From 73182c878727851dc967409d139faa10374536e0 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Tue, 16 Apr 2013 08:33:30 -0400
Subject: [PATCH 001/438] Bug 857252 - testing-modules-dir is not defined.
 r=gps

---
 testing/mochitest/runtests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index b4c99c23c9a5..8a55ed44d26c 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -358,7 +358,7 @@ See <http://mochikit.com/doc/html/MochiKit/Logging.html> for details on the logg
       options.testingModulesDir = os.path.normpath(options.testingModulesDir)
 
       if not os.path.isabs(options.testingModulesDir):
-        options.testingModulesDir = os.path.abspath(testingModulesDir)
+        options.testingModulesDir = os.path.abspath(options.testingModulesDir)
 
       if not os.path.isdir(options.testingModulesDir):
         self.error('--testing-modules-dir not a directory: %s' %

From 7a6ce42c2aea40a149f96c74f126e0df0d015756 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Tue, 16 Apr 2013 06:35:52 -0600
Subject: [PATCH 002/438] Bug 862228 - Move a RootedPropertyName to the proper
 place.

---
 js/src/frontend/Parser.cpp               | 8 +++++---
 js/src/jit-test/tests/basic/bug862228.js | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 js/src/jit-test/tests/basic/bug862228.js

diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 88320dad663b..ecbe09be592e 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -2793,9 +2793,11 @@ Parser<FullParseHandler>::checkDestructuring(BindData<FullParseHandler> *data,
                  * officially linked to its def or registered in lexdeps. Do
                  * that now.
                  */
-                RootedPropertyName name(context, pn->pn_atom->asPropertyName());
-                if (pair->pn_right == pair->pn_left && !noteNameUse(name, pn))
-                    return false;
+                if (pair->pn_right == pair->pn_left) {
+                    RootedPropertyName name(context, pn->pn_atom->asPropertyName());
+                    if (!noteNameUse(name, pn))
+                        return false;
+                }
                 ok = bindDestructuringLHS(pn);
             }
             if (!ok)
diff --git a/js/src/jit-test/tests/basic/bug862228.js b/js/src/jit-test/tests/basic/bug862228.js
new file mode 100644
index 000000000000..95ba66632c07
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug862228.js
@@ -0,0 +1,3 @@
+// |jit-test| error: ReferenceError
+
+({"":y=""}=

From 5f0f14e3824d6b18c153c48874a579a9191e9334 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Tue, 16 Apr 2013 14:35:59 +0200
Subject: [PATCH 003/438] Bug 848935 - requestLongerTimeout for intermittent
 failure in browser_aboutHome.js

---
 browser/base/content/test/browser_aboutHome.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js
index 22345f0a2029..b2a4392a29a1 100644
--- a/browser/base/content/test/browser_aboutHome.js
+++ b/browser/base/content/test/browser_aboutHome.js
@@ -250,6 +250,7 @@ let gTests = [
 function test()
 {
   waitForExplicitFinish();
+  requestLongerTimeout(2);
 
   Task.spawn(function () {
     for (let test of gTests) {

From 9b5c2c8642c2f63fc927087c4bf44eaa69acb345 Mon Sep 17 00:00:00 2001
From: Valentin Gosu <valentin.gosu@gmail.com>
Date: Tue, 16 Apr 2013 08:46:03 -0400
Subject: [PATCH 004/438] Bug 843865 - Fix >> in code. r=bz

---
 netwerk/base/src/Dashboard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/base/src/Dashboard.cpp b/netwerk/base/src/Dashboard.cpp
index 994be332544f..b94d1900f9a2 100644
--- a/netwerk/base/src/Dashboard.cpp
+++ b/netwerk/base/src/Dashboard.cpp
@@ -393,7 +393,7 @@ Dashboard::GetDNSCacheEntries()
 
     Sequence<double> &expiration = dict.mExpiration.Value();
     Sequence<nsString> &family = dict.mFamily.Value();
-    Sequence<Sequence<nsString>> &hostaddr = dict.mHostaddr.Value();
+    Sequence<Sequence<nsString> > &hostaddr = dict.mHostaddr.Value();
     Sequence<nsString> &hostname = dict.mHostname.Value();
 
     uint32_t length = mDns.data.Length();

From 84a17b140eee5d40b93aa3fd1a661f2d34f53ef3 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Mon, 15 Apr 2013 11:26:48 +0200
Subject: [PATCH 005/438] Bug 861790 - Fix unused function
 TypeIsFloatingPoint/TypeIsUnsigned in ObjectImpl.h. r=jwalden

--HG--
extra : rebase_source : 0ee1b49909e370983cba448480fc28741a0879bd
---
 js/src/vm/ObjectImpl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/vm/ObjectImpl.h b/js/src/vm/ObjectImpl.h
index d683b4380ef6..0e757f3e08c0 100644
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -560,11 +560,11 @@ struct uint8_clamped {
 };
 
 /* Note that we can't use std::numeric_limits here due to uint8_clamped. */
-template<typename T> static inline const bool TypeIsFloatingPoint() { return false; }
+template<typename T> inline const bool TypeIsFloatingPoint() { return false; }
 template<> inline const bool TypeIsFloatingPoint<float>() { return true; }
 template<> inline const bool TypeIsFloatingPoint<double>() { return true; }
 
-template<typename T> static inline const bool TypeIsUnsigned() { return false; }
+template<typename T> inline const bool TypeIsUnsigned() { return false; }
 template<> inline const bool TypeIsUnsigned<uint8_t>() { return true; }
 template<> inline const bool TypeIsUnsigned<uint16_t>() { return true; }
 template<> inline const bool TypeIsUnsigned<uint32_t>() { return true; }

From c2cef2b66749ab842ea4bae6c87e9409f59962ff Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Tue, 16 Apr 2013 07:52:49 -0500
Subject: [PATCH 006/438] Bug 861181: Separate interface from implementation
 for nsColumnSetFrame. [r=roc]

---
 layout/generic/nsColumnSetFrame.cpp | 148 +----------------------
 layout/generic/nsColumnSetFrame.h   | 178 ++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+), 147 deletions(-)
 create mode 100644 layout/generic/nsColumnSetFrame.h

diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp
index 4a4294b033d2..cc5843fd5f79 100644
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -5,157 +5,11 @@
 
 /* rendering object for css3 multi-column layout */
 
-#include "nsContainerFrame.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsISupports.h"
-#include "nsIAtom.h"
-#include "nsPresContext.h"
-#include "nsHTMLParts.h"
-#include "nsGkAtoms.h"
-#include "nsStyleConsts.h"
-#include "nsCOMPtr.h"
-#include "nsLayoutUtils.h"
-#include "nsDisplayList.h"
-#include "nsCSSRendering.h"
-#include <algorithm>
+#include "nsColumnSetFrame.h"
 
 using namespace mozilla;
 using namespace mozilla::layout;
 
-class nsColumnSetFrame : public nsContainerFrame {
-public:
-  NS_DECL_FRAMEARENA_HELPERS
-
-  nsColumnSetFrame(nsStyleContext* aContext);
-
-  NS_IMETHOD SetInitialChildList(ChildListID     aListID,
-                                 nsFrameList&    aChildList);
-
-  NS_IMETHOD Reflow(nsPresContext* aPresContext,
-                    nsHTMLReflowMetrics& aDesiredSize,
-                    const nsHTMLReflowState& aReflowState,
-                    nsReflowStatus& aStatus);
-                               
-  NS_IMETHOD  AppendFrames(ChildListID     aListID,
-                           nsFrameList&    aFrameList);
-  NS_IMETHOD  InsertFrames(ChildListID     aListID,
-                           nsIFrame*       aPrevFrame,
-                           nsFrameList&    aFrameList);
-  NS_IMETHOD  RemoveFrame(ChildListID     aListID,
-                          nsIFrame*       aOldFrame);
-
-  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);  
-  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
-
-  virtual nsIFrame* GetContentInsertionFrame() {
-    nsIFrame* frame = GetFirstPrincipalChild();
-
-    // if no children return nullptr
-    if (!frame)
-      return nullptr;
-
-    return frame->GetContentInsertionFrame();
-  }
-
-  virtual nsresult StealFrame(nsPresContext* aPresContext,
-                              nsIFrame*      aChild,
-                              bool           aForceNormal)
-  { // nsColumnSetFrame keeps overflow containers in main child list
-    return nsContainerFrame::StealFrame(aPresContext, aChild, true);
-  }
-
-  virtual bool IsFrameOfType(uint32_t aFlags) const
-   {
-     return nsContainerFrame::IsFrameOfType(aFlags &
-              ~(nsIFrame::eCanContainOverflowContainers));
-   }
-
-  virtual void BuildDisplayList(nsDisplayListBuilder*   aBuilder,
-                                const nsRect&           aDirtyRect,
-                                const nsDisplayListSet& aLists) MOZ_OVERRIDE;
-
-  virtual nsIAtom* GetType() const;
-
-  virtual void PaintColumnRule(nsRenderingContext* aCtx,
-                               const nsRect&        aDirtyRect,
-                               const nsPoint&       aPt);
-
-#ifdef DEBUG
-  NS_IMETHOD GetFrameName(nsAString& aResult) const {
-    return MakeFrameName(NS_LITERAL_STRING("ColumnSet"), aResult);
-  }
-#endif
-
-protected:
-  nscoord        mLastBalanceHeight;
-  nsReflowStatus mLastFrameStatus;
-
-  /**
-   * These are the parameters that control the layout of columns.
-   */
-  struct ReflowConfig {
-    int32_t mBalanceColCount;
-    nscoord mColWidth;
-    nscoord mExpectedWidthLeftOver;
-    nscoord mColGap;
-    nscoord mColMaxHeight;
-    bool mIsBalancing;
-  };
-
-  /**
-   * Some data that is better calculated during reflow
-   */
-  struct ColumnBalanceData {
-    // The maximum "content height" of any column
-    nscoord mMaxHeight;
-    // The sum of the "content heights" for all columns
-    nscoord mSumHeight;
-    // The "content height" of the last column
-    nscoord mLastHeight;
-    // The maximum "content height" of all columns that overflowed
-    // their available height
-    nscoord mMaxOverflowingHeight;
-    // Whether or not we should revert back to 'auto' setting for column-fill.
-    // This happens if we overflow our columns such that we no longer have
-    // enough room to keep balancing.
-    bool mShouldRevertToAuto;
-    void Reset() {
-      mMaxHeight = mSumHeight = mLastHeight = mMaxOverflowingHeight = 0;
-      mShouldRevertToAuto = false;
-    }
-  };
-  
-  /**
-   * Similar to nsBlockFrame::DrainOverflowLines. Locate any columns not
-   * handled by our prev-in-flow, and any columns sitting on our own
-   * overflow list, and put them in our primary child list for reflowing.
-   */
-  void DrainOverflowColumns();
-
-  /**
-   * The basic reflow strategy is to call this function repeatedly to
-   * obtain specific parameters that determine the layout of the
-   * columns. This function will compute those parameters from the CSS
-   * style. This function will also be responsible for implementing
-   * the state machine that controls column balancing.
-   */
-  ReflowConfig ChooseColumnStrategy(const nsHTMLReflowState& aReflowState,
-                                    bool aForceAuto);
-
-  /**
-   * Reflow column children. Returns true iff the content that was reflowed 
-   * fit into the mColMaxHeight.
-   */
-  bool ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
-                        const nsHTMLReflowState& aReflowState,
-                        nsReflowStatus& aStatus,
-                        const ReflowConfig& aConfig,
-                        bool aLastColumnUnbounded,
-                        nsCollapsingMargin* aCarriedOutBottomMargin,
-                        ColumnBalanceData& aColData);
-};
-
 /**
  * Tracking issues:
  *
diff --git a/layout/generic/nsColumnSetFrame.h b/layout/generic/nsColumnSetFrame.h
new file mode 100644
index 000000000000..25785a9db7ae
--- /dev/null
+++ b/layout/generic/nsColumnSetFrame.h
@@ -0,0 +1,178 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+/* rendering object for css3 multi-column layout */
+
+#include "nsContainerFrame.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsISupports.h"
+#include "nsIAtom.h"
+#include "nsPresContext.h"
+#include "nsHTMLParts.h"
+#include "nsGkAtoms.h"
+#include "nsStyleConsts.h"
+#include "nsCOMPtr.h"
+#include "nsLayoutUtils.h"
+#include "nsDisplayList.h"
+#include "nsCSSRendering.h"
+#include <algorithm>
+
+class nsColumnSetFrame : public nsContainerFrame {
+public:
+  NS_DECL_FRAMEARENA_HELPERS
+
+  nsColumnSetFrame(nsStyleContext* aContext);
+
+  NS_IMETHOD SetInitialChildList(ChildListID     aListID,
+                                 nsFrameList&    aChildList);
+
+  NS_IMETHOD Reflow(nsPresContext* aPresContext,
+                    nsHTMLReflowMetrics& aDesiredSize,
+                    const nsHTMLReflowState& aReflowState,
+                    nsReflowStatus& aStatus);
+
+  NS_IMETHOD  AppendFrames(ChildListID     aListID,
+                           nsFrameList&    aFrameList);
+  NS_IMETHOD  InsertFrames(ChildListID     aListID,
+                           nsIFrame*       aPrevFrame,
+                           nsFrameList&    aFrameList);
+  NS_IMETHOD  RemoveFrame(ChildListID     aListID,
+                          nsIFrame*       aOldFrame);
+
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
+
+  virtual nsIFrame* GetContentInsertionFrame() {
+    nsIFrame* frame = GetFirstPrincipalChild();
+
+    // if no children return nullptr
+    if (!frame)
+      return nullptr;
+
+    return frame->GetContentInsertionFrame();
+  }
+
+  virtual nsresult StealFrame(nsPresContext* aPresContext,
+                              nsIFrame*      aChild,
+                              bool           aForceNormal)
+  { // nsColumnSetFrame keeps overflow containers in main child list
+    return nsContainerFrame::StealFrame(aPresContext, aChild, true);
+  }
+
+  virtual bool IsFrameOfType(uint32_t aFlags) const
+   {
+     return nsContainerFrame::IsFrameOfType(aFlags &
+              ~(nsIFrame::eCanContainOverflowContainers));
+   }
+
+  virtual void BuildDisplayList(nsDisplayListBuilder*   aBuilder,
+                                const nsRect&           aDirtyRect,
+                                const nsDisplayListSet& aLists) MOZ_OVERRIDE;
+
+  virtual nsIAtom* GetType() const;
+
+  virtual void PaintColumnRule(nsRenderingContext* aCtx,
+                               const nsRect&        aDirtyRect,
+                               const nsPoint&       aPt);
+
+#ifdef DEBUG
+  NS_IMETHOD GetFrameName(nsAString& aResult) const {
+    return MakeFrameName(NS_LITERAL_STRING("ColumnSet"), aResult);
+  }
+#endif
+
+protected:
+  nscoord        mLastBalanceHeight;
+  nsReflowStatus mLastFrameStatus;
+
+  /**
+   * These are the parameters that control the layout of columns.
+   */
+  struct ReflowConfig {
+    // The number of columns that we want to balance across. If we're not
+    // balancing, this will be set to INT32_MAX.
+    int32_t mBalanceColCount;
+
+    // The width of each individual column.
+    nscoord mColWidth;
+
+    // The amount of width that is expected to be left over after all the
+    // columns and column gaps are laid out.
+    nscoord mExpectedWidthLeftOver;
+
+    // The width of each column gap.
+    nscoord mColGap;
+
+    // The maximum height of any individual column during a reflow iteration.
+    // This parameter is set during each iteration of the binary search for
+    // the best column height.
+    nscoord mColMaxHeight;
+
+    // A boolean controlling whether or not we are balancing. This should be
+    // equivalent to mBalanceColCount == INT32_MAX.
+    bool mIsBalancing;
+
+    // The last known column height that was 'feasible'. A column height is
+    // feasible if all child content fits within the specified height.
+    nscoord mKnownFeasibleHeight;
+
+    // The last known height that was 'infeasible'. A column height is
+    // infeasible if not all child content fits within the specified height.
+    nscoord mKnownInfeasibleHeight;
+  };
+
+  /**
+   * Some data that is better calculated during reflow
+   */
+  struct ColumnBalanceData {
+    // The maximum "content height" of any column
+    nscoord mMaxHeight;
+    // The sum of the "content heights" for all columns
+    nscoord mSumHeight;
+    // The "content height" of the last column
+    nscoord mLastHeight;
+    // The maximum "content height" of all columns that overflowed
+    // their available height
+    nscoord mMaxOverflowingHeight;
+    // Whether or not we should revert back to 'auto' setting for column-fill.
+    // This happens if we overflow our columns such that we no longer have
+    // enough room to keep balancing.
+    bool mShouldRevertToAuto;
+    void Reset() {
+      mMaxHeight = mSumHeight = mLastHeight = mMaxOverflowingHeight = 0;
+      mShouldRevertToAuto = false;
+    }
+  };
+
+  /**
+   * Similar to nsBlockFrame::DrainOverflowLines. Locate any columns not
+   * handled by our prev-in-flow, and any columns sitting on our own
+   * overflow list, and put them in our primary child list for reflowing.
+   */
+  void DrainOverflowColumns();
+
+  /**
+   * The basic reflow strategy is to call this function repeatedly to
+   * obtain specific parameters that determine the layout of the
+   * columns. This function will compute those parameters from the CSS
+   * style. This function will also be responsible for implementing
+   * the state machine that controls column balancing.
+   */
+  ReflowConfig ChooseColumnStrategy(const nsHTMLReflowState& aReflowState,
+                                    bool aForceAuto);
+
+  /**
+   * Reflow column children. Returns true iff the content that was reflowed
+   * fit into the mColMaxHeight.
+   */
+  bool ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
+                        const nsHTMLReflowState& aReflowState,
+                        nsReflowStatus& aStatus,
+                        const ReflowConfig& aConfig,
+                        bool aLastColumnUnbounded,
+                        nsCollapsingMargin* aCarriedOutBottomMargin,
+                        ColumnBalanceData& aColData);
+};

From 1c6de2e304f7b11b34fbbce38db61ce14db54098 Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Tue, 16 Apr 2013 07:52:51 -0500
Subject: [PATCH 007/438] Bug 861182: Pull knownFeasibleHeight and
 knownInfeasibleHeight into ReflowConfig so they can be used outside of
 nsColumnSetFrame::Reflow(). [r=roc]

---
 layout/generic/nsColumnSetFrame.cpp | 73 +++++++++++++++++------------
 layout/generic/nsColumnSetFrame.h   |  3 +-
 2 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp
index cc5843fd5f79..a0d95e6321f6 100644
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -176,8 +176,14 @@ GetColumnGap(nsColumnSetFrame*    aFrame,
 
 nsColumnSetFrame::ReflowConfig
 nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState,
-                                       bool aForceAuto = false)
+                                       bool aForceAuto = false,
+                                       nscoord aFeasibleHeight = NS_INTRINSICSIZE,
+                                       nscoord aInfeasibleHeight = 0)
+
 {
+  nscoord knownFeasibleHeight = aFeasibleHeight;
+  nscoord knownInfeasibleHeight = aInfeasibleHeight;
+
   const nsStyleColumn* colStyle = StyleColumn();
   nscoord availContentWidth = GetAvailableContentWidth(aReflowState);
   if (aReflowState.ComputedWidth() != NS_INTRINSICSIZE) {
@@ -290,7 +296,8 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState,
          numColumns, colWidth, expectedWidthLeftOver, colHeight, colGap);
 #endif
   ReflowConfig config = { numColumns, colWidth, expectedWidthLeftOver, colGap,
-                          colHeight, isBalancing };
+                          colHeight, isBalancing, knownFeasibleHeight,
+                          knownInfeasibleHeight };
   return config;
 }
 
@@ -808,91 +815,95 @@ nsColumnSetFrame::Reflow(nsPresContext*           aPresContext,
       nscoord availableContentHeight = GetAvailableContentHeight(aReflowState);
 
       // Termination of the algorithm below is guaranteed because
-      // knownFeasibleHeight - knownInfeasibleHeight decreases in every
-      // iteration.
-      nscoord knownFeasibleHeight = NS_INTRINSICSIZE;
-      nscoord knownInfeasibleHeight = 0;
+      // config.mKnownFeasibleHeight - config.mKnownInfeasibleHeight decreases
+      // in every iteration.
+
       // We set this flag when we detect that we may contain a frame
       // that can break anywhere (thus foiling the linear decrease-by-one
       // search)
       bool maybeContinuousBreakingDetected = false;
 
       while (!aPresContext->HasPendingInterrupt()) {
-        nscoord lastKnownFeasibleHeight = knownFeasibleHeight;
+        nscoord lastKnownFeasibleHeight = config.mKnownFeasibleHeight;
 
         // Record what we learned from the last reflow
         if (feasible) {
           // maxHeight is feasible. Also, mLastBalanceHeight is feasible.
-          knownFeasibleHeight = std::min(knownFeasibleHeight, colData.mMaxHeight);
-          knownFeasibleHeight = std::min(knownFeasibleHeight, mLastBalanceHeight);
+          config.mKnownFeasibleHeight = std::min(config.mKnownFeasibleHeight,
+                                                 colData.mMaxHeight);
+          config.mKnownFeasibleHeight = std::min(config.mKnownFeasibleHeight,
+                                                 mLastBalanceHeight);
 
           // Furthermore, no height less than the height of the last
           // column can ever be feasible. (We might be able to reduce the
           // height of a non-last column by moving content to a later column,
           // but we can't do that with the last column.)
           if (mFrames.GetLength() == config.mBalanceColCount) {
-            knownInfeasibleHeight = std::max(knownInfeasibleHeight,
-                                           colData.mLastHeight - 1);
+            config.mKnownInfeasibleHeight =
+              std::max(config.mKnownInfeasibleHeight, colData.mLastHeight - 1);
           }
         } else {
-          knownInfeasibleHeight = std::max(knownInfeasibleHeight, mLastBalanceHeight);
+          config.mKnownInfeasibleHeight =
+            std::max(config.mKnownInfeasibleHeight, mLastBalanceHeight);
           // If a column didn't fit in its available height, then its current
           // height must be the minimum height for unbreakable content in
           // the column, and therefore no smaller height can be feasible.
-          knownInfeasibleHeight = std::max(knownInfeasibleHeight,
-                                         colData.mMaxOverflowingHeight - 1);
+          config.mKnownInfeasibleHeight =
+            std::max(config.mKnownInfeasibleHeight,
+                     colData.mMaxOverflowingHeight - 1);
 
           if (unboundedLastColumn) {
             // The last column is unbounded, so all content got reflowed, so the
             // mColMaxHeight is feasible.
-            knownFeasibleHeight = std::min(knownFeasibleHeight,
-                                         colData.mMaxHeight);
+            config.mKnownFeasibleHeight = std::min(config.mKnownFeasibleHeight,
+                                                   colData.mMaxHeight);
           }
         }
 
 #ifdef DEBUG_roc
         printf("*** nsColumnSetFrame::Reflow balancing knownInfeasible=%d knownFeasible=%d\n",
-               knownInfeasibleHeight, knownFeasibleHeight);
+               config.mKnownInfeasibleHeight, config.mKnownFeasibleHeight);
 #endif
 
 
-        if (knownInfeasibleHeight >= knownFeasibleHeight - 1) {
-          // knownFeasibleHeight is where we want to be
+        if (config.mKnownInfeasibleHeight >= config.mKnownFeasibleHeight - 1) {
+          // config.mKnownFeasibleHeight is where we want to be
           break;
 
         }
-        if (knownInfeasibleHeight >= availableContentHeight) {
+        if (config.mKnownInfeasibleHeight >= availableContentHeight) {
           break;
         }
 
-        if (lastKnownFeasibleHeight - knownFeasibleHeight == 1) {
+        if (lastKnownFeasibleHeight - config.mKnownFeasibleHeight == 1) {
           // We decreased the feasible height by one twip only. This could
           // indicate that there is a continuously breakable child frame
           // that we are crawling through.
           maybeContinuousBreakingDetected = true;
         }
 
-        nscoord nextGuess = (knownFeasibleHeight + knownInfeasibleHeight)/2;
+        nscoord nextGuess =
+          (config.mKnownFeasibleHeight + config.mKnownInfeasibleHeight)/2;
         // The constant of 600 twips is arbitrary. It's about two line-heights.
-        if (knownFeasibleHeight - nextGuess < 600 &&
+        if (config.mKnownFeasibleHeight - nextGuess < 600 &&
             !maybeContinuousBreakingDetected) {
           // We're close to our target, so just try shrinking just the
           // minimum amount that will cause one of our columns to break
           // differently.
-          nextGuess = knownFeasibleHeight - 1;
+          nextGuess = config.mKnownFeasibleHeight - 1;
         } else if (unboundedLastColumn) {
           // Make a guess by dividing that into N columns. Add some slop
           // to try to make it on the feasible side.  The constant of
           // 600 twips is arbitrary. It's about two line-heights.
           nextGuess = colData.mSumHeight/config.mBalanceColCount + 600;
           // Sanitize it
-          nextGuess = clamped(nextGuess, knownInfeasibleHeight + 1,
-                                         knownFeasibleHeight - 1);
-        } else if (knownFeasibleHeight == NS_INTRINSICSIZE) {
+          nextGuess = clamped(nextGuess, config.mKnownInfeasibleHeight + 1,
+                                         config.mKnownFeasibleHeight - 1);
+        } else if (config.mKnownFeasibleHeight == NS_INTRINSICSIZE) {
           // This can happen when we had a next-in-flow so we didn't
           // want to do an unbounded height measuring step. Let's just increase
           // from the infeasible height by some reasonable amount.
-          nextGuess = knownInfeasibleHeight*2 + 600;
+          nextGuess = config.mKnownInfeasibleHeight*2 + 600;
         }
         // Don't bother guessing more than our height constraint.
         nextGuess = std::min(availableContentHeight, nextGuess);
@@ -914,13 +925,13 @@ nsColumnSetFrame::Reflow(nsPresContext*           aPresContext,
         // We may need to reflow one more time at the feasible height to
         // get a valid layout.
         bool skip = false;
-        if (knownInfeasibleHeight >= availableContentHeight) {
-          config.mColMaxHeight = availableContentHeight;
+        if (config.mKnownInfeasibleHeight >= availableContentHeight) {
+            config.mColMaxHeight = availableContentHeight;
           if (mLastBalanceHeight == availableContentHeight) {
             skip = true;
           }
         } else {
-          config.mColMaxHeight = knownFeasibleHeight;
+          config.mColMaxHeight = config.mKnownFeasibleHeight;
         }
         if (!skip) {
           // If our height is unconstrained, make sure that the last column is
diff --git a/layout/generic/nsColumnSetFrame.h b/layout/generic/nsColumnSetFrame.h
index 25785a9db7ae..9c81517bcc57 100644
--- a/layout/generic/nsColumnSetFrame.h
+++ b/layout/generic/nsColumnSetFrame.h
@@ -162,7 +162,8 @@ protected:
    * the state machine that controls column balancing.
    */
   ReflowConfig ChooseColumnStrategy(const nsHTMLReflowState& aReflowState,
-                                    bool aForceAuto);
+                                    bool aForceAuto, nscoord aFeasibleHeight,
+                                    nscoord aInfeasibleHeight);
 
   /**
    * Reflow column children. Returns true iff the content that was reflowed

From d170276e6391d070dab470747eae610d244357be Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Tue, 16 Apr 2013 21:19:29 +0900
Subject: [PATCH 008/438] Bug 860180 - Prefer UTF-16BE/LE to UTF-16. r=hsivonen

---
 content/base/public/nsContentUtils.h          |  2 +-
 content/base/src/nsContentUtils.cpp           | 21 ++++---------------
 content/base/src/nsScriptLoader.cpp           |  4 ++--
 dom/workers/FileReaderSync.cpp                | 18 +++-------------
 .../src/base/nsUniversalDetector.cpp          |  4 ++--
 layout/style/Loader.cpp                       |  5 ++---
 6 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index c9c75b9c70e3..9da9cc53d9c6 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -510,7 +510,7 @@ public:
    * @return boolean indicating whether a BOM was detected.
    */
   static bool CheckForBOM(const unsigned char* aBuffer, uint32_t aLength,
-                          nsACString& aCharset, bool *bigEndian = nullptr);
+                          nsACString& aCharset);
 
   static nsresult GuessCharset(const char *aData, uint32_t aDataLen,
                                nsACString &aCharset);
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 85749b985f5f..6bc0e3f6731b 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -3713,7 +3713,7 @@ nsContentUtils::ConvertStringFromCharset(const nsACString& aCharset,
 /* static */
 bool
 nsContentUtils::CheckForBOM(const unsigned char* aBuffer, uint32_t aLength,
-                            nsACString& aCharset, bool *bigEndian)
+                            nsACString& aCharset)
 {
   bool found = true;
   aCharset.Truncate();
@@ -3725,15 +3725,11 @@ nsContentUtils::CheckForBOM(const unsigned char* aBuffer, uint32_t aLength,
   }
   else if (aLength >= 2 &&
            aBuffer[0] == 0xFE && aBuffer[1] == 0xFF) {
-    aCharset = "UTF-16";
-    if (bigEndian)
-      *bigEndian = true;
+    aCharset = "UTF-16BE";
   }
   else if (aLength >= 2 &&
            aBuffer[0] == 0xFF && aBuffer[1] == 0xFE) {
-    aCharset = "UTF-16";
-    if (bigEndian)
-      *bigEndian = false;
+    aCharset = "UTF-16LE";
   } else {
     found = false;
   }
@@ -3791,16 +3787,7 @@ nsContentUtils::GuessCharset(const char *aData, uint32_t aDataLen,
       (aDataLen >= sizeof(sniffBuf) ? sizeof(sniffBuf) : aDataLen);
     memcpy(sniffBuf, aData, numRead);
 
-    bool bigEndian;
-    if (CheckForBOM(sniffBuf, numRead, aCharset, &bigEndian) &&
-        aCharset.EqualsLiteral("UTF-16")) {
-      if (bigEndian) {
-        aCharset.AppendLiteral("BE");
-      }
-      else {
-        aCharset.AppendLiteral("LE");
-      }
-    }
+    CheckForBOM(sniffBuf, numRead, aCharset);
   }
 
   if (aCharset.IsEmpty()) {
diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp
index 65c236401c62..ac19a251bc9b 100644
--- a/content/base/src/nsScriptLoader.cpp
+++ b/content/base/src/nsScriptLoader.cpp
@@ -981,14 +981,14 @@ DetectByteOrderMark(const unsigned char* aBytes, int32_t aLen, nsCString& oChars
     if (0xFF == aBytes[1]) {
       // FE FF
       // UTF-16, big-endian
-      oCharset.Assign("UTF-16");
+      oCharset.Assign("UTF-16BE");
     }
     break;
   case 0xFF:
     if (0xFE == aBytes[1]) {
       // FF FE
       // UTF-16, little-endian
-      oCharset.Assign("UTF-16");
+      oCharset.Assign("UTF-16LE");
     }
     break;
   }
diff --git a/dom/workers/FileReaderSync.cpp b/dom/workers/FileReaderSync.cpp
index 715fa5cfc8bb..5e24ba4cf9fd 100644
--- a/dom/workers/FileReaderSync.cpp
+++ b/dom/workers/FileReaderSync.cpp
@@ -343,21 +343,9 @@ FileReaderSync::GuessCharset(nsIInputStream *aStream, nsACString &aCharset)
                        sizeof(sniffBuf), &numRead);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    if (numRead >= 4 &&
-        sniffBuf[0] == 0x00 &&
-        sniffBuf[1] == 0x00 &&
-        sniffBuf[2] == 0xfe &&
-        sniffBuf[3] == 0xff) {
-      mCharset = "UTF-32BE";
-    } else if (numRead >= 4 &&
-               sniffBuf[0] == 0xff &&
-               sniffBuf[1] == 0xfe &&
-               sniffBuf[2] == 0x00 &&
-               sniffBuf[3] == 0x00) {
-      mCharset = "UTF-32LE";
-    } else if (numRead >= 2 &&
-               sniffBuf[0] == 0xfe &&
-               sniffBuf[1] == 0xff) {
+    if (numRead >= 2 &&
+        sniffBuf[0] == 0xfe &&
+        sniffBuf[1] == 0xff) {
       mCharset = "UTF-16BE";
     } else if (numRead >= 2 &&
                sniffBuf[0] == 0xff &&
diff --git a/extensions/universalchardet/src/base/nsUniversalDetector.cpp b/extensions/universalchardet/src/base/nsUniversalDetector.cpp
index 04b85f7c218a..a06c2270c29a 100644
--- a/extensions/universalchardet/src/base/nsUniversalDetector.cpp
+++ b/extensions/universalchardet/src/base/nsUniversalDetector.cpp
@@ -88,12 +88,12 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, uint32_t aLen)
         case '\xFE':
           if ('\xFF' == aBuf[1])
             // FE FF  UTF-16, big endian BOM
-            mDetectedCharset = "UTF-16";
+            mDetectedCharset = "UTF-16BE";
         break;
         case '\xFF':
           if ('\xFE' == aBuf[1])
             // FF FE  UTF-16, little endian BOM
-            mDetectedCharset = "UTF-16";
+            mDetectedCharset = "UTF-16LE";
         break;
       }  // switch
 
diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index cb9a11dc4278..a5b2ac857341 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -663,9 +663,8 @@ SheetLoadData::OnDetermineCharset(nsIUnicharStreamLoader* aLoader,
   if (nsContentUtils::CheckForBOM((const unsigned char*)aSegment.BeginReading(),
                                   aSegment.Length(),
                                   aCharset)) {
-    // aCharset is now either "UTF-16" or "UTF-8".
-    // The UTF-16 decoder will re-sniff and swallow the BOM.
-    // The UTF-8 decoder will swallow the BOM.
+    // aCharset is now either "UTF-16BE", "UTF-16BE" or "UTF-8"
+    // which will swallow the BOM.
     mCharset.Assign(aCharset);
 #ifdef PR_LOGGING
     LOG(("  Setting from BOM to: %s", PromiseFlatCString(aCharset).get()));

From 031e42df2360e2f5b254e6d2e7749e5a74ff3285 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Tue, 16 Apr 2013 21:19:30 +0900
Subject: [PATCH 009/438] Bug 860180 - Regression tests. r=hsivonen

--HG--
rename : parser/htmlparser/tests/mochitest/test_xml_mislabeled_nobom.html => parser/htmlparser/tests/mochitest/test_xml_mislabeled.html
---
 parser/htmlparser/tests/mochitest/Makefile.in |  2 +-
 .../tests/mochitest/test_xml_mislabeled.html  | 62 +++++++++++++++++++
 .../mochitest/test_xml_mislabeled_nobom.html  | 44 -------------
 3 files changed, 63 insertions(+), 45 deletions(-)
 create mode 100644 parser/htmlparser/tests/mochitest/test_xml_mislabeled.html
 delete mode 100644 parser/htmlparser/tests/mochitest/test_xml_mislabeled_nobom.html

diff --git a/parser/htmlparser/tests/mochitest/Makefile.in b/parser/htmlparser/tests/mochitest/Makefile.in
index c0fb80e17b09..5e6d982fda71 100644
--- a/parser/htmlparser/tests/mochitest/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/Makefile.in
@@ -81,7 +81,7 @@ MOCHITEST_FILES =	parser_datreader.js \
 		file_bug716579-16.xhtml^headers^ \
 		test_bug717180.html \
 		file_bug717180.html \
-		test_xml_mislabeled_nobom.html \
+		test_xml_mislabeled.html \
 		$(NULL)
 
 # Test disabled on mobile. See bug 737020.
diff --git a/parser/htmlparser/tests/mochitest/test_xml_mislabeled.html b/parser/htmlparser/tests/mochitest/test_xml_mislabeled.html
new file mode 100644
index 000000000000..821edd42a772
--- /dev/null
+++ b/parser/htmlparser/tests/mochitest/test_xml_mislabeled.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html><meta charset=utf-8>
+<title>Test for mislabeled or unlabeled XML entities with U+xxD8</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css" />
+<body>
+<script class="testbody">
+'use strict';
+
+SimpleTest.waitForExplicitFinish();
+
+var declaredEncodings = [null, 'utf-8', 'uTf-8', 'UTF-8', 'utf-16', 'uTf-16', 'UTF-16'];
+var actualEncodings = ['utf-8', 'utf-16be', 'utf-16le'];
+var i = 0, j = 0
+testxhr(declaredEncodings[i], actualEncodings[j]);
+
+function testxhr(declaredEncoding, actualEncoding) {
+  // utf-16 XML requres the BOM
+  var bom = actualEncoding.startsWith('utf-16') ? '\uFEFF' : '';
+  var xmlDecl = declaredEncoding ? '<?xml version="1.0" encoding="' + declaredEncoding + '" ?>\n' : '';
+  // The test string need to contain U+xxD8 (bug 860180)
+  var xmlString = bom + xmlDecl + '<test>testハヒフヘホ</test>';
+  var xml = new TextEncoder(actualEncoding).encode(xmlString);
+  var description = declaredEncoding ? ' labeled with ' + declaredEncoding : ' without XML declaration';
+  if (!declaredEncoding || actualEncoding !== declaredEncoding.toLowerCase()) {
+    description += ' but actually encoded with ' + actualEncoding;
+  }
+  var xhr = new XMLHttpRequest();
+  var url = URL.createObjectURL(new Blob([xml], {type: 'text/xml'}));
+  xhr.open('GET', url);
+  xhr.send();
+  xhr.onload = xhr.onerror = function(e) {
+    URL.revokeObjectURL(url);
+    is(e.type, 'load', 'xhr loading should succeed for XML' + description);
+    is(xhr.responseXML.documentElement.textContent, 'testハヒフヘホ',
+       'response should be available for XML' + description);
+    testiframe(description, xml);
+  };
+}
+
+function testiframe(description, xml) {
+  var iframe = document.createElement('iframe');
+  var url = URL.createObjectURL(new Blob([xml], {type: 'text/xml'}))
+  iframe.src = url;
+  iframe.onload = iframe.onerror = function(e) {
+    URL.revokeObjectURL(url);
+    is(e.type, 'load', 'iframe loading should succeed for XML' + description);
+    is(iframe.contentDocument.documentElement.textContent, 'testハヒフヘホ',
+       'iframe content should be available for XML' + description);
+    if (++i >= declaredEncodings.length) {
+      i = 0;
+      if (++j >= actualEncodings.length) {
+        SimpleTest.finish();
+        return;
+      }
+    }
+    testxhr(declaredEncodings[i], actualEncodings[j]);
+  };
+  document.body.appendChild(iframe);
+}
+</script>
+<div id="display"></div>
+</body>
diff --git a/parser/htmlparser/tests/mochitest/test_xml_mislabeled_nobom.html b/parser/htmlparser/tests/mochitest/test_xml_mislabeled_nobom.html
deleted file mode 100644
index 0849d22cac2c..000000000000
--- a/parser/htmlparser/tests/mochitest/test_xml_mislabeled_nobom.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html><meta charset=utf-8>
-<title>Test for mislabeled XML entities</title>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css" />
-<body>
-<script class="testbody">
-'use strict';
-
-SimpleTest.waitForExplicitFinish();
-
-var encodings = ['utf-8', 'uTf-8', 'UTF-8', 'utf-16', 'uTf-16', 'UTF-16'];
-testxhr(encodings.shift());
-
-function testxhr(encoding) {
-  var xml = '<?xml version="1.0" encoding="' + encoding + '" ?>\n<test>test</test>';
-  var xhr = new XMLHttpRequest();
-  xhr.open('GET', 'data:text/xml,' + xml);
-  xhr.send();
-  xhr.onload = xhr.onerror = function(e) {
-    ok(e.type === 'load', 'Test xhr loading for utf-8 XML labeled with ' + encoding);
-    is(xhr.responseXML.documentElement.textContent, 'test',
-       'Test xhr response for utf-8 XML labeled with ' + encoding);
-    testiframe(encoding, xml);
-  };
-}
-
-function testiframe(encoding, xml) {
-  var iframe = document.createElement('iframe');
-  iframe.src = 'data:text/xml,' + xml;
-  iframe.onload = iframe.onerror = function(e) {
-    ok(e.type === 'load', 'Test iframe loading for utf-8 XML labeled with ' + encoding);
-    is(iframe.contentDocument.documentElement.textContent, 'test',
-       'Test iframe content for utf-8 XML labeled with ' + encoding);
-    if (encodings.length === 0) {
-      SimpleTest.finish();
-    } else {
-      testxhr(encodings.shift());
-    }
-  };
-  document.body.appendChild(iframe);
-}
-</script>
-<div id="display"></div>
-</body>

From 7f7df293ae003f27716e9f9bd48b4bf94e7064c8 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Mon, 15 Apr 2013 18:32:55 +0100
Subject: [PATCH 010/438] Bug 861281 - GC: Root the wrap object API r=terrence
 r=bholley

--HG--
extra : rebase_source : 1d3ed88299ad8e9ad6812fb41aa48f03cc7aabae
---
 content/base/src/nsNodeUtils.cpp         |  2 +-
 dom/bindings/BindingUtils.cpp            |  4 +++-
 dom/bindings/BindingUtils.h              |  2 +-
 js/src/jsapi-tests/testBug604087.cpp     | 14 ++++-------
 js/src/jsapi.h                           |  9 +++----
 js/src/jswrapper.cpp                     |  8 ++-----
 js/src/jswrapper.h                       |  4 ++--
 js/xpconnect/wrappers/WrapperFactory.cpp | 30 +++++++++++++-----------
 js/xpconnect/wrappers/WrapperFactory.h   | 14 +++++------
 9 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/content/base/src/nsNodeUtils.cpp b/content/base/src/nsNodeUtils.cpp
index 620be1b9c59f..3a1dbef635c0 100644
--- a/content/base/src/nsNodeUtils.cpp
+++ b/content/base/src/nsNodeUtils.cpp
@@ -400,7 +400,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep,
 
   AutoJSContext cx;
   nsresult rv;
-  JSObject *wrapper;
+  JS::RootedObject wrapper(cx);
   bool isDOMBinding;
   if (aReparentScope && (wrapper = aNode->GetWrapper()) &&
       !(isDOMBinding = IsDOMObject(wrapper))) {
diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index db155f37b0db..85adf4ff3e3c 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -1438,8 +1438,10 @@ private:
 };
 
 nsresult
-ReparentWrapper(JSContext* aCx, JSObject* aObj)
+ReparentWrapper(JSContext* aCx, JS::HandleObject aObjArg)
 {
+  // aObj is assigned to below, so needs to be re-rooted.
+  JS::RootedObject aObj(aCx, aObjArg);
   const DOMClass* domClass = GetDOMClass(aObj);
 
   JSObject* oldParent = JS_GetParent(aObj);
diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index 777aaa5626c9..724d29cb714e 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -1681,7 +1681,7 @@ struct JSBindingFinalized<T, true>
 };
 
 nsresult
-ReparentWrapper(JSContext* aCx, JSObject* aObj);
+ReparentWrapper(JSContext* aCx, JS::HandleObject aObj);
 
 /**
  * Used to implement the hasInstance hook of an interface object.
diff --git a/js/src/jsapi-tests/testBug604087.cpp b/js/src/jsapi-tests/testBug604087.cpp
index c3a907a20b91..100d432b3f7b 100644
--- a/js/src/jsapi-tests/testBug604087.cpp
+++ b/js/src/jsapi-tests/testBug604087.cpp
@@ -43,29 +43,23 @@ wrap(JSContext *cx, JS::HandleObject toWrap, JS::HandleObject target)
 }
 
 static JSObject *
-SameCompartmentWrap(JSContext *cx, JSObject *objArg)
+SameCompartmentWrap(JSContext *cx, JS::HandleObject obj)
 {
-    JS::RootedObject obj(cx, objArg);
     JS_GC(JS_GetRuntime(cx));
     return obj;
 }
 
 static JSObject *
-PreWrap(JSContext *cx, JSObject *scopeArg, JSObject *objArg, unsigned flags)
+PreWrap(JSContext *cx, JS::HandleObject scope, JS::HandleObject obj, unsigned flags)
 {
-    JS::RootedObject scope(cx, scopeArg);
-    JS::RootedObject obj(cx, objArg);
     JS_GC(JS_GetRuntime(cx));
     return obj;
 }
 
 static JSObject *
-Wrap(JSContext *cx, JSObject *existing, JSObject *objArg,
-     JSObject *protoArg, JSObject *parentArg, unsigned flags)
+Wrap(JSContext *cx, JS::HandleObject existing, JS::HandleObject obj,
+     JS::HandleObject proto, JS::HandleObject parent, unsigned flags)
 {
-    JS::RootedObject obj(cx, objArg);
-    JS::RootedObject proto(cx, protoArg);
-    JS::RootedObject parent(cx, parentArg);
     return js::Wrapper::New(cx, obj, proto, parent, &js::CrossCompartmentWrapper::singleton);
 }
 
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 846073b1386d..ecc48aa638b2 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1161,8 +1161,8 @@ typedef JSBool
  * wrap a function.
  */
 typedef JSObject *
-(* JSWrapObjectCallback)(JSContext *cx, JSObject *existing, JSObject *obj,
-                         JSObject *proto, JSObject *parent,
+(* JSWrapObjectCallback)(JSContext *cx, JS::HandleObject existing, JS::HandleObject obj,
+                         JS::HandleObject proto, JS::HandleObject parent,
                          unsigned flags);
 
 /*
@@ -1171,7 +1171,8 @@ typedef JSObject *
  * or even finding a more suitable object for the new compartment.
  */
 typedef JSObject *
-(* JSPreWrapCallback)(JSContext *cx, JSObject *scope, JSObject *obj, unsigned flags);
+(* JSPreWrapCallback)(JSContext *cx, JS::HandleObject scope, JS::HandleObject obj,
+                      unsigned flags);
 
 /*
  * Callback used when wrapping determines that the underlying object is already
@@ -1184,7 +1185,7 @@ typedef JSObject *
  * compartment wrapper that gets passed to wrap.
  */
 typedef JSObject *
-(* JSSameCompartmentWrapObjectCallback)(JSContext *cx, JSObject *obj);
+(* JSSameCompartmentWrapObjectCallback)(JSContext *cx, JS::HandleObject obj);
 
 typedef void
 (* JSDestroyCompartmentCallback)(JSFreeOp *fop, JSCompartment *compartment);
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 3f21082891d9..49958bf7920b 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -132,14 +132,10 @@ Wrapper Wrapper::singletonWithPrototype((unsigned)0, true);
 /* Compartments. */
 
 extern JSObject *
-js::TransparentObjectWrapper(JSContext *cx, JSObject *existing, JSObject *objArg,
-                             JSObject *wrappedProtoArg, JSObject *parentArg,
+js::TransparentObjectWrapper(JSContext *cx, HandleObject existing, HandleObject obj,
+                             HandleObject wrappedProto, HandleObject parent,
                              unsigned flags)
 {
-    RootedObject obj(cx, objArg);
-    RootedObject wrappedProto(cx, wrappedProtoArg);
-    RootedObject parent(cx, parentArg);
-
     // Allow wrapping outer window proxies.
     JS_ASSERT(!obj->isWrapper() || obj->getClass()->ext.innerObject);
     return Wrapper::New(cx, obj, wrappedProto, parent, &CrossCompartmentWrapper::singleton);
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index 3e7985cb6b2a..520191eef739 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -205,8 +205,8 @@ class JS_FRIEND_API(DeadObjectProxy) : public BaseProxyHandler
 };
 
 extern JSObject *
-TransparentObjectWrapper(JSContext *cx, JSObject *existing, JSObject *obj,
-                         JSObject *wrappedProto, JSObject *parent,
+TransparentObjectWrapper(JSContext *cx, HandleObject existing, HandleObject obj,
+                         HandleObject wrappedProto, HandleObject parent,
                          unsigned flags);
 
 // Proxy family for wrappers. Public so that IsWrapper() can be fully inlined by
diff --git a/js/xpconnect/wrappers/WrapperFactory.cpp b/js/xpconnect/wrappers/WrapperFactory.cpp
index 571c9a1d03b8..381f296d6341 100644
--- a/js/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/xpconnect/wrappers/WrapperFactory.cpp
@@ -125,7 +125,8 @@ WrapperFactory::DoubleWrap(JSContext *cx, HandleObject obj, unsigned flags)
 }
 
 JSObject *
-WrapperFactory::PrepareForWrapping(JSContext *cx, JSObject *scope, JSObject *objArg, unsigned flags)
+WrapperFactory::PrepareForWrapping(JSContext *cx, HandleObject scope,
+                                   HandleObject objArg, unsigned flags)
 {
     RootedObject obj(cx, objArg);
     // Outerize any raw inner objects at the entry point here, so that we don't
@@ -167,6 +168,7 @@ WrapperFactory::PrepareForWrapping(JSContext *cx, JSObject *scope, JSObject *obj
 
     JSAutoCompartment ac(cx, obj);
     XPCCallContext ccx(JS_CALLER, cx, obj);
+    RootedObject wrapScope(cx, scope);
 
     {
         if (NATIVE_HAS_FLAG(&ccx, WantPreCreate)) {
@@ -177,20 +179,19 @@ WrapperFactory::PrepareForWrapping(JSContext *cx, JSObject *scope, JSObject *obj
             // being accessed across compartments. We would really prefer to
             // replace the above code with a test that says "do you only have one
             // wrapper?"
-            RootedObject originalScope(cx, scope);
             nsresult rv = wn->GetScriptableInfo()->GetCallback()->
-                PreCreate(wn->Native(), cx, scope, &scope);
+                PreCreate(wn->Native(), cx, scope, wrapScope.address());
             NS_ENSURE_SUCCESS(rv, DoubleWrap(cx, obj, flags));
 
             // If the handed back scope differs from the passed-in scope and is in
             // a separate compartment, then this object is explicitly requesting
             // that we don't create a second JS object for it: create a security
             // wrapper.
-            if (js::GetObjectCompartment(originalScope) != js::GetObjectCompartment(scope))
+            if (js::GetObjectCompartment(scope) != js::GetObjectCompartment(wrapScope))
                 return DoubleWrap(cx, obj, flags);
 
             RootedObject currentScope(cx, JS_GetGlobalForObject(cx, obj));
-            if (MOZ_UNLIKELY(scope != currentScope)) {
+            if (MOZ_UNLIKELY(wrapScope != currentScope)) {
                 // The wrapper claims it wants to be in the new scope, but
                 // currently has a reflection that lives in the old scope. This
                 // can mean one of two things, both of which are rare:
@@ -217,7 +218,7 @@ WrapperFactory::PrepareForWrapping(JSContext *cx, JSObject *scope, JSObject *obj
 
                 // Check for case (2).
                 if (probe != currentScope) {
-                    MOZ_ASSERT(probe == scope);
+                    MOZ_ASSERT(probe == wrapScope);
                     return DoubleWrap(cx, obj, flags);
                 }
 
@@ -236,8 +237,8 @@ WrapperFactory::PrepareForWrapping(JSContext *cx, JSObject *scope, JSObject *obj
             // This doesn't actually pose a security issue, because we'll still compute
             // the correct (opaque) wrapper for the object below given the security
             // characteristics of the two compartments.
-            if (!AccessCheck::isChrome(js::GetObjectCompartment(scope)) &&
-                 AccessCheck::subsumesIgnoringDomain(js::GetObjectCompartment(scope),
+            if (!AccessCheck::isChrome(js::GetObjectCompartment(wrapScope)) &&
+                 AccessCheck::subsumesIgnoringDomain(js::GetObjectCompartment(wrapScope),
                                                      js::GetObjectCompartment(obj)))
             {
                 return DoubleWrap(cx, obj, flags);
@@ -249,11 +250,11 @@ WrapperFactory::PrepareForWrapping(JSContext *cx, JSObject *scope, JSObject *obj
     // WrapNativeToJSVal.
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
 
-    // This public WrapNativeToJSVal API enters the compartment of 'scope'
+    // This public WrapNativeToJSVal API enters the compartment of 'wrapScope'
     // so we don't have to.
     RootedValue v(cx);
     nsresult rv =
-        nsXPConnect::FastGetXPConnect()->WrapNativeToJSVal(cx, scope, wn->Native(), nullptr,
+        nsXPConnect::FastGetXPConnect()->WrapNativeToJSVal(cx, wrapScope, wn->Native(), nullptr,
                                                            &NS_GET_IID(nsISupports), false,
                                                            v.address(), getter_AddRefs(holder));
     if (NS_SUCCEEDED(rv)) {
@@ -344,8 +345,8 @@ SelectWrapper(bool securityWrapper, bool wantXrays, XrayType xrayType,
 }
 
 JSObject *
-WrapperFactory::Rewrap(JSContext *cx, JSObject *existing, JSObject *obj,
-                       JSObject *wrappedProto, JSObject *parent,
+WrapperFactory::Rewrap(JSContext *cx, HandleObject existing, HandleObject obj,
+                       HandleObject wrappedProto, HandleObject parent,
                        unsigned flags)
 {
     MOZ_ASSERT(!IsWrapper(obj) ||
@@ -498,8 +499,9 @@ WrapperFactory::Rewrap(JSContext *cx, JSObject *existing, JSObject *obj,
 }
 
 JSObject *
-WrapperFactory::WrapForSameCompartment(JSContext *cx, JSObject *obj)
+WrapperFactory::WrapForSameCompartment(JSContext *cx, HandleObject objArg)
 {
+    RootedObject obj(cx, objArg);
     MOZ_ASSERT(js::IsObjectInContextCompartment(obj, cx));
 
     // NB: The contract of WrapForSameCompartment says that |obj| may or may not
@@ -511,7 +513,7 @@ WrapperFactory::WrapForSameCompartment(JSContext *cx, JSObject *obj)
     obj = JS_ObjectToOuterObject(cx, obj);
     NS_ENSURE_TRUE(obj, nullptr);
 
-    if (dom::GetSameCompartmentWrapperForDOMBinding(obj)) {
+    if (dom::GetSameCompartmentWrapperForDOMBinding(*obj.address())) {
         return obj;
     }
 
diff --git a/js/xpconnect/wrappers/WrapperFactory.h b/js/xpconnect/wrappers/WrapperFactory.h
index e17d98215ffe..c998a38b58c3 100644
--- a/js/xpconnect/wrappers/WrapperFactory.h
+++ b/js/xpconnect/wrappers/WrapperFactory.h
@@ -48,21 +48,21 @@ class WrapperFactory {
 
     // Prepare a given object for wrapping in a new compartment.
     static JSObject *PrepareForWrapping(JSContext *cx,
-                                        JSObject *scope,
-                                        JSObject *obj,
+                                        JS::HandleObject scope,
+                                        JS::HandleObject obj,
                                         unsigned flags);
 
     // Rewrap an object that is about to cross compartment boundaries.
     static JSObject *Rewrap(JSContext *cx,
-                            JSObject *existing,
-                            JSObject *obj,
-                            JSObject *wrappedProto,
-                            JSObject *parent,
+                            JS::HandleObject existing,
+                            JS::HandleObject obj,
+                            JS::HandleObject wrappedProto,
+                            JS::HandleObject parent,
                             unsigned flags);
 
     // Wrap an object for same-compartment access.
     static JSObject *WrapForSameCompartment(JSContext *cx,
-                                            JSObject *obj);
+                                            JS::HandleObject obj);
 
     // Wrap wrapped object into a waiver wrapper and then re-wrap it.
     static bool WaiveXrayAndWrap(JSContext *cx, jsval *vp);

From dfbe53629bdd568df3bd1d9fe287d08717c77e6a Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Tue, 9 Apr 2013 16:42:32 +0100
Subject: [PATCH 011/438] Bug 861912 - GC: Remove use of AUTO_MARK_JSVAL in
 XPConnect r=bholley

--HG--
extra : rebase_source : 5d279fe19c5dfc5812eaa2a241945c58a29dbe9d
---
 js/xpconnect/src/XPCConvert.cpp            | 28 ++++++++++------------
 js/xpconnect/src/XPCWrappedJSClass.cpp     | 14 +++--------
 js/xpconnect/src/XPCWrappedNative.cpp      |  5 +---
 js/xpconnect/src/XPCWrappedNativeJSOps.cpp |  3 ---
 js/xpconnect/src/nsXPConnect.cpp           |  1 -
 js/xpconnect/src/xpcprivate.h              | 28 ----------------------
 6 files changed, 17 insertions(+), 62 deletions(-)

diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp
index a201d126a3ec..2079193f75d7 100644
--- a/js/xpconnect/src/XPCConvert.cpp
+++ b/js/xpconnect/src/XPCConvert.cpp
@@ -29,6 +29,7 @@
 using namespace xpc;
 using namespace mozilla;
 using namespace mozilla::dom;
+using namespace JS;
 
 //#define STRICT_CHECK_OF_UNICODE
 #ifdef STRICT_CHECK_OF_UNICODE
@@ -169,7 +170,7 @@ XPCConvert::NativeData2JS(XPCLazyCallContext& lccx, jsval* d, const void* s,
                 nsID* iid2 = *((nsID**)s);
                 if (!iid2)
                     break;
-                JS::RootedObject scope(cx, lccx.GetScopeForNewJSObjects());
+                RootedObject scope(cx, lccx.GetScopeForNewJSObjects());
                 JSObject* obj;
                 if (!(obj = xpc_NewIDObject(cx, scope, *iid2)))
                     return false;
@@ -830,7 +831,7 @@ XPCConvert::NativeInterface2JSObject(XPCLazyCallContext& lccx,
     nsWrapperCache *cache = aHelper.GetWrapperCache();
 
     bool tryConstructSlimWrapper = false;
-    JS::RootedObject flat(cx);
+    RootedObject flat(cx);
     if (cache) {
         flat = cache->GetWrapper();
         if (cache->IsDOMBinding()) {
@@ -1153,7 +1154,7 @@ public:
 
 private:
     JSContext * const mContext;
-    JS::AutoValueRooter tvr;
+    AutoValueRooter tvr;
 };
 
 // static
@@ -1411,29 +1412,26 @@ XPCConvert::NativeArray2JS(XPCLazyCallContext& lccx,
 
     // XXX add support to indicate *which* array element was not convertable
 
-    JSObject *array = JS_NewArrayObject(cx, count, nullptr);
+    RootedObject array(cx, JS_NewArrayObject(cx, count, nullptr));
 
     if (!array)
         return false;
 
-    // root this early
     *d = OBJECT_TO_JSVAL(array);
-    AUTO_MARK_JSVAL(ccx, d);
 
     if (pErr)
         *pErr = NS_ERROR_XPC_BAD_CONVERT_NATIVE;
 
     uint32_t i;
-    jsval current = JSVAL_NULL;
-    AUTO_MARK_JSVAL(ccx, &current);
+    RootedValue current(cx, JSVAL_NULL);
 
-#define POPULATE(_t)                                                          \
-    PR_BEGIN_MACRO                                                            \
-        for (i = 0; i < count; i++) {                                         \
-            if (!NativeData2JS(ccx, &current, ((_t*)*s)+i, type, iid, pErr) ||\
-                !JS_SetElement(cx, array, i, &current))                       \
-                goto failure;                                                 \
-        }                                                                     \
+#define POPULATE(_t)                                                                    \
+    PR_BEGIN_MACRO                                                                      \
+        for (i = 0; i < count; i++) {                                                   \
+            if (!NativeData2JS(ccx, current.address(), ((_t*)*s)+i, type, iid, pErr) || \
+                !JS_SetElement(cx, array, i, current.address()))                        \
+                goto failure;                                                           \
+        }                                                                               \
     PR_END_MACRO
 
     // XXX check IsPtr - esp. to handle array of nsID (as opposed to nsID*)
diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
index d4a47e6cbe5f..def5886c3029 100644
--- a/js/xpconnect/src/XPCWrappedJSClass.cpp
+++ b/js/xpconnect/src/XPCWrappedJSClass.cpp
@@ -232,9 +232,6 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
     if (!JS_GetPropertyById(cx, jsobj, funid, fun.address()) || JSVAL_IS_PRIMITIVE(fun))
         return nullptr;
 
-    // protect fun so that we're sure it's alive when we call it
-    AUTO_MARK_JSVAL(cx, fun);
-
     // Ensure that we are asking for a scriptable interface.
     // NB:  It's important for security that this check is here rather
     // than later, since it prevents untrusted objects from implementing
@@ -271,7 +268,6 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
                          "JS failed without setting an exception!");
 
             RootedValue jsexception(cx, NullValue());
-            AUTO_MARK_JSVAL(cx, jsexception.address());
 
             if (JS_GetPendingException(cx, jsexception.address())) {
                 nsresult rv;
@@ -716,12 +712,9 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
     }
 
     // check if the JSObject claims to implement this interface
-    JSObject* jsobj = CallQueryInterfaceOnJSObject(ccx, self->GetJSObject(),
-                                                   aIID);
+    RootedObject jsobj(ccx, CallQueryInterfaceOnJSObject(ccx, self->GetJSObject(),
+                                                         aIID));
     if (jsobj) {
-        // protect jsobj until it is actually attached
-        AUTO_MARK_JSVAL(ccx, OBJECT_TO_JSVAL(jsobj));
-
         // We can't use XPConvert::JSObject2NativeInterface() here
         // since that can find a XPCWrappedNative directly on the
         // proto chain, and we don't want that here. We need to find
@@ -1291,8 +1284,7 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16_t methodIndex,
         nsXPTType datum_type;
         uint32_t array_count;
         bool isArray = type.IsArray();
-        RootedValue val(cx, JSVAL_NULL);
-        AUTO_MARK_JSVAL(ccx, val.address());
+        RootedValue val(cx, NullValue());
         bool isSizedString = isArray ?
                 false :
                 type.TagPart() == nsXPTType::T_PSTRING_SIZE_IS ||
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index dc72f426a50f..b518645259f9 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -503,9 +503,7 @@ XPCWrappedNative::GetNewOrUsed(XPCCallContext& ccx,
 
     RootedObject parent(ccx, Scope->GetGlobalJSObject());
 
-    jsval newParentVal = JSVAL_NULL;
-    XPCMarkableJSVal newParentVal_markable(&newParentVal);
-    AutoMarkingJSVal newParentVal_automarker(ccx, &newParentVal_markable);
+    RootedValue newParentVal(ccx, JSVAL_NULL);
     JSBool needsSOW = false;
     JSBool needsCOW = false;
 
@@ -2441,7 +2439,6 @@ CallMethodHelper::GatherAndConvertResults()
         const nsXPTType& type = paramInfo.GetType();
         nsXPTCVariant* dp = GetDispatchParam(i);
         RootedValue v(mCallContext, NullValue());
-        AUTO_MARK_JSVAL(mCallContext, v.address());
         uint32_t array_count = 0;
         nsXPTType datum_type;
         bool isArray = type.IsArray();
diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
index de781293e608..457cf19de90c 100644
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -424,9 +424,6 @@ DefinePropertyIfFound(XPCCallContext& ccx,
     if (!member->NewFunctionObject(ccx, iface, obj, funval.address()))
         return false;
 
-    // protect funobj until it is actually attached
-    AUTO_MARK_JSVAL(ccx, funval);
-
 #ifdef off_DEBUG_jband
     {
         static int cloneCount = 0;
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index e8e9ee71e9b3..d0aec76d00c8 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -1593,7 +1593,6 @@ nsXPConnect::CreateSandbox(JSContext *cx, nsIPrincipal *principal,
     *_retval = nullptr;
 
     RootedValue rval(cx, JSVAL_VOID);
-    AUTO_MARK_JSVAL(ccx, rval.address());
 
     SandboxOptions options(cx);
     nsresult rv = xpc_CreateSandboxObject(cx, rval.address(), principal, options);
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index bcc2d5532602..919f835904c1 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -3856,25 +3856,6 @@ private:
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
-/***************************************************************************/
-class XPCMarkableJSVal
-{
-public:
-    XPCMarkableJSVal(jsval val) : mVal(val), mValPtr(&mVal) {}
-    XPCMarkableJSVal(jsval *pval) : mVal(JSVAL_VOID), mValPtr(pval) {}
-    ~XPCMarkableJSVal() {}
-    void Mark() {}
-    void TraceJS(JSTracer* trc)
-    {
-        JS_CallValueTracer(trc, *mValPtr, "XPCMarkableJSVal");
-    }
-    void AutoTrace(JSTracer* trc) {}
-private:
-    XPCMarkableJSVal(); // not implemented
-    jsval  mVal;
-    jsval* mValPtr;
-};
-
 /***************************************************************************/
 // AutoMarkingPtr is the base class for the various AutoMarking pointer types
 // below. This system allows us to temporarily protect instances of our garbage
@@ -3954,7 +3935,6 @@ typedef TypedAutoMarkingPtr<XPCNativeSet> AutoMarkingNativeSetPtr;
 typedef TypedAutoMarkingPtr<XPCWrappedNative> AutoMarkingWrappedNativePtr;
 typedef TypedAutoMarkingPtr<XPCWrappedNativeTearOff> AutoMarkingWrappedNativeTearOffPtr;
 typedef TypedAutoMarkingPtr<XPCWrappedNativeProto> AutoMarkingWrappedNativeProtoPtr;
-typedef TypedAutoMarkingPtr<XPCMarkableJSVal> AutoMarkingJSVal;
 typedef TypedAutoMarkingPtr<XPCNativeScriptableInfo> AutoMarkingNativeScriptableInfoPtr;
 
 template<class T>
@@ -4007,14 +3987,6 @@ class ArrayAutoMarkingPtr : public AutoMarkingPtr
 
 typedef ArrayAutoMarkingPtr<XPCNativeInterface> AutoMarkingNativeInterfacePtrArrayPtr;
 
-#define AUTO_MARK_JSVAL_HELPER2(tok, line) tok##line
-#define AUTO_MARK_JSVAL_HELPER(tok, line) AUTO_MARK_JSVAL_HELPER2(tok, line)
-
-#define AUTO_MARK_JSVAL(cx, val)                                              \
-    XPCMarkableJSVal AUTO_MARK_JSVAL_HELPER(_val_,__LINE__)(val);             \
-    AutoMarkingJSVal AUTO_MARK_JSVAL_HELPER(_automarker_,__LINE__)            \
-    (cx, &AUTO_MARK_JSVAL_HELPER(_val_,__LINE__))
-
 /***************************************************************************/
 // Allocates a string that grants all access ("AllAccess")
 

From 7251a7a7f42d388e15d7239cf6481e60414dd5cb Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Tue, 16 Apr 2013 15:47:41 +0200
Subject: [PATCH 012/438] Bug 815905 - Dynamically open OpenSLES libary if
 available. r=jesup

---
 configure.in                                  | 15 -----
 .../android/audio_device_opensles_android.cc  | 61 +++++++++++++++----
 .../android/audio_device_opensles_android.h   |  9 +++
 3 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/configure.in b/configure.in
index da9746f4e9d9..965ae39e4545 100644
--- a/configure.in
+++ b/configure.in
@@ -5316,21 +5316,6 @@ if test -n "$MOZ_WEBRTC"; then
     MOZ_VP8_ENCODER=1
     MOZ_VP8_ERROR_CONCEALMENT=1
 
-    if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
-       dnl OpenSLES is only available in Android 2.3 and later; we'll change this
-       dnl hard dependency to a dynamic load with graceful runtime failure before
-       dnl we make --enable-webrtc on by default in Android (bug 815905)
-       dnl
-       if test "$OS_TARGET" = "Android"; then
-          LDFLAGS="$LDFLAGS -lOpenSLES"
-       fi
-       case "$target" in
-          *-android*|*-linuxandroid*)
-          LDFLAGS="$LDFLAGS -lOpenSLES"
-          ;;
-       esac
-    fi
-
 dnl enable once Signaling lands
     MOZ_WEBRTC_SIGNALING=1
     AC_DEFINE(MOZ_WEBRTC_SIGNALING)
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.cc
index e1f36846eb74..1b0e32f10399 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.cc
@@ -17,6 +17,7 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 #include <time.h>
+#include <dlfcn.h>
 
 #include "modules/audio_device/audio_device_utility.h"
 #include "system_wrappers/interface/event_wrapper.h"
@@ -70,7 +71,8 @@ AudioDeviceAndroidOpenSLES::AudioDeviceAndroidOpenSLES(const WebRtc_Word32 id)
       speaker_sampling_rate_(N_PLAY_SAMPLES_PER_SEC * 1000),
       max_speaker_vol_(0),
       min_speaker_vol_(0),
-      loundspeaker_on_(false) {
+      loundspeaker_on_(false),
+      opensles_lib_(0) {
   WEBRTC_OPENSL_TRACE(kTraceMemory, kTraceAudioDevice, id, "%s created",
                       __FUNCTION__);
   memset(rec_buf_, 0, sizeof(rec_buf_));
@@ -115,11 +117,46 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::Init() {
   if (is_initialized_)
     return 0;
 
+  /* Try to dynamically open the OpenSLES library */
+  opensles_lib_ = dlopen("libOpenSLES.so", RTLD_LAZY);
+  if (!opensles_lib_) {
+      WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
+                          "  failed to dlopen OpenSLES library");
+      return -1;
+  }
+
+  typedef SLresult (*slCreateEngine_t)(SLObjectItf *,
+                                       SLuint32,
+                                       const SLEngineOption *,
+                                       SLuint32,
+                                       const SLInterfaceID *,
+                                       const SLboolean *);
+  slCreateEngine_t f_slCreateEngine =
+    (slCreateEngine_t)dlsym(opensles_lib_, "slCreateEngine");
+  SL_IID_ENGINE_ = *(SLInterfaceID *)dlsym(opensles_lib_, "SL_IID_ENGINE");
+  SL_IID_BUFFERQUEUE_ = *(SLInterfaceID *)dlsym(opensles_lib_, "SL_IID_BUFFERQUEUE");
+  SL_IID_ANDROIDCONFIGURATION_ = *(SLInterfaceID *)dlsym(opensles_lib_, "SL_IID_ANDROIDCONFIGURATION");
+  SL_IID_PLAY_ = *(SLInterfaceID *)dlsym(opensles_lib_, "SL_IID_PLAY");
+  SL_IID_ANDROIDSIMPLEBUFFERQUEUE_ = *(SLInterfaceID *)dlsym(opensles_lib_, "SL_IID_ANDROIDSIMPLEBUFFERQUEUE");
+  SL_IID_RECORD_ = *(SLInterfaceID *)dlsym(opensles_lib_, "SL_IID_RECORD");
+
+  if (!f_slCreateEngine ||
+      !SL_IID_ENGINE_ ||
+      !SL_IID_BUFFERQUEUE_ ||
+      !SL_IID_ANDROIDCONFIGURATION_ ||
+      !SL_IID_PLAY_ ||
+      !SL_IID_ANDROIDSIMPLEBUFFERQUEUE_ ||
+      !SL_IID_RECORD_) {
+      WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
+                          "  failed to find OpenSLES function");
+      return -1;
+  }
+
   SLEngineOption EngineOption[] = {
     { SL_ENGINEOPTION_THREADSAFE, static_cast<SLuint32>(SL_BOOLEAN_TRUE) },
   };
-  WebRtc_Word32 res = slCreateEngine(&sles_engine_, 1, EngineOption, 0,
-                                     NULL, NULL);
+  WebRtc_Word32 res = f_slCreateEngine(&sles_engine_, 1, EngineOption, 0,
+                                       NULL, NULL);
 
   if (res != SL_RESULT_SUCCESS) {
     WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
@@ -137,7 +174,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::Init() {
 
   if ((*sles_engine_)->GetInterface(
           sles_engine_,
-          SL_IID_ENGINE,
+          SL_IID_ENGINE_,
           &sles_engine_itf_) != SL_RESULT_SUCCESS) {
     WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
                         "  failed to get SL Engine interface");
@@ -190,6 +227,8 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::Terminate() {
     sles_engine_itf_ = NULL;
   }
 
+  dlclose(opensles_lib_);
+
   is_initialized_ = false;
   return 0;
 }
@@ -285,7 +324,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::SetSpeakerVolume(
   if (sles_engine_itf_ == NULL) {
     if ((*sles_engine_)->GetInterface(
             sles_engine_,
-            SL_IID_ENGINE,
+            SL_IID_ENGINE_,
             &sles_engine_itf_) != SL_RESULT_SUCCESS) {
       WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
                           "  failed to GetInterface SL Engine Interface");
@@ -726,7 +765,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitPlayout() {
   locator_outputmix.outputMix = sles_output_mixer_;
 
   SLInterfaceID ids[N_MAX_INTERFACES] = {
-    SL_IID_BUFFERQUEUE, SL_IID_ANDROIDCONFIGURATION };
+    SL_IID_BUFFERQUEUE_, SL_IID_ANDROIDCONFIGURATION_ };
   SLboolean req[N_MAX_INTERFACES] = {
     SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE };
   res = (*sles_engine_itf_)->CreateAudioPlayer(sles_engine_itf_,
@@ -746,7 +785,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitPlayout() {
     return -1;
   }
   res = (*sles_player_)->GetInterface(
-      sles_player_, SL_IID_PLAY,
+      sles_player_, SL_IID_PLAY_,
       static_cast<void*>(&sles_player_itf_));
   if (res != SL_RESULT_SUCCESS) {
     WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
@@ -754,7 +793,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitPlayout() {
     return -1;
   }
   res = (*sles_player_)->GetInterface(
-      sles_player_, SL_IID_BUFFERQUEUE,
+      sles_player_, SL_IID_BUFFERQUEUE_,
       static_cast<void*>(&sles_player_sbq_itf_));
   if (res != SL_RESULT_SUCCESS) {
     WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
@@ -846,7 +885,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitRecording() {
   record_pcm_.endianness = SL_BYTEORDER_LITTLEENDIAN;
 
   const SLInterfaceID id[2] = {
-    SL_IID_ANDROIDSIMPLEBUFFERQUEUE, SL_IID_ANDROIDCONFIGURATION };
+    SL_IID_ANDROIDSIMPLEBUFFERQUEUE_, SL_IID_ANDROIDCONFIGURATION_ };
   const SLboolean req[2] = {
     SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE };
   WebRtc_Word32 res = -1;
@@ -873,7 +912,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitRecording() {
 
   // Get the RECORD interface - it is an implicit interface
   res = (*sles_recorder_)->GetInterface(
-      sles_recorder_, SL_IID_RECORD,
+      sles_recorder_, SL_IID_RECORD_,
       static_cast<void*>(&sles_recorder_itf_));
   if (res != SL_RESULT_SUCCESS) {
     WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
@@ -884,7 +923,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitRecording() {
   // Get the simpleBufferQueue interface
   res = (*sles_recorder_)->GetInterface(
       sles_recorder_,
-      SL_IID_ANDROIDSIMPLEBUFFERQUEUE,
+      SL_IID_ANDROIDSIMPLEBUFFERQUEUE_,
       static_cast<void*>(&sles_recorder_sbq_itf_));
   if (res != SL_RESULT_SUCCESS) {
     WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.h b/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.h
index eb1603b6c0fb..cc53727411ab 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.h
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.h
@@ -310,6 +310,15 @@ class AudioDeviceAndroidOpenSLES: public AudioDeviceGeneric {
   std::queue<WebRtc_Word8*> play_queue_;
   WebRtc_Word8 play_buf_[N_PLAY_QUEUE_BUFFERS][
       N_PLAY_CHANNELS * sizeof(int16_t) * PLAY_BUF_SIZE_IN_SAMPLES];
+
+  // dlopen for OpenSLES
+  void *opensles_lib_;
+  SLInterfaceID SL_IID_ENGINE_;
+  SLInterfaceID SL_IID_BUFFERQUEUE_;
+  SLInterfaceID SL_IID_ANDROIDCONFIGURATION_;
+  SLInterfaceID SL_IID_PLAY_;
+  SLInterfaceID SL_IID_ANDROIDSIMPLEBUFFERQUEUE_;
+  SLInterfaceID SL_IID_RECORD_;
 };
 
 }  // namespace webrtc

From 51b126dfa1f98838efd1f1fdfd6acbd7b70a5bfb Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Tue, 16 Apr 2013 15:47:41 +0200
Subject: [PATCH 013/438] Bug 815905 - Provide JNI as a fallback if OpenSLES
 opening fails. r=jesup

---
 .../android/audio_device_jni_android.h        | 17 +++---
 .../android/audio_device_opensles_android.h   | 60 +++++++++----------
 .../modules/audio_device/audio_device.gypi    | 17 ++----
 .../modules/audio_device/audio_device_impl.cc | 51 +++++++++-------
 4 files changed, 71 insertions(+), 74 deletions(-)

diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_jni_android.h b/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_jni_android.h
index b8186bea54e4..d7e713544612 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_jni_android.h
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_jni_android.h
@@ -24,15 +24,6 @@ namespace webrtc
 {
 class EventWrapper;
 
-const WebRtc_UWord32 N_REC_SAMPLES_PER_SEC = 16000; // Default is 16 kHz
-const WebRtc_UWord32 N_PLAY_SAMPLES_PER_SEC = 16000; // Default is 16 kHz
-
-const WebRtc_UWord32 N_REC_CHANNELS = 1; // default is mono recording
-const WebRtc_UWord32 N_PLAY_CHANNELS = 1; // default is mono playout
-
-const WebRtc_UWord32 REC_BUF_SIZE_IN_SAMPLES = 480; // Handle max 10 ms @ 48 kHz
-
-
 class ThreadWrapper;
 
 class AudioDeviceAndroidJni : public AudioDeviceGeneric {
@@ -159,6 +150,14 @@ class AudioDeviceAndroidJni : public AudioDeviceGeneric {
   virtual WebRtc_Word32 SetLoudspeakerStatus(bool enable);
   virtual WebRtc_Word32 GetLoudspeakerStatus(bool& enable) const;
 
+  static const WebRtc_UWord32 N_REC_SAMPLES_PER_SEC = 16000; // Default is 16 kHz
+  static const WebRtc_UWord32 N_PLAY_SAMPLES_PER_SEC = 16000; // Default is 16 kHz
+
+  static const WebRtc_UWord32 N_REC_CHANNELS = 1; // default is mono recording
+  static const WebRtc_UWord32 N_PLAY_CHANNELS = 1; // default is mono playout
+
+  static const WebRtc_UWord32 REC_BUF_SIZE_IN_SAMPLES = 480; // Handle max 10 ms @ 48 kHz
+
  private:
   // Lock
   void Lock() {
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.h b/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.h
index cc53727411ab..26f686b2f207 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.h
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/audio_device_opensles_android.h
@@ -28,36 +28,6 @@ namespace webrtc {
 
 class EventWrapper;
 
-const WebRtc_UWord32 N_MAX_INTERFACES = 3;
-const WebRtc_UWord32 N_MAX_OUTPUT_DEVICES = 6;
-const WebRtc_UWord32 N_MAX_INPUT_DEVICES = 3;
-
-const WebRtc_UWord32 N_REC_SAMPLES_PER_SEC = 16000;  // Default fs
-const WebRtc_UWord32 N_PLAY_SAMPLES_PER_SEC = 16000;  // Default fs
-
-const WebRtc_UWord32 N_REC_CHANNELS = 1;
-const WebRtc_UWord32 N_PLAY_CHANNELS = 1;
-
-const WebRtc_UWord32 REC_BUF_SIZE_IN_SAMPLES = 480;
-const WebRtc_UWord32 PLAY_BUF_SIZE_IN_SAMPLES = 480;
-
-const WebRtc_UWord32 REC_MAX_TEMP_BUF_SIZE_PER_10ms =
-    N_REC_CHANNELS * REC_BUF_SIZE_IN_SAMPLES * sizeof(int16_t);
-
-const WebRtc_UWord32 PLAY_MAX_TEMP_BUF_SIZE_PER_10ms =
-    N_PLAY_CHANNELS * PLAY_BUF_SIZE_IN_SAMPLES * sizeof(int16_t);
-
-// Number of the buffers in playout queue
-const WebRtc_UWord16 N_PLAY_QUEUE_BUFFERS = 8;
-// Number of buffers in recording queue
-// TODO(xian): Reduce the numbers of buffers to improve the latency.
-const WebRtc_UWord16 N_REC_QUEUE_BUFFERS = 16;
-// Some values returned from getMinBufferSize
-// (Nexus S playout  72ms, recording 64ms)
-// (Galaxy,         167ms,           44ms)
-// (Nexus 7,         72ms,           48ms)
-// (Xoom             92ms,           40ms)
-
 class ThreadWrapper;
 
 class AudioDeviceAndroidOpenSLES: public AudioDeviceGeneric {
@@ -211,6 +181,36 @@ class AudioDeviceAndroidOpenSLES: public AudioDeviceGeneric {
   virtual WebRtc_Word32 SetLoudspeakerStatus(bool enable);
   virtual WebRtc_Word32 GetLoudspeakerStatus(bool& enable) const;  // NOLINT
 
+  static const WebRtc_UWord32 N_MAX_INTERFACES = 3;
+  static const WebRtc_UWord32 N_MAX_OUTPUT_DEVICES = 6;
+  static const WebRtc_UWord32 N_MAX_INPUT_DEVICES = 3;
+
+  static const WebRtc_UWord32 N_REC_SAMPLES_PER_SEC = 16000;  // Default fs
+  static const WebRtc_UWord32 N_PLAY_SAMPLES_PER_SEC = 16000;  // Default fs
+
+  static const WebRtc_UWord32 N_REC_CHANNELS = 1;
+  static const WebRtc_UWord32 N_PLAY_CHANNELS = 1;
+
+  static const WebRtc_UWord32 REC_BUF_SIZE_IN_SAMPLES = 480;
+  static const WebRtc_UWord32 PLAY_BUF_SIZE_IN_SAMPLES = 480;
+
+  static const WebRtc_UWord32 REC_MAX_TEMP_BUF_SIZE_PER_10ms =
+      N_REC_CHANNELS * REC_BUF_SIZE_IN_SAMPLES * sizeof(int16_t);
+
+  static const WebRtc_UWord32 PLAY_MAX_TEMP_BUF_SIZE_PER_10ms =
+      N_PLAY_CHANNELS * PLAY_BUF_SIZE_IN_SAMPLES * sizeof(int16_t);
+
+  // Number of the buffers in playout queue
+  static const WebRtc_UWord16 N_PLAY_QUEUE_BUFFERS = 8;
+  // Number of buffers in recording queue
+  // TODO(xian): Reduce the numbers of buffers to improve the latency.
+  static const WebRtc_UWord16 N_REC_QUEUE_BUFFERS = 16;
+  // Some values returned from getMinBufferSize
+  // (Nexus S playout  72ms, recording 64ms)
+  // (Galaxy,         167ms,           44ms)
+  // (Nexus 7,         72ms,           48ms)
+  // (Xoom             92ms,           40ms)
+
  private:
   // Lock
   void Lock() {
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
index 640f732c3066..5923da799cf9 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
@@ -110,6 +110,10 @@
             'win/audio_mixer_manager_win.h',
             'android/audio_device_utility_android.cc',
             'android/audio_device_utility_android.h',
+            'android/audio_device_opensles_android.cc',
+            'android/audio_device_opensles_android.h',
+            'android/audio_device_jni_android.cc',
+            'android/audio_device_jni_android.h',
           ],
           'conditions': [
             ['OS=="android"', {
@@ -119,19 +123,6 @@
                   '-lOpenSLES',
                 ],
               },
-              'conditions': [
-                ['enable_android_opensl==1', {
-                  'sources': [
-                    'android/audio_device_opensles_android.cc',
-                    'android/audio_device_opensles_android.h',
-                  ],
-                }, {
-                  'sources': [
-                    'android/audio_device_jni_android.cc',
-                    'android/audio_device_jni_android.h',
-                  ],
-                }],
-              ],
             }],
             ['OS=="linux"', {
               'defines': [
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
index c7c87e66f3da..3f642bbaffba 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
@@ -24,8 +24,10 @@
  #endif
 #elif defined(WEBRTC_ANDROID_OPENSLES)
     #include <stdlib.h>
+    #include <dlfcn.h>
     #include "audio_device_utility_android.h"
     #include "audio_device_opensles_android.h"
+    #include "audio_device_jni_android.h"
 #elif defined(WEBRTC_ANDROID)
     #include <stdlib.h>
     #include "audio_device_utility_android.h"
@@ -259,12 +261,18 @@ WebRtc_Word32 AudioDeviceModuleImpl::CreatePlatformSpecificObjects()
     // Create the *Android OpenSLES* implementation of the Audio Device
     //
 #if defined(WEBRTC_ANDROID_OPENSLES)
-    if (audioLayer == kPlatformDefaultAudio)
-    {
-        // Create *Android OpenELSE Audio* implementation
-        ptrAudioDevice = new AudioDeviceAndroidOpenSLES(Id());
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
-                     "Android OpenSLES Audio APIs will be utilized");
+    // Check if the OpenSLES library is available before going further.
+    void* opensles_lib = dlopen("libOpenSLES.so", RTLD_LAZY);
+    if (opensles_lib) {
+        // That worked, close for now and proceed normally.
+        dlclose(opensles_lib);
+        if (audioLayer == kPlatformDefaultAudio)
+        {
+            // Create *Android OpenSLES Audio* implementation
+            ptrAudioDevice = new AudioDeviceAndroidOpenSLES(Id());
+            WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
+                         "Android OpenSLES Audio APIs will be utilized");
+        }
     }
 
     if (ptrAudioDevice != NULL)
@@ -272,25 +280,24 @@ WebRtc_Word32 AudioDeviceModuleImpl::CreatePlatformSpecificObjects()
         // Create the Android implementation of the Device Utility.
         ptrAudioDeviceUtility = new AudioDeviceUtilityAndroid(Id());
     }
-    // END #if defined(WEBRTC_ANDROID_OPENSLES)
+#elif defined(WEBRTC_ANDROID_OPENSLES) or defined(WEBRTC_ANDROID)
+    // Fall back to this case if on Android 2.2/OpenSLES not available.
+    if (ptrAudioDevice == NULL) {
+        // Create the *Android Java* implementation of the Audio Device
+        if (audioLayer == kPlatformDefaultAudio)
+        {
+            // Create *Android JNI Audio* implementation
+            ptrAudioDevice = new AudioDeviceAndroidJni(Id());
+            WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "Android JNI Audio APIs will be utilized");
+        }
 
-    // Create the *Android Java* implementation of the Audio Device
-    //
-#elif defined(WEBRTC_ANDROID)
-    if (audioLayer == kPlatformDefaultAudio)
-    {
-        // Create *Android JNI Audio* implementation
-        ptrAudioDevice = new AudioDeviceAndroidJni(Id());
-        WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "Android JNI Audio APIs will be utilized");
+        if (ptrAudioDevice != NULL)
+        {
+            // Create the Android implementation of the Device Utility.
+            ptrAudioDeviceUtility = new AudioDeviceUtilityAndroid(Id());
+        }
     }
 
-    if (ptrAudioDevice != NULL)
-    {
-        // Create the Android implementation of the Device Utility.
-        ptrAudioDeviceUtility = new AudioDeviceUtilityAndroid(Id());
-    }
-    // END #if defined(WEBRTC_ANDROID)
-
     // Create the *Linux* implementation of the Audio Device
     //
 #elif defined(WEBRTC_LINUX)

From 107dbb3b07dfb6598f9082e5e9b7e3dedc522243 Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Tue, 16 Apr 2013 15:47:41 +0200
Subject: [PATCH 014/438] Bug 861146 - Provide pthread_rwlock replacement for
 Android 2.2. r=jesup

---
 .../webrtc/trunk/webrtc/system_wrappers/source/rw_lock.cc  | 7 ++++++-
 .../webrtc/system_wrappers/source/system_wrappers.gyp      | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock.cc b/media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock.cc
index 8b76eb86147d..d409e7476598 100644
--- a/media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock.cc
+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock.cc
@@ -15,6 +15,8 @@
 #if defined(_WIN32)
 #include "webrtc/system_wrappers/source/rw_lock_generic.h"
 #include "webrtc/system_wrappers/source/rw_lock_win.h"
+#elif defined(ANDROID)
+#include "webrtc/system_wrappers/source/rw_lock_generic.h"
 #else
 #include "webrtc/system_wrappers/source/rw_lock_posix.h"
 #endif
@@ -22,13 +24,16 @@
 namespace webrtc {
 
 RWLockWrapper* RWLockWrapper::CreateRWLock() {
-#ifdef _WIN32
+#if defined(_WIN32)
   // Native implementation is faster, so use that if available.
   RWLockWrapper* lock = RWLockWin::Create();
   if (lock) {
     return lock;
   }
   return new RWLockGeneric();
+#elif defined(ANDROID)
+  // Android 2.2 and before do not have POSIX pthread rwlocks.
+  return new RWLockGeneric();
 #else
   return RWLockPosix::Create();
 #endif
diff --git a/media/webrtc/trunk/webrtc/system_wrappers/source/system_wrappers.gyp b/media/webrtc/trunk/webrtc/system_wrappers/source/system_wrappers.gyp
index 0aff7dfb3364..23664d4f0249 100644
--- a/media/webrtc/trunk/webrtc/system_wrappers/source/system_wrappers.gyp
+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/system_wrappers.gyp
@@ -138,6 +138,11 @@
         }],
         ['OS=="android" or moz_widget_toolkit_gonk==1', {
           'dependencies': [ 'cpu_features_android', ],
+          'sources!': [
+            # Android doesn't have these in <=2.2
+            'rw_lock_posix.cc',
+            'rw_lock_posix.h',
+          ],
         }],
         ['OS=="linux"', {
           'link_settings': {

From 9d6819b3922d45ccb77cacf1eb4ef335c2014085 Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Tue, 16 Apr 2013 15:47:41 +0200
Subject: [PATCH 015/438] Bug 861637 - Add workaround for missing clone
 function. r=blassey

---
 .../src/testing/gtest/include/gtest/internal/gtest-port.h   | 6 +++---
 .../trunk/testing/gtest/include/gtest/internal/gtest-port.h | 6 +++---
 testing/gtest/gtest/include/gtest/internal/gtest-port.h     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ipc/chromium/src/testing/gtest/include/gtest/internal/gtest-port.h b/ipc/chromium/src/testing/gtest/include/gtest/internal/gtest-port.h
index c3d34f6cf27d..a15f01f98d01 100644
--- a/ipc/chromium/src/testing/gtest/include/gtest/internal/gtest-port.h
+++ b/ipc/chromium/src/testing/gtest/include/gtest/internal/gtest-port.h
@@ -367,16 +367,16 @@
 
 // Determines whether clone(2) is supported.
 // Usually it will only be available on Linux, excluding
-// Linux on the Itanium architecture.
+// Linux on the Itanium architecture, and x86 Android.
 // Also see http://linux.die.net/man/2/clone.
 #ifndef GTEST_HAS_CLONE
 // The user didn't tell us, so we need to figure it out.
 
-#if GTEST_OS_LINUX && !defined(__ia64__)
+#if GTEST_OS_LINUX && !defined(__ia64__) && !(defined(ANDROID) && defined(__i386__))
 #define GTEST_HAS_CLONE 1
 #else
 #define GTEST_HAS_CLONE 0
-#endif  // GTEST_OS_LINUX && !defined(__ia64__)
+#endif  // GTEST_OS_LINUX && !defined(__ia64__) && !(defined(ANDROID) && defined(__i386__))
 
 #endif  // GTEST_HAS_CLONE
 
diff --git a/media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h b/media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h
index e5a455186d36..2432fd624339 100644
--- a/media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h
+++ b/media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h
@@ -572,16 +572,16 @@ using ::std::tuple_size;
 
 // Determines whether clone(2) is supported.
 // Usually it will only be available on Linux, excluding
-// Linux on the Itanium architecture.
+// Linux on the Itanium architecture, and x86 Android.
 // Also see http://linux.die.net/man/2/clone.
 #ifndef GTEST_HAS_CLONE
 // The user didn't tell us, so we need to figure it out.
 
-# if GTEST_OS_LINUX && !defined(__ia64__)
+# if GTEST_OS_LINUX && !defined(__ia64__) && !(defined(ANDROID) && defined(__i386__))
 #  define GTEST_HAS_CLONE 1
 # else
 #  define GTEST_HAS_CLONE 0
-# endif  // GTEST_OS_LINUX && !defined(__ia64__)
+# endif  // GTEST_OS_LINUX && !defined(__ia64__) && !(defined(ANDROID) && defined(__i386__))
 
 #endif  // GTEST_HAS_CLONE
 
diff --git a/testing/gtest/gtest/include/gtest/internal/gtest-port.h b/testing/gtest/gtest/include/gtest/internal/gtest-port.h
index 157b47f86a39..ba39a9c19304 100644
--- a/testing/gtest/gtest/include/gtest/internal/gtest-port.h
+++ b/testing/gtest/gtest/include/gtest/internal/gtest-port.h
@@ -509,16 +509,16 @@
 
 // Determines whether clone(2) is supported.
 // Usually it will only be available on Linux, excluding
-// Linux on the Itanium architecture.
+// Linux on the Itanium architecture, and x86 Android.
 // Also see http://linux.die.net/man/2/clone.
 #ifndef GTEST_HAS_CLONE
 // The user didn't tell us, so we need to figure it out.
 
-# if GTEST_OS_LINUX && !defined(__ia64__)
+# if GTEST_OS_LINUX && !defined(__ia64__) && !(defined(ANDROID) && defined(__i386__))
 #  define GTEST_HAS_CLONE 1
 # else
 #  define GTEST_HAS_CLONE 0
-# endif  // GTEST_OS_LINUX && !defined(__ia64__)
+# endif  // GTEST_OS_LINUX && !defined(__ia64__) && !(defined(ANDROID) && defined(__i386__))
 
 #endif  // GTEST_HAS_CLONE
 

From 2da9da464a6f676879f76593b24f66979d1f98a3 Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Tue, 16 Apr 2013 15:47:42 +0200
Subject: [PATCH 016/438] Bug 835716 - Enable building of WebRTC on Android by
 default. r=ted

---
 configure.in                 | 10 +---------
 mobile/android/app/mobile.js |  4 ++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 965ae39e4545..af24709aeb45 100644
--- a/configure.in
+++ b/configure.in
@@ -5255,15 +5255,7 @@ dnl --enable-webrtc to override.  Can disable for everything in
 dnl the master list above.
 if test -n "$MOZ_WEBRTC"; then
     case "$target" in
-    *-android*|*-linuxandroid*)
-        if test -n "$MOZ_B2G"; then
-            MOZ_WEBRTC=1
-        else
-            dnl Make sure doesn't get matched by *-linux*
-            MOZ_WEBRTC=
-        fi
-        ;;
-    *-linux*|*-mingw*|*-darwin*)
+    *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*)
         dnl Leave enabled
         ;;
     *)
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 2ee9b0c7297c..4a9b191960e2 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -705,3 +705,7 @@ pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed
 // Enable Web Audio for Firefox for Android in Nightly and Aurora
 pref("media.webaudio.enabled", true);
 #endif
+
+// This needs more tests and stability fixes first, as well as UI.
+pref("media.navigator.enabled", false);
+pref("media.peerconnection.enabled", false);

From 8b8c5084a549b5c56f480e7d06cd803792e9b3b7 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Tue, 16 Apr 2013 15:20:37 +0100
Subject: [PATCH 017/438] Bug 851782 - Dispatch an 'input' event when the
 'type' of an <input type=range> is changed while a user is dragging its
 thumb. r=smaug

---
 content/html/content/src/HTMLInputElement.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp
index 3cfc2e285ebd..70062b936465 100644
--- a/content/html/content/src/HTMLInputElement.cpp
+++ b/content/html/content/src/HTMLInputElement.cpp
@@ -7,6 +7,7 @@
 
 #include "mozilla/dom/HTMLInputElement.h"
 #include "mozilla/dom/HTMLInputElementBinding.h"
+#include "nsAsyncDOMEvent.h"
 #include "nsAttrValueInlines.h"
 
 #include "nsIDOMHTMLInputElement.h"
@@ -2715,6 +2716,7 @@ HTMLInputElement::CancelRangeThumbDrag(bool aIsForUserEvent)
 {
   MOZ_ASSERT(mIsDraggingRange);
 
+  mIsDraggingRange = false;
   if (nsIPresShell::GetCapturingContent() == this) {
     nsIPresShell::SetCapturingContent(nullptr, 0); // cancel capture
   }
@@ -2731,8 +2733,10 @@ HTMLInputElement::CancelRangeThumbDrag(bool aIsForUserEvent)
     if (frame) {
       frame->UpdateForValueChange();
     }
+    nsRefPtr<nsAsyncDOMEvent> event =
+      new nsAsyncDOMEvent(this, NS_LITERAL_STRING("input"), true, false);
+    event->RunDOMEventWhenSafe();
   }
-  mIsDraggingRange = false;
 }
 
 void

From c309d5712a84c8f516db60f00ac7400f1de5a568 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Tue, 16 Apr 2013 16:03:46 +0300
Subject: [PATCH 018/438] Bug 847596 - Paris binding for DeviceMotionEvent,
 r=peterv

--HG--
extra : rebase_source : 7cbf9ac11b81506a2ffe0a5c3a34ecb78fe54f5b
---
 content/events/src/nsDOMDeviceMotionEvent.cpp | 31 +++++++++++--
 content/events/src/nsDOMDeviceMotionEvent.h   | 39 +++++++++++++++-
 content/events/test/test_bug662678.html       | 45 ++++++++++++++-----
 dom/bindings/Bindings.conf                    |  6 +++
 dom/webidl/DeviceMotionEvent.webidl           | 26 +++++++++++
 dom/webidl/WebIDL.mk                          |  1 +
 6 files changed, 132 insertions(+), 16 deletions(-)
 create mode 100644 dom/webidl/DeviceMotionEvent.webidl

diff --git a/content/events/src/nsDOMDeviceMotionEvent.cpp b/content/events/src/nsDOMDeviceMotionEvent.cpp
index a2e8884fb690..4ab8645cd503 100644
--- a/content/events/src/nsDOMDeviceMotionEvent.cpp
+++ b/content/events/src/nsDOMDeviceMotionEvent.cpp
@@ -5,6 +5,9 @@
 #include "nsDOMClassInfoID.h"
 #include "nsDOMDeviceMotionEvent.h"
 
+using namespace mozilla;
+using namespace mozilla::dom;
+
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDOMDeviceMotionEvent, nsDOMEvent)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mAcceleration)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mAccelerationIncludingGravity)
@@ -46,12 +49,31 @@ nsDOMDeviceMotionEvent::InitDeviceMotionEvent(const nsAString & aEventTypeArg,
   return NS_OK;
 }
 
+void
+nsDOMDeviceMotionEvent::InitDeviceMotionEvent(const nsAString& aType,
+                                              bool aCanBubble,
+                                              bool aCancelable,
+                                              nsIDOMDeviceAcceleration* aAcceleration,
+                                              nsIDOMDeviceAcceleration* aAccelerationIncludingGravity,
+                                              nsIDOMDeviceRotationRate* aRotationRate,
+                                              double aInterval,
+                                              ErrorResult& aRv)
+{
+  aRv = InitDeviceMotionEvent(aType,
+                              aCanBubble,
+                              aCancelable,
+                              aAcceleration,
+                              aAccelerationIncludingGravity,
+                              aRotationRate,
+                              aInterval);
+}
+
 NS_IMETHODIMP
 nsDOMDeviceMotionEvent::GetAcceleration(nsIDOMDeviceAcceleration **aAcceleration)
 {
   NS_ENSURE_ARG_POINTER(aAcceleration);
 
-  NS_IF_ADDREF(*aAcceleration = mAcceleration);
+  NS_IF_ADDREF(*aAcceleration = GetAcceleration());
   return NS_OK;
 }
 
@@ -60,7 +82,8 @@ nsDOMDeviceMotionEvent::GetAccelerationIncludingGravity(nsIDOMDeviceAcceleration
 {
   NS_ENSURE_ARG_POINTER(aAccelerationIncludingGravity);
 
-  NS_IF_ADDREF(*aAccelerationIncludingGravity = mAccelerationIncludingGravity);
+  NS_IF_ADDREF(*aAccelerationIncludingGravity =
+               GetAccelerationIncludingGravity());
   return NS_OK;
 }
 
@@ -69,7 +92,7 @@ nsDOMDeviceMotionEvent::GetRotationRate(nsIDOMDeviceRotationRate **aRotationRate
 {
   NS_ENSURE_ARG_POINTER(aRotationRate);
 
-  NS_IF_ADDREF(*aRotationRate = mRotationRate);
+  NS_IF_ADDREF(*aRotationRate = GetRotationRate());
   return NS_OK;
 }
 
@@ -78,7 +101,7 @@ nsDOMDeviceMotionEvent::GetInterval(double *aInterval)
 {
   NS_ENSURE_ARG_POINTER(aInterval);
 
-  *aInterval = mInterval;
+  *aInterval = Interval();
   return NS_OK;
 }
 
diff --git a/content/events/src/nsDOMDeviceMotionEvent.h b/content/events/src/nsDOMDeviceMotionEvent.h
index 7aa4667c3313..d68e04e22366 100644
--- a/content/events/src/nsDOMDeviceMotionEvent.h
+++ b/content/events/src/nsDOMDeviceMotionEvent.h
@@ -8,6 +8,7 @@
 #include "nsIDOMDeviceMotionEvent.h"
 #include "nsDOMEvent.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/dom/DeviceMotionEventBinding.h"
 
 class nsDOMDeviceRotationRate MOZ_FINAL : public nsIDOMDeviceRotationRate
 {
@@ -47,7 +48,9 @@ public:
   nsDOMDeviceMotionEvent(mozilla::dom::EventTarget* aOwner,
                          nsPresContext* aPresContext, nsEvent* aEvent)
   : nsDOMEvent(aOwner, aPresContext, aEvent)
-  {}
+  {
+    SetIsDOMBinding();
+  }
 
   NS_DECL_ISUPPORTS_INHERITED
 
@@ -59,6 +62,40 @@ public:
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMDeviceMotionEvent, nsDOMEvent)
 
+  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope)
+  {
+    return mozilla::dom::DeviceMotionEventBinding::Wrap(aCx, aScope, this);
+  }
+
+  nsIDOMDeviceAcceleration* GetAcceleration()
+  {
+    return mAcceleration;
+  }
+
+  nsIDOMDeviceAcceleration* GetAccelerationIncludingGravity()
+  {
+    return mAccelerationIncludingGravity;
+  }
+
+  nsIDOMDeviceRotationRate* GetRotationRate()
+  {
+    return mRotationRate;
+  }
+
+  double Interval() const
+  {
+    return mInterval;
+  }
+
+  void InitDeviceMotionEvent(const nsAString& aType,
+                             bool aCanBubble,
+                             bool aCancelable,
+                             nsIDOMDeviceAcceleration* aAcceleration,
+                             nsIDOMDeviceAcceleration* aAccelerationIncludingGravity,
+                             nsIDOMDeviceRotationRate* aRotationRate,
+                             double aInterval,
+                             mozilla::ErrorResult& aRv);
+
   nsCOMPtr<nsIDOMDeviceAcceleration> mAcceleration;
   nsCOMPtr<nsIDOMDeviceAcceleration> mAccelerationIncludingGravity;
   nsCOMPtr<nsIDOMDeviceRotationRate> mRotationRate;
diff --git a/content/events/test/test_bug662678.html b/content/events/test/test_bug662678.html
index dfcf5dcf8452..9784e4998005 100644
--- a/content/events/test/test_bug662678.html
+++ b/content/events/test/test_bug662678.html
@@ -24,16 +24,39 @@ var checkMotion = function(event) {
   window.removeEventListener("devicemotion", checkMotion, true);
 
   is(event.acceleration.x, 1.5);
-  is(event.acceleration.y, 1.5);
-  is(event.acceleration.z, 1.5);
+  is(event.acceleration.y, 2.5);
+  is(event.acceleration.z, 3.5);
 
-  is(event.accelerationIncludingGravity.x, 1.5);
-  is(event.accelerationIncludingGravity.y, 1.5);
-  is(event.accelerationIncludingGravity.z, 1.5);
+  is(event.accelerationIncludingGravity.x, 4.5);
+  is(event.accelerationIncludingGravity.y, 5.5);
+  is(event.accelerationIncludingGravity.z, 6.5);
+
+  is(event.rotationRate.alpha, 7.5);
+  is(event.rotationRate.beta, 8.5);
+  is(event.rotationRate.gamma, 9.5);
+
+  var e = document.createEvent("DeviceMotionEvent");
+  e.initDeviceMotionEvent('devicemotion', true, true,
+                              null, null, null, 0);
+  is(e.acceleration, null);
+  is(e.accelerationIncludingGravity, null);
+  is(e.rotationRate, null);
+
+  e.initDeviceMotionEvent('devicemotion', true, true,
+                          {}, {}, {}, 0);
+
+  ok(isNaN(e.acceleration.x));
+  ok(isNaN(e.acceleration.y));
+  ok(isNaN(e.acceleration.z));
+
+  ok(isNaN(e.accelerationIncludingGravity.x));
+  ok(isNaN(e.accelerationIncludingGravity.y));
+  ok(isNaN(e.accelerationIncludingGravity.z));
+
+  ok(isNaN(e.rotationRate.alpha));
+  ok(isNaN(e.rotationRate.beta));
+  ok(isNaN(e.rotationRate.gamma));
 
-  is(event.rotationRate.alpha, 1.5);
-  is(event.rotationRate.beta, 1.5);
-  is(event.rotationRate.gamma, 1.5);
   SimpleTest.finish();
 };
 
@@ -44,9 +67,9 @@ ok(!!event, "Should have seen DeviceMotionEvent!");
 
 event = document.createEvent("DeviceMotionEvent");
 event.initDeviceMotionEvent('devicemotion', true, true, 
-                            {x:1.5,y:1.5,z:1.5},
-                            {x:1.5,y:1.5,z:1.5},
-                            {alpha:1.5,beta:1.5,gamma:1.5},
+                            {x:1.5,y:2.5,z:3.5},
+                            {x:4.5,y:5.5,z:6.5},
+                            {alpha:7.5,beta:8.5,gamma:9.5},
                             0);
 window.dispatchEvent(event);
 
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 2d3081bb3bc2..a7b2ae1a6d2d 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -229,6 +229,10 @@ DOMInterfaces = {
     'headerFile': 'mozilla/dom/DesktopNotification.h',
 },
 
+'DeviceMotionEvent': {
+    'nativeType': 'nsDOMDeviceMotionEvent',
+},
+
 'Document': [
 {
     'nativeType': 'nsIDocument',
@@ -1472,6 +1476,8 @@ addExternalIface('CanvasGradient', headerFile='nsIDOMCanvasRenderingContext2D.h'
 addExternalIface('CanvasPattern', headerFile='nsIDOMCanvasRenderingContext2D.h')
 addExternalIface('Counter')
 addExternalIface('CSSRule')
+addExternalIface('DeviceAcceleration', headerFile='nsIDOMDeviceMotionEvent.h', notflattened=True)
+addExternalIface('DeviceRotationRate', headerFile='nsIDOMDeviceMotionEvent.h', notflattened=True)
 addExternalIface('DOMError')
 addExternalIface('CSSRuleList')
 addExternalIface('DOMStringList')
diff --git a/dom/webidl/DeviceMotionEvent.webidl b/dom/webidl/DeviceMotionEvent.webidl
new file mode 100644
index 000000000000..a8bd4caf8aa5
--- /dev/null
+++ b/dom/webidl/DeviceMotionEvent.webidl
@@ -0,0 +1,26 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/.
+ */
+
+interface DeviceAcceleration;
+interface DeviceRotationRate;
+
+interface DeviceMotionEvent : Event
+{
+  [Throws]
+  void initDeviceMotionEvent(DOMString type,
+                             boolean canBubble,
+                             boolean cancelable,
+                             DeviceAcceleration? acceleration,
+                             DeviceAcceleration? accelerationIncludingGravity,
+                             DeviceRotationRate? rotationRate,
+                             double interval);
+
+  readonly attribute DeviceAcceleration? acceleration;
+  readonly attribute DeviceAcceleration? accelerationIncludingGravity;
+  readonly attribute DeviceRotationRate? rotationRate;
+  readonly attribute double interval;
+};
+
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index 785b44caf262..e3be80f1894f 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -46,6 +46,7 @@ webidl_files = \
   CSSValueList.webidl \
   DelayNode.webidl \
   DesktopNotification.webidl \
+  DeviceMotionEvent.webidl \
   Document.webidl \
   DocumentFragment.webidl \
   DocumentType.webidl \

From f4e6aab5268c73f81a9e5e3175def3d908ad2133 Mon Sep 17 00:00:00 2001
From: James Willcox <snorp@snorp.net>
Date: Fri, 29 Mar 2013 15:34:49 -0400
Subject: [PATCH 019/438] Bug 734691 - Add multi-thread support to profiler
 r=benwa

--HG--
extra : rebase_source : 71db00ee222713fd60ba42be14226b52535a4f1e
---
 dom/workers/RuntimeService.cpp     |   5 ++
 ipc/chromium/src/base/thread.cc    |   5 ++
 tools/profiler/BreakpadSampler.cpp |  15 +++--
 tools/profiler/GeckoProfiler.h     |   3 +
 tools/profiler/GeckoProfilerFunc.h |   4 ++
 tools/profiler/GeckoProfilerImpl.h |  13 ++++
 tools/profiler/ProfileEntry.cpp    |  10 ++-
 tools/profiler/ProfileEntry.h      |  11 +++-
 tools/profiler/TableTicker.cpp     |  54 ++++++++++------
 tools/profiler/TableTicker.h       |  62 ++++++++++++++++--
 tools/profiler/platform-linux.cc   | 100 +++++++++++++++++++++++------
 tools/profiler/platform-macos.cc   |  39 +++++++++--
 tools/profiler/platform-win32.cc   |  40 ++++++++++--
 tools/profiler/platform.cpp        |  31 ++++++++-
 tools/profiler/platform.h          |  66 ++++++++++++++++++-
 15 files changed, 395 insertions(+), 63 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 070f739dce2d..fdfd21a2f0f2 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -42,6 +42,8 @@
 #include "OSFileConstants.h"
 #include <algorithm>
 
+#include "GeckoProfiler.h"
+
 using namespace mozilla;
 using namespace mozilla::dom;
 
@@ -515,6 +517,8 @@ public:
       return NS_ERROR_FAILURE;
     }
 
+    profiler_register_thread("WebWorker");
+
     {
       JSAutoRequest ar(cx);
       workerPrivate->DoRunLoop(cx);
@@ -543,6 +547,7 @@ public:
     JS_DestroyRuntime(rt);
 
     workerPrivate->ScheduleDeletion(false);
+    profiler_unregister_thread();
     return NS_OK;
   }
 };
diff --git a/ipc/chromium/src/base/thread.cc b/ipc/chromium/src/base/thread.cc
index f447fbb201eb..31ec62832ec3 100644
--- a/ipc/chromium/src/base/thread.cc
+++ b/ipc/chromium/src/base/thread.cc
@@ -8,6 +8,7 @@
 #include "base/string_util.h"
 #include "base/thread_local.h"
 #include "base/waitable_event.h"
+#include "GeckoProfiler.h"
 
 namespace base {
 
@@ -136,6 +137,8 @@ void Thread::StopSoon() {
 }
 
 void Thread::ThreadMain() {
+  profiler_register_thread(name_.c_str());
+
   // The message loop for this thread.
   MessageLoop message_loop(startup_data_->options.message_loop_type);
 
@@ -161,6 +164,8 @@ void Thread::ThreadMain() {
   // Assert that MessageLoop::Quit was called by ThreadQuitTask.
   DCHECK(GetThreadWasQuitProperly());
 
+  profiler_unregister_thread();
+
   // We can't receive messages anymore.
   message_loop_ = NULL;
   thread_id_ = 0;
diff --git a/tools/profiler/BreakpadSampler.cpp b/tools/profiler/BreakpadSampler.cpp
index bc804e3627f5..d30a55b6ea2f 100644
--- a/tools/profiler/BreakpadSampler.cpp
+++ b/tools/profiler/BreakpadSampler.cpp
@@ -158,6 +158,13 @@ void genPseudoBacktraceEntries(/*MODIFIED*/UnwinderThreadBuffer* utb,
 // RUNS IN SIGHANDLER CONTEXT
 void BreakpadSampler::Tick(TickSample* sample)
 {
+  if (!sample->threadProfile) {
+    // Platform doesn't support multithread, so use the main thread profile we created
+    sample->threadProfile = GetPrimaryThreadProfile();
+  }
+
+  ThreadProfile& currThreadProfile = *sample->threadProfile;
+
   /* Get hold of an empty inter-thread buffer into which to park
      the ProfileEntries for this sample. */
   UnwinderThreadBuffer* utb = uwt__acquire_empty_buffer();
@@ -172,7 +179,7 @@ void BreakpadSampler::Tick(TickSample* sample)
      thread, and park them in |utb|. */
 
   // Marker(s) come before the sample
-  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
+  PseudoStack* stack = currThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
     utb__addEntry( utb, ProfileEntry('m', stack->getMarker(i)) );
   }
@@ -186,7 +193,7 @@ void BreakpadSampler::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      mPrimaryThreadProfile.erase();
+      currThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -293,9 +300,9 @@ void BreakpadSampler::Tick(TickSample* sample)
 #   else
 #     error "Unsupported platform"
 #   endif
-    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, ucV);
+    uwt__release_full_buffer(&currThreadProfile, utb, ucV);
   } else {
-    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, NULL);
+    uwt__release_full_buffer(&currThreadProfile, utb, NULL);
   }
 }
 
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 4c8e2b5452c8..9105f0470ecb 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -135,6 +135,9 @@ static inline void profiler_lock() {}
 // Re-enable the profiler and notify 'profiler-unlocked'.
 static inline void profiler_unlock() {}
 
+static inline void profiler_register_thread(const char* name) {}
+static inline void profiler_unregister_thread() {}
+
 #else
 
 #include "GeckoProfilerImpl.h"
diff --git a/tools/profiler/GeckoProfilerFunc.h b/tools/profiler/GeckoProfilerFunc.h
index 2c26d8eb8a92..41134bfb5ce7 100644
--- a/tools/profiler/GeckoProfilerFunc.h
+++ b/tools/profiler/GeckoProfilerFunc.h
@@ -57,6 +57,10 @@ void mozilla_sampler_lock();
 // Unlock the profiler, leaving it stopped and fires profiler-unlocked.
 void mozilla_sampler_unlock();
 
+// Register/unregister threads with the profiler
+bool mozilla_sampler_register_thread(const char* name);
+void mozilla_sampler_unregister_thread();
+
 /* Returns true if env var SPS_NEW is set to anything, else false. */
 extern bool sps_version2();
 
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index 917bd04173f7..65a60e2db615 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -140,6 +140,18 @@ void profiler_unlock()
   return mozilla_sampler_unlock();
 }
 
+static inline
+void profiler_register_thread(const char* name)
+{
+  mozilla_sampler_register_thread(name);
+}
+
+static inline
+void profiler_unregister_thread()
+{
+  mozilla_sampler_unregister_thread();
+}
+
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
@@ -154,6 +166,7 @@ void profiler_unlock()
 #define PROFILER_MAIN_THREAD_LABEL_PRINTF(name_space, info, ...)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla::SamplerStackFramePrintfRAII SAMPLER_APPEND_LINE_NUMBER(sampler_raii)(name_space "::" info, __LINE__, __VA_ARGS__)
 #define PROFILER_MAIN_THREAD_MARKER(info)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla_sampler_add_marker(info)
 
+
 /* FIXME/bug 789667: memory constraints wouldn't much of a problem for
  * this small a sample buffer size, except that serializing the
  * profile data is extremely, unnecessarily memory intensive. */
diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
index d8c74b748217..4435ebf4e9a2 100644
--- a/tools/profiler/ProfileEntry.cpp
+++ b/tools/profiler/ProfileEntry.cpp
@@ -134,19 +134,23 @@ std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
 
 #define DYNAMIC_MAX_STRING 512
 
-ThreadProfile::ThreadProfile(int aEntrySize, PseudoStack *aStack)
+ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread)
   : mWritePos(0)
   , mLastFlushPos(0)
   , mReadPos(0)
   , mEntrySize(aEntrySize)
   , mPseudoStack(aStack)
   , mMutex("ThreadProfile::mMutex")
+  , mName(strdup(aName))
+  , mThreadId(aThreadId)
+  , mIsMainThread(aIsMainThread)
 {
   mEntries = new ProfileEntry[mEntrySize];
 }
 
 ThreadProfile::~ThreadProfile()
 {
+  free(mName);
   delete[] mEntries;
 }
 
@@ -299,6 +303,10 @@ JSCustomObject* ThreadProfile::ToJSObject(JSContext *aCx)
 }
 
 void ThreadProfile::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile) {
+  // Thread meta data
+  b.DefineProperty(profile, "name", mName);
+  b.DefineProperty(profile, "tid", mThreadId);
+
   JSCustomArray *samples = b.CreateArray();
   b.DefineProperty(profile, "samples", samples);
 
diff --git a/tools/profiler/ProfileEntry.h b/tools/profiler/ProfileEntry.h
index 897abb23c6ea..a5483b59f887 100644
--- a/tools/profiler/ProfileEntry.h
+++ b/tools/profiler/ProfileEntry.h
@@ -6,6 +6,7 @@
 #ifndef MOZ_PROFILE_ENTRY_H
 #define MOZ_PROFILE_ENTRY_H
 
+#include <ostream>
 #include "GeckoProfilerImpl.h"
 #include "JSAObjectBuilder.h"
 #include "platform.h"
@@ -56,7 +57,7 @@ typedef void (*IterateTagsCallback)(const ProfileEntry& entry, const char* tagSt
 class ThreadProfile
 {
 public:
-  ThreadProfile(int aEntrySize, PseudoStack *aStack);
+  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread);
   ~ThreadProfile();
   void addTag(ProfileEntry aTag);
   void flush();
@@ -70,6 +71,11 @@ public:
   PseudoStack* GetPseudoStack();
   mozilla::Mutex* GetMutex();
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
+
+  bool IsMainThread() const { return mIsMainThread; }
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
 private:
   // Circular buffer 'Keep One Slot Open' implementation
   // for simplicity
@@ -80,6 +86,9 @@ private:
   int            mEntrySize;
   PseudoStack*   mPseudoStack;
   mozilla::Mutex mMutex;
+  char*          mName;
+  int            mThreadId;
+  bool           mIsMainThread;
 };
 
 std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index c31d9d94e4fa..14a3350b1318 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -173,16 +173,22 @@ void TableTicker::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile)
   JSCustomArray *threads = b.CreateArray();
   b.DefineProperty(profile, "threads", threads);
 
-  // For now we only have one thread
   SetPaused(true);
-  ThreadProfile* prof = GetPrimaryThreadProfile();
-  prof->GetMutex()->Lock();
-  JSCustomObject* threadSamples = b.CreateObject();
-  prof->BuildJSObject(b, threadSamples);
-  b.ArrayPush(threads, threadSamples);
-  prof->GetMutex()->Unlock();
+
+  {
+    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+    for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
+      MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
+
+      JSCustomObject* threadSamples = b.CreateObject();
+      sRegisteredThreads->at(i)->Profile()->BuildJSObject(b, threadSamples);
+      b.ArrayPush(threads, threadSamples);
+    }
+  }
+
   SetPaused(false);
-}
+} 
 
 // END SaveProfileTask et al
 ////////////////////////////////////////////////////////////////////////
@@ -383,10 +389,17 @@ void doSampleStackTrace(PseudoStack *aStack, ThreadProfile &aProfile, TickSample
 
 void TableTicker::Tick(TickSample* sample)
 {
+  if (!sample->threadProfile) {
+    // Platform doesn't support multithread, so use the main thread profile we created
+    sample->threadProfile = GetPrimaryThreadProfile();
+  }
+
+  ThreadProfile& currThreadProfile = *sample->threadProfile;
+
   // Marker(s) come before the sample
-  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
+  PseudoStack* stack = currThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
-    addDynamicTag(mPrimaryThreadProfile, 'm', stack->getMarker(i));
+    addDynamicTag(currThreadProfile, 'm', stack->getMarker(i));
   }
   stack->mQueueClearMarker = true;
 
@@ -398,7 +411,7 @@ void TableTicker::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      mPrimaryThreadProfile.erase();
+      currThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -414,29 +427,29 @@ void TableTicker::Tick(TickSample* sample)
 
 #if defined(USE_BACKTRACE) || defined(USE_NS_STACKWALK)
   if (mUseStackWalk) {
-    doNativeBacktrace(mPrimaryThreadProfile, sample);
+    doNativeBacktrace(currThreadProfile, sample);
   } else {
-    doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
+    doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
   }
 #else
-  doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
+  doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
 #endif
 
   if (recordSample)
-    mPrimaryThreadProfile.flush();
+    currThreadProfile.flush();
 
-  if (!sLastTracerEvent.IsNull() && sample) {
+  if (!sLastTracerEvent.IsNull() && sample && currThreadProfile.IsMainThread()) {
     TimeDuration delta = sample->timestamp - sLastTracerEvent;
-    mPrimaryThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
+    currThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
   }
 
   if (sample) {
     TimeDuration delta = sample->timestamp - mStartTime;
-    mPrimaryThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
+    currThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
   }
 
   if (sLastFrameNumber != sFrameNumber) {
-    mPrimaryThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
+    currThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
     sLastFrameNumber = sFrameNumber;
   }
 }
@@ -460,7 +473,8 @@ void mozilla_sampler_print_location1()
     return;
   }
 
-  ThreadProfile threadProfile(1000, stack);
+  ThreadProfile threadProfile("Temp", PROFILE_DEFAULT_ENTRY, stack,
+                              0, false);
   doSampleStackTrace(stack, threadProfile, NULL);
 
   threadProfile.flush();
diff --git a/tools/profiler/TableTicker.h b/tools/profiler/TableTicker.h
index 6b00d1e1c6d5..edb91195430d 100644
--- a/tools/profiler/TableTicker.h
+++ b/tools/profiler/TableTicker.h
@@ -5,6 +5,7 @@
 
 #include "platform.h"
 #include "ProfileEntry.h"
+#include "mozilla/Mutex.h"
 
 static bool
 hasFeature(const char** aFeatures, uint32_t aFeatureCount, const char* aFeature) {
@@ -27,8 +28,8 @@ class TableTicker: public Sampler {
  public:
   TableTicker(int aInterval, int aEntrySize, PseudoStack *aStack,
               const char** aFeatures, uint32_t aFeatureCount)
-    : Sampler(aInterval, true)
-    , mPrimaryThreadProfile(aEntrySize, aStack)
+    : Sampler(aInterval, true, aEntrySize)
+    , mPrimaryThreadProfile(nullptr)
     , mStartTime(TimeStamp::Now())
     , mSaveRequested(false)
   {
@@ -38,10 +39,47 @@ class TableTicker: public Sampler {
     mJankOnly = hasFeature(aFeatures, aFeatureCount, "jank");
     mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
     mAddLeafAddresses = hasFeature(aFeatures, aFeatureCount, "leaf");
-    mPrimaryThreadProfile.addTag(ProfileEntry('m', "Start"));
+
+    {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      // Create ThreadProfile for each registered thread
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        ThreadProfile* profile = new ThreadProfile(info->Name(),
+                                                   aEntrySize,
+                                                   info->Stack(),
+                                                   info->ThreadId(),
+                                                   info->IsMainThread());
+        profile->addTag(ProfileEntry('m', "Start"));
+
+        info->SetProfile(profile);
+      }
+
+      SetActiveSampler(this);
+    }
   }
 
-  ~TableTicker() { if (IsActive()) Stop(); }
+  ~TableTicker() {
+    if (IsActive())
+      Stop();
+
+    SetActiveSampler(nullptr);
+
+    // Destroy ThreadProfile for all threads
+    {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        ThreadProfile* profile = info->Profile();
+        if (profile) {
+          delete profile;
+          info->SetProfile(nullptr);
+        }
+      }
+    }
+  }
 
   virtual void SampleStack(TickSample* sample) {}
 
@@ -58,7 +96,19 @@ class TableTicker: public Sampler {
 
   ThreadProfile* GetPrimaryThreadProfile()
   {
-    return &mPrimaryThreadProfile;
+    if (!mPrimaryThreadProfile) {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        if (info->IsMainThread()) {
+          mPrimaryThreadProfile = info->Profile();
+          break;
+        }
+      }
+    }
+
+    return mPrimaryThreadProfile;
   }
 
   void ToStreamAsJSON(std::ostream& stream);
@@ -76,7 +126,7 @@ protected:
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
 
   // This represent the application's main thread (SAMPLER_INIT)
-  ThreadProfile mPrimaryThreadProfile;
+  ThreadProfile* mPrimaryThreadProfile;
   TimeStamp mStartTime;
   bool mSaveRequested;
   bool mAddLeafAddresses;
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index 0cc1c058156a..0b5915e88327 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -39,6 +39,7 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <stdlib.h>
+#include <sched.h>
 #ifdef ANDROID
 #include <android/log.h>
 #else
@@ -60,9 +61,13 @@
 #include <stdarg.h>
 #include "platform.h"
 #include "GeckoProfilerImpl.h"
+#include "mozilla/Mutex.h"
+#include "ProfileEntry.h"
+#include "nsThreadUtils.h"
 
 #include <string.h>
 #include <stdio.h>
+#include <list>
 
 #define SIGNAL_SAVE_PROFILE SIGUSR2
 
@@ -75,15 +80,14 @@ pid_t gettid()
 }
 #endif
 
-static Sampler* sActiveSampler = NULL;
-
-
 #ifdef ANDROID
 #include "android-signal-defs.h"
 #endif
 
+static ThreadProfile* sCurrentThreadProfile = NULL;
+
 static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context) {
-  sActiveSampler->RequestSave();
+  Sampler::GetActiveSampler()->RequestSave();
 }
 
 #ifdef ANDROID
@@ -94,7 +98,7 @@ static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context
 #define V8_HOST_ARCH_X64 1
 #endif
 static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
-  if (!sActiveSampler)
+  if (!Sampler::GetActiveSampler())
     return;
 
   TickSample sample_obj;
@@ -103,7 +107,7 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 
 #ifdef ENABLE_SPS_LEAF_DATA
   // If profiling, we extract the current pc and sp.
-  if (sActiveSampler->IsProfiling()) {
+  if (Sampler::GetActiveSampler()->IsProfiling()) {
     // Extracting the sample from the context is extremely machine dependent.
     ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
     mcontext_t& mcontext = ucontext->uc_mcontext;
@@ -138,14 +142,17 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 #endif
   }
 #endif
+  sample->threadProfile = sCurrentThreadProfile;
   sample->timestamp = mozilla::TimeStamp::Now();
 
-  sActiveSampler->Tick(sample);
+  Sampler::GetActiveSampler()->Tick(sample);
+
+  sCurrentThreadProfile = NULL;
 }
 
 #ifndef XP_MACOSX
-void tgkill(pid_t tgid, pid_t tid, int signalno) {
-  syscall(SYS_tgkill, tgid, tid, signalno);
+int tgkill(pid_t tgid, pid_t tid, int signalno) {
+  return syscall(SYS_tgkill, tgid, tid, signalno);
 }
 #endif
 
@@ -173,8 +180,33 @@ class Sampler::PlatformData : public Malloced {
 #ifdef XP_MACOSX
         pthread_kill(signal_receiver_, SIGPROF);
 #else
-        // Glibc doesn't provide a wrapper for tgkill(2).
-        tgkill(vm_tgid_, vm_tid_, SIGPROF);
+
+        std::vector<ThreadInfo*> threads = GetRegisteredThreads();
+
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // We use sCurrentThreadProfile the ThreadProfile for the
+          // thread we're profiling to the signal handler
+          sCurrentThreadProfile = info->Profile();
+
+          int threadId = info->ThreadId();
+          if (threadId == 0) {
+            threadId = vm_tid_;
+          }
+
+          if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
+            printf_stderr("profiler failed to signal tid=%d\n", threadId);
+#ifdef DEBUG
+            abort();
+#endif
+            continue;
+          }
+
+          // Wait for the signal handler to run before moving on to the next one
+          while (sCurrentThreadProfile)
+            sched_yield();
+        }
 #endif
       }
 
@@ -209,11 +241,12 @@ static void* SenderEntry(void* arg) {
 }
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false) {
+      active_(false),
+      entrySize_(entrySize) {
   data_ = new PlatformData(this);
 }
 
@@ -225,7 +258,6 @@ Sampler::~Sampler() {
 
 void Sampler::Start() {
   LOG("Sampler started");
-  if (sActiveSampler != NULL) return;
 
   // Request profiling signals.
   LOG("Request signal");
@@ -259,9 +291,6 @@ void Sampler::Start() {
     data_->signal_sender_launched_ = true;
   }
   LOG("Profiler thread started");
-
-  // Set this sampler as the active sampler.
-  sActiveSampler = this;
 }
 
 
@@ -281,9 +310,41 @@ void Sampler::Stop() {
     sigaction(SIGPROF, &data_->old_sigprof_signal_handler_, 0);
     data_->signal_handler_installed_ = false;
   }
+}
 
-  // This sampler is no longer the active sampler.
-  sActiveSampler = NULL;
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  ThreadInfo* info = new ThreadInfo(aName, gettid(), aIsMainThread, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       aIsMainThread));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  int id = gettid();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
 }
 
 #ifdef ANDROID
@@ -307,3 +368,4 @@ void OS::RegisterStartHandler()
   }
 }
 #endif
+
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index 99392cc7ed61..50945dc34fcd 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -28,6 +28,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include "nsThreadUtils.h"
+
 #include "platform.h"
 #include "UnwinderThread2.h"  /* uwt__register_thread_for_profiling */
 
@@ -199,8 +201,8 @@ class Sampler::PlatformData : public Malloced {
 class SamplerThread : public Thread {
  public:
   explicit SamplerThread(int interval)
-      : Thread("SamplerThread"),
-        interval_(interval) {}
+      : Thread("SamplerThread")
+      , interval_(interval) {}
 
   static void AddActiveSampler(Sampler* sampler) {
     ScopedLock lock(mutex_);
@@ -279,6 +281,7 @@ class SamplerThread : public Thread {
       sample->sp = reinterpret_cast<Address>(state.REGISTER_FIELD(sp));
       sample->fp = reinterpret_cast<Address>(state.REGISTER_FIELD(bp));
       sample->timestamp = mozilla::TimeStamp::Now();
+      sample->threadProfile = NULL;
       sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
@@ -302,12 +305,13 @@ Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : // isolate_(isolate),
       interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false) /*,
+      active_(false),
+      entrySize_(entrySize) /*,
       samples_taken_(0)*/ {
   data_ = new PlatformData;
 }
@@ -337,3 +341,30 @@ Sampler::GetProfiledThread(Sampler::PlatformData* aData)
 {
   return aData->profiled_pthread();
 }
+
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  if (!aIsMainThread)
+    return false;
+
+  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       true));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  // We only have the main thread currently and that will never be unregistered
+}
\ No newline at end of file
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index af68f4c52354..818b536b68f3 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -28,9 +28,10 @@
 
 #include <windows.h>
 #include <mmsystem.h>
-#include "platform.h"
 #include <process.h>
+#include "platform.h"
 
+#include "ProfileEntry.h"
 
 class Sampler::PlatformData : public Malloced {
  public:
@@ -67,9 +68,9 @@ Sampler::GetThreadHandle(Sampler::PlatformData* aData)
 class SamplerThread : public Thread {
  public:
   SamplerThread(int interval, Sampler* sampler)
-      : Thread("SamplerThread"),
-        interval_(interval),
-        sampler_(sampler) {}
+      : Thread("SamplerThread")
+      , interval_(interval)
+      , sampler_(sampler) {}
 
   static void StartSampler(Sampler* sampler) {
     if (instance_ == NULL) {
@@ -120,6 +121,7 @@ class SamplerThread : public Thread {
 
     // Grab the timestamp before pausing the thread, to avoid deadlocks.
     sample->timestamp = mozilla::TimeStamp::Now();
+    sample->threadProfile = NULL;
 
     static const DWORD kSuspendFailed = static_cast<DWORD>(-1);
     if (SuspendThread(profiled_thread) == kSuspendFailed)
@@ -155,11 +157,12 @@ class SamplerThread : public Thread {
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
       active_(false),
+      entrySize_(entrySize),
       data_(new PlatformData) {
 }
 
@@ -238,3 +241,30 @@ void Thread::Join() {
 void OS::Sleep(int milliseconds) {
   ::Sleep(milliseconds);
 }
+
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  if (!aIsMainThread)
+    return false;
+
+  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       true));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  // We only have the main thread currently and that will never be unregistered
+}
\ No newline at end of file
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 653b681dd17c..27bbeb6df5b0 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -18,6 +18,7 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "mozilla/Services.h"
+#include "nsThreadUtils.h"
 
 mozilla::ThreadLocal<PseudoStack *> tlsPseudoStack;
 mozilla::ThreadLocal<TableTicker *> tlsTicker;
@@ -35,7 +36,7 @@ int       sLastFrameNumber = 0;
 unsigned int sLastSampledEventGeneration = 0;
 
 /* a counter that's incremented everytime we get responsiveness event
- * note: it might also be worth tracking everytime we go around
+ * note: it might also be worth trackplaing everytime we go around
  * the event loop */
 unsigned int sCurrentEventGeneration = 0;
 /* we don't need to worry about overflow because we only treat the
@@ -43,6 +44,18 @@ unsigned int sCurrentEventGeneration = 0;
  * a problem if 2^32 events happen between samples that we need
  * to know are associated with different events */
 
+std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = new std::vector<ThreadInfo*>();
+mozilla::Mutex* Sampler::sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+
+Sampler* Sampler::sActiveSampler;
+
+ThreadInfo::~ThreadInfo() {
+  free(mName);
+
+  if (mProfile)
+    delete mProfile;
+}
+
 bool sps_version2()
 {
   static int version = 0; // Raced on, potentially
@@ -293,6 +306,8 @@ void mozilla_sampler_shutdown()
     uwt__deinit();
   }
 
+  Sampler::FreeRegisteredThreads();
+
   profiler_stop();
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
@@ -487,6 +502,20 @@ void mozilla_sampler_unlock()
     os->NotifyObservers(nullptr, "profiler-unlocked", nullptr);
 }
 
+bool mozilla_sampler_register_thread(const char* aName)
+{
+  PseudoStack* stack = new PseudoStack();
+  tlsPseudoStack.set(stack);
+
+  return Sampler::RegisterCurrentThread(aName, stack, false);
+}
+
+void mozilla_sampler_unregister_thread()
+{
+  Sampler::UnregisterCurrentThread();
+}
+
 // END externally visible functions
 ////////////////////////////////////////////////////////////////////////
 
+
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index 22bc75afbe87..8371927aa9d2 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -232,6 +232,9 @@ extern int     sUnwindStackScan;  /* max # of dubious frames allowed */
 // (if used for profiling) the program counter and stack pointer for
 // the thread that created it.
 
+class PseudoStack;
+class ThreadProfile;
+
 // TickSample captures the information collected for each sample.
 class TickSample {
  public:
@@ -255,16 +258,44 @@ class TickSample {
   Address function;  // The last called JS function.
   void*   context;   // The context from the signal handler, if available. On
                      // Win32 this may contain the windows thread context.
+  ThreadProfile* threadProfile;
   static const int kMaxFramesCount = 64;
-  Address stack[kMaxFramesCount];  // Call stack.
   int frames_count;  // Number of captured frames.
   mozilla::TimeStamp timestamp;
 };
 
+class ThreadInfo {
+ public:
+  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
+    : mName(strdup(aName))
+    , mThreadId(aThreadId)
+    , mIsMainThread(aIsMainThread)
+    , mPseudoStack(aPseudoStack)
+    , mProfile(NULL) {}
+
+  virtual ~ThreadInfo();
+
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
+  bool IsMainThread() const { return mIsMainThread; }
+  PseudoStack* Stack() const { return mPseudoStack; }
+  
+  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
+  ThreadProfile* Profile() const { return mProfile; }
+
+ private:
+  char* mName;
+  int mThreadId;
+  const bool mIsMainThread;
+  PseudoStack* mPseudoStack;
+  ThreadProfile* mProfile;
+};
+
 class Sampler {
  public:
   // Initialize sampler.
-  explicit Sampler(int interval, bool profiling);
+  explicit Sampler(int interval, bool profiling, int entrySize);
   virtual ~Sampler();
 
   int interval() const { return interval_; }
@@ -295,6 +326,8 @@ class Sampler {
   bool IsPaused() const { return paused_; }
   void SetPaused(bool value) { NoBarrier_Store(&paused_, value); }
 
+  int EntrySize() { return entrySize_; }
+
   class PlatformData;
 
   PlatformData* platform_data() { return data_; }
@@ -308,6 +341,34 @@ class Sampler {
 #ifdef XP_MACOSX
   static pthread_t GetProfiledThread(PlatformData*);
 #endif
+
+  static std::vector<ThreadInfo*> GetRegisteredThreads() {
+    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+    return *sRegisteredThreads;
+  }
+
+  static bool RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread);
+  static void UnregisterCurrentThread();
+
+  // Should only be called on shutdown
+  static void FreeRegisteredThreads() {
+    while (sRegisteredThreads->size() > 0) {
+      sRegisteredThreads->pop_back();
+    }
+
+    delete sRegisteredThreadsMutex;
+    delete sRegisteredThreads;
+  }
+
+  static Sampler* GetActiveSampler() { return sActiveSampler; }
+  static void SetActiveSampler(Sampler* sampler) { sActiveSampler = sampler; }
+
+ protected:
+  static std::vector<ThreadInfo*>* sRegisteredThreads;
+  static mozilla::Mutex* sRegisteredThreadsMutex;
+  static Sampler* sActiveSampler;
+
  private:
   void SetActive(bool value) { NoBarrier_Store(&active_, value); }
 
@@ -315,6 +376,7 @@ class Sampler {
   const bool profiling_;
   Atomic32 paused_;
   Atomic32 active_;
+  const int entrySize_;
   PlatformData* data_;  // Platform specific data.
 };
 

From df81c2521e4c9b3986e3c59bbd0cd45df298038c Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Wed, 3 Apr 2013 18:59:17 -0400
Subject: [PATCH 020/438] Bug 734691 - Port multi-thread support to win/mac.
 r=snorp,smaug

--HG--
extra : rebase_source : 41af95bcc4b6044b7394538e2524528f67cbd1d5
---
 dom/workers/RuntimeService.cpp     |  16 ++-
 tools/profiler/GeckoProfiler.h     |   4 +
 tools/profiler/GeckoProfilerImpl.h |  11 ++
 tools/profiler/Makefile.in         |   3 +
 tools/profiler/ProfileEntry.cpp    |   6 +-
 tools/profiler/ProfileEntry.h      |   7 +-
 tools/profiler/PseudoStack.h       |   4 +
 tools/profiler/TableTicker.cpp     |  15 +--
 tools/profiler/TableTicker.h       |  18 ++-
 tools/profiler/platform-linux.cc   | 198 +++++++++++++++--------------
 tools/profiler/platform-macos.cc   | 121 +++++++++++-------
 tools/profiler/platform-win32.cc   | 109 ++++++++++------
 tools/profiler/platform.cpp        |  73 ++++++++---
 tools/profiler/platform.h          | 124 ++++++++++--------
 14 files changed, 436 insertions(+), 273 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index fdfd21a2f0f2..c5744cae3ea2 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -265,6 +265,10 @@ JSBool
 OperationCallback(JSContext* aCx)
 {
   WorkerPrivate* worker = GetWorkerPrivateFromContext(aCx);
+
+  // Now is a good time to turn on profiling if it's pending.
+  profiler_js_operation_callback();
+
   return worker->OperationCallback(aCx);
 }
 
@@ -517,15 +521,19 @@ public:
       return NS_ERROR_FAILURE;
     }
 
+    JSRuntime* rt = JS_GetRuntime(cx);
+
     profiler_register_thread("WebWorker");
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    if (PseudoStack* stack = mozilla_get_pseudo_stack())
+      stack->sampleRuntime(rt);
+#endif
 
     {
       JSAutoRequest ar(cx);
       workerPrivate->DoRunLoop(cx);
     }
 
-    JSRuntime* rt = JS_GetRuntime(cx);
-
     // XXX Bug 666963 - CTypes can create another JSContext for use with
     // closures, and then it holds that context in a reserved slot on the CType
     // prototype object. We have to destroy that context before we can destroy
@@ -544,6 +552,10 @@ public:
       JS_DestroyContext(cx);
     }
 
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    if (PseudoStack* stack = mozilla_get_pseudo_stack())
+      stack->sampleRuntime(nullptr);
+#endif
     JS_DestroyRuntime(rt);
 
     workerPrivate->ScheduleDeletion(false);
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 9105f0470ecb..9c2507a71dad 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -138,6 +138,10 @@ static inline void profiler_unlock() {}
 static inline void profiler_register_thread(const char* name) {}
 static inline void profiler_unregister_thread() {}
 
+// Call by the JSRuntime's operation callback. This is used to enable
+// profiling on auxilerary threads.
+static inline void profiler_js_operation_callback() {}
+
 #else
 
 #include "GeckoProfilerImpl.h"
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index 65a60e2db615..b5c20626c610 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -152,6 +152,17 @@ void profiler_unregister_thread()
   mozilla_sampler_unregister_thread();
 }
 
+static inline
+void profiler_js_operation_callback()
+{
+  PseudoStack *stack = tlsPseudoStack.get();
+  if (!stack) {
+    return;
+  }
+
+  stack->jsOperationCallback();
+}
+
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index eb62fbd25143..98bcadcffde8 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -43,6 +43,9 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
+# Uncomment for better debugging in opt builds
+#MOZ_OPTIMIZE_FLAGS += -O0 -g
+
 CPPSRCS		= \
   platform.cpp \
   nsProfilerFactory.cpp \
diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
index 4435ebf4e9a2..d3608cace5fc 100644
--- a/tools/profiler/ProfileEntry.cpp
+++ b/tools/profiler/ProfileEntry.cpp
@@ -134,7 +134,10 @@ std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
 
 #define DYNAMIC_MAX_STRING 512
 
-ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread)
+ThreadProfile::ThreadProfile(const char* aName, int aEntrySize,
+                             PseudoStack *aStack, int aThreadId,
+                             PlatformData* aPlatform,
+                             bool aIsMainThread)
   : mWritePos(0)
   , mLastFlushPos(0)
   , mReadPos(0)
@@ -144,6 +147,7 @@ ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aSt
   , mName(strdup(aName))
   , mThreadId(aThreadId)
   , mIsMainThread(aIsMainThread)
+  , mPlatformData(aPlatform)
 {
   mEntries = new ProfileEntry[mEntrySize];
 }
diff --git a/tools/profiler/ProfileEntry.h b/tools/profiler/ProfileEntry.h
index a5483b59f887..378dc42481c2 100644
--- a/tools/profiler/ProfileEntry.h
+++ b/tools/profiler/ProfileEntry.h
@@ -12,7 +12,6 @@
 #include "platform.h"
 #include "mozilla/Mutex.h"
 
-class ThreadProfile;
 class ThreadProfile;
 
 class ProfileEntry
@@ -57,7 +56,9 @@ typedef void (*IterateTagsCallback)(const ProfileEntry& entry, const char* tagSt
 class ThreadProfile
 {
 public:
-  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread);
+  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack,
+                int aThreadId, PlatformData* aPlatformData,
+                bool aIsMainThread);
   ~ThreadProfile();
   void addTag(ProfileEntry aTag);
   void flush();
@@ -76,6 +77,7 @@ public:
   const char* Name() const { return mName; }
   int ThreadId() const { return mThreadId; }
 
+  PlatformData* GetPlatformData() { return mPlatformData; }
 private:
   // Circular buffer 'Keep One Slot Open' implementation
   // for simplicity
@@ -89,6 +91,7 @@ private:
   char*          mName;
   int            mThreadId;
   bool           mIsMainThread;
+  PlatformData*  mPlatformData;  // Platform specific data.
 };
 
 std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
diff --git a/tools/profiler/PseudoStack.h b/tools/profiler/PseudoStack.h
index 9079ffbfc3a8..b12bb226dae5 100644
--- a/tools/profiler/PseudoStack.h
+++ b/tools/profiler/PseudoStack.h
@@ -220,6 +220,10 @@ public:
       mStartJSSampling = true;
     }
   }
+  void jsOperationCallback() {
+    if (mStartJSSampling)
+      enableJSSampling();
+  }
   void disableJSSampling() {
     mStartJSSampling = false;
     if (mRuntime)
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index 14a3350b1318..349f7e794338 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -179,6 +179,10 @@ void TableTicker::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile)
     mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
 
     for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
+      // Thread not being profiled, skip it
+      if (!sRegisteredThreads->at(i)->Profile())
+        continue;
+
       MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
 
       JSCustomObject* threadSamples = b.CreateObject();
@@ -291,7 +295,7 @@ void StackWalkCallback(void* aPC, void* aSP, void* aClosure)
 void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample)
 {
 #ifndef XP_MACOSX
-  uintptr_t thread = GetThreadHandle(platform_data());
+  uintptr_t thread = GetThreadHandle(aSample->threadProfile->GetPlatformData());
   MOZ_ASSERT(thread);
 #endif
   void* pc_array[1000];
@@ -308,7 +312,7 @@ void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample
 
   uint32_t maxFrames = uint32_t(array.size - array.count);
 #ifdef XP_MACOSX
-  pthread_t pt = GetProfiledThread(platform_data());
+  pthread_t pt = GetProfiledThread(aSample->threadProfile->GetPlatformData());
   void *stackEnd = reinterpret_cast<void*>(-1);
   if (pt)
     stackEnd = static_cast<char*>(pthread_get_stackaddr_np(pt));
@@ -389,11 +393,6 @@ void doSampleStackTrace(PseudoStack *aStack, ThreadProfile &aProfile, TickSample
 
 void TableTicker::Tick(TickSample* sample)
 {
-  if (!sample->threadProfile) {
-    // Platform doesn't support multithread, so use the main thread profile we created
-    sample->threadProfile = GetPrimaryThreadProfile();
-  }
-
   ThreadProfile& currThreadProfile = *sample->threadProfile;
 
   // Marker(s) come before the sample
@@ -474,7 +473,7 @@ void mozilla_sampler_print_location1()
   }
 
   ThreadProfile threadProfile("Temp", PROFILE_DEFAULT_ENTRY, stack,
-                              0, false);
+                              0, Sampler::AllocPlatformData(0), false);
   doSampleStackTrace(stack, threadProfile, NULL);
 
   threadProfile.flush();
diff --git a/tools/profiler/TableTicker.h b/tools/profiler/TableTicker.h
index edb91195430d..1af75f19ef60 100644
--- a/tools/profiler/TableTicker.h
+++ b/tools/profiler/TableTicker.h
@@ -26,7 +26,7 @@ class BreakpadSampler;
 
 class TableTicker: public Sampler {
  public:
-  TableTicker(int aInterval, int aEntrySize, PseudoStack *aStack,
+  TableTicker(int aInterval, int aEntrySize,
               const char** aFeatures, uint32_t aFeatureCount)
     : Sampler(aInterval, true, aEntrySize)
     , mPrimaryThreadProfile(nullptr)
@@ -38,6 +38,7 @@ class TableTicker: public Sampler {
     //XXX: It's probably worth splitting the jank profiler out from the regular profiler at some point
     mJankOnly = hasFeature(aFeatures, aFeatureCount, "jank");
     mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
+    mProfileThreads = hasFeature(aFeatures, aFeatureCount, "threads");
     mAddLeafAddresses = hasFeature(aFeatures, aFeatureCount, "leaf");
 
     {
@@ -46,10 +47,15 @@ class TableTicker: public Sampler {
       // Create ThreadProfile for each registered thread
       for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
         ThreadInfo* info = sRegisteredThreads->at(i);
+
+        if (!info->IsMainThread() && !mProfileThreads)
+          continue;
+
         ThreadProfile* profile = new ThreadProfile(info->Name(),
                                                    aEntrySize,
                                                    info->Stack(),
                                                    info->ThreadId(),
+                                                   info->GetPlatformData(),
                                                    info->IsMainThread());
         profile->addTag(ProfileEntry('m', "Start"));
 
@@ -81,8 +87,6 @@ class TableTicker: public Sampler {
     }
   }
 
-  virtual void SampleStack(TickSample* sample) {}
-
   // Called within a signal. This function must be reentrant
   virtual void Tick(TickSample* sample);
 
@@ -115,7 +119,8 @@ class TableTicker: public Sampler {
   virtual JSObject *ToJSObject(JSContext *aCx);
   JSCustomObject *GetMetaJSCustomObject(JSAObjectBuilder& b);
 
-  const bool ProfileJS() { return mProfileJS; }
+  bool ProfileJS() const { return mProfileJS; }
+  bool ProfileThreads() const { return mProfileThreads; }
 
   virtual BreakpadSampler* AsBreakpadSampler() { return nullptr; }
 
@@ -133,13 +138,14 @@ protected:
   bool mUseStackWalk;
   bool mJankOnly;
   bool mProfileJS;
+  bool mProfileThreads;
 };
 
 class BreakpadSampler: public TableTicker {
  public:
-  BreakpadSampler(int aInterval, int aEntrySize, PseudoStack *aStack,
+  BreakpadSampler(int aInterval, int aEntrySize,
               const char** aFeatures, uint32_t aFeatureCount)
-    : TableTicker(aInterval, aEntrySize, aStack, aFeatures, aFeatureCount)
+    : TableTicker(aInterval, aEntrySize, aFeatures, aFeatureCount)
   {}
 
   // Called within a signal. This function must be reentrant
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index 0b5915e88327..68b127f3480e 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -64,6 +64,7 @@
 #include "mozilla/Mutex.h"
 #include "ProfileEntry.h"
 #include "nsThreadUtils.h"
+#include "TableTicker.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -84,6 +85,19 @@ pid_t gettid()
 #include "android-signal-defs.h"
 #endif
 
+struct SamplerRegistry {
+  static void AddActiveSampler(Sampler *sampler) {
+    ASSERT(!SamplerRegistry::sampler);
+    SamplerRegistry::sampler = sampler;
+  }
+  static void RemoveActiveSampler(Sampler *sampler) {
+    SamplerRegistry::sampler = NULL;
+  }
+  static Sampler *sampler;
+};
+
+Sampler *SamplerRegistry::sampler = NULL;
+
 static ThreadProfile* sCurrentThreadProfile = NULL;
 
 static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context) {
@@ -150,93 +164,75 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
   sCurrentThreadProfile = NULL;
 }
 
-#ifndef XP_MACOSX
 int tgkill(pid_t tgid, pid_t tid, int signalno) {
   return syscall(SYS_tgkill, tgid, tid, signalno);
 }
-#endif
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
-  explicit PlatformData(Sampler* sampler)
-      : sampler_(sampler),
-        signal_handler_installed_(false),
-        vm_tgid_(getpid()),
-#ifndef XP_MACOSX
-        vm_tid_(gettid()),
-#endif
-        signal_sender_launched_(false)
-#ifdef XP_MACOSX
-        , signal_receiver_(pthread_self())
-#endif
+  PlatformData()
   {
   }
-
-  void SignalSender() {
-    while (sampler_->IsActive()) {
-      sampler_->HandleSaveRequest();
-
-      if (!sampler_->IsPaused()) {
-#ifdef XP_MACOSX
-        pthread_kill(signal_receiver_, SIGPROF);
-#else
-
-        std::vector<ThreadInfo*> threads = GetRegisteredThreads();
-
-        for (uint32_t i = 0; i < threads.size(); i++) {
-          ThreadInfo* info = threads[i];
-
-          // We use sCurrentThreadProfile the ThreadProfile for the
-          // thread we're profiling to the signal handler
-          sCurrentThreadProfile = info->Profile();
-
-          int threadId = info->ThreadId();
-          if (threadId == 0) {
-            threadId = vm_tid_;
-          }
-
-          if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
-            printf_stderr("profiler failed to signal tid=%d\n", threadId);
-#ifdef DEBUG
-            abort();
-#endif
-            continue;
-          }
-
-          // Wait for the signal handler to run before moving on to the next one
-          while (sCurrentThreadProfile)
-            sched_yield();
-        }
-#endif
-      }
-
-      // Convert ms to us and subtract 100 us to compensate delays
-      // occuring during signal delivery.
-      // TODO measure and confirm this.
-      const useconds_t interval = sampler_->interval_ * 1000 - 100;
-      //int result = usleep(interval);
-      usleep(interval);
-    }
-  }
-
-  Sampler* sampler_;
-  bool signal_handler_installed_;
-  struct sigaction old_sigprof_signal_handler_;
-  struct sigaction old_sigsave_signal_handler_;
-  pid_t vm_tgid_;
-  pid_t vm_tid_;
-  bool signal_sender_launched_;
-  pthread_t signal_sender_thread_;
-#ifdef XP_MACOSX
-  pthread_t signal_receiver_;
-#endif
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData;
+}
 
-static void* SenderEntry(void* arg) {
-  Sampler::PlatformData* data =
-      reinterpret_cast<Sampler::PlatformData*>(arg);
-  data->SignalSender();
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
+
+static void* SignalSender(void* arg) {
+  int vm_tgid_ = getpid();
+
+  while (SamplerRegistry::sampler->IsActive()) {
+    SamplerRegistry::sampler->HandleSaveRequest();
+
+    if (!SamplerRegistry::sampler->IsPaused()) {
+      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+      std::vector<ThreadInfo*> threads =
+        SamplerRegistry::sampler->GetRegisteredThreads();
+
+      for (uint32_t i = 0; i < threads.size(); i++) {
+        ThreadInfo* info = threads[i];
+
+        // This will be null if we're not interested in profiling this thread.
+        if (!info->Profile())
+          continue;
+
+        // We use sCurrentThreadProfile the ThreadProfile for the
+        // thread we're profiling to the signal handler
+        sCurrentThreadProfile = info->Profile();
+
+        int threadId = info->ThreadId();
+
+        if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
+          printf_stderr("profiler failed to signal tid=%d\n", threadId);
+#ifdef DEBUG
+          abort();
+#endif
+          continue;
+        }
+
+        // Wait for the signal handler to run before moving on to the next one
+        while (sCurrentThreadProfile)
+          sched_yield();
+      }
+    }
+
+    // Convert ms to us and subtract 100 us to compensate delays
+    // occuring during signal delivery.
+    // TODO measure and confirm this.
+    const useconds_t interval =
+      SamplerRegistry::sampler->interval() * 1000 - 100;
+    //int result = usleep(interval);
+    usleep(interval);
+  }
   return 0;
 }
 
@@ -247,25 +243,25 @@ Sampler::Sampler(int interval, bool profiling, int entrySize)
       paused_(false),
       active_(false),
       entrySize_(entrySize) {
-  data_ = new PlatformData(this);
 }
 
 Sampler::~Sampler() {
-  ASSERT(!data_->signal_sender_launched_);
-  delete data_;
+  ASSERT(!signal_sender_launched_);
 }
 
 
 void Sampler::Start() {
   LOG("Sampler started");
 
+  SamplerRegistry::AddActiveSampler(this);
+
   // Request profiling signals.
   LOG("Request signal");
   struct sigaction sa;
   sa.sa_sigaction = ProfilerSignalHandler;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGPROF, &sa, &data_->old_sigprof_signal_handler_) != 0) {
+  if (sigaction(SIGPROF, &sa, &old_sigprof_signal_handler_) != 0) {
     LOG("Error installing signal");
     return;
   }
@@ -275,20 +271,20 @@ void Sampler::Start() {
   sa2.sa_sigaction = ProfilerSaveSignalHandler;
   sigemptyset(&sa2.sa_mask);
   sa2.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &data_->old_sigsave_signal_handler_) != 0) {
+  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &old_sigsave_signal_handler_) != 0) {
     LOG("Error installing start signal");
     return;
   }
   LOG("Signal installed");
-  data_->signal_handler_installed_ = true;
+  signal_handler_installed_ = true;
 
   // Start a thread that sends SIGPROF signal to VM thread.
   // Sending the signal ourselves instead of relying on itimer provides
   // much better accuracy.
   SetActive(true);
   if (pthread_create(
-          &data_->signal_sender_thread_, NULL, SenderEntry, data_) == 0) {
-    data_->signal_sender_launched_ = true;
+          &signal_sender_thread_, NULL, SignalSender, NULL) == 0) {
+    signal_sender_launched_ = true;
   }
   LOG("Profiler thread started");
 }
@@ -299,32 +295,42 @@ void Sampler::Stop() {
 
   // Wait for signal sender termination (it will exit after setting
   // active_ to false).
-  if (data_->signal_sender_launched_) {
-    pthread_join(data_->signal_sender_thread_, NULL);
-    data_->signal_sender_launched_ = false;
+  if (signal_sender_launched_) {
+    pthread_join(signal_sender_thread_, NULL);
+    signal_sender_launched_ = false;
   }
 
+  SamplerRegistry::RemoveActiveSampler(this);
+
   // Restore old signal handler
-  if (data_->signal_handler_installed_) {
-    sigaction(SIGNAL_SAVE_PROFILE, &data_->old_sigsave_signal_handler_, 0);
-    sigaction(SIGPROF, &data_->old_sigprof_signal_handler_, 0);
-    data_->signal_handler_installed_ = false;
+  if (signal_handler_installed_) {
+    sigaction(SIGNAL_SAVE_PROFILE, &old_sigsave_signal_handler_, 0);
+    sigaction(SIGPROF, &old_sigprof_signal_handler_, 0);
+    signal_handler_installed_ = false;
   }
 }
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  ThreadInfo* info = new ThreadInfo(aName, gettid(), aIsMainThread, aPseudoStack);
+  ThreadInfo* info = new ThreadInfo(aName, gettid(),
+    aIsMainThread, aPseudoStack);
 
-  if (sActiveSampler) {
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
+
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
                                        info->ThreadId(),
+                                       info->GetPlatformData(),
                                        aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -333,7 +339,7 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = gettid();
 
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index 50945dc34fcd..ac338808da1a 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -31,6 +31,7 @@
 #include "nsThreadUtils.h"
 
 #include "platform.h"
+#include "TableTicker.h"
 #include "UnwinderThread2.h"  /* uwt__register_thread_for_profiling */
 
 // this port is based off of v8 svn revision 9837
@@ -91,21 +92,13 @@ void OS::Sleep(int milliseconds) {
   usleep(1000 * milliseconds);
 }
 
-class Thread::PlatformData : public Malloced {
- public:
-  PlatformData() : thread_(kNoThread) {}
-  pthread_t thread_;  // Thread handle for pthread.
-};
-
 Thread::Thread(const char* name)
-    : data_(new PlatformData),
-      stack_size_(0) {
+    : stack_size_(0) {
   set_name(name);
 }
 
 
 Thread::~Thread() {
-  delete data_;
 }
 
 
@@ -141,9 +134,9 @@ static void* ThreadEntry(void* arg) {
   }
   // END temp hack for SPS v1-vs-v2
 
-  thread->data()->thread_ = pthread_self();
+  thread->thread_ = pthread_self();
   SetThreadName(thread->name());
-  ASSERT(thread->data()->thread_ != kNoThread);
+  ASSERT(thread->thread_ != kNoThread);
   thread->Run();
   return NULL;
 }
@@ -163,15 +156,15 @@ void Thread::Start() {
     pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_));
     attr_ptr = &attr;
   }
-  pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this);
-  ASSERT(data_->thread_ != kNoThread);
+  pthread_create(&thread_, attr_ptr, ThreadEntry, this);
+  ASSERT(thread_ != kNoThread);
 }
 
 void Thread::Join() {
-  pthread_join(data_->thread_, NULL);
+  pthread_join(thread_, NULL);
 }
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
   PlatformData() : profiled_thread_(mach_thread_self())
   {
@@ -197,6 +190,17 @@ class Sampler::PlatformData : public Malloced {
   pthread_t profiled_pthread_;
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData;
+}
+
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
 
 class SamplerThread : public Thread {
  public:
@@ -205,7 +209,7 @@ class SamplerThread : public Thread {
       , interval_(interval) {}
 
   static void AddActiveSampler(Sampler* sampler) {
-    ScopedLock lock(mutex_);
+    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
     SamplerRegistry::AddActiveSampler(sampler);
     if (instance_ == NULL) {
       instance_ = new SamplerThread(sampler->interval());
@@ -216,37 +220,45 @@ class SamplerThread : public Thread {
   }
 
   static void RemoveActiveSampler(Sampler* sampler) {
-    ScopedLock lock(mutex_);
+    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
     instance_->Join();
     //XXX: unlike v8 we need to remove the active sampler after doing the Join
     // because we drop the sampler immediately
     SamplerRegistry::RemoveActiveSampler(sampler);
     delete instance_;
     instance_ = NULL;
-    /*
-    if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) {
-      RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_);
-      delete instance_;
-      instance_ = NULL;
-    }
-    */
   }
 
   // Implement Thread::Run().
   virtual void Run() {
     while (SamplerRegistry::sampler->IsActive()) {
-      if (!SamplerRegistry::sampler->IsPaused())
-        SampleContext(SamplerRegistry::sampler);
+      {
+        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+        std::vector<ThreadInfo*> threads =
+          SamplerRegistry::sampler->GetRegisteredThreads();
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // This will be null if we're not interested in profiling this thread.
+          if (!info->Profile())
+            continue;
+
+          ThreadProfile* thread_profile = info->Profile();
+
+          if (!SamplerRegistry::sampler->IsPaused())
+            SampleContext(SamplerRegistry::sampler, thread_profile);
+        }
+      }
       OS::Sleep(interval_);
     }
   }
 
-  void SampleContext(Sampler* sampler) {
-    thread_act_t profiled_thread = sampler->platform_data()->profiled_thread();
+  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
+    thread_act_t profiled_thread =
+      thread_profile->GetPlatformData()->profiled_thread();
+
     TickSample sample_obj;
     TickSample* sample = &sample_obj;
-    //TickSample* sample = CpuProfiler::TickSampleEvent(sampler->isolate());
-    //if (sample == NULL) sample = &sample_obj;
 
     if (KERN_SUCCESS != thread_suspend(profiled_thread)) return;
 
@@ -276,13 +288,11 @@ class SamplerThread : public Thread {
                          flavor,
                          reinterpret_cast<natural_t*>(&state),
                          &count) == KERN_SUCCESS) {
-      //sample->state = sampler->isolate()->current_vm_state();
       sample->pc = reinterpret_cast<Address>(state.REGISTER_FIELD(ip));
       sample->sp = reinterpret_cast<Address>(state.REGISTER_FIELD(sp));
       sample->fp = reinterpret_cast<Address>(state.REGISTER_FIELD(bp));
       sample->timestamp = mozilla::TimeStamp::Now();
-      sample->threadProfile = NULL;
-      sampler->SampleStack(sample);
+      sample->threadProfile = thread_profile;
       sampler->Tick(sample);
     }
     thread_resume(profiled_thread);
@@ -300,11 +310,8 @@ class SamplerThread : public Thread {
 
 #undef REGISTER_FIELD
 
-
-Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
-
 Sampler::Sampler(int interval, bool profiling, int entrySize)
     : // isolate_(isolate),
       interval_(interval),
@@ -313,13 +320,11 @@ Sampler::Sampler(int interval, bool profiling, int entrySize)
       active_(false),
       entrySize_(entrySize) /*,
       samples_taken_(0)*/ {
-  data_ = new PlatformData;
 }
 
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
-  delete data_;
 }
 
 
@@ -337,27 +342,38 @@ void Sampler::Stop() {
 }
 
 pthread_t
-Sampler::GetProfiledThread(Sampler::PlatformData* aData)
+Sampler::GetProfiledThread(PlatformData* aData)
 {
   return aData->profiled_pthread();
 }
 
+#include <sys/syscall.h>
+pid_t gettid()
+{
+  return (pid_t) syscall(SYS_thread_selfid);
+}
+
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  if (!aIsMainThread)
-    return false;
+  ThreadInfo* info = new ThreadInfo(aName, gettid(),
+    aIsMainThread, aPseudoStack);
 
-  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
 
-  if (sActiveSampler) {
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
                                        info->ThreadId(),
-                                       true));
+                                       info->GetPlatformData(),
+                                       aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -366,5 +382,16 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  // We only have the main thread currently and that will never be unregistered
-}
\ No newline at end of file
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+
+  int id = gettid();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
+}
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index 818b536b68f3..c63fc32cccba 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -30,21 +30,21 @@
 #include <mmsystem.h>
 #include <process.h>
 #include "platform.h"
-
+#include "TableTicker.h"
 #include "ProfileEntry.h"
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
   // Get a handle to the calling thread. This is the thread that we are
   // going to profile. We need to make a copy of the handle because we are
   // going to use it in the sampler thread. Using GetThreadHandle() will
   // not work in this case. We're using OpenThread because DuplicateHandle
   // for some reason doesn't work in Chrome's sandbox.
-  PlatformData() : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
+  PlatformData(int aThreadId) : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
                                                THREAD_SUSPEND_RESUME |
                                                THREAD_QUERY_INFORMATION,
                                                false,
-                                               GetCurrentThreadId())) {}
+                                               aThreadId)) {}
 
   ~PlatformData() {
     if (profiled_thread_ != NULL) {
@@ -59,8 +59,20 @@ class Sampler::PlatformData : public Malloced {
   HANDLE profiled_thread_;
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData(aThreadId);
+}
+
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
+
 uintptr_t
-Sampler::GetThreadHandle(Sampler::PlatformData* aData)
+Sampler::GetThreadHandle(PlatformData* aData)
 {
   return (uintptr_t) aData->profiled_thread();
 }
@@ -97,8 +109,24 @@ class SamplerThread : public Thread {
         ::timeBeginPeriod(interval_);
 
     while (sampler_->IsActive()) {
-      if (!sampler_->IsPaused())
-        SampleContext(sampler_);
+      {
+        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+        std::vector<ThreadInfo*> threads =
+          sampler_->GetRegisteredThreads();
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // This will be null if we're not interested in profiling this thread.
+          if (!info->Profile())
+            continue;
+
+          ThreadProfile* thread_profile = info->Profile();
+
+          if (!sampler_->IsPaused()) {
+            SampleContext(sampler_, thread_profile);
+          }
+        }
+      }
       OS::Sleep(interval_);
     }
 
@@ -107,8 +135,10 @@ class SamplerThread : public Thread {
         ::timeEndPeriod(interval_);
   }
 
-  void SampleContext(Sampler* sampler) {
-    HANDLE profiled_thread = sampler->platform_data()->profiled_thread();
+  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
+    uintptr_t thread = Sampler::GetThreadHandle(
+                               thread_profile->GetPlatformData());
+    HANDLE profiled_thread = reinterpret_cast<HANDLE>(thread);
     if (profiled_thread == NULL)
       return;
 
@@ -121,7 +151,7 @@ class SamplerThread : public Thread {
 
     // Grab the timestamp before pausing the thread, to avoid deadlocks.
     sample->timestamp = mozilla::TimeStamp::Now();
-    sample->threadProfile = NULL;
+    sample->threadProfile = thread_profile;
 
     static const DWORD kSuspendFailed = static_cast<DWORD>(-1);
     if (SuspendThread(profiled_thread) == kSuspendFailed)
@@ -139,7 +169,6 @@ class SamplerThread : public Thread {
       sample->fp = reinterpret_cast<Address>(context.Ebp);
 #endif
       sample->context = &context;
-      sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
     ResumeThread(profiled_thread);
@@ -162,13 +191,11 @@ Sampler::Sampler(int interval, bool profiling, int entrySize)
       profiling_(profiling),
       paused_(false),
       active_(false),
-      entrySize_(entrySize),
-      data_(new PlatformData) {
+      entrySize_(entrySize) {
 }
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
-  delete data_;
 }
 
 void Sampler::Start() {
@@ -192,18 +219,11 @@ static unsigned int __stdcall ThreadEntry(void* arg) {
   return 0;
 }
 
-class Thread::PlatformData : public Malloced {
- public:
-  explicit PlatformData(HANDLE thread) : thread_(thread) {}
-  HANDLE thread_;
-  unsigned thread_id_;
-};
-
 // Initialize a Win32 thread object. The thread has an invalid thread
 // handle until it is started.
 Thread::Thread(const char* name)
     : stack_size_(0) {
-  data_ = new PlatformData(kNoThread);
+  thread_ = kNoThread;
   set_name(name);
 }
 
@@ -214,27 +234,26 @@ void Thread::set_name(const char* name) {
 
 // Close our own handle for the thread.
 Thread::~Thread() {
-  if (data_->thread_ != kNoThread) CloseHandle(data_->thread_);
-  delete data_;
+  if (thread_ != kNoThread) CloseHandle(thread_);
 }
 
 // Create a new thread. It is important to use _beginthreadex() instead of
 // the Win32 function CreateThread(), because the CreateThread() does not
 // initialize thread specific structures in the C runtime library.
 void Thread::Start() {
-  data_->thread_ = reinterpret_cast<HANDLE>(
+  thread_ = reinterpret_cast<HANDLE>(
       _beginthreadex(NULL,
                      static_cast<unsigned>(stack_size_),
                      ThreadEntry,
                      this,
                      0,
-                     &data_->thread_id_));
+                     &thread_id_));
 }
 
 // Wait for thread to terminate.
 void Thread::Join() {
-  if (data_->thread_id_ != GetCurrentThreadId()) {
-    WaitForSingleObject(data_->thread_, INFINITE);
+  if (thread_id_ != GetCurrentThreadId()) {
+    WaitForSingleObject(thread_, INFINITE);
   }
 }
 
@@ -244,20 +263,25 @@ void OS::Sleep(int milliseconds) {
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  if (!aIsMainThread)
-    return false;
+  ThreadInfo* info = new ThreadInfo(aName, GetCurrentThreadId(),
+    aIsMainThread, aPseudoStack);
 
-  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
 
-  if (sActiveSampler) {
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
-                                       info->ThreadId(),
-                                       true));
+                                       GetCurrentThreadId(),
+                                       info->GetPlatformData(),
+                                       aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -266,5 +290,16 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  // We only have the main thread currently and that will never be unregistered
-}
\ No newline at end of file
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+
+  int id = GetCurrentThreadId();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
+}
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 27bbeb6df5b0..80a317365be2 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -28,9 +28,10 @@ mozilla::ThreadLocal<TableTicker *> tlsTicker;
 // it as the flag itself.
 bool stack_key_initialized;
 
-TimeStamp sLastTracerEvent; // is raced on
-int       sFrameNumber = 0;
-int       sLastFrameNumber = 0;
+TimeStamp   sLastTracerEvent; // is raced on
+int         sFrameNumber = 0;
+int         sLastFrameNumber = 0;
+static bool sIsProfiling = false; // is raced on
 
 /* used to keep track of the last event that we sampled during */
 unsigned int sLastSampledEventGeneration = 0;
@@ -44,16 +45,33 @@ unsigned int sCurrentEventGeneration = 0;
  * a problem if 2^32 events happen between samples that we need
  * to know are associated with different events */
 
-std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = new std::vector<ThreadInfo*>();
-mozilla::Mutex* Sampler::sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = nullptr;
+mozilla::Mutex* Sampler::sRegisteredThreadsMutex = nullptr;
 
-Sampler* Sampler::sActiveSampler;
+TableTicker* Sampler::sActiveSampler;
+
+void Sampler::Startup() {
+  sRegisteredThreads = new std::vector<ThreadInfo*>();
+  sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+}
+
+void Sampler::Shutdown() {
+  while (sRegisteredThreads->size() > 0) {
+    delete sRegisteredThreads->back();
+    sRegisteredThreads->pop_back();
+  }
+
+  delete sRegisteredThreadsMutex;
+  delete sRegisteredThreads;
+}
 
 ThreadInfo::~ThreadInfo() {
   free(mName);
 
   if (mProfile)
     delete mProfile;
+
+  Sampler::FreePlatformData(mPlatformData);
 }
 
 bool sps_version2()
@@ -235,9 +253,13 @@ void mozilla_sampler_init()
   }
   stack_key_initialized = true;
 
+  Sampler::Startup();
+
   PseudoStack *stack = new PseudoStack();
   tlsPseudoStack.set(stack);
 
+  Sampler::RegisterCurrentThread("Gecko", stack, true);
+
   if (sps_version2()) {
     // Read mode settings from MOZ_PROFILER_MODE and interval
     // settings from MOZ_PROFILER_INTERVAL and stack-scan threshhold
@@ -306,9 +328,10 @@ void mozilla_sampler_shutdown()
     uwt__deinit();
   }
 
-  Sampler::FreeRegisteredThreads();
-
   profiler_stop();
+
+  Sampler::Shutdown();
+
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
   // TODO Need to find a safe time to delete Stack
@@ -367,6 +390,7 @@ const char** mozilla_sampler_get_features()
 #endif
     "jank",
     "js",
+    "threads",
     NULL
   };
 
@@ -398,16 +422,29 @@ void mozilla_sampler_start(int aProfileEntries, int aInterval,
   if (sps_version2()) {
     t = new BreakpadSampler(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                            aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                           stack, aFeatures, aFeatureCount);
+                           aFeatures, aFeatureCount);
   } else {
     t = new TableTicker(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                         aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                        stack, aFeatures, aFeatureCount);
+                        aFeatures, aFeatureCount);
   }
   tlsTicker.set(t);
   t->Start();
-  if (t->ProfileJS())
-      stack->enableJSSampling();
+  if (t->ProfileJS()) {
+      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+      std::vector<ThreadInfo*> threads = t->GetRegisteredThreads();
+
+      for (uint32_t i = 0; i < threads.size(); i++) {
+        ThreadInfo* info = threads[i];
+        ThreadProfile* thread_profile = info->Profile();
+        if (!thread_profile) {
+          continue;
+        }
+        thread_profile->GetPseudoStack()->enableJSSampling();
+      }
+  }
+
+  sIsProfiling = true;
 
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
@@ -435,6 +472,8 @@ void mozilla_sampler_stop()
   if (disableJS)
     stack->disableJSSampling();
 
+  sIsProfiling = false;
+
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
     os->NotifyObservers(nullptr, "profiler-stopped", nullptr);
@@ -442,15 +481,7 @@ void mozilla_sampler_stop()
 
 bool mozilla_sampler_is_active()
 {
-  if (!stack_key_initialized)
-    profiler_init();
-
-  TableTicker *t = tlsTicker.get();
-  if (!t) {
-    return false;
-  }
-
-  return t->IsActive();
+  return sIsProfiling;
 }
 
 static double sResponsivenessTimes[100];
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index 8371927aa9d2..f78c6911f9d4 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -35,14 +35,23 @@
 #define __android_log_print(a, ...)
 #endif
 
+#ifdef XP_UNIX
+#include <pthread.h>
+#endif
+
 #include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 #include "mozilla/unused.h"
 #include "mozilla/TimeStamp.h"
+#include "mozilla/Mutex.h"
 #include "PlatformMacros.h"
 #include "v8-support.h"
 #include <vector>
 
+#ifdef XP_WIN
+#include <windows.h>
+#endif
+
 #define ASSERT(a) MOZ_ASSERT(a)
 
 #ifdef ANDROID
@@ -183,14 +192,17 @@ class Thread {
   // prctl().
   static const int kMaxThreadNameLength = 16;
 
-  class PlatformData;
-  PlatformData* data() { return data_; }
+#ifdef XP_WIN
+  HANDLE thread_;
+  unsigned thread_id_;
+#endif
+#if defined(XP_MACOSX)
+  pthread_t thread_;
+#endif
 
  private:
   void set_name(const char *name);
 
-  PlatformData* data_;
-
   char name_[kMaxThreadNameLength];
   int stack_size_;
 
@@ -264,34 +276,9 @@ class TickSample {
   mozilla::TimeStamp timestamp;
 };
 
-class ThreadInfo {
- public:
-  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
-    : mName(strdup(aName))
-    , mThreadId(aThreadId)
-    , mIsMainThread(aIsMainThread)
-    , mPseudoStack(aPseudoStack)
-    , mProfile(NULL) {}
-
-  virtual ~ThreadInfo();
-
-  const char* Name() const { return mName; }
-  int ThreadId() const { return mThreadId; }
-
-  bool IsMainThread() const { return mIsMainThread; }
-  PseudoStack* Stack() const { return mPseudoStack; }
-  
-  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
-  ThreadProfile* Profile() const { return mProfile; }
-
- private:
-  char* mName;
-  int mThreadId;
-  const bool mIsMainThread;
-  PseudoStack* mPseudoStack;
-  ThreadProfile* mProfile;
-};
-
+class ThreadInfo;
+class PlatformData;
+class TableTicker;
 class Sampler {
  public:
   // Initialize sampler.
@@ -300,9 +287,6 @@ class Sampler {
 
   int interval() const { return interval_; }
 
-  // Performs stack sampling.
-  virtual void SampleStack(TickSample* sample) = 0;
-
   // This method is called for each sampling period with the current
   // program counter.
   virtual void Tick(TickSample* sample) = 0;
@@ -326,11 +310,14 @@ class Sampler {
   bool IsPaused() const { return paused_; }
   void SetPaused(bool value) { NoBarrier_Store(&paused_, value); }
 
+  virtual bool ProfileThreads() const = 0;
+
   int EntrySize() { return entrySize_; }
 
-  class PlatformData;
-
-  PlatformData* platform_data() { return data_; }
+  // We can't new/delete the type safely without defining it
+  // (-Wdelete-incomplete). Use these Alloc/Free functions instead.
+  static PlatformData* AllocPlatformData(int aThreadId);
+  static void FreePlatformData(PlatformData*);
 
   // If we move the backtracing code into the platform files we won't
   // need to have these hacks
@@ -343,31 +330,23 @@ class Sampler {
 #endif
 
   static std::vector<ThreadInfo*> GetRegisteredThreads() {
-    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
     return *sRegisteredThreads;
   }
 
   static bool RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread);
   static void UnregisterCurrentThread();
 
+  static void Startup();
   // Should only be called on shutdown
-  static void FreeRegisteredThreads() {
-    while (sRegisteredThreads->size() > 0) {
-      sRegisteredThreads->pop_back();
-    }
+  static void Shutdown();
 
-    delete sRegisteredThreadsMutex;
-    delete sRegisteredThreads;
-  }
-
-  static Sampler* GetActiveSampler() { return sActiveSampler; }
-  static void SetActiveSampler(Sampler* sampler) { sActiveSampler = sampler; }
+  static TableTicker* GetActiveSampler() { return sActiveSampler; }
+  static void SetActiveSampler(TableTicker* sampler) { sActiveSampler = sampler; }
 
+  static mozilla::Mutex* sRegisteredThreadsMutex;
  protected:
   static std::vector<ThreadInfo*>* sRegisteredThreads;
-  static mozilla::Mutex* sRegisteredThreadsMutex;
-  static Sampler* sActiveSampler;
+  static TableTicker* sActiveSampler;
 
  private:
   void SetActive(bool value) { NoBarrier_Store(&active_, value); }
@@ -377,7 +356,46 @@ class Sampler {
   Atomic32 paused_;
   Atomic32 active_;
   const int entrySize_;
-  PlatformData* data_;  // Platform specific data.
+
+  // Refactor me!
+#if defined(SPS_OS_linux) || defined(SPS_OS_android)
+  bool signal_handler_installed_;
+  struct sigaction old_sigprof_signal_handler_;
+  struct sigaction old_sigsave_signal_handler_;
+  bool signal_sender_launched_;
+  pthread_t signal_sender_thread_;
+#endif
+};
+
+class ThreadInfo {
+ public:
+  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
+    : mName(strdup(aName))
+    , mThreadId(aThreadId)
+    , mIsMainThread(aIsMainThread)
+    , mPseudoStack(aPseudoStack)
+    , mPlatformData(Sampler::AllocPlatformData(aThreadId))
+    , mProfile(NULL) {}
+
+  virtual ~ThreadInfo();
+
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
+  bool IsMainThread() const { return mIsMainThread; }
+  PseudoStack* Stack() const { return mPseudoStack; }
+  
+  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
+  ThreadProfile* Profile() const { return mProfile; }
+
+  PlatformData* GetPlatformData() const { return mPlatformData; }
+ private:
+  char* mName;
+  int mThreadId;
+  const bool mIsMainThread;
+  PseudoStack* mPseudoStack;
+  PlatformData* mPlatformData;
+  ThreadProfile* mProfile;
 };
 
 #endif /* ndef TOOLS_PLATFORM_H_ */

From b7e1764ebe88215e7adb2873ef092374195da128 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 16 Apr 2013 08:23:18 +0200
Subject: [PATCH 021/438] Bug 861453 - Restore empty substs after bug 857557,
 but put them in a separate file, unlisted as a dependency for everything.
 r=gps

---
 build/macosx/universal/flight.mk                         | 1 +
 config/autoconf.mk.in                                    | 1 +
 config/emptyvars.mk.in                                   | 1 +
 config/moz.build                                         | 1 +
 js/src/config/autoconf.mk.in                             | 1 +
 js/src/config/emptyvars.mk.in                            | 1 +
 js/src/configure.in                                      | 2 +-
 python/mozbuild/mozbuild/backend/configenvironment.py    | 6 +++++-
 .../mozbuild/test/backend/test_configenvironment.py      | 9 ++++++---
 9 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 config/emptyvars.mk.in
 create mode 100644 js/src/config/emptyvars.mk.in

diff --git a/build/macosx/universal/flight.mk b/build/macosx/universal/flight.mk
index 675d9d36bed2..544382da7135 100644
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -16,6 +16,7 @@ OBJDIR = $(OBJDIR_ARCH_1)
 endif
 
 topsrcdir = $(TOPSRCDIR)
+DEPTH = $(OBJDIR)
 include $(OBJDIR)/config/autoconf.mk
 
 core_abspath = $(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1))
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 3a1f0d8f49e1..41f7854eeef7 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -1,2 +1,3 @@
+include $(DEPTH)/config/emptyvars.mk
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
diff --git a/config/emptyvars.mk.in b/config/emptyvars.mk.in
new file mode 100644
index 000000000000..388cf2a35986
--- /dev/null
+++ b/config/emptyvars.mk.in
@@ -0,0 +1 @@
+@ALLEMPTYSUBSTS@
diff --git a/config/moz.build b/config/moz.build
index 8c98eb6c345c..422455a99600 100644
--- a/config/moz.build
+++ b/config/moz.build
@@ -6,6 +6,7 @@
 
 CONFIGURE_SUBST_FILES += [
     'autoconf.mk',
+    'emptyvars.mk',
     'doxygen.cfg',
     'makefiles/test/Makefile',
     'tests/makefiles/autodeps/Makefile',
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 3a1f0d8f49e1..41f7854eeef7 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -1,2 +1,3 @@
+include $(DEPTH)/config/emptyvars.mk
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
diff --git a/js/src/config/emptyvars.mk.in b/js/src/config/emptyvars.mk.in
new file mode 100644
index 000000000000..388cf2a35986
--- /dev/null
+++ b/js/src/config/emptyvars.mk.in
@@ -0,0 +1 @@
+@ALLEMPTYSUBSTS@
diff --git a/js/src/configure.in b/js/src/configure.in
index 1e6636dc0fe5..3ec29c04489a 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4384,7 +4384,7 @@ AC_SUBST(ac_configure_args)
 dnl Spit out some output
 dnl ========================================================
 
-AC_OUTPUT([js-confdefs.h Makefile config/autoconf.mk])
+AC_OUTPUT([js-confdefs.h Makefile config/autoconf.mk config/emptyvars.mk])
 
 # Produce the js-config script at configure time; see the comments for
 # 'js-config' in Makefile.in.
diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
index 89d8a5684296..dc63edcf4ea5 100644
--- a/python/mozbuild/mozbuild/backend/configenvironment.py
+++ b/python/mozbuild/mozbuild/backend/configenvironment.py
@@ -86,13 +86,15 @@ class ConfigEnvironment(object):
       - ALLDEFINES contains the defines in the form #define NAME VALUE, in
         sorted order, for use in config files, for an automatic listing of
         defines.
-    and another additional subst variable from all the other substs:
+    and two other additional subst variables from all the other substs:
       - ALLSUBSTS contains the substs in the form NAME = VALUE, in sorted
         order, for use in autoconf.mk. It includes ACDEFINES, but doesn't
         include ALLDEFINES. Only substs with a VALUE are included, such that
         the resulting file doesn't change when new empty substs are added.
         This results in less invalidation of build dependencies in the case
         of autoconf.mk..
+      - ALLEMPTYSUBSTS contains the substs with an empty value, in the form
+        NAME =.
 
     ConfigEnvironment expects a "top_srcdir" subst to be set with the top
     source directory, in msys format on windows. It is used to derive a
@@ -113,6 +115,8 @@ class ConfigEnvironment(object):
             shell_escape(self.defines[name])) for name in global_defines])
         self.substs['ALLSUBSTS'] = '\n'.join(sorted(['%s = %s' % (name,
             self.substs[name]) for name in self.substs if self.substs[name]]))
+        self.substs['ALLEMPTYSUBSTS'] = '\n'.join(sorted(['%s =' % name
+            for name in self.substs if not self.substs[name]]))
         self.substs['ALLDEFINES'] = '\n'.join(sorted(['#define %s %s' % (name,
             self.defines[name]) for name in global_defines]))
 
diff --git a/python/mozbuild/mozbuild/test/backend/test_configenvironment.py b/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
index a93ac9495cc7..dd202a3b2907 100644
--- a/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
+++ b/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
@@ -22,14 +22,14 @@ class ConfigEnvironment(ConfigStatus.ConfigEnvironment):
 
 class TestEnvironment(unittest.TestCase):
     def test_auto_substs(self):
-        '''Test the automatically set values of ACDEFINES, ALLDEFINES
-        and ALLSUBSTS.
+        '''Test the automatically set values of ACDEFINES, ALLDEFINES,
+        ALLSUBSTS and ALLEMPTYSUBSTS.
         '''
         env = ConfigEnvironment('.', '.',
                   defines = [ ('foo', 'bar'), ('baz', 'qux 42'),
                               ('abc', 'def'), ('extra', 'foobar') ],
                   non_global_defines = ['extra', 'ignore'],
-                  substs = [ ('FOO', 'bar'), ('ABC', 'def'),
+                  substs = [ ('FOO', 'bar'), ('FOOBAR', ''), ('ABC', 'def'),
                              ('bar', 'baz qux'), ('zzz', '"abc def"'),
                              ('qux', '') ])
         # non_global_defines should be filtered out in ACDEFINES and
@@ -47,6 +47,9 @@ ACDEFINES = -Dfoo=bar -Dbaz=qux\ 42 -Dabc=def
 FOO = bar
 bar = baz qux
 zzz = "abc def"''')
+        # ALLEMPTYSUBSTS contains all substs with no value.
+        self.assertEqual(env.substs['ALLEMPTYSUBSTS'], '''FOOBAR =
+qux =''')
 
     def test_config_file(self):
         '''Test the creation of config files.

From b37125b286e2c6298d32616d20d2b5b27b4280dd Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Mon, 15 Apr 2013 15:41:55 -0700
Subject: [PATCH 022/438] Bug 851630: fix error in patch for bug 758288 that
 caused improper cancellation of key events in children of autocomplete
 textboxes, r=dao

--HG--
extra : transplant_source : %D2XWZ%B0%21%E6%D5z%3F%26%9D%3E%DD7q%CE%B1%EFE
---
 toolkit/content/widgets/autocomplete.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index bf1028022f93..31dc01b5c25c 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -441,7 +441,7 @@
         <parameter name="aEvent"/>
         <body><![CDATA[
           if (aEvent.target.localName != "textbox")
-            return false; // Let child buttons of autocomplete take input
+            return true; // Let child buttons of autocomplete take input
 
           //XXXpch this is so bogus...
           if (aEvent.defaultPrevented)

From 73d5366744315ac5f74e2a6d787a3dc908495f21 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Tue, 16 Apr 2013 08:25:29 -0700
Subject: [PATCH 023/438] Bug 862186: remove unused import from DebuggerUI.jsm,
 r=past

--HG--
extra : transplant_source : %27%06U%D8%1C%10%FB%81%E5%00%EBi%2A%27%09%F0%0C%E6%D4%DB
---
 browser/devtools/debugger/DebuggerUI.jsm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/browser/devtools/debugger/DebuggerUI.jsm b/browser/devtools/debugger/DebuggerUI.jsm
index 876bcaf90941..af26d1f95f2d 100644
--- a/browser/devtools/debugger/DebuggerUI.jsm
+++ b/browser/devtools/debugger/DebuggerUI.jsm
@@ -21,9 +21,6 @@ XPCOMUtils.defineLazyModuleGetter(this,
 XPCOMUtils.defineLazyModuleGetter(this,
   "Services", "resource://gre/modules/Services.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this,
-  "FileUtils", "resource://gre/modules/FileUtils.jsm");
-
 this.EXPORTED_SYMBOLS = ["DebuggerUI"];
 
 /**

From c1bc4b958c6bb48a1fc86e444c0f6b05aa131bcc Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Thu, 17 Nov 2011 13:41:04 -0800
Subject: [PATCH 024/438] Bug 703377: remove now-unused pref override
 functionality, r=dolske

--HG--
extra : transplant_source : %C1%B65%07%B60XS%AB%DD%EF7Hx%A5%8Cz%11%04%97
---
 .../dirprovider/DirectoryProvider.cpp         | 10 -----
 .../nsBrowserDirectoryServiceDefs.h           | 24 ------------
 .../dirprovider/tests/unit/test_keys.js       | 11 +-----
 browser/components/nsBrowserContentHandler.js | 37 -------------------
 browser/locales/Makefile.in                   | 11 ------
 5 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 browser/components/dirprovider/nsBrowserDirectoryServiceDefs.h

diff --git a/browser/components/dirprovider/DirectoryProvider.cpp b/browser/components/dirprovider/DirectoryProvider.cpp
index 04e7a8e26ac2..92bc762d7418 100644
--- a/browser/components/dirprovider/DirectoryProvider.cpp
+++ b/browser/components/dirprovider/DirectoryProvider.cpp
@@ -12,7 +12,6 @@
 
 #include "nsArrayEnumerator.h"
 #include "nsEnumeratorUtils.h"
-#include "nsBrowserDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsCategoryManagerUtils.h"
@@ -58,15 +57,6 @@ DirectoryProvider::GetFile(const char *aKey, bool *aPersist, nsIFile* *aResult)
       }
     }
   }
-  else if (!strcmp(aKey, NS_APP_EXISTING_PREF_OVERRIDE)) {
-    rv = NS_GetSpecialDirectory(NS_APP_DEFAULTS_50_DIR,
-                                getter_AddRefs(file));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    file->AppendNative(NS_LITERAL_CSTRING("existing-profile-defaults.js"));
-    file.swap(*aResult);
-    return NS_OK;
-  }
   else {
     return NS_ERROR_FAILURE;
   }
diff --git a/browser/components/dirprovider/nsBrowserDirectoryServiceDefs.h b/browser/components/dirprovider/nsBrowserDirectoryServiceDefs.h
deleted file mode 100644
index 9b89855ff60f..000000000000
--- a/browser/components/dirprovider/nsBrowserDirectoryServiceDefs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 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/. */
-
-#ifndef nsBrowserDirectoryServiceDefs_h___
-#define nsBrowserDirectoryServiceDefs_h___
-
-//=============================================================================
-//
-// Defines property names for directories available from the browser-specific
-// nsBrowserDirectoryProvider.
-//
-// System and XPCOM properties are defined in nsDirectoryServiceDefs.h.
-// General application properties are defined in nsAppDirectoryServiceDefs.h.
-//
-//=============================================================================
-
-// ----------------------------------------------------------------------------
-// Files and directories that exist on a per-browser basis.
-// ----------------------------------------------------------------------------
-
-#define NS_APP_EXISTING_PREF_OVERRIDE           "ExistingPrefOverride"
-
-#endif
diff --git a/browser/components/dirprovider/tests/unit/test_keys.js b/browser/components/dirprovider/tests/unit/test_keys.js
index 174ba59d3b6b..8f0773b27c68 100644
--- a/browser/components/dirprovider/tests/unit/test_keys.js
+++ b/browser/components/dirprovider/tests/unit/test_keys.js
@@ -10,17 +10,8 @@ function test_bookmarkhtml() {
   do_check_true(bmarks.equals(tbmarks));
 }
 
-function test_prefoverride() {
-  let dir = gDirSvc.get("DefRt", Ci.nsIFile);
-  dir.append("existing-profile-defaults.js");
-
-  let tdir = gDirSvc.get("ExistingPrefOverride", Ci.nsIFile);
-  do_check_true(dir.equals(tdir));
-}
-
 function run_test() {
-  [test_bookmarkhtml,
-   test_prefoverride
+  [test_bookmarkhtml
   ].forEach(function(f) {
     do_test_pending();
     print("Running test: " + f.name);
diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index b489719cb356..f129168609b0 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -172,40 +172,6 @@ function getPostUpdateOverridePage(defaultOverridePage) {
   return update.getProperty("openURL") || defaultOverridePage;
 }
 
-// Copies a pref override file into the user's profile pref-override folder,
-// and then tells the pref service to reload its default prefs.
-function copyPrefOverride() {
-  try {
-    var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"]
-                                .getService(Components.interfaces.nsIProperties);
-    const NS_APP_EXISTING_PREF_OVERRIDE = "ExistingPrefOverride";
-    var prefOverride = fileLocator.get(NS_APP_EXISTING_PREF_OVERRIDE,
-                                       Components.interfaces.nsIFile);
-    if (!prefOverride.exists())
-      return; // nothing to do
-
-    const NS_APP_PREFS_OVERRIDE_DIR     = "PrefDOverride";
-    var prefOverridesDir = fileLocator.get(NS_APP_PREFS_OVERRIDE_DIR,
-                                           Components.interfaces.nsIFile);
-
-    // Check for any existing pref overrides, and remove them if present
-    var existingPrefOverridesFile = prefOverridesDir.clone();
-    existingPrefOverridesFile.append(prefOverride.leafName);
-    if (existingPrefOverridesFile.exists())
-      existingPrefOverridesFile.remove(false);
-
-    prefOverride.copyTo(prefOverridesDir, null);
-
-    // Now that we've installed the new-profile pref override file,
-    // re-read the default prefs.
-    var prefSvcObs = Components.classes["@mozilla.org/preferences-service;1"]
-                               .getService(Components.interfaces.nsIObserver);
-    prefSvcObs.observe(null, "reload-default-prefs", null);
-  } catch (ex) {
-    Components.utils.reportError(ex);
-  }
-}
-
 // Flag used to indicate that the arguments to openWindow can be passed directly.
 const NO_EXTERNAL_URIS = 1;
 
@@ -600,9 +566,6 @@ nsBrowserContentHandler.prototype = {
             overridePage = Services.urlFormatter.formatURLPref("startup.homepage_welcome_url");
             break;
           case OVERRIDE_NEW_MSTONE:
-            // Existing profile, new milestone build.
-            copyPrefOverride();
-
             // Check whether we have a session to restore. If we do, we assume
             // that this is an "update" session.
             var ss = Components.classes["@mozilla.org/browser/sessionstartup;1"]
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 4a71ea98ed2c..2353a1b96e02 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -99,17 +99,6 @@ $(STAGEDIST): $(DIST)/branding
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
 
-libs::
-	@if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
-	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
-	    $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(FINAL_TARGET)/defaults/existing-profile-defaults.js; \
-	fi
-install::
-	@if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
-	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
-	    $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(DESTDIR)$(mozappdir)/defaults/existing-profile-defaults.js; \
-	fi
-
 PROFILE_FILES = \
 	localstore.rdf \
 	mimeTypes.rdf \

From bb65618e53a56d196a5145387094c9d176efba6b Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Tue, 16 Apr 2013 08:27:42 -0700
Subject: [PATCH 025/438] bug 862152: remove obsolete xpcom/tests/utils code,
 r=bsmedberg

--HG--
extra : transplant_source : ytT%C26%9B%27d%AB%A4%EA%5E%F3%21%7F%0AV%B9%86%00
---
 xpcom/tests/utils/WhatError.cpp |  29 ------
 xpcom/tests/utils/cp.js         | 111 -----------------------
 xpcom/tests/utils/dirs.js       | 155 --------------------------------
 xpcom/tests/utils/ls.js         |  64 -------------
 4 files changed, 359 deletions(-)
 delete mode 100644 xpcom/tests/utils/WhatError.cpp
 delete mode 100644 xpcom/tests/utils/cp.js
 delete mode 100644 xpcom/tests/utils/dirs.js
 delete mode 100644 xpcom/tests/utils/ls.js

diff --git a/xpcom/tests/utils/WhatError.cpp b/xpcom/tests/utils/WhatError.cpp
deleted file mode 100644
index 8b9e9e159edc..000000000000
--- a/xpcom/tests/utils/WhatError.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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 "nsError.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-int
-main(int argc, char **argv)
-{
-    int errorCode = 0;
-    char buffer[100];
-    
-    if (argc != 2)
-        return -1;
-
-    sscanf( argv[1], "0x%x", &errorCode);
-    sprintf(buffer, "%d", errorCode);
-    sscanf( buffer, "%d", &errorCode);
-    
-    printf( "Code: %d, Module: %d, Severity: %d\n", 
-            NS_ERROR_GET_CODE(errorCode), 
-            NS_ERROR_GET_MODULE(errorCode), 
-            NS_ERROR_GET_SEVERITY(errorCode));
-
-    return 0;
-}
diff --git a/xpcom/tests/utils/cp.js b/xpcom/tests/utils/cp.js
deleted file mode 100644
index a38c120b6ba4..000000000000
--- a/xpcom/tests/utils/cp.js
+++ /dev/null
@@ -1,111 +0,0 @@
-const nsILocalFile = Components.interfaces.nsILocalFile;
-var prefix = "";
-
-function rename(source, newName)
-{
-    try {
-    var sourceFile = Components.classes["@mozilla.org/file/local;1"].
-	createInstance(nsILocalFile);
-    sourceFile.initWithPath(source);
-    
-    }
-    catch (e) {
-        dump("Could not create nsILocalFile\n");
-    }
-
-    
-    try {
-        sourceFile.copyTo(null, newName);
-    }
-    catch (e) {
-        dump("error coping" + e + "\n");
-    }
-}
-
-
-function cp(source, dest, followLinks, newName)
-{
-    try {
-    var sourceFile = Components.classes["@mozilla.org/file/local;1"].
-	createInstance(nsILocalFile);
-    sourceFile.initWithPath(source);
-    
-    var destFile = Components.classes["@mozilla.org/file/local;1"].
-	createInstance(nsILocalFile);
-    destFile.initWithPath(dest);
-    
-    }
-    catch (e) {
-        dump("Could not create nsILocalFile\n");
-    }
-
-    try {
-
-        if (! destFile.isDirectory())
-        {
-            dump("destination not a directory!\n");
-            return;
-        }
-    }
-    catch (e) {
-        dump("error accessing dest");
-    }
-
-    try {
-        if (followLinks)
-        {
-            sourceFile.copyToFollowingLinks(destFile, newName);
-        }
-        else
-        {
-            sourceFile.copyTo(destFile, newName);
-        }
-    }
-    catch (e) {
-        dump("error coping" + e + "\n");
-    }
-}
-
-
-function mv(source, dest, followLinks, newName)
-{
-    try {
-    var sourceFile = Components.classes["@mozilla.org/file/local;1"].
-	createInstance(nsILocalFile);
-    sourceFile.initWithPath(source);
-    
-    var destFile = Components.classes["@mozilla.org/file/local;1"].
-	createInstance(nsILocalFile);
-    destFile.initWithPath(dest);
-    
-    }
-    catch (e) {
-        dump("Could not create nsILocalFile\n");
-    }
-
-    try {
-
-        if (! destFile.isDirectory())
-        {
-            dump("destination not a directory!\n");
-            return;
-        }
-    }
-    catch (e) {
-        dump("error accessing dest");
-    }
-
-    try {
-        if (followLinks)
-        {
-            sourceFile.moveToFollowingLinks(destFile, newName);
-        }
-        else
-        {
-            sourceFile.moveTo(destFile, newName);
-        }
-    }
-    catch (e) {
-        dump("error coping" + e + "\n");
-    }
-}
diff --git a/xpcom/tests/utils/dirs.js b/xpcom/tests/utils/dirs.js
deleted file mode 100644
index c3fc24791776..000000000000
--- a/xpcom/tests/utils/dirs.js
+++ /dev/null
@@ -1,155 +0,0 @@
-function dumpPathOfProperty(prop)
-{
-    dump(prop +' = ');
-
-    try
-    {
-        var file = dsprops.get(prop, Components.interfaces.nsIFile);
-        dump(file.path + '\n');
-    }
-    catch (ar)
-    {
-        dump('undefined or error \n');
-    }
-}
-
-var dscontractid = "@mozilla.org/file/directory_service;1";  // XXX old-style
-var ds = Components.classes[dscontractid].getService();
-var dsprops = ds.QueryInterface(Components.interfaces.nsIProperties);
-
-dump("xpcom locations::\n");
-// XPCOM Locations:
-    dumpPathOfProperty ("xpcom.currentProcess");
-    dumpPathOfProperty ("xpcom.currentProcess.componentRegistry");
-    dumpPathOfProperty ("xpcom.currentProcess.componentDirectory");
-    dumpPathOfProperty ("system.OS_DriveDirectory");
-    dumpPathOfProperty ("system.OS_TemporaryDirectory");
-    dumpPathOfProperty ("system.OS_CurrentProcessDirectory");
-    dumpPathOfProperty ("system.OS_CurrentWorkingDirectory");
-
-dump("Mac locations::\n");
-// Mac
-    dumpPathOfProperty ("system.SystemDirectory");
-    dumpPathOfProperty ("system.DesktopDirectory");
-    dumpPathOfProperty ("system.TrashDirectory");
-    dumpPathOfProperty ("system.StartupDirectory");
-    dumpPathOfProperty ("system.ShutdownDirectory");
-    dumpPathOfProperty ("system.AppleMenuDirectory");
-    dumpPathOfProperty ("system.ControlPanelDirectory");
-    dumpPathOfProperty ("system.ExtensionDirectory");
-    dumpPathOfProperty ("system.FontsDirectory");
-    dumpPathOfProperty ("system.PreferencesDirectory");
-    dumpPathOfProperty ("system.DocumentsDirectory");
-    dumpPathOfProperty ("system.InternetSearchDirectory");
-
-dump("PC locations::\n");
-// PC
-    dumpPathOfProperty ("system.SystemDirectory");
-    dumpPathOfProperty ("system.WindowsDirectory");
-    dumpPathOfProperty ("system.HomeDirectory");
-    dumpPathOfProperty ("system.Desktop");
-    dumpPathOfProperty ("system.Programs");
-    dumpPathOfProperty ("system.Controls");
-    dumpPathOfProperty ("system.Printers");
-    dumpPathOfProperty ("system.Personal");
-    dumpPathOfProperty ("system.Favorites");
-    dumpPathOfProperty ("system.Startup");
-    dumpPathOfProperty ("system.Recent");
-    dumpPathOfProperty ("system.Sendto");
-    dumpPathOfProperty ("system.Bitbucket");
-    dumpPathOfProperty ("system.Startmenu");
-    dumpPathOfProperty ("system.Desktopdirectory");
-    dumpPathOfProperty ("system.Drives");
-    dumpPathOfProperty ("system.Network");
-    dumpPathOfProperty ("system.Nethood");
-    dumpPathOfProperty ("system.Fonts");
-    dumpPathOfProperty ("system.Templates");
-    dumpPathOfProperty ("system.Common_Startmenu");
-    dumpPathOfProperty ("system.Common_Programs");
-    dumpPathOfProperty ("system.Common_Startup");
-    dumpPathOfProperty ("system.Common_Desktopdirectory");
-    dumpPathOfProperty ("system.Appdata");
-    dumpPathOfProperty ("system.Printhood");
-
-dump("Unix locations::\n");
-// Unix
-
-    dumpPathOfProperty ("system.LocalDirectory");
-    dumpPathOfProperty ("system.LibDirectory");
-    dumpPathOfProperty ("system.HomeDirectory");
-
-dump("Beos locations::\n");
-// Beos
-
-    dumpPathOfProperty ("system.SettingsDirectory");
-    dumpPathOfProperty ("system.HomeDirectory");
-    dumpPathOfProperty ("system.DesktopDirectory");
-    dumpPathOfProperty ("system.SystemDirectory");
-
-dump("OS2 locations::\n");
-// OS2
-    dumpPathOfProperty ("system.SystemDirectory");
-    dumpPathOfProperty ("system.OS2Directory");
-    dumpPathOfProperty ("system.DesktopDirectory");
-
-
-// XPFE locations:
-
-
-// application Directories: 
-    dumpPathOfProperty ("app.res.directory");
-    dumpPathOfProperty ("app.defaults.directory");
-    dumpPathOfProperty ("app.chrome.directory");
-    dumpPathOfProperty ("app.chrome.user.directory");
-    dumpPathOfProperty ("app.plugins.directory");
-
-// application Files:
-
-    dumpPathOfProperty ("app.registry.file.4");
-    dumpPathOfProperty ("app.registry.file.5");
-    dumpPathOfProperty ("app.local.store.file.5");
-    dumpPathOfProperty ("app.history.file.5");
-    dumpPathOfProperty ("app.user.panels.5");
-
-// Preferences:
-
-//   dumpPathOfProperty ("app.prefs.directory.3");
-//   dumpPathOfProperty ("app.prefs.directory.4");
-    dumpPathOfProperty ("app.prefs.directory.5");
-    dumpPathOfProperty ("app.pref.default.directory.5");
-    
-//   dumpPathOfProperty ("app.prefs.file.3");
-//   dumpPathOfProperty ("app.prefs.file.4");
-    dumpPathOfProperty ("app.prefs.file.5");
-
-// Profile:
-
-//   dumpPathOfProperty ("app.profile.user.directory.3");
-//   dumpPathOfProperty ("app.profile.user.directory.4");
-    dumpPathOfProperty ("app.profile.user.directory.5");
-//   dumpPathOfProperty ("app.profile.default.user.directory.3");
-//   dumpPathOfProperty ("app.profile.default.user.directory.4");
-    dumpPathOfProperty ("app.profile.default.user.directory.5");
-//   dumpPathOfProperty ("app.profile.defaults.directory.3");
-//   dumpPathOfProperty ("app.profile.defaults.directory.4");
-    dumpPathOfProperty ("app.profile.defaults.directory.5");
-
-
-
-// Bookmarks:
-
-//   dumpPathOfProperty ("app.bookmark.file.3");
-//   dumpPathOfProperty ("app.bookmark.file.4");
-    dumpPathOfProperty ("app.bookmark.file.5");
-
-// Search
-    dumpPathOfProperty ("app.search.file.5");
-    dumpPathOfProperty ("app.search.directory.5");
-    
-
-// MailNews:
-
-    dumpPathOfProperty ("app.mail.directory.5");
-    dumpPathOfProperty ("app.mail.imap.directory.5");
-    dumpPathOfProperty ("app.mail.news.directory.5");
-    dumpPathOfProperty ("app.mail.messenger.cache.directory.5");
diff --git a/xpcom/tests/utils/ls.js b/xpcom/tests/utils/ls.js
deleted file mode 100644
index 8ae62f06fef0..000000000000
--- a/xpcom/tests/utils/ls.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const nsILocalFile = Components.interfaces.nsILocalFile;
-var prefix = "";
-
-function ls(path, recur)
-{
-    var file = Components.classes["@mozilla.org/file/local;1"].
-	createInstance(nsILocalFile);
-    try {
-        file.initWithPath( path );
-    
-        if (file.isDirectory() && arguments.length == 1)
-	    ls_dir(file, recur);
-        else
-	    ls_file(file, recur);
-    }
-    catch (e) {
-        dump("Error Returned " + e + "\n");
-    }
-}
-function ls_file(file, recur)
-{
-    dump(prefix);
-
-    try {
-        if (file.isDirectory()) {
-            dump("directory " + file.leafName + "\n");
-	        if(recur)
-	            ls_dir(file, true);
-	        return;
-        }
-
-        dump(file.leafName + " " + file.fileSize);
-        if (file.isSymlink())
-	        dump(" -> " + file.target);
-        dump("\n");
-    }
-
-    catch (e) {
-        dump(file.leafName + " (error accessing)\n");
-    }
-}
-
-function ls_dir(file, recur)
-{
-    var leafName = file.leafName;
-
-    var old = prefix;
-    prefix = prefix + "    ";
-
-    iter = file.directoryEntries;
-    dump(iter + "\n");
-
-    foreach_iter(iter,
-		 function (file) { ls_file(file, recur); });
-    prefix = old;
-}
-
-function foreach_iter(iter, fun)
-{
-    while (iter.hasMoreElements()) {
-	var item = iter.getNext().QueryInterface(nsILocalFile);
-	fun(item);
-    }
-}

From 57ff08adeafdbd26535dfbafaa0d319d0c194742 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Tue, 16 Apr 2013 08:33:41 -0700
Subject: [PATCH 026/438] Bug 847211: When reparenting style contexts, skip
 flex-item style fixup if our element is the root of an anonymous subtree.
 r=bz

---
 layout/base/nsCSSFrameConstructor.cpp     |  2 ++
 layout/generic/crashtests/847211-1.html   | 19 +++++++++++++++++++
 layout/generic/crashtests/crashtests.list |  1 +
 layout/style/nsStyleSet.cpp               |  8 ++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 layout/generic/crashtests/847211-1.html

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index deab4aed4a7e..dda85e58a416 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -9892,6 +9892,8 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
     NS_ABORT_IF_FALSE(!content->IsNodeOfType(nsINode::eCOMMENT) &&
                       !content->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION),
                       "Why is someone creating garbage anonymous content");
+    NS_ABORT_IF_FALSE(content->IsRootOfAnonymousSubtree(),
+                      "Content should know it's an anonymous subtree");
 
     nsRefPtr<nsStyleContext> styleContext;
     TreeMatchContext::AutoFlexItemStyleFixupSkipper
diff --git a/layout/generic/crashtests/847211-1.html b/layout/generic/crashtests/847211-1.html
new file mode 100644
index 000000000000..83e7da0eb546
--- /dev/null
+++ b/layout/generic/crashtests/847211-1.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+function boom()
+{
+    var f = document.createElementNS("http://www.w3.org/1999/xhtml", "input");
+    f.setAttributeNS(null, "type", "file");
+    document.body.appendChild(f);
+    f.style.whiteSpace = "pre-line";
+    f.style.display = "flex";
+    document.body.style.transitionTimingFunction = "linear";
+}
+
+</script>
+</head>
+<body onload="boom();"></body>
+</html>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index 6f103bf6d249..642a81656bbe 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -454,6 +454,7 @@ test-pref(layout.css.flexbox.enabled,true) load 844529-1.html
 load 847130.xhtml
 load 847208.html
 asserts(4) load 847209.html # bug 847368
+test-pref(layout.css.flexbox.enabled,true) load 847211-1.html
 load 849603.html
 test-pref(layout.css.flexbox.enabled,true) load 851396-1.html
 test-pref(layout.css.flexbox.enabled,true) load 854263-1.html
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 2bdc050167b1..0096750e4fee 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -1726,6 +1726,14 @@ nsStyleSet::ReparentStyleContext(nsStyleContext* aStyleContext,
     flags |= eDoAnimation;
   }
 
+  if (aElement && aElement->IsRootOfAnonymousSubtree()) {
+    // For anonymous subtree roots, don't tweak "display" value based on
+    // whether or not the parent is styled as a flex container. (If the parent
+    // has anonymous-subtree kids, then we know it's not actually going to get
+    // a flex container frame, anyway.)
+    flags |= eSkipFlexItemStyleFixup;
+  }
+
   return GetContext(aNewParentContext, ruleNode, visitedRuleNode,
                     pseudoTag, pseudoType,
                     aElement, flags);

From d73ecc7c2c7cc1f1377722f334f2e12903f6dc8f Mon Sep 17 00:00:00 2001
From: Michal Novotny <michal.novotny@gmail.com>
Date: Tue, 16 Apr 2013 17:40:08 +0200
Subject: [PATCH 027/438] Bug 829419 - Don't allow processing pending events
 while shutting down cache IO thread, r=jduell

---
 netwerk/cache/Makefile.in        |  1 +
 netwerk/cache/nsCacheService.cpp |  3 +-
 netwerk/cache/nsCacheUtils.cpp   | 85 ++++++++++++++++++++++++++++++++
 netwerk/cache/nsCacheUtils.h     | 44 +++++++++++++++++
 netwerk/cache/nsDeleteDir.cpp    | 17 +------
 5 files changed, 134 insertions(+), 16 deletions(-)
 create mode 100644 netwerk/cache/nsCacheUtils.cpp
 create mode 100644 netwerk/cache/nsCacheUtils.h

diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in
index f3d7dbd5e41c..b84ccb271bdb 100644
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -28,6 +28,7 @@ CPPSRCS = \
   nsCacheMetaData.cpp \
   nsCacheService.cpp \
   nsCacheSession.cpp \
+  nsCacheUtils.cpp \
   nsMemoryCacheDevice.cpp \
   nsDiskCacheBinding.cpp \
   nsDiskCacheBlockFile.cpp \
diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp
index a7ed007fcb8b..ea3151a22afa 100644
--- a/netwerk/cache/nsCacheService.cpp
+++ b/netwerk/cache/nsCacheService.cpp
@@ -20,6 +20,7 @@
 #include "nsICacheVisitor.h"
 #include "nsDiskCacheDevice.h"
 #include "nsDiskCacheDeviceSQL.h"
+#include "nsCacheUtils.h"
 
 #include "nsIObserverService.h"
 #include "nsIPrefService.h"
@@ -1254,7 +1255,7 @@ nsCacheService::Shutdown()
     }
 
     if (cacheIOThread)
-        cacheIOThread->Shutdown();
+        nsShutdownThread::BlockingShutdown(cacheIOThread);
 
     if (shouldSanitize) {
         nsresult rv = parentDir->AppendNative(NS_LITERAL_CSTRING("Cache"));
diff --git a/netwerk/cache/nsCacheUtils.cpp b/netwerk/cache/nsCacheUtils.cpp
new file mode 100644
index 000000000000..475cf712f32a
--- /dev/null
+++ b/netwerk/cache/nsCacheUtils.cpp
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* 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 "nsCache.h"
+#include "nsCacheUtils.h"
+#include "nsThreadUtils.h"
+
+using namespace mozilla;
+
+class nsDestroyThreadEvent : public nsRunnable {
+public:
+  nsDestroyThreadEvent(nsIThread *thread)
+    : mThread(thread)
+  {}
+  NS_IMETHOD Run()
+  {
+    mThread->Shutdown();
+    return NS_OK;
+  }
+private:
+  nsCOMPtr<nsIThread> mThread;
+};
+
+nsShutdownThread::nsShutdownThread(nsIThread *aThread)
+  : mLock("nsShutdownThread.mLock")
+  , mCondVar(mLock, "nsShutdownThread.mCondVar")
+  , mThread(aThread)
+{
+}
+
+nsShutdownThread::~nsShutdownThread()
+{
+}
+
+nsresult
+nsShutdownThread::Shutdown(nsIThread *aThread)
+{
+  nsresult rv;
+  nsRefPtr<nsDestroyThreadEvent> ev = new nsDestroyThreadEvent(aThread);
+  rv = NS_DispatchToMainThread(ev);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Dispatching event in nsShutdownThread::Shutdown failed!");
+  }
+  return rv;
+}
+
+nsresult
+nsShutdownThread::BlockingShutdown(nsIThread *aThread)
+{
+  nsresult rv;
+
+  nsRefPtr<nsShutdownThread> st = new nsShutdownThread(aThread);
+  nsCOMPtr<nsIThread> workerThread;
+
+  rv = NS_NewNamedThread("thread shutdown", getter_AddRefs(workerThread));
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Can't create nsShutDownThread worker thread!");
+    return rv;
+  }
+
+  {
+    MutexAutoLock lock(st->mLock);
+    rv = aThread->Dispatch(st, NS_DISPATCH_NORMAL);
+    if (NS_FAILED(rv)) {
+      NS_WARNING(
+        "Dispatching event in nsShutdownThread::BlockingShutdown failed!");
+    } else {
+      st->mCondVar.Wait();
+    }
+  }
+
+  return Shutdown(workerThread);
+}
+
+NS_IMETHODIMP
+nsShutdownThread::Run()
+{
+  MutexAutoLock lock(mLock);
+  mThread->Shutdown();
+  mCondVar.Notify();
+  return NS_OK;
+}
diff --git a/netwerk/cache/nsCacheUtils.h b/netwerk/cache/nsCacheUtils.h
new file mode 100644
index 000000000000..611a41575e36
--- /dev/null
+++ b/netwerk/cache/nsCacheUtils.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set sw=2 ts=8 et 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/. */
+
+#ifndef _nsCacheUtils_h_
+#define _nsCacheUtils_h_
+
+#include "nsThreadUtils.h"
+#include "nsCOMPtr.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/CondVar.h"
+
+class nsIThread;
+
+/**
+ * A class with utility methods for shutting down nsIThreads easily.
+  */
+class nsShutdownThread : public nsRunnable {
+public:
+  nsShutdownThread(nsIThread *aThread);
+  ~nsShutdownThread();
+
+  NS_IMETHOD Run();
+
+/**
+ * Shutdown ensures that aThread->Shutdown() is called on a main thread
+ */
+  static nsresult Shutdown(nsIThread *aThread);
+
+/**
+ * BlockingShutdown ensures that by the time it returns, aThread->Shutdown() has
+ * been called and no pending events have been processed on the current thread.
+ */
+  static nsresult BlockingShutdown(nsIThread *aThread);
+
+private:
+  mozilla::Mutex      mLock;
+  mozilla::CondVar    mCondVar;
+  nsCOMPtr<nsIThread> mThread;
+};
+
+#endif
diff --git a/netwerk/cache/nsDeleteDir.cpp b/netwerk/cache/nsDeleteDir.cpp
index 248cce07fc0b..fd66c0c0f23b 100644
--- a/netwerk/cache/nsDeleteDir.cpp
+++ b/netwerk/cache/nsDeleteDir.cpp
@@ -13,6 +13,7 @@
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "nsISupportsPriority.h"
+#include "nsCacheUtils.h"
 #include <time.h>
 
 using namespace mozilla;
@@ -28,20 +29,6 @@ public:
   }
 };
 
-class nsDestroyThreadEvent : public nsRunnable {
-public:
-  nsDestroyThreadEvent(nsIThread *thread)
-    : mThread(thread)
-  {}
-  NS_IMETHOD Run()
-  {
-    mThread->Shutdown();
-    return NS_OK;
-  }
-private:
-  nsCOMPtr<nsIThread> mThread;
-};
-
 
 nsDeleteDir * nsDeleteDir::gInstance = nullptr;
 
@@ -155,7 +142,7 @@ nsDeleteDir::DestroyThread()
     // more work to do, so don't delete thread.
     return;
 
-  NS_DispatchToMainThread(new nsDestroyThreadEvent(mThread));
+  nsShutdownThread::Shutdown(mThread);
   mThread = nullptr;
 }
 

From bcf6f3b22dc7c2ce0d4a18f659168a9e638a2b83 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 16 Apr 2013 11:51:49 -0400
Subject: [PATCH 028/438] Backed out changeset 76f7d7963692 (bug 861912) for
 debug mochitest b-c orange.

---
 js/xpconnect/src/XPCConvert.cpp            | 28 ++++++++++++----------
 js/xpconnect/src/XPCWrappedJSClass.cpp     | 14 ++++++++---
 js/xpconnect/src/XPCWrappedNative.cpp      |  5 +++-
 js/xpconnect/src/XPCWrappedNativeJSOps.cpp |  3 +++
 js/xpconnect/src/nsXPConnect.cpp           |  1 +
 js/xpconnect/src/xpcprivate.h              | 28 ++++++++++++++++++++++
 6 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp
index 2079193f75d7..a201d126a3ec 100644
--- a/js/xpconnect/src/XPCConvert.cpp
+++ b/js/xpconnect/src/XPCConvert.cpp
@@ -29,7 +29,6 @@
 using namespace xpc;
 using namespace mozilla;
 using namespace mozilla::dom;
-using namespace JS;
 
 //#define STRICT_CHECK_OF_UNICODE
 #ifdef STRICT_CHECK_OF_UNICODE
@@ -170,7 +169,7 @@ XPCConvert::NativeData2JS(XPCLazyCallContext& lccx, jsval* d, const void* s,
                 nsID* iid2 = *((nsID**)s);
                 if (!iid2)
                     break;
-                RootedObject scope(cx, lccx.GetScopeForNewJSObjects());
+                JS::RootedObject scope(cx, lccx.GetScopeForNewJSObjects());
                 JSObject* obj;
                 if (!(obj = xpc_NewIDObject(cx, scope, *iid2)))
                     return false;
@@ -831,7 +830,7 @@ XPCConvert::NativeInterface2JSObject(XPCLazyCallContext& lccx,
     nsWrapperCache *cache = aHelper.GetWrapperCache();
 
     bool tryConstructSlimWrapper = false;
-    RootedObject flat(cx);
+    JS::RootedObject flat(cx);
     if (cache) {
         flat = cache->GetWrapper();
         if (cache->IsDOMBinding()) {
@@ -1154,7 +1153,7 @@ public:
 
 private:
     JSContext * const mContext;
-    AutoValueRooter tvr;
+    JS::AutoValueRooter tvr;
 };
 
 // static
@@ -1412,26 +1411,29 @@ XPCConvert::NativeArray2JS(XPCLazyCallContext& lccx,
 
     // XXX add support to indicate *which* array element was not convertable
 
-    RootedObject array(cx, JS_NewArrayObject(cx, count, nullptr));
+    JSObject *array = JS_NewArrayObject(cx, count, nullptr);
 
     if (!array)
         return false;
 
+    // root this early
     *d = OBJECT_TO_JSVAL(array);
+    AUTO_MARK_JSVAL(ccx, d);
 
     if (pErr)
         *pErr = NS_ERROR_XPC_BAD_CONVERT_NATIVE;
 
     uint32_t i;
-    RootedValue current(cx, JSVAL_NULL);
+    jsval current = JSVAL_NULL;
+    AUTO_MARK_JSVAL(ccx, &current);
 
-#define POPULATE(_t)                                                                    \
-    PR_BEGIN_MACRO                                                                      \
-        for (i = 0; i < count; i++) {                                                   \
-            if (!NativeData2JS(ccx, current.address(), ((_t*)*s)+i, type, iid, pErr) || \
-                !JS_SetElement(cx, array, i, current.address()))                        \
-                goto failure;                                                           \
-        }                                                                               \
+#define POPULATE(_t)                                                          \
+    PR_BEGIN_MACRO                                                            \
+        for (i = 0; i < count; i++) {                                         \
+            if (!NativeData2JS(ccx, &current, ((_t*)*s)+i, type, iid, pErr) ||\
+                !JS_SetElement(cx, array, i, &current))                       \
+                goto failure;                                                 \
+        }                                                                     \
     PR_END_MACRO
 
     // XXX check IsPtr - esp. to handle array of nsID (as opposed to nsID*)
diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
index def5886c3029..d4a47e6cbe5f 100644
--- a/js/xpconnect/src/XPCWrappedJSClass.cpp
+++ b/js/xpconnect/src/XPCWrappedJSClass.cpp
@@ -232,6 +232,9 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
     if (!JS_GetPropertyById(cx, jsobj, funid, fun.address()) || JSVAL_IS_PRIMITIVE(fun))
         return nullptr;
 
+    // protect fun so that we're sure it's alive when we call it
+    AUTO_MARK_JSVAL(cx, fun);
+
     // Ensure that we are asking for a scriptable interface.
     // NB:  It's important for security that this check is here rather
     // than later, since it prevents untrusted objects from implementing
@@ -268,6 +271,7 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
                          "JS failed without setting an exception!");
 
             RootedValue jsexception(cx, NullValue());
+            AUTO_MARK_JSVAL(cx, jsexception.address());
 
             if (JS_GetPendingException(cx, jsexception.address())) {
                 nsresult rv;
@@ -712,9 +716,12 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
     }
 
     // check if the JSObject claims to implement this interface
-    RootedObject jsobj(ccx, CallQueryInterfaceOnJSObject(ccx, self->GetJSObject(),
-                                                         aIID));
+    JSObject* jsobj = CallQueryInterfaceOnJSObject(ccx, self->GetJSObject(),
+                                                   aIID);
     if (jsobj) {
+        // protect jsobj until it is actually attached
+        AUTO_MARK_JSVAL(ccx, OBJECT_TO_JSVAL(jsobj));
+
         // We can't use XPConvert::JSObject2NativeInterface() here
         // since that can find a XPCWrappedNative directly on the
         // proto chain, and we don't want that here. We need to find
@@ -1284,7 +1291,8 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16_t methodIndex,
         nsXPTType datum_type;
         uint32_t array_count;
         bool isArray = type.IsArray();
-        RootedValue val(cx, NullValue());
+        RootedValue val(cx, JSVAL_NULL);
+        AUTO_MARK_JSVAL(ccx, val.address());
         bool isSizedString = isArray ?
                 false :
                 type.TagPart() == nsXPTType::T_PSTRING_SIZE_IS ||
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index b518645259f9..dc72f426a50f 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -503,7 +503,9 @@ XPCWrappedNative::GetNewOrUsed(XPCCallContext& ccx,
 
     RootedObject parent(ccx, Scope->GetGlobalJSObject());
 
-    RootedValue newParentVal(ccx, JSVAL_NULL);
+    jsval newParentVal = JSVAL_NULL;
+    XPCMarkableJSVal newParentVal_markable(&newParentVal);
+    AutoMarkingJSVal newParentVal_automarker(ccx, &newParentVal_markable);
     JSBool needsSOW = false;
     JSBool needsCOW = false;
 
@@ -2439,6 +2441,7 @@ CallMethodHelper::GatherAndConvertResults()
         const nsXPTType& type = paramInfo.GetType();
         nsXPTCVariant* dp = GetDispatchParam(i);
         RootedValue v(mCallContext, NullValue());
+        AUTO_MARK_JSVAL(mCallContext, v.address());
         uint32_t array_count = 0;
         nsXPTType datum_type;
         bool isArray = type.IsArray();
diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
index 457cf19de90c..de781293e608 100644
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -424,6 +424,9 @@ DefinePropertyIfFound(XPCCallContext& ccx,
     if (!member->NewFunctionObject(ccx, iface, obj, funval.address()))
         return false;
 
+    // protect funobj until it is actually attached
+    AUTO_MARK_JSVAL(ccx, funval);
+
 #ifdef off_DEBUG_jband
     {
         static int cloneCount = 0;
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index d0aec76d00c8..e8e9ee71e9b3 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -1593,6 +1593,7 @@ nsXPConnect::CreateSandbox(JSContext *cx, nsIPrincipal *principal,
     *_retval = nullptr;
 
     RootedValue rval(cx, JSVAL_VOID);
+    AUTO_MARK_JSVAL(ccx, rval.address());
 
     SandboxOptions options(cx);
     nsresult rv = xpc_CreateSandboxObject(cx, rval.address(), principal, options);
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 919f835904c1..bcc2d5532602 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -3856,6 +3856,25 @@ private:
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
+/***************************************************************************/
+class XPCMarkableJSVal
+{
+public:
+    XPCMarkableJSVal(jsval val) : mVal(val), mValPtr(&mVal) {}
+    XPCMarkableJSVal(jsval *pval) : mVal(JSVAL_VOID), mValPtr(pval) {}
+    ~XPCMarkableJSVal() {}
+    void Mark() {}
+    void TraceJS(JSTracer* trc)
+    {
+        JS_CallValueTracer(trc, *mValPtr, "XPCMarkableJSVal");
+    }
+    void AutoTrace(JSTracer* trc) {}
+private:
+    XPCMarkableJSVal(); // not implemented
+    jsval  mVal;
+    jsval* mValPtr;
+};
+
 /***************************************************************************/
 // AutoMarkingPtr is the base class for the various AutoMarking pointer types
 // below. This system allows us to temporarily protect instances of our garbage
@@ -3935,6 +3954,7 @@ typedef TypedAutoMarkingPtr<XPCNativeSet> AutoMarkingNativeSetPtr;
 typedef TypedAutoMarkingPtr<XPCWrappedNative> AutoMarkingWrappedNativePtr;
 typedef TypedAutoMarkingPtr<XPCWrappedNativeTearOff> AutoMarkingWrappedNativeTearOffPtr;
 typedef TypedAutoMarkingPtr<XPCWrappedNativeProto> AutoMarkingWrappedNativeProtoPtr;
+typedef TypedAutoMarkingPtr<XPCMarkableJSVal> AutoMarkingJSVal;
 typedef TypedAutoMarkingPtr<XPCNativeScriptableInfo> AutoMarkingNativeScriptableInfoPtr;
 
 template<class T>
@@ -3987,6 +4007,14 @@ class ArrayAutoMarkingPtr : public AutoMarkingPtr
 
 typedef ArrayAutoMarkingPtr<XPCNativeInterface> AutoMarkingNativeInterfacePtrArrayPtr;
 
+#define AUTO_MARK_JSVAL_HELPER2(tok, line) tok##line
+#define AUTO_MARK_JSVAL_HELPER(tok, line) AUTO_MARK_JSVAL_HELPER2(tok, line)
+
+#define AUTO_MARK_JSVAL(cx, val)                                              \
+    XPCMarkableJSVal AUTO_MARK_JSVAL_HELPER(_val_,__LINE__)(val);             \
+    AutoMarkingJSVal AUTO_MARK_JSVAL_HELPER(_automarker_,__LINE__)            \
+    (cx, &AUTO_MARK_JSVAL_HELPER(_val_,__LINE__))
+
 /***************************************************************************/
 // Allocates a string that grants all access ("AllAccess")
 

From d293f8f75cb73b16b3647af8afe31654fe126ba4 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Tue, 16 Apr 2013 09:09:11 -0700
Subject: [PATCH 029/438] Bug 855276: Diagnostic patch. r=bent

---
 dom/indexedDB/TransactionThreadPool.cpp | 2 +-
 dom/indexedDB/TransactionThreadPool.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/indexedDB/TransactionThreadPool.cpp b/dom/indexedDB/TransactionThreadPool.cpp
index ff599ef15456..2a331f2f4960 100644
--- a/dom/indexedDB/TransactionThreadPool.cpp
+++ b/dom/indexedDB/TransactionThreadPool.cpp
@@ -463,7 +463,7 @@ TransactionThreadPool::HasTransactionsForDatabase(IDBDatabase* aDatabase)
 }
 
 bool
-TransactionThreadPool::MaybeFireCallback(DatabasesCompleteCallback& aCallback)
+TransactionThreadPool::MaybeFireCallback(DatabasesCompleteCallback aCallback)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
diff --git a/dom/indexedDB/TransactionThreadPool.h b/dom/indexedDB/TransactionThreadPool.h
index 82d1ad3ca90b..b8ea52a20bf8 100644
--- a/dom/indexedDB/TransactionThreadPool.h
+++ b/dom/indexedDB/TransactionThreadPool.h
@@ -173,7 +173,7 @@ protected:
 
   TransactionQueue& GetQueueForTransaction(IDBTransaction* aTransaction);
 
-  bool MaybeFireCallback(DatabasesCompleteCallback& aCallback);
+  bool MaybeFireCallback(DatabasesCompleteCallback aCallback);
 
   nsCOMPtr<nsIThreadPool> mThreadPool;
 

From 828aa2ec132ca963c19baa98838f86c7a8e9e4de Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Tue, 16 Apr 2013 09:10:00 -0700
Subject: [PATCH 030/438] Bug 857669: Remove unused traversal method. r=mounir

---
 content/html/content/src/nsHTMLFormElement.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index c867111e0ed4..9938d7af3aef 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -2199,16 +2199,6 @@ nsFormControlList::FlushPendingNotifications()
   }
 }
 
-static PLDHashOperator
-ControlTraverser(const nsAString& key, nsISupports* control, void* userArg)
-{
-  nsCycleCollectionTraversalCallback *cb = 
-    static_cast<nsCycleCollectionTraversalCallback*>(userArg);
- 
-  cb->NoteXPCOMChild(control);
-  return PL_DHASH_NEXT;
-}
-
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFormControlList)
   tmp->Clear();
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER

From 8749ed336490f50453a20b94555e183095b98d65 Mon Sep 17 00:00:00 2001
From: Gabor Krizsanits <gkrizsanits@mozilla.com>
Date: Tue, 16 Apr 2013 11:31:26 +0200
Subject: [PATCH 031/438] Bug 820170 - Wrapping nodes into documents
 compartment. r=bholley

---
 content/base/src/nsDocument.cpp               |  7 ++++
 content/xul/document/src/XULDocument.cpp      | 29 +++++++++++++-
 dom/base/nsDOMClassInfo.cpp                   | 39 +++++--------------
 .../tests/unit/test_allowedDomainsXHR.js      | 39 ++++++++++++++-----
 4 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 3e96cb5af72e..0c196d84f3c5 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1852,6 +1852,13 @@ nsDocument::Init()
   mRadioGroups.Init();
   mCustomPrototypes.Init();
 
+  // If after creation the owner js global is not set for a document
+  // we use the default compartment for this document, instead of creating
+  // wrapper in some random compartment when the document is exposed to js
+  // via some events.
+  mScopeObject = do_GetWeakReference(xpc::GetNativeForGlobal(xpc::GetJunkScope()));
+  MOZ_ASSERT(mScopeObject);
+
   // Force initialization.
   nsINode::nsSlots* slots = Slots();
 
diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp
index 14dcfdc6ac0b..a53b32d84035 100644
--- a/content/xul/document/src/XULDocument.cpp
+++ b/content/xul/document/src/XULDocument.cpp
@@ -1517,6 +1517,29 @@ XULDocument::GetHeight(ErrorResult& aRv)
     return height;
 }
 
+JSObject*
+GetScopeObjectOfNode(nsIDOMNode* node)
+{
+    MOZ_ASSERT(node, "Must not be called with null.")
+
+    // Window root occasionally keeps alive a node of a document whose
+    // window is already dead. If in this brief period someone calls
+    // GetPopupNode and we return that node, nsNodeSH::PreCreate will throw,
+    // because it will not know which scope this node belongs to. Returning
+    // an orphan node like that to JS would be a bug anyway, so to avoid
+    // this, let's do the same check as nsNodeSH::PreCreate does to
+    // determine the scope and if it fails let's just return null in
+    // XULDocument::GetPopupNode.
+    nsCOMPtr<nsINode> inode = do_QueryInterface(node);
+    MOZ_ASSERT(inode, "How can this happen?");
+
+    nsIDocument* doc = inode->OwnerDoc();
+    MOZ_ASSERT(inode, "This should never happen.");
+
+    nsIGlobalObject* global = doc->GetScopeObject();
+    return global ? global->GetGlobalJSObject() : nullptr;
+}
+
 //----------------------------------------------------------------------
 //
 // nsIDOMXULDocument interface
@@ -1539,8 +1562,10 @@ XULDocument::GetPopupNode(nsIDOMNode** aNode)
         }
     }
 
-    if (node && nsContentUtils::CanCallerAccess(node))
-      node.swap(*aNode);
+    if (node && nsContentUtils::CanCallerAccess(node)
+        && GetScopeObjectOfNode(node)) {
+        node.swap(*aNode);
+    }
 
     return NS_OK;
 }
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 3a7a3c3cf3fb..ee9dfc7fa9d0 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -5550,18 +5550,6 @@ nsNodeSH::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj,
   // See http://bugzilla.mozilla.org/show_bug.cgi?id=227417
   nsIDocument* doc = node->OwnerDoc();
 
-  // If we have a document, make sure one of these is true
-  // (1) it has a script handling object,
-  // (2) has had one, or has been marked to have had one,
-  // (3) we are running a privileged script.
-  // Event handling is possible only if (1). If (2) event handling is prevented.
-  // If document has never had a script handling object,
-  // untrusted scripts (3) shouldn't touch it!
-  bool hasHadScriptHandlingObject = false;
-  NS_ENSURE_STATE(doc->GetScriptHandlingObject(hasHadScriptHandlingObject) ||
-                  hasHadScriptHandlingObject ||
-                  nsContentUtils::IsCallerChrome());
-
   nsINode *native_parent;
 
   bool nodeIsElement = node->IsElement();
@@ -5610,26 +5598,17 @@ nsNodeSH::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj,
     }
   } else {
     // We're called for a document object; set the parent to be the
-    // document's global object, if there is one
+    // document's global object
 
-    // Get the scope object from the document.
-    nsISupports *scope = doc->GetScopeObject();
+    // Document should know its global but if the owner window of the
+    // document is already dead at this point, then just throw.
+    nsIGlobalObject* scope = doc->GetScopeObject();
+    NS_ENSURE_TRUE(scope, NS_ERROR_UNEXPECTED);
 
-    if (scope) {
-        jsval v;
-        nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-        nsresult rv = WrapNative(cx, globalObj, scope, false, &v,
-                                 getter_AddRefs(holder));
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        holder->GetJSObject(parentObj);
-    }
-    else {
-      // No global object reachable from this document, use the
-      // global object that was passed to this method.
-
-      *parentObj = globalObj;
-    }
+    *parentObj = scope->GetGlobalJSObject();
+    // Guarding against the case when the native global is still alive
+    // but the JS global is not.
+    NS_ENSURE_TRUE(*parentObj, NS_ERROR_UNEXPECTED);
 
     // No slim wrappers for a document's scope object.
     return node->ChromeOnlyAccess() ?
diff --git a/js/xpconnect/tests/unit/test_allowedDomainsXHR.js b/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
index 20e82224b766..183484737ab5 100644
--- a/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
+++ b/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
@@ -32,8 +32,17 @@ function checkResults(xhr)
   return true;
 }
 
+var httpServersClosed = 0;
+function finishIfDone()
+{
+  if (++httpServersClosed == 2)
+    do_test_finished();
+}
+
 function run_test()
 {
+  do_test_pending();
+
   httpserver.registerPathHandler(testpath, serverHandler);
   httpserver.start(4444);
 
@@ -45,14 +54,6 @@ function run_test()
   var res = cu.evalInSandbox('var sync = createXHR("4444/simple"); sync.send(null); sync', sb);
   checkResults(res);
 
-  // Test async XHR sending
-  var async = cu.evalInSandbox('var async = createXHR("4444/simple", true); async', sb);
-  async.addEventListener("readystatechange", function(event) {
-    if (checkResults(async))
-      httpserver.stop(do_test_finished);
-  }, false);
-  async.send(null);
-
   // negative test sync XHR sending (to ensure that the xhr do not have chrome caps, see bug 779821)
   try {
     cu.evalInSandbox('var createXHR = ' + createXHR.toString(), sb);
@@ -61,8 +62,28 @@ function run_test()
   } catch (e) {
     do_check_true(true);
   }
+
+  httpserver2.stop(finishIfDone);
+
+  // Test async XHR sending
+  sb.finish = function(){
+    httpserver.stop(finishIfDone);
+  }
+
+  sb.checkResults = checkResults;
   
-  do_test_pending();
+  sb.do_check_eq = do_check_eq;
+
+  function changeListener(event) {
+    if (checkResults(async))
+      finish();
+  }
+
+  var async = cu.evalInSandbox('var async = createXHR("4444/simple", true);' +
+                               'async.addEventListener("readystatechange", ' +
+                                                       changeListener.toString() + ', false);' +
+                               'async', sb);
+  async.send(null);
 }
 
 function serverHandler(metadata, response)

From e87cea32d3ccf48e3b5079505d93021d4f33bb8f Mon Sep 17 00:00:00 2001
From: Rodrigo Silveira <rsilveira@mozilla.com>
Date: Sat, 13 Apr 2013 18:21:27 -0700
Subject: [PATCH 032/438] Bug 854077 - Use radio buttons for "Do Not Track"
 options and add a neutral option r=ally

--HG--
rename : browser/metro/base/tests/mochitest/browser_sanitize_ui.js => browser/metro/base/tests/mochitest/browser_prefs_ui.js
extra : rebase_source : 331345b81ff030f6cd6fa2f2e1bf20f276c82ce7
---
 .../base/content/bindings/toggleswitch.xml    |  4 +-
 browser/metro/base/content/browser.css        |  6 ++-
 browser/metro/base/content/browser.xul        | 11 +++-
 browser/metro/base/content/preferences.js     |  6 +++
 .../metro/base/tests/mochitest/Makefile.in    |  2 +-
 ...ser_sanitize_ui.js => browser_prefs_ui.js} | 54 +++++++++++++++++--
 .../locales/en-US/chrome/preferences.dtd      | 10 ++--
 browser/metro/theme/browser.css               |  5 ++
 8 files changed, 84 insertions(+), 14 deletions(-)
 rename browser/metro/base/tests/mochitest/{browser_sanitize_ui.js => browser_prefs_ui.js} (61%)

diff --git a/browser/metro/base/content/bindings/toggleswitch.xml b/browser/metro/base/content/bindings/toggleswitch.xml
index 2bcdf4d506ed..48b503b2097a 100644
--- a/browser/metro/base/content/bindings/toggleswitch.xml
+++ b/browser/metro/base/content/bindings/toggleswitch.xml
@@ -20,8 +20,8 @@
         <xul:description anonid="onlabel" class="onlabel" value="&checkbox.on.label;" xbl:inherits="value=onlabel"/>
         <xul:description anonid="offlabel" class="offlabel" value="&checkbox.off.label;" xbl:inherits="value=offlabel"/>
         <xul:radiogroup anonid="group" xbl:inherits="disabled">
-          <xul:radio anonid="on" class="checkbox-radio-on"/>
-          <xul:radio anonid="off" class="checkbox-radio-off"/>
+          <xul:radio type="toggle" anonid="on" class="checkbox-radio-on"/>
+          <xul:radio type="toggle" anonid="off" class="checkbox-radio-off"/>
         </xul:radiogroup>
       </xul:hbox>
     </content>
diff --git a/browser/metro/base/content/browser.css b/browser/metro/base/content/browser.css
index a30cbc4bddb4..e97123f2199c 100644
--- a/browser/metro/base/content/browser.css
+++ b/browser/metro/base/content/browser.css
@@ -118,10 +118,14 @@ placelabel {
   -moz-binding: url("chrome://browser/content/bindings/bindings.xml#place-label");
 }
 
-radio {
+radio[type="toggle"] {
   -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
 }
 
+radiogroup {
+  -moz-binding: url("chrome://global/content/bindings/radio.xml#radiogroup");
+}
+
 checkbox.toggleswitch {
   -moz-binding: url("chrome://browser/content/bindings/toggleswitch.xml#checkbox-toggleswitch");
 }
diff --git a/browser/metro/base/content/browser.xul b/browser/metro/base/content/browser.xul
index 5bb1616c2d33..25fedd3611f9 100644
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -461,8 +461,15 @@
         </hbox>
       </settings>
       <setting pref="signon.rememberSignons" title="&optionsHeader.privacy.passwords.label;" type="bool"/>
-      <settings id="prefs-donottrack" label="&optionsHeader.privacy.doNotTrack.title;">
-        <setting pref="privacy.donottrackheader.enabled" title="&optionsHeader.privacy.doNotTrack.label;" type="bool"/>
+      <settings id="prefs-dnt" label="&doNotTrack.title;">
+        <description>&doNotTrack.desc;</description>
+        <setting id="prefs-dnt-value" pref="privacy.donottrackheader.value" onpreferencechanged="PreferencesPanelView.onDNTPreferenceChanged()" type="radio" >
+          <radiogroup id="prefs-dnt-options">
+            <radio id="prefs-dnt-notrack" label="&doNotTrack.options.trackingNotOkay;" value="1"/>
+            <radio id="prefs-dnt-nopref" label="&doNotTrack.options.noPreference;" value="-1"/>
+            <radio id="prefs-dnt-oktrack" label="&doNotTrack.options.trackingOkay;" value="0"/>
+          </radiogroup>
+        </setting>
       </settings>
     </flyoutpanel>
 
diff --git a/browser/metro/base/content/preferences.js b/browser/metro/base/content/preferences.js
index a6bd1b3d8da9..3b92112857ed 100644
--- a/browser/metro/base/content/preferences.js
+++ b/browser/metro/base/content/preferences.js
@@ -12,5 +12,11 @@ var PreferencesPanelView = {
         SanitizeUI.init();
       }
     }, false);
+  },
+  onDNTPreferenceChanged: function onDNTPreferenceChanged() {
+    let dntNoPref = document.getElementById("prefs-dnt-nopref");
+
+    // When "tell sites nothing about my preferences" is selected, disable do not track.
+    Services.prefs.setBoolPref("privacy.donottrackheader.enabled", !dntNoPref.selected);
   }
 };
diff --git a/browser/metro/base/tests/mochitest/Makefile.in b/browser/metro/base/tests/mochitest/Makefile.in
index bc3ce41e58e1..852fa3f04f5e 100644
--- a/browser/metro/base/tests/mochitest/Makefile.in
+++ b/browser/metro/base/tests/mochitest/Makefile.in
@@ -29,7 +29,7 @@ BROWSER_TESTS = \
   browser_context_menu_tests_02.html \
   browser_context_menu_tests_03.html \
   text-block.html \
-  browser_sanitize_ui.js \
+  browser_prefs_ui.js \
   browser_topsites.js \
   browser_tabs.js \
   $(NULL)
diff --git a/browser/metro/base/tests/mochitest/browser_sanitize_ui.js b/browser/metro/base/tests/mochitest/browser_prefs_ui.js
similarity index 61%
rename from browser/metro/base/tests/mochitest/browser_sanitize_ui.js
rename to browser/metro/base/tests/mochitest/browser_prefs_ui.js
index 374d9bb8fa14..97c1fea05338 100644
--- a/browser/metro/base/tests/mochitest/browser_sanitize_ui.js
+++ b/browser/metro/base/tests/mochitest/browser_prefs_ui.js
@@ -39,11 +39,8 @@ gTests.push({
     // Show options flyout
     let promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
     Elements.prefsFlyout.show();
-
     yield promise;
 
-    ok(promise && !(promise instanceof Error), "Wait for PopupChanged");
-
     // Make sure it's opened
     yield waitForEvent(Elements.prefsFlyout, "transitionend", 1000);
 
@@ -93,12 +90,59 @@ gTests.push({
     });
 
     // hide options flyout
-    promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
+    let promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
     Elements.prefsFlyout.hide();
+    yield promise;
+  }
+});
 
+function checkDNTPrefs(aExpectedEnabled, aExpectedValue) {
+  let currentEnabled = Services.prefs.getBoolPref("privacy.donottrackheader.enabled");
+  let currentValue = Services.prefs.getIntPref("privacy.donottrackheader.value");
+
+  let enabledTestMsg = "testing privacy.donottrackheader.enabled, expected "
+    + aExpectedEnabled + " got " + currentEnabled;
+
+  ok(aExpectedEnabled === currentEnabled, enabledTestMsg);
+
+  let valueTestMsg = "testing privacy.donottrackheader.value, expected "
+    + aExpectedValue + " got " + currentValue;
+
+  ok(aExpectedValue === currentValue, valueTestMsg);
+}
+
+gTests.push({
+  desc: "Test do not track settings",
+  run: function testDNT() {
+    let noTrack = document.getElementById("prefs-dnt-notrack");
+    let noPref = document.getElementById("prefs-dnt-nopref");
+    let okTrack = document.getElementById("prefs-dnt-oktrack");
+
+    // Show options flyout
+    let promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
+    Elements.prefsFlyout.show();
     yield promise;
 
-    ok(promise && !(promise instanceof Error), "Wait for PopupChanged");
+    noPref.click();
+    // See https://mxr.mozilla.org/mozilla-central/source/modules/libpref/src/init/all.js?rev=0aab2bb76b45#755
+    // -1 - tell sites nothing about preferences
+    yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === -1);
+    checkDNTPrefs(false, -1);
+
+    noTrack.click();
+    // 1 - tell sites tracking is unacceptable
+    yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === 1);
+    checkDNTPrefs(true, 1);
+
+    okTrack.click();
+    // 0 - tell sites tracking is acceptable
+    yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === 0);
+    checkDNTPrefs(true, 0);
+
+    // hide options flyout
+    let promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
+    Elements.prefsFlyout.hide();
+    yield promise;
   }
 });
 
diff --git a/browser/metro/locales/en-US/chrome/preferences.dtd b/browser/metro/locales/en-US/chrome/preferences.dtd
index c41c5f1fac8d..9449150ced9e 100644
--- a/browser/metro/locales/en-US/chrome/preferences.dtd
+++ b/browser/metro/locales/en-US/chrome/preferences.dtd
@@ -35,8 +35,12 @@
 <!ENTITY clearPrivateData.logins                                 "Active logins">
 
 <!ENTITY optionsHeader.privacy.passwords.label                   "Remember Passwords">
-<!ENTITY optionsHeader.privacy.doNotTrack.title                  "Tracking">
-<!ENTITY optionsHeader.privacy.doNotTrack.label                  "Tell websites not to track me">
+<!ENTITY doNotTrack.title                                        "Do Not Track">
+<!ENTITY doNotTrack.desc                                         "Tell sites:">
+<!ENTITY doNotTrack.options.trackingNotOkay                      "I do not want to be tracked">
+<!ENTITY doNotTrack.options.noPreference                         "Nothing about my tracking preferences">
+<!ENTITY doNotTrack.options.trackingOkay                         "I want to be tracked">
 
-<!-- ## Sync Flyout Panel ## -->
+
+  <!-- ## Sync Flyout Panel ## -->
 <!-- see sync.dtd -->
diff --git a/browser/metro/theme/browser.css b/browser/metro/theme/browser.css
index 34fa534a9d26..5797334552b1 100644
--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -790,6 +790,11 @@ setting[type="directory"] > .preferences-alignment {
   -moz-box-align: center;
 }
 
+/* Removes the left side title vbox on radio setting */
+setting[type="radio"] > vbox {
+  display: none;
+}
+
 #prefs-homepage-options, #prefs-homepage-popup {
   min-width: 200px;
 }

From c16f555360c2696f9febc00c07077d78a65db15d Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Tue, 16 Apr 2013 19:07:38 +0200
Subject: [PATCH 033/438] Backout changeset baf184596a7b for build errors on a
 CLOSED TREE.

---
 content/base/src/nsDocument.cpp               |  7 ----
 content/xul/document/src/XULDocument.cpp      | 29 +-------------
 dom/base/nsDOMClassInfo.cpp                   | 39 ++++++++++++++-----
 .../tests/unit/test_allowedDomainsXHR.js      | 39 +++++--------------
 4 files changed, 41 insertions(+), 73 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 0c196d84f3c5..3e96cb5af72e 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1852,13 +1852,6 @@ nsDocument::Init()
   mRadioGroups.Init();
   mCustomPrototypes.Init();
 
-  // If after creation the owner js global is not set for a document
-  // we use the default compartment for this document, instead of creating
-  // wrapper in some random compartment when the document is exposed to js
-  // via some events.
-  mScopeObject = do_GetWeakReference(xpc::GetNativeForGlobal(xpc::GetJunkScope()));
-  MOZ_ASSERT(mScopeObject);
-
   // Force initialization.
   nsINode::nsSlots* slots = Slots();
 
diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp
index a53b32d84035..14dcfdc6ac0b 100644
--- a/content/xul/document/src/XULDocument.cpp
+++ b/content/xul/document/src/XULDocument.cpp
@@ -1517,29 +1517,6 @@ XULDocument::GetHeight(ErrorResult& aRv)
     return height;
 }
 
-JSObject*
-GetScopeObjectOfNode(nsIDOMNode* node)
-{
-    MOZ_ASSERT(node, "Must not be called with null.")
-
-    // Window root occasionally keeps alive a node of a document whose
-    // window is already dead. If in this brief period someone calls
-    // GetPopupNode and we return that node, nsNodeSH::PreCreate will throw,
-    // because it will not know which scope this node belongs to. Returning
-    // an orphan node like that to JS would be a bug anyway, so to avoid
-    // this, let's do the same check as nsNodeSH::PreCreate does to
-    // determine the scope and if it fails let's just return null in
-    // XULDocument::GetPopupNode.
-    nsCOMPtr<nsINode> inode = do_QueryInterface(node);
-    MOZ_ASSERT(inode, "How can this happen?");
-
-    nsIDocument* doc = inode->OwnerDoc();
-    MOZ_ASSERT(inode, "This should never happen.");
-
-    nsIGlobalObject* global = doc->GetScopeObject();
-    return global ? global->GetGlobalJSObject() : nullptr;
-}
-
 //----------------------------------------------------------------------
 //
 // nsIDOMXULDocument interface
@@ -1562,10 +1539,8 @@ XULDocument::GetPopupNode(nsIDOMNode** aNode)
         }
     }
 
-    if (node && nsContentUtils::CanCallerAccess(node)
-        && GetScopeObjectOfNode(node)) {
-        node.swap(*aNode);
-    }
+    if (node && nsContentUtils::CanCallerAccess(node))
+      node.swap(*aNode);
 
     return NS_OK;
 }
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index ee9dfc7fa9d0..3a7a3c3cf3fb 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -5550,6 +5550,18 @@ nsNodeSH::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj,
   // See http://bugzilla.mozilla.org/show_bug.cgi?id=227417
   nsIDocument* doc = node->OwnerDoc();
 
+  // If we have a document, make sure one of these is true
+  // (1) it has a script handling object,
+  // (2) has had one, or has been marked to have had one,
+  // (3) we are running a privileged script.
+  // Event handling is possible only if (1). If (2) event handling is prevented.
+  // If document has never had a script handling object,
+  // untrusted scripts (3) shouldn't touch it!
+  bool hasHadScriptHandlingObject = false;
+  NS_ENSURE_STATE(doc->GetScriptHandlingObject(hasHadScriptHandlingObject) ||
+                  hasHadScriptHandlingObject ||
+                  nsContentUtils::IsCallerChrome());
+
   nsINode *native_parent;
 
   bool nodeIsElement = node->IsElement();
@@ -5598,17 +5610,26 @@ nsNodeSH::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj,
     }
   } else {
     // We're called for a document object; set the parent to be the
-    // document's global object
+    // document's global object, if there is one
 
-    // Document should know its global but if the owner window of the
-    // document is already dead at this point, then just throw.
-    nsIGlobalObject* scope = doc->GetScopeObject();
-    NS_ENSURE_TRUE(scope, NS_ERROR_UNEXPECTED);
+    // Get the scope object from the document.
+    nsISupports *scope = doc->GetScopeObject();
 
-    *parentObj = scope->GetGlobalJSObject();
-    // Guarding against the case when the native global is still alive
-    // but the JS global is not.
-    NS_ENSURE_TRUE(*parentObj, NS_ERROR_UNEXPECTED);
+    if (scope) {
+        jsval v;
+        nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
+        nsresult rv = WrapNative(cx, globalObj, scope, false, &v,
+                                 getter_AddRefs(holder));
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        holder->GetJSObject(parentObj);
+    }
+    else {
+      // No global object reachable from this document, use the
+      // global object that was passed to this method.
+
+      *parentObj = globalObj;
+    }
 
     // No slim wrappers for a document's scope object.
     return node->ChromeOnlyAccess() ?
diff --git a/js/xpconnect/tests/unit/test_allowedDomainsXHR.js b/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
index 183484737ab5..20e82224b766 100644
--- a/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
+++ b/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
@@ -32,17 +32,8 @@ function checkResults(xhr)
   return true;
 }
 
-var httpServersClosed = 0;
-function finishIfDone()
-{
-  if (++httpServersClosed == 2)
-    do_test_finished();
-}
-
 function run_test()
 {
-  do_test_pending();
-
   httpserver.registerPathHandler(testpath, serverHandler);
   httpserver.start(4444);
 
@@ -54,6 +45,14 @@ function run_test()
   var res = cu.evalInSandbox('var sync = createXHR("4444/simple"); sync.send(null); sync', sb);
   checkResults(res);
 
+  // Test async XHR sending
+  var async = cu.evalInSandbox('var async = createXHR("4444/simple", true); async', sb);
+  async.addEventListener("readystatechange", function(event) {
+    if (checkResults(async))
+      httpserver.stop(do_test_finished);
+  }, false);
+  async.send(null);
+
   // negative test sync XHR sending (to ensure that the xhr do not have chrome caps, see bug 779821)
   try {
     cu.evalInSandbox('var createXHR = ' + createXHR.toString(), sb);
@@ -62,28 +61,8 @@ function run_test()
   } catch (e) {
     do_check_true(true);
   }
-
-  httpserver2.stop(finishIfDone);
-
-  // Test async XHR sending
-  sb.finish = function(){
-    httpserver.stop(finishIfDone);
-  }
-
-  sb.checkResults = checkResults;
   
-  sb.do_check_eq = do_check_eq;
-
-  function changeListener(event) {
-    if (checkResults(async))
-      finish();
-  }
-
-  var async = cu.evalInSandbox('var async = createXHR("4444/simple", true);' +
-                               'async.addEventListener("readystatechange", ' +
-                                                       changeListener.toString() + ', false);' +
-                               'async', sb);
-  async.send(null);
+  do_test_pending();
 }
 
 function serverHandler(metadata, response)

From e8487ad0c864f30225205d02d82c1349728f074a Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Tue, 31 Jul 2012 15:52:16 -0700
Subject: [PATCH 034/438] Bug 779336 - Replace DOMExpandoMap with a
 js::HashSet; r=bholley

--HG--
extra : rebase_source : 125fbd75b5123c17cda64c9dfe7e09b36c03bb42
---
 js/xpconnect/src/XPCWrappedNativeScope.cpp | 30 ++++++++--------------
 js/xpconnect/src/xpcprivate.h              | 18 +++++++------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp
index 9593accc82da..7a8c385fbf4c 100644
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -390,14 +390,6 @@ WrappedNativeJSGCThingTracer(JSDHashTable *table, JSDHashEntryHdr *hdr,
     return JS_DHASH_NEXT;
 }
 
-static PLDHashOperator
-TraceDOMExpandos(nsPtrHashKey<JSObject> *expando, void *aClosure)
-{
-    JS_CallObjectTracer(static_cast<JSTracer *>(aClosure), expando->GetKey(),
-                        "DOM expando object");
-    return PL_DHASH_NEXT;
-}
-
 // static
 void
 XPCWrappedNativeScope::TraceWrappedNativesInAllScopes(JSTracer* trc, XPCJSRuntime* rt)
@@ -410,8 +402,10 @@ XPCWrappedNativeScope::TraceWrappedNativesInAllScopes(JSTracer* trc, XPCJSRuntim
     // well as any DOM expando objects.
     for (XPCWrappedNativeScope* cur = gScopes; cur; cur = cur->mNext) {
         cur->mWrappedNativeMap->Enumerate(WrappedNativeJSGCThingTracer, trc);
-        if (cur->mDOMExpandoMap)
-            cur->mDOMExpandoMap->EnumerateEntries(TraceDOMExpandos, trc);
+        if (cur->mDOMExpandoSet) {
+            for (DOMExpandoSet::Range r = cur->mDOMExpandoSet->all(); !r.empty(); r.popFront())
+                JS_CallObjectTracer(trc, r.front(), "DOM expando object");
+        }
     }
 }
 
@@ -430,17 +424,13 @@ WrappedNativeSuspecter(JSDHashTable *table, JSDHashEntryHdr *hdr,
     return JS_DHASH_NEXT;
 }
 
-static PLDHashOperator
-SuspectDOMExpandos(nsPtrHashKey<JSObject> *key, void *arg)
+static void
+SuspectDOMExpandos(JSObject *obj, nsCycleCollectionTraversalCallback &cb)
 {
-    nsCycleCollectionTraversalCallback *cb =
-      static_cast<nsCycleCollectionTraversalCallback *>(arg);
-    JSObject* obj = key->GetKey();
     const dom::DOMClass* clasp = dom::GetDOMClass(obj);
     MOZ_ASSERT(clasp && clasp->mDOMObjectIsISupports);
     nsISupports* native = dom::UnwrapDOMObject<nsISupports>(obj);
-    cb->NoteXPCOMRoot(native);
-    return PL_DHASH_NEXT;
+    cb.NoteXPCOMRoot(native);
 }
 
 // static
@@ -452,8 +442,10 @@ XPCWrappedNativeScope::SuspectAllWrappers(XPCJSRuntime* rt,
 
     for (XPCWrappedNativeScope* cur = gScopes; cur; cur = cur->mNext) {
         cur->mWrappedNativeMap->Enumerate(WrappedNativeSuspecter, &cb);
-        if (cur->mDOMExpandoMap)
-            cur->mDOMExpandoMap->EnumerateEntries(SuspectDOMExpandos, &cb);
+        if (cur->mDOMExpandoSet) {
+            for (DOMExpandoSet::Range r = cur->mDOMExpandoSet->all(); !r.empty(); r.popFront())
+                SuspectDOMExpandos(r.front(), cb);
+        }
     }
 }
 
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index bcc2d5532602..d3db2c98abd4 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -1678,18 +1678,20 @@ public:
     XPCContext *GetContext() { return mContext; }
     void ClearContext() { mContext = nullptr; }
 
-    typedef nsTHashtable<nsPtrHashKey<JSObject> > DOMExpandoMap;
+    typedef js::HashSet<JSObject *,
+                        js::PointerHasher<JSObject *, 3>,
+                        js::SystemAllocPolicy> DOMExpandoSet;
 
     bool RegisterDOMExpandoObject(JSObject *expando) {
-        if (!mDOMExpandoMap) {
-            mDOMExpandoMap = new DOMExpandoMap();
-            mDOMExpandoMap->Init(8);
+        if (!mDOMExpandoSet) {
+            mDOMExpandoSet = new DOMExpandoSet();
+            mDOMExpandoSet->init(8);
         }
-        return mDOMExpandoMap->PutEntry(expando, mozilla::fallible_t());
+        return mDOMExpandoSet->put(expando);
     }
     void RemoveDOMExpandoObject(JSObject *expando) {
-        if (mDOMExpandoMap)
-            mDOMExpandoMap->RemoveEntry(expando);
+        if (mDOMExpandoSet)
+            mDOMExpandoSet->remove(expando);
     }
 
     // Gets the appropriate scope object for XBL in this scope. The context
@@ -1737,7 +1739,7 @@ private:
 
     XPCContext*                      mContext;
 
-    nsAutoPtr<DOMExpandoMap> mDOMExpandoMap;
+    nsAutoPtr<DOMExpandoSet> mDOMExpandoSet;
 
     bool mIsXBLScope;
 

From 68e139c5497d57c358bb09a15af6f722d1a89e61 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Mon, 15 Apr 2013 15:34:27 -0700
Subject: [PATCH 035/438] Bug 859586 - Remove {Start,End,Fail}DocumentLoad
 notifications (r=felipe)

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

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index be1abad75379..a1c4fdf9b670 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3745,6 +3745,7 @@ var XULBrowserWindow = {
       aMaxTotalProgress);
   },
 
+  // This function fires only for the currently selected tab.
   onStateChange: function (aWebProgress, aRequest, aStateFlags, aStatus) {
     const nsIWebProgressListener = Ci.nsIWebProgressListener;
     const nsIChannel = Ci.nsIChannel;
@@ -3752,8 +3753,13 @@ var XULBrowserWindow = {
     if (aStateFlags & nsIWebProgressListener.STATE_START &&
         aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
 
-      if (aRequest && aWebProgress.DOMWindow == content)
-        this.startDocumentLoad(aRequest);
+      if (aRequest && aWebProgress.DOMWindow == content) {
+        // clear out feed data
+        gBrowser.selectedBrowser.feeds = null;
+
+        // clear out search-engine data
+        gBrowser.selectedBrowser.engines = null;
+      }
 
       this.isBusy = true;
 
@@ -3770,11 +3776,6 @@ var XULBrowserWindow = {
       }
     }
     else if (aStateFlags & nsIWebProgressListener.STATE_STOP) {
-      if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK &&
-          aWebProgress.DOMWindow == content &&
-          aRequest)
-        this.endDocumentLoad(aRequest, aStatus);
-
       // This (thanks to the filter) is a network stop or the last
       // request stop outside of loading the document, stop throbbers
       // and progress bars and such
@@ -4073,30 +4074,6 @@ var XULBrowserWindow = {
     if (loadingDone)
       return;
     this.onStatusChange(gBrowser.webProgress, null, 0, aMessage);
-  },
-
-  startDocumentLoad: function XWB_startDocumentLoad(aRequest) {
-    // clear out feed data
-    gBrowser.selectedBrowser.feeds = null;
-
-    // clear out search-engine data
-    gBrowser.selectedBrowser.engines = null;
-
-    var uri = aRequest.QueryInterface(Ci.nsIChannel).URI;
-    try {
-      Services.obs.notifyObservers(content, "StartDocumentLoad", uri.spec);
-    } catch (e) {
-    }
-  },
-
-  endDocumentLoad: function XWB_endDocumentLoad(aRequest, aStatus) {
-    var urlStr = aRequest.QueryInterface(Ci.nsIChannel).originalURI.spec;
-
-    var notification = Components.isSuccessCode(aStatus) ? "EndDocumentLoad" : "FailDocumentLoad";
-    try {
-      Services.obs.notifyObservers(content, notification, urlStr);
-    } catch (e) {
-    }
   }
 };
 

From b27a45bc2873f1540f4e866bc2a7e6a2a3f5577b Mon Sep 17 00:00:00 2001
From: Camilo Viecco <cviecco@mozilla.com>
Date: Wed, 27 Feb 2013 10:30:19 -0800
Subject: [PATCH 036/438] Bug 813418 - Centralize certificate validation (Part
 1, tests). r=bsmith

--HG--
extra : rebase_source : a9d66d37da35b315097af6e20177188a3ef52ce0
---
 build/pgo/certs/cert8.db                      | Bin 65536 -> 65536 bytes
 build/pgo/certs/evintermediate.ca             |  34 ++++++++++
 build/pgo/certs/evroot.ca                     |  32 +++++++++
 build/pgo/certs/key3.db                       | Bin 69632 -> 98304 bytes
 build/pgo/server-locations.txt                |   2 +
 .../manager/ssl/src/nsIdentityChecking.cpp    |  21 +++++-
 .../ssl/tests/mochitest/bugs/Makefile.in      |   2 +
 .../mochitest/bugs/test_ev_validation.html    |  52 +++++++++++++++
 .../bugs/test_ev_validation_child.html        |  62 ++++++++++++++++++
 testing/mochitest/Makefile.in                 |   2 +
 testing/mochitest/intermediate-ev-tester.crl  | Bin 0 -> 541 bytes
 testing/mochitest/root-ev-tester.crl          | Bin 0 -> 557 bytes
 12 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 build/pgo/certs/evintermediate.ca
 create mode 100644 build/pgo/certs/evroot.ca
 create mode 100644 security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html
 create mode 100644 security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html
 create mode 100644 testing/mochitest/intermediate-ev-tester.crl
 create mode 100644 testing/mochitest/root-ev-tester.crl

diff --git a/build/pgo/certs/cert8.db b/build/pgo/certs/cert8.db
index 3123b417b151a77a7ededbd77dc6e9a7c6fae898..aa38b3b0d57ae2c303d6873e659ee0f288853e3e 100644
GIT binary patch
literal 65536
zcmeI52|QF?|G@7oc8aXYG6{)rXNF;rB}<Req7+%G!C)9m_9cWUiLylWRFaaElvF57
zAw`=ONu*UNvb0FW|K1_dn|j{o|GwVO=jn{k{g`v^x%Zy)y}$E2zkBZa{RUzera=&d
zg&=$b1nDDRp(zlALH?l|#5wW>+0V+rvHr7mL9@~CJ3T_5Apg-1S_a)F{lht2pGm(i
zxF8?^2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@
z00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve
z0)PM@@Sh@}0)5bXtM^Rrh@Ow$kZzmqeqFNeDec4B;o7UUqp3kuJE{>iP{UorL}Qjl
z59KkXkg|pHMSYvPBY6S&94VW$ndCugA=VPpi5^5UQH-ds>ZlT|oITf0e!0A_+%!2~
zIXT%lSy{;h$szCo1ONd*01yBK00BS%5C8-K0YCr{00aO5KmZT`1ONd*01yBK00BS%
z5C8-K0YKn4B7j6P=j7x>qOP-jf~LZeY#-oA{KHHf7K6oNa4;V`mtxExF(3Fa7&bNt
zj(9}mfw|amEAi}t*p(~3CO8GLh6Y3tSP0$2A;`Db)6c_~#_%AlV$cJKv*4L%KDVIw
zV$Wa(lSv~e6O3089O?Fc&IDh&k1qi^SQ4Ir7UB^UT0wX4^Je%45sW>Y86I@HH^al3
zC=bh`yK#b&$dMMvF-Rss0lA8|pO0^Vr?;<5&>ZwMg0KKuZjK-~-Cr3!x3U9`I2TqN
zZ3Y)cMAE^9=FOz}(meFh63CfU=z%nMFD6~Z!P6a<66GV3VG>b|sG&}Usn()=Bs57H
zNx~5~zczc48I1773Gy*KeCgiqbVmlwmrnjqv^f$ZGxk<v*dSaaW-0_nVz{x97z|Vq
zuJugrZo%==&%2A6DQ!=mT6Ay|mUP|f+2f+GIsaqS630JJH7&ko`f#qicytM)E3x9^
zs*-FE;g(HquOr=f4<s(+(Mnt}B=LBv_Wea!jp_|9)!eDcy^TFF{1%qaYozgwmVIv`
z6?oJK2b|PB<>NIQKQN0Zl1o+h*i=!@udBP^bI223{`ioTzSUXxX_l0|SKK!bx>9wL
zu=A{zx;-auFkaq0pN(5VR4lCLxL)(TpqF7h)8wdEALT|+3=_jNK1n|ap2^@6GvzEZ
zc3GF*A3N3cRrlF-ns?pq2c=A58$9YP*WOwmUfUt6$luoBqAk{+aJ=B5Y~hv9M78#S
z0tYM(17QwCVrmc~7hp+5#3ZNSMesslHfb>aEnT_jpj|-Opw{lo+IyxWMa0kov+xK)
zB*C*$sCJiDyOmdRXQk!B8|T?Q--qtDdcQxSJv-v*@6e+nxuE0K^JJXlO-V2>N=6XR
z2IDZ8A((=ur17e-GOUz2Cv$d;oQtoomzJvPnEt5h?dj>OJkp!#-YO2>Ojr*+j)2#M
zDX<zl9{CEvXdmZPVn?(T2NokDHF6&JAhd@&db%UZNQLR?Kx3*pc=>3Lm32g|A+nBv
zc(y31s|P97AK8Kpzd3kV#;86|CNOPgV_9z+?EBJq@8tkx@w}wuKSJP3`O}SB?=&^*
z`siG==Cy1s@SyJ?P~A=K-=ERF+Grdt!%#mL^gK1;nYj>m$d%hp3oph5zFOe^`tvqw
z^5M73?mE^N)W39ysh)btrCphL;#@ypq*P#2<A-N89J^0vtW|zmj@_Q`RZ&5F8^ny)
zdT2oAyzu7?ie-uT^MJRu&jnrWp&Oqb5;9lpEO~M4pwm>oj-JXq<C!{e^c&_ml6jAQ
z$BN_OPYAC4Ym4WV$}8UZOm*nJQtQ-fvum4hLm#8KsQ5Ui6~`yOnP$>iAFP+3%Lv47
z*kiw*?mt$mK#1=D4U|16^5Y>*aKzoeq0z-)5kv}+QElqiQEg;cBFe%t=pG)y8Oyvq
zofu3yVSyjRk?u%X>gCIDX9UxH8J-?QX_gv6Ml=ybwizD&G$zAw>^L-Dt&bG=_l7bo
zdQVv=hJK%hB0tPxh1bXHvy&iBIFeljF=<3b%o)sg{r(?0lz%f{G>IfN$~W_6I0;AG
z`y0akpD^J@EIgc`5F+ru5cj`lx&6wDxs<qa;ocN;Y{|X#5)Q{TxK?dzu)r>NDt~<u
zKI;3l@8H~RM$g!&HFJIZ1Xb&|kONYuynGZBa1NWAAy%}yW5ZCHS4mNFlWgRxbs}kV
z9>m$ref@U!#wYki8!bu?8U&_=2iEcwD@`|_M$%q%L~E^TP<d2UiQ<rXWv|tvdGB^6
z%R9EZ+r?!E=}2=HFAhB5xVLA@8iMD=r#&Yxu_aDhq*d8|SLYUkNop1-F%3DRv7m4;
zzfVTZ&Lo73;^S6$zh+0>=HAR_3tdm!n#r!d+;=UdMbyV}p+~9`v1%?Oh~jis^WGU%
z8+`dRg$HWRmMhMjPin}JC3f9UoS#S*`*KL3bi|6mvcr*BEX#~XhGHxXAvQDDx|lyO
zG5zx~7(5<_W!E2L<Iv2XND@q}!%r&c%3>EO^>MB_+=rMo{OA~r+Bh6Y0=MyprqFL>
z;~?XuAWB3I&kJ*ZwM1|jm<P?Aib7?}gmuw`G+qN%hsl}5Ow}0WAJ{u%hvDz+p2g_#
z1iT4s1kY!mhFCjz%q!Dqar6%p<;#Wn|64)K>%L*V&oX2JK5^<QUT$O8+jTOgxtQC}
zYvtYc?$)|fH5V((nK~7RgdRJvZKrjdI~4acQ+k7p_Ev*gyHu16MD?JigK*kzyUV6r
z{UxFh?;EO~=SIT<*x1pe>^<kXfY>>rJXb&UW}P}<>#@Ggw5k4$uEo>F`_cu=mmSPn
zxjOGvM(#0EQgy-gol9uPQW|g0%Pumyp})rGzGrmZ?C`X6j+LsP0?I`<_gALco}IQX
zvW&}qRto<m=Yw8@lxGIX{xSwvZy%6Mu=RgGbU&+9E<OF+D*m%2OWo8CC`P>u_#!BF
zHIx^-B<E64@3ECpfkF7IMv6J2?e1YwrRQx1csZ=;{=?%X2J=rG95|8RQbQj1A?Rx}
zp*u*%Ke45V_4<z;=g{AtGek`s%o#`sQND%9CNXT{;4l$qzBh7&zgm(wLGG0vZXTWi
z9>`1yYnp>Zgpqj-iW-GXMC=6Q>$fDVFlNqWWS)iYs7w#^VtCWX8LDu^zOk1?=MEy`
zk*T6sY(xZf&|&F}#4n8|_g)ckH9Pel?IT|;b8<SkaWJK-g!lqif9nwEvDbCtm~KzF
zvoEo@p-ReRe&3)_WY0TcrQSLr9Z9@P-Ep-KZc7Ijzud)Nacb9Tb8-LEr%A3Nt3H#p
z7H9^??EG`K&9?l`FUwvfzxyC=YaLJ7Qe36SHJ~lBv3i~}Ysed0J@j!8sn=d3`E7IK
ztEWa(GwNtVHYdvh>}4wt64Z*H#Ya_mPT|csOl;wpi6Kc&xzcAfP$~Q=t}QBz<KbE(
zt4sEY#_u+ir{*rPVsE#2uMy@*yz2cTS23qp>`J3{j=_-5n-=Ym=d}X~(Ym`9#V1gc
zq38a`E(!A9_pI?+Df+mUpv5subd)H~!*PTugh6lKkMGuS#}$I09~}pYBb|7{Lvero
zPNEM9ihsR0_D7W&uBj*lc{zI$eCXc(bZ>$K-P@Pp#Be}nt02f7`Nc-q^)EgoP5h9h
z0LvqTA@cYnZ9#YU^7N*82N4XvU58-c=j-B$P9x%A5uy-0ZMZPcn280nwaEE@yc0V?
z^@p2>{9Gm7$ARWWr}_HQ9Nb7qYavKLENt=QHcXs2!UrcfH6S2B#h&J<?CckW&SH-0
z2rM5o1u^%y5FOz?tRwJ*Ej-rWb&1KWH>!DHDoiG7l3+4fouzrkCdUXMujFvEJlu$A
zqoD5^`BTkP`|7ZqegXttvMVo;NtyOQVUy{V?Dz&hSD}0r8?VFbTM`<3BsFiI-Ogak
zuaojC+QaSjs&M*=>Zk9T*julv8sAqja^7!|RCnSw%yH<p$sF@NW*Z-rDo>raff~D9
zXPbTwzX)IcG-%eex#nawrBpeZV*Ns$3mE*RT#@?&=eeUM(mYG1Rn?u{#9=shMKo^d
zlCvi~EW$!12G036`Zs2Y6dUxkeq0>*$v&`hMrBI+0M;fkuBhDlCHsm8F;gRNynX!c
zf>W^m^|#^n0)vI6dzaqQ^XlBNui~}dbq9gfFYZR?tyIHz$;8|m5NmmqF9%8PN?S9<
zPtZet$AhMNfxK(Ih1PLn1(yh6Si&%g-SLMVh{)<dlU<dun(-Hs_Pu8OMRDwS$ir>s
z9;3Y>Xa)p@BX5}|(Dyi)K$L<dhLx7^sGc1=KZI6E=GVo(DQO7R39P9R%qfTm(FX;{
zHhrS0kspskBYhXO6sT$>b#>HgprS^@NOFSa{IsLyg<#CB1K&#a_JxaF&F$LZ?kyEO
zB;}e^RLahO?^>$DTG$pQTghmx#GDOHd~<}+T;Vi3W2Iq=ZSnl#?Uw^M-p$PvI^qD?
zX1sS5>F1=JJy9cj&9~0V^hUUX#vfA3MrqcXo>X17_4LEHQ-=PqTNv7Z)Uu>?m9hPe
zWp|}EV+)6$iuvIw-%U=BfAxhL4FX$Sy{k1;!zvFwcU-<3GiZ|7aXC{_z;BbkgV9rl
zOL}IMOSN8{XDt4R-Us4Q;^nYG<M{c!5_n>KPxVTLIeCM`Qi&%!gx_4K%2=$CvSn7#
z{p`5h5Pxf59-AFUwr=z2*5r^^nRQvH`QUE;@T#_h$KO2aIAbE=A2>ZH-s<_9Mc=G9
z#8#L9H7XXO6YRr|Il<@vfjP$#hO>w;%$!IVWQYV<YFHRWedtUlWgmvK$9GoXuvQ-t
z1)}CS$v~3uUpdFmEXnLuUeT5O68+DkE<K)YAm*XdR40YZ)kJ%0%nQUW-f#S-*=vw?
zx{`9&&`@+;f%s<La-(FX_Le7!dxV}pEbx2?-BEJ>LYzbATq|v&^J42JWB8iFlJgsI
zS1ty47q5J_>Ggw%k7c>41E=ko(!43kars2?Phn!09JFRBhj)}=uTG@Tt;!YUpBeU5
zq;C?!B|g)Y*hySxcY^(VOO`;-b*s~T7hI%rYLCC`H03PhdU3;)7gMqD7C&9tr1N@C
z*5I+*_9d=Z<2|IRz2d~s?nUAAtjW!HBsKDwWxk2{4R5xcd43~V?$i=)Yif%^p<__b
z?X1H5-mLT?<+44@B|!mErb$ld{TRL-s8IX`%BX}OQ`En{rPwj2M#beG`pki)K>~<9
zVTXuI%|zldiNgs?A!)+uBoYjhk^iXJjZIFfVe>QbZR=3T#jH=acM<do=;^+?->c-%
zVah>o-Pg{`wB5WPbBYY!eRM@hm9|32BIKC0>>9p}6>QHp>q_ms+92+kG;2Z4k*H3o
z{rQF;Hev&U>Z^qE*p?-1%*~9u^_p=-B*Tf3ajddu#gn@GQa*VHnT4X2*o&v8nBBd$
zWK(aSZbGq2=dhMTUXR05k&cYa`*FhT$SXK32KvqvL=|0O^FDv~DARL?wKuF<@X<c5
zL}KBV>a?=Z?pwzO%2i9GrIuc^UAXA=v#myc8m-AD2CA}~1j-7!v~H{T73Q6flq(B9
zww=NAUSi!e_8raV2LAjUFnFzF^@(QD`jCPA7U9$`gASiu(xsxk{F)!O6k&w&@ek_C
z(=!Ug#jHF9jvu~>8sEO7X1xOqmF!6rDo%C?qM+XHuo@AOt6{}A2U)G4MkFIE0#pJ$
zl$BiqX|DDzbY~JRm`r1`vRngcOfN^K7yD?*(e(xH!wVl&JiVQvQ446a82Wq!K^o{(
z%-^~oGN&Uoda@s06ZiK{jH(Lc73<%DfE}$6t98hn6SRu%?Ss7ef(THTUZ@_wUbOCF
zU0IzW?F-sRw1c(RXs1!PP@SpoHS;M4DH|zkDG$`$)h)>{NqbaMR8A=yD#t1upUpnI
zU7k(8T#ik?W0soi;7l_aj+v`x(#1=WXJGIF1ONd*01yBK00BS%5C8-K0YCr{00aO5
zKmZT`1ONd*01yBK00BS%5C8=JO#;Yk@DXR}3<z0L$CipXONR}=1|Q?(IDX~G@8Czr
zT1`CSG_6L3VdORZSEp%K^0#2{EBB-9fhA65!9CHIEBA_=;A*RJRB`lDo!7qnOf_}p
zy=3L(DLYi{6~qeDsg742It#=eY<6#OP|$uCVA4nb{GpbL!JO8j)-Qj=fY)C*TD$G3
zU(Otwi+z^?Tkyy8Ij3rSHQcgux126^4Nclt^dd~Dt=cXzq-Jm7p=g=H9PcCswY<u{
zY)5+9iQ3eQskiV)xHpShh2OQZf(#YO@t(XJ9pb(`^LHsFep1lh`p^Wf^NzhoxbV@6
zTzKw$JV8F2drgRq)G;5+v$eDR8|%}gO3Gunx;V<J7GT(>r5(N<=C0<FtGKAsy|u2%
zd>S|TNGkR*H|#w3&`?~jZO-j1`570f!%Gk%F^iG4Bc@{<jDF-DjT8Y+)MJ<XP3%NH
zUfZyInI+~dzwoxE#dKF+;xcC7oRTx!tqB{Qs<~gA-SHO>4hoE}4E<v<ru*&H0$T;|
z^O&CJ>Uz_a4sT@FOvn!!xQz1%^)MseTK{Q~t%$lOMX)YMDZ-(o^`n2S%V)PiICR?{
zMuwDsRcJTKuoMH|Xc~zAv#t8r{G{bO`$}go-CMDzG<55{Ijt32pYlrjnjQ`*=j*D#
zC)}eSaj~)BT^VzzHIIgWpt+XNnV-J>j~AN+`GwYNNT{uGXWCQ06dg(qKmF-#<jpLc
z$se|&g@LDI`-5jR3N^>Y!39n@1)mE?OOxsJ=Sg3bpje){`NEQ=P`k)f{RYz$T9&Py
z(;MEemwOma_eY(^(RCx=JkNgzZ)TQz53<hmo8K>lEKG;Cq?0Fe`3&NFGieUhqf2Xl
zpC(VP4>@Y_u>SA|Aa2Ck*@tYL!xj&oC0OIt&woqKe&_rAk8C@-#;ysqz9&&xOm5F%
z|7n<^k!67Yb7hUL9sGGkCsUnI?j1rGHS42)|6ASmBd@iQ2P!gAjRdP{lF@a|$O9Fb
zh^%vFCI7L#1~L499*XLuR{s)<eTK5@ZmPQb>pytfDlPTO*0^A(q;ErBX+q<&z3TI)
zQ(V_+zj+*%_wlBdsZ6xIvDwt-{Q>pNb(hQAbP|GR@HOsJ8dB%J<6v$lVqk1?Yz5<E
zYTIk^>rp{Tdgu964;{68$;I<HeuIsdVxrEHh6KGcOmTaBbP@?!&d;u`KCh*Ek3Nr(
zBai!bV$i~S0W&w`*oEv&k9X<WT97Fqtzow?bHVa!4FgX<n`8Mqx5}>;s<~jpx1XEx
zh3nm&E4$X7;^kk9W$!fN71_V+(>~nxtR!arCgomv+nVC4$gMVudE$fzBkLVSU-qrI
z%F}Rs@WY=84dw~lud^-hJL|N3eTrI(kh1y9K^&Y~Q!;T=bdC<~eS1Z8nYIm2pX_UR
z1G*A?7Tyo`+3%6f{BI52KN4>w;L=|Rm!OQ+Pa2QJeuHH)37Jwc5<du+fUFgFps}Jt
z{dc1yAj{%sL@Zfn(W_lj_J(mzv6{EG1|KMQ*{DuiP1YgJ>r@Fd<F#7R>hsM7jR*QE
z5?7sNO0KMu$8;05y0c%@<Z6A6+Mp|yn;$NACYW<=@=aX+fZ5a4D)shFGBZMtKxRd=
zh(hiLTG~-}cN-sX^SQOxR-E+cwY>GdXQoSJryq1%n;Z4b#>GswO^>bwZ~h1S)FYvi
zMgk=vV*<;$9<PA-QAOfq;YeKkh@%VkJ6DOx>@lnXfdo^CRH8bGqE12wgt5tq9GQRW
zde<V-nle3Wqo|oy?2FHR5PYZ2iZ{-XPpyI6W)w?((X==wP1}4yzs}tw^10JHwpi`O
zJNef}${7Z63D9R2;50iZL*49m+r>M}oVL$%o_X!kz9OO9&!eRN-0s}GTGsSZ{cf`$
z?@-7x&2*|FzEkIT$eZ$@b@iI5Iqn&_X!S0G5nYCzi+B_%AR8LvQBnXOiJgHYL?g#~
zYex#8F@cEVrbJj-q;XjyK7RH@m47YzE&pH3lO`xXoIk$2q&I!NA5swqCWG$bi@G+9
zyF6<*5+GrM-O|7C9Ep@=RsUC|gnZ}@<C}>1l|+gm$Eu9%`BrIk&)4$fbH|qd#uY6u
zf<$;=czbz!1_q659d7{HffZB}^<#<TN4>Gf<p>}-#DC2qjn9%ro9ChFN^$g2Co=;A
z+`QMj_>(kg<4a9POELZF$`mHeaon!&Iw9(>v?xI0xUloeB+beJTV~FSlO2rqdWqDX
zm7EU!BomQdHy5^@CwHg|4$5(CSy<z$wfoHTZVrFj6$OfHucQp7h`!<aXm-*uRn@PG
zi=iRbg{O5Fs=4yS_%#Te57u4nANts`Aj2$7xAb;^==56!&(a^NNbbq*^S207s-Rvp
z-lY3>f?xrdNey&>TC*(8h4^$Kk<Tz+kj-gWb78qwd`E54RTm5sk!X$TsLMa<qc=7Q
zOA#et@nJ73!GAZvNM0+U=^Eo)UVW$I>w<z-jZI&&pKt|Q?@8W?-D|a=!@s4!Hbyum
z*!ISko%mQ?D3Q(Q=;^I4P0YeO{#|N$d#oyR4y<rBZVRjG?3|P3Ca)b^sZ37#xVq|T
ze_T;fbo#t5u0U7YJ6~FghWsqc!`0h|@LjR&gEV^LgXRrR$$T~}74{umR3!a%!h_%V
zMtPn1gP!@P+q0$T@)gRsZQ}i)>xPdzo5)Sv$ryvBgT)dru`5i~R2+C>lv5c_#j6Gi
z*kjDP37%UAoK;d{w)nO#UlPD8jQ^7MJZ5vq;H7%PK3D1Yygqqu0@X}2y4c~c9%4B5
zR_`O&0)y#0)f{MgjPG{dY|5%zqd`TGTR)kubE6T4h6BYwkOu@!ZWVC9k|)%bLHwD2
zE_B$h0KauBWmY7OIY_rk8kqoNh5VSD39uho(JbfJ;m{c*HBGfKku-*r@J|AS{M0UZ
z!(M0=Rb4m5zcInuK$Rv@(w*#e{e%9RB(0pBp^xJA<th)(SXj-}?UuT*ijn@lD^t^8
zwyCV0eeh@YQ=eC{y?S#Bs(ey7>v%lhncT;FjOwO%ah|ZuF3zlr-dt*Vn8(g+jmfEu
zx}{;gp&Pf}{OmDf>4$vn>$`Yjg<r)K3%fYG58DMuNLN^4*dmw-OGl2z0wMh{7RdP9
zfObI-LM*+~y!B1bmCXFIfVy_7$V2Y;QmY>y`od+@wN}owfKx-kUhn;ag4x%zr|qod
zUY*3hzdwQYF8xt$&&|i#J)Y}*Pn$2l(~@6$O}b=fr5ic^(V2vywW8^#w5gVs3XS`m
z&Zf_$6p>t=-1X92t6jq@5?s<Mmb*o+Ja$M|Clxm~2m}ejOm=)2RLl{*I&qAcaZxIe
zXqjKf4@?0%(~CKZY{Dag&I(mAp6~=Q21aCZI1T`rG%i8}n*4Rdil0hml74sZIdgsr
zMV09v9C9Lz@1(3zCOl6vd4+<k@nNk+^q^M0{8Fu4O4#<@ia|Gp*9K`U=eVnU!@OQ{
zM~BJXnNaUgjws(Fjm}25uxy8rq+pN0-Al6>O_z1-JohayyJ=Uv_keMFf;-V<FpE;T
z*v+umwmtOH73?e>(=G4$=N*_x-D3nI1Bm;!FV^|&&f|B+#Bq*~`BlAs4)0x+-D|Mg
zujY%Avy9C)ZHPYg#4pUNH_)Z)nCg}5br<+#LZe>HzZDeUy=E61mi#c5lVj`oO$UX~
zA2C%>5PZ9e@+65(Ca)Ru*+R!LuDUC<FgHe}rrT`S1v$b2kIf0u#cCm2*SFmW-#i*3
z1j76ztjO?8G7kie2?PO&p?=3d4)=kZAb<2cV<H4Va_D*fLRbOZUnw*?HHV$T(z>WX
z`iwk={Yx0vzvZCJ5>zx)00o&+gUM*1R957GugSmX_WV=fEfT_C?8$l-FvDr1)n-ju
znNDp6RpW9>+S&o~v-M4c0i|s`c+!m)IBMV9;04=08NNSJb>VKvGM~1-evbG}B0iWM
zgV#m5m7;tirne_1#?7tbIdno{_8YAw+_<8Os1r`n`8?hGYBN(#F7@xd(oHD9o5y9R
zyxROWF7C*7X=U%>kVFT@tJMg}QAh0`d5-_UvPrB=yBxG1lYDymYKOTUGJ7vA@S7Lv
z^|B!^1S`F&onPnnnmCs#8=s1~*-J}zM<qtS)ohN9ZB|a$R~_bA%I(0>V3pOFLgin5
zd8;)4SsTlf5f*)7JLPX^t`;r0!N5K=a9feS>4D+RsDbE|Sy|7+T9i8n)41-6Z@pml
zKEk7fjdQfVEXQ(WBI$44{$UXoKmreaA8P=OP&TRI25^&Vpdq8eq)zp*BB_lF=I{lH
zdjvj!03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mA
zfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@
P00;mAfB+!yza{X0cco0F

delta 60
zcmV-C0K@-)fCPYm1duxcAhA5eKLIF{0YFg%>MlSpvvEKj9kYNy%@MOeZ@>@%7?S~j
SF$8BWoi4G_XD+jyu47SUvlVIp

diff --git a/build/pgo/certs/evintermediate.ca b/build/pgo/certs/evintermediate.ca
new file mode 100644
index 000000000000..17a048ad86c3
--- /dev/null
+++ b/build/pgo/certs/evintermediate.ca
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF9zCCBN+gAwIBAgIBAzANBgkqhkiG9w0BAQUFADCB4TELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MSMwIQYDVQQKExpN
+b3ppbGxhIC0gRVYgZGVidWcgdGVzdCBDQTEdMBsGA1UECxMUU2VjdXJpdHkgRW5n
+aW5lZXJpbmcxJjAkBgNVBAMTHUVWIFRlc3RpbmcgKHVudHJ1c3R3b3J0aHkpIENB
+MRMwEQYDVQQpEwpldi10ZXN0LWNhMSwwKgYJKoZIhvcNAQkBFh1jaGFybGF0YW5A
+dGVzdGluZy5leGFtcGxlLmNvbTAeFw0xMzAyMTQxNzU5MDlaFw0yMzAyMTIxNzU5
+MDlaMIHRMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50
+YWluIFZpZXcxIzAhBgNVBAoTGk1vemlsbGEgLSBFViBkZWJ1ZyB0ZXN0IENBMR0w
+GwYDVQQLExRTZWN1cml0eSBFbmdpbmVlcmluZzEWMBQGA1UEAxMNaW50ZXJtZWRp
+YXRlMzETMBEGA1UEKRMKZXYtdGVzdC1jYTEsMCoGCSqGSIb3DQEJARYdY2hhcmxh
+dGFuQHRlc3RpbmcuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDAfzrlJdawr7v8m7lslODk5FTqCiBO7tPxnWhAOEL5g05knLTZTc5J
+3ywmGoW6ae6RwPlWuqRuFd2Ea+yCawyjkUoLOpFH/xziDzvaS6LXNdJoxQqWk/LX
+8YYQVFfmxh8E11fz74IoCzX++mY1byaNONf3bLU2HU8vnVvENr1gy9Bzpm8wUuKm
+HkBYuG0SVzaeym2H/mo5PJICPVhPa+YxfEVS8EIFCigXGH7xrz/bPXnpfgsSJTnN
+4amBNkORfjf7H9x6IWkJGEkIvkVoYKT4iQ9q6/C4YDjWa9p5lA4F/qxnJefezH/I
+6hcqEODSaDsY+I6vsN8ks8r8MTTnd7BjAgMBAAGjggHGMIIBwjAdBgNVHQ4EFgQU
+fluXMAT0ZS21pV13vv46m8k7nRkwggEYBgNVHSMEggEPMIIBC4AUyJg651hwk+3B
+V0rQvQZv9n2bWPahgeekgeQwgeExCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEW
+MBQGA1UEBxMNTW91bnRhaW4gVmlldzEjMCEGA1UEChMaTW96aWxsYSAtIEVWIGRl
+YnVnIHRlc3QgQ0ExHTAbBgNVBAsTFFNlY3VyaXR5IEVuZ2luZWVyaW5nMSYwJAYD
+VQQDEx1FViBUZXN0aW5nICh1bnRydXN0d29ydGh5KSBDQTETMBEGA1UEKRMKZXYt
+dGVzdC1jYTEsMCoGCSqGSIb3DQEJARYdY2hhcmxhdGFuQHRlc3RpbmcuZXhhbXBs
+ZS5jb22CCQCvxT0iZiZJMjAMBgNVHRMEBTADAQH/MDYGA1UdHwQvMC0wK6ApoCeG
+JWh0dHA6Ly9leGFtcGxlLmNvbS9yb290LWV2LXRlc3Rlci5jcmwwPwYDVR0gBDgw
+NjA0BgRVHSAAMCwwKgYIKwYBBQUHAgEWHmh0dHA6Ly9teXRlc3Rkb21haW4ubG9j
+YWwvY3BzOzANBgkqhkiG9w0BAQUFAAOCAQEAC4grNTV5K8yqiAJ/0f6oIkTMqyJ4
+lyHXvvKXMHTpRZ7Jdy0aq5KTSHswx64ZRN7V2ds+czzDWgxX3rBuZZAgOW1JYva3
+Ps3XRYUiaTW8eeaWjuVRFAp7ytRmSsOGeOtHbez8jDmTqPRQ1mTMsMzpY4bFD8do
+5y0xsbz4DYIeeNnX9+XGB5u2ml8t5L8Cj65wwMAx9HlsjTrfQTMIwpwbNle6GuZ3
+9FzmE2piAND73yCgU5W66K2lZg8N6vHBq0UhPDCF72y8MlHxQOpTr3/jIGr4X7k9
+uyYq0Pw5Y/LKyGbyW5iMFdLzabm1ua8IWAf7DSFMH6L3WlK8mngCfJ1icQ==
+-----END CERTIFICATE-----
diff --git a/build/pgo/certs/evroot.ca b/build/pgo/certs/evroot.ca
new file mode 100644
index 000000000000..df220e446c44
--- /dev/null
+++ b/build/pgo/certs/evroot.ca
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFljCCBH6gAwIBAgIJAK/FPSJmJkkyMA0GCSqGSIb3DQEBBQUAMIHhMQswCQYD
+VQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxIzAh
+BgNVBAoTGk1vemlsbGEgLSBFViBkZWJ1ZyB0ZXN0IENBMR0wGwYDVQQLExRTZWN1
+cml0eSBFbmdpbmVlcmluZzEmMCQGA1UEAxMdRVYgVGVzdGluZyAodW50cnVzdHdv
+cnRoeSkgQ0ExEzARBgNVBCkTCmV2LXRlc3QtY2ExLDAqBgkqhkiG9w0BCQEWHWNo
+YXJsYXRhbkB0ZXN0aW5nLmV4YW1wbGUuY29tMB4XDTEzMDIxNDE3NDkwMFoXDTIz
+MDIxMjE3NDkwMFowgeExCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UE
+BxMNTW91bnRhaW4gVmlldzEjMCEGA1UEChMaTW96aWxsYSAtIEVWIGRlYnVnIHRl
+c3QgQ0ExHTAbBgNVBAsTFFNlY3VyaXR5IEVuZ2luZWVyaW5nMSYwJAYDVQQDEx1F
+ViBUZXN0aW5nICh1bnRydXN0d29ydGh5KSBDQTETMBEGA1UEKRMKZXYtdGVzdC1j
+YTEsMCoGCSqGSIb3DQEJARYdY2hhcmxhdGFuQHRlc3RpbmcuZXhhbXBsZS5jb20w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk+k5mvnrxhVdVnhaxCeDG
+ZC5kcC8951K3xTkh2JMtUpSQL2IoGLOZOWTNY+2wGNyHbdJjKDv1d0bzZfz3yDkB
+AbY6OcxS4WkwccKsyIzkdacpYWhi7kEFevm9p7TI8jdrpKmItrlqfZKfteh+K+DF
+XZF7xp6zpoUis6dykmk5v8RivpCZl7HIlsOW0wSqCocXWH/WWFgAQyozjW8MgGOL
+/eV2aLsx+yg7it9GMMtyidggwvlYM7O8vY0gJqQKXntbHq1zV7jIJ3bXzJceur+G
+Ce4HvsRHAQUSl6jUfm00aKkqS+1t3svZURIKM6qWAuIKMGcspv+L8lyn1KImG8M5
+AgMBAAGjggFNMIIBSTAdBgNVHQ4EFgQUyJg651hwk+3BV0rQvQZv9n2bWPYwggEY
+BgNVHSMEggEPMIIBC4AUyJg651hwk+3BV0rQvQZv9n2bWPahgeekgeQwgeExCzAJ
+BgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEj
+MCEGA1UEChMaTW96aWxsYSAtIEVWIGRlYnVnIHRlc3QgQ0ExHTAbBgNVBAsTFFNl
+Y3VyaXR5IEVuZ2luZWVyaW5nMSYwJAYDVQQDEx1FViBUZXN0aW5nICh1bnRydXN0
+d29ydGh5KSBDQTETMBEGA1UEKRMKZXYtdGVzdC1jYTEsMCoGCSqGSIb3DQEJARYd
+Y2hhcmxhdGFuQHRlc3RpbmcuZXhhbXBsZS5jb22CCQCvxT0iZiZJMjAMBgNVHRME
+BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAcKVLC9MbdSZjzkVBseCm6t49aIIBm
+xQrsTNV2Gnp5eIXBfUhNAfD0zbBcKHK9AfHmNT8ZK6iABjiOrnn6yQNufW5MMdNx
++/4FtTmdlBPLpyuBY7re+XbIaPxr/jB9jJ1pmh52xH3wMkO7ATDQ2fqFnODFrUKS
+UpXzuydPnsCdu32KPSnewIrkDB10Sah7vw3uwASO2GWqaFtUDFWGpt6rYQTcOF8g
+7a6Zj0johBMQFHE3HDRebWxiOf21ppN/tvv0gtGiA0ZIXBezeLaJ+Hob1xTbi4sw
+sGYDKHPCrLuTZWXmkv0rAIkLLK4VHbsA5xYPQNJJsTpX3u0Z0vZxJd9/
+-----END CERTIFICATE-----
diff --git a/build/pgo/certs/key3.db b/build/pgo/certs/key3.db
index f4edf2e72fbfede0ad14ff150df337352a729964..a99595c52a9f799b96b1a081e885916aa8e90237 100644
GIT binary patch
delta 3400
zcmZvfcQ_ji*Ty3u#NJeFo|=8c3W8QBYF2DjYR@Q7hZ@mX39UA2uhy(qsTre)*_cJ`
z5vyvHhPG&FpAcW)?|Z-N`rhw-|G4k#oa>zX-}AdpY%ybOEcl6>03!eZVEZku-(vo)
zfAoK*=|LHo(<adMWIYvzuS5penTiM)5X&{pZqA+w;fJ_`Ey3<!pfCWy36cl>o^ygS
z+>f9{BX2l}Xf*ZPY8U=tflyFsn1KlEzeHD<<UtIQ{}v^7=n1m?%c47z695Tt0%WLi
zBY8joR^RZzo8g}5Kpy}sp7AJy$Bqx{-$Jt5n|>|p8H^aLR4$+Jzqn-#WME*7XB;$W
zYqavHelg4avi7fM<%7c870jC#QeeI-2jr`wHc(h?pY-7Bx4N*scNfuYIvhb<-vyk>
z_0Ksq*XDL7uC;D(r5m&=iKam=^Ez)$DG)wY`44%rJ}F1-h`;Mw>F8Kt{d<p$)j8~Z
z^}#dsR<EPWGITFr?=#}+eBilHN~nl9JBp-i{m6*|v>|I1mx@V(BzzN{b^gOo{PB5K
z!OZV9oHr&y7*wbcZQaXktufogTWmu{qdzu)v)m>ewcX7qS#AHN2xPR9bB*Rw?eKe<
z-lCPzv)92otHJ?BnxD}*@nt`{v8J$-#5NpqnqSL@`FW7lc2?1k5sQ7kX6o2LOm*a6
zdCyt=62mc<!*|rb!9}U;wJbz+Vc3=8V<xMZf-{(;jGdi_n(+}qgT+6(QXJjXlSrE$
z`ta-TR?W70%_vT>Tn~jGTC4c;Gf#O4vz?|Cu!*q+ko)7O_>&p0VMFO(*q>_S*@zkB
zwPQ@DT75Mg#W8#^UI!wt%e8rX8OVZzuBL4)s?hq8sITmwKe2`8Kh5%T0PElN;Kt*{
zAX-Yn(XY%L*KKc<R3E`bkrO51W~q_e8PH=B=is6jt|<z)(u!X&?9a_ii4v<BH`@E|
zm=_K#mA!Y5#rKOx)@8Y4J3fYHw+|j3_A-R8Uy4r-O^owser6K?ci4jI=Maqkf+y|h
zuoA|%b!i!K<rI@(b2NhQplC^e)jpvnXW)Rb5vF@u`}>D=zp8}x^yz1X8l2j%SNLC(
zy6ZV@L>?ZbBb6&Mm?RaGt#QzD$B)svwt~U}^U?3V7rb{%ZESVKF2XA($9uN5*t!Io
zenN+qP#?a5<S0H5DW6H2J0iIyE~QX|d&p4^Fbm(?TH#tFShRY+ao#db6`ed%=JlO8
zOOPQHm{s;<)zhj-cmu%^D|h*CZv&=@p<2{_KL^{GenN_{x?!e<0j~L{6|Y@Z`5Ptj
zJiPCP<Q~xQqZqbfk?yBR5Fa^EPM{yh-Esc50Qe-|wX~SA$87_E&8oJX)T{9M_fAyk
zy;|(d4y&`_-MkjbwGD4n2yt^wqLM7Cg{;-!tbW$@u~XI58J6b#o)&#Tu+l{F{Cnl-
zf;$;eMSa>o+|sHe2bO#CNNLcn!*{7Zfs!<SiFY|?30Q0u9`Oje5+in~R<fgAXuoEC
zt}3bhUKsFU@l@W4I7TT+N;Y5)A6p{TwVA8cDd^YWqS}iH2ixtCouMLqa%@SA_KVw=
zPifQlbx_-asyU@5M}2q4JLo*IVsitV_8t6HqPn93_0AXh%kE=cnP+cHE!f2Mj@n<Z
z!==QtVjEkuh3$;4SB9&BqyN;b!f^XlIQafR5gHQGkwR+Bgxy8C=-qmpSWmiAS-CKa
zueZKz@wlkjdXl|3kv7b!?V1{9Y)X@?$h}reMaI|^gT}d8OL@kp>ZW9Lx=X95-?U3$
z85e`c?`&~4stP)GUf8EH^M=cJB}Y^@kHeo}nF0p=IDH)?D|YJ2Bag?c7{3p@ssGBd
zKO}59nGz-OBZv7?-WVk5%`vVbIoA0kX(P)Bi&&ZJ9P#sdla!Am=X#_)$lfDelcUzV
zta>6erRDG#hG;=0nT69D^>vj*cJWM8J*U_|P6ebJ5I?Q$i;QGFCR9Sg4VE@mB*d}Q
z>&A6wZHJhucEX%Zp{C(Ec#wzg*N^wBeoY|Eq;cnsEx8s;?v0>5hPpoJ5u%_Rb45yL
znyfS4C^tc*u}QUE;IHftyCUxsBGWH*aHza^?Y0A9`}i2+8m5@0XFW-{)PffAV#KAZ
zH6QkZbv5;u`<@xF@%ylaq^d@m&)>sJVP3jLXXQN(*ne18%p;-YW?pP+J2v_E#t90@
zz4!3E3x9vFD@O?{{1ozIW;pjoBRlsEAb9UGyI_e8tq7D_nvNbxyl`;-dVec9{-LWC
zTZ#ZZe#A#;=g@AHZL*er{FE?>BCzg0ccS>~ErS3IzfV7~1||<?Q^a4vA7|J&vJxYY
zlFt1H!~p*nF(TZ*>2%2vO59w6{!d}#jRq4p(NIwRgeq742kHN#KoBeNHw<ZzeFzQm
z8*KX!E)amlH~jx`hiz0xqPwA6kAGFSbd^nfax{I_^Pk+|H+OG+stiUIKL(G(Jif3q
zvaCGH8k&SsXw&t)74msI*Nt<OlY4{04<dQJoOA;3i1pdd-z46VRv1!r=conv!9QOk
zB5~cPWXjcKrY7f6hq|Ec^5AGM2Thpja{MD&c6ui^O7ospZ88F}kQyF6?9P{BQ*h}5
zb>j=FHHXJz7uif}jUvH~Y@-Oa$JkBH!1br3<r^%7i;zNnyQ!wDYq3@g%uIg7DdDC%
zdpK`Wu1Vb0Dx4<VES0I`^A{H}*Tg;{2qTAVu*hTaTXQDS9tdF}@$&l$Ax#llT5EDo
z6!2I>xnm~%jF!P{gS%*DyrGk3pLF^fgHGIZ>jUtbk)5Rs<`mnIC}~q5G^2gKtcSZi
zfQBx4S+cKYoVWELfe;6SAW^i-^N%V0%GUZ{!om7vvWN)rPOp>1P4<@bDb(p?iA3xX
zljOwK*-|CJHIFi_=XRj==UDF;9{Q$?9UBCVV%$7Ptii7b`Whm?KH$!$M;&lr<s#Jh
zjDHZinPVRPDt^Eq$BJ8|<k{T7xviPI1CyrU{QBnO99P>-(+fch%^7q26aK!JU-6vX
zCVi<gpFSHMEEZJQ2)zisXpt44H6LOY_$bx;)&)kkDqYn*P=dI+33nR@W7LI}BCLX%
z{DAVPzo{)j+ONm#k96_ds$%afs(T~1j>@H`MHNiyjIJ1Bq@!~3CQ{rgl`ePJFu`L@
zPJM`c*FIZ$4|}un)5+O#2cCfEqlYj?_Ti^r{h`)x_>>#N!rPA;wANThbdA=K(nA=Y
z-DV{eSTlet96!wKJY2o8_|XBlf$g5sr_F8L+YSJVDqZD~qhtUv@e^c_HsF4RLjHEA
zbgUj~Kl%&MxdMAtWaJfcK#5@XlC*JHCo6S<#ZpudCdh(s`aq|E2&HdkzpsZG`CUlZ
zFH$9R`zJ9|yxyt-Pn_wvFOkq>MOZ-$6)9_&m;P2(AAyUnLcj|K4X9Xl-4)v+l9@g}
zQRdf?q@uOtYZKlR$Q5PkxCz;}NhKMR))$I9<_#$ceWpwf&ueI~lllJsS`zBgtFT>W
z+iZlnrS+n%(ap1MT%ZCMiHC}V*v@@>MIx}z4quAN(kaVFkjIFlPjC0!t?`7Z&xrH}
z1)sE*lbhnC$21(Q6tQgGW@CLw4hDyUZjlkRdMyQQ)u98coKdoes9qm-mV~4{FJpLi
zzjRp0$?#%Taz#!4{ifPREkmrQPmE3Grh2316xH6ys;SK}FjcxOb5$*AvbqrO-xo!C
zVG(8<Zo5>*ktdtZ8RlEK@^jWZl}W>Rg<gC!7EaQwXem|<#R{M`+O_k(cCWp4iOU{w
z`O8HjIKs+2vnIFWE7u2>KLU1Mk_!xFzBGXaPBj*GbTDy4&bCuC1HN7|YXkI~-t7|I
zks4I6vpW(%^p<HrYs_cC9w}^_2pnvUp7K5sXDHz{M*1Eo;287_>6ZB#=W-mM`B>;s
zS1g{lU7~k?!qR(_>dA7G9hT`2jrd<qzE}%Yn7Wmm+p$7hDyS7x&h!7;cvotIcEj#6
zmGa=L`~CHA=pIR$;$!+PCzXhpKdE$!UcoN6^C$kV_wP{dUnHr~To)<`mUgGhN$ciC
z128wN_7$m?(nL9JRMbG4gLz>l3fMOPm#BBG7R2$<B-S2i>({mW7WVqi#$mbgqsyC2
zI{nJG@A9dPB&*-c=G<As-y;FD^M#vSK4Z>0!`hlM7G&e89)dXvODS&3yWizv*BLEh
z?c2+d5joh1LAF+<b0}UlU5iS@4VB2Q1ah0=8LH>Nc}@RER>pasl@Pa-=aG66EUi`%
zWj=-boLG0s(6<}=4FgPRycUR_PqTVcfoQcwo;I`S7A;dEz2;C_!_6cb0>2$hr1U>|
zmvm6PX&%&k-BQ+N=x{7^S?IQp`OR!4RkCtmB;4<f_I!(qD`OY0{E~*hlU++k`eeSW
m>K96yVVb(|=?nRG;D5g*-R#5c|9pLjJd)Gw#K>7F=)VBB9696w

delta 138
zcmZo@U~5>wGC^IGnSp_U3yArFm>q~&fLLdujWi?c#EUr_kJ#vMW;FQEzxlsCqk<F{
zLj(UQ9xt9LoFbfYZ1-3-n3*IP82Feqn1PD;m?xjAk=|Y@#+bvl`Du<c^JM!l>FrNt
j7^RsP6*z3V;LN<)dGlVINeV(h#Xf8x#hWX?wMzm3!qz60

diff --git a/build/pgo/server-locations.txt b/build/pgo/server-locations.txt
index dbc0cf4af3f2..98c7d3f34d3e 100644
--- a/build/pgo/server-locations.txt
+++ b/build/pgo/server-locations.txt
@@ -101,6 +101,8 @@ https://mismatch.expired.example.com:443	privileged,cert=expired
 https://mismatch.untrusted.example.com:443	privileged,cert=untrusted
 https://untrusted-expired.example.com:443	privileged,cert=untrustedandexpired
 https://mismatch.untrusted-expired.example.com:443	privileged,cert=untrustedandexpired
+https://ev-valid.example.com:443	privileged,cert=evvalid
+https://ev-invalid.example.com:443      priviliged,cert=evinvalid
 
 # This is here so that we don't load the default live bookmark over
 # the network in every test suite.
diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index da1304d13e53..b9c5ca90a9c3 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -109,6 +109,21 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
    * In other words, if you add another list, that uses the same dotted_oid
    * as an existing entry, then please use the same oid_name.
    */
+  {
+    // This is the testing EV signature.
+    // C=US, ST=CA, L=Mountain View, O=Mozilla - EV debug test CA, OU=Security Engineering, CN=EV Testing (untrustworthy) CA/name=ev-test-ca/emailAddress=charlatan@testing.example.com
+    "1.3.6.1.4.1.13769.666.666.666.1.500.9.1",
+    "DEBUGtesting EV OID",
+    SEC_OID_UNKNOWN,
+    "AD:FE:0E:44:16:45:B0:17:46:8B:76:01:74:B7:FF:64:5A:EC:35:91",
+    "MIHhMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWlu"
+    "IFZpZXcxIzAhBgNVBAoTGk1vemlsbGEgLSBFViBkZWJ1ZyB0ZXN0IENBMR0wGwYD"
+    "VQQLExRTZWN1cml0eSBFbmdpbmVlcmluZzEmMCQGA1UEAxMdRVYgVGVzdGluZyAo"
+    "dW50cnVzdHdvcnRoeSkgQ0ExEzARBgNVBCkTCmV2LXRlc3QtY2ExLDAqBgkqhkiG"
+    "9w0BCQEWHWNoYXJsYXRhbkB0ZXN0aW5nLmV4YW1wbGUuY29t",
+    "AK/FPSJmJkky",
+    nullptr
+  },
   {
     // CN=WellsSecure Public Root Certificate Authority,OU=Wells Fargo Bank NA,O=Wells Fargo WellsSecure,C=US
     "2.16.840.1.114171.500.9",
@@ -1061,7 +1076,11 @@ nsNSSComponent::IdentityInfoInit()
     ias.serialNumber.type = siUnsignedInteger;
 
     entry.cert = CERT_FindCertByIssuerAndSN(nullptr, &ias);
-    NS_ASSERTION(entry.cert, "Could not find EV root in NSS storage");
+
+    // The debug CA info is at position 0, and is NOT on the NSS root db
+    if (iEV != 0) {
+       NS_ASSERTION(entry.cert, "Could not find EV root in NSS storage");
+    }
 
     SECITEM_FreeItem(&ias.derIssuer, false);
     SECITEM_FreeItem(&ias.serialNumber, false);
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index 8981ea47a8d9..f61c25dcc82b 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -15,6 +15,8 @@ MOCHITEST_FILES = \
         test_bug480509.html \
         test_bug483440.html \
         test_bug484111.html \
+	test_ev_validation.html \
+	test_ev_validation_child.html \
         $(NULL)
 
 MOCHITEST_CHROME_FILES = \
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html b/security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html
new file mode 100644
index 000000000000..1e1812758519
--- /dev/null
+++ b/security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=813418
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 813418</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=813418">Mozilla Bug 813418</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script type="application/javascript">
+  SimpleTest.waitForExplicitFinish();
+
+  var wnd = window.open("https://ev-valid.example.com/tests/security/ssl/bugs/test_ev_validation_child.html");
+  window.addEventListener("message", function(event) {
+     if (event.origin == "https://ev-valid.example.com") {
+       is(event.data, "EV", "Child was EV valid.");
+       wnd.close();
+       wnd = window.open("https://example.com/tests/security/ssl/bugs/test_ev_validation_child.html");
+     }
+     else if (event.origin == "https://example.com") {
+       is(event.data, "secure", "Child was just secure (NO EV) no ev flags present.");
+       wnd.close();
+       wnd = window.open("https://ev-invalid.example.com/tests/security/ssl/bugs/test_ev_validation_child.html");
+     }
+     else if (event.origin == "https://ev-invalid.example.com") {
+       is(event.data, "secure", "Child was just secure (NO EV ev cert from invalid anchor).");
+       wnd.close();
+       SimpleTest.finish(); //expected end of tests.
+     }
+     else{
+       ok(false,"something is broken");
+       SimpleTest.finish();
+     }
+
+    }, false);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html b/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html
new file mode 100644
index 000000000000..0faa27a015cc
--- /dev/null
+++ b/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html
@@ -0,0 +1,62 @@
+<html>
+<head>
+<title></title>
+<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<script type="text/javascript">
+
+function finish(state) {
+  try {
+    window.opener.postMessage(state, "*");
+    //the opener should close this window, no
+    // need to call simpletest.finish()
+    return;
+  }
+  catch(e){
+    if (window.opener) {
+      //could not sent the message?
+      ok(false,"could no opener window");
+    }
+  }
+}
+
+function onWindowLoad()
+{
+  if (!window.opener) {
+    ok(true, "Direct call, nothing to do");
+    SimpleTest.finish();
+  }
+
+  var ui = SpecialPowers.wrap(window)
+     .QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
+     .getInterface(SpecialPowers.Ci.nsIWebNavigation)
+     .QueryInterface(SpecialPowers.Ci.nsIDocShell)
+     .securityUI;
+
+  var isInsecure = !ui ||
+     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IS_INSECURE);
+  var isBroken = ui &&
+     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IS_BROKEN);
+  var isEV = ui &&
+     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL);
+ 
+  var gotState;
+  if (isInsecure)
+    gotState = "insecure";
+  else if (isBroken)
+    gotState = "broken";
+  else if (isEV)
+    gotState = "EV";
+  else
+    gotState = "secure";
+
+  finish(gotState);
+}
+
+</script>
+</head>
+
+<body onload="onWindowLoad()">
+ <h1>Security_state_child</h1>
+</body>
+</html>
+
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 4f8240cc21cb..98ed5ee90d16 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -61,6 +61,8 @@ _SERV_FILES = 	\
  	 	plain-loop.html \
 		android.json \
 		b2g.json \
+		root-ev-tester.crl \
+		intermediate-ev-tester.crl \
 		$(NULL)	
 
 ifeq ($(MOZ_BUILD_APP),mobile/android)
diff --git a/testing/mochitest/intermediate-ev-tester.crl b/testing/mochitest/intermediate-ev-tester.crl
new file mode 100644
index 0000000000000000000000000000000000000000..3d94e958fd77301027d4b0122c9213400f8704b6
GIT binary patch
literal 541
zcmXqLVv;myVq`SnW#iOp^Jx3d%gD&e%3#oV(U9AKlZ`o)g-w_#G#JL=5N2|AG!!!s
z0m-ln^ZMqO=9MI7<|%|_rj{Ej8z_RrxrC*B^Q$s*auOAE6<os<Qc{yj(-lfmi%S%M
znq>{7L5jGAMS@e4ON%l~DivJw(lhf?Q;Rb5(qU#Z3-e~?m82Hsrlw>jmZTaR3L6N5
zv}p=+rIzV}%+gIxG}JNBf;*d&QA{>DBe5tau_Q6i0i*(GoL*{0Vs1fBs$Oz_t~jru
zv4N4HiJ^tDrKv%bIIj_iYXs$@1pqTJOc?yFKNoS^MFz8ox4U+%5f=A*l_93ASa{BV
z(e=k05@w&e-Yk{CRGa9v`6uJ|hV@IHntt$N5&CG@wymc)$won8`tHeH>6VN+{05wN
z&n}RxulnkFc2|vB`i}1}6fYm#WqwJc<6T(JZIKfvRv4BhwSISgYgN+FK1pBu*qZRh
z%GFC}ER|iu_;gj&l!NcD{PcZq=TaEPv&+bkY4-hMsS7GP=Qq8Ldm`Z_Jl$XU<D?Z<
zo=<(0+SlhM%#Y&o<8*oG%6Vbg28Q=nyLL?0p3_(K?qwF^32z0n1E;<@oxIs8=iZ&Y
nU9nLjL?l<eMN(XH_L^%KQY?zM-4^9l>(N@@aWr}ViC;$m*nPie

literal 0
HcmV?d00001

diff --git a/testing/mochitest/root-ev-tester.crl b/testing/mochitest/root-ev-tester.crl
new file mode 100644
index 0000000000000000000000000000000000000000..4d0dee3a0e42bdd95c5df0476b04731a0e115e8d
GIT binary patch
literal 557
zcmXqLV$w8dViYvsW#iOp^Jx3d%gD&e%3#p=(2(1JlZ`o)g-w_#G#JL=5N2|AG!!!s
z0m-ln^ZMqO=9MI7<|%|_rj{Ej8z_RrxrC*B^Q$s*auOAE6<os<Qc{yj(-lfmi%S%M
znq>{7L5jGAMS@e4ON%l~DivJw(lhf?Q;Rb5(hb!NR6x?q!m>b}AwWGqK?Mz<Ek&ip
zCFS`=B^i~PAY+6L1VQRFg}GA8bU|k8CMO!|7-+%0!O18lo1BqYl#^JJnCAde0W?W3
zwIVUMASYEXIX_pN*U;F&$k4>l!r08%JW8C`2*fpla?t{WxrvdHA@0bGzWj$X9A?&k
zaq?fdfHT>u;QSANel`7Uzpc3rUXS+Iv?;w0>=IdeabuFf?D_tD+RmYM3s{$2nLB^a
zO-YBED5u=u=*MrY7gdQy9u$7Dx<2f<TVBT^fdr}i`XH~ntj@LUlfxEl?QH%$?ZnUQ
z+wa8s$^=WJdD?y?=&k&n=~q~=fYaSP-d5t}HJ77->{%!HgM-+*n$@ZoU0EOg<sg^2
zZq|MQ{tHsftCQn5R_E(1Ws*11JnrE7A|lWC@Tc!jP9FSP@HmmZq3`s?%t@c$n}pT7
z6$|No@|=I-#Je`ToR5vsj#}n1mp5o`j1Rs%W#X1K=GW2`4bt3ah;@E2F`26%4*;lm
B!v+8V

literal 0
HcmV?d00001


From c51b32ad004ca624babe8c9a2ec3afd9fda32836 Mon Sep 17 00:00:00 2001
From: Brian Smith <bsmith@mozilla.com>
Date: Sat, 27 Oct 2012 00:11:35 -0700
Subject: [PATCH 037/438] Bug 813418 - Centralize certificate validation (Part
 2 centralize verfification)  r=bsmith

--HG--
rename : security/manager/ssl/src/nsCERTValInParamWrapper.cpp => security/manager/ssl/src/CertVerifier.cpp
extra : rebase_source : 36e8fc83be5c0ec3d83791f04505f47ab972e2cb
---
 security/manager/ssl/src/CertVerifier.cpp     | 416 ++++++++++++++++++
 security/manager/ssl/src/CertVerifier.h       |  65 +++
 security/manager/ssl/src/CryptoUtil.h         |  13 +
 security/manager/ssl/src/Makefile.in          |   2 +-
 .../ssl/src/SSLServerCertVerification.cpp     | 168 +++----
 .../ssl/src/nsCERTValInParamWrapper.cpp       | 126 ------
 .../manager/ssl/src/nsCERTValInParamWrapper.h |  71 ---
 security/manager/ssl/src/nsCMS.cpp            |  46 +-
 .../manager/ssl/src/nsIdentityChecking.cpp    | 116 ++---
 security/manager/ssl/src/nsNSSCertificate.cpp |  50 +--
 security/manager/ssl/src/nsNSSCertificate.h   |   4 +-
 .../manager/ssl/src/nsNSSCertificateDB.cpp    | 114 ++---
 security/manager/ssl/src/nsNSSComponent.cpp   |  56 +--
 security/manager/ssl/src/nsNSSComponent.h     |  24 +-
 .../manager/ssl/src/nsUsageArrayHelper.cpp    |  71 ++-
 security/manager/ssl/src/nsUsageArrayHelper.h |   8 +-
 16 files changed, 727 insertions(+), 623 deletions(-)
 create mode 100644 security/manager/ssl/src/CertVerifier.cpp
 create mode 100644 security/manager/ssl/src/CertVerifier.h
 create mode 100644 security/manager/ssl/src/CryptoUtil.h
 delete mode 100644 security/manager/ssl/src/nsCERTValInParamWrapper.cpp
 delete mode 100644 security/manager/ssl/src/nsCERTValInParamWrapper.h

diff --git a/security/manager/ssl/src/CertVerifier.cpp b/security/manager/ssl/src/CertVerifier.cpp
new file mode 100644
index 000000000000..6b021a8e01d7
--- /dev/null
+++ b/security/manager/ssl/src/CertVerifier.cpp
@@ -0,0 +1,416 @@
+/* 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 "CertVerifier.h"
+#include "nsNSSComponent.h"
+#include "cert.h"
+#include "secerr.h"
+
+
+#ifdef PR_LOGGING
+extern PRLogModuleInfo* gPIPNSSLog;
+#endif
+
+namespace mozilla { namespace psm {
+
+extern SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag);
+extern CERTCertList* getRootsForOid(SECOidTag oid_tag);
+
+const CertVerifier::Flags CertVerifier::FLAG_LOCAL_ONLY = 1;
+
+CertVerifier::CertVerifier(missing_cert_download_config mcdc,
+                           crl_download_config cdc,
+                           ocsp_download_config odc,
+                           ocsp_strict_config osc,
+                           any_revo_fresh_config arfc,
+                           const char *firstNetworkRevocationMethod)
+  : mMissingCertDownloadEnabled(mcdc == missing_cert_download_on)
+  , mCRLDownloadEnabled(cdc == crl_download_allowed)
+  , mOCSPDownloadEnabled(odc == ocsp_on)
+  , mOCSPStrict(osc == ocsp_strict)
+  , mRequireRevocationInfo(arfc == any_revo_strict)
+  , mCRLFirst(firstNetworkRevocationMethod != nullptr &&
+              !strcmp("crl", firstNetworkRevocationMethod))
+{
+  MOZ_COUNT_CTOR(CertVerifier);
+}
+
+CertVerifier::~CertVerifier()
+{
+  MOZ_COUNT_DTOR(CertVerifier);
+}
+
+
+static SECStatus
+ClassicVerifyCert(CERTCertificate * cert,
+                  const SECCertificateUsage usage,
+                  const PRTime time,
+                  nsIInterfaceRequestor * pinArg,
+                  /*optional out*/ CERTCertList **validationChain,
+                  /*optional out*/ CERTVerifyLog *verifyLog)
+{
+  SECStatus rv;
+  SECCertUsage enumUsage;
+  if (validationChain) {
+    switch(usage){
+      case  certificateUsageSSLClient:
+        enumUsage = certUsageSSLClient;
+        break;
+      case  certificateUsageSSLServer:
+        enumUsage = certUsageSSLServer;
+        break;
+      case certificateUsageSSLServerWithStepUp:
+        enumUsage = certUsageSSLServerWithStepUp;
+        break;
+      case certificateUsageSSLCA:
+        enumUsage = certUsageSSLCA;
+        break;
+      case certificateUsageEmailSigner:
+        enumUsage = certUsageEmailSigner;
+        break;
+      case certificateUsageEmailRecipient:
+        enumUsage = certUsageEmailRecipient;
+        break;
+      case certificateUsageObjectSigner:
+        enumUsage = certUsageObjectSigner;
+        break;
+      case certificateUsageUserCertImport:
+        enumUsage = certUsageUserCertImport;
+        break;
+      case certificateUsageVerifyCA:
+        enumUsage = certUsageVerifyCA;
+        break;
+      case certificateUsageProtectedObjectSigner:
+        enumUsage = certUsageProtectedObjectSigner;
+        break;
+      case certificateUsageStatusResponder:
+        enumUsage = certUsageStatusResponder;
+        break;
+      case certificateUsageAnyCA:
+        enumUsage = certUsageAnyCA;
+        break;
+       default:
+        return SECFailure;
+    }
+  }
+  if (usage == certificateUsageSSLServer) {
+    /* SSL server cert verification has always used CERT_VerifyCert, so we
+     * continue to use it for SSL cert verification to minimize the risk of
+     * there being any differnce in results between CERT_VerifyCert and
+     * CERT_VerifyCertificate.
+     */
+    rv = CERT_VerifyCert(CERT_GetDefaultCertDB(), cert, true,
+                         certUsageSSLServer, time, pinArg, verifyLog);
+  } else {
+    rv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), cert, true,
+                                usage, time, pinArg,
+                                verifyLog, nullptr);
+  }
+  if (rv == SECSuccess && validationChain) {
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert: getting chain in 'classic' \n"));
+    *validationChain = CERT_GetCertChainFromCert(cert, time, enumUsage);
+    if (!*validationChain) {
+      rv = SECFailure;
+    }
+  }
+  return rv;
+}
+
+SECStatus
+CertVerifier::VerifyCert(CERTCertificate * cert,
+                         const SECCertificateUsage usage,
+                         const PRTime time,
+                         nsIInterfaceRequestor * pinArg,
+                         const Flags flags,
+                         /*optional out*/ CERTCertList **validationChain,
+                         /*optional out*/ SECOidTag *evOidPolicy,
+                         /*optional out*/ CERTVerifyLog *verifyLog)
+{
+  if (!cert) {
+    PORT_SetError(SEC_ERROR_INVALID_ARGS);
+    return SECFailure;
+  }
+  if (validationChain) {
+    *validationChain = nullptr;
+  }
+  if (evOidPolicy) {
+    *evOidPolicy = SEC_OID_UNKNOWN;
+  }
+
+  ScopedCERTCertList trustAnchors;
+  SECStatus rv;
+  SECOidTag evPolicy = SEC_OID_UNKNOWN;
+
+  // Do EV checking only for sslserver usage
+  if (usage == certificateUsageSSLServer) {
+    SECStatus srv = getFirstEVPolicy(cert, evPolicy);
+    if (srv == SECSuccess) {
+      if (evPolicy != SEC_OID_UNKNOWN) {
+        trustAnchors = getRootsForOid(evPolicy);
+      }
+      if (!trustAnchors) {
+        return SECFailure;
+      }
+    } else {
+      // Do not setup EV verification params
+      evPolicy = SEC_OID_UNKNOWN;
+    }
+  }
+  
+  MOZ_ASSERT_IF(evPolicy != SEC_OID_UNKNOWN, trustAnchors);
+
+  size_t i = 0;
+  size_t validationChainLocation = 0;
+  size_t validationTrustAnchorLocation = 0;
+  CERTValOutParam cvout[4];
+  if (verifyLog) {
+     cvout[i].type = cert_po_errorLog;
+     cvout[i].value.pointer.log = verifyLog;
+     ++i;
+  }
+  if (validationChain) {
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert: setting up validation chain outparam.\n"));
+    validationChainLocation = i;
+    cvout[i].type = cert_po_certList;
+    cvout[i].value.pointer.cert = nullptr;
+    ++i;
+    validationTrustAnchorLocation = i;
+    cvout[i].type = cert_po_trustAnchor;
+    cvout[i].value.pointer.chain = nullptr;
+    ++i;
+  }
+  cvout[i].type = cert_po_end;
+
+  CERTRevocationFlags rev;
+
+  CERTRevocationMethodIndex revPreferredMethods[2];
+  rev.leafTests.preferred_methods =
+  rev.chainTests.preferred_methods = revPreferredMethods;
+
+  uint64_t revFlagsPerMethod[2];
+  rev.leafTests.cert_rev_flags_per_method =
+  rev.chainTests.cert_rev_flags_per_method = revFlagsPerMethod;
+  rev.leafTests.number_of_preferred_methods =
+  rev.chainTests.number_of_preferred_methods = 1;
+
+  rev.leafTests.number_of_defined_methods =
+  rev.chainTests.number_of_defined_methods = cert_revocation_method_ocsp + 1;
+
+  const bool localOnly = flags & FLAG_LOCAL_ONLY;
+  CERTValInParam cvin[6];
+
+  // Parameters for both EV and DV validation
+  cvin[0].type = cert_pi_useAIACertFetch;
+  cvin[0].value.scalar.b = mMissingCertDownloadEnabled && !localOnly;
+  cvin[1].type = cert_pi_revocationFlags;
+  cvin[1].value.pointer.revocation = &rev;
+  cvin[2].type = cert_pi_date;
+  cvin[2].value.scalar.time = time;
+  i = 3;
+  const size_t evParamLocation = i;
+
+  // Declare dv variables here so that we can use they dont cross the goto line!
+  // after classic is gone, we can move the declaration below (and remove the
+  // goto)
+  bool strictRevocation;
+
+  if (evPolicy != SEC_OID_UNKNOWN) {
+    // EV setup!
+    // This flags are not quite correct, but it is what we have now, so keeping
+    // them identical for bug landing purposes. Should be fixed later!
+    uint64_t revMethodFlags =
+      CERT_REV_M_TEST_USING_THIS_METHOD
+      | (mOCSPDownloadEnabled ? CERT_REV_M_ALLOW_NETWORK_FETCHING
+                              : CERT_REV_M_FORBID_NETWORK_FETCHING)
+      | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
+      | CERT_REV_M_REQUIRE_INFO_ON_MISSING_SOURCE
+      | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
+      | CERT_REV_M_STOP_TESTING_ON_FRESH_INFO;
+ 
+    rev.leafTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
+    rev.chainTests.cert_rev_flags_per_method[cert_revocation_method_crl] = revMethodFlags;
+    rev.leafTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
+    rev.chainTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] = revMethodFlags;
+
+    rev.leafTests.cert_rev_method_independent_flags =
+    rev.chainTests.cert_rev_method_independent_flags =
+      // avoiding the network is good, let's try local first
+      CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST
+      // is overall revocation requirement strict or relaxed?
+      |  CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE
+      ;
+
+    rev.leafTests.preferred_methods[0] =
+    rev.chainTests.preferred_methods[0] = cert_revocation_method_ocsp;
+
+    cvin[i].type = cert_pi_policyOID;
+    cvin[i].value.arraySize = 1;
+    cvin[i].value.array.oids = &evPolicy;
+    ++i;
+    MOZ_ASSERT(trustAnchors);
+    cvin[i].type = cert_pi_trustAnchors;
+    cvin[i].value.pointer.chain = trustAnchors;
+    ++i;
+
+    cvin[i].type = cert_pi_end;
+
+    rv = CERT_PKIXVerifyCert(cert, usage, cvin, cvout, pinArg);
+    if (rv == SECSuccess) {
+      if (evOidPolicy) {
+        *evOidPolicy = evPolicy;
+      }
+      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+             ("VerifyCert: successful CERT_PKIXVerifyCert(ev) \n"));
+      goto pkix_done;
+    }
+
+    if (validationChain && *validationChain) {
+      // There SHOULD not be a validation chain on failure, asserion here for
+      // the debug builds AND a fallback for production builds
+      MOZ_ASSERT(false,
+                 "certPKIXVerifyCert returned failure AND a validationChain");
+      CERT_DestroyCertList(*validationChain);
+      *validationChain = nullptr;
+    }
+
+    if (verifyLog) {
+      // Cleanup the log so that it is ready the the next validation
+      CERTVerifyLogNode *i_node;
+      for (i_node = verifyLog->head; i_node; i_node = i_node->next) {
+         //destroy cert if any.
+         if (i_node->cert) {
+           CERT_DestroyCertificate(i_node->cert);
+         }
+         // No need to cleanup the actual nodes in the arena.
+      }
+      verifyLog->count = 0;
+      verifyLog->head = nullptr;
+      verifyLog->tail = nullptr;
+    }
+
+  }
+
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification){
+    // XXX: we do not care about the localOnly flag (currently) as the
+    // caller that wants localOnly should disable and reenable the fetching.
+    return ClassicVerifyCert(cert, usage, time, pinArg, validationChain,
+                             verifyLog);
+  }
+
+  // The current flags check the chain the same way as the leafs
+  rev.leafTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
+  rev.chainTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
+    // implicit default source - makes no sense for CRLs
+    CERT_REV_M_IGNORE_IMPLICIT_DEFAULT_SOURCE
+
+    // let's not stop on fresh CRL. If OCSP is enabled, too, let's check it
+    | CERT_REV_M_CONTINUE_TESTING_ON_FRESH_INFO
+
+    // no fresh CRL? well, let other flag decide whether to fail or not
+    | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
+
+    // testing using local CRLs is always allowed
+    | CERT_REV_M_TEST_USING_THIS_METHOD
+
+    // no local crl and don't know where to get it from? ignore
+    | CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE
+
+    // crl download based on parameter
+    | ((mCRLDownloadEnabled && !localOnly) ?
+        CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
+    ;
+
+  rev.leafTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
+  rev.chainTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
+    // use OCSP
+      CERT_REV_M_TEST_USING_THIS_METHOD
+
+    // if app has a default OCSP responder configured, let's use it
+    | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
+
+    // of course OCSP doesn't work without a source. let's accept such certs
+    | CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE
+
+    // if ocsp is required stop on lack of freshness
+    | (mOCSPStrict ?
+       CERT_REV_M_FAIL_ON_MISSING_FRESH_INFO : CERT_REV_M_IGNORE_MISSING_FRESH_INFO)
+
+    // ocsp success is sufficient
+    | CERT_REV_M_STOP_TESTING_ON_FRESH_INFO
+
+    // ocsp enabled controls network fetching, too
+    | ((mOCSPDownloadEnabled && !localOnly) ?
+        CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
+    ;
+
+  rev.leafTests.preferred_methods[0] =
+  rev.chainTests.preferred_methods[0] =
+    mCRLFirst ? cert_revocation_method_crl : cert_revocation_method_ocsp;
+
+  rev.leafTests.cert_rev_method_independent_flags =
+  rev.chainTests.cert_rev_method_independent_flags =
+    // avoiding the network is good, let's try local first
+    CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST
+
+    // is overall revocation requirement strict or relaxed?
+    | (mRequireRevocationInfo ?
+       CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE : CERT_REV_MI_NO_OVERALL_INFO_REQUIREMENT)
+    ;
+
+  // Skip EV parameters
+  cvin[evParamLocation].type = cert_pi_end;
+
+  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert: calling CERT_PKIXVerifyCert(dv) \n"));
+  rv = CERT_PKIXVerifyCert(cert, usage, cvin, cvout, pinArg);
+
+pkix_done:
+  if (validationChain) {
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert: validation chain requested\n"));
+    ScopedCERTCertificate trustAnchor(cvout[validationTrustAnchorLocation].value.pointer.cert);
+
+    if (rv == SECSuccess) {
+      if (! cvout[validationChainLocation].value.pointer.chain) {
+        return SECFailure;
+      }
+      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert: I have a chain\n"));
+      *validationChain = cvout[validationChainLocation].value.pointer.chain;
+      if (trustAnchor) {
+        // we should only add the issuer to the chain if it is not already
+        // present. On CA cert checking, the issuer is the same cert, so in
+        // that case we do not add the cert to the chain.
+        if (!CERT_CompareCerts(trustAnchor, cert)) {
+          PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert:  adding issuer to tail for display\n"));
+          // note: rv is reused to catch errors on cert creation!
+          rv = CERT_AddCertToListTail(*validationChain,
+                                      CERT_DupCertificate(trustAnchor));
+          if (rv != SECSuccess) {
+            CERT_DestroyCertList(*validationChain);
+            *validationChain = nullptr;
+          }
+        }
+      }
+    } else {
+      // Validation was a fail, clean up if needed
+      if (cvout[validationChainLocation].value.pointer.chain) {
+        CERT_DestroyCertList(cvout[validationChainLocation].value.pointer.chain);
+      }
+    }
+  }
+  return rv;
+}
+
+TemporaryRef<CertVerifier>
+GetDefaultCertVerifier()
+{
+  static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
+
+  nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(kNSSComponentCID));
+  RefPtr<CertVerifier> certVerifier;
+  if (nssComponent) {
+    (void) nssComponent->GetDefaultCertVerifier(certVerifier);
+  }
+  return certVerifier;
+}
+
+} } // namespace mozilla::psm
diff --git a/security/manager/ssl/src/CertVerifier.h b/security/manager/ssl/src/CertVerifier.h
new file mode 100644
index 000000000000..96dbd5441cbd
--- /dev/null
+++ b/security/manager/ssl/src/CertVerifier.h
@@ -0,0 +1,65 @@
+/* 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/. */
+
+#ifndef mozilla_psm__CertVerifier_h
+#define mozilla_psm__CertVerifier_h
+
+#include "mozilla/RefPtr.h"
+#include "CryptoUtil.h"
+#include "nsISupportsImpl.h"
+#include "certt.h"
+
+class nsIInterfaceRequestor;
+class nsNSSComponent;
+
+namespace mozilla { namespace psm {
+
+class CertVerifier
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CertVerifier)
+
+  typedef unsigned int Flags;
+  static const Flags FLAG_LOCAL_ONLY;
+  // XXX: The localonly flag is ignored in the classic verification case
+
+  // *evOidPolicy == SEC_OID_UNKNOWN means the cert is NOT EV
+  SECStatus VerifyCert(CERTCertificate * cert,
+                       const SECCertificateUsage usage,
+                       const PRTime time,
+                       nsIInterfaceRequestor * pinArg,
+                       const Flags flags = 0,
+                       /*optional out*/ CERTCertList **validationChain = nullptr,
+                       /*optional out*/ SECOidTag *evOidPolicy = nullptr ,
+                       /*optional out*/ CERTVerifyLog *verifyLog = nullptr);
+
+  enum missing_cert_download_config { missing_cert_download_off = 0, missing_cert_download_on };
+  enum crl_download_config { crl_local_only = 0, crl_download_allowed };
+  enum ocsp_download_config { ocsp_off = 0, ocsp_on };
+  enum ocsp_strict_config { ocsp_relaxed = 0, ocsp_strict };
+  enum any_revo_fresh_config { any_revo_relaxed = 0, any_revo_strict };
+
+  bool IsOCSPDownloadEnabled() const { return mOCSPDownloadEnabled; }
+
+private:
+  CertVerifier(missing_cert_download_config ac, crl_download_config cdc,
+               ocsp_download_config odc, ocsp_strict_config osc,
+               any_revo_fresh_config arfc,
+               const char *firstNetworkRevocationMethod);
+  ~CertVerifier();
+
+  const bool mMissingCertDownloadEnabled;
+  const bool mCRLDownloadEnabled;
+  const bool mOCSPDownloadEnabled;
+  const bool mOCSPStrict;
+  const bool mRequireRevocationInfo;
+  const bool mCRLFirst;
+  friend class ::nsNSSComponent;
+};
+
+MOZ_WARN_UNUSED_RESULT TemporaryRef<CertVerifier> GetDefaultCertVerifier();
+
+} } // namespace mozilla::psm
+
+#endif // mozilla_psm__CertVerifier_h
diff --git a/security/manager/ssl/src/CryptoUtil.h b/security/manager/ssl/src/CryptoUtil.h
new file mode 100644
index 000000000000..8d80f9aeb72f
--- /dev/null
+++ b/security/manager/ssl/src/CryptoUtil.h
@@ -0,0 +1,13 @@
+#ifndef mozilla_psm__CryptoUtil_h
+#define mozilla_psm__CryptoUtil_h
+
+#include <mozilla/RefPtr.h>
+#include "mozilla/Types.h"
+
+#ifdef MOZILLA_INTERNAL_API
+#define MOZ_CRYPTO_API(x) MOZ_EXPORT_API(x)
+#else
+#define MOZ_CRYPTO_API(x) MOZ_IMPORT_API(x)
+#endif
+
+#endif // mozilla_psm__CryptoUtil_h
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 2898fbc7187c..4b87ab48e5e9 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -20,7 +20,7 @@ LIBXUL_LIBRARY	= 1
 CPPSRCS = 				\
 	CryptoTask.cpp \
 	JARSignatureVerification.cpp \
-	nsCERTValInParamWrapper.cpp     \
+	CertVerifier.cpp     \
 	nsNSSCleaner.cpp                \
 	nsCertOverrideService.cpp   \
 	nsRecentBadCerts.cpp \
diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp
index 746ed9010dae..773189a2305a 100644
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
@@ -95,6 +95,7 @@
  */
 
 #include "SSLServerCertVerification.h"
+#include "CertVerifier.h"
 #include "nsIBadCertListener2.h"
 #include "nsICertOverrideService.h"
 #include "nsIStrictTransportSecurityService.h"
@@ -113,7 +114,6 @@
 #include "nsServiceManagerUtils.h"
 #include "nsIConsoleService.h"
 #include "PSMRunnable.h"
-#include "ScopedNSSTypes.h"
 #include "SharedSSLState.h"
 
 #include "ssl.h"
@@ -131,6 +131,7 @@ namespace {
 
 NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 
+NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
 NSSCleanupAutoPtrClass_WithParam(PLArenaPool, PORT_FreeArena, FalseParam, false)
 
 // do not use a nsCOMPtr to avoid static initializer/destructor
@@ -467,31 +468,26 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   }
 
   SECStatus srv;
-  nsresult nsrv;
 
-  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
-  if (!inss) {
-    NS_ERROR("do_GetService(kNSSComponentCID) failed");
-    PR_SetError(defaultErrorCodeToReport, 0);
-    return nullptr;
-  }
-
-  RefPtr<nsCERTValInParamWrapper> survivingParams;
-  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
-  if (NS_FAILED(nsrv)) {
-    NS_ERROR("GetDefaultCERTValInParam failed");
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  if (!certVerifier) {
+    NS_ERROR("GetDefaultCerVerifier failed");
     PR_SetError(defaultErrorCodeToReport, 0);
     return nullptr;
   }
   
-  PLArenaPool *log_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+  PRTime now = PR_Now();
+
+  PLArenaPool *log_arena = nullptr;
   PLArenaPoolCleanerFalseParam log_arena_cleaner(log_arena);
+  CERTVerifyLog * verify_log = nullptr;
+
+  log_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   if (!log_arena) {
     NS_ERROR("PORT_NewArena failed");
     return nullptr; // PORT_NewArena set error code
   }
-
-  CERTVerifyLog *verify_log = PORT_ArenaZNew(log_arena, CERTVerifyLog);
+  verify_log = PORT_ArenaZNew(log_arena, CERTVerifyLog);
   if (!verify_log) {
     NS_ERROR("PORT_ArenaZNew failed");
     return nullptr; // PORT_ArenaZNew set error code
@@ -499,22 +495,8 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   CERTVerifyLogContentsCleaner verify_log_cleaner(verify_log);
   verify_log->arena = log_arena;
 
-  if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-    srv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), cert,
-                                true, certificateUsageSSLServer,
-                                PR_Now(), static_cast<void*>(infoObject),
-                                verify_log, nullptr);
-  }
-  else {
-    CERTValOutParam cvout[2];
-    cvout[0].type = cert_po_errorLog;
-    cvout[0].value.pointer.log = verify_log;
-    cvout[1].type = cert_po_end;
-
-    srv = CERT_PKIXVerifyCert(cert, certificateUsageSSLServer,
-                              survivingParams->GetRawPointerForNSS(),
-                              cvout, static_cast<void*>(infoObject));
-  }
+  srv = certVerifier->VerifyCert(cert, certificateUsageSSLServer, now,
+                                   infoObject, 0, nullptr, nullptr, verify_log);
 
   // We ignore the result code of the cert verification.
   // Either it is a failure, which is expected, and we'll process the
@@ -539,40 +521,44 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
     errorCodeMismatch = SSL_ERROR_BAD_CERT_DOMAIN;
   }
 
-  CERTVerifyLogNode *i_node;
-  for (i_node = verify_log->head; i_node; i_node = i_node->next)
-  {
-    switch (i_node->error)
+  if (verify_log) {
+    CERTVerifyLogNode *i_node;
+    for (i_node = verify_log->head; i_node; i_node = i_node->next)
     {
-      case SEC_ERROR_UNKNOWN_ISSUER:
-      case SEC_ERROR_CA_CERT_INVALID:
-      case SEC_ERROR_UNTRUSTED_ISSUER:
-      case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-      case SEC_ERROR_UNTRUSTED_CERT:
-      case SEC_ERROR_INADEQUATE_KEY_USAGE:
-      case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
-        // We group all these errors as "cert not trusted"
-        collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
-        if (errorCodeTrust == SECSuccess) {
-          errorCodeTrust = i_node->error;
-        }
-        break;
-      case SSL_ERROR_BAD_CERT_DOMAIN:
-        collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
-        if (errorCodeMismatch == SECSuccess) {
-          errorCodeMismatch = i_node->error;
-        }
-        break;
-      case SEC_ERROR_EXPIRED_CERTIFICATE:
-        collected_errors |= nsICertOverrideService::ERROR_TIME;
-        if (errorCodeExpired == SECSuccess) {
-          errorCodeExpired = i_node->error;
-        }
-        break;
-      default:
-        PR_SetError(i_node->error, 0);
-        return nullptr;
+      switch (i_node->error)
+      {
+        case SEC_ERROR_UNKNOWN_ISSUER:
+        case SEC_ERROR_CA_CERT_INVALID:
+        case SEC_ERROR_UNTRUSTED_ISSUER:
+        case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+        case SEC_ERROR_UNTRUSTED_CERT:
+        case SEC_ERROR_INADEQUATE_KEY_USAGE:
+        case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
+          // We group all these errors as "cert not trusted"
+          collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
+          if (errorCodeTrust == SECSuccess) {
+            errorCodeTrust = i_node->error;
+          }
+          break;
+        case SSL_ERROR_BAD_CERT_DOMAIN:
+          collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
+          if (errorCodeMismatch == SECSuccess) {
+            errorCodeMismatch = i_node->error;
+          }
+          break;
+        case SEC_ERROR_EXPIRED_CERTIFICATE:
+          collected_errors |= nsICertOverrideService::ERROR_TIME;
+          if (errorCodeExpired == SECSuccess) {
+            errorCodeExpired = i_node->error;
+          }
+          break;
+        default:
+          PR_SetError(i_node->error, 0);
+          return nullptr;
+      }
     }
+  } else {
+    // XXX set errorCodeTrust, errorCodeMismatch, errorCodeExpired, collected_errors
   }
 
   if (!collected_errors)
@@ -661,31 +647,21 @@ SSLServerCertVerificationJob::SSLServerCertVerificationJob(
 }
 
 SECStatus
-PSM_SSL_PKIX_AuthCertificate(CERTCertificate *peerCert, void * pinarg,
-                             const char * hostname)
+PSM_SSL_PKIX_AuthCertificate(CERTCertificate *peerCert,
+                             nsIInterfaceRequestor * pinarg,
+                             const char * hostname,
+                             CERTCertList **validationChain,
+                             SECOidTag *evOidPolicy)
 {
-    SECStatus          rv;
-    
-    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-        rv = CERT_VerifyCertNow(CERT_GetDefaultCertDB(), peerCert, true,
-                                certUsageSSLServer, pinarg);
+    RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+    if (!certVerifier) {
+      PR_SetError(PR_INVALID_STATE_ERROR, 0);
+      return SECFailure;
     }
-    else {
-        nsresult nsrv;
-        nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
-        if (!inss)
-          return SECFailure;
-        RefPtr<nsCERTValInParamWrapper> survivingParams;
-        if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams)))
-          return SECFailure;
 
-        CERTValOutParam cvout[1];
-        cvout[0].type = cert_po_end;
-
-        rv = CERT_PKIXVerifyCert(peerCert, certificateUsageSSLServer,
-                                survivingParams->GetRawPointerForNSS(),
-                                cvout, pinarg);
-    }
+    SECStatus rv = certVerifier->VerifyCert(peerCert,
+                                            certificateUsageSSLServer, PR_Now(),
+                                            pinarg, 0, validationChain , evOidPolicy);
 
     if (rv == SECSuccess) {
         /* cert is OK.  This is the client side of an SSL connection.
@@ -897,8 +873,12 @@ AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert,
     }
   }
 
+  CERTCertList *verifyCertChain = nullptr;
+  SECOidTag evOidPolicy;
   SECStatus rv = PSM_SSL_PKIX_AuthCertificate(cert, infoObject,
-                                              infoObject->GetHostName());
+                                              infoObject->GetHostName(),
+                                              &verifyCertChain,
+                                              &evOidPolicy);
 
   // We want to remember the CA certs in the temp db, so that the application can find the
   // complete chain at any time it might need it.
@@ -908,7 +888,12 @@ AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert,
   RefPtr<nsNSSCertificate> nsc;
 
   if (!status || !status->mServerCert) {
-    nsc = nsNSSCertificate::Create(cert);
+    if( rv == SECSuccess ){
+      nsc = nsNSSCertificate::Create(cert, &evOidPolicy);
+    }
+    else {
+      nsc = nsNSSCertificate::Create(cert);
+    }
   }
 
   ScopedCERTCertList certList(CERT_GetCertChainFromCert(cert, PR_Now(),
@@ -937,13 +922,6 @@ AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert,
   }
 
   if (rv == SECSuccess) {
-    if (nsc) {
-      bool dummyIsEV;
-      nsc->GetIsExtendedValidation(&dummyIsEV); // the nsc object will cache the status
-    }
-    
-    nsCOMPtr<nsINSSComponent> nssComponent;
-
     // We want to avoid storing any intermediate cert information when browsing
     // in private, transient contexts.
     if (!(providerFlags & nsISocketProvider::NO_PERMANENT_STORAGE)) {
diff --git a/security/manager/ssl/src/nsCERTValInParamWrapper.cpp b/security/manager/ssl/src/nsCERTValInParamWrapper.cpp
deleted file mode 100644
index a7efc3727aad..000000000000
--- a/security/manager/ssl/src/nsCERTValInParamWrapper.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/* 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 "nsCERTValInParamWrapper.h"
-
-NS_IMPL_THREADSAFE_ADDREF(nsCERTValInParamWrapper)
-NS_IMPL_THREADSAFE_RELEASE(nsCERTValInParamWrapper)
-
-nsCERTValInParamWrapper::nsCERTValInParamWrapper()
-:mAlreadyConstructed(false)
-,mCVIN(nullptr)
-,mRev(nullptr)
-{
-  MOZ_COUNT_CTOR(nsCERTValInParamWrapper);
-}
-
-nsCERTValInParamWrapper::~nsCERTValInParamWrapper()
-{
-  MOZ_COUNT_DTOR(nsCERTValInParamWrapper);
-  if (mRev) {
-    CERT_DestroyCERTRevocationFlags(mRev);
-  }
-  if (mCVIN)
-    PORT_Free(mCVIN);
-}
-
-nsresult nsCERTValInParamWrapper::Construct(missing_cert_download_config mcdc,
-                                            crl_download_config cdc,
-                                            ocsp_download_config odc,
-                                            ocsp_strict_config osc,
-                                            any_revo_fresh_config arfc,
-                                            const char *firstNetworkRevocationMethod)
-{
-  if (mAlreadyConstructed)
-    return NS_ERROR_FAILURE;
-
-  mOCSPDownloadEnabled = odc == ocsp_on;
-
-  CERTValInParam *p = (CERTValInParam*)PORT_Alloc(3 * sizeof(CERTValInParam));
-  if (!p)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  CERTRevocationFlags *rev = CERT_AllocCERTRevocationFlags(
-      cert_revocation_method_ocsp +1, 1,
-      cert_revocation_method_ocsp +1, 1);
-  
-  if (!rev) {
-    PORT_Free(p);
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  
-  p[0].type = cert_pi_useAIACertFetch;
-  p[0].value.scalar.b = (mcdc == missing_cert_download_on);
-  p[1].type = cert_pi_revocationFlags;
-  p[1].value.pointer.revocation = rev;
-  p[2].type = cert_pi_end;
-  
-  rev->leafTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
-  rev->chainTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
-    // implicit default source - makes no sense for CRLs
-    CERT_REV_M_IGNORE_IMPLICIT_DEFAULT_SOURCE
-
-    // let's not stop on fresh CRL. If OCSP is enabled, too, let's check it
-    | CERT_REV_M_CONTINUE_TESTING_ON_FRESH_INFO
-
-    // no fresh CRL? well, let other flag decide whether to fail or not
-    | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
-
-    // testing using local CRLs is always allowed
-    | CERT_REV_M_TEST_USING_THIS_METHOD
-
-    // no local crl and don't know where to get it from? ignore
-    | CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE
-
-    // crl download based on parameter
-    | ((cdc == crl_download_allowed) ?
-        CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
-    ;
-
-  rev->leafTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
-  rev->chainTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
-    // is ocsp enabled at all?
-    ((odc == ocsp_on) ?
-      CERT_REV_M_TEST_USING_THIS_METHOD : CERT_REV_M_DO_NOT_TEST_USING_THIS_METHOD)
-
-    // ocsp enabled controls network fetching, too
-    | ((odc == ocsp_on) ?
-        CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
-
-    // ocsp set to strict==required?
-    | ((osc == ocsp_strict) ?
-        CERT_REV_M_FAIL_ON_MISSING_FRESH_INFO : CERT_REV_M_IGNORE_MISSING_FRESH_INFO)
-
-    // if app has a default OCSP responder configured, let's use it
-    | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
-
-    // of course OCSP doesn't work without a source. let's accept such certs
-    | CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE
-
-    // ocsp success is sufficient
-    | CERT_REV_M_STOP_TESTING_ON_FRESH_INFO
-    ;
-
-  bool wantsCrlFirst = (firstNetworkRevocationMethod != nullptr)
-                          && (strcmp("crl", firstNetworkRevocationMethod) == 0);
-    
-  rev->leafTests.preferred_methods[0] =
-  rev->chainTests.preferred_methods[0] =
-    wantsCrlFirst ? cert_revocation_method_crl : cert_revocation_method_ocsp;
-
-  rev->leafTests.cert_rev_method_independent_flags =
-  rev->chainTests.cert_rev_method_independent_flags =
-    // avoiding the network is good, let's try local first
-    CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST
-
-    // is overall revocation requirement strict or relaxed?
-    | ((arfc == any_revo_strict) ?
-        CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE : CERT_REV_MI_NO_OVERALL_INFO_REQUIREMENT)
-    ;
-
-  mAlreadyConstructed = true;
-  mCVIN = p;
-  mRev = rev;
-  return NS_OK;
-}
diff --git a/security/manager/ssl/src/nsCERTValInParamWrapper.h b/security/manager/ssl/src/nsCERTValInParamWrapper.h
deleted file mode 100644
index dab0aaabcc90..000000000000
--- a/security/manager/ssl/src/nsCERTValInParamWrapper.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 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/. */
-
-#ifndef _nsCERTValInParamWrapper_H
-#define _nsCERTValInParamWrapper_H
-
-#include "nsISupports.h"
-#include "cert.h"
-
-/*
- * This is a wrapper around type
- * CERTValInParam is a nested input parameter type for CERT_PKIXVerifyCert.
- * The values inside this type depend on application preferences,
- * as a consequence it's expensive to construct this object.
- * (and we shall avoid to access prefs from secondary threads anyway).
- * We want to create an instance of that input type once, and use as long as possible.
- * Every time the preferences change, we will create a new default object.
- *
- * A race is possible between "verification function is active and object in use"
- * and "must switch to new defaults".
- *
- * The global default object may be replaced at any time with a new object.
- * The contents of inner CERTValInParam are supposed to be stable (const).
- *
- * In order to protect against the race, we use a reference counted wrapper.
- * Each user of a foreign nsCERTValInParamWrapper object
- * (e.g. the current global default object)
- * must use RefPtr<nsCERTValInParamWrapper> = other-object
- * prior to calling CERT_PKIXVerifyCert.
- * 
- * This guarantees the object will still be alive after the call,
- * and if the default object has been replaced in the meantime,
- * the reference counter will go to zero, and the old default
- * object will get destroyed automatically.
- */
-class nsCERTValInParamWrapper
-{
-public:
-  NS_IMETHOD_(nsrefcnt) AddRef();
-  NS_IMETHOD_(nsrefcnt) Release();
-
-  bool IsOCSPDownloadEnabled() const { return mOCSPDownloadEnabled; }
-
-  nsCERTValInParamWrapper();
-  virtual ~nsCERTValInParamWrapper();
-
-  enum missing_cert_download_config { missing_cert_download_off = 0, missing_cert_download_on };
-  enum crl_download_config { crl_local_only = 0, crl_download_allowed };
-  enum ocsp_download_config { ocsp_off = 0, ocsp_on };
-  enum ocsp_strict_config { ocsp_relaxed = 0, ocsp_strict };
-  enum any_revo_fresh_config { any_revo_relaxed = 0, any_revo_strict };
-
-  nsresult Construct(missing_cert_download_config ac, crl_download_config cdc,
-                     ocsp_download_config odc, ocsp_strict_config osc,
-                     any_revo_fresh_config arfc,
-                     const char *firstNetworkRevocationMethod);
-
-private:
-  nsAutoRefCnt mRefCnt;
-  NS_DECL_OWNINGTHREAD
-  bool mAlreadyConstructed;
-  CERTValInParam *mCVIN;
-  CERTRevocationFlags *mRev;
-  bool mOCSPDownloadEnabled;
-  
-public:
-  CERTValInParam *GetRawPointerForNSS() { return mCVIN; }
-};
-
-#endif
diff --git a/security/manager/ssl/src/nsCMS.cpp b/security/manager/ssl/src/nsCMS.cpp
index 1c183a562ca9..89da4298111a 100644
--- a/security/manager/ssl/src/nsCMS.cpp
+++ b/security/manager/ssl/src/nsCMS.cpp
@@ -3,8 +3,9 @@
  * 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.h"
 #include "nsCMS.h"
+#include "CertVerifier.h"
+#include "nsISupports.h"
 #include "nsNSSHelper.h"
 #include "nsNSSCertificate.h"
 #include "smime.h"
@@ -13,19 +14,17 @@
 #include "nsIArray.h"
 #include "nsArrayUtils.h"
 #include "nsCertVerificationThread.h"
-#include "nsCERTValInParamWrapper.h"
 #include "ScopedNSSTypes.h"
 
 #include "prlog.h"
 
-#include "nsNSSComponent.h"
+using namespace mozilla;
+using namespace mozilla::psm;
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gPIPNSSLog;
 #endif
 
-using namespace mozilla;
-
 static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsCMSMessage, nsICMSMessage, 
@@ -218,9 +217,8 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, uint32_
   NSSCMSSignedData *sigd = nullptr;
   NSSCMSSignerInfo *si;
   int32_t nsigners;
+  RefPtr<CertVerifier> certVerifier;
   nsresult rv = NS_ERROR_FAILURE;
-  RefPtr<nsCERTValInParamWrapper> survivingParams;
-  nsCOMPtr<nsINSSComponent> inss;
 
   if (!NSS_CMSMessage_IsSigned(m_cmsMsg)) {
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - not signed\n"));
@@ -264,32 +262,16 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, uint32_
   // See bug 324474. We want to make sure the signing cert is 
   // still valid at the current time.
 
-  if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-    if (CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), si->cert, true, 
-                                  certificateUsageEmailSigner,
-                                  si->cmsg->pwfn_arg, nullptr) != SECSuccess) {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
-      rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
-      goto loser;
-    }
-  }
-  else {
-    CERTValOutParam cvout[1];
-    cvout[0].type = cert_po_end;
+  certVerifier = GetDefaultCertVerifier();
+  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
 
-    inss = do_GetService(kNSSComponentCID, &rv);
-    if (!inss) {
-      goto loser;
-    }
-
-    if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams))) {
-      goto loser;
-    }
-    SECStatus stat = CERT_PKIXVerifyCert(si->cert, certificateUsageEmailSigner,
-			    survivingParams->GetRawPointerForNSS(),
-			    cvout, si->cmsg->pwfn_arg);
-    if (stat != SECSuccess) {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
+  {
+    SECStatus srv = certVerifier->VerifyCert(si->cert,
+                                             certificateUsageEmailSigner,
+                                             PR_Now(), nullptr /*XXX pinarg*/);
+    if (srv != SECSuccess) {
+      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+             ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
       rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
       goto loser;
     }
diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index b9c5ca90a9c3..80e4e5797344 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -4,6 +4,7 @@
  * 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 "CertVerifier.h"
 #include "mozilla/RefPtr.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsStreamUtils.h"
@@ -20,6 +21,7 @@
 #include "ScopedNSSTypes.h"
 
 using namespace mozilla;
+using namespace mozilla::psm;
 
 #ifdef DEBUG
 #ifndef PSM_ENABLE_TEST_EV_ROOTS
@@ -1013,7 +1015,9 @@ isEVPolicy(SECOidTag policyOIDTag)
   return false;
 }
 
-static CERTCertList*
+namespace mozilla { namespace psm {
+
+CERTCertList*
 getRootsForOid(SECOidTag oid_tag)
 {
   CERTCertList *certList = CERT_NewCertList();
@@ -1034,6 +1038,8 @@ getRootsForOid(SECOidTag oid_tag)
   return certList;
 }
 
+}}
+
 static bool 
 isApprovedForEV(SECOidTag policyOIDTag, CERTCertificate *rootCert)
 {
@@ -1127,8 +1133,10 @@ nsNSSComponent::IdentityInfoInit()
   return PR_SUCCESS;
 }
 
+namespace mozilla { namespace psm {
+
 // Find the first policy OID that is known to be an EV policy OID.
-static SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
+SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
 {
   if (!cert)
     return SECFailure;
@@ -1173,6 +1181,8 @@ static SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
   return SECFailure;
 }
 
+}}
+
 NS_IMETHODIMP
 nsSSLStatus::GetIsExtendedValidation(bool* aIsEV)
 {
@@ -1215,101 +1225,23 @@ nsNSSCertificate::hasValidEVOidTag(SECOidTag &resultOidTag, bool &validEV)
     return nrv;
   nssComponent->EnsureIdentityInfoLoaded();
 
-  RefPtr<nsCERTValInParamWrapper> certVal;
-  nrv = nssComponent->GetDefaultCERTValInParam(certVal);
-  NS_ENSURE_SUCCESS(nrv, nrv);
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
 
   validEV = false;
   resultOidTag = SEC_OID_UNKNOWN;
 
-  SECOidTag oid_tag;
-  SECStatus rv = getFirstEVPolicy(mCert, oid_tag);
-  if (rv != SECSuccess)
-    return NS_OK;
+  SECStatus rv = certVerifier->VerifyCert(mCert,
+                                          certificateUsageSSLServer, PR_Now(),
+                                          nullptr /* XXX pinarg*/,
+                                          0, nullptr, &resultOidTag);
 
-  if (oid_tag == SEC_OID_UNKNOWN) // not in our list of OIDs accepted for EV
-    return NS_OK;
-
-  ScopedCERTCertList rootList(getRootsForOid(oid_tag));
-
-  CERTRevocationMethodIndex preferedRevMethods[1] = { 
-    cert_revocation_method_ocsp
-  };
-
-  uint64_t revMethodFlags = 
-    CERT_REV_M_TEST_USING_THIS_METHOD
-    | (certVal->IsOCSPDownloadEnabled() ? CERT_REV_M_ALLOW_NETWORK_FETCHING
-                                        : CERT_REV_M_FORBID_NETWORK_FETCHING)
-    | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
-    | CERT_REV_M_REQUIRE_INFO_ON_MISSING_SOURCE
-    | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
-    | CERT_REV_M_STOP_TESTING_ON_FRESH_INFO;
-
-  uint64_t revMethodIndependentFlags = 
-    CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST
-    | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE;
-
-  uint64_t methodFlags[2];
-  methodFlags[cert_revocation_method_crl] = revMethodFlags;
-  methodFlags[cert_revocation_method_ocsp] = revMethodFlags;
-
-  CERTRevocationFlags rev;
-
-  rev.leafTests.number_of_defined_methods = cert_revocation_method_ocsp +1;
-  rev.leafTests.cert_rev_flags_per_method = methodFlags;
-  rev.leafTests.number_of_preferred_methods = 1;
-  rev.leafTests.preferred_methods = preferedRevMethods;
-  rev.leafTests.cert_rev_method_independent_flags =
-    revMethodIndependentFlags;
-
-  rev.chainTests.number_of_defined_methods = cert_revocation_method_ocsp +1;
-  rev.chainTests.cert_rev_flags_per_method = methodFlags;
-  rev.chainTests.number_of_preferred_methods = 1;
-  rev.chainTests.preferred_methods = preferedRevMethods;
-  rev.chainTests.cert_rev_method_independent_flags =
-    revMethodIndependentFlags;
-
-  CERTValInParam cvin[4];
-  cvin[0].type = cert_pi_policyOID;
-  cvin[0].value.arraySize = 1; 
-  cvin[0].value.array.oids = &oid_tag;
-
-  cvin[1].type = cert_pi_revocationFlags;
-  cvin[1].value.pointer.revocation = &rev;
-
-  cvin[2].type = cert_pi_trustAnchors;
-  cvin[2].value.pointer.chain = rootList;
-
-  cvin[3].type = cert_pi_end;
-
-  CERTValOutParam cvout[2];
-  cvout[0].type = cert_po_trustAnchor;
-  cvout[0].value.pointer.cert = nullptr;
-  cvout[1].type = cert_po_end;
-
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("calling CERT_PKIXVerifyCert nss cert %p\n", mCert.get()));
-  rv = CERT_PKIXVerifyCert(mCert, certificateUsageSSLServer,
-                           cvin, cvout, nullptr);
-  if (rv != SECSuccess)
-    return NS_OK;
-
-  ScopedCERTCertificate issuerCert(cvout[0].value.pointer.cert);
-
-#ifdef PR_LOGGING
-  if (PR_LOG_TEST(gPIPNSSLog, PR_LOG_DEBUG)) {
-    nsNSSCertificate ic(issuerCert);
-    nsAutoString fingerprint;
-    ic.GetSha1Fingerprint(fingerprint);
-    NS_LossyConvertUTF16toASCII fpa(fingerprint);
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CERT_PKIXVerifyCert returned success, issuer: %s, SHA1: %s\n", 
-      issuerCert->subjectName, fpa.get()));
+  if (rv != SECSuccess) {
+    resultOidTag = SEC_OID_UNKNOWN;
+  }
+  if (resultOidTag != SEC_OID_UNKNOWN) {
+    validEV = true;
   }
-#endif
-
-  validEV = isApprovedForEV(oid_tag, issuerCert);
-  if (validEV)
-    resultOidTag = oid_tag;
- 
   return NS_OK;
 }
 
@@ -1345,8 +1277,10 @@ nsNSSCertificate::GetIsExtendedValidation(bool* aIsEV)
 
   if (mCachedEVStatus != ev_status_unknown) {
     *aIsEV = (mCachedEVStatus == ev_status_valid);
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSSCertificate::GetIsExtendedValidation value IS cached! \n"));
     return NS_OK;
   }
+  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSSCertificate::GetIsExtendedValidation value is NOT cached! \n"));
 
   SECOidTag oid_tag;
   return getValidEVOidTag(oid_tag, *aIsEV);
diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp
index 31d8228bbf5e..5ea2da7d5558 100644
--- a/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/security/manager/ssl/src/nsNSSCertificate.cpp
@@ -7,11 +7,12 @@
 #include "prerror.h"
 #include "prprf.h"
 
+#include "nsNSSCertificate.h"
+#include "CertVerifier.h"
 #include "nsNSSComponent.h" // for PIPNSS string bundle calls.
 #include "nsNSSCleaner.h"
 #include "nsCOMPtr.h"
 #include "nsIMutableArray.h"
-#include "nsNSSCertificate.h"
 #include "nsNSSCertValidity.h"
 #include "nsPKCS12Blob.h"
 #include "nsPK11TokenDB.h"
@@ -48,6 +49,7 @@
 #include "plbase64.h"
 
 using namespace mozilla;
+using namespace mozilla::psm;
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gPIPNSSLog;
@@ -75,14 +77,14 @@ NS_IMPL_THREADSAFE_ISUPPORTS7(nsNSSCertificate, nsIX509Cert,
 
 /* static */
 nsNSSCertificate*
-nsNSSCertificate::Create(CERTCertificate *cert)
+nsNSSCertificate::Create(CERTCertificate *cert, SECOidTag *evOidPolicy)
 {
   if (GeckoProcessType_Default != XRE_GetProcessType()) {
     NS_ERROR("Trying to initialize nsNSSCertificate in a non-chrome process!");
     return nullptr;
   }
   if (cert)
-    return new nsNSSCertificate(cert);
+    return new nsNSSCertificate(cert, evOidPolicy);
   else
     return new nsNSSCertificate();
 }
@@ -127,7 +129,8 @@ nsNSSCertificate::InitFromDER(char *certDER, int derLen)
   return true;
 }
 
-nsNSSCertificate::nsNSSCertificate(CERTCertificate *cert) : 
+nsNSSCertificate::nsNSSCertificate(CERTCertificate *cert,
+                                   SECOidTag *evOidPolicy) :
                                            mCert(nullptr),
                                            mPermDelete(false),
                                            mCertType(CERT_TYPE_NOT_YET_INITIALIZED),
@@ -142,8 +145,18 @@ nsNSSCertificate::nsNSSCertificate(CERTCertificate *cert) :
   if (isAlreadyShutDown())
     return;
 
-  if (cert) 
+  if (cert) {
     mCert = CERT_DupCertificate(cert);
+    if (evOidPolicy) {
+      if ( *evOidPolicy == SEC_OID_UNKNOWN) {
+        mCachedEVStatus =  ev_status_invalid;
+      }
+      else {
+        mCachedEVStatus = ev_status_valid;
+      }
+      mCachedEVOidTag = *evOidPolicy;
+    }
+  }
 }
 
 nsNSSCertificate::nsNSSCertificate() : 
@@ -1201,15 +1214,9 @@ nsNSSCertificate::VerifyForUsage(uint32_t usage, uint32_t *verificationResult)
 
   NS_ENSURE_ARG(verificationResult);
 
-  nsresult nsrv;
-  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
-  if (!inss)
-    return nsrv;
-  RefPtr<nsCERTValInParamWrapper> survivingParams;
-  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
-  if (NS_FAILED(nsrv))
-    return nsrv;
-  
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
+
   SECCertificateUsage nss_usage;
   
   switch (usage)
@@ -1266,19 +1273,8 @@ nsNSSCertificate::VerifyForUsage(uint32_t usage, uint32_t *verificationResult)
       return NS_ERROR_FAILURE;
   }
 
-  SECStatus verify_result;
-  if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-    CERTCertDBHandle *defaultcertdb = CERT_GetDefaultCertDB();
-    verify_result = CERT_VerifyCertificateNow(defaultcertdb, mCert, true, 
-                                              nss_usage, nullptr, nullptr);
-  }
-  else {
-    CERTValOutParam cvout[1];
-    cvout[0].type = cert_po_end;
-    verify_result = CERT_PKIXVerifyCert(mCert, nss_usage,
-                                        survivingParams->GetRawPointerForNSS(),
-                                        cvout, nullptr);
-  }
+  SECStatus verify_result = certVerifier->VerifyCert(mCert, nss_usage, PR_Now(),
+                                                     nullptr /*XXX pinarg*/);
   
   if (verify_result == SECSuccess)
   {
diff --git a/security/manager/ssl/src/nsNSSCertificate.h b/security/manager/ssl/src/nsNSSCertificate.h
index f1c7066778ad..8e3a7059a77e 100644
--- a/security/manager/ssl/src/nsNSSCertificate.h
+++ b/security/manager/ssl/src/nsNSSCertificate.h
@@ -44,12 +44,12 @@ public:
   NS_DECL_NSISERIALIZABLE
   NS_DECL_NSICLASSINFO
 
-  nsNSSCertificate(CERTCertificate *cert);
+  nsNSSCertificate(CERTCertificate *cert,SECOidTag *evOidPolicy = nullptr);
   nsNSSCertificate();
   /* from a request? */
   virtual ~nsNSSCertificate();
   nsresult FormatUIStrings(const nsAutoString &nickname, nsAutoString &nickWithSerial, nsAutoString &details);
-  static nsNSSCertificate* Create(CERTCertificate *cert = nullptr);
+  static nsNSSCertificate* Create(CERTCertificate *cert = nullptr, SECOidTag *evOidPolicy = nullptr);
   static nsNSSCertificate* ConstructFromDER(char *certDER, int derLen);
 
   // It is the responsibility of the caller of this method to free the returned
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index c41f115af1dc..ade4fdb62a8a 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -7,8 +7,10 @@
 // only exported so PSM can use it for this specific purpose.
 #define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm
 
-#include "nsNSSComponent.h"
 #include "nsNSSCertificateDB.h"
+
+#include "CertVerifier.h"
+#include "nsNSSComponent.h"
 #include "mozilla/Base64.h"
 #include "nsCOMPtr.h"
 #include "nsNSSCertificate.h"
@@ -46,6 +48,7 @@
 #include "plbase64.h"
 
 using namespace mozilla;
+using namespace mozilla::psm;
 using mozilla::psm::SharedSSLState;
 
 #ifdef PR_LOGGING
@@ -494,22 +497,9 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
   CERTCertificate **certArray = nullptr;
   ScopedCERTCertList certList;
   CERTCertListNode *node;
-  PRTime now;
-  SECCertUsage certusage;
-  SECCertificateUsage certificateusage;
   SECItem **rawArray;
   int numcerts;
   int i;
-  CERTValOutParam cvout[1];
-  cvout[0].type = cert_po_end;
-
-  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
-  if (!inss)
-    return nsrv;
-  RefPtr<nsCERTValInParamWrapper> survivingParams;
-  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
-  if (NS_FAILED(nsrv))
-    return nsrv;
  
   PLArenaPool *arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   if (!arena)
@@ -521,9 +511,11 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
     return NS_ERROR_FAILURE;
   }
 
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
+
   certdb = CERT_GetDefaultCertDB();
-  certusage = certUsageEmailRecipient;
-  certificateusage = certificateUsageEmailRecipient;
+  const PRTime now = PR_Now();
 
   numcerts = certCollection->numcerts;
 
@@ -537,7 +529,7 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
     rawArray[i] = &certCollection->rawCerts[i];
   }
 
-  srv = CERT_ImportCerts(certdb, certusage, numcerts, rawArray, 
+  srv = CERT_ImportCerts(certdb, certUsageEmailRecipient, numcerts, rawArray,
                          &certArray, false, false, nullptr);
 
   PORT_Free(rawArray);
@@ -565,7 +557,6 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
   /* go down the remaining list of certs and verify that they have
    * valid chains, then import them.
    */
-  now = PR_Now();
 
   for (node = CERT_LIST_HEAD(certList);
        !CERT_LIST_END(node,certList);
@@ -577,25 +568,18 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
       continue;
     }
 
-    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-      if (CERT_VerifyCert(certdb, node->cert,
-          true, certusage, now, ctx, nullptr) != SECSuccess) {
-        alert_and_skip = true;
-      }
-    }
-    else {
-      if (CERT_PKIXVerifyCert(node->cert, certificateusage,
-                              survivingParams->GetRawPointerForNSS(),
-                              cvout, ctx)
-          != SECSuccess) {
-        alert_and_skip = true;
-      }
+    SECStatus rv = certVerifier->VerifyCert(node->cert,
+                                            certificateUsageEmailRecipient,
+                                            now, ctx);
+    if (rv != SECSuccess) {
+      alert_and_skip = true;
     }
 
     ScopedCERTCertificateList certChain;
 
     if (!alert_and_skip) {
-      certChain = CERT_CertChainFromCert(node->cert, certusage, false);
+      certChain = CERT_CertChainFromCert(node->cert, certUsageEmailRecipient,
+                                         false);
       if (!certChain) {
         alert_and_skip = true;
       }
@@ -619,7 +603,7 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
     for (i=0; i < certChain->len; i++) {
       rawArray[i] = &certChain->certs[i];
     }
-    CERT_ImportCerts(certdb, certusage, certChain->len, 
+    CERT_ImportCerts(certdb, certUsageEmailRecipient, certChain->len,
                             rawArray,  nullptr, true, false, nullptr);
 
     CERT_SaveSMimeProfile(node->cert, nullptr, nullptr);
@@ -752,14 +736,9 @@ nsresult
 nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfaceRequestor *ctx)
 {
   SECItem **rawArray;
-  nsresult nsrv;
-  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
-  if (!inss)
-    return nsrv;
-  RefPtr<nsCERTValInParamWrapper> survivingParams;
-  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
-  if (NS_FAILED(nsrv))
-    return nsrv;
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  if (!certVerifier)
+    return NS_ERROR_UNEXPECTED;
 
   /* filter out the certs we don't want */
   SECStatus srv = CERT_FilterCertListByUsage(certList, certUsageAnyCA, true);
@@ -780,19 +759,10 @@ nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfac
 
     bool alert_and_skip = false;
 
-    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-      if (CERT_VerifyCert(CERT_GetDefaultCertDB(), node->cert, 
-          true, certUsageVerifyCA, PR_Now(), ctx, nullptr) != SECSuccess) {
-        alert_and_skip = true;
-      }
-    }
-    else {
-      if (CERT_PKIXVerifyCert(node->cert, certificateUsageVerifyCA,
-                              survivingParams->GetRawPointerForNSS(),
-                              cvout, ctx)
-          != SECSuccess) {
-        alert_and_skip = true;
-      }
+    SECStatus rv = certVerifier->VerifyCert(node->cert, certificateUsageVerifyCA,
+                                            PR_Now(), ctx);
+    if (rv != SECSuccess) {
+      alert_and_skip = true;
     }
 
     ScopedCERTCertificateList certChain;
@@ -1324,18 +1294,8 @@ nsNSSCertificateDB::FindCertByEmailAddress(nsISupports *aToken, const char *aEma
 {
   nsNSSShutDownPreventionLock locker;
   
-  nsCOMPtr<nsINSSComponent> inss;
-  RefPtr<nsCERTValInParamWrapper> survivingParams;
-  nsresult nsrv;
-  
-  if (nsNSSComponent::globalConstFlagUsePKIXVerification) {
-    inss = do_GetService(kNSSComponentCID, &nsrv);
-    if (!inss)
-      return nsrv;
-    nsrv = inss->GetDefaultCERTValInParam(survivingParams);
-    if (NS_FAILED(nsrv))
-      return nsrv;
-  }
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
 
   ScopedCERTCertList certlist(
       PK11_FindCertsFromEmailAddress(aEmailAddress, nullptr));
@@ -1354,23 +1314,11 @@ nsNSSCertificateDB::FindCertByEmailAddress(nsISupports *aToken, const char *aEma
        !CERT_LIST_END(node, certlist);
        node = CERT_LIST_NEXT(node)) {
 
-    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-      if (CERT_VerifyCert(CERT_GetDefaultCertDB(), node->cert,
-          true, certUsageEmailRecipient, PR_Now(), nullptr, nullptr) == SECSuccess) {
-        // found a valid certificate
-        break;
-      }
-    }
-    else {
-      CERTValOutParam cvout[1];
-      cvout[0].type = cert_po_end;
-      if (CERT_PKIXVerifyCert(node->cert, certificateUsageEmailRecipient,
-                              survivingParams->GetRawPointerForNSS(),
-                              cvout, nullptr)
-          == SECSuccess) {
-        // found a valid certificate
-        break;
-      }
+    SECStatus srv = certVerifier->VerifyCert(node->cert,
+                                             certificateUsageEmailRecipient,
+                                             PR_Now(), nullptr /*XXX pinarg*/);
+    if (srv == SECSuccess) {
+      break;
     }
   }
 
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 8b91e5fc82e2..57f8ac0528f4 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -9,6 +9,8 @@
 #endif
 
 #include "nsNSSComponent.h"
+
+#include "CertVerifier.h"
 #include "nsNSSCallbacks.h"
 #include "nsNSSIOLayer.h"
 #include "nsCertVerificationThread.h"
@@ -67,7 +69,6 @@
 #include "nsNSSShutDown.h"
 #include "GeneratedEvents.h"
 #include "nsIKeyModule.h"
-#include "ScopedNSSTypes.h"
 #include "SharedSSLState.h"
 
 #include "nss.h"
@@ -1098,23 +1099,18 @@ void nsNSSComponent::setValidationOptions(nsIPrefBranch * pref)
                            ocspMode_FailureIsVerificationFailure
                            : ocspMode_FailureIsNotAVerificationFailure);
 
-  RefPtr<nsCERTValInParamWrapper> newCVIN(new nsCERTValInParamWrapper);
-  if (NS_SUCCEEDED(newCVIN->Construct(
+  mDefaultCertVerifier = new CertVerifier(
       aiaDownloadEnabled ? 
-        nsCERTValInParamWrapper::missing_cert_download_on : nsCERTValInParamWrapper::missing_cert_download_off,
+        CertVerifier::missing_cert_download_on : CertVerifier::missing_cert_download_off,
       crlDownloading ?
-        nsCERTValInParamWrapper::crl_download_allowed : nsCERTValInParamWrapper::crl_local_only,
+        CertVerifier::crl_download_allowed : CertVerifier::crl_local_only,
       ocspEnabled ? 
-        nsCERTValInParamWrapper::ocsp_on : nsCERTValInParamWrapper::ocsp_off,
+        CertVerifier::ocsp_on : CertVerifier::ocsp_off,
       ocspRequired ? 
-        nsCERTValInParamWrapper::ocsp_strict : nsCERTValInParamWrapper::ocsp_relaxed,
+        CertVerifier::ocsp_strict : CertVerifier::ocsp_relaxed,
       anyFreshRequired ?
-        nsCERTValInParamWrapper::any_revo_strict : nsCERTValInParamWrapper::any_revo_relaxed,
-      firstNetworkRevo.get()))) {
-    // Swap to new defaults, and will cause the old defaults to be released,
-    // as soon as any concurrent use of the old default objects has finished.
-    mDefaultCERTValInParam = newCVIN;
-  }
+        CertVerifier::any_revo_strict : CertVerifier::any_revo_relaxed,
+      firstNetworkRevo.get());
 
   /*
     * The new defaults might change the validity of already established SSL sessions,
@@ -1826,20 +1822,6 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
       // dynamic options from prefs
       setValidationOptions(mPrefBranch);
 
-      // static validation options for usagesarray - do not hit the network
-      mDefaultCERTValInParamLocalOnly = new nsCERTValInParamWrapper;
-      rv = mDefaultCERTValInParamLocalOnly->Construct(
-          nsCERTValInParamWrapper::missing_cert_download_off,
-          nsCERTValInParamWrapper::crl_local_only,
-          nsCERTValInParamWrapper::ocsp_off,
-          nsCERTValInParamWrapper::ocsp_relaxed,
-          nsCERTValInParamWrapper::any_revo_relaxed,
-          FIRST_REVO_METHOD_DEFAULT);
-      if (NS_FAILED(rv)) {
-        nsPSMInitPanic::SetPanic();
-        return rv;
-      }
-      
       RegisterMyOCSPAIAInfoCallback();
 
       mHttpForNSS.initTable();
@@ -2053,7 +2035,7 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, uint32_t aRSABufLen,
   *aPrincipal = nullptr;
 
   nsNSSShutDownPreventionLock locker;
-  ScopedSEC_PKCS7ContentInfo p7_info; 
+  ScopedSEC_PKCS7ContentInfo p7_info;
   unsigned char hash[SHA1_LENGTH]; 
 
   SECItem item;
@@ -2066,10 +2048,6 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, uint32_t aRSABufLen,
                                 GetDecryptKeyCallback, nullptr,
                                 DecryptionAllowedCallback);
 
-  if (!p7_info) {
-    return NS_ERROR_FAILURE;
-  }
-
   // Make sure we call SEC_PKCS7DestroyContentInfo after this point;
   // otherwise we leak data in p7_info
   
@@ -2526,22 +2504,12 @@ nsNSSComponent::IsNSSInitialized(bool *initialized)
 }
 
 NS_IMETHODIMP
-nsNSSComponent::GetDefaultCERTValInParam(RefPtr<nsCERTValInParamWrapper> &out)
+nsNSSComponent::GetDefaultCertVerifier(RefPtr<CertVerifier> &out)
 {
   MutexAutoLock lock(mutex);
   if (!mNSSInitialized)
       return NS_ERROR_NOT_INITIALIZED;
-  out = mDefaultCERTValInParam;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSComponent::GetDefaultCERTValInParamLocalOnly(RefPtr<nsCERTValInParamWrapper> &out)
-{
-  MutexAutoLock lock(mutex);
-  if (!mNSSInitialized)
-      return NS_ERROR_NOT_INITIALIZED;
-  out = mDefaultCERTValInParamLocalOnly;
+  out = mDefaultCertVerifier;
   return NS_OK;
 }
 
diff --git a/security/manager/ssl/src/nsNSSComponent.h b/security/manager/ssl/src/nsNSSComponent.h
index 0f3ee52818ed..160a23390537 100644
--- a/security/manager/ssl/src/nsNSSComponent.h
+++ b/security/manager/ssl/src/nsNSSComponent.h
@@ -37,7 +37,13 @@
 
 #include "nsNSSHelper.h"
 #include "nsClientAuthRemember.h"
-#include "nsCERTValInParamWrapper.h"
+
+namespace mozilla { namespace psm {
+
+class CertVerifier;
+
+} } // namespace mozilla::psm
+
 
 #define NS_NSSCOMPONENT_CID \
 {0xa277189c, 0x1dd1, 0x11b2, {0xa8, 0xc9, 0xe4, 0xe8, 0xbf, 0xb1, 0x33, 0x8e}}
@@ -157,10 +163,8 @@ class NS_NO_VTABLE nsINSSComponent : public nsISupports {
 
   NS_IMETHOD IsNSSInitialized(bool *initialized) = 0;
 
-  NS_IMETHOD GetDefaultCERTValInParam(
-                  mozilla::RefPtr<nsCERTValInParamWrapper> &out) = 0;
-  NS_IMETHOD GetDefaultCERTValInParamLocalOnly(
-                  mozilla::RefPtr<nsCERTValInParamWrapper> &out) = 0;
+  NS_IMETHOD GetDefaultCertVerifier(
+                  mozilla::RefPtr<mozilla::psm::CertVerifier> &out) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsINSSComponent, NS_INSSCOMPONENT_IID)
@@ -264,10 +268,8 @@ public:
   NS_IMETHOD EnsureIdentityInfoLoaded();
   NS_IMETHOD IsNSSInitialized(bool *initialized);
 
-  NS_IMETHOD GetDefaultCERTValInParam(
-                  mozilla::RefPtr<nsCERTValInParamWrapper> &out);
-  NS_IMETHOD GetDefaultCERTValInParamLocalOnly(
-                  mozilla::RefPtr<nsCERTValInParamWrapper> &out);
+  NS_IMETHOD GetDefaultCertVerifier(
+                  mozilla::RefPtr<mozilla::psm::CertVerifier> &out);
 private:
 
   nsresult InitializeNSS(bool showWarningBox);
@@ -327,8 +329,8 @@ private:
   nsCertVerificationThread *mCertVerificationThread;
 
   nsNSSHttpInterface mHttpForNSS;
-  mozilla::RefPtr<nsCERTValInParamWrapper> mDefaultCERTValInParam;
-  mozilla::RefPtr<nsCERTValInParamWrapper> mDefaultCERTValInParamLocalOnly;
+  mozilla::RefPtr<mozilla::psm::CertVerifier> mDefaultCertVerifier;
+
 
   static PRStatus IdentityInfoInit(void);
   PRCallOnceType mIdentityInfoCallOnce;
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.cpp b/security/manager/ssl/src/nsUsageArrayHelper.cpp
index a8ed09d95739..38c497d51063 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.cpp
+++ b/security/manager/ssl/src/nsUsageArrayHelper.cpp
@@ -16,6 +16,7 @@
 #include "secerr.h"
 
 using namespace mozilla;
+using namespace mozilla::psm;
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gPIPNSSLog;
@@ -118,8 +119,10 @@ isFatalError(uint32_t checkResult)
 uint32_t
 nsUsageArrayHelper::check(uint32_t previousCheckResult,
                           const char *suffix,
+                          CertVerifier * certVerifier,
                           SECCertificateUsage aCertUsage,
-                          nsCERTValInParamWrapper * aValInParams,
+                          PRTime time,
+                          CertVerifier::Flags flags,
                           uint32_t &aCounter,
                           PRUnichar **outUsages)
 {
@@ -175,13 +178,8 @@ nsUsageArrayHelper::check(uint32_t previousCheckResult,
     return nsIX509Cert::NOT_VERIFIED_UNKNOWN;
   }
 
-  SECStatus rv;
-  CERTValOutParam cvout[1];
-  cvout[0].type = cert_po_end;
-
-  rv = CERT_PKIXVerifyCert(mCert, aCertUsage,
-                           aValInParams->GetRawPointerForNSS(),
-                           cvout, nullptr);
+  SECStatus rv = certVerifier->VerifyCert(mCert, aCertUsage,
+                         time, nullptr /*XXX:wincx*/, flags);
 
   if (rv == SECSuccess) {
     typestr.Append(suffix);
@@ -298,7 +296,6 @@ if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
   
   check(suffix, usages & certificateUsageSSLClient, count, outUsages);
   check(suffix, usages & certificateUsageSSLServer, count, outUsages);
-  check(suffix, usages & certificateUsageSSLServerWithStepUp, count, outUsages);
   check(suffix, usages & certificateUsageEmailSigner, count, outUsages);
   check(suffix, usages & certificateUsageEmailRecipient, count, outUsages);
   check(suffix, usages & certificateUsageObjectSigner, count, outUsages);
@@ -323,43 +320,43 @@ if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
   return NS_OK;
 }
 
-  RefPtr<nsCERTValInParamWrapper> params;
-  nsresult rv = localOnly ? nssComponent->GetDefaultCERTValInParamLocalOnly(params)
-                          : nssComponent->GetDefaultCERTValInParam(params);
-  NS_ENSURE_SUCCESS(rv, rv);
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
+
+  PRTime now = PR_Now();
+  CertVerifier::Flags flags = localOnly ? CertVerifier::FLAG_LOCAL_ONLY : 0;
 
   // The following list of checks must be < max_returned_out_array_size
 
   uint32_t result;
-  result = check(nsIX509Cert::VERIFIED_OK, suffix, certificateUsageSSLClient,
-                 params, count, outUsages);
-  result = check(result, suffix, certificateUsageSSLServer,
-                 params, count, outUsages);
-  result = check(result, suffix, certificateUsageSSLServerWithStepUp,
-                 params, count, outUsages);
-  result = check(result, suffix, certificateUsageEmailSigner,
-                 params, count, outUsages);
-  result = check(result, suffix, certificateUsageEmailRecipient,
-                 params, count, outUsages);
-  result = check(result, suffix, certificateUsageObjectSigner,
-                 params, count, outUsages);
+  result = check(nsIX509Cert::VERIFIED_OK, suffix, certVerifier,
+                 certificateUsageSSLClient, now, flags, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageSSLServer, now, flags, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageEmailSigner, now, flags, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageEmailRecipient, now, flags, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageObjectSigner, now, flags, count, outUsages);
 #if 0
-  result = check(result, suffix, certificateUsageProtectedObjectSigner,
-                 params, count, outUsages);
-  result = check(result, suffix, certificateUsageUserCertImport,
-                 params, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageProtectedObjectSigner, now, flags, count,
+                 outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageUserCertImport, now, flags, count, outUsages);
 #endif
-  result = check(result, suffix, certificateUsageSSLCA,
-                 params, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageSSLCA, now, flags, count, outUsages);
 #if 0
-  result = check(result, suffix, certificateUsageVerifyCA,
-                 params, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageVerifyCA, now, flags, count, outUsages);
 #endif
-  result = check(result, suffix, certificateUsageStatusResponder,
-                 params, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageStatusResponder, now, flags, count, outUsages);
 #if 0
-  result = checkPKIX(result, check(suffix, certificateUsageAnyCA,
-                 params, count, outUsages);
+  result = check(result, suffix, certVerifier,
+                 certificateUsageAnyCA, now, flags, count, outUsages);
 #endif
 
   if (isFatalError(result) || count == 0) {
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.h b/security/manager/ssl/src/nsUsageArrayHelper.h
index 63b46257a6ef..c2abc4aa9f47 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.h
+++ b/security/manager/ssl/src/nsUsageArrayHelper.h
@@ -5,9 +5,9 @@
 #ifndef _NSUSAGEARRAYHELPER_H_
 #define _NSUSAGEARRAYHELPER_H_
 
-#include "certt.h"
-
+#include "CertVerifier.h"
 #include "nsNSSComponent.h"
+#include "certt.h"
 
 class nsUsageArrayHelper
 {
@@ -38,8 +38,10 @@ private:
 
   uint32_t check(uint32_t previousCheckResult,
                  const char *suffix,
+                 mozilla::psm::CertVerifier * certVerifier,
                  SECCertificateUsage aCertUsage,
-                 nsCERTValInParamWrapper * aValInParams,
+                 PRTime time,
+                 mozilla::psm::CertVerifier::Flags flags,
                  uint32_t &aCounter,
                  PRUnichar **outUsages);
 

From 5dfdbfe9ec3b2e831e030aa9e2e4993df5197e31 Mon Sep 17 00:00:00 2001
From: Camilo Viecco <cviecco@mozilla.com>
Date: Mon, 15 Apr 2013 15:39:39 -0700
Subject: [PATCH 038/438] Bug 813418 - Centralize certificate validation (Part
 3 Getting chain form verify). r=bsmith

--HG--
rename : security/manager/ssl/src/nsCERTValInParamWrapper.cpp => security/manager/ssl/src/CertVerifier.cpp
extra : rebase_source : f373c1dabd57b4e0e6d61ac27b2eb0528eac03ba
---
 security/manager/ssl/src/CertVerifier.cpp     |  14 ++-
 .../ssl/src/SSLServerCertVerification.cpp     |  82 ++++++------
 .../manager/ssl/src/nsIdentityChecking.cpp    |   4 +-
 .../manager/ssl/src/nsNSSCertificateDB.cpp    | 119 ++++++++----------
 security/manager/ssl/src/nsNSSComponent.cpp   |   6 +-
 5 files changed, 106 insertions(+), 119 deletions(-)

diff --git a/security/manager/ssl/src/CertVerifier.cpp b/security/manager/ssl/src/CertVerifier.cpp
index 6b021a8e01d7..355f85cdf7a8 100644
--- a/security/manager/ssl/src/CertVerifier.cpp
+++ b/security/manager/ssl/src/CertVerifier.cpp
@@ -217,12 +217,12 @@ CertVerifier::VerifyCert(CERTCertificate * cert,
 
   if (evPolicy != SEC_OID_UNKNOWN) {
     // EV setup!
-    // This flags are not quite correct, but it is what we have now, so keeping
-    // them identical for bug landing purposes. Should be fixed later!
+    // XXX 859872 The current flags are not quite correct. (use
+    // of ocsp flags for crl preferences).
     uint64_t revMethodFlags =
       CERT_REV_M_TEST_USING_THIS_METHOD
-      | (mOCSPDownloadEnabled ? CERT_REV_M_ALLOW_NETWORK_FETCHING
-                              : CERT_REV_M_FORBID_NETWORK_FETCHING)
+      | ((mOCSPDownloadEnabled && !localOnly) ?
+          CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
       | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
       | CERT_REV_M_REQUIRE_INFO_ON_MISSING_SOURCE
       | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
@@ -371,6 +371,7 @@ pkix_done:
 
     if (rv == SECSuccess) {
       if (! cvout[validationChainLocation].value.pointer.chain) {
+        PR_SetError(PR_UNKNOWN_ERROR, 0);
         return SECFailure;
       }
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert: I have a chain\n"));
@@ -382,8 +383,8 @@ pkix_done:
         if (!CERT_CompareCerts(trustAnchor, cert)) {
           PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert:  adding issuer to tail for display\n"));
           // note: rv is reused to catch errors on cert creation!
-          rv = CERT_AddCertToListTail(*validationChain,
-                                      CERT_DupCertificate(trustAnchor));
+          ScopedCERTCertificate tempCert(CERT_DupCertificate(trustAnchor));
+          rv = CERT_AddCertToListTail(*validationChain, tempCert);
           if (rv != SECSuccess) {
             CERT_DestroyCertList(*validationChain);
             *validationChain = nullptr;
@@ -397,6 +398,7 @@ pkix_done:
       }
     }
   }
+
   return rv;
 }
 
diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp
index 773189a2305a..a212c2b4954f 100644
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
@@ -478,16 +478,14 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   
   PRTime now = PR_Now();
 
-  PLArenaPool *log_arena = nullptr;
+  PLArenaPool *log_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   PLArenaPoolCleanerFalseParam log_arena_cleaner(log_arena);
-  CERTVerifyLog * verify_log = nullptr;
-
-  log_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   if (!log_arena) {
     NS_ERROR("PORT_NewArena failed");
     return nullptr; // PORT_NewArena set error code
   }
-  verify_log = PORT_ArenaZNew(log_arena, CERTVerifyLog);
+
+  CERTVerifyLog * verify_log = PORT_ArenaZNew(log_arena, CERTVerifyLog);
   if (!verify_log) {
     NS_ERROR("PORT_ArenaZNew failed");
     return nullptr; // PORT_ArenaZNew set error code
@@ -496,7 +494,7 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   verify_log->arena = log_arena;
 
   srv = certVerifier->VerifyCert(cert, certificateUsageSSLServer, now,
-                                   infoObject, 0, nullptr, nullptr, verify_log);
+                                 infoObject, 0, nullptr, nullptr, verify_log);
 
   // We ignore the result code of the cert verification.
   // Either it is a failure, which is expected, and we'll process the
@@ -521,44 +519,40 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
     errorCodeMismatch = SSL_ERROR_BAD_CERT_DOMAIN;
   }
 
-  if (verify_log) {
-    CERTVerifyLogNode *i_node;
-    for (i_node = verify_log->head; i_node; i_node = i_node->next)
+  CERTVerifyLogNode *i_node;
+  for (i_node = verify_log->head; i_node; i_node = i_node->next)
+  {
+    switch (i_node->error)
     {
-      switch (i_node->error)
-      {
-        case SEC_ERROR_UNKNOWN_ISSUER:
-        case SEC_ERROR_CA_CERT_INVALID:
-        case SEC_ERROR_UNTRUSTED_ISSUER:
-        case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-        case SEC_ERROR_UNTRUSTED_CERT:
-        case SEC_ERROR_INADEQUATE_KEY_USAGE:
-        case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
-          // We group all these errors as "cert not trusted"
-          collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
-          if (errorCodeTrust == SECSuccess) {
-            errorCodeTrust = i_node->error;
-          }
-          break;
-        case SSL_ERROR_BAD_CERT_DOMAIN:
-          collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
-          if (errorCodeMismatch == SECSuccess) {
-            errorCodeMismatch = i_node->error;
-          }
-          break;
-        case SEC_ERROR_EXPIRED_CERTIFICATE:
-          collected_errors |= nsICertOverrideService::ERROR_TIME;
-          if (errorCodeExpired == SECSuccess) {
-            errorCodeExpired = i_node->error;
-          }
-          break;
-        default:
-          PR_SetError(i_node->error, 0);
-          return nullptr;
-      }
+      case SEC_ERROR_UNKNOWN_ISSUER:
+      case SEC_ERROR_CA_CERT_INVALID:
+      case SEC_ERROR_UNTRUSTED_ISSUER:
+      case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+      case SEC_ERROR_UNTRUSTED_CERT:
+      case SEC_ERROR_INADEQUATE_KEY_USAGE:
+      case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
+        // We group all these errors as "cert not trusted"
+        collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
+        if (errorCodeTrust == SECSuccess) {
+          errorCodeTrust = i_node->error;
+        }
+        break;
+      case SSL_ERROR_BAD_CERT_DOMAIN:
+        collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
+        if (errorCodeMismatch == SECSuccess) {
+          errorCodeMismatch = i_node->error;
+        }
+        break;
+      case SEC_ERROR_EXPIRED_CERTIFICATE:
+        collected_errors |= nsICertOverrideService::ERROR_TIME;
+        if (errorCodeExpired == SECSuccess) {
+          errorCodeExpired = i_node->error;
+        }
+        break;
+      default:
+        PR_SetError(i_node->error, 0);
+        return nullptr;
     }
-  } else {
-    // XXX set errorCodeTrust, errorCodeMismatch, errorCodeExpired, collected_errors
   }
 
   if (!collected_errors)
@@ -896,8 +890,8 @@ AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert,
     }
   }
 
-  ScopedCERTCertList certList(CERT_GetCertChainFromCert(cert, PR_Now(),
-                                                        certUsageSSLCA));
+  ScopedCERTCertList certList(verifyCertChain);
+
   if (!certList) {
     rv = SECFailure;
   } else {
diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index 80e4e5797344..52fc227df540 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -1038,7 +1038,7 @@ getRootsForOid(SECOidTag oid_tag)
   return certList;
 }
 
-}}
+} } // namespace mozilla::psm
 
 static bool 
 isApprovedForEV(SECOidTag policyOIDTag, CERTCertificate *rootCert)
@@ -1181,7 +1181,7 @@ SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
   return SECFailure;
 }
 
-}}
+} } // namespace mozilla::psm
 
 NS_IMETHODIMP
 nsSSLStatus::GetIsExtendedValidation(bool* aIsEV)
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index ade4fdb62a8a..9debd7ed20ee 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -32,7 +32,6 @@
 #include "nsComponentManagerUtils.h"
 #include "nsIPrompt.h"
 #include "nsThreadUtils.h"
-#include "ScopedNSSTypes.h"
 #include "nsIObserverService.h"
 #include "nsRecentBadCerts.h"
 #include "SharedSSLState.h"
@@ -480,6 +479,42 @@ nsNSSCertificateDB::ImportCertificates(uint8_t * data, uint32_t length,
   return nsrv;
 }
 
+static 
+SECStatus 
+ImportCertsIntoPermanentStorage(const ScopedCERTCertList &certChain, const SECCertUsage usage,
+                               const PRBool caOnly)
+{
+  CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
+  const PRTime now = PR_Now();
+
+  int chainLen=0;
+
+  for (CERTCertListNode *chainNode = CERT_LIST_HEAD(certChain);
+       !CERT_LIST_END(chainNode, certChain);
+       chainNode = CERT_LIST_NEXT(chainNode)) {
+    chainLen++;
+  }
+  SECItem **rawArray;
+  rawArray = (SECItem **) PORT_Alloc(chainLen * sizeof(SECItem *));
+  if (!rawArray) {
+    return SECFailure;
+  }
+
+  int i=0;
+  for (CERTCertListNode *chainNode = CERT_LIST_HEAD(certChain);
+       !CERT_LIST_END(chainNode, certChain);
+       chainNode = CERT_LIST_NEXT(chainNode), i++) {
+    rawArray[i] = &chainNode->cert->derCert;
+  }
+  CERT_ImportCerts(certdb, usage, chainLen,
+                   rawArray,  nullptr, true, caOnly, nullptr);
+
+  PORT_Free(rawArray);
+
+   
+  return SECSuccess;
+} 
+
 
 /*
  *  [noscript] void importEmailCertificates(in charPtr data, in unsigned long length,
@@ -562,53 +597,29 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
        !CERT_LIST_END(node,certList);
        node = CERT_LIST_NEXT(node)) {
 
-    bool alert_and_skip = false;
-
     if (!node->cert) {
       continue;
     }
 
+    CERTCertList *verifyCertChain = nullptr;
+
     SECStatus rv = certVerifier->VerifyCert(node->cert,
                                             certificateUsageEmailRecipient,
-                                            now, ctx);
+                                            now, ctx, 0, &verifyCertChain);
+
+    ScopedCERTCertList certChain(verifyCertChain);
+
     if (rv != SECSuccess) {
-      alert_and_skip = true;
-    }
-
-    ScopedCERTCertificateList certChain;
-
-    if (!alert_and_skip) {
-      certChain = CERT_CertChainFromCert(node->cert, certUsageEmailRecipient,
-                                         false);
-      if (!certChain) {
-        alert_and_skip = true;
-      }
-    }
-
-    if (alert_and_skip) {    
       nsCOMPtr<nsIX509Cert> certToShow = nsNSSCertificate::Create(node->cert);
       DisplayCertificateAlert(ctx, "NotImportingUnverifiedCert", certToShow);
       continue;
     }
-
-    /*
-     * CertChain returns an array of SECItems, import expects an array of
-     * SECItem pointers. Create the SECItem Pointers from the array of
-     * SECItems.
-     */
-    rawArray = (SECItem **) PORT_Alloc(certChain->len * sizeof(SECItem *));
-    if (!rawArray) {
-      continue;
-    }
-    for (i=0; i < certChain->len; i++) {
-      rawArray[i] = &certChain->certs[i];
-    }
-    CERT_ImportCerts(certdb, certUsageEmailRecipient, certChain->len,
-                            rawArray,  nullptr, true, false, nullptr);
-
+    rv = ImportCertsIntoPermanentStorage(certChain, certUsageEmailRecipient, false);
+    if (rv != SECSuccess) {
+      goto loser;
+    } 
     CERT_SaveSMimeProfile(node->cert, nullptr, nullptr);
 
-    PORT_Free(rawArray);
   }
 
 loser:
@@ -757,45 +768,21 @@ nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfac
        !CERT_LIST_END(node,certList);
        node = CERT_LIST_NEXT(node)) {
 
-    bool alert_and_skip = false;
+    //bool alert_and_skip = false;
+    CERTCertList *verifyCertChain = nullptr;
 
     SECStatus rv = certVerifier->VerifyCert(node->cert, certificateUsageVerifyCA,
-                                            PR_Now(), ctx);
+                                            PR_Now(), ctx, 0, &verifyCertChain);
+
+    ScopedCERTCertList certChain(verifyCertChain);
+
     if (rv != SECSuccess) {
-      alert_and_skip = true;
-    }
-
-    ScopedCERTCertificateList certChain;
-
-    if (!alert_and_skip) {    
-      certChain = CERT_CertChainFromCert(node->cert, certUsageAnyCA, false);
-      if (!certChain) {
-        alert_and_skip = true;
-      }
-    }
-
-    if (alert_and_skip) {    
       nsCOMPtr<nsIX509Cert> certToShow = nsNSSCertificate::Create(node->cert);
       DisplayCertificateAlert(ctx, "NotImportingUnverifiedCert", certToShow);
       continue;
     }
 
-    /*
-     * CertChain returns an array of SECItems, import expects an array of
-     * SECItem pointers. Create the SECItem Pointers from the array of
-     * SECItems.
-     */
-    rawArray = (SECItem **) PORT_Alloc(certChain->len * sizeof(SECItem *));
-    if (!rawArray) {
-      continue;
-    }
-    for (int i=0; i < certChain->len; i++) {
-      rawArray[i] = &certChain->certs[i];
-    }
-    CERT_ImportCerts(CERT_GetDefaultCertDB(), certUsageAnyCA, certChain->len, 
-                            rawArray,  nullptr, true, true, nullptr);
-
-    PORT_Free(rawArray);
+    ImportCertsIntoPermanentStorage(certChain, certUsageAnyCA, true);
   }
   
   return NS_OK;
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 57f8ac0528f4..247a36be2cfe 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -2048,9 +2048,13 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, uint32_t aRSABufLen,
                                 GetDecryptKeyCallback, nullptr,
                                 DecryptionAllowedCallback);
 
+  if (!p7_info) {
+    return NS_ERROR_FAILURE;
+  }
+
   // Make sure we call SEC_PKCS7DestroyContentInfo after this point;
   // otherwise we leak data in p7_info
-  
+
   //-- If a plaintext was provided, hash it.
   SECItem digest;
   digest.data = nullptr;

From 0f9279bce17203d1259ce4069129b5d595ace87e Mon Sep 17 00:00:00 2001
From: Camilo Viecco <cviecco@mozilla.com>
Date: Wed, 27 Feb 2013 10:30:10 -0800
Subject: [PATCH 039/438] Bug 813418 - Centralize certificate validation (Part
 4 remove verifycertnow). r=bsmith

--HG--
extra : rebase_source : 15e6d3b1f70e24384914dfc71b393a00ac5ddf1e
---
 security/manager/ssl/src/nsNSSCertificate.cpp |  39 ++++-
 .../manager/ssl/src/nsNSSCertificateDB.cpp    |  10 +-
 .../manager/ssl/src/nsUsageArrayHelper.cpp    | 135 +++---------------
 3 files changed, 59 insertions(+), 125 deletions(-)

diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp
index 5ea2da7d5558..66e8ac71c8f8 100644
--- a/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/security/manager/ssl/src/nsNSSCertificate.cpp
@@ -825,8 +825,45 @@ nsNSSCertificate::GetChain(nsIArray **_rvChain)
   nsresult rv;
   /* Get the cert chain from NSS */
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting chain for \"%s\"\n", mCert->nickname));
+
   ScopedCERTCertList nssChain;
-  nssChain = CERT_GetCertChainFromCert(mCert, PR_Now(), certUsageSSLClient);
+  SECStatus srv;
+  nssChain = nullptr;
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
+  CERTCertList *pkixNssChain = nullptr;
+
+  // We want to test all usages, but we start with server because most of the
+  // time Firefox users care about server certs.
+  srv = certVerifier->VerifyCert(mCert,
+                                 certificateUsageSSLServer, PR_Now(),
+                                 nullptr, /*XXX fixme*/
+                                 CertVerifier::FLAG_LOCAL_ONLY,
+                                 &pkixNssChain);
+  for (int usage = certificateUsageSSLClient;
+       usage < certificateUsageAnyCA && !pkixNssChain;
+       usage = usage << 1) {
+    if (usage == certificateUsageSSLServer) {
+      continue;
+    }
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("pipnss: PKIX attempting chain(%d) for '%s'\n",usage, mCert->nickname));
+    srv = certVerifier->VerifyCert(mCert,
+                                   certificateUsageSSLClient, PR_Now(),
+                                   nullptr, /*XXX fixme*/
+                                   CertVerifier::FLAG_LOCAL_ONLY,
+                                   &pkixNssChain);
+  }
+
+  if (!pkixNssChain) {
+    // There is not verified path for the chain, howeever we still want to 
+    // present to the user as much of a possible chain as possible, in the case
+    // where there was a problem with the cert or the issuers.
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("pipnss: getchain :CertVerify failed to get chain for '%s'\n", mCert->nickname));
+    nssChain = CERT_GetCertChainFromCert(mCert, PR_Now(), certUsageSSLClient);
+  } else {
+    nssChain = pkixNssChain;
+  }
+
   if (!nssChain)
     return NS_ERROR_FAILURE;
   /* enumerate the chain for scripting purposes */
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index 9debd7ed20ee..f4283e0a5230 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -487,20 +487,20 @@ ImportCertsIntoPermanentStorage(const ScopedCERTCertList &certChain, const SECCe
   CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
   const PRTime now = PR_Now();
 
-  int chainLen=0;
-
+  int chainLen = 0;
   for (CERTCertListNode *chainNode = CERT_LIST_HEAD(certChain);
        !CERT_LIST_END(chainNode, certChain);
        chainNode = CERT_LIST_NEXT(chainNode)) {
     chainLen++;
   }
+
   SECItem **rawArray;
   rawArray = (SECItem **) PORT_Alloc(chainLen * sizeof(SECItem *));
   if (!rawArray) {
     return SECFailure;
   }
 
-  int i=0;
+  int i = 0;
   for (CERTCertListNode *chainNode = CERT_LIST_HEAD(certChain);
        !CERT_LIST_END(chainNode, certChain);
        chainNode = CERT_LIST_NEXT(chainNode), i++) {
@@ -509,9 +509,7 @@ ImportCertsIntoPermanentStorage(const ScopedCERTCertList &certChain, const SECCe
   CERT_ImportCerts(certdb, usage, chainLen,
                    rawArray,  nullptr, true, caOnly, nullptr);
 
-  PORT_Free(rawArray);
-
-   
+  PORT_Free(rawArray);   
   return SECSuccess;
 } 
 
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.cpp b/security/manager/ssl/src/nsUsageArrayHelper.cpp
index 38c497d51063..34b5efdb58a8 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.cpp
+++ b/security/manager/ssl/src/nsUsageArrayHelper.cpp
@@ -32,66 +32,6 @@ nsUsageArrayHelper::nsUsageArrayHelper(CERTCertificate *aCert)
   nssComponent = do_GetService(kNSSComponentCID, &m_rv);
 }
 
-// XXX: old, non-libpkix version of check that will be removed after the switch
-// to libpkix is final.
-void
-nsUsageArrayHelper::check(const char *suffix,
-                        SECCertificateUsage aCertUsage,
-                        uint32_t &aCounter,
-                        PRUnichar **outUsages)
-{
-  if (!aCertUsage) return;
-  nsAutoCString typestr;
-  switch (aCertUsage) {
-  case certificateUsageSSLClient:
-    typestr = "VerifySSLClient";
-    break;
-  case certificateUsageSSLServer:
-    typestr = "VerifySSLServer";
-    break;
-  case certificateUsageSSLServerWithStepUp:
-    typestr = "VerifySSLStepUp";
-    break;
-  case certificateUsageEmailSigner:
-    typestr = "VerifyEmailSigner";
-    break;
-  case certificateUsageEmailRecipient:
-    typestr = "VerifyEmailRecip";
-    break;
-  case certificateUsageObjectSigner:
-    typestr = "VerifyObjSign";
-    break;
-  case certificateUsageProtectedObjectSigner:
-    typestr = "VerifyProtectObjSign";
-    break;
-  case certificateUsageUserCertImport:
-    typestr = "VerifyUserImport";
-    break;
-  case certificateUsageSSLCA:
-    typestr = "VerifySSLCA";
-    break;
-  case certificateUsageVerifyCA:
-    typestr = "VerifyCAVerifier";
-    break;
-  case certificateUsageStatusResponder:
-    typestr = "VerifyStatusResponder";
-    break;
-  case certificateUsageAnyCA:
-    typestr = "VerifyAnyCA";
-    break;
-  default:
-    break;
-  }
-  if (!typestr.IsEmpty()) {
-    typestr.Append(suffix);
-    nsAutoString verifyDesc;
-    m_rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
-    if (NS_SUCCEEDED(m_rv)) {
-      outUsages[aCounter++] = ToNewUnicode(verifyDesc);
-    }
-  }
-}
-
 namespace {
 
 // Some validation errors are non-fatal in that, we should keep checking the
@@ -259,67 +199,21 @@ nsUsageArrayHelper::GetUsagesArray(const char *suffix,
   if (outArraySize < max_returned_out_array_size)
     return NS_ERROR_FAILURE;
 
+  // Bug 860076, this disabling ocsp for all NSS is incorrect.
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification && localOnly) {
+    nsresult rv;
+    nssComponent = do_GetService(kNSSComponentCID, &rv);
+    if (NS_FAILED(rv))
+      return rv;
+    
+    if (nssComponent) {
+      nssComponent->SkipOcsp();
+    }
+  }
+
   uint32_t &count = *_count;
   count = 0;
 
-// TODO: This block will be removed as soon as the switch to libpkix is
-// complete.
-if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-  if (localOnly) {
-    nssComponent->SkipOcsp();
-  }
-
-  SECCertificateUsage usages = 0;
-  int err = 0;
-  
-  // CERT_VerifyCertificateNow returns SECFailure unless the certificate is
-  // valid for all the given usages. Hoewver, we are only looking for the list
-  // of usages for which the cert *is* valid.
-  (void)
-  CERT_VerifyCertificateNow(defaultcertdb, mCert, true,
-			    certificateUsageSSLClient |
-			    certificateUsageSSLServer |
-			    certificateUsageSSLServerWithStepUp |
-			    certificateUsageEmailSigner |
-			    certificateUsageEmailRecipient |
-			    certificateUsageObjectSigner |
-			    certificateUsageSSLCA |
-			    certificateUsageStatusResponder,
-			    nullptr, &usages);
-  err = PR_GetError();
-
-  if (localOnly) {
-     nssComponent->SkipOcspOff();
-  }
-
-  // The following list of checks must be < max_returned_out_array_size
-  
-  check(suffix, usages & certificateUsageSSLClient, count, outUsages);
-  check(suffix, usages & certificateUsageSSLServer, count, outUsages);
-  check(suffix, usages & certificateUsageEmailSigner, count, outUsages);
-  check(suffix, usages & certificateUsageEmailRecipient, count, outUsages);
-  check(suffix, usages & certificateUsageObjectSigner, count, outUsages);
-#if 0
-  check(suffix, usages & certificateUsageProtectedObjectSigner, count, outUsages);
-  check(suffix, usages & certificateUsageUserCertImport, count, outUsages);
-#endif
-  check(suffix, usages & certificateUsageSSLCA, count, outUsages);
-#if 0
-  check(suffix, usages & certificateUsageVerifyCA, count, outUsages);
-#endif
-  check(suffix, usages & certificateUsageStatusResponder, count, outUsages);
-#if 0
-  check(suffix, usages & certificateUsageAnyCA, count, outUsages);
-#endif
-
-  if (count == 0) {
-    verifyFailed(_verified, err);
-  } else {
-    *_verified = nsNSSCertificate::VERIFIED_OK;
-  }
-  return NS_OK;
-}
-
   RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
   NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
 
@@ -359,6 +253,11 @@ if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
                  certificateUsageAnyCA, now, flags, count, outUsages);
 #endif
 
+  // Bug 860076, this disabling ocsp for all NSS is incorrect
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification && localOnly) {
+     nssComponent->SkipOcspOff();
+  }
+
   if (isFatalError(result) || count == 0) {
     MOZ_ASSERT(result != nsIX509Cert::VERIFIED_OK);
 

From 5537f1395ccd3ea31e1a366d2d36d9f94fe46f98 Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Tue, 16 Apr 2013 09:40:47 +1200
Subject: [PATCH 040/438] Bug 861731, remove redundent Connect, Attach call.
 r=nical

--HG--
extra : rebase_source : af4a88fd5ddd8cecfceea49e88eebb37bf833517
---
 gfx/layers/basic/BasicThebesLayer.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gfx/layers/basic/BasicThebesLayer.cpp b/gfx/layers/basic/BasicThebesLayer.cpp
index 4451bcdf57d6..b88e8f4a149b 100644
--- a/gfx/layers/basic/BasicThebesLayer.cpp
+++ b/gfx/layers/basic/BasicThebesLayer.cpp
@@ -278,11 +278,8 @@ BasicShadowableThebesLayer::PaintBuffer(gfxContext* aContext,
                                         void* aCallbackData)
 {
   ContentClientRemote* contentClientRemote = static_cast<ContentClientRemote*>(mContentClient.get());
-  if (HasShadow() && !mContentClient->GetIPDLActor()) {
-    mContentClient->Connect();
-    BasicManager()->Attach(mContentClient, this);
-  }
   MOZ_ASSERT(contentClientRemote->GetIPDLActor() || !HasShadow());
+
   // NB: this just throws away the entire valid region if there are
   // too many rects.
   mValidRegion.SimplifyInward(8);

From d66ab16c1569c91fe085763db89a56e3e312db0d Mon Sep 17 00:00:00 2001
From: Seth Fowler <seth@mozilla.com>
Date: Mon, 15 Apr 2013 14:34:18 -0700
Subject: [PATCH 041/438] Bug 859718 - Don't assume we have mImageRequest in
 RasterImage::IsDecodeFinished. r=joe

--HG--
extra : rebase_source : ec57c42b17398f0c90d19f35834e389444059b7f
---
 image/src/RasterImage.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index b2e88bc9295e..19cca9bd4a94 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -3278,7 +3278,6 @@ RasterImage::IsDecodeFinished()
   // Precondition
   mDecodingMutex.AssertCurrentThreadOwns();
   NS_ABORT_IF_FALSE(mDecoder, "Can't call IsDecodeFinished() without decoder!");
-  MOZ_ASSERT(mDecodeRequest);
 
   // The decode is complete if we got what we wanted.
   if (mDecoder->IsSizeDecode()) {
@@ -3288,11 +3287,12 @@ RasterImage::IsDecodeFinished()
   } else if (mDecoder->GetDecodeDone()) {
     return true;
   }
-  
+
   // If the decoder returned because it needed a new frame and we haven't
   // written to it since then, the decoder may be storing data that it hasn't
   // decoded yet.
-  if (mDecoder->NeedsNewFrame() || mDecodeRequest->mAllocatedNewFrame) {
+  if (mDecoder->NeedsNewFrame() ||
+      (mDecodeRequest && mDecodeRequest->mAllocatedNewFrame)) {
     return false;
   }
 

From 7021bbc62cabcee286f009246a3ade90e80b7282 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Fri, 12 Apr 2013 16:34:27 -0700
Subject: [PATCH 042/438] Bug 860572 - Allow JSPropertyDescriptor to use
 Rooted; r=jonco

--HG--
extra : rebase_source : e66e6b99777e19e6c98b4cc6487a65b04495961c
---
 js/src/gc/RootMarking.cpp |  33 +++++++-----
 js/src/gc/Verifier.cpp    |  17 +++++--
 js/src/jsapi.h            | 104 +++++++++++++++++++++++++++++++++++++-
 js/src/jspubtd.h          |   1 +
 4 files changed, 137 insertions(+), 18 deletions(-)

diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index 2f6e71da4ce6..4b55a109c40d 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -68,6 +68,7 @@ MarkExactStackRoot(JSTracer *trc, Rooted<void*> *rooter, ThingRootKind kind)
       case THING_ROOT_ID:          MarkIdRoot(trc, (jsid *)addr, "exact-id"); break;
       case THING_ROOT_PROPERTY_ID: MarkIdRoot(trc, &((js::PropertyId *)addr)->asId(), "exact-propertyid"); break;
       case THING_ROOT_BINDINGS:    ((Bindings *)addr)->trace(trc); break;
+      case THING_ROOT_PROPERTY_DESCRIPTOR: ((JSPropertyDescriptor *)addr)->trace(trc); break;
       default: JS_NOT_REACHED("Invalid THING_ROOT kind"); break;
     }
 }
@@ -416,19 +417,7 @@ AutoGCRooter::trace(JSTracer *trc)
 
       case DESCRIPTOR : {
         PropertyDescriptor &desc = *static_cast<AutoPropertyDescriptorRooter *>(this);
-        if (desc.obj)
-            MarkObjectRoot(trc, &desc.obj, "Descriptor::obj");
-        MarkValueRoot(trc, &desc.value, "Descriptor::value");
-        if ((desc.attrs & JSPROP_GETTER) && desc.getter) {
-            JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, desc.getter);
-            MarkObjectRoot(trc, &tmp, "Descriptor::get");
-            desc.getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, tmp);
-        }
-        if (desc.attrs & JSPROP_SETTER && desc.setter) {
-            JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, desc.setter);
-            MarkObjectRoot(trc, &tmp, "Descriptor::set");
-            desc.setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, tmp);
-        }
+        desc.trace(trc);
         return;
       }
 
@@ -649,6 +638,24 @@ StackShape::AutoRooter::trace(JSTracer *trc)
     MarkIdRoot(trc, (jsid*) &shape->propid, "StackShape::AutoRooter id");
 }
 
+void
+JSPropertyDescriptor::trace(JSTracer *trc)
+{
+    if (obj)
+        MarkObjectRoot(trc, &obj, "Descriptor::obj");
+    MarkValueRoot(trc, &value, "Descriptor::value");
+    if ((attrs & JSPROP_GETTER) && getter) {
+        JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, getter);
+        MarkObjectRoot(trc, &tmp, "Descriptor::get");
+        getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, tmp);
+    }
+    if ((attrs & JSPROP_SETTER) && setter) {
+        JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, setter);
+        MarkObjectRoot(trc, &tmp, "Descriptor::set");
+        setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, tmp);
+    }
+}
+
 void
 js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots)
 {
diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp
index 2a45d31f7b6e..0b20188f9b40 100644
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -30,14 +30,23 @@ using namespace mozilla;
 
 #if defined(DEBUG) && defined(JS_GC_ZEAL) && defined(JSGC_ROOT_ANALYSIS) && !defined(JS_THREADSAFE)
 
+template <typename T>
+bool
+CheckNonAddressThing(uintptr_t *w, T *t)
+{
+    return w >= (uintptr_t*)t && w < (uintptr_t*)(t + 1);
+}
+
 JS_ALWAYS_INLINE bool
 CheckStackRootThing(uintptr_t *w, void *address, ThingRootKind kind)
 {
-    if (kind != THING_ROOT_BINDINGS)
-        return address == static_cast<void*>(w);
+    if (kind == THING_ROOT_BINDINGS)
+        return CheckNonAddressThing(w, static_cast<Bindings*>(address));
 
-    Bindings *bp = static_cast<Bindings*>(address);
-    return w >= (uintptr_t*)bp && w < (uintptr_t*)(bp + 1);
+    if (kind == THING_ROOT_PROPERTY_DESCRIPTOR)
+        return CheckNonAddressThing(w, static_cast<PropertyDescriptor*>(address));
+
+    return address == static_cast<void*>(w);
 }
 
 struct Rooter {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index cd4d151ca4f1..3ea75be79d3b 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -3307,13 +3307,115 @@ struct JSPropertyDescriptor {
     unsigned           shortid;
     JSPropertyOp       getter;
     JSStrictPropertyOp setter;
-    jsval              value;
+    JS::Value          value;
 
     JSPropertyDescriptor() : obj(NULL), attrs(0), shortid(0), getter(NULL),
                              setter(NULL), value(JSVAL_VOID)
     {}
+
+    void trace(JSTracer *trc);
 };
 
+namespace JS {
+
+template <typename Outer>
+class PropertyDescriptorOperations
+{
+    const JSPropertyDescriptor * desc() const { return static_cast<const Outer*>(this)->extract(); }
+    JSPropertyDescriptor * desc() { return static_cast<Outer*>(this)->extract(); }
+
+  public:
+    bool isEnumerable() const { return desc()->attrs & JSPROP_ENUMERATE; }
+    bool isReadonly() const { return desc()->attrs & JSPROP_READONLY; }
+    bool isPermanent() const { return desc()->attrs & JSPROP_PERMANENT; }
+    bool hasNativeAccessors() const { return desc()->attrs & JSPROP_NATIVE_ACCESSORS; }
+    bool hasGetterObject() const { return desc()->attrs & JSPROP_GETTER; }
+    bool hasSetterObject() const { return desc()->attrs & JSPROP_SETTER; }
+    bool isShared() const { return desc()->attrs & JSPROP_SHARED; }
+    bool isIndex() const { return desc()->attrs & JSPROP_INDEX; }
+    bool hasShortId() const { return desc()->attrs & JSPROP_SHORTID; }
+    bool hasAttributes(unsigned attrs) const { return desc()->attrs & attrs; }
+
+    JS::MutableHandleObject obj() { return JS::MutableHandleObject::fromMarkedLocation(&desc()->obj); }
+    unsigned attributes() const { return desc()->attrs; }
+    unsigned shortid() const {
+        MOZ_ASSERT(hasShortId());
+        return desc()->shortid;
+    }
+    JSPropertyOp getter() const { MOZ_ASSERT(!hasGetterObject()); return desc()->getter; }
+    JSStrictPropertyOp setter() const { MOZ_ASSERT(!hasSetterObject()); return desc()->setter; }
+    JS::HandleObject getterObject() const {
+        MOZ_ASSERT(hasGetterObject());
+        return JS::HandleObject::fromMarkedLocation(reinterpret_cast<JSObject *const *>(&desc()->getter));
+    }
+    JS::HandleObject setterObject() const {
+        MOZ_ASSERT(hasSetterObject());
+        return JS::HandleObject::fromMarkedLocation(reinterpret_cast<JSObject *const *>(&desc()->setter));
+    }
+    JS::MutableHandleValue value() { return JS::MutableHandleValue::fromMarkedLocation(&desc()->value); }
+
+    void setAttributes(unsigned attrs) { desc()->attrs = attrs; }
+    void setShortId(unsigned shortid) { desc()->shortid = shortid; }
+    void setGetter(JSPropertyOp op) { desc->getter = op; }
+    void setSetter(JSStrictPropertyOp op) { desc->setter = op; }
+    void setGetterObject(JSObject *obj) { desc()->getter = reinterpret_cast<JSPropertyOp>(obj); }
+    void setSetterObject(JSObject *obj) { desc()->setter = reinterpret_cast<JSStrictPropertyOp>(obj); }
+};
+
+} /* namespace JS */
+
+namespace js {
+
+template <>
+struct RootMethods<JSPropertyDescriptor> {
+    static JSPropertyDescriptor initial() { return JSPropertyDescriptor(); }
+    static ThingRootKind kind() { return THING_ROOT_PROPERTY_DESCRIPTOR; }
+    static bool poisoned(const JSPropertyDescriptor &desc) {
+        return (desc.obj && JS::IsPoisonedPtr(desc.obj)) ||
+               (desc.attrs & JSPROP_GETTER && desc.getter && JS::IsPoisonedPtr(desc.getter)) ||
+               (desc.attrs & JSPROP_SETTER && desc.setter && JS::IsPoisonedPtr(desc.setter)) ||
+               (desc.value.isGCThing() && JS::IsPoisonedPtr(desc.value.toGCThing()));
+    }
+};
+
+template <>
+class RootedBase<JSPropertyDescriptor>
+  : public JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >
+{
+    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
+    const JSPropertyDescriptor *extract() const {
+        return static_cast<const JS::Rooted<JSPropertyDescriptor>*>(this)->address();
+    }
+    JSPropertyDescriptor *extract() {
+        return static_cast<JS::Rooted<JSPropertyDescriptor>*>(this)->address();
+    }
+};
+
+template <>
+class HandleBase<JSPropertyDescriptor>
+  : public JS::PropertyDescriptorOperations<JS::Handle<JSPropertyDescriptor> >
+{
+    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
+    const JSPropertyDescriptor *extract() const {
+        return static_cast<const JS::Handle<JSPropertyDescriptor>*>(this)->address();
+    }
+};
+
+template <>
+class MutableHandleBase<JSPropertyDescriptor>
+  : public JS::PropertyDescriptorOperations<JS::MutableHandle<JSPropertyDescriptor> >
+{
+    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
+    const JSPropertyDescriptor *extract() const {
+        return static_cast<const JS::MutableHandle<JSPropertyDescriptor>*>(this)->address();
+    }
+    JSPropertyDescriptor *extract() {
+        return static_cast<JS::MutableHandle<JSPropertyDescriptor>*>(this)->address();
+    }
+};
+
+} /* namespace js */
+
 /*
  * Like JS_GetPropertyAttrsGetterAndSetterById but will return a property on
  * an object on the prototype chain (returned in objp). If data->obj is null,
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index 2159dd4f6cc6..5dd1c718d750 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -244,6 +244,7 @@ enum ThingRootKind
     THING_ROOT_VALUE,
     THING_ROOT_TYPE,
     THING_ROOT_BINDINGS,
+    THING_ROOT_PROPERTY_DESCRIPTOR,
     THING_ROOT_LIMIT
 };
 

From c92aae54d07923ca064a7cc47c6d42b263588910 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Fri, 12 Apr 2013 17:42:59 -0700
Subject: [PATCH 043/438] Bug 860572 - Use Rooted<JSPropertyDescriptor> in
 XPCComponents; r=bholley

--HG--
extra : rebase_source : 696cf3ac61d431188d92440bbe506852ecf3c232
---
 js/xpconnect/src/XPCComponents.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 3253644d1b70..69bc225c1e8d 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -2769,15 +2769,15 @@ nsXPCComponents_Utils::LookupMethod(const JS::Value& object,
 
         // Alright, now do the lookup.
         *retval = JSVAL_VOID;
-        JSPropertyDescriptor desc;
-        if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, &desc))
+        Rooted<JSPropertyDescriptor> desc(cx);
+        if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, desc.address()))
             return NS_ERROR_FAILURE;
 
         // First look for a method value. If that's not there, try a getter,
         // since historically lookupMethod also works for getters.
-        JSObject *methodObj = desc.value.isObject() ? &desc.value.toObject() : NULL;
-        if (!methodObj && (desc.attrs & JSPROP_GETTER))
-            methodObj = JS_FUNC_TO_DATA_PTR(JSObject *, desc.getter);
+        JSObject *methodObj = desc.value().isObject() ? &desc.value().toObject() : NULL;
+        if (!methodObj && desc.hasGetterObject())
+            methodObj = desc.getterObject();
 
         // Callers of this function seem to expect bound methods. Make it happen.
         // Note that this is unnecessary until bug 658909 is fixed.

From d61ea30a209e83eccaa91d81b754e35c29406f23 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Fri, 8 Mar 2013 15:23:31 -0500
Subject: [PATCH 044/438] bug 860027 - nuke the interface info super manager
 r=bsmedberg

---
 js/xpconnect/src/nsXPConnect.cpp              | 22 +----
 js/xpconnect/src/xpcprivate.h                 |  4 +-
 .../public/nsIInterfaceInfoManager.idl        | 10 ---
 .../xptinfo/src/xptiInterfaceInfoManager.cpp  | 80 +------------------
 xpcom/reflect/xptinfo/src/xptiprivate.h       |  5 +-
 5 files changed, 8 insertions(+), 113 deletions(-)

diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 84136594fc6e..3193b33a792b 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -225,7 +225,7 @@ nsXPConnect::ReleaseXPConnectSingleton()
 
 // static
 nsresult
-nsXPConnect::GetInterfaceInfoManager(nsIInterfaceInfoSuperManager** iim,
+nsXPConnect::GetInterfaceInfoManager(nsIInterfaceInfoManager** iim,
                                      nsXPConnect* xpc /*= nullptr*/)
 {
     if (!xpc && !(xpc = GetXPConnect()))
@@ -275,30 +275,12 @@ static bool NameTester(nsIInterfaceInfoManager* manager, const void* data,
 }
 
 static nsresult FindInfo(InfoTester tester, const void* data,
-                         nsIInterfaceInfoSuperManager* iism,
+                         nsIInterfaceInfoManager* iism,
                          nsIInterfaceInfo** info)
 {
     if (tester(iism, data, info))
         return NS_OK;
 
-    // If not found, then let's ask additional managers.
-
-    bool yes;
-    nsCOMPtr<nsISimpleEnumerator> list;
-
-    if (NS_SUCCEEDED(iism->HasAdditionalManagers(&yes)) && yes &&
-        NS_SUCCEEDED(iism->EnumerateAdditionalManagers(getter_AddRefs(list))) &&
-        list) {
-        bool more;
-        nsCOMPtr<nsIInterfaceInfoManager> current;
-
-        while (NS_SUCCEEDED(list->HasMoreElements(&more)) && more &&
-               NS_SUCCEEDED(list->GetNext(getter_AddRefs(current))) && current) {
-            if (tester(current, data, info))
-                return NS_OK;
-        }
-    }
-
     return NS_ERROR_NO_INTERFACE;
 }
 
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 78f86b4acce2..33508ca76318 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -492,7 +492,7 @@ public:
 #endif
 
     // Gets addref'd pointer
-    static nsresult GetInterfaceInfoManager(nsIInterfaceInfoSuperManager** iim,
+    static nsresult GetInterfaceInfoManager(nsIInterfaceInfoManager** iim,
                                             nsXPConnect* xpc = nullptr);
 
     static JSBool IsISupportsDescendant(nsIInterfaceInfo* info);
@@ -568,7 +568,7 @@ private:
     static JSBool            gOnceAliveNowDead;
 
     XPCJSRuntime*            mRuntime;
-    nsCOMPtr<nsIInterfaceInfoSuperManager> mInterfaceInfoManager;
+    nsCOMPtr<nsIInterfaceInfoManager> mInterfaceInfoManager;
     nsIXPCSecurityManager*   mDefaultSecurityManager;
     uint16_t                 mDefaultSecurityManagerFlags;
     JSBool                   mShuttingDown;
diff --git a/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl b/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
index 1789728a2655..72fb5f2f8a01 100644
--- a/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
+++ b/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
@@ -28,16 +28,6 @@ interface nsIInterfaceInfoManager : nsISupports
     nsIEnumerator enumerateInterfacesWhoseNamesStartWith(in string prefix);
 };
 
-[uuid(0ee22850-bc6a-11d5-9134-0010a4e73d9a)]
-interface nsIInterfaceInfoSuperManager : nsIInterfaceInfoManager
-{
-    void addAdditionalManager(in nsIInterfaceInfoManager manager);        
-    void removeAdditionalManager(in nsIInterfaceInfoManager manager);        
-
-    boolean hasAdditionalManagers();
-    nsISimpleEnumerator enumerateAdditionalManagers();
-};
-
 %{C++
 #define NS_INTERFACEINFOMANAGER_SERVICE_CID            \
  { /* 13bef784-f8e0-4f96-85c1-09f9ef4f9a19 */          \
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
index baf09a0c94b7..3c7185d9bc1d 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -16,9 +16,8 @@
 
 using namespace mozilla;
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(xptiInterfaceInfoManager, 
-                              nsIInterfaceInfoManager,
-                              nsIInterfaceInfoSuperManager)
+NS_IMPL_THREADSAFE_ISUPPORTS1(xptiInterfaceInfoManager, 
+                              nsIInterfaceInfoManager)
 
 static xptiInterfaceInfoManager* gInterfaceInfoManager = nullptr;
 #ifdef DEBUG
@@ -79,9 +78,7 @@ xptiInterfaceInfoManager::FreeInterfaceInfoManager()
 
 xptiInterfaceInfoManager::xptiInterfaceInfoManager()
     :   mWorkingSet(),
-        mResolveLock("xptiInterfaceInfoManager.mResolveLock"),
-        mAdditionalManagersLock(
-            "xptiInterfaceInfoManager.mAdditionalManagersLock")
+        mResolveLock("xptiInterfaceInfoManager.mResolveLock")
 {
     NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(xptiWorkingSet));
 }
@@ -334,74 +331,3 @@ NS_IMETHODIMP xptiInterfaceInfoManager::AutoRegisterInterfaces()
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
-
-/***************************************************************************/
-
-/* void addAdditionalManager (in nsIInterfaceInfoManager manager); */
-NS_IMETHODIMP xptiInterfaceInfoManager::AddAdditionalManager(nsIInterfaceInfoManager *manager)
-{
-    nsCOMPtr<nsIWeakReference> weakRef = do_GetWeakReference(manager);
-    nsISupports* ptrToAdd = weakRef ? 
-                    static_cast<nsISupports*>(weakRef) :
-                    static_cast<nsISupports*>(manager);
-    { // scoped lock...
-        MutexAutoLock lock(mAdditionalManagersLock);
-        if (mAdditionalManagers.IndexOf(ptrToAdd) != -1)
-            return NS_ERROR_FAILURE;
-        if (!mAdditionalManagers.AppendObject(ptrToAdd))
-            return NS_ERROR_OUT_OF_MEMORY;
-    }
-    return NS_OK;
-}
-
-/* void removeAdditionalManager (in nsIInterfaceInfoManager manager); */
-NS_IMETHODIMP xptiInterfaceInfoManager::RemoveAdditionalManager(nsIInterfaceInfoManager *manager)
-{
-    nsCOMPtr<nsIWeakReference> weakRef = do_GetWeakReference(manager);
-    nsISupports* ptrToRemove = weakRef ? 
-                    static_cast<nsISupports*>(weakRef) :
-                    static_cast<nsISupports*>(manager);
-    { // scoped lock...
-        MutexAutoLock lock(mAdditionalManagersLock);
-        if (!mAdditionalManagers.RemoveObject(ptrToRemove))
-            return NS_ERROR_FAILURE;
-    }
-    return NS_OK;
-}
-
-/* bool hasAdditionalManagers (); */
-NS_IMETHODIMP xptiInterfaceInfoManager::HasAdditionalManagers(bool *_retval)
-{
-    *_retval = mAdditionalManagers.Count() > 0;
-    return NS_OK;
-}
-
-/* nsISimpleEnumerator enumerateAdditionalManagers (); */
-NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateAdditionalManagers(nsISimpleEnumerator **_retval)
-{
-    MutexAutoLock lock(mAdditionalManagersLock);
-
-    nsCOMArray<nsISupports> managerArray(mAdditionalManagers);
-    /* Resolve all the weak references in the array. */
-    for(int32_t i = managerArray.Count(); i--; ) {
-        nsISupports *raw = managerArray.ObjectAt(i);
-        if (!raw)
-            return NS_ERROR_FAILURE;
-        nsCOMPtr<nsIWeakReference> weakRef = do_QueryInterface(raw);
-        if (weakRef) {
-            nsCOMPtr<nsIInterfaceInfoManager> manager = 
-                do_QueryReferent(weakRef);
-            if (manager) {
-                if (!managerArray.ReplaceObjectAt(manager, i))
-                    return NS_ERROR_FAILURE;
-            }
-            else {
-                // The manager is no more. Remove the element.
-                mAdditionalManagers.RemoveObjectAt(i);
-                managerArray.RemoveObjectAt(i);
-            }
-        }
-    }
-    
-    return NS_NewArrayEnumerator(_retval, managerArray);
-}
diff --git a/xpcom/reflect/xptinfo/src/xptiprivate.h b/xpcom/reflect/xptinfo/src/xptiprivate.h
index f179b3a9cd26..d072042fe1c5 100644
--- a/xpcom/reflect/xptinfo/src/xptiprivate.h
+++ b/xpcom/reflect/xptinfo/src/xptiprivate.h
@@ -397,11 +397,10 @@ private:
 /***************************************************************************/
 
 class xptiInterfaceInfoManager MOZ_FINAL
-    : public nsIInterfaceInfoSuperManager
+    : public nsIInterfaceInfoManager
 {
     NS_DECL_ISUPPORTS
     NS_DECL_NSIINTERFACEINFOMANAGER
-    NS_DECL_NSIINTERFACEINFOSUPERMANAGER
 
     typedef mozilla::ReentrantMonitor ReentrantMonitor;
     typedef mozilla::Mutex Mutex;
@@ -441,8 +440,6 @@ private:
 private:
     xptiWorkingSet               mWorkingSet;
     Mutex                        mResolveLock;
-    Mutex                        mAdditionalManagersLock;
-    nsCOMArray<nsISupports>      mAdditionalManagers;
 };
 
 #endif /* xptiprivate_h___ */

From 3f28a1017cf5d335c8dbc0bdc4cacaf8962253fd Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Fri, 8 Mar 2013 21:54:10 -0500
Subject: [PATCH 045/438] bug 860027 - export a header declaring
 XPTInterfaceInfoManager r=bsmedberg

---
 xpcom/build/nsXPComInit.cpp                   |   8 +-
 xpcom/components/nsComponentManager.cpp       |   4 +-
 xpcom/reflect/xptcall/src/xptcall.cpp         |   7 +-
 xpcom/reflect/xptinfo/public/Makefile.in      |   5 +
 .../xptinfo/public/XPTInterfaceInfoManager.h  | 114 ++++++++++++++++++
 .../reflect/xptinfo/src/xptiInterfaceInfo.cpp |  13 +-
 .../xptinfo/src/xptiInterfaceInfoManager.cpp  |  63 +++++-----
 xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp |  11 +-
 xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp  |   8 +-
 xpcom/reflect/xptinfo/src/xptiprivate.h       |  86 -------------
 10 files changed, 185 insertions(+), 134 deletions(-)
 create mode 100644 xpcom/reflect/xptinfo/public/XPTInterfaceInfoManager.h

diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index 1e548d35380a..ec8afdbf1c67 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -48,6 +48,7 @@
 #include "xptinfo.h"
 #include "nsIInterfaceInfoManager.h"
 #include "xptiprivate.h"
+#include "mozilla/XPTInterfaceInfoManager.h"
 
 #include "nsTimerImpl.h"
 #include "TimerThread.h"
@@ -126,6 +127,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **)
 
 #include "GeckoProfiler.h"
 
+using namespace mozilla;
 using base::AtExitManager;
 using mozilla::ipc::BrowserProcessSubThread;
 #ifdef MOZ_VISUAL_EVENT_TRACER
@@ -228,7 +230,7 @@ nsXPTIInterfaceInfoManagerGetSingleton(nsISupports* outer,
     NS_ENSURE_TRUE(!outer, NS_ERROR_NO_AGGREGATION);
 
     nsCOMPtr<nsIInterfaceInfoManager> iim
-        (xptiInterfaceInfoManager::GetSingleton());
+        (XPTInterfaceInfoManager::GetSingleton());
     if (!iim)
         return NS_ERROR_FAILURE;
 
@@ -470,7 +472,7 @@ NS_InitXPCOM2(nsIServiceManager* *result,
 
     // The iimanager constructor searches and registers XPT files.
     // (We trigger the singleton's lazy construction here to make that happen.)
-    (void) xptiInterfaceInfoManager::GetSingleton();
+    (void) XPTInterfaceInfoManager::GetSingleton();
 
     // After autoreg, but before we actually instantiate any components,
     // add any services listed in the "xpcom-directory-providers" category
@@ -688,7 +690,7 @@ ShutdownXPCOM(nsIServiceManager* servMgr)
     // Do this _after_ shutting down the component manager, because the
     // JS component loader will use XPConnect to call nsIModule::canUnload,
     // and that will spin up the InterfaceInfoManager again -- bad mojo
-    xptiInterfaceInfoManager::FreeInterfaceInfoManager();
+    XPTInterfaceInfoManager::FreeInterfaceInfoManager();
 
     // Finally, release the component manager last because it unloads the
     // libraries:
diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
index a2298a746c42..b2d7d6d80773 100644
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -36,6 +36,7 @@
 #include "nsCategoryManager.h"
 #include "nsCategoryManagerUtils.h"
 #include "xptiprivate.h"
+#include "mozilla/XPTInterfaceInfoManager.h"
 #include "nsIConsoleService.h"
 #include "nsIMemoryReporter.h"
 #include "nsIObserverService.h"
@@ -613,8 +614,7 @@ nsComponentManagerImpl::ManifestXPT(ManifestProcessingContext& cx, int lineno, c
         rv = data.Copy(buf, len);
     }
     if (NS_SUCCEEDED(rv)) {
-        xptiInterfaceInfoManager::GetSingleton()
-            ->RegisterBuffer(buf, len);
+        XPTInterfaceInfoManager::GetSingleton()->RegisterBuffer(buf, len);
     } else {
         nsCString uri;
         f.GetURIString(uri);
diff --git a/xpcom/reflect/xptcall/src/xptcall.cpp b/xpcom/reflect/xptcall/src/xptcall.cpp
index ed0b99227f77..e46ddd559d3d 100644
--- a/xpcom/reflect/xptcall/src/xptcall.cpp
+++ b/xpcom/reflect/xptcall/src/xptcall.cpp
@@ -7,6 +7,9 @@
 
 #include "xptcprivate.h"
 #include "xptiprivate.h"
+#include "mozilla/XPTInterfaceInfoManager.h"
+
+using namespace mozilla;
 
 NS_IMETHODIMP
 nsXPTCStubBase::QueryInterface(REFNSIID aIID,
@@ -39,8 +42,8 @@ NS_GetXPTCallStub(REFNSIID aIID, nsIXPTCProxy* aOuter,
 {
     NS_ENSURE_ARG(aOuter && aResult);
 
-    xptiInterfaceInfoManager *iim =
-        xptiInterfaceInfoManager::GetSingleton();
+    XPTInterfaceInfoManager *iim =
+        XPTInterfaceInfoManager::GetSingleton();
     NS_ENSURE_TRUE(iim, NS_ERROR_NOT_INITIALIZED);
 
     xptiInterfaceEntry *iie = iim->GetInterfaceEntryForIID(&aIID);
diff --git a/xpcom/reflect/xptinfo/public/Makefile.in b/xpcom/reflect/xptinfo/public/Makefile.in
index 9cab747bc2fb..8adec75ca937 100644
--- a/xpcom/reflect/xptinfo/public/Makefile.in
+++ b/xpcom/reflect/xptinfo/public/Makefile.in
@@ -15,6 +15,11 @@ EXPORTS		= \
 		xptinfo.h \
 		$(NULL)
 
+EXPORTS_NAMESPACES := mozilla
+EXPORTS_mozilla := \
+  XPTInterfaceInfoManager.h \
+  $(null)
+
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/reflect/xptinfo/public/XPTInterfaceInfoManager.h b/xpcom/reflect/xptinfo/public/XPTInterfaceInfoManager.h
new file mode 100644
index 000000000000..1fddf395f4f5
--- /dev/null
+++ b/xpcom/reflect/xptinfo/public/XPTInterfaceInfoManager.h
@@ -0,0 +1,114 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=4 et sw=4 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/. */
+
+#ifndef mozilla_XPTInterfaceInfoManager_h_
+#define mozilla_XPTInterfaceInfoManager_h_
+
+#include "nsIInterfaceInfoManager.h"
+
+#include "mozilla/Mutex.h"
+#include "mozilla/ReentrantMonitor.h"
+#include "nsDataHashtable.h"
+
+template<typename T> class nsCOMArray;
+class XPTHeader;
+class XPTInterfaceDirectoryEntry;
+class xptiInterfaceEntry;
+class xptiInterfaceInfo;
+class xptiTypelibGuts;
+
+namespace mozilla {
+
+class XPTInterfaceInfoManager MOZ_FINAL
+    : public nsIInterfaceInfoManager
+{
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIINTERFACEINFOMANAGER
+
+public:
+    // GetSingleton() is infallible
+    static XPTInterfaceInfoManager* GetSingleton();
+    static void FreeInterfaceInfoManager();
+
+    void GetScriptableInterfaces(nsCOMArray<nsIInterfaceInfo>& aInterfaces);
+
+    void RegisterBuffer(char *buf, uint32_t length);
+
+    static Mutex& GetResolveLock()
+    {
+        return GetSingleton()->mResolveLock;
+    }
+
+    xptiInterfaceEntry* GetInterfaceEntryForIID(const nsIID *iid);
+
+    size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf);
+
+    static int64_t GetXPTIWorkingSetSize();
+
+private:
+    XPTInterfaceInfoManager();
+    ~XPTInterfaceInfoManager();
+
+    void RegisterXPTHeader(XPTHeader* aHeader);
+                          
+    // idx is the index of this interface in the XPTHeader
+    void VerifyAndAddEntryIfNew(XPTInterfaceDirectoryEntry* iface,
+                                uint16_t idx,
+                                xptiTypelibGuts* typelib);
+
+private:
+
+    class xptiWorkingSet
+    {
+    public:
+        xptiWorkingSet();
+        ~xptiWorkingSet();
+
+        bool IsValid() const;
+
+        void InvalidateInterfaceInfos();
+        void ClearHashTables();
+
+        // utility methods...
+
+        enum {NOT_FOUND = 0xffffffff};
+
+        // Directory stuff...
+
+        uint32_t GetDirectoryCount();
+        nsresult GetCloneOfDirectoryAt(uint32_t i, nsIFile** dir);
+        nsresult GetDirectoryAt(uint32_t i, nsIFile** dir);
+        bool     FindDirectory(nsIFile* dir, uint32_t* index);
+        bool     FindDirectoryOfFile(nsIFile* file, uint32_t* index);
+        bool     DirectoryAtMatchesPersistentDescriptor(uint32_t i, const char* desc);
+
+    private:
+        uint32_t        mFileCount;
+        uint32_t        mMaxFileCount;
+
+    public:
+        // XXX make these private with accessors
+        // mTableMonitor must be held across:
+        //  * any read from or write to mIIDTable or mNameTable
+        //  * any writing to the links between an xptiInterfaceEntry
+        //    and its xptiInterfaceInfo (mEntry/mInfo)
+        mozilla::ReentrantMonitor mTableReentrantMonitor;
+        nsDataHashtable<nsIDHashKey, xptiInterfaceEntry*> mIIDTable;
+        nsDataHashtable<nsDepCharHashKey, xptiInterfaceEntry*> mNameTable;
+    };
+
+    // XXX xptiInterfaceInfo want's to poke at the working set itself
+    friend class ::xptiInterfaceInfo;
+    friend class ::xptiInterfaceEntry;
+    friend class ::xptiTypelibGuts;
+
+    xptiWorkingSet               mWorkingSet;
+    Mutex                        mResolveLock;
+};
+
+}
+
+#endif
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
index 60ab60d1fc87..3a27a78bfcd6 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
@@ -6,6 +6,7 @@
 /* Implementation of xptiInterfaceEntry and xptiInterfaceInfo. */
 
 #include "xptiprivate.h"
+#include "mozilla/XPTInterfaceInfoManager.h"
 #include "nsAtomicRefcnt.h"
 
 using namespace mozilla;
@@ -70,7 +71,7 @@ xptiInterfaceEntry::xptiInterfaceEntry(const char* name,
 bool 
 xptiInterfaceEntry::Resolve()
 {
-    MutexAutoLock lock(xptiInterfaceInfoManager::GetResolveLock());
+    MutexAutoLock lock(XPTInterfaceInfoManager::GetResolveLock());
     return ResolveLocked();
 }
 
@@ -540,7 +541,7 @@ nsresult
 xptiInterfaceEntry::GetInterfaceInfo(xptiInterfaceInfo** info)
 {
 #ifdef DEBUG
-    xptiInterfaceInfoManager::GetSingleton()->GetWorkingSet()->mTableReentrantMonitor.
+    XPTInterfaceInfoManager::GetSingleton()->mWorkingSet.mTableReentrantMonitor.
         AssertCurrentThreadIn();
 #endif
     LOG_INFO_MONITOR_ENTRY;
@@ -572,8 +573,8 @@ xptiInterfaceEntry::LockedInvalidateInterfaceInfo()
 bool
 xptiInterfaceInfo::BuildParent()
 {
-    mozilla::ReentrantMonitorAutoEnter monitor(xptiInterfaceInfoManager::GetSingleton()->
-                                    GetWorkingSet()->mTableReentrantMonitor);
+    mozilla::ReentrantMonitorAutoEnter monitor(XPTInterfaceInfoManager::GetSingleton()->
+                                    mWorkingSet.mTableReentrantMonitor);
     NS_ASSERTION(mEntry && 
                  mEntry->IsFullyResolved() && 
                  !mParent &&
@@ -615,8 +616,8 @@ xptiInterfaceInfo::Release(void)
     NS_LOG_RELEASE(this, cnt, "xptiInterfaceInfo");
     if(!cnt)
     {
-        mozilla::ReentrantMonitorAutoEnter monitor(xptiInterfaceInfoManager::
-                                          GetSingleton()->GetWorkingSet()->
+        mozilla::ReentrantMonitorAutoEnter monitor(XPTInterfaceInfoManager::
+                                          GetSingleton()->mWorkingSet.
                                           mTableReentrantMonitor);
         LOG_INFO_MONITOR_ENTRY;
 
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
index 3c7185d9bc1d..e1b7c874b55c 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -5,6 +5,8 @@
 
 /* Implementation of xptiInterfaceInfoManager. */
 
+#include "mozilla/XPTInterfaceInfoManager.h"
+
 #include "xptiprivate.h"
 #include "nsDependentString.h"
 #include "nsString.h"
@@ -16,10 +18,10 @@
 
 using namespace mozilla;
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(xptiInterfaceInfoManager, 
+NS_IMPL_THREADSAFE_ISUPPORTS1(XPTInterfaceInfoManager, 
                               nsIInterfaceInfoManager)
 
-static xptiInterfaceInfoManager* gInterfaceInfoManager = nullptr;
+static XPTInterfaceInfoManager* gInterfaceInfoManager = nullptr;
 #ifdef DEBUG
 static int gCallCount = 0;
 #endif
@@ -28,7 +30,7 @@ static int gCallCount = 0;
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(XPTMallocSizeOf)
 
 size_t
-xptiInterfaceInfoManager::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf)
+XPTInterfaceInfoManager::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf)
 {
     size_t n = aMallocSizeOf(this);
     ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor);
@@ -41,7 +43,7 @@ xptiInterfaceInfoManager::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf)
 
 // static
 int64_t
-xptiInterfaceInfoManager::GetXPTIWorkingSetSize()
+XPTInterfaceInfoManager::GetXPTIWorkingSetSize()
 {
     size_t n = XPT_SizeOfArena(gXPTIStructArena, XPTMallocSizeOf);
 
@@ -52,38 +54,38 @@ xptiInterfaceInfoManager::GetXPTIWorkingSetSize()
     return n;
 }
 
-NS_MEMORY_REPORTER_IMPLEMENT(xptiWorkingSet,
+NS_MEMORY_REPORTER_IMPLEMENT(XPTInterfaceInfoManager,
                              "explicit/xpti-working-set",
                              KIND_HEAP,
                              UNITS_BYTES,
-                             xptiInterfaceInfoManager::GetXPTIWorkingSetSize,
+                             XPTInterfaceInfoManager::GetXPTIWorkingSetSize,
                              "Memory used by the XPCOM typelib system.")
 
 // static
-xptiInterfaceInfoManager*
-xptiInterfaceInfoManager::GetSingleton()
+XPTInterfaceInfoManager*
+XPTInterfaceInfoManager::GetSingleton()
 {
     if (!gInterfaceInfoManager) {
-        gInterfaceInfoManager = new xptiInterfaceInfoManager();
+        gInterfaceInfoManager = new XPTInterfaceInfoManager();
         NS_ADDREF(gInterfaceInfoManager);
     }
     return gInterfaceInfoManager;
 }
 
 void
-xptiInterfaceInfoManager::FreeInterfaceInfoManager()
+XPTInterfaceInfoManager::FreeInterfaceInfoManager()
 {
     NS_IF_RELEASE(gInterfaceInfoManager);
 }
 
-xptiInterfaceInfoManager::xptiInterfaceInfoManager()
+XPTInterfaceInfoManager::XPTInterfaceInfoManager()
     :   mWorkingSet(),
-        mResolveLock("xptiInterfaceInfoManager.mResolveLock")
+        mResolveLock("XPTInterfaceInfoManager.mResolveLock")
 {
-    NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(xptiWorkingSet));
+    NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPTInterfaceInfoManager));
 }
 
-xptiInterfaceInfoManager::~xptiInterfaceInfoManager()
+XPTInterfaceInfoManager::~XPTInterfaceInfoManager()
 {
     // We only do this on shutdown of the service.
     mWorkingSet.InvalidateInterfaceInfos();
@@ -95,7 +97,7 @@ xptiInterfaceInfoManager::~xptiInterfaceInfoManager()
 }
 
 void
-xptiInterfaceInfoManager::RegisterBuffer(char *buf, uint32_t length)
+XPTInterfaceInfoManager::RegisterBuffer(char *buf, uint32_t length)
 {
     XPTState *state = XPT_NewXDRState(XPT_DECODE, buf, length);
     if (!state)
@@ -116,7 +118,7 @@ xptiInterfaceInfoManager::RegisterBuffer(char *buf, uint32_t length)
 }
 
 void
-xptiInterfaceInfoManager::RegisterXPTHeader(XPTHeader* aHeader)
+XPTInterfaceInfoManager::RegisterXPTHeader(XPTHeader* aHeader)
 {
     if (aHeader->major_version >= XPT_MAJOR_INCOMPATIBLE_VERSION) {
         NS_ASSERTION(!aHeader->num_interfaces,"bad libxpt");
@@ -131,9 +133,9 @@ xptiInterfaceInfoManager::RegisterXPTHeader(XPTHeader* aHeader)
 }
 
 void
-xptiInterfaceInfoManager::VerifyAndAddEntryIfNew(XPTInterfaceDirectoryEntry* iface,
-                                                 uint16_t idx,
-                                                 xptiTypelibGuts* typelib)
+XPTInterfaceInfoManager::VerifyAndAddEntryIfNew(XPTInterfaceDirectoryEntry* iface,
+                                                uint16_t idx,
+                                                xptiTypelibGuts* typelib)
 {
     if (!iface->interface_descriptor)
         return;
@@ -199,14 +201,15 @@ EntryToInfo(xptiInterfaceEntry* entry, nsIInterfaceInfo **_retval)
 }
 
 xptiInterfaceEntry*
-xptiInterfaceInfoManager::GetInterfaceEntryForIID(const nsIID *iid)
+XPTInterfaceInfoManager::GetInterfaceEntryForIID(const nsIID *iid)
 {
     ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor);
     return mWorkingSet.mIIDTable.Get(*iid);
 }
 
 /* nsIInterfaceInfo getInfoForIID (in nsIIDPtr iid); */
-NS_IMETHODIMP xptiInterfaceInfoManager::GetInfoForIID(const nsIID * iid, nsIInterfaceInfo **_retval)
+NS_IMETHODIMP
+XPTInterfaceInfoManager::GetInfoForIID(const nsIID * iid, nsIInterfaceInfo **_retval)
 {
     NS_ASSERTION(iid, "bad param");
     NS_ASSERTION(_retval, "bad param");
@@ -217,7 +220,8 @@ NS_IMETHODIMP xptiInterfaceInfoManager::GetInfoForIID(const nsIID * iid, nsIInte
 }
 
 /* nsIInterfaceInfo getInfoForName (in string name); */
-NS_IMETHODIMP xptiInterfaceInfoManager::GetInfoForName(const char *name, nsIInterfaceInfo **_retval)
+NS_IMETHODIMP
+XPTInterfaceInfoManager::GetInfoForName(const char *name, nsIInterfaceInfo **_retval)
 {
     NS_ASSERTION(name, "bad param");
     NS_ASSERTION(_retval, "bad param");
@@ -228,7 +232,8 @@ NS_IMETHODIMP xptiInterfaceInfoManager::GetInfoForName(const char *name, nsIInte
 }
 
 /* nsIIDPtr getIIDForName (in string name); */
-NS_IMETHODIMP xptiInterfaceInfoManager::GetIIDForName(const char *name, nsIID * *_retval)
+NS_IMETHODIMP
+XPTInterfaceInfoManager::GetIIDForName(const char *name, nsIID * *_retval)
 {
     NS_ASSERTION(name, "bad param");
     NS_ASSERTION(_retval, "bad param");
@@ -244,7 +249,8 @@ NS_IMETHODIMP xptiInterfaceInfoManager::GetIIDForName(const char *name, nsIID *
 }
 
 /* string getNameForIID (in nsIIDPtr iid); */
-NS_IMETHODIMP xptiInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **_retval)
+NS_IMETHODIMP
+XPTInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **_retval)
 {
     NS_ASSERTION(iid, "bad param");
     NS_ASSERTION(_retval, "bad param");
@@ -271,7 +277,8 @@ xpti_ArrayAppender(const char* name, xptiInterfaceEntry* entry, void* arg)
 }
 
 /* nsIEnumerator enumerateInterfaces (); */
-NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateInterfaces(nsIEnumerator **_retval)
+NS_IMETHODIMP
+XPTInterfaceInfoManager::EnumerateInterfaces(nsIEnumerator **_retval)
 {
     // I didn't want to incur the size overhead of using nsHashtable just to
     // make building an enumerator easier. So, this code makes a snapshot of 
@@ -312,7 +319,8 @@ xpti_ArrayPrefixAppender(const char* keyname, xptiInterfaceEntry* entry, void* a
 }
 
 /* nsIEnumerator enumerateInterfacesWhoseNamesStartWith (in string prefix); */
-NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *prefix, nsIEnumerator **_retval)
+NS_IMETHODIMP
+XPTInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *prefix, nsIEnumerator **_retval)
 {
     nsCOMPtr<nsISupportsArray> array;
     NS_NewISupportsArray(getter_AddRefs(array));
@@ -327,7 +335,8 @@ NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(c
 }
 
 /* void autoRegisterInterfaces (); */
-NS_IMETHODIMP xptiInterfaceInfoManager::AutoRegisterInterfaces()
+NS_IMETHODIMP
+XPTInterfaceInfoManager::AutoRegisterInterfaces()
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
diff --git a/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp b/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
index 6f9a65cc666c..ada3f9abbaed 100644
--- a/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
@@ -6,6 +6,7 @@
 /* Implementation of xptiTypelibGuts. */
 
 #include "xptiprivate.h"
+#include "mozilla/XPTInterfaceInfoManager.h"
 
 using namespace mozilla;
 
@@ -38,15 +39,15 @@ xptiTypelibGuts::GetEntryAt(uint16_t i)
 
     XPTInterfaceDirectoryEntry* iface = mHeader->interface_directory + i;
 
-    xptiWorkingSet* set =
-        xptiInterfaceInfoManager::GetSingleton()->GetWorkingSet();
+    XPTInterfaceInfoManager::xptiWorkingSet& set =
+        XPTInterfaceInfoManager::GetSingleton()->mWorkingSet;
 
     {
-        ReentrantMonitorAutoEnter monitor(set->mTableReentrantMonitor);
+        ReentrantMonitorAutoEnter monitor(set.mTableReentrantMonitor);
         if (iface->iid.Equals(zeroIID))
-            r = set->mNameTable.Get(iface->name);
+            r = set.mNameTable.Get(iface->name);
         else
-            r = set->mIIDTable.Get(iface->iid);
+            r = set.mIIDTable.Get(iface->iid);
     }
 
     if (r)
diff --git a/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp b/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
index 5f6331061955..9eee6d473944 100644
--- a/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
@@ -5,6 +5,8 @@
 
 /* Implementation of xptiWorkingSet. */
 
+#include "mozilla/XPTInterfaceInfoManager.h"
+
 #include "xptiprivate.h"
 #include "nsString.h"
 
@@ -13,7 +15,7 @@ using namespace mozilla;
 #define XPTI_STRUCT_ARENA_BLOCK_SIZE    (1024 * 16)
 #define XPTI_HASHTABLE_SIZE             2048
 
-xptiWorkingSet::xptiWorkingSet()
+XPTInterfaceInfoManager::xptiWorkingSet::xptiWorkingSet()
     : mTableReentrantMonitor("xptiWorkingSet::mTableReentrantMonitor")
 {
     MOZ_COUNT_CTOR(xptiWorkingSet);
@@ -33,13 +35,13 @@ xpti_Invalidator(const char* keyname, xptiInterfaceEntry* entry, void* arg)
 }
 
 void 
-xptiWorkingSet::InvalidateInterfaceInfos()
+XPTInterfaceInfoManager::xptiWorkingSet::InvalidateInterfaceInfos()
 {
     ReentrantMonitorAutoEnter monitor(mTableReentrantMonitor);
     mNameTable.EnumerateRead(xpti_Invalidator, NULL);
 }        
 
-xptiWorkingSet::~xptiWorkingSet()
+XPTInterfaceInfoManager::xptiWorkingSet::~xptiWorkingSet()
 {
     MOZ_COUNT_DTOR(xptiWorkingSet);
 
diff --git a/xpcom/reflect/xptinfo/src/xptiprivate.h b/xpcom/reflect/xptinfo/src/xptiprivate.h
index d072042fe1c5..8637d70a9189 100644
--- a/xpcom/reflect/xptinfo/src/xptiprivate.h
+++ b/xpcom/reflect/xptinfo/src/xptiprivate.h
@@ -75,7 +75,6 @@ class xptiInterfaceInfo;
 class xptiInterfaceInfoManager;
 class xptiInterfaceEntry;
 class xptiTypelibGuts;
-class xptiWorkingSet;
 
 extern XPTArena* gXPTIStructArena;
 
@@ -117,45 +116,6 @@ private:
 
 /***************************************************************************/
 
-class xptiWorkingSet
-{
-public:
-    xptiWorkingSet();
-    ~xptiWorkingSet();
-    
-    bool IsValid() const;
-
-    void InvalidateInterfaceInfos();
-    void ClearHashTables();
-
-    // utility methods...
-
-    enum {NOT_FOUND = 0xffffffff};
-
-    // Directory stuff...
-
-    uint32_t GetDirectoryCount();
-    nsresult GetCloneOfDirectoryAt(uint32_t i, nsIFile** dir);
-    nsresult GetDirectoryAt(uint32_t i, nsIFile** dir);
-    bool     FindDirectory(nsIFile* dir, uint32_t* index);
-    bool     FindDirectoryOfFile(nsIFile* file, uint32_t* index);
-    bool     DirectoryAtMatchesPersistentDescriptor(uint32_t i, const char* desc);
-
-private:
-    uint32_t        mFileCount;
-    uint32_t        mMaxFileCount;
-
-public:
-    // XXX make these private with accessors
-    // mTableMonitor must be held across:
-    //  * any read from or write to mIIDTable or mNameTable
-    //  * any writing to the links between an xptiInterfaceEntry
-    //    and its xptiInterfaceInfo (mEntry/mInfo)
-    mozilla::ReentrantMonitor mTableReentrantMonitor;
-    nsDataHashtable<nsIDHashKey, xptiInterfaceEntry*> mIIDTable;
-    nsDataHashtable<nsDepCharHashKey, xptiInterfaceEntry*> mNameTable;
-};
-
 /***************************************************************************/
 
 // This class exists to help xptiInterfaceInfo store a 4-state (2 bit) value 
@@ -396,50 +356,4 @@ private:
 
 /***************************************************************************/
 
-class xptiInterfaceInfoManager MOZ_FINAL
-    : public nsIInterfaceInfoManager
-{
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIINTERFACEINFOMANAGER
-
-    typedef mozilla::ReentrantMonitor ReentrantMonitor;
-    typedef mozilla::Mutex Mutex;
-
-public:
-    // GetSingleton() is infallible
-    static xptiInterfaceInfoManager* GetSingleton();
-    static void FreeInterfaceInfoManager();
-
-    void RegisterBuffer(char *buf, uint32_t length);
-
-    xptiWorkingSet*  GetWorkingSet() {return &mWorkingSet;}
-
-    static Mutex& GetResolveLock(xptiInterfaceInfoManager* self = nullptr) 
-    {
-        self = self ? self : GetSingleton();
-        return self->mResolveLock;
-    }
-
-    xptiInterfaceEntry* GetInterfaceEntryForIID(const nsIID *iid);
-
-    size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf);
-
-    static int64_t GetXPTIWorkingSetSize();
-
-private:
-    xptiInterfaceInfoManager();
-    ~xptiInterfaceInfoManager();
-
-    void RegisterXPTHeader(XPTHeader* aHeader);
-                          
-    // idx is the index of this interface in the XPTHeader
-    void VerifyAndAddEntryIfNew(XPTInterfaceDirectoryEntry* iface,
-                                uint16_t idx,
-                                xptiTypelibGuts* typelib);
-
-private:
-    xptiWorkingSet               mWorkingSet;
-    Mutex                        mResolveLock;
-};
-
 #endif /* xptiprivate_h___ */

From a54c6c7e4eb3b8c8335d217d0944ac01a0c72a06 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Fri, 8 Mar 2013 22:05:08 -0500
Subject: [PATCH 046/438] bug 860027 - remove
 nsXPConnect::GetInterfaceInfoManager() r=bholley

---
 js/xpconnect/src/nsXPConnect.cpp | 13 -------------
 js/xpconnect/src/xpcprivate.h    |  4 ----
 2 files changed, 17 deletions(-)

diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 3193b33a792b..b97a98f49c00 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -223,19 +223,6 @@ nsXPConnect::ReleaseXPConnectSingleton()
     }
 }
 
-// static
-nsresult
-nsXPConnect::GetInterfaceInfoManager(nsIInterfaceInfoManager** iim,
-                                     nsXPConnect* xpc /*= nullptr*/)
-{
-    if (!xpc && !(xpc = GetXPConnect()))
-        return NS_ERROR_FAILURE;
-
-    *iim = xpc->mInterfaceInfoManager;
-    NS_IF_ADDREF(*iim);
-    return NS_OK;
-}
-
 // static
 XPCJSRuntime*
 nsXPConnect::GetRuntimeInstance()
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 33508ca76318..1e3f41fee80b 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -491,10 +491,6 @@ public:
     void AssertNoObjectsToTrace(void* aPossibleJSHolder);
 #endif
 
-    // Gets addref'd pointer
-    static nsresult GetInterfaceInfoManager(nsIInterfaceInfoManager** iim,
-                                            nsXPConnect* xpc = nullptr);
-
     static JSBool IsISupportsDescendant(nsIInterfaceInfo* info);
 
     nsIXPCSecurityManager* GetDefaultSecurityManager() const

From 6d48f5d792f1d579a2bdb7c68a21e946da173e2a Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Sun, 10 Mar 2013 20:14:14 -0400
Subject: [PATCH 047/438] bug 860027 - remove
 nsXPConnect::mInterfaceInfoManager r=bholley

---
 js/xpconnect/src/nsXPConnect.cpp | 39 ++++----------------------------
 js/xpconnect/src/xpcprivate.h    |  2 --
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index b97a98f49c00..e8e9ee71e9b3 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -40,7 +40,9 @@
 #include "nsDOMMutationObserver.h"
 #include "nsICycleCollectorListener.h"
 #include "nsThread.h"
+#include "mozilla/XPTInterfaceInfoManager.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 using namespace xpc;
 using namespace JS;
@@ -76,7 +78,6 @@ const char XPC_XPCONNECT_CONTRACTID[]     = "@mozilla.org/js/xpc/XPConnect;1";
 
 nsXPConnect::nsXPConnect()
     :   mRuntime(nullptr),
-        mInterfaceInfoManager(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID)),
         mDefaultSecurityManager(nullptr),
         mDefaultSecurityManagerFlags(0),
         mShuttingDown(false),
@@ -150,9 +151,6 @@ nsXPConnect::GetXPConnect()
         if (!gSelf->mRuntime) {
             NS_RUNTIMEABORT("Couldn't create XPCJSRuntime.");
         }
-        if (!gSelf->mInterfaceInfoManager) {
-            NS_RUNTIMEABORT("Couldn't get global interface info manager.");
-        }
 
         // Initial extra ref to keep the singleton alive
         // balanced by explicit call to ReleaseXPConnectSingleton()
@@ -244,43 +242,17 @@ nsXPConnect::IsISupportsDescendant(nsIInterfaceInfo* info)
 
 /***************************************************************************/
 
-typedef bool (*InfoTester)(nsIInterfaceInfoManager* manager, const void* data,
-                           nsIInterfaceInfo** info);
-
-static bool IIDTester(nsIInterfaceInfoManager* manager, const void* data,
-                      nsIInterfaceInfo** info)
-{
-    return NS_SUCCEEDED(manager->GetInfoForIID((const nsIID *) data, info)) &&
-           *info;
-}
-
-static bool NameTester(nsIInterfaceInfoManager* manager, const void* data,
-                       nsIInterfaceInfo** info)
-{
-    return NS_SUCCEEDED(manager->GetInfoForName((const char *) data, info)) &&
-           *info;
-}
-
-static nsresult FindInfo(InfoTester tester, const void* data,
-                         nsIInterfaceInfoManager* iism,
-                         nsIInterfaceInfo** info)
-{
-    if (tester(iism, data, info))
-        return NS_OK;
-
-    return NS_ERROR_NO_INTERFACE;
-}
-
 nsresult
 nsXPConnect::GetInfoForIID(const nsIID * aIID, nsIInterfaceInfo** info)
 {
-    return FindInfo(IIDTester, aIID, mInterfaceInfoManager, info);
+  return XPTInterfaceInfoManager::GetSingleton()->GetInfoForIID(aIID, info);
 }
 
 nsresult
 nsXPConnect::GetInfoForName(const char * name, nsIInterfaceInfo** info)
 {
-    return FindInfo(NameTester, name, mInterfaceInfoManager, info);
+  nsresult rv = XPTInterfaceInfoManager::GetSingleton()->GetInfoForName(name, info);
+  return NS_FAILED(rv) ? NS_OK : NS_ERROR_NO_INTERFACE;
 }
 
 bool
@@ -1740,7 +1712,6 @@ nsXPConnect::DebugDump(int16_t depth)
         XPC_LOG_ALWAYS(("gOnceAliveNowDead is %d", (int)gOnceAliveNowDead));
         XPC_LOG_ALWAYS(("mDefaultSecurityManager @ %x", mDefaultSecurityManager));
         XPC_LOG_ALWAYS(("mDefaultSecurityManagerFlags of %x", mDefaultSecurityManagerFlags));
-        XPC_LOG_ALWAYS(("mInterfaceInfoManager @ %x", mInterfaceInfoManager.get()));
         if (mRuntime) {
             if (depth)
                 mRuntime->DebugDump(depth);
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 1e3f41fee80b..bcc2d5532602 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -119,7 +119,6 @@
 #include "nsMemory.h"
 #include "nsIXPConnect.h"
 #include "nsIInterfaceInfo.h"
-#include "nsIInterfaceInfoManager.h"
 #include "nsIXPCScriptable.h"
 #include "nsIXPCSecurityManager.h"
 #include "nsIJSRuntimeService.h"
@@ -564,7 +563,6 @@ private:
     static JSBool            gOnceAliveNowDead;
 
     XPCJSRuntime*            mRuntime;
-    nsCOMPtr<nsIInterfaceInfoManager> mInterfaceInfoManager;
     nsIXPCSecurityManager*   mDefaultSecurityManager;
     uint16_t                 mDefaultSecurityManagerFlags;
     JSBool                   mShuttingDown;

From dc8230838c8c5a66ec639181333fe318266b4b85 Mon Sep 17 00:00:00 2001
From: Sean Stangl <sstangl@mozilla.com>
Date: Tue, 16 Apr 2013 13:47:10 -0700
Subject: [PATCH 048/438] Bug 860029 - Standardize Modelines in the JS Module.
 r=njn

---
 js/ipc/CPOWTypes.h                            |  3 +-
 js/ipc/ContextWrapperChild.h                  |  3 +-
 js/ipc/ContextWrapperParent.h                 |  3 +-
 js/ipc/ObjectWrapperChild.cpp                 |  3 +-
 js/ipc/ObjectWrapperChild.h                   |  3 +-
 js/ipc/ObjectWrapperParent.cpp                |  3 +-
 js/ipc/ObjectWrapperParent.h                  |  3 +-
 js/jsd/jsd.h                                  |  5 ++-
 js/jsd/jsd_atom.cpp                           |  5 ++-
 js/jsd/jsd_high.cpp                           |  5 ++-
 js/jsd/jsd_hook.cpp                           |  5 ++-
 js/jsd/jsd_java.cpp                           |  5 ++-
 js/jsd/jsd_lock.cpp                           |  5 ++-
 js/jsd/jsd_lock.h                             |  5 ++-
 js/jsd/jsd_obj.cpp                            |  5 ++-
 js/jsd/jsd_scpt.cpp                           |  5 ++-
 js/jsd/jsd_stak.cpp                           |  5 ++-
 js/jsd/jsd_step.cpp                           |  5 ++-
 js/jsd/jsd_text.cpp                           |  5 ++-
 js/jsd/jsd_val.cpp                            |  5 ++-
 js/jsd/jsd_xpc.cpp                            |  4 +-
 js/jsd/jsd_xpc.h                              |  4 +-
 js/jsd/jsdebug.cpp                            |  5 ++-
 js/jsd/jsdebug.h                              |  5 ++-
 js/jsd/jsdstubs.cpp                           |  5 ++-
 js/jsd/jshash.cpp                             |  2 +-
 js/jsd/jshash.h                               |  4 +-
 js/jsd/resource.h                             |  5 ++-
 js/public/Anchor.h                            |  5 +--
 js/public/CallArgs.h                          |  5 +--
 js/public/CharacterEncoding.h                 |  3 +-
 js/public/GCAPI.h                             |  8 ++--
 js/public/HashTable.h                         |  5 +--
 js/public/HeapAPI.h                           |  8 ++--
 js/public/LegacyIntTypes.h                    |  5 ++-
 js/public/MemoryMetrics.h                     |  5 +--
 js/public/PropertyKey.h                       |  5 +--
 js/public/RequiredDefines.h                   |  3 +-
 js/public/RootingAPI.h                        |  3 +-
 js/public/TemplateLib.h                       |  5 +--
 js/public/Utility.h                           |  5 +--
 js/public/Value.h                             |  5 +--
 js/public/Vector.h                            |  5 +--
 js/src/TraceLogging.cpp                       | 10 ++---
 js/src/TraceLogging.h                         | 10 ++---
 js/src/assembler/assembler/ARMAssembler.cpp   |  2 +-
 js/src/assembler/assembler/ARMAssembler.h     |  2 +-
 js/src/assembler/assembler/ARMv7Assembler.h   |  2 +-
 .../assembler/AbstractMacroAssembler.h        |  2 +-
 js/src/assembler/assembler/AssemblerBuffer.h  |  2 +-
 .../AssemblerBufferWithConstantPool.h         |  2 +-
 js/src/assembler/assembler/CodeLocation.h     |  2 +-
 js/src/assembler/assembler/LinkBuffer.h       |  2 +-
 js/src/assembler/assembler/MacroAssembler.h   |  2 +-
 .../assembler/assembler/MacroAssemblerARM.cpp |  2 +-
 .../assembler/assembler/MacroAssemblerARM.h   |  2 +-
 .../assembler/assembler/MacroAssemblerARMv7.h |  2 +-
 .../assembler/MacroAssemblerCodeRef.h         |  2 +-
 .../assembler/assembler/MacroAssemblerSparc.h |  4 +-
 .../assembler/assembler/MacroAssemblerX86.h   |  2 +-
 .../assembler/MacroAssemblerX86Common.cpp     |  4 +-
 .../assembler/MacroAssemblerX86Common.h       |  2 +-
 .../assembler/MacroAssemblerX86_64.h          |  2 +-
 js/src/assembler/assembler/RepatchBuffer.h    |  2 +-
 js/src/assembler/assembler/SparcAssembler.h   |  4 +-
 js/src/assembler/assembler/X86Assembler.h     |  2 +-
 js/src/assembler/jit/ExecutableAllocator.cpp  |  4 +-
 js/src/assembler/moco/MocoStubs.h             |  5 +--
 js/src/builtin/Eval.cpp                       |  3 +-
 js/src/builtin/Eval.h                         |  5 +--
 js/src/builtin/Intl.cpp                       |  2 +-
 js/src/builtin/Intl.h                         |  2 +-
 js/src/builtin/Iterator-inl.h                 |  9 ++--
 js/src/builtin/MapObject.cpp                  |  5 +--
 js/src/builtin/MapObject.h                    |  5 +--
 js/src/builtin/Module.cpp                     |  6 +++
 js/src/builtin/Module.h                       |  6 +++
 js/src/builtin/Object.cpp                     |  5 +--
 js/src/builtin/Object.h                       |  5 +--
 js/src/builtin/ParallelArray.cpp              |  5 +--
 js/src/builtin/ParallelArray.h                |  5 +--
 js/src/builtin/Profilers.cpp                  |  9 ++--
 js/src/builtin/Profilers.h                    |  3 +-
 js/src/builtin/RegExp.cpp                     |  5 +--
 js/src/builtin/RegExp.h                       |  5 +--
 js/src/builtin/TestingFunctions.cpp           |  9 ++--
 js/src/builtin/TestingFunctions.h             |  9 ++--
 js/src/ctypes/CTypes.cpp                      |  5 ++-
 js/src/ctypes/Library.cpp                     |  5 ++-
 js/src/devtools/jint/treesearch.py            |  3 +-
 js/src/devtools/sharkctl.cpp                  |  3 +-
 js/src/devtools/sharkctl.h                    |  3 +-
 js/src/ds/BitArray.h                          |  5 +--
 js/src/ds/InlineMap.h                         |  5 +--
 js/src/ds/LifoAlloc.cpp                       |  5 +--
 js/src/ds/LifoAlloc.h                         |  5 +--
 js/src/ds/PriorityQueue.h                     |  5 +--
 js/src/ds/Sort.h                              |  5 +--
 js/src/ds/SplayTree.h                         |  5 +--
 js/src/editline/editline.c                    |  1 -
 js/src/editline/editline.h                    |  1 -
 js/src/editline/sysunix.c                     |  1 -
 js/src/editline/unix.h                        |  1 -
 js/src/frontend/BytecodeCompiler.cpp          |  3 +-
 js/src/frontend/BytecodeCompiler.h            |  3 +-
 js/src/frontend/BytecodeEmitter.cpp           |  3 +-
 js/src/frontend/BytecodeEmitter.h             |  3 +-
 js/src/frontend/FoldConstants.cpp             |  3 +-
 js/src/frontend/FoldConstants.h               |  3 +-
 js/src/frontend/FullParseHandler.h            |  3 +-
 js/src/frontend/NameFunctions.cpp             |  3 +-
 js/src/frontend/NameFunctions.h               |  3 +-
 js/src/frontend/ParseMaps-inl.h               |  5 +--
 js/src/frontend/ParseMaps.cpp                 |  5 +--
 js/src/frontend/ParseMaps.h                   |  5 +--
 js/src/frontend/ParseNode-inl.h               |  2 +-
 js/src/frontend/ParseNode.cpp                 |  3 +-
 js/src/frontend/ParseNode.h                   |  3 +-
 js/src/frontend/Parser-inl.h                  |  3 +-
 js/src/frontend/Parser.cpp                    |  3 +-
 js/src/frontend/Parser.h                      |  3 +-
 js/src/frontend/SharedContext-inl.h           |  3 +-
 js/src/frontend/SharedContext.h               |  3 +-
 js/src/frontend/SyntaxParseHandler.h          |  3 +-
 js/src/frontend/TokenStream.cpp               |  3 +-
 js/src/frontend/TokenStream.h                 |  4 +-
 js/src/gc/Barrier-inl.h                       |  3 +-
 js/src/gc/Barrier.h                           |  3 +-
 js/src/gc/FindSCCs-inl.h                      |  8 ++--
 js/src/gc/FindSCCs.h                          |  8 ++--
 js/src/gc/GCInternals.h                       |  3 +-
 js/src/gc/Heap.h                              |  8 ++--
 js/src/gc/Iteration.cpp                       |  3 +-
 js/src/gc/Marking.cpp                         |  9 ++--
 js/src/gc/Marking.h                           | 11 +++--
 js/src/gc/Memory.cpp                          |  7 ++-
 js/src/gc/Memory.h                            |  7 ++-
 js/src/gc/RootMarking.cpp                     |  3 +-
 js/src/gc/Statistics.cpp                      |  3 +-
 js/src/gc/Statistics.h                        |  3 +-
 js/src/gc/StoreBuffer.cpp                     |  9 ++--
 js/src/gc/StoreBuffer.h                       |  7 ++-
 js/src/gc/Verifier.cpp                        |  3 +-
 js/src/gc/Zone.cpp                            |  3 +-
 js/src/gc/Zone.h                              |  5 +--
 js/src/gdb/gdb-tests.h                        |  2 +-
 js/src/ion/AliasAnalysis.cpp                  |  5 +--
 js/src/ion/AliasAnalysis.h                    |  5 +--
 js/src/ion/AsmJS.cpp                          |  5 +--
 js/src/ion/AsmJS.h                            |  5 +--
 js/src/ion/AsmJSLink.cpp                      |  5 +--
 js/src/ion/AsmJSModule.h                      |  5 +--
 js/src/ion/AsmJSSignalHandlers.cpp            |  5 +--
 js/src/ion/BacktrackingAllocator.cpp          |  5 +--
 js/src/ion/BacktrackingAllocator.h            |  5 +--
 js/src/ion/Bailouts.cpp                       |  5 +--
 js/src/ion/Bailouts.h                         |  5 +--
 js/src/ion/BaselineBailouts.cpp               |  5 +--
 js/src/ion/BaselineCompiler.cpp               |  5 +--
 js/src/ion/BaselineCompiler.h                 |  5 +--
 js/src/ion/BaselineFrame-inl.h                |  5 +--
 js/src/ion/BaselineFrame.cpp                  |  5 +--
 js/src/ion/BaselineFrame.h                    |  5 +--
 js/src/ion/BaselineFrameInfo.cpp              |  5 +--
 js/src/ion/BaselineFrameInfo.h                |  5 +--
 js/src/ion/BaselineHelpers.h                  |  5 +--
 js/src/ion/BaselineIC.cpp                     |  5 +--
 js/src/ion/BaselineIC.h                       |  5 +--
 js/src/ion/BaselineInspector.cpp              |  5 +--
 js/src/ion/BaselineInspector.h                |  5 +--
 js/src/ion/BaselineJIT.cpp                    |  5 +--
 js/src/ion/BaselineJIT.h                      |  5 +--
 js/src/ion/BaselineRegisters.h                |  5 +--
 js/src/ion/BitSet.cpp                         |  5 +--
 js/src/ion/BitSet.h                           |  5 +--
 js/src/ion/C1Spewer.cpp                       |  5 +--
 js/src/ion/C1Spewer.h                         |  5 +--
 js/src/ion/CodeGenerator.cpp                  |  5 +--
 js/src/ion/CodeGenerator.h                    |  5 +--
 js/src/ion/CompactBuffer.h                    |  5 +--
 js/src/ion/CompileInfo-inl.h                  |  5 +--
 js/src/ion/CompileInfo.h                      |  5 +--
 js/src/ion/CompilerRoot.h                     |  5 +--
 js/src/ion/EdgeCaseAnalysis.cpp               |  5 +--
 js/src/ion/EdgeCaseAnalysis.h                 |  5 +--
 js/src/ion/EffectiveAddressAnalysis.cpp       |  5 +--
 js/src/ion/EffectiveAddressAnalysis.h         |  5 +--
 js/src/ion/ExecutionModeInlines.h             |  5 +--
 js/src/ion/FixedArityList.h                   |  5 +--
 js/src/ion/FixedList.h                        |  5 +--
 js/src/ion/InlineList.h                       |  5 +--
 js/src/ion/Ion.cpp                            |  5 +--
 js/src/ion/Ion.h                              |  5 +--
 js/src/ion/IonAllocPolicy.h                   |  5 +--
 js/src/ion/IonAnalysis.cpp                    |  5 +--
 js/src/ion/IonAnalysis.h                      |  5 +--
 js/src/ion/IonBuilder.cpp                     |  5 +--
 js/src/ion/IonBuilder.h                       |  5 +--
 js/src/ion/IonCaches.cpp                      |  5 +--
 js/src/ion/IonCaches.h                        |  5 +--
 js/src/ion/IonCode.h                          |  5 +--
 js/src/ion/IonCompartment.h                   |  5 +--
 js/src/ion/IonFrameIterator-inl.h             |  5 +--
 js/src/ion/IonFrameIterator.h                 |  5 +--
 js/src/ion/IonFrames-inl.h                    |  5 +--
 js/src/ion/IonFrames.cpp                      |  5 +--
 js/src/ion/IonFrames.h                        |  5 +--
 js/src/ion/IonInstrumentation.h               |  5 +--
 js/src/ion/IonLinker.h                        |  5 +--
 js/src/ion/IonMacroAssembler.cpp              |  5 +--
 js/src/ion/IonMacroAssembler.h                |  5 +--
 js/src/ion/IonSpewer.cpp                      |  5 +--
 js/src/ion/IonSpewer.h                        |  5 +--
 js/src/ion/IonTypes.h                         |  5 +--
 js/src/ion/JSONSpewer.cpp                     |  5 +--
 js/src/ion/JSONSpewer.h                       |  5 +--
 js/src/ion/LICM.cpp                           |  5 +--
 js/src/ion/LICM.h                             |  5 +--
 js/src/ion/LIR-Common.h                       |  5 +--
 js/src/ion/LIR-inl.h                          |  5 +--
 js/src/ion/LIR.cpp                            |  5 +--
 js/src/ion/LIR.h                              |  5 +--
 js/src/ion/LOpcodes.h                         |  5 +--
 js/src/ion/LinearScan.cpp                     |  5 +--
 js/src/ion/LinearScan.h                       |  5 +--
 js/src/ion/LiveRangeAllocator.cpp             |  5 +--
 js/src/ion/LiveRangeAllocator.h               |  5 +--
 js/src/ion/Lowering.cpp                       |  5 +--
 js/src/ion/Lowering.h                         |  5 +--
 js/src/ion/MCallOptimize.cpp                  |  5 +--
 js/src/ion/MIR.cpp                            |  5 +--
 js/src/ion/MIR.h                              |  5 +--
 js/src/ion/MIRGenerator.h                     |  5 +--
 js/src/ion/MIRGraph.cpp                       |  5 +--
 js/src/ion/MIRGraph.h                         |  5 +--
 js/src/ion/MOpcodes.h                         |  5 +--
 js/src/ion/MoveEmitter.h                      |  5 +--
 js/src/ion/MoveResolver.cpp                   |  5 +--
 js/src/ion/MoveResolver.h                     |  5 +--
 js/src/ion/ParallelArrayAnalysis.cpp          |  5 +--
 js/src/ion/ParallelArrayAnalysis.h            |  5 +--
 js/src/ion/ParallelFunctions.cpp              |  5 +--
 js/src/ion/ParallelFunctions.h                |  5 +--
 js/src/ion/PcScriptCache-inl.h                |  5 +--
 js/src/ion/PcScriptCache.h                    |  5 +--
 js/src/ion/RangeAnalysis.cpp                  |  5 +--
 js/src/ion/RangeAnalysis.h                    |  5 +--
 js/src/ion/RegisterAllocator.cpp              |  5 +--
 js/src/ion/RegisterAllocator.h                |  5 +--
 js/src/ion/RegisterSets.h                     |  5 +--
 js/src/ion/Registers.h                        |  5 +--
 js/src/ion/Safepoints.cpp                     |  5 +--
 js/src/ion/Safepoints.h                       |  5 +--
 js/src/ion/SnapshotReader.h                   |  5 +--
 js/src/ion/SnapshotWriter.h                   |  5 +--
 js/src/ion/Snapshots.cpp                      |  5 +--
 js/src/ion/StackSlotAllocator.h               |  5 +--
 js/src/ion/StupidAllocator.cpp                |  5 +--
 js/src/ion/StupidAllocator.h                  |  5 +--
 js/src/ion/TypeOracle.cpp                     |  5 +--
 js/src/ion/TypeOracle.h                       |  5 +--
 js/src/ion/TypePolicy.cpp                     |  5 +--
 js/src/ion/TypePolicy.h                       |  5 +--
 js/src/ion/UnreachableCodeElimination.cpp     |  5 +--
 js/src/ion/UnreachableCodeElimination.h       |  5 +--
 js/src/ion/VMFunctions.cpp                    |  5 +--
 js/src/ion/VMFunctions.h                      |  5 +--
 js/src/ion/ValueNumbering.cpp                 |  5 +--
 js/src/ion/ValueNumbering.h                   |  5 +--
 js/src/ion/arm/Architecture-arm.cpp           |  6 +--
 js/src/ion/arm/Architecture-arm.h             |  5 +--
 js/src/ion/arm/Assembler-arm.cpp              |  5 +--
 js/src/ion/arm/Assembler-arm.h                |  5 +--
 js/src/ion/arm/Bailouts-arm.cpp               |  5 +--
 js/src/ion/arm/BaselineCompiler-arm.cpp       |  5 +--
 js/src/ion/arm/BaselineCompiler-arm.h         |  5 +--
 js/src/ion/arm/BaselineHelpers-arm.h          |  5 +--
 js/src/ion/arm/BaselineIC-arm.cpp             |  5 +--
 js/src/ion/arm/BaselineRegisters-arm.h        |  5 +--
 js/src/ion/arm/CodeGenerator-arm.cpp          |  5 +--
 js/src/ion/arm/CodeGenerator-arm.h            |  5 +--
 js/src/ion/arm/IonFrames-arm.cpp              |  5 +--
 js/src/ion/arm/IonFrames-arm.h                |  5 +--
 js/src/ion/arm/LIR-arm.h                      |  5 +--
 js/src/ion/arm/LOpcodes-arm.h                 |  5 +--
 js/src/ion/arm/Lowering-arm.cpp               |  5 +--
 js/src/ion/arm/Lowering-arm.h                 |  5 +--
 js/src/ion/arm/MacroAssembler-arm.cpp         |  5 +--
 js/src/ion/arm/MacroAssembler-arm.h           |  5 +--
 js/src/ion/arm/MoveEmitter-arm.cpp            |  5 +--
 js/src/ion/arm/MoveEmitter-arm.h              |  5 +--
 js/src/ion/arm/Trampoline-arm.cpp             |  5 +--
 js/src/ion/shared/Assembler-shared.h          |  5 +--
 js/src/ion/shared/Assembler-x86-shared.cpp    |  5 +--
 js/src/ion/shared/Assembler-x86-shared.h      |  5 +--
 js/src/ion/shared/BaselineCompiler-shared.cpp |  5 +--
 js/src/ion/shared/BaselineCompiler-shared.h   |  5 +--
 .../shared/BaselineCompiler-x86-shared.cpp    |  5 +--
 .../ion/shared/BaselineCompiler-x86-shared.h  |  5 +--
 js/src/ion/shared/BaselineIC-x86-shared.cpp   |  5 +--
 js/src/ion/shared/CodeGenerator-shared-inl.h  |  5 +--
 js/src/ion/shared/CodeGenerator-shared.cpp    |  5 +--
 js/src/ion/shared/CodeGenerator-shared.h      |  5 +--
 .../ion/shared/CodeGenerator-x86-shared.cpp   |  5 +--
 js/src/ion/shared/CodeGenerator-x86-shared.h  |  5 +--
 js/src/ion/shared/IonAssemblerBuffer.h        |  5 +--
 .../IonAssemblerBufferWithConstantPools.h     |  5 +--
 js/src/ion/shared/IonFrames-shared.h          | 44 +++----------------
 js/src/ion/shared/IonFrames-x86-shared.cpp    |  5 +--
 js/src/ion/shared/IonFrames-x86-shared.h      |  5 +--
 js/src/ion/shared/LIR-x86-shared.h            |  5 +--
 js/src/ion/shared/Lowering-shared-inl.h       |  5 +--
 js/src/ion/shared/Lowering-shared.cpp         |  5 +--
 js/src/ion/shared/Lowering-shared.h           |  5 +--
 js/src/ion/shared/Lowering-x86-shared.cpp     |  5 +--
 js/src/ion/shared/Lowering-x86-shared.h       |  5 +--
 js/src/ion/shared/MacroAssembler-x86-shared.h |  5 +--
 js/src/ion/shared/MoveEmitter-x86-shared.cpp  |  5 +--
 js/src/ion/shared/MoveEmitter-x86-shared.h    |  5 +--
 js/src/ion/x64/Architecture-x64.h             |  5 +--
 js/src/ion/x64/Assembler-x64.cpp              |  5 +--
 js/src/ion/x64/Assembler-x64.h                |  5 +--
 js/src/ion/x64/Bailouts-x64.cpp               |  5 +--
 js/src/ion/x64/BaselineCompiler-x64.cpp       |  5 +--
 js/src/ion/x64/BaselineCompiler-x64.h         |  5 +--
 js/src/ion/x64/BaselineHelpers-x64.h          |  5 +--
 js/src/ion/x64/BaselineIC-x64.cpp             |  5 +--
 js/src/ion/x64/BaselineRegisters-x64.h        |  5 +--
 js/src/ion/x64/CodeGenerator-x64.cpp          |  5 +--
 js/src/ion/x64/CodeGenerator-x64.h            |  5 +--
 js/src/ion/x64/LIR-x64.h                      |  5 +--
 js/src/ion/x64/LOpcodes-x64.h                 |  5 +--
 js/src/ion/x64/Lowering-x64.cpp               |  5 +--
 js/src/ion/x64/Lowering-x64.h                 |  5 +--
 js/src/ion/x64/MacroAssembler-x64.cpp         |  5 +--
 js/src/ion/x64/MacroAssembler-x64.h           |  5 +--
 js/src/ion/x64/Trampoline-x64.cpp             |  5 +--
 js/src/ion/x86/Architecture-x86.h             |  5 +--
 js/src/ion/x86/Assembler-x86.cpp              |  5 +--
 js/src/ion/x86/Assembler-x86.h                |  5 +--
 js/src/ion/x86/Bailouts-x86.cpp               |  5 +--
 js/src/ion/x86/BaselineCompiler-x86.cpp       |  5 +--
 js/src/ion/x86/BaselineCompiler-x86.h         |  5 +--
 js/src/ion/x86/BaselineHelpers-x86.h          |  5 +--
 js/src/ion/x86/BaselineIC-x86.cpp             |  5 +--
 js/src/ion/x86/BaselineRegisters-x86.h        |  5 +--
 js/src/ion/x86/CodeGenerator-x86.cpp          |  5 +--
 js/src/ion/x86/CodeGenerator-x86.h            |  5 +--
 js/src/ion/x86/LIR-x86.h                      |  5 +--
 js/src/ion/x86/LOpcodes-x86.h                 |  5 +--
 js/src/ion/x86/Lowering-x86.cpp               |  5 +--
 js/src/ion/x86/Lowering-x86.h                 |  5 +--
 js/src/ion/x86/MacroAssembler-x86.cpp         |  5 +--
 js/src/ion/x86/MacroAssembler-x86.h           |  5 +--
 js/src/ion/x86/Trampoline-x86.cpp             |  5 +--
 .../jit-test/tests/auto-regress/bug557946.js  |  2 +-
 .../jit-test/tests/auto-regress/bug558618.js  |  2 +-
 js/src/jit-test/tests/basic/bug535760.js      |  2 +-
 js/src/jit-test/tests/basic/bug541191-1.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-2.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-3.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-4.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-5.js    |  2 +-
 js/src/jit-test/tests/basic/bug592927.js      |  2 +-
 js/src/jit-test/tests/basic/bug602088.js      |  2 +-
 js/src/jit-test/tests/basic/bug606083.js      |  2 +-
 js/src/jit-test/tests/basic/bug616762.js      |  2 +-
 js/src/jit-test/tests/basic/bug633409-1.js    |  2 +-
 js/src/jit-test/tests/basic/bug633409-2.js    |  2 +-
 js/src/jit-test/tests/ion/bug674664-3.js      |  2 +-
 js/src/jit-test/tests/ion/bug684362.js        |  2 +-
 js/src/jit-test/tests/ion/bug747271.js        |  2 +-
 js/src/jit-test/tests/ion/bug750588.js        |  2 +-
 js/src/jit-test/tests/ion/bug772901.js        |  2 +-
 js/src/jit-test/tests/ion/testPos.js          |  2 +-
 js/src/jit-test/tests/ion/testSubtract.js     |  2 +-
 js/src/jit-test/tests/ion/testVAndBranch.js   |  2 +-
 js/src/jit-test/tests/ion/truncateToInt32.js  |  2 +-
 js/src/jit-test/tests/ion/valueToInt32.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug592973-1.js   |  2 +-
 js/src/jit-test/tests/jaeger/bug592973-3.js   |  2 +-
 js/src/jit-test/tests/jaeger/bug597378.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug600139.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug600424.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug601982.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug604381.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug616508.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug625438.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug627486.js     |  2 +-
 .../jit-test/tests/jaeger/floatTypedArrays.js |  2 +-
 .../tests/jaeger/normalIntTypedArrays.js      |  2 +-
 .../tests/jaeger/smallIntTypedArrays.js       |  2 +-
 .../tests/jaeger/testCallElemAfterGC.js       |  2 +-
 .../tests/jaeger/testDenseCallElem.js         |  2 +-
 js/src/jit-test/tests/jaeger/testForOps.js    |  2 +-
 .../jit-test/tests/jaeger/testPropCallElem.js |  2 +-
 .../tests/jaeger/testPropCallElem2.js         |  2 +-
 .../jit-test/tests/jaeger/testSetElem-Easy.js |  2 +-
 .../tests/jaeger/testSetElem-Indexed.js       |  2 +-
 .../tests/jaeger/testSetElem-NewProto.js      |  2 +-
 .../tests/jaeger/testSetTypedFloatArray.js    |  2 +-
 .../tests/jaeger/testSetTypedIntArray.js      |  2 +-
 .../tests/jaeger/testShiftSameBacking.js      |  2 +-
 js/src/jsalloc.cpp                            |  5 +--
 js/src/jsalloc.h                              |  5 +--
 js/src/jsanalyze.cpp                          |  6 +--
 js/src/jsanalyze.h                            |  6 +--
 js/src/jsapi-tests/selfTest.cpp               |  2 +-
 .../jsapi-tests/testAddPropertyPropcache.cpp  |  2 +-
 js/src/jsapi-tests/testArgumentsObject.cpp    |  2 +-
 js/src/jsapi-tests/testArrayBuffer.cpp        |  2 +-
 js/src/jsapi-tests/testBug604087.cpp          |  2 +-
 js/src/jsapi-tests/testClassGetter.cpp        |  2 +-
 js/src/jsapi-tests/testCloneScript.cpp        |  2 +-
 js/src/jsapi-tests/testContexts.cpp           |  6 +--
 js/src/jsapi-tests/testDebugger.cpp           |  2 +-
 js/src/jsapi-tests/testDeepFreeze.cpp         |  2 +-
 .../testDefineGetterSetterNonEnumerable.cpp   |  2 +-
 js/src/jsapi-tests/testDefineProperty.cpp     |  2 +-
 js/src/jsapi-tests/testEnclosingFunction.cpp  |  2 +-
 js/src/jsapi-tests/testErrorCopying.cpp       |  2 +-
 js/src/jsapi-tests/testFindSCCs.cpp           |  2 +-
 js/src/jsapi-tests/testFunctionProperties.cpp |  2 +-
 js/src/jsapi-tests/testGCOutOfMemory.cpp      |  2 +-
 js/src/jsapi-tests/testGetPropertyDefault.cpp |  2 +-
 js/src/jsapi-tests/testIndexToString.cpp      |  2 +-
 js/src/jsapi-tests/testIntString.cpp          |  2 +-
 js/src/jsapi-tests/testJSEvaluateScript.cpp   |  2 +-
 js/src/jsapi-tests/testLookup.cpp             |  2 +-
 js/src/jsapi-tests/testNewObject.cpp          |  2 +-
 js/src/jsapi-tests/testOps.cpp                |  2 +-
 js/src/jsapi-tests/testParseJSON.cpp          |  2 +-
 js/src/jsapi-tests/testProfileStrings.cpp     |  2 +-
 js/src/jsapi-tests/testPropCache.cpp          |  2 +-
 .../testRegExpInstanceProperties.cpp          |  2 +-
 js/src/jsapi-tests/testResolveRecursion.cpp   |  2 +-
 js/src/jsapi-tests/testSameValue.cpp          |  2 +-
 js/src/jsapi-tests/testScriptInfo.cpp         |  2 +-
 js/src/jsapi-tests/testScriptObject.cpp       |  2 +-
 js/src/jsapi-tests/testSetProperty.cpp        |  2 +-
 js/src/jsapi-tests/testStringBuffer.cpp       |  2 +-
 js/src/jsapi-tests/testTrap.cpp               |  2 +-
 js/src/jsapi-tests/testTypedArrays.cpp        |  2 +-
 js/src/jsapi-tests/testUTF8.cpp               |  2 +-
 js/src/jsapi-tests/testXDR.cpp                |  2 +-
 js/src/jsapi-tests/tests.cpp                  |  3 +-
 js/src/jsapi-tests/tests.h                    |  3 +-
 js/src/jsapi-tests/valueABI.c                 |  3 +-
 js/src/jsapi.cpp                              |  5 +--
 js/src/jsapi.h                                |  3 +-
 js/src/jsarray.cpp                            |  3 +-
 js/src/jsarray.h                              |  2 +-
 js/src/jsatom.cpp                             |  2 +-
 js/src/jsatom.h                               |  2 +-
 js/src/jsatominlines.h                        |  4 +-
 js/src/jsbool.cpp                             |  2 +-
 js/src/jsbool.h                               |  4 +-
 js/src/jsboolinlines.h                        |  4 +-
 js/src/jsclass.h                              |  5 +--
 js/src/jsclist.h                              |  5 ++-
 js/src/jsclone.cpp                            |  1 +
 js/src/jsclone.h                              |  1 +
 js/src/jscntxt.cpp                            |  5 +--
 js/src/jscntxt.h                              |  3 +-
 js/src/jscntxtinlines.h                       |  5 +--
 js/src/jscompartment.cpp                      |  5 +--
 js/src/jscompartment.h                        |  5 +--
 js/src/jscompartmentinlines.h                 |  5 +--
 js/src/jscpucfg.h                             |  4 +-
 js/src/jscrashformat.h                        |  5 +--
 js/src/jscrashreport.cpp                      |  5 +--
 js/src/jscrashreport.h                        |  5 +--
 js/src/jsdate.cpp                             |  3 +-
 js/src/jsdate.h                               |  4 +-
 js/src/jsdbgapi.cpp                           |  3 +-
 js/src/jsdbgapi.h                             |  3 +-
 js/src/jsdhash.cpp                            |  5 ++-
 js/src/jsdhash.h                              |  5 ++-
 js/src/jsdtoa.cpp                             |  2 +-
 js/src/jsdtoa.h                               |  4 +-
 js/src/jsexn.cpp                              |  3 +-
 js/src/jsexn.h                                |  4 +-
 js/src/jsfriendapi.cpp                        |  5 +--
 js/src/jsfriendapi.h                          |  2 +-
 js/src/jsfun.cpp                              |  5 +--
 js/src/jsfun.h                                |  4 +-
 js/src/jsfuninlines.h                         |  5 +--
 js/src/jsgc.cpp                               |  3 +-
 js/src/jsgc.h                                 |  2 +-
 js/src/jsgcinlines.h                          |  2 +-
 js/src/jsinfer.cpp                            |  6 +--
 js/src/jsinfer.h                              |  6 +--
 js/src/jsinferinlines.h                       |  6 +--
 js/src/jsinterp.cpp                           |  5 +--
 js/src/jsinterp.h                             |  5 +--
 js/src/jsinterpinlines.h                      |  5 +--
 js/src/jsiter.cpp                             |  3 +-
 js/src/jsiter.h                               |  3 +-
 js/src/jskwgen.cpp                            |  3 +-
 js/src/jslibmath.h                            |  5 +--
 js/src/jslock.h                               |  3 +-
 js/src/jslog2.cpp                             |  5 ++-
 js/src/jsmath.cpp                             |  5 +--
 js/src/jsmath.h                               |  4 +-
 js/src/jsmemorymetrics.cpp                    |  5 +--
 js/src/jsnativestack.cpp                      |  5 +--
 js/src/jsnativestack.h                        |  5 +--
 js/src/jsnum.cpp                              |  2 +-
 js/src/jsnum.h                                |  4 +-
 js/src/jsnuminlines.h                         |  4 +-
 js/src/jsobj.cpp                              |  3 +-
 js/src/jsobj.h                                |  3 +-
 js/src/jsobjinlines.h                         |  3 +-
 js/src/json.cpp                               |  3 +-
 js/src/json.h                                 |  4 +-
 js/src/jsonparser.cpp                         |  3 +-
 js/src/jsonparser.h                           |  3 +-
 js/src/jsopcode.cpp                           |  5 +--
 js/src/jsopcode.h                             |  4 +-
 js/src/jsopcodeinlines.h                      |  4 +-
 js/src/jsoplengen.cpp                         |  3 +-
 js/src/jsprf.cpp                              |  5 ++-
 js/src/jsprf.h                                |  5 ++-
 js/src/jsprobes.cpp                           |  3 +-
 js/src/jsprobes.h                             |  5 +--
 js/src/jspropertycache.cpp                    |  5 +--
 js/src/jspropertycache.h                      |  3 +-
 js/src/jspropertycacheinlines.h               |  3 +-
 js/src/jspropertytree.cpp                     |  6 +--
 js/src/jspropertytree.h                       |  6 +--
 js/src/jsprototypes.h                         |  5 +--
 js/src/jsproxy.cpp                            |  9 ++--
 js/src/jsproxy.h                              |  5 +--
 js/src/jsprvtd.h                              |  2 +-
 js/src/jspubtd.h                              |  2 +-
 js/src/jsreflect.cpp                          |  5 +--
 js/src/jsreflect.h                            |  5 +--
 js/src/jsscript.cpp                           |  3 +-
 js/src/jsscript.h                             |  3 +-
 js/src/jsscriptinlines.h                      |  3 +-
 js/src/jsstr.cpp                              |  5 +--
 js/src/jsstr.h                                |  5 +--
 js/src/jsstrinlines.h                         |  4 +-
 js/src/jstypedarray.cpp                       |  6 +--
 js/src/jstypedarray.h                         |  6 +--
 js/src/jstypedarrayinlines.h                  |  6 +--
 js/src/jstypes.h                              |  5 ++-
 js/src/jsutil.cpp                             |  4 +-
 js/src/jsutil.h                               |  4 +-
 js/src/jsversion.h                            |  4 +-
 js/src/jswatchpoint.cpp                       |  2 +-
 js/src/jswatchpoint.h                         |  2 +-
 js/src/jsweakcache.h                          |  5 +--
 js/src/jsweakmap.cpp                          |  5 +--
 js/src/jsweakmap.h                            |  5 +--
 js/src/jswin.h                                |  4 +-
 js/src/jsworkers.cpp                          |  6 +--
 js/src/jsworkers.h                            |  6 +--
 js/src/jswrapper.cpp                          |  5 +--
 js/src/jswrapper.h                            |  5 +--
 js/src/methodjit/BaseAssembler.h              |  5 +--
 js/src/methodjit/BaseCompiler.h               |  5 +--
 js/src/methodjit/CodeGenIncludes.h            |  5 +--
 js/src/methodjit/Compiler.cpp                 |  5 +--
 js/src/methodjit/Compiler.h                   |  5 +--
 js/src/methodjit/FastArithmetic.cpp           |  5 +--
 js/src/methodjit/FastBuiltins.cpp             |  5 +--
 js/src/methodjit/FastOps.cpp                  |  5 +--
 js/src/methodjit/FrameEntry.h                 |  5 +--
 js/src/methodjit/FrameState-inl.h             |  5 +--
 js/src/methodjit/FrameState.cpp               |  5 +--
 js/src/methodjit/FrameState.h                 |  5 +--
 js/src/methodjit/ICChecker.h                  |  5 +--
 js/src/methodjit/ICLabels.h                   |  5 +--
 js/src/methodjit/ICRepatcher.h                |  5 +--
 js/src/methodjit/ImmutableSync.cpp            |  5 +--
 js/src/methodjit/ImmutableSync.h              |  5 +--
 js/src/methodjit/InlineFrameAssembler.h       |  5 +--
 js/src/methodjit/InvokeHelpers.cpp            |  5 +--
 js/src/methodjit/Logging.cpp                  |  5 +--
 js/src/methodjit/Logging.h                    |  5 +--
 js/src/methodjit/LoopState.cpp                |  5 +--
 js/src/methodjit/LoopState.h                  |  5 +--
 js/src/methodjit/MachineRegs.h                |  5 +--
 js/src/methodjit/MethodJIT.cpp                |  5 +--
 js/src/methodjit/MethodJIT.h                  |  5 +--
 js/src/methodjit/MonoIC.cpp                   |  5 +--
 js/src/methodjit/MonoIC.h                     |  5 +--
 js/src/methodjit/NunboxAssembler.h            |  5 +--
 js/src/methodjit/PolyIC.cpp                   |  5 +--
 js/src/methodjit/PolyIC.h                     |  5 +--
 js/src/methodjit/PunboxAssembler.h            |  5 +--
 js/src/methodjit/RematInfo.h                  |  5 +--
 js/src/methodjit/Retcon.cpp                   |  5 +--
 js/src/methodjit/Retcon.h                     |  5 +--
 js/src/methodjit/StubCalls-inl.h              |  5 +--
 js/src/methodjit/StubCalls.cpp                |  5 +--
 js/src/methodjit/StubCalls.h                  |  5 +--
 js/src/methodjit/StubCompiler.cpp             |  5 +--
 js/src/methodjit/StubCompiler.h               |  5 +--
 js/src/methodjit/TrampolineCompiler.cpp       |  5 +--
 js/src/methodjit/TrampolineCompiler.h         |  5 +--
 js/src/methodjit/TrampolineMIPS.cpp           |  5 +--
 js/src/methodjit/TypedArrayIC.h               |  5 +--
 js/src/perf/jsperf.cpp                        |  2 +-
 js/src/perf/jsperf.h                          |  2 +-
 js/src/perf/pm_linux.cpp                      |  2 +-
 js/src/perf/pm_stub.cpp                       |  2 +-
 js/src/prmjtime.cpp                           |  2 +-
 js/src/prmjtime.h                             |  4 +-
 js/src/shell/js.cpp                           |  3 +-
 js/src/shell/jsheaptools.cpp                  |  3 +-
 js/src/shell/jsheaptools.h                    |  3 +-
 js/src/shell/jsoptparse.cpp                   |  3 +-
 js/src/shell/jsoptparse.h                     |  3 +-
 .../ecma_2/Exceptions/exception-010-n.js      |  1 -
 .../ecma_2/Exceptions/exception-011-n.js      |  1 -
 .../ecma_2/FunctionObjects/apply-001-n.js     |  1 -
 .../tests/ecma_3/Exceptions/regress-58946.js  |  1 -
 .../tests/ecma_3/ExecutionContexts/10.1.3.js  |  1 -
 .../ecma_3/ExecutionContexts/10.1.4-1.js      |  1 -
 .../ecma_3/ExecutionContexts/regress-23346.js |  1 -
 js/src/tests/ecma_3/FunExpr/fe-001-n.js       |  1 -
 js/src/tests/ecma_3/FunExpr/fe-001.js         |  1 -
 js/src/tests/ecma_3/FunExpr/fe-002.js         |  1 -
 .../ecma_3/NumberFormatting/tostring-001.js   |  1 -
 js/src/tests/ecma_3/RegExp/regress-24712.js   |  1 -
 js/src/tests/ecma_3/RegExp/regress-28686.js   |  1 -
 js/src/tests/ecma_3/Unicode/uc-001-n.js       |  1 -
 js/src/tests/ecma_3/Unicode/uc-001.js         |  1 -
 js/src/tests/ecma_3/Unicode/uc-002-n.js       |  1 -
 js/src/tests/ecma_3/Unicode/uc-002.js         |  1 -
 js/src/tests/ecma_3/Unicode/uc-003.js         |  1 -
 js/src/tests/ecma_3/Unicode/uc-004.js         |  1 -
 .../js1_5/Exceptions/catchguard-002-n.js      |  1 -
 .../js1_5/Exceptions/catchguard-003-n.js      |  1 -
 js/src/tests/js1_5/GetSet/getset-002.js       |  1 -
 .../js1_5/extensions/catchguard-001-n.js      |  1 -
 .../tests/js1_5/extensions/catchguard-001.js  |  1 -
 .../tests/js1_5/extensions/catchguard-002.js  |  1 -
 .../tests/js1_5/extensions/catchguard-003.js  |  1 -
 js/src/tests/js1_5/extensions/getset-001.js   |  1 -
 .../tests/js1_5/extensions/regress-50447-1.js |  2 +-
 .../tests/js1_5/extensions/regress-50447.js   |  1 -
 js/src/tests/js1_6/shell.js                   |  1 -
 js/src/tests/js1_7/shell.js                   |  1 -
 js/src/tests/js1_8/shell.js                   |  1 -
 js/src/tests/js1_8_1/shell.js                 |  1 -
 js/src/tests/shell.js                         |  1 -
 js/src/vm/ArgumentsObject-inl.h               |  3 +-
 js/src/vm/ArgumentsObject.cpp                 |  3 +-
 js/src/vm/ArgumentsObject.h                   |  3 +-
 js/src/vm/BooleanObject-inl.h                 |  3 +-
 js/src/vm/BooleanObject.h                     |  3 +-
 js/src/vm/CharacterEncoding.cpp               |  3 +-
 js/src/vm/CommonPropertyNames.h               |  5 +--
 js/src/vm/DateTime.cpp                        |  6 +--
 js/src/vm/DateTime.h                          |  6 +--
 js/src/vm/Debugger.cpp                        |  5 +--
 js/src/vm/Debugger.h                          |  5 +--
 js/src/vm/ForkJoin.cpp                        |  3 +-
 js/src/vm/ForkJoin.h                          |  3 +-
 js/src/vm/GlobalObject-inl.h                  |  3 +-
 js/src/vm/GlobalObject.cpp                    |  3 +-
 js/src/vm/GlobalObject.h                      |  3 +-
 js/src/vm/Keywords.h                          |  5 +--
 js/src/vm/MatchPairs.h                        |  5 +--
 js/src/vm/Monitor.cpp                         |  3 +-
 js/src/vm/Monitor.h                           |  3 +-
 js/src/vm/NumberObject-inl.h                  |  3 +-
 js/src/vm/NumberObject.h                      |  3 +-
 js/src/vm/NumericConversions.h                |  7 ++-
 js/src/vm/ObjectImpl-inl.h                    |  7 ++-
 js/src/vm/ObjectImpl.cpp                      |  7 ++-
 js/src/vm/ObjectImpl.h                        |  7 ++-
 js/src/vm/ParallelDo.cpp                      |  5 +--
 js/src/vm/ParallelDo.h                        |  5 +--
 js/src/vm/PropertyKey.cpp                     |  2 +-
 js/src/vm/RegExpObject-inl.h                  |  5 +--
 js/src/vm/RegExpObject.cpp                    |  5 +--
 js/src/vm/RegExpObject.h                      |  5 +--
 js/src/vm/RegExpStatics-inl.h                 |  5 +--
 js/src/vm/RegExpStatics.cpp                   |  5 +--
 js/src/vm/RegExpStatics.h                     |  5 +--
 js/src/vm/SPSProfiler.cpp                     |  5 +--
 js/src/vm/SPSProfiler.h                       |  5 +--
 js/src/vm/ScopeObject-inl.h                   |  3 +-
 js/src/vm/ScopeObject.cpp                     |  5 +--
 js/src/vm/ScopeObject.h                       |  3 +-
 js/src/vm/SelfHosting.cpp                     |  5 +--
 js/src/vm/Shape-inl.h                         |  5 ++-
 js/src/vm/Shape.cpp                           |  3 +-
 js/src/vm/Shape.h                             |  5 +--
 js/src/vm/Stack-inl.h                         |  5 +--
 js/src/vm/Stack.cpp                           |  5 +--
 js/src/vm/Stack.h                             |  5 +--
 js/src/vm/String-inl.h                        |  5 +--
 js/src/vm/String.cpp                          |  5 +--
 js/src/vm/String.h                            |  5 +--
 js/src/vm/StringBuffer.cpp                    |  6 +--
 js/src/vm/StringBuffer.h                      |  6 +--
 js/src/vm/StringObject-inl.h                  |  3 +-
 js/src/vm/StringObject.h                      |  3 +-
 js/src/vm/ThreadPool.cpp                      |  6 +--
 js/src/vm/ThreadPool.h                        |  3 +-
 js/src/vm/Unicode.h                           |  4 +-
 js/src/vm/Xdr.cpp                             |  2 +-
 js/src/vm/Xdr.h                               |  3 +-
 js/src/yarr/ASCIICType.h                      |  4 +-
 js/src/yarr/BumpPointerAllocator.h            |  4 +-
 js/src/yarr/CheckedArithmetic.h               |  3 +-
 js/src/yarr/MatchResult.h                     |  4 +-
 js/src/yarr/OSAllocator.h                     |  4 +-
 js/src/yarr/OSAllocatorOS2.cpp                |  4 +-
 js/src/yarr/OSAllocatorPosix.cpp              |  4 +-
 js/src/yarr/OSAllocatorWin.cpp                |  4 +-
 js/src/yarr/PageAllocation.h                  |  4 +-
 js/src/yarr/PageBlock.cpp                     |  4 +-
 js/src/yarr/PageBlock.h                       |  4 +-
 js/src/yarr/VMTags.h                          |  4 +-
 js/src/yarr/Yarr.h                            |  4 +-
 js/src/yarr/YarrCanonicalizeUCS2.cpp          |  4 +-
 js/src/yarr/YarrCanonicalizeUCS2.h            |  4 +-
 js/src/yarr/YarrInterpreter.cpp               |  4 +-
 js/src/yarr/YarrInterpreter.h                 |  4 +-
 js/src/yarr/YarrJIT.cpp                       |  3 +-
 js/src/yarr/YarrJIT.h                         |  3 +-
 js/src/yarr/YarrParser.h                      |  3 +-
 js/src/yarr/YarrPattern.cpp                   |  3 +-
 js/src/yarr/YarrPattern.h                     |  3 +-
 js/src/yarr/YarrSyntaxChecker.cpp             |  4 +-
 js/src/yarr/YarrSyntaxChecker.h               |  4 +-
 js/src/yarr/wtfbridge.h                       |  6 +--
 733 files changed, 1279 insertions(+), 1724 deletions(-)

diff --git a/js/ipc/CPOWTypes.h b/js/ipc/CPOWTypes.h
index 46195f9ee72d..56d84cd3f717 100644
--- a/js/ipc/CPOWTypes.h
+++ b/js/ipc/CPOWTypes.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ContextWrapperChild.h b/js/ipc/ContextWrapperChild.h
index ec42b78ba6d7..b6d1c9505c17 100644
--- a/js/ipc/ContextWrapperChild.h
+++ b/js/ipc/ContextWrapperChild.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ContextWrapperParent.h b/js/ipc/ContextWrapperParent.h
index 01fca526411d..671521b36b2a 100644
--- a/js/ipc/ContextWrapperParent.h
+++ b/js/ipc/ContextWrapperParent.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ObjectWrapperChild.cpp b/js/ipc/ObjectWrapperChild.cpp
index 7eb823a5440f..145d44d96f66 100644
--- a/js/ipc/ObjectWrapperChild.cpp
+++ b/js/ipc/ObjectWrapperChild.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ObjectWrapperChild.h b/js/ipc/ObjectWrapperChild.h
index dff0afd2f9a9..f9a270cacce5 100644
--- a/js/ipc/ObjectWrapperChild.h
+++ b/js/ipc/ObjectWrapperChild.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ObjectWrapperParent.cpp b/js/ipc/ObjectWrapperParent.cpp
index 61a607107328..f22d9eb0bdc4 100644
--- a/js/ipc/ObjectWrapperParent.cpp
+++ b/js/ipc/ObjectWrapperParent.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ObjectWrapperParent.h b/js/ipc/ObjectWrapperParent.h
index 89b2e5139a70..785fc134250c 100644
--- a/js/ipc/ObjectWrapperParent.h
+++ b/js/ipc/ObjectWrapperParent.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/jsd.h b/js/jsd/jsd.h
index c0043b986a74..a5dab01407a8 100644
--- a/js/jsd/jsd.h
+++ b/js/jsd/jsd.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_atom.cpp b/js/jsd/jsd_atom.cpp
index 5517b997d644..dec6b391457a 100644
--- a/js/jsd/jsd_atom.cpp
+++ b/js/jsd/jsd_atom.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_high.cpp b/js/jsd/jsd_high.cpp
index 9ba321cd5e1f..9c0a3ec87497 100644
--- a/js/jsd/jsd_high.cpp
+++ b/js/jsd/jsd_high.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_hook.cpp b/js/jsd/jsd_hook.cpp
index 9f8fa947f082..95e631804472 100644
--- a/js/jsd/jsd_hook.cpp
+++ b/js/jsd/jsd_hook.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_java.cpp b/js/jsd/jsd_java.cpp
index 4bfcccde93ba..c5c0aec2aaf9 100644
--- a/js/jsd/jsd_java.cpp
+++ b/js/jsd/jsd_java.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_lock.cpp b/js/jsd/jsd_lock.cpp
index c8a827b8f941..628d2fd621e7 100644
--- a/js/jsd/jsd_lock.cpp
+++ b/js/jsd/jsd_lock.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_lock.h b/js/jsd/jsd_lock.h
index a3eb821be953..b1e8c31053bd 100644
--- a/js/jsd/jsd_lock.h
+++ b/js/jsd/jsd_lock.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_obj.cpp b/js/jsd/jsd_obj.cpp
index dc7c927cab99..cc0e8bb754bf 100644
--- a/js/jsd/jsd_obj.cpp
+++ b/js/jsd/jsd_obj.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_scpt.cpp b/js/jsd/jsd_scpt.cpp
index f4ef023d45ea..67c53f92791d 100644
--- a/js/jsd/jsd_scpt.cpp
+++ b/js/jsd/jsd_scpt.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_stak.cpp b/js/jsd/jsd_stak.cpp
index 8e5fbb384aa5..7dac8eb3befd 100644
--- a/js/jsd/jsd_stak.cpp
+++ b/js/jsd/jsd_stak.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_step.cpp b/js/jsd/jsd_step.cpp
index 0396a5cb7318..da1886a2b03f 100644
--- a/js/jsd/jsd_step.cpp
+++ b/js/jsd/jsd_step.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_text.cpp b/js/jsd/jsd_text.cpp
index bc851a3def41..ab11e82eac8b 100644
--- a/js/jsd/jsd_text.cpp
+++ b/js/jsd/jsd_text.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_val.cpp b/js/jsd/jsd_val.cpp
index a8cad6d005a9..97385a98af32 100644
--- a/js/jsd/jsd_val.cpp
+++ b/js/jsd/jsd_val.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_xpc.cpp b/js/jsd/jsd_xpc.cpp
index 8ce10b932552..ea1ef4b837dd 100644
--- a/js/jsd/jsd_xpc.cpp
+++ b/js/jsd/jsd_xpc.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/jsd_xpc.h b/js/jsd/jsd_xpc.h
index da383e30f9d9..4dbfe7cab405 100644
--- a/js/jsd/jsd_xpc.h
+++ b/js/jsd/jsd_xpc.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/jsdebug.cpp b/js/jsd/jsdebug.cpp
index 06954cead55f..7e893c69d149 100644
--- a/js/jsd/jsdebug.cpp
+++ b/js/jsd/jsdebug.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsdebug.h b/js/jsd/jsdebug.h
index 0971ba121f17..a3a05eeb1f15 100644
--- a/js/jsd/jsdebug.h
+++ b/js/jsd/jsdebug.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsdstubs.cpp b/js/jsd/jsdstubs.cpp
index 68cf75b79889..22420410251c 100644
--- a/js/jsd/jsdstubs.cpp
+++ b/js/jsd/jsdstubs.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jshash.cpp b/js/jsd/jshash.cpp
index 6ae4e549ea34..d4caf2ce833f 100644
--- a/js/jsd/jshash.cpp
+++ b/js/jsd/jshash.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/jshash.h b/js/jsd/jshash.h
index 5c44b7ba964a..e21c7b786a04 100644
--- a/js/jsd/jshash.h
+++ b/js/jsd/jshash.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/resource.h b/js/jsd/resource.h
index d40e61ae13d1..69874fe0ff30 100644
--- a/js/jsd/resource.h
+++ b/js/jsd/resource.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/public/Anchor.h b/js/public/Anchor.h
index 166ada5cd28e..d0c2476cf726 100644
--- a/js/public/Anchor.h
+++ b/js/public/Anchor.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/CallArgs.h b/js/public/CallArgs.h
index 6ecc4273de8d..5b474f0ac3b3 100644
--- a/js/public/CallArgs.h
+++ b/js/public/CallArgs.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/CharacterEncoding.h b/js/public/CharacterEncoding.h
index 36d8670a0821..63e5cc6650ca 100644
--- a/js/public/CharacterEncoding.h
+++ b/js/public/CharacterEncoding.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/GCAPI.h b/js/public/GCAPI.h
index 1231ca97b9f9..80d8f8a426fb 100644
--- a/js/public/GCAPI.h
+++ b/js/public/GCAPI.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef js_gc_api_h___
 #define js_gc_api_h___
diff --git a/js/public/HashTable.h b/js/public/HashTable.h
index 5cc7ea4e8b9e..acd4e310ac79 100644
--- a/js/public/HashTable.h
+++ b/js/public/HashTable.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/HeapAPI.h b/js/public/HeapAPI.h
index 47cb5602123d..cd50b7e1bbcb 100644
--- a/js/public/HeapAPI.h
+++ b/js/public/HeapAPI.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef js_heap_api_h___
 #define js_heap_api_h___
diff --git a/js/public/LegacyIntTypes.h b/js/public/LegacyIntTypes.h
index 30944efda61e..387a68b9e9d1 100644
--- a/js/public/LegacyIntTypes.h
+++ b/js/public/LegacyIntTypes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/public/MemoryMetrics.h b/js/public/MemoryMetrics.h
index f14dc73912cf..31262e8d4504 100644
--- a/js/public/MemoryMetrics.h
+++ b/js/public/MemoryMetrics.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/PropertyKey.h b/js/public/PropertyKey.h
index 5d048195f51e..53158c26f30f 100644
--- a/js/public/PropertyKey.h
+++ b/js/public/PropertyKey.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/RequiredDefines.h b/js/public/RequiredDefines.h
index 8dc47e251c95..2be2efbf9a3b 100644
--- a/js/public/RequiredDefines.h
+++ b/js/public/RequiredDefines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
index 9f9fa9df53f0..5d139292fe38 100644
--- a/js/public/RootingAPI.h
+++ b/js/public/RootingAPI.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/TemplateLib.h b/js/public/TemplateLib.h
index 58966b166f9f..a4ff6829125f 100644
--- a/js/public/TemplateLib.h
+++ b/js/public/TemplateLib.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/Utility.h b/js/public/Utility.h
index 70f09d6b22a9..2a883323ff63 100644
--- a/js/public/Utility.h
+++ b/js/public/Utility.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/Value.h b/js/public/Value.h
index a9a7bfd40005..57e951a1defd 100644
--- a/js/public/Value.h
+++ b/js/public/Value.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/Vector.h b/js/public/Vector.h
index b8e2ea698504..5f40dd634b8c 100644
--- a/js/public/Vector.h
+++ b/js/public/Vector.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/TraceLogging.cpp b/js/src/TraceLogging.cpp
index 49fe2d3e8ace..1c64a67fd68d 100644
--- a/js/src/TraceLogging.cpp
+++ b/js/src/TraceLogging.cpp
@@ -1,8 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=4 sw=4 et tw=79: */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "TraceLogging.h"
 #include <cstdarg>
diff --git a/js/src/TraceLogging.h b/js/src/TraceLogging.h
index eebadfc1e14d..2e6d5ba9ac38 100644
--- a/js/src/TraceLogging.h
+++ b/js/src/TraceLogging.h
@@ -1,8 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=4 sw=4 et tw=79: */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #if !defined(TraceLogging_h__)
 #define TraceLogging_h__
diff --git a/js/src/assembler/assembler/ARMAssembler.cpp b/js/src/assembler/assembler/ARMAssembler.cpp
index a9ada8e9a2c5..18f742b80b6a 100644
--- a/js/src/assembler/assembler/ARMAssembler.cpp
+++ b/js/src/assembler/assembler/ARMAssembler.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/ARMAssembler.h b/js/src/assembler/assembler/ARMAssembler.h
index e04b251b7439..2c1d712158d8 100644
--- a/js/src/assembler/assembler/ARMAssembler.h
+++ b/js/src/assembler/assembler/ARMAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009, 2010 University of Szeged
diff --git a/js/src/assembler/assembler/ARMv7Assembler.h b/js/src/assembler/assembler/ARMv7Assembler.h
index 1f96585ee16c..1a83139887fd 100644
--- a/js/src/assembler/assembler/ARMv7Assembler.h
+++ b/js/src/assembler/assembler/ARMv7Assembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AbstractMacroAssembler.h b/js/src/assembler/assembler/AbstractMacroAssembler.h
index 286fad954742..2bfb275b6884 100644
--- a/js/src/assembler/assembler/AbstractMacroAssembler.h
+++ b/js/src/assembler/assembler/AbstractMacroAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AssemblerBuffer.h b/js/src/assembler/assembler/AssemblerBuffer.h
index d21182527b52..a2e7c3840331 100644
--- a/js/src/assembler/assembler/AssemblerBuffer.h
+++ b/js/src/assembler/assembler/AssemblerBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
index 467f9c9e8cbe..2578692dc47a 100644
--- a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
+++ b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/CodeLocation.h b/js/src/assembler/assembler/CodeLocation.h
index 490157688614..d9bc6d4175fb 100644
--- a/js/src/assembler/assembler/CodeLocation.h
+++ b/js/src/assembler/assembler/CodeLocation.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/LinkBuffer.h b/js/src/assembler/assembler/LinkBuffer.h
index 35913c87aaf7..1e6fb4b35249 100644
--- a/js/src/assembler/assembler/LinkBuffer.h
+++ b/js/src/assembler/assembler/LinkBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssembler.h b/js/src/assembler/assembler/MacroAssembler.h
index 8bf9c0b0a80e..2b77445e14cf 100644
--- a/js/src/assembler/assembler/MacroAssembler.h
+++ b/js/src/assembler/assembler/MacroAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerARM.cpp b/js/src/assembler/assembler/MacroAssemblerARM.cpp
index 89db1e2d859e..9c76e8fd43e7 100644
--- a/js/src/assembler/assembler/MacroAssemblerARM.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerARM.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/MacroAssemblerARM.h b/js/src/assembler/assembler/MacroAssemblerARM.h
index 831ccbb8a183..6e18c54b84dc 100644
--- a/js/src/assembler/assembler/MacroAssemblerARM.h
+++ b/js/src/assembler/assembler/MacroAssemblerARM.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc.
diff --git a/js/src/assembler/assembler/MacroAssemblerARMv7.h b/js/src/assembler/assembler/MacroAssemblerARMv7.h
index 2bdb6e8fdb5e..0abeb2b31de0 100644
--- a/js/src/assembler/assembler/MacroAssemblerARMv7.h
+++ b/js/src/assembler/assembler/MacroAssemblerARMv7.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerCodeRef.h b/js/src/assembler/assembler/MacroAssemblerCodeRef.h
index 101ffcb098d5..bcf3903f9b13 100644
--- a/js/src/assembler/assembler/MacroAssemblerCodeRef.h
+++ b/js/src/assembler/assembler/MacroAssemblerCodeRef.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerSparc.h b/js/src/assembler/assembler/MacroAssemblerSparc.h
index 1d89f17790e7..3692b3e0b272 100644
--- a/js/src/assembler/assembler/MacroAssemblerSparc.h
+++ b/js/src/assembler/assembler/MacroAssemblerSparc.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99: */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/MacroAssemblerX86.h b/js/src/assembler/assembler/MacroAssemblerX86.h
index c6ab40f587fa..c782ad60d006 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerX86Common.cpp b/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
index b94a345ff649..e65b2a3d7c62 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99: */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/MacroAssemblerX86Common.h b/js/src/assembler/assembler/MacroAssemblerX86Common.h
index 30bb1ed26afc..b0bef29120c2 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerX86_64.h b/js/src/assembler/assembler/MacroAssemblerX86_64.h
index c4b67dcaeb03..c3be4145695a 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86_64.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86_64.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/RepatchBuffer.h b/js/src/assembler/assembler/RepatchBuffer.h
index 003479211b43..0a3deb3c27d2 100644
--- a/js/src/assembler/assembler/RepatchBuffer.h
+++ b/js/src/assembler/assembler/RepatchBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/SparcAssembler.h b/js/src/assembler/assembler/SparcAssembler.h
index 4e3d5b14559a..19217a7cafd0 100644
--- a/js/src/assembler/assembler/SparcAssembler.h
+++ b/js/src/assembler/assembler/SparcAssembler.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99: */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/X86Assembler.h b/js/src/assembler/assembler/X86Assembler.h
index 2293098864f3..1533bdfa95e9 100644
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/jit/ExecutableAllocator.cpp b/js/src/assembler/jit/ExecutableAllocator.cpp
index 59e1c259b673..bd8b1d3ba24d 100644
--- a/js/src/assembler/jit/ExecutableAllocator.cpp
+++ b/js/src/assembler/jit/ExecutableAllocator.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
diff --git a/js/src/assembler/moco/MocoStubs.h b/js/src/assembler/moco/MocoStubs.h
index 7ce6da5e329b..df3d1f979745 100644
--- a/js/src/assembler/moco/MocoStubs.h
+++ b/js/src/assembler/moco/MocoStubs.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Eval.cpp b/js/src/builtin/Eval.cpp
index a29c89517709..a5c203d5b342 100644
--- a/js/src/builtin/Eval.cpp
+++ b/js/src/builtin/Eval.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Eval.h b/js/src/builtin/Eval.h
index e6eaeefa5b04..133c4b28ebcb 100644
--- a/js/src/builtin/Eval.h
+++ b/js/src/builtin/Eval.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Intl.cpp b/js/src/builtin/Intl.cpp
index 6e22cc76f358..8c6b0136af52 100644
--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/Intl.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Intl.h b/js/src/builtin/Intl.h
index 3db27dc63767..eefec5dbcaaa 100644
--- a/js/src/builtin/Intl.h
+++ b/js/src/builtin/Intl.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Iterator-inl.h b/js/src/builtin/Iterator-inl.h
index 7f93219af814..e6c838cdeb98 100644
--- a/js/src/builtin/Iterator-inl.h
+++ b/js/src/builtin/Iterator-inl.h
@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef Iterator_inl_h_
 #define Iterator_inl_h_
diff --git a/js/src/builtin/MapObject.cpp b/js/src/builtin/MapObject.cpp
index 08100842e2a9..fc3e21808d68 100644
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/MapObject.h b/js/src/builtin/MapObject.h
index 3661c4cc498b..f8f006472dab 100644
--- a/js/src/builtin/MapObject.h
+++ b/js/src/builtin/MapObject.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Module.cpp b/js/src/builtin/Module.cpp
index 2aaf96508585..1f33cd7470bf 100644
--- a/js/src/builtin/Module.cpp
+++ b/js/src/builtin/Module.cpp
@@ -1,3 +1,9 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "jsobjinlines.h"
 #include "builtin/Module.h"
 
diff --git a/js/src/builtin/Module.h b/js/src/builtin/Module.h
index 7a6386ebc434..f1bdef1ef1ba 100644
--- a/js/src/builtin/Module.h
+++ b/js/src/builtin/Module.h
@@ -1,3 +1,9 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
+
 #ifndef Module_h___
 #define Module_h___
 
diff --git a/js/src/builtin/Object.cpp b/js/src/builtin/Object.cpp
index 188911c74896..8171d873284b 100644
--- a/js/src/builtin/Object.cpp
+++ b/js/src/builtin/Object.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Object.h b/js/src/builtin/Object.h
index a08fcdfb818e..c6a29225e957 100644
--- a/js/src/builtin/Object.h
+++ b/js/src/builtin/Object.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/ParallelArray.cpp b/js/src/builtin/ParallelArray.cpp
index 04bcae9f3af5..b136e0ac22c4 100644
--- a/js/src/builtin/ParallelArray.cpp
+++ b/js/src/builtin/ParallelArray.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/ParallelArray.h b/js/src/builtin/ParallelArray.h
index d63b87872fb2..443ebad5952a 100644
--- a/js/src/builtin/ParallelArray.h
+++ b/js/src/builtin/ParallelArray.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Profilers.cpp b/js/src/builtin/Profilers.cpp
index 43b9bea178e5..853d61d89111 100644
--- a/js/src/builtin/Profilers.cpp
+++ b/js/src/builtin/Profilers.cpp
@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 /* Profiling-related API */
 
diff --git a/js/src/builtin/Profilers.h b/js/src/builtin/Profilers.h
index 872830de12d3..59c4e992024d 100644
--- a/js/src/builtin/Profilers.h
+++ b/js/src/builtin/Profilers.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index eeccfcb1129c..502ca8fc6784 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/RegExp.h b/js/src/builtin/RegExp.h
index 90662e9ed8bf..60fb782be9f9 100644
--- a/js/src/builtin/RegExp.h
+++ b/js/src/builtin/RegExp.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index 9f9a57adf906..f7f28d1aaf37 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "jsapi.h"
 #include "jsbool.h"
diff --git a/js/src/builtin/TestingFunctions.h b/js/src/builtin/TestingFunctions.h
index 9bcb1e31d2e6..52b9bef76ce3 100644
--- a/js/src/builtin/TestingFunctions.h
+++ b/js/src/builtin/TestingFunctions.h
@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef TestingFunctions_h__
 #define TestingFunctions_h__
diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
index e7213fc80c9f..f3444f654644 100644
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@@ -1,5 +1,6 @@
-/* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp
index 1c2f8ea7c5ff..47c38853b4eb 100644
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -1,5 +1,6 @@
-/* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=2 sw=2 et tw=99:
+ * 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/. */
 
diff --git a/js/src/devtools/jint/treesearch.py b/js/src/devtools/jint/treesearch.py
index c06a62b88011..2cbc45335814 100644
--- a/js/src/devtools/jint/treesearch.py
+++ b/js/src/devtools/jint/treesearch.py
@@ -1,9 +1,8 @@
+# vim: set ts=8 sts=4 et sw=4 tw=99:
 # 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/.
 
-# vim: set ts=4 sw=4 tw=99 et: 
-
 import os, re
 import tempfile
 import subprocess
diff --git a/js/src/devtools/sharkctl.cpp b/js/src/devtools/sharkctl.cpp
index 14a550247af2..86fdfc936d22 100644
--- a/js/src/devtools/sharkctl.cpp
+++ b/js/src/devtools/sharkctl.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/devtools/sharkctl.h b/js/src/devtools/sharkctl.h
index e381cfd32ba3..bb3038d3ae6a 100644
--- a/js/src/devtools/sharkctl.h
+++ b/js/src/devtools/sharkctl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/BitArray.h b/js/src/ds/BitArray.h
index 4d0d0e64bb63..a20796d4dbe4 100644
--- a/js/src/ds/BitArray.h
+++ b/js/src/ds/BitArray.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/InlineMap.h b/js/src/ds/InlineMap.h
index 68ca36fb3973..d11172463de8 100644
--- a/js/src/ds/InlineMap.h
+++ b/js/src/ds/InlineMap.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/LifoAlloc.cpp b/js/src/ds/LifoAlloc.cpp
index c019a7ca12d5..b9621600f512 100644
--- a/js/src/ds/LifoAlloc.cpp
+++ b/js/src/ds/LifoAlloc.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/LifoAlloc.h b/js/src/ds/LifoAlloc.h
index d7233c932a87..167a61c52a90 100644
--- a/js/src/ds/LifoAlloc.h
+++ b/js/src/ds/LifoAlloc.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/PriorityQueue.h b/js/src/ds/PriorityQueue.h
index 1e9e26c918db..8ef6531bb12f 100644
--- a/js/src/ds/PriorityQueue.h
+++ b/js/src/ds/PriorityQueue.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/Sort.h b/js/src/ds/Sort.h
index 4061f75cb4fe..46542e5bf882 100644
--- a/js/src/ds/Sort.h
+++ b/js/src/ds/Sort.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/SplayTree.h b/js/src/ds/SplayTree.h
index 390282363f9f..8df268335fa6 100644
--- a/js/src/ds/SplayTree.h
+++ b/js/src/ds/SplayTree.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/editline/editline.c b/js/src/editline/editline.c
index f98d048a4112..21946a6250b8 100644
--- a/js/src/editline/editline.c
+++ b/js/src/editline/editline.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/editline/editline.h b/js/src/editline/editline.h
index 5895322f1be1..0616de03a221 100644
--- a/js/src/editline/editline.h
+++ b/js/src/editline/editline.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/editline/sysunix.c b/js/src/editline/sysunix.c
index 0035640a29f6..d45db6c79baa 100644
--- a/js/src/editline/sysunix.c
+++ b/js/src/editline/sysunix.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/editline/unix.h b/js/src/editline/unix.h
index 3d8687632232..ec4a762acb58 100644
--- a/js/src/editline/unix.h
+++ b/js/src/editline/unix.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index 24fe869ecd53..fc891b210dd1 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index 1b13ffe9ed13..9f1164e69400 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 336445f7ccec..8d90567bb301 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index 3b0bc3b4a31b..e84c80e29f24 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/FoldConstants.cpp b/js/src/frontend/FoldConstants.cpp
index b78d821f897b..cbad2eb6675a 100644
--- a/js/src/frontend/FoldConstants.cpp
+++ b/js/src/frontend/FoldConstants.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/FoldConstants.h b/js/src/frontend/FoldConstants.h
index a1bf9d14e9ad..86da781e8d80 100644
--- a/js/src/frontend/FoldConstants.h
+++ b/js/src/frontend/FoldConstants.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index 4152bc957c9c..57b338de55d6 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/NameFunctions.cpp b/js/src/frontend/NameFunctions.cpp
index 22b9e961d2c1..01d2585d4e88 100644
--- a/js/src/frontend/NameFunctions.cpp
+++ b/js/src/frontend/NameFunctions.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/NameFunctions.h b/js/src/frontend/NameFunctions.h
index d2f9437cd191..adfb3920ad4d 100644
--- a/js/src/frontend/NameFunctions.h
+++ b/js/src/frontend/NameFunctions.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseMaps-inl.h b/js/src/frontend/ParseMaps-inl.h
index 55fca1a6eb66..ceefb4c8af89 100644
--- a/js/src/frontend/ParseMaps-inl.h
+++ b/js/src/frontend/ParseMaps-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseMaps.cpp b/js/src/frontend/ParseMaps.cpp
index 3426d861d903..34b1c8ede742 100644
--- a/js/src/frontend/ParseMaps.cpp
+++ b/js/src/frontend/ParseMaps.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseMaps.h b/js/src/frontend/ParseMaps.h
index a8026167be12..b986bb10d0b4 100644
--- a/js/src/frontend/ParseMaps.h
+++ b/js/src/frontend/ParseMaps.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseNode-inl.h b/js/src/frontend/ParseNode-inl.h
index d35c61409ec2..15da9b41d96e 100644
--- a/js/src/frontend/ParseNode-inl.h
+++ b/js/src/frontend/ParseNode-inl.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index f705e604db70..26b22639f07e 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index f280390e2609..7b2acefd33a6 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/Parser-inl.h b/js/src/frontend/Parser-inl.h
index 1fe084ce700f..b689f3bddd73 100644
--- a/js/src/frontend/Parser-inl.h
+++ b/js/src/frontend/Parser-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index ecbe09be592e..b6a9bb676269 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 2dcab9c3242a..22b006981d50 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/SharedContext-inl.h b/js/src/frontend/SharedContext-inl.h
index 74cac685efc8..247501f07d01 100644
--- a/js/src/frontend/SharedContext-inl.h
+++ b/js/src/frontend/SharedContext-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 4b5bfff63a06..7212e66d3080 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index dd0ba4faedf1..2d32ae516bee 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
index 69b9477666ab..5435b683f0c7 100644
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/TokenStream.h b/js/src/frontend/TokenStream.h
index 0997a8049aa4..dad7e88ae2c1 100644
--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Barrier-inl.h b/js/src/gc/Barrier-inl.h
index acab9ef1610d..0329d1e740e6 100644
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
index 0a1009721abb..13f2a509a2e1 100644
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/FindSCCs-inl.h b/js/src/gc/FindSCCs-inl.h
index 552ce53be271..24ae0b1de3eb 100644
--- a/js/src/gc/FindSCCs-inl.h
+++ b/js/src/gc/FindSCCs-inl.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "jsfriendapi.h"
 
diff --git a/js/src/gc/FindSCCs.h b/js/src/gc/FindSCCs.h
index ccd5f5991fbf..c8ed79d70a9c 100644
--- a/js/src/gc/FindSCCs.h
+++ b/js/src/gc/FindSCCs.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef gc_findsccs_h___
 #define gc_findsccs_h___
diff --git a/js/src/gc/GCInternals.h b/js/src/gc/GCInternals.h
index e661aac9e88e..f900778b106e 100644
--- a/js/src/gc/GCInternals.h
+++ b/js/src/gc/GCInternals.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h
index bf73c24f80d5..e5e7f7b67bc9 100644
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef gc_heap_h___
 #define gc_heap_h___
diff --git a/js/src/gc/Iteration.cpp b/js/src/gc/Iteration.cpp
index 607fd215aef5..76693e5fecff 100644
--- a/js/src/gc/Iteration.cpp
+++ b/js/src/gc/Iteration.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index f527fb650715..f6b18144a985 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 tw=79 et:
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "mozilla/DebugOnly.h"
 
diff --git a/js/src/gc/Marking.h b/js/src/gc/Marking.h
index 499becc6aad8..3d89bd3e607b 100644
--- a/js/src/gc/Marking.h
+++ b/js/src/gc/Marking.h
@@ -1,9 +1,8 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef gc_marking_h___
 #define gc_marking_h___
diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
index e2bec9717391..399177771718 100644
--- a/js/src/gc/Memory.cpp
+++ b/js/src/gc/Memory.cpp
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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 "mozilla/Assertions.h"
 
diff --git a/js/src/gc/Memory.h b/js/src/gc/Memory.h
index bf78cd0594bc..b73c266bf2cb 100644
--- a/js/src/gc/Memory.h
+++ b/js/src/gc/Memory.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef jsgc_memory_h___
 #define jsgc_memory_h___
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index 2f6e71da4ce6..f97bb1503c81 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp
index dcbd00f563c9..377c3b21b796 100644
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Statistics.h b/js/src/gc/Statistics.h
index 934df0668de8..027600bc0c64 100644
--- a/js/src/gc/Statistics.h
+++ b/js/src/gc/Statistics.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/StoreBuffer.cpp b/js/src/gc/StoreBuffer.cpp
index 0a1523096e28..236fcbd1cf6e 100644
--- a/js/src/gc/StoreBuffer.cpp
+++ b/js/src/gc/StoreBuffer.cpp
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifdef JSGC_GENERATIONAL
 
diff --git a/js/src/gc/StoreBuffer.h b/js/src/gc/StoreBuffer.h
index 5409eb02a2b5..d927d098f695 100644
--- a/js/src/gc/StoreBuffer.h
+++ b/js/src/gc/StoreBuffer.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifdef JSGC_GENERATIONAL
 #ifndef jsgc_storebuffer_h___
diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp
index 2a45d31f7b6e..d7f714e9679d 100644
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Zone.cpp b/js/src/gc/Zone.cpp
index 49976dd6c65c..8d4be70cdbdf 100644
--- a/js/src/gc/Zone.cpp
+++ b/js/src/gc/Zone.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index b9c42184afb3..4fb93bf50250 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gdb/gdb-tests.h b/js/src/gdb/gdb-tests.h
index 70fdd8e94fc5..e9141d51528e 100644
--- a/js/src/gdb/gdb-tests.h
+++ b/js/src/gdb/gdb-tests.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * 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
diff --git a/js/src/ion/AliasAnalysis.cpp b/js/src/ion/AliasAnalysis.cpp
index f37c055a2a0d..5fc176480eef 100644
--- a/js/src/ion/AliasAnalysis.cpp
+++ b/js/src/ion/AliasAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AliasAnalysis.h b/js/src/ion/AliasAnalysis.h
index 36fd648e5467..64de011e513d 100644
--- a/js/src/ion/AliasAnalysis.h
+++ b/js/src/ion/AliasAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJS.cpp b/js/src/ion/AsmJS.cpp
index b955bc5fd570..7aa7e2561c63 100644
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJS.h b/js/src/ion/AsmJS.h
index b27e152e2593..98b297edcbcd 100644
--- a/js/src/ion/AsmJS.h
+++ b/js/src/ion/AsmJS.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJSLink.cpp b/js/src/ion/AsmJSLink.cpp
index 46e87e0841b1..977ab27b46d2 100644
--- a/js/src/ion/AsmJSLink.cpp
+++ b/js/src/ion/AsmJSLink.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJSModule.h b/js/src/ion/AsmJSModule.h
index ae5d1e89a5de..72bf651c5c6a 100644
--- a/js/src/ion/AsmJSModule.h
+++ b/js/src/ion/AsmJSModule.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJSSignalHandlers.cpp b/js/src/ion/AsmJSSignalHandlers.cpp
index 0fa3af4adbc2..4e477392ea1d 100644
--- a/js/src/ion/AsmJSSignalHandlers.cpp
+++ b/js/src/ion/AsmJSSignalHandlers.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BacktrackingAllocator.cpp b/js/src/ion/BacktrackingAllocator.cpp
index 491b49a3bd2f..e42befd3ade5 100644
--- a/js/src/ion/BacktrackingAllocator.cpp
+++ b/js/src/ion/BacktrackingAllocator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BacktrackingAllocator.h b/js/src/ion/BacktrackingAllocator.h
index ccf0a2e611fb..51b8ff62ce4e 100644
--- a/js/src/ion/BacktrackingAllocator.h
+++ b/js/src/ion/BacktrackingAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Bailouts.cpp b/js/src/ion/Bailouts.cpp
index 2cffb267d201..aa4f2d14a458 100644
--- a/js/src/ion/Bailouts.cpp
+++ b/js/src/ion/Bailouts.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Bailouts.h b/js/src/ion/Bailouts.h
index 8694db28b92f..d9d514d9e102 100644
--- a/js/src/ion/Bailouts.h
+++ b/js/src/ion/Bailouts.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineBailouts.cpp b/js/src/ion/BaselineBailouts.cpp
index 75e2573e594f..53b7628f2f15 100644
--- a/js/src/ion/BaselineBailouts.cpp
+++ b/js/src/ion/BaselineBailouts.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineCompiler.cpp b/js/src/ion/BaselineCompiler.cpp
index c50b0d0b11b7..15f392397a97 100644
--- a/js/src/ion/BaselineCompiler.cpp
+++ b/js/src/ion/BaselineCompiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineCompiler.h b/js/src/ion/BaselineCompiler.h
index 7e7fe1d4b6da..3c72e32a66c5 100644
--- a/js/src/ion/BaselineCompiler.h
+++ b/js/src/ion/BaselineCompiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrame-inl.h b/js/src/ion/BaselineFrame-inl.h
index 37f82ba5019e..cf3226aa5360 100644
--- a/js/src/ion/BaselineFrame-inl.h
+++ b/js/src/ion/BaselineFrame-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrame.cpp b/js/src/ion/BaselineFrame.cpp
index e9d317ea54f4..299ef4af564c 100644
--- a/js/src/ion/BaselineFrame.cpp
+++ b/js/src/ion/BaselineFrame.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrame.h b/js/src/ion/BaselineFrame.h
index 476c66978fae..7d9642b0d12a 100644
--- a/js/src/ion/BaselineFrame.h
+++ b/js/src/ion/BaselineFrame.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrameInfo.cpp b/js/src/ion/BaselineFrameInfo.cpp
index 39e1c4556286..17dcd2765c9b 100644
--- a/js/src/ion/BaselineFrameInfo.cpp
+++ b/js/src/ion/BaselineFrameInfo.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrameInfo.h b/js/src/ion/BaselineFrameInfo.h
index d02ecbc6af0b..eae34e232184 100644
--- a/js/src/ion/BaselineFrameInfo.h
+++ b/js/src/ion/BaselineFrameInfo.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineHelpers.h b/js/src/ion/BaselineHelpers.h
index 1502dba2a617..1c2bd3dc0061 100644
--- a/js/src/ion/BaselineHelpers.h
+++ b/js/src/ion/BaselineHelpers.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineIC.cpp b/js/src/ion/BaselineIC.cpp
index 6c3494bbb287..4403911b76a8 100644
--- a/js/src/ion/BaselineIC.cpp
+++ b/js/src/ion/BaselineIC.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineIC.h b/js/src/ion/BaselineIC.h
index f9c08e770f11..461628faf47e 100644
--- a/js/src/ion/BaselineIC.h
+++ b/js/src/ion/BaselineIC.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineInspector.cpp b/js/src/ion/BaselineInspector.cpp
index 26a6273f3dd5..b8490f92d4f1 100644
--- a/js/src/ion/BaselineInspector.cpp
+++ b/js/src/ion/BaselineInspector.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineInspector.h b/js/src/ion/BaselineInspector.h
index 5fb59f6ed015..cef840718a53 100644
--- a/js/src/ion/BaselineInspector.h
+++ b/js/src/ion/BaselineInspector.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineJIT.cpp b/js/src/ion/BaselineJIT.cpp
index 3dfce7916f15..8061224465aa 100644
--- a/js/src/ion/BaselineJIT.cpp
+++ b/js/src/ion/BaselineJIT.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineJIT.h b/js/src/ion/BaselineJIT.h
index 2c9e914c5042..33244f8ca2ed 100644
--- a/js/src/ion/BaselineJIT.h
+++ b/js/src/ion/BaselineJIT.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineRegisters.h b/js/src/ion/BaselineRegisters.h
index c9d0d4136a8e..26365375481d 100644
--- a/js/src/ion/BaselineRegisters.h
+++ b/js/src/ion/BaselineRegisters.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BitSet.cpp b/js/src/ion/BitSet.cpp
index 1b3ec5863dc2..bbe12ce97f6c 100644
--- a/js/src/ion/BitSet.cpp
+++ b/js/src/ion/BitSet.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BitSet.h b/js/src/ion/BitSet.h
index 03903c74a3ac..f9b9dc38dd3b 100644
--- a/js/src/ion/BitSet.h
+++ b/js/src/ion/BitSet.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/C1Spewer.cpp b/js/src/ion/C1Spewer.cpp
index 7f17319efa40..8934dc09d28e 100644
--- a/js/src/ion/C1Spewer.cpp
+++ b/js/src/ion/C1Spewer.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/C1Spewer.h b/js/src/ion/C1Spewer.h
index fe05132a9407..66248f3528ba 100644
--- a/js/src/ion/C1Spewer.h
+++ b/js/src/ion/C1Spewer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 3b827b76d31a..5106493af101 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CodeGenerator.h b/js/src/ion/CodeGenerator.h
index 348fb3ce14f5..4130a3611ebc 100644
--- a/js/src/ion/CodeGenerator.h
+++ b/js/src/ion/CodeGenerator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CompactBuffer.h b/js/src/ion/CompactBuffer.h
index c3ca501190d5..fb29b780e3d8 100644
--- a/js/src/ion/CompactBuffer.h
+++ b/js/src/ion/CompactBuffer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CompileInfo-inl.h b/js/src/ion/CompileInfo-inl.h
index 666da9777c4d..85971562381a 100644
--- a/js/src/ion/CompileInfo-inl.h
+++ b/js/src/ion/CompileInfo-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CompileInfo.h b/js/src/ion/CompileInfo.h
index 237e9e4e1a4b..2288b20460f6 100644
--- a/js/src/ion/CompileInfo.h
+++ b/js/src/ion/CompileInfo.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CompilerRoot.h b/js/src/ion/CompilerRoot.h
index 81e9386ac417..141924b7094a 100644
--- a/js/src/ion/CompilerRoot.h
+++ b/js/src/ion/CompilerRoot.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/EdgeCaseAnalysis.cpp b/js/src/ion/EdgeCaseAnalysis.cpp
index 18a7547581e9..38cb200838b4 100644
--- a/js/src/ion/EdgeCaseAnalysis.cpp
+++ b/js/src/ion/EdgeCaseAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/EdgeCaseAnalysis.h b/js/src/ion/EdgeCaseAnalysis.h
index bb744dd40eab..a322257996bf 100644
--- a/js/src/ion/EdgeCaseAnalysis.h
+++ b/js/src/ion/EdgeCaseAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/EffectiveAddressAnalysis.cpp b/js/src/ion/EffectiveAddressAnalysis.cpp
index 76fa88a36e06..e936a6ebfe8d 100644
--- a/js/src/ion/EffectiveAddressAnalysis.cpp
+++ b/js/src/ion/EffectiveAddressAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/EffectiveAddressAnalysis.h b/js/src/ion/EffectiveAddressAnalysis.h
index e7f3dc9f2e71..a86e871290b1 100644
--- a/js/src/ion/EffectiveAddressAnalysis.h
+++ b/js/src/ion/EffectiveAddressAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ExecutionModeInlines.h b/js/src/ion/ExecutionModeInlines.h
index 1f86e4a8d294..8a4c2d758ebd 100644
--- a/js/src/ion/ExecutionModeInlines.h
+++ b/js/src/ion/ExecutionModeInlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/FixedArityList.h b/js/src/ion/FixedArityList.h
index d737ad4e1d02..4cf6ccf51827 100644
--- a/js/src/ion/FixedArityList.h
+++ b/js/src/ion/FixedArityList.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/FixedList.h b/js/src/ion/FixedList.h
index 9213d0744955..2062ad8d64e3 100644
--- a/js/src/ion/FixedList.h
+++ b/js/src/ion/FixedList.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/InlineList.h b/js/src/ion/InlineList.h
index 7bc21801de30..00897619b123 100644
--- a/js/src/ion/InlineList.h
+++ b/js/src/ion/InlineList.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index 3298897730b4..9a227fa73aeb 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Ion.h b/js/src/ion/Ion.h
index c9e4f0cd8fa2..d11485db6fe6 100644
--- a/js/src/ion/Ion.h
+++ b/js/src/ion/Ion.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonAllocPolicy.h b/js/src/ion/IonAllocPolicy.h
index 8c828f71528f..f604a5005b49 100644
--- a/js/src/ion/IonAllocPolicy.h
+++ b/js/src/ion/IonAllocPolicy.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonAnalysis.cpp b/js/src/ion/IonAnalysis.cpp
index fc13e62faec3..58a070c42954 100644
--- a/js/src/ion/IonAnalysis.cpp
+++ b/js/src/ion/IonAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonAnalysis.h b/js/src/ion/IonAnalysis.h
index 42b02bb3f961..0f311da802df 100644
--- a/js/src/ion/IonAnalysis.h
+++ b/js/src/ion/IonAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index e41193c06496..8a4b4f8f8974 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonBuilder.h b/js/src/ion/IonBuilder.h
index 4b1422e29608..8f8f2a486734 100644
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonCaches.cpp b/js/src/ion/IonCaches.cpp
index d5be53c9fa12..de522f126ded 100644
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonCaches.h b/js/src/ion/IonCaches.h
index 855b7535236c..19920883537b 100644
--- a/js/src/ion/IonCaches.h
+++ b/js/src/ion/IonCaches.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonCode.h b/js/src/ion/IonCode.h
index 0a4aeb1f34b9..ec4a86d60e9c 100644
--- a/js/src/ion/IonCode.h
+++ b/js/src/ion/IonCode.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonCompartment.h b/js/src/ion/IonCompartment.h
index 5a5681f110f6..472cf55fba5d 100644
--- a/js/src/ion/IonCompartment.h
+++ b/js/src/ion/IonCompartment.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrameIterator-inl.h b/js/src/ion/IonFrameIterator-inl.h
index 5b1094bda4d7..2740d9432b5b 100644
--- a/js/src/ion/IonFrameIterator-inl.h
+++ b/js/src/ion/IonFrameIterator-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrameIterator.h b/js/src/ion/IonFrameIterator.h
index e85656fb4265..fb0a339ae79d 100644
--- a/js/src/ion/IonFrameIterator.h
+++ b/js/src/ion/IonFrameIterator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrames-inl.h b/js/src/ion/IonFrames-inl.h
index 1267a565856f..a1fa889785c8 100644
--- a/js/src/ion/IonFrames-inl.h
+++ b/js/src/ion/IonFrames-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrames.cpp b/js/src/ion/IonFrames.cpp
index cb6138e0905d..b218d05d802c 100644
--- a/js/src/ion/IonFrames.cpp
+++ b/js/src/ion/IonFrames.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrames.h b/js/src/ion/IonFrames.h
index 6872c96a3422..5e598e244b27 100644
--- a/js/src/ion/IonFrames.h
+++ b/js/src/ion/IonFrames.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonInstrumentation.h b/js/src/ion/IonInstrumentation.h
index cb8ceae9119a..62d9ea1f6951 100644
--- a/js/src/ion/IonInstrumentation.h
+++ b/js/src/ion/IonInstrumentation.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonLinker.h b/js/src/ion/IonLinker.h
index 979385254362..b818368ccbaa 100644
--- a/js/src/ion/IonLinker.h
+++ b/js/src/ion/IonLinker.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonMacroAssembler.cpp b/js/src/ion/IonMacroAssembler.cpp
index 808218f3df8b..bcf85af67d84 100644
--- a/js/src/ion/IonMacroAssembler.cpp
+++ b/js/src/ion/IonMacroAssembler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index b08f08d277cc..9b4571354eb8 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonSpewer.cpp b/js/src/ion/IonSpewer.cpp
index 002a36193d12..c911955b57cf 100644
--- a/js/src/ion/IonSpewer.cpp
+++ b/js/src/ion/IonSpewer.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonSpewer.h b/js/src/ion/IonSpewer.h
index 19696dc286e6..4f6ad0eaa776 100644
--- a/js/src/ion/IonSpewer.h
+++ b/js/src/ion/IonSpewer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonTypes.h b/js/src/ion/IonTypes.h
index b033e28f18c3..6e60a39c6159 100644
--- a/js/src/ion/IonTypes.h
+++ b/js/src/ion/IonTypes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/JSONSpewer.cpp b/js/src/ion/JSONSpewer.cpp
index bc3a4c363984..466941ddd7a5 100644
--- a/js/src/ion/JSONSpewer.cpp
+++ b/js/src/ion/JSONSpewer.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/JSONSpewer.h b/js/src/ion/JSONSpewer.h
index 8726b48fcd26..556faa9081bb 100644
--- a/js/src/ion/JSONSpewer.h
+++ b/js/src/ion/JSONSpewer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LICM.cpp b/js/src/ion/LICM.cpp
index d40970a65994..d93f1c22f248 100644
--- a/js/src/ion/LICM.cpp
+++ b/js/src/ion/LICM.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LICM.h b/js/src/ion/LICM.h
index ab40b2b6df91..e2f53fafdc65 100644
--- a/js/src/ion/LICM.h
+++ b/js/src/ion/LICM.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index f2ddb2d08264..5d6ef835e6bf 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LIR-inl.h b/js/src/ion/LIR-inl.h
index af24d9769146..de4d08ede26c 100644
--- a/js/src/ion/LIR-inl.h
+++ b/js/src/ion/LIR-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LIR.cpp b/js/src/ion/LIR.cpp
index 7c70b2a51cda..d0f96070f6c0 100644
--- a/js/src/ion/LIR.cpp
+++ b/js/src/ion/LIR.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LIR.h b/js/src/ion/LIR.h
index 096cbd374ce0..dcbc44e47b4c 100644
--- a/js/src/ion/LIR.h
+++ b/js/src/ion/LIR.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LOpcodes.h b/js/src/ion/LOpcodes.h
index 227aeac052a4..b7bf009b266c 100644
--- a/js/src/ion/LOpcodes.h
+++ b/js/src/ion/LOpcodes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LinearScan.cpp b/js/src/ion/LinearScan.cpp
index b073db985a1e..8318716ca2d0 100644
--- a/js/src/ion/LinearScan.cpp
+++ b/js/src/ion/LinearScan.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LinearScan.h b/js/src/ion/LinearScan.h
index 3cf8d80740e3..4dcd24a207ca 100644
--- a/js/src/ion/LinearScan.h
+++ b/js/src/ion/LinearScan.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LiveRangeAllocator.cpp b/js/src/ion/LiveRangeAllocator.cpp
index b35e731eb3ab..154c2767204b 100644
--- a/js/src/ion/LiveRangeAllocator.cpp
+++ b/js/src/ion/LiveRangeAllocator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LiveRangeAllocator.h b/js/src/ion/LiveRangeAllocator.h
index d48aece848d9..3c81bc90903a 100644
--- a/js/src/ion/LiveRangeAllocator.h
+++ b/js/src/ion/LiveRangeAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 5a3bbd5c0823..75de254f6577 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Lowering.h b/js/src/ion/Lowering.h
index 4d39160fb155..cc8cd249df8b 100644
--- a/js/src/ion/Lowering.h
+++ b/js/src/ion/Lowering.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MCallOptimize.cpp b/js/src/ion/MCallOptimize.cpp
index d05b5f5f1378..98e986259127 100644
--- a/js/src/ion/MCallOptimize.cpp
+++ b/js/src/ion/MCallOptimize.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIR.cpp b/js/src/ion/MIR.cpp
index 8eb9b1165495..7b94d6c7419f 100644
--- a/js/src/ion/MIR.cpp
+++ b/js/src/ion/MIR.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 0e1f6ec87acf..faa0d1ed38fa 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIRGenerator.h b/js/src/ion/MIRGenerator.h
index 39cbba47602c..a734cbdef71b 100644
--- a/js/src/ion/MIRGenerator.h
+++ b/js/src/ion/MIRGenerator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIRGraph.cpp b/js/src/ion/MIRGraph.cpp
index 3a02a3394f4d..addbda66aecd 100644
--- a/js/src/ion/MIRGraph.cpp
+++ b/js/src/ion/MIRGraph.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIRGraph.h b/js/src/ion/MIRGraph.h
index 21f77942f95d..f5b62e11623e 100644
--- a/js/src/ion/MIRGraph.h
+++ b/js/src/ion/MIRGraph.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MOpcodes.h b/js/src/ion/MOpcodes.h
index c27a8b14251e..a5123a627ccd 100644
--- a/js/src/ion/MOpcodes.h
+++ b/js/src/ion/MOpcodes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MoveEmitter.h b/js/src/ion/MoveEmitter.h
index 9a88bd12703d..095b5d9e6da6 100644
--- a/js/src/ion/MoveEmitter.h
+++ b/js/src/ion/MoveEmitter.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MoveResolver.cpp b/js/src/ion/MoveResolver.cpp
index 1d4c76b7f681..a2b661c3130e 100644
--- a/js/src/ion/MoveResolver.cpp
+++ b/js/src/ion/MoveResolver.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MoveResolver.h b/js/src/ion/MoveResolver.h
index 0f816e15be54..8a20e1021a09 100644
--- a/js/src/ion/MoveResolver.h
+++ b/js/src/ion/MoveResolver.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ParallelArrayAnalysis.cpp b/js/src/ion/ParallelArrayAnalysis.cpp
index 3d92c14267fe..364df7b0902d 100644
--- a/js/src/ion/ParallelArrayAnalysis.cpp
+++ b/js/src/ion/ParallelArrayAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ParallelArrayAnalysis.h b/js/src/ion/ParallelArrayAnalysis.h
index 93e4ce36de2d..2c2eba228b37 100644
--- a/js/src/ion/ParallelArrayAnalysis.h
+++ b/js/src/ion/ParallelArrayAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ParallelFunctions.cpp b/js/src/ion/ParallelFunctions.cpp
index 1b821503b328..e0c7ca406778 100644
--- a/js/src/ion/ParallelFunctions.cpp
+++ b/js/src/ion/ParallelFunctions.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ParallelFunctions.h b/js/src/ion/ParallelFunctions.h
index b74e5cfa7aee..1fe9fcc333ff 100644
--- a/js/src/ion/ParallelFunctions.h
+++ b/js/src/ion/ParallelFunctions.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/PcScriptCache-inl.h b/js/src/ion/PcScriptCache-inl.h
index 9a852d0ed453..fdf5acfd19ab 100644
--- a/js/src/ion/PcScriptCache-inl.h
+++ b/js/src/ion/PcScriptCache-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/PcScriptCache.h b/js/src/ion/PcScriptCache.h
index 4d8eca0cbe31..9f9a3d79c87c 100644
--- a/js/src/ion/PcScriptCache.h
+++ b/js/src/ion/PcScriptCache.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RangeAnalysis.cpp b/js/src/ion/RangeAnalysis.cpp
index 918dc33bf90b..229b3a552b8d 100644
--- a/js/src/ion/RangeAnalysis.cpp
+++ b/js/src/ion/RangeAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RangeAnalysis.h b/js/src/ion/RangeAnalysis.h
index 830d3a3167de..0ffdc4752288 100644
--- a/js/src/ion/RangeAnalysis.h
+++ b/js/src/ion/RangeAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RegisterAllocator.cpp b/js/src/ion/RegisterAllocator.cpp
index f9986453416f..335eae5265a8 100644
--- a/js/src/ion/RegisterAllocator.cpp
+++ b/js/src/ion/RegisterAllocator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RegisterAllocator.h b/js/src/ion/RegisterAllocator.h
index d98704d38d03..fe76b3504ee9 100644
--- a/js/src/ion/RegisterAllocator.h
+++ b/js/src/ion/RegisterAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RegisterSets.h b/js/src/ion/RegisterSets.h
index b1ec16bcd735..9679f9f734df 100644
--- a/js/src/ion/RegisterSets.h
+++ b/js/src/ion/RegisterSets.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Registers.h b/js/src/ion/Registers.h
index e942d2e0474e..988d544f279c 100644
--- a/js/src/ion/Registers.h
+++ b/js/src/ion/Registers.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Safepoints.cpp b/js/src/ion/Safepoints.cpp
index 180b929d0301..8af0573240d7 100644
--- a/js/src/ion/Safepoints.cpp
+++ b/js/src/ion/Safepoints.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Safepoints.h b/js/src/ion/Safepoints.h
index 6e81e75e6442..4ae9e14bbfaf 100644
--- a/js/src/ion/Safepoints.h
+++ b/js/src/ion/Safepoints.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/SnapshotReader.h b/js/src/ion/SnapshotReader.h
index 61c930852a6a..497763da8e8c 100644
--- a/js/src/ion/SnapshotReader.h
+++ b/js/src/ion/SnapshotReader.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/SnapshotWriter.h b/js/src/ion/SnapshotWriter.h
index 9044da1dc405..9c90e6a7a757 100644
--- a/js/src/ion/SnapshotWriter.h
+++ b/js/src/ion/SnapshotWriter.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Snapshots.cpp b/js/src/ion/Snapshots.cpp
index bc761faf75f8..3605148521c0 100644
--- a/js/src/ion/Snapshots.cpp
+++ b/js/src/ion/Snapshots.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/StackSlotAllocator.h b/js/src/ion/StackSlotAllocator.h
index d08c63797170..e0b978324b9e 100644
--- a/js/src/ion/StackSlotAllocator.h
+++ b/js/src/ion/StackSlotAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/StupidAllocator.cpp b/js/src/ion/StupidAllocator.cpp
index c0646ac78f24..699194afc6ef 100644
--- a/js/src/ion/StupidAllocator.cpp
+++ b/js/src/ion/StupidAllocator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/StupidAllocator.h b/js/src/ion/StupidAllocator.h
index 77534641f7ba..5c1279ddeaa4 100644
--- a/js/src/ion/StupidAllocator.h
+++ b/js/src/ion/StupidAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/TypeOracle.cpp b/js/src/ion/TypeOracle.cpp
index 6e67e7956079..a54068563498 100644
--- a/js/src/ion/TypeOracle.cpp
+++ b/js/src/ion/TypeOracle.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/TypeOracle.h b/js/src/ion/TypeOracle.h
index bf13fdd6b8bf..d75a1cb77f32 100644
--- a/js/src/ion/TypeOracle.h
+++ b/js/src/ion/TypeOracle.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index 2d4f90a542d4..ce60a3528c03 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/TypePolicy.h b/js/src/ion/TypePolicy.h
index 310dd73e99ec..3f209e53c857 100644
--- a/js/src/ion/TypePolicy.h
+++ b/js/src/ion/TypePolicy.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/UnreachableCodeElimination.cpp b/js/src/ion/UnreachableCodeElimination.cpp
index 75367fd313c0..50a27363928f 100644
--- a/js/src/ion/UnreachableCodeElimination.cpp
+++ b/js/src/ion/UnreachableCodeElimination.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/UnreachableCodeElimination.h b/js/src/ion/UnreachableCodeElimination.h
index 99a61eed7b7b..9999afb47443 100644
--- a/js/src/ion/UnreachableCodeElimination.h
+++ b/js/src/ion/UnreachableCodeElimination.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/VMFunctions.cpp b/js/src/ion/VMFunctions.cpp
index 15b33c5190d4..c9f2f8dda262 100644
--- a/js/src/ion/VMFunctions.cpp
+++ b/js/src/ion/VMFunctions.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/VMFunctions.h b/js/src/ion/VMFunctions.h
index 7439a9b56276..c7477ddd2b0f 100644
--- a/js/src/ion/VMFunctions.h
+++ b/js/src/ion/VMFunctions.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ValueNumbering.cpp b/js/src/ion/ValueNumbering.cpp
index 597fb89170f4..a8b83b5dc950 100644
--- a/js/src/ion/ValueNumbering.cpp
+++ b/js/src/ion/ValueNumbering.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ValueNumbering.h b/js/src/ion/ValueNumbering.h
index 24db39cde1a1..edb1f40558f2 100644
--- a/js/src/ion/ValueNumbering.h
+++ b/js/src/ion/ValueNumbering.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Architecture-arm.cpp b/js/src/ion/arm/Architecture-arm.cpp
index 567715f688d1..7fc302930308 100644
--- a/js/src/ion/arm/Architecture-arm.cpp
+++ b/js/src/ion/arm/Architecture-arm.cpp
@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+
 #define HWCAP_ARMv7 (1 << 31)
 #include <mozilla/StandardInteger.h>
 
diff --git a/js/src/ion/arm/Architecture-arm.h b/js/src/ion/arm/Architecture-arm.h
index 3257c31ff1c0..0471efb88357 100644
--- a/js/src/ion/arm/Architecture-arm.h
+++ b/js/src/ion/arm/Architecture-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Assembler-arm.cpp b/js/src/ion/arm/Assembler-arm.cpp
index a2c178ee7f8a..820f99c9b615 100644
--- a/js/src/ion/arm/Assembler-arm.cpp
+++ b/js/src/ion/arm/Assembler-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Assembler-arm.h b/js/src/ion/arm/Assembler-arm.h
index 620270bcf3f2..80f1b7737255 100644
--- a/js/src/ion/arm/Assembler-arm.h
+++ b/js/src/ion/arm/Assembler-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Bailouts-arm.cpp b/js/src/ion/arm/Bailouts-arm.cpp
index bb51f8f3fbc6..21968bde4b1d 100644
--- a/js/src/ion/arm/Bailouts-arm.cpp
+++ b/js/src/ion/arm/Bailouts-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineCompiler-arm.cpp b/js/src/ion/arm/BaselineCompiler-arm.cpp
index 53ddd75857b0..7ed88a3f246a 100644
--- a/js/src/ion/arm/BaselineCompiler-arm.cpp
+++ b/js/src/ion/arm/BaselineCompiler-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineCompiler-arm.h b/js/src/ion/arm/BaselineCompiler-arm.h
index baaaff529d02..5485204398d3 100644
--- a/js/src/ion/arm/BaselineCompiler-arm.h
+++ b/js/src/ion/arm/BaselineCompiler-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineHelpers-arm.h b/js/src/ion/arm/BaselineHelpers-arm.h
index 6dd5795c0f39..6d5611eb5437 100644
--- a/js/src/ion/arm/BaselineHelpers-arm.h
+++ b/js/src/ion/arm/BaselineHelpers-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineIC-arm.cpp b/js/src/ion/arm/BaselineIC-arm.cpp
index 079b5b33d15c..25a1b40c0e5e 100644
--- a/js/src/ion/arm/BaselineIC-arm.cpp
+++ b/js/src/ion/arm/BaselineIC-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineRegisters-arm.h b/js/src/ion/arm/BaselineRegisters-arm.h
index 4ba983e6e7d5..53c908850855 100644
--- a/js/src/ion/arm/BaselineRegisters-arm.h
+++ b/js/src/ion/arm/BaselineRegisters-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/CodeGenerator-arm.cpp b/js/src/ion/arm/CodeGenerator-arm.cpp
index 4acfde24e38c..b28d73f5f080 100644
--- a/js/src/ion/arm/CodeGenerator-arm.cpp
+++ b/js/src/ion/arm/CodeGenerator-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/CodeGenerator-arm.h b/js/src/ion/arm/CodeGenerator-arm.h
index a0e421d57ac0..4c9940ade643 100644
--- a/js/src/ion/arm/CodeGenerator-arm.h
+++ b/js/src/ion/arm/CodeGenerator-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/IonFrames-arm.cpp b/js/src/ion/arm/IonFrames-arm.cpp
index 0b90bb2c48fb..fe5bd1c65b69 100644
--- a/js/src/ion/arm/IonFrames-arm.cpp
+++ b/js/src/ion/arm/IonFrames-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/IonFrames-arm.h b/js/src/ion/arm/IonFrames-arm.h
index f5b38c324f4a..c9d5268c6af5 100644
--- a/js/src/ion/arm/IonFrames-arm.h
+++ b/js/src/ion/arm/IonFrames-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/LIR-arm.h b/js/src/ion/arm/LIR-arm.h
index 7e0997c14bb3..f9db2e9b6e05 100644
--- a/js/src/ion/arm/LIR-arm.h
+++ b/js/src/ion/arm/LIR-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/LOpcodes-arm.h b/js/src/ion/arm/LOpcodes-arm.h
index 7745129aa645..1f53b9baabc8 100644
--- a/js/src/ion/arm/LOpcodes-arm.h
+++ b/js/src/ion/arm/LOpcodes-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Lowering-arm.cpp b/js/src/ion/arm/Lowering-arm.cpp
index 867f69bbffd3..f5aecb3ed4ef 100644
--- a/js/src/ion/arm/Lowering-arm.cpp
+++ b/js/src/ion/arm/Lowering-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Lowering-arm.h b/js/src/ion/arm/Lowering-arm.h
index 4436f2cd1cd3..0472fa1489e5 100644
--- a/js/src/ion/arm/Lowering-arm.h
+++ b/js/src/ion/arm/Lowering-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/MacroAssembler-arm.cpp b/js/src/ion/arm/MacroAssembler-arm.cpp
index 561a0b358802..0076f8d27058 100644
--- a/js/src/ion/arm/MacroAssembler-arm.cpp
+++ b/js/src/ion/arm/MacroAssembler-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/MacroAssembler-arm.h b/js/src/ion/arm/MacroAssembler-arm.h
index a383576e8331..18b258b750cc 100644
--- a/js/src/ion/arm/MacroAssembler-arm.h
+++ b/js/src/ion/arm/MacroAssembler-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/MoveEmitter-arm.cpp b/js/src/ion/arm/MoveEmitter-arm.cpp
index b6f1b409e900..289ecc795d80 100644
--- a/js/src/ion/arm/MoveEmitter-arm.cpp
+++ b/js/src/ion/arm/MoveEmitter-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/MoveEmitter-arm.h b/js/src/ion/arm/MoveEmitter-arm.h
index 783cf1c966e1..8d63c095c83d 100644
--- a/js/src/ion/arm/MoveEmitter-arm.h
+++ b/js/src/ion/arm/MoveEmitter-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Trampoline-arm.cpp b/js/src/ion/arm/Trampoline-arm.cpp
index a8dd69f463b4..3f313235f059 100644
--- a/js/src/ion/arm/Trampoline-arm.cpp
+++ b/js/src/ion/arm/Trampoline-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-shared.h b/js/src/ion/shared/Assembler-shared.h
index eb6371fb2b68..dec722212e45 100644
--- a/js/src/ion/shared/Assembler-shared.h
+++ b/js/src/ion/shared/Assembler-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-x86-shared.cpp b/js/src/ion/shared/Assembler-x86-shared.cpp
index 689a5a6876d3..09accd9c7bb8 100644
--- a/js/src/ion/shared/Assembler-x86-shared.cpp
+++ b/js/src/ion/shared/Assembler-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-x86-shared.h b/js/src/ion/shared/Assembler-x86-shared.h
index 41cb8e0bc5da..66f49ef47131 100644
--- a/js/src/ion/shared/Assembler-x86-shared.h
+++ b/js/src/ion/shared/Assembler-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-shared.cpp b/js/src/ion/shared/BaselineCompiler-shared.cpp
index 7b8bbfe05fc9..47831a5c82cc 100644
--- a/js/src/ion/shared/BaselineCompiler-shared.cpp
+++ b/js/src/ion/shared/BaselineCompiler-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-shared.h b/js/src/ion/shared/BaselineCompiler-shared.h
index a0baa943e584..2a23e44ed56b 100644
--- a/js/src/ion/shared/BaselineCompiler-shared.h
+++ b/js/src/ion/shared/BaselineCompiler-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-x86-shared.cpp b/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
index 9c23197aafe1..9c3db57f63a2 100644
--- a/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
+++ b/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-x86-shared.h b/js/src/ion/shared/BaselineCompiler-x86-shared.h
index 56d1b2de020b..20ecdec89408 100644
--- a/js/src/ion/shared/BaselineCompiler-x86-shared.h
+++ b/js/src/ion/shared/BaselineCompiler-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineIC-x86-shared.cpp b/js/src/ion/shared/BaselineIC-x86-shared.cpp
index cc5bf7e616d4..a671664ad752 100644
--- a/js/src/ion/shared/BaselineIC-x86-shared.cpp
+++ b/js/src/ion/shared/BaselineIC-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared-inl.h b/js/src/ion/shared/CodeGenerator-shared-inl.h
index 7bf3b611417f..67f4aeee310a 100644
--- a/js/src/ion/shared/CodeGenerator-shared-inl.h
+++ b/js/src/ion/shared/CodeGenerator-shared-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared.cpp b/js/src/ion/shared/CodeGenerator-shared.cpp
index 568e0d684500..3017b431e153 100644
--- a/js/src/ion/shared/CodeGenerator-shared.cpp
+++ b/js/src/ion/shared/CodeGenerator-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared.h b/js/src/ion/shared/CodeGenerator-shared.h
index 1695dc5c45cc..a99934e46968 100644
--- a/js/src/ion/shared/CodeGenerator-shared.h
+++ b/js/src/ion/shared/CodeGenerator-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-x86-shared.cpp b/js/src/ion/shared/CodeGenerator-x86-shared.cpp
index eaa4ac482f2e..80a6adb35e5f 100644
--- a/js/src/ion/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/ion/shared/CodeGenerator-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-x86-shared.h b/js/src/ion/shared/CodeGenerator-x86-shared.h
index 93305081b7b5..547ddbd588de 100644
--- a/js/src/ion/shared/CodeGenerator-x86-shared.h
+++ b/js/src/ion/shared/CodeGenerator-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/IonAssemblerBuffer.h b/js/src/ion/shared/IonAssemblerBuffer.h
index 47653f94955a..59c51eacc751 100644
--- a/js/src/ion/shared/IonAssemblerBuffer.h
+++ b/js/src/ion/shared/IonAssemblerBuffer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h b/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
index 8b9b1055e2f4..8dcb2f3eb249 100644
--- a/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
+++ b/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/IonFrames-shared.h b/js/src/ion/shared/IonFrames-shared.h
index 794da5226709..2b6f12f1da78 100644
--- a/js/src/ion/shared/IonFrames-shared.h
+++ b/js/src/ion/shared/IonFrames-shared.h
@@ -1,43 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Anderson <dvander@alliedmods.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
+
 #ifndef jsion_ionframes_shared_h__
 #define jsion_ionframes_shared_h__
 
diff --git a/js/src/ion/shared/IonFrames-x86-shared.cpp b/js/src/ion/shared/IonFrames-x86-shared.cpp
index 55ca61030a89..fe9dc1f19531 100644
--- a/js/src/ion/shared/IonFrames-x86-shared.cpp
+++ b/js/src/ion/shared/IonFrames-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/IonFrames-x86-shared.h b/js/src/ion/shared/IonFrames-x86-shared.h
index 04f055884d71..9100f3b38413 100644
--- a/js/src/ion/shared/IonFrames-x86-shared.h
+++ b/js/src/ion/shared/IonFrames-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/LIR-x86-shared.h b/js/src/ion/shared/LIR-x86-shared.h
index 4cec8fbed08a..5d12830436c9 100644
--- a/js/src/ion/shared/LIR-x86-shared.h
+++ b/js/src/ion/shared/LIR-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared-inl.h b/js/src/ion/shared/Lowering-shared-inl.h
index a67981a03684..6139c7ea0647 100644
--- a/js/src/ion/shared/Lowering-shared-inl.h
+++ b/js/src/ion/shared/Lowering-shared-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared.cpp b/js/src/ion/shared/Lowering-shared.cpp
index 577196d1aa65..7ab7b2e314f9 100644
--- a/js/src/ion/shared/Lowering-shared.cpp
+++ b/js/src/ion/shared/Lowering-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared.h b/js/src/ion/shared/Lowering-shared.h
index 5f8b34c24237..0808833a0284 100644
--- a/js/src/ion/shared/Lowering-shared.h
+++ b/js/src/ion/shared/Lowering-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-x86-shared.cpp b/js/src/ion/shared/Lowering-x86-shared.cpp
index 95496d77e916..f2ed21d6b7fb 100644
--- a/js/src/ion/shared/Lowering-x86-shared.cpp
+++ b/js/src/ion/shared/Lowering-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-x86-shared.h b/js/src/ion/shared/Lowering-x86-shared.h
index 797f552baeb2..99a3c6cf3c50 100644
--- a/js/src/ion/shared/Lowering-x86-shared.h
+++ b/js/src/ion/shared/Lowering-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/MacroAssembler-x86-shared.h b/js/src/ion/shared/MacroAssembler-x86-shared.h
index 644e302b3f5a..f28f229dd7b8 100644
--- a/js/src/ion/shared/MacroAssembler-x86-shared.h
+++ b/js/src/ion/shared/MacroAssembler-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/MoveEmitter-x86-shared.cpp b/js/src/ion/shared/MoveEmitter-x86-shared.cpp
index 99e50bef2134..8c8c6290923d 100644
--- a/js/src/ion/shared/MoveEmitter-x86-shared.cpp
+++ b/js/src/ion/shared/MoveEmitter-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/MoveEmitter-x86-shared.h b/js/src/ion/shared/MoveEmitter-x86-shared.h
index bbc2a5ef1fe9..915dd13b5091 100644
--- a/js/src/ion/shared/MoveEmitter-x86-shared.h
+++ b/js/src/ion/shared/MoveEmitter-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Architecture-x64.h b/js/src/ion/x64/Architecture-x64.h
index 707fb2a43c04..3a832c95df18 100644
--- a/js/src/ion/x64/Architecture-x64.h
+++ b/js/src/ion/x64/Architecture-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Assembler-x64.cpp b/js/src/ion/x64/Assembler-x64.cpp
index bdb88083fb02..bdcbe791d2e1 100644
--- a/js/src/ion/x64/Assembler-x64.cpp
+++ b/js/src/ion/x64/Assembler-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Assembler-x64.h b/js/src/ion/x64/Assembler-x64.h
index 379a88eea1ae..fdd7825b1037 100644
--- a/js/src/ion/x64/Assembler-x64.h
+++ b/js/src/ion/x64/Assembler-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Bailouts-x64.cpp b/js/src/ion/x64/Bailouts-x64.cpp
index 8062c8814f3a..4f9e265c62f8 100644
--- a/js/src/ion/x64/Bailouts-x64.cpp
+++ b/js/src/ion/x64/Bailouts-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineCompiler-x64.cpp b/js/src/ion/x64/BaselineCompiler-x64.cpp
index 45c9bf09c30b..e0bce0af7d51 100644
--- a/js/src/ion/x64/BaselineCompiler-x64.cpp
+++ b/js/src/ion/x64/BaselineCompiler-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineCompiler-x64.h b/js/src/ion/x64/BaselineCompiler-x64.h
index 1bfb02ba220b..ddac8c9c4133 100644
--- a/js/src/ion/x64/BaselineCompiler-x64.h
+++ b/js/src/ion/x64/BaselineCompiler-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineHelpers-x64.h b/js/src/ion/x64/BaselineHelpers-x64.h
index 939d8d9f5e9a..0e5c802f13ea 100644
--- a/js/src/ion/x64/BaselineHelpers-x64.h
+++ b/js/src/ion/x64/BaselineHelpers-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineIC-x64.cpp b/js/src/ion/x64/BaselineIC-x64.cpp
index 57d71a05a150..7359d26eb661 100644
--- a/js/src/ion/x64/BaselineIC-x64.cpp
+++ b/js/src/ion/x64/BaselineIC-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineRegisters-x64.h b/js/src/ion/x64/BaselineRegisters-x64.h
index f3b9d69d187c..72a64a55bb1f 100644
--- a/js/src/ion/x64/BaselineRegisters-x64.h
+++ b/js/src/ion/x64/BaselineRegisters-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/CodeGenerator-x64.cpp b/js/src/ion/x64/CodeGenerator-x64.cpp
index b7d720810de1..e94fe12fdb71 100644
--- a/js/src/ion/x64/CodeGenerator-x64.cpp
+++ b/js/src/ion/x64/CodeGenerator-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/CodeGenerator-x64.h b/js/src/ion/x64/CodeGenerator-x64.h
index 5360dc710413..35e103cd3254 100644
--- a/js/src/ion/x64/CodeGenerator-x64.h
+++ b/js/src/ion/x64/CodeGenerator-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/LIR-x64.h b/js/src/ion/x64/LIR-x64.h
index f1a8d03fe3a5..f5366d747f8d 100644
--- a/js/src/ion/x64/LIR-x64.h
+++ b/js/src/ion/x64/LIR-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/LOpcodes-x64.h b/js/src/ion/x64/LOpcodes-x64.h
index 8a276914ac25..fb479d48ce5a 100644
--- a/js/src/ion/x64/LOpcodes-x64.h
+++ b/js/src/ion/x64/LOpcodes-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Lowering-x64.cpp b/js/src/ion/x64/Lowering-x64.cpp
index d8eda3c9430b..525d0ecabfb7 100644
--- a/js/src/ion/x64/Lowering-x64.cpp
+++ b/js/src/ion/x64/Lowering-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Lowering-x64.h b/js/src/ion/x64/Lowering-x64.h
index f479e5d1d8b9..176041735618 100644
--- a/js/src/ion/x64/Lowering-x64.h
+++ b/js/src/ion/x64/Lowering-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/MacroAssembler-x64.cpp b/js/src/ion/x64/MacroAssembler-x64.cpp
index daf6a8b23875..c91b2471c35e 100644
--- a/js/src/ion/x64/MacroAssembler-x64.cpp
+++ b/js/src/ion/x64/MacroAssembler-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/MacroAssembler-x64.h b/js/src/ion/x64/MacroAssembler-x64.h
index 6165a0c5fe60..c7b8eecba0aa 100644
--- a/js/src/ion/x64/MacroAssembler-x64.h
+++ b/js/src/ion/x64/MacroAssembler-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Trampoline-x64.cpp b/js/src/ion/x64/Trampoline-x64.cpp
index b25b253bed98..d801cd02c8d6 100644
--- a/js/src/ion/x64/Trampoline-x64.cpp
+++ b/js/src/ion/x64/Trampoline-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Architecture-x86.h b/js/src/ion/x86/Architecture-x86.h
index 4c32e49df5b3..61ffbdd3f787 100644
--- a/js/src/ion/x86/Architecture-x86.h
+++ b/js/src/ion/x86/Architecture-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Assembler-x86.cpp b/js/src/ion/x86/Assembler-x86.cpp
index d9cf3d312c9a..e09285f8022c 100644
--- a/js/src/ion/x86/Assembler-x86.cpp
+++ b/js/src/ion/x86/Assembler-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Assembler-x86.h b/js/src/ion/x86/Assembler-x86.h
index 3f894a8868fb..3099f80a9b6d 100644
--- a/js/src/ion/x86/Assembler-x86.h
+++ b/js/src/ion/x86/Assembler-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Bailouts-x86.cpp b/js/src/ion/x86/Bailouts-x86.cpp
index 72e3eab4081b..731ef2c7e3ad 100644
--- a/js/src/ion/x86/Bailouts-x86.cpp
+++ b/js/src/ion/x86/Bailouts-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineCompiler-x86.cpp b/js/src/ion/x86/BaselineCompiler-x86.cpp
index 4ae0b3c74d3d..618ac55080c5 100644
--- a/js/src/ion/x86/BaselineCompiler-x86.cpp
+++ b/js/src/ion/x86/BaselineCompiler-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineCompiler-x86.h b/js/src/ion/x86/BaselineCompiler-x86.h
index cd1af33574a7..dcc7eeabbfbf 100644
--- a/js/src/ion/x86/BaselineCompiler-x86.h
+++ b/js/src/ion/x86/BaselineCompiler-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineHelpers-x86.h b/js/src/ion/x86/BaselineHelpers-x86.h
index 6222189a46b5..30f7db30986e 100644
--- a/js/src/ion/x86/BaselineHelpers-x86.h
+++ b/js/src/ion/x86/BaselineHelpers-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineIC-x86.cpp b/js/src/ion/x86/BaselineIC-x86.cpp
index 56a5dd0bba66..01a0b54bfc49 100644
--- a/js/src/ion/x86/BaselineIC-x86.cpp
+++ b/js/src/ion/x86/BaselineIC-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineRegisters-x86.h b/js/src/ion/x86/BaselineRegisters-x86.h
index e8a88217be9f..b28bda46ea29 100644
--- a/js/src/ion/x86/BaselineRegisters-x86.h
+++ b/js/src/ion/x86/BaselineRegisters-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/CodeGenerator-x86.cpp b/js/src/ion/x86/CodeGenerator-x86.cpp
index fd36974e9792..4884d5118e26 100644
--- a/js/src/ion/x86/CodeGenerator-x86.cpp
+++ b/js/src/ion/x86/CodeGenerator-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/CodeGenerator-x86.h b/js/src/ion/x86/CodeGenerator-x86.h
index 9fdc4b6a1b05..c4a58322e4db 100644
--- a/js/src/ion/x86/CodeGenerator-x86.h
+++ b/js/src/ion/x86/CodeGenerator-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/LIR-x86.h b/js/src/ion/x86/LIR-x86.h
index b56ab4788770..a27412302000 100644
--- a/js/src/ion/x86/LIR-x86.h
+++ b/js/src/ion/x86/LIR-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/LOpcodes-x86.h b/js/src/ion/x86/LOpcodes-x86.h
index 7944813552d1..5b4b9f49e2ca 100644
--- a/js/src/ion/x86/LOpcodes-x86.h
+++ b/js/src/ion/x86/LOpcodes-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Lowering-x86.cpp b/js/src/ion/x86/Lowering-x86.cpp
index debcc669fceb..9ef6d6d51c45 100644
--- a/js/src/ion/x86/Lowering-x86.cpp
+++ b/js/src/ion/x86/Lowering-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Lowering-x86.h b/js/src/ion/x86/Lowering-x86.h
index db6347ea5af3..f283e8a41053 100644
--- a/js/src/ion/x86/Lowering-x86.h
+++ b/js/src/ion/x86/Lowering-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/MacroAssembler-x86.cpp b/js/src/ion/x86/MacroAssembler-x86.cpp
index d620f46a0792..4183d3c9f372 100644
--- a/js/src/ion/x86/MacroAssembler-x86.cpp
+++ b/js/src/ion/x86/MacroAssembler-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/MacroAssembler-x86.h b/js/src/ion/x86/MacroAssembler-x86.h
index 5912f3ec3537..18f95d8bb89d 100644
--- a/js/src/ion/x86/MacroAssembler-x86.h
+++ b/js/src/ion/x86/MacroAssembler-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Trampoline-x86.cpp b/js/src/ion/x86/Trampoline-x86.cpp
index c6345788f956..088d7678bc91 100644
--- a/js/src/ion/x86/Trampoline-x86.cpp
+++ b/js/src/ion/x86/Trampoline-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jit-test/tests/auto-regress/bug557946.js b/js/src/jit-test/tests/auto-regress/bug557946.js
index 37cde015b269..8d1e95c53b17 100644
--- a/js/src/jit-test/tests/auto-regress/bug557946.js
+++ b/js/src/jit-test/tests/auto-regress/bug557946.js
@@ -1,7 +1,7 @@
 // Binary: cache/js-dbg-64-6f1a38b94754-linux
 // Flags: -j
 //
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 var x = 0;
 var y = 0;
diff --git a/js/src/jit-test/tests/auto-regress/bug558618.js b/js/src/jit-test/tests/auto-regress/bug558618.js
index 1618adb14b19..3fe1dfb257ec 100644
--- a/js/src/jit-test/tests/auto-regress/bug558618.js
+++ b/js/src/jit-test/tests/auto-regress/bug558618.js
@@ -1,7 +1,7 @@
 // Binary: cache/js-dbg-64-e69034463eeb-linux
 // Flags: -j
 //
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 function f() {
     this.search = function(a, b, c) {
         arguments[3] = { }
diff --git a/js/src/jit-test/tests/basic/bug535760.js b/js/src/jit-test/tests/basic/bug535760.js
index e7e1fce14880..dd00b961522c 100644
--- a/js/src/jit-test/tests/basic/bug535760.js
+++ b/js/src/jit-test/tests/basic/bug535760.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 function foundit(items, n) {
     for (var i = 0; i < 10; i++)
         arguments[2](items, this);
diff --git a/js/src/jit-test/tests/basic/bug541191-1.js b/js/src/jit-test/tests/basic/bug541191-1.js
index 78f0caf10ad8..74ccae82976e 100644
--- a/js/src/jit-test/tests/basic/bug541191-1.js
+++ b/js/src/jit-test/tests/basic/bug541191-1.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-2.js b/js/src/jit-test/tests/basic/bug541191-2.js
index 1d232dc332a9..d270b7de1e2b 100644
--- a/js/src/jit-test/tests/basic/bug541191-2.js
+++ b/js/src/jit-test/tests/basic/bug541191-2.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-3.js b/js/src/jit-test/tests/basic/bug541191-3.js
index f4e01b9e1802..f447d49d1e2d 100644
--- a/js/src/jit-test/tests/basic/bug541191-3.js
+++ b/js/src/jit-test/tests/basic/bug541191-3.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-4.js b/js/src/jit-test/tests/basic/bug541191-4.js
index 0ecbb9177425..5d15bedb5c16 100644
--- a/js/src/jit-test/tests/basic/bug541191-4.js
+++ b/js/src/jit-test/tests/basic/bug541191-4.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-5.js b/js/src/jit-test/tests/basic/bug541191-5.js
index a2f9e5714f0c..f87217b2ccee 100644
--- a/js/src/jit-test/tests/basic/bug541191-5.js
+++ b/js/src/jit-test/tests/basic/bug541191-5.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug592927.js b/js/src/jit-test/tests/basic/bug592927.js
index dc74a5af9062..69f0bd237e46 100644
--- a/js/src/jit-test/tests/basic/bug592927.js
+++ b/js/src/jit-test/tests/basic/bug592927.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(x, y) {
     x(f);
     assertEq(y, "hello");
diff --git a/js/src/jit-test/tests/basic/bug602088.js b/js/src/jit-test/tests/basic/bug602088.js
index 283b546acc3c..7e00d9b4c26d 100644
--- a/js/src/jit-test/tests/basic/bug602088.js
+++ b/js/src/jit-test/tests/basic/bug602088.js
@@ -1,5 +1,5 @@
 // |jit-test| error: TypeError
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 var p = Proxy.createFunction({}, function(x, y) { undefined.x(); });
 print(new p(1, 2));
diff --git a/js/src/jit-test/tests/basic/bug606083.js b/js/src/jit-test/tests/basic/bug606083.js
index fc2594b0ead3..d8049b94fa13 100644
--- a/js/src/jit-test/tests/basic/bug606083.js
+++ b/js/src/jit-test/tests/basic/bug606083.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(L) {
     do {
      L: for (var i = 0; i < L; i++) {
diff --git a/js/src/jit-test/tests/basic/bug616762.js b/js/src/jit-test/tests/basic/bug616762.js
index 89b8ddd18ab0..02f5c953cf59 100644
--- a/js/src/jit-test/tests/basic/bug616762.js
+++ b/js/src/jit-test/tests/basic/bug616762.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 document = {
     ready: function (x) {
         this.exec = x;
diff --git a/js/src/jit-test/tests/basic/bug633409-1.js b/js/src/jit-test/tests/basic/bug633409-1.js
index 1f65ccc8445f..20eaa6cda58e 100644
--- a/js/src/jit-test/tests/basic/bug633409-1.js
+++ b/js/src/jit-test/tests/basic/bug633409-1.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 x = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 };
 
 for (i in x)
diff --git a/js/src/jit-test/tests/basic/bug633409-2.js b/js/src/jit-test/tests/basic/bug633409-2.js
index 349af466a2b3..d3c498d6d235 100644
--- a/js/src/jit-test/tests/basic/bug633409-2.js
+++ b/js/src/jit-test/tests/basic/bug633409-2.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 var o1 = {p1: 1};
 var o2 = {p1: 1, p2: 2};
diff --git a/js/src/jit-test/tests/ion/bug674664-3.js b/js/src/jit-test/tests/ion/bug674664-3.js
index 7838e8738048..ce5a828d57c3 100644
--- a/js/src/jit-test/tests/ion/bug674664-3.js
+++ b/js/src/jit-test/tests/ion/bug674664-3.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f0(p0) {
     var v0;
     do {
diff --git a/js/src/jit-test/tests/ion/bug684362.js b/js/src/jit-test/tests/ion/bug684362.js
index dd2f606fc653..9a83b053d711 100644
--- a/js/src/jit-test/tests/ion/bug684362.js
+++ b/js/src/jit-test/tests/ion/bug684362.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(a) {
     var k = a;
     T: for (;;) {
diff --git a/js/src/jit-test/tests/ion/bug747271.js b/js/src/jit-test/tests/ion/bug747271.js
index 2a751177f5ad..176a44a5833a 100644
--- a/js/src/jit-test/tests/ion/bug747271.js
+++ b/js/src/jit-test/tests/ion/bug747271.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function randomFloat () {
     // note that in fuzz-testing, this can used as the size of a buffer to allocate.
     // so it shouldn't return astronomic values. The maximum value 10000000 is already quite big.
diff --git a/js/src/jit-test/tests/ion/bug750588.js b/js/src/jit-test/tests/ion/bug750588.js
index 63bab41d6190..6fa44d9cce63 100644
--- a/js/src/jit-test/tests/ion/bug750588.js
+++ b/js/src/jit-test/tests/ion/bug750588.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function S() {
   var t = new Float32Array(1);
diff --git a/js/src/jit-test/tests/ion/bug772901.js b/js/src/jit-test/tests/ion/bug772901.js
index 13928ced8592..eb71f6afb8a2 100644
--- a/js/src/jit-test/tests/ion/bug772901.js
+++ b/js/src/jit-test/tests/ion/bug772901.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f(x) {
     delete ((x)++);
diff --git a/js/src/jit-test/tests/ion/testPos.js b/js/src/jit-test/tests/ion/testPos.js
index 1d79df2fc636..197650e9b1fb 100644
--- a/js/src/jit-test/tests/ion/testPos.js
+++ b/js/src/jit-test/tests/ion/testPos.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f_int(x) {
     return +x;
 }
diff --git a/js/src/jit-test/tests/ion/testSubtract.js b/js/src/jit-test/tests/ion/testSubtract.js
index ad75a03f2ef0..2b4389b2a8fe 100644
--- a/js/src/jit-test/tests/ion/testSubtract.js
+++ b/js/src/jit-test/tests/ion/testSubtract.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f_int(x, y) {
     return x - y;
 }
diff --git a/js/src/jit-test/tests/ion/testVAndBranch.js b/js/src/jit-test/tests/ion/testVAndBranch.js
index e2ac44234227..c1fcc00e961f 100644
--- a/js/src/jit-test/tests/ion/testVAndBranch.js
+++ b/js/src/jit-test/tests/ion/testVAndBranch.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(x) {
     if (x)
         return true;
diff --git a/js/src/jit-test/tests/ion/truncateToInt32.js b/js/src/jit-test/tests/ion/truncateToInt32.js
index f48b7f16aef7..462b411ad1fe 100644
--- a/js/src/jit-test/tests/ion/truncateToInt32.js
+++ b/js/src/jit-test/tests/ion/truncateToInt32.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function w(y)
 {
diff --git a/js/src/jit-test/tests/ion/valueToInt32.js b/js/src/jit-test/tests/ion/valueToInt32.js
index c879c2d75a10..65ad561eca4d 100644
--- a/js/src/jit-test/tests/ion/valueToInt32.js
+++ b/js/src/jit-test/tests/ion/valueToInt32.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f(x, y) {
     // Confuse the type analysis to not know the type of x.
diff --git a/js/src/jit-test/tests/jaeger/bug592973-1.js b/js/src/jit-test/tests/jaeger/bug592973-1.js
index 470f84ee359b..d3bafac623db 100644
--- a/js/src/jit-test/tests/jaeger/bug592973-1.js
+++ b/js/src/jit-test/tests/jaeger/bug592973-1.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(x) {
     if (x) {
         let y;
diff --git a/js/src/jit-test/tests/jaeger/bug592973-3.js b/js/src/jit-test/tests/jaeger/bug592973-3.js
index ae4694955f5c..541c39981a4c 100644
--- a/js/src/jit-test/tests/jaeger/bug592973-3.js
+++ b/js/src/jit-test/tests/jaeger/bug592973-3.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f([a, b, c, d]) {
   a = b;
   return function () { return a + b + c + d; };
diff --git a/js/src/jit-test/tests/jaeger/bug597378.js b/js/src/jit-test/tests/jaeger/bug597378.js
index 454935bb9320..c766407ab58c 100644
--- a/js/src/jit-test/tests/jaeger/bug597378.js
+++ b/js/src/jit-test/tests/jaeger/bug597378.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(a, b) {
     var o = a;
     var q = b;
diff --git a/js/src/jit-test/tests/jaeger/bug600139.js b/js/src/jit-test/tests/jaeger/bug600139.js
index 2fdedf42d5cf..61fa7283a03a 100644
--- a/js/src/jit-test/tests/jaeger/bug600139.js
+++ b/js/src/jit-test/tests/jaeger/bug600139.js
@@ -1,5 +1,5 @@
 // |jit-test| error: ReferenceError
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(a, b, c) {
     if (!a.__SSi) {
         throw Components.returnCode = Cr.NS_ERROR_INVALID_ARG;
diff --git a/js/src/jit-test/tests/jaeger/bug600424.js b/js/src/jit-test/tests/jaeger/bug600424.js
index 44bb4e7c9b4c..e59a06614f21 100644
--- a/js/src/jit-test/tests/jaeger/bug600424.js
+++ b/js/src/jit-test/tests/jaeger/bug600424.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(a) {
     var x = {
         g: function () {
diff --git a/js/src/jit-test/tests/jaeger/bug601982.js b/js/src/jit-test/tests/jaeger/bug601982.js
index b78f0704c69d..99f4bf906fc4 100644
--- a/js/src/jit-test/tests/jaeger/bug601982.js
+++ b/js/src/jit-test/tests/jaeger/bug601982.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function J(i) {
     /* Cause a branch to build(?) */
diff --git a/js/src/jit-test/tests/jaeger/bug604381.js b/js/src/jit-test/tests/jaeger/bug604381.js
index 365c9e3d2b16..3ca01cb36234 100644
--- a/js/src/jit-test/tests/jaeger/bug604381.js
+++ b/js/src/jit-test/tests/jaeger/bug604381.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function F() {
     var T = { };
diff --git a/js/src/jit-test/tests/jaeger/bug616508.js b/js/src/jit-test/tests/jaeger/bug616508.js
index 38ca2360f1aa..d29bf75f9b5e 100644
--- a/js/src/jit-test/tests/jaeger/bug616508.js
+++ b/js/src/jit-test/tests/jaeger/bug616508.js
@@ -1,5 +1,5 @@
 // |jit-test| error: ReferenceError
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 // Note: modified from original test, which used Uint32Array in place of Array,
 // because the behavior has changed in a way that this will throw a TypeError
diff --git a/js/src/jit-test/tests/jaeger/bug625438.js b/js/src/jit-test/tests/jaeger/bug625438.js
index 494bfd1342fd..32586d8ab4fa 100644
--- a/js/src/jit-test/tests/jaeger/bug625438.js
+++ b/js/src/jit-test/tests/jaeger/bug625438.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 var count = 0;
 this.watch("x", function() {
diff --git a/js/src/jit-test/tests/jaeger/bug627486.js b/js/src/jit-test/tests/jaeger/bug627486.js
index f87d27e18a47..7acc3b01e957 100644
--- a/js/src/jit-test/tests/jaeger/bug627486.js
+++ b/js/src/jit-test/tests/jaeger/bug627486.js
@@ -1,5 +1,5 @@
 // |jit-test| error: TypeError
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 g = undefined;
 function L() { }
 
diff --git a/js/src/jit-test/tests/jaeger/floatTypedArrays.js b/js/src/jit-test/tests/jaeger/floatTypedArrays.js
index da1abe0c40ea..51ea7c0a16f6 100644
--- a/js/src/jit-test/tests/jaeger/floatTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/floatTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testFloat32Array(L) {
     var f = new Float32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js b/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
index dc5ed7b45270..8bb4627fa678 100644
--- a/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testInt32Array(L) {
     var f = new Int32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js b/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
index 3ed2f2bcb553..c63d36bf2aea 100644
--- a/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testInt8Array(L) {
     var f = new Int8Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js b/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
index f9e7825a6378..369aa2c6fb86 100644
--- a/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
+++ b/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
@@ -1,4 +1,4 @@
-// vim: ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function A() {
     this.x = 12;
diff --git a/js/src/jit-test/tests/jaeger/testDenseCallElem.js b/js/src/jit-test/tests/jaeger/testDenseCallElem.js
index eadb77f55b9f..0301048bf31a 100644
--- a/js/src/jit-test/tests/jaeger/testDenseCallElem.js
+++ b/js/src/jit-test/tests/jaeger/testDenseCallElem.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function fillDense(a) {
 }
diff --git a/js/src/jit-test/tests/jaeger/testForOps.js b/js/src/jit-test/tests/jaeger/testForOps.js
index 5704e070de07..382f096121ff 100644
--- a/js/src/jit-test/tests/jaeger/testForOps.js
+++ b/js/src/jit-test/tests/jaeger/testForOps.js
@@ -1,5 +1,5 @@
 // |jit-test| mjitalways
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function assertObjectsEqual(obj1, obj2) {
     assertEq(obj1.a, obj2.a);
diff --git a/js/src/jit-test/tests/jaeger/testPropCallElem.js b/js/src/jit-test/tests/jaeger/testPropCallElem.js
index fd067bbf7a50..2bb97fbe64a1 100644
--- a/js/src/jit-test/tests/jaeger/testPropCallElem.js
+++ b/js/src/jit-test/tests/jaeger/testPropCallElem.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testUKeyUObject(a, key1, key2, key3) {
     a.a = function () { return this.d; }
diff --git a/js/src/jit-test/tests/jaeger/testPropCallElem2.js b/js/src/jit-test/tests/jaeger/testPropCallElem2.js
index 328193ae4b21..43f8efb0fb57 100644
--- a/js/src/jit-test/tests/jaeger/testPropCallElem2.js
+++ b/js/src/jit-test/tests/jaeger/testPropCallElem2.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testUKeyUObject(a, key1, key2, key3) {
     a.a = function () { return this.d; }
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-Easy.js b/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
index 9eb9d0688689..ed8fc7c9a9bb 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testBadSetElems(obj, key) {
     obj[key] = 5;
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js b/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
index 146092fbb5d4..01b42bd6b392 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f() {
     return [[], [], [], []];
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js b/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
index 91d71401d489..f202513d534a 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f() {
     return [[], [], [], []];
diff --git a/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js b/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
index 49ea74a8b94c..33e38dd3fc3f 100644
--- a/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
+++ b/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testSetTypedFloat32Array(k) {
     var ar = new Float32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js b/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
index bf3099c50c0f..89e943b698a7 100644
--- a/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
+++ b/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testSetTypedInt8Array(k) {
     var ar = new Int8Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testShiftSameBacking.js b/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
index cb2ce0059b46..1cbe064d3fef 100644
--- a/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
+++ b/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f(a) {
     var x = a;
diff --git a/js/src/jsalloc.cpp b/js/src/jsalloc.cpp
index a5ceae2a22c5..744eb68cb9d7 100644
--- a/js/src/jsalloc.cpp
+++ b/js/src/jsalloc.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsalloc.h b/js/src/jsalloc.h
index 7d76a7c701ad..7d2690b69a79 100644
--- a/js/src/jsalloc.h
+++ b/js/src/jsalloc.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index 0e5312f58ce2..bda8e36751e5 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsanalyze.h b/js/src/jsanalyze.h
index 2be5bcdaf3c2..e1b60575aaed 100644
--- a/js/src/jsanalyze.h
+++ b/js/src/jsanalyze.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsapi-tests/selfTest.cpp b/js/src/jsapi-tests/selfTest.cpp
index 91f25ccce612..39202abb5720 100644
--- a/js/src/jsapi-tests/selfTest.cpp
+++ b/js/src/jsapi-tests/selfTest.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testAddPropertyPropcache.cpp b/js/src/jsapi-tests/testAddPropertyPropcache.cpp
index 8c6979e38a39..666898e5bb32 100644
--- a/js/src/jsapi-tests/testAddPropertyPropcache.cpp
+++ b/js/src/jsapi-tests/testAddPropertyPropcache.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testArgumentsObject.cpp b/js/src/jsapi-tests/testArgumentsObject.cpp
index 81c79608fd73..0d34e41b2dad 100644
--- a/js/src/jsapi-tests/testArgumentsObject.cpp
+++ b/js/src/jsapi-tests/testArgumentsObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testArrayBuffer.cpp b/js/src/jsapi-tests/testArrayBuffer.cpp
index 081146c3d690..a8299a611b51 100644
--- a/js/src/jsapi-tests/testArrayBuffer.cpp
+++ b/js/src/jsapi-tests/testArrayBuffer.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 
 #include "tests.h"
diff --git a/js/src/jsapi-tests/testBug604087.cpp b/js/src/jsapi-tests/testBug604087.cpp
index 100d432b3f7b..4bda71b5e0fd 100644
--- a/js/src/jsapi-tests/testBug604087.cpp
+++ b/js/src/jsapi-tests/testBug604087.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests JS_TransplantObject
  */
diff --git a/js/src/jsapi-tests/testClassGetter.cpp b/js/src/jsapi-tests/testClassGetter.cpp
index 86c3229afce7..5ee3efae034f 100644
--- a/js/src/jsapi-tests/testClassGetter.cpp
+++ b/js/src/jsapi-tests/testClassGetter.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests the JSClass::getProperty hook
  */
diff --git a/js/src/jsapi-tests/testCloneScript.cpp b/js/src/jsapi-tests/testCloneScript.cpp
index 14e6882dd431..91ff93d76180 100644
--- a/js/src/jsapi-tests/testCloneScript.cpp
+++ b/js/src/jsapi-tests/testCloneScript.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Test script cloning.
  */
diff --git a/js/src/jsapi-tests/testContexts.cpp b/js/src/jsapi-tests/testContexts.cpp
index 1f65b462a2d0..e863a4086ee1 100644
--- a/js/src/jsapi-tests/testContexts.cpp
+++ b/js/src/jsapi-tests/testContexts.cpp
@@ -1,11 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "tests.h"
 
 BEGIN_TEST(testContexts_IsRunning)
diff --git a/js/src/jsapi-tests/testDebugger.cpp b/js/src/jsapi-tests/testDebugger.cpp
index 586a24da62ba..577fffa08129 100644
--- a/js/src/jsapi-tests/testDebugger.cpp
+++ b/js/src/jsapi-tests/testDebugger.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDeepFreeze.cpp b/js/src/jsapi-tests/testDeepFreeze.cpp
index 9b95af5b0bbf..48d31f6bcaa2 100644
--- a/js/src/jsapi-tests/testDeepFreeze.cpp
+++ b/js/src/jsapi-tests/testDeepFreeze.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
index 7f07b640e842..d28c8affb58a 100644
--- a/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
+++ b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDefineProperty.cpp b/js/src/jsapi-tests/testDefineProperty.cpp
index b5617799adae..739dfafdb6c5 100644
--- a/js/src/jsapi-tests/testDefineProperty.cpp
+++ b/js/src/jsapi-tests/testDefineProperty.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testEnclosingFunction.cpp b/js/src/jsapi-tests/testEnclosingFunction.cpp
index 2549b6f181aa..0a88f6c598e1 100644
--- a/js/src/jsapi-tests/testEnclosingFunction.cpp
+++ b/js/src/jsapi-tests/testEnclosingFunction.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Test script cloning.
  */
diff --git a/js/src/jsapi-tests/testErrorCopying.cpp b/js/src/jsapi-tests/testErrorCopying.cpp
index 1923879d2763..bda243b85265 100644
--- a/js/src/jsapi-tests/testErrorCopying.cpp
+++ b/js/src/jsapi-tests/testErrorCopying.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests that the column number of error reports is properly copied over from
  * other reports when invoked from the C++ api.
diff --git a/js/src/jsapi-tests/testFindSCCs.cpp b/js/src/jsapi-tests/testFindSCCs.cpp
index 1e98800059e4..ad38b56ac036 100644
--- a/js/src/jsapi-tests/testFindSCCs.cpp
+++ b/js/src/jsapi-tests/testFindSCCs.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testFunctionProperties.cpp b/js/src/jsapi-tests/testFunctionProperties.cpp
index 9fee41561803..b70f95bcb0e0 100644
--- a/js/src/jsapi-tests/testFunctionProperties.cpp
+++ b/js/src/jsapi-tests/testFunctionProperties.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testGCOutOfMemory.cpp b/js/src/jsapi-tests/testGCOutOfMemory.cpp
index 83aa3c774f85..49e3db00f819 100644
--- a/js/src/jsapi-tests/testGCOutOfMemory.cpp
+++ b/js/src/jsapi-tests/testGCOutOfMemory.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
diff --git a/js/src/jsapi-tests/testGetPropertyDefault.cpp b/js/src/jsapi-tests/testGetPropertyDefault.cpp
index 4dc9664fb921..8aa0323d8c3e 100644
--- a/js/src/jsapi-tests/testGetPropertyDefault.cpp
+++ b/js/src/jsapi-tests/testGetPropertyDefault.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testIndexToString.cpp b/js/src/jsapi-tests/testIndexToString.cpp
index 0b59b6f0b402..998e65218614 100644
--- a/js/src/jsapi-tests/testIndexToString.cpp
+++ b/js/src/jsapi-tests/testIndexToString.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testIntString.cpp b/js/src/jsapi-tests/testIntString.cpp
index 18b3d53371e5..fc627d62430d 100644
--- a/js/src/jsapi-tests/testIntString.cpp
+++ b/js/src/jsapi-tests/testIntString.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testJSEvaluateScript.cpp b/js/src/jsapi-tests/testJSEvaluateScript.cpp
index 875ae83094be..72d92e751432 100644
--- a/js/src/jsapi-tests/testJSEvaluateScript.cpp
+++ b/js/src/jsapi-tests/testJSEvaluateScript.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 
 #include "tests.h"
diff --git a/js/src/jsapi-tests/testLookup.cpp b/js/src/jsapi-tests/testLookup.cpp
index 65edab7c0ebc..c7fa9f7fea26 100644
--- a/js/src/jsapi-tests/testLookup.cpp
+++ b/js/src/jsapi-tests/testLookup.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testNewObject.cpp b/js/src/jsapi-tests/testNewObject.cpp
index 5a97aa72e4ad..302708766d4d 100644
--- a/js/src/jsapi-tests/testNewObject.cpp
+++ b/js/src/jsapi-tests/testNewObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testOps.cpp b/js/src/jsapi-tests/testOps.cpp
index e0f7d8fa68ed..ee7b09ad4193 100644
--- a/js/src/jsapi-tests/testOps.cpp
+++ b/js/src/jsapi-tests/testOps.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests for operators and implicit type conversion.
  */
diff --git a/js/src/jsapi-tests/testParseJSON.cpp b/js/src/jsapi-tests/testParseJSON.cpp
index abfe849ec214..87255505bc6f 100644
--- a/js/src/jsapi-tests/testParseJSON.cpp
+++ b/js/src/jsapi-tests/testParseJSON.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testProfileStrings.cpp b/js/src/jsapi-tests/testProfileStrings.cpp
index d02426e19ec6..a6dd78638af4 100644
--- a/js/src/jsapi-tests/testProfileStrings.cpp
+++ b/js/src/jsapi-tests/testProfileStrings.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests the stack-based instrumentation profiler on a JSRuntime
  */
diff --git a/js/src/jsapi-tests/testPropCache.cpp b/js/src/jsapi-tests/testPropCache.cpp
index 799347bd0567..96116535c645 100644
--- a/js/src/jsapi-tests/testPropCache.cpp
+++ b/js/src/jsapi-tests/testPropCache.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
index 5fdebda8acac..717c7dccac2b 100644
--- a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
+++ b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testResolveRecursion.cpp b/js/src/jsapi-tests/testResolveRecursion.cpp
index f5f6bbffa6b5..f860a4970fdf 100644
--- a/js/src/jsapi-tests/testResolveRecursion.cpp
+++ b/js/src/jsapi-tests/testResolveRecursion.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testSameValue.cpp b/js/src/jsapi-tests/testSameValue.cpp
index 6f1c75b54e60..3d35df3a671b 100644
--- a/js/src/jsapi-tests/testSameValue.cpp
+++ b/js/src/jsapi-tests/testSameValue.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testScriptInfo.cpp b/js/src/jsapi-tests/testScriptInfo.cpp
index 3265ed9fc430..2fa8f29429a4 100644
--- a/js/src/jsapi-tests/testScriptInfo.cpp
+++ b/js/src/jsapi-tests/testScriptInfo.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testScriptObject.cpp b/js/src/jsapi-tests/testScriptObject.cpp
index 4075976864c7..29a522dfa857 100644
--- a/js/src/jsapi-tests/testScriptObject.cpp
+++ b/js/src/jsapi-tests/testScriptObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testSetProperty.cpp b/js/src/jsapi-tests/testSetProperty.cpp
index 598d5d24d8fa..8003c473b35a 100644
--- a/js/src/jsapi-tests/testSetProperty.cpp
+++ b/js/src/jsapi-tests/testSetProperty.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testStringBuffer.cpp b/js/src/jsapi-tests/testStringBuffer.cpp
index 51c232381d27..ebbd2dff1f61 100644
--- a/js/src/jsapi-tests/testStringBuffer.cpp
+++ b/js/src/jsapi-tests/testStringBuffer.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testTrap.cpp b/js/src/jsapi-tests/testTrap.cpp
index 3e66a388ec06..a1bde8d9d2d8 100644
--- a/js/src/jsapi-tests/testTrap.cpp
+++ b/js/src/jsapi-tests/testTrap.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testTypedArrays.cpp b/js/src/jsapi-tests/testTypedArrays.cpp
index 00ec3704e356..8aba225ac576 100644
--- a/js/src/jsapi-tests/testTypedArrays.cpp
+++ b/js/src/jsapi-tests/testTypedArrays.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testUTF8.cpp b/js/src/jsapi-tests/testUTF8.cpp
index 941177369b89..2ec6b06898ef 100644
--- a/js/src/jsapi-tests/testUTF8.cpp
+++ b/js/src/jsapi-tests/testUTF8.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testXDR.cpp b/js/src/jsapi-tests/testXDR.cpp
index e8d934a83d6d..c47d82897726 100644
--- a/js/src/jsapi-tests/testXDR.cpp
+++ b/js/src/jsapi-tests/testXDR.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/tests.cpp b/js/src/jsapi-tests/tests.cpp
index 6ce8c30b6244..30b89be2d3b8 100644
--- a/js/src/jsapi-tests/tests.cpp
+++ b/js/src/jsapi-tests/tests.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsapi-tests/tests.h b/js/src/jsapi-tests/tests.h
index 60c3ba75d893..c3c7e4cb8265 100644
--- a/js/src/jsapi-tests/tests.h
+++ b/js/src/jsapi-tests/tests.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsapi-tests/valueABI.c b/js/src/jsapi-tests/valueABI.c
index 89a5693ee393..65b31d38c48e 100644
--- a/js/src/jsapi-tests/valueABI.c
+++ b/js/src/jsapi-tests/valueABI.c
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sw=4 et tw=99 ft=c:
- *
  * 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/. */
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index cfba78bcd547..ec8768853859 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index ecc48aa638b2..9bcb80d2f422 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 3a54f904630e..593b7ec9171e 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsarray.h b/js/src/jsarray.h
index a61d7a829deb..7cb15822c18b 100644
--- a/js/src/jsarray.h
+++ b/js/src/jsarray.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index e0178dedd302..a675149a54aa 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsatom.h b/js/src/jsatom.h
index 9ff01bd6fac1..1aa15269e9d6 100644
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsatominlines.h b/js/src/jsatominlines.h
index 2d5df3d44029..421bf141b6be 100644
--- a/js/src/jsatominlines.h
+++ b/js/src/jsatominlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsbool.cpp b/js/src/jsbool.cpp
index 843c3294c8b8..217572a80310 100644
--- a/js/src/jsbool.cpp
+++ b/js/src/jsbool.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsbool.h b/js/src/jsbool.h
index 1676d523af87..0d847ec30514 100644
--- a/js/src/jsbool.h
+++ b/js/src/jsbool.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsboolinlines.h b/js/src/jsboolinlines.h
index 1f2b361d276e..58ed270c1966 100644
--- a/js/src/jsboolinlines.h
+++ b/js/src/jsboolinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsclass.h b/js/src/jsclass.h
index bb01ff046043..7d37d69adfb5 100644
--- a/js/src/jsclass.h
+++ b/js/src/jsclass.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsclist.h b/js/src/jsclist.h
index 4881104eee79..8782307fa4ab 100644
--- a/js/src/jsclist.h
+++ b/js/src/jsclist.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsclone.cpp b/js/src/jsclone.cpp
index e3b249e486eb..885bfc01a1ba 100644
--- a/js/src/jsclone.cpp
+++ b/js/src/jsclone.cpp
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsclone.h b/js/src/jsclone.h
index 5a3326152b65..595bf8f013a1 100644
--- a/js/src/jsclone.h
+++ b/js/src/jsclone.h
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 9da194a90cf8..e9738381eee5 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 01ca74eba0e7..e1c73498bb41 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 604b206b5ab9..6384cade797a 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 41961c8b8b2e..2a6dc4dc4edf 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index d4fda4b68e7d..454f13137d3a 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscompartmentinlines.h b/js/src/jscompartmentinlines.h
index e9724ff9b047..c9c747b55e96 100644
--- a/js/src/jscompartmentinlines.h
+++ b/js/src/jscompartmentinlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
index 3d2022dbe292..1b7baf996f1a 100644
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscrashformat.h b/js/src/jscrashformat.h
index cf274f336018..7d3940d9f661 100644
--- a/js/src/jscrashformat.h
+++ b/js/src/jscrashformat.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscrashreport.cpp b/js/src/jscrashreport.cpp
index 6cb415aeb716..1ebac89fa44f 100644
--- a/js/src/jscrashreport.cpp
+++ b/js/src/jscrashreport.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscrashreport.h b/js/src/jscrashreport.h
index beeb76151ba1..cb2336be00d1 100644
--- a/js/src/jscrashreport.h
+++ b/js/src/jscrashreport.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index b3ce396f860d..d98dc5b9e59c 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdate.h b/js/src/jsdate.h
index 514160ecd634..67c2ca067981 100644
--- a/js/src/jsdate.h
+++ b/js/src/jsdate.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index be6e447aad9c..a3ed445bd705 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdbgapi.h b/js/src/jsdbgapi.h
index e47c33a85718..d6f5b2e9db25 100644
--- a/js/src/jsdbgapi.h
+++ b/js/src/jsdbgapi.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdhash.cpp b/js/src/jsdhash.cpp
index 51b5cb5d94bd..00b0dbdbc04b 100644
--- a/js/src/jsdhash.cpp
+++ b/js/src/jsdhash.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsdhash.h b/js/src/jsdhash.h
index c8f02b18b708..1f7830fd2b1f 100644
--- a/js/src/jsdhash.h
+++ b/js/src/jsdhash.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsdtoa.cpp b/js/src/jsdtoa.cpp
index b8b57eb3f368..9d94bebaf5e9 100644
--- a/js/src/jsdtoa.cpp
+++ b/js/src/jsdtoa.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdtoa.h b/js/src/jsdtoa.h
index c55b8277ed40..dfd5393d1090 100644
--- a/js/src/jsdtoa.h
+++ b/js/src/jsdtoa.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 68a5e1da59c2..d6b8e4add71c 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsexn.h b/js/src/jsexn.h
index 4d14278db6f8..c7b8882bdce6 100644
--- a/js/src/jsexn.h
+++ b/js/src/jsexn.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index d2e8a0b84b12..cb69671550fe 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index a95600ac89a7..c0f4c975cb29 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 80ab7636f8a9..541dc965ce26 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index 4fce726bc1cf..d1cf351dcbc0 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
@@ -212,7 +212,7 @@ class JSFunction : public JSObject
 
     js::RawScript getOrCreateScript(JSContext *cx) {
         JS_ASSERT(isInterpreted());
-				JS_ASSERT(cx);
+        JS_ASSERT(cx);
         if (isInterpretedLazy()) {
             JS::RootedFunction self(cx, this);
             js::MaybeCheckStackRoots(cx);
diff --git a/js/src/jsfuninlines.h b/js/src/jsfuninlines.h
index 0a0b49ad79c4..a15eb7ec3b48 100644
--- a/js/src/jsfuninlines.h
+++ b/js/src/jsfuninlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index f89147853304..7e5e0fda211c 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 6b26f57faadb..22894caf3bdf 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index a684d0636d5f..9fc17ff96585 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 508eb23b1413..75d40a8f30e7 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsinfer.h b/js/src/jsinfer.h
index 1043a9954265..2d26722ad9f7 100644
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h
index c6d29d39a7ea..c3dbb5f8f067 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index f1bb3881c222..2da5e5a97ba0 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 9cbd70dbeafa..9887aa0e6db9 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index 56a513dd30bc..989cb28cb43c 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 0308f4daee56..60d9531003c5 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsiter.h b/js/src/jsiter.h
index 3d7627384df6..6640de902901 100644
--- a/js/src/jsiter.h
+++ b/js/src/jsiter.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jskwgen.cpp b/js/src/jskwgen.cpp
index c488184603f7..c5e66707fb98 100644
--- a/js/src/jskwgen.cpp
+++ b/js/src/jskwgen.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jslibmath.h b/js/src/jslibmath.h
index 778d7f8ae1de..bcd136a1a79b 100644
--- a/js/src/jslibmath.h
+++ b/js/src/jslibmath.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jslock.h b/js/src/jslock.h
index 025aaea0af82..b4a28a9fa9c4 100644
--- a/js/src/jslock.h
+++ b/js/src/jslock.h
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+
 #ifndef jslock_h__
 #define jslock_h__
 
diff --git a/js/src/jslog2.cpp b/js/src/jslog2.cpp
index d02400721365..cee3d0d13e22 100644
--- a/js/src/jslog2.cpp
+++ b/js/src/jslog2.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
index aa0526391cac..8f889b82151d 100644
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsmath.h b/js/src/jsmath.h
index 91150d809fc9..4f2a4b467eca 100644
--- a/js/src/jsmath.h
+++ b/js/src/jsmath.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsmemorymetrics.cpp b/js/src/jsmemorymetrics.cpp
index 351d965446e5..2b309f6fbba8 100644
--- a/js/src/jsmemorymetrics.cpp
+++ b/js/src/jsmemorymetrics.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
index 9fec01d35f0d..cd301292d72d 100644
--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
@@ -1,7 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 et sw=4 tw=80:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsnativestack.h b/js/src/jsnativestack.h
index 3f823f56d22f..916bee2d0394 100644
--- a/js/src/jsnativestack.h
+++ b/js/src/jsnativestack.h
@@ -1,7 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 et sw=4 tw=80:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index e89b967840ae..a982b33ca446 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsnum.h b/js/src/jsnum.h
index 653ff12fddf0..0f765f3c616b 100644
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsnuminlines.h b/js/src/jsnuminlines.h
index c17909fdb52e..1c4dcf515d56 100644
--- a/js/src/jsnuminlines.h
+++ b/js/src/jsnuminlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 50097ee541bc..122aa48b0576 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 919e33229145..8579222b1c11 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index a78e32222ba7..e00de1cb4160 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 66e73b9dea9a..f58060abc4a5 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/json.h b/js/src/json.h
index bb21f9145151..7fa2c117c804 100644
--- a/js/src/json.h
+++ b/js/src/json.h
@@ -1,4 +1,6 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsonparser.cpp b/js/src/jsonparser.cpp
index 3b4b1ebb2a8c..9c89d08b4997 100644
--- a/js/src/jsonparser.cpp
+++ b/js/src/jsonparser.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsonparser.h b/js/src/jsonparser.h
index 10c954055ff8..d8df9946b27b 100644
--- a/js/src/jsonparser.h
+++ b/js/src/jsonparser.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index aafd8bbf4b6e..2ce6dfc2c2a0 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsopcode.h b/js/src/jsopcode.h
index 1d1e17cbce46..f0ec5c580cb3 100644
--- a/js/src/jsopcode.h
+++ b/js/src/jsopcode.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsopcodeinlines.h b/js/src/jsopcodeinlines.h
index 5fd85cd891da..701be7785e5a 100644
--- a/js/src/jsopcodeinlines.h
+++ b/js/src/jsopcodeinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsoplengen.cpp b/js/src/jsoplengen.cpp
index 4bef284c5f5f..808f5ed778b9 100644
--- a/js/src/jsoplengen.cpp
+++ b/js/src/jsoplengen.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsprf.cpp b/js/src/jsprf.cpp
index 0a2ebc8e41e5..08fb08ff3fb5 100644
--- a/js/src/jsprf.cpp
+++ b/js/src/jsprf.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsprf.h b/js/src/jsprf.h
index 4c2bef91d29e..c0891f0e9e90 100644
--- a/js/src/jsprf.h
+++ b/js/src/jsprf.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsprobes.cpp b/js/src/jsprobes.cpp
index 3a103ea612b0..b2217b1b8c1f 100644
--- a/js/src/jsprobes.cpp
+++ b/js/src/jsprobes.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsprobes.h b/js/src/jsprobes.h
index 601bc5c70a03..0bd391a2b70a 100644
--- a/js/src/jsprobes.h
+++ b/js/src/jsprobes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspropertycache.cpp b/js/src/jspropertycache.cpp
index 20d074edd5f1..98a84f21df78 100644
--- a/js/src/jspropertycache.cpp
+++ b/js/src/jspropertycache.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=98:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspropertycache.h b/js/src/jspropertycache.h
index b63aff4c7026..ce0acab2c78f 100644
--- a/js/src/jspropertycache.h
+++ b/js/src/jspropertycache.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=98:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspropertycacheinlines.h b/js/src/jspropertycacheinlines.h
index 48e1a7874db7..910a9e180a74 100644
--- a/js/src/jspropertycacheinlines.h
+++ b/js/src/jspropertycacheinlines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspropertytree.cpp b/js/src/jspropertytree.cpp
index cf32bfac4e1a..6e8843821c1d 100644
--- a/js/src/jspropertytree.cpp
+++ b/js/src/jspropertytree.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jspropertytree.h b/js/src/jspropertytree.h
index 4c3fbd725a2a..d269e2937c4e 100644
--- a/js/src/jspropertytree.h
+++ b/js/src/jspropertytree.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsprototypes.h b/js/src/jsprototypes.h
index 27f5c84450b1..007d25d7204f 100644
--- a/js/src/jsprototypes.h
+++ b/js/src/jsprototypes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 23220564a573..2d726d7e45ee 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -1,10 +1,9 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/.
- */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include <string.h>
 #include "jsapi.h"
 #include "jscntxt.h"
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index a6f7851744c8..54e91db7fa61 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsprvtd.h b/js/src/jsprvtd.h
index a131e61ba6e0..4db5ed8c36d0 100644
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index 2159dd4f6cc6..ab124ee57104 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsreflect.cpp b/js/src/jsreflect.cpp
index 16978563e9c8..e97e31344415 100644
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsreflect.h b/js/src/jsreflect.h
index b517c1bc4d90..be973527970c 100644
--- a/js/src/jsreflect.h
+++ b/js/src/jsreflect.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index ed61d59d663b..3135a6159e31 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 595287a6b12b..38f8b8d69d6e 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsscriptinlines.h b/js/src/jsscriptinlines.h
index 2861ea2e5f4c..560aa44a14ab 100644
--- a/js/src/jsscriptinlines.h
+++ b/js/src/jsscriptinlines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79 ft=cpp:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index de0dd134c7aa..976ca4b776a9 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsstr.h b/js/src/jsstr.h
index 10ae7b2fc106..8a1d270ad720 100644
--- a/js/src/jsstr.h
+++ b/js/src/jsstr.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsstrinlines.h b/js/src/jsstrinlines.h
index 82550466197c..262a1d11a33a 100644
--- a/js/src/jsstrinlines.h
+++ b/js/src/jsstrinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index bc07ee898708..402cf9c35998 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h
index 08ad9479e92c..05cfdec260c2 100644
--- a/js/src/jstypedarray.h
+++ b/js/src/jstypedarray.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jstypedarrayinlines.h b/js/src/jstypedarrayinlines.h
index 22e30038b946..952ecb100505 100644
--- a/js/src/jstypedarrayinlines.h
+++ b/js/src/jstypedarrayinlines.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jstypes.h b/js/src/jstypes.h
index c83e7fed26e3..b597cf3b987b 100644
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsutil.cpp b/js/src/jsutil.cpp
index f04077996b08..fc4341002444 100644
--- a/js/src/jsutil.cpp
+++ b/js/src/jsutil.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsutil.h b/js/src/jsutil.h
index ff77e41a8893..ed7e0989e0f7 100644
--- a/js/src/jsutil.h
+++ b/js/src/jsutil.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsversion.h b/js/src/jsversion.h
index 50e2fa6beb0b..64f2ad217675 100644
--- a/js/src/jsversion.h
+++ b/js/src/jsversion.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jswatchpoint.cpp b/js/src/jswatchpoint.cpp
index 152eb4d0f211..42b6a272bd8d 100644
--- a/js/src/jswatchpoint.cpp
+++ b/js/src/jswatchpoint.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jswatchpoint.h b/js/src/jswatchpoint.h
index 2c05f77c77f3..47179327d6df 100644
--- a/js/src/jswatchpoint.h
+++ b/js/src/jswatchpoint.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsweakcache.h b/js/src/jsweakcache.h
index bc3ac58b2c57..54d810032461 100644
--- a/js/src/jsweakcache.h
+++ b/js/src/jsweakcache.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index dc0abbea626b..07fcbcd0885c 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsweakmap.h b/js/src/jsweakmap.h
index 47a7f42eff72..bc130e10c6ef 100644
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jswin.h b/js/src/jswin.h
index 50b548cb8fd7..689d23810677 100644
--- a/js/src/jswin.h
+++ b/js/src/jswin.h
@@ -1,4 +1,6 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsworkers.cpp b/js/src/jsworkers.cpp
index d80ee15f3037..f6a2e279f741 100644
--- a/js/src/jsworkers.cpp
+++ b/js/src/jsworkers.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsworkers.h b/js/src/jsworkers.h
index a3b7edafda00..89baca26d7ca 100644
--- a/js/src/jsworkers.h
+++ b/js/src/jsworkers.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 49958bf7920b..99be761711f8 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index 520191eef739..222ad6c95e48 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/BaseAssembler.h b/js/src/methodjit/BaseAssembler.h
index 7b84a48e532f..9e3af92cd4dc 100644
--- a/js/src/methodjit/BaseAssembler.h
+++ b/js/src/methodjit/BaseAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/BaseCompiler.h b/js/src/methodjit/BaseCompiler.h
index 3531ec04d773..ad3af9d3da38 100644
--- a/js/src/methodjit/BaseCompiler.h
+++ b/js/src/methodjit/BaseCompiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/CodeGenIncludes.h b/js/src/methodjit/CodeGenIncludes.h
index 23378e5e7e89..3cddee0a5638 100644
--- a/js/src/methodjit/CodeGenIncludes.h
+++ b/js/src/methodjit/CodeGenIncludes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index ef5680120c5d..b934effe95db 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Compiler.h b/js/src/methodjit/Compiler.h
index 5cafd3e298a4..9652a071c8fb 100644
--- a/js/src/methodjit/Compiler.h
+++ b/js/src/methodjit/Compiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FastArithmetic.cpp b/js/src/methodjit/FastArithmetic.cpp
index f2f6d19a1ea2..44c2361cacb3 100644
--- a/js/src/methodjit/FastArithmetic.cpp
+++ b/js/src/methodjit/FastArithmetic.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FastBuiltins.cpp b/js/src/methodjit/FastBuiltins.cpp
index 5415930e9ab2..8d907b836fbc 100644
--- a/js/src/methodjit/FastBuiltins.cpp
+++ b/js/src/methodjit/FastBuiltins.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FastOps.cpp b/js/src/methodjit/FastOps.cpp
index 45d038a9047c..4d6ec3126640 100644
--- a/js/src/methodjit/FastOps.cpp
+++ b/js/src/methodjit/FastOps.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FrameEntry.h b/js/src/methodjit/FrameEntry.h
index 53e6b0b493c0..5d3b5c38218f 100644
--- a/js/src/methodjit/FrameEntry.h
+++ b/js/src/methodjit/FrameEntry.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FrameState-inl.h b/js/src/methodjit/FrameState-inl.h
index a12867a47e38..0a4b6439c1e5 100644
--- a/js/src/methodjit/FrameState-inl.h
+++ b/js/src/methodjit/FrameState-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FrameState.cpp b/js/src/methodjit/FrameState.cpp
index bdfbf2ffbece..186fb524e86c 100644
--- a/js/src/methodjit/FrameState.cpp
+++ b/js/src/methodjit/FrameState.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FrameState.h b/js/src/methodjit/FrameState.h
index 85f1f959d913..f568943a70c3 100644
--- a/js/src/methodjit/FrameState.h
+++ b/js/src/methodjit/FrameState.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ICChecker.h b/js/src/methodjit/ICChecker.h
index 93c4889bf992..44c06cc100e5 100644
--- a/js/src/methodjit/ICChecker.h
+++ b/js/src/methodjit/ICChecker.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ICLabels.h b/js/src/methodjit/ICLabels.h
index 4b422ff94883..8d4e8ad2106c 100644
--- a/js/src/methodjit/ICLabels.h
+++ b/js/src/methodjit/ICLabels.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ICRepatcher.h b/js/src/methodjit/ICRepatcher.h
index 79c7666b9a00..2d5ea4035caa 100644
--- a/js/src/methodjit/ICRepatcher.h
+++ b/js/src/methodjit/ICRepatcher.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ImmutableSync.cpp b/js/src/methodjit/ImmutableSync.cpp
index a763b5c0a479..7cef76bb72ff 100644
--- a/js/src/methodjit/ImmutableSync.cpp
+++ b/js/src/methodjit/ImmutableSync.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ImmutableSync.h b/js/src/methodjit/ImmutableSync.h
index f232175db78f..bd1429efa655 100644
--- a/js/src/methodjit/ImmutableSync.h
+++ b/js/src/methodjit/ImmutableSync.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/InlineFrameAssembler.h b/js/src/methodjit/InlineFrameAssembler.h
index 12d3bac8f3b6..b80bb52d24bd 100644
--- a/js/src/methodjit/InlineFrameAssembler.h
+++ b/js/src/methodjit/InlineFrameAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index c02d6db68996..582558fb60f2 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Logging.cpp b/js/src/methodjit/Logging.cpp
index 5bca55ccc240..7ecf536d8bb1 100644
--- a/js/src/methodjit/Logging.cpp
+++ b/js/src/methodjit/Logging.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Logging.h b/js/src/methodjit/Logging.h
index fff123e911ce..6825f0313695 100644
--- a/js/src/methodjit/Logging.h
+++ b/js/src/methodjit/Logging.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/LoopState.cpp b/js/src/methodjit/LoopState.cpp
index 21e65fd40865..92e9c6dffce8 100644
--- a/js/src/methodjit/LoopState.cpp
+++ b/js/src/methodjit/LoopState.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/LoopState.h b/js/src/methodjit/LoopState.h
index 6280bf2598bc..3518ba88e5eb 100644
--- a/js/src/methodjit/LoopState.h
+++ b/js/src/methodjit/LoopState.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MachineRegs.h b/js/src/methodjit/MachineRegs.h
index e355dd7b6cab..2b5d80c51600 100644
--- a/js/src/methodjit/MachineRegs.h
+++ b/js/src/methodjit/MachineRegs.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
index 94f145bf00fd..7741b59b7fa9 100644
--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MethodJIT.h b/js/src/methodjit/MethodJIT.h
index c813d1fc47f6..a60415f82e0c 100644
--- a/js/src/methodjit/MethodJIT.h
+++ b/js/src/methodjit/MethodJIT.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MonoIC.cpp b/js/src/methodjit/MonoIC.cpp
index b07bdeab577d..f633ef29d8a9 100644
--- a/js/src/methodjit/MonoIC.cpp
+++ b/js/src/methodjit/MonoIC.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MonoIC.h b/js/src/methodjit/MonoIC.h
index 852dacc02f65..acb0acdc6aef 100644
--- a/js/src/methodjit/MonoIC.h
+++ b/js/src/methodjit/MonoIC.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/NunboxAssembler.h b/js/src/methodjit/NunboxAssembler.h
index 9d764a5f0e88..8c30afc06815 100644
--- a/js/src/methodjit/NunboxAssembler.h
+++ b/js/src/methodjit/NunboxAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp
index df176bc13de1..f76a68abdbf0 100644
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/PolyIC.h b/js/src/methodjit/PolyIC.h
index f7b4423c3f09..e17226aaeb2a 100644
--- a/js/src/methodjit/PolyIC.h
+++ b/js/src/methodjit/PolyIC.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/PunboxAssembler.h b/js/src/methodjit/PunboxAssembler.h
index 959ba595f306..7a066bd4ffc9 100644
--- a/js/src/methodjit/PunboxAssembler.h
+++ b/js/src/methodjit/PunboxAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/RematInfo.h b/js/src/methodjit/RematInfo.h
index cd9ec7a2e50d..c0bdc40e3881 100644
--- a/js/src/methodjit/RematInfo.h
+++ b/js/src/methodjit/RematInfo.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Retcon.cpp b/js/src/methodjit/Retcon.cpp
index d91286108123..2479236a3a5c 100644
--- a/js/src/methodjit/Retcon.cpp
+++ b/js/src/methodjit/Retcon.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Retcon.h b/js/src/methodjit/Retcon.h
index d4e688bf7046..8e4105644347 100644
--- a/js/src/methodjit/Retcon.h
+++ b/js/src/methodjit/Retcon.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCalls-inl.h b/js/src/methodjit/StubCalls-inl.h
index cf5903865f93..47f4725e04fa 100644
--- a/js/src/methodjit/StubCalls-inl.h
+++ b/js/src/methodjit/StubCalls-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index 5a6a8f956c2b..f2ba2f6939a9 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCalls.h b/js/src/methodjit/StubCalls.h
index 23dc2420d03f..e620b37dba3d 100644
--- a/js/src/methodjit/StubCalls.h
+++ b/js/src/methodjit/StubCalls.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCompiler.cpp b/js/src/methodjit/StubCompiler.cpp
index f366d8e826ac..77754e2f60f9 100644
--- a/js/src/methodjit/StubCompiler.cpp
+++ b/js/src/methodjit/StubCompiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCompiler.h b/js/src/methodjit/StubCompiler.h
index e2a0d49c4e03..be3b4b97c021 100644
--- a/js/src/methodjit/StubCompiler.h
+++ b/js/src/methodjit/StubCompiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/TrampolineCompiler.cpp b/js/src/methodjit/TrampolineCompiler.cpp
index 81478f2d8891..4860a7ecb522 100644
--- a/js/src/methodjit/TrampolineCompiler.cpp
+++ b/js/src/methodjit/TrampolineCompiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/TrampolineCompiler.h b/js/src/methodjit/TrampolineCompiler.h
index 11e118be78fe..e3d4a6e8bffc 100644
--- a/js/src/methodjit/TrampolineCompiler.h
+++ b/js/src/methodjit/TrampolineCompiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/TrampolineMIPS.cpp b/js/src/methodjit/TrampolineMIPS.cpp
index 7be2e42d01a3..4da001eda725 100644
--- a/js/src/methodjit/TrampolineMIPS.cpp
+++ b/js/src/methodjit/TrampolineMIPS.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/TypedArrayIC.h b/js/src/methodjit/TypedArrayIC.h
index aa86cb2f8ead..16deeb770adb 100644
--- a/js/src/methodjit/TypedArrayIC.h
+++ b/js/src/methodjit/TypedArrayIC.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/perf/jsperf.cpp b/js/src/perf/jsperf.cpp
index 7caa12a50a28..7c2abd24c11a 100644
--- a/js/src/perf/jsperf.cpp
+++ b/js/src/perf/jsperf.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/jsperf.h b/js/src/perf/jsperf.h
index 265478c33ebb..aaf513342736 100644
--- a/js/src/perf/jsperf.h
+++ b/js/src/perf/jsperf.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/pm_linux.cpp b/js/src/perf/pm_linux.cpp
index 3156354bdff7..de5675eff5e9 100644
--- a/js/src/perf/pm_linux.cpp
+++ b/js/src/perf/pm_linux.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/pm_stub.cpp b/js/src/perf/pm_stub.cpp
index 4af53cb1250f..cf82288f093c 100644
--- a/js/src/perf/pm_stub.cpp
+++ b/js/src/perf/pm_stub.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/prmjtime.cpp b/js/src/prmjtime.cpp
index a5bb6478220b..4fa2ae2359ff 100644
--- a/js/src/prmjtime.cpp
+++ b/js/src/prmjtime.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/prmjtime.h b/js/src/prmjtime.h
index e7b13c35d4a0..30ee7c080b99 100644
--- a/js/src/prmjtime.h
+++ b/js/src/prmjtime.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 4c496dc4f09b..c58c6c0d1408 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/jsheaptools.cpp b/js/src/shell/jsheaptools.cpp
index 4cae34a43cf5..e5d38ba1538c 100644
--- a/js/src/shell/jsheaptools.cpp
+++ b/js/src/shell/jsheaptools.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/jsheaptools.h b/js/src/shell/jsheaptools.h
index 55e12ab39ffc..326102668a2c 100644
--- a/js/src/shell/jsheaptools.h
+++ b/js/src/shell/jsheaptools.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp
index 1a54690de8c8..0556b747eb76 100644
--- a/js/src/shell/jsoptparse.cpp
+++ b/js/src/shell/jsoptparse.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/jsoptparse.h b/js/src/shell/jsoptparse.h
index 7e2ef72e994a..9e52cb97871a 100644
--- a/js/src/shell/jsoptparse.h
+++ b/js/src/shell/jsoptparse.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/tests/ecma_2/Exceptions/exception-010-n.js b/js/src/tests/ecma_2/Exceptions/exception-010-n.js
index 95f5ef725d3d..51931804e4ca 100644
--- a/js/src/tests/ecma_2/Exceptions/exception-010-n.js
+++ b/js/src/tests/ecma_2/Exceptions/exception-010-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_2/Exceptions/exception-011-n.js b/js/src/tests/ecma_2/Exceptions/exception-011-n.js
index 533765a69f28..dc08346ca9a1 100644
--- a/js/src/tests/ecma_2/Exceptions/exception-011-n.js
+++ b/js/src/tests/ecma_2/Exceptions/exception-011-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js b/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
index f19fce62e90f..932f51ab804e 100644
--- a/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
+++ b/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Exceptions/regress-58946.js b/js/src/tests/ecma_3/Exceptions/regress-58946.js
index c961e5ab739a..1147fdd633d6 100644
--- a/js/src/tests/ecma_3/Exceptions/regress-58946.js
+++ b/js/src/tests/ecma_3/Exceptions/regress-58946.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
index 3f8b6a84778f..5352534a3f38 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
index 1e6b115a61b2..97ec349a0e59 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js b/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
index 41ae113c9123..1a6cb1a21ddc 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-001-n.js b/js/src/tests/ecma_3/FunExpr/fe-001-n.js
index 55c57212ec40..d1f9c3e49545 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-001-n.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-001-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-001.js b/js/src/tests/ecma_3/FunExpr/fe-001.js
index a68d6e10aa12..f80f34e2e8c4 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-001.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-001.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-002.js b/js/src/tests/ecma_3/FunExpr/fe-002.js
index 9ee5bfbaf250..5619fbbb65da 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-002.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-002.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/NumberFormatting/tostring-001.js b/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
index 49915472953e..8634f53dd4f7 100644
--- a/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
+++ b/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/RegExp/regress-24712.js b/js/src/tests/ecma_3/RegExp/regress-24712.js
index dfaded2661f0..d675f6a3c184 100644
--- a/js/src/tests/ecma_3/RegExp/regress-24712.js
+++ b/js/src/tests/ecma_3/RegExp/regress-24712.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/RegExp/regress-28686.js b/js/src/tests/ecma_3/RegExp/regress-28686.js
index 669455ba6893..1e3871f1968c 100644
--- a/js/src/tests/ecma_3/RegExp/regress-28686.js
+++ b/js/src/tests/ecma_3/RegExp/regress-28686.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-001-n.js b/js/src/tests/ecma_3/Unicode/uc-001-n.js
index 80dc1a782939..566c7459f5a7 100644
--- a/js/src/tests/ecma_3/Unicode/uc-001-n.js
+++ b/js/src/tests/ecma_3/Unicode/uc-001-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-001.js b/js/src/tests/ecma_3/Unicode/uc-001.js
index 2a81693d5ff1..bfb8fd515ef4 100644
--- a/js/src/tests/ecma_3/Unicode/uc-001.js
+++ b/js/src/tests/ecma_3/Unicode/uc-001.js
@@ -1,6 +1,5 @@
 // |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-002-n.js b/js/src/tests/ecma_3/Unicode/uc-002-n.js
index 6d673f88b983..ca09090d6304 100644
--- a/js/src/tests/ecma_3/Unicode/uc-002-n.js
+++ b/js/src/tests/ecma_3/Unicode/uc-002-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-002.js b/js/src/tests/ecma_3/Unicode/uc-002.js
index 93d78b9ebb70..1ff15d3769ab 100644
--- a/js/src/tests/ecma_3/Unicode/uc-002.js
+++ b/js/src/tests/ecma_3/Unicode/uc-002.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-003.js b/js/src/tests/ecma_3/Unicode/uc-003.js
index f77b3b9dcea0..d06815cf941a 100644
--- a/js/src/tests/ecma_3/Unicode/uc-003.js
+++ b/js/src/tests/ecma_3/Unicode/uc-003.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-004.js b/js/src/tests/ecma_3/Unicode/uc-004.js
index a82eb3528c37..5d243d56de3f 100644
--- a/js/src/tests/ecma_3/Unicode/uc-004.js
+++ b/js/src/tests/ecma_3/Unicode/uc-004.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/Exceptions/catchguard-002-n.js b/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
index 08b9f52d499a..fbbcecd3bc99 100644
--- a/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
+++ b/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/Exceptions/catchguard-003-n.js b/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
index c768f1f046f8..0d4e1767e5e4 100644
--- a/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
+++ b/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/GetSet/getset-002.js b/js/src/tests/js1_5/GetSet/getset-002.js
index 114a282fb778..d2a5c2218024 100644
--- a/js/src/tests/js1_5/GetSet/getset-002.js
+++ b/js/src/tests/js1_5/GetSet/getset-002.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-001-n.js b/js/src/tests/js1_5/extensions/catchguard-001-n.js
index 8d357fd39ac4..8e0a5ad7feee 100644
--- a/js/src/tests/js1_5/extensions/catchguard-001-n.js
+++ b/js/src/tests/js1_5/extensions/catchguard-001-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-001.js b/js/src/tests/js1_5/extensions/catchguard-001.js
index c1e447f105f4..da531a13ec3b 100644
--- a/js/src/tests/js1_5/extensions/catchguard-001.js
+++ b/js/src/tests/js1_5/extensions/catchguard-001.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-002.js b/js/src/tests/js1_5/extensions/catchguard-002.js
index 8148ca45e455..da590140236a 100644
--- a/js/src/tests/js1_5/extensions/catchguard-002.js
+++ b/js/src/tests/js1_5/extensions/catchguard-002.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-003.js b/js/src/tests/js1_5/extensions/catchguard-003.js
index 9e64f89d23ed..97f2cbfea310 100644
--- a/js/src/tests/js1_5/extensions/catchguard-003.js
+++ b/js/src/tests/js1_5/extensions/catchguard-003.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/getset-001.js b/js/src/tests/js1_5/extensions/getset-001.js
index 2e6b9488dab5..2609f359aa9c 100644
--- a/js/src/tests/js1_5/extensions/getset-001.js
+++ b/js/src/tests/js1_5/extensions/getset-001.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/regress-50447-1.js b/js/src/tests/js1_5/extensions/regress-50447-1.js
index 55ca6aca7f00..4d08d3825e03 100644
--- a/js/src/tests/js1_5/extensions/regress-50447-1.js
+++ b/js/src/tests/js1_5/extensions/regress-50447-1.js
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/regress-50447.js b/js/src/tests/js1_5/extensions/regress-50447.js
index 1621d5576395..32044a8edc4e 100644
--- a/js/src/tests/js1_5/extensions/regress-50447.js
+++ b/js/src/tests/js1_5/extensions/regress-50447.js
@@ -1,6 +1,5 @@
 // |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_6/shell.js b/js/src/tests/js1_6/shell.js
index d378e171db67..a5bfae873392 100644
--- a/js/src/tests/js1_6/shell.js
+++ b/js/src/tests/js1_6/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_7/shell.js b/js/src/tests/js1_7/shell.js
index 13cf0022e7a7..9c935544e6ca 100644
--- a/js/src/tests/js1_7/shell.js
+++ b/js/src/tests/js1_7/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_8/shell.js b/js/src/tests/js1_8/shell.js
index d61c2d6a07b9..934ae1489d02 100644
--- a/js/src/tests/js1_8/shell.js
+++ b/js/src/tests/js1_8/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_8_1/shell.js b/js/src/tests/js1_8_1/shell.js
index d8fe725b7444..f4eadfbb411d 100644
--- a/js/src/tests/js1_8_1/shell.js
+++ b/js/src/tests/js1_8_1/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/shell.js b/js/src/tests/shell.js
index 08abb3bb518e..c2d42e4e6fd3 100644
--- a/js/src/tests/shell.js
+++ b/js/src/tests/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject-inl.h b/js/src/vm/ArgumentsObject-inl.h
index b94c1de19f4e..c442eda6e559 100644
--- a/js/src/vm/ArgumentsObject-inl.h
+++ b/js/src/vm/ArgumentsObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index 9e77cf3e6da1..73ad153f2464 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index 162ceeea73e4..fbb70f0b84f4 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/BooleanObject-inl.h b/js/src/vm/BooleanObject-inl.h
index c36e75d05111..b84171b8eb1d 100644
--- a/js/src/vm/BooleanObject-inl.h
+++ b/js/src/vm/BooleanObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/BooleanObject.h b/js/src/vm/BooleanObject.h
index 0df94da2cf86..3892a404e19e 100644
--- a/js/src/vm/BooleanObject.h
+++ b/js/src/vm/BooleanObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/CharacterEncoding.cpp b/js/src/vm/CharacterEncoding.cpp
index 96d94d86cb19..79266f4fd4db 100644
--- a/js/src/vm/CharacterEncoding.cpp
+++ b/js/src/vm/CharacterEncoding.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index 2f363a4a0d51..48acbbbcbbb8 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp
index 4bf194cf7add..9c839c7ef156 100644
--- a/js/src/vm/DateTime.cpp
+++ b/js/src/vm/DateTime.cpp
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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 "DateTime.h"
 
diff --git a/js/src/vm/DateTime.h b/js/src/vm/DateTime.h
index 4dff3186439e..3d006a8f7654 100644
--- a/js/src/vm/DateTime.h
+++ b/js/src/vm/DateTime.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef DateTime_h___
 #define DateTime_h___
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 032867ff5841..fa2e5b24fd79 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index 48c759105f9e..b04d1abaa3eb 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ForkJoin.cpp b/js/src/vm/ForkJoin.cpp
index 6c654568eeeb..f636cbae1a21 100644
--- a/js/src/vm/ForkJoin.cpp
+++ b/js/src/vm/ForkJoin.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ForkJoin.h b/js/src/vm/ForkJoin.h
index 1b89efdc4377..a5c244310e73 100644
--- a/js/src/vm/ForkJoin.h
+++ b/js/src/vm/ForkJoin.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/GlobalObject-inl.h b/js/src/vm/GlobalObject-inl.h
index 9797cfd3918b..06d103aee0f1 100644
--- a/js/src/vm/GlobalObject-inl.h
+++ b/js/src/vm/GlobalObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index 97e2300eebf4..67ba84486057 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/GlobalObject.h b/js/src/vm/GlobalObject.h
index 783d4fdf18c7..3886b133c09b 100644
--- a/js/src/vm/GlobalObject.h
+++ b/js/src/vm/GlobalObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Keywords.h b/js/src/vm/Keywords.h
index 0f0409a2e150..cc2d5dbc982e 100644
--- a/js/src/vm/Keywords.h
+++ b/js/src/vm/Keywords.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/MatchPairs.h b/js/src/vm/MatchPairs.h
index 8fd9320dab85..1018d7d67b33 100644
--- a/js/src/vm/MatchPairs.h
+++ b/js/src/vm/MatchPairs.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Monitor.cpp b/js/src/vm/Monitor.cpp
index 0cd21ae23443..f92ee48dc477 100644
--- a/js/src/vm/Monitor.cpp
+++ b/js/src/vm/Monitor.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Monitor.h b/js/src/vm/Monitor.h
index e13f138ce939..9b0144586bde 100644
--- a/js/src/vm/Monitor.h
+++ b/js/src/vm/Monitor.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/NumberObject-inl.h b/js/src/vm/NumberObject-inl.h
index e2822f9cc375..651cb93d6ddd 100644
--- a/js/src/vm/NumberObject-inl.h
+++ b/js/src/vm/NumberObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/NumberObject.h b/js/src/vm/NumberObject.h
index dc0ab3bdea74..48ee6383da35 100644
--- a/js/src/vm/NumberObject.h
+++ b/js/src/vm/NumberObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
index 42e69d63dd75..674df8cb58c0 100644
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef NumericConversions_h___
 #define NumericConversions_h___
diff --git a/js/src/vm/ObjectImpl-inl.h b/js/src/vm/ObjectImpl-inl.h
index 8423dacb09ad..a4048fac745a 100644
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/ObjectImpl-inl.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef ObjectImpl_inl_h___
 #define ObjectImpl_inl_h___
diff --git a/js/src/vm/ObjectImpl.cpp b/js/src/vm/ObjectImpl.cpp
index c009fc680b5e..7375b3da6419 100644
--- a/js/src/vm/ObjectImpl.cpp
+++ b/js/src/vm/ObjectImpl.cpp
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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 "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
diff --git a/js/src/vm/ObjectImpl.h b/js/src/vm/ObjectImpl.h
index 0e757f3e08c0..41237dc2c8e7 100644
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef ObjectImpl_h___
 #define ObjectImpl_h___
diff --git a/js/src/vm/ParallelDo.cpp b/js/src/vm/ParallelDo.cpp
index 6f4b63fdb064..461e5acff556 100644
--- a/js/src/vm/ParallelDo.cpp
+++ b/js/src/vm/ParallelDo.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ParallelDo.h b/js/src/vm/ParallelDo.h
index 807174528857..3188c147bd54 100644
--- a/js/src/vm/ParallelDo.h
+++ b/js/src/vm/ParallelDo.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/PropertyKey.cpp b/js/src/vm/PropertyKey.cpp
index d7ca7b371607..0935cd377c8b 100644
--- a/js/src/vm/PropertyKey.cpp
+++ b/js/src/vm/PropertyKey.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h
index d6a0f04fac13..d1f3371356d2 100644
--- a/js/src/vm/RegExpObject-inl.h
+++ b/js/src/vm/RegExpObject-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
index b2fe90262352..232c4e8328e5 100644
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h
index 61d329dedc73..929d7147ee06 100644
--- a/js/src/vm/RegExpObject.h
+++ b/js/src/vm/RegExpObject.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpStatics-inl.h b/js/src/vm/RegExpStatics-inl.h
index d70fdf2dccec..8b8842e40c71 100644
--- a/js/src/vm/RegExpStatics-inl.h
+++ b/js/src/vm/RegExpStatics-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpStatics.cpp b/js/src/vm/RegExpStatics.cpp
index 8f2b761fcaec..99e6d86b5f1b 100644
--- a/js/src/vm/RegExpStatics.cpp
+++ b/js/src/vm/RegExpStatics.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpStatics.h b/js/src/vm/RegExpStatics.h
index 9a7a84e934da..422424f91a0a 100644
--- a/js/src/vm/RegExpStatics.h
+++ b/js/src/vm/RegExpStatics.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/SPSProfiler.cpp b/js/src/vm/SPSProfiler.cpp
index 8e44d71ca853..d39903b61960 100644
--- a/js/src/vm/SPSProfiler.cpp
+++ b/js/src/vm/SPSProfiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/SPSProfiler.h b/js/src/vm/SPSProfiler.h
index 80c6b09e6baf..16defd8a6f94 100644
--- a/js/src/vm/SPSProfiler.h
+++ b/js/src/vm/SPSProfiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ScopeObject-inl.h b/js/src/vm/ScopeObject-inl.h
index 63daedcba784..d85c8879ac26 100644
--- a/js/src/vm/ScopeObject-inl.h
+++ b/js/src/vm/ScopeObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index 91025f40cbcf..364f54aea2c1 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 6; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ScopeObject.h b/js/src/vm/ScopeObject.h
index fdb9303803e9..b9cb94f584eb 100644
--- a/js/src/vm/ScopeObject.h
+++ b/js/src/vm/ScopeObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index 0fed32c33a84..7f6ba8028160 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Shape-inl.h b/js/src/vm/Shape-inl.h
index b0d0ab45f502..2abc80cfaa94 100644
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/vm/Shape.cpp b/js/src/vm/Shape.cpp
index 8e3c7996f461..674e67958f74 100644
--- a/js/src/vm/Shape.cpp
+++ b/js/src/vm/Shape.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
index 53ab88e40db8..dff5a03c63b8 100644
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Stack-inl.h b/js/src/vm/Stack-inl.h
index 4d77179b9a29..a925de1e4e9c 100644
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index c38bbc188ea6..db4c42ac0d87 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index e10c627d5f22..e197fc03fcec 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/String-inl.h b/js/src/vm/String-inl.h
index 7be763b696d9..981a9651b55d 100644
--- a/js/src/vm/String-inl.h
+++ b/js/src/vm/String-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/String.cpp b/js/src/vm/String.cpp
index d6d550fd40bf..1bb9b86c641f 100644
--- a/js/src/vm/String.cpp
+++ b/js/src/vm/String.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/String.h b/js/src/vm/String.h
index 9fd5899cd988..e7769c0e4ec9 100644
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/StringBuffer.cpp b/js/src/vm/StringBuffer.cpp
index 459571a70dc6..1ecc31c7f046 100644
--- a/js/src/vm/StringBuffer.cpp
+++ b/js/src/vm/StringBuffer.cpp
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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 "vm/StringBuffer.h"
 
diff --git a/js/src/vm/StringBuffer.h b/js/src/vm/StringBuffer.h
index 7706e83032dd..92ab4f8c6eeb 100644
--- a/js/src/vm/StringBuffer.h
+++ b/js/src/vm/StringBuffer.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef StringBuffer_h___
 #define StringBuffer_h___
diff --git a/js/src/vm/StringObject-inl.h b/js/src/vm/StringObject-inl.h
index 0940081d9e0e..b1b01bbdddc3 100644
--- a/js/src/vm/StringObject-inl.h
+++ b/js/src/vm/StringObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/StringObject.h b/js/src/vm/StringObject.h
index 75446443365c..59510956a0e6 100644
--- a/js/src/vm/StringObject.h
+++ b/js/src/vm/StringObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ThreadPool.cpp b/js/src/vm/ThreadPool.cpp
index 7eee4965cc11..754ad507d2cd 100644
--- a/js/src/vm/ThreadPool.cpp
+++ b/js/src/vm/ThreadPool.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/vm/ThreadPool.h b/js/src/vm/ThreadPool.h
index 901894137ad8..75698d526ad5 100644
--- a/js/src/vm/ThreadPool.h
+++ b/js/src/vm/ThreadPool.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Unicode.h b/js/src/vm/Unicode.h
index a83a0925de36..27fde7a60373 100644
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -1,4 +1,6 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/vm/Xdr.cpp b/js/src/vm/Xdr.cpp
index 34fc4b6b0668..d248926f9cca 100644
--- a/js/src/vm/Xdr.cpp
+++ b/js/src/vm/Xdr.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index 3ad573a6de0f..46a00ba9de51 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/yarr/ASCIICType.h b/js/src/yarr/ASCIICType.h
index a3ae9f4455e2..2082b758bc56 100644
--- a/js/src/yarr/ASCIICType.h
+++ b/js/src/yarr/ASCIICType.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/BumpPointerAllocator.h b/js/src/yarr/BumpPointerAllocator.h
index 6d23a684831e..a43a5d8ba2d4 100644
--- a/js/src/yarr/BumpPointerAllocator.h
+++ b/js/src/yarr/BumpPointerAllocator.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/CheckedArithmetic.h b/js/src/yarr/CheckedArithmetic.h
index 0f60971d0f1f..21aa188bd969 100644
--- a/js/src/yarr/CheckedArithmetic.h
+++ b/js/src/yarr/CheckedArithmetic.h
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/MatchResult.h b/js/src/yarr/MatchResult.h
index e28ac4bbf42f..4ebc936779d5 100644
--- a/js/src/yarr/MatchResult.h
+++ b/js/src/yarr/MatchResult.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/OSAllocator.h b/js/src/yarr/OSAllocator.h
index ecfdc3b042ec..c8b815b52d2e 100644
--- a/js/src/yarr/OSAllocator.h
+++ b/js/src/yarr/OSAllocator.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorOS2.cpp b/js/src/yarr/OSAllocatorOS2.cpp
index ead003084dd1..466b9e949d81 100644
--- a/js/src/yarr/OSAllocatorOS2.cpp
+++ b/js/src/yarr/OSAllocatorOS2.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorPosix.cpp b/js/src/yarr/OSAllocatorPosix.cpp
index 99bf061467ca..013b6af0771a 100644
--- a/js/src/yarr/OSAllocatorPosix.cpp
+++ b/js/src/yarr/OSAllocatorPosix.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorWin.cpp b/js/src/yarr/OSAllocatorWin.cpp
index 08df9e98aefb..a5d5fa7db823 100644
--- a/js/src/yarr/OSAllocatorWin.cpp
+++ b/js/src/yarr/OSAllocatorWin.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageAllocation.h b/js/src/yarr/PageAllocation.h
index a86f37116e50..42a57f6ae5fe 100644
--- a/js/src/yarr/PageAllocation.h
+++ b/js/src/yarr/PageAllocation.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageBlock.cpp b/js/src/yarr/PageBlock.cpp
index 047172d6476f..0ffc1bc95157 100644
--- a/js/src/yarr/PageBlock.cpp
+++ b/js/src/yarr/PageBlock.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageBlock.h b/js/src/yarr/PageBlock.h
index 145bb0a8d63a..ea98f42f2237 100644
--- a/js/src/yarr/PageBlock.h
+++ b/js/src/yarr/PageBlock.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/VMTags.h b/js/src/yarr/VMTags.h
index fe6a006d3601..f44136907fe7 100644
--- a/js/src/yarr/VMTags.h
+++ b/js/src/yarr/VMTags.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/Yarr.h b/js/src/yarr/Yarr.h
index 110ae4124bed..da9a0ec70f33 100644
--- a/js/src/yarr/Yarr.h
+++ b/js/src/yarr/Yarr.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
  * All rights reserved.
diff --git a/js/src/yarr/YarrCanonicalizeUCS2.cpp b/js/src/yarr/YarrCanonicalizeUCS2.cpp
index ce3a372a6a63..e6d334212fd3 100644
--- a/js/src/yarr/YarrCanonicalizeUCS2.cpp
+++ b/js/src/yarr/YarrCanonicalizeUCS2.cpp
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrCanonicalizeUCS2.h b/js/src/yarr/YarrCanonicalizeUCS2.h
index 735064ac803b..874af40e8693 100644
--- a/js/src/yarr/YarrCanonicalizeUCS2.h
+++ b/js/src/yarr/YarrCanonicalizeUCS2.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrInterpreter.cpp b/js/src/yarr/YarrInterpreter.cpp
index 296e7d5c9559..176fa381ac6e 100644
--- a/js/src/yarr/YarrInterpreter.cpp
+++ b/js/src/yarr/YarrInterpreter.cpp
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
  *
diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
index ae40fa7d1cac..0a3da2fbb1c9 100644
--- a/js/src/yarr/YarrInterpreter.h
+++ b/js/src/yarr/YarrInterpreter.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrJIT.cpp b/js/src/yarr/YarrJIT.cpp
index 225933ff5a5a..d570f4697d42 100644
--- a/js/src/yarr/YarrJIT.cpp
+++ b/js/src/yarr/YarrJIT.cpp
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrJIT.h b/js/src/yarr/YarrJIT.h
index fad19adfdf44..b4c03b7e9b23 100644
--- a/js/src/yarr/YarrJIT.h
+++ b/js/src/yarr/YarrJIT.h
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrParser.h b/js/src/yarr/YarrParser.h
index f5d1aca6095c..7cbeea0f010d 100644
--- a/js/src/yarr/YarrParser.h
+++ b/js/src/yarr/YarrParser.h
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrPattern.cpp b/js/src/yarr/YarrPattern.cpp
index f091b984884c..3de728032c18 100644
--- a/js/src/yarr/YarrPattern.cpp
+++ b/js/src/yarr/YarrPattern.cpp
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h
index 737de608199f..3baaf5369ed1 100644
--- a/js/src/yarr/YarrPattern.h
+++ b/js/src/yarr/YarrPattern.h
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
diff --git a/js/src/yarr/YarrSyntaxChecker.cpp b/js/src/yarr/YarrSyntaxChecker.cpp
index 34fb5010cfc9..bd4b8dc05025 100644
--- a/js/src/yarr/YarrSyntaxChecker.cpp
+++ b/js/src/yarr/YarrSyntaxChecker.cpp
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrSyntaxChecker.h b/js/src/yarr/YarrSyntaxChecker.h
index b6848e752681..e42d8afa8184 100644
--- a/js/src/yarr/YarrSyntaxChecker.h
+++ b/js/src/yarr/YarrSyntaxChecker.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h
index a7646b87ea34..890b269355f0 100644
--- a/js/src/yarr/wtfbridge.h
+++ b/js/src/yarr/wtfbridge.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 

From cbb7e746ff9725bf510896b85ee604cb261ecb85 Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Tue, 16 Apr 2013 16:08:38 -0500
Subject: [PATCH 049/438] Bug 803719: Add a toDOMRange API to CaretPosition and
 use it to maintain position for reflow-on-zoom feature. [r=kats,tn]

---
 content/base/src/nsDOMCaretPosition.cpp  | 33 +++++++++++-
 content/base/src/nsDOMCaretPosition.h    | 31 +++++++++++
 content/base/src/nsDocument.cpp          | 10 ++++
 content/base/src/nsRange.cpp             | 16 ++++++
 content/base/src/nsRange.h               |  3 ++
 dom/webidl/CaretPosition.webidl          |  2 +
 mobile/android/chrome/content/browser.js | 69 ++++++++++++++----------
 7 files changed, 135 insertions(+), 29 deletions(-)

diff --git a/content/base/src/nsDOMCaretPosition.cpp b/content/base/src/nsDOMCaretPosition.cpp
index 35711b4a9269..06c45bc3d368 100644
--- a/content/base/src/nsDOMCaretPosition.cpp
+++ b/content/base/src/nsDOMCaretPosition.cpp
@@ -7,7 +7,7 @@
 #include "nsContentUtils.h"
 
 nsDOMCaretPosition::nsDOMCaretPosition(nsINode* aNode, uint32_t aOffset)
-  : mOffset(aOffset), mOffsetNode(aNode)
+  : mOffset(aOffset), mOffsetNode(aNode), mAnonymousContentNode(nullptr)
 {
   SetIsDOMBinding();
 }
@@ -21,6 +21,37 @@ nsINode* nsDOMCaretPosition::GetOffsetNode() const
   return mOffsetNode;
 }
 
+already_AddRefed<nsClientRect>
+nsDOMCaretPosition::GetClientRect() const
+{
+  if (!mOffsetNode) {
+    return nullptr;
+  }
+
+  nsRefPtr<nsClientRect> rect;
+  nsRefPtr<nsRange> domRange;
+  nsCOMPtr<nsINode> node;
+
+  if (mAnonymousContentNode) {
+    node = mAnonymousContentNode;
+  } else {
+    node = mOffsetNode;
+  }
+
+  nsresult creationRv = nsRange::CreateRange(node, mOffset, node,
+                                             mOffset,
+                                             getter_AddRefs<nsRange>(domRange));
+  if (!NS_SUCCEEDED(creationRv)) {
+    return nullptr;
+  }
+
+  NS_ASSERTION(domRange, "unable to retrieve valid dom range from CaretPosition");
+
+  rect = domRange->GetBoundingClientRect();
+
+  return rect.forget();
+}
+
 JSObject*
 nsDOMCaretPosition::WrapObject(JSContext *aCx, JSObject *aScope)
 {
diff --git a/content/base/src/nsDOMCaretPosition.h b/content/base/src/nsDOMCaretPosition.h
index 2caef48eeb20..ab9036ed16c6 100644
--- a/content/base/src/nsDOMCaretPosition.h
+++ b/content/base/src/nsDOMCaretPosition.h
@@ -8,7 +8,10 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
 #include "nsINode.h"
+#include "nsRange.h"
 #include "nsWrapperCache.h"
+#include "nsRect.h"
+#include "nsClientRect.h"
 
 /**
  * Implementation of a DOM Caret Position, which is a node and offset within
@@ -46,6 +49,32 @@ public:
    */
   nsINode* GetOffsetNode() const;
 
+  /**
+   * Retrieve the bounding rectangle of this CaretPosition object.
+   *
+   * @returns An nsClientRect representing the bounding rectangle of this
+   *          CaretPosition, if one can be successfully determined, otherwise
+   *          nullptr.
+   */
+  already_AddRefed<nsClientRect> GetClientRect() const;
+
+  /**
+   * Set the anonymous content node that is the actual parent of this
+   * CaretPosition object. In situations where the DOM node for a CaretPosition
+   * actually lies within an anonymous content node (e.g. a textarea), the
+   * actual parent is not set as the offset node. This is used to get the
+   * correct bounding box of a CaretPosition object that lies within a textarea
+   * or input element.
+   *
+   * @param aNode A pointer to an nsINode object that is the actual element
+   *        within which this CaretPosition lies, but is an anonymous content
+   *        node.
+   */
+  void SetAnonymousContentNode(nsINode* aNode)
+  {
+    mAnonymousContentNode = aNode;
+  }
+
   nsISupports* GetParentObject() const
   {
     return GetOffsetNode();
@@ -56,8 +85,10 @@ public:
 
 protected:
   virtual ~nsDOMCaretPosition();
+
   uint32_t mOffset;
   nsCOMPtr<nsINode> mOffsetNode;
+  nsCOMPtr<nsINode> mAnonymousContentNode;
 };
 #endif
 
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 3e96cb5af72e..568ff0f779cb 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -9323,6 +9323,13 @@ nsIDocument::CaretPositionFromPoint(float aX, float aY)
     if (textArea || (input &&
                      NS_SUCCEEDED(input->MozIsTextField(false, &isText)) &&
                      isText)) {
+      // If the anonymous content node has a child, then we need to make sure
+      // that we get the appropriate child, as otherwise the offset may not be
+      // correct when we construct a range for it.
+      nsCOMPtr<nsIContent> firstChild = anonNode->GetFirstChild();
+      if (firstChild) {
+        anonNode = firstChild;
+      }
       offset = nsContentUtils::GetAdjustedOffsetInTextControl(ptFrame, offset);
       node = nonanon;
     } else {
@@ -9332,6 +9339,9 @@ nsIDocument::CaretPositionFromPoint(float aX, float aY)
   }
 
   nsRefPtr<nsDOMCaretPosition> aCaretPos = new nsDOMCaretPosition(node, offset);
+  if (nodeIsAnonymous) {
+    aCaretPos->SetAnonymousContentNode(anonNode);
+  }
   return aCaretPos.forget();
 }
 
diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp
index 2366df5906a6..db51a6dc7d8b 100644
--- a/content/base/src/nsRange.cpp
+++ b/content/base/src/nsRange.cpp
@@ -211,6 +211,22 @@ nsRange::~nsRange()
   DoSetRange(nullptr, 0, nullptr, 0, nullptr);
 } 
 
+/* static */
+nsresult
+nsRange::CreateRange(nsINode* aStartParent, int32_t aStartOffset,
+                     nsINode* aEndParent, int32_t aEndOffset,
+                     nsRange** aRange)
+{
+  nsCOMPtr<nsIDOMNode> startDomNode = do_QueryInterface(aStartParent);
+  nsCOMPtr<nsIDOMNode> endDomNode = do_QueryInterface(aEndParent);
+
+  nsresult rv = CreateRange(startDomNode, aStartOffset, endDomNode, aEndOffset,
+                            aRange);
+
+  return rv;
+
+}
+
 /* static */
 nsresult
 nsRange::CreateRange(nsIDOMNode* aStartParent, int32_t aStartOffset,
diff --git a/content/base/src/nsRange.h b/content/base/src/nsRange.h
index 8932632abe96..a22eca732663 100644
--- a/content/base/src/nsRange.h
+++ b/content/base/src/nsRange.h
@@ -65,6 +65,9 @@ public:
   static nsresult CreateRange(nsIDOMNode* aStartParent, int32_t aStartOffset,
                               nsIDOMNode* aEndParent, int32_t aEndOffset,
                               nsIDOMRange** aRange);
+  static nsresult CreateRange(nsINode* aStartParent, int32_t aStartOffset,
+                              nsINode* aEndParent, int32_t aEndOffset,
+                              nsRange** aRange);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsRange, nsIDOMRange)
diff --git a/dom/webidl/CaretPosition.webidl b/dom/webidl/CaretPosition.webidl
index 4cc42759f25e..7b0ed78b3e9d 100644
--- a/dom/webidl/CaretPosition.webidl
+++ b/dom/webidl/CaretPosition.webidl
@@ -9,4 +9,6 @@ interface CaretPosition {
    */
   readonly attribute Node? offsetNode;
   readonly attribute unsigned long offset;
+
+  ClientRect getClientRect();
 };
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 7484e7b45f29..ca681538ad5c 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2836,15 +2836,11 @@ Tab.prototype = {
 
     // Adjust the max line box width to be no more than the viewport width, but
     // only if the reflow-on-zoom preference is enabled.
-    if (BrowserEventHandler.mReflozPref && BrowserEventHandler._mLastPinchData) {
-      let webNav = window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation);
-      let docShell = webNav.QueryInterface(Ci.nsIDocShell);
-      let docViewer = docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
-      let viewportWidth = gScreenWidth / aViewport.zoom;
-      // We add in a bit of fudge just so that the end characters don't accidentally
-      // get clipped. 15px is an arbitrary choice.
-      docViewer.changeMaxLineBoxWidth(viewportWidth - 15);
-      BrowserEventHandler._mLastPinchData = null;
+    let isZooming = aViewport.zoom != this._zoom;
+    if (isZooming &&
+        BrowserEventHandler.mReflozPref &&
+        BrowserApp.selectedTab._mReflozPoint) {
+      BrowserApp.selectedTab.performReflowOnZoom(aViewport);
     }
 
     let win = this.browser.contentWindow;
@@ -3890,7 +3886,9 @@ var BrowserEventHandler = {
         break;
 
       case "MozMagnifyGesture":
-        this.onPinchFinish(aData, this._mLastPinchPoint.x, this._mLastPinchPoint.y);
+        if (BrowserEventHandler.mReflozPref) {
+          this.onPinchFinish(aData, BrowserApp.selectedTab._mReflozPoint.x, BrowserApp.selectedTab._mReflozPoint.y);
+        }
         break;
 
       default:
@@ -4001,21 +3999,32 @@ var BrowserEventHandler = {
     sendMessageToJava(rect);
   },
 
-  _zoomInAndSnapToElement: function(aX, aY, aElement) {
-    let viewport = BrowserApp.selectedTab.getViewport();
-    if (viewport.zoom < 1.0) {
-      // We don't want to do this on zoom out.
+  _zoomInAndSnapToRange: function(aRange) {
+    if (!aRange) {
+      Cu.reportError("aRange is null in zoomInAndSnapToRange. Unable to maintain position.");
       return;
     }
 
+    let viewport = BrowserApp.selectedTab.getViewport();
     let fudge = 15; // Add a bit of fudge.
-    let win = BrowserApp.selectedBrowser.contentWindow;
+    let boundingElement = aRange.offsetNode;
+    while (!boundingElement.getBoundingClientRect && boundingElement.parentNode) {
+      boundingElement = boundingElement.parentNode;
+    }
 
-    let rect = ElementTouchHelper.getBoundingContentRect(aElement);
+    let rect = ElementTouchHelper.getBoundingContentRect(boundingElement);
+    let drRect = aRange.getClientRect();
+    let scrollTop =
+      BrowserApp.selectedBrowser.contentDocument.documentElement.scrollTop ||
+      BrowserApp.selectedBrowser.contentDocument.body.scrollTop;
+
+    // We subtract half the height of the viewport so that we can (ideally)
+    // center the area of interest on the screen.
+    let topPos = scrollTop + drRect.top - (viewport.cssHeight / 2.0);
 
     rect.type = "Browser:ZoomToRect";
     rect.x = Math.max(viewport.cssPageLeft, rect.x  - fudge);
-    rect.y = viewport.cssY;
+    rect.y = Math.max(topPos, viewport.cssPageTop);
     rect.w = viewport.cssWidth;
     rect.h = viewport.cssHeight;
 
@@ -4023,18 +4032,24 @@ var BrowserEventHandler = {
    },
 
    onPinch: function(aData) {
-     let data = JSON.parse(aData);
-     this._mLastPinchPoint = {x: data.x, y: data.y};
+     // We only want to do this if reflow-on-zoom is enabled.
+     if (BrowserEventHandler.mReflozPref &&
+         !BrowserApp.selectedTab._mReflozPoint) {
+       let data = JSON.parse(aData);
+       let zoomPointX = data.x;
+       let zoomPointY = data.y;
+
+       BrowserApp.selectedTab._mReflozPoint = { x: zoomPointX, y: zoomPointY,
+         range: BrowserApp.selectedBrowser.contentDocument.caretPositionFromPoint(zoomPointX, zoomPointY) };
+     }
    },
 
    onPinchFinish: function(aData, aX, aY) {
-     if (this.mReflozPref) {
-       let data = JSON.parse(aData);
-       let pinchElement = ElementTouchHelper.anyElementFromPoint(aX, aY);
-       data.element = pinchElement;
-       BrowserApp.selectedTab._mLastPinchElement = pinchElement;
-       this._mLastPinchData = data;
-       this._zoomInAndSnapToElement(data.x, data.y, data.element);
+     // We only want to do this if reflow-on-zoom is enabled.
+     if (BrowserEventHandler.mReflozPref) {
+       let range = BrowserApp.selectedTab._mReflozPoint.range;
+       this._zoomInAndSnapToRange(range);
+       BrowserApp.selectedTab._mReflozPoint = null;
      }
    },
 
@@ -4055,8 +4070,6 @@ var BrowserEventHandler = {
 
   _highlightElement: null,
 
-  _mLastPinchData: null,
-
   _doTapHighlight: function _doTapHighlight(aElement) {
     DOMUtils.setContentState(aElement, kStateActive);
     this._highlightElement = aElement;

From d50f0f6e2a79f78d3622105db7b5427bd78bc633 Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Tue, 16 Apr 2013 16:10:20 -0500
Subject: [PATCH 050/438] Backed out changeset 6d29c583d5c0 due to incorrect
 commit message.

---
 content/base/src/nsDOMCaretPosition.cpp  | 33 +-----------
 content/base/src/nsDOMCaretPosition.h    | 31 -----------
 content/base/src/nsDocument.cpp          | 10 ----
 content/base/src/nsRange.cpp             | 16 ------
 content/base/src/nsRange.h               |  3 --
 dom/webidl/CaretPosition.webidl          |  2 -
 mobile/android/chrome/content/browser.js | 69 ++++++++++--------------
 7 files changed, 29 insertions(+), 135 deletions(-)

diff --git a/content/base/src/nsDOMCaretPosition.cpp b/content/base/src/nsDOMCaretPosition.cpp
index 06c45bc3d368..35711b4a9269 100644
--- a/content/base/src/nsDOMCaretPosition.cpp
+++ b/content/base/src/nsDOMCaretPosition.cpp
@@ -7,7 +7,7 @@
 #include "nsContentUtils.h"
 
 nsDOMCaretPosition::nsDOMCaretPosition(nsINode* aNode, uint32_t aOffset)
-  : mOffset(aOffset), mOffsetNode(aNode), mAnonymousContentNode(nullptr)
+  : mOffset(aOffset), mOffsetNode(aNode)
 {
   SetIsDOMBinding();
 }
@@ -21,37 +21,6 @@ nsINode* nsDOMCaretPosition::GetOffsetNode() const
   return mOffsetNode;
 }
 
-already_AddRefed<nsClientRect>
-nsDOMCaretPosition::GetClientRect() const
-{
-  if (!mOffsetNode) {
-    return nullptr;
-  }
-
-  nsRefPtr<nsClientRect> rect;
-  nsRefPtr<nsRange> domRange;
-  nsCOMPtr<nsINode> node;
-
-  if (mAnonymousContentNode) {
-    node = mAnonymousContentNode;
-  } else {
-    node = mOffsetNode;
-  }
-
-  nsresult creationRv = nsRange::CreateRange(node, mOffset, node,
-                                             mOffset,
-                                             getter_AddRefs<nsRange>(domRange));
-  if (!NS_SUCCEEDED(creationRv)) {
-    return nullptr;
-  }
-
-  NS_ASSERTION(domRange, "unable to retrieve valid dom range from CaretPosition");
-
-  rect = domRange->GetBoundingClientRect();
-
-  return rect.forget();
-}
-
 JSObject*
 nsDOMCaretPosition::WrapObject(JSContext *aCx, JSObject *aScope)
 {
diff --git a/content/base/src/nsDOMCaretPosition.h b/content/base/src/nsDOMCaretPosition.h
index ab9036ed16c6..2caef48eeb20 100644
--- a/content/base/src/nsDOMCaretPosition.h
+++ b/content/base/src/nsDOMCaretPosition.h
@@ -8,10 +8,7 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
 #include "nsINode.h"
-#include "nsRange.h"
 #include "nsWrapperCache.h"
-#include "nsRect.h"
-#include "nsClientRect.h"
 
 /**
  * Implementation of a DOM Caret Position, which is a node and offset within
@@ -49,32 +46,6 @@ public:
    */
   nsINode* GetOffsetNode() const;
 
-  /**
-   * Retrieve the bounding rectangle of this CaretPosition object.
-   *
-   * @returns An nsClientRect representing the bounding rectangle of this
-   *          CaretPosition, if one can be successfully determined, otherwise
-   *          nullptr.
-   */
-  already_AddRefed<nsClientRect> GetClientRect() const;
-
-  /**
-   * Set the anonymous content node that is the actual parent of this
-   * CaretPosition object. In situations where the DOM node for a CaretPosition
-   * actually lies within an anonymous content node (e.g. a textarea), the
-   * actual parent is not set as the offset node. This is used to get the
-   * correct bounding box of a CaretPosition object that lies within a textarea
-   * or input element.
-   *
-   * @param aNode A pointer to an nsINode object that is the actual element
-   *        within which this CaretPosition lies, but is an anonymous content
-   *        node.
-   */
-  void SetAnonymousContentNode(nsINode* aNode)
-  {
-    mAnonymousContentNode = aNode;
-  }
-
   nsISupports* GetParentObject() const
   {
     return GetOffsetNode();
@@ -85,10 +56,8 @@ public:
 
 protected:
   virtual ~nsDOMCaretPosition();
-
   uint32_t mOffset;
   nsCOMPtr<nsINode> mOffsetNode;
-  nsCOMPtr<nsINode> mAnonymousContentNode;
 };
 #endif
 
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 568ff0f779cb..3e96cb5af72e 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -9323,13 +9323,6 @@ nsIDocument::CaretPositionFromPoint(float aX, float aY)
     if (textArea || (input &&
                      NS_SUCCEEDED(input->MozIsTextField(false, &isText)) &&
                      isText)) {
-      // If the anonymous content node has a child, then we need to make sure
-      // that we get the appropriate child, as otherwise the offset may not be
-      // correct when we construct a range for it.
-      nsCOMPtr<nsIContent> firstChild = anonNode->GetFirstChild();
-      if (firstChild) {
-        anonNode = firstChild;
-      }
       offset = nsContentUtils::GetAdjustedOffsetInTextControl(ptFrame, offset);
       node = nonanon;
     } else {
@@ -9339,9 +9332,6 @@ nsIDocument::CaretPositionFromPoint(float aX, float aY)
   }
 
   nsRefPtr<nsDOMCaretPosition> aCaretPos = new nsDOMCaretPosition(node, offset);
-  if (nodeIsAnonymous) {
-    aCaretPos->SetAnonymousContentNode(anonNode);
-  }
   return aCaretPos.forget();
 }
 
diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp
index db51a6dc7d8b..2366df5906a6 100644
--- a/content/base/src/nsRange.cpp
+++ b/content/base/src/nsRange.cpp
@@ -211,22 +211,6 @@ nsRange::~nsRange()
   DoSetRange(nullptr, 0, nullptr, 0, nullptr);
 } 
 
-/* static */
-nsresult
-nsRange::CreateRange(nsINode* aStartParent, int32_t aStartOffset,
-                     nsINode* aEndParent, int32_t aEndOffset,
-                     nsRange** aRange)
-{
-  nsCOMPtr<nsIDOMNode> startDomNode = do_QueryInterface(aStartParent);
-  nsCOMPtr<nsIDOMNode> endDomNode = do_QueryInterface(aEndParent);
-
-  nsresult rv = CreateRange(startDomNode, aStartOffset, endDomNode, aEndOffset,
-                            aRange);
-
-  return rv;
-
-}
-
 /* static */
 nsresult
 nsRange::CreateRange(nsIDOMNode* aStartParent, int32_t aStartOffset,
diff --git a/content/base/src/nsRange.h b/content/base/src/nsRange.h
index a22eca732663..8932632abe96 100644
--- a/content/base/src/nsRange.h
+++ b/content/base/src/nsRange.h
@@ -65,9 +65,6 @@ public:
   static nsresult CreateRange(nsIDOMNode* aStartParent, int32_t aStartOffset,
                               nsIDOMNode* aEndParent, int32_t aEndOffset,
                               nsIDOMRange** aRange);
-  static nsresult CreateRange(nsINode* aStartParent, int32_t aStartOffset,
-                              nsINode* aEndParent, int32_t aEndOffset,
-                              nsRange** aRange);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsRange, nsIDOMRange)
diff --git a/dom/webidl/CaretPosition.webidl b/dom/webidl/CaretPosition.webidl
index 7b0ed78b3e9d..4cc42759f25e 100644
--- a/dom/webidl/CaretPosition.webidl
+++ b/dom/webidl/CaretPosition.webidl
@@ -9,6 +9,4 @@ interface CaretPosition {
    */
   readonly attribute Node? offsetNode;
   readonly attribute unsigned long offset;
-
-  ClientRect getClientRect();
 };
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index ca681538ad5c..7484e7b45f29 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2836,11 +2836,15 @@ Tab.prototype = {
 
     // Adjust the max line box width to be no more than the viewport width, but
     // only if the reflow-on-zoom preference is enabled.
-    let isZooming = aViewport.zoom != this._zoom;
-    if (isZooming &&
-        BrowserEventHandler.mReflozPref &&
-        BrowserApp.selectedTab._mReflozPoint) {
-      BrowserApp.selectedTab.performReflowOnZoom(aViewport);
+    if (BrowserEventHandler.mReflozPref && BrowserEventHandler._mLastPinchData) {
+      let webNav = window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation);
+      let docShell = webNav.QueryInterface(Ci.nsIDocShell);
+      let docViewer = docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
+      let viewportWidth = gScreenWidth / aViewport.zoom;
+      // We add in a bit of fudge just so that the end characters don't accidentally
+      // get clipped. 15px is an arbitrary choice.
+      docViewer.changeMaxLineBoxWidth(viewportWidth - 15);
+      BrowserEventHandler._mLastPinchData = null;
     }
 
     let win = this.browser.contentWindow;
@@ -3886,9 +3890,7 @@ var BrowserEventHandler = {
         break;
 
       case "MozMagnifyGesture":
-        if (BrowserEventHandler.mReflozPref) {
-          this.onPinchFinish(aData, BrowserApp.selectedTab._mReflozPoint.x, BrowserApp.selectedTab._mReflozPoint.y);
-        }
+        this.onPinchFinish(aData, this._mLastPinchPoint.x, this._mLastPinchPoint.y);
         break;
 
       default:
@@ -3999,32 +4001,21 @@ var BrowserEventHandler = {
     sendMessageToJava(rect);
   },
 
-  _zoomInAndSnapToRange: function(aRange) {
-    if (!aRange) {
-      Cu.reportError("aRange is null in zoomInAndSnapToRange. Unable to maintain position.");
+  _zoomInAndSnapToElement: function(aX, aY, aElement) {
+    let viewport = BrowserApp.selectedTab.getViewport();
+    if (viewport.zoom < 1.0) {
+      // We don't want to do this on zoom out.
       return;
     }
 
-    let viewport = BrowserApp.selectedTab.getViewport();
     let fudge = 15; // Add a bit of fudge.
-    let boundingElement = aRange.offsetNode;
-    while (!boundingElement.getBoundingClientRect && boundingElement.parentNode) {
-      boundingElement = boundingElement.parentNode;
-    }
+    let win = BrowserApp.selectedBrowser.contentWindow;
 
-    let rect = ElementTouchHelper.getBoundingContentRect(boundingElement);
-    let drRect = aRange.getClientRect();
-    let scrollTop =
-      BrowserApp.selectedBrowser.contentDocument.documentElement.scrollTop ||
-      BrowserApp.selectedBrowser.contentDocument.body.scrollTop;
-
-    // We subtract half the height of the viewport so that we can (ideally)
-    // center the area of interest on the screen.
-    let topPos = scrollTop + drRect.top - (viewport.cssHeight / 2.0);
+    let rect = ElementTouchHelper.getBoundingContentRect(aElement);
 
     rect.type = "Browser:ZoomToRect";
     rect.x = Math.max(viewport.cssPageLeft, rect.x  - fudge);
-    rect.y = Math.max(topPos, viewport.cssPageTop);
+    rect.y = viewport.cssY;
     rect.w = viewport.cssWidth;
     rect.h = viewport.cssHeight;
 
@@ -4032,24 +4023,18 @@ var BrowserEventHandler = {
    },
 
    onPinch: function(aData) {
-     // We only want to do this if reflow-on-zoom is enabled.
-     if (BrowserEventHandler.mReflozPref &&
-         !BrowserApp.selectedTab._mReflozPoint) {
-       let data = JSON.parse(aData);
-       let zoomPointX = data.x;
-       let zoomPointY = data.y;
-
-       BrowserApp.selectedTab._mReflozPoint = { x: zoomPointX, y: zoomPointY,
-         range: BrowserApp.selectedBrowser.contentDocument.caretPositionFromPoint(zoomPointX, zoomPointY) };
-     }
+     let data = JSON.parse(aData);
+     this._mLastPinchPoint = {x: data.x, y: data.y};
    },
 
    onPinchFinish: function(aData, aX, aY) {
-     // We only want to do this if reflow-on-zoom is enabled.
-     if (BrowserEventHandler.mReflozPref) {
-       let range = BrowserApp.selectedTab._mReflozPoint.range;
-       this._zoomInAndSnapToRange(range);
-       BrowserApp.selectedTab._mReflozPoint = null;
+     if (this.mReflozPref) {
+       let data = JSON.parse(aData);
+       let pinchElement = ElementTouchHelper.anyElementFromPoint(aX, aY);
+       data.element = pinchElement;
+       BrowserApp.selectedTab._mLastPinchElement = pinchElement;
+       this._mLastPinchData = data;
+       this._zoomInAndSnapToElement(data.x, data.y, data.element);
      }
    },
 
@@ -4070,6 +4055,8 @@ var BrowserEventHandler = {
 
   _highlightElement: null,
 
+  _mLastPinchData: null,
+
   _doTapHighlight: function _doTapHighlight(aElement) {
     DOMUtils.setContentState(aElement, kStateActive);
     this._highlightElement = aElement;

From 63715cfdf52355b46294231e3daac694d18807fa Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Tue, 16 Apr 2013 16:12:03 -0500
Subject: [PATCH 051/438] Bug 803719: Add a getClientRect API to CaretPosition
 and use it to maintain position for reflow-on-zoom feature. [r=kats,tn]

---
 content/base/src/nsDOMCaretPosition.cpp  | 33 +++++++++++-
 content/base/src/nsDOMCaretPosition.h    | 31 +++++++++++
 content/base/src/nsDocument.cpp          | 10 ++++
 content/base/src/nsRange.cpp             | 16 ++++++
 content/base/src/nsRange.h               |  3 ++
 dom/webidl/CaretPosition.webidl          |  2 +
 mobile/android/chrome/content/browser.js | 69 ++++++++++++++----------
 7 files changed, 135 insertions(+), 29 deletions(-)

diff --git a/content/base/src/nsDOMCaretPosition.cpp b/content/base/src/nsDOMCaretPosition.cpp
index 35711b4a9269..06c45bc3d368 100644
--- a/content/base/src/nsDOMCaretPosition.cpp
+++ b/content/base/src/nsDOMCaretPosition.cpp
@@ -7,7 +7,7 @@
 #include "nsContentUtils.h"
 
 nsDOMCaretPosition::nsDOMCaretPosition(nsINode* aNode, uint32_t aOffset)
-  : mOffset(aOffset), mOffsetNode(aNode)
+  : mOffset(aOffset), mOffsetNode(aNode), mAnonymousContentNode(nullptr)
 {
   SetIsDOMBinding();
 }
@@ -21,6 +21,37 @@ nsINode* nsDOMCaretPosition::GetOffsetNode() const
   return mOffsetNode;
 }
 
+already_AddRefed<nsClientRect>
+nsDOMCaretPosition::GetClientRect() const
+{
+  if (!mOffsetNode) {
+    return nullptr;
+  }
+
+  nsRefPtr<nsClientRect> rect;
+  nsRefPtr<nsRange> domRange;
+  nsCOMPtr<nsINode> node;
+
+  if (mAnonymousContentNode) {
+    node = mAnonymousContentNode;
+  } else {
+    node = mOffsetNode;
+  }
+
+  nsresult creationRv = nsRange::CreateRange(node, mOffset, node,
+                                             mOffset,
+                                             getter_AddRefs<nsRange>(domRange));
+  if (!NS_SUCCEEDED(creationRv)) {
+    return nullptr;
+  }
+
+  NS_ASSERTION(domRange, "unable to retrieve valid dom range from CaretPosition");
+
+  rect = domRange->GetBoundingClientRect();
+
+  return rect.forget();
+}
+
 JSObject*
 nsDOMCaretPosition::WrapObject(JSContext *aCx, JSObject *aScope)
 {
diff --git a/content/base/src/nsDOMCaretPosition.h b/content/base/src/nsDOMCaretPosition.h
index 2caef48eeb20..ab9036ed16c6 100644
--- a/content/base/src/nsDOMCaretPosition.h
+++ b/content/base/src/nsDOMCaretPosition.h
@@ -8,7 +8,10 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
 #include "nsINode.h"
+#include "nsRange.h"
 #include "nsWrapperCache.h"
+#include "nsRect.h"
+#include "nsClientRect.h"
 
 /**
  * Implementation of a DOM Caret Position, which is a node and offset within
@@ -46,6 +49,32 @@ public:
    */
   nsINode* GetOffsetNode() const;
 
+  /**
+   * Retrieve the bounding rectangle of this CaretPosition object.
+   *
+   * @returns An nsClientRect representing the bounding rectangle of this
+   *          CaretPosition, if one can be successfully determined, otherwise
+   *          nullptr.
+   */
+  already_AddRefed<nsClientRect> GetClientRect() const;
+
+  /**
+   * Set the anonymous content node that is the actual parent of this
+   * CaretPosition object. In situations where the DOM node for a CaretPosition
+   * actually lies within an anonymous content node (e.g. a textarea), the
+   * actual parent is not set as the offset node. This is used to get the
+   * correct bounding box of a CaretPosition object that lies within a textarea
+   * or input element.
+   *
+   * @param aNode A pointer to an nsINode object that is the actual element
+   *        within which this CaretPosition lies, but is an anonymous content
+   *        node.
+   */
+  void SetAnonymousContentNode(nsINode* aNode)
+  {
+    mAnonymousContentNode = aNode;
+  }
+
   nsISupports* GetParentObject() const
   {
     return GetOffsetNode();
@@ -56,8 +85,10 @@ public:
 
 protected:
   virtual ~nsDOMCaretPosition();
+
   uint32_t mOffset;
   nsCOMPtr<nsINode> mOffsetNode;
+  nsCOMPtr<nsINode> mAnonymousContentNode;
 };
 #endif
 
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 3e96cb5af72e..568ff0f779cb 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -9323,6 +9323,13 @@ nsIDocument::CaretPositionFromPoint(float aX, float aY)
     if (textArea || (input &&
                      NS_SUCCEEDED(input->MozIsTextField(false, &isText)) &&
                      isText)) {
+      // If the anonymous content node has a child, then we need to make sure
+      // that we get the appropriate child, as otherwise the offset may not be
+      // correct when we construct a range for it.
+      nsCOMPtr<nsIContent> firstChild = anonNode->GetFirstChild();
+      if (firstChild) {
+        anonNode = firstChild;
+      }
       offset = nsContentUtils::GetAdjustedOffsetInTextControl(ptFrame, offset);
       node = nonanon;
     } else {
@@ -9332,6 +9339,9 @@ nsIDocument::CaretPositionFromPoint(float aX, float aY)
   }
 
   nsRefPtr<nsDOMCaretPosition> aCaretPos = new nsDOMCaretPosition(node, offset);
+  if (nodeIsAnonymous) {
+    aCaretPos->SetAnonymousContentNode(anonNode);
+  }
   return aCaretPos.forget();
 }
 
diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp
index 2366df5906a6..db51a6dc7d8b 100644
--- a/content/base/src/nsRange.cpp
+++ b/content/base/src/nsRange.cpp
@@ -211,6 +211,22 @@ nsRange::~nsRange()
   DoSetRange(nullptr, 0, nullptr, 0, nullptr);
 } 
 
+/* static */
+nsresult
+nsRange::CreateRange(nsINode* aStartParent, int32_t aStartOffset,
+                     nsINode* aEndParent, int32_t aEndOffset,
+                     nsRange** aRange)
+{
+  nsCOMPtr<nsIDOMNode> startDomNode = do_QueryInterface(aStartParent);
+  nsCOMPtr<nsIDOMNode> endDomNode = do_QueryInterface(aEndParent);
+
+  nsresult rv = CreateRange(startDomNode, aStartOffset, endDomNode, aEndOffset,
+                            aRange);
+
+  return rv;
+
+}
+
 /* static */
 nsresult
 nsRange::CreateRange(nsIDOMNode* aStartParent, int32_t aStartOffset,
diff --git a/content/base/src/nsRange.h b/content/base/src/nsRange.h
index 8932632abe96..a22eca732663 100644
--- a/content/base/src/nsRange.h
+++ b/content/base/src/nsRange.h
@@ -65,6 +65,9 @@ public:
   static nsresult CreateRange(nsIDOMNode* aStartParent, int32_t aStartOffset,
                               nsIDOMNode* aEndParent, int32_t aEndOffset,
                               nsIDOMRange** aRange);
+  static nsresult CreateRange(nsINode* aStartParent, int32_t aStartOffset,
+                              nsINode* aEndParent, int32_t aEndOffset,
+                              nsRange** aRange);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsRange, nsIDOMRange)
diff --git a/dom/webidl/CaretPosition.webidl b/dom/webidl/CaretPosition.webidl
index 4cc42759f25e..7b0ed78b3e9d 100644
--- a/dom/webidl/CaretPosition.webidl
+++ b/dom/webidl/CaretPosition.webidl
@@ -9,4 +9,6 @@ interface CaretPosition {
    */
   readonly attribute Node? offsetNode;
   readonly attribute unsigned long offset;
+
+  ClientRect getClientRect();
 };
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 7484e7b45f29..ca681538ad5c 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2836,15 +2836,11 @@ Tab.prototype = {
 
     // Adjust the max line box width to be no more than the viewport width, but
     // only if the reflow-on-zoom preference is enabled.
-    if (BrowserEventHandler.mReflozPref && BrowserEventHandler._mLastPinchData) {
-      let webNav = window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation);
-      let docShell = webNav.QueryInterface(Ci.nsIDocShell);
-      let docViewer = docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
-      let viewportWidth = gScreenWidth / aViewport.zoom;
-      // We add in a bit of fudge just so that the end characters don't accidentally
-      // get clipped. 15px is an arbitrary choice.
-      docViewer.changeMaxLineBoxWidth(viewportWidth - 15);
-      BrowserEventHandler._mLastPinchData = null;
+    let isZooming = aViewport.zoom != this._zoom;
+    if (isZooming &&
+        BrowserEventHandler.mReflozPref &&
+        BrowserApp.selectedTab._mReflozPoint) {
+      BrowserApp.selectedTab.performReflowOnZoom(aViewport);
     }
 
     let win = this.browser.contentWindow;
@@ -3890,7 +3886,9 @@ var BrowserEventHandler = {
         break;
 
       case "MozMagnifyGesture":
-        this.onPinchFinish(aData, this._mLastPinchPoint.x, this._mLastPinchPoint.y);
+        if (BrowserEventHandler.mReflozPref) {
+          this.onPinchFinish(aData, BrowserApp.selectedTab._mReflozPoint.x, BrowserApp.selectedTab._mReflozPoint.y);
+        }
         break;
 
       default:
@@ -4001,21 +3999,32 @@ var BrowserEventHandler = {
     sendMessageToJava(rect);
   },
 
-  _zoomInAndSnapToElement: function(aX, aY, aElement) {
-    let viewport = BrowserApp.selectedTab.getViewport();
-    if (viewport.zoom < 1.0) {
-      // We don't want to do this on zoom out.
+  _zoomInAndSnapToRange: function(aRange) {
+    if (!aRange) {
+      Cu.reportError("aRange is null in zoomInAndSnapToRange. Unable to maintain position.");
       return;
     }
 
+    let viewport = BrowserApp.selectedTab.getViewport();
     let fudge = 15; // Add a bit of fudge.
-    let win = BrowserApp.selectedBrowser.contentWindow;
+    let boundingElement = aRange.offsetNode;
+    while (!boundingElement.getBoundingClientRect && boundingElement.parentNode) {
+      boundingElement = boundingElement.parentNode;
+    }
 
-    let rect = ElementTouchHelper.getBoundingContentRect(aElement);
+    let rect = ElementTouchHelper.getBoundingContentRect(boundingElement);
+    let drRect = aRange.getClientRect();
+    let scrollTop =
+      BrowserApp.selectedBrowser.contentDocument.documentElement.scrollTop ||
+      BrowserApp.selectedBrowser.contentDocument.body.scrollTop;
+
+    // We subtract half the height of the viewport so that we can (ideally)
+    // center the area of interest on the screen.
+    let topPos = scrollTop + drRect.top - (viewport.cssHeight / 2.0);
 
     rect.type = "Browser:ZoomToRect";
     rect.x = Math.max(viewport.cssPageLeft, rect.x  - fudge);
-    rect.y = viewport.cssY;
+    rect.y = Math.max(topPos, viewport.cssPageTop);
     rect.w = viewport.cssWidth;
     rect.h = viewport.cssHeight;
 
@@ -4023,18 +4032,24 @@ var BrowserEventHandler = {
    },
 
    onPinch: function(aData) {
-     let data = JSON.parse(aData);
-     this._mLastPinchPoint = {x: data.x, y: data.y};
+     // We only want to do this if reflow-on-zoom is enabled.
+     if (BrowserEventHandler.mReflozPref &&
+         !BrowserApp.selectedTab._mReflozPoint) {
+       let data = JSON.parse(aData);
+       let zoomPointX = data.x;
+       let zoomPointY = data.y;
+
+       BrowserApp.selectedTab._mReflozPoint = { x: zoomPointX, y: zoomPointY,
+         range: BrowserApp.selectedBrowser.contentDocument.caretPositionFromPoint(zoomPointX, zoomPointY) };
+     }
    },
 
    onPinchFinish: function(aData, aX, aY) {
-     if (this.mReflozPref) {
-       let data = JSON.parse(aData);
-       let pinchElement = ElementTouchHelper.anyElementFromPoint(aX, aY);
-       data.element = pinchElement;
-       BrowserApp.selectedTab._mLastPinchElement = pinchElement;
-       this._mLastPinchData = data;
-       this._zoomInAndSnapToElement(data.x, data.y, data.element);
+     // We only want to do this if reflow-on-zoom is enabled.
+     if (BrowserEventHandler.mReflozPref) {
+       let range = BrowserApp.selectedTab._mReflozPoint.range;
+       this._zoomInAndSnapToRange(range);
+       BrowserApp.selectedTab._mReflozPoint = null;
      }
    },
 
@@ -4055,8 +4070,6 @@ var BrowserEventHandler = {
 
   _highlightElement: null,
 
-  _mLastPinchData: null,
-
   _doTapHighlight: function _doTapHighlight(aElement) {
     DOMUtils.setContentState(aElement, kStateActive);
     this._highlightElement = aElement;

From 7586d14b643f55b7231d2cf8e216c1a13fe8f4ac Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 16 Apr 2013 17:14:09 -0400
Subject: [PATCH 052/438] Bug 862388.  Fix test_bug328885.html to actually test
 things.  r=bholley

---
 content/events/test/test_bug328885.html | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/content/events/test/test_bug328885.html b/content/events/test/test_bug328885.html
index e935b3a98194..3cd45a75969a 100644
--- a/content/events/test/test_bug328885.html
+++ b/content/events/test/test_bug328885.html
@@ -6,6 +6,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=328885
 <head>
   <title>Test for Bug 328885</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -29,7 +30,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=328885
   }
 
   function clickTest() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     inputelement.addEventListener("DOMSubtreeModified", mutationListener, false);
     inputelement.addEventListener("DOMNodeInserted", mutationListener, false);
     inputelement.addEventListener("DOMNodeRemoved", mutationListener, false);
@@ -39,10 +39,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=328885
     inputelement.addEventListener("DOMCharacterDataModified", mutationListener, false);
     
     inputelement.addEventListener('click', 
-      function(evt) {
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-        ok(evt.originalTarget instanceof HTMLDivElement, "(1) Wrong originalTarget!");
-        ok(evt.originalTarget.parentNode == inputelement, "(2) Wront parent node!");
+      function(event) {
+        var evt = SpecialPowers.wrap(event);
+        ok(SpecialPowers.unwrap(evt.originalTarget) instanceof HTMLDivElement,
+           "(1) Wrong originalTarget!");
+        is(SpecialPowers.unwrap(evt.originalTarget.parentNode), inputelement,
+           "(2) Wront parent node!");
         ok(mutationCount == 0, "(3) No mutations should have happened! [" + mutationCount + "]");
         evt.originalTarget.textContent = "foo";
         ok(mutationCount == 0, "(4) Mutation listener shouldn't have been called! [" + mutationCount + "]");
@@ -51,14 +53,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=328885
         evt.originalTarget.lastChild.data = "bar";
         ok(mutationCount == 0, "(6) Mutation listener shouldn't have been called! [" + mutationCount + "]");
 
-        var r = document.createRange();
+        var r = SpecialPowers.wrap(document.createRange());
         r.selectNodeContents(evt.originalTarget);
         r.deleteContents();
         ok(mutationCount == 0, "(7) Mutation listener shouldn't have been called! [" + mutationCount + "]");
 
         evt.originalTarget.textContent = "foo";
         ok(mutationCount == 0, "(8) Mutation listener shouldn't have been called! [" + mutationCount + "]");
-        r = document.createRange();
+        r = SpecialPowers.wrap(document.createRange());
         r.selectNodeContents(evt.originalTarget);
         r.extractContents();
         ok(mutationCount == 0, "(9) Mutation listener shouldn't have been called! [" + mutationCount + "]");
@@ -111,10 +113,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=328885
         ok(mutationCount == 19, "(20) Mutation listener should have been called! ["+ mutationCount + "]");
       }
     ,false);
-    var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                       getInterface(Components.interfaces.nsIDOMWindowUtils);
-    utils.sendMouseEvent("mousedown", 5, 5, 0, 1, 0);
-    utils.sendMouseEvent("mouseup", 5, 5, 0, 1, 0);
+    synthesizeMouseAtPoint(5, 5, {}, window);
     SimpleTest.finish();
   }
 

From 52f876f3ad138cb456aff242ff1a63b1d0f60f26 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 16 Apr 2013 17:14:30 -0400
Subject: [PATCH 053/438] Bug 835643 part 1.  Give CallbackObject an IID so
 that random things don't QI to it.  r=smaug

Right now it thinks its IID is the nsISupports IID!
---
 dom/bindings/CallbackObject.cpp | 1 +
 dom/bindings/CallbackObject.h   | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/dom/bindings/CallbackObject.cpp b/dom/bindings/CallbackObject.cpp
index e4a96ab60cd1..794f3b267907 100644
--- a/dom/bindings/CallbackObject.cpp
+++ b/dom/bindings/CallbackObject.cpp
@@ -18,6 +18,7 @@ namespace mozilla {
 namespace dom {
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CallbackObject)
+  NS_INTERFACE_MAP_ENTRY(mozilla::dom::CallbackObject)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
diff --git a/dom/bindings/CallbackObject.h b/dom/bindings/CallbackObject.h
index c8a678bc58ea..6d7b1c75c0bc 100644
--- a/dom/bindings/CallbackObject.h
+++ b/dom/bindings/CallbackObject.h
@@ -34,9 +34,15 @@
 namespace mozilla {
 namespace dom {
 
+#define DOM_CALLBACKOBJECT_IID \
+{ 0xbe74c190, 0x6d76, 0x4991, \
+ { 0x84, 0xb9, 0x65, 0x06, 0x99, 0xe6, 0x93, 0x2b } }
+
 class CallbackObject : public nsISupports
 {
 public:
+  NS_DECLARE_STATIC_IID_ACCESSOR(DOM_CALLBACKOBJECT_IID)
+
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CallbackObject)
 
@@ -371,6 +377,8 @@ private:
   uintptr_t mPtrBits;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(CallbackObject, DOM_CALLBACKOBJECT_IID)
+
 template<class T, class U>
 inline void
 ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,

From 84188ce00274f3673ab0fecd247b7a35d4698b7c Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 16 Apr 2013 17:15:57 -0400
Subject: [PATCH 054/438] Bug 835643 part 2.  Store an EventListenerHolder, not
 an nsIDOMEventListener, in nsListenerStruct.  r=smaug

---
 content/events/src/nsEventListenerManager.cpp | 27 +++++++++++----
 content/events/src/nsEventListenerManager.h   | 22 ++++++++++---
 content/events/src/nsEventListenerService.h   |  3 +-
 dom/bindings/CallbackObject.cpp               |  2 +-
 dom/bindings/CallbackObject.h                 | 33 +++++++++++++++++--
 5 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index fb265c7099f0..587b4a97bc1d 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -54,6 +54,7 @@
 #include "nsSandboxFlags.h"
 #include "mozilla/dom/time/TimeChangeObserver.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::hal;
 
@@ -159,7 +160,8 @@ ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
                             const char* aName,
                             unsigned aFlags)
 {
-  CycleCollectionNoteChild(aCallback, aField.mListener.get(), aName, aFlags);
+  CycleCollectionNoteChild(aCallback, aField.mListener.GetISupports(), aName,
+                           aFlags);
 }
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsEventListenerManager)
@@ -906,7 +908,7 @@ nsEventListenerManager::CompileEventHandlerInternal(nsListenerStruct *aListenerS
 
 nsresult
 nsEventListenerManager::HandleEventSubType(nsListenerStruct* aListenerStruct,
-                                           nsIDOMEventListener* aListener,
+                                           const EventListenerHolder& aListener,
                                            nsIDOMEvent* aDOMEvent,
                                            EventTarget* aCurrentTarget,
                                            nsCxPusher* aPusher)
@@ -927,7 +929,14 @@ nsEventListenerManager::HandleEventSubType(nsListenerStruct* aListenerStruct,
   if (NS_SUCCEEDED(result)) {
     nsAutoMicroTask mt;
     // nsIDOMEvent::currentTarget is set in nsEventDispatcher.
-    result = aListener->HandleEvent(aDOMEvent);
+    if (aListener.HasWebIDLCallback()) {
+      ErrorResult rv;
+      aListener.GetWebIDLCallback()->
+        HandleEvent(aCurrentTarget, *(aDOMEvent->InternalDOMEvent()), rv);
+      result = rv.ErrorCode();
+    } else {
+      result = aListener.GetXPCOMCallback()->HandleEvent(aDOMEvent);
+    }
   }
 
   return result;
@@ -996,7 +1005,7 @@ nsEventListenerManager::HandleEventInternal(nsPresContext* aPresContext,
             continue;
           }
 
-          nsRefPtr<nsIDOMEventListener> kungFuDeathGrip = ls->mListener;
+          EventListenerHolder kungFuDeathGrip(ls->mListener);
           if (NS_FAILED(HandleEventSubType(ls, ls->mListener, *aDOMEvent,
                                            aCurrentTarget, aPusher))) {
             aEvent->mFlags.mExceptionHasBeenRisen = true;
@@ -1159,8 +1168,11 @@ nsEventListenerManager::GetListenerInfo(nsCOMArray<nsIEventListenerInfo>* aList)
     }
     const nsDependentSubstring& eventType =
       Substring(nsDependentAtomString(ls.mTypeAtom), 2);
+    // EventListenerInfo is defined in XPCOM, so we have to go ahead
+    // and convert to an XPCOM callback here...
     nsRefPtr<nsEventListenerInfo> info =
-      new nsEventListenerInfo(eventType, ls.mListener, ls.mFlags.mCapture,
+      new nsEventListenerInfo(eventType, ls.mListener.ToXPCOMCallback(),
+                              ls.mFlags.mCapture,
                               ls.mFlags.mAllowUntrustedEvents,
                               ls.mFlags.mInSystemGroup);
     NS_ENSURE_TRUE(info, NS_ERROR_OUT_OF_MEMORY);
@@ -1285,7 +1297,10 @@ nsEventListenerManager::MarkForCC()
       }
       xpc_UnmarkGrayObject(jsl->GetEventScope());
     } else if (ls.mListenerType == eWrappedJSListener) {
-      xpc_TryUnmarkWrappedGrayObject(ls.mListener);
+      xpc_TryUnmarkWrappedGrayObject(ls.mListener.GetXPCOMCallback());
+    } else if (ls.mListenerType == eWebIDLListener) {
+      // Callback() unmarks gray
+      ls.mListener.GetWebIDLCallback()->Callback();
     }
   }
   if (mRefCnt.IsPurple()) {
diff --git a/content/events/src/nsEventListenerManager.h b/content/events/src/nsEventListenerManager.h
index c851c605a515..122dc27d171a 100644
--- a/content/events/src/nsEventListenerManager.h
+++ b/content/events/src/nsEventListenerManager.h
@@ -18,6 +18,7 @@
 #include "nsGUIEvent.h"
 #include "nsIJSEventListener.h"
 #include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/EventListenerBinding.h"
 
 class nsIDOMEvent;
 class nsIAtom;
@@ -35,6 +36,9 @@ class nsEventListenerManager;
 namespace mozilla {
 namespace dom {
 
+typedef CallbackObjectHolder<EventListener, nsIDOMEventListener>
+  EventListenerHolder;
+
 struct EventListenerFlags
 {
   friend struct ::nsListenerStruct;
@@ -149,12 +153,14 @@ typedef enum
 {
     eNativeListener = 0,
     eJSEventListener,
-    eWrappedJSListener
+    eWrappedJSListener,
+    eWebIDLListener,
+    eListenerTypeCount
 } nsListenerType;
 
 struct nsListenerStruct
 {
-  nsRefPtr<nsIDOMEventListener> mListener;
+  mozilla::dom::EventListenerHolder mListener;
   nsCOMPtr<nsIAtom>             mTypeAtom;
   uint32_t                      mEventType;
   uint8_t                       mListenerType;
@@ -166,13 +172,19 @@ struct nsListenerStruct
 
   nsIJSEventListener* GetJSListener() const {
     return (mListenerType == eJSEventListener) ?
-      static_cast<nsIJSEventListener *>(mListener.get()) : nullptr;
+      static_cast<nsIJSEventListener *>(mListener.GetXPCOMCallback()) : nullptr;
+  }
+
+  nsListenerStruct()
+  {
+    MOZ_ASSERT(sizeof(mListenerType) == 1);
+    MOZ_ASSERT(eListenerTypeCount < 255);
   }
 
   ~nsListenerStruct()
   {
     if ((mListenerType == eJSEventListener) && mListener) {
-      static_cast<nsIJSEventListener*>(mListener.get())->Disconnect();
+      static_cast<nsIJSEventListener*>(mListener.GetXPCOMCallback())->Disconnect();
     }
   }
 
@@ -364,7 +376,7 @@ protected:
                            nsCxPusher* aPusher);
 
   nsresult HandleEventSubType(nsListenerStruct* aListenerStruct,
-                              nsIDOMEventListener* aListener,
+                              const mozilla::dom::EventListenerHolder& aListener,
                               nsIDOMEvent* aDOMEvent,
                               mozilla::dom::EventTarget* aCurrentTarget,
                               nsCxPusher* aPusher);
diff --git a/content/events/src/nsEventListenerService.h b/content/events/src/nsEventListenerService.h
index a069e2015f2b..83447efc5e2c 100644
--- a/content/events/src/nsEventListenerService.h
+++ b/content/events/src/nsEventListenerService.h
@@ -18,7 +18,8 @@
 class nsEventListenerInfo : public nsIEventListenerInfo
 {
 public:
-  nsEventListenerInfo(const nsAString& aType, nsIDOMEventListener* aListener,
+  nsEventListenerInfo(const nsAString& aType,
+                      already_AddRefed<nsIDOMEventListener> aListener,
                       bool aCapturing, bool aAllowsUntrusted,
                       bool aInSystemEventGroup)
   : mType(aType), mListener(aListener), mCapturing(aCapturing),
diff --git a/dom/bindings/CallbackObject.cpp b/dom/bindings/CallbackObject.cpp
index 794f3b267907..77b9183d1b63 100644
--- a/dom/bindings/CallbackObject.cpp
+++ b/dom/bindings/CallbackObject.cpp
@@ -185,7 +185,7 @@ CallbackObject::CallSetup::~CallSetup()
 
 already_AddRefed<nsISupports>
 CallbackObjectHolderBase::ToXPCOMCallback(CallbackObject* aCallback,
-                                          const nsIID& aIID)
+                                          const nsIID& aIID) const
 {
   if (!aCallback) {
     return nullptr;
diff --git a/dom/bindings/CallbackObject.h b/dom/bindings/CallbackObject.h
index 6d7b1c75c0bc..a7399ff9156e 100644
--- a/dom/bindings/CallbackObject.h
+++ b/dom/bindings/CallbackObject.h
@@ -207,7 +207,7 @@ class CallbackObjectHolderBase
 protected:
   // Returns null on all failures
   already_AddRefed<nsISupports> ToXPCOMCallback(CallbackObject* aCallback,
-                                                const nsIID& aIID);
+                                                const nsIID& aIID) const;
 };
 
 template<class WebIDLCallbackT, class XPCOMCallbackT>
@@ -250,11 +250,38 @@ public:
     UnlinkSelf();
   }
 
+  void operator=(WebIDLCallbackT* aCallback)
+  {
+    UnlinkSelf();
+    mPtrBits = reinterpret_cast<uintptr_t>(aCallback);
+    NS_IF_ADDREF(aCallback);
+  }
+
+  void operator=(XPCOMCallbackT* aCallback)
+  {
+    UnlinkSelf();
+    mPtrBits = reinterpret_cast<uintptr_t>(aCallback) | XPCOMCallbackFlag;
+    NS_IF_ADDREF(aCallback);
+  }
+
+  void operator=(const CallbackObjectHolder& aOther)
+  {
+    UnlinkSelf();
+    mPtrBits = aOther.mPtrBits;
+    NS_IF_ADDREF(GetISupports());
+  }
+
   nsISupports* GetISupports() const
   {
     return reinterpret_cast<nsISupports*>(mPtrBits & ~XPCOMCallbackFlag);
   }
 
+  // Boolean conversion operator so people can use this in boolean tests
+  operator bool() const
+  {
+    return GetISupports();
+  }
+
   // Even if HasWebIDLCallback returns true, GetWebIDLCallback() might still
   // return null.
   bool HasWebIDLCallback() const
@@ -310,7 +337,7 @@ public:
   }
 
   // Try to return an XPCOMCallbackT version of this object.
-  already_AddRefed<XPCOMCallbackT> ToXPCOMCallback()
+  already_AddRefed<XPCOMCallbackT> ToXPCOMCallback() const
   {
     if (!HasWebIDLCallback()) {
       nsRefPtr<XPCOMCallbackT> callback = GetXPCOMCallback();
@@ -325,7 +352,7 @@ public:
   }
 
   // Try to return a WebIDLCallbackT version of this object.
-  already_AddRefed<WebIDLCallbackT> ToWebIDLCallback()
+  already_AddRefed<WebIDLCallbackT> ToWebIDLCallback() const
   {
     if (HasWebIDLCallback()) {
       nsRefPtr<WebIDLCallbackT> callback = GetWebIDLCallback();

From 3f4bc94369025696135aeff1d6eeab50079dc97c Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 16 Apr 2013 17:16:08 -0400
Subject: [PATCH 055/438] Bug 835643 part 3.  Expose the ability to add WebIDL
 event listeners to an event listener manager via its API.  r=smaug

---
 content/events/src/nsEventListenerManager.cpp | 30 +++++++----
 content/events/src/nsEventListenerManager.h   | 53 +++++++++++++++++--
 2 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 587b4a97bc1d..0e9518a8313a 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -201,7 +201,7 @@ nsEventListenerManager::GetTargetAsInnerWindow() const
 
 void
 nsEventListenerManager::AddEventListenerInternal(
-                          nsIDOMEventListener* aListener,
+                          const EventListenerHolder& aListener,
                           uint32_t aType,
                           nsIAtom* aTypeAtom,
                           const EventListenerFlags& aFlags,
@@ -214,7 +214,9 @@ nsEventListenerManager::AddEventListenerInternal(
     return;
   }
 
-  nsRefPtr<nsIDOMEventListener> kungFuDeathGrip = aListener;
+  // Since there is no public API to call us with an EventListenerHolder, we
+  // know that there's an EventListenerHolder on the stack holding a strong ref
+  // to the listener.
 
   nsListenerStruct* ls;
   uint32_t count = mListeners.Length();
@@ -243,8 +245,11 @@ nsEventListenerManager::AddEventListenerInternal(
   // Detect the type of event listener.
   nsCOMPtr<nsIXPConnectWrappedJS> wjs;
   if (aFlags.mListenerIsJSListener) {
+    MOZ_ASSERT(!aListener.HasWebIDLCallback());
     ls->mListenerType = eJSEventListener;
-  } else if ((wjs = do_QueryInterface(aListener))) {
+  } else if (aListener.HasWebIDLCallback()) {
+    ls->mListenerType = eWebIDLListener;
+  } else if ((wjs = do_QueryInterface(aListener.GetXPCOMCallback()))) {
     ls->mListenerType = eWrappedJSListener;
   } else {
     ls->mListenerType = eNativeListener;
@@ -427,7 +432,7 @@ nsEventListenerManager::DisableDevice(uint32_t aType)
 
 void
 nsEventListenerManager::RemoveEventListenerInternal(
-                          nsIDOMEventListener* aListener, 
+                          const EventListenerHolder& aListener, 
                           uint32_t aType,
                           nsIAtom* aUserType,
                           const EventListenerFlags& aFlags,
@@ -501,7 +506,7 @@ ListenerCanHandle(nsListenerStruct* aLs, nsEvent* aEvent)
 }
 
 void
-nsEventListenerManager::AddEventListenerByType(nsIDOMEventListener *aListener, 
+nsEventListenerManager::AddEventListenerByType(const EventListenerHolder& aListener, 
                                                const nsAString& aType,
                                                const EventListenerFlags& aFlags)
 {
@@ -512,7 +517,7 @@ nsEventListenerManager::AddEventListenerByType(nsIDOMEventListener *aListener,
 
 void
 nsEventListenerManager::RemoveEventListenerByType(
-                          nsIDOMEventListener* aListener,
+                          const EventListenerHolder& aListener,
                           const nsAString& aType,
                           const EventListenerFlags& aFlags)
 {
@@ -565,7 +570,8 @@ nsEventListenerManager::SetEventHandlerInternal(nsIScriptContext *aContext,
                                aHandler, getter_AddRefs(scriptListener));
 
     if (NS_SUCCEEDED(rv)) {
-      AddEventListenerInternal(scriptListener, eventType, aName, flags, true);
+      EventListenerHolder holder(scriptListener);
+      AddEventListenerInternal(holder, eventType, aName, flags, true);
 
       ls = FindEventHandler(eventType, aName);
     }
@@ -1036,7 +1042,7 @@ nsEventListenerManager::Disconnect()
 
 void
 nsEventListenerManager::AddEventListener(const nsAString& aType,
-                                         nsIDOMEventListener* aListener,
+                                         const EventListenerHolder& aListener,
                                          bool aUseCapture,
                                          bool aWantsUntrusted)
 {
@@ -1048,7 +1054,7 @@ nsEventListenerManager::AddEventListener(const nsAString& aType,
 
 void
 nsEventListenerManager::RemoveEventListener(const nsAString& aType, 
-                                            nsIDOMEventListener* aListener, 
+                                            const EventListenerHolder& aListener, 
                                             bool aUseCapture)
 {
   EventListenerFlags flags;
@@ -1066,7 +1072,8 @@ nsEventListenerManager::AddListenerForAllEvents(nsIDOMEventListener* aListener,
   flags.mCapture = aUseCapture;
   flags.mAllowUntrustedEvents = aWantsUntrusted;
   flags.mInSystemGroup = aSystemEventGroup;
-  AddEventListenerInternal(aListener, NS_EVENT_TYPE_ALL, nullptr, flags,
+  EventListenerHolder holder(aListener);
+  AddEventListenerInternal(holder, NS_EVENT_TYPE_ALL, nullptr, flags,
                            false, true);
 }
 
@@ -1078,7 +1085,8 @@ nsEventListenerManager::RemoveListenerForAllEvents(nsIDOMEventListener* aListene
   EventListenerFlags flags;
   flags.mCapture = aUseCapture;
   flags.mInSystemGroup = aSystemEventGroup;
-  RemoveEventListenerInternal(aListener, NS_EVENT_TYPE_ALL, nullptr, flags,
+  EventListenerHolder holder(aListener);
+  RemoveEventListenerInternal(holder, NS_EVENT_TYPE_ALL, nullptr, flags,
                               true);
 }
 
diff --git a/content/events/src/nsEventListenerManager.h b/content/events/src/nsEventListenerManager.h
index 122dc27d171a..878d34fe30bc 100644
--- a/content/events/src/nsEventListenerManager.h
+++ b/content/events/src/nsEventListenerManager.h
@@ -219,10 +219,33 @@ public:
   void AddEventListener(const nsAString& aType,
                         nsIDOMEventListener* aListener,
                         bool aUseCapture,
-                        bool aWantsUntrusted);
+                        bool aWantsUntrusted)
+  {
+    mozilla::dom::EventListenerHolder holder(aListener);
+    AddEventListener(aType, holder, aUseCapture, aWantsUntrusted);
+  }
+  void AddEventListener(const nsAString& aType,
+                        mozilla::dom::EventListener* aListener,
+                        bool aUseCapture,
+                        bool aWantsUntrusted)
+  {
+    mozilla::dom::EventListenerHolder holder(aListener);
+    AddEventListener(aType, holder, aUseCapture, aWantsUntrusted);
+  }
   void RemoveEventListener(const nsAString& aType,
                            nsIDOMEventListener* aListener,
-                           bool aUseCapture);
+                           bool aUseCapture)
+  {
+    mozilla::dom::EventListenerHolder holder(aListener);
+    RemoveEventListener(aType, holder, aUseCapture);
+  }
+  void RemoveEventListener(const nsAString& aType,
+                           mozilla::dom::EventListener* aListener,
+                           bool aUseCapture)
+  {
+    mozilla::dom::EventListenerHolder holder(aListener);
+    RemoveEventListener(aType, holder, aUseCapture);
+  }
 
   void AddListenerForAllEvents(nsIDOMEventListener* aListener,
                                bool aUseCapture,
@@ -237,9 +260,23 @@ public:
   * @param an event listener
   */
   void AddEventListenerByType(nsIDOMEventListener *aListener,
+                              const nsAString& type,
+                              const mozilla::dom::EventListenerFlags& aFlags)
+  {
+    mozilla::dom::EventListenerHolder holder(aListener);
+    AddEventListenerByType(holder, type, aFlags);
+  }
+  void AddEventListenerByType(const mozilla::dom::EventListenerHolder& aListener,
                               const nsAString& type,
                               const mozilla::dom::EventListenerFlags& aFlags);
   void RemoveEventListenerByType(nsIDOMEventListener *aListener,
+                                 const nsAString& type,
+                                 const mozilla::dom::EventListenerFlags& aFlags)
+  {
+    mozilla::dom::EventListenerHolder holder(aListener);
+    RemoveEventListenerByType(holder, type, aFlags);
+  }
+  void RemoveEventListenerByType(const mozilla::dom::EventListenerHolder& aListener,
                                  const nsAString& type,
                                  const mozilla::dom::EventListenerFlags& aFlags);
 
@@ -457,15 +494,23 @@ protected:
    */
   const nsEventHandler* GetEventHandlerInternal(nsIAtom* aEventName);
 
+  void AddEventListener(const nsAString& aType,
+                        const mozilla::dom::EventListenerHolder& aListener,
+                        bool aUseCapture,
+                        bool aWantsUntrusted);
+  void RemoveEventListener(const nsAString& aType,
+                           const mozilla::dom::EventListenerHolder& aListener,
+                           bool aUseCapture);
+
   void AddEventListenerInternal(
-         nsIDOMEventListener* aListener,
+         const mozilla::dom::EventListenerHolder& aListener,
          uint32_t aType,
          nsIAtom* aTypeAtom,
          const mozilla::dom::EventListenerFlags& aFlags,
          bool aHandler = false,
          bool aAllEvents = false);
   void RemoveEventListenerInternal(
-         nsIDOMEventListener* aListener,
+         const mozilla::dom::EventListenerHolder& aListener,
          uint32_t aType,
          nsIAtom* aUserType,
          const mozilla::dom::EventListenerFlags& aFlags,

From de948b12f3d58202a79b0dd2ce5a434a02a442d3 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 16 Apr 2013 17:16:08 -0400
Subject: [PATCH 056/438] Bug 835643 part 4.  Put in place all the
 infrastructure to switch EventListener to WebIDL codegen.  r=smaug

---
 content/base/public/nsINode.h                 |  6 +++
 content/base/src/WebSocket.cpp                | 28 ++++++++++
 content/base/src/WebSocket.h                  |  9 ++++
 content/base/src/nsDOMDataChannel.cpp         |  2 +-
 content/base/src/nsDOMFileReader.h            |  2 +-
 content/base/src/nsINode.cpp                  | 23 +++++++++
 content/base/src/nsInProcessTabChildGlobal.h  |  1 +
 content/base/src/nsXMLHttpRequest.h           |  6 +--
 content/events/public/EventTarget.h           | 26 ++++------
 content/events/src/EventTarget.cpp            | 26 ++++++++++
 content/events/src/Makefile.in                |  1 +
 content/events/src/nsDOMEventTargetHelper.cpp | 30 +++++++++++
 content/events/src/nsDOMEventTargetHelper.h   | 13 ++++-
 .../synth/SpeechSynthesisUtterance.h          |  2 +-
 dom/base/DOMRequest.h                         |  2 +-
 dom/base/nsGlobalWindow.cpp                   | 28 ++++++++++
 dom/base/nsGlobalWindow.h                     |  6 +++
 dom/base/nsScreen.h                           |  2 +-
 dom/base/nsWindowRoot.cpp                     | 18 +++++++
 dom/base/nsWindowRoot.h                       |  6 +++
 dom/bluetooth/BluetoothAdapter.h              |  2 +-
 dom/bluetooth/BluetoothDevice.h               |  2 +-
 dom/bluetooth/BluetoothManager.h              |  2 +-
 dom/cellbroadcast/src/CellBroadcast.h         |  2 +-
 dom/devicestorage/DeviceStorage.h             | 11 ++++
 dom/devicestorage/nsDeviceStorage.cpp         | 51 ++++++++++++++++---
 dom/fm/FMRadio.h                              |  2 +-
 dom/icc/src/IccManager.h                      |  2 +-
 dom/ipc/TabChild.h                            |  1 +
 dom/mobilemessage/src/MobileMessageManager.h  |  2 +-
 dom/mobilemessage/src/SmsManager.h            |  2 +-
 dom/network/src/Connection.h                  |  2 +-
 dom/network/src/MobileConnection.h            |  2 +-
 dom/telephony/Telephony.h                     |  2 +-
 dom/telephony/TelephonyCall.h                 |  2 +-
 dom/voicemail/Voicemail.h                     |  2 +-
 36 files changed, 281 insertions(+), 45 deletions(-)
 create mode 100644 content/events/src/EventTarget.cpp

diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index 8a9345cb69c3..69c45fa11224 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -805,7 +805,13 @@ public:
    * See nsIDOMEventTarget
    */
   NS_DECL_NSIDOMEVENTTARGET
+  using mozilla::dom::EventTarget::RemoveEventListener;
   using nsIDOMEventTarget::AddEventListener;
+  virtual void AddEventListener(const nsAString& aType,
+                                nsIDOMEventListener* aListener,
+                                bool aUseCapture,
+                                const mozilla::dom::Nullable<bool>& aWantsUntrusted,
+                                mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
   using nsIDOMEventTarget::AddSystemEventListener;
 
   /**
diff --git a/content/base/src/WebSocket.cpp b/content/base/src/WebSocket.cpp
index d90b77f9e7dd..143a56deaee4 100644
--- a/content/base/src/WebSocket.cpp
+++ b/content/base/src/WebSocket.cpp
@@ -1153,6 +1153,20 @@ WebSocket::RemoveEventListener(const nsAString& aType,
   return rv;
 }
 
+void
+WebSocket::RemoveEventListener(const nsAString& aType,
+                               nsIDOMEventListener* aListener,
+                               bool aUseCapture,
+                               ErrorResult& aRv)
+{
+  NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread");
+  nsDOMEventTargetHelper::RemoveEventListener(aType, aListener,
+                                              aUseCapture, aRv);
+  if (!aRv.Failed()) {
+    UpdateMustKeepAlive();
+  }
+}
+
 NS_IMETHODIMP
 WebSocket::AddEventListener(const nsAString& aType,
                             nsIDOMEventListener *aListener,
@@ -1172,6 +1186,20 @@ WebSocket::AddEventListener(const nsAString& aType,
   return rv;
 }
 
+void
+WebSocket::AddEventListener(const nsAString& aType,
+                            nsIDOMEventListener* aListener,
+                            bool aUseCapture,
+                            const Nullable<bool>& aWantsUntrusted,
+                            ErrorResult& aRv)
+{
+  NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread");
+  nsDOMEventTargetHelper::AddEventListener(aType, aListener, aUseCapture,
+                                           aWantsUntrusted, aRv);
+  if (!aRv.Failed()) {
+    UpdateMustKeepAlive();
+  }
+}
 //-----------------------------------------------------------------------------
 // WebSocket - methods
 //-----------------------------------------------------------------------------
diff --git a/content/base/src/WebSocket.h b/content/base/src/WebSocket.h
index a8cc41aeaea0..2028c9c11008 100644
--- a/content/base/src/WebSocket.h
+++ b/content/base/src/WebSocket.h
@@ -77,9 +77,18 @@ public:
                               bool aUseCapture,
                               bool aWantsUntrusted,
                               uint8_t optional_argc);
+  virtual void AddEventListener(const nsAString& aType,
+                                nsIDOMEventListener* aListener,
+                                bool aCapture,
+                                const Nullable<bool>& aWantsUntrusted,
+                                ErrorResult& aRv) MOZ_OVERRIDE;
   NS_IMETHOD RemoveEventListener(const nsAString& aType,
                                  nsIDOMEventListener* aListener,
                                  bool aUseCapture);
+  virtual void RemoveEventListener(const nsAString& aType,
+                                   nsIDOMEventListener* aListener,
+                                   bool aUseCapture,
+                                   ErrorResult& aRv) MOZ_OVERRIDE;
 
   virtual void DisconnectFromOwner();
 
diff --git a/content/base/src/nsDOMDataChannel.cpp b/content/base/src/nsDOMDataChannel.cpp
index 2f337a106c95..4bcae7095fb2 100644
--- a/content/base/src/nsDOMDataChannel.cpp
+++ b/content/base/src/nsDOMDataChannel.cpp
@@ -71,7 +71,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMDATACHANNEL
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMDataChannel,
                                            nsDOMEventTargetHelper)
diff --git a/content/base/src/nsDOMFileReader.h b/content/base/src/nsDOMFileReader.h
index 8be0edb455fe..bdafb4617cee 100644
--- a/content/base/src/nsDOMFileReader.h
+++ b/content/base/src/nsDOMFileReader.h
@@ -41,7 +41,7 @@ public:
 
   NS_DECL_NSIDOMFILEREADER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   // nsIInterfaceRequestor 
   NS_DECL_NSIINTERFACEREQUESTOR
diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp
index 03de895c6ea7..e4a8c8e8eed8 100644
--- a/content/base/src/nsINode.cpp
+++ b/content/base/src/nsINode.cpp
@@ -1044,6 +1044,29 @@ nsINode::AddEventListener(const nsAString& aType,
   return NS_OK;
 }
 
+void
+nsINode::AddEventListener(const nsAString& aType,
+                          nsIDOMEventListener* aListener,
+                          bool aUseCapture,
+                          const Nullable<bool>& aWantsUntrusted,
+                          ErrorResult& aRv)
+{
+  bool wantsUntrusted;
+  if (aWantsUntrusted.IsNull()) {
+    wantsUntrusted = !nsContentUtils::IsChromeDoc(OwnerDoc());
+  } else {
+    wantsUntrusted = aWantsUntrusted.Value();
+  }
+
+  nsEventListenerManager* listener_manager = GetListenerManager(true);
+  if (!listener_manager) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return;
+  }
+  listener_manager->AddEventListener(aType, aListener, aUseCapture,
+                                     wantsUntrusted);
+}
+
 NS_IMETHODIMP
 nsINode::AddSystemEventListener(const nsAString& aType,
                                 nsIDOMEventListener *aListener,
diff --git a/content/base/src/nsInProcessTabChildGlobal.h b/content/base/src/nsInProcessTabChildGlobal.h
index 390d61b78a94..a60f23db296c 100644
--- a/content/base/src/nsInProcessTabChildGlobal.h
+++ b/content/base/src/nsInProcessTabChildGlobal.h
@@ -91,6 +91,7 @@ public:
                                                     aWantsUntrusted,
                                                     optional_argc);
   }
+  using nsDOMEventTargetHelper::AddEventListener;
 
   virtual nsIScriptObjectPrincipal* GetObjectPrincipal() { return this; }
   virtual JSContext* GetJSContextForEventHandlers() { return mCx; }
diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h
index 9c6b56a8d1e5..c67f54381304 100644
--- a/content/base/src/nsXMLHttpRequest.h
+++ b/content/base/src/nsXMLHttpRequest.h
@@ -67,7 +67,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsXHREventTarget,
                                            nsDOMEventTargetHelper)
   NS_DECL_NSIXMLHTTPREQUESTEVENTTARGET
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   IMPL_EVENT_HANDLER(loadstart)
   IMPL_EVENT_HANDLER(progress)
@@ -91,7 +91,7 @@ public:
   }                                         
   NS_DECL_ISUPPORTS_INHERITED
   NS_FORWARD_NSIXMLHTTPREQUESTEVENTTARGET(nsXHREventTarget::)
-  NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget)
   NS_DECL_NSIXMLHTTPREQUESTUPLOAD
 
   virtual JSObject* WrapObject(JSContext *cx, JSObject *scope) MOZ_OVERRIDE
@@ -226,7 +226,7 @@ public:
   virtual size_t
     SizeOfEventTargetIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget)
 
 #ifdef DEBUG
   void StaticAssertions();
diff --git a/content/events/public/EventTarget.h b/content/events/public/EventTarget.h
index d946c334fba4..d91a1931e844 100644
--- a/content/events/public/EventTarget.h
+++ b/content/events/public/EventTarget.h
@@ -17,6 +17,8 @@ class nsDOMEvent;
 namespace mozilla {
 namespace dom {
 
+class EventListener;
+
 // IID for the dom::EventTarget interface
 #define NS_EVENTTARGET_IID \
 { 0x0a5aed21, 0x0bab, 0x48b3, \
@@ -32,21 +34,15 @@ public:
   using nsIDOMEventTarget::AddEventListener;
   using nsIDOMEventTarget::RemoveEventListener;
   using nsIDOMEventTarget::DispatchEvent;
-  void AddEventListener(const nsAString& aType,
-                        nsIDOMEventListener* aCallback, // XXX nullable
-                        bool aCapture, const Nullable<bool>& aWantsUntrusted,
-                        mozilla::ErrorResult& aRv)
-  {
-    aRv = AddEventListener(aType, aCallback, aCapture,
-                           !aWantsUntrusted.IsNull() && aWantsUntrusted.Value(),
-                           aWantsUntrusted.IsNull() ? 1 : 2);
-  }
-  void RemoveEventListener(const nsAString& aType,
-                           nsIDOMEventListener* aCallback,
-                           bool aCapture, mozilla::ErrorResult& aRv)
-  {
-    aRv = RemoveEventListener(aType, aCallback, aCapture);
-  }
+  virtual void AddEventListener(const nsAString& aType,
+                                nsIDOMEventListener* aCallback,
+                                bool aCapture,
+                                const Nullable<bool>& aWantsUntrusted,
+                                ErrorResult& aRv) = 0;
+  virtual void RemoveEventListener(const nsAString& aType,
+                                   nsIDOMEventListener* aCallback,
+                                   bool aCapture,
+                                   ErrorResult& aRv);
   bool DispatchEvent(nsDOMEvent& aEvent, ErrorResult& aRv);
 };
 
diff --git a/content/events/src/EventTarget.cpp b/content/events/src/EventTarget.cpp
new file mode 100644
index 000000000000..beae68758bca
--- /dev/null
+++ b/content/events/src/EventTarget.cpp
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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 "mozilla/dom/EventTarget.h"
+#include "nsEventListenerManager.h"
+
+
+namespace mozilla {
+namespace dom {
+
+void
+EventTarget::RemoveEventListener(const nsAString& aType,
+                                 nsIDOMEventListener* aListener,
+                                 bool aUseCapture,
+                                 ErrorResult& aRv)
+{
+  nsEventListenerManager* elm = GetListenerManager(false);
+  if (elm) {
+    elm->RemoveEventListener(aType, aListener, aUseCapture);
+  }
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index 832ef8bb2d75..5b0aee74629a 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -15,6 +15,7 @@ LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 CPPSRCS		= \
+		EventTarget.cpp \
 		nsEventListenerManager.cpp \
 		nsEventStateManager.cpp \
 		nsDOMEvent.cpp \
diff --git a/content/events/src/nsDOMEventTargetHelper.cpp b/content/events/src/nsDOMEventTargetHelper.cpp
index e7c8e153a32f..cd6c34e6cc06 100644
--- a/content/events/src/nsDOMEventTargetHelper.cpp
+++ b/content/events/src/nsDOMEventTargetHelper.cpp
@@ -192,6 +192,36 @@ nsDOMEventTargetHelper::AddEventListener(const nsAString& aType,
   return NS_OK;
 }
 
+void
+nsDOMEventTargetHelper::AddEventListener(const nsAString& aType,
+                                         nsIDOMEventListener* aListener,
+                                         bool aUseCapture,
+                                         const Nullable<bool>& aWantsUntrusted,
+                                         ErrorResult& aRv)
+{
+  bool wantsUntrusted;
+  if (aWantsUntrusted.IsNull()) {
+    nsresult rv;
+    nsIScriptContext* context = GetContextForEventHandlers(&rv);
+    if (NS_FAILED(rv)) {
+      aRv.Throw(rv);
+      return;
+    }
+    nsCOMPtr<nsIDocument> doc =
+      nsContentUtils::GetDocumentFromScriptContext(context);
+    wantsUntrusted = doc && !nsContentUtils::IsChromeDoc(doc);
+  } else {
+    wantsUntrusted = aWantsUntrusted.Value();
+  }
+
+  nsEventListenerManager* elm = GetListenerManager(true);
+  if (!elm) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return;
+  }
+  elm->AddEventListener(aType, aListener, aUseCapture, wantsUntrusted);
+}
+
 NS_IMETHODIMP
 nsDOMEventTargetHelper::AddSystemEventListener(const nsAString& aType,
                                                nsIDOMEventListener *aListener,
diff --git a/content/events/src/nsDOMEventTargetHelper.h b/content/events/src/nsDOMEventTargetHelper.h
index ab4cf4565b03..c35e9a2fa645 100644
--- a/content/events/src/nsDOMEventTargetHelper.h
+++ b/content/events/src/nsDOMEventTargetHelper.h
@@ -31,6 +31,12 @@ public:
   NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsDOMEventTargetHelper)
 
   NS_DECL_NSIDOMEVENTTARGET
+  using mozilla::dom::EventTarget::RemoveEventListener;
+  virtual void AddEventListener(const nsAString& aType,
+                                nsIDOMEventListener* aListener,
+                                bool aCapture,
+                                const mozilla::dom::Nullable<bool>& aWantsUntrusted,
+                                mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
 
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_DOMEVENTTARGETHELPER_IID)
 
@@ -205,6 +211,11 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsDOMEventTargetHelper,
   } \
   virtual JSContext * GetJSContextForEventHandlers(void) { \
     return _to GetJSContextForEventHandlers(); \
-  } 
+  }
+
+#define NS_REALLY_FORWARD_NSIDOMEVENTTARGET(_class) \
+  using _class::AddEventListener;                   \
+  using _class::RemoveEventListener;                \
+  NS_FORWARD_NSIDOMEVENTTARGET(_class::)
 
 #endif // nsDOMEventTargetHelper_h_
diff --git a/content/media/webspeech/synth/SpeechSynthesisUtterance.h b/content/media/webspeech/synth/SpeechSynthesisUtterance.h
index 7e5d8c8f151f..1ba64df41438 100644
--- a/content/media/webspeech/synth/SpeechSynthesisUtterance.h
+++ b/content/media/webspeech/synth/SpeechSynthesisUtterance.h
@@ -35,7 +35,7 @@ public:
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   nsISupports* GetParentObject() const;
 
diff --git a/dom/base/DOMRequest.h b/dom/base/DOMRequest.h
index e9e1134ff195..8e331dc484b3 100644
--- a/dom/base/DOMRequest.h
+++ b/dom/base/DOMRequest.h
@@ -30,7 +30,7 @@ protected:
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMDOMREQUEST
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(DOMRequest,
                                                          nsDOMEventTargetHelper)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index d2d9dcb2f4d5..62f8e589752b 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -8018,6 +8018,34 @@ nsGlobalWindow::AddEventListener(const nsAString& aType,
   return NS_OK;
 }
 
+void
+nsGlobalWindow::AddEventListener(const nsAString& aType,
+                                 nsIDOMEventListener* aListener,
+                                 bool aUseCapture,
+                                 const Nullable<bool>& aWantsUntrusted,
+                                 ErrorResult& aRv)
+{
+  if (IsOuterWindow() && mInnerWindow &&
+      !nsContentUtils::CanCallerAccess(mInnerWindow)) {
+    aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
+    return;
+  }
+
+  bool wantsUntrusted;
+  if (aWantsUntrusted.IsNull()) {
+    wantsUntrusted = !nsContentUtils::IsChromeDoc(mDoc);
+  } else {
+    wantsUntrusted = aWantsUntrusted.Value();
+  }
+
+  nsEventListenerManager* manager = GetListenerManager(true);
+  if (!manager) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return;
+  }
+  manager->AddEventListener(aType, aListener, aUseCapture, wantsUntrusted);
+}
+
 NS_IMETHODIMP
 nsGlobalWindow::AddSystemEventListener(const nsAString& aType,
                                        nsIDOMEventListener *aListener,
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 0684c4b8c2f0..336896427fe3 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -340,6 +340,12 @@ public:
 
   // nsIDOMEventTarget
   NS_DECL_NSIDOMEVENTTARGET
+  using mozilla::dom::EventTarget::RemoveEventListener;
+  virtual void AddEventListener(const nsAString& aType,
+                                nsIDOMEventListener* aListener,
+                                bool aUseCapture,
+                                const mozilla::dom::Nullable<bool>& aWantsUntrusted,
+                                mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
 
   // nsITouchEventReceiver
   NS_DECL_NSITOUCHEVENTRECEIVER
diff --git a/dom/base/nsScreen.h b/dom/base/nsScreen.h
index 4b716db6569f..87b434e9d847 100644
--- a/dom/base/nsScreen.h
+++ b/dom/base/nsScreen.h
@@ -34,7 +34,7 @@ public:
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMSCREEN
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   nsPIDOMWindow* GetParentObject() const
   {
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index 10b0e1648471..d6cadb60cdc1 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -26,6 +26,7 @@
 #include "nsIDOMXULElement.h"
 #endif
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 static NS_DEFINE_CID(kEventListenerManagerCID,    NS_EVENTLISTENERMANAGER_CID);
@@ -110,6 +111,23 @@ nsWindowRoot::AddEventListener(const nsAString& aType,
   return NS_OK;
 }
 
+void
+nsWindowRoot::AddEventListener(const nsAString& aType,
+                                nsIDOMEventListener* aListener,
+                                bool aUseCapture,
+                                const Nullable<bool>& aWantsUntrusted,
+                                ErrorResult& aRv)
+{
+  bool wantsUntrusted = !aWantsUntrusted.IsNull() && aWantsUntrusted.Value();
+  nsEventListenerManager* elm = GetListenerManager(true);
+  if (!elm) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return;
+  }
+  elm->AddEventListener(aType, aListener, aUseCapture, wantsUntrusted);
+}
+
+
 NS_IMETHODIMP
 nsWindowRoot::AddSystemEventListener(const nsAString& aType,
                                      nsIDOMEventListener *aListener,
diff --git a/dom/base/nsWindowRoot.h b/dom/base/nsWindowRoot.h
index b67a97ee63af..1348b399f2b4 100644
--- a/dom/base/nsWindowRoot.h
+++ b/dom/base/nsWindowRoot.h
@@ -27,6 +27,12 @@ public:
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIDOMEVENTTARGET
+  using mozilla::dom::EventTarget::RemoveEventListener;
+  virtual void AddEventListener(const nsAString& aType,
+                                nsIDOMEventListener* aListener,
+                                bool aUseCapture,
+                                const mozilla::dom::Nullable<bool>& aWantsUntrusted,
+                                mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
 
   // nsPIWindowRoot
 
diff --git a/dom/bluetooth/BluetoothAdapter.h b/dom/bluetooth/BluetoothAdapter.h
index d52b89d47c31..6594a1d42bac 100644
--- a/dom/bluetooth/BluetoothAdapter.h
+++ b/dom/bluetooth/BluetoothAdapter.h
@@ -31,7 +31,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMBLUETOOTHADAPTER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(BluetoothAdapter,
                                                          nsDOMEventTargetHelper)
diff --git a/dom/bluetooth/BluetoothDevice.h b/dom/bluetooth/BluetoothDevice.h
index 9bfe74b166be..b74c2864f435 100644
--- a/dom/bluetooth/BluetoothDevice.h
+++ b/dom/bluetooth/BluetoothDevice.h
@@ -31,7 +31,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMBLUETOOTHDEVICE
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(BluetoothDevice,
                                                          nsDOMEventTargetHelper)
diff --git a/dom/bluetooth/BluetoothManager.h b/dom/bluetooth/BluetoothManager.h
index a17c67cfed12..dcaf9abb957a 100644
--- a/dom/bluetooth/BluetoothManager.h
+++ b/dom/bluetooth/BluetoothManager.h
@@ -26,7 +26,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMBLUETOOTHMANAGER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   static already_AddRefed<BluetoothManager>
   Create(nsPIDOMWindow* aWindow);
diff --git a/dom/cellbroadcast/src/CellBroadcast.h b/dom/cellbroadcast/src/CellBroadcast.h
index 6908f2c874bc..bc23451e260c 100644
--- a/dom/cellbroadcast/src/CellBroadcast.h
+++ b/dom/cellbroadcast/src/CellBroadcast.h
@@ -33,7 +33,7 @@ public:
   NS_DECL_NSIDOMMOZCELLBROADCAST
   NS_DECL_NSICELLBROADCASTLISTENER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   CellBroadcast() MOZ_DELETE;
   CellBroadcast(nsPIDOMWindow *aWindow,
diff --git a/dom/devicestorage/DeviceStorage.h b/dom/devicestorage/DeviceStorage.h
index ac5fa9c5b160..4d478306548a 100644
--- a/dom/devicestorage/DeviceStorage.h
+++ b/dom/devicestorage/DeviceStorage.h
@@ -1,3 +1,5 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et 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/. */
@@ -80,6 +82,15 @@ public:
 
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIDOMEVENTTARGET
+  virtual void AddEventListener(const nsAString& aType,
+                                nsIDOMEventListener* aListener,
+                                bool aUseCapture,
+                                const mozilla::dom::Nullable<bool>& aWantsUntrusted,
+                                mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
+  virtual void RemoveEventListener(const nsAString& aType,
+                                   nsIDOMEventListener* aListener,
+                                   bool aUseCapture,
+                                   mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
 
   nsDOMDeviceStorage();
 
diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp
index ceacad4d062f..1e848f9083d6 100644
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -1,3 +1,5 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et 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/. */
@@ -1527,15 +1529,14 @@ public:
                          nsIPrincipal *aPrincipal,
                          DeviceStorageFile *aFile,
                          DOMRequest* aRequest,
-                         nsDOMDeviceStorage *aDeviceStorage,
-                         nsIDOMEventListener *aListener)
+                         nsDOMDeviceStorage *aDeviceStorage)
       : mRequestType(aRequestType)
       , mWindow(aWindow)
       , mPrincipal(aPrincipal)
       , mFile(aFile)
       , mRequest(aRequest)
       , mDeviceStorage(aDeviceStorage)
-      , mListener(aListener) {}
+    {}
 
     DeviceStorageRequest(const DeviceStorageRequestType aRequestType,
                          nsPIDOMWindow *aWindow,
@@ -1821,7 +1822,6 @@ private:
   nsRefPtr<DOMRequest> mRequest;
   nsCOMPtr<nsIDOMBlob> mBlob;
   nsRefPtr<nsDOMDeviceStorage> mDeviceStorage;
-  nsCOMPtr<nsIDOMEventListener> mListener;
 };
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DeviceStorageRequest)
@@ -1833,12 +1833,11 @@ NS_INTERFACE_MAP_END
 NS_IMPL_CYCLE_COLLECTING_ADDREF(DeviceStorageRequest)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(DeviceStorageRequest)
 
-NS_IMPL_CYCLE_COLLECTION_5(DeviceStorageRequest,
+NS_IMPL_CYCLE_COLLECTION_4(DeviceStorageRequest,
                            mRequest,
                            mWindow,
                            mBlob,
-                           mDeviceStorage,
-                           mListener)
+                           mDeviceStorage)
 
 
 DOMCI_DATA(DeviceStorage, nsDOMDeviceStorage)
@@ -2455,11 +2454,32 @@ nsDOMDeviceStorage::AddEventListener(const nsAString & aType,
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
   nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_WATCH,
-                                                     win, mPrincipal, dsf, request, this, aListener);
+                                                     win, mPrincipal, dsf, request, this);
   NS_DispatchToMainThread(r);
   return nsDOMEventTargetHelper::AddEventListener(aType, aListener, aUseCapture, aWantsUntrusted, aArgc);
 }
 
+void
+nsDOMDeviceStorage::AddEventListener(const nsAString & aType,
+                                     nsIDOMEventListener *aListener,
+                                     bool aUseCapture,
+                                     const Nullable<bool>& aWantsUntrusted,
+                                     ErrorResult& aRv)
+{
+  nsCOMPtr<nsPIDOMWindow> win = GetOwner();
+  if (!win) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return;
+  }
+
+  nsRefPtr<DOMRequest> request = new DOMRequest(win);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
+  nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_WATCH,
+                                                     win, mPrincipal, dsf, request, this);
+  NS_DispatchToMainThread(r);
+  nsDOMEventTargetHelper::AddEventListener(aType, aListener, aUseCapture, aWantsUntrusted, aRv);
+}
+
 NS_IMETHODIMP
 nsDOMDeviceStorage::AddSystemEventListener(const nsAString & aType,
                                            nsIDOMEventListener *aListener,
@@ -2491,6 +2511,21 @@ nsDOMDeviceStorage::RemoveEventListener(const nsAString & aType,
   return NS_OK;
 }
 
+void
+nsDOMDeviceStorage::RemoveEventListener(const nsAString& aType,
+                                        nsIDOMEventListener* aListener,
+                                        bool aCapture,
+                                        ErrorResult& aRv)
+{
+  nsDOMEventTargetHelper::RemoveEventListener(aType, aListener, aCapture, aRv);
+
+  if (mIsWatchingFile && !HasListenersFor(nsGkAtoms::onchange)) {
+    mIsWatchingFile = false;
+    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+    obs->RemoveObserver(this, "file-watcher-update");
+  }
+}
+
 NS_IMETHODIMP
 nsDOMDeviceStorage::RemoveSystemEventListener(const nsAString & aType,
                                               nsIDOMEventListener *aListener,
diff --git a/dom/fm/FMRadio.h b/dom/fm/FMRadio.h
index e1800590cbcc..19977bfb84ac 100644
--- a/dom/fm/FMRadio.h
+++ b/dom/fm/FMRadio.h
@@ -34,7 +34,7 @@ public:
   NS_DECL_NSIFMRADIO
   NS_DECL_NSIAUDIOCHANNELAGENTCALLBACK
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
   FMRadio();
   virtual void Notify(const hal::FMRadioOperationInformation& info);
   virtual void Notify(const hal::SwitchEvent& aEvent);
diff --git a/dom/icc/src/IccManager.h b/dom/icc/src/IccManager.h
index d8be3adc9c58..650b01d8d05e 100644
--- a/dom/icc/src/IccManager.h
+++ b/dom/icc/src/IccManager.h
@@ -30,7 +30,7 @@ public:
   NS_DECL_NSIDOMMOZICCMANAGER
   NS_DECL_NSIICCLISTENER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   IccManager();
 
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index 42a683377891..c024f160879b 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -113,6 +113,7 @@ public:
     return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
                                                     aUseCapture, false, 2);
   }
+  using nsDOMEventTargetHelper::AddEventListener;
   NS_IMETHOD AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,
                               bool aUseCapture, bool aWantsUntrusted,
diff --git a/dom/mobilemessage/src/MobileMessageManager.h b/dom/mobilemessage/src/MobileMessageManager.h
index fa438cd7b9d0..287ad3b0a872 100644
--- a/dom/mobilemessage/src/MobileMessageManager.h
+++ b/dom/mobilemessage/src/MobileMessageManager.h
@@ -25,7 +25,7 @@ public:
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIDOMMOZMOBILEMESSAGEMANAGER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   void Init(nsPIDOMWindow *aWindow);
   void Shutdown();
diff --git a/dom/mobilemessage/src/SmsManager.h b/dom/mobilemessage/src/SmsManager.h
index f47ea98680a3..d7e06b9e20cc 100644
--- a/dom/mobilemessage/src/SmsManager.h
+++ b/dom/mobilemessage/src/SmsManager.h
@@ -24,7 +24,7 @@ public:
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIDOMMOZSMSMANAGER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   static already_AddRefed<SmsManager>
   CreateInstanceIfAllowed(nsPIDOMWindow *aWindow);
diff --git a/dom/network/src/Connection.h b/dom/network/src/Connection.h
index 060ab0d921c3..015994d13083 100644
--- a/dom/network/src/Connection.h
+++ b/dom/network/src/Connection.h
@@ -29,7 +29,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMMOZCONNECTION
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   Connection();
 
diff --git a/dom/network/src/MobileConnection.h b/dom/network/src/MobileConnection.h
index b7cd86aa9d5b..1ef32f1a93b7 100644
--- a/dom/network/src/MobileConnection.h
+++ b/dom/network/src/MobileConnection.h
@@ -37,7 +37,7 @@ public:
   NS_DECL_NSIDOMMOZMOBILECONNECTION
   NS_DECL_NSIMOBILECONNECTIONLISTENER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   MobileConnection();
 
diff --git a/dom/telephony/Telephony.h b/dom/telephony/Telephony.h
index 5e17bfd346da..2bf6e1b66119 100644
--- a/dom/telephony/Telephony.h
+++ b/dom/telephony/Telephony.h
@@ -47,7 +47,7 @@ public:
   NS_DECL_NSIDOMTELEPHONY
   NS_DECL_NSITELEPHONYLISTENER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(
                                                    Telephony,
                                                    nsDOMEventTargetHelper)
diff --git a/dom/telephony/TelephonyCall.h b/dom/telephony/TelephonyCall.h
index 3cb2dd592d7c..429547502d1c 100644
--- a/dom/telephony/TelephonyCall.h
+++ b/dom/telephony/TelephonyCall.h
@@ -32,7 +32,7 @@ class TelephonyCall : public nsDOMEventTargetHelper,
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMTELEPHONYCALL
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(TelephonyCall,
                                            nsDOMEventTargetHelper)
 
diff --git a/dom/voicemail/Voicemail.h b/dom/voicemail/Voicemail.h
index 40befe036dea..d622b8de4186 100644
--- a/dom/voicemail/Voicemail.h
+++ b/dom/voicemail/Voicemail.h
@@ -35,7 +35,7 @@ public:
   NS_DECL_NSIDOMMOZVOICEMAIL
   NS_DECL_NSIVOICEMAILLISTENER
 
-  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper)
 
   Voicemail(nsPIDOMWindow* aWindow, nsIVoicemailProvider* aProvider);
   virtual ~Voicemail();

From d74a374a6926da951c0c672080f78f814a4f363b Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Fri, 5 Apr 2013 00:57:39 -0400
Subject: [PATCH 057/438] Bug 850090.  Don't assert things about our
 stylesheets during unlink, since our state can be kinda inconsistent then. 
 r=smaug

---
 content/base/src/nsDocument.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 568ff0f779cb..9e5e77800733 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -3758,7 +3758,7 @@ nsDocument::RemoveStyleSheet(nsIStyleSheet* aSheet)
   nsCOMPtr<nsIStyleSheet> sheet = aSheet; // hold ref so it won't die too soon
 
   if (!mStyleSheets.RemoveObject(aSheet)) {
-    NS_NOTREACHED("stylesheet not found");
+    NS_ASSERTION(mInUnlinkOrDeletion, "stylesheet not found");
     return;
   }
 

From a0a8b12fb73ace170b219fe19319fc5ab187adff Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Tue, 16 Apr 2013 16:29:04 -0500
Subject: [PATCH 058/438] Bug 836565, Part 1: Make pinch gestures perform
 reflow-on-zoom operations only once to improve performance. [r=kats]

---
 layout/base/nsPresShell.cpp              | 7 ++++---
 mobile/android/chrome/content/browser.js | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 7cc667dbfb21..bfbce3512efe 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -9506,7 +9506,8 @@ nsIPresShell::SetMaxLineBoxWidth(nscoord aMaxLineBoxWidth)
 {
   NS_ASSERTION(aMaxLineBoxWidth >= 0, "attempting to set max line box width to a negative value");
 
-  mMaxLineBoxWidth = aMaxLineBoxWidth;
-
-  FrameNeedsReflow(GetRootFrame(), eResize, NS_FRAME_IS_DIRTY);
+  if (mMaxLineBoxWidth != aMaxLineBoxWidth) {
+    mMaxLineBoxWidth = aMaxLineBoxWidth;
+    FrameNeedsReflow(GetRootFrame(), eResize, NS_FRAME_IS_DIRTY);
+  }
 }
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index ca681538ad5c..6b91cf30ae24 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2836,11 +2836,13 @@ Tab.prototype = {
 
     // Adjust the max line box width to be no more than the viewport width, but
     // only if the reflow-on-zoom preference is enabled.
-    let isZooming = aViewport.zoom != this._zoom;
+    let isZooming = Math.abs(aViewport.zoom - this._zoom) >= 1e-6;
     if (isZooming &&
         BrowserEventHandler.mReflozPref &&
-        BrowserApp.selectedTab._mReflozPoint) {
+        BrowserApp.selectedTab._mReflozPoint &&
+        BrowserApp.selectedTab.probablyNeedRefloz) {
       BrowserApp.selectedTab.performReflowOnZoom(aViewport);
+      BrowserApp.selectedTab.probablyNeedRefloz = false;
     }
 
     let win = this.browser.contentWindow;
@@ -4041,6 +4043,7 @@ var BrowserEventHandler = {
 
        BrowserApp.selectedTab._mReflozPoint = { x: zoomPointX, y: zoomPointY,
          range: BrowserApp.selectedBrowser.contentDocument.caretPositionFromPoint(zoomPointX, zoomPointY) };
+         BrowserApp.selectedTab.probablyNeedRefloz = true;
      }
    },
 

From b50787e6b678b8e287381ee527960ea08436f6db Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Tue, 16 Apr 2013 16:29:11 -0500
Subject: [PATCH 059/438] Bug 800805: Account for left border and padding when
 snapping in to text after reflow on zoom. [r=kats]

---
 mobile/android/chrome/content/browser.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 6b91cf30ae24..662453d73c75 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -4024,8 +4024,13 @@ var BrowserEventHandler = {
     // center the area of interest on the screen.
     let topPos = scrollTop + drRect.top - (viewport.cssHeight / 2.0);
 
+    // Factor in the border and padding
+    let boundingStyle = window.getComputedStyle(boundingElement);
+    let leftAdjustment = parseInt(boundingStyle.paddingLeft) +
+                         parseInt(boundingStyle.borderLeftWidth);
+
     rect.type = "Browser:ZoomToRect";
-    rect.x = Math.max(viewport.cssPageLeft, rect.x  - fudge);
+    rect.x = Math.max(viewport.cssPageLeft, rect.x  - fudge + leftAdjustment);
     rect.y = Math.max(topPos, viewport.cssPageTop);
     rect.w = viewport.cssWidth;
     rect.h = viewport.cssHeight;

From 830f0c9453dcd85630739fa03f34b5a7e1c71a17 Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Tue, 16 Apr 2013 14:34:46 -0700
Subject: [PATCH 060/438] Bug 838793 - Part 1: Convert AboutHomeContent to a
 Fragment. r=lucasr

---
 mobile/android/base/AwesomeBar.java           |  22 +-
 mobile/android/base/BrowserApp.java           | 180 ++++-------
 mobile/android/base/GeckoActivity.java        |   4 +-
 mobile/android/base/GeckoApp.java             |  89 +++---
 mobile/android/base/GeckoViewsFactory.java    |   4 +-
 mobile/android/base/Makefile.in               |   3 +-
 mobile/android/base/PrivateTab.java           |   6 +-
 mobile/android/base/Tab.java                  |  21 +-
 mobile/android/base/Tabs.java                 |   4 +-
 mobile/android/base/gfx/LayerView.java        |   9 +-
 .../abouthome_content.xml                     |  11 +-
 .../resources/layout/abouthome_content.xml    |  11 +-
 .../base/resources/layout/gecko_app.xml       |   5 -
 mobile/android/base/widget/AboutHome.java     | 279 ++++++++++++++++++
 .../android/base/widget/AboutHomeContent.java | 235 ---------------
 mobile/android/base/widget/AboutHomeView.java |  55 ++++
 mobile/android/base/widget/AddonsSection.java |  14 +-
 .../android/base/widget/LastTabsSection.java  |   4 +-
 mobile/android/base/widget/TopSitesView.java  |  20 +-
 19 files changed, 528 insertions(+), 448 deletions(-)
 create mode 100644 mobile/android/base/widget/AboutHome.java
 delete mode 100644 mobile/android/base/widget/AboutHomeContent.java
 create mode 100644 mobile/android/base/widget/AboutHomeView.java

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index 13d1b6f9fe9e..ecebc736e617 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -28,6 +28,7 @@ import android.text.InputType;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -40,7 +41,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.ListView;
 import android.widget.TabWidget;
 import android.widget.Toast;
 
@@ -68,11 +68,12 @@ public class AwesomeBar extends GeckoActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        LayoutInflater.from(this).setFactory(this);
+
         super.onCreate(savedInstanceState);
 
         Log.d(LOGTAG, "creating awesomebar");
 
-        LayoutInflater.from(this).setFactory(GeckoViewsFactory.getInstance());
         setContentView(R.layout.awesomebar);
 
         mGoButton = (ImageButton) findViewById(R.id.awesomebar_button);
@@ -265,6 +266,21 @@ public class AwesomeBar extends GeckoActivity {
         }
     }
 
+    /*
+     * Only one factory can be set on the inflater; however, we want to use two
+     * factories (GeckoViewsFactory and the FragmentActivity factory).
+     * Overriding onCreateView() here allows us to dispatch view creation to
+     * both factories.
+     */
+    @Override
+    public View onCreateView(String name, Context context, AttributeSet attrs) {
+        View view = GeckoViewsFactory.getInstance().onCreateView(name, context, attrs);
+        if (view == null) {
+            view = super.onCreateView(name, context, attrs);
+        }
+        return view;
+    }
+
     private boolean handleBackKey() {
         // Let mAwesomeTabs try to handle the back press, since we may be in a
         // bookmarks sub-folder.
@@ -527,7 +543,6 @@ public class AwesomeBar extends GeckoActivity {
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, view, menuInfo);
-        ListView list = (ListView) view;
         AwesomeBarTab tab = mAwesomeTabs.getAwesomeBarTabForView(view);
         mContextMenuSubject = tab.getSubject(menu, view, menuInfo);
     }
@@ -542,7 +557,6 @@ public class AwesomeBar extends GeckoActivity {
         final byte[] b = mContextMenuSubject.favicon;
         final String title = mContextMenuSubject.title;
         final String keyword = mContextMenuSubject.keyword;
-        final int display = mContextMenuSubject.display;
 
         switch (item.getItemId()) {
             case R.id.open_in_reader: {
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index ecdf25b6b618..14377ae99fd2 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -15,8 +15,7 @@ import org.mozilla.gecko.util.GamepadUtils;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UiAsyncTask;
-import org.mozilla.gecko.widget.AboutHomeContent;
-import org.mozilla.gecko.widget.TopSitesView;
+import org.mozilla.gecko.widget.AboutHome;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -42,7 +41,6 @@ import android.nfc.NfcEvent;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -66,7 +64,9 @@ import java.util.Vector;
 abstract public class BrowserApp extends GeckoApp
                                  implements TabsPanel.TabsLayoutChangeListener,
                                             PropertyAnimator.PropertyAnimationListener,
-                                            View.OnKeyListener {
+                                            View.OnKeyListener,
+                                            AboutHome.UriLoadListener,
+                                            AboutHome.LoadCompleteListener {
     private static final String LOGTAG = "GeckoBrowserApp";
 
     private static final String PREF_CHROME_DYNAMICTOOLBAR = "browser.chrome.dynamictoolbar";
@@ -74,8 +74,7 @@ abstract public class BrowserApp extends GeckoApp
     private static final int TABS_ANIMATION_DURATION = 450;
 
     public static BrowserToolbar mBrowserToolbar;
-    private AboutHomeContent mAboutHomeContent;
-    private Boolean mAboutHomeShowing = null;
+    private AboutHome mAboutHome;
     protected Telemetry.Timer mAboutHomeStartupTimer = null;
 
     private static final int ADDON_MENU_OFFSET = 1000;
@@ -362,8 +361,7 @@ abstract public class BrowserApp extends GeckoApp
                 case KeyEvent.KEYCODE_BUTTON_Y:
                     // Toggle/focus the address bar on gamepad-y button.
                     if (mBrowserToolbar.isVisible()) {
-                        if (isDynamicToolbarEnabled() &&
-                            Boolean.FALSE.equals(mAboutHomeShowing)) {
+                        if (isDynamicToolbarEnabled() && !mAboutHome.getUserVisibleHint()) {
                             mBrowserToolbar.animateVisibility(false);
                             mLayerView.requestFocus();
                         } else {
@@ -463,8 +461,8 @@ abstract public class BrowserApp extends GeckoApp
         ThreadUtils.postToUiThread(new Runnable() {
             @Override
             public void run() {
-                if (mAboutHomeContent != null)
-                    mAboutHomeContent.setLastTabsVisibility(false);
+                if (mAboutHome != null)
+                    mAboutHome.setLastTabsVisibility(false);
             }
         });
 
@@ -488,16 +486,23 @@ abstract public class BrowserApp extends GeckoApp
                 // put the focus on the layerview and carry on
                 LayerView layerView = mLayerView;
                 if (layerView != null && !layerView.hasFocus() && GamepadUtils.isPanningControl(event)) {
-                    if (Boolean.FALSE.equals(mAboutHomeShowing)) {
+                    if (mAboutHome.getUserVisibleHint()) {
                         layerView.requestFocus();
                     } else {
-                        mAboutHomeContent.requestFocus();
+                        mAboutHome.requestFocus();
                     }
                 }
                 return false;
             }
         });
 
+        // AboutHome will be dynamically attached and detached as
+        // about:home is shown. Adding/removing the fragment is not synchronous,
+        // so we can't use Fragment#isVisible() to determine whether the
+        // about:home is shown. Instead, we use Fragment#getUserVisibleHint()
+        // with the hint we set ourselves.
+        mAboutHome = AboutHome.newInstance();
+        mAboutHome.setUserVisibleHint(false);
 
         mBrowserToolbar = new BrowserToolbar(this);
         mBrowserToolbar.from(actionBar);
@@ -574,9 +579,7 @@ abstract public class BrowserApp extends GeckoApp
         } else {
             // Immediately show the toolbar when disabling the dynamic
             // toolbar.
-            if (mAboutHomeContent != null) {
-                mAboutHomeContent.setPadding(0, 0, 0, 0);
-            }
+            mAboutHome.setPadding(0, 0, 0, 0);
             mBrowserToolbar.cancelVisibilityAnimation();
             mBrowserToolbar.getLayout().scrollTo(0, 0);
         }
@@ -610,8 +613,6 @@ abstract public class BrowserApp extends GeckoApp
             PrefsHelper.removeObserver(mPrefObserverId);
             mPrefObserverId = null;
         }
-        if (mAboutHomeContent != null)
-            mAboutHomeContent.onDestroy();
         if (mBrowserToolbar != null)
             mBrowserToolbar.onDestroy();
 
@@ -635,13 +636,6 @@ abstract public class BrowserApp extends GeckoApp
         super.onDestroy();
     }
 
-    @Override
-    public void onContentChanged() {
-        super.onContentChanged();
-        if (mAboutHomeContent != null)
-            mAboutHomeContent.onActivityContentChanged();
-    }
-
     @Override
     protected void finishProfileMigration() {
         // Update about:home with the new information.
@@ -698,7 +692,7 @@ abstract public class BrowserApp extends GeckoApp
     }
 
     public void setToolbarHeight(int aHeight, int aVisibleHeight) {
-        if (!isDynamicToolbarEnabled() || Boolean.TRUE.equals(mAboutHomeShowing)) {
+        if (!isDynamicToolbarEnabled() || mAboutHome.getUserVisibleHint()) {
             // Use aVisibleHeight here so that when the dynamic toolbar is
             // enabled, the padding will animate with the toolbar becoming
             // visible.
@@ -706,7 +700,7 @@ abstract public class BrowserApp extends GeckoApp
                 // When the dynamic toolbar is enabled, set the padding on the
                 // about:home widget directly - this is to avoid resizing the
                 // LayerView, which can cause visible artifacts.
-                mAboutHomeContent.setPadding(0, aVisibleHeight, 0, 0);
+                mAboutHome.setPadding(0, aVisibleHeight, 0, 0);
             } else {
                 setToolbarMargin(aVisibleHeight);
             }
@@ -793,9 +787,6 @@ abstract public class BrowserApp extends GeckoApp
         invalidateOptionsMenu();
         updateSideBarState();
         mTabsPanel.refresh();
-
-        if (mAboutHomeContent != null)
-            mAboutHomeContent.refresh();
     }
 
     @Override
@@ -1194,75 +1185,46 @@ abstract public class BrowserApp extends GeckoApp
 
     /* About:home UI */
     void updateAboutHomeTopSites() {
-        if (mAboutHomeContent == null)
-            return;
-
-        mAboutHomeContent.update(EnumSet.of(AboutHomeContent.UpdateFlags.TOP_SITES));
+        mAboutHome.update(EnumSet.of(AboutHome.UpdateFlags.TOP_SITES));
     }
 
     private void showAboutHome() {
-        // Don't create an additional AboutHomeRunnable if about:home
-        // is already visible.
-        if (mAboutHomeShowing != null && mAboutHomeShowing)
+        if (mAboutHome.getUserVisibleHint()) {
             return;
+        }
 
-        mAboutHomeShowing = true;
-        Runnable r = new AboutHomeRunnable(true);
-        ThreadUtils.getUiHandler().postAtFrontOfQueue(r);
+        // We use commitAllowingStateLoss() instead of commit() here to avoid an
+        // IllegalStateException. showAboutHome() and hideAboutHome() are
+        // executed inside of tab's onChange() callback. Since that callback can
+        // be triggered asynchronously from Gecko, it's possible that this
+        // method can be called while Fennec is in the background. If that
+        // happens, using commit() would throw an IllegalStateException since
+        // it can't be used between the Activity's onSaveInstanceState() and
+        // onResume().
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.gecko_layout, mAboutHome).commitAllowingStateLoss();
+        mAboutHome.setUserVisibleHint(true);
+
+        mBrowserToolbar.setNextFocusDownId(R.id.abouthome_content);
+
+        // Refresh margins to possibly restore the toolbar padding
+        ((BrowserToolbarLayout)mBrowserToolbar.getLayout()).refreshMargins();
     }
 
     private void hideAboutHome() {
-        // If hideAboutHome gets called before showAboutHome, we still need
-        // to create an AboutHomeRunnable to hide the about:home content.
-        if (mAboutHomeShowing != null && !mAboutHomeShowing)
+        if (!mAboutHome.getUserVisibleHint()) {
             return;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .remove(mAboutHome).commitAllowingStateLoss();
+        mAboutHome.setUserVisibleHint(false);
 
         mBrowserToolbar.setShadowVisibility(true);
-        mAboutHomeShowing = false;
-        Runnable r = new AboutHomeRunnable(false);
-        ThreadUtils.getUiHandler().postAtFrontOfQueue(r);
-    }
+        mBrowserToolbar.setNextFocusDownId(R.id.layer_view);
 
-    private class AboutHomeRunnable implements Runnable {
-        boolean mShow;
-        AboutHomeRunnable(boolean show) {
-            mShow = show;
-        }
-
-        @Override
-        public void run() {
-            if (mShow) {
-                if (mAboutHomeContent == null) {
-                    mAboutHomeContent = (AboutHomeContent) findViewById(R.id.abouthome_content);
-                    mAboutHomeContent.init();
-                    mAboutHomeContent.update(AboutHomeContent.UpdateFlags.ALL);
-                    mAboutHomeContent.setUriLoadCallback(new AboutHomeContent.UriLoadCallback() {
-                        @Override
-                        public void callback(String url) {
-                            mBrowserToolbar.setProgressVisibility(true);
-                            Tabs.getInstance().loadUrl(url);
-                        }
-                    });
-                    mAboutHomeContent.setLoadCompleteCallback(new AboutHomeContent.VoidCallback() {
-                        @Override
-                        public void callback() {
-                            mAboutHomeStartupTimer.stop();
-                        }
-                    });
-                } else {
-                    mAboutHomeContent.update(EnumSet.of(AboutHomeContent.UpdateFlags.TOP_SITES,
-                                                        AboutHomeContent.UpdateFlags.REMOTE_TABS));
-                }
-                mAboutHomeContent.setVisibility(View.VISIBLE);
-                mBrowserToolbar.setNextFocusDownId(R.id.abouthome_content);
-            } else {
-                findViewById(R.id.abouthome_content).setVisibility(View.GONE);
-                mBrowserToolbar.setNextFocusDownId(R.id.layer_view);
-            }
-
-            // Refresh margins to possibly restore the toolbar padding
-            ((BrowserToolbarLayout)mBrowserToolbar.getLayout()).refreshMargins();
-        }
+        // Refresh margins to possibly restore the toolbar padding
+        ((BrowserToolbarLayout)mBrowserToolbar.getLayout()).refreshMargins();
     }
 
     private class HideTabsTouchListener implements TouchEventInterceptor {
@@ -1576,39 +1538,6 @@ abstract public class BrowserApp extends GeckoApp
         return true;
     }
 
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        ContextMenuInfo info = item.getMenuInfo();
-
-        switch (item.getItemId()) {
-            case R.id.abouthome_open_new_tab:
-                mAboutHomeContent.openNewTab(info);
-                return true;
-
-            case R.id.abouthome_open_private_tab:
-                mAboutHomeContent.openNewPrivateTab(info);
-                return true;
-
-            case R.id.abouthome_topsites_edit:
-                mAboutHomeContent.editSite(info);
-                return true;
-
-            case R.id.abouthome_topsites_unpin:
-                mAboutHomeContent.unpinSite(info, TopSitesView.UnpinFlags.REMOVE_PIN);
-                return true;
-
-            case R.id.abouthome_topsites_pin:
-                mAboutHomeContent.pinSite(info);
-                return true;
-
-            case R.id.abouthome_topsites_remove:
-                mAboutHomeContent.unpinSite(info, TopSitesView.UnpinFlags.REMOVE_HISTORY);
-                return true;
-
-        }
-        return super.onContextItemSelected(item);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.toggle_profiling) {
@@ -1792,13 +1721,14 @@ abstract public class BrowserApp extends GeckoApp
     }
 
     @Override
-    public void onResume()
-    {
-        super.onResume();
-        if (mAboutHomeContent != null) {
-            mAboutHomeContent.refresh();
-        }
+    public void onAboutHomeUriLoad(String url) {
+        mBrowserToolbar.setProgressVisibility(true);
+        Tabs.getInstance().loadUrl(url);
+    }
 
+    @Override
+    public void onAboutHomeLoadComplete() {
+        mAboutHomeStartupTimer.stop();
     }
 
     @Override
diff --git a/mobile/android/base/GeckoActivity.java b/mobile/android/base/GeckoActivity.java
index 53b853a2c568..762cde8e7aa9 100644
--- a/mobile/android/base/GeckoActivity.java
+++ b/mobile/android/base/GeckoActivity.java
@@ -4,16 +4,16 @@
 
 package org.mozilla.gecko;
 
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
+import android.support.v4.app.FragmentActivity;
 
 interface GeckoActivityStatus {
     public boolean isGeckoActivityOpened();
     public boolean isFinishing();  // typically from android.app.Activity
 };
 
-public class GeckoActivity extends Activity implements GeckoActivityStatus {
+public class GeckoActivity extends FragmentActivity implements GeckoActivityStatus {
     // has this activity recently started another Gecko activity?
     private boolean mGeckoActivityOpened = false;
 
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index bcd3f43f3b5c..aa3669279d1c 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1318,6 +1318,37 @@ abstract public class GeckoApp
         mJavaUiStartupTimer = new Telemetry.Timer("FENNEC_STARTUP_TIME_JAVAUI");
         mGeckoReadyStartupTimer = new Telemetry.Timer("FENNEC_STARTUP_TIME_GECKOREADY");
 
+        String args = getIntent().getStringExtra("args");
+
+        String profileName = null;
+        String profilePath = null;
+        if (args != null) {
+            if (args.contains("-P")) {
+                Pattern p = Pattern.compile("(?:-P\\s*)(\\w*)(\\s*)");
+                Matcher m = p.matcher(args);
+                if (m.find()) {
+                    profileName = m.group(1);
+                }
+            }
+            if (args.contains("-profile")) {
+                Pattern p = Pattern.compile("(?:-profile\\s*)(\\S*)(\\s*)");
+                Matcher m = p.matcher(args);
+                if (m.find()) {
+                    profilePath =  m.group(1);
+                }
+                if (profileName == null) {
+                    profileName = getDefaultProfileName();
+                    if (profileName == null)
+                        profileName = "default";
+                }
+                GeckoApp.sIsUsingCustomProfile = true;
+            }
+            if (profileName != null || profilePath != null) {
+                mProfile = GeckoProfile.get(this, profileName, profilePath);
+            }
+        }
+
+        BrowserDB.initialize(getProfile().getName());
         ((GeckoApplication)getApplication()).initialize();
 
         mAppContext = this;
@@ -1327,7 +1358,7 @@ abstract public class GeckoApp
         Favicons.getInstance().attachToContext(this);
 
         // Check to see if the activity is restarted after configuration change.
-        if (getLastNonConfigurationInstance() != null) {
+        if (getLastCustomNonConfigurationInstance() != null) {
             // Restart the application as a safe way to handle the configuration change.
             doRestart();
             System.exit(0);
@@ -1356,7 +1387,7 @@ abstract public class GeckoApp
             }
         }
 
-        LayoutInflater.from(this).setFactory(GeckoViewsFactory.getInstance());
+        LayoutInflater.from(this).setFactory(this);
 
         super.onCreate(savedInstanceState);
 
@@ -1439,37 +1470,6 @@ abstract public class GeckoApp
 
         Intent intent = getIntent();
         String action = intent.getAction();
-        String args = intent.getStringExtra("args");
-
-        String profileName = null;
-        String profilePath = null;
-        if (args != null) {
-            if (args.contains("-P")) {
-                Pattern p = Pattern.compile("(?:-P\\s*)(\\w*)(\\s*)");
-                Matcher m = p.matcher(args);
-                if (m.find()) {
-                    profileName = m.group(1);
-                }
-            }
-            if (args.contains("-profile")) {
-                Pattern p = Pattern.compile("(?:-profile\\s*)(\\S*)(\\s*)");
-                Matcher m = p.matcher(args);
-                if (m.find()) {
-                    profilePath =  m.group(1);
-                }
-                if (profileName == null) {
-                    profileName = getDefaultProfileName();
-                    if (profileName == null)
-                        profileName = "default";
-                }
-                GeckoApp.sIsUsingCustomProfile = true;
-            }
-            if (profileName != null || profilePath != null) {
-                mProfile = GeckoProfile.get(this, profileName, profilePath);
-            }
-        }
-
-        BrowserDB.initialize(getProfile().getName());
 
         String passedUri = null;
         String uri = getURIFromIntent(intent);
@@ -2061,12 +2061,6 @@ abstract public class GeckoApp
         }
     }
 
-    @Override
-    public void onContentChanged() {
-        super.onContentChanged();
-    }
-
-
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -2081,7 +2075,7 @@ abstract public class GeckoApp
     }
 
     @Override
-    public Object onRetainNonConfigurationInstance() {
+    public Object onRetainCustomNonConfigurationInstance() {
         // Send a non-null value so that we can restart the application, 
         // when activity restarts due to configuration change.
         return Boolean.TRUE;
@@ -2091,6 +2085,21 @@ abstract public class GeckoApp
         return AppConstants.MOZ_CHILD_PROCESS_NAME;
     }
 
+    /*
+     * Only one factory can be set on the inflater; however, we want to use two
+     * factories (GeckoViewsFactory and the FragmentActivity factory).
+     * Overriding onCreateView() here allows us to dispatch view creation to
+     * both factories.
+     */
+    @Override
+    public View onCreateView(String name, Context context, AttributeSet attrs) {
+        View view = GeckoViewsFactory.getInstance().onCreateView(name, context, attrs);
+        if (view == null) {
+            view = super.onCreateView(name, context, attrs);
+        }
+        return view;
+    }
+
     public void addEnvToIntent(Intent intent) {
         Map<String,String> envMap = System.getenv();
         Set<Map.Entry<String,String>> envSet = envMap.entrySet();
diff --git a/mobile/android/base/GeckoViewsFactory.java b/mobile/android/base/GeckoViewsFactory.java
index 44d2b3d80d11..ea35eda79e3c 100644
--- a/mobile/android/base/GeckoViewsFactory.java
+++ b/mobile/android/base/GeckoViewsFactory.java
@@ -5,7 +5,7 @@
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.gfx.LayerView;
-import org.mozilla.gecko.widget.AboutHomeContent;
+import org.mozilla.gecko.widget.AboutHomeView;
 import org.mozilla.gecko.widget.AddonsSection;
 import org.mozilla.gecko.widget.IconTabWidget;
 import org.mozilla.gecko.widget.LastTabsSection;
@@ -46,7 +46,7 @@ public final class GeckoViewsFactory implements LayoutInflater.Factory {
         Class<Context> arg1Class = Context.class;
         Class<AttributeSet> arg2Class = AttributeSet.class;
         try {
-            mFactoryMap.put("AboutHomeContent", AboutHomeContent.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("AboutHomeView", AboutHomeView.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("AddonsSection", AddonsSection.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("LastTabsSection", LastTabsSection.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("PromoBox", PromoBox.class.getConstructor(arg1Class, arg2Class));
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 85a1cb250e03..056216f37563 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -209,7 +209,8 @@ FENNEC_JAVA_FILES = \
   gfx/TouchEventHandler.java \
   gfx/ViewTransform.java \
   gfx/VirtualLayer.java \
-  widget/AboutHomeContent.java \
+  widget/AboutHome.java \
+  widget/AboutHomeView.java \
   widget/AboutHomeSection.java \
   widget/AddonsSection.java \
   widget/DateTimePicker.java \
diff --git a/mobile/android/base/PrivateTab.java b/mobile/android/base/PrivateTab.java
index 1994a153283b..7f6d0b5350f5 100644
--- a/mobile/android/base/PrivateTab.java
+++ b/mobile/android/base/PrivateTab.java
@@ -5,9 +5,11 @@
 
 package org.mozilla.gecko;
 
+import android.content.Context;
+
 public class PrivateTab extends Tab {
-    public PrivateTab(int id, String url, boolean external, int parentId, String title) {
-        super(id, url, external, parentId, title);
+    public PrivateTab(Context context, int id, String url, boolean external, int parentId, String title) {
+        super(context, id, url, external, parentId, title);
     }
 
     @Override
diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java
index 1fa7aa12ab68..adf80ec5b745 100644
--- a/mobile/android/base/Tab.java
+++ b/mobile/android/base/Tab.java
@@ -13,6 +13,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.content.ContentResolver;
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -57,11 +58,12 @@ public class Tab {
     private ZoomConstraints mZoomConstraints;
     private ArrayList<View> mPluginViews;
     private HashMap<Object, Layer> mPluginLayers;
-    private int mBackgroundColor = Color.WHITE;
+    private int mBackgroundColor;
     private int mState;
     private Bitmap mThumbnailBitmap;
     private boolean mDesktopMode;
     private boolean mEnteringReaderMode;
+    private Context mContext;
     private static final int MAX_HISTORY_LIST_SIZE = 50;
 
     public static final int STATE_DELAYED = 0;
@@ -69,7 +71,8 @@ public class Tab {
     public static final int STATE_SUCCESS = 2;
     public static final int STATE_ERROR = 3;
 
-    public Tab(int id, String url, boolean external, int parentId, String title) {
+    public Tab(Context context, int id, String url, boolean external, int parentId, String title) {
+        mContext = context;
         mId = id;
         mLastUsed = 0;
         mUrl = url;
@@ -96,6 +99,11 @@ public class Tab {
         mPluginViews = new ArrayList<View>();
         mPluginLayers = new HashMap<Object, Layer>();
         mState = shouldShowProgress(url) ? STATE_SUCCESS : STATE_LOADING;
+
+        // At startup, the background is set to a color specified by LayerView
+        // when the LayerView is created. Shortly after, this background color
+        // will be used before the tab's content is shown.
+        mBackgroundColor = getBackgroundColorForUrl(url);
     }
 
     private ContentResolver getContentResolver() {
@@ -554,7 +562,7 @@ public class Tab {
         setReaderEnabled(false);
         setZoomConstraints(new ZoomConstraints(true));
         setHasTouchListeners(false);
-        setBackgroundColor(Color.WHITE);
+        setBackgroundColor(getBackgroundColorForUrl(uri));
 
         Tabs.getInstance().notifyListeners(this, Tabs.TabEvents.LOCATION_CHANGE, uri);
     }
@@ -563,6 +571,13 @@ public class Tab {
         return "about:home".equals(url) || ReaderModeUtils.isAboutReader(url);
     }
 
+    private int getBackgroundColorForUrl(String url) {
+        if ("about:home".equals(url)) {
+            return mContext.getResources().getColor(R.color.background_normal);
+        }
+        return Color.WHITE;
+    }
+
     void handleDocumentStart(boolean showProgress, String url) {
         setState(shouldShowProgress(url) ? STATE_SUCCESS : STATE_LOADING);
         updateIdentityData(null);
diff --git a/mobile/android/base/Tabs.java b/mobile/android/base/Tabs.java
index 07e2c037b660..6152f5d23be5 100644
--- a/mobile/android/base/Tabs.java
+++ b/mobile/android/base/Tabs.java
@@ -171,8 +171,8 @@ public class Tabs implements GeckoEventListener {
     }
 
     private Tab addTab(int id, String url, boolean external, int parentId, String title, boolean isPrivate) {
-        final Tab tab = isPrivate ? new PrivateTab(id, url, external, parentId, title) :
-                                    new Tab(id, url, external, parentId, title);
+        final Tab tab = isPrivate ? new PrivateTab(mActivity, id, url, external, parentId, title) :
+                                    new Tab(mActivity, id, url, external, parentId, title);
         synchronized (this) {
             lazyRegisterBookmarkObserver();
             mTabs.put(id, tab);
diff --git a/mobile/android/base/gfx/LayerView.java b/mobile/android/base/gfx/LayerView.java
index 9cb060f91b68..380c2edc220e 100644
--- a/mobile/android/base/gfx/LayerView.java
+++ b/mobile/android/base/gfx/LayerView.java
@@ -183,7 +183,12 @@ public class LayerView extends FrameLayout {
         if (shouldUseTextureView()) {
             mTextureView = new TextureView(getContext());
             mTextureView.setSurfaceTextureListener(new SurfaceTextureListener());
-            mTextureView.setBackgroundColor(Color.WHITE);
+
+            // The background is set to this color when the LayerView is
+            // created, and it will be shown immediately at startup. Shortly
+            // after, the tab's background color will be used before any content
+            // is shown.
+            mTextureView.setBackgroundResource(R.color.background_normal);
             addView(mTextureView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
         } else {
             // This will stop PropertyAnimator from creating a drawing cache (i.e. a bitmap)
@@ -191,7 +196,7 @@ public class LayerView extends FrameLayout {
             setWillNotCacheDrawing(false);
 
             mSurfaceView = new LayerSurfaceView(getContext(), this);
-            mSurfaceView.setBackgroundColor(Color.WHITE);
+            mSurfaceView.setBackgroundResource(R.color.background_normal);
             addView(mSurfaceView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
 
             SurfaceHolder holder = mSurfaceView.getHolder();
diff --git a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
index 053c50f8e703..2fd37f815743 100644
--- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
+++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
@@ -3,8 +3,13 @@
    - 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/. -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res-auto">
+<org.mozilla.gecko.widget.AboutHomeView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:gecko="http://schemas.android.com/apk/res-auto"
+		android:id="@+id/abouthome_content"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/background_normal">
 
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="fill_parent"
@@ -105,4 +110,4 @@
 
     </LinearLayout>
 
-</merge>
+</org.mozilla.gecko.widget.AboutHomeView>
diff --git a/mobile/android/base/resources/layout/abouthome_content.xml b/mobile/android/base/resources/layout/abouthome_content.xml
index 6e3074383fc5..ec0c44c6b652 100644
--- a/mobile/android/base/resources/layout/abouthome_content.xml
+++ b/mobile/android/base/resources/layout/abouthome_content.xml
@@ -3,8 +3,13 @@
    - 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/. -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res-auto">
+<org.mozilla.gecko.widget.AboutHomeView
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:gecko="http://schemas.android.com/apk/res-auto"
+		android:id="@+id/abouthome_content"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:background="@color/background_normal">
 
     <RelativeLayout android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
@@ -90,4 +95,4 @@
 
     </RelativeLayout>
 
-</merge>
+</org.mozilla.gecko.widget.AboutHomeView>
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index 814ce4659f87..98904a9b1ac3 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -28,11 +28,6 @@
 
             <include layout="@layout/shared_ui_components"/>
 
-            <Gecko.AboutHomeContent android:id="@+id/abouthome_content"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="fill_parent"
-                                    android:background="@color/background_normal"/>
-
         </RelativeLayout>
 
         <org.mozilla.gecko.FindInPageBar android:id="@+id/find_in_page"
diff --git a/mobile/android/base/widget/AboutHome.java b/mobile/android/base/widget/AboutHome.java
new file mode 100644
index 000000000000..74a99a777398
--- /dev/null
+++ b/mobile/android/base/widget/AboutHome.java
@@ -0,0 +1,279 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko.widget;
+
+import java.util.EnumSet;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.db.BrowserContract;
+import org.mozilla.gecko.util.ThreadUtils;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.database.ContentObserver;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class AboutHome extends Fragment {
+    public static enum UpdateFlags {
+        TOP_SITES,
+        PREVIOUS_TABS,
+        RECOMMENDED_ADDONS,
+        REMOTE_TABS;
+
+        public static final EnumSet<UpdateFlags> ALL = EnumSet.allOf(UpdateFlags.class);
+    }
+
+    private UriLoadListener mUriLoadListener;
+    private LoadCompleteListener mLoadCompleteListener;
+    private LightweightTheme mLightweightTheme;
+    private ContentObserver mTabsContentObserver;
+    private int mPaddingLeft;
+    private int mPaddingRight;
+    private int mPaddingTop;
+    private int mPaddingBottom;
+    private AboutHomeView mAboutHomeView;
+    private AddonsSection mAddonsSection;
+    private LastTabsSection mLastTabsSection;
+    private RemoteTabsSection mRemoteTabsSection;
+    private TopSitesView mTopSitesView;
+
+    public interface UriLoadListener {
+        public void onAboutHomeUriLoad(String uriSpec);
+    }
+
+    public interface LoadCompleteListener {
+        public void onAboutHomeLoadComplete();
+    }
+
+    public static AboutHome newInstance() {
+        return new AboutHome();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mLightweightTheme = ((GeckoApplication) getActivity().getApplication()).getLightweightTheme();
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        try {
+            mUriLoadListener = (UriLoadListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString()
+                    + " must implement UriLoadListener");
+        }
+
+        try {
+            mLoadCompleteListener = (LoadCompleteListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString()
+                    + " must implement LoadCompleteListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+
+        mUriLoadListener = null;
+        mLoadCompleteListener = null;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+
+        // Synchronized with onUpdate(), which runs in a background thread.
+        synchronized (this) {
+            mAboutHomeView = (AboutHomeView) inflater.inflate(R.layout.abouthome_content, container, false);
+            mAddonsSection = (AddonsSection) mAboutHomeView.findViewById(R.id.recommended_addons);
+            mLastTabsSection = (LastTabsSection) mAboutHomeView.findViewById(R.id.last_tabs);
+            mRemoteTabsSection = (RemoteTabsSection) mAboutHomeView.findViewById(R.id.remote_tabs);
+            mTopSitesView = (TopSitesView) mAboutHomeView.findViewById(R.id.top_sites_grid);
+        }
+
+        mAboutHomeView.setLightweightTheme(mLightweightTheme);
+        mLightweightTheme.addListener(mAboutHomeView);
+
+        return mAboutHomeView;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        view.setPadding(mPaddingLeft, mPaddingTop, mPaddingRight, mPaddingBottom);
+        ((PromoBox) view.findViewById(R.id.promo_box)).showRandomPromo();
+        update(AboutHome.UpdateFlags.ALL);
+
+        mTopSitesView.setLoadCompleteListener(mLoadCompleteListener);
+        mTopSitesView.setUriLoadListener(mUriLoadListener);
+        mAddonsSection.setUriLoadListener(mUriLoadListener);
+
+        // Reload the mobile homepage on inbound tab syncs
+        // Because the tabs URI is coarse grained, this updates the
+        // remote tabs component on *every* tab change
+        // The observer will run on the background thread (see constructor argument)
+        mTabsContentObserver = new ContentObserver(ThreadUtils.getBackgroundHandler()) {
+            @Override
+            public void onChange(boolean selfChange) {
+                update(EnumSet.of(AboutHome.UpdateFlags.REMOTE_TABS));
+            }
+        };
+        getActivity().getContentResolver().registerContentObserver(BrowserContract.Tabs.CONTENT_URI,
+                false, mTabsContentObserver);
+    }
+
+    @Override
+    public void onDestroyView() {
+        mLightweightTheme.removeListener(mAboutHomeView);
+        getActivity().getContentResolver().unregisterContentObserver(mTabsContentObserver);
+
+        synchronized (this) {
+            mTopSitesView.onDestroy();
+            mAboutHomeView = null;
+            mAddonsSection = null;
+            mLastTabsSection = null;
+            mRemoteTabsSection = null;
+            mTopSitesView = null;
+        }
+
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        // Reattach the fragment, forcing a reinflation of its view.
+        // We use commitAllowingStateLoss() instead of commit() here to avoid
+        // an IllegalStateException. If the phone is rotated while Fennec
+        // is in the background, onConfigurationChanged() is fired.
+        // onConfigurationChanged() is called before onResume(), so
+        // using commit() would throw an IllegalStateException since it can't
+        // be used between the Activity's onSaveInstanceState() and
+        // onResume().
+        if (isVisible()) {
+            getFragmentManager().beginTransaction()
+                                .detach(this)
+                                .attach(this)
+                                .commitAllowingStateLoss();
+        }
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        ContextMenuInfo info = item.getMenuInfo();
+
+        if (getView() == null) {
+            return true;
+        }
+
+        switch (item.getItemId()) {
+            case R.id.abouthome_open_new_tab:
+                mTopSitesView.openNewTab(info);
+                return true;
+
+            case R.id.abouthome_open_private_tab:
+                mTopSitesView.openNewPrivateTab(info);
+                return true;
+
+            case R.id.abouthome_topsites_edit:
+                mTopSitesView.editSite(info);
+                return true;
+
+            case R.id.abouthome_topsites_unpin:
+                mTopSitesView.unpinSite(info, TopSitesView.UnpinFlags.REMOVE_PIN);
+                return true;
+
+            case R.id.abouthome_topsites_pin:
+                mTopSitesView.pinSite(info);
+                return true;
+
+            case R.id.abouthome_topsites_remove:
+                mTopSitesView.unpinSite(info, TopSitesView.UnpinFlags.REMOVE_HISTORY);
+                return true;
+
+        }
+        return super.onContextItemSelected(item);
+    }
+
+    public void update(final EnumSet<UpdateFlags> flags) {
+        ThreadUtils.postToBackgroundThread(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (AboutHome.this) {
+                    if (getView() == null) {
+                        return;
+                    }
+
+                    if (flags.contains(UpdateFlags.TOP_SITES)) {
+                        mTopSitesView.loadTopSites();
+                    }
+
+                    if (flags.contains(UpdateFlags.PREVIOUS_TABS)) {
+                        mLastTabsSection.readLastTabs();
+                    }
+
+                    if (flags.contains(UpdateFlags.RECOMMENDED_ADDONS)) {
+                        mAddonsSection.readRecommendedAddons();
+                    }
+
+                    if (flags.contains(UpdateFlags.REMOTE_TABS)) {
+                        mRemoteTabsSection.loadRemoteTabs();
+                    }
+                }
+            }
+        });
+    }
+
+    // Must be run on the UI thread
+    public void setLastTabsVisibility(boolean visible) {
+        if (mAboutHomeView == null) {
+            return;
+        }
+
+        if (visible)
+            mLastTabsSection.show();
+        else
+            mLastTabsSection.hide();
+    }
+
+    public void requestFocus() {
+        View view = getView();
+        if (view != null) {
+            view.requestFocus();
+        }
+    }
+
+    // Must be run on the UI thread
+    public void setPadding(int left, int top, int right, int bottom) {
+        View view = getView();
+        if (view != null) {
+            view.setPadding(left, top, right, bottom);
+        }
+
+        // If the padding has changed but the view hasn't been created yet,
+        // store the padding values here; they will be used later in
+        // onViewCreated().
+        mPaddingLeft = left;
+        mPaddingRight = right;
+        mPaddingTop = top;
+        mPaddingBottom = bottom;
+    }
+}
diff --git a/mobile/android/base/widget/AboutHomeContent.java b/mobile/android/base/widget/AboutHomeContent.java
deleted file mode 100644
index 667eab713149..000000000000
--- a/mobile/android/base/widget/AboutHomeContent.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * 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/. */
-
-package org.mozilla.gecko.widget;
-
-import org.mozilla.gecko.BrowserApp;
-import org.mozilla.gecko.LightweightTheme;
-import org.mozilla.gecko.LightweightThemeDrawable;
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.db.BrowserContract;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.content.Context;
-import android.database.ContentObserver;
-import android.util.AttributeSet;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.LayoutInflater;
-import android.widget.ScrollView;
-
-import java.util.EnumSet;
-
-public class AboutHomeContent extends ScrollView
-                              implements LightweightTheme.OnChangeListener {
-    public static enum UpdateFlags {
-        TOP_SITES,
-        PREVIOUS_TABS,
-        RECOMMENDED_ADDONS,
-        REMOTE_TABS;
-
-        public static final EnumSet<UpdateFlags> ALL = EnumSet.allOf(UpdateFlags.class);
-    }
-
-    private Context mContext;
-    private BrowserApp mActivity;
-    private UriLoadCallback mUriLoadCallback = null;
-
-    private ContentObserver mTabsContentObserver = null;
-
-    protected TopSitesView mTopSites;
-    protected AddonsSection mAddons;
-    protected LastTabsSection mLastTabs;
-    protected RemoteTabsSection mRemoteTabs;
-    private PromoBox mPromoBox;
-
-    public interface UriLoadCallback {
-        public void callback(String uriSpec);
-    }
-
-    public interface VoidCallback {
-        public void callback();
-    }
-
-    public AboutHomeContent(Context context) {
-        super(context);
-        mContext = context;
-        mActivity = (BrowserApp) context;
-    }
-
-    public AboutHomeContent(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        mActivity = (BrowserApp) context;
-    }
-
-    public void init() {
-        inflate();
-
-        // Reload the mobile homepage on inbound tab syncs
-        // Because the tabs URI is coarse grained, this updates the
-        // remote tabs component on *every* tab change
-        // The observer will run on the background thread (see constructor argument)
-        mTabsContentObserver = new ContentObserver(ThreadUtils.getBackgroundHandler()) {
-            @Override
-            public void onChange(boolean selfChange) {
-                update(EnumSet.of(AboutHomeContent.UpdateFlags.REMOTE_TABS));
-            }
-        };
-        mActivity.getContentResolver().registerContentObserver(BrowserContract.Tabs.CONTENT_URI,
-                false, mTabsContentObserver);
-    }
-
-    private void inflate() {
-        LayoutInflater.from(mContext).inflate(R.layout.abouthome_content, this);
-
-        mTopSites = (TopSitesView) findViewById(R.id.top_sites_grid);
-        mPromoBox = (PromoBox) findViewById(R.id.promo_box);
-        mAddons = (AddonsSection) findViewById(R.id.recommended_addons);
-        mLastTabs = (LastTabsSection) findViewById(R.id.last_tabs);
-        mRemoteTabs = (RemoteTabsSection) findViewById(R.id.remote_tabs);
-
-        // Inform the new views about the UriLoadCallback
-        if (mUriLoadCallback != null)
-            setUriLoadCallback(mUriLoadCallback);
-
-        mPromoBox.showRandomPromo();
-    }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mActivity.getLightweightTheme().addListener(this);
-    }
-
-    @Override
-    public void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        mActivity.getLightweightTheme().removeListener(this);
-    }
-
-    public void onDestroy() {
-        if (mTopSites != null) {
-            mTopSites.onDestroy();
-        }
-
-        if (mTabsContentObserver != null) {
-            mActivity.getContentResolver().unregisterContentObserver(mTabsContentObserver);
-            mTabsContentObserver = null;
-        }
-    }
-
-    private void loadTopSites() {
-        mTopSites.loadTopSites();
-    }
-
-    public void openNewTab(ContextMenuInfo info) {
-        mTopSites.openNewTab(info);
-    }
-
-    public void openNewPrivateTab(ContextMenuInfo info) {
-        mTopSites.openNewPrivateTab(info);
-    }
-
-    public void pinSite(ContextMenuInfo info) {
-        mTopSites.pinSite(info);
-    }
-
-    public void unpinSite(ContextMenuInfo info, final TopSitesView.UnpinFlags flags) {
-        mTopSites.unpinSite(info, flags);
-    }
-
-    public void editSite(ContextMenuInfo info) {
-        mTopSites.editSite(info);
-    }
-
-    public void update(final EnumSet<UpdateFlags> flags) {
-        ThreadUtils.postToBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                if (flags.contains(UpdateFlags.TOP_SITES))
-                    loadTopSites();
-
-                if (flags.contains(UpdateFlags.PREVIOUS_TABS))
-                    readLastTabs();
-
-                if (flags.contains(UpdateFlags.RECOMMENDED_ADDONS))
-                    readRecommendedAddons();
-
-                if (flags.contains(UpdateFlags.REMOTE_TABS))
-                    loadRemoteTabs();
-            }
-        });
-    }
-
-    public void setUriLoadCallback(UriLoadCallback uriLoadCallback) {
-        mUriLoadCallback = uriLoadCallback;
-        mTopSites.setUriLoadCallback(uriLoadCallback);
-        mAddons.setUriLoadCallback(uriLoadCallback);
-    }
-
-    public void setLoadCompleteCallback(VoidCallback callback) {
-        if (mTopSites != null)
-            mTopSites.setLoadCompleteCallback(callback);
-    }
-
-    public void onActivityContentChanged() {
-        update(EnumSet.of(UpdateFlags.TOP_SITES));
-    }
-
-    /**
-     * Reinflates and updates all components of this view.
-     */
-    public void refresh() {
-        mTopSites.onDestroy();
-
-        // We must remove the currently inflated view to allow for reinflation.
-        removeAllViews();
-
-        inflate();
-
-        // Refresh all elements.
-        update(AboutHomeContent.UpdateFlags.ALL);
-    }
-
-    public void setLastTabsVisibility(boolean visible) {
-        if (visible)
-            mLastTabs.show();
-        else
-            mLastTabs.hide();
-    }
-
-    private void readLastTabs() {
-        mLastTabs.readLastTabs(mActivity.getProfile());
-    }
-
-    private void loadRemoteTabs() {
-        mRemoteTabs.loadRemoteTabs();
-    }
-
-    private void readRecommendedAddons() {
-        mAddons.readRecommendedAddons();
-    }
-
-    @Override
-    public void onLightweightThemeChanged() {
-        LightweightThemeDrawable drawable = mActivity.getLightweightTheme().getColorDrawable(this);
-        if (drawable == null)
-            return;
-
-         drawable.setAlpha(255, 0);
-         setBackgroundDrawable(drawable);
-    }
-
-    @Override
-    public void onLightweightThemeReset() {
-        setBackgroundColor(getContext().getResources().getColor(R.color.background_normal));
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-        onLightweightThemeChanged();
-    }
-}
diff --git a/mobile/android/base/widget/AboutHomeView.java b/mobile/android/base/widget/AboutHomeView.java
new file mode 100644
index 000000000000..c2bd390110f8
--- /dev/null
+++ b/mobile/android/base/widget/AboutHomeView.java
@@ -0,0 +1,55 @@
+package org.mozilla.gecko.widget;
+
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.LightweightThemeDrawable;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+public class AboutHomeView extends ScrollView implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mLightweightTheme;
+
+    public AboutHomeView(Context context) {
+        super(context);
+    }
+
+    public AboutHomeView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public AboutHomeView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public void setLightweightTheme(LightweightTheme theme) {
+        mLightweightTheme = theme;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mLightweightTheme == null) {
+            throw new IllegalStateException("setLightweightTheme() must be called before this view can listen to theme changes.");
+        }
+
+        LightweightThemeDrawable drawable = mLightweightTheme.getColorDrawable(this);
+        if (drawable == null) {
+            return;
+        }
+
+        drawable.setAlpha(255, 0);
+        setBackgroundDrawable(drawable);
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        setBackgroundColor(getResources().getColor(R.color.background_normal));
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        onLightweightThemeChanged();
+    }
+}
diff --git a/mobile/android/base/widget/AddonsSection.java b/mobile/android/base/widget/AddonsSection.java
index 5a5f473abc81..c9948e1d42b5 100644
--- a/mobile/android/base/widget/AddonsSection.java
+++ b/mobile/android/base/widget/AddonsSection.java
@@ -40,7 +40,7 @@ public class AddonsSection extends AboutHomeSection {
 
     private Context mContext;
     private BrowserApp mActivity;
-    private AboutHomeContent.UriLoadCallback mUriLoadCallback = null;
+    private AboutHome.UriLoadListener mUriLoadListener;
 
     private static Rect sIconBounds;
     private static TextAppearanceSpan sSubTitleSpan;
@@ -57,14 +57,14 @@ public class AddonsSection extends AboutHomeSection {
         setOnMoreTextClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mUriLoadCallback != null)
-                    mUriLoadCallback.callback("https://addons.mozilla.org/android");
+                if (mUriLoadListener != null)
+                    mUriLoadListener.onAboutHomeUriLoad(mContext.getString(R.string.bookmarkdefaults_url_addons));
             }
         });
     }
 
-    public void setUriLoadCallback(AboutHomeContent.UriLoadCallback uriLoadCallback) {
-        mUriLoadCallback = uriLoadCallback;
+    public void setUriLoadListener(AboutHome.UriLoadListener uriLoadListener) {
+        mUriLoadListener = uriLoadListener;
     }
 
     private String readFromZipFile(String filename) {
@@ -190,8 +190,8 @@ public class AddonsSection extends AboutHomeSection {
                         row.setOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                if (mUriLoadCallback != null)
-                                    mUriLoadCallback.callback(homepageUrl);
+                                if (mUriLoadListener != null)
+                                    mUriLoadListener.onAboutHomeUriLoad(homepageUrl);
                             }
                         });
                         row.setOnKeyListener(GamepadUtils.getClickDispatcher());
diff --git a/mobile/android/base/widget/LastTabsSection.java b/mobile/android/base/widget/LastTabsSection.java
index dd3b2a772a0d..3ce8e8b0b0c9 100644
--- a/mobile/android/base/widget/LastTabsSection.java
+++ b/mobile/android/base/widget/LastTabsSection.java
@@ -31,8 +31,8 @@ public class LastTabsSection extends AboutHomeSection {
         mContext = context;
     }
 
-    public void readLastTabs(GeckoProfile profile) {
-        String jsonString = profile.readSessionFile(true);
+    public void readLastTabs() {
+        String jsonString = GeckoProfile.get(mContext).readSessionFile(true);
         if (jsonString == null) {
             // no previous session data
             return;
diff --git a/mobile/android/base/widget/TopSitesView.java b/mobile/android/base/widget/TopSitesView.java
index 606a1923b971..a30b7d456b6a 100644
--- a/mobile/android/base/widget/TopSitesView.java
+++ b/mobile/android/base/widget/TopSitesView.java
@@ -66,8 +66,8 @@ public class TopSitesView extends GridView {
 
     private Context mContext;
     private BrowserApp mActivity;
-    private AboutHomeContent.UriLoadCallback mUriLoadCallback = null;
-    private AboutHomeContent.VoidCallback mLoadCompleteCallback = null;
+    private AboutHome.UriLoadListener mUriLoadListener;
+    private AboutHome.LoadCompleteListener mLoadCompleteListener;
 
     protected TopSitesCursorAdapter mTopSitesAdapter;
 
@@ -105,8 +105,8 @@ public class TopSitesView extends GridView {
                     return;
                 }
 
-                if (mUriLoadCallback != null)
-                    mUriLoadCallback.callback(spec);
+                if (mUriLoadListener != null)
+                    mUriLoadListener.onAboutHomeUriLoad(spec);
             }
         });
 
@@ -224,8 +224,8 @@ public class TopSitesView extends GridView {
                 // Even if AboutHome isn't necessarily entirely loaded if we
                 // get here, for phones this is the part the user initially sees,
                 // so it's the one we will care about for now.
-                if (mLoadCompleteCallback != null)
-                    mLoadCompleteCallback.callback();
+                if (mLoadCompleteListener != null)
+                    mLoadCompleteListener.onAboutHomeLoadComplete();
             }
         });
     }
@@ -354,12 +354,12 @@ public class TopSitesView extends GridView {
         mNumberOfCols = getResources().getInteger(R.integer.number_of_top_sites_cols);
     }
 
-    public void setUriLoadCallback(AboutHomeContent.UriLoadCallback uriLoadCallback) {
-        mUriLoadCallback = uriLoadCallback;
+    public void setUriLoadListener(AboutHome.UriLoadListener uriLoadListener) {
+        mUriLoadListener = uriLoadListener;
     }
 
-    public void setLoadCompleteCallback(AboutHomeContent.VoidCallback callback) {
-        mLoadCompleteCallback = callback;
+    public void setLoadCompleteListener(AboutHome.LoadCompleteListener listener) {
+        mLoadCompleteListener = listener;
     }
 
     private class TopSitesViewHolder {

From 4b61e6ad555c671dfd3137037ff89b473c07491f Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Tue, 16 Apr 2013 14:34:46 -0700
Subject: [PATCH 061/438] Bug 838793 - Part 2: Move AboutHome update to
 foreground thread. r=lucasr

---
 mobile/android/base/widget/AboutHome.java     |  70 +++-----
 mobile/android/base/widget/AddonsSection.java | 154 +++++++++---------
 .../android/base/widget/LastTabsSection.java  | 122 +++++++-------
 .../base/widget/RemoteTabsSection.java        |  24 ++-
 mobile/android/base/widget/TopSitesView.java  |  59 ++++---
 5 files changed, 217 insertions(+), 212 deletions(-)

diff --git a/mobile/android/base/widget/AboutHome.java b/mobile/android/base/widget/AboutHome.java
index 74a99a777398..f52285ba59d4 100644
--- a/mobile/android/base/widget/AboutHome.java
+++ b/mobile/android/base/widget/AboutHome.java
@@ -11,7 +11,6 @@ import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.db.BrowserContract;
-import org.mozilla.gecko.util.ThreadUtils;
 
 import android.app.Activity;
 import android.content.res.Configuration;
@@ -98,14 +97,11 @@ public class AboutHome extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        // Synchronized with onUpdate(), which runs in a background thread.
-        synchronized (this) {
-            mAboutHomeView = (AboutHomeView) inflater.inflate(R.layout.abouthome_content, container, false);
-            mAddonsSection = (AddonsSection) mAboutHomeView.findViewById(R.id.recommended_addons);
-            mLastTabsSection = (LastTabsSection) mAboutHomeView.findViewById(R.id.last_tabs);
-            mRemoteTabsSection = (RemoteTabsSection) mAboutHomeView.findViewById(R.id.remote_tabs);
-            mTopSitesView = (TopSitesView) mAboutHomeView.findViewById(R.id.top_sites_grid);
-        }
+        mAboutHomeView = (AboutHomeView) inflater.inflate(R.layout.abouthome_content, container, false);
+        mAddonsSection = (AddonsSection) mAboutHomeView.findViewById(R.id.recommended_addons);
+        mLastTabsSection = (LastTabsSection) mAboutHomeView.findViewById(R.id.last_tabs);
+        mRemoteTabsSection = (RemoteTabsSection) mAboutHomeView.findViewById(R.id.remote_tabs);
+        mTopSitesView = (TopSitesView) mAboutHomeView.findViewById(R.id.top_sites_grid);
 
         mAboutHomeView.setLightweightTheme(mLightweightTheme);
         mLightweightTheme.addListener(mAboutHomeView);
@@ -128,8 +124,7 @@ public class AboutHome extends Fragment {
         // Reload the mobile homepage on inbound tab syncs
         // Because the tabs URI is coarse grained, this updates the
         // remote tabs component on *every* tab change
-        // The observer will run on the background thread (see constructor argument)
-        mTabsContentObserver = new ContentObserver(ThreadUtils.getBackgroundHandler()) {
+        mTabsContentObserver = new ContentObserver(null) {
             @Override
             public void onChange(boolean selfChange) {
                 update(EnumSet.of(AboutHome.UpdateFlags.REMOTE_TABS));
@@ -143,15 +138,13 @@ public class AboutHome extends Fragment {
     public void onDestroyView() {
         mLightweightTheme.removeListener(mAboutHomeView);
         getActivity().getContentResolver().unregisterContentObserver(mTabsContentObserver);
+        mTopSitesView.onDestroy();
 
-        synchronized (this) {
-            mTopSitesView.onDestroy();
-            mAboutHomeView = null;
-            mAddonsSection = null;
-            mLastTabsSection = null;
-            mRemoteTabsSection = null;
-            mTopSitesView = null;
-        }
+        mAboutHomeView = null;
+        mAddonsSection = null;
+        mLastTabsSection = null;
+        mRemoteTabsSection = null;
+        mTopSitesView = null;
 
         super.onDestroyView();
     }
@@ -214,35 +207,27 @@ public class AboutHome extends Fragment {
     }
 
     public void update(final EnumSet<UpdateFlags> flags) {
-        ThreadUtils.postToBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                synchronized (AboutHome.this) {
-                    if (getView() == null) {
-                        return;
-                    }
+        if (getView() == null) {
+            return;
+        }
 
-                    if (flags.contains(UpdateFlags.TOP_SITES)) {
-                        mTopSitesView.loadTopSites();
-                    }
+        if (flags.contains(UpdateFlags.TOP_SITES)) {
+            mTopSitesView.loadTopSites();
+        }
 
-                    if (flags.contains(UpdateFlags.PREVIOUS_TABS)) {
-                        mLastTabsSection.readLastTabs();
-                    }
+        if (flags.contains(UpdateFlags.PREVIOUS_TABS)) {
+            mLastTabsSection.readLastTabs();
+        }
 
-                    if (flags.contains(UpdateFlags.RECOMMENDED_ADDONS)) {
-                        mAddonsSection.readRecommendedAddons();
-                    }
+        if (flags.contains(UpdateFlags.RECOMMENDED_ADDONS)) {
+            mAddonsSection.readRecommendedAddons();
+        }
 
-                    if (flags.contains(UpdateFlags.REMOTE_TABS)) {
-                        mRemoteTabsSection.loadRemoteTabs();
-                    }
-                }
-            }
-        });
+        if (flags.contains(UpdateFlags.REMOTE_TABS)) {
+            mRemoteTabsSection.loadRemoteTabs();
+        }
     }
 
-    // Must be run on the UI thread
     public void setLastTabsVisibility(boolean visible) {
         if (mAboutHomeView == null) {
             return;
@@ -261,7 +246,6 @@ public class AboutHome extends Fragment {
         }
     }
 
-    // Must be run on the UI thread
     public void setPadding(int left, int top, int right, int bottom) {
         View view = getView();
         if (view != null) {
diff --git a/mobile/android/base/widget/AddonsSection.java b/mobile/android/base/widget/AddonsSection.java
index c9948e1d42b5..c87978e1be1e 100644
--- a/mobile/android/base/widget/AddonsSection.java
+++ b/mobile/android/base/widget/AddonsSection.java
@@ -9,6 +9,7 @@ import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.Favicons;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.util.GamepadUtils;
+import org.mozilla.gecko.util.ThreadUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -74,8 +75,6 @@ public class AddonsSection extends AboutHomeSection {
             InputStream fileStream = null;
             File applicationPackage = new File(mActivity.getApplication().getPackageResourcePath());
             zip = new ZipFile(applicationPackage);
-            if (zip == null)
-                return null;
             ZipEntry fileEntry = zip.getEntry(filename);
             if (fileEntry == null)
                 return null;
@@ -139,83 +138,88 @@ public class AddonsSection extends AboutHomeSection {
     }
 
     public void readRecommendedAddons() {
-        final String addonsFilename = "recommended-addons.json";
-        String jsonString;
-        try {
-            jsonString = mActivity.getProfile().readFile(addonsFilename);
-        } catch (IOException ioe) {
-            Log.i(LOGTAG, "filestream is null");
-            jsonString = readFromZipFile(addonsFilename);
-        }
-
-        JSONArray addonsArray = null;
-        if (jsonString != null) {
-            try {
-                addonsArray = new JSONObject(jsonString).getJSONArray("addons");
-            } catch (JSONException e) {
-                Log.i(LOGTAG, "error reading json file", e);
-            }
-        }
-
-        final JSONArray array = addonsArray;
-        post(new Runnable() {
+        ThreadUtils.postToBackgroundThread(new Runnable() {
             @Override
             public void run() {
+                final String addonsFilename = "recommended-addons.json";
+                String jsonString;
                 try {
-                    if (array == null || array.length() == 0) {
-                        hide();
-                        return;
-                    }
-
-                    for (int i = 0; i < array.length(); i++) {
-                        JSONObject jsonobj = array.getJSONObject(i);
-                        String name = jsonobj.getString("name");
-                        String version = jsonobj.getString("version");
-                        String text = name + " " + version;
-
-                        SpannableString spannable = new SpannableString(text);
-                        spannable.setSpan(sSubTitleSpan, name.length() + 1, text.length(), 0);
-
-                        final TextView row = (TextView) LayoutInflater.from(mContext).inflate(R.layout.abouthome_addon_row, getItemsContainer(), false);
-                        row.setText(spannable, TextView.BufferType.SPANNABLE);
-
-                        Drawable drawable = mContext.getResources().getDrawable(R.drawable.ic_addons_empty);
-                        drawable.setBounds(sIconBounds);
-                        row.setCompoundDrawables(drawable, null, null, null);
-
-                        String iconUrl = jsonobj.getString("iconURL");
-                        String pageUrl = getPageUrlFromIconUrl(iconUrl);
-
-                        final String homepageUrl = jsonobj.getString("homepageURL");
-                        row.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                if (mUriLoadListener != null)
-                                    mUriLoadListener.onAboutHomeUriLoad(homepageUrl);
-                            }
-                        });
-                        row.setOnKeyListener(GamepadUtils.getClickDispatcher());
-
-                        Favicons favicons = Favicons.getInstance();
-                        favicons.loadFavicon(pageUrl, iconUrl, true,
-                                    new Favicons.OnFaviconLoadedListener() {
-                            @Override
-                            public void onFaviconLoaded(String url, Bitmap favicon) {
-                                if (favicon != null) {
-                                    Drawable drawable = new BitmapDrawable(favicon);
-                                    drawable.setBounds(sIconBounds);
-                                    row.setCompoundDrawables(drawable, null, null, null);
-                                }
-                            }
-                        });
-
-                        addItem(row);
-                    }
-
-                    show();
-                } catch (JSONException e) {
-                    Log.i(LOGTAG, "error reading json file", e);
+                    jsonString = mActivity.getProfile().readFile(addonsFilename);
+                } catch (IOException ioe) {
+                    Log.i(LOGTAG, "filestream is null");
+                    jsonString = readFromZipFile(addonsFilename);
                 }
+
+                JSONArray addonsArray = null;
+                if (jsonString != null) {
+                    try {
+                        addonsArray = new JSONObject(jsonString).getJSONArray("addons");
+                    } catch (JSONException e) {
+                        Log.i(LOGTAG, "error reading json file", e);
+                    }
+                }
+
+                final JSONArray array = addonsArray;
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            if (array == null || array.length() == 0) {
+                                hide();
+                                return;
+                            }
+
+                            for (int i = 0; i < array.length(); i++) {
+                                JSONObject jsonobj = array.getJSONObject(i);
+                                String name = jsonobj.getString("name");
+                                String version = jsonobj.getString("version");
+                                String text = name + " " + version;
+
+                                SpannableString spannable = new SpannableString(text);
+                                spannable.setSpan(sSubTitleSpan, name.length() + 1, text.length(), 0);
+
+                                final TextView row = (TextView) LayoutInflater.from(mContext).inflate(R.layout.abouthome_addon_row, getItemsContainer(), false);
+                                row.setText(spannable, TextView.BufferType.SPANNABLE);
+
+                                Drawable drawable = mContext.getResources().getDrawable(R.drawable.ic_addons_empty);
+                                drawable.setBounds(sIconBounds);
+                                row.setCompoundDrawables(drawable, null, null, null);
+
+                                String iconUrl = jsonobj.getString("iconURL");
+                                String pageUrl = getPageUrlFromIconUrl(iconUrl);
+
+                                final String homepageUrl = jsonobj.getString("homepageURL");
+                                row.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        if (mUriLoadListener != null)
+                                            mUriLoadListener.onAboutHomeUriLoad(homepageUrl);
+                                    }
+                                });
+                                row.setOnKeyListener(GamepadUtils.getClickDispatcher());
+
+                                Favicons favicons = Favicons.getInstance();
+                                favicons.loadFavicon(pageUrl, iconUrl, true,
+                                            new Favicons.OnFaviconLoadedListener() {
+                                    @Override
+                                    public void onFaviconLoaded(String url, Bitmap favicon) {
+                                        if (favicon != null) {
+                                            Drawable drawable = new BitmapDrawable(favicon);
+                                            drawable.setBounds(sIconBounds);
+                                            row.setCompoundDrawables(drawable, null, null, null);
+                                        }
+                                    }
+                                });
+
+                                addItem(row);
+                            }
+
+                            show();
+                        } catch (JSONException e) {
+                            Log.i(LOGTAG, "error reading json file", e);
+                        }
+                    }
+                });
             }
         });
     }
diff --git a/mobile/android/base/widget/LastTabsSection.java b/mobile/android/base/widget/LastTabsSection.java
index 3ce8e8b0b0c9..01b45fb97b32 100644
--- a/mobile/android/base/widget/LastTabsSection.java
+++ b/mobile/android/base/widget/LastTabsSection.java
@@ -11,6 +11,7 @@ import org.mozilla.gecko.SessionParser;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.util.GamepadUtils;
+import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -32,77 +33,82 @@ public class LastTabsSection extends AboutHomeSection {
     }
 
     public void readLastTabs() {
-        String jsonString = GeckoProfile.get(mContext).readSessionFile(true);
-        if (jsonString == null) {
-            // no previous session data
-            return;
-        }
-
-        final ArrayList<String> lastTabUrlsList = new ArrayList<String>();
-        new SessionParser() {
+        ThreadUtils.postToBackgroundThread(new Runnable() {
             @Override
-            public void onTabRead(final SessionTab tab) {
-                final String url = tab.getSelectedUrl();
-                // don't show last tabs for about:home
-                if (url.equals("about:home")) {
+            public void run() {
+                String jsonString = GeckoProfile.get(mContext).readSessionFile(true);
+                if (jsonString == null) {
+                    // no previous session data
                     return;
                 }
 
-                ContentResolver resolver = mContext.getContentResolver();
-                final Bitmap favicon = BrowserDB.getFaviconForUrl(resolver, url);
-                lastTabUrlsList.add(url);
-
-                LastTabsSection.this.post(new Runnable() {
+                final ArrayList<String> lastTabUrlsList = new ArrayList<String>();
+                new SessionParser() {
                     @Override
-                    public void run() {
-                        View container = LayoutInflater.from(mContext).inflate(R.layout.abouthome_last_tabs_row, getItemsContainer(), false);
-                        ((TextView) container.findViewById(R.id.last_tab_title)).setText(tab.getSelectedTitle());
-                        ((TextView) container.findViewById(R.id.last_tab_url)).setText(tab.getSelectedUrl());
-                        if (favicon != null) {
-                            ((ImageView) container.findViewById(R.id.last_tab_favicon)).setImageBitmap(favicon);
+                    public void onTabRead(final SessionTab tab) {
+                        final String url = tab.getSelectedUrl();
+                        // don't show last tabs for about:home
+                        if (url.equals("about:home")) {
+                            return;
                         }
 
-                        container.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                int flags = Tabs.LOADURL_NEW_TAB;
-                                if (Tabs.getInstance().getSelectedTab().isPrivate())
-                                    flags |= Tabs.LOADURL_PRIVATE;
-                                Tabs.getInstance().loadUrl(url, flags);
-                            }
-                        });
-                        container.setOnKeyListener(GamepadUtils.getClickDispatcher());
+                        ContentResolver resolver = mContext.getContentResolver();
+                        final Bitmap favicon = BrowserDB.getFaviconForUrl(resolver, url);
+                        lastTabUrlsList.add(url);
 
-                        addItem(container);
-                    }
-                });
-            }
-        }.parse(jsonString);
-
-        final int nu = lastTabUrlsList.size();
-        if (nu >= 1) {
-            post(new Runnable() {
-                @Override
-                public void run() {
-                    if (nu > 1) {
-                        showMoreText();
-                        setOnMoreTextClickListener(new View.OnClickListener() {
+                        LastTabsSection.this.post(new Runnable() {
                             @Override
-                            public void onClick(View v) {
-                                int flags = Tabs.LOADURL_NEW_TAB;
-                                if (Tabs.getInstance().getSelectedTab().isPrivate())
-                                    flags |= Tabs.LOADURL_PRIVATE;
-                                for (String url : lastTabUrlsList) {
-                                    Tabs.getInstance().loadUrl(url, flags);
+                            public void run() {
+                                View container = LayoutInflater.from(mContext).inflate(R.layout.abouthome_last_tabs_row, getItemsContainer(), false);
+                                ((TextView) container.findViewById(R.id.last_tab_title)).setText(tab.getSelectedTitle());
+                                ((TextView) container.findViewById(R.id.last_tab_url)).setText(tab.getSelectedUrl());
+                                if (favicon != null) {
+                                    ((ImageView) container.findViewById(R.id.last_tab_favicon)).setImageBitmap(favicon);
                                 }
+
+                                container.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        int flags = Tabs.LOADURL_NEW_TAB;
+                                        if (Tabs.getInstance().getSelectedTab().isPrivate())
+                                            flags |= Tabs.LOADURL_PRIVATE;
+                                        Tabs.getInstance().loadUrl(url, flags);
+                                    }
+                                });
+                                container.setOnKeyListener(GamepadUtils.getClickDispatcher());
+
+                                addItem(container);
                             }
                         });
-                    } else if (nu == 1) {
-                        hideMoreText();
                     }
-                    show();
+                }.parse(jsonString);
+
+                final int nu = lastTabUrlsList.size();
+                if (nu >= 1) {
+                    post(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (nu > 1) {
+                                showMoreText();
+                                setOnMoreTextClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        int flags = Tabs.LOADURL_NEW_TAB;
+                                        if (Tabs.getInstance().getSelectedTab().isPrivate())
+                                            flags |= Tabs.LOADURL_PRIVATE;
+                                        for (String url : lastTabUrlsList) {
+                                            Tabs.getInstance().loadUrl(url, flags);
+                                        }
+                                    }
+                                });
+                            } else if (nu == 1) {
+                                hideMoreText();
+                            }
+                            show();
+                        }
+                    });
                 }
-            });
-        }
+            }
+        });
     }
 }
diff --git a/mobile/android/base/widget/RemoteTabsSection.java b/mobile/android/base/widget/RemoteTabsSection.java
index 88bca8893bc5..b8f0ba56e2c9 100644
--- a/mobile/android/base/widget/RemoteTabsSection.java
+++ b/mobile/android/base/widget/RemoteTabsSection.java
@@ -11,6 +11,7 @@ import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.TabsAccessor;
 import org.mozilla.gecko.sync.setup.SyncAccounts;
 import org.mozilla.gecko.util.GamepadUtils;
+import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -55,17 +56,22 @@ public class RemoteTabsSection extends AboutHomeSection
     }
 
     public void loadRemoteTabs() {
-        if (!SyncAccounts.syncAccountsExist(mActivity)) {
-            post(new Runnable() {
-                @Override
-                public void run() {
-                    hide();
+        ThreadUtils.postToBackgroundThread(new Runnable() {
+            @Override
+            public void run() {
+                if (!SyncAccounts.syncAccountsExist(mActivity)) {
+                    post(new Runnable() {
+                        @Override
+                        public void run() {
+                            hide();
+                        }
+                    });
+                    return;
                 }
-            });
-            return;
-        }
 
-        TabsAccessor.getTabs(getContext(), NUMBER_OF_REMOTE_TABS, this);
+                TabsAccessor.getTabs(getContext(), NUMBER_OF_REMOTE_TABS, RemoteTabsSection.this);
+            }
+        });
     }
 
     @Override
diff --git a/mobile/android/base/widget/TopSitesView.java b/mobile/android/base/widget/TopSitesView.java
index a30b7d456b6a..b77c5259df91 100644
--- a/mobile/android/base/widget/TopSitesView.java
+++ b/mobile/android/base/widget/TopSitesView.java
@@ -193,39 +193,44 @@ public class TopSitesView extends GridView {
     }
 
     public void loadTopSites() {
-        final ContentResolver resolver = mContext.getContentResolver();
-
-        // Swap in the new cursor.
-        final Cursor oldCursor = (mTopSitesAdapter != null) ? mTopSitesAdapter.getCursor() : null;
-        final Cursor newCursor = BrowserDB.getTopSites(resolver, mNumberOfTopSites);
-
-        post(new Runnable() {
+        ThreadUtils.postToBackgroundThread(new Runnable() {
             @Override
             public void run() {
-                if (mTopSitesAdapter == null) {
-                    mTopSitesAdapter = new TopSitesCursorAdapter(mContext,
-                                                                 R.layout.abouthome_topsite_item,
-                                                                 newCursor,
-                                                                 new String[] { URLColumns.TITLE },
-                                                                 new int[] { R.id.title });
+                final ContentResolver resolver = mContext.getContentResolver();
 
-                    setAdapter(mTopSitesAdapter);
-                } else {
-                    mTopSitesAdapter.changeCursor(newCursor);
-                }
+                // Swap in the new cursor.
+                final Cursor oldCursor = (mTopSitesAdapter != null) ? mTopSitesAdapter.getCursor() : null;
+                final Cursor newCursor = BrowserDB.getTopSites(resolver, mNumberOfTopSites);
 
-                if (mTopSitesAdapter.getCount() > 0)
-                    loadTopSitesThumbnails(resolver);
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mTopSitesAdapter == null) {
+                            mTopSitesAdapter = new TopSitesCursorAdapter(mContext,
+                                                                         R.layout.abouthome_topsite_item,
+                                                                         newCursor,
+                                                                         new String[] { URLColumns.TITLE },
+                                                                         new int[] { R.id.title });
 
-                // Free the old Cursor in the right thread now.
-                if (oldCursor != null && !oldCursor.isClosed())
-                    oldCursor.close();
+                            setAdapter(mTopSitesAdapter);
+                        } else {
+                            mTopSitesAdapter.changeCursor(newCursor);
+                        }
 
-                // Even if AboutHome isn't necessarily entirely loaded if we
-                // get here, for phones this is the part the user initially sees,
-                // so it's the one we will care about for now.
-                if (mLoadCompleteListener != null)
-                    mLoadCompleteListener.onAboutHomeLoadComplete();
+                        if (mTopSitesAdapter.getCount() > 0)
+                            loadTopSitesThumbnails(resolver);
+
+                        // Free the old Cursor in the right thread now.
+                        if (oldCursor != null && !oldCursor.isClosed())
+                            oldCursor.close();
+
+                        // Even if AboutHome isn't necessarily entirely loaded if we
+                        // get here, for phones this is the part the user initially sees,
+                        // so it's the one we will care about for now.
+                        if (mLoadCompleteListener != null)
+                            mLoadCompleteListener.onAboutHomeLoadComplete();
+                    }
+                });
             }
         });
     }

From 01c87f8dfce97fe52ade2757f8094a91e5c0c3c7 Mon Sep 17 00:00:00 2001
From: Dave Hunt <dhunt@mozilla.com>
Date: Tue, 16 Apr 2013 22:35:07 +0100
Subject: [PATCH 062/438] Bug 857607 - Reduce log level when launching B2G
 desktop client with mozrunner. r=jgriffin

---
 .../client/marionette/geckoinstance.py        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/testing/marionette/client/marionette/geckoinstance.py b/testing/marionette/client/marionette/geckoinstance.py
index 73fa771aaf7d..a047b5d441a5 100644
--- a/testing/marionette/client/marionette/geckoinstance.py
+++ b/testing/marionette/client/marionette/geckoinstance.py
@@ -2,6 +2,8 @@
 # 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/
 
+import os
+
 from mozprofile import Profile
 from mozrunner import Runner
 
@@ -28,10 +30,13 @@ class GeckoInstance(object):
         else:
             runner_class = CloneRunner
             profile_args["path_from"] = profile_path
-        print "starting runner"
-        self.runner = runner_class.create(binary=self.bin,
-                                         profile_args=profile_args,
-                                         cmdargs=['-no-remote'])
+        self.runner = runner_class.create(
+            binary=self.bin,
+            profile_args=profile_args,
+            cmdargs=['-no-remote'],
+            kp_kwargs={
+                'processOutputLine': [NullOutput()],
+                'logfile': os.path.abspath('gecko.log')})
         self.runner.start()
 
     def close(self):
@@ -49,3 +54,9 @@ apps = {'b2gdesktop': B2GDesktopInstance}
 class CloneRunner(Runner):
 
     profile_class = Profile.clone
+
+
+class NullOutput(object):
+
+    def __call__(self, line):
+        pass

From 3a4be4332ae3ec2f6b0e75e67f1b298c717e0ad8 Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Wed, 17 Apr 2013 09:35:57 +1200
Subject: [PATCH 063/438] Bug 861490, fix crash in
 MaybeDrawRoundedBottomCorners with OMTC. r=mattwoodrow

--HG--
extra : rebase_source : 849e63417a94cd260e6722c83018f9937c0cb339
---
 gfx/layers/Makefile.in                       |  5 +-
 gfx/layers/composite/LayerManagerComposite.h |  1 -
 gfx/layers/opengl/CompositorOGL.h            |  3 +
 gfx/layers/opengl/GLManager.cpp              | 80 ++++++++++++++++++++
 gfx/layers/opengl/GLManager.h                | 37 +++++++++
 widget/cocoa/nsChildView.h                   |  6 +-
 widget/cocoa/nsChildView.mm                  | 19 ++---
 7 files changed, 137 insertions(+), 14 deletions(-)
 create mode 100644 gfx/layers/opengl/GLManager.cpp
 create mode 100644 gfx/layers/opengl/GLManager.h

diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in
index a2d7a51b1303..b39a0566ac0c 100644
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -141,7 +141,10 @@ DEFINES	+= -DMOZ_ENABLE_D3D10_LAYER
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CPPSRCS += ShadowLayerUtilsMac.cpp
+EXPORTS_mozilla/layers += GLManager.h
+CPPSRCS += ShadowLayerUtilsMac.cpp \
+           GLManager.cpp \
+           $(NULL)
 endif
 
 # NB: Gralloc is available on other platforms that use the android GL
diff --git a/gfx/layers/composite/LayerManagerComposite.h b/gfx/layers/composite/LayerManagerComposite.h
index 90480bbaf5fc..54d849ccbeae 100644
--- a/gfx/layers/composite/LayerManagerComposite.h
+++ b/gfx/layers/composite/LayerManagerComposite.h
@@ -135,7 +135,6 @@ public:
 
   virtual LayersBackend GetBackendType() MOZ_OVERRIDE
   {
-    MOZ_ASSERT(false, "Shouldn't be called for composited layer manager");
     return LAYERS_NONE;
   }
   virtual void GetBackendName(nsAString& name) MOZ_OVERRIDE
diff --git a/gfx/layers/opengl/CompositorOGL.h b/gfx/layers/opengl/CompositorOGL.h
index 55d3791bdca2..43c965d15289 100644
--- a/gfx/layers/opengl/CompositorOGL.h
+++ b/gfx/layers/opengl/CompositorOGL.h
@@ -18,11 +18,14 @@ namespace layers {
 
 struct FPSState;
 class CompositingRenderTargetOGL;
+class GLManagerCompositor;
 
 class CompositorOGL : public Compositor
 {
   typedef mozilla::gl::GLContext GLContext;
   typedef mozilla::gl::ShaderProgramType ProgramType;
+  
+  friend class GLManagerCompositor;
 
 public:
   CompositorOGL(nsIWidget *aWidget, int aSurfaceWidth = -1, int aSurfaceHeight = -1,
diff --git a/gfx/layers/opengl/GLManager.cpp b/gfx/layers/opengl/GLManager.cpp
new file mode 100644
index 000000000000..7a4723be035a
--- /dev/null
+++ b/gfx/layers/opengl/GLManager.cpp
@@ -0,0 +1,80 @@
+#include "GLManager.h"
+#include "LayerManagerOGL.h"
+#include "CompositorOGL.h"
+#include "LayerManagerComposite.h"
+#include "GLContext.h"
+
+using namespace mozilla::gl;
+
+namespace mozilla {
+namespace layers {
+
+class GLManagerLayerManager : public GLManager
+{
+public:
+  GLManagerLayerManager(LayerManagerOGL* aManager)
+    : mImpl(aManager)
+  {}
+
+  virtual GLContext* gl() const MOZ_OVERRIDE
+  {
+    return mImpl->gl();
+  }
+
+  virtual ShaderProgramOGL* GetProgram(ShaderProgramType aType) MOZ_OVERRIDE
+  {
+    return mImpl->GetProgram(aType);
+  }
+
+  virtual void BindAndDrawQuad(ShaderProgramOGL *aProg) MOZ_OVERRIDE
+  {
+    mImpl->BindAndDrawQuad(aProg);
+  }
+
+private:
+  nsRefPtr<LayerManagerOGL> mImpl;
+};
+
+class GLManagerCompositor : public GLManager
+{
+public:
+  GLManagerCompositor(CompositorOGL* aCompositor)
+    : mImpl(aCompositor)
+  {}
+
+  virtual GLContext* gl() const MOZ_OVERRIDE
+  {
+    return mImpl->gl();
+  }
+
+  virtual ShaderProgramOGL* GetProgram(gl::ShaderProgramType aType) MOZ_OVERRIDE
+  {
+    return mImpl->GetProgram(aType);
+  }
+
+  virtual void BindAndDrawQuad(ShaderProgramOGL *aProg) MOZ_OVERRIDE
+  {
+    mImpl->BindAndDrawQuad(aProg);
+  }
+
+private:
+  RefPtr<CompositorOGL> mImpl;
+};
+
+/* static */ GLManager*
+GLManager::CreateGLManager(LayerManager* aManager)
+{
+  if (aManager->GetBackendType() == LAYERS_OPENGL) {
+    return new GLManagerLayerManager(static_cast<LayerManagerOGL*>(aManager));
+  }
+  if (aManager->GetBackendType() == LAYERS_NONE) {
+    return new GLManagerCompositor(static_cast<CompositorOGL*>(
+      static_cast<LayerManagerComposite*>(aManager)->GetCompositor()));
+  }
+
+  MOZ_NOT_REACHED("Cannot create GLManager for non-GL layer manager");
+  return nullptr;
+}
+
+}
+}
\ No newline at end of file
diff --git a/gfx/layers/opengl/GLManager.h b/gfx/layers/opengl/GLManager.h
new file mode 100644
index 000000000000..cf00b04ef676
--- /dev/null
+++ b/gfx/layers/opengl/GLManager.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
+
+#ifndef MOZILLA_GFX_GLMANAGER_H
+#define MOZILLA_GFX_GLMANAGER_H
+
+#include "LayerManagerOGL.h"
+
+namespace mozilla {
+namespace gl {
+class GLContext;
+}
+namespace layers {
+
+/**
+ * Minimal interface to allow widgets to draw using OpenGL. Abstracts
+ * LayerManagerOGL and CompositorOGL. Call CreateGLManager with either a
+ * LayerManagerOGL or a LayerManagerComposite backed by a CompositorOGL.
+ */
+class GLManager
+{
+public:
+  static GLManager* CreateGLManager(LayerManager* aManager);
+
+  virtual ~GLManager() {}
+
+  virtual gl::GLContext* gl() const = 0;
+  virtual ShaderProgramOGL* GetProgram(gl::ShaderProgramType aType) = 0;
+  virtual void BindAndDrawQuad(ShaderProgramOGL *aProg) = 0;
+
+};
+
+}
+}
+#endif
diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index 46e658ed16f1..0439b93e2afa 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -90,7 +90,7 @@ class TextureImage;
 }
 
 namespace layers {
-class LayerManagerOGL;
+class GLManager;
 }
 }
 
@@ -573,8 +573,8 @@ protected:
     return widget.forget();
   }
 
-  void MaybeDrawResizeIndicator(mozilla::layers::LayerManagerOGL* aManager, nsIntRect aRect);
-  void MaybeDrawRoundedBottomCorners(mozilla::layers::LayerManagerOGL* aManager, nsIntRect aRect);
+  void MaybeDrawResizeIndicator(mozilla::layers::GLManager* aManager, nsIntRect aRect);
+  void MaybeDrawRoundedBottomCorners(mozilla::layers::GLManager* aManager, nsIntRect aRect);
 
   nsIWidget* GetWidgetForListenerEvents();
 
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 4cc26dcf5895..91ccf9566c80 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -51,8 +51,9 @@
 #include "nsRegion.h"
 #include "Layers.h"
 #include "LayerManagerOGL.h"
-#include "GLTextureImage.h"
 #include "LayerManagerComposite.h"
+#include "GLTextureImage.h"
+#include "mozilla/layers/GLManager.h"
 #include "mozilla/layers/CompositorCocoaWidgetHelper.h"
 #include "mozilla/layers/CompositorOGL.h"
 #ifdef ACCESSIBILITY
@@ -1865,7 +1866,7 @@ nsChildView::DrawWindowOverlay(LayerManager* aManager, nsIntRect aRect)
     return;
   }
 
-  LayerManagerOGL *manager = static_cast<LayerManagerOGL *>(aManager);
+  nsAutoPtr<GLManager> manager(GLManager::CreateGLManager(aManager));
   MaybeDrawResizeIndicator(manager, aRect);
   MaybeDrawRoundedBottomCorners(manager, aRect);
 }
@@ -1904,7 +1905,7 @@ DrawResizer(CGContextRef aCtx)
 }
 
 void
-nsChildView::MaybeDrawResizeIndicator(LayerManagerOGL* aManager, nsIntRect aRect)
+nsChildView::MaybeDrawResizeIndicator(GLManager* aManager, nsIntRect aRect)
 {
   nsIntRect resizeRect;
   if (!ShowsResizeIndicator(&resizeRect) || mFailedResizerImage) {
@@ -1914,9 +1915,9 @@ nsChildView::MaybeDrawResizeIndicator(LayerManagerOGL* aManager, nsIntRect aRect
   if (!mResizerImage) {
     mResizerImage =
       aManager->gl()->CreateTextureImage(nsIntSize(resizeRect.width, resizeRect.height),
-                                        gfxASurface::CONTENT_COLOR_ALPHA,
-                                        LOCAL_GL_CLAMP_TO_EDGE,
-                                        TextureImage::UseNearestFilter);
+                                         gfxASurface::CONTENT_COLOR_ALPHA,
+                                         LOCAL_GL_CLAMP_TO_EDGE,
+                                         TextureImage::UseNearestFilter);
 
     // Creation of texture images can fail.
     if (!mResizerImage)
@@ -1953,7 +1954,7 @@ nsChildView::MaybeDrawResizeIndicator(LayerManagerOGL* aManager, nsIntRect aRect
   TextureImage::ScopedBindTexture texBind(mResizerImage, LOCAL_GL_TEXTURE0);
 
   ShaderProgramOGL *program =
-    aManager->GetProgram(mResizerImage->GetShaderProgramType(), nullptr);
+    aManager->GetProgram(mResizerImage->GetShaderProgramType());
   program->Activate();
   program->SetLayerQuadRect(nsIntRect(bottomX - resizeIndicatorWidth,
                                       bottomY - resizeIndicatorHeight,
@@ -1975,7 +1976,7 @@ DrawTopLeftCornerMask(CGContextRef aCtx, int aRadius)
 }
 
 void
-nsChildView::MaybeDrawRoundedBottomCorners(LayerManagerOGL* aManager, nsIntRect aRect)
+nsChildView::MaybeDrawRoundedBottomCorners(GLManager* aManager, nsIntRect aRect)
 {
   if (![mView isKindOfClass:[ChildView class]] ||
       ![(ChildView*)mView hasRoundedBottomCorners] ||
@@ -2023,7 +2024,7 @@ nsChildView::MaybeDrawRoundedBottomCorners(LayerManagerOGL* aManager, nsIntRect
   
   TextureImage::ScopedBindTexture texBind(mCornerMaskImage, LOCAL_GL_TEXTURE0);
   
-  ShaderProgramOGL *program = aManager->GetProgram(mCornerMaskImage->GetShaderProgramType(), nullptr);
+  ShaderProgramOGL *program = aManager->GetProgram(mCornerMaskImage->GetShaderProgramType());
   program->Activate();
   program->SetLayerQuadRect(nsIntRect(0, 0, // aRect.x, aRect.y,
                                       devPixelCornerRadius,

From ec2b05364995689bc9822ae2002d0b3cbf1fb3af Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Wed, 17 Apr 2013 09:36:06 +1200
Subject: [PATCH 064/438] Bug 862064; use PCompositable for tiled layers and
 add TiledContentClient. r=nical

--HG--
extra : rebase_source : b0055e13b661f78bc0e7168c0df8c6082cfdb34e
---
 gfx/layers/CompositorTypes.h                  |  2 +-
 gfx/layers/basic/BasicTiledThebesLayer.cpp    | 65 +++++++++++--------
 gfx/layers/basic/BasicTiledThebesLayer.h      |  3 +-
 gfx/layers/client/TiledContentClient.cpp      | 49 ++++++++++----
 gfx/layers/client/TiledContentClient.h        | 50 ++++++++++----
 gfx/layers/composite/CompositableHost.cpp     | 12 ++--
 gfx/layers/composite/CompositableHost.h       | 12 ++--
 gfx/layers/composite/ContentHost.cpp          |  5 +-
 gfx/layers/composite/ContentHost.h            | 16 ++---
 gfx/layers/composite/ImageHost.h              | 12 ++--
 .../composite/LayerManagerComposite.cpp       |  2 +-
 gfx/layers/composite/LayerManagerComposite.h  |  7 +-
 gfx/layers/composite/ThebesLayerComposite.cpp | 17 +----
 gfx/layers/composite/ThebesLayerComposite.h   |  4 +-
 gfx/layers/composite/TiledContentHost.cpp     |  8 +++
 gfx/layers/composite/TiledContentHost.h       | 26 ++++++--
 gfx/layers/ipc/CompositableForwarder.h        |  4 ++
 .../ipc/CompositableTransactionParent.cpp     | 14 ++++
 gfx/layers/ipc/ImageBridgeChild.h             |  6 ++
 gfx/layers/ipc/LayerTransaction.ipdlh         |  5 +-
 gfx/layers/ipc/ShadowLayers.cpp               |  4 +-
 gfx/layers/ipc/ShadowLayers.h                 |  5 +-
 gfx/layers/ipc/ShadowLayersParent.cpp         | 15 -----
 23 files changed, 207 insertions(+), 136 deletions(-)

diff --git a/gfx/layers/CompositorTypes.h b/gfx/layers/CompositorTypes.h
index 9e2214a2f974..020b705a7833 100644
--- a/gfx/layers/CompositorTypes.h
+++ b/gfx/layers/CompositorTypes.h
@@ -74,7 +74,7 @@ enum TextureHostFlags
 {
   TEXTURE_HOST_DEFAULT = 0,       // The default texture host for the given
                                   // SurfaceDescriptor
-  TEXTURE_HOST_TILED = 1 << 0,    // A texture host that supports tiling
+  TEXTURE_HOST_TILED = 1 << 0     // A texture host that supports tiling
 };
 
 /**
diff --git a/gfx/layers/basic/BasicTiledThebesLayer.cpp b/gfx/layers/basic/BasicTiledThebesLayer.cpp
index 20dfe99629f8..35d3743ef583 100644
--- a/gfx/layers/basic/BasicTiledThebesLayer.cpp
+++ b/gfx/layers/basic/BasicTiledThebesLayer.cpp
@@ -15,11 +15,9 @@ namespace layers {
 
 BasicTiledThebesLayer::BasicTiledThebesLayer(BasicShadowLayerManager* const aManager)
   : ThebesLayer(aManager, static_cast<BasicImplData*>(this))
-  , mTiledBuffer(this, aManager)
-  , mLowPrecisionTiledBuffer(this, aManager)
+  , mContentClient()
 {
   MOZ_COUNT_CTOR(BasicTiledThebesLayer);
-  mLowPrecisionTiledBuffer.SetResolution(gfxPlatform::GetLowPrecisionResolution());
   mPaintData.mLastScrollOffset = gfx::Point(0, 0);
   mPaintData.mFirstPaint = true;
 }
@@ -126,7 +124,15 @@ BasicTiledThebesLayer::PaintThebes(gfxContext* aContext,
     return;
   }
 
-  if (mTiledBuffer.HasFormatChanged()) {
+  if (!mContentClient) {
+    mContentClient = new TiledContentClient(this, BasicManager());
+
+    mContentClient->Connect();
+    BasicManager()->Attach(mContentClient, this);
+    MOZ_ASSERT(mContentClient->GetForwarder());
+  }
+
+  if (mContentClient->mTiledBuffer.HasFormatChanged()) {
     mValidRegion = nsIntRegion();
   }
 
@@ -151,9 +157,11 @@ BasicTiledThebesLayer::PaintThebes(gfxContext* aContext,
 
     NS_ASSERTION(!BasicManager()->IsRepeatTransaction(), "Didn't paint our mask layer");
 
-    mTiledBuffer.PaintThebes(mValidRegion, invalidRegion, aCallback, aCallbackData);
+    mContentClient->mTiledBuffer.PaintThebes(mValidRegion, invalidRegion,
+                                             aCallback, aCallbackData);
 
-    mTiledBuffer.LockCopyAndWrite();
+    BasicManager()->Hold(this);
+    mContentClient->LockCopyAndWrite(TiledContentClient::TILED_BUFFER);
 
     return;
   }
@@ -199,33 +207,35 @@ BasicTiledThebesLayer::PaintThebes(gfxContext* aContext,
     // Only draw progressively when the resolution is unchanged.
     if (gfxPlatform::UseProgressiveTilePainting() &&
         !BasicManager()->HasShadowTarget() &&
-        mTiledBuffer.GetFrameResolution() == mPaintData.mResolution) {
+        mContentClient->mTiledBuffer.GetFrameResolution() == mPaintData.mResolution) {
       // Store the old valid region, then clear it before painting.
       // We clip the old valid region to the visible region, as it only gets
       // used to decide stale content (currently valid and previously visible)
-      nsIntRegion oldValidRegion = mTiledBuffer.GetValidRegion();
+      nsIntRegion oldValidRegion = mContentClient->mTiledBuffer.GetValidRegion();
       oldValidRegion.And(oldValidRegion, mVisibleRegion);
       if (!mPaintData.mLayerCriticalDisplayPort.IsEmpty()) {
         oldValidRegion.And(oldValidRegion, mPaintData.mLayerCriticalDisplayPort);
       }
 
       updatedBuffer =
-        mTiledBuffer.ProgressiveUpdate(mValidRegion, invalidRegion,
-                                       oldValidRegion, &mPaintData, aCallback,
-                                       aCallbackData);
+        mContentClient->mTiledBuffer.ProgressiveUpdate(mValidRegion, invalidRegion,
+                                                       oldValidRegion, &mPaintData,
+                                                       aCallback, aCallbackData);
     } else {
       updatedBuffer = true;
       mValidRegion = mVisibleRegion;
       if (!mPaintData.mLayerCriticalDisplayPort.IsEmpty()) {
         mValidRegion.And(mValidRegion, mPaintData.mLayerCriticalDisplayPort);
       }
-      mTiledBuffer.SetFrameResolution(mPaintData.mResolution);
-      mTiledBuffer.PaintThebes(mValidRegion, invalidRegion, aCallback, aCallbackData);
+      mContentClient->mTiledBuffer.SetFrameResolution(mPaintData.mResolution);
+      mContentClient->mTiledBuffer.PaintThebes(mValidRegion, invalidRegion,
+                                               aCallback, aCallbackData);
     }
 
     if (updatedBuffer) {
       mPaintData.mFirstPaint = false;
-      mTiledBuffer.LockCopyAndWrite();
+      BasicManager()->Hold(this);
+      mContentClient->LockCopyAndWrite(TiledContentClient::TILED_BUFFER);
 
       // If there are low precision updates, mark the paint as unfinished and
       // request a repeat transaction.
@@ -247,18 +257,19 @@ BasicTiledThebesLayer::PaintThebes(gfxContext* aContext,
   bool updatedLowPrecision = false;
   if (!lowPrecisionInvalidRegion.IsEmpty() &&
       !nsIntRegion(mPaintData.mLayerCriticalDisplayPort).Contains(mVisibleRegion)) {
-    nsIntRegion oldValidRegion = mLowPrecisionTiledBuffer.GetValidRegion();
+    nsIntRegion oldValidRegion =
+      mContentClient->mLowPrecisionTiledBuffer.GetValidRegion();
     oldValidRegion.And(oldValidRegion, mVisibleRegion);
 
     // If the frame resolution or format have changed, invalidate the buffer
-    if (mLowPrecisionTiledBuffer.GetFrameResolution() != mPaintData.mResolution ||
-        mLowPrecisionTiledBuffer.HasFormatChanged()) {
+    if (mContentClient->mLowPrecisionTiledBuffer.GetFrameResolution() != mPaintData.mResolution ||
+        mContentClient->mLowPrecisionTiledBuffer.HasFormatChanged()) {
       if (!mLowPrecisionValidRegion.IsEmpty()) {
         updatedLowPrecision = true;
       }
       oldValidRegion.SetEmpty();
       mLowPrecisionValidRegion.SetEmpty();
-      mLowPrecisionTiledBuffer.SetFrameResolution(mPaintData.mResolution);
+      mContentClient->mLowPrecisionTiledBuffer.SetFrameResolution(mPaintData.mResolution);
       lowPrecisionInvalidRegion = mVisibleRegion;
     }
 
@@ -273,25 +284,27 @@ BasicTiledThebesLayer::PaintThebes(gfxContext* aContext,
     lowPrecisionInvalidRegion.Sub(lowPrecisionInvalidRegion, mValidRegion);
 
     if (!lowPrecisionInvalidRegion.IsEmpty()) {
-      updatedLowPrecision =
-        mLowPrecisionTiledBuffer.ProgressiveUpdate(mLowPrecisionValidRegion,
-                                                   lowPrecisionInvalidRegion, oldValidRegion,
-                                                   &mPaintData, aCallback, aCallbackData);
+      updatedLowPrecision = mContentClient->mLowPrecisionTiledBuffer
+                              .ProgressiveUpdate(mLowPrecisionValidRegion,
+                                                 lowPrecisionInvalidRegion,
+                                                 oldValidRegion, &mPaintData,
+                                                 aCallback, aCallbackData);
     }
   } else if (!mLowPrecisionValidRegion.IsEmpty()) {
     // Clear the low precision tiled buffer
     updatedLowPrecision = true;
     mLowPrecisionValidRegion.SetEmpty();
-    mLowPrecisionTiledBuffer.PaintThebes(mLowPrecisionValidRegion,
-                                         mLowPrecisionValidRegion, aCallback,
-                                         aCallbackData);
+    mContentClient->mLowPrecisionTiledBuffer.PaintThebes(mLowPrecisionValidRegion,
+                                                         mLowPrecisionValidRegion,
+                                                         aCallback, aCallbackData);
   }
 
   // We send a Painted callback if we clear the valid region of the low
   // precision buffer, so that the shadow buffer's valid region can be updated
   // and the associated resources can be freed.
   if (updatedLowPrecision) {
-    mLowPrecisionTiledBuffer.LockCopyAndWrite();
+    BasicManager()->Hold(this);
+    mContentClient->LockCopyAndWrite(TiledContentClient::LOW_PRECISION_TILED_BUFFER);
   }
 
   EndPaint(false);
diff --git a/gfx/layers/basic/BasicTiledThebesLayer.h b/gfx/layers/basic/BasicTiledThebesLayer.h
index 7eaa7deebafc..2ce44776cbbe 100644
--- a/gfx/layers/basic/BasicTiledThebesLayer.h
+++ b/gfx/layers/basic/BasicTiledThebesLayer.h
@@ -94,8 +94,7 @@ private:
    */
   void EndPaint(bool aFinish);
 
-  BasicTiledLayerBuffer mTiledBuffer;
-  BasicTiledLayerBuffer mLowPrecisionTiledBuffer;
+  RefPtr<TiledContentClient> mContentClient;
   nsIntRegion mLowPrecisionValidRegion;
   BasicTiledLayerPaintData mPaintData;
 };
diff --git a/gfx/layers/client/TiledContentClient.cpp b/gfx/layers/client/TiledContentClient.cpp
index 1f8199621284..425257a1c1fb 100644
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -58,6 +58,43 @@ using namespace gfx;
 
 namespace layers {
 
+
+TiledContentClient::TiledContentClient(BasicTiledThebesLayer* aThebesLayer,
+                                       BasicShadowLayerManager* aManager)
+  : CompositableClient(aManager->AsShadowForwarder())
+  , mTiledBuffer(aThebesLayer, aManager)
+  , mLowPrecisionTiledBuffer(aThebesLayer, aManager)
+{
+  MOZ_COUNT_CTOR(TiledContentClient);
+
+  mLowPrecisionTiledBuffer.SetResolution(gfxPlatform::GetLowPrecisionResolution());
+}
+
+void
+TiledContentClient::LockCopyAndWrite(TiledBufferType aType)
+{
+  // Create a heap copy owned and released by the compositor. This is needed
+  // since we're sending this over an async message and content needs to be
+  // be able to modify the tiled buffer in the next transaction.
+  // TODO: Remove me once Bug 747811 lands.
+  BasicTiledLayerBuffer* buffer = aType == LOW_PRECISION_TILED_BUFFER
+    ? &mLowPrecisionTiledBuffer
+    : &mTiledBuffer;
+
+  BasicTiledLayerBuffer* heapCopy = new BasicTiledLayerBuffer(buffer->DeepCopy());
+  buffer->ReadLock();
+  mForwarder->PaintedTiledLayerBuffer(this, heapCopy);
+  buffer->ClearPaintedRegion();
+}
+
+BasicTiledLayerBuffer::BasicTiledLayerBuffer(BasicTiledThebesLayer* aThebesLayer,
+                                             BasicShadowLayerManager* aManager)
+  : mThebesLayer(aThebesLayer)
+  , mManager(aManager)
+  , mLastPaintOpaque(false)
+{
+}
+
 bool
 BasicTiledLayerBuffer::HasFormatChanged() const
 {
@@ -75,18 +112,6 @@ BasicTiledLayerBuffer::GetContentType() const
   }
 }
 
-void
-BasicTiledLayerBuffer::LockCopyAndWrite()
-{
-  // Create a heap copy owned and released by the compositor. This is needed
-  // since we're sending this over an async message and content needs to be
-  // be able to modify the tiled buffer in the next transaction.
-  // TODO: Remove me once Bug 747811 lands.
-  BasicTiledLayerBuffer *heapCopy = new BasicTiledLayerBuffer(this->DeepCopy());
-  ReadLock();
-  mManager->PaintedTiledLayerBuffer(mManager->Hold(mThebesLayer), heapCopy);
-  ClearPaintedRegion();
-}
 
 void
 BasicTiledLayerBuffer::PaintThebes(const nsIntRegion& aNewValidRegion,
diff --git a/gfx/layers/client/TiledContentClient.h b/gfx/layers/client/TiledContentClient.h
index 69a50865362d..a1f23c83a3dc 100644
--- a/gfx/layers/client/TiledContentClient.h
+++ b/gfx/layers/client/TiledContentClient.h
@@ -100,16 +100,12 @@ class BasicTiledLayerBuffer
 
 public:
   BasicTiledLayerBuffer(BasicTiledThebesLayer* aThebesLayer,
-                        BasicShadowLayerManager* aManager)
-    : mThebesLayer(aThebesLayer)
-    , mManager(aManager)
-    , mLastPaintOpaque(false)
-    {}
- BasicTiledLayerBuffer()
+                        BasicShadowLayerManager* aManager);
+  BasicTiledLayerBuffer()
     : mThebesLayer(nullptr)
     , mManager(nullptr)
     , mLastPaintOpaque(false)
-    {}
+  {}
 
   void PaintThebes(const nsIntRegion& aNewValidRegion,
                    const nsIntRegion& aPaintRegion,
@@ -135,8 +131,6 @@ public:
 
   bool HasFormatChanged() const;
 
-  void LockCopyAndWrite();
-
   /**
    * Performs a progressive update of a given tiled buffer.
    * See ComputeProgressiveUpdateRegion above for parameter documentation.
@@ -175,6 +169,7 @@ protected:
   }
 
   BasicTiledLayerTile GetPlaceholderTile() const { return BasicTiledLayerTile(); }
+
 private:
   gfxASurface::gfxContentType GetContentType() const;
   BasicTiledThebesLayer* mThebesLayer;
@@ -189,8 +184,8 @@ private:
   nsIntPoint                    mSinglePaintBufferOffset;
 
   BasicTiledLayerTile ValidateTileInternal(BasicTiledLayerTile aTile,
-                                         const nsIntPoint& aTileOrigin,
-                                         const nsIntRect& aDirtyRect);
+                                           const nsIntPoint& aTileOrigin,
+                                           const nsIntRect& aDirtyRect);
 
   /**
    * Calculates the region to update in a single progressive update transaction.
@@ -220,6 +215,39 @@ private:
                                       bool aIsRepeated);
 };
 
+class TiledContentClient : public CompositableClient
+{
+  // XXX: for now the layer which owns us interacts directly with our buffers.
+  // We should have a content client for each tiled buffer which manages its
+  // own valid region, resolution, etc. Then we could have a much cleaner
+  // interface and tidy up BasicTiledThebesLayer::PaintThebes (bug 862547).
+  friend class BasicTiledThebesLayer;
+
+public:
+  TiledContentClient(BasicTiledThebesLayer* aThebesLayer,
+                     BasicShadowLayerManager* aManager);
+
+  ~TiledContentClient()
+  {
+    MOZ_COUNT_DTOR(TiledContentClient);
+  }
+
+  virtual TextureInfo GetTextureInfo() const MOZ_OVERRIDE
+  {
+    return TextureInfo(BUFFER_TILED);
+  }
+
+  enum TiledBufferType {
+    TILED_BUFFER,
+    LOW_PRECISION_TILED_BUFFER
+  };
+  void LockCopyAndWrite(TiledBufferType aType);
+
+private:
+  BasicTiledLayerBuffer mTiledBuffer;
+  BasicTiledLayerBuffer mLowPrecisionTiledBuffer;
+};
+
 }
 }
 
diff --git a/gfx/layers/composite/CompositableHost.cpp b/gfx/layers/composite/CompositableHost.cpp
index 8cc7ebfdd643..6b126ae523d1 100644
--- a/gfx/layers/composite/CompositableHost.cpp
+++ b/gfx/layers/composite/CompositableHost.cpp
@@ -43,24 +43,24 @@ CompositableHost::AddMaskEffect(EffectChain& aEffects,
 }
 
 /* static */ TemporaryRef<CompositableHost>
-CompositableHost::Create(const TextureInfo& aTextureInfo, Compositor* aCompositor)
+CompositableHost::Create(const TextureInfo& aTextureInfo)
 {
   RefPtr<CompositableHost> result;
   switch (aTextureInfo.mCompositableType) {
   case BUFFER_IMAGE_BUFFERED:
-    result = new ImageHostBuffered(aTextureInfo, aCompositor);
+    result = new ImageHostBuffered(aTextureInfo);
     return result;
   case BUFFER_IMAGE_SINGLE:
-    result = new ImageHostSingle(aTextureInfo, aCompositor);
+    result = new ImageHostSingle(aTextureInfo);
     return result;
   case BUFFER_TILED:
-    result = new TiledContentHost(aTextureInfo, aCompositor);
+    result = new TiledContentHost(aTextureInfo);
     return result;
   case BUFFER_CONTENT:
-    result = new ContentHostSingleBuffered(aTextureInfo, aCompositor);
+    result = new ContentHostSingleBuffered(aTextureInfo);
     return result;
   case BUFFER_CONTENT_DIRECT:
-    result = new ContentHostDoubleBuffered(aTextureInfo, aCompositor);
+    result = new ContentHostDoubleBuffered(aTextureInfo);
     return result;
   default:
     MOZ_NOT_REACHED("Unknown CompositableType");
diff --git a/gfx/layers/composite/CompositableHost.h b/gfx/layers/composite/CompositableHost.h
index 1443a59e0a7a..8f82209391eb 100644
--- a/gfx/layers/composite/CompositableHost.h
+++ b/gfx/layers/composite/CompositableHost.h
@@ -48,10 +48,9 @@ class SurfaceDescriptor;
 class CompositableHost : public RefCounted<CompositableHost>
 {
 public:
-  CompositableHost(const TextureInfo& aTextureInfo,
-                   Compositor* aCompositor = nullptr)
+  CompositableHost(const TextureInfo& aTextureInfo)
     : mTextureInfo(aTextureInfo)
-    , mCompositor(aCompositor)
+    , mCompositor(nullptr)
     , mLayer(nullptr)
   {
     MOZ_COUNT_CTOR(CompositableHost);
@@ -62,8 +61,7 @@ public:
     MOZ_COUNT_DTOR(CompositableHost);
   }
 
-  static TemporaryRef<CompositableHost> Create(const TextureInfo& aTextureInfo,
-                                               Compositor* aCompositor = nullptr);
+  static TemporaryRef<CompositableHost> Create(const TextureInfo& aTextureInfo);
 
   virtual CompositableType GetType() = 0;
 
@@ -146,7 +144,9 @@ public:
   Layer* GetLayer() const { return mLayer; }
   void SetLayer(Layer* aLayer) { mLayer = aLayer; }
 
-  void Attach(Layer* aLayer, Compositor* aCompositor)
+  virtual TiledLayerComposer* AsTiledLayerComposer() { return nullptr; }
+
+  virtual void Attach(Layer* aLayer, Compositor* aCompositor)
   {
     SetCompositor(aCompositor);
     SetLayer(aLayer);
diff --git a/gfx/layers/composite/ContentHost.cpp b/gfx/layers/composite/ContentHost.cpp
index befda04a7088..52773f23e8d8 100644
--- a/gfx/layers/composite/ContentHost.cpp
+++ b/gfx/layers/composite/ContentHost.cpp
@@ -11,9 +11,8 @@ namespace mozilla {
 using namespace gfx;
 namespace layers {
 
-ContentHostBase::ContentHostBase(const TextureInfo& aTextureInfo,
-                                 Compositor* aCompositor)
-  : ContentHost(aTextureInfo, aCompositor)
+ContentHostBase::ContentHostBase(const TextureInfo& aTextureInfo)
+  : ContentHost(aTextureInfo)
   , mPaintWillResample(false)
   , mInitialised(false)
 {}
diff --git a/gfx/layers/composite/ContentHost.h b/gfx/layers/composite/ContentHost.h
index b80c51600a8a..069e7500240f 100644
--- a/gfx/layers/composite/ContentHost.h
+++ b/gfx/layers/composite/ContentHost.h
@@ -39,8 +39,8 @@ public:
 #endif
 
 protected:
-  ContentHost(const TextureInfo& aTextureInfo, Compositor* aCompositor)
-    : CompositableHost(aTextureInfo, aCompositor)
+  ContentHost(const TextureInfo& aTextureInfo)
+    : CompositableHost(aTextureInfo)
   {}
 };
 
@@ -61,7 +61,7 @@ public:
   typedef ThebesLayerBuffer::ContentType ContentType;
   typedef ThebesLayerBuffer::PaintState PaintState;
 
-  ContentHostBase(const TextureInfo& aTextureInfo, Compositor* aCompositor);
+  ContentHostBase(const TextureInfo& aTextureInfo);
   ~ContentHostBase();
 
   virtual void Composite(EffectChain& aEffectChain,
@@ -135,9 +135,8 @@ protected:
 class ContentHostDoubleBuffered : public ContentHostBase
 {
 public:
-  ContentHostDoubleBuffered(const TextureInfo& aTextureInfo,
-                            Compositor* aCompositor)
-    : ContentHostBase(aTextureInfo, aCompositor)
+  ContentHostDoubleBuffered(const TextureInfo& aTextureInfo)
+    : ContentHostBase(aTextureInfo)
   {}
 
   ~ContentHostDoubleBuffered();
@@ -173,9 +172,8 @@ protected:
 class ContentHostSingleBuffered : public ContentHostBase
 {
 public:
-  ContentHostSingleBuffered(const TextureInfo& aTextureInfo,
-                            Compositor* aCompositor)
-    : ContentHostBase(aTextureInfo, aCompositor)
+  ContentHostSingleBuffered(const TextureInfo& aTextureInfo)
+    : ContentHostBase(aTextureInfo)
   {}
   virtual ~ContentHostSingleBuffered();
 
diff --git a/gfx/layers/composite/ImageHost.h b/gfx/layers/composite/ImageHost.h
index 6b01432a5264..ff1f854ba37f 100644
--- a/gfx/layers/composite/ImageHost.h
+++ b/gfx/layers/composite/ImageHost.h
@@ -24,8 +24,8 @@ public:
   TextureHost* GetTextureHost() MOZ_OVERRIDE { return nullptr; }
 
 protected:
-  ImageHost(const TextureInfo& aTextureInfo, Compositor* aCompositor)
-  : CompositableHost(aTextureInfo, aCompositor)
+  ImageHost(const TextureInfo& aTextureInfo)
+  : CompositableHost(aTextureInfo)
   {
     MOZ_COUNT_CTOR(ImageHost);
   }
@@ -40,8 +40,8 @@ protected:
 class ImageHostSingle : public ImageHost
 {
 public:
-  ImageHostSingle(const TextureInfo& aTextureInfo, Compositor* aCompositor)
-    : ImageHost(aTextureInfo, aCompositor)
+  ImageHostSingle(const TextureInfo& aTextureInfo)
+    : ImageHost(aTextureInfo)
     , mTextureHost(nullptr)
     , mHasPictureRect(false)
   {}
@@ -99,8 +99,8 @@ protected:
 class ImageHostBuffered : public ImageHostSingle
 {
 public:
-  ImageHostBuffered(const TextureInfo& aTextureInfo, Compositor* aCompositor)
-    : ImageHostSingle(aTextureInfo, aCompositor)
+  ImageHostBuffered(const TextureInfo& aTextureInfo)
+    : ImageHostSingle(aTextureInfo)
   {}
 
   virtual bool Update(const SurfaceDescriptor& aImage,
diff --git a/gfx/layers/composite/LayerManagerComposite.cpp b/gfx/layers/composite/LayerManagerComposite.cpp
index 8b1c623f09d6..2ee0614f4581 100644
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@@ -389,7 +389,7 @@ LayerManagerComposite::ComputeRenderIntegrityInternal(Layer* aLayer,
     TiledLayerComposer* composer = nullptr;
     LayerComposite* shadow = aLayer->AsLayerComposite();
     if (shadow) {
-      composer = shadow->AsTiledLayerComposer();
+      composer = shadow->GetTiledLayerComposer();
       if (composer) {
         incompleteRegion.Sub(incompleteRegion, composer->GetValidLowPrecisionRegion());
         if (!incompleteRegion.IsEmpty()) {
diff --git a/gfx/layers/composite/LayerManagerComposite.h b/gfx/layers/composite/LayerManagerComposite.h
index 54d849ccbeae..c4af147865ff 100644
--- a/gfx/layers/composite/LayerManagerComposite.h
+++ b/gfx/layers/composite/LayerManagerComposite.h
@@ -287,12 +287,7 @@ public:
 
   virtual void CleanupResources() = 0;
 
-  virtual TiledLayerComposer* AsTiledLayerComposer() { return NULL; }
-
-  virtual void EnsureBuffer(CompositableType aType)
-  {
-    MOZ_ASSERT(false, "Should not be called unless overriden.");
-  }
+  virtual TiledLayerComposer* GetTiledLayerComposer() { return nullptr; }
 
 protected:
   LayerManagerComposite* mCompositeManager;
diff --git a/gfx/layers/composite/ThebesLayerComposite.cpp b/gfx/layers/composite/ThebesLayerComposite.cpp
index 5949a2551f3b..c16487ce886f 100644
--- a/gfx/layers/composite/ThebesLayerComposite.cpp
+++ b/gfx/layers/composite/ThebesLayerComposite.cpp
@@ -47,21 +47,6 @@ ThebesLayerComposite::SetCompositableHost(CompositableHost* aHost)
   mBuffer= static_cast<ContentHost*>(aHost);
 }
 
-void
-ThebesLayerComposite::EnsureBuffer(CompositableType aType)
-{
-  MOZ_ASSERT(aType == BUFFER_TILED,
-             "Should only be called for tiled layers.");
-  if (!mBuffer ||
-      mBuffer->GetType() != aType) {
-    RefPtr<CompositableHost> bufferHost
-      = CompositableHost::Create(TextureInfo(aType), mCompositeManager->GetCompositor());
-    NS_ASSERTION(bufferHost->GetType() == BUFFER_TILED, "bad buffer type");
-    mBuffer = static_cast<ContentHost*>(bufferHost.get());
-    mRequiresTiledProperties = true;
-  }
-}
-
 void
 ThebesLayerComposite::Disconnect()
 {
@@ -87,7 +72,7 @@ ThebesLayerComposite::GetLayer()
 }
 
 TiledLayerComposer*
-ThebesLayerComposite::AsTiledLayerComposer()
+ThebesLayerComposite::GetTiledLayerComposer()
 {
   return mBuffer->AsTiledLayerComposer();
 }
diff --git a/gfx/layers/composite/ThebesLayerComposite.h b/gfx/layers/composite/ThebesLayerComposite.h
index 15f4132032c5..c524cc8ca150 100644
--- a/gfx/layers/composite/ThebesLayerComposite.h
+++ b/gfx/layers/composite/ThebesLayerComposite.h
@@ -47,7 +47,7 @@ public:
 
   virtual Layer* GetLayer() MOZ_OVERRIDE;
 
-  virtual TiledLayerComposer* AsTiledLayerComposer() MOZ_OVERRIDE;
+  virtual TiledLayerComposer* GetTiledLayerComposer() MOZ_OVERRIDE;
 
   virtual void RenderLayer(const nsIntPoint& aOffset,
                            const nsIntRect& aClipRect) MOZ_OVERRIDE;
@@ -58,7 +58,7 @@ public:
 
   virtual LayerComposite* AsLayerComposite() MOZ_OVERRIDE { return this; }
 
-  virtual void EnsureBuffer(CompositableType aType) MOZ_OVERRIDE;
+  void EnsureTiled() { mRequiresTiledProperties = true; }
 
 #ifdef MOZ_LAYERS_HAVE_LOG
   virtual const char* Name() const MOZ_OVERRIDE { return "ThebesLayerComposite"; }
diff --git a/gfx/layers/composite/TiledContentHost.cpp b/gfx/layers/composite/TiledContentHost.cpp
index 25399dc80a57..c6355aef8ea7 100644
--- a/gfx/layers/composite/TiledContentHost.cpp
+++ b/gfx/layers/composite/TiledContentHost.cpp
@@ -6,6 +6,7 @@
 #include "TiledContentHost.h"
 #include "mozilla/layers/Effects.h"
 #include "nsPrintfCString.h"
+#include "ThebesLayerComposite.h"
 
 namespace mozilla {
 using namespace gfx;
@@ -59,6 +60,13 @@ TiledContentHost::~TiledContentHost()
   mLowPrecisionMainMemoryTiledBuffer.ReadUnlock();
 }
 
+void
+TiledContentHost::Attach(Layer* aLayer, Compositor* aCompositor)
+{
+  CompositableHost::Attach(aLayer, aCompositor);
+  static_cast<ThebesLayerComposite*>(aLayer)->EnsureTiled();
+}
+
 void
 TiledContentHost::PaintedTiledLayerBuffer(const BasicTiledLayerBuffer* mTiledBuffer)
 {
diff --git a/gfx/layers/composite/TiledContentHost.h b/gfx/layers/composite/TiledContentHost.h
index 01ddc45a2f56..9116f193e94f 100644
--- a/gfx/layers/composite/TiledContentHost.h
+++ b/gfx/layers/composite/TiledContentHost.h
@@ -66,8 +66,8 @@ class TiledLayerBufferComposite
   friend class TiledLayerBuffer<TiledLayerBufferComposite, TiledTexture>;
 
 public:
-  TiledLayerBufferComposite(Compositor* aCompositor)
-    : mCompositor(aCompositor)
+  TiledLayerBufferComposite()
+    : mCompositor(nullptr)
   {}
 
   void Upload(const BasicTiledLayerBuffer* aMainMemoryTiledBuffer,
@@ -81,6 +81,11 @@ public:
   // by the sum of the resolutions of all parent layers' FrameMetrics.
   const gfxSize& GetFrameResolution() { return mFrameResolution; }
 
+  void SetCompositor(Compositor* aCompositor)
+  {
+    mCompositor = aCompositor;
+  }
+
 protected:
   TiledTexture ValidateTile(TiledTexture aTile,
                             const nsIntPoint& aTileRect,
@@ -126,10 +131,8 @@ class TiledContentHost : public ContentHost,
                          public TiledLayerComposer
 {
 public:
-  TiledContentHost(const TextureInfo& aTextureInfo, Compositor* aCompositor)
-    : ContentHost(aTextureInfo, aCompositor)
-    , mVideoMemoryTiledBuffer(aCompositor)
-    , mLowPrecisionVideoMemoryTiledBuffer(aCompositor)
+  TiledContentHost(const TextureInfo& aTextureInfo)
+    : ContentHost(aTextureInfo)
     , mPendingUpload(false)
     , mPendingLowPrecisionUpload(false)
   {}
@@ -179,7 +182,7 @@ public:
 
   virtual CompositableType GetType() { return BUFFER_TILED; }
 
-  virtual TiledLayerComposer* AsTiledLayerComposer() { return this; }
+  virtual TiledLayerComposer* AsTiledLayerComposer() MOZ_OVERRIDE { return this; }
 
   virtual bool EnsureTextureHost(TextureIdentifier aTextureId,
                                  const SurfaceDescriptor& aSurface,
@@ -190,6 +193,15 @@ public:
     return false;
   }
 
+  virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE
+  {
+    CompositableHost::SetCompositor(aCompositor);
+    mVideoMemoryTiledBuffer.SetCompositor(aCompositor);
+    mLowPrecisionVideoMemoryTiledBuffer.SetCompositor(aCompositor);
+  }
+
+  virtual void Attach(Layer* aLayer, Compositor* aCompositor) MOZ_OVERRIDE;
+
 #ifdef MOZ_LAYERS_HAVE_LOG
   virtual void PrintInfo(nsACString& aTo, const char* aPrefix);
 #endif
diff --git a/gfx/layers/ipc/CompositableForwarder.h b/gfx/layers/ipc/CompositableForwarder.h
index 9167a7dc71c8..b71ba7f032ed 100644
--- a/gfx/layers/ipc/CompositableForwarder.h
+++ b/gfx/layers/ipc/CompositableForwarder.h
@@ -20,6 +20,7 @@ class TextureFactoryIdentifier;
 class SurfaceDescriptor;
 class ThebesBufferData;
 class TextureClient;
+class BasicTiledLayerBuffer;
 
 /**
  * A transaction is a set of changes that happenned on the content side, that
@@ -69,6 +70,9 @@ public:
    */
   virtual void DestroyThebesBuffer(CompositableClient* aCompositable) = 0;
 
+  virtual void PaintedTiledLayerBuffer(CompositableClient* aCompositable,
+                                       BasicTiledLayerBuffer* aTiledLayerBuffer) = 0;
+
   /**
    * Communicate to the compositor that the texture identified by aCompositable
    * and aTextureId has been updated to aImage.
diff --git a/gfx/layers/ipc/CompositableTransactionParent.cpp b/gfx/layers/ipc/CompositableTransactionParent.cpp
index 0daaf2e98da1..303e049ffb15 100644
--- a/gfx/layers/ipc/CompositableTransactionParent.cpp
+++ b/gfx/layers/ipc/CompositableTransactionParent.cpp
@@ -132,6 +132,20 @@ CompositableParentManager::ReceiveCompositableUpdate(const CompositableOperation
       compositable->SetPictureRect(op.picture());
       break;
     }
+    case CompositableOperation::TOpPaintTiledLayerBuffer: {
+      MOZ_LAYERS_LOG(("[ParentSide] Paint TiledLayerBuffer"));
+      const OpPaintTiledLayerBuffer& op = aEdit.get_OpPaintTiledLayerBuffer();
+      CompositableParent* compositableParent = static_cast<CompositableParent*>(op.compositableParent());
+      CompositableHost* compositable =
+        compositableParent->GetCompositableHost();
+
+      TiledLayerComposer* tileComposer = compositable->AsTiledLayerComposer();
+      NS_ASSERTION(tileComposer, "compositable is not a tile composer");
+
+      BasicTiledLayerBuffer* p = reinterpret_cast<BasicTiledLayerBuffer*>(op.tiledLayerBuffer());
+      tileComposer->PaintedTiledLayerBuffer(p);
+      break;
+    }
     default: {
       MOZ_ASSERT(false, "bad type");
     }
diff --git a/gfx/layers/ipc/ImageBridgeChild.h b/gfx/layers/ipc/ImageBridgeChild.h
index 7b2419071961..d36fa8a44451 100644
--- a/gfx/layers/ipc/ImageBridgeChild.h
+++ b/gfx/layers/ipc/ImageBridgeChild.h
@@ -230,6 +230,12 @@ public:
 
   virtual void Connect(CompositableClient* aCompositable) MOZ_OVERRIDE;
 
+  virtual void PaintedTiledLayerBuffer(CompositableClient* aCompositable,
+                                       BasicTiledLayerBuffer* aTiledLayerBuffer) MOZ_OVERRIDE
+  {
+    NS_RUNTIMEABORT("should not be called");
+  }
+
   /**
    * Communicate to the compositor that the texture identified by aCompositable
    * and aTextureId has been updated to aDescriptor.
diff --git a/gfx/layers/ipc/LayerTransaction.ipdlh b/gfx/layers/ipc/LayerTransaction.ipdlh
index 57e0772e58f4..fb988090e942 100644
--- a/gfx/layers/ipc/LayerTransaction.ipdlh
+++ b/gfx/layers/ipc/LayerTransaction.ipdlh
@@ -235,7 +235,7 @@ struct OpRaiseToTopChild  { PLayer container; PLayer childLayer; };
 
 // Paint (buffer update)
 struct OpPaintTiledLayerBuffer {
-  PLayer layer;
+  PCompositable compositable;
   // Bug 747811
   // FIXME: We need to support sharing tile across process.
   uintptr_t tiledLayerBuffer;
@@ -277,6 +277,8 @@ union CompositableOperation {
 
   OpPaintTexture;
   OpPaintTextureRegion;
+
+  OpPaintTiledLayerBuffer;
 };
 
 // A unit of a changeset; a set of these comprise a changeset
@@ -300,7 +302,6 @@ union Edit {
   OpAttachCompositable;
   OpAttachAsyncCompositable;
 
-  OpPaintTiledLayerBuffer;
   CompositableOperation;
 };
 
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index f9206e639f1d..4be9b116408b 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -290,12 +290,12 @@ ShadowLayerForwarder::RepositionChild(ShadowableLayer* aContainer,
 }
 
 void
-ShadowLayerForwarder::PaintedTiledLayerBuffer(ShadowableLayer* aLayer,
+ShadowLayerForwarder::PaintedTiledLayerBuffer(CompositableClient* aCompositable,
                                               BasicTiledLayerBuffer* aTiledLayerBuffer)
 {
   if (XRE_GetProcessType() != GeckoProcessType_Default)
     NS_RUNTIMEABORT("PaintedTiledLayerBuffer must be made IPC safe (not share pointers)");
-  mTxn->AddNoSwapPaint(OpPaintTiledLayerBuffer(NULL, Shadow(aLayer),
+  mTxn->AddNoSwapPaint(OpPaintTiledLayerBuffer(NULL, aCompositable->GetIPDLActor(),
                                                uintptr_t(aTiledLayerBuffer)));
 }
 
diff --git a/gfx/layers/ipc/ShadowLayers.h b/gfx/layers/ipc/ShadowLayers.h
index 22da90d36d67..abc8a877822f 100644
--- a/gfx/layers/ipc/ShadowLayers.h
+++ b/gfx/layers/ipc/ShadowLayers.h
@@ -50,7 +50,6 @@ class TiledLayerComposer;
 class Transaction;
 class SurfaceDescriptor;
 class CanvasSurface;
-class BasicTiledLayerBuffer;
 class TextureClientShmem;
 class ContentClientRemote;
 class CompositableChild;
@@ -258,8 +257,8 @@ public:
    * and is free to choose it's own internal representation (double buffering,
    * copy on write, tiling).
    */
-  void PaintedTiledLayerBuffer(ShadowableLayer* aThebes,
-                               BasicTiledLayerBuffer* aTiledLayerBuffer);
+  virtual void PaintedTiledLayerBuffer(CompositableClient* aCompositable,
+                                       BasicTiledLayerBuffer* aTiledLayerBuffer) MOZ_OVERRIDE;
 
   /**
    * Notify the compositor that a compositable will be updated asynchronously
diff --git a/gfx/layers/ipc/ShadowLayersParent.cpp b/gfx/layers/ipc/ShadowLayersParent.cpp
index 9389ddc4b5c8..421a9426fb93 100644
--- a/gfx/layers/ipc/ShadowLayersParent.cpp
+++ b/gfx/layers/ipc/ShadowLayersParent.cpp
@@ -389,21 +389,6 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       compositableParent->SetCompositorID(mLayerManager->GetCompositor()->GetCompositorID());
       break;
     }
-    case Edit::TOpPaintTiledLayerBuffer: {
-      MOZ_LAYERS_LOG(("[ParentSide] Paint TiledLayerBuffer"));
-      const OpPaintTiledLayerBuffer& op = edit.get_OpPaintTiledLayerBuffer();
-      ShadowLayerParent* shadow = AsShadowLayer(op);
-
-      LayerComposite* compositeLayer = shadow->AsLayer()->AsLayerComposite();
-      compositeLayer->EnsureBuffer(BUFFER_TILED);
-      TiledLayerComposer* tileComposer = compositeLayer->AsTiledLayerComposer();
-
-      NS_ASSERTION(tileComposer, "compositeLayer is not a tile composer");
-
-      BasicTiledLayerBuffer* p = reinterpret_cast<BasicTiledLayerBuffer*>(op.tiledLayerBuffer());
-      tileComposer->PaintedTiledLayerBuffer(p);
-      break;
-    }
     default:
       NS_RUNTIMEABORT("not reached");
     }

From 9a37c9d3fd5f7b31774d7b213373b49ac89154c9 Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Wed, 17 Apr 2013 09:36:06 +1200
Subject: [PATCH 065/438] Bug 862106. Use Create*Client directly. r=nical

--HG--
extra : rebase_source : d903db2fcb68bbccff9548dfbcd215d9a25ba41c
---
 gfx/layers/basic/BasicCanvasLayer.cpp |  3 ++-
 gfx/layers/basic/BasicImageLayer.cpp  | 13 +++++++----
 gfx/layers/basic/BasicThebesLayer.cpp |  2 +-
 gfx/layers/client/CanvasClient.cpp    |  5 ++--
 gfx/layers/client/CanvasClient.h      |  3 +--
 gfx/layers/client/ContentClient.cpp   |  5 ++--
 gfx/layers/client/ContentClient.h     |  3 +--
 gfx/layers/client/ImageClient.cpp     |  9 ++++----
 gfx/layers/client/ImageClient.h       |  3 +--
 gfx/layers/ipc/ImageBridgeChild.cpp   |  2 +-
 gfx/layers/ipc/ShadowLayers.cpp       | 33 ---------------------------
 gfx/layers/ipc/ShadowLayers.h         | 11 ---------
 12 files changed, 24 insertions(+), 68 deletions(-)

diff --git a/gfx/layers/basic/BasicCanvasLayer.cpp b/gfx/layers/basic/BasicCanvasLayer.cpp
index 7506933e1989..b2b4d1b21c17 100644
--- a/gfx/layers/basic/BasicCanvasLayer.cpp
+++ b/gfx/layers/basic/BasicCanvasLayer.cpp
@@ -295,7 +295,8 @@ BasicShadowableCanvasLayer::Paint(gfxContext* aContext, Layer* aMaskLayer)
     if (mNeedsYFlip) {
       flags |= NeedsYFlip;
     }
-    mCanvasClient = BasicManager()->CreateCanvasClientFor(GetCompositableClientType(), this, flags);
+    mCanvasClient = CanvasClient::CreateCanvasClient(GetCompositableClientType(),
+                                                     BasicManager(), flags);
     if (!mCanvasClient) {
       return;
     }
diff --git a/gfx/layers/basic/BasicImageLayer.cpp b/gfx/layers/basic/BasicImageLayer.cpp
index ab51e36d3b84..7da766f5df1f 100644
--- a/gfx/layers/basic/BasicImageLayer.cpp
+++ b/gfx/layers/basic/BasicImageLayer.cpp
@@ -258,10 +258,15 @@ BasicShadowableImageLayer::Paint(gfxContext* aContext, Layer* aMaskLayer)
 
   if (!mImageClient ||
       !mImageClient->UpdateImage(mContainer, GetContentFlags())) {
-    mImageClient = BasicManager()->CreateImageClientFor(GetImageClientType(), this,
-                                                        mForceSingleTile
-                                                          ? ForceSingleTile
-                                                          : 0);
+    mImageClient = ImageClient::CreateImageClient(GetImageClientType(),
+                                                  BasicManager(),
+                                                  mForceSingleTile
+                                                    ? ForceSingleTile
+                                                    : 0);
+    if (GetImageClientType() == BUFFER_BRIDGE) {
+      static_cast<ImageClientBridge*>(mImageClient.get())->SetLayer(this);
+    }
+
     if (!mImageClient) {
       return;
     }
diff --git a/gfx/layers/basic/BasicThebesLayer.cpp b/gfx/layers/basic/BasicThebesLayer.cpp
index b88e8f4a149b..3de5cabaf05b 100644
--- a/gfx/layers/basic/BasicThebesLayer.cpp
+++ b/gfx/layers/basic/BasicThebesLayer.cpp
@@ -254,7 +254,7 @@ BasicShadowableThebesLayer::PaintThebes(gfxContext* aContext,
   }
   
   if (!mContentClient) {
-    mContentClient = BasicManager()->CreateContentClientFor(this);
+    mContentClient = ContentClient::CreateContentClient(BasicManager());
     if (!mContentClient) {
       return;
     }
diff --git a/gfx/layers/client/CanvasClient.cpp b/gfx/layers/client/CanvasClient.cpp
index 56db914ccbf6..0c4253af86e8 100644
--- a/gfx/layers/client/CanvasClient.cpp
+++ b/gfx/layers/client/CanvasClient.cpp
@@ -18,8 +18,7 @@ namespace mozilla {
 namespace layers {
 
 /* static */ TemporaryRef<CanvasClient>
-CanvasClient::CreateCanvasClient(LayersBackend aParentBackend,
-                                 CompositableType aCompositableHostType,
+CanvasClient::CreateCanvasClient(CompositableType aCompositableHostType,
                                  CompositableForwarder* aForwarder,
                                  TextureFlags aFlags)
 {
@@ -27,7 +26,7 @@ CanvasClient::CreateCanvasClient(LayersBackend aParentBackend,
     return new CanvasClient2D(aForwarder, aFlags);
   }
   if (aCompositableHostType == BUFFER_IMAGE_BUFFERED) {
-    if (aParentBackend == LAYERS_OPENGL) {
+    if (aForwarder->GetCompositorBackendType() == LAYERS_OPENGL) {
       return new CanvasClientWebGL(aForwarder, aFlags);
     }
     return new CanvasClient2D(aForwarder, aFlags);
diff --git a/gfx/layers/client/CanvasClient.h b/gfx/layers/client/CanvasClient.h
index 44b59f3bdbaf..3ef775eab6d5 100644
--- a/gfx/layers/client/CanvasClient.h
+++ b/gfx/layers/client/CanvasClient.h
@@ -26,8 +26,7 @@ public:
    * message will be sent to the compositor to create a corresponding image
    * host.
    */
-  static TemporaryRef<CanvasClient> CreateCanvasClient(LayersBackend aBackendType,
-                                                       CompositableType aImageHostType,
+  static TemporaryRef<CanvasClient> CreateCanvasClient(CompositableType aImageHostType,
                                                        CompositableForwarder* aFwd,
                                                        TextureFlags aFlags);
 
diff --git a/gfx/layers/client/ContentClient.cpp b/gfx/layers/client/ContentClient.cpp
index a58806971b31..5986785bb35f 100644
--- a/gfx/layers/client/ContentClient.cpp
+++ b/gfx/layers/client/ContentClient.cpp
@@ -17,10 +17,9 @@ using namespace gfx;
 namespace layers {
 
 /* static */ TemporaryRef<ContentClient>
-ContentClient::CreateContentClient(LayersBackend aParentBackend,
-                                   CompositableForwarder* aForwarder)
+ContentClient::CreateContentClient(CompositableForwarder* aForwarder)
 {
-  if (aParentBackend != LAYERS_OPENGL) {
+  if (aForwarder->GetCompositorBackendType() != LAYERS_OPENGL) {
     return nullptr;
   }
   if (ShadowLayerManager::SupportsDirectTexturing() ||
diff --git a/gfx/layers/client/ContentClient.h b/gfx/layers/client/ContentClient.h
index 928a602ddc96..7914b95d32b0 100644
--- a/gfx/layers/client/ContentClient.h
+++ b/gfx/layers/client/ContentClient.h
@@ -64,8 +64,7 @@ public:
    * message will be sent to the compositor to create a corresponding content
    * host.
    */
-  static TemporaryRef<ContentClient> CreateContentClient(LayersBackend aBackendType,
-                                                         CompositableForwarder* aFwd);
+  static TemporaryRef<ContentClient> CreateContentClient(CompositableForwarder* aFwd);
 
   ContentClient(CompositableForwarder* aForwarder)
   : CompositableClient(aForwarder)
diff --git a/gfx/layers/client/ImageClient.cpp b/gfx/layers/client/ImageClient.cpp
index 69007e1610de..e0d661d0edf1 100644
--- a/gfx/layers/client/ImageClient.cpp
+++ b/gfx/layers/client/ImageClient.cpp
@@ -21,25 +21,24 @@ namespace mozilla {
 namespace layers {
 
 /* static */ TemporaryRef<ImageClient>
-ImageClient::CreateImageClient(LayersBackend aParentBackend,
-                               CompositableType aCompositableHostType,
+ImageClient::CreateImageClient(CompositableType aCompositableHostType,
                                CompositableForwarder* aForwarder,
                                TextureFlags aFlags)
 {
   RefPtr<ImageClient> result = nullptr;
   switch (aCompositableHostType) {
   case BUFFER_IMAGE_SINGLE:
-    if (aParentBackend == LAYERS_OPENGL) {
+    if (aForwarder->GetCompositorBackendType() == LAYERS_OPENGL) {
       result = new ImageClientSingle(aForwarder, aFlags, BUFFER_IMAGE_SINGLE);
     }
     break;
   case BUFFER_IMAGE_BUFFERED:
-    if (aParentBackend == LAYERS_OPENGL) {
+    if (aForwarder->GetCompositorBackendType() == LAYERS_OPENGL) {
       result = new ImageClientSingle(aForwarder, aFlags, BUFFER_IMAGE_BUFFERED);
     }
     break;
   case BUFFER_BRIDGE:
-    if (aParentBackend == LAYERS_OPENGL) {
+    if (aForwarder->GetCompositorBackendType() == LAYERS_OPENGL) {
       result = new ImageClientBridge(aForwarder, aFlags);
     }
     break;
diff --git a/gfx/layers/client/ImageClient.h b/gfx/layers/client/ImageClient.h
index 9453a441572b..1676823baebf 100644
--- a/gfx/layers/client/ImageClient.h
+++ b/gfx/layers/client/ImageClient.h
@@ -31,8 +31,7 @@ public:
    * message will be sent to the compositor to create a corresponding image
    * host.
    */
-  static TemporaryRef<ImageClient> CreateImageClient(LayersBackend aBackendType,
-                                                     CompositableType aImageHostType,
+  static TemporaryRef<ImageClient> CreateImageClient(CompositableType aImageHostType,
                                                      CompositableForwarder* aFwd,
                                                      TextureFlags aFlags);
 
diff --git a/gfx/layers/ipc/ImageBridgeChild.cpp b/gfx/layers/ipc/ImageBridgeChild.cpp
index fbcede1927cf..38f8b6031ba5 100644
--- a/gfx/layers/ipc/ImageBridgeChild.cpp
+++ b/gfx/layers/ipc/ImageBridgeChild.cpp
@@ -485,7 +485,7 @@ ImageBridgeChild::CreateImageClientNow(CompositableType aType)
   mCompositorBackend = LAYERS_OPENGL;
 
   RefPtr<ImageClient> client
-    = ImageClient::CreateImageClient(mCompositorBackend, aType, this, 0);
+    = ImageClient::CreateImageClient(aType, this, 0);
   MOZ_ASSERT(client, "failed to create ImageClient");
   if (client) {
     client->Connect();
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index 4be9b116408b..e57ec019bbec 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -532,39 +532,6 @@ ShadowLayerForwarder::CloseDescriptor(const SurfaceDescriptor& aDescriptor)
   // There's no "close" needed for Shmem surfaces.
 }
 
-TemporaryRef<ImageClient>
-ShadowLayerForwarder::CreateImageClientFor(const CompositableType& aCompositableType,
-                                           ShadowableLayer* aLayer,
-                                           TextureFlags aFlags)
-{
-  RefPtr<ImageClient> client = ImageClient::CreateImageClient(GetCompositorBackendType(),
-                                                              aCompositableType,
-                                                              this, aFlags);
-  if (aCompositableType == BUFFER_BRIDGE) {
-    static_cast<ImageClientBridge*>(client.get())->SetLayer(aLayer);
-  }
-  return client.forget();
-}
-
-TemporaryRef<CanvasClient>
-ShadowLayerForwarder::CreateCanvasClientFor(const CompositableType& aCompositableType,
-                                            ShadowableLayer* aLayer,
-                                            TextureFlags aFlags)
-{
-  RefPtr<CanvasClient> client = CanvasClient::CreateCanvasClient(GetCompositorBackendType(),
-                                                                 aCompositableType,
-                                                                 this, aFlags);
-  return client.forget();
-}
-
-TemporaryRef<ContentClient>
-ShadowLayerForwarder::CreateContentClientFor(ShadowableLayer* aLayer)
-{
-  RefPtr<ContentClient> client = ContentClient::CreateContentClient(GetCompositorBackendType(),
-                                                                    this);
-  return client.forget();
-}
-
 PLayerChild*
 ShadowLayerForwarder::ConstructShadowFor(ShadowableLayer* aLayer)
 {
diff --git a/gfx/layers/ipc/ShadowLayers.h b/gfx/layers/ipc/ShadowLayers.h
index abc8a877822f..7d266395c5b2 100644
--- a/gfx/layers/ipc/ShadowLayers.h
+++ b/gfx/layers/ipc/ShadowLayers.h
@@ -363,17 +363,6 @@ public:
    */
   void SetIsFirstPaint() { mIsFirstPaint = true; }
 
-  /**
-   * Create compositable clients, see comments in CompositingFactory
-   */
-  TemporaryRef<ImageClient> CreateImageClientFor(const CompositableType& aCompositableType,
-                                                 ShadowableLayer* aLayer,
-                                                 TextureFlags aFlags);
-  TemporaryRef<CanvasClient> CreateCanvasClientFor(const CompositableType& aCompositableType,
-                                                   ShadowableLayer* aLayer,
-                                                   TextureFlags aFlags);
-  TemporaryRef<ContentClient> CreateContentClientFor(ShadowableLayer* aLayer);
-
   static void PlatformSyncBeforeUpdate();
 
   static already_AddRefed<gfxASurface>

From 977188f1752a462f5cf8fe43805b781ead4923cf Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Tue, 16 Apr 2013 14:46:48 -0700
Subject: [PATCH 066/438] Bug 806046 - Try to fix intermittent failure
 browser_bug719271.js. r=test

---
 browser/base/content/test/browser_bug719271.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/browser/base/content/test/browser_bug719271.js b/browser/base/content/test/browser_bug719271.js
index 53aca641e457..5a2553a8f859 100644
--- a/browser/base/content/test/browser_bug719271.js
+++ b/browser/base/content/test/browser_bug719271.js
@@ -58,13 +58,21 @@ function testNavigation() {
   Task.spawn(function () {
     yield FullZoomHelper.load(gTab1, TEST_VIDEO);
     FullZoomHelper.zoomTest(gTab1, 1, "Zoom should be 1 when a video was loaded");
+    yield waitForNextTurn(); // trying to fix orange bug 806046
     yield FullZoomHelper.navigate(FullZoomHelper.BACK);
     FullZoomHelper.zoomTest(gTab1, gLevel1, "Zoom should be restored when a page is loaded");
+    yield waitForNextTurn(); // trying to fix orange bug 806046
     yield FullZoomHelper.navigate(FullZoomHelper.FORWARD);
     FullZoomHelper.zoomTest(gTab1, 1, "Zoom should be 1 again when navigating back to a video");
   }).then(finishTest, FullZoomHelper.failAndContinue(finish));
 }
 
+function waitForNextTurn() {
+  let deferred = Promise.defer();
+  setTimeout(function () deferred.resolve(), 0);
+  return deferred.promise;
+}
+
 var finishTestStarted  = false;
 function finishTest() {
   Task.spawn(function () {

From ec45787e928d6d7063f747394d6f8aec1d383d04 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Tue, 16 Apr 2013 14:54:00 -0700
Subject: [PATCH 067/438] Bug 861980 - Change sockopt length to be a socklen_t;
 r=echou

---
 dom/bluetooth/BluetoothUnixSocketConnector.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dom/bluetooth/BluetoothUnixSocketConnector.cpp b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
index dee1cae4cd51..55db5d7f70c8 100644
--- a/dom/bluetooth/BluetoothUnixSocketConnector.cpp
+++ b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
@@ -123,7 +123,8 @@ BluetoothUnixSocketConnector::SetUp(int aFd)
   if (mType == BluetoothSocketType::L2CAP ||
       mType == BluetoothSocketType::EL2CAP) {
     struct l2cap_options opts;
-    int optlen = sizeof(opts), err;
+    socklen_t optlen = sizeof(opts);
+    int err;
     err = getsockopt(aFd, SOL_L2CAP, L2CAP_OPTIONS, &opts, &optlen);
     if (!err) {
       /* setting MTU for [E]L2CAP */

From 0a8e5cb5592af143bfdef1dc35944e01cfe46498 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Tue, 16 Apr 2013 14:54:00 -0700
Subject: [PATCH 068/438] Bug 855062 - Add initialization function for
 DOMRequest FireSuccessAsync; r=mrbkap

---
 dom/base/DOMRequest.cpp | 56 ++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/dom/base/DOMRequest.cpp b/dom/base/DOMRequest.cpp
index b2794e087de8..97a3d81a64ed 100644
--- a/dom/base/DOMRequest.cpp
+++ b/dom/base/DOMRequest.cpp
@@ -239,19 +239,51 @@ DOMRequestService::FireError(nsIDOMDOMRequest* aRequest,
 
 class FireSuccessAsyncTask : public nsRunnable
 {
-public:
+
   FireSuccessAsyncTask(DOMRequest* aRequest,
                        const JS::Value& aResult) :
     mReq(aRequest),
-    mResult(aResult)
+    mResult(aResult),
+    mIsSetup(false)
+  {
+  }
+
+public:
+
+  nsresult
+  Setup()
   {
-    NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
     nsresult rv;
     nsIScriptContext* sc = mReq->GetContextForEventHandlers(&rv);
+    if (!NS_SUCCEEDED(rv)) {
+      return rv;
+    }
     AutoPushJSContext cx(sc->GetNativeContext());
-    MOZ_ASSERT(NS_SUCCEEDED(rv) && cx);
+    if (!cx) {
+      return NS_ERROR_FAILURE;
+    }
     JSAutoRequest ar(cx);
     JS_AddValueRoot(cx, &mResult);
+    mIsSetup = true;
+    return NS_OK;
+  }
+
+  // Due to the fact that initialization can fail during shutdown (since we
+  // can't fetch a js context), set up an initiatization function to make sure
+  // we can return the failure appropriately
+  static nsresult
+  Dispatch(DOMRequest* aRequest,
+           const JS::Value& aResult)
+  {
+    NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
+    nsRefPtr<FireSuccessAsyncTask> asyncTask = new FireSuccessAsyncTask(aRequest, aResult);
+    nsresult rv = asyncTask->Setup();
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (NS_FAILED(NS_DispatchToMainThread(asyncTask))) {
+      NS_WARNING("Failed to dispatch to main thread!");
+      return NS_ERROR_FAILURE;
+    }
+    return NS_OK;
   }
 
   NS_IMETHODIMP
@@ -264,10 +296,15 @@ public:
   ~FireSuccessAsyncTask()
   {
     NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
+    if(!mIsSetup) {
+      // If we never set up, no reason to unroot
+      return;
+    }
     nsresult rv;
     nsIScriptContext* sc = mReq->GetContextForEventHandlers(&rv);
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
     AutoPushJSContext cx(sc->GetNativeContext());
-    MOZ_ASSERT(NS_SUCCEEDED(rv) && cx);
+    MOZ_ASSERT(cx);
 
     // We need to build a new request, otherwise we assert since there won't be
     // a request available yet.
@@ -277,6 +314,7 @@ public:
 private:
   nsRefPtr<DOMRequest> mReq;
   JS::Value mResult;
+  bool mIsSetup;
 };
 
 class FireErrorAsyncTask : public nsRunnable
@@ -305,13 +343,7 @@ DOMRequestService::FireSuccessAsync(nsIDOMDOMRequest* aRequest,
                                     const JS::Value& aResult)
 {
   NS_ENSURE_STATE(aRequest);
-  nsCOMPtr<nsIRunnable> asyncTask =
-    new FireSuccessAsyncTask(static_cast<DOMRequest*>(aRequest), aResult);
-  if (NS_FAILED(NS_DispatchToMainThread(asyncTask))) {
-    NS_WARNING("Failed to dispatch to main thread!");
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
+  return FireSuccessAsyncTask::Dispatch(static_cast<DOMRequest*>(aRequest), aResult);
 }
 
 NS_IMETHODIMP

From ebc496af05759f1c1aa759d5a5d08d9f8aef4d7c Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Tue, 16 Apr 2013 14:54:00 -0700
Subject: [PATCH 069/438] Bug 862462 - Make sure BluetoothAdapter unroots
 before destruction; r=mrbkap

---
 dom/bluetooth/BluetoothAdapter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/bluetooth/BluetoothAdapter.cpp b/dom/bluetooth/BluetoothAdapter.cpp
index 81bc06863922..4799df3d66a7 100644
--- a/dom/bluetooth/BluetoothAdapter.cpp
+++ b/dom/bluetooth/BluetoothAdapter.cpp
@@ -168,11 +168,11 @@ BluetoothAdapter::BluetoothAdapter(nsPIDOMWindow* aWindow,
 
 BluetoothAdapter::~BluetoothAdapter()
 {
+  Unroot();
   BluetoothService* bs = BluetoothService::Get();
   // We can be null on shutdown, where this might happen
   NS_ENSURE_TRUE_VOID(bs);
   bs->UnregisterBluetoothSignalHandler(NS_LITERAL_STRING(KEY_ADAPTER), this);
-  Unroot();
 }
 
 void

From 640afdb409e60be2077dd897754891689d214d09 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 16 Apr 2013 15:06:19 -0700
Subject: [PATCH 070/438] Bug 837132 - Remove 'remove' option from top sites
 page. r=margaret

---
 mobile/android/base/locales/en-US/android_strings.dtd      | 1 -
 .../base/resources/menu/abouthome_topsites_contextmenu.xml | 2 --
 mobile/android/base/strings.xml.in                         | 1 -
 mobile/android/base/widget/AboutHome.java                  | 4 ----
 mobile/android/base/widget/TopSitesView.java               | 7 +------
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 8ea11cc1cbd6..2aab6e913012 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -205,7 +205,6 @@ size. -->
 <!ENTITY abouthome_topsites_edit "Edit">
 <!ENTITY abouthome_topsites_pin "Pin Site">
 <!ENTITY abouthome_topsites_unpin "Unpin Site">
-<!ENTITY abouthome_topsites_remove "Remove">
 
 <!-- Localization note (abouthome_about_sync3, abouthome_about_apps2): The
      chevron (ex: "»"; unicode= U+00BB) is used as an arrow to show that
diff --git a/mobile/android/base/resources/menu/abouthome_topsites_contextmenu.xml b/mobile/android/base/resources/menu/abouthome_topsites_contextmenu.xml
index 590a878392a1..35eb8460a68c 100644
--- a/mobile/android/base/resources/menu/abouthome_topsites_contextmenu.xml
+++ b/mobile/android/base/resources/menu/abouthome_topsites_contextmenu.xml
@@ -20,6 +20,4 @@
     <item android:id="@+id/abouthome_topsites_unpin"
           android:title="@string/abouthome_topsites_unpin"/>
 
-    <item android:id="@+id/abouthome_topsites_remove"
-          android:title="@string/abouthome_topsites_remove"/>
 </menu>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index bc9ff043dc07..641f57d94015 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -207,7 +207,6 @@
   <string name="abouthome_topsites_edit">&abouthome_topsites_edit;</string>
   <string name="abouthome_topsites_pin">&abouthome_topsites_pin;</string>
   <string name="abouthome_topsites_unpin">&abouthome_topsites_unpin;</string>
-  <string name="abouthome_topsites_remove">&abouthome_topsites_remove;</string>
 
   <string name="filepicker_title">&filepicker_title;</string>
   <string name="filepicker_audio_title">&filepicker_audio_title;</string>
diff --git a/mobile/android/base/widget/AboutHome.java b/mobile/android/base/widget/AboutHome.java
index f52285ba59d4..58c4b8db1647 100644
--- a/mobile/android/base/widget/AboutHome.java
+++ b/mobile/android/base/widget/AboutHome.java
@@ -198,10 +198,6 @@ public class AboutHome extends Fragment {
                 mTopSitesView.pinSite(info);
                 return true;
 
-            case R.id.abouthome_topsites_remove:
-                mTopSitesView.unpinSite(info, TopSitesView.UnpinFlags.REMOVE_HISTORY);
-                return true;
-
         }
         return super.onContextItemSelected(item);
     }
diff --git a/mobile/android/base/widget/TopSitesView.java b/mobile/android/base/widget/TopSitesView.java
index b77c5259df91..3cbd65309944 100644
--- a/mobile/android/base/widget/TopSitesView.java
+++ b/mobile/android/base/widget/TopSitesView.java
@@ -60,8 +60,7 @@ public class TopSitesView extends GridView {
     private static int mNumberOfCols;
 
     public static enum UnpinFlags {
-        REMOVE_PIN,
-        REMOVE_HISTORY
+        REMOVE_PIN
     }
 
     private Context mContext;
@@ -128,7 +127,6 @@ public class TopSitesView extends GridView {
                     menu.findItem(R.id.abouthome_open_private_tab).setVisible(false);
                     menu.findItem(R.id.abouthome_topsites_pin).setVisible(false);
                     menu.findItem(R.id.abouthome_topsites_unpin).setVisible(false);
-                    menu.findItem(R.id.abouthome_topsites_remove).setVisible(false);
                 } else if (holder.isPinned()) {
                     menu.findItem(R.id.abouthome_topsites_pin).setVisible(false);
                 } else {
@@ -550,9 +548,6 @@ public class TopSitesView extends GridView {
             public Void doInBackground(Void... params) {
                 final ContentResolver resolver = mContext.getContentResolver();
                 BrowserDB.unpinSite(resolver, position);
-                if (flags == UnpinFlags.REMOVE_HISTORY) {
-                    BrowserDB.removeHistoryEntry(resolver, url);
-                }
                 return null;
             }
         }).execute();

From 8da3a43ea8ab9d94405595f2d91bde6dbbcc9ce2 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 16 Apr 2013 15:07:11 -0700
Subject: [PATCH 071/438] Bug 815715 - Send location change methods even if
 we're just moving inside the same document. r=bnicholson

---
 mobile/android/base/Tab.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java
index adf80ec5b745..1fd10649111b 100644
--- a/mobile/android/base/Tab.java
+++ b/mobile/android/base/Tab.java
@@ -551,6 +551,8 @@ public class Tab {
         setDocumentURI(message.getString("documentURI"));
         if (message.getBoolean("sameDocument")) {
             // We can get a location change event for the same document with an anchor tag
+            // Notify listeners so that buttons like back or forward will update themselves
+            Tabs.getInstance().notifyListeners(this, Tabs.TabEvents.LOCATION_CHANGE, uri);
             return;
         }
 

From 0306ac9e407707a9f309dd7a76bd5549f16beec1 Mon Sep 17 00:00:00 2001
From: Frederic Kayser <f.kayser@free.fr>
Date: Tue, 16 Apr 2013 15:25:26 -0700
Subject: [PATCH 072/438] Bug 653001 - Replace about-logo.png with optimized
 version. r=fryn

---
 .../branding/official/content/about-logo.png  | Bin 55620 -> 49502 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/browser/branding/official/content/about-logo.png b/browser/branding/official/content/about-logo.png
index 6784d1f34cf52c3d0a2ecfaeb96704f8685c171d..175956b42c774e6c4bf858e8dca0c0ba5ae8fe7f 100644
GIT binary patch
literal 49502
zcmV)8K*qm`P)<h;3K|Lk000e1NJLTq007be007bm1^@s6Kbf9F006-yNkl<ZcwX$7
z3#et+S;v3hx7OPGyzl!p&)j6vWHL!i(wM}QK8Q$ap(+X#supUBRYd`9t!O}LT7(K{
z5d}oSMreu(rC3_5h_AGfrfDt7B$;$FW;(eucOLioIQKmEUdwein>lc}I3`22NzVsA
z{(G&x0bujvzxHM{BSu_5!f3wdO#bMn45||<asc!uQJFzyQbiA`%27m`B2tf85tUR#
z6G06k0A&b4$Pnp+bb?3+XotW?-p|kaJS?GdMT}lX_2t=nj$W9!b$%W2jAkU#8;$XI
z{y`Ptn5f>QBKO9;QB@B_=0s#cMaM)GL=Yk|fiffIx_qWU02By904VSIP;60|YG7+F
zW}V7J4NdHtZKTUFFXp*_)d$XmJUm@w;55)<G$WC|pJ+Y!SWDI1jdGVUa+|2$siL>4
z>bMrAq6h*6gor9?3?_-BimO;m#i1@{YOxV@5vzzQ1Hl3W$nrq1mlOJ)(9IcZ)tS5J
z2)>$-0eSgM*2~E=4?qZk;K7Hm>V0_Ld!CKYoDA?yvG!SDo6(F!`oE_6Bfob-Mc*!}
z?@%?zjWH)w)kUthj1W)*#wo6zkhW6Nu_~@riCH6Qq}WP=*%K*=ID@eoiD?X~ii#k@
z)d@gql(EDz<t#N-YLx`BhTUFHr|;Q~?8NKsUdC1@W;c)bJiRQC`#=a13HU;+up305
zZ(rFy+5YzFuTA9bCxMfUW+c-0g2w%is-X9Z$h*|&+f?;!M$MEMgNmXmC;^p#t17OM
zl1|pC&oxOW>bNM5YgTc!gd}mKE@DkV-C0_Ddq!~)D}qzSs9;182IC1FNF4{O4pAio
zx_KcGUGM4pKtBX}F}so7%+v1gNtLs)n-y%fGqyW9ot`HzWP+edf2T+L?8TMdcbA{4
z<lQI7TgksvQ+)==7|lqe>!JR`zjKR<{G_V>m>PS(F{Y`i6sQ#97!ydUCW=#|wlGfZ
zzywK@$24oWN=oW1jl?mQCQMWkW@;6haa~IcRcEMKOKKGraFIkI06u^U0OSEY5P(FW
z2Bd(Ndm&Ir)C-}=C>8C@vy*!|k#-*ULL{zt_r&UEtnXy3ZueN*>a)}FWMarg*<IP@
z$~V44cX?&I(M-S5sK`H#*UcA3O*InfHPN{Dw;RBFMD)ki=(~+E^Qwjj#%Ls9G{;r6
z_{gswoTN4%<(VDFG^#k~s5#4YHDxZYCu=D)^(y0WU9pNYAe0kI2_kiYX#*DUKn^Ga
zk#b-+z_teu)C7`}nu1V{3`EQ#-8`_J<q==xX3Sk*G#JIb-9GEveO5MmMRu@kEpM{)
z)fd^hw1G(tsgo<sn*KwpX1+Apv|k3+7|lqe{ixsbTQ?xQS5@DyY927AkOwt_wTdww
zX9Gzyr7|~8_0Vi&1~*<qj8b>DXq$y*okJ5%W}-y(#9+$W$bBRL5dbA3AV5=L%0MCz
z_J1)*DOfiYi5cu;1Og1?qyU70Tol3<O|{<3Sc`1zwNoDG1HIg{)$X&l(Pe!%=kmD?
zmY#l@&GTz`gggY0K%=7Hnr)fS#+Ldb@FKv7kx10;`pCVa@;(*)88y0iRUj)^CphC{
zLOR}{a&VT~p*hmI38Z4NhN5u}PmXb9vc*EHK{Zi~6yo3`lmb|RM%f-Yu$@CMfB=&Q
z<}BA7DFFzB-1i#55BBgwZ#)YWEw$R~bEUf{R?cpq5T>&ySSM$Fb(a_a=~>R7d=;+=
zxflAGCxo18s>{<Y`*%|<`vmZ{kw`zV0{zB)AV06FKdVM3Owm3DV+EH8*5(mN##&LJ
z1!^}OB%N*{CSVn2S~V8uCs~}Gj4~xx<p}{K4BEf|O#>5=x`G7|*vVld5(6J#&Ouec
zzs8pmhS&R~2SONJmx&03NYBGsH{-%?uaK(a16XCF?|JUzf3ft;X*%b(=x*iYUdeLk
zXCbC1O=SDPg#DX?lgVd*e;bMP148Z2U%wBL4~d%h8Dm<iN(Ad7iNy3+14(m?%KSm9
zM-D`RnuzmA@XSs$xcSH|H_T1atXdc}4^pB603pD%g`){**#cqc84u(EjDTLdkqFn2
zDFB3Fp#}mCXI@G#k$!;9e$Kg_9?xA`=gj4Gb_w`A(7v!n`<2V=F0Int$;om<mPt%c
zKhLRH-JKt|e>*>(`~~puBaz;uRPXq;V~9MWA|KvsAl0&gj9^p2C1Ay4D|OPjL(~o*
zC7o(v5>JpmtyYzrj?D3vC{e5K2&F(miGc2N{HiEST4?FePXRy%5UwH6KGIyXi5PCB
zeH&^30_^~o`fz4ti<g$KaA|Xg4Csqxr=8KiaE1Qai*zq<(Cb2$8S*U9%RE`kN}}6`
zCf(zQrtF^r&yPfUlTf+iR~sN75Rs3n>J5cJDi|x+#NZOasK*#fIyq1E&`ngPr?6E)
zw2yIc;NTP|ZavK0WStPe=O6+mA^>F$L;@#ZWgygqg#`yXEJ&GQXnl>@znMzdKk;Gk
z%y2vTvYA#hSn7eZ(8~hfSzh7Hg^M&on~JlX*>SvjsYCDFWn}pxq1`ED>i31bAL!>1
z?`c+aX>mIJ^no$==fK8Dq&F~?+kfRJ5c!CTyj@ihEgQ&162)3DD%k2cmH9;~a|cQ4
z3D$YgjB3;ImMGA%8yBb~N}hv+fGUVY7^Ds)U?CBv94Lc(DqsL$Am2XH$n~^Q31Q#;
z{Ur*6Yk+QmD;eyRKSOd4%d4AQI{yl{r7PSzn{c{a=RcO<+b^xNd^*aszK$&_&XDyW
z&pqAp96QsrPc2R-e+YbjB+?s<%5A@NB#3-WR6eYtMpaN%%vFK3Y#~QFewcLOX40`H
zE(ur{2qtH2vc~N{w8){uQv@II-lI}VQ5vE{O_T#IBOI#=RUNd<@W^mp#|sHVxo<NK
zH_<hO5`on|yxPghGf&>nqf9%TdigAivdjnXPC0R8if^qrzVzG<|N6{DUV7mI>zh3i
zXR#Q323cM-6wZXOFy{Vpe$0IwI5!gM4I$Al{v7C|qH>FfqDBg=(*k268n9`Tbov;T
zsl&LMEn3K>O3<9C`6hSVeIwH|EwU^_2&hPeg0Kf5GH4o6m~qNNs-yx?3O3X{!!3mD
zBi8GZXt<4rvm}7uUnqPSh;*Urxft<zPG`4Ax7}rJt<8U)TB5VE#QSd-e)*v}v^vdN
z2fq5;CBFFNcX{gh70#@HN<yjz3DD0ynGcLr%=6<_eGK^ANTlymlH(sbB*^cJ$Rnak
zA(0B|%A;KQW5Ecx#vIAaanj}lF7*+?C8m&Qe73<|_Z?$mqE0{Sqe6L<lL!RBD%6}{
zOS#&4pr*ntO@jkG0ALUVu7dpUT1c*^k%sp}nI)b;kzq)p!8HP`^aJNRIsMF&^)lK!
zyX<at*xqP!@}(tConGRBg)YDQ-bwC0u?Vz)9w$#<;`33czkhm#7tee8zCzV00%W;I
z2v}=AZDwab0bJotGUiPo(XEfX8<EFF<Y84MCaQvQg0(S?!74F@q_s#oeS)OcB(XWx
z6%rxhX^dAnanB;-<58k+f9PW);6uPF9BEh%)eI9(3sQwKt5l7Ug?*$D2>;XZONQ33
z0|3Ick9mHml?Ho*bq-WiumU@KA_Y)U0s$XsRuUx7_~z*yzWnu7O#2dVJ*J3lGCMiJ
zJMKEbd)_+1(TNThSJpYV+NYBllEfe?<hg$!^!o2I_1a5_oQ?2CNBDo3-d{iTU_eg+
zD_qAkK5;k|k&hwrQ9&A_f~aB?jMG9Oqk9>!E+rYenPmJXY-(`jQO-ux3Te%7{N5Xw
zJ1~jQGekl6Fmm-cCy|2<N8JfNz*I$1xC($Ek#bK!7{E{~F?{5Eoxi~M7iZ8&0{DGJ
z3WK$jId~QkSnGL~+8N!<llL+@?Jn)DT{c#?IQ7CSynOmH{f$k2`cBWIAGm>ohmQa$
zPz3_Z%gcP>$(MQjpD**wS;b40dLjg$A;zvHvooJG<70mW_|ehsHPHRcLmx!slL!w3
z&%SPnK7RNpDt{~@KZOVy5mPpiji|vGi#47?qVeOn)*{w{bD<E(MNFcgfyLts+!)Ed
zM<ig3lrl*K5HKpFR_OV_(N@B2%|Zy2x6z^RA_GvYWmuNsqu&0xFV|?D{adNr59Bat
zqTyy5>=jVTwA#%%*Y1;NzM%MK+Uat6d5ssIJHzFrHLhIP=C0W-KJ^Rp-2cEWrA!WJ
z0-h_Emw4hUC;79lZ1UoAjcO$!HGMpSZM8nz%lvNw%K)b~|D>i5HXoXQ*nS<jG&<T1
z(f_M=9uLS9L6{Zz9B}q^N%Yv^hyI(r_kh;zy6Ss>Ywf+idg`r3_exj2xX880vN0}z
z!6q0&34{{J3*qHGQXV9sB_x5o011S^gCqnJdP{@Qn{C{{1~*x@C97UZx0X}Cw#!=c
z9nUdG*4Sf@V+%_*3}ARnuid_LuFl!N^Ph9Bx#n`t{nVa)n#!uZ?B3irtJEgXATI{=
zR&SxVbP~<h<)TRkJuW-|YX`?%ck3~I;e+|{0OABlevcr!aBgjoadNqbT>}FJ?A%mo
zUn06Ux^A6opLgA`wsm78={(a-EZFEEinQY;Nl^7OPb0!^9Z|*g4)Kouu!r**^Lfdz
za6EV(e)}DlIaF-%tlL+B9O4X|FdDD(;%6V>wa<orxWc`UmTWEtWI0gIpB3xoZgKv7
z665(VaSsM}X7OXQZT~gnlkPF8cu*?%vumGXkp9UVPX93Q0?<{YZv=M_IQ|5-r$i_J
z2G0Gcb6lqYSv=%2$h?*NXl4$IVnDHSBfar)1xMk^vpsWqu4<EePTqW!mGv=A-GD*l
z#IP_}91vq<RCrFW_vvMxD6$V94%fN1&kOI;Bhm&8=~!2n<VhqLXlLvQoe5b<_q)o3
z06p)RRFN`7aF%@Wp8lY(t8<$@8}~hzc09lJj!g!O%e?qm%a9ikwm`PQ!+`^b_{_VO
zc>c)=SFdh!-}#)9f_^TiTnwMHx;lF7X9v&u&{u7|?fDyz@VV0q@vn}rk(I39ycY>`
zB=Bd^{HH7~`Y)gMX##H`+Ur8R(GmHR*wS|#|K~W_gD4(Axe}Zc9X$#s3X>DEyhpKg
zEyeI4nTz=UeGi<PBL-o-JYaccNWG|uO(X=d(JV#<s0nKN`8;ztV>^l&YIZJastO2V
z&xl$#UTM2n@}w<70w5VeI!@nP)M6Ud0+K#Ux~_29c^yUF+O>YB55{N!d(Uub$gz`$
z86R9{v}f0xTEnj%=9_<V!9V_<chgMHLRLe(0`(Kn>=^~GdHHSpw|{z)ANcYqCr3N%
zPCQNI<dyCD&#u)wUw7Z&(EG=3CtiC0VsQV@%>U8uBjH!#ym`T%@n_IJHHs8|{BDPH
z-zAYdi9qfV+ydM$fQuhbg~tE<`0!u8W%c_V{6icbO+}k|n{4%#T=0<R1-<b#<ikU%
zLRp@Z@0riMp8MS4z0LicTxVr{L<k{ife4ah$zV|UDC=k-Kof-`_t?{j2347w({GTZ
zNL<&;!|lHug8i+lG#^KiMCisr&HzKwwYDmy^YnSP7d2Hdlm)=)&v&*6ga9tfP~OOS
z<9ioeJ$rsHi<fJU3Yraw6Ob9WhGMwNi=Ms2r`<T=;^kdF_(YE&F1zgduicT}vFFbo
zI5zT&Z0joQoC&9fhxqKGAD@sqerV75Gi09{kp9^lu00jWzR%SR@SqksNR(eB$|h0R
z&zAnhv4c4GUvPXCm=ZW=%7Q74Gl<k>qZl1ii1I8W&o$|QSIgAx^HwC+8x|bCW=(7E
zVvzI_IzuDDlpHTa8;YFYtq8pl>#I4EWyl~ya&Nh8W2kUQ;VmT=69~@j6DmEq6gXxd
z+pUupP$Y;5NJ|mBF_Y*BN<TrB3viB|vSD6@q^?mkCatQ5MH%$x3^v`6WxV-)4Np9L
zf!91Qqqn*Q)n$c=xKN<T3Qin9#2a2LtZ;=tdJxK4?jPtMI{5_S?9SOkthzay+m7us
z&Fc6te<kn7o!G>8?iqhJ>{9@e{KQN9QT#s=@>fe45FeoyB*dXK;SVIld-n|K8q5Fc
znv>vu66anIw0gjK^U=MU)zE#^2I~}q!xVW=rg2ejU3qeS*4kVFFc|k(JG_i@DL8kS
z0=e$1Eeb(KJy@YP9&vPfp7je4;&-+f-18Pj@A&VG-v09p-|-9d-}yf&{_vN`&OJal
zaWgVnf+%fhoQ>Fl`vlh_nX=GQpe~S6q+1e1a{U7BxM)^KwZas?5n*Fm>%u<_qG%77
zRbV!6aAY`_sXFH#jY;4BA>r|dF7X-9AJAJ{g~bI^rW)cLT+n*QyPv<rbB}KDp@-+3
zzcl3G@k!43CGMC$%mLYDYumANzR6dP`_Il?sHKi?{j;J-`6nBsrsf|;_=hxsSk)jP
zjUbuB3175dxybVOoj!r%rycSNo78}m5d#Na&803r#S(e{fGU&sf_YbJAnj^vL0!EV
zg{F@Btf+E;7l*?kY5)+)X$C7~PPp#ud%5-g-(vm#-^a_Gte#L@J%d|J6&6uogm}%(
zl&9|?W;r6@4OIXWKES1`l0b6qNmer?>1@N)fvWAosfi>->Xr#{bzXC6Qn5ZPSRUk>
zXqZ+F5``cZTLl5p_)|RqawvuahCz_%Scy)@pMIxf^gWOB{oi_u{`$4B^+AX;h$DrG
zd;-NGKI>ICaqFqa_y_;-0>AXWL%enTJQnMYzkm5xILZ!JA0P6O-)p$-RsDbITnNB-
z1N<r5Cl{pZKfdI;X5RciuE;&p8i@@=hg1R4NjZ6KHprg~ytmaq;oqD-?HoUa$jg+1
z^rn$iNs&t3eDXe7f8CTvP{<5A#2gtz0|D&wF+{+?&Oq>F_I<p;RQJb7(dX#Hf5a{C
z`Z;d+@UJtTJb{e+&?}&-iLQ_2YiO7hW>n96ExTXy{e)|-#m@v+H$;Ov0gd5Gf&-V%
zKMqNP?C%mLrLub|p%BEi+`4ouDIOBXazE$ltm53xf?}ewO%qJL#S|$heVCgKICY_m
z!GJ+<NB}XIe)O$E@4Fu5`@Z!ivX$Fl^SuxjkPXb$n?rGc(>I^yXTS9_-}#f5_<w(`
z=8t;M<zF4i`G21HuN;>x&fPyE>jiGPtM^?^+3W!S{?9c?-o;OEs%Blp!K_3I2bCao
zgNTO^M^WV4`^&?BZZMI5>+z$0nV$rC88{2_1(GURqQRSsXKC-=3R%`8^AYc|^pds{
zy@;f*B?6%iszfn5yfsf$+_C{NA3(ogW%CK{_`{#%wmn<hJ&UZ52nVbxycCcEmpfd~
zla*V9l_TuD;%`tMy_RAUkr)yKA_kB_(^ViGACIK23bo@QX@iyG9|E-Jj1Yw;q-U_}
z3<}S+>m$x?&DojNAbLM#{(>n|)DaQV?<UL1`_LOh42~6h=7)bTaCG%SzU3d@3`^I;
z_J<+X5NaKX6%=!Z>(}xxzkbBA^+)-ZUkKdmpUn>(tNFhl|9K8HJ3RV<5yO?hH8*Ad
zX0a6>F0UT{?SrpgzXo{X&((x%{4aMMskX|09fO=AfJ{nU;faezLBfGFfv~7<8#LuB
zK6thGsptKt^<q-x|IOv@)4{dW2ZaZ7<vf{l8W(ATp|?cdUqNf?_RJCsILn@S@4#tO
z6EnbRjh)6x2#6#_m<`q#?_S{KBX8yK<L~3ezw*zx^<6*DAg_pr4?@wWSwun^!8?4<
z;|fo{*rGmgii>~qKQMdA>+p+!dLOv1sNhnJ)XLyF<l}H8ZR=Jui0j;s7(}@4q$_4^
zRnjrbJWUXG<~1>p(&G_gBeqf)szqQvt4)2<l3T=MlM@skJ$~bRY7R6{@Pd~d10pQ0
znj|(#Dy{}Mh3qgdzVj&0IC!47eqhD};TFz})_CUD2kFmtxw-)dj^xE~g}a)m|D*C;
z_RUMT$D_X2{PCXgDYQ?XB86G~rOmW_sq5uP9f)O(A7se9w!hF334%C*NqO6R!+rnu
z;$R<<S0NE_Dfrd{u`xBDSE#ZAUyLvpuf1%62%?6QfY`Z+I(5VlH9nFES%gSV*<a@P
zxqJBZw|*xl9{VFzszJ3wJg^R<J_>)?0Fd<@e$U7qdAUQia+LF5_5U%y`?d5Yffxe8
zLzZG9i|?F{NoZ3|oFGpkJ~ESZF6lU(lPn<CACHvw781N72_^&m;?A6nX+;R4Y7(NP
zd9nZmAy_O_>(4Q{eE?v!kG&qf;aIa<>!G1s9OT=6rsVXohk5N69)oflDR;mdl@f4D
z=>5>Uh0lBKovbb2%UAxuIo`kdLjKE%UB2ewpF_^?^56#?&-t|RjlK2hw{73QeBjb=
z&cFQV>qi6N`#+V6<UdJj)N3a5&!=vnj>LI|gn%>+aZwSgX3uIhsRNU#aJ$?3>aRR~
z<;&1?q5z?lGInAykpu6|oFmJJXk0{0MWVzOL?VKnlk!&T)=@1QViTwXOtKZOd-N@Q
z{;&NlZhGkV$m)t*YQp+K+@MFO0`*jbZG7R>T;?h23C(DgGhgz3Y`y5Uu%lm-2n2J7
zNRzScNzd*Qa0Oj#8d~<V?lK62LkJ=X7=fVXbToKcP|cb^745U>->6Ei*|<fc5UB+r
zG=lySvg4pjEdnt{#Qr$#Okp~QCOWjObD=O%jFvfkbj&nA$k+dH#s}Ya2@W0uSLpj8
zO^K9KWHE(m2Gxgv9bR$w^ZEJzCvww)C-{TmEBM)KUXKtt|KV*eK3>xshtJ7Y=eKX(
z*XQcnxBhLho`36}@u{-xlTr%w*~f3GHzwaMwe$o>oK(1|0X=c2!q#l7Yey79E%at3
zFF&%&{qutRuZ|%ToL4N;#H*UeM)JHz-W!vtJC~Zz+j=A&`QJXf$6P(sG7q3l>tlb+
ztXSsuCw`kZy#1RvxP69+UnTegKkR9Pd#!dTg94llJihPnxuc+j%yHjmeH&L_`8Vk`
zH7<sfWt4XCBe-;|W6BKDJ>P$#)_@`bm0UX6M~Ms^8`UkI)RBiaW~%U`eoiA0Or3`P
zf<Z51XI4?E;+SA)l0gj#5bDT$Rx3<Z8ClO4Jm=_~P%gN%S+hG8f_QRgQ5}(f7C3X+
z^O5^^_}u5!437+v>BOWoLI|mDQLcjTbL!M>+<pB;-uS*9-m`cnS#Qpb7aySsf#Wv~
ziH#e~HV4ekMh0uMR}HUQb}sX8-ZMVQ_DNEtvVK9B*GoECRo19G7a~&Ds4W_#RMT@p
zV0Ri>na}vaJ09SrM=l|A%czMt8fl3_N_%I0z?=R!LWCwlh?t3*s6#I}38qRW4+y(e
zhTq-f8IS%dpYuoG!GYOXg-BJ$VxJJAx^oWjeUEJeMxF(FuHwFDei;uw?<<Il8KEjo
ziG)UISrpeUJT+xWz_{+})$Td5Wp4j-g~BYFiC~4c)FND&RT}?H%7!5AcE?o{84U}L
ztdA6;rV&-05F(8(L03hhECWp)P?aiccD5Hh_sA|k_}2p8^?5a)d&>rg{Z+QNcG;eT
z%LepDLyjFC@;mph@z4Ih1<V6}X^ezu-b<;fB=bEhD=0q<;VjR8{`2|Sf6#FH@D+Y}
z`Ez;uu{)WbS+IG&q&EsgU$U5IJpNl1^~Utu@x5=_Gd{`o$x)<lzH99tG&|LEhyqPS
zW;J+_D5_2hm5WGYZ$2ng^WDJVY{5$pZ1TQopT~E{pv9=Dssuc>WK=PuWI*FaU=yus
zwkp;sT#hDs7Qr)bG8QqTk&H+N&g<lDS&Ug(T;xmd|9^SqnV(@f?lN~Hnlj*fnVJa1
zI^Z1SLr>OsWVsq+raXM?F5Z6EH_=-^z|c2jMUKnTzDAJZAX?zKkG)iO|3C>ry75tG
zG=Oj^TW5+lZ-jG`l8d_)JBu0w$~quGzsT%4)C&j#lUdF7Zlw@elEK_N6sWS)-VXY6
zqN>>3uK4{AlnkWg%Rh6S&wTz7UU9SI=y1Z$);5n{S}?C1y*%Pw!`ttToEl7c&WjwB
zLEj4zQK*OkoAd*@qVK^q*WSd7Pd(1BzqjEX&8-}rJj{*pB5S9X*}0S}@bfK@*_6Yd
zw*Jay#$ytBpG5d1+0zeF^Fz;HDlbmHH7@F71`;xFAOi^j1*wjJ=()lq0!`53zv&!~
zXA54wzQG6Q1I}!ZiH#!!uS>#Du0(D-7<kc%!0T?D^10V<^V!$!@Y$!g`J8LFc<r^@
zy!zBOpMK2_cc0kdMMo#xx;EqBpk}4lQ20n4JXgbrL74N^=l?BtUHu*K8IA8#O&iF(
zLWD!1N1{TM54-~83(qJk*&ZI@*PihYSe$w$YyF_h3i2X{1W{*()#+i!y=$N2?6_qe
z7p`jpDXnerKtPBoQ^@(<1?RRGXx*SHHPlU1Wg7Hz&1P;-YbNuCt6K{$T%OW2DdlY-
z>9x8FsEZdxuQvwMY`5gM-nGs7Coc1<=Z!dc@ETrl`yoF2IeiZG_Fy`<!DE+7970tG
z-hFS)XWqKt$c+#u3J)SSbr7Q^X)=(jIN#^gb*Fjm;Yawd?-}#n<~nZM`7n2!sF==&
z%ytDb*gaFSblmv^cb#}my}A1?Tzmu<`6SrWpS7Ev-@ZLe%3GxgMph)&4K5dm5vhYJ
z5&+(Q0d+vc(EyG13dlI%=X~$65AdB?&Ds7DUUoy^rPl^-To(=uVWkJ-LSrRxnHpY4
zox{NAIy#?etTPKeCb7qEGvGos=6%x>_<P>Q3$}ird2f}F_Y|TiLRNTi$<N7pj;!x-
zxh}h)$c5ZR-f`r$JbvgoT$k5my)on&!8x4Cf;iVLFm;fLt)3NwN(>@PsMzuTEmjju
zNu9d$MJYB)HFJnSWxbW1a|#mX0t>1_+D!l9v)c-n-ABZs5JiOutCClU5D+|QT$*cQ
zVKnN|EcN-%zp=r5=e_*fZ=5n*KF!*}<NU2JKEmtndV(MOpYP{C{mNCg>V`90J^tYj
zXZ+Xe8b(W=YO4VUC`=VW1TWwjfZUH8+{~+9^Gtr^>ihWe?>o#7ZG1K_pZpdpqZya0
zK1ENcO3$Oea*2a4yLM@C{o(&mojLm|>tgh0e?oS8cI&1dZXl}25gLOh69^HVjJ5d(
z$%PQC5?OtAs7oOL^~!)#*ADohyElnTHOH1v*R2j_rDuDdA!uC}xLiSUW++5^W{HSA
z&sobe4)rr`J22$M7eB<A$(z}w2U&sCLQ_Rt?vtX#fX^+tkZTVJ9mm<62M0IvuEU?f
z(zr)|P~ZnW$g<S1o>t{|8WU7_v&4%-5?2^gZMA|Hcy?;$2nfMJ6i0BP*8n!>72Au3
z!%KafI7CSEL6%^^D%z*>hN=u;kSj!%`c{CVAZDcH8i2>=1$kd6hLNS^hH$XvCx7=c
z)c5djzd0~mz6Ka_;?xcNlfQd_S3UPV{Hy=;etzw3Gk*Q81wZ&xHUIeU1pQfuN-)m_
z?E52v9}Yksz>RL?uYd9NoV)xW|LEV}&JS&G@@;GHh6q*dksL04xa7j`JkE80^Uj;H
z)urzbTf1Kdlz-+YWdFf4`=6T!UM)>PLVzkFRRb;}nhFoZI?_a_fhIWWT3E~@RS>cR
z1xvS%S-EXYc5K9G=onHlnT0)Tn9pm<MWdZ<f<jpnn?_BV8VL<?&qPhn^<LPsrf#Ss
z%%&A*|M2}xE^i=N51gkiRVndBW*|izpe|j{sY+>s{UYKr$1ffDt2}Y?WgI^;WNCFo
zf7B<-e5<e)J#4#j=|0#2jxIUf29jN<bTs%P5FN>#vnumOgbTYB=XXkGRY0tIy^aDX
z9M~Zeg!!UTYZ?I*qNH{aB&1Q{vKS%Sbs~TV@z{JF-bLQ}o*k;~OT6apCGdr<oXxoQ
zx?{ZI)0Y^_CEottEq>?S8LzrMa{87?n2A-H8?Dj809&Q&!WQ%oa`&A*&Yi!+e|hg|
zt}U)`dUBCT?Gc1>A=Dc?oOtPRddJspkJH_WE3&um8Be1<{fguqH&8Z6V}5RkYO!<#
zO_d5wz}y3eW`82|4(6;~J79RMPd3Pi0iAQ2HG-%MVKrOg0gs@gLI4?f52iqBJ_jA!
zuAXy&okuS+y>Lm3NfC(ZenxfOaDwxK6LaYbXM4MX&m3dF-~;_TxM%Gy4y^VVEDdxo
zSm%AJB2WmD#Y923y1@X*aA`8ROV9qz9``YE5CqQcR$SgQ%XV^Qw<4NOnTJQ>*fE_e
z5w`FVBGLxQj!mJ6b{#Q8ryKBjk8Btz>YAmh<lxbgAN-{Y96#^@{@&kt4!9he27Jb7
z{UG1+&3E&h+uy_A`KOQYcmJL6rkfpWYp|FA29v~qi)E7LevaFD2)BA2-~ac=eCXVq
zfAX#u^L_pjC!1}iegGL<_|S|CZ@<WOU-?Y@+S0d#%Uf>;-u7o!kskR!j}-Z|{zhMh
zYh$gI0|e{1S?k_9P%R>LfVzUkLSUS+ddrXl&sbu3qz^tL)`F^66^Ug-s3WlnW;&5e
zEGuIDQLBkj704{;*tHtxBIVYEjr$+hxXmU$(eERo@sC#~MWM+C-at~b7RQlaU-}##
zJ^nII9A9E-ZA^dE!>3FgE~$%wks!h1CP``ndfrwe5>Oak9e@Je%I(nZ!@%Wf#iEX6
zj<))kS@Oa_5kQa4<xAiYlJZ17mUJ9|sH4>_nvz8^2qKvan%sEvJFoKW6BBN}wGUwj
zWCAh;@45N5!@Tb0@T+gy;_MS8uYPg*eh4H#)X3Fc;{()FdWVki@@u#Gu|F8`q00k4
zO&&zk@d%4aqf-^vzUl_t!1tw|-7fR`XAx--;pwpKX?5$KH(bxQtFNbuhZ@_RppH;A
zC_H*ztK3pWSh{||k>@V4bZUUhGh*WmAT7foR)SuO9#x|T6tYGT%@jqXF>sm&F`y&{
zJtlz!67+oM@hg;DGw_}$&R&iP-dR^x(8=Ed@*=r(e$Pf(#rf<gzr5$x^{+X_p(9HS
zSBB)h9Phlrl7MiDq<xxxr)Q;|xofXgG6-S|p#4qk8SfnZ+-t*@%3QSsju<>iQKDYc
zF##77B+)<;HEBUas_sz$Et6-2X*m`>*RVOMdC&VV^V;V%tRHhw?ErI-Ib<~lkF4<7
zuNd*hw{0`1XWVq!(NtntJkZhR1_3k<rpASugV(Qe>+mW+{H`PPXFEJ2Ji%PFR*-6I
z&Z$qok>RN&q?(?JWp$Cvy=%{S8tmx>>F>W_d|0-szg<_dTGgTols2Ujs#=)O1vmB_
zzH`i>XN@S93M6=9Bd9VgBC(7}<B?b(F+&<htWl6eeeVp&z($MEAx0FYXkdi|7X-?k
z1(S<2R28Bif{j?x&*3stpu(FPS)w6xjQoN>>^+Zn9{voD9A9PSz!LrOK%Yr*P+NVH
z%9#4lzAx!MvJXfGM;DkhcCQHpMCXMB*qYXs>c(OYQ<&tgAqgZTDOUnWK`}_|Jk~;}
zbaED=v*(4B?TZSO{c)q0H$3=w#ib`U`Mg(nvQY))F0cSfaC4T|`n>4*2e@*6&U(J1
z{n}$7DQS>2$?hEL%7;15<=lQpkBv(+e)Rpvcusg!E5%EfG22*h<e7&!^x~7m`4mTZ
zR@hnmk~DE^&v=UV^n&#DH|58g-R5sMHKV$*Ej}6riK>G6EHXM;aLr4WSvfrbm!WDC
zAS{IVQL7vhas?(f5LKCiz3}aRRp6`~NP)tU0p5I=MqNG&%+!^eZ8U^R6(@lt0FW6-
zralIdnqDt_q{({x&(Y^_@$fS_dSuLKZHeBXz^DEUq|scuj^a2wPuJ+Ud1|m9Jkl-q
zF*eeeTs?Goy;t?6vXphS#d(6GiFys%K&geKLJ+`G;Cdd)NIu9}IWg8!tEP%n^ICyK
z%wteBQt3iOVIuc|cYk=nA-}_m@5-Q>Lo)+PpaM5#v|MoQ4JT=KOJuPLcmRV_Ah~!3
zlSk?WZZza&H&^`1`+L0eu_1TGhm`o)Ze*~WapUW5hcL$xSHi3*@Y%2L8BfukW{{pS
zI9_dsudN&U3Xe|O!J?EsgZ1kNoO<yx!vh5p9grgpgn1;+g-`*}p)OY$iL(ZsV<JI>
zq!+U7GGQ)@2diEHFyDlF;izU_Au=~1tqO9YF^*Sgz$-vzrc%SK;exF3%cIxgkDg%t
z;E3V!h@xNUef=MxmLvykpbZTqHxMz<(s4T$+8?HNtP}TXl#dg}gPifOAcUxmN{U|2
z>S~{rl|I8^K~;r4i>VS^Arb=!Q?TUHHDx3l<Q%zejrG&Zj1CX!9~x-E>SAMoL4;V4
zBSaLW5b&{PQ8v8$-Z`K7jGCi20@Eo(Qzat!1+MV))^9`>HDPj@1QUoUo|wv#nbMaf
z{o@0kvo_%eKI-D_ZgWSx!YqQ+ftx<(7W#*B;%tsDvYTbT`>T%T@}BV&?CAyR@4bBO
zn%VjC|ESAYs2bH!mI@R{Zy$2)i<T+I88Kuy-y@bnGi?Z#5*G_n<2({34O&f{+3P8g
z_Ge8B03^v5J20pmxvGMQqh4f$K<W%6#v-C{C6F9hfh8UsY96v)MtO0E50}@nebe(;
zU+K|b8j$x3RC#E-aqW0%|JaCbIvk!vy&Y*eM7k%^ZI*8_dJt7&27`>E$XH$Jv%J)!
z*Yk`<g(gdOw<{DLNvb0e(9r;@qK<>r9!G9jV|1`jt;rfkHp&?u7*fv~=2xdkQv;DG
zu?1EP4LLREFE#9LO!<OW0!4)R45R@k_B)<J4%y1B$gCtxE}0jT<k;LiRV7XMNWeA1
zsarggs|`Q>z5~2a9%h+_*>1(DPdm-p9R~@US8%=<(1hCM#c%EzPr;sMMLM0G*u7GJ
zP1#7%1e+Ub;N+bnu6x0<=G!GIM1;9ePf8S|TCm2y#AzT*Ys3qZr-sy~AXr7Xof}}$
z0FrKw+2Qqj*0lkLjyNQxo4qrL%(Q6=I6K$+y&_}r_$Ka&3!J(2<;bBUEDdr6N$)4c
zf%Y6ytJba!3jkeZeG*Oe<9^r8Xm<xvYXor6@8t?r6O-~3{frP$n4)G$g;=v^*5|Jh
z5E!iXSvxi6;PuP&#)X0vBB+&70q7qZ>Cdp*Sx`;q8m~svNF<ocU4zuz`#{aJk1n|N
z`2|c%XeuBoOsLDegUcaXeHLM7moT}g2?h~Nk)r+n(;r0YM%C=Dn@fJ}17kk&XynD&
zIc5_$@#2#lebF_@Y(pV*zJGJvx%x}g)zv-Y6SSwh`dbqUl$9`>3yVrP`RpOrK5q%M
z(MS%iuL`6;<Vj<{AcsUp*lh^2+G=QkAZik&HL;m|8LQWeX;GO(GXZS0KsAYi6Kt!N
z6c?o`BfK}blx>9<36ZU`&#8+K^PKnnS0<HXUJIcPsT2n@F{5?8r5urTKS&zw^M5jf
zw3aA!1hRX2tft2Tbre$`^t>@wZuMZF1BZr;mV2xo7;@nFh}EM*Mr(bRjtn_`^D4*g
zSY!2?F?dg1Dnv*!1xs+O+<1^9FT9TR+pnQm8|kDtM94f@(Ie~i8IKC)(&xK>7Ix1x
zurfx2_o_h_bEp>fLpg)%J;C6nSCWmcC06s~YDQ6)EzE1etRj?+!WB0cES+$C$CuA}
z|Ju#mD+d`guyb}7aJaz$niAI=9>n>tz<Hj6J-v$bRj2z$cCXf7J)g&3S;BSC8F9l4
z$GAL4B*)?PKe*m4sVC~rS;LHsIB5ur8VbNW3=9D97TW+KHd-*-sk`Z_5|)Zh3Y2zF
zHpKz|zf}o~i|o47>om1+@v%~~fhRXU!p`bZF5mb<Mul}=ZK+b%rIU0WfuvOJw0MFo
z9d}hoY;2$JpUF#R@O7_;Xq{7+3&yK`g=e@@Fx(qQ2L_A}4(Kfvh@d}<7%*s4+B-yu
zw)ij95!dh0KeS5!;40<zglcCOyi)?K5{2B=Jn&fH`qc%`ziSz^6~O`ogs9IupMhM)
z_1Ey@XH#E(gjnrrl8Km<$?6Bum{q`4!p%2DKKxkD8}BK2Vf7fxr$*fLh8uCNB2Kn&
zehj{UC|rE(r)4oO_l!@#o?ejt+E@-uCh@DMQyHAPW5}&{E#Z4PF=mKLe@QbbDR&z}
z)nH2=2-8R?YbYEzZ>o~kAE=4LrSzvAm}^HDpmgqtCI_iYkM)1hZ)Y%NBsb2$a?Xx(
zrxVFn&n}40vm8sVJ^LOu51(f9#^=*3GI9wmP*O9?bPS#N$k<Px>Hb~V2byl51v?i5
zCOw~y+n<wkoMI^?K^MfTA4q^GKqO_2sHwuK>3LdiQ3bNzfNVHmcJT_)_MMX05JSL)
zn%!C8;-v*&dbgv0Xc^hvPSiWGiB|`l!;h}PxntCqA265Bl1C=b06sG>qK^2H<5|aR
ze*6!{^e&#~wv`FjeZj5dOAx0MC<DH~emGn``#x|V1ji>}PcKMccSEsy@nZPOgQt2+
zcfN92x0H;MDHvf<5oUpM5^2gnW(^GDOre6@BQ9l!KrpFD!GqXDth9T=={dB)GKd_;
zTy(9BnhvHos?G@@+HM`>xzqIN#<>LwUq5HLoN)a^Z=vZ8*gpMi>a}I?1x`H5z0VNu
z5$CaE1I?=m4zcs3Mq<}N_?VW!LH5t!iKJr^V0zSrFhLa6Y(XFi7)fTppkM_(Z(mC_
zc&bj>U_?EeQ(oCXnXn9AXc{~<kDU+Pc6iFOUwjDW4OA0s;ut(SR|E~Xi{z`f5a${7
z)idCH%Hrv0v65x+SVRt82OFE7|M@n@-K$r*?F(<DSnuh2C7JEudIykt;oM;SU-yhp
zz@Fx;-K|Bh&a$t5*2~9hO9u;r<Pb$`=0X`McO%U#;_ZbFb3sdWaxoCRO0<BfL8=zO
zHbfR_x7`uhZ%aJa0t%59M0iYbzyLxa`QL6DHtM7-yBjrI=NA-~5~rUtt|r`Y-*0o|
z@%NJBk^X>sxI)N#3QlyMXfTQQgiOx~xu+>~B;xTn$TBE0$i2mkLfj|Wkdy~Cqz#MM
z{iHm!Arq33OfVQsfs*T%plU%BNh+ji@dTbEz|hfU)H^#YE?vf%YY}w*szFt0x8ds5
zIbU>lL4R$PIJuHk34sjoIWEq@?~<?HOnr5eFxga?tmxLBPl+Q!!~=Jn4E)5~hp;o}
z^S*Q)e`rLU&xz9=T)v9)!<FjZcl~U<dU?8M{0Z&pEm}SPqLT;LCtJ%aha5pN1)x!g
z0`&~4X~0=Qq)x!95-9{kY0S^H)OKbnWU*2Vq1CPm5#z<-kWM=)oaiXt96H*28F^Cy
z4AfRC8cF|ed}_BLXl-*?4f=T3aQ%CJlN;~<Ey@!&uyfrr2rGy1PH;l2Tu8DURi{kr
zkC^%~kBn|+Yjm7mCiGTU@JFs8J9+{?%2ln!<d$~9Dwrh&66h#XQXspQ6sQGd%Mwfp
zB7-X33kFY&m_e|yrBDVGPKZrF8qKH?ozvLa7X>~qSX#<>=STXy?GHA1?HAvSD^`i+
zCd3R!gLnsCKLgb{{BX$lmS?g3t}Dc*)Obl0W}$I)nzkq$VJC3(1bofsW&G5SpI~$0
zI84B0Hj!KI;>V}1al@s%f&cNRx*kb>{?mKql`H?ExXc0ZIl44_R$9@iquOn7A>y-0
zs32BRAreyy2_Vt{89plj(t4K=+a0)Z?PiE#m>3)ek&Xma9gDLP9ylSzF{V}qnz+`x
z+p2&tOW!6hSPTjVF0gvxA&y>ph<+~-xL-RhyUk6bgS`LPr}Myp=TQQ6HD|thnDy7Z
zp5@aw5UZy3&4tz}(p9EZnb1})yO+jb&qXz9#XbolgCmWE1dxG}Ad-+2D_s|*u~=Ef
z4|^Ibql&NVm(==$oXKX7pZ}c+ul>vlKRQO7UqSF7!Q4BLVWG(f%10=U+{)nE8=2hy
z0bK6E)KC_Y##LlFI6U3~yTaGLHuA<lUgqANKCh&P49IihWCK6G-es#tUh$_6Qnk7L
ze@xF`{Hwmu9}cmsRf%HbD0f9&yUa(V7GfDqaln~dAd+5i0L0w6CYYb>k#?(IgTu~%
z1Q3XU;t(V%IOv%`5+G@1%bfAmCP~s83V_&yEvQs&sv;+5P#0ML@isx?umekah;XpE
z%B#-*GAs2azwV#S)k_!Ic;q*5Z+kO$eaF9J?YfgR^Twb79BoBTDrLvg&Ei42hr)q$
z)rUY*ogm4@OV!|#fH8oQi-(<)AWG**s3{JtF*<dM?fdUX>*Jhtb}9;0rryZ&o9`~T
z_kCA+=F4t`jS++e5<Qd+(PAHZnRRM<gwc)Hu()uLdgH39l{A5DxT?U{lPTU0a5;pD
zaOi;Ww?0Q0^g~Mecn@KMG;`eYk=y@NSICARzw7$R6KB5-BEC07YE5M$(b1GbGYfbE
zM4i|}Q~|s~BvpW5U|G{TA)-uFf;4Gj76D0WWO0w3wH!Rxd3jw@ArR~w3|eC&(a~Z?
zOz%Wt+_yi8b%LdCpp1g|3RHRyNdOwTjUQ3Oh8JJ?ea=)D`0)z|*gAWj^33Br^U?(l
z+<b~SPs9q+&FTquYzhNyHIk$<dOw|;nZf|lhRm)TM1cfRE3qI6BBj)Wy0Ds^vl_by
z&eJ=15Z~_;W;1Jzrk!!shQpkTm-_tPyS8}drwwp}6Uff}i0eTGxEjeZb@EV6@S{zZ
zZn=i7KiooUbsb?mAU}K^&AE4z<uz`UfftxYKJUc>H#8s~=dI-%0jVeW@zL8CfArr^
z0#E#@fV9}&{?=wbJ)R8<L`2;=RUR$ujSw0f*7#9GB^`li>VyNbBr=FjvJn>og@Kb4
zA;DyB9WGsWss1OalHmo(jT57+1w#so>`Mq8>1p={>cHeZ6d5$ZQPr9<Hb_Z{jrQtS
zYL_$294~i|@>Az7^5Eke9J}@;+1erIr52iYT|^wv1<TG-2C$QaNT4KljdZ>3?wJ`d
zDgJ4>cM{Tdd`?(2%&uIaX(GkS3ce_86?2Urj#z!xvzR{mD2odh0m0>&K9dzWWIcZO
zk9YXG3tRL@M+n>ZgP4|<j+iz0+#&r;!E}qu3{D)Tf9wF$M=q+1*X(RCzV-RU-Q!d{
zXUK{XzJM4b{XF9OF;!34FNS)G8yr6A`lDz3sen}e^h;hnec+L=_PNS5u?n{Nl2FYd
zEL4rGCMq>rCxVnw0Wnw<FwiOj!aQ0d6A(%8*b9!deI~>Jj2IlGI7v)aoOdm$arR95
z8VaTY<WlNf&C=m51xy~MS@KA&q8zMOWU}r?NP2xPIVT2z+qlYG1lDePCe8Q+7cZ3h
z0`3!QbuG2hO2?!OCGEa?E#RU^N1^n*9rGZ8q(){UP9dr%Gq&z~i0RpLgr+86U1jB#
zo5@#JkXn!!DAo_KytItVa%PV`s;Xo)YZSwbcRo<?k^9c_th;XkKSG+hWpo7=AcZ4Z
z2^S&YvQ3t5TVZj23!P@Ec8QBAgKMv6^6rNfY;D&jktPaR6g>tpkTRs+#g9CGxOC&E
z+_kHJ>6Q87%(;I+Q+q!efVS5P=(?gB>RH6mw6Z<U87!5;hRcC0y^RQ}QX+!y={ZO%
zOz#B#l3;2ples<E6^W))e*d;{&Wv_YZxgh}PPg_nnSjsI%V!VlW9fDXfnE{0_Q)6>
zo^tqkcSFC=Vtcm>N@rKT1UzXoF%Td<)7kPOrT<-8x}l?<6Qgtz3Zf=@ZpR8ysD<f;
zbL>2PhH`ToAu5oIix+8TQ^u#SBVSv?^?FEE;fkEWsgumkpGE2#vI3vy3<jR7n|<DO
z&&D1|6|T32R1?IeKq!Tnqh($6Ro;>LoMPQEyl%|)2TG;9ymFE8i=WA2by?xgdp(4R
zE1dOMjHFjeGj~Xw;RdUBe#$`#llf;ho7<n``-MWF5X~#3LaVK*8!{IO0mK}7GKVyx
zi3l<@{t>Jc2d8Q#byT?*fY^PDy6#PPTYhOHmF_!(PSQCfU=2R>GJwS$c|TK_QdS~G
zWsYw0p~w|JbAejWbWH@=T~K_^YgszA%IJN+%#r86l4=oDot?>9VyM#~QZ2Cqw9?-8
z@{8Cph(w}ve!L2mvsIr?fpP|^c@e?fx}-|rGN$LwarNF06YCnhR|pX_k<d(b+4{h}
z_+FpkscRUXJVmH$==aH2)@WvP>$Q=S7a1`WyzxB~{^rhvyuVDj9n&90iI^(s^W?Tw
zPBUYCeZlnMoO;VqU%7zexeQJnWqR)eG-XDSi?tXw-!%o7NT@(6+;HXk>Lc%TfPBh8
zsxDpqLL@rZD?nqKplTAEOtW;}2@)K{h>Kzpfj*~axv7X)X^^UsV3ngt?Dot~`x_-V
zq=Q*Id*^VST_2FNT*-NRP60Fcr0u@-2AR%D5TZWkT4Z#0+Ow)^5(8aBB2w4LEHHfG
z^YDM;JLvt#pWw)IUO{pA2Budw$qH{<)O6URJsKo-jVQ$QY=X-Gi=bwZ8C+O5RRhjC
zreM1w;xnvVtG&^fcSNgw6z`3&h=`iytpoMuhAL6-#0hX-RcLtQ&D7HgVeg*Lt#M7?
z^PY!1XCK?;nj4mY3?!!XHW7*j3h>SY`c6?S!}xTct@qA|^9f<vFgS6D`GXH?!YdyE
zy&N*vPFD&xmiWQofTsFj{wV=z<DVTr9d>p<%MS`19^GYP9+8mIG#(c#d!ZcQ5eeWO
z)DD6t>w$P6+Fr0ON7X1qD9n9B5a$s{OQhS~bh-@`UF#49*ObX1Nzfz$T2oKbieIdj
zs^`gbPYf}ArW@;EO|l^fO|6r#t<0S>)9U6tCtF^n_q=DY_O;&z!*!Ncuj9}wU&hYm
z9Y#w9gOxGGz+=rM5oyCj$GuBRgjveor7|G{$E=-fu={qLD(l7m;5nD}6cs%B`x}n*
zo-`$hD3A)45~;`ZPaJ1>!;OgZ*0vh_cuY1Jq8U-^^wb}C9==@g-ut$=<~A)V)k0Rx
zJ*O6A0n!VQp@v>>7@zJjeW;+BEode)@>8qy4rY{3G=xIC<toF{#MTc%0SyZ%{Hk+q
z`BMfG62H_H*$J0tun5FiAXY-aD-amuX`(d8i6b<YiE{=9mIQDbHzg1Rb1Uqa1QH|&
zkQ5&|1W6qhTc9KY6NJgF>prLE!Rq43icDb&rKHDfR}EFqvQaf{dJvY^U_6HT3}(BU
z#q_;g;{qv5eXh9X2*c;UjQ;I+GJNr8;D$%oIP*b%^Xy4#*4R0B9(U}J?k(iAoXlzw
zrQ0A<#{^YUZK16|2^@h)nv_lbD>~UbF_n(u%$>6uIWZm1JcI?ikDMV^rScV|4UvQf
zKNv8&<yNwl6~ep(?=`s~b)`@#pk5V;qVVk2Irl$2=k?Oydm}<QL&(zpyrtmg;B}`&
zXV(J7C}VW8&*lfVX{Nj2*BKt|Q(agP${c!*RI(nEN}GG<@@xs8Ed!T6sUVpet^16x
z^g1!-h?81h4)Gb$b`ua(0W3Wl4Sv8y@cN4}z)-1;jp%dau3Z5jN=1SwSzDD1+@uUG
zJ`A)3sXYTiN`)t&AZ@P+INRMXr`oZ<xMfYYHYQ&h;KPF6p<^t+@Fnzax&t>H6E?5X
zoPCt?!4JV=ij;GjC(ctGUS<4QpUL<&pGR^0IH8KTVZmbKVZQw*&hxwXI*uL{%FzL;
zvZAR2S%?ZN2*Q3Yp51N7ODF^Y2_gdqvo!IPYU@bv8PZ;JBrdJKHR+l>@(8;RJ&Y?d
z0ELK@cqfKHJ{sW$L;bmtWyGqY*|<uWPKgVRksvs%GcJ(vkux>SDy<%GVnpzy9(sa?
z5<OcP>n-354WpAeJNF6I08K!$ztzhSj*=~pD3-6%OfuXsGl-H5r?U7O^1%@2$Df*H
zgLiLmxxY<+a61igHxR`WbBGIzV1pnEmG$;^Ldp>*H%DJqJVBqq?qhKZ2;CYTX^kc-
z9oJ6MvWb=o0nn~+XvYz0y;3rK;TbIT*pXdg8CZVCZLC~>8c)se#0ggJdKu&Ay%6X7
z#Q6rzmCJ-1ZlZtvt;FrigsWHaFCQ~{>8t49@)AIZ7d}FM^$DgI$NZE3G2<uRvEab^
zAjM~>8d|*7mQ6_qNsX}c<kCXNos-t2EP5RS!x?1Kskg(<W3VyBL^M@Nhz&Hh=M|~z
zv%_#gFW`CwVRwh=eIKT}av2dx%4QR^e$Oa8_dM#@x;SBN)z+uE<cF$ymfDjLSAfe6
zt}<$@G&r15Z|y?Jpje}~`UK(}zMo;`8K%Sr6(F(3<-H-!4?pQ3ZGOi!&UwDj^)iT#
zxK$G?U}PCL>p2%qg{TCn1&VI1890@5iRQC<XUvd-c|Df|k6Dr%m!N1R8um?)f!*%@
zgRqoviUUlM^teCDkXktSlDjzmX|F=+8Kdj3XK>wh<m;>Yf~ZOt1-(<(6OW&uck(n6
zYW&g)esBcnA=Afkk9`Ecy~W$l_W5^j-Q>4E+^{k(==U;B)#ihNx^-lkHLy<{newzM
zJi6-CuER^NTY4sW2|iVOYlqcHOhBdS3$<u*lMu~{0|)UJ&TBO_2$s2P1&`&%2JXHO
zkuNP%UA{<p=@QmN(CEiJ0Nc2$a6ER^bN0fNwS##|f5+5Gh)R$}K#EksLX7wxj8A4v
zFD{S(&aaZM^<m_}3(^SPE|@@UfTriXU;U(mgm=$z8L#k#M>ZpICm?-~<RG)C>JuAD
z0c&YeP&h~cs1ku!c(m~eR&iiz1az};ZOQ38)8)v~Vy@eS-jYyh5uVlg7(}UT2^{^g
z<JgPt<mBtVn7r`#(U9JeLmIe-$pk;@qbeN&La9Ld^+P}b<Pdk^{G+(XAK`(s4L@_=
zke_^a&4r!Ffu)RoKO-OXDV9bQ;~~D^vqqMJm?e6WLbu~c07)HF(;6dFr_@yypCJy)
z&0Xe~Hx-g%Wtn1i)s!f~7EJ{VBt5qpNwTG7mTtb4rmR$@%8M7MHm-n3>LIu&nLhjo
z&Kod!0f3|xoNCT{wIX-yEHW-$s(8jTJtUBjXi8h#gnti2-8;Kp3jI}2xl<CVhCCnP
z`$K#^A<i4^peqVd`ooU`8h{#ctbWq>kagaFrt9Tn#3NfZ;vKS-DLl=hA*ON`C0|v_
zwcRi4KWFNK)nU1|tCs%ywt<rN@&2VVZTR%O(+k+fq(tDo9UDN_K~<vAU&=Z8vggv<
zgToI-nq>;p8B#ZTpCHJhLMI*PbEK*aq6RKK1n+x07vFg=-}ieBU-I93eD|9gw&#&U
zOBqG4P!;MeFELnIqPH|A>-WKBL~#Utam}L8u60u*z3k}oLG0P|8CAFGg$=eo@))yA
zSDBu>%=UwiF+G2Y*`Dou<Y5+9H*t9nd=B1QtQ$}Zk@W9~YPvXYWsTy{VT!{?8QuO&
zii3xdrZE~VTdMO*ju6q$gb<L_K{dJh-jijXd6RSgVhyoU&xKSSgS7@jO5KtasRO1k
z3P+YZ`b!I9Ifrb7%ZGYD>@E;e*kRikf+Uc@jll6Ius@k1ZGYFbJsf|<_i~s-;;crN
zJY<eA*G7&YX=#MiMoLDSy2L9;Vv=v|Zxd*$C~a7z4M}>|x$ac0GwYV1cFtQ|IfpaD
zC72RWI-i4VJw%*658ofB#v9vPAWOuJ%Veu7G?y<zRnfcUHe~ZM?uq-EKl}v0{$R#`
zxOa)SJ)Ti`I55(by3XhqqXGSuC5CIu3|3YshC^FU;*hvcaYITlv|Tz<1}~W^5aq@$
zlgBR-%8L2cjwOP0hYfI^P}O_)&(bsvf-189(I6`{4pNu|a}#5NSMLb`uITARYjxqA
zsc8Fmi`YxtEv5&Xugdd`S@1k@F+fvedpRKh(Nx3|DQ*#w9`=RAfP(%~jW0^@J;e3N
z`Wa2tAdLbCHr--yf&`$#f&b*XcAgjd+`m8p*r}1+!8p^2Fa4_^Y3a0>Y~mec<|>H?
zKvDw`B&KsKao9(3>>-DZ`_G1|b#EfB^D$E)hmFZpnUd*wHlW!#M|1hZ^savyR5P0M
zkK%itaIpai_+9}qFnH!O@E^Gs&OFS!ACLUt2UhsyhX#}Z)`pIv$P}QgS5OT4^q0mA
z)>jy;tx@b9tExFi=qy0$#(W7X+DQk2h`o4d?4x}XnzDpEOT8}uF@+K5sHaoPk33)i
zgC7j(9XUe2zHaIy3SYEiF~fkR2}oV(v9mZ08x8gJtW{Vz00R>{C%^;e9LyTL7aD!A
z-ECDGa3#blTCWDcRM=$^U)11w;QBiKz_dYTHLmXzA{v3z>>npJ&PM@w{5^+#^ilxj
z(+iSwuXVkwM;Vbx4NEx@(V{?Am6WbY{iQN{DP^CGQ;Y^tS1LqedsS?=;XHKJ3UH*%
z8*1G~jR~5hK1qpCv+KE6^H~l+bLk%P_0uq$6SvP3iykgC3Q;4Xu37(q_jC6Ag8zK~
z3O{lG5|8g@EDs$A$6D!3-v6le>5X(_V*2LN_4h3655X5i@wm`si0-6pQtfWFgBp+$
z1ffaO0_L76AT|n7pT%OLW^;pbdz0}^w~(zLAcmSq>M5rtV&H+qp!IbUEp2ajC&@JU
zB;XvBR$DpjIfKNYb8vCXQB5l{r{DnXE~^Sn<%p$63V}S`Ck7<eHcwdq8N`Y>t+XYW
zXmNGB{9Pj8qXUpL$B$*lcD_^&ZvF>g`m}(w^S!6NbM7ved*o_`#zsR=oYt1nNzLeq
zww6c)SJ*6gY(oI99YEVXhqwB+{Twpaxg@R&5y=dwcH<L+B$<L`Fqx6mN+HrZtzw94
zcBmhIBiZl<a2Y5>J*^L1=?N~(`L%loe9wE2@Qw?8hK1wsimH$9rIZf`6b4XlX+$v^
z>Txj~XtIGkM-?Q({uQg;CX(IxB+^JkoTq=}FwLT*-kqS}q|9G}%HkTqOcO#iO;zEP
zF9psZG8HjsU6vE36PoQ!u;dX$+7Rg^Ezux;!7T?ke`U_Y=O!!<Qlf{<F_}B&v%q*5
zkOUHvk`73vedCdy$Clxc*2mZ21+onA_<n&_gV%YhZ=wK_Ko0=bZgyvXrT>3rNBw_$
z+Cakd3|F`p(+DyPu#^$ieM^&dSSF4jO1sSsv{SXDlyZ~=jI?`U1A^=iQ41W56=^}_
z+7OW-QiV+JoB~3Yt{GhE85BYVMek<?G?$Tj2{*U~ughpMR(ryk-Hh*l-!eaS--w+$
z=fK$0A80yTGjYXuL~qaZcr?&hNa4~|qB&$4>e5AUPS_u%P6DqRkJw34rbc@mj80!i
zwKJjG-ln{ImDmLEAi<z$D-^M|^!@6(#z+aE*j^grJs_IiZl)8QS9xedBnF@Eq*$@F
zHRsjOy^)tZ``LWOx4(r;8@ntQ`nA-irK6ljmin!2UDPns!P*zN3_wVYB^s=y7l>1D
zAXHk?hS*%EsZmns+HC{Wp?*zKa(#in6FBp<faIKirOW*iy8*mI1|XA&h*on$O!EK|
z1F<2kdQJ6T7(@ns8!+*J6D-EU2uVQE-32_IIveRil%6wqthH@Rf$TW5v3(D*RIbl6
zt02xmE`qGm>mOvf*YMV}J-+GfE4<_UfR&Nw$ZAfe0F5*Y*IOPNL?czDykC$N1@<+;
z`;@A7f|LCrGHV0VJtqay3Y0;UQLL|%t*$}QWA?=3NF7KjBWc1l1cj@A<S4ORP(Jbm
z#gXH<{y@Pq6(Tk@)rH4tcDB_V8Azg9Af3m6G&NE#Xm)pb{D~|4<F9@pKllwV<g5Pa
zo0!bz3>@Imj<&OD<j`^?#WH|G45$gQR2L7QgY#H6E-m0AZ33sUZk%rGxmb+k3{n@P
zgvwtA2vWbgo<l!oF9-hD(*siGUkM)OH4Gh50ulj*ULi4G)HVZ);QMKHYIoavlX<$k
zHb@XGQPJ&Mnm9sSTcuoUzaiQU8a*UX5=5?}L^^7Qjy>}hA1Tn9uFc7Ey@zuRj`Q@h
zRet{d5#RXMG3Vz!4y|~4gFg9ah{ChHOn=27Qh@qs?Omn-sRBj8D&*S`b*pmisG~%k
zCj2%!BnDF#eb!tveU{?LVY2Nl%FCCn;vS2AVtN*#Jof})HdmOkwL|#c0Go@V+1X<8
z_!;Uemn;LAoAgJd<&LBRRzjm?Lez5}e&iCdzR2gj@*w~8Z$6uE{5NmGWep%qE64T(
zoT(#XkQgHp#3q3iB&6qXS#s@=2D~Y*%W$#AQ4r?Ve8;|4@|8nf?G%?D`JE%zMe5t@
zSw@^?FU}56dO-D*K$`r(jcYD<cepYVBgoLfOaM=`Uy@+mEyY<gb@Zi8BqfzdyD4-b
z!scvffS$ubCX0jGwR7E#jBRk;uj!HkL6+2~15xHtg~)Y8LCP{U5QC{8Q_u=liV5#M
zf0cjywxgV#WgJ=c<ijDwcuap~nf~gsX5o6H5&1v?f;?A{Q)*i*qbS{m`)aa}3?-1v
zb=8-%+Swt@77DvoSC7Vspg@VOcaNfrFd@%yy*^f1V(xaZ7hW)^bP0q$-|rKZbph`+
z7MkAwA>w?dF0U3bV+x40R0&CVi$tuMJ{K-*vb{ZJ{m=$~|0|Di?|nD%Uw-C2PzYu1
z(9P*WBxUQMck~GL#y0iN6z7~Z)e!}WLQ+i=4bY^OuuWwhhjLX!g2nO(rbzR0*U!qi
zygtjCUQ;=mxx2lWa|(FqDS?Fd&%wLXECTc#*g7K-OqJ5E4zUuee{!khr#)d{u(Z=q
zVo(5}aaR`-+UnJE<<hkTEP(TEcg`i4@ZKk&vXop<h>9F%5GA-W1t~U-Rvlz{j?0Bv
zy-DUPmPV`O<37FR6?&^H3Q})rtYBF(0-cnE)QdbVdr!4#deDYvA2~{jE|JBhOO#hP
z2xYC1h~4TRJGN&>!Flbh(@Z90Yb)A>1e`&p>Y-*3p(++kop4CzwG61bbdka7CCCeE
zD?IhRo&f^10cxFF%#@e{Cc9H6(`pZ-8Qx#!U;f=2c*i>*<o@@ar#vVu%9N#(y1|c@
z8Qyw5@tzM-T@8?D*8c-y-!@1vn4OE@n&jSvMq7fBEfIHjk(edu0T;qny(^<?5ntES
z1c#^E;lS#WdpbaJFLi+)j*@{x%Gj4yA8r7z7Rv^rDD~n%#C3k@=3=y`hj2Ipi~u;&
zU+vZ;tBG41ummZPU~0K@EfpebL8Rv%hl@ZH5g##lbX1tK3@y5B8e&ze!nmT~@!1*+
zH_#o<6`r+KdMhicO4(qb^A{LEE~dtj2_Bb504H{|ze)N(@LrW@e)%fRbgJbyILnIG
zHS@D)bzZ7CbVzI7=8v5rUtXp-c#wQ$l`x;FLLv5<AQ(uNc!;gJqs7_B5E1=sv$bLI
zqN)tiGytaH7&ys|H(1S4P>+DwtYkWy0~u^R!SNHqKmYoh`LeG&&ve#MRhT>Hh;^WM
zV4dvHkZf#;Ef)a@wS^T0I3j@FbJVu#0QI1}bKsYWi^oywV)}iQ3$9$foZs5i;U!rg
zBs%H|zUaGao^p)jyn7~9gv{NC;|7WJ&0R}-7nw^Is{kIz+8#+X3{XpQk6lYDVvu<Q
zDFKwAv1j*%$+Z#-ZHN@0)@YU`#lkj)*58ca#(lEBx-I%#-ph$)rOK2QJ#Ic!v$WJ>
zd!R~W5RLGI9^~FCt8Ha%D*@tKqfyiq;Qc3K0l``3$}*%#2q^}2Xkb4*^C<c54)x|H
z0QL6vp6%lDTr+5pvUUnlYFI~F;HTg#T#Lsa#d&YnG!Db}2js`DL3D}4B~|Zs7SRq;
zb((qw3et2AjFD!6+r6JJ`GV{Dg<n6;|NPkp6<~u~VagATA*<-E_aXPhIx3J}y&;gE
z0%X})z=fpnIEW=KUsdRQo+9{u9{Av6BmaR1i&va-<&mInpQD-rxLckQNRuDFWeMRW
zIQN9~+=r><*@*e}sj(vh(1`V0XxGulD5UZa@B#s8#Y=ju=Z2gDkW$(JbW+@1mrfj=
z@*X=jV4Ojf%x5Vca;84uY@Q(ycS}Nqe0hlLXR1uzdwl`x;JNWY#pxrC_k~sRr7_uX
zs4uAEZxftWjGI8>V*~Z1G)Ynx(<Vg?iY%p?F`Lb(C%d>L)e4JlO9H6H6c<^I9FYVO
z5?in<D9)uMg25yTmL$jwc!+H|#i=@!Rl{UDQ;=|iOs?RTGXCM;Jis5krAIa2PNiht
zlZ`Scx5>wuy3*yPi53e-eg8ljRVjQgGsOulfTf<`@--yp#1IuWhu~f0(pGW9#!mR+
zQ@xrHY`4cc$LHB?Pf?NFGjZ;E3cizCt`~7mBJGX608*)l#ZexY(ysuRn5WMrh}3MG
zN^=cbpmZ~FDbdhYBD#r$1d$yZEWQO(W-*bva`uePv{wNs8v=94JlRsAjWC(dY3jgm
z;5fYM@rxz=ppVT3rS0(z9C4&|Iqk$q2P8fwNYX8#5+O7-p{^iiNue$NF%Lr31(7tV
z3U<G}`yJ-aC5R-!Yh&`o4d!ye;-UKxNv)raB73equVvm2brsmz-2n~&4#EO1Kh9k*
zIL_br!c}5@fe_HR&ky@#%NfjfaCu;G>;Q`ky9$|jAvOvUxB#OeuIE87Mi3078NQ!s
zA*<B83ZXdBXU^{ys}GlM_1XCbA!I~>tjUR?f8;5G#9hw&vxMfYM7~rZ2*GNz9D=5+
z)ri(b)f+_0S6Vji9Y8BS>Mm9b_WQ{U4(vR=a0wiA#Cb@^9=Z@=aN#>@q);h1246}{
z6uI7G3{uu=aW*I9ImPOdDo+R%gS_VOI6&xw&kz(Mf-`r{kqTlFQbHk($#pfLo|GUZ
zl5n1Ub&W8erwm=)fRN^g#0(u1JR%Td=bBBpCICps-S$N`AaqND(j7$7v(7-OBa_`t
z-~<3l!*m9tjKBZYL$=;nFxg$Gx8o1>$%Y=L6_iu@$BvVYuIMrrok~zu63C)@1$YlZ
zK{5kEg&Q@vypJrlAon<c5PA4=pNAKH;xG_Gz(t{n4)H5%PYEQ!y%OQSN{|ZNjS5Sn
zQlDBhH3EVynE;nI&;nB=d{UnDD@m{zXhg9Lo=xVu6h?L2qK+E*1dPIvQr%__vefF-
z%wSWc!nXRy+#7tMJ0`$jpuWFUB~s1_i=2FEh^rbhUot2H;1P3sqlk5NO(0>%PC*fn
z6#qr+8B#hNo^-|mT-1tdKO7-IEK6pOK1x`Wru4QNR3U-{O-Q9S2Aoze*m-v;F744E
zNdQ4ww@&wd`!e3Cf-s#-fy#a^4Ky>j8aR6D2rGB2u=AlQh~WD<xCl)|78CMu!{~<7
z?7a8=XePOV7!2FY18FA!6k?}B;F;qJZ?P9-nIN^}zVkya*FvM!7uIGwM##rYpD;)}
zKXBVJ(T$>uzu;ngxv39Qi;kpvE5H#0DbuDVDLtO0i9$(m&?)*BAOnRc#iR)$*M-O>
zh)Cc#5>(#eAXTAMq2L@@FH_TJb5CwfN<<*&Cd3uqL$BW_4wi|{K-aiPS;5fZhe7~m
zjUzU}I;%Rwk{05`KoSE9bi_s^#YN)i@Z<IaD4C>q3G%|+YOkY&2Js$9ibPDMItik5
zO@V7eq}FNHnbeK+n6v?-t41y<nJIzOQXyD?x6YHXf<*(<U5Zo7_=hgj?3Vb#1KQ&o
zi4JDx7+-q>^G8={wzrAB%-lR+P$+b&NU=_Rm74%8$c6=V#M0zKRl@nL9@_|Ih&XAG
z=*eTm5Bh^o7$gbtTJY~AhCh}l--I}51PP?Zflah$L98Q?abonhJ$uutbd3Z9Vl*iP
z$@Rmx)7?0|pEe}R+HM>+W;Ut1H!4iQg4Mj25gI{&^AGN@y-|XokPXHK%ZElBxMrE<
zg99!7naoS36VK5@5tfF`7CjczlCTJSr;%CR<Kk{lYsX?!prDG!ejX{sZ|#$Hw7H^I
z;?an5Pc}yCmI*-<A<s1p-ppsoZHsM?6c&q}>^jlhA0a`6wACoxO0abxGSy26wLvpw
zRI}eZmo^r_TtNa9254|QyX0#J=p9|6zB<DdfYj!$dE#srzkH6R+YYhyt{u(bNdx2#
zHyYX`dV{6$&46Z#E7DX<?uFf%=fYOb+&kvMF_eZTcr<Y_$a_x#Bsq$c-xYl0C0viG
zu0&IvperV^rN{{u=xmOqJS4|I1*0TL?D4MRv|PA$pzghE6`Wd051LhrFrPM*i^%SF
z&DPbD5McR0pK2cU-h5hf@v$kSl@+>G{_1MMiIW5Tb8lyG%|U+u%rZR(pK<G)XPt)8
zYM*=0WIVD1>nolowhFv2iPi}xr~r{t-q6{L$vKb|19qgQTi^h)KUWsydt|X-aqb+U
zEG<Te2_gfD6fa>3h@?abpfn~}6Ih9_l(~cMvyh%Ab?|YLK-$=DfHK96;vfd%e1TtH
z&_6z6@*!t+bPb~FFCZCVa+TrX160?ousE}YH0IH0Uy(-5{O#0PwV7ir;y|F6MIJxj
z<ILqAOPR0;(3gg$&Y*yN<nm7#q}Y&qiSPC<9>uw%5*<=n2|K1nG0m)Zw?s&-O-ZaE
z=JJrL8Nes-6bc8@f~Ygm+D&O&acMPcn9l>dn>E{eHrZ{MO&Y3FXqt$94?-PPt$Mu-
z2lxyCGKo}|7yR_(I)3T$bGhc4K7AK>&)G58y?eoHZ=Ue^&ztb#8)y9LJqP%2e{`J3
z%Z%RIoLJ}9=rE=CT`HLDCQi}_E)7Yo_pfT`zVG(mHD72+PpoULdozFx7HmwJy95WF
z7)W5>*hta`T9xOm=bSy;0?=YLm#CY~8>@?xRH&@V*&ve{#af?ywTBgVnrjz8EV(e*
zV0?X#I4ua11+rE^;cb>SsENdsybBG^MZlmYa`sBbe45cOJhR|fmYTYXWFzRU$R`St
zf^u(YxatadCAmLD1C*(Ah=K&|AW|@u@gN3WCI*a4T|m8WJA7&TBJe3jN)VC8G`Xs9
zVH2LAij<4MWT#<gJFvUmFq=iHG7^Fyf-050Oxml?cqVhsI`Rt3BK*P1ZT#GUH&9B!
z*7=$|6NdeUGdn&0;~yU4C*QZu-@1E~|Kr6w{M3gtE^G_OmMdc2;Ie=>LfV-*8|_{j
zq|OrgCs8Iu#|?`iLeVEbbcFK!<C+}7XQ=`|riFW*xF^BTjg1Vd^gtUjX+zcmtQ|K+
z45`EvP*oPkWJ&3;e`}o1$qw}BA0Fa}3WucXZvbK$@Vy1&8w=(Sl!(tX^(~FMfoiG2
z1vUp35z@M*3mX}fo^m)~r|xm2*`h9m;jx1LdUT&KNC&^|p>qIR|LTU@5tk8+=FB0w
z8=pqjBtTp{_UTqEC(z6!#XYUL1?Vb~UbmPCXE2+^C@dC{$t1G98Q9rwm`@|MRw%Sr
zih3(z^<a%s)o>n$L^g{tzq<NqlzZc{%%L#&#IZC48AKMf;|G542p_sM=FnQnz|~sm
zpc8yCKu8%n+DfFO1Ef25l(wvSk|qX0``A$&)uj%UPdrAmyMz4)wv_>p7*hju^EDGm
z?RdvN(5~E15O%Y4X2kZtF|8#^Al7w+P=N~uI!Q&V8mf}wK#t2I)HM<!wAK<i!Xn~x
z$KXVv@saaRLBbXiDm>=C5+V+t;19yNs|5r{l?|9wx~CIO?N~ZJ!Y@mB>dPpEW6nXW
zA<P4eJ+U^KbiQ4mXoE{Cm9Bfu`WZwCG1{>crbu?G=jny??Y$<zcKfKrAZpZ|n@uB4
zohJXlp#V8a9kvo!WHt#t6yZ(d+j(qsEh`21Y$>@pAt2Tvaa=^gKzQ?+Rfd;)4A%n0
zm<m2!NU@QDlQMP*D$+5I6gNJ36GXZ}6ali8b^53KaN#WV#${q%;#77qMxv^fFZx=m
zM~oyuWuLF#0w{sk1qj-ZBhm)WNCGD`S{z&9Tzc6FV964~tfY4!L!#3~c{Bl{0)QZi
z<uc$3$PW$MZI*0QC2Q|XOy(lx0`5CofOw+MSx8Q;eN*7T?PH*7o-#<{IE;6?ti0N;
zwN0;t*j5=_TGuLAhDr=DyDQz@h=~arNX4qgO?Qbn?YKz<>ROmi13Oy{+j};f2AUca
zbW9n*KynI=fv%(0tmaS<SUAtUqg!D(rq@T87&vbwFQG9DYFUirBHFr&EH_n+YEE2=
z8)#QzxTHcY*xHRQ-N#9R3++>(J%ZGY7S;AoohDmbr#kmI&CVvylnESzQ`eENA7t^^
z!_-$UDrj`~0VHwJbq94YAX>$BEssuscATVUpoK<MHC*0645XLd)Mi$ZE%!B%qza|K
zgNS)0X^aBSTcV*hS1w?Rlw8`76u0og<!#Rg&ki7SsPpA=>IDq0?Q!_oOEBAh>L7tT
z=zK=KHKmzp27<IimsI-WfY|z68?^QocZf<Vpn*9gHENa2v@&<jCx`%=AS~vA-R+=p
z(cB<1wZ{YAr;lWrGc^)ofZPc>0iMAC;atATg~2iU{eo<1pgSetGgF$_0?E><df)d4
z3X|>7g|zo`!HFQ|&!yM2Q)`#5$&<=}BW<^?li9OsY~A%@aQ%?#++);NF9A>-K1P1v
zFyy%cClUb<(p4XHj4g=v$;_FG*%)=C{fxP92&8HXh&2#Nl^B?4SxnL7xSm7mhE&Ab
zio+BxKP>Q>x^-!Hkfz2|%z(o(h>-ipg{>ZEw|ijA+@te^5{}%m%<?rk@$qT-ltFUN
zuOW_Vvm#U>sd^KUEVCWoy1PAqvylWGf*2fN?zyzp$QeC$4hf<(0wF?Gs!PZ2PB4fB
zB6t7~Hb;vy^O>F#BRChyd#X@)TMw44EzyjY(8APSA3x9nRG>BgqEKP3o&ug1+G5z2
z)~8@T)!DUsEjwBO=xLj-ju~HFRq7go!Hb<&723h{n(MUp0)QVaA?EVfU+b=_#BODS
zq;oZBfz?S?v_GFFaS_@ONNC4<!4B{Wfs_@JN5s^~K%%`hi|B+pP81-$-UJlBCaD-M
zDSPfBPh82^oaQj{;4+%1$tQ07j3c<^NWC*(JSC7e|K&{s=iM3s!lcF)dx3z|l3w=o
zf*^KGBBWhH;u2_BiAFndm0UU-J99}QXexU?k4$%iK@>qq{253-bs;8KbrOZa<xmvP
zgiy$UmGxYo5phPLt&VlhxR4ZIq|~ux5_5H%3_37)1nEw$wf2*Ja)8K_&pvefq?0O8
zvhfN43Xepb&)T~*C;Zy3BWBV`k+)O`Xg^0XiI}Cbos^z3kT9jOc+@Rlhb*oV=exK<
ztj%z=cP9a=$3Qm9aVT&GQbSY~OUu<=On?)Fdmil*7db5Ji^F0jtX}81?v)2%Iwela
z$x{Le=hn&G!B_?AX$^f8Byb86c}%XF6>B2<ERYsa+i#tX!s1&H8Cc2Ej(9>{3G-P{
zt4oE5Oer#OGIiyQ^QfbW3s`*><i-dQiUQWxptn;Klkc6#PFc8aw`T($QXq{aP+Dr#
zT0$b-xCm(}lk38Qbf516g`?~1sruNlC`55FquJgtIAVK(x2rx0%uf2ft3d5cpB^S?
z)1w+LcxgZ(i=_6$6@GXWvH@}9{rJ)&wNAYdExbs{Akmb!?>h)JmZ&h-F0?uZi9_#a
zE;60LyUz@O3^EVV5gT~s7ae2y<^nmtMVyygPZ1>6T<#9k8#Q58YZF9?rV0(v2;>S;
zr=r9eTp(bO=@A|hAnlhibDf?Gu02|tW+=<ZVis+$RUz{jW#FBVYjrm`QwX0qY%wR9
zSE$UbgAj$@lIPHRV0CxKnPBU4%v5oblD7XpO*G@otxFFGNCGgur3seAf$U!j^kg-v
ztqSdH-IRH|UNY2}a(1(FZGGAYAkiTmr(4|u*mf0qkqOX15Ug@R!O+E%zK35vNx1kv
z;-Wz!rbz9{-q=KXD>*KQ80yr|+hSUYY5vUVJ?Q6=N6u#4bG8qKxiCAC<Ih>)j;|WP
zd`8%r5*O9RQ);3w!Wf_R!>mE-h+1Pcb(q8guG?^}{gRQ&h=4Xo(!G|{2s`N}8LBc;
zEh3>2yie-mosi{_XF~22FfwPBITWG{irnd#dHc+$;P`UIjr}XswWJ@uSyWfTOp@6-
z*gbn*;U=o3MRT3Hw`kTnP9|MT_q(4pm$UsnTMZqRbUW4;6|#c<shh|T98DGB5+Jr-
zc(bUM;E8G&5Gh%JS!}z7q|cN7y%dFjtD&i|7|6m1eGWf5fcPPCQ6qKg*=?o};UHVi
z0gd|%qDX8M%=G>2GZKWpk9_D{k24#6=s8$q^p-uZ`}za86ChW2h|>j9hL7wS``D9m
z?FNX;o2^QTj*Sq@h$RJxL2$Ts{9-SPDNE|@9izq&<k<5<i!`4mV-q-C*G}X7TGX9u
zDwS(8D|AHwFXUNDBA6nQc~c}5DD)YN?{W{l<v!zH;B(d=<X3m^q^t*IArP~Ox0ug*
zP$aMs07%#E*rov58`Y+Gz`1U*kLxPU{`+^*y(Zmj-HL>^a@i&Pc$xh0ahlyNq^`hu
z3?d!7vPZWT&&HH+knS@g(9O0n>O}>Kpa3X9YN|dpemLH<1H|n|A?qWJv@6#`Bpc^s
z0|y~M5I|i()PjylF+JEk6dyj@L#hl$9?Cx7@I~kN^jBShjfyxaiPI9P<s(nYwR7J0
z36eEC6(B~x;Cr4lGoBI(p-J-@DTq$6h{5Ah;i{bhkg@`u_`{wuWosIpa8-~!;Ii}%
zdvDwG8%P+F87MFjK-EbN1bpEbEal9l$E()Q@QRIx_>K8thQk`N+yvHxGiOztfsvL&
z=pDg8v1bw__IM{Y+BaM0o@AOqTHx&;D~asW(kt_Xoh=qmJg61yIM->R)iP-VB56$b
zJM&5D`Bdi@b%e;_l?Ge@Qw{~dK(gL+xWO{<vVdmpz(6#0fqco~GKDayvH}?mJb=`Q
zKPR%i>-d9*`yd(Y40+A#uJWy4`azg%6L+o6z_dmhx$u-+JD2A@3DL*00S~qwiBzBq
zO1quc3k3}kl7w`>OWSo50fT^ybfdcmzq#xvu%U?xvR4JtQh0OQ9A=hKKu1f3lj}2f
z-K&uokoP=g%vjDVzV6t&IO?vjU3v&j%f(CXQTj!yNi-9+)^SYNu(9Rhb=<t<B6h9q
zLJ}oe`yP_M7ud0#>lpPIVrY<Zkuqs!ok`T>9wis9Q<RFSPIA9YsoFm$YkLfl<LgmD
zlFBB%V@!J(5h2d-!zCg;qLqD#nbd-2V3!;OtM-nyejQ7Bs}Yk+3DD0X51!9>*O?)N
zKF@!_F8}Ep?qxjOAa2&GM2+r`9Cjtd^LxfV_9Q?eX3}VPAa%PC?OT@$bVP_D^(AN)
zLQ~lbgDMH#bgWrQ9;gANR5#s(L{cP+S0WCD2L(mJ5Q7GC?+hkqg$II1+F<FiC`g&D
zPuXeuykg}MzUj#CKv^;^U5b}FrU0~HK{_wHT1?jxcy^rbNgEhxS@(Y1hzXPqaM2*_
z#!Z22X^rCWH3mQer@ia~g8(9lnKnEIu|0>70LCoEQwjuG<iIK*jk=YhF^we?B0zvJ
zB^wTK`G8n8(0-9Amc6CM6M%Z$Xicad6EUzYV@c$V9~!W+HR1)&neuc0>;X<+bA@=h
z(d8S>c16(L`r`!&oR<LmnSU~~u^QY}5j-GPZzou1PS=V9n$p}mlk$B~O=9B{Slx#@
zb4#tdEhm;hP-wv0ahB_-N@Z}7oAMwQAL%oq<{fB;&-}oEV;cK>`N4Pdch`T5YSA#O
zJT8Pz;viYjkpxK>g7i7|f6>hnIBiR+(zO;S`vTc|4jgelrF#59n$4?vo@6F5l3+&1
zq)cY%`zEkR0Fk~wU_eE&W!%F0nuDMqK^?$gkmzvg^6laaAsdd7+T6FKM&zp=3p<bi
zu`vslS#H`%j>1QFw&AxwIO5fJ&G>KM^EfwOw?#Nt6Q&E|ZcVcrh&4zpA8<o|WzX2h
zo=mdA=dp~$DlDAGf%KKq8k@9H%5j+jMNpYdU51>87+NidQ)gB0!6k}145iYUeRtRL
zKE*puz^Teu7S21pZw*KczKBB=D(xGt@L`Gz4k#tpukj5>ewSe$`QDv3uq`82iyBFZ
z62x^Ix!@e#B@yk3X`DbzPozkObf0vgT@K`kX<-T;>Gr~dZcLPhRP>8bUp_~D>8wsD
zlNvj=Q{^^x*Cf$NJhbDc_OkSpQ8XAEVNeK%)*{p;QrEU*Us6WcRZ#B&f*%hdIt39>
zaQf>xzORMUM!hi}?6@%{@@Wps0q3@IzWj45{_5vmVs*WwenQ`KRkUU<)N^oNkV-xP
z@YG@?hi@iYw*C&hzpOx4mTt^ktNpO3IhqC79;3F6B)CWlwk@ENR@~Fx>s4A4lXPZg
zZ8a+fjG3v8l>zzW_NnE$U2|dzC3vsb_1pm|v=io15XAF;ANXCq^T5xs9<Fk^8W3$#
zkxqOPlM;lE3)oT{+A&MYK9ST#LLh|5tafZxIU9?Djd{lIEK<(qRMQ!gNzKMo_RO=n
z$eA@>KNC$c=(u{Oc6jia#u0Hb*JC{wNQ$N>q^gIQKrk@Cl&KvPf{h3rrK)Qo)b_b1
z>T>-9OAVAY)D2Pv%tf=TPzhlQ&D?r6cqE8|<4ujE5sTOD-D@QM)0(IwW(dp|j$?-+
zU-SAYtA0WGctf+>s4Le@g?a+EFL0Db{&>&$820fL$>PI#6Gh~=ajXF+Llp^gv4wRB
z2!#V(d8!iYLNq8`_v<D$_IK-W`@xM*E*+r9;K75&MNUL5Q$Q3LM3O&i**XQrVyMJv
zQcum|1w4Oa^(~w(F7vOq-oU%c+f}7TS&af<V0V^<IBETCKIVU$bFB%`GI(YohuCn8
zi(K!|al&8aaJIvdV#0y`0-t-fS>dv*a;Y5i#B|JqyN5W>VO@)~ls6PUAhdUsm#WlW
z2gFD$XX@JFyh7HNvNVcxw+gg7>A2myfpirTRFQGNVG#p$2ny2S)yR>R1{R_aMFmM9
z2ow&V+p>w^$O=?7<GciMWb4{Sjj)K|+ItZLX#r}CZFO!SYXb8tfruq7?1N1Su?F7*
zY2=awx#uZweJKGS>o@`4Esj?Ts2YVuBpamUK*|<ilgWaYcKuzNJ4xz<cSx6^M4BDD
zbe;-OJyyA3u3gaU3Wc*;K##MUJ0OP`RK+wN^48!m(_@36yDcrX<ZOj8uNdCPEyaJ}
zM|WP$&&*!I<*?3bR-!MfB;U%3(A^YG+7<D7-Yub;H5rRNTa|5IRou_rgZp^?;1O;d
zZL&0k{vabC4|T&Z*YDwaJ4o*`wd*mN3lCly@b)vyyy@&w{&4peb_Z*$^cz)S+kRga
zsM)%T%qPTZVN9ous3Ac@i>b~M^fn~vS{F1_$ym(c3tzFr)y<M$`~4j1$TLsX99pYk
zDoACDWb;0Sc7Cd%E)^tSWMqSaW_zw3SBtSD)~1@Sy(2zeAyPQ4;yby_QP3g->j@r3
zz&j*DsO()8LF)L31UdiofK<h+BJv>k9ZaHQ8Oa8jty(p=!N3R+ni`6jvUfUoQjBDN
zs#T67lGy1emuug^ATpN@hv<kmSIq+ms)~}bcsQ%SgEToCl6y#c2@<X7Korkr9CI+A
z@T~{_2Y2s5^&>l<!P}~5u*;Ao1Il3v?W9v{=k}Qss>LyDa+(l1<t}h{??b$9{9ax%
zeuM*qil#rN?k^E~L*_*f_RQr4&VST;_^d}Z?6GpV&r5H~__P--`0B?#%&*_`C_i!E
zjl6SqEB*0+ajppw++a-a_zg(CP-Rk>LPOX)mde~b+5mMI^mW%j*-2Z$NN!=2NGvm6
za8t?YmCO9vTaG{@Jo~x|`W0~lqQ>LqiUxs9aFkF75NzuhhXg2=JkFz_fW3#l9Vf;`
z(D#7MGIa(VC?o{Y5C!pA?|K8Sux?qUywl~be#$XYY{Z2sJ`@^xB1YLUnWmWsq!w&j
z`IODE%7c0yP0EwNo9kyWl0EMoM*seEie@AcLqW(%B|bi7;S4gp=Oy9|w4#6_$I68i
zFe@JtJgv&-<m)>iZPv^r4%A*b{2>3~@Q?7_>p#JZiw|lU%9U!wPSc}`j#N$*Q~abR
zgea83v0dj}S>!Z}1-Hvb`1_;($&VfW_xziqKhI~ae}vw!&qi^WUBAL27Br0zEv2g#
z)QBO_R6*BeZO<H=y~C_O_YS`1Zye+2zVczd;nbVyZJlRx?y#nZ2taR$Upq>E_*(K~
zH&7hE2|rp*RnzShy;?d>b5yhqkv2f--`D_wqpR@hXYX?8zyh+!i*8;(Q`0O0`r=p7
zJ_o)hzyj(S8hpzF?<3jJ;m3}su~dpz2~kbY>p)n9PBn#E)Yyh#-jl{$>RKlFQB{=R
z-!q<aj1=lvH&wW|f8AQMczkCw8c1OgXyzW*cesenU!+(;CuT#67ut&Bhyvbj)8<I6
zQzR~=`CWy`k?&c^fM@_^=GxgP5nRMT(pU&7v}zp%Nr?myG9s=HiP%(To?uewoL<_B
zWBRV<uP?og&lujrA1rR+cjwRM1J$)W+8kj^`Uu|Uu0Svo$fRM#O?YO0k=qAP@QUGw
zdEww;P83_J1~WHgMgih+3S!zFyxluaaQ0HTv<w2NDrQqhxwOi$mmcO{-f@}d{m(z<
zTi$pR57#%bJ_<M&lQ^1+y1|J2=ncrZ2ME(`Q>K)SYi0bpz3w`lh|<Kf0#CiDSsKIj
zM`3iN+EdRdzqgff$EgY?8XplBLaYUpNg*3~h+2aO0KTReMZ&5FQ!PA5Yo&nTK!J>9
zu!<bgHabo{Dnb*jEDcp6sR5rt2???h8_U=|WksrG9?N(}C0Dp;@}P1VN=e)4J7<c7
zp4W>=Q@4Y^w8Vn;OX>mHe-{R%tE0Yf<Z7xarba3L$ub3vtd-q^yr&SRrYELK9s%8;
z%iORasf$sXoV4aEnOaFt-MwW$=dX<an16HdC-)TPhxz^k|Cw)E`R{zu@GZQect0=6
z@8zX?_Uht2eAVc8`S!J6;D-+VC_i@ONBEw@KhGB|zgrUsyE0-YjtJtRTUF2s;zhyE
z(t0WHL1J27EfA}U-JP1np`-lOue+Wf{rvm6sl1P^nNBdbRVD;|p1gqm2uT^b^t~}K
zq`jZ3wEul6dnxH_OH;$5=J0aOvDFfM!z-UT<$0&)99{~@#9r=sB%1O9_#QT=Wclp6
zCLcxe9#93nN2AuRHfW+|;Ajl^q(n$C$QnTqg(%Evl@=j-{SPJZs08@f_GDtDMz%vG
zPgtDu5miPJ7h|NF2eM@kxkG9t##W(vLZj=2$oqOZfs@cxu$=j71}F|m$|jKFcCbTJ
zB(Ehsq42~g3X5dm1Y1JkK%4@f*);{Kum&s&mMHW@LDjLTiFH&E#S5+y$UPK}6f;}F
zu3CnOP{uxs*i%(InQw4IaS1HrH;X+Q$yAwoE--Q>eb*3iR8mk<FpK>pyAo0#i^fng
zaBx`BZ-y&+xPD)g4t{BbUtJ^Xuj=Qhb|G`nFL1G<p47<dh?jr$Gx)*zz5E})T5#E)
z)|jc)n9_NTmt?++!{9(#z3Sv+FVpC(eAOy$bwO)bR2*B299o*G0)6`Ja}LHid5n}3
zh$RY>1QbT!bNc(DRsg_b${W?RU^;m!kc_BaQ(88W;!{(wU|*wj#M(mQJSnOIQpvBo
zi~#VIlMT(Rx!f$m93VzM1Z;?K5JbC`=GC6{b5o||szpKX50^8G-7(k&-;PT=F;b`C
z(hk!P&0M=)M(lYF(jDNiY6k@GoI(==q&cUkpQ8_$%jY%5vvhgWXn(cnGc6aw17*N9
z9@n?YDY5tf>+EX1ys(yF^O!NS{??wz(APLBz$rYX6wIXGmRpg|Ivqkg`y~=vYi|T_
zrjTS_o9E|8j!;~Gn*7i@lqK{=#8{FEg#M5+AM%<nxt=e*?@_+z!J`aTY(;NUdcyV<
z!erYNCY5l}2B_o4*=-U?Nxfn;km{P-PSy;EQ)Jt5+lhwL!<urYu&Rd>st5s9q<ksY
z7zxYDNeg6wCfHo2q(2CjP>Q7{69DN}qbn%tQQ7-}6%nN3VrsTxEx!%$w16}@vvXF8
z%yzxtqJwh+2N5kARalBuhfC>X#DbY}8VMoI6(x8qB`ztBO8Y1oFk+8Mk|L5?DFAuT
z6Z@IXF+`k8isTW6ChL1FCc=ALZqZ9|lEH88T%ewmG=m|-M#%aOpWDA}-k|elJ>5eo
zxj6w$Rq;w|M(SOVQFp7P0Y0vEE8u<WWp<LlBLw317Ukv!^_fTMKliy5hYsT|Pw__%
zFgtS}qZhrD#ia>-S@0Qm!jIl}nR#=9eijWP59N&J>RBW-Wb4O}YC)LqB-m(Gb9b_I
zsl%2ekTjaF2~7=o!(F#7z|E*jC~|NGRMUv_g2qP;m?uO&_V@y1o)RQ!fwJ|LN4*O`
zk{U(St&@;c3`oxep`OM)6MU`^5hK=~KtMfY-Y0>FpEi(g|6iA;>5Sb!dS?DU;8`Z!
z)Uyat<03V&za~ES)MZ0c2}R!-M_3xv<0S21?vwy9>1ufkY4-w`dRAD2N8j@leXoiU
zOAWZq^;7jxweWoqQ$dZFMD*W=DX1eQ6LKdouh?D`#Ia{6j-sdE2WPO$B3QE%XBkV>
zIvsaN=jon2DS#YFc|P{DkedB@$RI3A7Vmx!_4*nzoil#P%L!X^X217V1}}dZ^Edq-
z+2bRM-c3xSfQv~Cb&+3Awtk%a@O3no9)-!KDlw!4N8%~LBpo%fZb4BE7J;R;n&;fG
zi^if6f(SvOiQrI>qybY5&CDUvUIGDNeK$-&+LMhQEB-dJgDJejpwsw>W*SrD%2qfk
z7DMsNc*2tfDFgVE*w-G<Zjd0KiC8&M9Vu3F1xG|!Od4i8fvlfVmx12E(Hmw4Onaws
zOHklioq`<gcE0JJ9=7g*GtiKT7b{ftl2YP@LyrZrUTTVxWd@S>#t{l0z{RVMvVyE<
z-!r7x&lNt!Z??{b0Ntewv;*}N>~+C$$xTeJ=f~$r#3sKRHC1<2#2E3jUGi!|wtbnr
zKcIZ*e#Qru89a6`KmOi>{8s&9hPmJ&mH)U5KU&9+4-n@&gw3-!^DvB*t{WGnvo#C|
zDdpU#TPNEU&wu8eZ~USu#k{6zz*()Fro3yRnu!JPqRKEjt(%G=vj)8;1_Pj3<5|EZ
zs&ynnm|Hdv>^`Z+&Y=m7YAb?MHM1V`W?rGaD5d)bBHKiGGM4{IL5fX$FgY0NXHsrA
zjE<_mtpJ6lA`c20^GRT|mZv}zXA^CvK7v68h`DZJ;$)w3sl=rnD|uB52pMkAKyZ=N
z%T5GUpuUGH;t^a1&RX;uw15Il00upwkcNxrqJpx#UN9PG^jsvjz7Oi+<qnVUE~-OX
z{p#!hXzw_fh?4gDq}WlS&UuXb0@8fcY6ZwRg+U%!8`fk6T&<R<E-hHvev~0|uD<#A
z`Q42h`0>dr@wwntF??G|oz~wGHqY7QY>{^JOG=rP2Wc;tu;;95lo%8ws2iSrea&bo
zP;Xm$+ZhB=i$u|&A5q2Vt>xrnr|E0mY&nAXmO`iPQ=K3f1WAp+wHy6Aix*;Pb$W%p
zU(u=>OrWLVP2_Us$y4!(fE4(Eb6f(BfR%l0)eH~z!8`In1`g^fs7fuS+Tlmz8H0mp
z^B&$i%w@7bo&=EvNCr<zJ&VES45mCI>kG~nh|xrR%F-z`&N<Bhp^BCA@vRaiQJ56K
zqwB&G=K~j?h?Mil@>;=YHDfsP6nJtX4pQph+i2<n>~FMJb`s;0a^uWXB1A#o%Svc!
zp=lrlAwyU$YRV?(cXzMh_qVU*{W}LKW6ptM!GU4J#d3-FH#e~8A7m+Oh%xW9G{HN~
z+QsQMA}&FcVj&ytd7-o0gc$86l}Od#hBdFevsAc3C8V+>RV57(RE<zqj$+koq9M*~
zEfFLjd{W35?V82h>K+Eb3og=%jRYWCHZNF3LsWRv#?b+h%KbNhPbx@v-4`DIgWIxq
z<M?a<pFuSZx|K>kDs*q5e9soMKyRGuFT7j`d5;uqTUy$C%L*Bg;E<S-6DCt6xLOTv
zOo|;88D4TwXapZr@-e|t$W%p~PfhPqPw>>2FFKki99R_&t~nk((;!j*{fws>qm?~d
z%IJ?WdO9Bks&bP4-EN<~{X2aP(zX57Cr#rhEIOr7i^iP_QUfsxBiE4o$XhqB;TJdW
z;16b}m^I63kyhzpRzOi`t==dXV!OICDG8qNQIP5?b(n2IL|dH%5@gAZ5>q6J4a@@9
zoT_>GGb-2(M4JfpC=k?hAy^*}2?9>&ty#~A()!nVAcDg{5mRqS#j1@><^qJIRyst$
z6sws9L?kJYQ^0T;NW%lM=C?oTAOVPQuY=FVUgWqC=9@Ju<DM!{Z<OiQDw&q^3+mpj
z<bW6u*g`f<GvlIbmE1e;5;)kk)Djt&h_d}=J-)~h5mbq4vA9NXDR{@!197Ary<k~4
zZvm_V$mx@wa~C4JTY=DE8<Rz5OM&5%suTU8*JMOic&nyJhD%U9IcqORu@$p~pr-0m
zmud=Bh>ncFN>=lDwZhNs0rV@ox3S9svc6My)ayUW+Z>c_K<zWc`{atXfkwo(m6TT6
z*v>(^4I*3D5_AD1=tvcK>8%yV57snSQZG8OpLeLNE;3UPG+U?3#;btT(SWf?00ph(
z20L$RU5bH7d)^4FXc`5!Sp-NRAr=M@g;@Jv#LMod3Z%CI-{^48rcs!0H;fMlvchW<
z5pgArwKrZ&0-+X#Cap4t7$PBhGRq2yNwrg$Kycl^-su`hf{NVZ$nB!wYKw&cTq;Xy
zcRWf#vZ|HAR5y`B2jGU&86WsSrH?nYP?f@B=9y0-gHg6;j^1$3`WZz}D=n;dp2PcY
z^Z#V7{c;Lvxp@$xDUe#D@X#zGA(#L-82bwEgkRa-i+MJl!$ZwAxIw{4x4rL!%4G()
zR=lQAiR-EecF84>Atu<m4I+_l0joh3t;R4w-9WGAuim}D`9L{~_6@+1;FBiJC5=va
zvVj$_)(T#C?TyfiC#AxAiO^ZX;S4?mnn@%sBCfD3tb?Rh?qaO@u}_4F>=Oa$YYzIW
zz!y2ky5NY;QO!lOT!ZC8q1oB2b@bj5g3ur4dzKkUV(|o;;RA=J$W?7p?2)>yrt3PQ
zqg_m+eI{K>or+RBAuB$`43{Q_ZQVNNWU{=LadiW>HXD631_g>x>qt{Ur79shR*Q68
zml1WrYIDQV@t(y!!&D~f=gLK-oU7^aVx~&YVmDIFRDp=jDLkvb;zAhnAFe)^e}DBw
zT;(u>aYnB{z!d|q-7!>soX43eforc9GDWsx&g5RtcZl=t*0Z#L>#9_OC@oJVmatQE
z`^_`H<0~f&B~a}|pj~NSZZtZtV<~P{t}p1VInAy~X<kE8L7Wp*S*8IHP&G<`JL#$>
zpl06-p9$^F>p&X+GdO-42Y)jA1VQ@GS7r7!2eW62@I0JH)8Ij<>&S4er)lEd&01dw
zU38^cInQW0$C)3DfX|(RRF}eNH8-h-1O-W!ah;{yu9GIWz~4p^O&DnDIBUa{>gc?}
z6e0`<j^T37h4WFt0KvK!>8LPSJ*9$DqEILp29|=6OdDF3c6~9?p5@vtR?qc%U@_5q
zRCAkiD>T+&K&_P$Z<(FqUtPS5-=Exy^al(_1+F*16@ADGoXgT1V96O%fmGGq9nAo+
zKu^CMv7W<hJ0%ag5G9b>%9K*+p@vYwwBaj1bC)-~YEE@k1AQFQiqFc;hGwE}9Q_r~
z%FR8Thd39clJq<zkgBM$4$&YA2^tbe24ISz=9e2)Ip-C~6lcRsD);rN$;qF@K0%NG
zzWRV$0lokSf~nFXYWjP)QmFeg*{&5NfDllS^1ercwJOUTRTY_THH_B^%ym!mD`tjM
zQl<915|GaED71DHY=8tGBn84d1IpY^uvo&YlCG|0NS<-=Tw^g8NQi_6okI(IR@bUN
zsKOXrduB=mb%{Y`08N8}QqBYVd;^Vw7pb+6xqvvbL5?pnoJ5x0f}POgCpVwT4_<x|
z7vf=^pDPC1SqHM70hHY54kYcSDlMq6`+A5V^DT%?t3*i01WzYcN){m2Fsm6aFZiyn
z+UC^ZhQ-y01nDdaUR-XdCjkO1oh}$1%ZQa&2Cl6t&PG)v>m3rC_T)DhKqS!d=+Aa>
zr2$f+3vcs@$bWY}{@|YR3D_qN(pMeu69-=kZY<6rVCh(4e4s}Zr#t6~rJO?}6#YyC
zb#d4Pn-CprU8?CX<?5cqVE!FRl}M_C7!0lB6bGg23Wx!f;4{!10xbm+?+r2mNs5IC
z2M^^;7O-)tL6Zx)$5Qto5QC}|O{Jz2(bXa-7?mnfpq%M7RkmR9fVi|Gvz`Y+85Qts
zkWmZ^+d)vb)#Uy2BYf|r7xHU6cTnd;dc#~*2#bes8G>sA)a|Rczr_Rsc%+)bp5c6}
z6fm_}4y|rOU`7OKRE^lJ`P`RH_y?cAOEVGb-3UT5Kq4$I)zmwIeCSxcwMW*2IFA}H
zIgtcW`kaDR?*?LN_uEQjhwX}pYO|r<i3$-u6#$TN8Ag8_ii=S23D_qN(vNS*)>p0j
z=Oa9mv>OGBX+zdiRnj=AE+d(TpuseZmkaX3>9Lp`Zy9i_2Ma7im*SZ$y|6;3J+cmT
zV<%f?kkp1&yrt&|wBx4CMgfBf!I5Wh=xD+AuCTLVFcnsTUVPLtvcg-_e*GG4rS$5?
zqR$kLEc0O5s!#=UH5|ntrx+FVdrqswd$Hn7wam|M-o_7Ic^;26$8m$4!eSw^zSZ`5
z3v~oqz<{)_k@jXy;3SBmngU5aK&lzkm7XWJtx<UCEyG|9dP`8xK|)faP=oHrRPmi(
zy2TwgmCUbdb`EhQV4W%s^GlV2v~+FG@~IqYqD`76DRgO`3cM<kf+3;(49Ro=yB>ta
z)quk3N#R2-#Mz;X&Gs$d7p6yMd&VbVpEyVWdmt?fydmup;ixL1ECVZt`sgNLyEWbe
zsH;PNkTY1y(jGYi)7{8yw_$0mpf~WuD5PD@)y+zBZE6JxB3!zj;7Zbs^E#T#hXCn$
zEIcxZ%&h}J(BmME!N76gNRQ2psJo@-8GxxDV!)(DhYC)v8A-f;O+Z9l!BE=rXHd9`
zVa{-zu{01yuGXyK{j(L#$o>1Pck=eh4Z1P3x_YWY1IP-*8AL*I&umPv&`u~Mh`QHO
zGe^jK3XRNn(hE$0!3wNg1EYg5SOv`(Z9oiw#YS<VNrt<gJ>{Q$@fN-o${n!+-}X)%
zv5Cyi)_QII89lNgs9RUk&ekE=h{i~>NVOesq<ge#{SsKtqp?}J5lwLI)yP4boNDvd
zbtzY$kh=e_J>wIwrwG!TKMQ;zu&zxt0C3EA19?BwKz(bYwi+j=fQUH8t5%!W2p(9J
zqAzFB^DM2KD&ei9J!SAnzkoJKc9!xH$t4t0)j>)wB=;|=siBD##M;D=h^V@S2&1v*
z;PF0Nn?dKv`h8E9r+=SwiA=1rJ=$EF-6z*2@1Eh%vpj<3fiNs0Rd75q8}i2OWBj+x
z8~KUNJNU!tX?Fdxs!-PJgQ<}7IgpXUfRD3tg~Yb<2wmt%qnZHoEhu*tT$P7n2y55b
zYCE7=z}DmH0zw2t0Y?VlgzxyG3%uy|8M94CGwUP+Y+gs0K2b6{ma}}iKpLw8udwG+
zvO$kUQPTLR-c>T~UVBtayi#qeYpGB{s=1tRoq*~jSzh6?=4YJ`d;<2=K>CR-nSJHD
zKLxzh3NMME0rY&@uza9LxzIgcvC<q3%m>4a;W)QBBh7FzokRs~c`a9$Nen(gfV4{m
z(ovxVQ|BB=t{!+b(!{I*YL@nR1w1KDj@~B(SX%NNINDP;Z?fI6QUr!sq~~SNB83;V
z+(os*MFzRB+=p=?^b5#ym`lN9)rb#HS9#0!QGRjbdVYTMX5KtG&7<`ZN<V~tf$#M!
zr9Hs;0$dIl_|bLVf4X4V011-rhuZT>9v0iMb5311R!)Eb!*$4qAi*Fy1LZapBYlqE
zDimXw_Idf8TYTpm9w%!ei-{0wD-dl0Zn&iF!l>q2g<Wkm8XM(9N30@Y0R)2}0Rq_I
zpqXg;+c@fi<fJ{(U2X=Vxpe{z3plqmWP9so)_OVOW$KWh0_so2JW^Mc4rL1>Uy0!H
z9<hnf*(9jy^vAhYIhb$|f`B-dR&B%F2vr%GP9t>{Rh7n?3MVN9bX3XFPJz1wQ#<92
zvDJnqRi7(VDYjArM1e|6>1o5nv6DUCy1B}4UN}lc!FJ5p4F!{sF^M0wk6!DuDFdDJ
zIa7_eXSUAoPmb}syC?Wx+t>2nw{GA!cdz9=vuk*wImq0PpvZB(J<IzEAT3)j5T9JR
z)^df80ni0S+Q1+vn79nc(uh-)(eveF3bDeXSpbWLcF#jSg{5OKKB6Fjx)(T^@~=Pt
zex7^77L)CadXBLgaUv8auZIwj={EI_kdGYWYcisi_<$reqD4>|HOp5|lOm<LqxQ4v
z*3E@#Gk_RGIc&@wzyIjXT-#sOt$e_3f&3R>@uvdPSFXBqz}*5jIEzCfy1atfEHGLw
zXc|=_Qw&jXwB~EMuqlVg?j-7S5`?9d9EHr0UUJY_17pcxA>r0_^U?^|9RsZcRNFiT
z4+81BH<%)fhj8L#kKdY{;-{auiFY)|_=9kqw^k?B-dvvIO&_(zDc<-|o1f$zvy*(V
zJjTQIAufkiN;iPKK;bD0oT`txaCw?o#b?;WM@K>SwRX&u)-1)?+RjrIWpV+gmtnD?
zaOgArRgHl_NF^0%CklK9!voM;0TERwC1$JUbD#G(|Kzm~(<~f|DM&3i1gR_XL&qtu
zxt8YA6U503oMUjrE6-A6YLrsgv=SsqJ?rg&&Plm8K&}lO4yd*x%~ZgeiVi*e=zZ5S
zTU^V_56-Ba#|al?QU93KvD`EMg!a@y`pGScU$N$EgfFyzsi_j`(uE-8eXk&?0tkAo
z39!7{(-?y&Os0XV)(KB~gN)&_x7Gy?T5Sb9$;VDgVs~k0^MHL}ve6}F(rY&2+xOG+
zAkI+*&+$RcXI#6@BlA8VI=@CK1#{P9CPQWnSuj*snmrS5P!t*DW<?M3zS%%WvX5F1
zvI3j}l)4@Y9os)HN{XXa%@h(nHi+2x2%LKtY&{G+PpGl`n2yxD3JE@k7}QXRB4CTV
zTxQKyDkXqP&HB<7KlFtk;`&1~c6KwptoS!IzCWaY%QJA9&|G+eIIpxfT{Zv-smzB~
zIMr4q1u|&H&U!7R+t7tbg1L1yI1lSR_}#}>`T0lg<SR~0_s$!dS||>!o>{*88UML|
z<B59D_!HVw2MORSR{c4IFA(IQ_a5<%AdaSqlvQkPI3^K5OJeBvGsde02uvpp^F_4s
zH(1dL+V(z}NOH9#+U4Yqb>k*G>?%_NExB}_Hb5kJ)JO>ndu9<lE4{#HUAN8E#_|4h
zOMnAwt4o%v*`6_`Fg=6C6vx0(^B*;JwGzPHD)P1gDX7a5TmZg+dIp;h!lip);{g~P
zfc_c)Y(1pl=yOT&42tt00mjEj-H94fnmg(-(dLZG5~el(_%rY4D_?Y$tx2H*CHj#F
z5e7HiM1JTnak4>k=?YR-_`bt=1&FY)`7YXj3|uRw(`PkfmnL^zQY6}LT{DYTmISLk
zIJ=$k_uhLK&t5M0{6klmNrB8u#&_QE@X5dT*Z=eK^Y4gz#-Grh9*}-&TjpQB>Q@n7
z1=x1_pe|h#5uw#1+*Dd!yyX=w?bpf6o!v$isHsIE8;x_s-~rcOQ42u3><8%X2J!J=
zN{jHi?j3EH4$`p!O&L9-LU`q=Z6p`|=)wxI=|L|`fEYk+E5H}v^8^oVc<8DQ){6`z
znmO<pggV7F-qdVz4$l1{Y(AuFL^IP^hUJs`JUfp<wQH^;W~o1#f-*XmGIV7P>RAMU
z1Xx|dcEhWm@fhFpy8Ce=%%`4M8W2rG|I`Wk*I$c-nlRZST-typ;Creu#JMurNq0LW
zK@yd91+Ll&$wN(yCFMp<fom4RsDQeLZ+`!Cc>nH={KJ!vbD*ec$kpXsf6WW-nSAJ>
zpV>1$5i^jUy8ZPP|2XhvA~LpY7a@weYYI~4T2<HprOxET>UtjsY;8A$08W4Qu(Dd{
zJdA<Zg4bE1!qJ|L1v5KO^k6{l50gRE+59;vRj1ZZt&EOdCcOIEZLV1^`QuAVOs7L^
zD-4pt*s+1ChHFEE?5{q~L%9R9%TO$-nt@kfxcFXm)tFy}{)#GvLNvc*(3;9sJJ6J{
z^BC-$Nv<O#LlP*1LqHF<r{u+q6DxCe7Z#`nD@@%EoH}xaAOE8Fb9#No)+8s+ZGWS(
zrZ{qd!R<FFu(6sGc6VtmZ2?ggDW-HcuCsk+w{X6m#66QF*h!7jv4>b`d_>`3=;7af
z@CJVR@t5%WW1GBT<s1tspo#d^0oVNX*Zo@m_~GB)Gd=-(`at@b9ohQptNsAO%fx}t
zGXRZ^>PA(>RLKH%qiL}SnhsxH>8X1+odxpTQ&mE*?-?yyzXxx?I8ybvr=?g42z$=1
zJ!zPvrDkfbb*@8Fs&t7uIzn{3@aTk>p4euy@_b}t2xSIDK$41Ju|{%}x-U<cBk+Z(
z%scIVRCu`ZK}{5>I+R;5y#SN5daP=fv{#?e`-`i90ZkWRoPbnNPGNhC=bXCAkNmX@
zoa}G##{1U5Sv}ou<lyoq|Nise&nvFK%GKRMvt-hsN|Ya5X86qO@q+<URY+56lA*c0
zh0AUCzd3CeE{dHypbZ!}oj+=<oa$pWVXAhcPTa2b;TIn{!goDz7c0vn{?7vsa5S4!
zyMi#8vVQk-xaNyq_aptohu*hmd?J<sJdLXKF!1F>8F`;6OuCJK9T7m|CsPUYSQN6l
zj2t-FSI9QEDr+AHO(iU?=H!K5NDyGl!j%?iD@uEJ71}T%T{jO&Fm*D3t;+H?upLN)
zILhF;VP&xwH(lknwF$d*<jO**DuF7hQQM}&Y0Xb3Z@cfxzha~=8k-Nm<Z+l?R3Pz5
z^=KCQj9$aFK{3@eW$Y@EnJvqOW|ObFYl|QI8sYh;&+{99l=HR+jsgu#gj0vE@E<?_
zJ$&x1m)MvTsuWUx)Ecs-0i$PKOSUpXnxHNeArN+^G*`D3gjg9kNP<0qlYmOe19j_S
zZ4#93wcZ7Z>ejL5;cXX}`IdWM!cK85pSymJ*YzJ};d)3N@#CE9|IaU3j8C8Z9+&xZ
zd&VbX8Nk!2N?*3@k0IP82w9$icbaerL2$n97KJE?xp-Ly>j!#lZ#Nn{<+<0<d&lx>
zL6q(bE~I#gl)=L#JUTELdqzSFrgUQ0TQGGF?36B0^We$7@Vq0FJ)o}esuLT$?Dz)H
zJ-op+%eyS~W-JwRA`SD}LG7XO#${|F-FdlvPZI!Co2n{gMF)uFHqx<=oxA{u7(_T1
z_>M2g`R*@UX00EP3m16PgCpL$XGK2a4bMEw_rLyLKJB^<Hg<Cs6ObBW9mvLgMt598
zzA{v(P=RX{-sZ|SVPi)jP@~&b3tWe7^<+vd4eG#?0&smylMLf3^2lzFZ@A}0oC!B@
zd_CvOdmrGapHS1I+1=&j7rvTPU-H`b$H~?2mTKDU8J~bXy&wU6*@}M@$CpZ!k;@#a
zN=;N%vh=kAC73E1OtV>FWhK`l(CzJ70TP^M_q0#KFe3)Rw@PsU+O>6E0Ma!(urVFC
zabX{I+7G7gC!JGuV%~Uq8Ju2OaOdF(cOTp4HK#WCywjKYikr{zg*Tkz(~e%|xreT@
zKA5vn=1i-i+YVS-5GX(z<4B!=c{0|Gzq+6jAw<T#hVT92$Tz;eAO_gEc!hep;N)P&
zGf$l7tDg4+|JPklaB^wR)$N>WYCRL0hHTtpeCsiawUI)F2vRmCyilFJOqi6ZrV$W@
zs>`=ah#4T-+)<B_E=)QI<kP_J%<)e?_#FOl=T-&>4)EIkqrAp_n9}#DcV?_U<0QBL
zqpu_%hTm{G|6|Yi1nubu>1TK4>X$D2A@J!EAuBQfRV5KY05XqN-x^4o;iIY|2iAK`
zW`U;C_QL2|omyC3E66h6ikDJ@d(={egB7Tz+PoGbNvY_%YU$ekuAZ<zP_7G989ehQ
zV-YgEgDN<F^UMmr^~f4$cKS?f7-lu6MiZI{8}r`&b#N}%1OmGcVG{f#0g^62L=dwW
z!5KtF!w>znlCOOY%uB~~V*>LX%E~c_4KFyc;KsFzat=G&8KDGh7xCWmfTf!bsaq#?
z0Gzr|v5Js+WKmH*ennk9@ZBuFq^c5dNIN4(wbKwPx{8$E0kS&cX2N%U_;&v5#XA|V
zALP^!{#two>r9zVBg4Z3?)>(zVfnTb#H){gm&|uQv}b&R_Vj}U@Yk07{W!juD67sv
zR^+NkO-QY6eQF9x6QTmJSm^F~n);qj1J<;WaxPlvxxA7QBWbM?E>&-1hD!?4a_PD;
zQ#wuOtuq1Xz~ca(ltOhuO^J#7Hivs4t@F$G9pR52KFqr>tn!grj~D~<2BIY+kTfFL
zGKMjP8I&8~vX2W;vY6l@sShG7k0MnS>G{CF`>Qkl=Bp~E3s1RQB9jSDP;eHdu&A8w
z!P?Ymd4(qU4h&ejZjEfvQ&4aQ*dp4pl#H-Fr8>V!oAcC)4Z5zHT_#kbb3()vAJM5~
z5C)6L&pdby|L)9-7%i>STRFsQ<X&D<-^=dI(_8X9_uD?7Bd>Zs@zTQ|CY0YwtQUL6
zCupA>kbZt5lRcQ`!0RPORVAFGtRv3q?W}mzlmmrKpD6=_z9)z(5zbt^`7E%soYNn8
z{d}u_E;aGM;xDWErdyxaW~qyhV;@Ja4OI8;lMx3;5a@Y$(a|Yyxale{J-Nm5c+SOA
z*xbsQPBLO_fEt?wRYMwRD$-1}hs7nmj_cIb87S?stw5sV>PYz77s2*CaB&j(?$<5&
z`p>MH){b%-h?5fUgr<hsB$^bM0odHm=<ty7iDjHt^;?y76yhu*ku+6sZi8lP3O+MM
z>G}YKh#!stG`_OmwYqf8EV*@R&~outB=EM!R{7Qs-%Zs&%+mTHt}7;d-sE@5cP3;j
zIWPQ{S98thy&SppII`IM_k_i7?io+TGJsEtDlPkafmb7(LeQNf>LwBmf+h;yd#kX<
zmRLYk&`@P+LMjsr=K8Iy737&C#uiMSIT+_%2Mna0#ui))CZVHFoiq7Z@sm6msDvm`
zT0-LX^*OJ(Zi`o*+~%eO6PEf5HW$Kl1}p^oA;97y?A{NqP(y&~Dm0Vi;;KcUZAgG<
z02yQl$AK@nGw|;|C+M`pPre_%?K2j9%j;_9(P`g^IBD>fw3+Q_<CdiArb2noGd?m<
zHA1jDJY!bpk|eqDWzFL84UL;zdtDhxb|S9VCtE*2oJ}Dpg-En)U1PY>jf=)v;PO_+
zx8Cz2KGNL4;q@hYOKW`A?wh#&!UyObAM=uLy^E8d|6;g$g}8Hm%Q^QAPMXVm##6Bj
z;FF|EVNaDV=p=0rbZLZhghm5JLKLfg^lIYJdpKLkoZ35C2UK<a@J=Uc5hvyolj5!R
zvS+;ARD}ZQs!7|`YXg#wB|Y0xGdu18wXaIGX$%ofNYv4BY^mn1<GXy;9#pS6wZ$C=
zC#(%i`gzH`5z6Tlsz+h51J%IB3qVK!wM^1zK%H8Ryy#TJmprH8TV7rBb<e4J=xoEc
z|GwvIU)J!?USCl~$81-SX#lHDolj)XBDhwcL2bLXbht-v=!vPfHbl?~*@iS_k!RE!
zQ_4#_sTw80kj5A(PMpLQ8O`Pf=EiG*YBP!ZhJ{5Y<U#n}58S~oU4Ax4)`qy1quero
zgqJ@28yvf%&)xt0c^vz!XTZiTaq}GB$<Mnu|4)0yQ?(4>lL*rTdobOE<JqDxW!9%!
z0PQ?P1hQOVQh*FJQp5eE7EWEfNPplMFIl`K7*MJGF>Pqlge^jwgf1YowdhG)*<Yb>
z9}6mJ9aX_GuRQ?Amug;cY{F+;yUFXX-`E>Bc){^G&pOm_<NAyfOB<{dm+>s<<<QUK
z-WYX(;8HJgXcV~ZP~Zh8;$CXH;q|u$zWR9$Uw>D_SL{Lbs%ry>v&dvO^1)rt>z@x_
zdw0X45>+0VM*w^d<xH4vhE~H!?Y*(yW3Xyf`ay6=>UKJh5CnWm07;0<&u<eJwSfdk
z`;V2>HN7K8=p8>!vwfAgJ2Uk|7v+W8)J?jQzg9&4*Tcv7?)zTEXuQN=WsP1XeAe0j
z!K+@q#f$&hZLGcUBwU#hH!tF(*(S!nL#!_B8BftZxgY_2@z}pt6A!|&EgjcDIto}N
zID#Y3Gn_R^iP03nClIWe1u;72Ghu0*F&N}XtAfU<DNLk5G!>${R#SfIVuEz$kkWHb
z+Og99K$+2js^k8(&P9m8BEX{Y1aS=W$f@O$=N_5!vTNZrH#lB*!-CJfso`^PfiJi<
zs{Pel17C7`;IG}$@YnAMeAzP^zTmdNXWbCF`()s@gTivA-Hw=7j>bc_;(7LI;kLt(
zon4`tM5w`*%%c!(H0mh;8te9#3WjTa@<C>*M+*F_h?Ef`?N~GO)Vm87mv-AFQ6!T(
zP^>O7xbY@pv!L17AkIrvjY^@OhJD3-xrm(G?eWd;ejewW!;D5Frqwd9%iqf1`Qm$d
z?l&Bxcg+~CR>;;Co`%WelOL|Oc79^dcpB`J57IA8Wor+nxrf&wk`z1zDw?&!L19UW
zx(+t~=1Hz}a^310%2HTa%CyUAOe-VXY4P-a8e|@qzD_3+f>c`61tDE`lI|iOGi}%I
za70@a>72L4(Ry}hmHDD^lmQx1$Qcx#gQLiiCE@s<U9<er5e|=p)d6H4f)!Jg(NPJ6
z4E(^+8#(f!&C8U+d@97!HU`K{`L_d;t2HqQ3edQqzuc!c%E8<>lN+P~sRU|CO-g91
z(e%QEuxRMUMw(C{Umh~L?Iy@Gn(Yn3&RkRF`aWo<UchxlzLyCS;XB`ZE5CF8dc+M_
zbtPZ>!uRmaU-uzy_`GGv3)q;!#sufJ`_P$lZ@%!g)5mvq_Kc@)2GXZMmF@vvg5$=N
z_3{W}YnPx7)=8(A5u(sEF*SMwfY#FU`CN!WSY63dVJoUe_Bp!-2_}QH<pQ>$>8MjD
zAWqLd$@!=DaraP2hh3$jQ~oCi5FON_U{Ob*M$dH&09h&o&(sVOfG9|9FMlJd;I?NJ
zp%Qkl)XcUURg&JgM}MhDF~}_rZDs7N94H!C29Fpa76UJ~O6D7jwDTV%h?+pY)MtF#
zwPZ`nG+P_Qsv>O9k)}~K(oEex*_-vA@XL=L;a~mnvmtn1dE+Ji)tBAF-}xJlv3x@h
z<~g!c!{!2K8P3Pvxb+WR9^brYJWckg0qGZ~6255U-{as*oMU7YqKHeC;0lv&gsknY
z2r0vds!8g=Y8gIZHjm(8c{#IRGD&e9cAPNL>sZ>owHbrk9|qS|CnTLoH-+1Uk3@4~
zMA9>K6$<GJT({Y*nH@MaNykQ~CGwCUpvQU*M=HmQwJ_glm|P8n8hWDv#kfz_Q-In#
z5(bc<5JAKUN(0!bM~h1*SLR5N_L3HDSRW}?2YV1*L%z03*qsm-Go%rk?U@4F*mf`7
z-wcfN$OD^0{_fkJtIcHo=@&l4_x#@v^X!+EkPV14kL=dSRs|xsfw1#H__@pPYyL^K
z6=lzOx-0|ul)yBT%U?M1JHYF`YiqQ^B+izu1Z!jE6)XV*$eS{x-VHGdlZjS9usqIE
z|7lYk1EKwL8d*L|$|Om5kR$^gU^=jMRjM<w*bb_@CY`TrEG0s9aBaYF?Gd`sUON&@
zTR-BRs5&8{6(oz@z-%j0FC4z;kq>)Tk>ZimR77ErfPqPynl?#T`!OaP74<x(1Op1R
z!qPiD-h=2E`RX!ZUeWAM07uv@6{N5bLTLcfHrEKTf?v6O9Y<~(@FQRU0B?BxHiNaC
zI4|~0knI|oGyr6MN4eqdz4HF-tNY8@_MY)H+NTaAfd4v^KmMYjztK7F)S9{U@)9F@
z7Dc<YYR#Rqss{_0$Wnt7Qy_ho$!^frSmSX<S~=^nOcTz#&JO8f*A>tx2?$9*h;#es
z)ILiv_E#x8-~U?DDYZ6?t_w={9d6^^ZcPDr8>70!)N|49K8szb7an|}6(~OQ0BwL$
z4??xBN8I&gy>raB8&$cqM=%!T!SLh?OSc`ykNQXz2$MNFzvMm5#*}7zt{@=*v|Y&n
z`N-o>jd;c@3%>euuW<N8L#zry>4>vH+^Ug91n=+##M13td0+meS;4(~#?x*9pGx~1
zWB<;=@mFx}VDw30L?A>GOg8sqkhR@1AZ6&#cxq=SFc>IIs#E~jeG)^Rs$y%+)lw^y
z!7dyf?dZVMaqpy+>HFAUr7LsNp(uG#0^TksP|RAZ^A#NJEk1*C0*k4qoOwc>fy*rk
z(`FknOJwdtao4=pj=M~^YJk)!SGSwYSi1QD<D1rTg;Qk;v&z!qo>&FSi#yc2jk%wx
zxC4RyYR>BI0}eiK%)vYQ961uK=p#eBvu+3CZetsSW1Vkd>;C-jW_^BX&-i4R1Nc<i
zcdz-+I-R@!KFs{M0!uc)td1;dAs`BsSlYU2l8cvT+PxIZ2-zlFQDdq>KjZrA2OK_J
z5Tbyym9%=S3S|8u4MZD#;qj($U`o|~4q6TTX<bW-VE4^j3jkHc<YKjHN{~4ayWb%*
z0xkk1SYnbd5kYLH42jkjy0wN-=_0kL5J0*BCMeNkbR^xA&NDWun_Vvg)6J3?WBR!U
z=pE=QM7^UUz&0713%ZrR0C`4rVTaj68-xnPCWP~$XK*lQe5zo0tf04^gC(8>gLGjv
zeL*0%-=C?`{9^v?z`yup3WNjr)3Coj@_+xUmi)h+J4X!!fwB>%Wu%G_5dsb&l@Ecz
zWHA(^nfA~Gv;$G$6{aIcda7ywKJP$cKsnG+V<vqLu;*IfC}^}Ga=0!~oyL>~Qv#!P
zo?sz?lrAHr^p@=a9t0huU5<jJ^?~Uehjfw=W?pQU!wf`_P^WtxbxV-YhOh&X&mGO8
zVWtp??J1?#8C|o)_=Z*Tl^)St>$uPrtRR5S7e#jOy+pH9k&hkywM@Yo9?9vgW@H1O
z90#k8h-F0P0#U42yoCWd^j92QE`9*`d!KA^$o{lIy1$Wk9`#&zYwn&?+e>JByjqpG
zYrV8BhsS((uTWs41B4JzH!rhno}e#ZyHl%lvvFy1F|Dw4lC+~+i?@HOydx&kx|X2n
z*66j$oTSwwF-??u?I#Xdj>50j(@`z&q37A2<vpi?cD`rDXwO!1`fDS4D?@diW7#O2
zIG$8hJFe^MVai=i8|GW3g6;$)K(Sh|a?>i~)64jNh8XY)(LAQ=ZoDo*&-0Sy(>+#h
z=&^czkI|6?kR>`Gpvi<Vi9`i4!4HlihknoVp)<`7-}6Df@saZ}>=~a#`%?qS1&|Lm
zyzxfQ3$DxEjg?KlX3nyA7TmUAvU_?<Rm%Rd8cdqNz+l=A3dHhK4i4+T?Ylv~w6k<X
z!Q8ZVt6XWf2R1n90z|h&Nzw&LP$hWHx?xgxai0?dD#LcTP)NuJj^03Fp*KdYzvSpG
zJNh5BRYz~dQ4Bo}h_jM%XF;d}s=VyKwh6c2dFn!2O)3`KC9wt~>Mk#x94kb<^+5tg
zRYW%&YbAIj1p0$1<71BATCU)u@T8wn3=n5RGqumhq=*)0)5{&b70=JVsr<pO`2OkN
z`=$3Unmyx_Y=0^sIUD^#C_mEhjyrPq$|IhmwR3ojOM(bZOglxG0nnt)=OBv3J{CKr
z9n0C>Rd-L7DYKd|bJtQA&!jJ%j9W5?@49f^5+g9!+Set)m7p>(lL_suTBY^8km4wW
z_7*J$r?pt_#4hF*YM<?9x2E2yDD`L4N?F^mZ}Dv>uCr+dg{Yd;#Ks!19_q7l{W8O2
zL&!bRen(<kRK~hpbt2-(WJ;b_Nc8$#y6+UuX2zZgu@aC3P|C!@NLAPKW4~VhoB!)a
zXWvlP$e!^jus>apfNWd1`e4JmpOd@KS@W#a-jS&?c^VNyH1{{{6RWT_Ep<>p$TGE7
z8IX2xT|~yCj9y_?%F>Ew5>QD+K<G>cr~PToNGc`mt~cFA9wKekO4kxJcC&R)x(Z4Q
zsFb26>PXai8e7g(YCx|L>E_0jWw@dT=$MoJE7`GIn1aQ+q1s(&9h}c$c%aA1$syz8
zBeGGB#1x>#22~;n4t&aT3LY0qayJE^z?R?$6@)p2g?=8Oz3T@Frlp}H^Dh3IUtau+
zc_rWaiaT<C?Y*_D8uko6*_Qn&LFCLlP+W~X_ITjFJ9GEiWydHuPo^s42vG=P9+xVX
zjo#cm0MZ_!nfL1ZJ9Fo7Fq=hPUfl0FO_3v{wMhG9pSu;@21|;O6li?9mcVYQTgOXl
zxpa1(hVJrdkbQsxXAq0|yrK|cO-O{;pw|IH@YGdC2(CT3+pYWCUzsd`Y-T0Zw8S}K
zbg;+Li6P^o1M*>>)Y^Fz?n;o_(9B$Nqwx@Ga@heFk>Ct|hbmX)48|@%q+`~W9A)KZ
z-|*9mzq>Qzd-sfg`AdrokWY;^{ON+^&2pf3KJuZnfhV4uxz~)G3>xRjGp9f`QT7Z%
znvBJx>SJLIDg7HoA<K(QpVM;(RW0i3W!^CwW>^dHZZ{$5x;f&~b!qSZho_wiPVrQN
zh@_CMI153b1C<?jA=*Et>c(Am!5K$Q?bQ(4Dh%Cj&jQeWX+<DbHDOWWyr=>#A0IJ1
zG|*~rk+kQlL<a`5!jQE(*6OIw&Uc`$iM1z`3K9}5{%Qe~uGs}L4{OVwhcC#Zf9J>N
zU$;A#pZ@W;mi}E2H8~)EF+gg=Q~;y1k@ugAoW0Y#SC5_a8|TP#RVP9)nCwOHs#qv&
zpfME!Hg6IEttMA+Vz9-85q2kmx)N2UUZJXnw3nH;1N)Xz*%{Jl-tU}C88t8MMXLsZ
zm<+g%x=7;1?xpAUiKk4BNY*U~ji~xGbw)H5QtK-3zJ+}PmMLo>ROCHjbfCx5ks*Wi
zK3UIO;wM!u#2PhQVs0vw44>&|!uB>YTOh$Jc#y#9ZjR8N<Q^7|<+0<p-WT5VH-BvY
zx35m*_uhPeGXhdaPT<coNC~238PEqtPXz8c7rF3^%)M+`7*sZIlxquQ6sREPC0M+q
z+e>Opl@vv60byRKtB0n*0dw`3&w@fY9Qan&${7^<7aJs@aGl))O==CQEK3u+tvy}4
zTNoKnZO9UYU7)(^mDDOmrvQcE^|(t5NSnN*z+w+Zr4UCTFCv2_VYpr}KG>(XRA6ea
zj}gV(Ng-BA>78%)N*9GH1A%5^2bs-NJ7^L>-CY>l$Lk}fs{g~k*Zk+N|JnIBo!N*V
zxwI>*04<2p=>9x`<hn4CC6GukMLzIY<cU3)Ub-qWtZ=F>xvruWi<`h=BJ`y-i^<iq
zU$megTJ{Km%tKx2o=p18pzjqpQmmVxO7J9DXt(BSE1A)R!lahvkmuktQ!)cXqHDpm
zZ`Q5_RJupHXO#?&7`&>Fh<nm4?owS{K>H8)hN36*$HHjMGg{B-FBiJWwqVH&HJ|}$
z1cCxZQk?{d!324NC{CtUnv@_(w6|e0BIsp~gJZ`7m*ng>{g3MZ{qEl?zkg9P2bS9%
zUb;H{=NTm5hKK@-mw@s4$bAn69=s`Y&pjftT8b`Jr&nZv!DPK13?$3ic>sb)Ds;59
zP6~@DLuPe&(`jTj4R{azfu_)*y;FK3MWm%hLR(#ME<x75W?4ns4ZT3&%Dmu}UrBCY
zNNIhE?d1z?bJh&VsVS7=67XF!=)}Hu#EIaDWIj;z0)r6@mmH(jY|nDtZ87hAz*`bS
z0WxTS=#WlE(gE%5aq!wG6lo&$)otQ*hRb}qpR%FpxD6AlLv`c%#rK5Y`8z*Xef#g-
z-~0|RwD+X}V$1#lg5(XLEEx*Z<;a5{4%~Y(bGKb1azr~1<&J(Y!vVn*$KocODL|2#
zItgmd)CqGF^*qf*P*zbZ$eSus<c?lXRj%8`)lNwDN*GW`+bcJBv7OO#7+4ldWw|FW
z97Unk2nH7xW1)sYhCw3+m_!tuq$ad2CK+@3aK!sao=1vYDEdNw1jA(*uKGR87%X{;
zVWzGyI7r{C<ysp0bSIh&@YaTHULlHALv?kBI9uSn?<h`JjZhmDj`gwQk*jjypZ`Yv
z!~gVGs~@;Lk@KcP4hSv#3l37&vIN%Bws7v<jr`%Vb4PFX+^8>-_YC^E#yBBHq5=gX
zV6h2#QYT`2x9ij@Hzh9g)_fY6Oaie{cTj<HS@Q7#k~$eslEk*VQ@DPv`+h_l6&8gS
zpL;Sb@9`9UN6)O+gTnSGD{{ySp(q4}p@@2}rsqPh7xzr)_xEhLX9ELf>=-Sp;?N&^
z24hEm<SBaky@7VqRS{ALbyIO<-?bA639=L)d4;B#mQ)+NNL8y6;r5Gv5>|QUI5=|5
zYU-c*<M3<W_{;V8{^p0n?+WCmL@~khmmqajscWNB*xrNbo#I@6v*(UsjJ^T-{hVIz
zu~>*GSW-b@A<v+&0@o-CTdH+)?WB;E8PPN-OnXp)h{9A9-eB^bDhnrF(Y0byHITH-
zy)~)Z?aL;ln8JH+g|waom)9~NGx{I3A!-9NJEu1=>pKdoxzpOb)(-Fv@JZR!Qnw{q
z@X)#@HX_}73Pi4%IjWr*_0Cj}6)s0tjU1$7p(p~G^YW&L;`{%}Z#Mtm54^Sc*(+1I
z3@ia22p=D$zf`2$%qL?g(0p(Yrc1)*8#8yu0g0nJM)F>+Esg<#)!#+)>AV8sDJ<FG
z9Oe#!Z}+FO$zD}61xk|<I}M9jzyU?iV~Y*J>iV2dK&6_cZd%)75>u=+AK9uHr@L;+
zL@f!o^XV^r=55UIKEv5H=QG$dm+6RAx`JKD<$BHTAuSaJNI+Q@QOA9q3kL}xFn^g)
zHk3Ovnt2I&$pE9RMtT5Nksk2QQ`Bqxo44=_-}oEze|`UDc>w5}Nf#g*v+x%sMoJL1
zVRCJl@LiD9dO-15;J$l;|KNfC@Z@PP$E2<x%NPy{^4t+)Bt(b394R)+w6Th+lL(|v
zt%-0HCQ!3dqjC|M7*L3i=O~okAaa>0hXR%2B@3L}OvPx~E*(=GlR5#L+R;wMD||^M
zNKThpntw@giK!<k|L)Q<izXr=5}Tl7E5_Qt8B80pq(VRfCDc(X9?IPrv5vUh6ujHX
z1&@$r0hdK$^wg6z@}28>?1|$$|M)EzerUI;FQ!<Cm|*Eb)HdWV8c6%AQ#wwtnSZ<;
z<>I?S_8wmhmTt}B&HYeQ3)<&y(90B}M%Bpyss>nhA%&pm>0fqhR%tXRnoMa@A*=w4
zxdMf`eB`=}LDeg{V!0}VsfqywAZ<Ao0fXG&io_6fG;67ZNW|G^%sS^1#l{E*iG+ZT
zbs+AUG&(|z1~J{<eE|Cw<GR*481$ABucj4?odxx*QGWB~KGu#4(%LR^FO0KDaKfY>
zQEe?VyL^&z^AxLcm|uA0!kd2m?D^jTMoEP_O0+Lbe?b&!e|6f|y2>>Qu_^B<n|m($
z{`U2`yWy}j!zx5ohtV)6*V3YB1+RbzAw;Z%h+Z$(xhb$E76={(q#{^z_f(w>D9VMp
ze9R{e(YnIsIo8Kq6^bm+EWO*U?sgxmjd2uv$xXRJz|=z_Fa<G7ph%OhVdn-YV$gsy
z<xAFW3}aM$+zkXxwt>(@>RHWVr=*%Rh(Q0~fd27i91y0JDJl#yVaW@N2HrcpmJe*)
zNPY1D+146TFR?!AbFQ52{EK@&@}D-!`Z7?oT{Z)!4Nz@kH%201|K}5={o^H<6bbin
zfEs}KGgbY-J&k+hNbZhb=jD)uNTceM(N}eXCZJGc&iWVVi>8@5jjy~-)`~vYDkN<s
z7krlHnW|Eot}xxLspqOvSjm!(&MQ!4nW|K~RaJ7OaC945c32bXnhkcIz9wx;S(Oy)
zBw*}TTWPvbkxUgPqApxHt91=hHEX~N#d^Wg^~(&74X8F|RF`JtP8jFV7q~Jnc+2LE
z{PdMq^T3sxxM^p~@wm{R(`Zo8%Oc--&jUaGwu@VD1BUx6P}e#T{kd19C-369&T-cY
z)YXeu-&x9s8t}LD+;vNcFPo_G&~T8GXHYj05l3z)YAn?#02GBn2U^n?6XMc#_bjug
zUsq!&oNad!nC>(zCJmu#0KuNc>1tNpPdB-N=HoyDDoI1SWt-FN1DJH(Ml%Cyf0e;?
zx74SjR%viH*&EP)42wxcIjv}_fa^p5sAqItkJ0fyj)vJIyZ9@O0u&m!e`|&Re(~A-
z$IaLA_Sp-$b#ax~$M<m}+acx!Mb_iMpy4MTeB`bF;epFPmo(eJ*&m{?k0QyR_gcHI
zDs`2~b?jrqlmWvAntN+`=;4MdCvtb}WagGah=iyqYy}0-^UNs}AP}ulp#s&*6e@>a
zZ?#IcL$Z{uQ=qau^&2l2k?C%NsxBLxM7)E{LsnQ~LNjbSrZ&oeOX|}W6tP33bq=I^
z4j{E+?v?;K8~15`DF(6$m{)ip)<Uxgl+&7OzGqd9<dJ;UD?r0z8U1xznS8Z`Cu-ad
zTwL^c)8$kA#HAPU)05BOo&GMaW6GCSZ{cO}gX(%$3@N<l#L<f1y7I)m|Kfd@f24{`
zfefg-@KBp|-MVCA#$ODO_E#xB4n*DZB2rfGeBi>KIz8eY{abtP#MlXyZG6@5XX-{+
zS{JK@0|yeL#yo%mm0K$?iIR{vxKbS*WZo%EI$yPCI0!+L6U;se)po;N-M<=*sRXNP
za0-<(^SMFh9pF3r$Qo+toVNV5PrGW9ATl%H+6_%S5}+xCavHRyR=KFDL!<EcWubS#
z(?96R*Sz+GkS4-3P;5lXbMT={%lzEM+xf9eck>(d-8{7P0#1xGzM%YlUO#;!N5Up^
z84)FCc`b7Kwgqq5y>$OKzis13HWyf2MBO%;{jV8R`@41W=M|&`&;Ahk{jYapsst4|
zFert^drCR;SR>ol^xUCSxf?|h>JTYB6osk*U__?6Fa;-u2o8&JQlm*#4pP4epUQnO
zC{=axk6NA<Cf22}m__EhjrP=DOlqomqe^JA#5T?26ezVqvw$dUmcquR_zEORwx!2g
zMYZj@Dh1J$rnPNOY=n9N<y4q%=|nV(vZf)xAmT@muQ-YoPd0Y=%zDwy1t|lgN@%Xa
zJ04o&M;^PAAK!d2e;A*~^w8~`IJm^8m+$7YF8wMuZ{J6Z8KLO2bXd6dS;Fbt7yQyA
zSKs%Izq#|DuS~fJ^!A5^s-sF~9hdG;TOIza6|maaOCx<9?Kq7L%=*C4tN=KaxobXu
z$-nTk#_k!b8QE?Sf@Ph8K+}khB7&GZLn<OwNN}`L%=W6<Jg27Ab<E7HEigtM`dJ+T
z1rTgS0a|r1@H%FNr|4@X!=5Ri<~m{!050Mn)zD#(dsD4$B$Z02A~ZFGAZjrRO%P%b
z#DU9&d<a<|yng?7-v<PnMi6>A6eZkqcFcc!;#S@~zn#tg30Bq*a&W27_0vaq)}^;|
z^W<KJLr4Gci1lj<R!?M{IO(YBk{^E4&YQpYE!8j2BUgb8SOBGsl^s{<m^z&&_b!3d
zaqZ;KH%R-#lqO_JFqw4$YTF=<3=>>9pnqrI-TWmh{`oH&y5j+u2J;218D$Uvk3iZb
z!vISYqRNG-69z;wt(7xH$$Wy!bj;?KB1mk<JZ3n|RRo_Kl-^8_6<jm>976iHi5g&?
zYZVZpL_{zX1p8bDK8MWA=gxHA!1S)wsM34T&(yGSwczK^+{!O(K9|eAlN?@K;>g;7
z({hpL?7W>j%J*<|ZO-`Ai1Cp=qXQXBD;di!@cxg?w*TdC&wlM!AK~o=MQlN20Ch$K
z>Eoom`3nkC+imNX3MFMqwl7G@+Sdxe4L$3hv*e%kSC;)9*A<NB0`sV_5Ck=Qvk{zL
zj{u|{Fw~;p=zx?|$~$%KvOFau6aWXNAP`NZ(yT4soBEKNy%;2&jzmsC6*Nr;5h93z
zMV9p5WrEjHRnXMSMgzo|kruIn-NWul4b21=JD#^}UBjE@c2-vVoIcoacomL}rrg|o
zh-3XL^bYsPR`)FT5Iw^NrW-Z?>;2`2zwZy5-+Ew&`vGS#%o9NSC{kOE!v0FshUm{Z
zNL`rrNhIVp7RkD*WUzEyJkmWiQ@xXgJH7|gGhVywZduFlyAdkO;H6&isb6nvl|qCl
zR_23%B!CR8*61^X%9c%dgUfj^M6EV3C|D_OQ$?`RzLsyVo3pQBqYz0=U8J=!o+xzA
zr8uv%a>0O6eieMwTx$P|1Y5q*_cZ+;%Y%kdKTz}|Ssw9Th($r|3UrZSEesnWuOjb$
zw7L32@2cPOOApB(3v2@}L1PAG+mcJyRwF_h5re4%(O)Ex*gsQ8maGet+J3HGvUELJ
zVZipDH*}}pu;TByYwS+;9qdM^&Hafwf~1sIr+1@>LO=`xsM#{}u3A|N+`6H914~D%
z>r)g|?a~h9SX^Xkm0&Ws#Ev1EgERty*tx=@qaCX`Q!PwR!6`%rP-dSocap-gjtZsf
zp9w7H_Uf{KMqbF9z<rN5yTAB>=KVkSq3}l+7CerLXB!^o9f&$=)XvcDSLyv18KnJT
zYR64QCkfF}rG3>YSpqOK863ZA$=~$3tM0aE58WZ}VH%-{fC7b@V8x(D1_p-!Rx?M`
z(ew<#b)hm7QyUUcxfQ@FSSHZ|h`~i9B`U;}DuGI7u($+>b7{XQ0}V0*DNE-lFfKu3
z=hiI0)l(Y-x?P0la5!DkGPacXedp?(-~4cW|4-f1y!(*}XAA&osZi&*1CUutDwxHO
z2hm?xke+0Nlze}f_E)ElE7;BidVry4<<-mnrq5n+w>*2~4&q>Dd$x+2L4~EtRU!1n
zPl82CpGT{gbC~(mmycE!4qS?lEc=(rk-T^5rN%OJ#FW5DUoWlqNos_+_GSSFO6xhF
zfU@t0-4oJhh1AFdQ#G%1ZsWeEpTW+g;g8SM=YR9Q`Xj%3fAitTXPh$-1gJj_Jd18(
zp{qoH1|doy{TYRc7D)TYO}(};=m6DGqt^3<nFCnPSo`c1f6J>^{7ttFIneWtnYw&p
zE(}CF27Q_ER^6ZzstGC-z9uSIL{pXo6<G@IL6wW-!lmQ|PJt2(s`NPkBH{#GQX>P$
z)QAK_a^ujk3l%OMW6Fd#6?5j6_WBv4zSln6i$&zYOU>>dKT@6jwGUSxdF$ix;i;yx
z2>=Nos(s+uM}<s*x=JJ;3!=XSX+NO$uV%>iPmdcc`-9Z)%uywk0|V+6%l`V$SoJqQ
zXY7s*J<KDNtySw{2I8D46gX8AZ;1uP4N#?0lc=Kw6_CJEP?9@nP^l3~F%ro<h)c?0
zfao<y@TB+%oEO@$l820>ez^k$C@p^<_Py@#;DDW3<e^K=_8*?9pZKFQ)!Db7Y0jLR
za|M{E7oEDDFzDLHN^hHmmJ&Vr#KK>K^zrNPx-fMoZ@aEsXKY*1wp8&k@GRfG<gfqC
zHGlJ+V|U_UL0*djMF23cq6l6fcS0Q@h{_8#??aZ73@A8&#9%<B6|@EirUGf9p(n*U
zdQC_Ua8e^v7zBgGK4Xm<4IEL}T}x@~-&r{AkzN#zB2&PbSHct9arV$gv+?0`&Bi+(
ztsi^e`R3fEl1*Td6oSx6Rd<0g>rS-V7(Px#cT52MB}h-l+NJDIHs_R%I}q&;Q=Z%g
zMt6?fiO*Q`x4wAUUw5+4xSzp7pt5&*tD(G7%VO`|@&S);B9uWWBZTA%+6$|#xh&BD
z4#7H);3TH3T-p=KRLDjHiv*BClG5K^3B;iExGc>jX|F#`&7**OKyb{1uw7Db%;Mtg
zR@i<2#dzV~i}mGuE;bh*-;G-l<_3V6g?4({#$@Hb=l1NrB|mB86NTt6LE0ZCY|Nk=
zJ9X8`j`z1>ADHr%rRC1O<2`ra#mnyW-7Eh3JI3z#u^#>0D@gLoSK~+CH<9x<4c+=P
zMjX9i;0_$h>3Pcp)={V;G$M$C)vnh|U92>{tT1^?n-2>|PoXeKTx!9fN@ocJhorCR
zoVj`q@%DBK%mcDjyTxWD^NocpE>Gg@>~7qBa9gfCydAbKPQv8sB2EL$3=RS4E@`0N
z7o`2IZW|#1v~Rgj{6qlyOOU$e{)8>Px+O;Y1D4JW#P(>G;1vUFc+1codC{^z{gM@T
z{jFnnWG$!n_8mF*(-*?~J~ZRvYR2%+C3pO}OYX$YeGVQh+|oy%u}v`u0<|b)L<C6H
z3OG_%1}9von2I9~GuJbZj;M?%L=v6s8ByDBI~Qu9sl<h8pt@Q!y;90-x0Y(Bk;T=L
z>BWUiHp@8QyH-X-AuyA+88}_5yOu!e96u?5lI^!Q2f$x~^z^|*7p87&uPzu}d(t3v
zyBs+Ts=~2+vhUWPzwA!kwd$@PczXBE*m(PPeDnhoxl{}FQpV`W9!RGLtlvKJM^5xv
zJ=|mISkJ8-$m#WTq7$U^HaQ9}{KgeI^P^|OAAeLu3h(w{B#%+Rrf{1`jHrcL6sV?w
zAl;H0GuQ_jd(Kp%J=UG^V_VgEe*cCg(M<LO=r2L~q{6g+c5nYUstZ`>diOZ%j7g<P
zN~OCuuG~CyN0015vRTXGv68JPO4+h!Fc6ESjKN1iIz8aP(Y{-{e&`M!@4MC2oZ&ck
z{ed<=b@?E}^&Px<L(cx<#qi$yrgCYsmKo6OlLnT3j^jQSI@X2AjC#Lu|9c6ZZX%%#
z(f{Ah9dJYtMPV2|cSajFK>z<=^$S8o5GiTz&6W;ceLikRjSgPt&WtR0oRu{RKp`qf
z+ixe#)uYOYXBCiu37?Um6V|%K$9wt@FFj7<3p-wWk_hADA7+=wH4bM;SL^xQE{>nz
zj@O5{dOF41?eloJdFprfuknb_3;vgj6P+9+U;-#{4Lqoe-^m$71!;RsSt24RZmI<!
zxOI4sm^7rESp)3E1bF8;7?8vlVqjEthsZ(VM0}QK0PPIugOe4c?Q59!oeu!OxP2Bt
zVuVCY{OsVFTQ(;nDh;U{OcoMB@tSAAA=bgk%>zUQ={GSEltabsA#hkc3K6y<VY3EU
zDgufLNC3r|b!?Z6a8v?0(eSz;{XQlSil|fqipN8+dK<MoPe9rL6F}+bDq!h^{>K3o
zBmzRsZYqz9+hsKn6DuKM1K~PrlV9!PJ4l>p5Q@h~pgMvfqJp#|OhjdHEq3yrzu%bH
zN(0Xnq+u|1y`hLePxVYBV0%CXY5$<Y!_vr*yl(;fuc*VJ5}4#!LDSDQ7G66*1!>2i
zEUI~6App4z7(_Jl)lN;GeIAH8heK45{>zrqxMBiZh<g)=rZL4NiXo8}9uKKNd052Y
zvHcv6g{6TFT>p4Z<0(jm${?^%6sig6!+@GNyA8(*P~~er{gM`@e%EJyg>F-SkI!H$
zT2Mo-sHzQM0hdEYaPzIYSQMBYz^MwBZP~DE<MP|uee0e!Lnx!RK`00uwcgD<bwXEM
R-D(CP@B|*Sy3Q$~2>@Gt|7QRI

literal 55620
zcmV(=K-s^EP)<h;3K|Lk000e1NJLTq007be007bm1^@s6Kbf9F0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBXL=1D|BRCwC#y$66@S9LD@?Ne``s+m!j
ztYW!$8#i1aU<fTe5FkJb`5}1;Nl5Ys5=c)-ULFbQfe<<bLf|KX0HL~2ZMoaBEm>Wf
zk*3|b{gnOI+IydJ?~G(wnEVhl_R;O<o_o&z_WIUZ-&$KpDRJiS%-@;6Z|%=H*^9k*
z-~5z+q2PZk0SRlx*XboVzQk)jQo-MTz67UYo)iK?ecDp@)t=~ik=!@0>&F(PF!#;t
zB7G0^bHdio=ig(A<Ou1;(z{JRXTDb;I~M(8=%JlEEYZKwL?!qQmNjAtv4-Bbg}!GM
z9s8&ytaX+pHqsla^qw-^7U(r!2+O1Iv-J+me(B4kKu8Y)y5FJS*P$m{wEM*<i1x*i
zJVg6EE^O-<eb?@ZOE(@F*)g>c1!2r{rHJWJpbkgfiKTvQIS!Wg9Yb*MV^}-t&|?eq
zKWt0CH;QC(`a!#ZYYVkSaZK+KYCpas;Mn^8y@1}Y&PA-hE2iV7J3$nqO|R8k0roFO
z2u8-?lnQjQU3DJohmNAun8)ARU%-{YA(Wp}#^_ZJ;+90z4H30z>+o%WkngubgtRZ&
z3lR4N+D9iadUFl_8ahc0ItG`2U_|fbTk({P-O(TX{OJMd%-@syllq?`{j-&Tv4zId
z<-)elvMg&2ZIkreY68!Y5Y_<j4Pg0##|d~cFbb*X4>c%Lkn2IrA1O`NXi&N+jFnLs
zDZ%obd8gtZwWOS;_Z=hv?2(Y)pz*wiw#RsmJae`F8!ghAzb62Wro}ZH)0fcg#WX{o
zD=h0m0?Q5p&akD7ie)S*Stezj2op4u+nx>Ex8N2W*aeqnP`dRUvc`_O&z6Dqm9x0o
zgoI=vdc6oTpc%g#VW?Kd<fR)B7d<jpWI^<MM#5e+5{2<O7MTh@PHC|fl5=q^A0%UP
zAHC-Rdi!1U_WR-}Zpbhq%i|<Q@XX&CAbq>Rqy9aQ2Ke;^l&8~nj&0lL5pZ0~vQjIf
z$Sctso0yAR_Tbli_(MgwwF2Fi;8lD$1&=^P0P<*a30MRkn+87Z54<l+(bIm5=M(1|
zqW6yx*h=)C6756KXW9g=PQdgjMw9M0dLfoNbW31s_hR%yqDV2APF^Q1d7Z6+)h3Jf
zU}32IKx?RSN3+?wtyFRz@QaS3XH4tP{G9>PQ%TvFSY1wI`bOKfuBAbKt!>$3f(JZV
z9JVl)0!{?CNLGeG;*XY5o~*(jDZ?e;xK#pC$%E&)@Lk$y@bgwCK-Bm-8rd#w4k3pS
zsr(N+@#)MT*&wX(U92s-%384n>P8ws-9n6jxL!a=@6m0Swssh!6)>nGERtWrTb+E1
z1_7)?;EG~VBrsi8ov2<`xaPc<xAslXF77}2mBLc{w&9xh#iDQB>DVF^ne{#McLqqO
zWqr=3vHU_B(BEg-_Elsls>)JW20TQ!Y&(QkBv6c&P+C2V(wY%?1RlFe;3*KG2q+Z-
z%8>72gsjIZa<HrPxJ1;hNLHvs&c5$h%At2@^DJ$7*#EH%ir6s3#v*y_6R~A7ZWA2=
zB>C(Nq8>Z-3Pc1T0#TDpP=~e_?VvkMn{xQsN`+WxhL~&gFuxR_*&)kG;CIj8G}c}{
z{=DPgeDrzKduJP!s{hSOL40<&Y=6AuTMr149n+b=GeCNxKaLYVm&VI;$okwu;F)4y
zhc|jm8x376Adpz(+*eRsJBrd2foEcv1|wM=vNk0G&v?<tBt0H2`B+shVwfHm9JV^h
ztc)~~F51c*6(VFf1~d@^MP@+a#~grKq8AtGeo1IhDPYm(JX^pskwgX;1CiJqfk&c2
z{!fE|#kX}gMwNWB(Q1sfQ3;K9fQ3eY*?Ldi7N@FkFW-tow}+LvnZ+9yef!4a_3(Ao
zlJ)6Y$^PVM)%jGx5%UPoAnFW|R{q;W^yT?vX<kC0d7Ac9Xrlq@u<v3MZF9)_R0$B1
zqbRPMpluc0;SvM^j42vho7L4a){RuLia=E6fPyv~?4OXO;DK$z{7F=wZmaZQj5gO;
z9e&NuUnKLsBK=b~VQ4#-PDn!8hX27txRrlZpyMx))f=P70X@l<YJvQxdD<4qIx&r`
zlzmK$$5?6wm|yH-p)!oJe+~|PV>jxD2{VxxKVFZ2;`mbZ6Eln9&WW1+ezH>kUM<-V
z^Y1zXsWU)gi*Pv&xE~|O{)a5v+MEK2b0ZumAOJaT1b?`K!rBRx)=k2n9Dyh}Dt9tU
zmS+9v5H^g~u)0PTintk#T?L#@n2v1)h6-B`TU(a~{nImpkVDwEu{<aH6Nb_yfrsQa
zabINadE@{ljg{lS5={yv$HPR?Q&wuO7vOl8fkpc#dRH!c7$<;DO_Z>H^DrL%+<iFw
zz(K^8N59D;u*H|uo83#ufBKd2n)8vdn)88)nsW!|o`Ub;;KcVbkglZdWn_VVf&esP
zE9=9NGjjGlIx%E@Xd;I<R3iYbMrqSp_~SLQK2jwtSCtFcJT;2V6Qe}mygu-#ypNft
z86Z{qXN0!0Wlp%UEQ^r_RV(Jqs<t>Wp4<#CPw-d{J|{EZOB!&O8B{J=Bbp562~0=Y
zJq0R`0v3l|cm%4ME7qcIwb41egzi$PtaBLI=mc_V?@aIKk1PbQSTo}M%i2-zUBe~&
z%k&cB@4>)?^F0cnpJppWK2I$P9ysLbJDyb5hb@g)9YSGhEs7h~5P+%><Xa#Nu&P?Y
zwha^5MD(s&bkvAUEKj0~utetn4AEOQxSFo9&k{fbt!U{jHkL>M@dV(=TO|1eV9JAL
zndKVTVnaEZ0*;Y|t@#dClQlZf?BV{I1?)MtfRHAMRo9$@){%L%_8vp~&>XtWNQLRc
zkhUnU?3wAl>hN6f;;CWh!&AfF+ea(*t&+^__mYMBUINlq+I~t1@oKg}3P37&Kma1X
z<a#mDFWL%aqHgO@TE7wgSPeEkFT*aXr6RU$n8bDhQLXGk(g1AtGVrK~R?cTh2JZr)
z!y@$5EFBaOxj~$K))}B*D*<RF>UJ_qGzhLZ4<Pe>GDiVpV?`Yf$<uFLRVBLD>>#K&
zRhZphJ&tf_7-Hf$+<nvN9$Q4OOA`Qr$)T+m#>K~HdM`h+5dPr0QTN^J#+<({`}Tu0
z_s~Qk&j9IvNEGhnG)P`gG;WiQzzLdB>BoCeG|skYhP52{qhx{BZ9!pt3{H`yIbEeu
zTf24)=j~XJ$<eYJfUT|uj-ANujPSt9StZwmvw46Xqrnu?_xTq36oz8J(ujfQaS{u4
zqUYpEfR*}8D}XB*>uo|!osM_)Xcc4R^F4ZW7JH6Nqav437<RD79ml~!1ySi3oTJmQ
zTODPYM8Fz7*3`+$Bh#JN99gtpxOv?Fi#0>;KX{H<4C6CE`fmPv0d2oZxVfIe!%0kX
zgH#Z~@i-c%g_llom}uN)6eiayzreAX#)T+UU2G=+Z9Qu>3Z8`yTOesfnP%{b9EcMC
zW;N}5%*}w6MChamW2fL7plfmk`X-(LJS)*R$Wx$oIdH|f&#~1Up;1BXO{p}tOpKE+
zMZVJEy*SsK#gDA>@Ywn?zB;uU_dHU>(Z{AC7Z&K8(s?0kCVDhUMFNd(y!O6>?YA6V
z41Qqqxc8^EqV;dKbp}Y^ZGRhR`*j)zueOA+Rq~Xr5M68yAYrVK3x9Y$(UxuShpJ?q
z=yf78GLA4bT*CPmZN|FwWAs>}(~T4utlS8<20+9hsgao)b9CT9o(u@GA3UcTOn4$n
zx1wb_nI+1imuXmiiY9?Mx;@y55RoYv_FZ&_*5Gry1ME3`6tBFbjh}ty7<OJVj!)iS
z#Fy@z#v>0M!9u+Q&vnQ$*(lHq!@9tkrSR(cR`9Q@hun8e4Y|MT*y4aV1ElYYzn9YX
zMjGU2tKtWyQ;8KKuEjo)&AyOVg+IO(g|YQ;OLXx?NCUv40Tp3vyow7hISb>fYUp+X
zqnlG@3~CEymZz~y=$ZxDt6U4KeN}Lwaz++%l@}+nFyh1%4^I+AC$dHupl~MwRNil5
zMMOjsNKDRPHwaL&B{r=Z$Ie|{eC0!j@RIWv@c-OAiA!!8$7`;x;r9E7@b9<n$5$RC
zDmcsM#e+}gzhJ4LgV;CM`{{*Nbj@(l`aSYfKPdi(sbl{q0cjm=Z&m>XOP3)i5IF`!
z3?Qzvq2c3}CgH6*2Yz*gUL#PEb#m#Vvn3iHui%1<w_s$rj840&tq@1o43OCI=J0ok
zqkQ}w^c+iYiZuM!76e=xig5}Iu_90F1B+Y^jME8!pD+wQkYi%K-k`q}=c%5FD(WP#
z)KVp$VCb<=6UBLCp&w{>@JF9HgfHB;3vYP-F<f%qW<2lmb+k?3fyZX>Zv?1Md}9_5
zA7=eu0Y&<pM<;5j8=c$eh97Vo`)PExf1jxKad`$v-^M?o3(KCw-z~KL8GY_NVF^>J
z0HwU<pn}c55$odUHLtoE-q>~mQxUGEt&pRt*dkPFMVxctMpP;VbXr|q`)6q|2ulw@
zE^1p}b};H|Q5+BYdJw}i0@GeD=nyC6iz2fYgMLwxkbR;M_bE|7`NT9Y&e6D)qIl9!
z)FDDrOuz9kS*C!_k>~q}=)NCC*uHrZ2zt1E*Acw*ZHMs-H_zhLFWds*uf};>*U`2b
zue{|r{{8mH@UG9#VCQ~;NET2o*b1CM82w^AJ9jl*sMp)WLtmD0d<ICT`F9O%yJ(wT
zG1MzKOMXiG@r^I^dL<l43TJ81vp=M?al%qm&USowL)+jDZy{P|D=KH3@HdYl&v&r(
z+_k9H%ILOximF-2xK|Qb7%#c%!SOaxz=EZYci7c*E~M$3;S`$ygA~~epN6nSzr_(J
z0N9B_;3u;_D}~6VOhCO7y^|TRL<X?ry+ic7;-Za1lHX_3$u4kJl{%U&+twirL+pMG
zc+<buanGao;EgX|#M<>6)MZ&aHHlaM&;(w1?NNOEw%vI57mnf1eHML>mQF?8&Xw`e
z>5qAF{09W4|3eo|l`Xn7p{W3ki+-Kdclh6bdmM!>#4Du~AEA3|mc^3jf^ptv|FnfK
z>~=NGPt0>R()K~xeg_6bYVcc9(K$=eE-ptP>gIR^q8)H+TXo(@MA}!fbr6ETd(FmG
z<QuV1)T03sA!Z+ew@}~mW9B)>TLB)O?<&ynpi+WTBM?<|iHqpe0F~-~EM*#qNC&O#
zw*V{oEGG(WpC}TS03g|SoGT}fkR6*o9&?N`7qyew=i}rz(GxYIWs_`4m@X5i^-2V%
zS_#9ehH=*Rjaau~6qV5-y#E_6Uh;bn<7;2Nmu)m>&}eI6YHBTB{lnMc<8QtafBNDg
zwv5)5IJOtl^^L=k&e5ZP);)aWJt7RJdX|TIy9_IiOPv`!k9hQi<$reo$$s;j-+bah
zfA>ErQ~cCzIEViI0L{u1LV-Z;%MS;Bk6n;>@7I02=PM<Mg03b_ORkajXSkVsp!d-B
zboIPt{2``u3LILg?WiC_fk3n!US*vYpE|5wu=IUb&m+TQWo$fqO8Hd`8dK0s)<b5~
zy3{i`7tRgSz*<-J(&zHkchY!30#D@dh?9n}r8qHQRs!L2-$<?)_Lh0TCAUJ$diwmO
z9LTs<Dx@ctf>;+Wa?cIg{GvzqZM4akERywl><I9gJC0%8UBCtB)HLCVTgoJt$|Jby
z!U^1RA?+_Zj{Em^G2baD>P-~jf;b4Tja>iks8l<0S$H@S`#SGvEn2TCuebKon0PE|
zb7EX?G2ha$#I&(ALq^=Ep^V~YA5N95XwS6d;K?F<vR>zj|BC1Q<mmw^y8EA>V&6yn
z4gGt$X*$B4B<{^=15{YL*%tV%&y=xu#!-rcd?OJ}pu{Wa{@dx{Mg<_DtqPwwJCXY^
zWn(opfyk|GfmdE_6x^1|-1GPFV-*&s+jZL}Q5z{E48n9M3ggsB0~SS(h|8A<e49py
zCeprE)RYPI18E@0ux!AKLElKMXoXg`RPqEMTG>C6xe|@OT$0&Op4!C&G>?M?jb5y3
zn)F<z^KyQ{SJk;8ZDsPQX6hC`eaAcsonyG_f~t=6L}Z=hqT)ZJqvLqi)fHT}u7TOv
zMLc}OK^I);DA$WPdhW5(`2KMxcyPzUp3CMQ$Mc&<;~y$biJDu(&ZrZ&6@b12fn+_g
zEBjP!csl+2qC`JKKX(hw|HyBaAL6e47VdbQPQE9Xk5D0hhc*IHJgTwBJrJb2wM>b(
z0uu)oh|al{4RDKN%15%&*AiUP5fFbVR|}}tiU>M^x<FiB9UD5QHUbX=D2()`x*XXe
zZDf?EM;SHJ6e^*4eRNLtN67Lsf8w{C>VI(_AOmzRmi;tO%8Y8J6pyy3kK$#|XY@}O
z3v!@l*jI{FIv)nWbUurfBBs`@LV0WiCEC`mABHuw3jgoBJNWgt+(`rc5Y2D_eeO6p
zz6Xgf9^{Y>o_YNaeB`&+;V)m>#JW-)OAU*u<htXF?f1W1p8azV7sl@?i+VhBPp7c!
zeeGXcdOZ4sTNIanr#6*1sYMd^yh9Djr(ole_s25EMY^Vd3$wYMl=UInRK`V>Y}0l6
z^Dh>0$1V?6QRF-66lr@a-Fv+<OQzM9NNJs=BXhQ{|8X2vF0X}C9M=H_hpZcIT3ctS
z5(%YF;M~u;5wb=l0!@?)Nt=OUs9gdE{=P2Hgk}J<pX93Fl2AdDwBn{GmX%RHxje{#
zd^8U$%X^+^dOOkQ1})NH?kG0Fg;-_*hh@IfpigH$zep2KFUlqe{t<kBTb#UQH3VG)
zg*T#gpWoTR?4cug`o)gwQGsxdUTDycnC^u%$qnJk3oCf~mIkJeE#ZNK9{Fa%J|_HI
z>e8FKto7(r$?Dh(v*dN{i`LWSd`@v#9E>{AgYkD0wG;QgV_BQF)7j|X^)c)}7Xb=d
zFQcx~7+s-%p>3Y8l;^}aaLmGQ{AUphE$*a~0%?r4chb4|Nlghg-AgQswlu<kNK-bq
zG^Ie~*tVi_w#^`NRG9?RKFf&YyrPR$Yll@7FE&bLH8@0$GKv0S%Kj5K6gjfgL*$h(
zGUPyV4vPFH$q6QD!sSMACtb^g#Ig{t6yij#(n)1KC-R3@29fLo6mlSnAeV*0`+X*9
zh=V>)k+NL+yw|&-qH?KqjivHQd%aMrKa|sB>)v>DUcPvDh=Y5M;+dD)<f~SI-Z2fP
zxT67OyI8Y&951>`qK4!6#$)6%wH)hFe|+6Rl<kXJyD=o%m|qlF+!qd&SK$SPVNnm;
z@z=hSfaE+;KIbV2)A_L!ucaYBB!fUZ@Es-&7?H8Og1%z6x~v4GukJ2j?=h}n$R$}N
z2+eqwX|$LQQjMp?GFdv%z?;v&7*-cjMer2ZvVce8!?5hfado#I=J(n<=ty1?E-;@U
zpa@m=&7}b`4V0)*MS-T>TKzEG<1>(65#FJP;2nMt&cb0>orbANqW5n+AH5rY5;4&o
z5ypm*$}AKv_4nrWck+}^ZFVQMiUSITJou6b;-JPZp?=XoFoXL$Fs&<bha)~uGFGx5
zrn^j~V@31yZ*V;qwnrB(CJS8?>iJ=*`R{waO8(^UAH-k3aUCiX6Ts4L0zjSKTcT}=
zu05U4p<(>m&lGUcmV@}s_jGaBfpL7cdI=2`fnS>Y6eh8VxuZoq{K>%I@f`mzid9s?
z7XI+NB99dHzQw$=%1wyZ$4tpMq}&ViMGvJKoOA(xL|F2JOt->7;!AsMRj?xpY80-a
zf8R?(`G!=FlaGiQc}@~+P+ff73LJk_StbP{D{mELzZ8cPryMY#!4T5S#_yG}2C5}R
zACUBH?jS7GRAP7Ip`AE;*QYVE>r3?BHn{)|xU>6+tTxrCl(8PZ@!D<ZZaP<iPkmob
z(;!o0C$eXA`KFV(0xL;^^nT=WYnFmaE(;=Pf2p6!#X0%YY&*bAqlXc)+|`1k0u9Yx
zsD580jc*lc-fF8LkF7?OTP&c+^pDPGjk80vz4vPZrMDcwTi>uA{>TPk;Q<}dQ($V-
z=g3OA<9PPXTXFXK{dnEqAH~P+9>=ZaOVJr2Fdh2@fvJw!14TUYxez;U_Wyv4Sri8N
zlka#S#j!kHE0j#F8>3$I%Yq$=CRro4vwUKi8hFYo+#(9jC6?#zT<i#Z{g9gsrcLze
z_s~_o4kEAqlv!s|(@r?;=HvKejYjCPlUbq!bTW%kiA2F^KCkjaFu>-vyYwmBe2-<o
z6!>MLXg((Qd;{CR{sElz&?ixD9E2<r@28m<+%{MEMD2!kE-PxGcj+xydevJIt=#~t
zMSBTC#qh*{w$7vla^Mh8Y?b8lnB7X0FtJp9bw^+jh-LneOoI&x00pYPgV|OOhwB}<
z4V|&2`OpL|^!SKPk}9Fu{EL`EyM+P@M7d<7Cn(<Dek)P<Ki-Q!f5TSTwH?6xPMWQW
z;@Jg5^$1YzC^l`|g!jMU7=HiVGx)>*2=EQ>68zDGgI_-QVXT%5IJ~Pw)-S^LtGz#_
zgRRpT`&-3WZ1J55B-j5I^0hRQqjqp(*b7JaqHqz9<N_VCa*_s><kp{2T%uX=P2|Y@
zP7pXd16^Y<N&mi^&gyk)m?<ikn<mX5R~<}^ucV@J9$5?9Qwdm0*ttPE5a^ZJzEoKQ
zeJNk$I2Oth=|~&h(#4IP0t?Jgn?Hzizxr<Mplx{R5F`gDMztzD?(+Uz2#1b|`!#eI
z5Y;A7zu^_=PHvz97%L4Qa`~N1#UNI+Kmw=A?{ZeC&mWS@!ro~`ECzE%Qh_Ft{gjWN
zFOYw?fqv_ug|_P14VgtHRpc)+7Ae-ZNkB$j8(XI@yfVMWmPx<oZ$1}ca_BMq=Igfs
zmCeB7L-Yby{{{M%9UQlfB3Z3J_=OUtM)u-2KNR79>q7kHRDhp9@Ij1*b?m*bgkmki
z+O77V$uQazhw*3VTC5eWb@0iFtiF>aLOgke@kCJX{Vbns5fN}$c0;x}?$G@(R1T@+
z@N%d3!eY=ld!|*rYPwmDVaxZ^6}es}frWlmTH49f($QB9B!^}wr)VOC$;HfRDO78n
zILC9eh=;@6ApyxIUN2O$ckZWcp<5Wn$l^gvJ$esZnlaD+%0FT4<6nhU^$|`@=)`R+
zQpe8#vI#(Z>vR?njIPJbEB^}Jt8St3zzT`TbYAUOflK2M4XVP$DTr5BDlPB#nM7)d
z2J=U;Iva8z^q!}Evae~1M`WTxmT9rs)4(wyaXy`KsBfjJ!jBE5&3c)u;Ew0REwPkQ
zVwn9aI_H1*u>hmBhw*c-At0630F47Wc*~510VV0yB|tfw@e40M4;v;P#%upEz}@mv
zylriS*FOGUVgw7=_4P6;)pDsag1-(HnlD?p!+VWWv2V9(rN2`(^xySBq7fb~bzU4c
zyVnSh`~w=SaW{a)k*#)MX6RU*Tort1ba%Ap#9J3TW5kc-%{s!BA7~=$D3WVFulysM
z`(~F?iq~JZkN}8=kBszik+A{{4=1K|dH@g@W9<iZ{VG-;z85#%`ukY3{~O9u6?%2V
zqa$?D>F|i#@ahOE<jHGBaAP?JQMZm>Z4yU*@~_ao_7->z4Wh`>k};Xr+$F%u8QMe>
zr|jV=_(xfgp-+6#r?Jb^yhu^HoLnde7;X6n!r=7WbiIu^0+7nBsUU;Q@?^Xte$Mzp
zfjN%}?MtQtRZQu5@QP(MagETV+U<<tjqmGX)6^c^^21X=cM+1#p9WK`1jIribr&Id
zJ6?FpMHsH$kC*@DVcau+1>U)439s7o0mvguc<erbi=STJ;*B)lxVWo2I`g0Hmrgz}
zE?Cv-TV>Kr<NtSw(9U<9M&4DOU@w?&{$bn>HnEwH89d~qlG#PP)KxRN<YhlJ;YLXG
zXjR<0WTxj_@XezY<FCjxGM9nJwDL7#Q{~`#71(Yu4S^@6<Vgd1z4C);NYD8lTdN<G
zN}R*xMBP*$Y<f@IAI4b+Z^a8f_lsC}@J>zlI21lKM3aE4@)o?Lhz60RfW-PUH*6p*
z*0A@*e}SdzUI3>>zm=_3s#*|zqE$Jdf{@G1kN(ZF&yM9iD$!?!WS-Iu_&qR|C^EXh
zgycrKyiq%f)6x$UJ5bMe==#hzdg$~tHH}P^PSH3HI7Hei@#8L0zb;KMJUMdUsL=v}
z%gn1fd#h4_{5jtVF-tzz?RPctj4e$}>=>oVv`(K5^~A?0O#?4;bh0bhv|%frw&5_o
zbWa`k_RdGc1J0j&2+jE}YLf*FuM*q3Ew@_VQ!EHszooXr3uWxw8h4*;U#4$E9tjMj
zCocmc>l1Dd<{EF3f%FuyqKhG7?a;^d9(3kTY9R3ip%d?s4|V;-5_Yv+?3yKF%|J5i
z6=jK6k+lnE5IG(JsjLBHXU*p|h^#azsyVv>Qu4Z~)8KA6v0nyV1Dtd4GkDSMzk#vE
zeP~!iWKGE06+PA9Ua1{8Pr??aK*zuZeB8PVUDdqd;b*@Qvp4+|yfC2O8f8(&ff|W4
zc9>v6h<+<G@c6`uS_3MX4=#vh3D`bMl=p$Sa}mpaXmZ#+*HY)WL=-NRI&Z}9DbgfU
z@NDvrdgvL8qYOr@!J`1hEycKbKLLr;2t69OBTfewPqta%jhXoXOHDooE3I+jz58~A
zea9?3va62gUmBn|QG{$Z%)!TMjHJ3n$(4dW*00}zYd25h^LN*ASLb}1$lBO4{WwB;
z@9M2Zx<;bVnlGSrC`Mtpb#rM;Nzfek#V1uQ`RxJH+fOgZ(Cj{^H`n|zX->Lq^imI+
zEs~NIGmtpC5bM^UoqB*_*~QaWE#m9-A`UE8RR7)-L`Kc6O2(BnBL2;k&Q{$^=sk|I
zJd#6i$_m*k@hM@M5P1SJTV>xZW0AU65#_jvvuD1H@89`HSk>H*B{8ICR?DaNak5qg
z6+$gRA`saML{PmQe01=@`7gtxH@=RXb3Wuyh1Icwc21-%g)@rRA7~JLV$~-qmB^&N
zCwOcClql2_A1G;i#6$IHql;s7O}K%7wdiK*Z)1Tx&sM*CaY<7=9b{l%M<+XZ&gjwv
z!<EDwxakr5h}vyDXL}Q`x!J~rt7Ed*OITdgplS!aNB|!~NMH(a&mM`+u|?c+EeC68
zqHT8#m?9Xb%vduGrZsDK;Oh1J@Y$Vhe64o@MsO4xrVn9gorhA@Lw&|UuVtfsxP#FP
z>>K^5N;g;tZcC}ax3HDYJxw6VZ~Q~Qi0f1~)@B`RzAmiyF4hgG>C$n;$1*b+fhwbR
zu?7`?7iY|uBCN7IxMp-7cQ<_;SSl+A!&ZjHVl^HDX`>h0WCsceMM;&wrj6|l(3nE7
zQys<@I^?9ZLmM6XOek$tSHnPKy<FEVqt=<mi+BAYZrb-gRO2PIX`dlm9#4ZvQKcYK
zgWV}=5OEVp-pXiV&(zhp{p#O<H!_N%6_WLGwDl9BKWCKCIGGDJ3{pDLZ<$W)C&?B4
zqrqEki9{ByGy8252o4i~rU@MNj*iB4IeN)TZ??V(yR<YNY|!;%AjL{|sOg*nQp7!C
zVg)1)BJg=auZQ`?9=>!RT_KtnU;3;OJnOOv+^|hxve-a<VG##rI%xNVQnOeh#O?RT
zSYK%1;wy#f>8w=V>}y2{&68SsC6B9du$E}vRqGGnlRHD)5uT07#vW{mr!l;~s(=*I
zv9(zz+iGIf(?@O+uCqUC^zK%XRU-{Movpaz6{i_&c(QpUOXY|v;ZpY!Wo?8ObaCE@
z$FEAnnuMNCc<SX5l|Ml<5MPL6^T1|0;s3Dpe!TXv7+*fV8Ug1A$U6Cz80%^QR#!u;
z9g47RyoJ>jiHdKbK%1|8Cx`qU2LX|;j&#wCJRIv3u)kHod|1L_R6;!}({n=@it70B
znZLx9v;Re)svxim2xvxC7LGM^$;BkoYUe;?(Ue-UI#}>m;|tqfiB4@2qnrn^OUepH
zd6|yLi;JWRJXpEdTpBX&i`+dyE-4q4>$gxclL8@ADnzNkRa>i>W*3LaLZoSDZsbpc
z_uy<xS<`aK#Uf33+~BcE=i@k0KOUTE$lCykH>Pv?dKxJ*Z9X|gye88hd}tB-4$R?C
zUb~fioOO8hhDrR`4af1}&pnQJ|JQNcw=Ymk0iKUHzsJXw=QMEcl{5)XCwfPwld*CO
zl#Q3X7~(E<%vWD?0p9z+zJcfe$uQp8`az<2|BQ|GI$fgzdW(GhfJ0yDVdSz|d-V&p
zybU5aKqm8Zikts;N9|h2mYzJ2I^j7{qkFdUf1s3|1Q2e6t1@_s&dDS+X=$gG0VLG|
zsZfsU;f{?_tBwCXbsv7;4sghyz;$OuxMo9yEh7@6bUtgu=*q74l~g8GXt5~Yat?zn
z72h(IV_&C5fNI1Zmcjy#_R3`O*1)>=He9~&CA2;AhsfXRHA5AVQguoqORR8Efmhe#
z8I8*>T&`&%i+abzEjTcKF*Z5@y{F7v4^gsIB@YB4mJ3XUa{tl}L?V}P){(ocBDc>{
z$(6v=Z=DA7MVW7uY39`G7g3z7ZL5>+v5v^8!{FWuWP$b^T13Ft&b+Qt1CdU`Di9f!
zd>kd;p9FPSCrLD`<RPs1_@__Jp<UmJ|MRO&6swysJhmD?^P>~^{;Ln-9shO@{_zvD
zSfKH-Z^6Us|Hj6LH-;!xEc6ya^Sc>LJ$3AsQil{Ym<ro)^E1!KKg`~Zm;U)G{Po;(
zaDC&`sFhkc*7H?Is9x8?-cQV6?79t=!sb<f*V}jKW?1ooZ%5;mlTy25@BLkL7u!#2
z3l}>#SW*0A%KC(n1`eBR;}fayx5+thhZ+VBV~!afuPWDVbHfa}U-mI|RuRv+EXI#s
z(!~#Kr`c+>gE6m5ehJZxfcSPNQd^5@AvwA2Zloei9koiGzU9XOT_{@yWJS94`8KwW
zc5zYg0LCBsFZv7}2VHnhUG&<KvP3C0V@;WDD4naLbbMR2+t^*)hW}XqN|dLjFfv>~
zp<0CFxn`9;fqark4mPsOy(Y5IUY`$@3*KeHiGg-R%Po@701_HJkuU;T+UAYihZi?%
z(s^le2w%@_8gK?kH5&ZQc8Iz8cKRg>L?-l|gu<2Y8<~8POrzH7y$a-<QlNh<0>B-2
zH*oa85j^8c2d?ibn_L~5#0^)i#+91`OdmReNB1@H=x&=P$Pm|EsSiqq#;!-^3)Ghg
zH8~=lr)yQlh35~W+&zE~@7#!9A;wLm12{e{^rS&!u6eYJ>bStj)f+}-x3f{UyC0|X
z5uFZL+%>N}Js{10^p6ZLKDCX-j3SiJcOpDPfhf{TE-;<rmZho~i<6WbMviqK>@eaS
z1UZ}pAeQIbqb@3Elkc*l4121CQc<8tz-hE1+6XW-AiAB9C`Cw?nv=U+M--}!?{f$>
z<^-_X%wu{jqKymp7^JOc4~M>b4;shjAURk;GilJ(meNuS7>Q&aS0Hi>fK-EhH&#-V
zkB$Bi4z9Znt0#)643*%Qd=-|@Bupm&%V2;(WZJ>O46Qhk3nj8vUeW|86rB^u(K!tw
zu53L@{>_nk7p<O-gt2-(Nc4b7yJD%6rfoX6yfKx7kqV{OE&+?VO+>3{#5#$)D~H%h
z^L4xg=&g6viE_>0nb%fyLk3kjYh%O4DZJ>$3d(W@x9?oQXYaIe^Eoj#ZKv_nGKH0C
z<~UB|`8s{U1%v(=uD!^^;UhD6=gv*o;2y`O#xxp%E^p~}$Y-CcW6d?I;jJD%CvGk^
zh_l|F&o`dx=B#<u=>ci+Q~z7{o;szCPB>SehVf52-RM%50jWSksGUb84rNZ=VZi9-
zCIMafZkHDqCaN^zpth}qAp%ih+*2niCb0DAqH-iC?DkYrm!IQ(GhJjgdCcGm5)ef?
z7ojrbq0;tAB|R~~iX)}NtM560McO!bq<B3?p}LWl`J_24P3aupQl;tKk%(y>TcZd4
z9r)zrk7IQ01V&d?h_aA1;vhp(4lgnwiA)%HLg2`pHOjv|=_#J3j#el?kJCI+F2rrD
zAW!6n2}CnXy@YwIWiJEMwI>~yx#Vz{CcZF?%z4Qb9Htg00glX!M3m;eHJFst%F@(U
zQL;$Myl%a79+h|jPrG6WYGL(=mrQHHEmd*-^{a5{<~DBo>Kwj!cZ?suo{KIy$7nz<
zjTqR_QXK)H*Md4kWgO2qp935nyzhZ2TqgHoG+ZJdS^Gncqb-bVsbTo?^)yymSCUn_
zjrOrWU7+d|x03<sq@EY&eNKH-NlsS;(K&2^VnR!#N|2?dY(1#0L)M2`MVEZ@R-I-Y
z&%)5TB}`m7gxXmpSiYlF=W#dE8-s|z6cLCb+CkJM`q*kBY%C#c)@h^LP6JV=NgLg^
zn`UbaY)f<!n`lkXU}5(GlY!UbO}3C~Fx!@q9Z6mM=bIux<$e*U2w*YIqTeW9iSE!^
zRI47`f~Txl5>yy0Q;1g>_~F2&8jTD9A<iXl<$!810Z%vpqI5qpQ+IPIL~QhZsggks
z_+V1YqxeIK@Kk{$7e-GWq`4$H0G`}It9_|O3RrJfgj*(tF;an78^)X8IfqaF`+f8k
zbM)S0bg)P1pbx7LKleo!;Ir>P8^w}~x4cuMSgZ1rA06vSwA~?t)>0`68FU~Q_n|a3
zig*5EL{_JQzieGjV~p8Qhb(e{Rx8H-&+mt<N3d(dHLK#ig$}ZKdTN8y01`(_PI=SO
zw;DRpc+}I<n;zHr6Nos%+UZF(+wqEZ?KWRviPFXbRzIzV5vFkk0#LwFzgPh%<a`8I
zUGj60t+#-ay{v1L&=rz&QoCKmot6eq0w%ugHtBiu904h&$5CquOZ$(|zB}p)slgeW
z^?dAnXjCZnVH*HhwzgCSizt#kiTf)T6UX=AmsxS{m~~vlKt~_Bau0;TvW2`=kt^I9
zuqU~o6#=w@MG8$IW2)+_^=hM>_36v0q*i30Y#sS(zzjffyaIr-CQ$l$BhFO?m^8^a
z1)nH#38SNBbnG&I{cVS_=Yhw`>1fb_9;X8*Km{DCTg0~W*We@ncrF@I8DIEv0ME^8
z^!5Jrb&u#8My)oD1$G^XCf291?XnTP^XC@vaBVX_9&Uq66K6<FB_bAb=+0wU+}(sl
z*3T*xu7+#<v`W7`H8^^Lo(-o=>$ua1O7@h)K$h6*FmO7`3K4(;sX*1~#^lHn2uc=K
zU0%V|l@%05$<dE2Iyu@3u^2Swjxjw354{$<1R$GUqxbY^@JEh%4w8$=JbfFPW$+kS
zGz&%DR%V$DnBra&?b!vi=bFm$=vBJ;;+SS0CXWkCD;8`gu|^t1oS$+<h=<&5m@BVC
zwQMVSk#HPEVPXvSUg)p;>1)X~AS8`eplJCmlqUwwGAovo2k{E$tX3E;dn%X^8dD{6
z2u}unzNds77(jUdAxW|);Nu7$UDvQ1tKfhh>@riitMlp7xneLCv1+1>`w#ng!&?s{
zSR||DH|ao+Ye4aBd>m^w6!4}uo(H=;j{5PQqJ?oD%t~cK0BLoUby9&XP8>B`_`w%d
z@e40(<Gr{Xk3_@pctW*e%pGcC`p&~#7R?1yuq%aMqvPDn$IcAsRJPME?3?dADQOV-
zM8%*R7g-I@0`EwLRdu8%RCF#zWy;0s%PJ^MFi0#Vv1cbY>gbY$m@N>42S&%mG%<|(
zCk2^>w6u)KHlk2dD#3mkxJD>2QX%%YY_#UJ1yY~MErOM6wV-?AIU)s-WdO##@Y+@h
zclj3~E>=}TN#Sa1Wc20B>ai^J(>*J<+(gpD!ODlebGNxn(=v6#;F6YoO;rXeUwiaV
znXLW9Z~;rrKt(vUf1``@q)J?C0dZ3Bn71%#PSl_`?+@`Hba;WXwFPwRwC}ktdYo`K
z2{M^FU_vFT*)q930@Gv}AHJiDYu<Sjzwk@kwyOi>I7>%w^#9l-`AyHe5Y0y)qzUnW
z=@<zUir0+<V-AZaHC}Waa%m3M=m`GcrzE~`Ujc9b$`$y{_|tS9dYazdx({c+;$qsB
z4_Pd(gVX!faIX7WJO#^SI47?kdlFxut6|+<4<7sb44lw7q#R6O0pr+N1+2ZSOkCMf
zf=~qjp3%qx#T}^>^hk=%nBtLd6w_6d)?j^WPVkwPn(7FXwAFqg^i`KqH=iOZO|zz>
zz#+{lUs`^oI}urS-XF?shVFS*ghTNt_Soy;bHhYezo@KHZs1FkKZ<iBUx@xDThcTZ
zvvM6yMGkn0GCV$sOehZ~DF+%%_JK)vSsJf-sFCk6GvCJSVi&IGV7Tn4a(m7f&CRum
za)&xao5+M>nF1)KfaW>2KupJ1?HERRRS`6SlF!@2@kbW0xVLV6&{%DJemSjRd2E>q
zD3uFnl#BS|4=muuE9<!68akJ=O=Hq+%`)6Bfnx-fvoAq+uZv*zu^gCS0uRJs2qZdC
z<7;1aZXVV3CH(!*F5$+#XW_Glw&DBZN6?^;9=&%4&4WuQuPYI~Z^9iZzeLE+-_RI%
z;M)o$4nLnVj%W~u^}y{O>^jQS$Jz=7fu<Bw=M=G?ED>wfqKL(#uJVDxR;X@OZHqLs
zJNriTypj<)8K0MlCt_L45-EBB#o5S}9E!G8w;JZvQO`Dj%lZQ|h?4T}#1~@lsC=$1
zQiV7hu-J9s9zKT2_9HlW&Q)1ODYDh~^0Df?H4+1_=RuXI7%UTt7D+;P1=WyTL3kqj
z8kxxD&GM6o8?*>`Y@|RSvem{qy4XC=zxUw&B@G@^{VJn=I;SK-JuMR|j`$ecTti{R
zQ>lZPuAM*ZW8#8wbuAb6%;}0~5oh94Zb0LCun0`U^xnh!eZ1wJOL)%(1e^kg*IKIQ
zgYp6eQ7~slwPo`*U#gBJn0<t0_ZgrSjifOoyNVfzlBXVvIe}|#bnv<tb@5mKa4{|q
z4xr|>v3RhK;}6fGymc+@?+A@qZ`ksSKNGjxzoZ=EZ<|G$Zk#%h*lM(;=n{y6P*Vp^
zuChP3;o=fDTv}1mn>b>s<tZx^5Dj1;soE9;j=0H=Bn^IBM-7vyH&IF_P3>jMg^>C?
zS-e^17#6QGp@pYb+8swn=JE<`Md?g%LHk5GofTUc7Q8MtaOM7wWA5^2Vrk6|RD(zj
zJj;@O3Wa`~u7eO7D7hSx`ArrEnz~4d6Ezt+v2b;{UxtD1K+=d%d56`Cr)XUe8Olr(
zU8&+?c(jP=BTbc0Q#qp06z}olKp$X{fLI#yQ64WS3lMO0HZ~;|UB#O*cK#~ZMH>r`
z9z%!D84vE50Htb^h~n8kM>~BCk$?QJw>$XJ|F4bb|AbFK;;48xv#o+VgdQgAPp;IK
zrzx5r%s)y1D40lMV)gjFU48yoc-!nKb;WPJtc%axRmDedJrA#TzKPb7RMryMtQZBe
z9;;Y;scbd=hR(qw;@brz>q+dHCHdr)pvQrQKq^ZV5T)C6X%0lOqb(5urC0AFV5<{K
zb%Is7H%oN57|StV9?7i7oF%fvrpz1*bt3b{e=<wJ@Sx<@x^a}lnW2IT_)?f4gXmKk
zSxMy1EO4Y+^wMZq==xYcy$2WH{bB6f^4lu%=m(Kjd#^O&2e6eaNXFUzSY&!SA+wG`
ziFD|cfRr!ZlljV4+24mDZ>4gj;xd&Ganw~{hyW6pk_eStrU@mW!PaYq8boA8ile@w
zX{<<LIu{Lu!6PL|7N~6*gEw5l(xC;~j;lbA;B`b<4@raE_I$1BoA>c2@9*Nq>q1l~
z%8<wBv_+C_-C}@yVqhNx-4?dqg!q9j!UjFI3TYuBU*Je0RrGVMSWNzXWsQa3duba#
zeBU<QzxX(|gtMq0TGH0BK%Z~XF?qvd^r4qwY4NwD?R<NHw9tG~MX~6$iKPWHW|ac_
zM4K-uVH5d8T(%HPTX_aitE((g(9o@CRc~*iVR1v}ir^Z}UYv7QO_3f<?gxg(NjYGJ
z@+)@<Ef`H`i7KeD@_t38KoBAUlLl03jgkeHEvQMM)sm`J*cChf1&vMT;mEUJg(6J^
zwkqNi%dJvYv7o;*=Lgw+0SIlaL{4M3l2ww+nx714?6CZHSsqI+k1i@}rAH#h)|7O)
zgwVoRm759;Wn@8ar~wqmxlXPoDXRh#Mz_ZS4ZBj*3HH^an7MNoT1RJ0RMaMm;VLkV
zj&xK*&<}pBg`fHP5fxFBy{6GBcC>%R3RL+Bta25F?YE$L?}y3y%_(M+L?M|*hRJm#
z6UO689+!B|jWK@USuQ^QfphS`a2uNYW>q=6MHZ2RQEGVACVwzonEg|tPxaI7<a$yd
z&F^hJsi0lVlUF+qTTQY=7ZkDO^0EpK$FZ)Aj0kCABS3eFeU?}i;xUM#W&$FUkBQ=}
zpQ15~CQ7Y+f;dOzjKX@5)}>*woHMVZWg=4y<jMsS8fPVngxo62{5sFTTq+=GW*qLd
z@QhFYF}}2F6=t9D5}ITsI8+&1iQrV`dNSzQ-ZG8q(<YZjG%9noua*?~d0^$n4J(33
z=Aw233yI0)QNF&0konve2Zw~rtXd=!QjkXZqA1^$HB&c4rVW|QhpD4T$+et95yRUz
zp}Vk1RKBfFv_%xp@_qOP@@vRKz5SCdy!d%!MF@1tr7$uInXn7?m2oGW;isdp>FH=a
z^a&M+(sCp->B`Xfd&~+Q8ds9O+rpcEqJ!`I>Lk8-?=Uv;itLLm^5<yArelzu2GP6G
zb7?=f#I5$foUX5Q(y&~)YMt^{saYtNtX{JvJEQA8?6|s2T-a94M3l4N=_<f<8?mnU
zQ6&@+7XcE8x>{mn___|XB~C-uy;NPO&@|bI`;&ke%#9?y17rp)VQ`uHK6XL}l9?>)
z3!a~t_%lIQSMu`nUE=uF#w?!wp<l*1pZ+U^oemn6GCf~JNV8<D6z2}zr%jk!+9H0Q
zzLeDwd<Iml5SQZf*)WB6kzB4;=-URLALzx<*NZ&q!+`$4NLp@@_9@RguqKi=9;1=W
ztV{x!wCpSaP?YKH`ku>a@VKwKTN^@gYC_4l)OFyBX0l4c^Ds2z;I7AgeC*Q%Aiu<P
zi^~9%j!e>LC65nvFzmE_75@4Wcxx^tpQ)$Dmcm@5lk_21>bA6$j1MB74YBQ9iI+d$
z!so>nEY#_IEwyx8Y5IN{)-|w)R{e<DzjpXm-cHvdjSQc9_?v;;Sdxv=HD34p>&oye
zx{yvaUGMZ%&Ow2w6&oP{cjD2K501>KaU0wE#31XUn#StX#f)>f5V;=RNx@wIieAzL
z6m-9be21G%kuA)!<7qR=T+8m%DsgYSjuzXxzJ9Ss)S%p)!wnz$6-+<+863FrWmwpD
z1=?d95jb8Z;}Y4b=CCrV2;)}SGzh#{rnFM+T{-yC2`i*i<v^~BPz>~S4vKSr(y}nQ
zT%q}YPE!{rJ?nDREd^B`M7iXwE<I1Aa561$O<q$4n!cCm)Xl=a9L4hs<SP-U|HuD`
z@uKH6Q5jo>xHX%0ep2csK3~KJL_j`{yA#E&XCs(Dh+yuZ>Q1E-$NB(6JJdm=qOF1@
z){?+$pC94<ADzS(7Z&j2ZH{UbRCrcOZpK4Yue$navi;yBQKe~|Mt{7M0%_v%4X3sj
z)3vnP3dTkn3)R{<%h+u-fI|hM2mwt3y{7ICquN<@bg~sDyd6s&rdCNK9(~D=i4&R;
z<qG67OQWfpT-J^%@!+*?QKqyoL5Y=<R}1tZC+&Tj%b)6QLwV7u0TWkvZocb3v1Qk%
z(Oq*E>Ko5PR2$bFjbuLL&3Z(-a5R9VtyYFc(<<Zf(l#uVR>QL;yrCMbiM6mN*T5<f
zCFWp^lzmRpN-OdufdmXBXk|V`F8iB6_W4nRMb0_PlYl7BS^qdq)aEQzoLH{`3uOSM
z{6HmOHcfC8U2~ML#L9;XO}t-w#K&!4nZqqVx{cm5M1Ih`nq0Y3P3pF~>NDsaCOTF`
zdHV%e{Q7a)Z&#%{q$%+T$@j5L<kcp3A*x59Q;Ju;(8hcIc@5?}0;`x0sL6{MQ+J8{
zuk~w1v2ty^Q2*%ZG}k)mCu&<JPB|IN%@f??$A8y7hEd5ybwURgSXjt<x!#iQtYg{i
zA3<rPG@Ub+MNwki?~Yq+X}`z}jwsHhjQZRD0!aWO^Go`|V3DS7NvK@(hwqHKT4vVI
zEV?WPqhoUUPgY+;gP=n*YC%L8I=UN^GrOTC-V>C#%7I$Ft)(&CGj$^#9ley>s30Ie
zvOTm4BhP#us+-QzlZ}+iqIDUNWM601)K8L`Wg1+hEV)ez{rV_gE&`Z>C|7fo)+FUX
z6Gs_{lH5~D4-GZs9WlM*W-^M(E9-A55b@?095m)VeDJdk-14j*O(au@+sCyifOl%B
zxGcKbnspzCJ8?D&8@8aa>pm4pOal)cVm_j$@__<+DIY9J{Om0;KL5=s?yvi}iHmsH
z9bzB8F-Jh!EbO6)8=|?nj|yo&wLnrA@l<d`ye?=i{&e%m^bc_vHlLVSskJ%LD$rfh
zdMxgODg%>mFcwFoT{`mv9LX|rdKQy9q9g}f_2%gv@&HO!+tb!c_4F1p&Dv)MD2w_f
zeHDa6{~9bwjw;R#<$kGx1_fQU9yza^m=9c-{^R`!lDX)jIvU#dSU8KDk9-`pU>={e
zF2wB2H0B=v6vS;`#MQs|7Z~2SE^PspM*Z^^S*{#-kSl2K66zP_*G<Y<pD0&%lr~FA
z6SNv^dBDU`p5kSXQxN4Ib2*DUI*ii#^;q1sON|*V-_pJcTPCk$;Xm(masS=3IRCmW
zz+6eSG-fFomkh)vaSU$AqB=D_j?$L3=o}p*iZ`ouk2GHF;*dJ_pwXmjP*7#(QA1*U
zRN`lzD^c*HEI7p%DQeK?+7Q)=b08kdMW>#kV8f{>VpZfRjy88@XWz(|j5#m+JrO&J
zG=RCDBy4Hd8nKSnY2QUC5GjpSFUtBuC{?y;<fxRrM)8nS0B1pl{u*m3^FfA$79wj?
zjBF%|e7UJidL}GiV<l_kD0Q;*B>hQ}{?`Fb9xbA-ym9FWuN}}cDi1Ex3L-6`;(Dx>
zRiax9R~`Qn&O7)S?Ad<+dk-DK!(Y7}OEX7R1Im0^MVu}(mKF1*evXj+;@4z_37LT)
zrC%n15E;u9<tW;+fI{;5DAV1=eSrm;fk?gCQgR+eW!2=R+cq<G_r}Ilw2lJ>Dssu)
zoy@X3#iE1h1s|XL`T~8P08m(?Le<I-<8i=aiZ|5{k@GDLvRw11Y+tJr?;M=q6HK3V
zR-H`~kko;P&=j7MYw^OXLR@l|?w_aRVai<b=V)K$$#V$c>z?wc-4oUzv42CeaA$Gx
z4Pm>v+9tEBXo0E|k*eH*L){z=Vc$q)$5q%@Cv^BRTPhh13{I&Vrm$2f9qUOMKp&W7
zRvXg?piJf52Rs8N&GO_jy4EK-k}HUE`XoMbMKJLM=c~x7P=hR=pbjJSl`|wC4TSD5
zalP0J`|v|}?7$JSYCi1Yad3C4E_doN8`pNJ`mQLMgY=4eN|F_uMWIuPkXY8PYjCmV
zJb2_lgf2=}?@O9N=B!RMP}rAN$Z~X&{7GUbXdXVQYRDKYDsoGd&MKBLbioDiCnwVd
z3`CMwViB<I;lIAwL-*(c?9xQ0U|@RB`72hv^t3;%`p0*Up|D26pBhzCGp2%JeE=mu
z+P@CY&^QMW(5ts}ccWP6EqyB@i)5yrM7yODg-rtP&^qCl&O;nO#ni6!1j{E8FAbWV
zXLRRgU&+;@e8RY(Pt5>)!P`(jj;)bQ>im<2AAAA2CST+lnrCD}swa3mHjPYjd6_gS
zKCljhH2vUIq$<}l-1tdSWci>xJrgP4l4+DrsU1Y7flC0GsvJbWWlKe=B8vtl#+4(P
zNv}xJw-UtwHKhA(>0nJE!Vb*h%k=r-t>+^wufg=uuBrmYNd&Ab`K;-0&95b8WhF*Z
zCIy2sD;ku!mc(%`5HaBM$f!T`9VfjS2t+}ng@uQAqj~7CT64u28bWRRHaNAKnq1j3
zxg(>fR;p_9Xzkyt>7C=M%`Mva+M_NWdH4`6xOO}3v!rO3DqZJ;;YBN4p(wOkeS*X3
zHd&<|HFS<Fa4&gcJxi(<t*~J;8h7rY=R)1CO==CO&9bhf4n&<Cwq{H8RrH=>WeXRM
z3fNB_ke*N@B!ttOoqrv|z_LmO-5pb{gA}WU1%g(rBQ7~EE=+m1Qg^dF$T4aDWTf$h
z>uS}4>Z_giq|x6SuD{QlNPUp}!d<BqLZbQ>X<+a~ag#pxD77>qU14UW77P6m%xv&I
zQHRguWnOyIb7O3nC<A+%Sas>OWZHbP_Dd&>SoE#RCo_v3_noqw<sFbqB;ZmKs9bXu
zX#y^(b;<=4WKO`EHUQ<-ECOycav1eJ`_P?VRP>wy*_obJ70u;M8{rHOtGtmUTE`_Q
zh4t&uI&w(04B%RRi+r3y!NTmkkFVc5M?mVSoRTC8CzAzxxzvUY7qcN>uc9E^Z33r2
zabp>a_jT2Y?;f8<`Kt5L8LBF9JN&&o&AP($Sd4QQQ%CM(++wSA5#l3HtwmDNk&{@X
zaIx{MaDMT*7IPUs`3$0VkA65O;cQiC#|t4xQF4)WSX&o^nO=7$5o?+Ch>{hn+1#fK
zN1R|TmN}9o^NWz>o)hVNk|>=4oy<K(4zP(5LS_LBe(d<Rkuzm=5h4x9FAqMbQYCJ%
zXeba)hAFnVOC7k+y#<x^Lnz(-aZFrx6M7x9;zhPvS{CRZY!I1Wks?*gXJK#MwMk}G
ztW336DAh=$QmSHD0ZL?&szeGD$sEPgGkWvzVa(qDkm~Nl<~uh2D+dy|Ex^Kk_tV7a
zqqu%8itE-B@B%eaIJIG=c2L0wTbFgjk&DmY)xb~H8+6{Q=q|?Dq{s(vtdeTG=9r~&
z!WPP#T{QQQRa_uH_4rZx$Rz~UNi^?&lzeqtwNX<YqU?M;-{c%QluQFx6l<F^n(`C@
zDXcG@BvNOgH#7Ic98usz8GF#|)37y(LtFVissVkZwL>D#25j6h$wnukWI7Y7xO-Qo
z%F$FNl<S$Dt#6cpWBFRD{n5K5)0AKJA)VFZL_DFTJi4+|41~x4uVAa31XMFiv8-%j
zaGj&1o=1q21c2BH=jA|K5sFt_3hNcW2k-CSg^7!AfV=7}G>^}#?nSHu5Y{s64cyAU
z<g1E!4g?-kUlFpe(S9oJF-grNQYTX>h^`RU+8fhuE5Fbf3xk#3jeZYvU=zwq>X9@*
zj}XkyDNE$7S))%nS)t;VZR8#_5YcO_!Bc=DOLNz53y1bEVeMHJO<81|`MrF{4V5m_
zGAD+|lv@Q^J|7D^$uHtQ9nFyZC-O5NdrSqq9IguT933&vhbvR(k$kv9VN`|sB-&4=
zU-(IZ)PDTn$zI+>r}NpoN`q<<Ox#qJh(|WUkk=dPnE_?0ZB#CRwKhB$xksE1yl~h_
z<r9eGDQm?1!OfHkyi$0okRHh9_pRzMptw#4w@E?@WFSdFlMf)szC3P@y=uP0ieg^q
zSvknLB<rBBqZbPbRj4ZrbQ0FKL~dmYbGV(h%3;{mA$XUbhvA=nBNzFgGPDunH(iJN
zvAQa4DAdYuiS8uLB>Qtn{nSm${t$RtDlRkqTsmgr{?hU+2qAM}aou|`lU(TuPl#+y
zQB^3y*RNR8lVPZPcPkZ2oGk37@B3?3qj=U9eN7|XaK<WgzmB4gh?=IJKK<T3$6V}u
zcmZp7lvU4fZgP?+T)@5-TP07k8nvnCLjsbA=5Dfrtqxg2qI6{8y)hfzgCQcClvsPG
zCeASKI|*8i(czW}Lv)_2dig-{6!}PTbTa?w#lp4MFa-l!BJQ=owe4mBuVhxv5~YqB
zysREp!3B}k5eYNvvEP*CNs!VC$bMN&-%=<t^N&Q5oXr~(ae}B^K93|<c%MY7=TVC^
z^Mb?#rl^~vmS$BAWj#61L9d0}LZUiMQzH$4b_-}NsVJu9>C$x8jq&^3wG${_b{+h4
zE<*9D?;}bvfw_GT;6D$oLx5q_4<CV;8dqxzacG!(NJudd#UJ#KAp64o`P@>U;z7zZ
zH4w=x2qg2epv1x%D;=kuR&~F^C^@-YLP7&@>G6GZ{dG-HBnLngg*?-vwEb+@wHhK0
zMY5vb;eH&t7d%9^z=2BxekpLUYfl@`<3$O)lIp`DRc)E+$4BQ-v~^nmZoaRdBdb)h
zQCjC?{=P-kVG7m=ijzKiN4b{=4R=rEB<pc5qO0j0jpquT@G3nq^ArXfPUs_z&`U43
zRAP*mZ3)y5WBH3xAt*VI$imZ6oQ1DBd1UDelPVE-xffGFrX)jo17j$blq<^w2FtGp
z3+M9d5{aBOOJ#gA3s&SMJ;*Ju$xm`cX`$?>Ix02eb_3YMWjK`rEE-7O_!O#FJPqE~
za|sk>qAIfp5A8+wu?K0QX%c|i2oD}1$~J`Zv!8|XGhYaI^=g$@<6^YV+#bB?T}SX=
z_X|u;N_0!3=yiK~MZw7QrRrNXb~(jM+ZW4zO<oN2=h<SJlLTdYp}e*(8)q^XWH4P<
zlRTC&U5&>d$I|XSy8Ir-kx#u;E$?zlC3578>b!9{lk-U7+$_;A?)Id8B&9+zOZ2dr
zd1N2Gx7DM`q@epsz)G90sB6FzI4}05TEQjVWI_UxgZje~y;*MeHAz;#M6{2tN5fY7
zyEJE#@A#tovO!7Jg;mzewLeuB>4Xi(<%@)4?NBGKPBZaRq*UG<P2t`PN&hGXpvd(0
z7R$PNn6Ru~fJ&|9nk}ws{FGc4U#`6HFwj3cXVgySin;SvsJ}KaZ`iUVGX`STx^aG?
z;-M~=)XY~sZwG3dH}U!yC=%zdU40$OmtH~Fz$c13hw%6@L}zV<zxiy$i*$c>7S{D;
zl&-lM{`RNo8T9BQaApspIbFtYeYAyl-O<75NFjG{+8QSQR)3ND@|;&6<xQ4wSw`n%
zZVbt^SDgli$bu3BdOIYKque^O#wQBN5=C52YuZ$&lbOhsz9cDc@~5MvI+_nZgdUxv
zRMBE<<*-W7@&r!j``*0*3)2k@59y{gQe-?-uiq<FgqSO6RrFVC)eQSeg;h3!g(cl#
z${mI`bWkxIUaBX_K1)+!o2o<zNW$?LNX5)Se=4GO;sj4y;)jK2EB_{52-NzyD4B>`
zD2;f~<cQSb%TgEYVQ_s^VUl%*vsxm>jL7*uQZ8S4A-Bj-A1L}-^sF2p>knHG)cxp?
zaOMYOeY^$ylC6Hr*we1Y>Zjk#T{}_Qycva!8{v!$sR5#_G|OGqZ$`X&4ZL-mlsv|&
z)QH}&cF}`u9)Q^Y2&}~g+<wT%U)(y6Pd^l*R(9cgwhGlcM1`2v@$8*6uuqfIIa53+
z7wVG@$^La@6HA1g6iA;BD^q(5z0!M}1C*5czIL(ko1_Vk6HOf*gLU)>O(1POL72#0
zejs({<{%z^kSur=y<^kp&deZf(PVy)F#eZn)JgPz|Ez^WN1GTPbF%Pv+OI+CvBiNa
zHz&X1e(k)#!aAEKsE&#<3Tp_?uuo&u(hE0)dDENISjDPkr$^U+C^nJXr0edtBad{k
zuyF&=&~lzmYMp+FZ|P1-ExksLYNM5${H{4rH`i}hB>5zr2T+|(P49wqMTQkhtCvL+
zR*F&f;YgqlbNLVDTVN%LR*~xqk$}h&X+H_SEHHKDMOgR!KdRaoTcskriE%XvL=Bd!
z_?q4*YTMOL_{cc)EW+lRX2>IZAr3r_M-PQ~-@`?``_2GI>oG<vHhf<<Q*<jtMao5*
zJv|*tPD{fFW8D2wIf=X?L!@f&Bx;Og#r8yAW$6yF-T5W7kIgHPxV0+Wp`onRcAORV
zC8aD3q}Wu!@-f*2j>@*PRa<GcQr+pJ=*=BZPq3Q#J6$yQJZ{QVw10%OVNF)vn5?MC
z%8+`;#`H`N=bdkw-6V<?L&;=d68;>xO6VOwPh-v>vd|?O9`!;v4tMaS^BFXhGJ+fM
zNW))~iQiN<vd)Ch$xw0@oAU((T}SP^a{3m@S}BA0Ea4G{<V^EISIOHY4Fc}9z^#RK
zpur5_P%r(#-_ln`ZB_|Nt&HKLas{l&0l#2b)M}YLPOND8av7ig@>uj+qNJ={Bmh#g
zq`r85#lg^}m%w9igdM$POtS^M?9*i8Xgb^J5qN6kH#P`AF8Ku|-Gg9eA8>FtruWX{
zeGmC~?*kqlnjt<<<7vFYfecq!A+K6Np;m!c;lfB?g^pt>a{Y!^_K_e5mUuxfQkQS~
zNI#}|bQV3LJ>F<dU7zNm83e7iUW@4HF_h2R1b<=zO4DTe1gaoIvgD;qtWj(N5#+tp
zhT)p;vPWrhdH4Zx@DFR>Cy@_ZR@MqF40B2mQ!$)SeQuIs^8#@Wj!d_ec26;vUXcA3
z<M=UXA{LXoQc*k@ACMEaex*Ybd0Q6?Iz{?SofiowW>8Gs4lO`TLf{%mw6~IF(S*?P
zFn6>{ZikNatv~&Q?6Rjk`n50M2o$*ILW_P_#ZtinZfFv#CV#ooh#+fFkPT!@3k;Kj
zJX776CEWVM&-vB5`_^BT%eklQlO`;ape|>7`7$J9frLmxyjeT01W@b*%Z1(ayDy~~
zuB>NT?j*Fx%fnR=&mDt3R6|JAg;%cgw(lUTeGKB@F0}U?#3vuK@pt!EaN7Y}HKrXc
z>5w{S^xaYcJ^`pWTqPjY;1-LfoJ6ch*X00s29@B*Cu0+Thz4VKZV8P8(@F!^UZ|Tu
zkX~Vfe`7?0wQ=AOLSEei+9F##8PKt?AH;x)Q<@m(ELEt34}8R~rxL9UB$=n3sUph^
z;+4eoCST<^Hd>K|gVT|!mQB`jl1Q|7GF5SiPOMttrSg5FZ}KZdsa=i`5}g*ls@UdL
zOq3gutR@-7Y1C4SK6~m{v*3DZ(I;}jU3cRrjD$Z)YA3I-9P4rgfO?=st7Y5tT!_*<
zgTDCMY^r_OhANrW0n!MyNSw$VTgiQAf1pmFuhLGOBpbRSd`yUZ;A7efiS#zxtc<e@
zW2x){!unwX%0uurUq|P>g^;M4#bNR3P+bUag2*#l;r#PpJ#s&=Zx8M~5aVt4)$sA%
z1tm5eF7om)wgM1aB5qCPlLab}B`XZm%ue@}lqOmIPo9{|=7sGN13`yGxe#kg$G%T%
z`Z!Uru38i=8H_L`{>s9zdcE01_mM|a0P_s)k%e+bMoc7D2O8q^zD$+)x(jNg!`f0S
z=F`rr=#yQf;qkODpaEuD=uGG8(Zh7F6{?nJVe-brM~d|tN}{Xl+bq++9maABo0sVc
zxU^Qa_EMd3X{_>6tisotPOb7yj)#-&^qLjRPRm1QwrbfHd0<x9?VH`7G?11L%v*$K
zdtfbGgAS0Wj#^@|6J|3^;%p?11#B}Y<q0BArnDS#`QXpD+REpIq*%WGsvPLRnnm6Q
z1auJnzK|ty)+bNv%xkJDQ!j;SnRZR#%)K<IHqixcBVIhB7Ag~*D<M$udPGdk{73J>
zp(7pq)2<rcwX1>yOE#(mps})6I&<G}?uYG>CGyDE@(rb9t7H?O=Q0G2gyxsTk}H6z
zFJd=P_}544OrfOqZNe-qVAi&hGNWpG$w@uH__=U?4&B9hl(%k&Ju*t4547)<M83?x
zPJpMHHny6YvRhUzK$1Cf`ZIcM-mcMB7Cn)IB)Q(x3j)1nkA{&<^Bc*rrN`J4syDpk
zhWk$TIusoZOrFx!)F|#D=KZO~<+LI^zy7gSu*V{-6XV#oddi-vzgUjV{~aA_6HgJf
zvuI|%TCJ@*+ta>LksRS>kjn3sZ)ux4pq^=@?wTxkJOBcd8_MU0blJF->f2T(WXmIR
z{lF4^YYHI;D3R|FWM$M%SXp2pads1bDS3`Tq;y(tk@$Tb!Jf~<E}o@-umX{%^no>x
zesk2uf81ZdTXs(1j-x(`uE46AWBeeZJ;j2eatt7k0}Fghn@i7guz?j1(k!iV62<DW
zWi?mKC#67&m7>6(SVit#7r|0P11A^xOF?DwEa`tLAQTWS>S^X=TA|6rGR0Y~7%LN^
zW&<GsFYBcd4}eG~X_E!&F5f<iBgfm=bGU(OAs6VONx0D#XtyGii;+pj<|IwY_wwo_
z9lG_bv<xS!j}LUuGh6%RtP53Y@W4qs$jCVJC(WIxw^%@L$-c<1`LDGnt&hZ3-24`(
zUEibgge$I6xdQrO-~dBxRv<|FLMM^9NO${5asz##T4W*RBzvAEOhsQFNInsWa)LKu
z^mt+bJej~W4<akIKnf^)oObqHAHd9vsw@?2!4$=#*)2Rq*Qf$fSgX3U+MbOe0?|IQ
zJa4_biuXKRLOtM>AS~5#iUSE8iF3;(cx4@xV=%EVq`;-BL>(ROW=a<)$_t#dgd%Uv
zm-!<JKvK&Ts$K`BO&igxH_%&LM0a*pRUzw&?qto_ehbAQQsMidku>O#fi71XW0J-k
z-VO;&Ecwae=ec9y&#ILadstX#;~AH1!P73h5HEYvmoY;=T-7!EqOI8#s$*}(&$>d%
zoHas{TsG|s)I<)MYb+5O^@*(p8MA??rzLGNN>)zKQCzibj9Bc{T?A3^OmeX{)0MeM
zifG?y7xv|S1ln#QYg9p7YvyD@OL~;F!c>!`{)9RH)Zc)}QI5gKxmCZ7coafpZHRO0
zpypc)=L>v9+7a~xAj(ofDNs~*)IJMj?%SgOvALhF_rpbKym4q+PSe(aM-+`gbn77x
zFZt96-g;LB0nJepLk<dLak!~TVQd7&Rbwd8#<zvBQTW3{${(@`WJ>sJ+a@uJTx6_&
ziv}LcD4}avNIHqAsj5(}?J{{i-a?Li(V%k4-zjd`2!Cp|Rv++^IFXkB#F74-`b?mM
z2=2rr(Weetk35X1)za87j=HKtqtA5@?nC2&d(k~|NJnOKm4uo8&rmL2VUhM1E-m4}
z!Q;5$vMIdnSFS*Ttx&6zc6VwJZEH1S)$b!K*hH34jZJiz#nL@pIgqwIit+_~B4sP=
z>vC6Ln7k*<`d%t>NI#Z<cC5R^{%P=xfKy|!eZB3=r^ZL3!E}@QWo<H*MYbkU+F)Hb
zz&FKYLRY@>YnGq2<&`;$(nlu-OHYMf<|PeO^o4Z#*I$(@ENm?EjUV$7JPUn5NkO#C
z5+y*h)xfrlf25C#11hY0)2|7^zQz&w_7Fa}tAt;@wTvTe592ip9xtxNl&xB(txCR6
zSz98eZv;H0y;G$FW<?7LqmVbvSeE&W@`S!ppL|M)0riK_y|+y(GnoicO~A$_s%I}Q
zpnL3Cs<@Xq!Kr#LXT=U5)C+sj;OEL+%PXY0sIb0(&VhXhj?b6~pp&k{D>0D!GCDk_
z!>ZhzM(Uo&XK2h!<Apbk;kSS4Lj3BVeVO(Vs`obuNQ(_VH*rS2qB!ee7#ZzdpnWCj
z>7`3EYR9GL#^Q3JDEmxsb>XOE0uFJWD@Q@E?#{FpoQ*MpbAlF45-s~GyUaay(fd}F
z4a33_=L*xRRu(yuqE(%7a*@mexvI#kn=IayU+*Nd60%Pl*AF6?oQ+zR&eKI$LS}wY
zUOTtqLdK$h@#EAg<tz~Fy!9CXky_rx*1-kG0LivZKE(8!ldkR(OBAo>Hn8)^EPnmA
zNgSe+J~3pe1+{p&N54h@8mcO*<CRLv|52#}C%4L9k`EDC<*yJYQroU9GE7T9coL(*
z*{j#pB3x=B_`lq}2b5*mSswcD6K<~DRh?(Ld$KemjYdc#X;2siK+zI{CwRyRFtAwb
z0ZT^4Xc=sSLAI9(eg?w>8EmWv27?I?5J46a5-55kjV6yY)6+RsSG;xO3H$wF?|t?;
z_jXYC2)*@6x>MCvH=MBl{ipB$K0;Tw+D^Ga8+J_I2q~nabFI}KvP8n|%q)2AjEY7e
z`1!=QU@?#c55ioi_vB-c5BePPGKkr2l75$1mzrKY55-!)37k8(0b5%=SlG1=@BYp`
z@W>N4!+-hh&jZ9HQm0tq(Rw5cxUKD8fn<FPlI@;sposuk$&l!E4%1`>M(reQIyQ_$
z5qm_)tSFkc9%(S@2K~`MzbOpUT8hS*4%8iZ+o+B7^z~xx?#7FJh)~|VxXqlAV>!*i
zsk5;x<=9RlDz6WuOI0-2(6$%W<BMYs_52cQ-=NAK$G3Q|px`*_f}+G7c-{w?_bez3
zD)fpAkx=R?XGGSxLJ57+lta5PqUUJnCmWbzjiJ+;gQ#6c4>Zf+92pWdR>`nzF@l<s
zxk;Fn9S*c(?{43zFzHWCkaQ_5rVBc}Z~=3kb*6t7u{HTqea{|z>=yO*9n#<3L9a5)
zBqZRF4j!$Fg8=2O&%{fOgb)S;7+*LKjYA#g=1UCll+Ldh>8Kb`35uQ<yc_0gr`v;_
z-WUz3kGEhI-uJ^t;FF(u3Z8uMER2>k3`a$kj>t_&zOs4SVaOkP6vk_^8HnN|KCLbs
z@5(lL2_&u3BD|x*P?Mln9mu;~Rw{8uPgf($Hj}PyjfeRgYh2(6aAShSxsJLHL$ZrD
zfS0L^o3SIH+-QV{Ypa>ID=d7XJTkyBr-l7%HF49mH(OM+hs-FqrNOa7Wv2h*H(7Ow
zo7*!cFT^V}ko>%-@Iq2t@QjFz1q`zh#m+(Qj7J8}%zzz%E>j9i6812Jt2^1BhoNd<
zKGYE7!Q7`tP1Ux^e`H)%cJjO+jx3BvRfsC}6(?c*QF4B7^hATzHB9n*0>3eNCJhb_
zPM_w!RJ>~!W8MZQjzfguX1ufn(d-<CIeqp}c5>MAYvdM2;~KAKeEjqYejdFx-CP%M
zZIwaN)C_)x9&1ez##>`mmH`*<MZZ6S9&v(GUbT4&_U_a0Q$KVI{O><-7Jr{oZ`*`(
ziXmvV#RUj=H6d)9!j_WqCJWe8S`mZOP^7<+PKrz&$QTIoy9YCn4^PVGnHTp1oz%s(
z)#$b~$zBrHWkV-|p}4O0Uq_DQ@}oOp%v^L&;O~y$wW+&sE%$~=xu!4isFPcOf^b9m
z4IN+82+CeWy6|>7(}(szDP+5(F?ofBQbEBOjS4E?!@$7z&F|=vlGrof8NBH%x-4M}
zJugB(pO41unW!Ie%dP}Eof>R4#1n}TwIFEJSYKCiV>4M>A?YuFFV06ztN!b0@E{Sx
z<|xKgNG;v5rTeACzIXf>MBQx+(Kdv+XbZ!lt*(e1WQI2{%S)I#J3mnj_}PXidcTv$
zj2w@}(`76m7VX*3oDAvu1)0|>RT2GyePDu~Kn$rzhJ+y~L9e<`!aKhCF#PvF-wS{A
z-<~q%a$BiW5G}TGeT|{EQ0MDQSWV7rIT{kdKQ^u)Fa@ZrtV)2cOGR^RbU{=cQ$5Py
z(G#uU;iuwP9#o?hR^`yt$Ku!BdcB6!!OwXKUaV6Xe?AV0eje{!c2q)p<K9$sV7`Si
zjy^Bcy#%Lf2;0l}I>QfOP0o<pYk!eVD{)ssI_*e33V4qzWrv=33X4Y&dijv?KGIYc
zdBwat;x!e`G(pv6UWOI`Ex;rT;HJef99mKEV1}U`RpBs{qXlY5*15r{t=FAWj-O&s
zSLKsD0XEwd6{84?QnUSEzmGd>x7f@W@tyOet_#5OA}_KtJ3?`6jL4t;S9Y*bc|`;<
zCT)+$8kuvSdBvS7_70<QilJSf4T;l+or|D4A^hk+T7*x1yawaJRskg=9A1l<R<|&W
z4mp$_UD#o;Fc-ZNsp63#5fWcKPF6Bt;;>WEJRV=fl}Qf&Y1#>2b73<+vc8@DZwG4$
z!-L3>k|d(_ar?C!lHANY@nRf?7=8wg=rF#q(!Sz@kAJckuV(OSwt40?SMA8Rd!1L#
z7WB8tZNjplOjP3hLW3&vcuy@PgkFWtg=)Srg)S$uA)PXcfyA*#6R;T!L@296<nK+u
zESLxHni%db&*6IvJFL57dqL7b%-wNm$33CElDuDutazr&2X<u$6%jb1=gE?>=&%;e
zwSqB6OECdl<xV>Ta*a}t<U7xOBl4g<{&1HkH%iI-@aZR9t3WHi$B`FB2royX`$4LI
z+g(!9TQnQk5McEry!7k#!gqZOd5&{Jpo4i|(8TCq2G4J>jrS;n#-2qOp6iOo3Pfd)
zE577~TDYOr0_nxr5R(n5&vQuxWF;CdR_{}C&S$&v+|iMmdtS8860LOVVM+#9U%3uL
z;;)zDVmys^>2GmOe7nTZndx5`0>aEf(Y5d)1c58o<+>Of4^*XGTd7WIgRkQI6RHxZ
zRQn4~sZtR_5E#nkL@>>WjBy1M-bjqf8jghrv601sW}uByQv#2V9Ao*6K&EpY_B>fO
zhDMaYa+~ON>N1*OxCJt0!@07$Mo~}zPe-W?V^UY;kaP)#63xwHzB4E)bi_L9O~q>8
zOIfZ0TUK`E<>Gg?;aaM~O$<Ki35u{uNRW>K)MW`PG9-**cDfXD?lXA+9yfU?^gQqW
z?j~%0B*woFIob(!p&>Q#p7e0T81=Xh7Pc<(7z?)&QZxS+=0dp7l*ArtfXnA&P^}dI
zjv2~ulfy&7_T_MNwGKyzb;z3;Q=};--lQJq?EEzwlHiWi{rKU(kA{Lru5JQPqsUP-
zrH1T2&0T0^Qz$E%3juh98M@S0vM?Vj#>Ex9&_H(lG^!F7O?V?O7h+@ZOWnq(z?8v#
z2$56kizH-|P)WiY7Q~7%dnKtv(&HJAcx*fyMi|E7j)!4M7>uA1XNKfOIpPpY&ad3D
zt0Ku(g~Fh+Ib<<Ya3zf7B&-3AmJruOLc$x^XaxOZ$5@w2*}{V<l@`1X+E5951R$Ir
zWd(d|auj!Rg3!C8?!S4}h$gwp!L$l#{q%Nvg1lCy_miR_t!1$L;0nw>XBM^}6BWOJ
z##Jc)p|v*L!O$*+){#T7{e>?|B{?;OmGtJJ5gWBi0G8h)BW95S!`CGDq9B3{P{9*t
zo3Ki(xQxCqG~4vrsNJ~^LsB!O6`ia6zpFfdx${0r0b_SDH7G~T1db|K7v=F#l|hw$
z-N6TaTV2S&gl<8(5~q}!f}tyn2&%{g1DcgQNW73mDA0Qmw1*!2T>N`vNlIAPinz+h
zyr~g-A#cp!X3^jo7fqzzO?;oG@N4%|#ZVhzR#l8obBsl%N8}15s+fyXpuO>Tb;(hW
zOJaneJck5au?q}lF<?xawtNrTLrqsgIqkuBv=8g4Ahs)*q{6%TH@9S9lio;qo=iM}
zVyF-k)&*A10<SOW3HQ1XADn^U=~YNESEYec&ai3BgNV=jXP|w<5f~hsgLG>P@>*!Z
zJbYRs7NcW<vZUZu<~ge&5XE+q+cLRk9q6;0H6VJ+5!0@vT>g$|Lv7R>*KSBzegmG_
zXYc?XzzhCf-X>Ec!D5L64P%hb3JH2QZ>Lp>*Sjc7R7f6e?qj#%z=QjMY09cHa@){{
z%Z?wG!#Ind3r$m%zLParozw^~c4l-@&px#cTk9ja!T6d+JBFEEEm+(?12anvn5khR
zJQ(4Q8Nlvcc&_M$`okIwNojDH;XiZeCp9?Vtub~iPo?x6(BPwENGe#1WExkyUQwy=
zSZX?7MUGVM&uW>mp@uJ&!P7y%2;1_iA=!cgxZmd{{Lv-$$*MQ9f6A-FVm{q#MLDEw
zXvI{lcK7|lI?-(n#E`%u7BKwU?m{%b2({fENY?shcrP*GT7aQ;7lN5H(7AmVY<_lI
zrmd;oLhM4ABS{lIb!B{QQ5|WId!5!hN0?uA`vIKWj9`HGY=Fky#5YQ_KnfR)sCFHO
zq<7=Z{;(3^qQhXkF7E`O94^a_B3Gys$`{@!H9)CK2c<-NVmPmal~d)ixA9Ja>j@c@
zwjFt3wokk@B)2)tp}Up9=Gusp)|tgRj0ZXYZO}{L{E41B4tl#76VbW381@}#K=6V)
zps{}mK6ZSDYbdX~Z2)&2!ti~r4v!oU;Tg=47iI%EwMhcNBfK8Mgp=9+vsUGTf~Uo#
zJmOZZCdoag0UY$@0O5ku!jK1({xfGphlq28+zZvbkpbgTa>wnKPg1t(N`<hbO5hhf
zOy#a>*p;b64F!V_bJ-a~THm52HY)N)P8*21cZh~Eg!<kV>^x>RSn{&${pk(yTJNku
zb9oWQH_pQF_@)>Vtq0~6NsD4b?lG$ppSYojqu<pqr#gAI2FF)x(7`Z|um^QAq$Fgf
zfT*RSYc?eOd^FVja~PiN#+$#J42VX1U5_obI3=%oQ^NN9)TVwYrwVD8DtuNKdak-+
zL=%nHYDwFGOG(atFvy_0k-!!{cDgC_cT#lS82hHV`wUV|Aa7Np(9UBY3-MgWt3&v$
zog3kgS6=}8_t&AWGWh)IHr)8RA$-#<JMgx9cHrKd`tWBDEyDl!Uwh%?D1_Sl0C&X5
z5FHlfedPlttA&#(lkckHtuHr_R9)|UUby%O(nF|i#qy5YBSI`HXSQ-zhKrYTAYILg
zN=D&BethJ)_dMkd@s&k?OL|fLL27Vu_PW{GBs7|xKE(5Nh~{b*+-X8PBiKyEg`IV1
zAI7Ml7o%YfL9^I$V7jzIUal?KC5SOH>cQl5)WAJ`F~p5EggU;ij~n6)dcK52!&_)*
zv-;W%2@T~D{NObm>if~8b}?*eR4|9wu&&Hp<MBOM7Mf6d+zGb$5R?PHLPXCsV--wC
zaD(4mHLEZ;+DjwcN_MtW*xo`z!d<T4N23@C0$Si<fxFqnRcDbSp)zXN_=_3*+oxu4
zhu>LzE1qr)n`aY<@En@;6pnA#;MYFA3qJ7R0({?n8}PmNZo~imcnIgVH0+rfGg?}O
znd}RyTA5R&FmAdbd7H}>VL~twhA|UtjEip93XIO4<l=~o5EP2=Zg8)f_vmU_y$tWs
z6}FW!gOQ%(2Jotb#qaY9vynV=JT`eu=y^JGta)z$;bINy%S}Nnux3*3@^5}u68NqS
zp?y;fgD;O5;ZCJ*YDSC5a_T9c*&diV7UQAMty6z0fKjsn+Ze8|q?;_l-P{vHeIZxZ
zUjEMY8RKm3VCZaSt_2a{vl?IKR=9Q&lzu~T3KyNvY3J{{9vyEXNm3cev+O>hD%ASy
z?ur*<h#}n0PL5tELqnplE$7l|o|Pv>0|R0Wz!9ZdS_Ww1Ro;l(@Mm+cfDwM5A?DgR
za3TPhB7tt?FiaHu;$N@8V;9=6Yo3r(2_qf2!N<}KMTHJ3p2*?~^_1RGS+eFT3U|8N
zSCZW*-n|zT=EtK`CooChb|<JS08(wKf-DWOt}v=pb);PQrpquTJ*`UTs~vh(J6{Rf
zym`Xo4`c5Ch@lrbmu9855yXoTkB<ZKr90I$?W$MVFlXk~#=e;IBaTqWkjx+<8;=cN
z=|0&o$P5CWS&R9;jl%})jAOo^L_6I%)WYymXV(o8!ZX{$L#|}pG>_C4ScdQ|1Z8}p
zmnW5k^5|P2RX<hj9#wLuLI&IpjCl((@NTeq7gqZiYhy$yhjTQ;k|uuhPnoF<T`+8U
zh83D7coU!e(e@p1qICnz5=nd5DZ(7;pBaY4c8p%Gq2X_i&p{L8>gIgr_^Y^ttTHb*
zQUwsh8IhWp@U>0buk1@#@)YwU(PGaoK>bi1;M{3Q)>rYKjYMI@A@XzfRzYkO^zyuf
zD4+iRRRfw<2G`|y6QERbFAUCV6p;uUT{kL!`->f1v4r%9Yl|W0=QNbZl{ceJ>rVvJ
z22TZvXjjvh6m;LU87J{|iAgbqfZ$J@j-`Nsq4^LaxkPwVVDXMNi00xo8j{T!G>JeH
zvKtfgF(&Oq)2n@fWbGFVv<a8A5$=M5%tFJY8gX7BSy2VXPF3JPs>1qX*@Q?9uh&B_
zw24N9k3RlP8<E7r%GD_X^Il<C7&<d12dorNQz|e-OMRqu8(LHwYQ%<x|KXi2*Jf8s
zO+z|^5N}FE2{RRR%nXjL3@NS3r2ifgLxCUG6~<Pk7gJX#f$PdY^~97cHDn1?TR(UR
z!ubUlpE(KX_6CRD7TVP~NaU7FFg$S-l8fh!lut#-ty*l*lb%R}r-kFAAY4ROmBh$P
zBLG}QrMx9doh+bh7L&Ij>f)KYfT77lWg>Y4UJ=DsB)R<0g@(i_q`CWMk0UG2EylcT
zbt`~JPd6mmqToxRA)#?KZm7ZX^KdimV~DeOeGnn~TA~Y_Z1y1Sa|Oa1(e<D|3Mzs-
zs$ytmi92m}9gd5Y?~N*u8L#Nz6w1w^rMM#vsj#q>ab7gAMx<Tk9D<;DNoZu_874yr
ze7yPG0LSZ2S{`SjIXKtY1NC|gA#NC?lpr}q?zjf5A=$Dj@9NZMAY&4Ru41a!r90Y5
z*!at|inVjU(^pjiFEu)=x=E7f%0^167mdSBG^P`ftO-ASyu1gZ#bqv+lfg+@Iw%=Q
ziI~P!nJT>@n9`uN-}A~2DkB3DzImFY(g05+hw_O1#c7$GB8`|ZpEigB#9Ge7Xk7-)
zm>Gq%-A(Bl(9gz;IS~Q*53c7N&TZD<^j1xXOsV2a)MV(9R&Jevnf(#uCwrsdz%}Pc
z=4MC1JS~9n2FVI$#dW6cGHds!vNV&1GW(BL*H*S#<7vbCz+B7fQ>adtdq?0&IFc<>
zC5}S6?zS}|xk!Pj1ezYLtC*2ZgtFGTY7^DOLj`6YES&E^+Uf`}6}=HrQ8Cm6%KaB@
z!Ub)#EopRtDTV`!Z!27}+hlyMWmQ3NU!J{b%AD+^SE|~X@~NJQxP%x?_ut6e3w(L-
zJhcsZ>~3B4D)}U`LHqyqLqLb6t9Y~0>wSn4R4R&DIp4D~>vSV&zKWP!BXg`-!E{uX
zX3;XXLgzsSq=k>1jV~>{m@ms1;W{{VF@%j?B(%opkq8z<Yvrcbt$>=rTzh*ktX=1*
zc>@h)o=z$w)d@4~#TOyb-rSJ(M#=5Zz6^^l^@&_x+dwo_wRfV*XohMpiF=P|$b&%+
zy{<K)+=Y>W$)|j}I(oTGjZ553oq;%3#t~`;RLm|!{2b9l4P>M|3|%6wTwaiu8jw;+
zj0`)i4KX}ST(!AY(UZLz1G%aqgq{e>3NK+0C}Dfn^a-UT%;B7`(mW|sP!uUZS2@2*
zgp?DzssB3A1>`OFU^}inm3ajU?ebAIb0g^C8svj6GpcH<Tw=YFHBi&b3|kRb_q36U
zB(I#a7c0iq-B>?Jp7qc%%oB&WAZBFY4Eq}9Zd7pN{TR=YVn%PYbG@7m3%G?Z(VS7z
zBe_DETj3=|h7{!<hE6%6z^Mb$KK<5|{)i>KDC6qN)LMlio`z(snW~8%$w-VSH18pm
zITOkmc2D{qMTI9M`-nnEFF*{#urLo$+fE$cb_vhq<NT_;G5(0VqoDF&3nk`%e}qI&
z$%}N!GpQ-YqNhE7!l2Y-7gy(QPKco~L|iiLL%OwIZ~^Pdg2Oa@O+8V5pXPy}+^Ef=
zEIVm_Pw7IyKshMJI2hMC#!ziH-mC`X>tBR``0EmBz2r8%aK#|aC2!&i;S#we%IDB7
zD=`LXqt8W!2ExaF?s!A6X_PQiK?7fM=eO>GnOiXAJ-dlUJlee8svYq)EGFv-CVUB#
zAPV)C00fz-GE!yEZL26@8*8>#lv`gFlxyJrVhq&;=Ypzyw=~T}EI6b-(NNInVNism
zB)b_gy4!dWQnC&ujME0s7)9X1I%4OkbpqJ6kilHH563f)1jG;>D&LdBq(V6tHe6T-
z;Oog023Tos`U=m}xEU_%iS*@xtZ*69eIGAp@siZMRDQ@%_CC7Qy_#k~x+-Gp0U;&<
zus#Ys4h_Eo&w$x5Ov~_OP=jFR0A%MMWR7`lG`B2gxAm3;ny$@89BJ@Srd=pDr_GE0
znKFAu9UZ|lr$cz?bX^*_6oqW(u=nm+c+R^TEEbn-lZMlH{n{I{a^h`Vfpub#As9P9
zQj4iGv`0}0YGOX7ToiD^R8?NOYT&QRL$gr9*xBb(k%1bm<6+JfAL#`t7w5B1Z>TMX
z)*+3_Lor_hAwO^fh-?LqUel_<-kCAnRKEzH>)z^J{Jby}b&1JU<(l}VkXHFpEJ{t}
zNJ{G|8PJs~cGVx$G$d;gVo!t!9u|(a-jFJLH$!saG-O+Arsz;$A4{Ov3RZHO0hKjt
z^J*utfFgNv7cnKMDlvTAnVHr#9N`2SZ7qThnz*2cLSkZbBsV4^`9U}nNpfYq9=%U0
zhFMbSQ&Pid1UWo*rU}Q_>kLAMVF<Ok0N(gRi=g(M1ASo|!@41r)xUJjhGddt8hMP;
zO_A)#4TqR53NXhqsB->dDkI7@AZ@ghOAcWtXnl!1lT#MWSeT?7HXkFKr{-`j9gDjT
zEzp(UhrCfyM6ipOo)a3nH8LoEj>+#RFRIPdp<T=14GT}fpLL%Pqoe^L;R%UD+E|L?
zpiq8!4GJM_4}7bXF0}><1M{v;sh>6#x^Ve<^9j#00l=#u63U*-HL2S(5H0V8w7bc?
z-C&U^WkB78QIxTGJ`v;;BXhEwlhw9XEf+(|Y`I#y5eL?nYT|z0T!eh<7~Z_P<Vike
z5MLLzBa8r*^o$Hm7Z=1VS$>*(^Bds$P>-LkfgXoaXc*PuJ>Pl;UiIpW0PADOcSe*S
zQ8@Xf>j>?5=Dm&|7N*-{m(Y<h5pjIc87~S7tP$$~l;u!Jb^;B)yoy#8-H2d{47e(q
znqWK|6&k2QM}{1jiCVjc$vefSr0s(wsF)B11w7DD*U5E_amVOHFwix4^}=y@<@(d`
z7lUPJHWMyuYjZs;Vq0skm}15uv=<U7NBrUy7qnl=)Kl1))g>k<^p#q&m$ox6SJE1$
zBVaMk&4`=s)KiRLFEn`c^ukA(%5_2%x{S@!mC(+|`H9vN-I3+lRHj;u=a9v3%IAig
zPSF_4s^sN5^Jl7LA|dK1hG#i(07IZDM&y;^&72%D*Kc(deClYO!LP90gx9`t4SxLF
z9|hRi5+zEa86aBjRG+){&@LiGv#z154VWD$05^}sMF%Co+Q2AO(<2#5Smgx6xFn{h
z=3mN(K-i5utb}uwFvo`MWUyH(VHYVCaAD1CcI0Kq+ps!;H>wa6oc{dpDD)5x<S21-
z808_%M1A;yJ)ecopSl^gM*CnsPEB9PKQ{4BswBIqrxXoT<wspqF+F8LRq_~W(m*Z&
zIhj5=3zOkjrSIey3{)=s6U_6L8@Q0J_J1yg2CsZx1xTkW_%J(Qs7+rkH@cd87jl6I
zjZM?rQh{Zbqppu0se?b&02o!Hin2GQ8q@;nC^LIxMWD^JLS`z>Cj1l7rGh#}8V{Wf
z;j_n^Jl*`ld%N(T-g5%l%?-#&L~oct%KFGz7hiw&vfzcw{xK&e(L7{I*l{LdmlobS
z2hh<%hifZZDH>8b)-E<yN=+}vYA6v#x+UbR=S?d}7>~sGISLg)iVPgaanVIPxKCsZ
zio!Sn9<ZD*7@|~L-R9{?nuiO`e9CrOhgZ%%1Mgk=pH$Ic{%Jp7DnE)bZSBGpPo=?o
zZeIGGc8kfXL`=TM8@Tf(SWADeJaV^4C*LnGsYm!k_!)$qd5D+ymy{U_xxNB9Zs&RO
zQvX#KyaIVK9H@192FXyVc-2tBLDE?G;+%LMmV-%+hLKg$<K9aT!e#?h)WG$Z%4mr9
zh-U&*8ZQh`!aBi(+DQdVb1cGUIeg@?2CQ$k;Op-0!SDR!m*LR<i|F-I9^Xi}#*p<h
zTJPu3D9>IWX9FfRTwoZRE~gf}U8Ez!%xTBLC45LnCjPV+H<-S0I%gBu#@nSgUR5bf
zSlpH}9!3WyWHXI<G8*A~l%j$%&(-Ew!cg9bJy~E&;epIH@!=@w<#l-H(&yk@z5xHB
z`xX{iZpWFZ&iRFdDM}a`D*4~ElJpcI+cH8(T_&o#G%EaZ{ivzA60r#ldXR0bvWi48
z5~C(wqc1V&Hx&V18m}mFC~XYLBG6@wTf@S<coWXglFS&27NSrN`MMZ><Nd;1Dc#(V
z8|)ge_!e_Q4W?~sk%JpM=gM-LmpCV=K)1aG@S#Ur@S2zQ;WvJ218%%=0NEMgJ15Lu
z+NCsx+dL2B;a<G<(2f^I5D7tfHWXqYU1uvzz%*?PYiKCDITZm^RIm&w!-iC*95$1p
zf#D;bvM>}(LT4ssHbA>D&4zZ$dM70X2>A#bf{{Vx>^a#(fzb^&#-{@1Lg*206!aeN
zS@|$DF(&`{?YF{~Zoyofm@v<de@r2AQEJLaM7c37acEgDw^VymdiuzO$<K0cFeNB8
zc%g!txKu$xyVgXqdWI`@%-QV|J651a6TA(&QY@)f?n-0mUg5&2Nr=!_0}W)?JfXTr
zOlX;#p*`tW(&Z%M>dO6YH@VNF4djCI_4)$dtGWQGU40`jSh!>u)r_AT?@DKWW;23!
zzIhC9fAa;HTNpudiq|=RZaUCJOU~M{daNJT`Z`GTP2?3&oQQA!NnDk;qKiAgw8Sji
zqTB{%iadOiDZJxqo{6^!ilcHblw&WZN+<`LQ<eKP-p*ZNh%9u%qyi>YJNcQ)-aH-w
zrkdv!*l5QJm4tn^dS-}Li-l}hHwQX~CVv0H#Sg<mG=QJodMljQE3g=k_;V*cl57yA
z9#P4|c*Tio&f>(>bScjuk575qNQdHa@nT0baY;lW)RabpPucAX!6o%Y>Oor49;oIi
zhU7v>^HW^7!-1*Hgx+A@L=sdQ-qe$Luu22h*J&#EnG(}b4YZJ$bY@75I+a;B@&@C~
zg=mZ_2}csO5NszFFs8-Y(bxogBT7FE+{{9Sz*f7{9I93L!BD}TT{(QuZ9Pt&M<>m+
zH<!!tF#1v$Q*;Yb{eaHl+6~DSMFwe(2lpYoGek*rfClI?A~rXJbp<9>8n85ZN;`$h
z3}^I|W=Lry{gPpwx+LJj5&}hmD?ACJfli8w3`TY_wB&z*!%GSgY-sI3yBrEC#FO-2
zs^Za@-gnJ?91g{+@Uxq5h0l)eU@z4Q6Q>le)ReIhrAyc5vgf8$sR265Xi78UYR(=w
z4~K&@urFAH<!~ET;vHD54|%M93ua+e&%uRJ8&37w@Kkpf2J_22i`0oy3}Le3`rDbz
z@rbz&XyxUjK8JQZtCZ&xp&3kt|M*SX3I@;PZYUx1tOvu-XxCF1qPs|_OpS|tc`k<)
zs@e^OLy)~fY7`}6BC0WC6Qt)F%gxINBfh5Lg3zeZERuvIRe*&VKrN}ZiAY0;?>V@b
z34Asy!q9Xi_*qs<PxS@-+e25vXI+twi)2yJWm53`IXv$BIl?7&9X#-`;S~pbMp$kp
z6Xc_ezw>)1svvThI7U@X7<4)1Z~)W*z>e2&XlLdOLxWkQ>SACdT{r}c<k-lYP(BnG
zf<q1gRe7QKEXcI$Z)R<HW%CKRHU3rj_3hWdZ}(pbtJwm~;cm%`Racv=RZ+A`MQ+OU
zE8WO`8p04Cb9xJ29X|>8HJ*SMHlBf-S{po6SZ@%!Xp;rQRJ{hOwhg+r3W=)04sLEw
zU2MQ7j?chHPw$3LcW;GmV;*L4;fA*DK*(nFK<VZh=)n#y+M$=<*?})Tb^3OqH>E2^
zGEw^W4NXEia(>_P%57NN7{LcW7I6jc&VvbtcDQnTTB>#?ydndLnfWQ<u#XHWh(la=
zF{E1qW?YTiN<uo@>{s5N6_|p<ICF?^cONJ}>!*g=*wCj1LZz0C&06I#_WT(%q_bBl
zC0vP)OAKk8ui=3_g`c!-cN@x^!bWJOR_zG07zS(H;<?9pQN6PWedQ&gR>8tjJ4~A#
zaCM9dB7!S!feGnM2uBw#a9&FKUF?;@qU6o^JAk4&n-%#~nQNfvXK@o41MH2w4NK7u
z{P^M@!hL8|@85nM{N4Du(8U0-V+=}FLo^R-r!G+_Nbmym(};)L4yto-U+pn?WBUv6
zlJ+yO*cd}vZ$nb=KvrwQAf`HRjnU>RphpcilNu)BHJDwl!^>_B;T10)!grr|9RB>F
zWAI;}xCuVfzYXf`2DBroJgP<;YI~31A{nx0Vq?NYKf|B(cu)+YRf-GMfxhYtl;1ll
zH)JIrViojJ2w!*e2oBAz!UsRT!a36OZbXk$A49$lg<zOfE@zs8krW`9>4`Ylg`Fzy
z2)8#Gifc&(<()7eX1orBi(YurT^NoAm}yB-Smchm>y5$1hAnHPKZE~Hu1nS2G+z~l
za!+TeK7}W>Z7*C(mAjVVje`Qs00w!G4034BgpPP!ypS?EL=nrnv55+5d0H=D6;4bH
zA(CE@0be^q3Jj-QKoB7<sDzNY?PLZ?s(ljD$sw48-9tXx#i0U^Vi=EqCvV_I%i#Xz
zqi|3C8TerT9{Amz`{3d6A-D)_%uh0C1PM3$l=4vw1<;fQFYwL{G54YM(bhe<BRm7I
zX*~>Y=zI~L(>Mz?3~2^o2iBuGk&wjas#Ii3xQb=nEHgP}yqGfl{V2!8yR!@nFE{|-
zbI$<2>9M2m%YSti-hcG@u+iQPbM?#!vJsSn<YrnXa=^F45HDRl0a<TL2=XU}_ok!1
zp<+m->Yy&l|7j{<+1+yhueqxWyB25R;!X}PzGcWeZ#pDzDTV~5$r{w?-G)3~F0niA
z>;Z1##3@ML$dcJ8UFu0%<N{Hq@ur>o6TIO1PY(R0!O<NnGc_X;uKHtM5%by%N%$f1
zBpqju&~;F>DVs$`2bc~5mRVQ173eK;g~Svb3WW*ZKt!P~C=>}N8t4-saa}-!0yZK{
zGVzgxU?4);ke8S+&lW*)TXZmn6ANlRv|h+)j)t`Glgw{uxe&mghYF3l-X?mdx=P?X
zI)4YRYd!>@8r}*Y9y|{X>IOKLuE3_Qb3ILZSLHrss8g6#J8)-o9`0zI!jSQCcv0gh
z?29+q8}wBZ`XFP^$|9kIpp>{euWoul${T~A*`t0B_wmjg?0MNTyze=yaL*q-0RQYG
zH^b57W>{!t!l2`Evh(F_v>@7zp6bk(*_gmg%T5#>paLE8o3gr+U>kCM>cb_&1UhYi
z!@B`mD`WJYJ^1U*5T0`oJ<^WkN7+!+_iWE6B-jomEU6L8!%Zq~p(mLO9CAU_`204B
zL_1`VM2cd^H=K-)l87oxa|25Q_Cz`<+BHffi`LPRJbX3tD_7vPW1|`1haNXr(DQCw
zgpdUz4RIrI19#RVF`x5LAUsiBmE`G_Urx#eIqvtGG)!R|t-7c{AUzR2vRL>6$xw7)
zOX7jai8#S=)jc+xnvt2*#oDwLK45_^W3ag{CIWp48iq|tt$mbJMJ<MzU;uAvKLFp<
zdJs;fi}3L123)W!@KmxJ^Qc)o1OfFn)EM?h>u^(i9&V1$!R@uPuo7*fL8chI#L(3(
z7QRw}svxR$Y5vKMt_ML_%u5BPA;#m?vD_mxsP49c`mWvZ_8*vqmANMXIY7q0;rstE
zg{R>*m~Uj@bD&vHch**_<8gF1923;kxug={VG0SPLzWv5D#iL}NXvT^?3p7ngcR<-
zvj-a&Vp#5EB*n{$dsM{AQ|-nhDB-uwSN1v>jzuk8S34%8GpxieH&R7wf!Z|OLkcQ6
zpEgEj5D|JT#IDM);#w*RG_Fsh4IH~<LG0=$WZB}kF!?&A<+^`K8tj;&;RPCFco)tD
zGDeXoL;VU|h9w9O%?m|!&)ej>gr#7^vay;QC@r8j;Ee<M)7RpW0*3Ttalohmehbq}
zk`W5IvUIUR8@?$qKyKnG@lr|%$HhBRDVT`bDQ}~{jkP3PvGPU&3}BZZAup^^UdJ%4
z#$N3J8p@GaM!Bit*T>(dWJvgVH4MF4YQ%;^eW0<9*?{_a-76bs1&>AQc``TT7zo;)
z@+8utB{jefhG%p05Z349b>psV0;K7LD<q-z#as(s{@u@oUm83D-}`4VtOkc9XDXHD
z1J0K;4bXwdKUZqHUVcoYI{C`wWJYt7A&p_rd=9%hefB`Fx?=!K`G6^bM{G!vBk@`z
z=vPhg{er~wodUDLndv}ov1q8Ml$e4SM@`<?gpaK;3hw+KBgK0UU*5>uAjpY~^`El>
zo4QVqL<k0qL08iu{zU61hsW^O>v)VyECY{uP=uBp)gz-xRGbhU|Jde9y4cw11cM6p
zv6>@IA^{4nK?`8z(5{9{7mX>+a;KHf`44N|$W1Vl;KnQE{5rx3f(iKo<8`=Po~F#N
zmZO1$vGJ6|N|OexizF}#?W7=?+0}A+8A`ALdX&E5w<e9gW<YuB*yKivdGh+YUV$U%
zi8&oXFZ&BPFZE>XD7nP40h8xPD=QEmJ_OOO1%@^O=07>EPSz%_H(?Yt;kEBL4B!65
zG5B{+?S{szo#-t*eYQo)4qF93gKck27*IKkE7B=%w7~*Xb7M%D=iGiEfo8J@dP~9W
z`%*a6OkmU(W2Fd(S}QySfnitFi6lodRXJTUWGyA}&=eU|QPH7-66?t(d2vlE*g@J%
z>GSOR5D<X}E>19dPxOc2D)OT%8dCS@7G03jI>yYP853W_d3?_^_&H0W$CI<M#B;Jk
z+j6otTg0fBbDmWiiSdM)MHowaqZeMK*kU?$8SrVn6&V0|q?{IbDv%NjIIzV7GMca+
zxSU8JLCO$l$nTu-v!o8j@jD|(8%=1EC#x%N`0=p~Qt6x3f<l<t03)qeWrz{Wx>$T!
zi1%X>C4E(26A1XAw3wA&2%v%kDU)xkLvs8W)L-xdh<7c6TJ1rwvIza-PeAL%FN5KQ
z9jNOeyzcn`zy8E34AOlJ+!Q0C5rRIXYo{4B8ZPX?9eIeG>9%KVdZJ?ISLq6dEf1W^
zBMk{_H$jxbOK+ocd!MV>Os#;C<hYk}GoAAzLwZF?f7B)|U;KGs5aB+SIk3F)5?vId
zEoRK7pSk?0G*+&ph>#HHVUHTRVnlgv=?Nq(L@)IqzW>pyo$<e{A*BQMdA+C=L)srv
z%-F?6^C14|F6+9JzJLL(DxNmG2{j9oQOW?;xbF3exC|Ny=d!BgO<I@b?d|okavUD@
z0TVppqK?r}$YanB#QLmYc^Y!bmFjZS1A}Oy3RNJ)4Nj@e788h32nJ)=8pe?0O>E+4
z#x?mIWsQAk$xc+E+OA-daR+p%L8&jp#ZWaMRpLmv(gd^Z{RCV%AsLt9=ROa~!aV5S
z0NO8kIb@py=>PTKLgVFM4}*{XHH0TycwRR{k9S}Xtw1B$VT4As7oz1GA-!-6L$D14
z1uF_1peyJG?MuaYlma?4vN3qgNN`|2fxC}%B^PB(swjDI!<6;KwB)G9V^C$zR@byg
zG6{xvL+6zlE=hKU?mN*%<;~-R<5mWGy|kAX#FeFVRH}s-5&u8<nO7CoT^S-|j3XNf
ztUYLiw3B}kAOFzKMy0(J61+&%C}T;Lhzcwj#JCXClz6!D=Xxv#V;WxE%Lrs%f^x0E
z=o$INDOG7hRGYGVJ;@+QFDH|JfJ&@Piok#<v<l-uJVs{vNg$|S@-z;d=Mk7RFfr+0
z9N}?Cu&@*X=^4cI+L{pbgHiE=+@RidL1O72+w^HtHFXB5L>y@d46kM<w0JT*_$h@J
zyw(ZckJa-KX<V>h_*<y$+5>~*k3;9c64bZP!bcvv8CJ7-Xj7FY_voDPwb9B=xIxso
zYDeVsR$IxRPb!CTy3|i9VeI%i8AHN#aMxWUc<v48ih4#0)T?(;6O;hYoSX1k(JZ#i
zMr8E3lr9fP3i{t`z}h0iz*O^;$7AKSHZty2X*YM1TM<07A)+Ck$DIF<z7opY%Nvs6
zPax8hWG6E{BWlbR3x(p$(N+qr-4btyb&^aOLzD^bZh)_A%|~9vN4Z8@A<bx22~6mw
z3&tdA+^SMK;c}%wyam<3RVLw<X;d4qs-P<f&`4s^Y(!j;Fc`p~$Wpc09UB;v$G9z?
zKO>c*nS~fy?GS22-DP+mMB$H^CxR(Mb=r%})C5DmQq>N#UnbTCjn`$+-dqt+HE&eR
z$ZIH>=`9;k4)d6I5R_(Z+=20hA#}Em;f64PwZHioe0co`{N~R6EJ7Tx#|X-vl*hPJ
z$TrTH=4@Q3`BkcRh5DaAE}=_S&T~$jAEofT!wIxH7(Q>A^0p1hasi2Q(hoAGQ^PeA
zQJ;vYu@k{+>dIW3lTS5JEC!hR-bj@(fy(3y6uod!DK_gXH>d{Vpz%FEifi;ZsAtKL
zMq49Zv`KGlaB6%|592zZveb%$eQaU^xm4$ai5i00Aze_~!G}Fz_@R78J5g*o_`oz{
zwJkNfMlG1o&nM8(t|;KDdYmMNXuJj>3j%@+yeb`|y=lj(DdTi1<!lR4GR&xCfV&qo
zoI0Dq`BOQJFbABOM`M}`q1nPv5{)M^*lR2LY^!*nRB8U|(ip~Kva?vESD1n|1wA5Z
z;dMznI4R4e0>`4vY$nFUJ&oYQ-Tm;ftsCHr+e_S_U5tmY*u>3Y)PXOiM_^cAf=-y?
zM@JKsCVV{xUC4V|Mv<|sSm95@`sHL@^;miC$m<FAqtLkTfBuM#D;w+5*a>Y4lp<J-
zE%HJ!Y4YNxmiM!gSOZwiDT}bl{fT7Bv!ueTUDRrGBg^>8)x69g8ccu52}e`^cC7x#
zl|ZUrks%E(^h$BNx#mal+vo5XujlY8q+~H;DHY14NLwhv#}F?-tsU_VAK}Rnt8dXM
zm$GzV`%ey4po&o#Z^lVgJdyUWp?py>tPHfwZg2yX`XQj*)H)fN0BnPT^v>f1cf5QU
z=A?KWi*p*5<`o<}p7I5z<8SvuXwBlI6GFX(9;znD3ifikIBqp<o?!|idins-BwvHA
z_L8x1OCgcLNj9WZHl>zInJx5hH}=EtZ9E4))jtURbVf?|bZ#U3-jA7YjIesGNXu5B
zCy^X<Mj06r%>`M8*{XP01!Lzoh+W&ncqArQ!L_jeU;;0HF1}|s6Ep$?jO7@Tf#z@v
z3^zR8=-RxQHyRoKI@2%W)sjK65!sN=NNBP*0-GBZp&%QT@mOg;b73fZATxSS(F*?k
z%jg+D1n?{xQkiR^bgv)5f4<%}Uvpe&gN+1c+cow)HC$*UtrBK370Th=Y~*f+GAQ6Y
zmol@;m4^;Cxs*@(Y5Gl;5?Of`C3>>~YrV2ZAw!~>DAOxaUh;0ehgE^Fl*`J1_iO@7
zPdjuVfHUWE=x%1bv5GKR4t)$wnjP^@^=81u2+G4OnnL+Kjju>oqM*XI!fibGmdPV!
zvKM*qm_1%Ik_VX$6F51Zh2KE~`qS?1(1k^=Hc~hm@IeKp2W3^=Ly^MNRhW-85+f_A
z%VlG&Ckal<b4Gq>XIN8td&ln>oxJR}G3;GRAiY>{(P?wNv$4TNhGGa*t>dwA0-Gj<
zAhc2i$G9H`bDEn;`Mk)DD&=nDwa8%8Vdl<FLPk^2qI@X{eh=TP3+h=kqzQVh!oL0v
z|NBpP?9a4O2AC(cmor{eL?WWqh>H%4ltM$Ifxpm64Vp20DiY*@n^@JxRde+%0FO+>
zzuBtP&TvM>%G8moN)RE9a?<q$EUC<RR3yvFVAtsV65KI&Edm@l6vD#~kNN4ekcl37
z*bi`H$f1FoMWdyl*2D*T;J7A8i@=Pw3*UH|{J*?G`Lw-IjGJfLh$ra63z0zDP+AGL
zd(aNXylMRD7Un$bcf-@^eozezL0R^`E)aNA(DCy%Z57<AUc_tL6$*@bx#CzQh@1vs
zg#us4l@L-^uO;yI`-XT=GZ^*l_<F%pp>1W(^paZp0-h{j0BhotKthRk&(9|bo#2>%
zD<d2V3c<5<Cuck#%U<R}6j^vHbsoLZZ-D-a_rNO{(xt8PllVc$aM2wG)A%H!#{R|_
zX7@BX^dW;v6KQ}F|J)FF^Ugx#cmf2nj;}#iUu)u`>?p~d%x+^P2@44lZ~h_|q__5;
zqePXw)GtV7=gGYh4#y)Ac-5-hgDa8RK_&_Ok;5UJJr}`+a|z462wEe@g&kt<ghtiF
zowGrPBqjdHz?QgwWmsONU^8t5$rw|vP328`YW$#GnnDno`x@&)<eH2W@A{k?!<n=L
zzqRpP_=BzILK@CMgL^LZLK(yAAyr4da`&GS>yIlq1gem)(R%8xI@L@0BNMKih`SkX
zqIcXng4f(V0^Jo}L>o%yUN0=qiZO@!g2Zv;J?!YX@~EGAjab%HB^Ws(ytnH^LAh_F
zJ+AMxCunfu>EKCQ4+VyX^v4+59lNB!+x1lKF7b5{7u#RsBKTfVh3?SK+8A1kbu^?1
zY8Z>}j3g<ii?p*P;hi#ZFrQqcxO7fCZeynA6#jB$dO{XAO8Jg2nC1Zs?Tu7+w~bh+
z19C0^q}*hcuDJGKbH)Q%j%1a)a;;)W5TUYjXyLB-+`DS9y(Mg}QLI^biZ+O39N_N)
z&Ix0x^sz?@gfD_BdXX`tpd9kKs+|Tyf>?;4<>q(fy|ctlfQDRp=ZYMz7@B_lo8Ccq
z|Jn=S$<YDyLJ>3@5v%l3BB}#}R`Af;d5OAM!z8tWkJ!cyO@$@eWjzt4l)ag*va))G
z2HMPC|AHYb?Mh&DP7I*L)33ns($Tu8&tnd{XlRMYh9M}>C2e5|2@B80MwI#9$gk9a
zg9TB^JLy@{7t^RUn<}p7K6<tP1i1$IiZ!aPs3Ch<%lsRBe6JhV#zjPKyN9{b%&s~#
zXJXjiOq^F{4c8$iyB!HPgg0E^96R`$x!tj&69%(8yQ&!YC35AJ$&2L8!I0>pL{YJ7
zQ&l!5uw_o;fviM@<3}U6AF_8FqrvRm9l-5(HQ=EK`hw}BYP$hECL=Vip@g$>EZ9E^
zU!y1xV+z4lCMS3dY<wS@b2Q-`^?-6i#u7Cn>0RMnp21LgBWu8a*|-yack@o@t6BEs
zL7fb!E@f&6O@X2cIjT;zR*)u8;UbJ0EFCEddcjnIWv!>Yk$V^(tU(6tg%Nzq%lh1Y
z;L4mw=j=AZ#84Ly^XUpzVeMR!S5SbWFQiSwmc4mWtW$^fP({zlmgi}2Nd_5@|G028
zm;RqAf&U5q^tsFPYF#VVF28IY;*<E9QU>=F@VXbr&|a)Tdp?HXoB&D*mO~*CsYcY>
z(zq3hube|6Dv?u&H@g(!g%RWc8&XhE4r`A+C@{SyH;Uo)sF?kgi&bGELqS+Mt4v^a
zsoeArl&Ne9zng`%<Ps*5IyoNat+zz5xmkx}PYyXRqS+=_ui#LOa=;9Nq2x&X2+Vg6
z?e3@&LS?*`jG(Y*GD$Uuh3L&=#xH7U=0mji3?A&Sz^|`84;~mE!ki;!kFR1}@U-g4
z{XwCPtE*~xRbc5fLn=W@V$g9@hzqE}Te3@EBy3uBGB?0mF{E$2Zvgk+K7wS^F!WZ)
zl(a=+<KL)>-&hWWAfM-wEQq-bTy`Hr1~}3%$>gWY!<9;OxYBMWQ`1qo$&deE1>O3$
zj(_0UHl)j!nBW;amye)V_%@3(qtIr!ov<;rW@}K#9dodg3c)`fc^5qtH8?4spwNr3
zdd$X!H)RW7GrJfS7YQU+;2ql}m+TRo){ub>nS4v>@<=Urt3z)lJrz15<<0K17te%7
znX4wWuyx?V3^FnbiwHV&_dN|RgP%V+f+khOB4aEL32vJ76*a-!0%k+yNc=erHB2=&
zL?O=;qX(kaK^$SI3q#hTJvN?&zvv!@Ki$3swqOB6xez^HokKYt)}(=|l{cSMT?)E7
zN;FY+uL>#i&|iBuW9?u(kbm31lYyWCqr1dMLw?^|HB)g0HqB*D467Rne8+t~v_;$~
zS7p<Iz~?(RHkUAW95fDLO3)TzW%fpCK`tr^kT$fJjaK?WP&}uCN_W^iLxz$VM1?JO
z$@mY3(mTuDd~o=**LZq%4e2VNVSj~B`8H*EzGdQ6!N$2E?3=4W2Oqti6pVNUYZ&#m
zGnikArEG4dRY^5s8x5(y7em5MfFX`hW^o0J7HFg#YQfh0ooJbB&M8-?cZD5;jJ9#G
z$^u99sJz@jXWF111Omj<p@vM6en(D{@}+z3ZNX=8M_a!zhGtW!hnPnkBzDkdIyVR{
zPlPEnC_9dyb05eeyJ?dMO-NYB&4mb6B0YjW=3$QxXW=vbz3`Vihv7`Ji$@{|HNswq
z7H|;p;GkcDn<%(flA8%$yGsn@@!TkVMq>{2u;;;Y@b`^bfX*KIJ8kXb9gNK{7;+IU
ziWcZaVJCr?+|!3|cs@zSXan0R7Y%sBBmR#;&Pa^*zEIHOW6e>eMSPbyFO*pamSD%h
ze=0=}->?{im~*qXnAWxfei4i}ZaAW{nQw<6{iUy!A$<@Z&)|t1R?@P7T0LN6>9U83
zVfB2#)3Y3M;R$bJK19_!j{OsX?bI3pbhlI3TEzv*vf<z=DqI#dG+Tv6sB+~~*INQh
z0I8uMYLs*{u;9|b@NOAn3cLlx;~lnN!E!KB!AMF-cD%W>GXcEl<umZWC%UkK#?<Z@
z*%*(P+zS1w9Eve!Ge5;n&lnGBG1X&|Gs$^cwU>tQrG6709xTE`!(H&X;U3t|X1R%~
zC>LU`2Ju3Qy-?sv&6maHO{ktjg&Ao2ToKpWX)2XTwOjZz8V7}Yvj@z~0X}Dpq2J~y
zV6j!Z(5Y&e;-l4r@4x>HblPLsxfpU;yBG!64r540LwQSU4|=0n0Ut98d<+gYraY*R
z+<GBAvFPq;tVcz72L_!ZJu2lFs_@bcHur!^<}sQYzaD@2AFnmGy8=Pv6~EA7!yn=k
z-y_slfoWeTSUWR-JvVirJriR{Hxi00Jo+B)RK4vO=9X%Zg(7JfnWTSfJ%NSYHAZw>
zRCvy?9|KUeO;jcBoLOE?XeYyc%8{%TuG^rjIIqzThzo|oH}G_Oa?=6lJSq}{G88lX
zKGa8=$D93i_sziPKih-N^J7?QV{9MV<Oe)*$YNKdb8pl_DW;gPvzOQ4#Gnork_Ma@
zci@rXB7AAI0PER|jD^zqHfY1CNi{C2<6B33%e2v<Rk_avF&WNH-pA>BNfX?3v?~rb
z(W|VIL<hhOdZ7L~TK<e|?-a(7%h);zFxo}~Yny^cP0oKkg_pme3vd6rF0+-Ap)h+B
zzcgdz3(7(DV2eE!{l0x5GUOw<slu5?sn57%T43x+5<TIGpjxf7RbNIk<fXijrf*Je
zH1Ra|!~QlmNcQ3yZc(86tQ*p0%HPF_Y4{WL8t*2>3Wy|}p>BV-o5J?mm~m=5+liz3
zrOMRS8hWL<n0IC_MwtA8Lch(62`nF|m-1Pz&;%CoV9L~n<y6_w#$fi`bD&^NbyQ%=
zFr!+QSHo;$Iq*saQ;xl56vMK}GX9W^X)b`5zM=#F`R{7*!Q(A>ZmSD3(TKHnVj3Pa
z9+U-r@iERYd>DtYkvHH>)`2zrel~5x$z%q$X*yQdBupa1ttrv04U7Si2MT3qCRc%{
zk)tm|vOgVeG&wS^<a5;&?k4g`jRjoc%XnOPES=r*d<xxoSna%cshRz_DrXH*#{dnk
zhlkpOANu+eFw+{s_Ik{Op;AqhYaK1`gPheK*3ggun!7{vMpVWY24Ch*P+m!UiY8TV
z6#EQr1*)WOPGu()G&qHiw*7&rD6I7qeDcI$xObNFJi=P322IUeQ3U&%%HLO$dujbC
z{O?Ec#=O>gB`P|Qm)W>5f~EZ}Xtp94^b=Fg))>YmTzFVmu5+AAl{;FjgdwA%!`xyd
zLwnkmt7T*%H0&n1X~fZvoI51GQ4+I87RcY-t_DR_PrHHua}5<e2|Xzgmg~X@?KVeY
z9z~#UdqoJJ{={DR*(aU@^%@#doC?*KvWlnyKN9@yn0_WM1+MuAg$FY#+RPNh?mS}Q
zFD_>rbb@w0ucDcHbvESZ7$LY}9e=e9HVB<;)cO=_4?)~P<CqsiV&aj+E0r1VMPu#F
zMGy!AZTSN+Bn;8t^rAEHmOIbGa7#(aJ2BHLG!?LWKZJ|RkglB-N;ix?8fZw2U?)d6
zGzJtDp}Pi)U@3ZtTmkgNqpM6)?i7j9iqH&(*o5v4(Lnspmk;52?}gpVJ3R6qW{~Q!
z<vdo;a%h+9E8i@<R`_3nRlJrjfN4Y$Y^J+|dC$cWhiapda?`O?QeMM+h>8*9l?X^l
z4b5>v8(M~WR0@lGVv%Su1AX+~xynsn#U!p4La$Y!zHMV*3%fVHf@#K7u*BL>NjtG+
zt;)p7Zf?l%C+y()9BvHY{jYoq-W?o<KY4ToMob8A7OgcFTk}?SvQT-36ctp#_GeZ6
zu82+5lyK}a0l5FGz!>hhCk!8y@7NPre-hy0<Fa}kjTNmn+$CoA0W97jMFltTq>F|f
zRqbSuNQ{l*v0e%b^IPy^_dkQ7Qwr-_G3Q3Y=##KQe0=Z-djMv8C2qPI#SSm$2CRYk
zRBLaZS5l^$%QRd0#FWZ}a6In={oG9+U?2n^Ixz<yIeRPoi<`Q*tTI0Ic=zI<efN=+
zv50y8EF03*q+Rly58?MO;{n_f=s?Q6#w!i*;?^+g3(Vl2uzhL{_qNu@uxoEaO1?Dy
z-IIGpxzgNHY{tATLR*@4wn@wJw9=(MjjP_7yvd1vP4i54;$4|BZYbtsl+TOcNn&Wv
zGtuuiF<c`S(_eYjQCO%Y@LwO?BTua7o-uev5m@80zYmJ<_PN%0TpJ&zB+}D1H1pnm
zOiW&l3If|F@S+|Uud(l54Ab_>bI22oHpD3W5;qanuRbhZYWE8Zb|Py`yfYa=XQtIf
z3mA==CFqC0;TgE^$U1Cd9?a$a)bdT>=6b^+2s&-Zw$2Mw$TX#;f2)l>o5rihmEcO>
z)>smgBN>E(ufwZ+!gFFF804<dF^iYu<Yovz{n!iPMKb~1(&(b?H$V-B5Z|yo-246C
zGG;?E{Ci)?S8ydX@>M-FtmC16fUh_8hVX3SSo%tIVXWe~%e#yxSUo@FaSMXkv|5qd
z`KfWcjR|YusiZUOtCrrAKRZ@ps<QewPFK`xBIadb;7LI`WsuT=NVfz9a+=W+R<+$i
zk&HoaCn4^>8vf0FC*Vh3dWzM#VH6t!i6vBuY~RIyG$bsd?U<AF2ufqNp572Rm2Xr3
zSFsi4H5HOj7X5HbdN|6EA#~3GocJ4nvk#!FzaU1_J7?HIi~-OwmLx_E69{>-!K#$E
zd0QV6^E|!}@o<mi^Y}3qI^pdMUh~|O@PjWsj$ynK2RO8p!MK_3+XM056*PiA^NrK*
zoKQe2T=MLdOh4B#tr{I!{@KuUF=<IsK&uMPC+)9E{!Sz1bgGmW4e>C4>XGNcsnI@o
z)8a)K8=!E8p=tf5eVcJ>E)9T+Lh;ncwdY7z-<+kd-^N?;!#c~CiP4lGE>v_-W5JWz
z60}8M(+1eXFmCnS5Dp&hKnJ&r=)#yWW>m3RyO6*P`r)W1&9@*_ZlmQ{CQC|^d8!ow
zc(eWD`78_s?A#Dc@k}-bchj<V4Be-y@<m#T(2#!9O%$}E9R9_<r{Jc!5&YDr55t8W
z${|1ka_9O2C?p9hMAbg?i@Jm&A6L`1DCh@h?-e7Z*L6=zm_{^Ql-DfZB?fZ-^I{D2
zJY|HWHlLQ`An(*YB?dEXCQ6y-kk^XvT($-n6^>xfY!0V)TKHDRm?<9H%HiP3MfmwQ
zJPwPE5nSwISU!-@i)31AdzYYg(?QcC8lZt;ST{;t!6ffXx!aeO(!MmPPqjtHF%-oJ
z6_f!Mr80Ra(I$DtS}4R(|L*Z4@WFF;!&~=Vgj?cm^hR|ewuf-O1+y=><I7TH`pUi0
zvlH4CU(eu)Qm*vg3=f7zz-vTKf(w2)&dq3qGJPFNyfeNKYnVfk!OYFqpwo$9ZEeh9
zAsN}`MgqI`)Qq-`R{+TDs5o#5+ozPW6by<-GE^~UVJK`>a2aDV6v~B`5jdP&sZ(C*
zqtn0pxR<5)dGEY^6>eV~!2kJ$8{kimVW>AIUI|_3YzCHy+~!YVkw^IiZPO-gseV3K
z2RMfwX6X*1D+Sm=ud_{ITVGx?-bQ2F5Kl)&Kt|+3#6UdD>K6;cEHMO?CrY`odhsz_
zksY}ErVM`OZGCv~D8NsA=r%kjQ?x+Ovox~_zxd{d;CXvC;o^3UD`ZS!g5EJ&nt{gc
zH%PggIP+4{KuTH6E2v4SJ0HL#dco$fp2EF0&=IEE(xzg2sYxI19pxMbQep0QkFLP4
z9)BS$%tr9~&RKzV5qfNA2bRD7r7&~H?GLl`=e3mVo`pVA^#$+8|9&5?s3qcLh+~>0
z&0&<}26Gp<ot=z{cBnC)=(*Dan3)k{T3a8x(2EcRGxLNbmyrv_(j#(#DI5rmrb`Zn
zE6>KtCj2JPsBQ1bc`Va!@^U6NZfi`rE=jv+4P|y%C{$pb2(|g!7!7G-6u}FZci>lF
z{RF)EnTzn>p4<Zutj)sCh>~{c1A!glBIAlY<MIm>RW=oy*tgL*XAa;3e?+Q!SyB`(
ztZ|IHrivNCgx;)AJ~+*Qe5Eehu(DI|uKOZ*-?z=d{-ss;y9XE1n2j9XFhEbV4*&5j
zUxYW^dJ)zzFXF|^IZp-=uHfeF`ypr%A&ZEJaWkA0CrFNx^5(HuDD&V|N*DbjR~#~v
z1f26&&IhfE&CMf=w7sKwbew;Cb_V{<6EB2ueGmMDxf5_lunN5#bE5<|?U@?ve&frB
zK^#4r?exDo5TUQsk~DcG%$4wmf1Kft6V_|cXoS$GQ3)y(1coL^3A#DUq|?0JP2v2x
z0qk1F3y;C<u#Yh{dL^pht(_mk-WwVQ(X30oErJpShP08Ivw<!kLTn(p3GX~(VlM{8
zZf0TjIjBk`SLQ9hlp0>iFPT2YIvNx4#l7R!3-G!d*5HZt798s~;dHMKPj9#28T@&3
zT!#ze7Oam6T-K1BCeB&0+g16hUWu80YEl3oTGH-G<8dlC%U6@QoTg}HinJ(kGZdZ4
z`v2A2V)(JQbRecm+v!aRGCba79XH7w-u%1`_|aEA4KLic1sAtsCVJ#XD!w-A)S-FX
zJ_ws=M1uk6UF3<lc|I5m%3X(r;kYQ*AQ@Ce8q`DyG^4~?NG|vA_!z7}Lm);pgE!-7
zw+8?6v3uYG9E80Xp}rzI!LwF85YXL*LvMQnEWPBeNAvFaM<C0u)ge909!b7_4G-o!
zG09v~QN~`Wjv-!>3dO9g{@M_aSvc``=P*~I&~9m04Njg&Wi|&d%-U+gUa2z|@#{lN
zePywDU?p1&t&;60K>>2*kRk9<q)<SOe5n~wP;NsMrJ!lX<d<8O_X>`%vH;fcQA4kI
z@18EaY~MCNZ%6`SiJ-^V#xXp;F@uKHfiJ8t!6#OC!}(!H7?uKEuHY%Jxi?&sa&{1X
z#UaDw&$<Ey7f;l#rSNaxp2H7*Q-t>}fsG4m5Mti*j+@WIzSbJ-p4ae-n+L3`dtogS
z?O-G9Oh(kYWjBA%&}axD!sF}Q$3kQ1_66w>czg?>%Cy67h_CSY6nb-^A@xFdzh`9C
zP^heqoA=gG!TTP+3mzXFhQ`tyyt4Kb+zMx*r<;&%c46Vp190Pad?Q-j#)EpaH7K#p
zKC2DcYqO*$@mvV}_mkNeFKRP{W<7)f>C~9Usxs<e6q>QzAl|$2Si@-y@%HX*GHRS=
zN2uyYq2Kv4V{Yoo^CdL119GC|?YIF8V+bU4%nd9ku=-8P@{OAuDOUx@q6c>@+l($z
z_bNXWDH)U<9xSN0#u$hbvcbMrEzG&y_Mzjm@W{nBG4F8*x*Tu8>vj*}^Xtp-<n|(D
zL8TXEjmZK<lg*MS*fkrFKSvY@ptc>S@XPNQ!Mk2f_br9NCVt+q3xlzOrFabQykp2U
zlU_GKuNoRnR;irT<{HqxX^A~i-bb$)MTW2*51052M`K90hX#}Ab9QSNzFCc4W&3-|
zBDItdm*ie?p)vx@iXl{5$0+z0zH~eM<=S(gy|4iL8#%l(dz`UH1N{8XN(1hA&pV*8
z7w^I9iN6x~6?}CJNnfK&!k7ITp5*u7&UOPOm9<*Lq1uo*9CD){8krCeJytqOxzDt<
zl|rLFhFSDXt0efGi?YP_W(Mo%nRf510jn5VV={|NJdf!|c(K2u`htSsq7>#Sk1H)N
zc0_*wP&;~uB6re$v{Cg?x&RuL^l(l1L8K+LAjWwB51i}3XHOANH->g~1&#Rx=IRNk
z3>PlRY`ET%D*8_h-B}@U8o<tRBiC>x1Dawy_Gg1cpJ{36VrW*w@cS3u)`xe!B7t7N
zj*bt*Fw7n3EU3yoq?S<{cmr0&pkHGNjp&AXJR}U`=!rxcnn|Noa>59`(Evj`!2lIZ
zsg>}~M=?Ng4@gp#s&I~!MXU1lH!31E4F5iGY(M<g+2>>KJqvMX0bZ6r00+{uusMpM
zF{|OOAAJ)n-g^_|=fC_oWa<Be>+nX`H;;7ruXA{!{~EvlYKDm=d8HQSK4a4ZN>iig
z5K4F#(KPB<wkIk!EX)&aRKQ#hVI&0U=gy9xJrnXHH9Tj5oh~)qZn>D$#|lj7Xof9v
z69U>S)=Gi!l({Nyo+-;$1HE!JNSCX6mq<PIRB$LMPyqLxzVr4q_~x6|;WKAD@E6Z4
zz+WC;fHRwI7!s{m9dn9!Wb(<VXy$4qWo>#i2uOMc9RB7Ki0?~#Ao<-~3*b9npx|Ri
zGk6FM>0iHL2;YA{8qtWj+sBaaBuuhGKyc#tD-Y&r2M%s6H=(t+Bc20|NKwt1_$Edo
zYDOs_5uqd(x6wnT`0oguM3d5<5ec9;Xm_}OMOsf_gySghaR~0*E0LRcntq(Y-Sp#U
z=HTa#z6gTG0yO8A;9#^3FWLG6^t%a!ixJ%O-dDliH{1jI+?UYcw|`%S_04NeWWI_y
zlKuKke7p-!_@zX7TsK~6OpK?@%7dYs5)KC{cL$l|P-G+9JDF%18IUV;=TYc)Y6ypK
zZZVoV%OsvBwo@C%St1esJy-ZV!^jP8&XS%4MKK~UMxo8jlhws_$!}$3OnK(z6bPXV
zVXG#sKGy;D6*osAhk38NVGCY;a0|X??L2(^^b8u-41DU`3|!c0;ucJJt3=r5Gt7%d
zXVDWKK||X`AU$d5j@QMo^kuw|))U4>sP%8UL&N{^A`PE@TEj1$4d5qUH-aDe#svDQ
zf+6A4dKp;y6#6$oyM*el7@a5hS8KTr^@X}10%${{M*LXxi#RWeWGXt}89=hu6Pkcr
zJHt`FaZ+1^<Z5Q-AX{H`+DFVR+s{j3oqt29(n~Tm=Qcw4g)iR?7u8<aGuMHr)rPO%
z{3vuToP_Y;JiO$e-3$BQb~nK4G03+sZmOvHd*U+TtLTxg&ypzpd>?-QGaADt9)kwv
zN(}SSV7S^cZn!c(0q$VqfiS33UK9ic0}L~XqOojkrf>m0)Bb}E(`?lurt86mAhU9Y
zQXUuim4Y{~q#LNj@8p*M&Lh{5U9dn(D^;${6(v{CpuDJLYJsdYwV;7|lA|<aRg7B~
z2XNP}9(?z6F2I*J8t@qk`_Q1C+G@bjZU?sd=%vQzcw!Z5x6$@ql)1C?s`8<Oa~f`2
z&f!Hj<nWERW$+^W`4e9P_~p;W@MEt{;h(>83<ETxK9#Wh(wHQNIOu9-iLwoE+O#MX
zC)%~vQVdZe5HG`2&XP0nypT4Yh`xwWW}^pbZzO2?yvU78*9pB*yu4eclhGR);Zd&C
zu~34Vo_55cD3$-plefdCx;Mkh0*1WpU2t>%8Mx{A12A`I8}9vy=fm>-w*Xu`1Nr7U
zY483qF0Mzf+hu%}J(3;#`z^c<@1#7ahC6GD7l=Z<7;nTVqlwWBYW0Y#dqQ`W8o41`
zG%&o}1_^%Q+?dH37nft^zP4gh%zxk{?k&|*&Y@#qIo-Iy<du1h<Odr;P*xpxRXycH
zxu%DEQ1wvY6(sbfjH>tpIoIwufE`?T1Tnf}35{yG2k*T70&Jn@I@WE#6Kgd%y%E8=
zolRIBJ_Hwf8qQ;=LRCO&Zd+|K8trPu8uoTH?7`@01wGH+S%4#pIXrha{(dHhP9&s^
zo9h}bWFh?Aw`TB$=cEjwA=)$|DzOt5L;RfHW>yeJ68x(XLSrt5T3h(ji3~=C+R+X3
zh`0(&j%2RiU<{*+JH@Dron}_vaC4eKea~))mzH3B{*;u`nZQO1)W`50Dm~d6m_hIU
zM@RR-2Tt56M5V16hzCP>@#zo2i@q_1yME-k(7qEr`Gs@niFRnVYYX!FFMcI;0QL7>
zY^W@ke~#z;YFwE66uN$rd(U#ITu}>%3@K5Hjj6^2{J9yEu*ww5P1lkkB$())J~@Uu
zh7>e3n3<}dg$>y;aSJ5^Lzo|!x;qc^`M3t93W&a$R|*Upk&kHLC|wuHu+r6DN5!E0
zLW5sZuNqc`JAn&MWBRm^Q@KtpgBPxJ;l;Z}>6XwF<75YR#?<@`V2IZ=F`VGcB!-6A
z!n?ZAM1!dV!($>NSTIh7etDDfNAwiYLID5ZV9p`t_LguUaL!}ck4WFDx1RDn;Se0(
zjA*Fqc-_OAG|4$!4rLIJnNc&D;A8bWI|4!D`dfW`48YM+Ls9w`x?x-!^Bt(&a0A}A
zA>?QT+HiKzJQKl!RA~mW`0s3-!^y20{L&M5z)-cI5!YaIrv~5J_&9v$KROL}eAiyQ
zAb4@kp9j62v0_K}bov|p)BP`~=;|9sE6@Mhc_jKehS&OM@LK;05q>ZqD(zx4;AM#G
z$qUh%j46+5(CpG!7>vjOY+=Ss!IE|NG0Zr5Vhl$P2TVqpI%CQm;fbx*8UMs_dtms#
z8CJyAUYT1eDo5HhY*oQ|W<64%oxW|+P}gNuyXy9(bukXF)np!}Ve0scFR?qyFh3!+
z4XvHVDdm4N4FwCWLR`)Dv9x&ORP+ScFbNA|i+-d8POvRym~{F(=y8m6ibE{n|N7{K
zdYcKq9~%%_XWYUtt}Z2aPWnUBMxY8xmOF-AVDA(<z6vTn3@+@L`x7|AddFdtrV!0G
zp?S*@jtodKFdt`*2b@aYxe;=&hR)QdqdxD?KYTMhw6V<hIUaW5`(FA*_@TEy0sCIG
zEX({n=91gEh16P*bZf^ieDdPIAFT}yAIMc2($^?Q^55n+@P57xuifi-_>YXn_Ib1v
z4n~wPkY~c1mSEm6Cdo-9Zp)F!1Y!haH5(f#oQg+q=x~E6tg_rA=XZKb+9b=gVM>X}
z8WZoP)-<XG0#m`$R-D&yG875250vx=0xJPxp*jd2j;zE%s3+?K6;I_ewbC&ODXF#*
znCoBpeo#dPfs&iBuzi|ThV6vW)_|l8Sqrhd5;x(93Jtg@YZxXmyHPBIh*_$Oio9j0
z&GUk4jG39Z&@TfQcmTuAF^spzCR%`kE!BWTqnSFiZaoM=s|m^4MQPp|x@*GiWy9Pt
zNmZBREPB4*Ke__H_4v)aZQg(61pLTbkHMSXxPe}%fjdRSVI^$I=hHcy`q=u<tbeJ0
zigLSW>+A2sBMA&m!#~Eu{uo~HrO@Oj<e$VdNiS$PNT7j#tJh<`VY%sX1YyApBtp+Q
zle1q~)l3<@e}CN-8<ge5Ghth9hV_K@E0exs<jKicpemGm8m=VkDOEV|q%L4AzAU{`
z{!m)sfwVU-H5o8Yf!tqZpH=x`V~IH4v(a3;0XW;-R34FtGE{ElVQ6-2*p(JVt=(jP
zJrQIxR9Y5EkQEXsP7x%~4x(p?90?Lel0f~nf#bb!{7<=zPt<U+w{PDE(cBEA+uL{?
zBS+Dt4PH(gD&uOKydCB6*u^IN^#6Jetjs3xo;N=Y-~aYim_JO%*o1sb@z{snNyMAC
zHEe&W|2sR!vj0p%4_Bm8_*yq)FY)y#-ix2WHS&L1-bVWHJT$c1<V`dg6Xrk77>y~y
z5H4X)qYXCCUP6WzkuD*I6Q@s&cp`W2o|?-u*qcxo5rC5l$&EaWbZtdJLX0VQJ)@x1
zNmqr+ddWLgYOg-AdkGfidmwMRwzNrUuU}P)2n*Iw|3yLN4HR5vGP>gCe2?XNX&4sa
zZa?nRgElV3{Nc<P8x^YXD$teJdw_K}J7r*5fw`9SkCbw(g!7xgtJDd>zJ}UL8``(7
zU|83ItUrLXw<G9oT>La<L2N=)6j2H)-iU;=H5W%dy0#Bq|EdwZ=Pggc9d`|JA;pmI
zgrZ{6OIdQ0N6ed;^R22!Hl7TAtUVv)3{iX**Z1G2A<@^b;`MtO-k5(Fux6_)ST-g~
zmPs8DFY<7ZLLGA@3iC#!GM>r8i~{A*z=Vt-V@dFWoj5+^-qP}NY*>V}mkUWOFVszn
z4T?h>3NhoL;IPwX5oqNoo_KV_$jFo$hN?h0C{>JLXb<^NlCAgHLQB;jU+<|RmKjW`
z_Fb9VT~Dtx`5uc0*^I^#sa&x3SI7d>R6tM$A<rS4ciwg*almx1sa^UG);nRIwUwZU
zOUvyC!^hA(FbnNlmbhn>k1!|h4Ta$rkAn?qkP3f;uCS{bdg8c)_ij%UzU>=EaO<s4
z^QcNbqB$u1ERt&7Nx9mm40UwchwZh8!XHSx>Ld%8CC~1{zN{g&6?`?m-ivSh5<JaY
zh;5Z3i<;4rr5haLolMCy4KV?YL+%B!9uQ^Dp-8|eQ+x=`1TLW>jvgKGP2ROD=Bl6-
z6w6H>z#&XtY~wQJEE=<xG^OB41H;~G1g@0w#?rkp3-9M*7SKZ@Tb^-MMnzQTW~Ld0
zu3DPseU$I|DoL5DR0Q+9Fbp@;ngynDZCGMMqXMFfFwlLb#mxq)>>+*QspOcHYYotV
zs950~cP6<RkzBTKUV!F}vqD{+puzO<F-mw-BTtlU4_SQ79t)GW8U#gsE`rYC8gvfT
zp}s4^(0;`EUYdlmK~fKl^K0dDIr{v~FNHrkSPecA#9tjK&t(ni;Y5EmKJyHo+YcRz
z;18OiYL7)p1?prlT9g>*o{>>eY1}8EPcylD)|e=f4P#k!BfNM=pC0g{A<vXq5wTFY
zv1JCY+AYq|DD!+$Eah=4@5zhH<rAu6JYFNQYEYm`)11z5w1*&9em@FIB!<%p4UQ$p
z<sY6#ZC>U!kP4U}5D0x>IZJ53QD=7Y*Msg^RR<q+t)NUm;0wMf4>|7}k>`~t(x5^G
z6)bWiZ)yqhYm0U0+_DI@-7UGNJYt^l0}S_Ivbh7}^%0L=ar#Q-`(^-*r3l&wV`%P)
zF|UeTWp>mzMF`w@^-$FPAaVmuye0KdNB^>WGJL-Z;F`xIuFH^qax4F;d?=pFUwv~k
z_=$IQ^uMQ@lPE!v)Ct|2$z&@b8!|A;3SJK;HPf+SXf$aJ=Qu5jk?~Blv#zYv_`O6L
zr7#jEl?+6((y|9}g@_urkt)EH9=w>Ny+HCLr>EnP5I)>r7sg_rqdlXlgm|TFsS-zf
zkUkgR<fZ__-*c~+P-ub~<bf(-0sWy{rEJ_72!9?kG9?o^TB-Qq8@KKJI-*Vwx5!46
zLVsiADR;>AZyoGF`^X&TLp391qnRi_GsKPD*u`*eaB_!3Iuc?gi5D`Q<_d=Sa~Pd8
zqy}qcGG$s8@7+K<!W)S^q*__;;Loe^FYX+T{}mCRsQTB)kcJw*YG1!U$p6EE5T5_q
zX7F8I6B@<1m>V^@P_&~4HZL(DniXhEQ>o+-?8vG+DAN^8aFIRp%#e5G-Fs?mi0tK}
zLLP<}rI}N52y(-8qYQ61&&#M{#65TOF*Y~ym~ASh@?!EryB?BVj845>P1FD;462GU
zr&A0Kx42cS(}u3hM5=-xtjt!~sdi@ks#7jhXVOWUR2^>(dE@evGRLtVOfjgyGbYf5
z5fR@XhI7O1k*k_A-~N0Iof~JMvA4x?ISd`5YU)ThzY8G@#RGt?Wev5P8fZ8H)Mv?f
z4B?D64P#RTqAFwV^pi{&XNEarj8X{K`PftGubh1f{^`!CygV#?jbCrRoO95ZsVH2H
zLie>hCD8MMnt5+W{lPtr;C0(n8~~YaCV{d(ji+lFfA9%)GP477-wziQVf4bl8$(WI
z`jG|z4;-k$-o15R<jn0I786UwsE=t@I>LM41XYMlJVdyM#j}mZGR;C!nN!}Bf$Kpj
zpM0_^gawmUrM=haBFrm_7`hau`GktL%BJk#qQ?M6gGBi_gcOtUQ8$sQSm2+Vp73C$
zktpxqR$7Wx?E7PUzp*gX(x(veWM2zCQ5(XxBqlnP#ugEsWFwzKSn)t$E!cuuD`UK#
z@}+QWUyz<Rw#;Cj0h#;9yp=V@M)<oQ9{tik`9S~On>#w!&r)F38|VL@G9*7W&2I?R
zP4Arv{^)S5?%EMd5TLh)F8*hj2msYyB$?;YFt+_Aa;b(QnG`J~x5`Dk)+DOCF~r-C
z21Vsu-YKh6lvXvu*L<xSR-in-l5zuARSay}?|rngssQmyjalW_4t$W2E>G;1?oqLz
z!2TR)w^2CgU~YEsM0nnkA$j@08NMp<u3V)tv3JPXh?0K7UYuwo8cTIHqS``@LuL+*
zsmjW9YRVa#%j@v>VctbgGT?#(U+)Oq1}3z6qF!Rdz=8s>*w9+&y`okCzwuY2pL_Rj
z_W$Y5@Y$_9U)EN>hK6Ksb9!5(Ui{up@P{k0+TS<14*?yv(U?Z59Vb_gaFmQ`WHd)<
z{ZM|zL@Tj`dQ{;fWVtq*-V!FK2M*Ms(FpjpC2tZG;ZNXpa8(ioQ&r;%pezb(tG-?_
zqL6bbPuVI}?(rzENun(BTzk(i#do?K?`iKn{L-}Fyfmz|oba2f996jTyh1hRvoZ&l
zFec~yB<#-96b)#^eIg<)s?XJ+wW|iT`8v-d@w;0gH}WP-WhcDBg-jFPvvdft+BRqm
zvngmXAbyQ)hKJy^sK7-M@^h!fT2=YaeQ@~GKmNPJpG-0hFrDG${}+Z-Wh%2BiP1f=
zdc(Ur!3P%pU-qsw#;&V6uf5OXzUS%Z#344aW0Dk-5Xz&pMGZ;|lp>JYQlOPusTEaK
zsS=2yN|mar5Bj6Dr93Jm)beQ65GXAwC?>50O>k<8A#q}eZSwFt_ShbeXXZZ7IeT}n
z{WxczJ?GrHHnBY(&y`Mm=gysbZ_eG{S!;jmTi^1@bdRbpp({YN*h?g644Cvp7fH?x
zVzp`Yba5BQPh#x}7eA(Wk(Qa@LTWWV*mg?@tuaq`zG~9JX4yzS-BU)WHhA>3a{W0>
zubo;DBu5YsYJrHj^&Fm;80GXp`LvGkB95F}L5w@fbgNd(tpY5bvjinTR85Yz#-Z4q
z>~^|Z9GMhdnDhn^_am9wRVPBIP6+_Df>bTQ<*X@X!Xl|}u4h%Hz*2}sqQhtNa^gAW
z@iGl#nZ0$ImO20e>wB7L5p09+eE7lM2R{Bt@6-AWc#v5$u4y0{5SeXY`?Udi?;kYi
zr&>N4mtYc)_5@fK1eow&M$~4Tm<^{C9BZpDP-=2t`;H?Kfusbcd8Rcv3<%6@4PkmZ
zP-de%pTgOIN&%CLRO-GVB;=a%Am1aymA60+IK)ch+!T+vE$cj|Rv?A_Ma$LZ0K9Nq
zi<!%o#8jqLc1?;~pDCBxK^{zLN-HVrNFJDaRmK7dBER8lGZLPrUefrVQ(d}~;z|W1
zFUuok-L5+il=Wp~;*8|>MTFV_vhM4P6lNmhV-%i0!;k*q7keN4xBY{!K<2{9ZYCgk
z`Uv#T?bnCoy}w_he?R7vR@YNup(pbCg>C{}9hs11@bt;VPmfGpoG6*Sd_nOaj7)f7
zwS3Tz(}j)znVt+_^OiuRdOTa~)Y?-Rpcp_wj+n^W+;fCQI%=M$!@arAFjC^ePP?24
z#cc%xu_kga%TQd47AIY_A`+%>Sb*gWmbq|oHzMWsdKSGe%@|{B_LgIiu#G~tQdGUv
zGb4TNL@{Sv_rb^+y*|l6q$3s9uabH69`9-~X&yKRFqxJwi->rh>J<Ww27zxJNWS@@
zhk74=`c(2=@fUS{BH~o|zr1<nssQO~c{YrqwR8^@%T@Lb_*cYPuKsSFeq@rdi4I=*
z#MNvJmm5YVG{8tyIum#*SEm7yBVYPh;L|<=s2)dVry`;gwr1c2a<gF1Ux=V5UTgE_
z5XL8bQ}js*3X}F2du?KLdK7ZrA<90E<eWf_W)E~`V~W0VYzbQ)1?;oJZPS!x#Di0S
zvI{;=@dqQKD#lV<m|m!zun9tL&xKS5+*0*`v(CaAhoBzHb_yC$Jx-SCztKMH+Co}g
zBDLJeD(Z4$_Ky;!xdlmgn^cgbOFo+}VozZ-gAnlkWSz+NkdHka{o|khXYa2rcKC7e
zn<)*T$XZinW$tTRN4iSUs0>t~!BpKB@qZt582`N*{mTtJnL^*eO5nk`q>^K?cVfz1
z62YWLN`^!!9kBb>s2U(rnmP$4aYWk12rr6gK6(5^A2y0ew*fcERWDt@;OtYi&Q*Kn
zX~PuI`!+qy$}AXWuBbrtq)nol+_b_SnJ1QH(IO)q9PkjHTLF2WJ)XCtGj$lvfbq+8
z=*s-k@nVBD7bYzLF#3db91`tG@PMx8#Ks-f8cJXjBsqZUIulnt6*6MQ7Z-rF+bUX_
zVzL>*WB$^fbp?uqsdz+!=<r#7>LYswAOGCG!51`m(8OW@s=bh0y|U}-s3W;VgGuXr
zo!V72kV5@f_fDVO|Na{NlkF5<wuF5|*s3l*?ouz3oPMHHH6$5)o$5&vLPjl?=8m#+
zRF0k$X-=eUzC4m$#2aF<Y}h2ClSuhIt%As<VWzDDvi*Xg!_A&arg}0$+G&WU&U1SZ
zqiIvJC8q7g7|V*PS-MBkdQtvLlsbN7v+6i3O9YF+leUcOfz<f=s3JkB6;7MSp>ICY
z$RSPlDV%4bQ=aP!A$d(;+QP4NUuL*9-bafrJnzx`qKZU5%~Cd-4K2J+q}vhx{FMXA
zfBpHx(I*a_O`gze2H&)&Bhf(r8*5N87&;H<#@r(f15)T5RsHzVZ60~`@6_lY-$mgk
zx>EPysX<@87?wo37Herp=&OOpM9X?G{gd`zQdO?MPXrvg*(7>mxm9Dq$0sM1(`&uy
zTW0&*A`Ps4hy{`qTn12Pvbn_q0$ASphF&(`FH;3$8L?vZdD77&_6Qo=d1VFFx1IKx
z)KGc&8@F37FB+J(q3YYi^w`U)$(%#_UPWNx%OGp%+hi1`DN9E~PtJ}V%r61&_m!ui
z=k9+jHUYpGKj+RAh*2djKHHdxLeHM(Xa4Sg;?IBP@#rD()h_8Zf}rW^W3UdSVju<j
z=!{di<u@wy1NR5yfe1BO;_8N9R9B>G3*AT;Xo-wC7@dr$Rkm73iSh{N`g`>tYj@_{
zA_!EDkA8YnQvpm&g-~mF+L6^&TxYa0vDl=v_GEzM(G*ar2Zcp58<0`cA5>tWB|CW&
zEstW>m+6kS<ax?EH{e2lCiDnYN(7P>a<v#WOV6w>Ut=ZAEeBds+z7>;h@?mcPyQSC
z1`sW_m7lnlb!E}WR$ycR!ghE}<L3JiefjC+;ZJ@$e(;&I?4XW9)B?^rkcOmo=Dq<_
zS3I%#%T@Z@?+D4S)kI+FVT*+T6cP-Jok)@p#t0vWoO!;I4&hBkC+z{?+k^A01!JbU
zn5l=2x+kJj0OJBw>HZ0bwJTP67}0vABKA&I=yimm+OU$6e7y$p7T+eqQLC3prFYzF
z_RA)wo6kcmN<BXg(w0`3p~x9Cm&U7fhOP}3DA}_+5h*QB>&Niofo`kl$I<CQj04ID
zXbS*4l`8_1NHIeuUc%>(ALj=?y)XIVp2Nwb8YEQ>j>t;o)`8>z$p%ry0+BiJ1SLNm
zlDGeQmA-!~<r|P5C)H5811xr8=!jG=(NwII4q<fi)!0qbmVt@~(Bq1TwRkBZ*5ZX!
zc-d-sFtst1)7f#dAb>qz*4XDV9o=|7I*|gEgzl*_(xhcIoU~0FEcp(}*L89r%RY<U
z>Q0Db<ChJ<O~*^Bh?iMy<(C@Cteb)7LFqO}*}WjTZh!^xfdCPUBBfo_^*<Ltrof6R
zC-KqP(}OS>hrfQj|KP{Iv-nTq`nROl189K6Lx2=rFCbk@){ZZ)WB@o^KQG|_&4E`V
z{_O#O_&9@;?`zfG|2h)g6QONWC4`A)2$fLmn?!WNvXPVmA+eBfJ<nDgH6LPhd+qCV
zFSYzqNfJ)8@N~ToDRsoh;$i}wP8XVU5ll`8aw-PW>4e(VOR7dR%1&D~WQ&>?Vp&g;
z+~DKB&4?^DK|u^*VHF#><vOI=MYu&zLuxW_K0C?D6EgQbZbc%lNd}&%Q=EEM<hDAb
zgeK4T%5!(@k{P=qR({lvAi_Ry4A!BR@EeO^Ybpq`pww5b;Mk=bFHJ&qFayueH5Wd+
z|EWjBOX0wxF%62iWUUmfmur5z9(5!aTtz3vJwfI^e%{LQI63^$rQ{>;Zq|PD9bWgX
z)xiL|%!h_p;8=57Xh+Z)B(k0&7x(}d50xFaNSEV~Xlzl(+LG*>(dm>L@T?a%s0iYD
ziUe4=6hnI{hDOta$qgbxNkDm$a#wOAC9hU{8dZaljz-o#h3kkSv1P_~T64vyebx3z
z`ZI!tGIPb}mf?J+!Q+r`8f13=lOZfLcycBpBwyk!XZ(1+9nor~m&7@?{o{TW+r;tz
zTjUn#4kXWi9P5r_1!kNUToV_D9zk((9iUx>XlbMPo~EH$AA>!|k3N2G&^|3*c3gv~
zXq~VXF1~9XNPGy0m_BidBlECN7Ji#!gQ(a3!hH0ZV~y&G_g2WSY)hiac9+S0)6`f9
z)m{vX-5BCT*HKa7Aih*DR`$qMG^7kXsd_+49EX%qoyMq{wKNr;BD-Y(wYZQ#yWNFG
zgTlllMyLR)4RqU4xgxdzU^*!y6Hceo458`$DDCs%I-RuonxuyWF~iX;ku6>yti6!!
zVnlNN=+;gqt&Uo&On2GZrYf8`UsH}(u%eUp&xo<qAkOtbfJimmi7VZ76@uxSoH`L*
z?4-m@MI2QGk4V10v-C2U?QDR}OAIzdcz!D|-3sAocVXdQUO2G_(mv*8k;q*qNeQ@y
zYpd2!L@G+(k|BU{Ph<`IrypHvf8%K1KmA(``kvPWeD?s;3bBwIHBZj4#l2InuYA|g
zV;igSXqB9Zd>q|f>-9kT=wUiyB8YsG#5DR*-4a1$i+}<Y6VZu5r`?C@`2mcL`Op%e
zsx@_#@>JWjWUd(3bi0aD(#k8zngW$1jVw#CRFfK5k^pPrTXUR=)q2kDHhBA$Ofw<3
z&|(ZM3FHf*+=*6v`Mwzm8NB#J=&yiIPk7#N;NUd2g4abP@}YaW4TIU9^#88~s&GBK
z6u=Xm?eJLV9`JfqcvJEMO!^Cwn5b3oG8Vz#9{kalp1ssQqUAnO!G(4d5M46>tp=@~
ztGBaBhl)c$1P+TAICObZC1k_9>f~+jY>@jK1pGEC3qoIV-rYX#onpB#5ljgfZ#p8|
zF9HE5T+4%jS{x}o4VucPipHiiYc-JjjfAJ}uc6or)J2qPjSCQqC{?NZGV&=2j9!sR
zB0F&jV|r1ue8HDkwWpL`Cm9n*GPOFfA`*35$#d0PD}5`{3z7VD+`Upd&`r1MqX>A=
zizS(WuSdnsHJG9z3Iz}}LSQ|yu{qua?~;f>fpWuot~~~iE$)WL;`^Wt)9|y&5qJO&
z!h|1*J!>5*epPyufA+cKkNw#XW<S9daR3EO+`u^^i)e@)lHnyK8djTV)&3T#118@A
zi3^sX<bFjH5mK-B>I%8<eNFn7I|H%>TlpgdK}cmy38w}kScsOK7^+)Zg9R$(ldbIH
zIdQC~F;IKIr0kZ>Xqa^Vtacma+NU6_AgDa3<2)x3tt#kL8Y)i+W30$Cg9SYUm!*YM
zQUIzHJk(KVgIzPqj4_w<10-7rslwY~;d1PtiaboZ4>2jPl1@)zV}}za{H8cxEpZ`g
z5;<K42^Mxq{O+81ejDISKZNfs%)s8x?E*4)z<gyJ+yf`z?Sp;r3Vsr}08c{Er`v;V
zGYRZ@@yx*wJ%0XUVjDWA*F@i9<_1IV+dzv;qSKlNlG~HyTSquTbh4>(115ZoV*&S9
zoAl>?u})tj)-){PTGf&jIZCA;t8~jg%Q`}#Is!=vuIX~72lUFqDJbPR)f6_h`k5%0
z5j0F2k|<3dMyhI!LR~DpT1$Znr#X0jre4pa3kqCnPo>sF29~VtJtgKSWNt@RG+I_i
zBG!;TV&f*0Ga2?#w(CbqPls(N4BcsQuZH88M6%`AiS$t*6_VN?QvtM4fTwc~;Lybu
z{P(4o!#)9^lfia~#<s!EZ~^Xb?}ht12SmOmE@reT&YutC(*$nY8N)Yc=MI1Hk&FK@
zy9B57_g_>SDvCxn<(*v3XtWxEG%PCFN(a9HJe7jtZPfx&)rwB_pQ@6(-!n$vct=2{
z+gzEsNS9W0F2WHqT0+DPJ#BTWO0q%Cmyyv)MjNZ+6(bZffS#|VLBw(W(Ge;&?3bEA
zr3<Xo(EOjuS-C+~yaqa(1|)5H&#N2skYlda2GIrtY0WAv>RL^Bkb#tBxoGyCnu&v&
z;E1I!92Y5@a-`)1qYjsm2H7_Rjx>)9^h+g5e2Xp{4eVx~2l&p33HaLi-LQY~ayTE{
zDpI{IFe83>@8T11?}h(`ExlP_ehs`@1;#cJnAz#U<}DF?>EQg6f3#=m^K%_Iqrd;Y
z1Eju{!nskYsBUysqS0yxk{gxm{v^L3%_~wr*dVG%5<(r)abtr=Zh2Re{^Tz-$X)2@
zw1`(+z1c{lBat$t=X&-}N)sER&C3>I%D#c|)l<L68kI@?JS_>L#J2V^MO*bcrtpi}
zwg6Su0!%@u3@>p49;Sh)zLu})X9Zpr{a99j<tzmpp+y${iVT+;KJ9TAM{3AhqW5>w
z{!Eh}s8Sbe9nj8~hDM2D8AfXRF9b1eKXE$eQ>Pm6<&(SNTirY0Vr2%#CZ}P#S%Dqx
z7vPn%dtukoL8#RTR5sRO@|FO`XFQnMhNEfv@TqSueCwl+4!+uDa6y0XJq?(i1)_li
zsDZO5iYyQ%R|`a|6-dK~2Wo-HFCZ5x1!-NyiA*&oI#uqjkX`Q{qxZeGMz-SFZYSpQ
z#iesmVp^XebL3`Li-2Lr)Y|2ltjIc~2oynuk&0%ZO7}jxAZi8#5zFGsL=*XUzB2mv
zJWCN^x^g`uj<r+}>1X5F@M+_?q^-uX;pLf;iX8LeE5j1=o~h>p&Gv^zV@S<t7_oHc
zE(Gx4vEA^+i}%90a2sr#Xu_t6Ds1Ox;hu%PaA*Jfuz8{jja%!`*i?b~ln2c*4_YGH
z9XQgt^cRnGzW%irV6O%Rb3oL0fYf)=x!8$Bb~J+P0i^3)kahp3jlWC+1w0budrgY`
zLG7q!9+&#81ATtv$c5zG+nV&1?`Y9GZwsJ~WJH${#pKDUnd!_C?ZLn`uSQZ+Lp6K0
z_<uysITbk%MP|cS<MTXiJV`w>>xt&mHJ;99NmD!Jn5r~_gfO=*s;_`rYzp?obfa?M
zxidhF;@eYE(4O7Q_1ITg9F8(zQ|(G*E7s9RGF}oZeSyNG^IPB$pMjsbbsn})pNEa(
z0GsM<*cJZ}wp7kTxG@B8yeapb_y)B&hW6PmeC|O1nZMZ=f8$3BaM=2e1|#f;VrM_J
z5<_=Qi?Y`<A~`&4ZogzRd0qkS?M9_)Ns4Fx&ZvgHZ2{RTz;xGJTIBW#59lJ31GrNY
z%2WobclO-sqccODWuevVsZ5$jAQ!19F{z(U`+TY+4b8N4peGbc%^OQkglTc7)M<OS
z-^0@5>2YfMb7wWBbn1mseA`3OY!*B<6oJ%uUPe7XYXO(G#|T!De#Vs$TGbfpl|-bY
zIIow<z9uF%f|1xvVbda-IM&3)#UC*E-qHBNC;u;c^go{C`^EcT((i5}P|u1)WqTw$
z8reYNS94!<Bcyg^DV|F{cqL#8hop8@=jVzehE-H~jckAC7`^ii4YCc{Jp@!_ybeq%
zlrwd+Sw1zCm@zZQN%#B^k^_~!@TCQXuO?|2V0m8FyCk>zEOow58%0%Q$efE(5p3GV
zVIP^o+O%eHnl}!~?q}LQX@R8&amn<}%N%@wn&w4y_T=7;@N}594zN1yC32!*U4Y7u
z6F77tUVP~3_`tvZF!}D89-Oc;4;wt)0uc2Jhy|PCPOfz!_C`qU+!{J_)DLV0MFbx~
z2y0ix5m3?hyZlE_c9YZhH|fq_8Yi!KRgG-GwbT|@(^&6?WW${tP^Qg1ECV=HD)V%2
z!gNEP{k9|*p_F0*pA*ZLbWD{}K>4PBN!7h%WYQs!GuzzT5DfsZOprjV_HS)HY?KTI
z^J{a){X`i{0=11T?NF@dCrS0VE^22IayelaLh=962-R$=LnoqzJ<mjkzwlK2y%(0?
zm<9lKqENpi8o8-mTtabQS2e?Gi%4#YSG4bOi?;rd$W)f<+0V0?K)Gsb6vp1%qC4L@
zMs9yqolN7qcM>^bC*7p8)H7T+uMwJExlQp?OM;kGSu5?EX^SAl?x?jC3D*9|uzy*t
z$|%IOj!sVfvx~QobJ$5ou$X8>oO+REZ)KiGwOL6joJ}S0-1=LdUJ<fpMk-tQ8zR-i
z4wHqY81^5FUfgpiI`Xx{@iQkna9RU_Yak2*Pp^Pjh)RmB*9AnYJ+&(X6F5LB+cy<;
z*H%i>I+sGXWk>QoTOLfjb&THr<}teS6*ZU&#e(U`l#iz=3`^D2YB8nFdmc?wFLUBi
z+b4^<jHS`afXcJI!_$2b$u$}plS<rw7*KiCR`oEg0w)%z^pIq5J;1Frj^sV#fabxL
zd4^~0^F*hmXe3h?;KBC(UXQ`Ev+?5o7Y3)k{><RWV<*`2ZAE7r;wZ8}QUso|C}bj#
z8;SV!ibOXGkjel>OISI72t8gY0F@h++!~d6Eiiz3Q;Y6+V4Uu{r$M%ehy^%2q0iGy
zNBb%8%(+!YDA3J&hFCCFCmpF0rdus68axG7)|W(y<3Fxd4mROH()NrjazN_+##4zC
z*k&TS3pKx2qVkNU(NCLP$f)QmBNP;sR?rYdJbgi2S)QAXFYP-Po&4^x!KuB+;$x?~
za9;0q%tDVG!k|B7A5=td+oS>;0-|e{%H3!{DogdsR1kha@wO<HD~m|37&g$aEpJr{
ztv5F5j-Q{PyY6m~ndtz0BqR_}iM5T8(=OzUD=t0P61}G~bsx_n8H~&a72yg{roP1U
z-L%?VC2c??c5#+lXU2*~6jF~o^|&=4z%#(%O4Xi=H2QM}M0%)WyMExQzv~V-oV>(3
z&&|bi&zz3u9zPl#fAYon^lTq4>Zrmj62Yag`z3%XDzw_vc9~j%m6T7`fpnSsrXp6a
z2vA``5w|S0D+7~neOdLp>tyDE3A+1rEqdFwir5->N_I5RYkEG0{`rXa#P3>DRF#v^
zx4fSge03`5DHVfs?vX@;F3zg)dQ!2FvU0YWiZ$iJv}uC{AluH@3`c_$lr$aff>Ba-
z3`=TWO^PrBZ_v&5QXitZ4(pwoPZkfHWoHhajm|xFHa>e|k<Bv|bq0`ceTf_}3>=`8
z{p?z3xd2KW;_149=tc%o8JNs{uVnA!7l0!ias(w{@}0wU1BF{dGWEI^+5W~cy5r6U
z!GY>Hxf6lJzj}ckd2)%rxU)tk@2bP*msiQu1|LGow5t)0rNR5U<J2e@s3sQD8WdIZ
zGSx*<j2JbH7DnM<QZ_yQ#M5o-sgTvYCLuc2Q%<F306{kaJ|B_Z#R2cm^?2{x66>5=
zWQ)&U;^&{gl+2%9N|rA47z#i-ko5(DwO?`l6QUsn)uR1RR8n9qll!pi&CK1%K!PDa
zDq{8Ax>H$eh6}KuV6WsC0Lp;Zkk7T-Yh=@FTXg&D$H<P|4YFxMfM)LkKmE^Vk|%%I
zfwSWt)b4JQt@k#`%&rRh_md_*r%JOS-<T>Q$e87)Y70<}JJ6W{w9$>Y=8@2F0!(5=
zf`~KmZDJi1=M6-JC=oX&i9o~PLImyeecoA&_+TOCy$gM4pY8Fbi+$D=kKv3&dw~}<
zT*d`QRC1KHK8yk&Hbm~jujc|>D?oC=1O;HSTQa;7%6!-{3XsfwYSq7p2o|kv6*75W
zi`@E#ak4`IB|OxDxxJUz(WjUAtXR}h(}VgZ0i^9!n7pG-H_cRFd}9dBEg>13^3n63
zC<oYOt4ZuvM1*?yJU{lCQ^|geA^{}`MxQBdo!ns|L8y{L*$E*POR>VL&3+XvR2MYn
zd9I2ecH}z4z~rhC+`mhlgG0G`o3Dn&x0ZlZ2Bu-`UfDjX3}7yRf&w6U4p^yETn<Il
z8QWDOn>PuNTon7J<9(Pv+2`}tqQJii1h}dQBmu6e%@xwzQ6tk^D`b4!hg!oY=vNtt
z2;^5i*#ZRLn&YP)I-5LksLf}^>vkaXG=L#ja5qINI+BtjE{I6c3ZN?bU0m>*WrjDf
z+Ca1xfwWR|vj6o)0F_??9<KyQMPQ;1sBE(;Ec;Zk?9x+q<*xmSYwUuAS*77Yh(HoR
z6Zc8bP=IS}5D`qIYVnCKzwm=LdvSIE3$T3dOOeA4gL40am4FnNq<7H@KgT7n$)H##
zw`xJO5|Dhjac^$(jY&)FJq))<g2Y<zv6BLprEf)#c?E!Sfn*aQ$TRf1EC*~GOw`%?
z^+j5?h{VNwoVk8Gi^_ApJ3i!KBY<esh?JB7B`yIS8?ygl4(I`{lXCl|xZTJ=vKLTp
zz%%6M<JkYw0zi2s5zD?$OMv8+0LcZDyO)E4`$dGxN*9q~Kw=|+X%rwO1*AYSBvnfa
zUYC_bM}SqLmAl!21kT=s7d+-hCbO`UqUccqj#0o<1|mDnboX;b2RNzUC>IjALLe2T
zcSUwraS7N~ia2FXsBFju0oH-EI=}=&096F4q=fl%LE(+~7#$LcilPy5?q3OzUP>?(
z0c+U(GT<<${xi%8mEY)#Z!H0-Y~SR9$xfkI3F}9O0LzXp-U!ciUk{v!RP-~fklwA7
z+Cd4BhLH|@2vGP6fMF}_(}wMR_*z(aYYj+6(Wxj6DoUpqESDjz^e-())rLJ@mdd$N
ziLbC%;w6!n7f{{91{AO%`xiFCbA|zCB_D3SmKNMv1yWITDkCY1I&_PGH4J2BzhCJn
zdS4h4nfM5xDg#s5{b8wK+3#Tl0Kv@wpql|mmjfs$S=<0Co350lXv6+y7(+*{Ftr;7
zs+B16QBpDvD;InDh~LFJkk$a8Mu}2<$YQ@-u)&b$TnUJ-1Wa&+px~GBx;GtoZdM>&
zPLwL!Yn7#7qk!$D0M97@Pkcz!y<EUu32<&2@T>!A^e8n7u;2=TGD_i<T){%+S9qU~
z2+VZ=tpn-D236T2Bo5H{3V<L`%q(7RWE#eZ5g3hb{&8zMe0}Mx18LO7aXI^yqO@^X
zeXHnw_)GAaSCZZEm+0KA-`0V2)qpkX;w4vck@8jcI_p4Mzm2rG$QoFr>!4W&(yCpA
z<Ocez>$j@`q+yLr>$mkqyMD`Vbo~^p-_~zG{_Xz-7yvuaHu9D}WVQeR002ovPDHLk
FV1gc7ibwze


From 8a180291b28db7a001393e442f51d6e282993aa6 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Wed, 17 Apr 2013 09:18:24 +1000
Subject: [PATCH 073/438] Bug 842224 - Make getCharNumAtPosition (a) return
 addressable character indices, and (b) heed full page zoom. r=longsonr

---
 layout/svg/nsSVGTextFrame2.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/layout/svg/nsSVGTextFrame2.cpp b/layout/svg/nsSVGTextFrame2.cpp
index 0c6e55e7d0e4..f003a243cb0d 100644
--- a/layout/svg/nsSVGTextFrame2.cpp
+++ b/layout/svg/nsSVGTextFrame2.cpp
@@ -993,10 +993,13 @@ TextRenderedRun::GetCharNumAtPosition(nsPresContext* aContext,
     return -1;
   }
 
+  float cssPxPerDevPx = aContext->
+    AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
+
   // Convert the point from user space into run user space, and take
   // into account any mFontSizeScaleFactor.
   gfxMatrix m = GetTransformFromRunUserSpaceToUserSpace(aContext).Invert();
-  gfxPoint p = m.Transform(aPoint) * mFontSizeScaleFactor;
+  gfxPoint p = m.Transform(aPoint) / cssPxPerDevPx * mFontSizeScaleFactor;
 
   // First check that the point lies vertically between the top and bottom
   // edges of the text.
@@ -3632,18 +3635,27 @@ nsSVGTextFrame2::ConvertTextElementCharIndexToAddressableIndex(
                                                            int32_t aIndex,
                                                            nsIContent* aContent)
 {
-  CharIterator it(this, CharIterator::eAddressable, aContent);
+  CharIterator it(this, CharIterator::eOriginal, aContent);
   if (!it.AdvanceToSubtree()) {
     return -1;
   }
-  uint32_t result = 0;
+  int32_t result = 0;
+  int32_t textElementCharIndex;
   while (!it.AtEnd() &&
-         it.IsWithinSubtree() &&
-         it.TextElementCharIndex() < static_cast<uint32_t>(aIndex)) {
-    result++;
+         it.IsWithinSubtree()) {
+    bool addressable = !it.IsOriginalCharUnaddressable();
+    textElementCharIndex = it.TextElementCharIndex();
     it.Next();
+    uint32_t delta = it.TextElementCharIndex() - textElementCharIndex;
+    aIndex -= delta;
+    if (addressable) {
+      if (aIndex < 0) {
+        return result;
+      }
+      result += delta;
+    }
   }
-  return result;
+  return -1;
 }
 
 /**
@@ -3816,7 +3828,7 @@ nsSVGTextFrame2::GetCharNumAtPosition(nsIContent* aContent,
     // Hit test this rendered run.  Later runs will override earlier ones.
     int32_t index = run.GetCharNumAtPosition(context, p);
     if (index != -1) {
-      result = index + run.mTextElementCharIndex - run.mTextFrameContentOffset;
+      result = index + run.mTextElementCharIndex;
     }
   }
 

From 90250462c0c5dcd68c83511a1375073dbb041d88 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Fri, 12 Apr 2013 16:34:27 -0700
Subject: [PATCH 074/438] Bug 860572 - Allow JSPropertyDescriptor to use
 Rooted; r=jonco

---
 js/src/gc/RootMarking.cpp |  33 +++++++-----
 js/src/gc/Verifier.cpp    |  17 +++++--
 js/src/jsapi.h            | 104 +++++++++++++++++++++++++++++++++++++-
 js/src/jspubtd.h          |   1 +
 4 files changed, 137 insertions(+), 18 deletions(-)

diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index f97bb1503c81..e1da8826c31c 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -67,6 +67,7 @@ MarkExactStackRoot(JSTracer *trc, Rooted<void*> *rooter, ThingRootKind kind)
       case THING_ROOT_ID:          MarkIdRoot(trc, (jsid *)addr, "exact-id"); break;
       case THING_ROOT_PROPERTY_ID: MarkIdRoot(trc, &((js::PropertyId *)addr)->asId(), "exact-propertyid"); break;
       case THING_ROOT_BINDINGS:    ((Bindings *)addr)->trace(trc); break;
+      case THING_ROOT_PROPERTY_DESCRIPTOR: ((JSPropertyDescriptor *)addr)->trace(trc); break;
       default: JS_NOT_REACHED("Invalid THING_ROOT kind"); break;
     }
 }
@@ -415,19 +416,7 @@ AutoGCRooter::trace(JSTracer *trc)
 
       case DESCRIPTOR : {
         PropertyDescriptor &desc = *static_cast<AutoPropertyDescriptorRooter *>(this);
-        if (desc.obj)
-            MarkObjectRoot(trc, &desc.obj, "Descriptor::obj");
-        MarkValueRoot(trc, &desc.value, "Descriptor::value");
-        if ((desc.attrs & JSPROP_GETTER) && desc.getter) {
-            JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, desc.getter);
-            MarkObjectRoot(trc, &tmp, "Descriptor::get");
-            desc.getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, tmp);
-        }
-        if (desc.attrs & JSPROP_SETTER && desc.setter) {
-            JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, desc.setter);
-            MarkObjectRoot(trc, &tmp, "Descriptor::set");
-            desc.setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, tmp);
-        }
+        desc.trace(trc);
         return;
       }
 
@@ -648,6 +637,24 @@ StackShape::AutoRooter::trace(JSTracer *trc)
     MarkIdRoot(trc, (jsid*) &shape->propid, "StackShape::AutoRooter id");
 }
 
+void
+JSPropertyDescriptor::trace(JSTracer *trc)
+{
+    if (obj)
+        MarkObjectRoot(trc, &obj, "Descriptor::obj");
+    MarkValueRoot(trc, &value, "Descriptor::value");
+    if ((attrs & JSPROP_GETTER) && getter) {
+        JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, getter);
+        MarkObjectRoot(trc, &tmp, "Descriptor::get");
+        getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, tmp);
+    }
+    if ((attrs & JSPROP_SETTER) && setter) {
+        JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, setter);
+        MarkObjectRoot(trc, &tmp, "Descriptor::set");
+        setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, tmp);
+    }
+}
+
 void
 js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots)
 {
diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp
index d7f714e9679d..9cdebbd5afe2 100644
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -29,14 +29,23 @@ using namespace mozilla;
 
 #if defined(DEBUG) && defined(JS_GC_ZEAL) && defined(JSGC_ROOT_ANALYSIS) && !defined(JS_THREADSAFE)
 
+template <typename T>
+bool
+CheckNonAddressThing(uintptr_t *w, T *t)
+{
+    return w >= (uintptr_t*)t && w < (uintptr_t*)(t + 1);
+}
+
 JS_ALWAYS_INLINE bool
 CheckStackRootThing(uintptr_t *w, void *address, ThingRootKind kind)
 {
-    if (kind != THING_ROOT_BINDINGS)
-        return address == static_cast<void*>(w);
+    if (kind == THING_ROOT_BINDINGS)
+        return CheckNonAddressThing(w, static_cast<Bindings*>(address));
 
-    Bindings *bp = static_cast<Bindings*>(address);
-    return w >= (uintptr_t*)bp && w < (uintptr_t*)(bp + 1);
+    if (kind == THING_ROOT_PROPERTY_DESCRIPTOR)
+        return CheckNonAddressThing(w, static_cast<PropertyDescriptor*>(address));
+
+    return address == static_cast<void*>(w);
 }
 
 struct Rooter {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 9bcb80d2f422..8bc2630a35d9 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -3326,13 +3326,115 @@ struct JSPropertyDescriptor {
     unsigned           shortid;
     JSPropertyOp       getter;
     JSStrictPropertyOp setter;
-    jsval              value;
+    JS::Value          value;
 
     JSPropertyDescriptor() : obj(NULL), attrs(0), shortid(0), getter(NULL),
                              setter(NULL), value(JSVAL_VOID)
     {}
+
+    void trace(JSTracer *trc);
 };
 
+namespace JS {
+
+template <typename Outer>
+class PropertyDescriptorOperations
+{
+    const JSPropertyDescriptor * desc() const { return static_cast<const Outer*>(this)->extract(); }
+    JSPropertyDescriptor * desc() { return static_cast<Outer*>(this)->extract(); }
+
+  public:
+    bool isEnumerable() const { return desc()->attrs & JSPROP_ENUMERATE; }
+    bool isReadonly() const { return desc()->attrs & JSPROP_READONLY; }
+    bool isPermanent() const { return desc()->attrs & JSPROP_PERMANENT; }
+    bool hasNativeAccessors() const { return desc()->attrs & JSPROP_NATIVE_ACCESSORS; }
+    bool hasGetterObject() const { return desc()->attrs & JSPROP_GETTER; }
+    bool hasSetterObject() const { return desc()->attrs & JSPROP_SETTER; }
+    bool isShared() const { return desc()->attrs & JSPROP_SHARED; }
+    bool isIndex() const { return desc()->attrs & JSPROP_INDEX; }
+    bool hasShortId() const { return desc()->attrs & JSPROP_SHORTID; }
+    bool hasAttributes(unsigned attrs) const { return desc()->attrs & attrs; }
+
+    JS::MutableHandleObject object() { return JS::MutableHandleObject::fromMarkedLocation(&desc()->obj); }
+    unsigned attributes() const { return desc()->attrs; }
+    unsigned shortid() const {
+        MOZ_ASSERT(hasShortId());
+        return desc()->shortid;
+    }
+    JSPropertyOp getter() const { MOZ_ASSERT(!hasGetterObject()); return desc()->getter; }
+    JSStrictPropertyOp setter() const { MOZ_ASSERT(!hasSetterObject()); return desc()->setter; }
+    JS::HandleObject getterObject() const {
+        MOZ_ASSERT(hasGetterObject());
+        return JS::HandleObject::fromMarkedLocation(reinterpret_cast<JSObject *const *>(&desc()->getter));
+    }
+    JS::HandleObject setterObject() const {
+        MOZ_ASSERT(hasSetterObject());
+        return JS::HandleObject::fromMarkedLocation(reinterpret_cast<JSObject *const *>(&desc()->setter));
+    }
+    JS::MutableHandleValue value() { return JS::MutableHandleValue::fromMarkedLocation(&desc()->value); }
+
+    void setAttributes(unsigned attrs) { desc()->attrs = attrs; }
+    void setShortId(unsigned id) { desc()->shortid = id; }
+    void setGetter(JSPropertyOp op) { desc()->getter = op; }
+    void setSetter(JSStrictPropertyOp op) { desc()->setter = op; }
+    void setGetterObject(JSObject *obj) { desc()->getter = reinterpret_cast<JSPropertyOp>(obj); }
+    void setSetterObject(JSObject *obj) { desc()->setter = reinterpret_cast<JSStrictPropertyOp>(obj); }
+};
+
+} /* namespace JS */
+
+namespace js {
+
+template <>
+struct RootMethods<JSPropertyDescriptor> {
+    static JSPropertyDescriptor initial() { return JSPropertyDescriptor(); }
+    static ThingRootKind kind() { return THING_ROOT_PROPERTY_DESCRIPTOR; }
+    static bool poisoned(const JSPropertyDescriptor &desc) {
+        return (desc.obj && JS::IsPoisonedPtr(desc.obj)) ||
+               (desc.attrs & JSPROP_GETTER && desc.getter && JS::IsPoisonedPtr(desc.getter)) ||
+               (desc.attrs & JSPROP_SETTER && desc.setter && JS::IsPoisonedPtr(desc.setter)) ||
+               (desc.value.isGCThing() && JS::IsPoisonedPtr(desc.value.toGCThing()));
+    }
+};
+
+template <>
+class RootedBase<JSPropertyDescriptor>
+  : public JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >
+{
+    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
+    const JSPropertyDescriptor *extract() const {
+        return static_cast<const JS::Rooted<JSPropertyDescriptor>*>(this)->address();
+    }
+    JSPropertyDescriptor *extract() {
+        return static_cast<JS::Rooted<JSPropertyDescriptor>*>(this)->address();
+    }
+};
+
+template <>
+class HandleBase<JSPropertyDescriptor>
+  : public JS::PropertyDescriptorOperations<JS::Handle<JSPropertyDescriptor> >
+{
+    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
+    const JSPropertyDescriptor *extract() const {
+        return static_cast<const JS::Handle<JSPropertyDescriptor>*>(this)->address();
+    }
+};
+
+template <>
+class MutableHandleBase<JSPropertyDescriptor>
+  : public JS::PropertyDescriptorOperations<JS::MutableHandle<JSPropertyDescriptor> >
+{
+    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
+    const JSPropertyDescriptor *extract() const {
+        return static_cast<const JS::MutableHandle<JSPropertyDescriptor>*>(this)->address();
+    }
+    JSPropertyDescriptor *extract() {
+        return static_cast<JS::MutableHandle<JSPropertyDescriptor>*>(this)->address();
+    }
+};
+
+} /* namespace js */
+
 /*
  * Like JS_GetPropertyAttrsGetterAndSetterById but will return a property on
  * an object on the prototype chain (returned in objp). If data->obj is null,
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index ab124ee57104..c9e4eacad750 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -244,6 +244,7 @@ enum ThingRootKind
     THING_ROOT_VALUE,
     THING_ROOT_TYPE,
     THING_ROOT_BINDINGS,
+    THING_ROOT_PROPERTY_DESCRIPTOR,
     THING_ROOT_LIMIT
 };
 

From 018af3a44c9017d530c94a70480f4887e1153bb1 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Fri, 12 Apr 2013 17:42:59 -0700
Subject: [PATCH 075/438] Bug 860572 - Use Rooted<JSPropertyDescriptor> in
 XPCComponents; r=bholley

---
 js/xpconnect/src/XPCComponents.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 0bb740a91e91..392f083a5f2d 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -2709,15 +2709,15 @@ nsXPCComponents_Utils::LookupMethod(const JS::Value& object,
 
         // Alright, now do the lookup.
         *retval = JSVAL_VOID;
-        JSPropertyDescriptor desc;
-        if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, &desc))
+        Rooted<JSPropertyDescriptor> desc(cx);
+        if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, desc.address()))
             return NS_ERROR_FAILURE;
 
         // First look for a method value. If that's not there, try a getter,
         // since historically lookupMethod also works for getters.
-        JSObject *methodObj = desc.value.isObject() ? &desc.value.toObject() : NULL;
-        if (!methodObj && (desc.attrs & JSPROP_GETTER))
-            methodObj = JS_FUNC_TO_DATA_PTR(JSObject *, desc.getter);
+        JSObject *methodObj = desc.value().isObject() ? &desc.value().toObject() : NULL;
+        if (!methodObj && desc.hasGetterObject())
+            methodObj = desc.getterObject();
 
         // Callers of this function seem to expect bound methods. Make it happen.
         // Note that this is unnecessary until bug 658909 is fixed.

From 10b6db2da503f20ea130593f3d5175544b4706d2 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 17 Apr 2013 00:50:26 +0100
Subject: [PATCH 076/438] Bug 862518 - Make sure the thumb of <input
 type=range> with fractional values is drawn at the correct position with
 Cocoa native theming. r=roc

---
 layout/forms/nsRangeFrame.h        | 16 ++++++++--------
 widget/cocoa/nsNativeThemeCocoa.mm | 20 +++++---------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/layout/forms/nsRangeFrame.h b/layout/forms/nsRangeFrame.h
index 2c4fb08ded31..bbb9b26a91d2 100644
--- a/layout/forms/nsRangeFrame.h
+++ b/layout/forms/nsRangeFrame.h
@@ -93,6 +93,14 @@ public:
   double GetMax() const;
   double GetValue() const;
 
+  /** 
+   * Returns the input element's value as a fraction of the difference between
+   * the input's minimum and its maximum (i.e. returns 0.0 when the value is
+   * the same as the minimum, and returns 1.0 when the value is the same as the 
+   * maximum).
+   */  
+  double GetValueAsFractionOfRange();
+
   /**
    * Returns whether the frame and its child should use the native style.
    */
@@ -126,14 +134,6 @@ private:
   void DoUpdateRangeProgressFrame(nsIFrame* aProgressFrame,
                                   const nsSize& aRangeSize);
 
-  /**
-   * Returns the input element's value as a fraction of the difference between
-   * the input's minimum and its maximum (i.e. returns 0.0 when the value is
-   * the same as the minimum, and returns 1.0 when the value is the same as the
-   * maximum).
-   */
-  double GetValueAsFractionOfRange();
-
   /**
    * The div used to show the ::-moz-range-track pseudo-element.
    * @see nsRangeFrame::CreateAnonymousContent
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 5bb05c3e2536..57e2b709d614 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -2269,21 +2269,11 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
       if (!rangeFrame) {
         break;
       }
-      int32_t value = rangeFrame->GetValue();
-      int32_t min = rangeFrame->GetMin();
-      int32_t max = rangeFrame->GetMax();
-      if (max < min) {
-        // The spec says that the only valid value is the minimum. For the
-        // purposes of drawing the range, we need to have a max that's greater
-        // than min though (it doesn't really matter what the value is, as long
-        // as the thumb is painted at the min.
-        max = min + 1;
-        value = min;
-      }
-      MOZ_ASSERT(MOZ_DOUBLE_IS_FINITE(value) &&
-                 MOZ_DOUBLE_IS_FINITE(min) &&
-                 MOZ_DOUBLE_IS_FINITE(max) &&
-                 value >= min && value <= max);
+      // DrawScale requires integer min, max and value. This is purely for
+      // drawing, so we normalize to a range 0-1000 here.
+      int32_t value = int32_t(rangeFrame->GetValueAsFractionOfRange() * 1000);
+      int32_t min = 0;
+      int32_t max = 1000;
       bool isVertical = !IsRangeHorizontal(aFrame);
       bool reverseDir =
         isVertical ||

From cdeed52b22cce96e5dda0f2421d592b4ce70da66 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Mon, 15 Apr 2013 15:06:42 -0700
Subject: [PATCH 077/438] Bug 861314: Prompts crash on 2.2. [r=bnicholson]
 [CLOSED TREE]

--HG--
extra : rebase_source : 82014ce40342ef8313575e7121f59ba71b3d1715
---
 mobile/android/base/Makefile.in               |  2 ++
 mobile/android/base/PromptService.java        |  4 ++--
 .../layout/autocomplete_list_item.xml         |  3 +--
 .../layout/select_dialog_multichoice.xml      |  1 +
 .../layout/select_dialog_singlechoice.xml     | 24 +++++++++++++++++++
 .../layout/simple_dropdown_item_1line.xml     | 24 +++++++++++++++++++
 .../base/resources/values-v11/styles.xml      |  2 ++
 .../android/base/resources/values/colors.xml  |  1 -
 .../android/base/resources/values/styles.xml  | 14 +++++++++++
 .../android/base/resources/values/themes.xml  |  3 +++
 10 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 mobile/android/base/resources/layout/select_dialog_singlechoice.xml
 create mode 100644 mobile/android/base/resources/layout/simple_dropdown_item_1line.xml

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 056216f37563..78fe406b18d3 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -431,6 +431,8 @@ RES_LAYOUT = \
   res/layout/list_item_header.xml \
   res/layout/select_dialog_list.xml \
   res/layout/select_dialog_multichoice.xml \
+  res/layout/select_dialog_singlechoice.xml \
+  res/layout/simple_dropdown_item_1line.xml \
   res/layout/abouthome_addon_row.xml \
   res/layout/abouthome_last_tabs_row.xml \
   res/layout/abouthome_section.xml \
diff --git a/mobile/android/base/PromptService.java b/mobile/android/base/PromptService.java
index d0b8f4ea7a24..8ef00005842c 100644
--- a/mobile/android/base/PromptService.java
+++ b/mobile/android/base/PromptService.java
@@ -203,7 +203,7 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
                 try {
                     String[] listitems = getStringArray(mJSONInput, "values");
                     if (listitems.length > 0) {
-                        ArrayAdapter<String> adapter = new ArrayAdapter<String>(GeckoApp.mAppContext, android.R.layout.simple_dropdown_item_1line, listitems);
+                        ArrayAdapter<String> adapter = new ArrayAdapter<String>(GeckoApp.mAppContext, R.layout.simple_dropdown_item_1line, listitems);
                         spinner.setAdapter(adapter);
                         int selectedIndex = getSafeInt(mJSONInput, "selected");
                         spinner.setSelection(selectedIndex);
@@ -320,7 +320,7 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
                 if (aMultipleSelection) {
                     resourceId = R.layout.select_dialog_multichoice;
                 } else {
-                    resourceId = android.R.layout.select_dialog_singlechoice;
+                    resourceId = R.layout.select_dialog_singlechoice;
                 }
             }
             PromptListAdapter adapter = new PromptListAdapter(GeckoApp.mAppContext, resourceId, aMenuList);
diff --git a/mobile/android/base/resources/layout/autocomplete_list_item.xml b/mobile/android/base/resources/layout/autocomplete_list_item.xml
index f7bbbbb1d104..4decde472741 100644
--- a/mobile/android/base/resources/layout/autocomplete_list_item.xml
+++ b/mobile/android/base/resources/layout/autocomplete_list_item.xml
@@ -6,8 +6,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:layout_width="fill_parent"
           android:layout_height="32dip"
-          android:textAppearance="?android:attr/textAppearanceMediumInverse"
-          android:textColor="@color/autocomplete_listitem_text"
+          android:textAppearance="@style/TextAppearance.Medium"
           android:layout_gravity="center_vertical"
           android:paddingLeft="10dp"
           android:paddingRight="10dp"
diff --git a/mobile/android/base/resources/layout/select_dialog_multichoice.xml b/mobile/android/base/resources/layout/select_dialog_multichoice.xml
index 0e08bac4399f..0fc9f949474d 100644
--- a/mobile/android/base/resources/layout/select_dialog_multichoice.xml
+++ b/mobile/android/base/resources/layout/select_dialog_multichoice.xml
@@ -18,4 +18,5 @@
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:textAppearance="@style/TextAppearance.Widget.TextView"
     style="@style/Widget.ListItem"/>
diff --git a/mobile/android/base/resources/layout/select_dialog_singlechoice.xml b/mobile/android/base/resources/layout/select_dialog_singlechoice.xml
new file mode 100644
index 000000000000..0bffa830d58d
--- /dev/null
+++ b/mobile/android/base/resources/layout/select_dialog_singlechoice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="@style/TextAppearance.Widget.TextView"
+    style="@style/Widget.ListItem"
+    android:checkMark="?android:attr/listChoiceIndicatorSingle"
+    android:ellipsize="marquee"/>
diff --git a/mobile/android/base/resources/layout/simple_dropdown_item_1line.xml b/mobile/android/base/resources/layout/simple_dropdown_item_1line.xml
new file mode 100644
index 000000000000..bc1c7999e44d
--- /dev/null
+++ b/mobile/android/base/resources/layout/simple_dropdown_item_1line.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/dropDownItemStyle"
+    android:textAppearance="@style/TextAppearance.Widget.TextView"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:ellipsize="marquee"/>
diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
index 5a070b697af8..1a55cd33aa80 100644
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -15,6 +15,8 @@
     -->
     <style name="Widget.BaseButton" parent="android:style/Widget.Holo.Light.Button"/>
 
+    <style name="Widget.BaseDropDownItem" parent="android:style/Widget.Holo.Light.DropDownItem"/>
+
     <style name="Widget.BaseEditText" parent="android:style/Widget.Holo.Light.EditText"/>
 
     <style name="Widget.BaseListView" parent="android:style/Widget.Holo.ListView"/>
diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
index 18c0bac30925..f03635bc7659 100644
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -59,7 +59,6 @@
   <!-- Link colors -->
   <color name="text_color_link">#22629E</color>
 
-  <color name="autocomplete_listitem_text">#000000</color>
   <color name="splash_background">#000000</color>
   <color name="splash_msgfont">#ffffff</color>
   <color name="splash_urlfont">#000000</color>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index acfc82440d3f..7b841508e9c9 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -12,6 +12,8 @@
 
     <style name="Widget.BaseButton" parent="android:style/Widget.Button"/>
 
+    <style name="Widget.BaseDropDownItem" parent="android:style/Widget.DropDownItem"/>
+
     <style name="Widget.BaseEditText" parent="android:style/Widget.EditText"/>
 
     <style name="Widget.BaseListLiew" parent="android:style/Widget.ListView"/>
@@ -26,6 +28,10 @@
         <item name="android:textAppearance">@style/TextAppearance.Widget.Button</item>
     </style>
 
+    <style name="Widget.DropDownItem" parent="Widget.BaseDropDownItem">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.DropDownItem</item>
+    </style>
+
     <style name="Widget.EditText" parent="Widget.BaseEditText">
         <item name="android:textAppearance">@style/TextAppearance.Widget.EditText</item>
     </style>
@@ -34,6 +40,10 @@
         <item name="android:textAppearance">@style/TextAppearance.Widget.TextView</item>
     </style>
 
+    <style name="Widget.TextView.SpinnerItem">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.TextView</item>
+    </style>
+
     <style name="Widget.ListView" parent="Widget.BaseListView">
         <item name="android:divider">#D1D5DA</item>
         <item name="android:dividerHeight">1dp</item>
@@ -132,6 +142,10 @@
         <item name="android:textColor">@color/primary_text</item>
     </style>
 
+    <style name="TextAppearance.Widget.DropDownItem">
+        <item name="android:textColor">@color/primary_text</item>
+    </style>
+
     <style name="TextAppearance.Widget.EditText">
         <item name="android:textColor">@color/primary_text</item>
     </style>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index cdc593353416..ebfb354eeefe 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -79,7 +79,10 @@
     <style name="Gecko.App">
         <item name="android:windowBackground">@color/background_normal</item>
         <item name="android:buttonStyle">@style/Widget.Button</item>
+        <item name="android:dropDownItemStyle">@style/Widget.DropDownItem</item>
         <item name="android:editTextStyle">@style/Widget.EditText</item>
+        <item name="android:spinnerDropDownItemStyle">@style/TextAppearance.Widget.TextView</item>
+        <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
         <item name="android:textViewStyle">@style/Widget.TextView</item>
     </style>
 

From af8c451de11301ea4a8e3527c35d6cd1946bcda9 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 16 Apr 2013 17:39:47 -0700
Subject: [PATCH 078/438] Bug 860326 - Don't update BrowserToolbar after
 editing a top site on about:home. r=wesj

---
 mobile/android/base/BrowserApp.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 14377ae99fd2..955e5fa6b843 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -792,8 +792,18 @@ abstract public class BrowserApp extends GeckoApp
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        String url = resultCode == Activity.RESULT_OK ? data.getStringExtra(AwesomeBar.URL_KEY) : null;
-        mBrowserToolbar.fromAwesomeBarSearch(url);
+
+        // Don't update the url in the toolbar if the activity was cancelled, or if it was launched to pick
+        //  a site. The order of these checks matters because data will be null if the activity was cancelled.
+        if (resultCode != Activity.RESULT_OK ||
+            data.getStringExtra(AwesomeBar.TARGET_KEY).equals(AwesomeBar.Target.PICK_SITE.toString())) {
+            // We still need to call fromAwesomeBarSearch to perform the toolbar animation.
+            mBrowserToolbar.fromAwesomeBarSearch(null);
+            return;
+        }
+
+        // Otherwise, update the toolbar with the url that was just entered.
+        mBrowserToolbar.fromAwesomeBarSearch(data.getStringExtra(AwesomeBar.URL_KEY));
     }
 
     public View getActionBarLayout() {

From 7b50d97cf8ada52c9d62549f3810eb83148e6111 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 16 Apr 2013 17:39:47 -0700
Subject: [PATCH 079/438] Bug 862125 - Properly quote addon id when passing
 string to querySelector. r=bnicholson

---
 mobile/android/chrome/content/aboutAddons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/chrome/content/aboutAddons.js b/mobile/android/chrome/content/aboutAddons.js
index c0f055c066a2..7da74aa5a3ec 100644
--- a/mobile/android/chrome/content/aboutAddons.js
+++ b/mobile/android/chrome/content/aboutAddons.js
@@ -221,7 +221,7 @@ var Addons = {
 
   _getElementForAddon: function(aKey) {
     let list = document.getElementById("addons-list");
-    let element = list.querySelector("div[addonID='" + aKey + "']");
+    let element = list.querySelector("div[addonID=" + aKey.quote() + "]");
     return element;
   },
 

From 3f720e92d2a5e9e5a7f53cfb6e4eae5fa0d291a3 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 16 Apr 2013 17:39:47 -0700
Subject: [PATCH 080/438] Bug 858323 - Focus tab.browser when the tab is
 selected. r=wesj

---
 mobile/android/chrome/content/browser.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 662453d73c75..46f8c47fc54a 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -625,6 +625,8 @@ var BrowserApp = {
     aTab.setResolution(aTab._zoom, true);
     this.displayedDocumentChanged();
     this.deck.selectedPanel = aTab.browser;
+    // Focus the browser so that things like selection will be styled correctly.
+    aTab.browser.focus();
   },
 
   get selectedBrowser() {

From f03b61a4bd927f2303b23f6be212de11d708c245 Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aklotz@mozilla.com>
Date: Tue, 16 Apr 2013 18:50:22 -0600
Subject: [PATCH 081/438] Bug 826851: Back out Plugin Hang UI unit tests due to
 intermittent WinXP oranges on inbound. r=bustage

---
 dom/plugins/ipc/hangui/PluginHangUIChild.cpp  |   1 -
 dom/plugins/test/mochitest/Makefile.in        |   5 -
 dom/plugins/test/mochitest/dialog_watcher.js  | 172 ------------
 dom/plugins/test/mochitest/hangui_common.js   |  20 --
 dom/plugins/test/mochitest/hangui_iface.js    | 121 --------
 .../test/mochitest/hangui_subpage.html        |   4 -
 dom/plugins/test/mochitest/test_hangui.xul    | 263 ------------------
 dom/plugins/test/testplugin/nptest.cpp        |  21 --
 8 files changed, 607 deletions(-)
 delete mode 100644 dom/plugins/test/mochitest/dialog_watcher.js
 delete mode 100644 dom/plugins/test/mochitest/hangui_common.js
 delete mode 100644 dom/plugins/test/mochitest/hangui_iface.js
 delete mode 100644 dom/plugins/test/mochitest/hangui_subpage.html
 delete mode 100644 dom/plugins/test/mochitest/test_hangui.xul

diff --git a/dom/plugins/ipc/hangui/PluginHangUIChild.cpp b/dom/plugins/ipc/hangui/PluginHangUIChild.cpp
index ff49e2dfb6e1..eee2ffd7550c 100644
--- a/dom/plugins/ipc/hangui/PluginHangUIChild.cpp
+++ b/dom/plugins/ipc/hangui/PluginHangUIChild.cpp
@@ -308,7 +308,6 @@ PluginHangUIChild::HangUIDlgProc(HWND aDlgHandle, UINT aMsgCode, WPARAM aWParam,
     }
     case WM_DESTROY: {
       EnableWindow(mParentWindow, TRUE);
-      SetForegroundWindow(mParentWindow);
       break;
     }
     default:
diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in
index 17821040fd7c..51e95374ae26 100644
--- a/dom/plugins/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -141,11 +141,6 @@ MOCHITEST_CHROME_FILES += \
       test_idle_hang.xul \
       test_busy_hang.xul \
       hang_test.js \
-      test_hangui.xul \
-      hangui_subpage.html \
-      hangui_common.js \
-      hangui_iface.js \
-      dialog_watcher.js \
       $(NULL)
   endif
 endif
diff --git a/dom/plugins/test/mochitest/dialog_watcher.js b/dom/plugins/test/mochitest/dialog_watcher.js
deleted file mode 100644
index b146a4aa8470..000000000000
--- a/dom/plugins/test/mochitest/dialog_watcher.js
+++ /dev/null
@@ -1,172 +0,0 @@
-const EVENT_OBJECT_SHOW = 0x8002;
-const EVENT_OBJECT_HIDE = 0x8003;
-const WINEVENT_OUTOFCONTEXT = 0;
-const WINEVENT_SKIPOWNPROCESS = 2;
-const QS_ALLINPUT = 0x04FF;
-const INFINITE = 0xFFFFFFFF;
-const WAIT_OBJECT_0 = 0;
-const WAIT_TIMEOUT = 258;
-const PM_NOREMOVE = 0;
-
-function DialogWatcher(titleText, onDialogStart, onDialogEnd) {
-  this.titleText = titleText;
-  this.onDialogStart = onDialogStart;
-  this.onDialogEnd = onDialogEnd;
-}
-
-DialogWatcher.prototype.init = function() {
-  this.hwnd = undefined;
-  if (!this.user32) {
-    this.user32 = ctypes.open("user32.dll");
-  }
-  if (!this.findWindow) {
-    this.findWindow = user32.declare("FindWindowW",
-                                     ctypes.winapi_abi,
-                                     ctypes.uintptr_t,
-                                     ctypes.jschar.ptr,
-                                     ctypes.jschar.ptr);
-  }
-  if (!this.winEventProcType) {
-    this.winEventProcType = ctypes.FunctionType(ctypes.stdcall_abi,
-                                                ctypes.void_t,
-                                                [ctypes.uintptr_t,
-                                                ctypes.uint32_t,
-                                                ctypes.uintptr_t,
-                                                ctypes.long,
-                                                ctypes.long,
-                                                ctypes.uint32_t,
-                                                ctypes.uint32_t]).ptr;
-  }
-  if (!this.setWinEventHook) {
-    this.setWinEventHook = user32.declare("SetWinEventHook",
-                                          ctypes.winapi_abi,
-                                          ctypes.uintptr_t,
-                                          ctypes.uint32_t,
-                                          ctypes.uint32_t,
-                                          ctypes.uintptr_t,
-                                          this.winEventProcType,
-                                          ctypes.uint32_t,
-                                          ctypes.uint32_t,
-                                          ctypes.uint32_t);
-  }
-  if (!this.unhookWinEvent) {
-    this.unhookWinEvent = user32.declare("UnhookWinEvent",
-                                         ctypes.winapi_abi,
-                                         ctypes.int,
-                                         ctypes.uintptr_t);
-  }
-  if (!this.pointType) {
-    this.pointType = ctypes.StructType("tagPOINT",
-                                       [ { "x": ctypes.long },
-                                         { "y": ctypes.long } ] );
-  }
-  if (!this.msgType) {
-    this.msgType = ctypes.StructType("tagMSG",
-                                     [ { "hwnd": ctypes.uintptr_t },
-                                       { "message": ctypes.uint32_t },
-                                       { "wParam": ctypes.uintptr_t },
-                                       { "lParam": ctypes.intptr_t },
-                                       { "time": ctypes.uint32_t },
-                                       { "pt": this.pointType } ] );
-  }
-  if (!this.peekMessage) {
-    this.peekMessage = user32.declare("PeekMessageW",
-                                      ctypes.winapi_abi,
-                                      ctypes.int,
-                                      this.msgType.ptr,
-                                      ctypes.uintptr_t,
-                                      ctypes.uint32_t,
-                                      ctypes.uint32_t,
-                                      ctypes.uint32_t);
-  }
-  if (!this.msgWaitForMultipleObjects) {
-    this.msgWaitForMultipleObjects = user32.declare("MsgWaitForMultipleObjects",
-                                                    ctypes.winapi_abi,
-                                                    ctypes.uint32_t,
-                                                    ctypes.uint32_t,
-                                                    ctypes.uintptr_t.ptr,
-                                                    ctypes.int,
-                                                    ctypes.uint32_t,
-                                                    ctypes.uint32_t);
-  }
-  if (!this.getWindowTextW) {
-    this.getWindowTextW = user32.declare("GetWindowTextW",
-                                         ctypes.winapi_abi,
-                                         ctypes.int,
-                                         ctypes.uintptr_t,
-                                         ctypes.jschar.ptr,
-                                         ctypes.int);
-  }
-};
-
-DialogWatcher.prototype.getWindowText = function(hwnd) {
-  var bufType = ctypes.ArrayType(ctypes.jschar);
-  var buffer = new bufType(256);
-  
-  if (this.getWindowTextW(hwnd, buffer, buffer.length)) {
-    return buffer.readString();
-  }
-};
-
-DialogWatcher.prototype.processWindowEvents = function(timeout) {
-  var onWinEvent = function(self, hook, event, hwnd, idObject, idChild, dwEventThread, dwmsEventTime) {
-    var nhwnd = Number(hwnd)
-    if (event == EVENT_OBJECT_SHOW) {
-      if (nhwnd == self.hwnd) {
-        // We've already picked up this event via FindWindow
-        return;
-      }
-      var windowText = self.getWindowText(hwnd);
-      if (windowText == self.titleText && self.onDialogStart) {
-        self.hwnd = nhwnd;
-        self.onDialogStart(nhwnd);
-      }
-    } else if (event == EVENT_OBJECT_HIDE && nhwnd == self.hwnd && self.onDialogEnd) {
-      self.onDialogEnd();
-      self.hwnd = null;
-    }
-  };
-  var self = this;
-  var callback = this.winEventProcType(function(hook, event, hwnd, idObject,
-                                                idChild, dwEventThread,
-                                                dwmsEventTime) {
-      onWinEvent(self, hook, event, hwnd, idObject, idChild, dwEventThread,
-                 dwmsEventTime);
-    } );
-  var hook = this.setWinEventHook(EVENT_OBJECT_SHOW, EVENT_OBJECT_HIDE,
-                                  0, callback, 0, 0,
-                                  WINEVENT_OUTOFCONTEXT | WINEVENT_SKIPOWNPROCESS);
-  if (!hook) {
-    return;
-  }
-  // Check if the window is already showing
-  var hwnd = this.findWindow(null, this.titleText);
-  if (hwnd && hwnd > 0) {
-    this.hwnd = Number(hwnd);
-    if (this.onDialogStart) {
-      this.onDialogStart(this.hwnd);
-    }
-  }
-
-  if (!timeout) {
-    timeout = INFINITE;
-  }
-
-  var waitStatus = WAIT_OBJECT_0;
-  var expectingStart = this.onDialogStart && this.hwnd === undefined;
-  while (this.hwnd === undefined || this.onDialogEnd && this.hwnd) {
-    waitStatus = this.msgWaitForMultipleObjects(0, null, 0, expectingStart ?
-                                                            INFINITE : timeout, 0);
-    if (waitStatus == WAIT_OBJECT_0) {
-      var msg = new this.msgType;
-      this.peekMessage(msg.address(), 0, 0, 0, PM_NOREMOVE);
-    } else if (waitStatus == WAIT_TIMEOUT) {
-      break;
-    }
-  }
-
-  this.unhookWinEvent(hook);
-  // Returns true if the hook was successful, something was found, and we never timed out
-  return this.hwnd !== undefined && waitStatus == WAIT_OBJECT_0;
-};
-
diff --git a/dom/plugins/test/mochitest/hangui_common.js b/dom/plugins/test/mochitest/hangui_common.js
deleted file mode 100644
index 776357efc361..000000000000
--- a/dom/plugins/test/mochitest/hangui_common.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Plugin Hang UI constants
-const HANGUIOP_NOTHING = 0;
-const HANGUIOP_CANCEL = 1;
-const HANGUIOP_COMMAND = 2;
-const IDC_CONTINUE = 1001;
-const IDC_STOP = 1002;
-const IDC_NOFUTURE = 1003;
-
-// Windows constants
-const WM_CLOSE = 0x0010;
-const WM_COMMAND = 0x0111;
-const BM_GETCHECK = 0x00F0;
-const BM_SETCHECK = 0x00F1;
-const BN_CLICKED = 0;
-const BST_CHECKED = 1;
-
-// Test-specific constants
-const EPSILON_MS = 1000;
-const STALL_DURATION = 5;
-
diff --git a/dom/plugins/test/mochitest/hangui_iface.js b/dom/plugins/test/mochitest/hangui_iface.js
deleted file mode 100644
index 4cd559c54527..000000000000
--- a/dom/plugins/test/mochitest/hangui_iface.js
+++ /dev/null
@@ -1,121 +0,0 @@
-var user32;
-var sendMessage;
-var getDlgItem;
-var messageBox;
-var watcher;
-
-importScripts("hangui_common.js");
-importScripts("dialog_watcher.js");
-
-function initCTypes() {
-  if (!user32) {
-    user32 = ctypes.open("user32.dll");
-  }
-  if (!getDlgItem) {
-    getDlgItem = user32.declare("GetDlgItem",
-                                ctypes.winapi_abi,
-                                ctypes.uintptr_t,
-                                ctypes.uintptr_t,
-                                ctypes.int);
-  }
-  if (!sendMessage) {
-    sendMessage = user32.declare("SendMessageW",
-                                 ctypes.winapi_abi,
-                                 ctypes.intptr_t,
-                                 ctypes.uintptr_t,
-                                 ctypes.uint32_t,
-                                 ctypes.uintptr_t,
-                                 ctypes.intptr_t);
-  }
-  if (!messageBox) {
-    // Handy for debugging the test itself
-    messageBox = user32.declare("MessageBoxW",
-                                ctypes.winapi_abi,
-                                ctypes.int,
-                                ctypes.uintptr_t,
-                                ctypes.jschar.ptr,
-                                ctypes.jschar.ptr,
-                                ctypes.uint32_t);
-  }
-  if (!watcher) {
-    watcher = new DialogWatcher("Warning: Unresponsive plugin");
-  }
-}
-
-function postSuccess(params) {
-  self.postMessage({"status": true, "params": params});
-}
-
-function postFail(params, msg) {
-  self.postMessage({"status": false, "params": params, "msg": msg});
-}
-
-function onDialogStart(inparams, hwnd) {
-  var params = Object.create(inparams);
-  params.testName += " (Start)";
-  params.callback = null;
-  if (!params.expectToFind) {
-    postFail(params, "Dialog showed when we weren't expecting it to!");
-    return;
-  }
-  if (params.opCode == HANGUIOP_CANCEL) {
-    sendMessage(hwnd, WM_CLOSE, 0, 0);
-  } else if (params.opCode == HANGUIOP_COMMAND) {
-    if (params.check) {
-      var checkbox = getDlgItem(hwnd, IDC_NOFUTURE);
-      if (!checkbox) {
-        postFail(params, "Couldn't find checkbox");
-        return;
-      }
-      sendMessage(checkbox, BM_SETCHECK, BST_CHECKED, 0);
-      sendMessage(hwnd, WM_COMMAND, (BN_CLICKED << 16) | IDC_NOFUTURE, checkbox);
-    }
-    var button = getDlgItem(hwnd, params.commandId);
-    if (!button) {
-      postFail(params,
-               "GetDlgItem failed to find button with ID " + params.commandId);
-      return;
-    }
-    sendMessage(hwnd, WM_COMMAND, (BN_CLICKED << 16) | params.commandId, button);
-  }
-  postSuccess(params);
-}
-
-function onDialogEnd(inparams) {
-  var params = Object.create(inparams);
-  params.testName += " (End)";
-  params.callback = inparams.callback;
-  postSuccess(params);
-}
-
-self.onmessage = function(event) {
-  initCTypes();
-  watcher.init();
-  var params = event.data;
-  var timeout = params.timeoutMs;
-  if (params.expectToFind) {
-    watcher.onDialogStart = function(hwnd) { onDialogStart(params, hwnd); };
-    if (params.expectToClose) {
-      watcher.onDialogEnd = function() { onDialogEnd(params); };
-    }
-  } else {
-    watcher.onDialogStart = null;
-    watcher.onDialogEnd = null;
-  }
-  var result = watcher.processWindowEvents(timeout);
-  if (result === null) {
-    postFail(params, "Hook failed");
-  } else if (!result) {
-    if (params.expectToFind) {
-      postFail(params, "The dialog didn't show but we were expecting it to");
-    } else {
-      postSuccess(params);
-    }
-  }
-}
-
-self.onerror = function(event) {
-  var msg = "Error: " + event.message + " at " + event.filename + ":" + event.lineno;
-  postFail(null, msg);
-};
-
diff --git a/dom/plugins/test/mochitest/hangui_subpage.html b/dom/plugins/test/mochitest/hangui_subpage.html
deleted file mode 100644
index 401912f68e07..000000000000
--- a/dom/plugins/test/mochitest/hangui_subpage.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<body onload="window.parent.frameLoaded()">
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-
diff --git a/dom/plugins/test/mochitest/test_hangui.xul b/dom/plugins/test/mochitest/test_hangui.xul
deleted file mode 100644
index 2842a79c1c4a..000000000000
--- a/dom/plugins/test/mochitest/test_hangui.xul
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <title>Plugin Hang UI Test</title>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
-  <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/hangui_common.js" />
-
-<body xmlns="http://www.w3.org/1999/xhtml">
-  <iframe id="iframe1" src="hangui_subpage.html" width="400" height="400"></iframe>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-const hangUITimeoutPref = "dom.ipc.plugins.hangUITimeoutSecs";
-const hangUIMinDisplayPref = "dom.ipc.plugins.hangUIMinDisplaySecs";
-const timeoutPref = "dom.ipc.plugins.timeoutSecs";
-
-var worker = new ChromeWorker("hangui_iface.js");
-worker.onmessage = function(event) {
-  var result = event.data;
-  var params = result.params;
-  var output = params.testName;
-  if (result.msg) {
-    output += ": " + result.msg;
-  }
-  ok(result.status, output);
-  if (params.callback) {
-    var cb = eval(params.callback);
-    var timeout = setTimeout(function() { clearTimeout(timeout); cb(); }, 100);
-  }
-};
-worker.onerror = function(event) {
-  var output = "Error: " + event.message + " at " + event.filename + ":" + event.lineno;
-  ok(false, output);
-};
-
-var iframe;
-var p;
-var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-
-function hanguiOperation(testName, timeoutSec, expectFind, expectClose, opCode,
-                         commandId, check, cb) {
-  var timeoutMs = timeoutSec * 1000 + EPSILON_MS;
-  worker.postMessage({ "timeoutMs": timeoutMs, "expectToFind": expectFind,
-                       "expectToClose": expectClose, "opCode": opCode,
-                       "commandId": commandId, "check": check,
-                       "testName": testName, "callback": cb });
-}
-
-function hanguiExpect(testName, shouldBeShowing, shouldClose, cb) {
-  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
-  if (!shouldBeShowing && !timeoutSec) {
-    timeoutSec = Services.prefs.getIntPref(timeoutPref);
-  }
-  hanguiOperation(testName, timeoutSec, shouldBeShowing, shouldClose, HANGUIOP_NOTHING, 0, false, cb);
-}
-
-function hanguiContinue(testName, check, cb) {
-  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
-  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_COMMAND, IDC_CONTINUE, check, cb);
-}
-
-function hanguiStop(testName, check, cb) {
-  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
-  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_COMMAND, IDC_STOP, check, cb);
-}
-
-function hanguiCancel(testName, cb) {
-  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
-  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_CANCEL, 0, false, cb);
-}
-
-function finishTest() {
-  if (obsCount > 0) {
-    os.removeObserver(testObserver, "plugin-crashed");
-    --obsCount;
-  }
-  SpecialPowers.clearUserPref(hangUITimeoutPref);
-  SpecialPowers.clearUserPref(hangUIMinDisplayPref);
-  SpecialPowers.clearUserPref(timeoutPref);
-  SimpleTest.finish();
-}
-
-function runTests() {
-  if (!SimpleTest.testPluginIsOOP()) {
-    ok(true, "Skipping this test when test plugin is not OOP.");
-    SimpleTest.finish();
-  }
-
-  resetVars();
-
-  hanguiExpect("Prime ChromeWorker", false, false, "test1");
-}
-
-window.frameLoaded = runTests;
-
-var obsCount = 0;
-
-function onPluginCrashedHangUI(aEvent) {
-  ok(true, "Plugin crashed notification received");
-  is(aEvent.type, "PluginCrashed", "event is correct type");
-
-  is(p, aEvent.target, "Plugin crashed event target is plugin element");
-
-  ok(aEvent instanceof Components.interfaces.nsIDOMDataContainerEvent,
-     "plugin crashed event has the right interface");
-
-  var minidumpID = aEvent.getData("minidumpID");
-  isnot(minidumpID, "", "got a non-empty dump ID");
-  var pluginName = aEvent.getData("pluginName");
-  is(pluginName, "Test Plug-in", "got correct plugin name");
-  var pluginFilename = aEvent.getData("pluginFilename");
-  isnot(pluginFilename, "", "got a non-empty filename");
-  var didReport = aEvent.getData("submittedCrashReport");
-  // The app itself may or may not have decided to submit the report, so
-  // allow either true or false here.
-  ok((didReport == true || didReport == false), "event said crash report was submitted");
-  os.removeObserver(testObserver, "plugin-crashed");
-  --obsCount;
-}
-
-function resetVars() {
-  iframe = document.getElementById('iframe1');
-  p = iframe.contentDocument.getElementById("plugin1");
-  if (obsCount == 0) {
-    os.addObserver(testObserver, "plugin-crashed", true);
-    ++obsCount;
-  }
-  iframe.contentDocument.addEventListener("PluginCrashed",
-                                          onPluginCrashedHangUI,
-                                          false);
-}
-
-function test9b() {
-  hanguiExpect("test9b: Plugin Hang UI is not showing (checkbox)", false);
-  p.stall(STALL_DURATION);
-  hanguiExpect("test9b: Plugin Hang UI is still not showing (checkbox)", false, false, "finishTest");
-  p.stall(STALL_DURATION);
-}
-
-function test9a() {
-  resetVars();
-  SpecialPowers.setIntPref(hangUITimeoutPref, 1);
-  SpecialPowers.setIntPref(hangUIMinDisplayPref, 1);
-  SpecialPowers.setIntPref(timeoutPref, 45);
-  hanguiContinue("test9a: Continue button works with checkbox", true, "test9b");
-  p.stall(STALL_DURATION);
-}
-
-function test9() {
-  window.frameLoaded = test9a;
-  iframe.contentWindow.location.reload();
-}
-
-function test8a() {
-  resetVars();
-  SpecialPowers.setIntPref(hangUITimeoutPref, 1);
-  SpecialPowers.setIntPref(hangUIMinDisplayPref, 4);
-  hanguiExpect("test8a: Plugin Hang UI is not showing (disabled due to hangUIMinDisplaySecs)", false, false, "test9");
-  var exceptionThrown = false;
-  try {
-    p.hang();
-  } catch(e) {
-    exceptionThrown = true;
-  }
-  ok(exceptionThrown, "test8a: Exception thrown from hang() when plugin was terminated");
-}
-
-function test8() {
-  window.frameLoaded = test8a;
-  iframe.contentWindow.location.reload();
-}
-
-function test7a() {
-  resetVars();
-  SpecialPowers.setIntPref(hangUITimeoutPref, 0);
-  hanguiExpect("test7a: Plugin Hang UI is not showing (disabled)", false, false, "test8");
-  var exceptionThrown = false;
-  try {
-    p.hang();
-  } catch(e) {
-    exceptionThrown = true;
-  }
-  ok(exceptionThrown, "test7a: Exception thrown from hang() when plugin was terminated");
-}
-
-function test7() {
-  window.frameLoaded = test7a;
-  iframe.contentWindow.location.reload();
-}
-
-function test6() {
-  SpecialPowers.setIntPref(hangUITimeoutPref, 1);
-  SpecialPowers.setIntPref(hangUIMinDisplayPref, 1);
-  SpecialPowers.setIntPref(timeoutPref, 3);
-  hanguiExpect("test6: Plugin Hang UI is showing", true, true, "test7");
-  var exceptionThrown = false;
-  try {
-    p.hang();
-  } catch(e) {
-    exceptionThrown = true;
-  }
-  ok(exceptionThrown, "test6: Exception thrown from hang() when plugin was terminated (child timeout)");
-}
-
-function test5a() {
-  resetVars();
-  hanguiCancel("test5a: Close button works", "test6");
-  p.stall(STALL_DURATION);
-}
-
-function test5() {
-  window.frameLoaded = test5a;
-  iframe.contentWindow.location.reload();
-}
-
-function test4() {
-  hanguiStop("test4: Stop button works", false);
-  // We'll get an exception here because the plugin was terminated
-  var exceptionThrown = false;
-  try {
-    p.hang();
-  } catch(e) {
-    exceptionThrown = true;
-  }
-  ok(exceptionThrown, "test4: Exception thrown from hang() when plugin was terminated");
-  SimpleTest.executeSoon(test5);
-}
-
-function test3() {
-  hanguiContinue("test3: Continue button works", false, "test4");
-  p.stall(STALL_DURATION);
-}
-
-function test2() {
-  // This test is identical to test1 because there were some bugs where the 
-  // Hang UI would show on the first hang but not on subsequent hangs
-  hanguiExpect("test2: Plugin Hang UI is showing", true, true, "test3");
-  p.stall(STALL_DURATION);
-}
-
-function test1() {
-  SpecialPowers.setIntPref(hangUITimeoutPref, 1);
-  SpecialPowers.setIntPref(hangUIMinDisplayPref, 1);
-  SpecialPowers.setIntPref(timeoutPref, 45);
-  hanguiExpect("test1: Plugin Hang UI is showing", true, true, "test2");
-  p.stall(STALL_DURATION);
-}
-
-]]>
-</script>
-</window>
diff --git a/dom/plugins/test/testplugin/nptest.cpp b/dom/plugins/test/testplugin/nptest.cpp
index 2b7c6feb5b5c..f52937e87865 100644
--- a/dom/plugins/test/testplugin/nptest.cpp
+++ b/dom/plugins/test/testplugin/nptest.cpp
@@ -147,7 +147,6 @@ static bool getAuthInfo(NPObject* npobj, const NPVariant* args, uint32_t argCoun
 static bool asyncCallbackTest(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool checkGCRace(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool hangPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
-static bool stallPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool getClipboardText(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool callOnDestroy(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool reinitWidget(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
@@ -211,7 +210,6 @@ static const NPUTF8* sPluginMethodIdentifierNames[] = {
   "asyncCallbackTest",
   "checkGCRace",
   "hang",
-  "stall",
   "getClipboardText",
   "callOnDestroy",
   "reinitWidget",
@@ -276,7 +274,6 @@ static const ScriptableFunction sPluginMethodFunctions[] = {
   asyncCallbackTest,
   checkGCRace,
   hangPlugin,
-  stallPlugin,
   getClipboardText,
   callOnDestroy,
   reinitWidget,
@@ -3317,24 +3314,6 @@ hangPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount,
   return true;
 }
 
-bool
-stallPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount,
-           NPVariant* result)
-{
-  uint32_t stallTimeSeconds = 0;
-  if ((argCount == 1) && NPVARIANT_IS_INT32(args[0])) {
-    stallTimeSeconds = (uint32_t) NPVARIANT_TO_INT32(args[0]);
-  }
-
-#ifdef XP_WIN
-  Sleep(stallTimeSeconds * 1000U);
-#else
-  sleep(stallTimeSeconds);
-#endif
-
-  return true;
-}
-
 #if defined(MOZ_WIDGET_GTK)
 bool
 getClipboardText(NPObject* npobj, const NPVariant* args, uint32_t argCount,

From 1fd67803cc15d6ab8bb6f1269c16f8ef971351da Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 17 Apr 2013 11:29:03 +1000
Subject: [PATCH 082/438] Bug 809733 - add css transitions for width and height
 to chatboxes.  r=jaws

---
 browser/base/content/browser.css          |  9 ++++++
 browser/base/content/socialchat.xml       | 35 ++++++++---------------
 browser/themes/shared/social/chat.inc.css |  7 -----
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index d1e127efcecb..a2d7b6b1d778 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -640,8 +640,17 @@ toolbarbutton[type="badged"] {
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#toolbarbutton-badged");
 }
 
+/* Note the chatbox 'width' values are duplicated in socialchat.xml */
 chatbox {
   -moz-binding: url("chrome://browser/content/socialchat.xml#chatbox");
+  transition: height 150ms ease-out, width 150ms ease-out;
+  height: 285px;
+  width: 260px; /* CHAT_WIDTH_OPEN in socialchat.xml */
+}
+
+chatbox[minimized="true"] {
+  width: 160px;
+  height: 20px; /* CHAT_WIDTH_MINIMIZED in socialchat.xml */
 }
 
 chatbar {
diff --git a/browser/base/content/socialchat.xml b/browser/base/content/socialchat.xml
index 2550d725cafe..0ebfadea4668 100644
--- a/browser/base/content/socialchat.xml
+++ b/browser/base/content/socialchat.xml
@@ -63,7 +63,8 @@
           return this.getAttribute("minimized") == "true";
         </getter>
         <setter><![CDATA[
-          this.isActive = !val;
+          // Note that this.isActive is set via our transitionend handler so
+          // the content doesn't see intermediate values.
           let parent = this.parentNode;
           if (val) {
             this.setAttribute("minimized", "true");
@@ -144,6 +145,10 @@
         this.setAttribute('image', uri.spec);
         this.parentNode.updateTitlebar(this);
       ]]></handler>
+      <handler event="transitionend">
+        if (this.isActive == this.minimized)
+          this.isActive = !this.minimized;
+      </handler>
     </handlers>
   </binding>
 
@@ -160,9 +165,7 @@
 
     <implementation implements="nsIDOMEventListener">
       <constructor>
-        // to avoid reflows we cache the values for various widths.
-        this.cachedWidthOpen = 0;
-        this.cachedWidthMinimized = 0;
+        // to avoid reflows we cache the width of the nub.
         this.cachedWidthNub = 0;
         this._selectedChat = null;
       </constructor>
@@ -326,25 +329,11 @@
       <method name="getTotalChildWidth">
         <parameter name="aChatbox"/>
         <body><![CDATA[
-          // gets the width of a child, using/setting the cached value for
-          // children of this type.
-          // DOES NOT take collapsed into account - ie, this is the width
-          // of a child assuming it is *not* collapsed.  (collapsed chats
-          // have a width of zero as they are not shown).
-          if (aChatbox.minimized) {
-            if (!this.cachedWidthMinimized) {
-              if (aChatbox.collapsed)
-                throw new Error("can't calculate size of collapsed chat!");
-              this.cachedWidthMinimized = this.calcTotalWidthOf(aChatbox);
-            }
-            return this.cachedWidthMinimized;
-          }
-          if (!this.cachedWidthOpen) {
-            if (aChatbox.collapsed)
-              throw new Error("can't calculate size of collapsed chat!");
-            this.cachedWidthOpen = this.calcTotalWidthOf(aChatbox);
-          }
-          return this.cachedWidthOpen;
+          // These are from the CSS for the chatbox and must be kept in sync.
+          // We can't use calcTotalWidthOf due to the transitions...
+          const CHAT_WIDTH_OPEN = 260;
+          const CHAT_WIDTH_MINIMIZED = 160;
+          return aChatbox.minimized ? CHAT_WIDTH_MINIMIZED : CHAT_WIDTH_OPEN;
         ]]></body>
       </method>
 
diff --git a/browser/themes/shared/social/chat.inc.css b/browser/themes/shared/social/chat.inc.css
index 1f135fbce001..c708218558d2 100644
--- a/browser/themes/shared/social/chat.inc.css
+++ b/browser/themes/shared/social/chat.inc.css
@@ -128,15 +128,8 @@ chatbar {
 }
 
 chatbox {
-  height: 285px;
-  width: 260px;
   -moz-margin-start: 4px;
   background-color: white;
   border: 1px solid #ccc;
   border-bottom: none;
 }
-
-chatbox[minimized="true"] {
-  width: 160px;
-  height: 20px;
-}

From ad828e25f5081f1d73edfb62512d5aceee676fa7 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 17 Apr 2013 11:29:03 +1000
Subject: [PATCH 083/438] Bug 860176 - always remove document-element-inserted
 observer from frameworkers.  r=jaws

---
 toolkit/components/social/FrameWorker.jsm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/toolkit/components/social/FrameWorker.jsm b/toolkit/components/social/FrameWorker.jsm
index 4e5ab5319a44..c7cb9ba47ce1 100644
--- a/toolkit/components/social/FrameWorker.jsm
+++ b/toolkit/components/social/FrameWorker.jsm
@@ -77,6 +77,7 @@ function FrameWorker(url, name, origin) {
   this.loaded = false;
   this.reloading = false;
   this.origin = origin;
+  this._injectController = null;
 
   this.frame = makeHiddenFrame();
   this.load();
@@ -84,22 +85,29 @@ function FrameWorker(url, name, origin) {
 
 FrameWorker.prototype = {
   load: function FrameWorker_loadWorker() {
-    var self = this;
-    Services.obs.addObserver(function injectController(doc, topic, data) {
-      if (!doc.defaultView || doc.defaultView != self.frame.contentWindow) {
+    this._injectController = function(doc, topic, data) {
+      if (!doc.defaultView || doc.defaultView != this.frame.contentWindow) {
         return;
       }
-      Services.obs.removeObserver(injectController, "document-element-inserted");
+      this._maybeRemoveInjectController();
       try {
-        self.createSandbox();
+        this.createSandbox();
       } catch (e) {
         Cu.reportError("FrameWorker: failed to create sandbox for " + url + ". " + e);
       }
-    }, "document-element-inserted", false);
+    }.bind(this);
 
+    Services.obs.addObserver(this._injectController, "document-element-inserted", false);
     this.frame.setAttribute("src", this.url);
   },
 
+  _maybeRemoveInjectController: function() {
+    if (this._injectController) {
+      Services.obs.removeObserver(this._injectController, "document-element-inserted");
+      this._injectController = null;
+    }
+  },
+
   reload: function FrameWorker_reloadWorker() {
     // push all the ports into pending ports, they will be re-entangled
     // during the call to createSandbox after the document is reloaded
@@ -308,6 +316,7 @@ FrameWorker.prototype = {
       // terminating an already terminated worker - ignore it
       return;
     }
+    this._maybeRemoveInjectController();
     // we want to "forget" about this worker now even though the termination
     // may not be complete for a little while...
     delete workerCache[this.url];

From 5f2b7f2d84d679d20538caf160caf423ce21458a Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 16 Apr 2013 16:43:28 +1000
Subject: [PATCH 084/438] Bug 862158 - Propagate implied SVG text rotate=""
 values over the top of inherited values. r=longsonr

---
 layout/reftests/svg/reftest.list            |  7 +++++--
 layout/reftests/svg/tspan-rotate-02-ref.svg | 11 +++++++++++
 layout/reftests/svg/tspan-rotate-04-ref.svg | 11 +++++++++++
 layout/reftests/svg/tspan-rotate-07-ref.svg |  8 ++++++++
 layout/reftests/svg/tspan-rotate-07.svg     |  8 ++++++++
 layout/svg/nsSVGTextFrame2.cpp              |  6 +-----
 6 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 layout/reftests/svg/tspan-rotate-02-ref.svg
 create mode 100644 layout/reftests/svg/tspan-rotate-04-ref.svg
 create mode 100644 layout/reftests/svg/tspan-rotate-07-ref.svg
 create mode 100644 layout/reftests/svg/tspan-rotate-07.svg

diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 893ff82de179..eb7d2ce0b5cf 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -319,11 +319,14 @@ HTTP(..) == text-scale-03.svg text-scale-03-ref.svg
 == tspan-dxdy-06.svg tspan-dxdy-ref.svg
 == tspan-dxdy-textPath-01.svg tspan-dxdy-textPath-01-ref.svg
 skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-01.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
-skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-02.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
+skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) pref(svg.text.css-frames.enabled,false) == tspan-rotate-02.svg tspan-rotate-02.svg # Bug 629718 for random failure on WinXP # bug 773482
+skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) pref(svg.text.css-frames.enabled,true) == tspan-rotate-02.svg tspan-rotate-02-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
 skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-03.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
-skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-04.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
+skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) pref(svg.text.css-frames.enabled,false) == tspan-rotate-04.svg tspan-rotate-04.svg # Bug 629718 for random failure on WinXP # bug 773482
+skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) pref(svg.text.css-frames.enabled,true) == tspan-rotate-04.svg tspan-rotate-04-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
 random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-05.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP
 skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-06.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
+== tspan-rotate-07.svg tspan-rotate-07-ref.svg
 == tspan-rotate-textPath-01.svg tspan-rotate-textPath-01-ref.svg
 skip-if(B2G) == tspan-xy-01.svg tspan-xy-ref.svg # bug 773482
 skip-if(B2G) == tspan-xy-02.svg tspan-xy-ref.svg # bug 773482
diff --git a/layout/reftests/svg/tspan-rotate-02-ref.svg b/layout/reftests/svg/tspan-rotate-02-ref.svg
new file mode 100644
index 000000000000..54160f32363c
--- /dev/null
+++ b/layout/reftests/svg/tspan-rotate-02-ref.svg
@@ -0,0 +1,11 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Reference for tspan with ancestor rotate attribute</title>
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=333698 -->
+  <text x="50 100 150" y="20 40 80 60" rotate="90 90 90 90 90">abcdef</text>
+  <use xlink:href="tspan-xy-ref.svg#grid"/>
+</svg>
diff --git a/layout/reftests/svg/tspan-rotate-04-ref.svg b/layout/reftests/svg/tspan-rotate-04-ref.svg
new file mode 100644
index 000000000000..700b85dfb545
--- /dev/null
+++ b/layout/reftests/svg/tspan-rotate-04-ref.svg
@@ -0,0 +1,11 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Reference for tspan with ancestor rotate attribute</title>
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=333698 -->
+  <text x="50 100 150" y="20 40 80 60" rotate="90 45 45 180 180 180">abcdef</text>
+  <use xlink:href="tspan-xy-ref.svg#grid"/>
+</svg>
diff --git a/layout/reftests/svg/tspan-rotate-07-ref.svg b/layout/reftests/svg/tspan-rotate-07-ref.svg
new file mode 100644
index 000000000000..5494cda6c2c3
--- /dev/null
+++ b/layout/reftests/svg/tspan-rotate-07-ref.svg
@@ -0,0 +1,8 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=862158 -->
+  <text x="100" y="100" style="font: 32px sans-serif" rotate="45 0">A B</text>
+</svg>
diff --git a/layout/reftests/svg/tspan-rotate-07.svg b/layout/reftests/svg/tspan-rotate-07.svg
new file mode 100644
index 000000000000..83b1dbdde1eb
--- /dev/null
+++ b/layout/reftests/svg/tspan-rotate-07.svg
@@ -0,0 +1,8 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=862158 -->
+  <text x="100" y="100" style="font: 32px sans-serif"><tspan rotate="45">A </tspan>B</text>
+</svg>
diff --git a/layout/svg/nsSVGTextFrame2.cpp b/layout/svg/nsSVGTextFrame2.cpp
index f003a243cb0d..4f166f43058f 100644
--- a/layout/svg/nsSVGTextFrame2.cpp
+++ b/layout/svg/nsSVGTextFrame2.cpp
@@ -4673,11 +4673,7 @@ nsSVGTextFrame2::DoGlyphPositioning()
     }
     // Fill in unspecified rotation values.
     if (!mPositions[i].IsAngleSpecified()) {
-      mPositions[i].mAngle = mPositions[i - 1].mAngle;
-      if (mPositions[i].mAngle != 0.0f) {
-        // Any non-zero rotation must begin a run boundary.
-        mPositions[i].mRunBoundary = true;
-      }
+      mPositions[i].mAngle = 0.0f;
     }
   }
 

From e86ee52760133a7e019939d7d488322ecd8b3e4f Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 17 Apr 2013 14:21:06 +1200
Subject: [PATCH 085/438] Bug 844693 - Remove
 MacIOSurfaceImage::SetUpdateCallback. r=BenWa

---
 dom/plugins/base/nsPluginInstanceOwner.cpp | 34 +---------------------
 gfx/layers/ImageContainer.cpp              |  8 -----
 gfx/layers/ImageContainer.h                | 32 +-------------------
 gfx/layers/opengl/ImageLayerOGL.cpp        | 16 ----------
 layout/generic/nsObjectFrame.cpp           | 28 ++++--------------
 layout/generic/nsObjectFrame.h             |  2 --
 6 files changed, 7 insertions(+), 113 deletions(-)

diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index 4b1dcd71c366..66d94b20b22f 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -149,22 +149,6 @@ nsPluginInstanceOwner::NotifyPaintWaiter(nsDisplayListBuilder* aBuilder)
   }
 }
 
-#ifdef XP_MACOSX
-static void DrawPlugin(ImageContainer* aContainer, void* aPluginInstanceOwner)
-{
-  nsObjectFrame* frame = static_cast<nsPluginInstanceOwner*>(aPluginInstanceOwner)->GetFrame();
-  if (frame) {
-    frame->UpdateImageLayer(gfxRect(0,0,0,0));
-  }
-}
-
-static void OnDestroyImage(void* aPluginInstanceOwner)
-{
-  nsPluginInstanceOwner* owner = static_cast<nsPluginInstanceOwner*>(aPluginInstanceOwner);
-  NS_IF_RELEASE(owner);
-}
-#endif // XP_MACOSX
-
 already_AddRefed<ImageContainer>
 nsPluginInstanceOwner::GetImageContainer()
 {
@@ -206,22 +190,7 @@ nsPluginInstanceOwner::GetImageContainer()
 #endif
 
   mInstance->GetImageContainer(getter_AddRefs(container));
-  if (container) {
-#ifdef XP_MACOSX
-    AutoLockImage autoLock(container);
-    Image* image = autoLock.GetImage();
-    if (image && image->GetFormat() == MAC_IO_SURFACE && mObjectFrame) {
-      // With this drawing model, every call to
-      // nsIPluginInstance::GetImage() creates a new image.
-      MacIOSurfaceImage *oglImage = static_cast<MacIOSurfaceImage*>(image);
-      NS_ADDREF_THIS();
-      oglImage->SetUpdateCallback(&DrawPlugin, this);
-      oglImage->SetDestroyCallback(&OnDestroyImage);
-    }
-#endif
-    return container.forget();
-  }
-  return nullptr;
+  return container.forget();
 }
 
 void
@@ -634,7 +603,6 @@ NS_IMETHODIMP nsPluginInstanceOwner::InvalidateRect(NPRect *invalidRect)
 #if defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID)
   // Each time an asynchronously-drawing plugin sends a new surface to display,
   // the image in the ImageContainer is updated and InvalidateRect is called.
-  // MacIOSurfaceImages callbacks are attached here.
   // There are different side effects for (sync) Android plugins.
   nsRefPtr<ImageContainer> container;
   mInstance->GetImageContainer(getter_AddRefs(container));
diff --git a/gfx/layers/ImageContainer.cpp b/gfx/layers/ImageContainer.cpp
index a4d8bdd640df..95cd6215c2f2 100644
--- a/gfx/layers/ImageContainer.cpp
+++ b/gfx/layers/ImageContainer.cpp
@@ -569,14 +569,6 @@ MacIOSurfaceImage::GetAsSurface()
 
   return imgSurface.forget();
 }
-
-void
-MacIOSurfaceImage::Update(ImageContainer* aContainer)
-{
-  if (mUpdateCallback) {
-    mUpdateCallback(aContainer, mPluginInstanceOwner);
-  }
-}
 #endif
 
 already_AddRefed<gfxASurface>
diff --git a/gfx/layers/ImageContainer.h b/gfx/layers/ImageContainer.h
index 91adc2f7e02c..13c77b4d23aa 100644
--- a/gfx/layers/ImageContainer.h
+++ b/gfx/layers/ImageContainer.h
@@ -806,17 +806,10 @@ public:
   MacIOSurfaceImage()
     : Image(NULL, MAC_IO_SURFACE)
     , mSize(0, 0)
-    , mPluginInstanceOwner(NULL)
-    , mUpdateCallback(NULL)
-    , mDestroyCallback(NULL)
     {}
 
   virtual ~MacIOSurfaceImage()
-  {
-    if (mDestroyCallback) {
-      mDestroyCallback(mPluginInstanceOwner);
-    }
-  }
+  { }
 
  /**
   * This can only be called on the main thread. It may add a reference
@@ -825,24 +818,6 @@ public:
   */
   virtual void SetData(const Data& aData);
 
-  /**
-   * Temporary hacks to force plugin drawing during an empty transaction.
-   * This should not be used for anything else, and will be removed
-   * when async plugin rendering is complete.
-   */
-  typedef void (*UpdateSurfaceCallback)(ImageContainer* aContainer, void* aInstanceOwner);
-  virtual void SetUpdateCallback(UpdateSurfaceCallback aCallback, void* aInstanceOwner)
-  {
-    mUpdateCallback = aCallback;
-    mPluginInstanceOwner = aInstanceOwner;
-  }
-
-  typedef void (*DestroyCallback)(void* aInstanceOwner);
-  virtual void SetDestroyCallback(DestroyCallback aCallback)
-  {
-    mDestroyCallback = aCallback;
-  }
-
   virtual gfxIntSize GetSize()
   {
     return mSize;
@@ -853,16 +828,11 @@ public:
     return mIOSurface;
   }
 
-  void Update(ImageContainer* aContainer);
-
   virtual already_AddRefed<gfxASurface> GetAsSurface();
 
 private:
   gfxIntSize mSize;
   RefPtr<MacIOSurface> mIOSurface;
-  void* mPluginInstanceOwner;
-  UpdateSurfaceCallback mUpdateCallback;
-  DestroyCallback mDestroyCallback;
 };
 #endif
 
diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp
index d9879e93201d..7db0aec4f6a6 100644
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -348,22 +348,6 @@ ImageLayerOGL::RenderLayer(int,
      MacIOSurfaceImage *ioImage =
        static_cast<MacIOSurfaceImage*>(image);
 
-     if (!mOGLManager->GetThebesLayerCallback()) {
-       // If its an empty transaction we still need to update
-       // the plugin IO Surface and make sure we grab the
-       // new image
-       ioImage->Update(GetContainer());
-       image = nullptr;
-       autoLock.Refresh();
-       image = autoLock.GetImage();
-       gl()->MakeCurrent();
-       ioImage = static_cast<MacIOSurfaceImage*>(image);
-     }
-
-     if (!ioImage) {
-       return;
-     }
-
      gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
 
      if (!ioImage->GetBackendData(LAYERS_OPENGL)) {
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index bc8b5cfe71e5..ab8753624cf9 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1534,20 +1534,6 @@ nsObjectFrame::GetPaintedRect(nsDisplayPlugin* aItem)
   return r;
 }
 
-void
-nsObjectFrame::UpdateImageLayer(const gfxRect& aRect)
-{
-  if (!mInstanceOwner) {
-    return;
-  }
-
-#ifdef XP_MACOSX
-  if (!mInstanceOwner->UseAsyncRendering()) {
-    mInstanceOwner->DoCocoaEventDrawRect(aRect, nullptr);
-  }
-#endif
-}
-
 LayerState
 nsObjectFrame::GetLayerState(nsDisplayListBuilder* aBuilder,
                              LayerManager* aManager)
@@ -1555,14 +1541,6 @@ nsObjectFrame::GetLayerState(nsDisplayListBuilder* aBuilder,
   if (!mInstanceOwner)
     return LAYER_NONE;
 
-#ifdef XP_MACOSX
-  if (!mInstanceOwner->UseAsyncRendering() &&
-      mInstanceOwner->IsRemoteDrawingCoreAnimation() &&
-      mInstanceOwner->GetEventModel() == NPEventModelCocoa) {
-    return LAYER_ACTIVE;
-  }
-#endif
-
 #ifdef MOZ_WIDGET_ANDROID
   // We always want a layer on Honeycomb and later
   if (AndroidBridge::Bridge()->GetAPIVersion() >= 11)
@@ -1626,7 +1604,11 @@ nsObjectFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
 
     NS_ASSERTION(layer->GetType() == Layer::TYPE_IMAGE, "Bad layer type");
     ImageLayer* imglayer = static_cast<ImageLayer*>(layer.get());
-    UpdateImageLayer(r);
+#ifdef XP_MACOSX
+    if (!mInstanceOwner->UseAsyncRendering()) {
+      mInstanceOwner->DoCocoaEventDrawRect(r, nullptr);
+    }
+#endif
 
     imglayer->SetScaleToSize(size, ImageLayer::SCALE_STRETCH);
     imglayer->SetContainer(container);
diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h
index 4d3f4b44e640..c5a7ded5da6b 100644
--- a/layout/generic/nsObjectFrame.h
+++ b/layout/generic/nsObjectFrame.h
@@ -159,8 +159,6 @@ public:
   virtual bool ReflowFinished() MOZ_OVERRIDE;
   virtual void ReflowCallbackCanceled() MOZ_OVERRIDE;
 
-  void UpdateImageLayer(const gfxRect& aRect);
-
   /**
    * Builds either an ImageLayer or a ReadbackLayer, depending on the type
    * of aItem (TYPE_PLUGIN or TYPE_PLUGIN_READBACK respectively).

From ca690f5eec98b91549d03f29ec55d98b6a619b53 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 17 Apr 2013 14:21:06 +1200
Subject: [PATCH 086/438] Bug 860615 - Add CreateSharedHandle to
 GLContextProvider so we can create one without a GLContext. r=jgilbert

---
 gfx/gl/GLContext.h               |  5 -----
 gfx/gl/GLContextProviderCGL.mm   |  8 ++++++++
 gfx/gl/GLContextProviderEGL.cpp  | 34 ++++++++------------------------
 gfx/gl/GLContextProviderGLX.cpp  |  8 ++++++++
 gfx/gl/GLContextProviderImpl.h   | 10 ++++++++++
 gfx/gl/GLContextProviderNull.cpp |  8 ++++++++
 gfx/gl/GLContextProviderWGL.cpp  |  8 ++++++++
 7 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 0f2aea62ff8a..a658b3de4413 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -442,11 +442,6 @@ public:
 #endif
     };
 
-    /**
-     * Create new shared GLContext content handle, must be released by ReleaseSharedHandle.
-     */
-    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType)
-    { return 0; }
     /*
      * Create a new shared GLContext content handle, using the passed buffer as a source.
      * Must be released by ReleaseSharedHandle. UpdateSharedHandle will have no effect
diff --git a/gfx/gl/GLContextProviderCGL.mm b/gfx/gl/GLContextProviderCGL.mm
index a44073c83de5..a2307f4d13f7 100644
--- a/gfx/gl/GLContextProviderCGL.mm
+++ b/gfx/gl/GLContextProviderCGL.mm
@@ -414,6 +414,14 @@ GLContextProviderCGL::GetGlobalContext(const ContextFlags)
     return gGlobalContext;
 }
 
+SharedTextureHandle
+GLContextProviderCGL::CreateSharedHandle(GLContext::SharedTextureShareType shareType,
+                                         void* buffer,
+                                         GLContext::SharedTextureBufferType bufferType)
+{
+    return 0;
+}
+
 void
 GLContextProviderCGL::Shutdown()
 {
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index e7953e9942c9..eeb3725b927f 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -665,7 +665,6 @@ public:
         return sEGLLibrary.HasKHRLockSurface();
     }
 
-    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType);
     virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType,
                                                    void* buffer,
                                                    SharedTextureBufferType bufferType);
@@ -909,31 +908,6 @@ GLContextEGL::UpdateSharedHandle(SharedTextureShareType shareType,
     wrap->MakeSync(this);
 }
 
-SharedTextureHandle
-GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType)
-{
-    if (shareType != SameProcess)
-        return 0;
-
-    if (!mShareWithEGLImage)
-        return 0;
-
-    MakeCurrent();
-    mTemporaryEGLImageTexture = CreateTextureForOffscreen(GetGLFormats(), OffscreenSize());
-
-    EGLTextureWrapper* tex = new EGLTextureWrapper();
-    bool ok = tex->CreateEGLImage(this, mTemporaryEGLImageTexture);
-
-    if (!ok) {
-        NS_ERROR("EGLImage creation for EGLTextureWrapper failed");
-        ReleaseSharedHandle(shareType, (SharedTextureHandle)tex);
-        return 0;
-    }
-
-    // Raw pointer shared across threads
-    return (SharedTextureHandle)tex;
-}
-
 SharedTextureHandle
 GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType,
                                  void* buffer,
@@ -2364,6 +2338,14 @@ GLContextProviderEGL::CreateOffscreen(const gfxIntSize& size,
     return glContext.forget();
 }
 
+SharedTextureHandle
+GLContextProviderEGL::CreateSharedHandle(GLContext::SharedTextureShareType shareType,
+                                         void* buffer,
+                                         GLContext::SharedTextureBufferType bufferType)
+{
+  return 0;
+}
+
 // Don't want a global context on Android as 1) share groups across 2 threads fail on many Tegra drivers (bug 759225)
 // and 2) some mobile devices have a very strict limit on global number of GL contexts (bug 754257)
 // and 3) each EGL context eats 750k on B2G (bug 813783)
diff --git a/gfx/gl/GLContextProviderGLX.cpp b/gfx/gl/GLContextProviderGLX.cpp
index 3ff453696dff..04e965eb8aa0 100644
--- a/gfx/gl/GLContextProviderGLX.cpp
+++ b/gfx/gl/GLContextProviderGLX.cpp
@@ -1415,6 +1415,14 @@ GLContextProviderGLX::CreateOffscreen(const gfxIntSize& size,
     return glContext.forget();
 }
 
+SharedTextureHandle
+GLContextProviderGLX::CreateSharedHandle(GLContext::SharedTextureShareType shareType,
+                                         void* buffer,
+                                         GLContext::SharedTextureBufferType bufferType)
+{
+  return 0;
+}
+
 static nsRefPtr<GLContext> gGlobalContext[GLXLibrary::LIBS_MAX];
 // TODO move that out of static initializaion
 static bool gUseContextSharing = getenv("MOZ_DISABLE_CONTEXT_SHARING_GLX") == 0;
diff --git a/gfx/gl/GLContextProviderImpl.h b/gfx/gl/GLContextProviderImpl.h
index 52657caacd41..cef25676d55d 100644
--- a/gfx/gl/GLContextProviderImpl.h
+++ b/gfx/gl/GLContextProviderImpl.h
@@ -68,6 +68,16 @@ public:
      */
     static GLContext*
     GetGlobalContext(ContextFlags flags = GLContext::ContextFlagsNone);
+    
+    /*
+     * Create a new shared GLContext content handle, using the passed buffer as a source.
+     * Must be released by ReleaseSharedHandle. UpdateSharedHandle will have no effect
+     * on handles created with this method, as the caller owns the source (the passed buffer)
+     * and is responsible for updating it accordingly.
+     */
+    static SharedTextureHandle CreateSharedHandle(GLContext::SharedTextureShareType shareType,
+                                                  void* buffer,
+                                                  GLContext::SharedTextureBufferType bufferType);
 
     /**
      * Free any resources held by this Context Provider.
diff --git a/gfx/gl/GLContextProviderNull.cpp b/gfx/gl/GLContextProviderNull.cpp
index 1d8f8e31553b..7183544b156e 100644
--- a/gfx/gl/GLContextProviderNull.cpp
+++ b/gfx/gl/GLContextProviderNull.cpp
@@ -22,6 +22,14 @@ GLContextProviderNull::CreateOffscreen(const gfxIntSize&,
     return nullptr;
 }
 
+SharedTextureHandle
+GLContextProviderNull::CreateSharedHandle(GLContext::SharedTextureShareType shareType,
+                                          void* buffer,
+                                          GLContext::SharedTextureBufferType bufferType)
+{
+  return 0;
+}
+
 GLContext*
 GLContextProviderNull::GetGlobalContext(ContextFlags)
 {
diff --git a/gfx/gl/GLContextProviderWGL.cpp b/gfx/gl/GLContextProviderWGL.cpp
index 34c51876d081..e881b752eb09 100644
--- a/gfx/gl/GLContextProviderWGL.cpp
+++ b/gfx/gl/GLContextProviderWGL.cpp
@@ -687,6 +687,14 @@ GLContextProviderWGL::CreateOffscreen(const gfxIntSize& size,
     return glContext.forget();
 }
 
+SharedTextureHandle
+GLContextProviderWGL::CreateSharedHandle(GLContext::SharedTextureShareType shareType,
+                                         void* buffer,
+                                         GLContext::SharedTextureBufferType bufferType)
+{
+  return 0;
+}
+
 static nsRefPtr<GLContextWGL> gGlobalContext[WGLLibrary::LIBS_MAX];
 
 GLContext *

From 26c10d73faa8817b5e6f9aa997a1014100ce7070 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 17 Apr 2013 14:21:06 +1200
Subject: [PATCH 087/438] Bug 860615 - Add SharedTextureHandle support to
 GLContextCGL. r=jgilbert

---
 gfx/gl/GLContext.h             |  3 +++
 gfx/gl/GLContextProviderCGL.mm | 44 +++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index a658b3de4413..44a27192c9be 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -439,6 +439,9 @@ public:
         TextureID
 #ifdef MOZ_WIDGET_ANDROID
         , SurfaceTexture
+#endif
+#ifdef XP_MACOSX
+        , IOSurface
 #endif
     };
 
diff --git a/gfx/gl/GLContextProviderCGL.mm b/gfx/gl/GLContextProviderCGL.mm
index a2307f4d13f7..8e3a03110f03 100644
--- a/gfx/gl/GLContextProviderCGL.mm
+++ b/gfx/gl/GLContextProviderCGL.mm
@@ -17,6 +17,7 @@
 #include "prenv.h"
 #include "mozilla/Preferences.h"
 #include "GeckoProfiler.h"
+#include "mozilla/gfx/MacIOSurface.h"
 
 using namespace mozilla::gfx;
 
@@ -177,6 +178,39 @@ public:
                             GLContext* aContext,
                             TextureImage::Flags aFlags = TextureImage::NoFlags);
 
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType,
+                                                   void* buffer,
+                                                   SharedTextureBufferType bufferType)
+    {
+        return GLContextProviderCGL::CreateSharedHandle(shareType, buffer, bufferType);
+    }
+
+    virtual void ReleaseSharedHandle(SharedTextureShareType shareType,
+                                     SharedTextureHandle sharedHandle)
+    {
+        if (sharedHandle) {
+            reinterpret_cast<MacIOSurface*>(sharedHandle)->Release();
+        }
+    }
+
+    virtual bool GetSharedHandleDetails(SharedTextureShareType shareType,
+                                        SharedTextureHandle sharedHandle,
+                                        SharedHandleDetails& details)
+    {
+        details.mTarget = LOCAL_GL_TEXTURE_RECTANGLE_ARB;
+        details.mProgramType = RGBARectLayerProgramType;
+        return true;
+    }
+
+    virtual bool AttachSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle)
+    {
+        MacIOSurface* surf = reinterpret_cast<MacIOSurface*>(sharedHandle);
+        surf->CGLTexImageIOSurface2D(mContext, LOCAL_GL_RGBA, LOCAL_GL_BGRA,
+                                     LOCAL_GL_UNSIGNED_INT_8_8_8_8_REV, 0);
+        return true;
+    }
+
     NSOpenGLContext *mContext;
     GLuint mTempTextureName;
 };
@@ -419,7 +453,15 @@ GLContextProviderCGL::CreateSharedHandle(GLContext::SharedTextureShareType share
                                          void* buffer,
                                          GLContext::SharedTextureBufferType bufferType)
 {
-    return 0;
+    if (shareType != GLContext::SameProcess ||
+        bufferType != GLContext::IOSurface) {
+        return 0;
+    }
+
+    MacIOSurface* surf = static_cast<MacIOSurface*>(buffer);
+    surf->AddRef();
+
+    return (SharedTextureHandle)surf;
 }
 
 void

From 0d81d85a4b828e39681d480dfbea917fc2fefe43 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 17 Apr 2013 14:21:06 +1200
Subject: [PATCH 088/438] Bug 860615 - Add SharedTextureHandle support to
 ImageLayerOGL. r=BenWa

---
 gfx/layers/opengl/ImageLayerOGL.cpp | 71 +++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 5 deletions(-)

diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp
index 7db0aec4f6a6..7a0e06cc0911 100644
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -17,6 +17,7 @@
 # include "GLXLibrary.h"
 # include "gfxXlibSurface.h"
 #endif
+#include "SharedTextureImage.h"
 
 #ifdef MOZ_WIDGET_ANDROID
 #include "nsSurfaceTexture.h"
@@ -154,7 +155,7 @@ TextureRecycleBin::GetTexture(TextureType aType, const gfxIntSize& aSize,
   mRecycledTextures[aType].RemoveElementAt(last);
 }
 
-struct THEBES_API MacIOSurfaceImageOGLBackendData : public ImageBackendData
+struct THEBES_API ImageOGLBackendData : public ImageBackendData
 {
   GLTexture mTexture;
 };
@@ -163,8 +164,8 @@ struct THEBES_API MacIOSurfaceImageOGLBackendData : public ImageBackendData
 void
 AllocateTextureIOSurface(MacIOSurfaceImage *aIOImage, mozilla::gl::GLContext* aGL)
 {
-  nsAutoPtr<MacIOSurfaceImageOGLBackendData> backendData(
-    new MacIOSurfaceImageOGLBackendData);
+  nsAutoPtr<ImageOGLBackendData> backendData(
+    new ImageOGLBackendData);
 
   backendData->mTexture.Allocate(aGL);
   aGL->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, backendData->mTexture.GetTextureID());
@@ -187,6 +188,23 @@ AllocateTextureIOSurface(MacIOSurfaceImage *aIOImage, mozilla::gl::GLContext* aG
 }
 #endif
 
+void
+AllocateTextureSharedTexture(SharedTextureImage *aTexImage, mozilla::gl::GLContext* aGL, GLenum aTarget)
+{
+  nsAutoPtr<ImageOGLBackendData> backendData(
+    new ImageOGLBackendData);
+
+  backendData->mTexture.Allocate(aGL);
+
+  aGL->fBindTexture(aTarget, backendData->mTexture.GetTextureID());
+  aGL->fTexParameteri(aTarget, LOCAL_GL_TEXTURE_MIN_FILTER, LOCAL_GL_LINEAR);
+  aGL->fTexParameteri(aTarget, LOCAL_GL_TEXTURE_MAG_FILTER, LOCAL_GL_LINEAR);
+  aGL->fTexParameteri(aTarget, LOCAL_GL_TEXTURE_WRAP_S, LOCAL_GL_CLAMP_TO_EDGE);
+  aGL->fTexParameteri(aTarget, LOCAL_GL_TEXTURE_WRAP_T, LOCAL_GL_CLAMP_TO_EDGE);
+
+  aTexImage->SetBackendData(LAYERS_OPENGL, backendData.forget());
+}
+
 #ifdef MOZ_WIDGET_GONK
 struct THEBES_API GonkIOSurfaceImageOGLBackendData : public ImageBackendData
 {
@@ -354,8 +372,8 @@ ImageLayerOGL::RenderLayer(int,
        AllocateTextureIOSurface(ioImage, gl());
      }
 
-     MacIOSurfaceImageOGLBackendData *data =
-      static_cast<MacIOSurfaceImageOGLBackendData*>(ioImage->GetBackendData(LAYERS_OPENGL));
+     ImageOGLBackendData *data =
+      static_cast<ImageOGLBackendData*>(ioImage->GetBackendData(LAYERS_OPENGL));
 
      gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
      gl()->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, data->mTexture.GetTextureID());
@@ -383,6 +401,49 @@ ImageLayerOGL::RenderLayer(int,
      mOGLManager->BindAndDrawQuad(program);
      gl()->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, 0);
 #endif
+  } else if (image->GetFormat() == SHARED_TEXTURE) {
+    SharedTextureImage* texImage =
+      static_cast<SharedTextureImage*>(image);
+    const SharedTextureImage::Data* data = texImage->GetData();
+    GLContext::SharedHandleDetails handleDetails;
+    if (!gl()->GetSharedHandleDetails(data->mShareType, data->mHandle, handleDetails)) {
+      NS_ERROR("Failed to get shared handle details");
+      return;
+    }
+
+    ShaderProgramOGL* program = mOGLManager->GetProgram(handleDetails.mProgramType, GetMaskLayer());
+
+    program->Activate();
+    if (handleDetails.mProgramType == gl::RGBARectLayerProgramType) {
+      // 2DRect case, get the multiplier right for a sampler2DRect
+      program->SetTexCoordMultiplier(data->mSize.width, data->mSize.height);
+    }
+    program->SetLayerTransform(GetEffectiveTransform());
+    program->SetLayerOpacity(GetEffectiveOpacity());
+    program->SetRenderOffset(aOffset);
+    program->SetTextureUnit(0);
+    program->SetTextureTransform(handleDetails.mTextureTransform);
+    program->LoadMask(GetMaskLayer());
+
+    if (!texImage->GetBackendData(LAYERS_OPENGL)) {
+      AllocateTextureSharedTexture(texImage, gl(), handleDetails.mTarget);
+    }
+
+    ImageOGLBackendData *backendData =
+      static_cast<ImageOGLBackendData*>(texImage->GetBackendData(LAYERS_OPENGL));
+    gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
+    gl()->fBindTexture(handleDetails.mTarget, backendData->mTexture.GetTextureID());
+
+    if (!gl()->AttachSharedHandle(data->mShareType, data->mHandle)) {
+      NS_ERROR("Failed to bind shared texture handle");
+      return;
+    }
+
+    gl()->ApplyFilterToBoundTexture(handleDetails.mTarget, mFilter);
+    program->SetLayerQuadRect(nsIntRect(nsIntPoint(0, 0), data->mSize));
+    mOGLManager->BindAndDrawQuad(program, data->mInverted);
+    gl()->fBindTexture(handleDetails.mTarget, 0);
+    gl()->DetachSharedHandle(data->mShareType, data->mHandle);
 #ifdef MOZ_WIDGET_GONK
   } else if (image->GetFormat() == GONK_IO_SURFACE) {
 

From a8572d46e2aed1bbae5624a52ceca56e25709fd1 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 17 Apr 2013 14:21:07 +1200
Subject: [PATCH 089/438] Bug 860615 - Use SharedTextureHandle for plugins on
 OSX. r=BenWa

---
 dom/plugins/ipc/PluginInstanceParent.cpp | 26 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp
index bb7f60fbe331..0f595457123f 100644
--- a/dom/plugins/ipc/PluginInstanceParent.cpp
+++ b/dom/plugins/ipc/PluginInstanceParent.cpp
@@ -28,6 +28,9 @@
 #include "gfxUtils.h"
 #include "nsNPAPIPluginInstance.h"
 #include "Layers.h"
+#include "SharedTextureImage.h"
+#include "GLContext.h"
+#include "GLContextProvider.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
@@ -47,6 +50,7 @@ extern const PRUnichar* kFlashFullscreenClass;
 
 using namespace mozilla::plugins;
 using namespace mozilla::layers;
+using namespace mozilla::gl;
 
 bool
 StreamNotifyParent::RecvRedirectNotifyResponse(const bool& allow)
@@ -739,18 +743,26 @@ PluginInstanceParent::GetImageContainer(ImageContainer** aContainer)
 
 #ifdef XP_MACOSX
     if (ioSurface) {
-        ImageFormat format = MAC_IO_SURFACE;
+        ImageFormat format = SHARED_TEXTURE;
         nsRefPtr<Image> image = container->CreateImage(&format, 1);
         if (!image) {
             return NS_ERROR_FAILURE;
         }
 
-        NS_ASSERTION(image->GetFormat() == MAC_IO_SURFACE, "Wrong format?");
-        MacIOSurfaceImage* ioImage = static_cast<MacIOSurfaceImage*>(image.get());
-        MacIOSurfaceImage::Data ioData;
-        ioData.mIOSurface = ioSurface;
-        ioImage->SetData(ioData);
-        container->SetCurrentImageInTransaction(ioImage);
+        NS_ASSERTION(image->GetFormat() == SHARED_TEXTURE, "Wrong format?");
+
+        SharedTextureImage::Data data;
+        data.mShareType = GLContext::SameProcess;
+        data.mHandle = GLContextProviderCGL::CreateSharedHandle(data.mShareType,
+                                                                ioSurface,
+                                                                GLContext::IOSurface);
+        data.mInverted = false;
+        data.mSize = gfxIntSize(ioSurface->GetWidth(), ioSurface->GetHeight());
+
+        SharedTextureImage* pluginImage = static_cast<SharedTextureImage*>(image.get());
+        pluginImage->SetData(data);
+
+        container->SetCurrentImageInTransaction(pluginImage);
 
         NS_IF_ADDREF(container);
         *aContainer = container;

From 7702f1de96caabdc3b64df5879cec07829af9a98 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 17 Apr 2013 14:21:07 +1200
Subject: [PATCH 090/438] Bug 860615 - Remove MacIOSurfaceImage. r=BenWa

---
 gfx/layers/ImageContainer.cpp       | 38 ----------------
 gfx/layers/ImageContainer.h         | 44 -------------------
 gfx/layers/ImageTypes.h             |  7 ---
 gfx/layers/opengl/ImageLayerOGL.cpp | 68 -----------------------------
 4 files changed, 157 deletions(-)

diff --git a/gfx/layers/ImageContainer.cpp b/gfx/layers/ImageContainer.cpp
index 95cd6215c2f2..9dda1a744da3 100644
--- a/gfx/layers/ImageContainer.cpp
+++ b/gfx/layers/ImageContainer.cpp
@@ -70,12 +70,6 @@ ImageFactory::CreateImage(const ImageFormat *aFormats,
     img = new SharedTextureImage();
     return img.forget();
   }
-#ifdef XP_MACOSX
-  if (FormatInList(aFormats, aNumFormats, MAC_IO_SURFACE)) {
-    img = new MacIOSurfaceImage();
-    return img.forget();
-  }
-#endif
 #ifdef MOZ_WIDGET_GONK
   if (FormatInList(aFormats, aNumFormats, GONK_IO_SURFACE)) {
     img = new GonkIOSurfaceImage();
@@ -539,38 +533,6 @@ PlanarYCbCrImage::GetAsSurface()
   return imageSurface.forget().get();
 }
 
-#ifdef XP_MACOSX
-void
-MacIOSurfaceImage::SetData(const Data& aData)
-{
-  mIOSurface = MacIOSurface::LookupSurface(aData.mIOSurface->GetIOSurfaceID());
-  mSize = gfxIntSize(mIOSurface->GetWidth(), mIOSurface->GetHeight());
-}
-
-already_AddRefed<gfxASurface>
-MacIOSurfaceImage::GetAsSurface()
-{
-  mIOSurface->Lock();
-  size_t bytesPerRow = mIOSurface->GetBytesPerRow();
-  size_t ioWidth = mIOSurface->GetWidth();
-  size_t ioHeight = mIOSurface->GetHeight();
-
-  unsigned char* ioData = (unsigned char*)mIOSurface->GetBaseAddress();
-
-  nsRefPtr<gfxImageSurface> imgSurface =
-    new gfxImageSurface(gfxIntSize(ioWidth, ioHeight), gfxASurface::ImageFormatARGB32);
-
-  for (int i = 0; i < ioHeight; i++) {
-    memcpy(imgSurface->Data() + i * imgSurface->Stride(),
-           ioData + i * bytesPerRow, ioWidth * 4);
-  }
-
-  mIOSurface->Unlock();
-
-  return imgSurface.forget();
-}
-#endif
-
 already_AddRefed<gfxASurface>
 RemoteBitmapImage::GetAsSurface()
 {
diff --git a/gfx/layers/ImageContainer.h b/gfx/layers/ImageContainer.h
index 13c77b4d23aa..0de5d3ba5eca 100644
--- a/gfx/layers/ImageContainer.h
+++ b/gfx/layers/ImageContainer.h
@@ -20,10 +20,6 @@ struct ID3D10Device;
 struct ID3D10ShaderResourceView;
 #endif
 
-#ifdef XP_MACOSX
-#include "mozilla/gfx/MacIOSurface.h"
-#endif
-
 #ifdef MOZ_WIDGET_GONK
 # include <ui/GraphicBuffer.h>
 #endif
@@ -796,46 +792,6 @@ public:
   gfxIntSize mSize;
 };
 
-#ifdef XP_MACOSX
-class THEBES_API MacIOSurfaceImage : public Image {
-public:
-  struct Data {
-    MacIOSurface* mIOSurface;
-  };
-
-  MacIOSurfaceImage()
-    : Image(NULL, MAC_IO_SURFACE)
-    , mSize(0, 0)
-    {}
-
-  virtual ~MacIOSurfaceImage()
-  { }
-
- /**
-  * This can only be called on the main thread. It may add a reference
-  * to the surface (which will eventually be released on the main thread).
-  * The surface must not be modified after this call!!!
-  */
-  virtual void SetData(const Data& aData);
-
-  virtual gfxIntSize GetSize()
-  {
-    return mSize;
-  }
-
-  MacIOSurface* GetIOSurface()
-  {
-    return mIOSurface;
-  }
-
-  virtual already_AddRefed<gfxASurface> GetAsSurface();
-
-private:
-  gfxIntSize mSize;
-  RefPtr<MacIOSurface> mIOSurface;
-};
-#endif
-
 class RemoteBitmapImage : public Image {
 public:
   RemoteBitmapImage() : Image(NULL, REMOTE_IMAGE_BITMAP) {}
diff --git a/gfx/layers/ImageTypes.h b/gfx/layers/ImageTypes.h
index 4791365fe43f..b9c3006e0c78 100644
--- a/gfx/layers/ImageTypes.h
+++ b/gfx/layers/ImageTypes.h
@@ -45,13 +45,6 @@ enum ImageFormat {
    */
   CAIRO_SURFACE,
 
-  /**
-   * The MAC_IO_SURFACE format creates a MacIOSurfaceImage.
-   *
-   * It wraps an IOSurface object and binds it directly to a GL texture.
-   */
-  MAC_IO_SURFACE,
-
   /**
    * The GONK_IO_SURFACE format creates a GonkIOSurfaceImage.
    *
diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp
index 7a0e06cc0911..52ac148c6cd1 100644
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -160,34 +160,6 @@ struct THEBES_API ImageOGLBackendData : public ImageBackendData
   GLTexture mTexture;
 };
 
-#ifdef XP_MACOSX
-void
-AllocateTextureIOSurface(MacIOSurfaceImage *aIOImage, mozilla::gl::GLContext* aGL)
-{
-  nsAutoPtr<ImageOGLBackendData> backendData(
-    new ImageOGLBackendData);
-
-  backendData->mTexture.Allocate(aGL);
-  aGL->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, backendData->mTexture.GetTextureID());
-  aGL->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
-                     LOCAL_GL_TEXTURE_MIN_FILTER,
-                     LOCAL_GL_NEAREST);
-  aGL->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
-                     LOCAL_GL_TEXTURE_MAG_FILTER,
-                     LOCAL_GL_NEAREST);
-
-  void *nativeCtx = aGL->GetNativeData(GLContext::NativeGLContext);
-
-  aIOImage->GetIOSurface()->CGLTexImageIOSurface2D(nativeCtx,
-                                     LOCAL_GL_RGBA, LOCAL_GL_BGRA,
-                                     LOCAL_GL_UNSIGNED_INT_8_8_8_8_REV, 0);
-
-  aGL->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, 0);
-
-  aIOImage->SetBackendData(LAYERS_OPENGL, backendData.forget());
-}
-#endif
-
 void
 AllocateTextureSharedTexture(SharedTextureImage *aTexImage, mozilla::gl::GLContext* aGL, GLenum aTarget)
 {
@@ -361,46 +333,6 @@ ImageLayerOGL::RenderLayer(int,
     program->LoadMask(GetMaskLayer());
 
     mOGLManager->BindAndDrawQuad(program);
-#ifdef XP_MACOSX
-  } else if (image->GetFormat() == MAC_IO_SURFACE) {
-     MacIOSurfaceImage *ioImage =
-       static_cast<MacIOSurfaceImage*>(image);
-
-     gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
-
-     if (!ioImage->GetBackendData(LAYERS_OPENGL)) {
-       AllocateTextureIOSurface(ioImage, gl());
-     }
-
-     ImageOGLBackendData *data =
-      static_cast<ImageOGLBackendData*>(ioImage->GetBackendData(LAYERS_OPENGL));
-
-     gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
-     gl()->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, data->mTexture.GetTextureID());
-
-     ShaderProgramOGL *program =
-       mOGLManager->GetProgram(gl::RGBARectLayerProgramType, GetMaskLayer());
-
-     program->Activate();
-     if (program->GetTexCoordMultiplierUniformLocation() != -1) {
-       // 2DRect case, get the multiplier right for a sampler2DRect
-       program->SetTexCoordMultiplier(ioImage->GetSize().width, ioImage->GetSize().height);
-     } else {
-       NS_ASSERTION(0, "no rects?");
-     }
-
-     program->SetLayerQuadRect(nsIntRect(0, 0,
-                                         ioImage->GetSize().width,
-                                         ioImage->GetSize().height));
-     program->SetLayerTransform(GetEffectiveTransform());
-     program->SetLayerOpacity(GetEffectiveOpacity());
-     program->SetRenderOffset(aOffset);
-     program->SetTextureUnit(0);
-     program->LoadMask(GetMaskLayer());
-
-     mOGLManager->BindAndDrawQuad(program);
-     gl()->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, 0);
-#endif
   } else if (image->GetFormat() == SHARED_TEXTURE) {
     SharedTextureImage* texImage =
       static_cast<SharedTextureImage*>(image);

From df473e9155a00bbfa0421c0e496bb3b67ad51533 Mon Sep 17 00:00:00 2001
From: EKR <ekr@rtfm.com>
Date: Tue, 16 Apr 2013 19:29:23 -0700
Subject: [PATCH 091/438] Bug 856433 - Allow cancellation of nonexistent
 nrappkit timers off the STS thread. r=abr

---
 media/mtransport/nr_timer.cpp          |  7 +++++--
 media/mtransport/test/ice_unittest.cpp | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/media/mtransport/nr_timer.cpp b/media/mtransport/nr_timer.cpp
index 4517ddb126d5..16e72633810b 100644
--- a/media/mtransport/nr_timer.cpp
+++ b/media/mtransport/nr_timer.cpp
@@ -155,11 +155,14 @@ int NR_async_schedule(NR_async_cb cb, void *arg, char *func, int l) {
 }
 
 int NR_async_timer_cancel(void *handle) {
-  CheckSTSThread();
-
+  // Check for the handle being nonzero because sometimes we get
+  // no-op cancels that aren't on the STS thread. This can be
+  // non-racy as long as the upper-level code is careful.
   if (!handle)
     return 0;
 
+  CheckSTSThread();
+
   nsITimer *timer = static_cast<nsITimer *>(handle);
 
   timer->Cancel();
diff --git a/media/mtransport/test/ice_unittest.cpp b/media/mtransport/test/ice_unittest.cpp
index 3721c507aefe..092be8a436f1 100644
--- a/media/mtransport/test/ice_unittest.cpp
+++ b/media/mtransport/test/ice_unittest.cpp
@@ -44,6 +44,8 @@ const std::string kDefaultStunServerHostname(
 const std::string kBogusStunServerHostname(
     (char *)"stun-server-nonexistent.invalid");
 const uint16_t kDefaultStunServerPort=3478;
+const std::string kBogusIceCandidate(
+    (char *)"candidate:0 2 UDP 2113601790 192.168.178.20 50769 typ");
 
 std::string g_turn_server;
 std::string g_turn_user;
@@ -310,6 +312,14 @@ class IceTestPeer : public sigslot::has_slots<> {
     candidate_filter_ = filter;
   }
 
+  // Allow us to parse candidates directly on the current thread.
+  void ParseCandidate(size_t i, const std::string& candidate) {
+    std::vector<std::string> attributes;
+
+    attributes.push_back(candidate);
+    streams_[i]->ParseAttributes(attributes);
+  }
+
  private:
   std::string name_;
   nsRefPtr<NrIceCtx> ice_ctx_;
@@ -504,6 +514,13 @@ TEST_F(IceGatherTest, TestGatherTurn) {
   Gather();
 }
 
+// Verify that a bogus candidate doesn't cause crashes on the
+// main thread. See bug 856433.
+TEST_F(IceGatherTest, TestBogusCandidate) {
+  Gather();
+  peer_->ParseCandidate(0, kBogusIceCandidate);
+}
+
 TEST_F(IceConnectTest, TestGather) {
   AddStream("first", 1);
   ASSERT_TRUE(Gather(true));

From 94e425874b60d89cc1796f77a843469f8ab021da Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Tue, 16 Apr 2013 23:58:09 -0400
Subject: [PATCH 092/438] Bug 862302: Don't lose reference to queued
 DataChannels when they open r=mcmanus

---
 content/base/src/nsDOMDataChannel.cpp    |  1 +
 netwerk/sctp/datachannel/DataChannel.cpp | 20 ++++++++++++++++----
 netwerk/sctp/datachannel/DataChannel.h   |  4 ++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/content/base/src/nsDOMDataChannel.cpp b/content/base/src/nsDOMDataChannel.cpp
index 4bcae7095fb2..43735d06155e 100644
--- a/content/base/src/nsDOMDataChannel.cpp
+++ b/content/base/src/nsDOMDataChannel.cpp
@@ -62,6 +62,7 @@ public:
     // Don't call us anymore!  Likely isn't an issue (or maybe just less of
     // one) once we block GC until all the (appropriate) onXxxx handlers
     // are dropped. (See WebRTC spec)
+    LOG(("Close()ing %p", mDataChannel.get()));
     mDataChannel->SetListener(nullptr, nullptr);
     mDataChannel->Close();
   }
diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp
index 56e0c8f22f70..3bb94a915dfc 100644
--- a/netwerk/sctp/datachannel/DataChannel.cpp
+++ b/netwerk/sctp/datachannel/DataChannel.cpp
@@ -584,6 +584,10 @@ DataChannelConnection::CompleteConnect(TransportFlow *flow, TransportLayer::Stat
 void
 DataChannelConnection::ProcessQueuedOpens()
 {
+  // The nsDeque holds channels with an AddRef applied.  Another reference
+  // (may) be held by the DOMDataChannel, unless it's been GC'd.  No other
+  // references should exist.
+
   // Can't copy nsDeque's.  Move into temp array since any that fail will
   // go back to mPending
   nsDeque temp;
@@ -593,11 +597,15 @@ DataChannelConnection::ProcessQueuedOpens()
   }
 
   nsRefPtr<DataChannel> channel;
+  // All these entries have an AddRef(); make that explicit now via the dont_AddRef()
   while (nullptr != (channel = dont_AddRef(static_cast<DataChannel *>(temp.PopFront())))) {
     if (channel->mFlags & DATA_CHANNEL_FLAGS_FINISH_OPEN) {
       LOG(("Processing queued open for %p (%u)", channel.get(), channel->mStream));
       channel->mFlags &= ~DATA_CHANNEL_FLAGS_FINISH_OPEN;
-      OpenFinish(channel.forget()); // may reset the flag and re-push
+      // OpenFinish returns a reference itself, so we need to take it can Release it
+      channel = OpenFinish(channel.forget()); // may reset the flag and re-push
+    } else {
+      NS_ASSERTION(false, "How did a DataChannel get queued without the FINISH_OPEN flag?");
     }
   }
 
@@ -1287,7 +1295,8 @@ DataChannelConnection::HandleMessage(const void *buffer, size_t length, uint32_t
 
   switch (ppid) {
     case DATA_CHANNEL_PPID_CONTROL:
-      NS_ENSURE_TRUE_VOID(length >= sizeof(*req));
+      // structure includes a possibly-unused char label[1] (in a packed structure)
+      NS_ENSURE_TRUE_VOID(length >= sizeof(*req) - 1);
 
       req = static_cast<const struct rtcweb_datachannel_open_request *>(buffer);
       switch (req->msg_type) {
@@ -1859,7 +1868,9 @@ DataChannelConnection::Open(const nsACString& label, const nsACString& protocol,
 already_AddRefed<DataChannel>
 DataChannelConnection::OpenFinish(already_AddRefed<DataChannel> aChannel)
 {
-  nsRefPtr<DataChannel> channel(aChannel);
+  nsRefPtr<DataChannel> channel(aChannel); // takes the reference passed in
+  // Normally 1 reference if called from ::Open(), or 2 if called from
+  // ProcessQueuedOpens() unless the DOMDataChannel was gc'd
   uint16_t stream = channel->mStream;
 
   mLock.AssertCurrentThreadOwns();
@@ -1889,7 +1900,7 @@ DataChannelConnection::OpenFinish(already_AddRefed<DataChannel> aChannel)
     }
     if (stream != INVALID_STREAM) {
       // just allocated (& OPEN), or externally negotiated
-      mStreams[stream] = channel;
+      mStreams[stream] = channel; // holds a reference
       channel->mStream = stream;
     }
 
@@ -1908,6 +1919,7 @@ DataChannelConnection::OpenFinish(already_AddRefed<DataChannel> aChannel)
   } else {
     // OPEN and externally negotiated stream
     mStreams[stream] = channel;
+    mStreams[stream] = channel; // holds a reference
   }
 
 #ifdef TEST_QUEUED_DATA
diff --git a/netwerk/sctp/datachannel/DataChannel.h b/netwerk/sctp/datachannel/DataChannel.h
index 9ca99032b4be..07f961b1c3f5 100644
--- a/netwerk/sctp/datachannel/DataChannel.h
+++ b/netwerk/sctp/datachannel/DataChannel.h
@@ -174,7 +174,7 @@ public:
                                      DataChannelListener *aListener,
                                      nsISupports *aContext,
                                      bool aExternalNegotiated,
-                                     uint16_t aStream);
+                                     uint16_t aStream) NS_WARN_UNUSED_RESULT;
 
   void Close(DataChannel *aChannel);
   // CloseInt() must be called with mLock held
@@ -238,7 +238,7 @@ private:
 
   void DeliverQueuedData(uint16_t stream);
 
-  already_AddRefed<DataChannel> OpenFinish(already_AddRefed<DataChannel> channel);
+  already_AddRefed<DataChannel> OpenFinish(already_AddRefed<DataChannel> channel) NS_WARN_UNUSED_RESULT;
 
   void StartDefer();
   bool SendDeferredMessages();

From 23d55db958ff0b12c3ac2595e5104439bb7fb938 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Wed, 17 Apr 2013 00:35:39 -0400
Subject: [PATCH 093/438] Bug 862118 - Remove GetAttributeToModifyOnNode
 r=ehsan

---
 editor/libeditor/html/nsHTMLDataTransfer.cpp | 129 -------------------
 editor/libeditor/html/nsHTMLEditor.h         |   1 -
 2 files changed, 130 deletions(-)

diff --git a/editor/libeditor/html/nsHTMLDataTransfer.cpp b/editor/libeditor/html/nsHTMLDataTransfer.cpp
index 68dd30c1a643..d449a682287e 100644
--- a/editor/libeditor/html/nsHTMLDataTransfer.cpp
+++ b/editor/libeditor/html/nsHTMLDataTransfer.cpp
@@ -715,135 +715,6 @@ nsHTMLEditor::DoInsertHTMLWithContext(const nsAString & aInputString,
   return mRules->DidDoAction(selection, &ruleInfo, rv);
 }
 
-// returns empty string if nothing to modify on node
-nsresult
-nsHTMLEditor::GetAttributeToModifyOnNode(nsIDOMNode *aNode, nsAString &aAttr)
-{
-  aAttr.Truncate();
-
-  NS_NAMED_LITERAL_STRING(srcStr, "src");
-  nsCOMPtr<nsIDOMHTMLImageElement> nodeAsImage = do_QueryInterface(aNode);
-  if (nodeAsImage)
-  {
-    aAttr = srcStr;
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIDOMHTMLAnchorElement> nodeAsAnchor = do_QueryInterface(aNode);
-  if (nodeAsAnchor)
-  {
-    aAttr.AssignLiteral("href");
-    return NS_OK;
-  }
-
-  NS_NAMED_LITERAL_STRING(bgStr, "background");
-  nsCOMPtr<dom::Element> element = do_QueryInterface(aNode);
-  if (element && element->IsHTML(nsGkAtoms::body)) {
-    aAttr = bgStr;
-    return NS_OK;
-  }
-
-  if (element && element->IsHTML(nsGkAtoms::table)) {
-    aAttr = bgStr;
-    return NS_OK;
-  }
-
-  if (element && element->IsHTML(nsGkAtoms::tr)) {
-    aAttr = bgStr;
-    return NS_OK;
-  }
-
-  if (element &&
-      (element->IsHTML(nsGkAtoms::td) || element->IsHTML(nsGkAtoms::th))) {
-    aAttr = bgStr;
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIDOMHTMLScriptElement> nodeAsScript = do_QueryInterface(aNode);
-  if (nodeAsScript)
-  {
-    aAttr = srcStr;
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIDOMHTMLEmbedElement> nodeAsEmbed = do_QueryInterface(aNode);
-  if (nodeAsEmbed)
-  {
-    aAttr = srcStr;
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIDOMHTMLObjectElement> nodeAsObject = do_QueryInterface(aNode);
-  if (nodeAsObject)
-  {
-    aAttr.AssignLiteral("data");
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIDOMHTMLLinkElement> nodeAsLink = do_QueryInterface(aNode);
-  if (nodeAsLink)
-  {
-    // Test if the link has a rel value indicating it to be a stylesheet
-    nsAutoString linkRel;
-    if (NS_SUCCEEDED(nodeAsLink->GetRel(linkRel)) && !linkRel.IsEmpty())
-    {
-      nsReadingIterator<PRUnichar> start;
-      nsReadingIterator<PRUnichar> end;
-      nsReadingIterator<PRUnichar> current;
-
-      linkRel.BeginReading(start);
-      linkRel.EndReading(end);
-
-      // Walk through space delimited string looking for "stylesheet"
-      for (current = start; current != end; ++current)
-      {
-        // Ignore whitespace
-        if (nsCRT::IsAsciiSpace(*current))
-          continue;
-
-        // Grab the next space delimited word
-        nsReadingIterator<PRUnichar> startWord = current;
-        do {
-          ++current;
-        } while (current != end && !nsCRT::IsAsciiSpace(*current));
-
-        // Store the link for fix up if it says "stylesheet"
-        if (Substring(startWord, current).LowerCaseEqualsLiteral("stylesheet"))
-        {
-          aAttr.AssignLiteral("href");
-          return NS_OK;
-        }
-        if (current == end)
-          break;
-      }
-    }
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIDOMHTMLFrameElement> nodeAsFrame = do_QueryInterface(aNode);
-  if (nodeAsFrame)
-  {
-    aAttr = srcStr;
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIDOMHTMLIFrameElement> nodeAsIFrame = do_QueryInterface(aNode);
-  if (nodeAsIFrame)
-  {
-    aAttr = srcStr;
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIDOMHTMLInputElement> nodeAsInput = do_QueryInterface(aNode);
-  if (nodeAsInput)
-  {
-    aAttr = srcStr;
-    return NS_OK;
-  }
-
-  return NS_OK;
-}
-
 nsresult
 nsHTMLEditor::AddInsertionListener(nsIContentFilter *aListener)
 {
diff --git a/editor/libeditor/html/nsHTMLEditor.h b/editor/libeditor/html/nsHTMLEditor.h
index 9b46fe24432b..07841be4199a 100644
--- a/editor/libeditor/html/nsHTMLEditor.h
+++ b/editor/libeditor/html/nsHTMLEditor.h
@@ -565,7 +565,6 @@ protected:
                                      nsIDOMNode **aTargetNode,       
                                      int32_t *aTargetOffset,   
                                      bool *aDoContinue);
-  nsresult   GetAttributeToModifyOnNode(nsIDOMNode *aNode, nsAString &aAttrib);
 
   bool       IsInLink(nsIDOMNode *aNode, nsCOMPtr<nsIDOMNode> *outLink = nullptr);
   nsresult   StripFormattingNodes(nsIDOMNode *aNode, bool aOnlyList = false);

From 70433dc16fcbb3c9abef1a6c5dca3f792f3a97b7 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Wed, 17 Apr 2013 00:56:00 -0400
Subject: [PATCH 094/438] Bug 855866: Fire toplevel-window-ready after
 usePrivateBrowsing is initialized, but still before the document starts
 loading; r=bzbarsky

---
 .../windowwatcher/src/nsWindowWatcher.cpp     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index e17b0544d522..678f508ce345 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -859,15 +859,6 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
     }
   }
 
-  if (isNewToplevelWindow) {
-    // Notify observers that the window is open and ready.
-    // The window has not yet started to load a document.
-    nsCOMPtr<nsIObserverService> obsSvc =
-      mozilla::services::GetObserverService();
-    if (obsSvc)
-      obsSvc->NotifyObservers(*_retval, "toplevel-window-ready", nullptr);
-  }
-
   // Now we have to set the right opener principal on the new window.  Note
   // that we have to do this _before_ starting any URI loads, thanks to the
   // sync nature of javascript: loads.  Since this is the only place where we
@@ -934,6 +925,7 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
     }
   }
 
+  nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
   if (uriToLoad && aNavigate) { // get the script principal and pass it to docshell
     JSContextAutoPopper contextGuard;
 
@@ -949,7 +941,6 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
       cx = contextGuard.get();
     }
 
-    nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
     newDocShell->CreateLoadInfo(getter_AddRefs(loadInfo));
     NS_ENSURE_TRUE(loadInfo, NS_ERROR_FAILURE);
 
@@ -983,7 +974,18 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
         }
       }
     }
+  }
 
+  if (isNewToplevelWindow) {
+    // Notify observers that the window is open and ready.
+    // The window has not yet started to load a document.
+    nsCOMPtr<nsIObserverService> obsSvc =
+      mozilla::services::GetObserverService();
+    if (obsSvc)
+      obsSvc->NotifyObservers(*_retval, "toplevel-window-ready", nullptr);
+  }
+
+  if (uriToLoad && aNavigate) {
     newDocShell->LoadURI(uriToLoad,
                          loadInfo,
                          windowIsNew

From 75fefce3e146e0b1102507927fe3daea1679bfc7 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Mon, 15 Apr 2013 16:14:43 -0700
Subject: [PATCH 095/438] Bug 847790 - Make nsTreeContentView::mRows an
 nsTArray<nsAutoPtr<Row> >.  r=bz.

--HG--
extra : rebase_source : 47255c0d85c68f638f4310126b94b27b69289f47
---
 layout/xul/tree/nsTreeContentView.cpp | 34 +++++++++++++--------------
 layout/xul/tree/nsTreeContentView.h   |  9 +++----
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/layout/xul/tree/nsTreeContentView.cpp b/layout/xul/tree/nsTreeContentView.cpp
index ec9bdfa23051..491c3ae06953 100644
--- a/layout/xul/tree/nsTreeContentView.cpp
+++ b/layout/xul/tree/nsTreeContentView.cpp
@@ -1034,7 +1034,7 @@ nsTreeContentView::NodeWillBeDestroyed(const nsINode* aNode)
 // Recursively serialize content, starting with aContent.
 void
 nsTreeContentView::Serialize(nsIContent* aContent, int32_t aParentIndex,
-                             int32_t* aIndex, nsTArray<Row*>& aRows)
+                             int32_t* aIndex, nsTArray<nsAutoPtr<Row> >& aRows)
 {
   // Don't allow non-XUL nodes.
   if (!aContent->IsXUL())
@@ -1058,7 +1058,7 @@ nsTreeContentView::Serialize(nsIContent* aContent, int32_t aParentIndex,
 
 void
 nsTreeContentView::SerializeItem(nsIContent* aContent, int32_t aParentIndex,
-                                 int32_t* aIndex, nsTArray<Row*>& aRows)
+                                 int32_t* aIndex, nsTArray<nsAutoPtr<Row> >& aRows)
 {
   if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::hidden,
                             nsGkAtoms::_true, eCaseMatters))
@@ -1094,7 +1094,7 @@ nsTreeContentView::SerializeItem(nsIContent* aContent, int32_t aParentIndex,
 void
 nsTreeContentView::SerializeSeparator(nsIContent* aContent,
                                       int32_t aParentIndex, int32_t* aIndex,
-                                      nsTArray<Row*>& aRows)
+                                      nsTArray<nsAutoPtr<Row> >& aRows)
 {
   if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::hidden,
                             nsGkAtoms::_true, eCaseMatters))
@@ -1158,10 +1158,15 @@ nsTreeContentView::EnsureSubtree(int32_t aIndex)
     return 0;
   }
 
-  nsAutoTArray<Row*, 8> rows;
+  nsAutoTArray<nsAutoPtr<Row>, 8> rows;
   int32_t index = 0;
   Serialize(child, aIndex, &index, rows);
-  mRows.InsertElementsAt(aIndex + 1, rows);
+  // We can't use InsertElementsAt since the destination can't steal
+  // ownership from its const source argument.
+  for (nsTArray<Row>::index_type i = 0; i < rows.Length(); i++) {
+    nsAutoPtr<Row>* newRow = mRows.InsertElementAt(aIndex + i + 1);
+    *newRow = rows[i];
+  }
   int32_t count = rows.Length();
 
   row->mSubtreeSize += count;
@@ -1180,9 +1185,6 @@ nsTreeContentView::RemoveSubtree(int32_t aIndex)
   Row* row = mRows[aIndex];
   int32_t count = row->mSubtreeSize;
 
-  for (int32_t i = 0; i < count; i++) {
-    delete mRows[aIndex + i + 1];
-  }
   mRows.RemoveElementsAt(aIndex + 1, count);
 
   row->mSubtreeSize -= count;
@@ -1232,7 +1234,7 @@ nsTreeContentView::InsertRowFor(nsIContent* aParent, nsIContent* aChild)
 int32_t
 nsTreeContentView::InsertRow(int32_t aParentIndex, int32_t aIndex, nsIContent* aContent)
 {
-  nsAutoTArray<Row*, 8> rows;
+  nsAutoTArray<nsAutoPtr<Row>, 8> rows;
   nsIAtom *tag = aContent->Tag();
   if (aContent->IsXUL()) {
     if (tag == nsGkAtoms::treeitem)
@@ -1241,7 +1243,12 @@ nsTreeContentView::InsertRow(int32_t aParentIndex, int32_t aIndex, nsIContent* a
       SerializeSeparator(aContent, aParentIndex, &aIndex, rows);
   }
 
-  mRows.InsertElementsAt(aParentIndex + aIndex + 1, rows);
+  // We can't use InsertElementsAt since the destination can't steal
+  // ownership from its const source argument.
+  for (nsTArray<Row>::index_type i = 0; i < rows.Length(); i++) {
+    nsAutoPtr<Row>* newRow = mRows.InsertElementAt(aParentIndex + aIndex + i + 1);
+    *newRow = rows[i];
+  }
   int32_t count = rows.Length();
 
   UpdateSubtreeSizes(aParentIndex, count);
@@ -1260,10 +1267,6 @@ nsTreeContentView::RemoveRow(int32_t aIndex)
   int32_t count = row->mSubtreeSize + 1;
   int32_t parentIndex = row->mParentIndex;
 
-  delete row;
-  for(int32_t i = 1; i < count; i++) {
-    delete mRows[aIndex + i];
-  }
   mRows.RemoveElementsAt(aIndex, count);
 
   UpdateSubtreeSizes(parentIndex, -count);
@@ -1276,9 +1279,6 @@ nsTreeContentView::RemoveRow(int32_t aIndex)
 void
 nsTreeContentView::ClearRows()
 {
-  for (uint32_t i = 0; i < mRows.Length(); i++) {
-    delete mRows[i];
-  }
   mRows.Clear();
   mRoot = nullptr;
   mBody = nullptr;
diff --git a/layout/xul/tree/nsTreeContentView.h b/layout/xul/tree/nsTreeContentView.h
index 5137c226fa2c..70b7139565eb 100644
--- a/layout/xul/tree/nsTreeContentView.h
+++ b/layout/xul/tree/nsTreeContentView.h
@@ -6,6 +6,7 @@
 #ifndef nsTreeContentView_h__
 #define nsTreeContentView_h__
 
+#include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsTArray.h"
 #include "nsStubDocumentObserver.h"
@@ -52,13 +53,13 @@ class nsTreeContentView MOZ_FINAL : public nsINativeTreeView,
   protected:
     // Recursive methods which deal with serializing of nested content.
     void Serialize(nsIContent* aContent, int32_t aParentIndex, int32_t* aIndex,
-                   nsTArray<Row*>& aRows);
+                   nsTArray<nsAutoPtr<Row> >& aRows);
 
     void SerializeItem(nsIContent* aContent, int32_t aParentIndex,
-                       int32_t* aIndex, nsTArray<Row*>& aRows);
+                       int32_t* aIndex, nsTArray<nsAutoPtr<Row> >& aRows);
 
     void SerializeSeparator(nsIContent* aContent, int32_t aParentIndex,
-                            int32_t* aIndex, nsTArray<Row*>& aRows);
+                            int32_t* aIndex, nsTArray<nsAutoPtr<Row> >& aRows);
 
     void GetIndexInSubtree(nsIContent* aContainer, nsIContent* aContent, int32_t* aResult);
     
@@ -94,7 +95,7 @@ class nsTreeContentView MOZ_FINAL : public nsINativeTreeView,
     nsCOMPtr<nsIContent>                mRoot;
     nsCOMPtr<nsIContent>                mBody;
     nsIDocument*                        mDocument;      // WEAK
-    nsTArray<Row*>                      mRows;
+    nsTArray<nsAutoPtr<Row> >           mRows;
 };
 
 #endif // nsTreeContentView_h__

From f75d29a2263bff07ff066ce6610676ea815a49c4 Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Wed, 17 Apr 2013 17:10:50 +1200
Subject: [PATCH 096/438] Bug 862236, check we have a compositable before using
 it as a mask layer. r=mattwoodrow

---
 gfx/layers/composite/CompositableHost.cpp      | 6 ++++++
 gfx/layers/composite/LayerManagerComposite.cpp | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/gfx/layers/composite/CompositableHost.cpp b/gfx/layers/composite/CompositableHost.cpp
index 6b126ae523d1..b469da8e8f44 100644
--- a/gfx/layers/composite/CompositableHost.cpp
+++ b/gfx/layers/composite/CompositableHost.cpp
@@ -34,6 +34,12 @@ CompositableHost::AddMaskEffect(EffectChain& aEffects,
                                 bool aIs3D)
 {
   RefPtr<TextureSource> source = GetTextureHost();
+
+  if (!source) {
+    NS_WARNING("Using compositable with no texture host as mask layer");
+    return false;
+  }
+
   RefPtr<EffectMask> effect = new EffectMask(source,
                                              source->GetSize(),
                                              aTransform);
diff --git a/gfx/layers/composite/LayerManagerComposite.cpp b/gfx/layers/composite/LayerManagerComposite.cpp
index 2ee0614f4581..427ad3b5f61e 100644
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@@ -608,6 +608,11 @@ LayerManagerComposite::AddMaskEffect(Layer* aMaskLayer, EffectChain& aEffects, b
     return false;
   }
   LayerComposite* maskLayerComposite = static_cast<LayerComposite*>(aMaskLayer->ImplData());
+  if (!maskLayerComposite->GetCompositableHost()) {
+    NS_WARNING("Mask layer with no compositable host");
+    return false;
+  }
+
   gfx::Matrix4x4 transform;
   ToMatrix4x4(aMaskLayer->GetEffectiveTransform(), transform);
   return maskLayerComposite->GetCompositableHost()->AddMaskEffect(aEffects, transform, aIs3D);

From ea35bb30d8c49fae03508b559946916142ca8668 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Wed, 27 Mar 2013 14:32:51 +1300
Subject: [PATCH 097/438] Bug 834835. Part 1: Add initial
 AudioStreamTrack/VideoStreamTrack/MediaStreamTrack interfaces and
 implementations. r=jesup

--HG--
extra : rebase_source : 7d9ec16301f7ba12fb181e0b37fdcaf8455b97e4
---
 content/media/AudioStreamTrack.cpp | 20 ++++++++++
 content/media/AudioStreamTrack.h   | 30 ++++++++++++++
 content/media/Makefile.in          | 11 ++++--
 content/media/MediaStreamTrack.cpp | 51 ++++++++++++++++++++++++
 content/media/MediaStreamTrack.h   | 63 ++++++++++++++++++++++++++++++
 content/media/VideoStreamTrack.cpp | 20 ++++++++++
 content/media/VideoStreamTrack.h   | 30 ++++++++++++++
 content/media/moz.build            |  6 +++
 dom/bindings/Bindings.conf         | 20 +++++++---
 dom/webidl/AudioStreamTrack.webidl | 16 ++++++++
 dom/webidl/MediaStreamTrack.webidl | 33 ++++++++++++++++
 dom/webidl/VideoStreamTrack.webidl | 19 +++++++++
 dom/webidl/WebIDL.mk               |  3 ++
 13 files changed, 313 insertions(+), 9 deletions(-)
 create mode 100644 content/media/AudioStreamTrack.cpp
 create mode 100644 content/media/AudioStreamTrack.h
 create mode 100644 content/media/MediaStreamTrack.cpp
 create mode 100644 content/media/MediaStreamTrack.h
 create mode 100644 content/media/VideoStreamTrack.cpp
 create mode 100644 content/media/VideoStreamTrack.h
 create mode 100644 dom/webidl/AudioStreamTrack.webidl
 create mode 100644 dom/webidl/MediaStreamTrack.webidl
 create mode 100644 dom/webidl/VideoStreamTrack.webidl

diff --git a/content/media/AudioStreamTrack.cpp b/content/media/AudioStreamTrack.cpp
new file mode 100644
index 000000000000..1aa07d5f2506
--- /dev/null
+++ b/content/media/AudioStreamTrack.cpp
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* 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 "AudioStreamTrack.h"
+
+#include "mozilla/dom/AudioStreamTrackBinding.h"
+
+namespace mozilla {
+namespace dom {
+
+JSObject*
+AudioStreamTrack::WrapObject(JSContext* aCx, JSObject* aScope)
+{
+  return AudioStreamTrackBinding::Wrap(aCx, aScope, this);
+}
+
+}
+}
diff --git a/content/media/AudioStreamTrack.h b/content/media/AudioStreamTrack.h
new file mode 100644
index 000000000000..db99bcd92621
--- /dev/null
+++ b/content/media/AudioStreamTrack.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* 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/. */
+
+#ifndef AUDIOSTREAMTRACK_H_
+#define AUDIOSTREAMTRACK_H_
+
+#include "MediaStreamTrack.h"
+
+namespace mozilla {
+namespace dom {
+
+class AudioStreamTrack : public MediaStreamTrack {
+public:
+  AudioStreamTrack(DOMMediaStream* aStream, TrackID aTrackID)
+    : MediaStreamTrack(aStream, aTrackID) {}
+
+  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope);
+
+  virtual AudioStreamTrack* AsAudioStreamTrack() { return this; }
+
+  // WebIDL
+  virtual void GetKind(nsAString& aKind) { aKind.AssignLiteral("audio"); }
+};
+
+}
+}
+
+#endif /* AUDIOSTREAMTRACK_H_ */
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 71e88e1dae73..763b1fc28e1a 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -16,24 +16,27 @@ FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
 CPPSRCS = \
+  AudioAvailableEventManager.cpp \
   AudioChannelFormat.cpp \
   AudioNodeEngine.cpp \
   AudioNodeStream.cpp \
   AudioSegment.cpp \
   AudioStream.cpp \
+  AudioStreamTrack.cpp \
   DecoderTraits.cpp \
   DOMMediaStream.cpp \
   FileBlockCache.cpp \
-  MediaResource.cpp \
-  MediaStreamGraph.cpp \
-  AudioAvailableEventManager.cpp \
+  MediaCache.cpp \
   MediaDecoder.cpp \
   MediaDecoderStateMachine.cpp \
   MediaDecoderReader.cpp \
-  MediaCache.cpp \
+  MediaResource.cpp \
+  MediaStreamGraph.cpp \
+  MediaStreamTrack.cpp \
   StreamBuffer.cpp \
   VideoFrameContainer.cpp \
   VideoSegment.cpp \
+  VideoStreamTrack.cpp \
   VideoUtils.cpp \
   $(NULL)
 
diff --git a/content/media/MediaStreamTrack.cpp b/content/media/MediaStreamTrack.cpp
new file mode 100644
index 000000000000..01b108f3bc40
--- /dev/null
+++ b/content/media/MediaStreamTrack.cpp
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* 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 "MediaStreamTrack.h"
+
+#include "DOMMediaStream.h"
+#include "nsIUUIDGenerator.h"
+#include "nsServiceManagerUtils.h"
+
+namespace mozilla {
+namespace dom {
+
+MediaStreamTrack::MediaStreamTrack(DOMMediaStream* aStream, TrackID aTrackID)
+  : mStream(aStream), mTrackID(aTrackID), mEnded(false)
+{
+  SetIsDOMBinding();
+
+  memset(&mID, 0, sizeof(mID));
+
+  nsresult rv;
+  nsCOMPtr<nsIUUIDGenerator> uuidgen =
+    do_GetService("@mozilla.org/uuid-generator;1", &rv);
+  if (uuidgen) {
+    uuidgen->GenerateUUIDInPlace(&mID);
+  }
+}
+
+MediaStreamTrack::~MediaStreamTrack()
+{
+}
+
+NS_IMPL_CYCLE_COLLECTION_INHERITED_1(MediaStreamTrack, nsDOMEventTargetHelper,
+                                     mStream)
+
+NS_IMPL_ADDREF_INHERITED(MediaStreamTrack, nsDOMEventTargetHelper)
+NS_IMPL_RELEASE_INHERITED(MediaStreamTrack, nsDOMEventTargetHelper)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaStreamTrack)
+NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
+
+void
+MediaStreamTrack::GetId(nsAString& aID)
+{
+  char chars[NSID_LENGTH];
+  mID.ToProvidedString(chars);
+  aID = NS_ConvertASCIItoUTF16(chars);
+}
+
+}
+}
diff --git a/content/media/MediaStreamTrack.h b/content/media/MediaStreamTrack.h
new file mode 100644
index 000000000000..61416a988c74
--- /dev/null
+++ b/content/media/MediaStreamTrack.h
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* 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/. */
+
+#ifndef MEDIASTREAMTRACK_H_
+#define MEDIASTREAMTRACK_H_
+
+#include "nsDOMEventTargetHelper.h"
+#include "nsID.h"
+#include "StreamBuffer.h"
+
+namespace mozilla {
+
+class DOMMediaStream;
+
+namespace dom {
+
+class AudioStreamTrack;
+class VideoStreamTrack;
+
+/**
+ * Class representing a track in a DOMMediaStream.
+ */
+class MediaStreamTrack : public nsDOMEventTargetHelper {
+public:
+  /**
+   * aTrackID is the MediaStreamGraph track ID for the track in the
+   * MediaStream owned by aStream.
+   */
+  MediaStreamTrack(DOMMediaStream* aStream, TrackID aTrackID);
+  virtual ~MediaStreamTrack();
+
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaStreamTrack, nsDOMEventTargetHelper)
+
+  DOMMediaStream* GetParentObject() const { return mStream; }
+  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) = 0;
+
+  DOMMediaStream* GetStream() const { return mStream; }
+  TrackID GetTrackID() const { return mTrackID; }
+  virtual AudioStreamTrack* AsAudioStreamTrack() { return nullptr; }
+  virtual VideoStreamTrack* AsVideoStreamTrack() { return nullptr; }
+
+  // WebIDL
+  virtual void GetKind(nsAString& aKind) = 0;
+  void GetId(nsAString& aID);
+  void GetLabel(nsAString& aLabel) { aLabel.Truncate(); }
+
+  // Notifications from the MediaStreamGraph
+  void NotifyEnded() { mEnded = true; }
+
+protected:
+  nsRefPtr<DOMMediaStream> mStream;
+  TrackID mTrackID;
+  nsID mID;
+  bool mEnded;
+};
+
+}
+}
+
+#endif /* MEDIASTREAMTRACK_H_ */
diff --git a/content/media/VideoStreamTrack.cpp b/content/media/VideoStreamTrack.cpp
new file mode 100644
index 000000000000..bacbad1045a1
--- /dev/null
+++ b/content/media/VideoStreamTrack.cpp
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* 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 "VideoStreamTrack.h"
+
+#include "mozilla/dom/VideoStreamTrackBinding.h"
+
+namespace mozilla {
+namespace dom {
+
+JSObject*
+VideoStreamTrack::WrapObject(JSContext* aCx, JSObject* aScope)
+{
+  return VideoStreamTrackBinding::Wrap(aCx, aScope, this);
+}
+
+}
+}
diff --git a/content/media/VideoStreamTrack.h b/content/media/VideoStreamTrack.h
new file mode 100644
index 000000000000..9fcd4acad1dd
--- /dev/null
+++ b/content/media/VideoStreamTrack.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* 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/. */
+
+#ifndef VIDEOSTREAMTRACK_H_
+#define VIDEOSTREAMTRACK_H_
+
+#include "MediaStreamTrack.h"
+
+namespace mozilla {
+namespace dom {
+
+class VideoStreamTrack : public MediaStreamTrack {
+public:
+  VideoStreamTrack(DOMMediaStream* aStream, TrackID aTrackID)
+    : MediaStreamTrack(aStream, aTrackID) {}
+
+  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope);
+
+  virtual VideoStreamTrack* AsVideoStreamTrack() { return this; }
+
+  // WebIDL
+  virtual void GetKind(nsAString& aKind) { aKind.AssignLiteral("video"); }
+};
+
+}
+}
+
+#endif /* VIDEOSTREAMTRACK_H_ */
diff --git a/content/media/moz.build b/content/media/moz.build
index 5f256159bd2a..464766e849de 100644
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -74,3 +74,9 @@ EXPORTS += [
     'VorbisUtils.h',
 ]
 
+EXPORTS.mozilla.dom += [
+    'AudioStreamTrack.h',
+    'MediaStreamTrack.h',
+    'VideoStreamTrack.h',
+]
+
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index a7b2ae1a6d2d..447ae15f5418 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -126,6 +126,9 @@ DOMInterfaces = {
     'nativeType': 'nsDOMBeforeUnloadEvent',
 },
 
+'AudioStreamTrack': {
+},
+
 'BiquadFilterNode': {
     'resultNotAddRefed': [ 'frequency', 'q', 'gain' ],
 },
@@ -553,6 +556,11 @@ DOMInterfaces = {
     'workers': True,
 }],
 
+'LocalMediaStream': {
+    'headerFile': 'DOMMediaStream.h',
+    'nativeType': 'mozilla::DOMLocalMediaStream'
+},
+
 'Location': {
     # NOTE: Before you turn on codegen for Location, make sure all the
     # Unforgeable stuff is dealt with.
@@ -571,11 +579,6 @@ DOMInterfaces = {
     'skipGen': True
 }],
 
-'LocalMediaStream': {
-    'headerFile': 'DOMMediaStream.h',
-    'nativeType': 'mozilla::DOMLocalMediaStream'
-},
-
 'MediaStreamList': {
     'headerFile': 'MediaStreamList.h',
     'wrapperCache': False,
@@ -584,6 +587,10 @@ DOMInterfaces = {
     'binaryNames': { '__indexedGetter': 'IndexedGetter' }
 },
 
+'MediaStreamTrack': {
+    'concrete': False
+},
+
 'MessageEvent': {
     'nativeType': 'nsDOMMessageEvent',
 },
@@ -1022,6 +1029,9 @@ DOMInterfaces = {
     'workers': True,
 }],
 
+'VideoStreamTrack': {
+},
+
 'WebGLActiveInfo': {
    'nativeType': 'mozilla::WebGLActiveInfo',
    'headerFile': 'WebGLContext.h',
diff --git a/dom/webidl/AudioStreamTrack.webidl b/dom/webidl/AudioStreamTrack.webidl
new file mode 100644
index 000000000000..9fff71cedc36
--- /dev/null
+++ b/dom/webidl/AudioStreamTrack.webidl
@@ -0,0 +1,16 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/.
+ *
+ * The origin of this IDL file is
+ * http://dev.w3.org/2011/webrtc/editor/getusermedia.html
+ *
+ * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
+ * liability, trademark and document use rules apply.
+ */
+
+// [Constructor(optional MediaTrackConstraints audioConstraints)]
+interface AudioStreamTrack : MediaStreamTrack {
+//    static sequence<DOMString> getSourceIds ();
+};
diff --git a/dom/webidl/MediaStreamTrack.webidl b/dom/webidl/MediaStreamTrack.webidl
new file mode 100644
index 000000000000..3daaa3827681
--- /dev/null
+++ b/dom/webidl/MediaStreamTrack.webidl
@@ -0,0 +1,33 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/.
+ *
+ * The origin of this IDL file is
+ * http://dev.w3.org/2011/webrtc/editor/getusermedia.html
+ *
+ * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
+ * liability, trademark and document use rules apply.
+ */
+
+interface MediaStreamTrack {
+    readonly    attribute DOMString             kind;
+    readonly    attribute DOMString             id;
+    readonly    attribute DOMString             label;
+//                attribute boolean               enabled;
+//    readonly    attribute MediaStreamTrackState readyState;
+//    readonly    attribute SourceTypeEnum        sourceType;
+//    readonly    attribute DOMString             sourceId;
+//                attribute EventHandler          onstarted;
+//                attribute EventHandler          onmute;
+//                attribute EventHandler          onunmute;
+//                attribute EventHandler          onended;
+//    any                    getConstraint (DOMString constraintName, optional boolean mandatory = false);
+//    void                   setConstraint (DOMString constraintName, any constraintValue, optional boolean mandatory = false);
+//    MediaTrackConstraints? constraints ();
+//    void                   applyConstraints (MediaTrackConstraints constraints);
+//    void                   prependConstraint (DOMString constraintName, any constraintValue);
+//    void                   appendConstraint (DOMString constraintName, any constraintValue);
+//                attribute EventHandler          onoverconstrained;
+//    void                   stop ();
+};
diff --git a/dom/webidl/VideoStreamTrack.webidl b/dom/webidl/VideoStreamTrack.webidl
new file mode 100644
index 000000000000..b194d5c9fae1
--- /dev/null
+++ b/dom/webidl/VideoStreamTrack.webidl
@@ -0,0 +1,19 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/.
+ *
+ * The origin of this IDL file is
+ * http://dev.w3.org/2011/webrtc/editor/getusermedia.html
+ *
+ * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
+ * liability, trademark and document use rules apply.
+ */
+
+// [Constructor(optional MediaTrackConstraints videoConstraints)]
+interface VideoStreamTrack : MediaStreamTrack {
+//    static sequence<DOMString> getSourceIds ();
+//    void                       takePhoto ();
+//                attribute EventHandler onphoto;
+//                attribute EventHandler onphotoerror;
+};
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index e3be80f1894f..ff086114c60e 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -20,6 +20,7 @@ webidl_files = \
   AudioListener.webidl \
   AudioNode.webidl \
   AudioParam.webidl \
+  AudioStreamTrack.webidl \
   Attr.webidl \
   BatteryManager.webidl \
   BeforeUnloadEvent.webidl \
@@ -154,6 +155,7 @@ webidl_files = \
   Location.webidl \
   MediaError.webidl \
   MediaStream.webidl \
+  MediaStreamTrack.webidl \
   MessageEvent.webidl \
   MouseEvent.webidl \
   MouseScrollEvent.webidl \
@@ -298,6 +300,7 @@ webidl_files = \
   UndoManager.webidl \
   URLUtils.webidl \
   USSDReceivedEvent.webidl \
+  VideoStreamTrack.webidl \
   XMLDocument.webidl \
   XMLHttpRequest.webidl \
   XMLHttpRequestEventTarget.webidl \

From 34a16c0fbe1056d24cdc12577e9d1ed542792854 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Wed, 17 Apr 2013 17:18:24 +1200
Subject: [PATCH 098/438] Bug 834835. Part 2: Make DOMMediaStream maintain a
 list of MediaStreamTrack objects. r=jesup We use a MediaStreamListener to
 watch the MediaStream and maintain the list of MediaStreamTrack objects.

--HG--
extra : rebase_source : 325a4069f97f716a76ff73a4edb0677e62283631
---
 content/media/DOMMediaStream.cpp | 135 ++++++++++++++++++++++++++++++-
 content/media/DOMMediaStream.h   |  22 ++++-
 2 files changed, 150 insertions(+), 7 deletions(-)

diff --git a/content/media/DOMMediaStream.cpp b/content/media/DOMMediaStream.cpp
index fe5bb77c0415..64cf365d4b4e 100644
--- a/content/media/DOMMediaStream.cpp
+++ b/content/media/DOMMediaStream.cpp
@@ -9,8 +9,11 @@
 #include "mozilla/dom/MediaStreamBinding.h"
 #include "mozilla/dom/LocalMediaStreamBinding.h"
 #include "MediaStreamGraph.h"
+#include "AudioStreamTrack.h"
+#include "VideoStreamTrack.h"
 
 using namespace mozilla;
+using namespace mozilla::dom;
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMMediaStream)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
@@ -20,13 +23,95 @@ NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMMediaStream)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMMediaStream)
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMMediaStream, mWindow)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(DOMMediaStream, mWindow, mTracks)
 
 NS_IMPL_ISUPPORTS_INHERITED1(DOMLocalMediaStream, DOMMediaStream,
                              nsIDOMLocalMediaStream)
 
+class DOMMediaStream::StreamListener : public MediaStreamListener {
+public:
+  StreamListener(DOMMediaStream* aStream)
+    : mStream(aStream)
+  {}
+
+  // Main thread only
+  void Forget() { mStream = nullptr; }
+  DOMMediaStream* GetStream() { return mStream; }
+
+  class TrackChange : public nsRunnable {
+  public:
+    TrackChange(StreamListener* aListener,
+                TrackID aID, TrackTicks aTrackOffset,
+                uint32_t aEvents, MediaSegment::Type aType)
+      : mListener(aListener), mID(aID), mEvents(aEvents), mType(aType)
+    {
+    }
+
+    NS_IMETHOD Run()
+    {
+      NS_ASSERTION(NS_IsMainThread(), "main thread only");
+
+      DOMMediaStream* stream = mListener->GetStream();
+      if (!stream) {
+        return NS_OK;
+      }
+
+      nsRefPtr<MediaStreamTrack> track;
+      if (mEvents & MediaStreamListener::TRACK_EVENT_CREATED) {
+        track = stream->CreateDOMTrack(mID, mType);
+      } else {
+        track = stream->GetDOMTrackFor(mID);
+      }
+      if (mEvents & MediaStreamListener::TRACK_EVENT_ENDED) {
+        track->NotifyEnded();
+      }
+      return NS_OK;
+    }
+
+    StreamTime mEndTime;
+    nsRefPtr<StreamListener> mListener;
+    TrackID mID;
+    uint32_t mEvents;
+    MediaSegment::Type mType;
+  };
+
+  /**
+   * Notify that changes to one of the stream tracks have been queued.
+   * aTrackEvents can be any combination of TRACK_EVENT_CREATED and
+   * TRACK_EVENT_ENDED. aQueuedMedia is the data being added to the track
+   * at aTrackOffset (relative to the start of the stream).
+   * aQueuedMedia can be null if there is no output.
+   */
+  virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
+                                        TrackRate aTrackRate,
+                                        TrackTicks aTrackOffset,
+                                        uint32_t aTrackEvents,
+                                        const MediaSegment& aQueuedMedia)
+  {
+    if (aTrackEvents & (TRACK_EVENT_CREATED | TRACK_EVENT_ENDED)) {
+      nsRefPtr<TrackChange> runnable =
+        new TrackChange(this, aID, aTrackOffset, aTrackEvents,
+                        aQueuedMedia.GetType());
+      NS_DispatchToMainThread(runnable);
+    }
+  }
+
+private:
+  // These fields may only be accessed on the main thread
+  DOMMediaStream* mStream;
+};
+
+DOMMediaStream::DOMMediaStream()
+  : mStream(nullptr), mHintContents(0)
+{
+  SetIsDOMBinding();
+}
+
 DOMMediaStream::~DOMMediaStream()
 {
+  if (mListener) {
+    mListener->Forget();
+  }
   if (mStream) {
     mStream->Destroy();
   }
@@ -56,7 +141,7 @@ DOMMediaStream::InitSourceStream(nsIDOMWindow* aWindow, uint32_t aHintContents)
   mWindow = aWindow;
   SetHintContents(aHintContents);
   MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
-  mStream = gm->CreateSourceStream(this);
+  InitStreamCommon(gm->CreateSourceStream(this));
 }
 
 void
@@ -65,7 +150,17 @@ DOMMediaStream::InitTrackUnionStream(nsIDOMWindow* aWindow, uint32_t aHintConten
   mWindow = aWindow;
   SetHintContents(aHintContents);
   MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
-  mStream = gm->CreateTrackUnionStream(this);
+  InitStreamCommon(gm->CreateTrackUnionStream(this));
+}
+
+void
+DOMMediaStream::InitStreamCommon(MediaStream* aStream)
+{
+  mStream = aStream;
+
+  // Setup track listener
+  mListener = new StreamListener(this);
+  aStream->AddListener(mListener);
 }
 
 already_AddRefed<DOMMediaStream>
@@ -90,6 +185,40 @@ DOMMediaStream::CombineWithPrincipal(nsIPrincipal* aPrincipal)
   return nsContentUtils::CombineResourcePrincipals(&mPrincipal, aPrincipal);
 }
 
+MediaStreamTrack*
+DOMMediaStream::CreateDOMTrack(TrackID aTrackID, MediaSegment::Type aType)
+{
+  MediaStreamTrack* track;
+  switch (aType) {
+  case MediaSegment::AUDIO:
+    track = new AudioStreamTrack(this, aTrackID);
+    break;
+  case MediaSegment::VIDEO:
+    track = new VideoStreamTrack(this, aTrackID);
+    break;
+  default:
+    MOZ_NOT_REACHED("Unhandled track type");
+    return nullptr;
+  }
+
+  mTracks.AppendElement(track);
+  return track;
+}
+
+MediaStreamTrack*
+DOMMediaStream::GetDOMTrackFor(TrackID aTrackID)
+{
+  for (uint32_t i = 0; i < mTracks.Length(); ++i) {
+    MediaStreamTrack* t = mTracks[i];
+    // We may add streams to our track list that are actually owned by
+    // a different DOMMediaStream. Ignore those.
+    if (t->GetTrackID() == aTrackID && t->GetStream() == this) {
+      return t;
+    }
+  }
+  return nullptr;
+}
+
 DOMLocalMediaStream::~DOMLocalMediaStream()
 {
   if (mStream) {
diff --git a/content/media/DOMMediaStream.h b/content/media/DOMMediaStream.h
index ce2946cea31c..f9e65ff3c2d4 100644
--- a/content/media/DOMMediaStream.h
+++ b/content/media/DOMMediaStream.h
@@ -11,6 +11,7 @@
 #include "nsIPrincipal.h"
 #include "nsWrapperCache.h"
 #include "nsIDOMWindow.h"
+#include "StreamBuffer.h"
 
 class nsXPCClassInfo;
 
@@ -30,6 +31,10 @@ namespace mozilla {
 
 class MediaStream;
 
+namespace dom {
+class MediaStreamTrack;
+}
+
 /**
  * DOM wrapper for MediaStreams.
  */
@@ -37,12 +42,10 @@ class DOMMediaStream : public nsIDOMMediaStream,
                        public nsWrapperCache
 {
   friend class DOMLocalMediaStream;
+  typedef dom::MediaStreamTrack MediaStreamTrack;
 
 public:
-  DOMMediaStream() : mStream(nullptr), mHintContents(0)
-  {
-    SetIsDOMBinding();
-  }
+  DOMMediaStream();
   virtual ~DOMMediaStream();
 
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMMediaStream)
@@ -92,9 +95,17 @@ public:
   static already_AddRefed<DOMMediaStream>
   CreateTrackUnionStream(nsIDOMWindow* aWindow, uint32_t aHintContents = 0);
 
+  // Notifications from StreamListener
+  MediaStreamTrack* CreateDOMTrack(TrackID aTrackID, MediaSegment::Type aType);
+  MediaStreamTrack* GetDOMTrackFor(TrackID aTrackID);
+
 protected:
   void InitSourceStream(nsIDOMWindow* aWindow, uint32_t aHintContents);
   void InitTrackUnionStream(nsIDOMWindow* aWindow, uint32_t aHintContents);
+  void InitStreamCommon(MediaStream* aStream);
+
+  class StreamListener;
+  friend class StreamListener;
 
   // We need this to track our parent object.
   nsCOMPtr<nsIDOMWindow> mWindow;
@@ -106,6 +117,9 @@ protected:
   // If null, this stream can be used by anyone because it has no content yet.
   nsCOMPtr<nsIPrincipal> mPrincipal;
 
+  nsAutoTArray<nsRefPtr<MediaStreamTrack>,2> mTracks;
+  nsRefPtr<StreamListener> mListener;
+
   // tells the SDP generator about whether this
   // MediaStream probably has audio and/or video
   uint32_t mHintContents;

From f4fd38f1e77ea7563fe4dbd0756a8e000e1aeeaa Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Wed, 17 Apr 2013 17:18:37 +1200
Subject: [PATCH 099/438] Bug 834835. Part 3: Implement
 DOMMediaStream::GetAudio/VideoTracks. r=jesup

--HG--
extra : rebase_source : 6e4ab9c849320ee3a3a1b516bf143f528957e57f
---
 content/media/DOMMediaStream.cpp | 22 ++++++++++++++++++++++
 content/media/DOMMediaStream.h   |  8 ++++++++
 dom/webidl/MediaStream.webidl    |  4 ++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/content/media/DOMMediaStream.cpp b/content/media/DOMMediaStream.cpp
index 64cf365d4b4e..c69c1ce2dc6b 100644
--- a/content/media/DOMMediaStream.cpp
+++ b/content/media/DOMMediaStream.cpp
@@ -129,6 +129,28 @@ DOMMediaStream::CurrentTime()
   return mStream ? MediaTimeToSeconds(mStream->GetCurrentTime()) : 0.0;
 }
 
+void
+DOMMediaStream::GetAudioTracks(nsTArray<nsRefPtr<AudioStreamTrack> >& aTracks)
+{
+  for (uint32_t i = 0; i < mTracks.Length(); ++i) {
+    AudioStreamTrack* t = mTracks[i]->AsAudioStreamTrack();
+    if (t) {
+      aTracks.AppendElement(t);
+    }
+  }
+}
+
+void
+DOMMediaStream::GetVideoTracks(nsTArray<nsRefPtr<VideoStreamTrack> >& aTracks)
+{
+  for (uint32_t i = 0; i < mTracks.Length(); ++i) {
+    VideoStreamTrack* t = mTracks[i]->AsVideoStreamTrack();
+    if (t) {
+      aTracks.AppendElement(t);
+    }
+  }
+}
+
 bool
 DOMMediaStream::IsFinished()
 {
diff --git a/content/media/DOMMediaStream.h b/content/media/DOMMediaStream.h
index f9e65ff3c2d4..868481fb590d 100644
--- a/content/media/DOMMediaStream.h
+++ b/content/media/DOMMediaStream.h
@@ -33,6 +33,8 @@ class MediaStream;
 
 namespace dom {
 class MediaStreamTrack;
+class AudioStreamTrack;
+class VideoStreamTrack;
 }
 
 /**
@@ -43,6 +45,8 @@ class DOMMediaStream : public nsIDOMMediaStream,
 {
   friend class DOMLocalMediaStream;
   typedef dom::MediaStreamTrack MediaStreamTrack;
+  typedef dom::AudioStreamTrack AudioStreamTrack;
+  typedef dom::VideoStreamTrack VideoStreamTrack;
 
 public:
   DOMMediaStream();
@@ -57,7 +61,11 @@ public:
   }
   virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
 
+  // WebIDL
   double CurrentTime();
+  void GetAudioTracks(nsTArray<nsRefPtr<AudioStreamTrack> >& aTracks);
+  void GetVideoTracks(nsTArray<nsRefPtr<VideoStreamTrack> >& aTracks);
+
   MediaStream* GetStream() { return mStream; }
   bool IsFinished();
   /**
diff --git a/dom/webidl/MediaStream.webidl b/dom/webidl/MediaStream.webidl
index 632bbf569ea7..7c1cc6df8cdd 100644
--- a/dom/webidl/MediaStream.webidl
+++ b/dom/webidl/MediaStream.webidl
@@ -12,8 +12,8 @@
 
 interface MediaStream {
     // readonly attribute DOMString    id;
-    // sequence<MediaStreamTrack> getAudioTracks ();
-    // sequence<MediaStreamTrack> getVideoTracks ();
+    sequence<AudioStreamTrack> getAudioTracks ();
+    sequence<VideoStreamTrack> getVideoTracks ();
     // MediaStreamTrack           getTrackById (DOMString trackId);
     // void                       addTrack (MediaStreamTrack track);
     // void                       removeTrack (MediaStreamTrack track);

From b12da7ca94d161ea820e41fafe9a56dd46cce582 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Wed, 17 Apr 2013 17:18:53 +1200
Subject: [PATCH 100/438] Bug 834835. Part 4: Test basic MediaStreamTrack
 functionality. r=jesup

--HG--
extra : rebase_source : 5fe7024af9ad4669f6fbdbc8149f8de00a75f13a
---
 content/media/test/Makefile.in              |  1 +
 content/media/test/manifest.js              | 13 ++---
 content/media/test/test_mozHasAudio.html    |  4 +-
 content/media/test/test_streams_tracks.html | 54 +++++++++++++++++++++
 4 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 content/media/test/test_streams_tracks.html

diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index dbf727d81bf1..df2849053cba 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -135,6 +135,7 @@ MOCHITEST_FILES = \
 		test_streams_srcObject.html \
 		test_reset_src.html \
 		test_streams_gc.html \
+		test_streams_tracks.html \
 		test_streams_autoplay.html \
 		$(filter disabled-for-intermittent-failures--bug-608634, test_error_in_video_document.html) \
 		$(NULL)
diff --git a/content/media/test/manifest.js b/content/media/test/manifest.js
index e6cf4d88364b..205bebd7c87a 100644
--- a/content/media/test/manifest.js
+++ b/content/media/test/manifest.js
@@ -62,12 +62,13 @@ var gPausedAfterEndedTests = gSmallTests.concat([
   { name:"small-shot.ogg", type:"video/ogg", duration:0.276 }
 ]);
 
-// Test the mozHasAudio property
-var gMozHasAudioTests = [
-  { name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444, hasAudio:undefined },
-  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266, size:28942, hasAudio:false },
-  { name:"short-video.ogv", type:"video/ogg", duration:1.081, hasAudio:true },
-  { name:"seek.webm", type:"video/webm", duration:3.966, size:215529, hasAudio:false },
+// Test the mozHasAudio property, and APIs that detect different kinds of
+// tracks
+var gTrackTests = [
+  { name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444, hasAudio:true, hasVideo:false },
+  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266, size:28942, hasAudio:false, hasVideo:true },
+  { name:"short-video.ogv", type:"video/ogg", duration:1.081, hasAudio:true, hasVideo:true },
+  { name:"seek.webm", type:"video/webm", duration:3.966, size:215529, hasAudio:false, hasVideo:true },
   { name:"bogus.duh", type:"bogus/duh" }
 ];
 
diff --git a/content/media/test/test_mozHasAudio.html b/content/media/test/test_mozHasAudio.html
index fff84baaad44..2a0bb341fbec 100644
--- a/content/media/test/test_mozHasAudio.html
+++ b/content/media/test/test_mozHasAudio.html
@@ -27,13 +27,13 @@ function startTest(test, token) {
 
   element.src = test.name;
   element.name = test.name;
-  element.hasAudio = test.hasAudio;
+  element.hasAudio = elemType == "video" ? test.hasAudio : undefined;
   element.addEventListener("loadedmetadata", onloadedmetadata, false);
 
   element.load();
 }
 
-manager.runTests(gMozHasAudioTests, startTest);
+manager.runTests(gTrackTests, startTest);
 
 </script>
 </pre>
diff --git a/content/media/test/test_streams_tracks.html b/content/media/test/test_streams_tracks.html
new file mode 100644
index 000000000000..3ece1d4f26ba
--- /dev/null
+++ b/content/media/test/test_streams_tracks.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test MediaStreamTrack interfaces</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+var manager = new MediaTestManager;
+
+function testTracks(tracks, hasTrack, kind, src) {
+  is(tracks.length, hasTrack ? 1 : 0, "Correct track count for " + src);
+  for (var i = 0; i < tracks.length; ++i) {
+    var track = tracks[i];
+    is(track.kind, kind, "Correct track kind for track " + i + " of " + src);
+    var id = track.id;
+    ok(/\{........-....-....-....-............\}/.test(track.id),
+       "id " + track.id + " for track " + i + " of " + src + " has correct form");
+  }
+}
+
+function onended(e) {
+  var t = e.target;
+  var audioTracks = t.stream.getAudioTracks();
+  var videoTracks = t.stream.getVideoTracks();
+
+  testTracks(audioTracks, t.test.hasAudio, "audio", t.src);
+  testTracks(videoTracks, t.test.hasVideo, "video", t.src);
+
+  manager.finished(t.token);
+}
+
+function startTest(test, token) {
+  var element = document.createElement("video");
+
+  element.token = token;
+  manager.started(token);
+
+  element.src = test.name;
+  element.test = test;
+  element.stream = element.mozCaptureStreamUntilEnded();
+  element.addEventListener("ended", onended, false);
+
+  element.play();
+}
+
+manager.runTests(gTrackTests, startTest);
+</script>
+</pre>
+</body>
+</html>

From 84a5ab4471fa1dde81b135130189dc7de5ca75ba Mon Sep 17 00:00:00 2001
From: Jan-Ivar Bruaroey <jib@mozilla.com>
Date: Tue, 16 Apr 2013 19:23:07 -0400
Subject: [PATCH 101/438] Bug 857765: Log errors thrown by user-defined
 PeerConnection callbacks r=msucan

---
 dom/media/PeerConnection.js                   | 227 ++++++++----------
 dom/media/tests/mochitest/Makefile.in         |   1 +
 .../test_peerConnection_throwInCallbacks.html |  83 +++++++
 3 files changed, 188 insertions(+), 123 deletions(-)
 create mode 100644 dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html

diff --git a/dom/media/PeerConnection.js b/dom/media/PeerConnection.js
index 7862d28dc1fb..476f066d55a5 100644
--- a/dom/media/PeerConnection.js
+++ b/dom/media/PeerConnection.js
@@ -727,14 +727,12 @@ PeerConnection.prototype = {
   }
 };
 
-// This is a separate object because we don't want to expose it to DOM.
-function PeerConnectionObserver(dompc) {
-  this._dompc = dompc;
+function RTCError(code, message) {
+  this.name = this.reasonName[Math.min(code, this.reasonName.length - 1)];
+  this.message = (typeof message === "string")? message : this.name;
+  this.__exposedProps__ = { name: "rw", message: "rw" };
 }
-PeerConnectionObserver.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.IPeerConnectionObserver,
-                                         Ci.nsISupportsWeakReference]),
-
+RTCError.prototype = {
   // These strings must match those defined in the WebRTC spec.
   reasonName: [
     "NO_ERROR", // Should never happen -- only used for testing
@@ -747,69 +745,106 @@ PeerConnectionObserver.prototype = {
     "INCOMPATIBLE_CONSTRAINTS",
     "INCOMPATIBLE_MEDIASTREAMTRACK",
     "INTERNAL_ERROR"
-  ],
+  ]
+};
 
-  callErrorCallback: function(callback, code, message) {
-    if (code > Ci.IPeerConnection.kMaxErrorType) {
-      code = Ci.IPeerConnection.kInternalError;
-    }
-
-    if (typeof message !== "string") {
-      message = this.reasonName[code];
-    }
+// This is a separate object because we don't want to expose it to DOM.
+function PeerConnectionObserver(dompc) {
+  this._dompc = dompc;
+}
+PeerConnectionObserver.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.IPeerConnectionObserver,
+                                         Ci.nsISupportsWeakReference]),
 
+  callCB: function(callback, arg) {
     if (callback) {
       try {
-        callback.onCallback({
-          name: this.reasonName[code], message: message,
-          __exposedProps__: { name: "rw", message: "rw" }
-        });
-      } catch(e) {}
+        callback.onCallback(arg);
+      } catch(e) {
+        // A content script (user-provided) callback threw an error. We don't
+        // want this to take down peerconnection, but we still want the user
+        // to see it, so we catch it, report it, and move on.
+        //
+        // We do stack parsing in two different places for different reasons:
+
+        var msg;
+        if (e.result == Cr.NS_ERROR_XPC_JS_THREW_JS_OBJECT) {
+          // TODO(jib@mozilla.com): Revisit once bug 862153 is fixed.
+          //
+          // The actual content script frame is unavailable due to bug 862153,
+          // so users see file and line # into this file, which is not helpful.
+          //
+          // 1) Fix up the error message itself to differentiate between the
+          //    22 places we call callCB() in this file, using plain JS stack.
+          //
+          // Tweak the existing NS_ERROR_XPC_JS_THREW_JS_OBJECT message:
+          // -'Error: x' when calling method: [RTCPeerConCallback::onCallback]
+          // +'Error: x' when calling method: [RTCPeerConCallback::onCreateOfferError]
+
+          let caller = Error().stack.split("\n")[1].split("@")[0];
+          // caller ~= "PeerConnectionObserver.prototype.onCreateOfferError"
+
+          msg = e.message.replace("::onCallback", "::" + caller.split(".")[2]);
+        } else {
+          msg = e.message;
+        }
+
+        // Log error message to web console and window.onerror, if present.
+        //
+        // 2) nsIScriptError doesn't understand the nsIStackFrame format, so
+        //    do the translation by extracting file and line from XPCOM stack:
+        //
+        // e.location ~= "JS frame :: file://.js :: RTCPCCb::onCallback :: line 1"
+
+        let stack = e.location.toString().split(" :: ");
+        let file = stack[1];
+        let line = parseInt(stack[3].split(" ")[1]);
+
+        let scriptError = Cc["@mozilla.org/scripterror;1"].
+            createInstance(Ci.nsIScriptError);
+        scriptError.initWithWindowID(msg, file, null, line, 0,
+                                     Ci.nsIScriptError.exceptionFlag,
+                                     "content javascript",
+                                     this._dompc._winID);
+        Cc["@mozilla.org/consoleservice;1"].
+            getService(Ci.nsIConsoleService).logMessage(scriptError);
+
+        // Call onerror directly if present (necessary for testing)
+        if (typeof this._dompc._win.onerror === "function") {
+          this._dompc._win.onerror(msg, file, line);
+        }
+      }
     }
   },
 
   onCreateOfferSuccess: function(offer) {
-    if (this._dompc._onCreateOfferSuccess) {
-      try {
-        this._dompc._onCreateOfferSuccess.onCallback({
-          type: "offer", sdp: offer,
-          __exposedProps__: { type: "rw", sdp: "rw" }
-        });
-      } catch(e) {}
-    }
+    this.callCB(this._dompc._onCreateOfferSuccess,
+                { type: "offer", sdp: offer,
+                __exposedProps__: { type: "rw", sdp: "rw" } });
     this._dompc._executeNext();
   },
 
   onCreateOfferError: function(code, message) {
-    this.callErrorCallback (this._dompc._onCreateOfferFailure, code, message);
+    this.callCB(this._dompc._onCreateOfferFailure, new RTCError(code, message));
     this._dompc._executeNext();
   },
 
   onCreateAnswerSuccess: function(answer) {
-    if (this._dompc._onCreateAnswerSuccess) {
-      try {
-        this._dompc._onCreateAnswerSuccess.onCallback({
-          type: "answer", sdp: answer,
-          __exposedProps__: { type: "rw", sdp: "rw" }
-        });
-      } catch(e) {}
-    }
+    this.callCB (this._dompc._onCreateAnswerSuccess,
+                 { type: "answer", sdp: answer,
+                 __exposedProps__: { type: "rw", sdp: "rw" } });
     this._dompc._executeNext();
   },
 
   onCreateAnswerError: function(code, message) {
-    this.callErrorCallback (this._dompc._onCreateAnswerFailure, code, message);
+    this.callCB(this._dompc._onCreateAnswerFailure, new RTCError(code, message));
     this._dompc._executeNext();
   },
 
   onSetLocalDescriptionSuccess: function() {
     this._dompc._localType = this._dompc._pendingType;
     this._dompc._pendingType = null;
-    if (this._dompc._onSetLocalDescriptionSuccess) {
-      try {
-        this._dompc._onSetLocalDescriptionSuccess.onCallback();
-      } catch(e) {}
-    }
+    this.callCB(this._dompc._onSetLocalDescriptionSuccess);
 
     // Until we support generating trickle ICE candidates,
     // we go ahead and trigger a call of onicecandidate here.
@@ -825,39 +860,33 @@ PeerConnectionObserver.prototype = {
   onSetRemoteDescriptionSuccess: function() {
     this._dompc._remoteType = this._dompc._pendingType;
     this._dompc._pendingType = null;
-    if (this._dompc._onSetRemoteDescriptionSuccess) {
-      try {
-        this._dompc._onSetRemoteDescriptionSuccess.onCallback();
-      } catch(e) {}
-    }
+    this.callCB(this._dompc._onSetRemoteDescriptionSuccess);
     this._dompc._executeNext();
   },
 
   onSetLocalDescriptionError: function(code, message) {
     this._dompc._pendingType = null;
-    this.callErrorCallback (this._dompc._onSetLocalDescriptionFailure, code,
-                            message);
+    this.callCB(this._dompc._onSetLocalDescriptionFailure,
+                new RTCError(code, message));
     this._dompc._executeNext();
   },
 
   onSetRemoteDescriptionError: function(code, message) {
     this._dompc._pendingType = null;
-    this.callErrorCallback (this._dompc._onSetRemoteDescriptionFailure, code,
-                            message);
+    this.callCB(this._dompc._onSetRemoteDescriptionFailure,
+                new RTCError(code, message));
     this._dompc._executeNext();
   },
 
   onAddIceCandidateSuccess: function() {
     this._dompc._pendingType = null;
-    if (this._dompc._onAddIceCandidateSuccess) {
-      this._dompc._onAddIceCandidateSuccess.onCallback();
-    }
+    this.callCB(this._dompc._onAddIceCandidateSuccess);
     this._dompc._executeNext();
   },
 
   onAddIceCandidateError: function(code, message) {
     this._dompc._pendingType = null;
-    this.callErrorCallback (this._dompc._onAddIceCandidateError, code, message);
+    this.callCB(this._dompc._onAddIceCandidateError, new RTCError(code, message));
     this._dompc._executeNext();
   },
 
@@ -866,42 +895,24 @@ PeerConnectionObserver.prototype = {
       return;
     }
 
-    let self = this;
-    let iceCb = function() {};
-    let iceGatherCb = function() {};
-    if (this._dompc.onicechange) {
-      iceCb = function(args) {
-        try {
-          self._dompc.onicechange(args);
-        } catch(e) {}
-      };
-    }
-    if (this._dompc.ongatheringchange) {
-      iceGatherCb = function(args) {
-        try {
-          self._dompc.ongatheringchange(args);
-        } catch(e) {}
-      };
-    }
-
     switch (this._dompc._pc.iceState) {
       case Ci.IPeerConnection.kIceGathering:
-        iceGatherCb("gathering");
+        this.callCB(this._dompc.ongatheringchange, "gathering");
         break;
       case Ci.IPeerConnection.kIceWaiting:
-        iceCb("starting");
+        this.callCB(this._dompc.onicechange, "starting");
         this._dompc._executeNext();
         break;
       case Ci.IPeerConnection.kIceChecking:
-        iceCb("checking");
+        this.callCB(this._dompc.onicechange, "checking");
         break;
       case Ci.IPeerConnection.kIceConnected:
         // ICE gathering complete.
-        iceCb("connected");
-        iceGatherCb("complete");
+        this.callCB(this._dompc.onicechange, "connected");
+        this.callCB(this._dompc.ongatheringchange, "complete");
         break;
       case Ci.IPeerConnection.kIceFailed:
-        iceCb("failed");
+        this.callCB(this._dompc.onicechange, "failed");
         break;
       default:
         // Unknown state!
@@ -910,63 +921,33 @@ PeerConnectionObserver.prototype = {
   },
 
   onAddStream: function(stream, type) {
-    if (this._dompc.onaddstream) {
-      try {
-        this._dompc.onaddstream.onCallback({
-          stream: stream, type: type,
-          __exposedProps__: { stream: "r", type: "r" }
-        });
-      } catch(e) {}
-    }
+    this.callCB(this._dompc.onaddstream,
+                { stream: stream, type: type,
+                __exposedProps__: { stream: "r", type: "r" } });
   },
 
   onRemoveStream: function(stream, type) {
-    if (this._dompc.onremovestream) {
-      try {
-        this._dompc.onremovestream.onCallback({
-          stream: stream, type: type,
-          __exposedProps__: { stream: "r", type: "r" }
-        });
-      } catch(e) {}
-    }
+    this.callCB(this._dompc.onremovestream,
+                { stream: stream, type: type,
+                __exposedProps__: { stream: "r", type: "r" } });
   },
 
   foundIceCandidate: function(cand) {
-    if (this._dompc.onicecandidate) {
-      try {
-        this._dompc.onicecandidate.onCallback({
-          candidate: cand,
-          __exposedProps__: { candidate: "rw" }
-        });
-      } catch(e) {}
-    }
+    this.callCB(this._dompc.onicecandidate,
+                {candidate: cand, __exposedProps__: { candidate: "rw" } });
   },
 
   notifyDataChannel: function(channel) {
-    if (this._dompc.ondatachannel) {
-      try {
-        this._dompc.ondatachannel.onCallback({
-          channel: channel,
-          __exposedProps__: { channel: "r" }
-        });
-      } catch(e) {}
-    }
+    this.callCB(this._dompc.ondatachannel,
+                { channel: channel, __exposedProps__: { channel: "r" } });
   },
 
   notifyConnection: function() {
-    if (this._dompc.onconnection) {
-      try {
-        this._dompc.onconnection.onCallback();
-      } catch(e) {}
-    }
+    this.callCB (this._dompc.onconnection);
   },
 
   notifyClosedConnection: function() {
-    if (this._dompc.onclosedconnection) {
-      try {
-        this._dompc.onclosedconnection.onCallback();
-      } catch(e) {}
-    }
+    this.callCB (this._dompc.onclosedconnection);
   }
 };
 
diff --git a/dom/media/tests/mochitest/Makefile.in b/dom/media/tests/mochitest/Makefile.in
index 76ab887273d1..ab6454c64853 100644
--- a/dom/media/tests/mochitest/Makefile.in
+++ b/dom/media/tests/mochitest/Makefile.in
@@ -33,6 +33,7 @@ MOCHITEST_FILES = \
   test_peerConnection_offerRequiresReceiveAudio.html \
   test_peerConnection_offerRequiresReceiveVideo.html \
   test_peerConnection_offerRequiresReceiveVideoAudio.html \
+  test_peerConnection_throwInCallbacks.html \
   test_peerConnection_bug822674.html \
   test_peerConnection_bug825703.html \
   test_peerConnection_bug827843.html \
diff --git a/dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html b/dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html
new file mode 100644
index 000000000000..dcc22e55dfff
--- /dev/null
+++ b/dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="head.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript;version=1.8">
+  createHTML({
+    bug: "857765",
+    title: "Throw in PeerConnection callbacks"
+  });
+
+  let error_count = 0;
+  let oldOnError = window.onerror;
+  window.onerror = function (errorMsg, url, lineNumber) {
+    if (errorMsg.indexOf("Expected") == -1) {
+      getFail(new Error)(errorMsg);
+    }
+    error_count += 1;
+    info("onerror " + error_count + ": " + errorMsg);
+    if (error_count == 7) {
+      finish();
+    }
+    return false;
+  }
+
+  let pc0, pc1, pc2;
+
+  runTest(function () {
+    error_count = 0;
+
+    // Test failure callbacks (limited to 1 for now)
+    pc0 = new mozRTCPeerConnection();
+    pc0.createOffer(getFail(new Error), function(err) {
+      pc1 = new mozRTCPeerConnection();
+      pc2 = new mozRTCPeerConnection();
+
+      // Test success callbacks (happy path)
+      navigator.mozGetUserMedia({video:true, fake: true}, function(video1) {
+        pc1.addStream(video1);
+        pc1.createOffer(function(offer) {
+          pc1.setLocalDescription(offer, function() {
+            pc2.setRemoteDescription(offer, function() {
+              pc2.createAnswer(function(answer) {
+                pc2.setLocalDescription(answer, function() {
+                  pc1.setRemoteDescription(answer, function() {
+                    throw new Error("Expected");
+                  }, getFail(new Error));
+                  throw new Error("Expected");
+                }, getFail(new Error));
+                throw new Error("Expected");
+              }, getFail(new Error));
+              throw new Error("Expected");
+            }, getFail(new Error));
+            throw new Error("Expected");
+          }, getFail(new Error));
+          throw new Error("Expected");
+        });
+      }, getFail(new Error));
+      throw new Error("Expected");
+    });
+  }, 1);
+
+  function finish() {
+    window.onerror = oldOnError;
+    ok(error_count == 7, "Seven expected errors verified.");
+    SimpleTest.finish();
+  }
+
+  function getFail(where) {
+    return function (err) {
+      window.onerror = onOldError;
+      unexpectedCallbackAndFinish(where)(err);
+    };
+  }
+</script>
+</pre>
+</body>
+</html>

From 345660552aa4a0af67f29a2bd3f1329d4bf17817 Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Wed, 17 Apr 2013 00:42:10 -0700
Subject: [PATCH 102/438] Bug 862053 - Use getBoundingClientRect instead of
 offsetParents, r=mdas

---
 testing/marionette/marionette-listener.js | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/testing/marionette/marionette-listener.js b/testing/marionette/marionette-listener.js
index c5b61a380234..8181478a3ed8 100644
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -719,19 +719,11 @@ function coordinates(target, x0, y0, x1, y1) {
  * This function returns if the element is in viewport 
  */
 function elementInViewport(el) {
-  let top = el.offsetTop;
-  let left = el.offsetLeft;
-  let width = el.offsetWidth;
-  let height = el.offsetHeight;
-  while(el.offsetParent) {
-    el = el.offsetParent;
-    top += el.offsetTop;
-    left += el.offsetLeft;
-  }
-  return (top >= curWindow.pageYOffset &&
-          left >= curWindow.pageXOffset &&
-          (top + height) <= (curWindow.pageYOffset + curWindow.innerHeight) &&
-          (left + width) <= (curWindow.pageXOffset + curWindow.innerWidth)
+  let rect = el.getBoundingClientRect();
+  return (rect.top >= curWindow.pageYOffset &&
+          rect.left >= curWindow.pageXOffset &&
+          rect.bottom <= (curWindow.pageYOffset + curWindow.innerHeight) &&
+          rect.right <= (curWindow.pageXOffset + curWindow.innerWidth)
          );
 }
 

From 66e6c6755e765a9649d748ed64324699b078eb84 Mon Sep 17 00:00:00 2001
From: Gabor Krizsanits <gkrizsanits@mozilla.com>
Date: Wed, 17 Apr 2013 10:11:53 +0200
Subject: [PATCH 103/438] Bug 820170 - Wrapping nodes into documents
 compartment. r=bholley

---
 content/base/src/nsDocument.cpp               |  7 ++++
 content/xul/document/src/XULDocument.cpp      | 29 +++++++++++++-
 dom/base/nsDOMClassInfo.cpp                   | 39 +++++--------------
 .../tests/unit/test_allowedDomainsXHR.js      | 39 ++++++++++++++-----
 4 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 9e5e77800733..f0e2f999e31d 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1852,6 +1852,13 @@ nsDocument::Init()
   mRadioGroups.Init();
   mCustomPrototypes.Init();
 
+  // If after creation the owner js global is not set for a document
+  // we use the default compartment for this document, instead of creating
+  // wrapper in some random compartment when the document is exposed to js
+  // via some events.
+  mScopeObject = do_GetWeakReference(xpc::GetNativeForGlobal(xpc::GetJunkScope()));
+  MOZ_ASSERT(mScopeObject);
+
   // Force initialization.
   nsINode::nsSlots* slots = Slots();
 
diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp
index 14dcfdc6ac0b..3ef4668d898b 100644
--- a/content/xul/document/src/XULDocument.cpp
+++ b/content/xul/document/src/XULDocument.cpp
@@ -1517,6 +1517,29 @@ XULDocument::GetHeight(ErrorResult& aRv)
     return height;
 }
 
+JSObject*
+GetScopeObjectOfNode(nsIDOMNode* node)
+{
+    MOZ_ASSERT(node, "Must not be called with null.");
+
+    // Window root occasionally keeps alive a node of a document whose
+    // window is already dead. If in this brief period someone calls
+    // GetPopupNode and we return that node, nsNodeSH::PreCreate will throw,
+    // because it will not know which scope this node belongs to. Returning
+    // an orphan node like that to JS would be a bug anyway, so to avoid
+    // this, let's do the same check as nsNodeSH::PreCreate does to
+    // determine the scope and if it fails let's just return null in
+    // XULDocument::GetPopupNode.
+    nsCOMPtr<nsINode> inode = do_QueryInterface(node);
+    MOZ_ASSERT(inode, "How can this happen?");
+
+    nsIDocument* doc = inode->OwnerDoc();
+    MOZ_ASSERT(inode, "This should never happen.");
+
+    nsIGlobalObject* global = doc->GetScopeObject();
+    return global ? global->GetGlobalJSObject() : nullptr;
+}
+
 //----------------------------------------------------------------------
 //
 // nsIDOMXULDocument interface
@@ -1539,8 +1562,10 @@ XULDocument::GetPopupNode(nsIDOMNode** aNode)
         }
     }
 
-    if (node && nsContentUtils::CanCallerAccess(node))
-      node.swap(*aNode);
+    if (node && nsContentUtils::CanCallerAccess(node)
+        && GetScopeObjectOfNode(node)) {
+        node.swap(*aNode);
+    }
 
     return NS_OK;
 }
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 3a7a3c3cf3fb..ee9dfc7fa9d0 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -5550,18 +5550,6 @@ nsNodeSH::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj,
   // See http://bugzilla.mozilla.org/show_bug.cgi?id=227417
   nsIDocument* doc = node->OwnerDoc();
 
-  // If we have a document, make sure one of these is true
-  // (1) it has a script handling object,
-  // (2) has had one, or has been marked to have had one,
-  // (3) we are running a privileged script.
-  // Event handling is possible only if (1). If (2) event handling is prevented.
-  // If document has never had a script handling object,
-  // untrusted scripts (3) shouldn't touch it!
-  bool hasHadScriptHandlingObject = false;
-  NS_ENSURE_STATE(doc->GetScriptHandlingObject(hasHadScriptHandlingObject) ||
-                  hasHadScriptHandlingObject ||
-                  nsContentUtils::IsCallerChrome());
-
   nsINode *native_parent;
 
   bool nodeIsElement = node->IsElement();
@@ -5610,26 +5598,17 @@ nsNodeSH::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj,
     }
   } else {
     // We're called for a document object; set the parent to be the
-    // document's global object, if there is one
+    // document's global object
 
-    // Get the scope object from the document.
-    nsISupports *scope = doc->GetScopeObject();
+    // Document should know its global but if the owner window of the
+    // document is already dead at this point, then just throw.
+    nsIGlobalObject* scope = doc->GetScopeObject();
+    NS_ENSURE_TRUE(scope, NS_ERROR_UNEXPECTED);
 
-    if (scope) {
-        jsval v;
-        nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-        nsresult rv = WrapNative(cx, globalObj, scope, false, &v,
-                                 getter_AddRefs(holder));
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        holder->GetJSObject(parentObj);
-    }
-    else {
-      // No global object reachable from this document, use the
-      // global object that was passed to this method.
-
-      *parentObj = globalObj;
-    }
+    *parentObj = scope->GetGlobalJSObject();
+    // Guarding against the case when the native global is still alive
+    // but the JS global is not.
+    NS_ENSURE_TRUE(*parentObj, NS_ERROR_UNEXPECTED);
 
     // No slim wrappers for a document's scope object.
     return node->ChromeOnlyAccess() ?
diff --git a/js/xpconnect/tests/unit/test_allowedDomainsXHR.js b/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
index 20e82224b766..183484737ab5 100644
--- a/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
+++ b/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
@@ -32,8 +32,17 @@ function checkResults(xhr)
   return true;
 }
 
+var httpServersClosed = 0;
+function finishIfDone()
+{
+  if (++httpServersClosed == 2)
+    do_test_finished();
+}
+
 function run_test()
 {
+  do_test_pending();
+
   httpserver.registerPathHandler(testpath, serverHandler);
   httpserver.start(4444);
 
@@ -45,14 +54,6 @@ function run_test()
   var res = cu.evalInSandbox('var sync = createXHR("4444/simple"); sync.send(null); sync', sb);
   checkResults(res);
 
-  // Test async XHR sending
-  var async = cu.evalInSandbox('var async = createXHR("4444/simple", true); async', sb);
-  async.addEventListener("readystatechange", function(event) {
-    if (checkResults(async))
-      httpserver.stop(do_test_finished);
-  }, false);
-  async.send(null);
-
   // negative test sync XHR sending (to ensure that the xhr do not have chrome caps, see bug 779821)
   try {
     cu.evalInSandbox('var createXHR = ' + createXHR.toString(), sb);
@@ -61,8 +62,28 @@ function run_test()
   } catch (e) {
     do_check_true(true);
   }
+
+  httpserver2.stop(finishIfDone);
+
+  // Test async XHR sending
+  sb.finish = function(){
+    httpserver.stop(finishIfDone);
+  }
+
+  sb.checkResults = checkResults;
   
-  do_test_pending();
+  sb.do_check_eq = do_check_eq;
+
+  function changeListener(event) {
+    if (checkResults(async))
+      finish();
+  }
+
+  var async = cu.evalInSandbox('var async = createXHR("4444/simple", true);' +
+                               'async.addEventListener("readystatechange", ' +
+                                                       changeListener.toString() + ', false);' +
+                               'async', sb);
+  async.send(null);
 }
 
 function serverHandler(metadata, response)

From 02ae98ba2fc8cd7a956a02114e6a2bb78d25152e Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 17 Apr 2013 09:22:55 +0100
Subject: [PATCH 104/438] Bug 862693 - Stop the :-moz-focusring pseudo-class
 from matching if an element is themed and the theme will display a visual
 indication of focus for the element. r=roc

---
 dom/base/nsFocusManager.cpp                   | 21 ++++++++++++++++++-
 dom/base/nsFocusManager.h                     |  2 ++
 dom/base/nsGlobalWindow.cpp                   |  3 ++-
 .../mochitest/general/test_focusrings.xul     |  3 ++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 2df8b97582cd..44ce2e474717 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1018,6 +1018,23 @@ nsFocusManager::FocusPlugin(nsIContent* aContent)
   return NS_OK;
 }
 
+/* static */ bool
+nsFocusManager::ThemeDisplaysFocusForContent(nsIContent* aContent)
+{
+  // We don't want to draw the focusring if the element is themed and
+  // the theme displays an indication of focus for the element.
+  nsIFrame* frame = aContent->GetPrimaryFrame();
+  if (frame) {
+    nsPresContext *presContext = frame->PresContext();
+    const nsStyleDisplay *disp = frame->StyleDisplay();
+    if (frame->IsThemed(disp) &&
+        presContext->GetTheme()->ThemeDrawsFocusForWidget(presContext, frame, disp->mAppearance)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 /* static */
 void
 nsFocusManager::NotifyFocusStateChange(nsIContent* aContent,
@@ -1028,7 +1045,9 @@ nsFocusManager::NotifyFocusStateChange(nsIContent* aContent,
     return;
   }
   nsEventStates eventState = NS_EVENT_STATE_FOCUS;
-  if (aWindowShouldShowFocusRing) {
+  if (!aGettingFocus ||
+      (aWindowShouldShowFocusRing &&
+       !ThemeDisplaysFocusForContent(aContent))) {
     eventState |= NS_EVENT_STATE_FOCUSRING;
   }
   if (aGettingFocus) {
diff --git a/dom/base/nsFocusManager.h b/dom/base/nsFocusManager.h
index 4259de41a3f4..a4f5356e8ba5 100644
--- a/dom/base/nsFocusManager.h
+++ b/dom/base/nsFocusManager.h
@@ -116,6 +116,8 @@ public:
 
   static bool sMouseFocusesFormControl;
 
+  static bool ThemeDisplaysFocusForContent(nsIContent* aContent);
+
 protected:
 
   nsFocusManager();
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 62f8e589752b..f925943d60e7 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -8463,7 +8463,8 @@ nsGlobalWindow::SetKeyboardIndicators(UIStateChangeType aShowAccelerators,
       oldShouldShowFocusRing != newShouldShowFocusRing &&
       mFocusedNode->IsElement()) {
     // Update mFocusedNode's state.
-    if (newShouldShowFocusRing) {
+    if (newShouldShowFocusRing &&
+        !nsFocusManager::ThemeDisplaysFocusForContent(mFocusedNode.get())) {
       mFocusedNode->AsElement()->AddStates(NS_EVENT_STATE_FOCUSRING);
     } else {
       mFocusedNode->AsElement()->RemoveStates(NS_EVENT_STATE_FOCUSRING);
diff --git a/dom/tests/mochitest/general/test_focusrings.xul b/dom/tests/mochitest/general/test_focusrings.xul
index 3fe267b60c27..87e2250ee6b2 100644
--- a/dom/tests/mochitest/general/test_focusrings.xul
+++ b/dom/tests/mochitest/general/test_focusrings.xul
@@ -49,6 +49,7 @@ function runTest()
 
   var isMac = (navigator.platform.indexOf("Mac") >= 0);
   var isWin = (navigator.platform.indexOf("Win") >= 0);
+  var isLinux = (navigator.platform.indexOf("Linux") >= 0);
 
   function checkFocus(element, visible, testid)
   {
@@ -100,7 +101,7 @@ function runTest()
   checkFocus($("l2"), true, "appearance on list after mouse focus with :focus");
 
   synthesizeMouse($("b1"), 4, 4, { });
-  checkFocus($("b1"), !isMac && expectedVisible, "appearance on button after mouse focus with :moz-focusring");
+  checkFocus($("b1"), !isMac && !isLinux && expectedVisible, "appearance on button after mouse focus with :moz-focusring");
   if (navigator.platform.indexOf("Mac") >= 0) {
     ok(compareSnapshots(snapShot($("b1")), snapShot($("b2")), false)[0], "focus after mouse shows no ring");
   }

From 0f64c0b43f8557ec558cb7316c8ae2b5bc511cf4 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 17 Apr 2013 09:24:46 +0100
Subject: [PATCH 105/438] Bug 851777 - Don't display a CSS focus ring on <input
 type=range> when OS X native theming is being used. r=roc

---
 widget/cocoa/nsNativeThemeCocoa.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 57e2b709d614..cba01e5a5bb8 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -3021,6 +3021,7 @@ nsNativeThemeCocoa::ThemeDrawsFocusForWidget(nsPresContext* aPresContext, nsIFra
       aWidgetType == NS_THEME_DROPDOWN_TEXTFIELD ||
       aWidgetType == NS_THEME_BUTTON ||
       aWidgetType == NS_THEME_RADIO ||
+      aWidgetType == NS_THEME_RANGE ||
       aWidgetType == NS_THEME_CHECKBOX)
     return true;
 

From 67157be6780d39a2bddc254d7eacfb200ee95616 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Wed, 17 Apr 2013 04:29:35 -0400
Subject: [PATCH 106/438] bug 733712 - don't call atk_object_set_name()
 r=tbsaunde

---
 accessible/src/atk/AccessibleWrap.cpp | 44 +++++++++++++++++++++------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/accessible/src/atk/AccessibleWrap.cpp b/accessible/src/atk/AccessibleWrap.cpp
index 916c739d0f9e..8048abca128a 100644
--- a/accessible/src/atk/AccessibleWrap.cpp
+++ b/accessible/src/atk/AccessibleWrap.cpp
@@ -141,6 +141,8 @@ struct MaiAtkObjectClass
 
 static guint mai_atk_object_signals [LAST_SIGNAL] = { 0, };
 
+static void MaybeFireNameChange(AtkObject* aAtkObj, const nsString& aNewName);
+
 G_BEGIN_DECLS
 /* callbacks for MaiAtkObject */
 static void classInitCB(AtkObjectClass *aClass);
@@ -600,16 +602,41 @@ getNameCB(AtkObject* aAtkObj)
   if (!accWrap)
     return nullptr;
 
-  nsAutoString uniName;
-  accWrap->Name(uniName);
+  nsAutoString name;
+  accWrap->Name(name);
 
-  NS_ConvertUTF8toUTF16 objName(aAtkObj->name);
-  if (!uniName.Equals(objName))
-    atk_object_set_name(aAtkObj, NS_ConvertUTF16toUTF8(uniName).get());
+  // XXX Firing an event from here does not seem right
+  MaybeFireNameChange(aAtkObj, name);
 
   return aAtkObj->name;
 }
 
+static void
+MaybeFireNameChange(AtkObject* aAtkObj, const nsString& aNewName)
+{
+  NS_ConvertUTF16toUTF8 newNameUTF8(aNewName);
+  if (aAtkObj->name && newNameUTF8.Equals(aAtkObj->name))
+    return;
+
+  // Below we duplicate the functionality of atk_object_set_name(),
+  // but without calling atk_object_get_name(). Instead of
+  // atk_object_get_name() we directly access aAtkObj->name. This is because
+  // atk_object_get_name() would call getNameCB() which would call
+  // MaybeFireNameChange() (or atk_object_set_name() before this problem was
+  // fixed) and we would get an infinite recursion.
+  // See http://bugzilla.mozilla.org/733712
+
+  // Do not notify for initial name setting.
+  // See bug http://bugzilla.gnome.org/665870
+  bool notify = !!aAtkObj->name;
+
+  free(aAtkObj->name);
+  aAtkObj->name = strdup(newNameUTF8.get());
+
+  if (notify)
+    g_object_notify(G_OBJECT(aAtkObj), "accessible-name");
+}
+
 const gchar *
 getDescriptionCB(AtkObject *aAtkObj)
 {
@@ -617,7 +644,7 @@ getDescriptionCB(AtkObject *aAtkObj)
     if (!accWrap || accWrap->IsDefunct())
         return nullptr;
 
-    /* nsIAccessible is responsible for the non-nullptr description */
+    /* nsIAccessible is responsible for the nonnull description */
     nsAutoString uniDesc;
     accWrap->Description(uniDesc);
 
@@ -975,9 +1002,8 @@ AccessibleWrap::FirePlatformEvent(AccEvent* aEvent)
       {
         nsAutoString newName;
         accessible->Name(newName);
-        NS_ConvertUTF16toUTF8 utf8Name(newName);
-        if (!atkObj->name || !utf8Name.Equals(atkObj->name))
-          atk_object_set_name(atkObj, utf8Name.get());
+
+        MaybeFireNameChange(atkObj, newName);
 
         break;
       }

From 25d88cbf1fbf961cd26c4e80df57276e6be7461e Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Wed, 17 Apr 2013 11:31:44 +0200
Subject: [PATCH 107/438] Bug 858617: Add testcase, r=testcase

---
 js/src/jit-test/tests/ion/bug858617.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 js/src/jit-test/tests/ion/bug858617.js

diff --git a/js/src/jit-test/tests/ion/bug858617.js b/js/src/jit-test/tests/ion/bug858617.js
new file mode 100644
index 000000000000..b322e72bf464
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug858617.js
@@ -0,0 +1,18 @@
+function TestCase(e, a) {
+  getTestCaseResult(e, a);
+};
+function reportCompare (expected, actual) {
+  new TestCase(expected, actual);
+}
+function enterFunc() {}
+function getTestCaseResult(expected, actual) {
+  return actual == expected;
+}
+reportCompare('', '');
+evaluate("\
+test();\
+function test() {\
+  enterFunc();\
+  reportCompare();\
+}\
+");

From f1e2a2c37b9085a8bdaf3baeffb5de016e7ec5f3 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Wed, 17 Apr 2013 11:31:45 +0200
Subject: [PATCH 108/438] Bug 861165: IonMonkey: Correct behaviour for JSOP_IN
 on dense native with negative index, r=bhackett

---
 js/src/ion/CodeGenerator.cpp           | 59 +++++++++++++++---
 js/src/ion/IonBuilder.cpp              |  2 +-
 js/src/ion/LIR-Common.h                | 10 ++-
 js/src/ion/Lowering.cpp                | 10 ++-
 js/src/ion/MIR.cpp                     |  6 ++
 js/src/ion/MIR.h                       | 73 ++++++++++++++++++++--
 js/src/ion/TypePolicy.cpp              |  2 +
 js/src/ion/VMFunctions.cpp             |  7 +++
 js/src/ion/VMFunctions.h               |  1 +
 js/src/jit-test/tests/ion/bug861165.js | 85 ++++++++++++++++++++++++++
 10 files changed, 237 insertions(+), 18 deletions(-)
 create mode 100644 js/src/jit-test/tests/ion/bug861165.js

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 5106493af101..fd71f60dd11e 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -5561,35 +5561,76 @@ CodeGenerator::visitIn(LIn *ins)
     return callVM(OperatorInInfo, ins);
 }
 
+typedef bool (*OperatorInIFn)(JSContext *, uint32_t, HandleObject, JSBool *);
+static const VMFunction OperatorInIInfo = FunctionInfo<OperatorInIFn>(OperatorInI);
+
 bool
 CodeGenerator::visitInArray(LInArray *lir)
 {
+    const MInArray *mir = lir->mir();
     Register elements = ToRegister(lir->elements());
     Register initLength = ToRegister(lir->initLength());
     Register output = ToRegister(lir->output());
 
     // When the array is not packed we need to do a hole check in addition to the bounds check.
-    Label falseBranch, done;
+    Label falseBranch, done, trueBranch;
+
+    OutOfLineCode *ool = NULL;
+    Label* failedInitLength = &falseBranch;
+
     if (lir->index()->isConstant()) {
-        masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(ToInt32(lir->index())), &falseBranch);
-        if (lir->mir()->needsHoleCheck()) {
-            masm.branchTestMagic(Assembler::Equal, Address(elements, ToInt32(lir->index()) * sizeof(Value)),
-                                 &falseBranch);
+        int32_t index = ToInt32(lir->index());
+
+        JS_ASSERT_IF(index < 0, mir->needsNegativeIntCheck());
+        if (mir->needsNegativeIntCheck()) {
+            ool = oolCallVM(OperatorInIInfo, lir,
+                            (ArgList(), Imm32(index), ToRegister(lir->object())),
+                            StoreRegisterTo(output));
+            failedInitLength = ool->entry();
+        }
+
+        masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(index), failedInitLength);
+        if (mir->needsHoleCheck()) {
+            Address address = Address(elements, index * sizeof(Value));
+            masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
         }
     } else {
-        masm.branch32(Assembler::BelowOrEqual, initLength, ToRegister(lir->index()), &falseBranch);
-        if (lir->mir()->needsHoleCheck()) {
-            masm.branchTestMagic(Assembler::Equal, BaseIndex(elements, ToRegister(lir->index()), TimesEight),
-                                 &falseBranch);
+        Label negativeIntCheck;
+        Register index = ToRegister(lir->index());
+
+        if (mir->needsNegativeIntCheck())
+            failedInitLength = &negativeIntCheck;
+
+        masm.branch32(Assembler::BelowOrEqual, initLength, index, failedInitLength);
+        if (mir->needsHoleCheck()) {
+            BaseIndex address = BaseIndex(elements, ToRegister(lir->index()), TimesEight);
+            masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
+        }
+        masm.jump(&trueBranch);
+
+        if (mir->needsNegativeIntCheck()) {
+            masm.bind(&negativeIntCheck);
+            ool = oolCallVM(OperatorInIInfo, lir,
+                            (ArgList(), index, ToRegister(lir->object())),
+                            StoreRegisterTo(output));
+
+            masm.testl(index, index);
+            masm.j(Assembler::Signed, ool->entry());
+            masm.jump(&falseBranch);
         }
     }
 
+    masm.bind(&trueBranch);
     masm.move32(Imm32(1), output);
     masm.jump(&done);
 
     masm.bind(&falseBranch);
     masm.move32(Imm32(0), output);
     masm.bind(&done);
+
+    if (ool)
+        masm.bind(ool->rejoin());
+
     return true;
 }
 
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 8a4b4f8f8974..b3b43753e4be 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -7394,7 +7394,7 @@ IonBuilder::jsop_in_dense()
     current->add(initLength);
 
     // Check if id < initLength and elem[id] not a hole.
-    MInArray *ins = MInArray::New(elements, id, initLength, needsHoleCheck);
+    MInArray *ins = MInArray::New(elements, id, initLength, obj, needsHoleCheck);
 
     current->add(ins);
     current->push(ins);
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index 5d6ef835e6bf..c37d3cd7dfe0 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -2718,15 +2718,18 @@ class LLoadElementV : public LInstructionHelper<BOX_PIECES, 2, 0>
     }
 };
 
-class LInArray : public LInstructionHelper<1, 3, 0>
+class LInArray : public LInstructionHelper<1, 4, 0>
 {
   public:
     LIR_HEADER(InArray)
 
-    LInArray(const LAllocation &elements, const LAllocation &index, const LAllocation &initLength) {
+    LInArray(const LAllocation &elements, const LAllocation &index,
+             const LAllocation &initLength, const LAllocation &object)
+    {
         setOperand(0, elements);
         setOperand(1, index);
         setOperand(2, initLength);
+        setOperand(3, object);
     }
     const MInArray *mir() const {
         return mir_->toInArray();
@@ -2740,6 +2743,9 @@ class LInArray : public LInstructionHelper<1, 3, 0>
     const LAllocation *initLength() {
         return getOperand(2);
     }
+    const LAllocation *object() {
+        return getOperand(3);
+    }
 };
 
 
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 75de254f6577..8a1c220d16f2 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -1819,11 +1819,19 @@ LIRGenerator::visitInArray(MInArray *ins)
     JS_ASSERT(ins->elements()->type() == MIRType_Elements);
     JS_ASSERT(ins->index()->type() == MIRType_Int32);
     JS_ASSERT(ins->initLength()->type() == MIRType_Int32);
+    JS_ASSERT(ins->object()->type() == MIRType_Object);
     JS_ASSERT(ins->type() == MIRType_Boolean);
 
+    LAllocation object;
+    if (ins->needsNegativeIntCheck())
+        object = useRegister(ins->object());
+    else
+        object = LConstantIndex::Bogus();
+
     LInArray *lir = new LInArray(useRegister(ins->elements()),
                                  useRegisterOrConstant(ins->index()),
-                                 useRegister(ins->initLength()));
+                                 useRegister(ins->initLength()),
+                                 object);
     return define(lir, ins) && assignSafepoint(lir, ins);
 }
 
diff --git a/js/src/ion/MIR.cpp b/js/src/ion/MIR.cpp
index 7b94d6c7419f..2914423b66b1 100644
--- a/js/src/ion/MIR.cpp
+++ b/js/src/ion/MIR.cpp
@@ -2007,6 +2007,12 @@ InlinePropertyTable::hasFunction(JSFunction *func) const
     return false;
 }
 
+bool
+MInArray::needsNegativeIntCheck() const
+{
+    return !index()->range() || index()->range()->lower() < 0;
+}
+
 MDefinition *
 MAsmJSUnsignedToDouble::foldsTo(bool useValueNumbers)
 {
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index faa0d1ed38fa..55e740c3c467 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -1654,6 +1654,57 @@ class MTernaryInstruction : public MAryInstruction<3>
     }
 };
 
+class MQuaternaryInstruction : public MAryInstruction<4>
+{
+  protected:
+    MQuaternaryInstruction(MDefinition *first, MDefinition *second,
+                           MDefinition *third, MDefinition *fourth)
+    {
+        setOperand(0, first);
+        setOperand(1, second);
+        setOperand(2, third);
+        setOperand(3, fourth);
+    }
+
+  protected:
+    HashNumber valueHash() const
+    {
+        MDefinition *first = getOperand(0);
+        MDefinition *second = getOperand(1);
+        MDefinition *third = getOperand(2);
+        MDefinition *fourth = getOperand(3);
+
+        return op() ^ first->valueNumber() ^ second->valueNumber() ^
+                      third->valueNumber() ^ fourth->valueNumber();
+    }
+
+    bool congruentTo(MDefinition *const &ins) const
+    {
+        if (op() != ins->op())
+            return false;
+
+        if (type() != ins->type())
+            return false;
+
+        if (isEffectful() || ins->isEffectful())
+            return false;
+
+        MDefinition *first = getOperand(0);
+        MDefinition *second = getOperand(1);
+        MDefinition *third = getOperand(2);
+        MDefinition *fourth = getOperand(3);
+        MDefinition *insFirst = ins->getOperand(0);
+        MDefinition *insSecond = ins->getOperand(1);
+        MDefinition *insThird = ins->getOperand(2);
+        MDefinition *insFourth = ins->getOperand(3);
+
+        return first->valueNumber() == insFirst->valueNumber() &&
+               second->valueNumber() == insSecond->valueNumber() &&
+               third->valueNumber() == insThird->valueNumber() &&
+               fourth->valueNumber() == insFourth->valueNumber();
+    }
+};
+
 class MCompare
   : public MBinaryInstruction,
     public ComparePolicy
@@ -6295,12 +6346,15 @@ class MIn
 
 // Test whether the index is in the array bounds or a hole.
 class MInArray
-  : public MTernaryInstruction
+  : public MQuaternaryInstruction,
+    public ObjectPolicy<3>
 {
     bool needsHoleCheck_;
 
-    MInArray(MDefinition *elements, MDefinition *index, MDefinition *initLength, bool needsHoleCheck)
-      : MTernaryInstruction(elements, index, initLength),
+    MInArray(MDefinition *elements, MDefinition *index,
+             MDefinition *initLength, MDefinition *object,
+             bool needsHoleCheck)
+      : MQuaternaryInstruction(elements, index, initLength, object),
         needsHoleCheck_(needsHoleCheck)
     {
         setResultType(MIRType_Boolean);
@@ -6314,8 +6368,10 @@ class MInArray
     INSTRUCTION_HEADER(InArray)
 
     static MInArray *New(MDefinition *elements, MDefinition *index,
-                         MDefinition *initLength, bool needsHoleCheck) {
-        return new MInArray(elements, index, initLength, needsHoleCheck);
+                         MDefinition *initLength, MDefinition *object,
+                         bool needsHoleCheck)
+    {
+        return new MInArray(elements, index, initLength, object, needsHoleCheck);
     }
 
     MDefinition *elements() const {
@@ -6327,12 +6383,19 @@ class MInArray
     MDefinition *initLength() const {
         return getOperand(2);
     }
+    MDefinition *object() const {
+        return getOperand(3);
+    }
     bool needsHoleCheck() const {
         return needsHoleCheck_;
     }
+    bool needsNegativeIntCheck() const;
     AliasSet getAliasSet() const {
         return AliasSet::Load(AliasSet::Element);
     }
+    TypePolicy *typePolicy() {
+        return this;
+    }
 };
 
 // Implementation for instanceof operator with specific rhs.
diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index ce60a3528c03..fc44e5d5f0c6 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -396,6 +396,8 @@ ObjectPolicy<Op>::staticAdjustInputs(MInstruction *ins)
 
 template bool ObjectPolicy<0>::staticAdjustInputs(MInstruction *ins);
 template bool ObjectPolicy<1>::staticAdjustInputs(MInstruction *ins);
+template bool ObjectPolicy<2>::staticAdjustInputs(MInstruction *ins);
+template bool ObjectPolicy<3>::staticAdjustInputs(MInstruction *ins);
 
 bool
 CallPolicy::adjustInputs(MInstruction *ins)
diff --git a/js/src/ion/VMFunctions.cpp b/js/src/ion/VMFunctions.cpp
index c9f2f8dda262..b1dd826206a0 100644
--- a/js/src/ion/VMFunctions.cpp
+++ b/js/src/ion/VMFunctions.cpp
@@ -507,6 +507,13 @@ OperatorIn(JSContext *cx, HandleValue key, HandleObject obj, JSBool *out)
     return true;
 }
 
+bool
+OperatorInI(JSContext *cx, uint32_t index, HandleObject obj, JSBool *out)
+{
+    RootedValue key(cx, Int32Value(index));
+    return OperatorIn(cx, key, obj, out);
+}
+
 bool
 GetIntrinsicValue(JSContext *cx, HandlePropertyName name, MutableHandleValue rval)
 {
diff --git a/js/src/ion/VMFunctions.h b/js/src/ion/VMFunctions.h
index c7477ddd2b0f..13be91aea586 100644
--- a/js/src/ion/VMFunctions.h
+++ b/js/src/ion/VMFunctions.h
@@ -521,6 +521,7 @@ bool SPSEnter(JSContext *cx, HandleScript script);
 bool SPSExit(JSContext *cx, HandleScript script);
 
 bool OperatorIn(JSContext *cx, HandleValue key, HandleObject obj, JSBool *out);
+bool OperatorInI(JSContext *cx, uint32_t index, HandleObject obj, JSBool *out);
 
 bool GetIntrinsicValue(JSContext *cx, HandlePropertyName name, MutableHandleValue rval);
 
diff --git a/js/src/jit-test/tests/ion/bug861165.js b/js/src/jit-test/tests/ion/bug861165.js
new file mode 100644
index 000000000000..924dcbaaef86
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug861165.js
@@ -0,0 +1,85 @@
+// |jit-test| no-jm
+
+// IM has the following fastpaths:
+// - constant index (constant)
+// - need negative int check (neg)
+// - needs hole check (hole)
+// So to test everything we have to do:
+//            constant | neg | hole
+//  test 1:     0         0      0
+//  test 2:     1         0      0
+//  test 3:     0         1      0
+//  test 4:     1         1      0
+//  test 5:     0         0      1
+//  test 6:     1         0      1
+//  test 7:     0         1      1
+//  test 8:     1         1      1
+
+function test1(index, a) {
+  if (index < 0)
+    index = -index
+  return index in a;
+}
+assertEq(test1(1, [1,2]), true);
+
+function test2(a) {
+  return 0 in a;
+}
+assertEq(test2([1,2]), true);
+
+function test3(index, a) {
+  return index in a;
+}
+
+var arr3 = [];
+arr3["-1073741828"] = 17;
+assertEq(test3(-1073741828, arr3), true);
+
+function test4(a) {
+  return -1073741828 in a;
+}
+assertEq(test4(arr3), true);
+
+
+function test5(index, a) {
+  if (index < 0)
+    index = -index
+  return index in a;
+}
+var arr5 = [];
+arr5[0] = 1
+arr5[1] = 1
+arr5[2] = 1
+arr5[4] = 1
+assertEq(test5(1, arr5), true);
+assertEq(test5(3, arr5), false);
+
+function test7a(a) {
+  return 3 in a;
+}
+function test7b(a) {
+  return 4 in a;
+}
+assertEq(test7a(arr5), false);
+assertEq(test7b(arr5), true);
+
+function test8(index, a) {
+  return index in a;
+}
+arr5["-1073741828"] = 17;
+assertEq(test8(-1073741828, arr5), true);
+assertEq(test8(3, arr5), false);
+assertEq(test8(0, arr5), true);
+
+function test9a(a) {
+  return 0 in a;
+}
+function test9b(a) {
+  return 3 in a;
+}
+function test9c(a) {
+  return -1073741828 in a;
+}
+assertEq(test9a(arr5), true);
+assertEq(test9b(arr5), false);
+assertEq(test9c(arr5), true);

From 1fe67d203cc03983b0be404fd09d80f039cb874e Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Wed, 17 Apr 2013 11:31:48 +0200
Subject: [PATCH 109/438] Bug 862357: IonMonkey: Box undefined inputs in the
 compare policy, r=nbp

---
 js/src/ion/TypePolicy.cpp              |  5 ++++-
 js/src/jit-test/tests/ion/bug862357.js | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 js/src/jit-test/tests/ion/bug862357.js

diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index fc44e5d5f0c6..f26e28caecd9 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -178,8 +178,11 @@ ComparePolicy::adjustInputs(MInstruction *def)
         MInstruction *replace;
 
         // See BinaryArithPolicy::adjustInputs for an explanation of the following
-        if (in->type() == MIRType_Object || in->type() == MIRType_String)
+        if (in->type() == MIRType_Object || in->type() == MIRType_String ||
+            in->type() == MIRType_Undefined)
+        {
             in = boxAt(def, in);
+        }
 
         switch (type) {
           case MIRType_Double:
diff --git a/js/src/jit-test/tests/ion/bug862357.js b/js/src/jit-test/tests/ion/bug862357.js
new file mode 100644
index 000000000000..df96dc83b08b
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug862357.js
@@ -0,0 +1,21 @@
+// |jit-test| error: ReferenceError
+function TestCase(e, a)
+  this.passed = (e == a);
+function reportCompare (expected, actual) {
+  var expected_t = typeof expected;
+  var actual_t = typeof actual;
+  if (expected_t != actual_t)
+    printStatus();
+  new TestCase(expected, actual);
+}
+var expect = '';
+reportCompare(expect, '');
+try {
+  test();
+} catch(exc1) {}
+function test() {
+  var { expect }  = '';
+  for (var a = 1; a < 2; ++a)
+    reportCompare(expect, '');
+}
+test();

From 88bf6beafab4cb3f1c664a0a42595d76e4f47b5d Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Wed, 17 Apr 2013 11:31:50 +0200
Subject: [PATCH 110/438] Bug 862100: IonMonkey: AddTypeBarrier shouldn't
 unbox, when type is already double, r=nbp

---
 js/src/ion/IonBuilder.cpp              | 18 +++++++++---------
 js/src/jit-test/tests/ion/bug862100.js | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 js/src/jit-test/tests/ion/bug862100.js

diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index b3b43753e4be..7cebe3ac3c62 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -3088,23 +3088,23 @@ IonBuilder::addTypeBarrier(uint32_t i, CallInfo &callinfo, types::StackTypeSet *
                 // types should remain.
 
                 JSValueType callerType = callerObs->getKnownTypeTag();
-                if (callerType == JSVAL_TYPE_DOUBLE) {
-                    MInstruction *bailType = MToInt32::New(ins);
-                    current->add(bailType);
-                    ins = bailType;
-                } else {
+                if (callerType != JSVAL_TYPE_DOUBLE && ins->type() != MIRType_Double) {
                     // We expect either an Int or a Value, this variant is not
                     // optimized and favor the int variant by filtering out all
                     // other inputs.
                     JS_ASSERT(callerType == JSVAL_TYPE_UNKNOWN);
+                    JS_ASSERT(ins->type() == MIRType_Value);
                     // Bail if the input is not a number.
                     MInstruction *toDouble = MUnbox::New(ins, MIRType_Double, MUnbox::Fallible);
-                    // Bail if the double does not fit in an int.
-                    MInstruction *toInt = MToInt32::New(ins);
                     current->add(toDouble);
-                    current->add(toInt);
-                    ins = toInt;
+                    ins = toDouble;
                 }
+                JS_ASSERT(ins->type() == MIRType_Double ||
+                          ins->type() == MIRType_Value);
+                // Bail if the double does not fit in an int.
+                MInstruction *toInt = MToInt32::New(ins);
+                current->add(toInt);
+                ins = toInt;
 
                 needsBarrier = false;
                 break;
diff --git a/js/src/jit-test/tests/ion/bug862100.js b/js/src/jit-test/tests/ion/bug862100.js
new file mode 100644
index 000000000000..d50b28abda83
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug862100.js
@@ -0,0 +1,14 @@
+
+function TestCase(n, d, e, a) {}
+function reportCompare (expected, actual, description) {
+  new TestCase("", description, expected, actual);
+}
+new TestCase( "", "", 0, Number(new Number()) );
+reportCompare(true, true);
+evaluate("\
+function TestCase(n, d, e, a) {}\
+test_negation(-2147483648, 2147483648);\
+test_negation(2147483647, -2147483647);\
+function test_negation(value, expected)\
+    reportCompare(expected, '', '-(' + value + ') == ' + expected);\
+");

From 49a17fabe54dd3a9621d473f5c2e96bd1f48c262 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Wed, 17 Apr 2013 11:31:53 +0200
Subject: [PATCH 111/438] Bug 861116: IonBuilder: Add support for
 JSOP_INITELEM, r=jandem

---
 js/src/ion/CodeGenerator.cpp         | 27 ++++++++++++++++++-----
 js/src/ion/CodeGenerator.h           |  1 +
 js/src/ion/IonBuilder.cpp            | 16 ++++++++++++++
 js/src/ion/IonBuilder.h              |  1 +
 js/src/ion/LIR-Common.h              | 20 +++++++++++++++++
 js/src/ion/LOpcodes.h                |  1 +
 js/src/ion/Lowering.cpp              | 12 ++++++++++
 js/src/ion/Lowering.h                |  1 +
 js/src/ion/MIR.h                     | 33 ++++++++++++++++++++++++++++
 js/src/ion/MOpcodes.h                |  1 +
 js/src/ion/ParallelArrayAnalysis.cpp |  1 +
 js/src/ion/TypePolicy.h              | 14 ++++++++++++
 12 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index fd71f60dd11e..67bc9ef15aca 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -2648,11 +2648,6 @@ CodeGenerator::visitNewStringObject(LNewStringObject *lir)
     return true;
 }
 
-typedef bool(*InitPropFn)(JSContext *cx, HandleObject obj,
-                          HandlePropertyName name, HandleValue value);
-static const VMFunction InitPropInfo =
-    FunctionInfo<InitPropFn>(InitProp);
-
 bool
 CodeGenerator::visitParNew(LParNew *lir)
 {
@@ -2747,6 +2742,28 @@ CodeGenerator::visitParBailout(LParBailout *lir)
     return true;
 }
 
+typedef bool(*InitElemFn)(JSContext *cx, HandleObject obj,
+                          HandleValue id, HandleValue value);
+static const VMFunction InitElemInfo =
+    FunctionInfo<InitElemFn>(InitElemOperation);
+
+bool
+CodeGenerator::visitInitElem(LInitElem *lir)
+{
+    Register objReg = ToRegister(lir->getObject());
+
+    pushArg(ToValue(lir, LInitElem::ValueIndex));
+    pushArg(ToValue(lir, LInitElem::IdIndex));
+    pushArg(objReg);
+
+    return callVM(InitElemInfo, lir);
+}
+
+typedef bool(*InitPropFn)(JSContext *cx, HandleObject obj,
+                          HandlePropertyName name, HandleValue value);
+static const VMFunction InitPropInfo =
+    FunctionInfo<InitPropFn>(InitProp);
+
 bool
 CodeGenerator::visitInitProp(LInitProp *lir)
 {
diff --git a/js/src/ion/CodeGenerator.h b/js/src/ion/CodeGenerator.h
index 4130a3611ebc..b48e613a9490 100644
--- a/js/src/ion/CodeGenerator.h
+++ b/js/src/ion/CodeGenerator.h
@@ -116,6 +116,7 @@ class CodeGenerator : public CodeGeneratorSpecific
     bool visitParNew(LParNew *lir);
     bool visitParNewDenseArray(LParNewDenseArray *lir);
     bool visitParBailout(LParBailout *lir);
+    bool visitInitElem(LInitElem *lir);
     bool visitInitProp(LInitProp *lir);
     bool visitCreateThis(LCreateThis *lir);
     bool visitCreateThisWithProto(LCreateThisWithProto *lir);
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 7cebe3ac3c62..f4e080bdd360 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -952,6 +952,9 @@ IonBuilder::inspectOpcode(JSOp op)
         return jsop_newobject(baseObj);
       }
 
+      case JSOP_INITELEM:
+        return jsop_initelem();
+
       case JSOP_INITELEM_ARRAY:
         return jsop_initelem_array();
 
@@ -4779,6 +4782,19 @@ IonBuilder::jsop_newobject(HandleObject baseObj)
     return resumeAfter(ins);
 }
 
+bool
+IonBuilder::jsop_initelem()
+{
+    MDefinition *value = current->pop();
+    MDefinition *id = current->pop();
+    MDefinition *obj = current->peek(-1);
+
+    MInitElem *initElem = MInitElem::New(obj, id, value);
+    current->add(initElem);
+
+    return resumeAfter(initElem);
+}
+
 bool
 IonBuilder::jsop_initelem_array()
 {
diff --git a/js/src/ion/IonBuilder.h b/js/src/ion/IonBuilder.h
index 8f8f2a486734..91fdee673034 100644
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -375,6 +375,7 @@ class IonBuilder : public MIRGenerator
     bool jsop_delprop(HandlePropertyName name);
     bool jsop_newarray(uint32_t count);
     bool jsop_newobject(HandleObject baseObj);
+    bool jsop_initelem();
     bool jsop_initelem_array();
     bool jsop_initprop(HandlePropertyName name);
     bool jsop_regexp(RegExpObject *reobj);
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index c37d3cd7dfe0..56eaa8d0d19a 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -478,6 +478,26 @@ class LParBailout : public LInstructionHelper<0, 0, 0>
     LIR_HEADER(ParBailout);
 };
 
+class LInitElem : public LCallInstructionHelper<0, 1 + 2*BOX_PIECES, 0>
+{
+  public:
+    LIR_HEADER(InitElem)
+
+    LInitElem(const LAllocation &object) {
+        setOperand(0, object);
+    }
+
+    static const size_t IdIndex = 1;
+    static const size_t ValueIndex = 1 + BOX_PIECES;
+
+    const LAllocation *getObject() {
+        return getOperand(0);
+    }
+    MInitElem *mir() const {
+        return mir_->toInitElem();
+    }
+};
+
 // Takes in an Object and a Value.
 class LInitProp : public LCallInstructionHelper<0, 1 + BOX_PIECES, 0>
 {
diff --git a/js/src/ion/LOpcodes.h b/js/src/ion/LOpcodes.h
index b7bf009b266c..88142926f1c5 100644
--- a/js/src/ion/LOpcodes.h
+++ b/js/src/ion/LOpcodes.h
@@ -32,6 +32,7 @@
     _(ParNewDenseArray)             \
     _(ParNewCallObject)             \
     _(ParBailout)                   \
+    _(InitElem)                     \
     _(InitProp)                     \
     _(CheckOverRecursed)            \
     _(ParCheckOverRecursed)         \
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 8a1c220d16f2..f36d0984a4d1 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -237,6 +237,18 @@ LIRGenerator::visitParBailout(MParBailout *ins)
     return add(lir, ins);
 }
 
+bool
+LIRGenerator::visitInitElem(MInitElem *ins)
+{
+    LInitElem *lir = new LInitElem(useRegisterAtStart(ins->getObject()));
+    if (!useBoxAtStart(lir, LInitElem::IdIndex, ins->getId()))
+        return false;
+    if (!useBoxAtStart(lir, LInitElem::ValueIndex, ins->getValue()))
+        return false;
+
+    return add(lir, ins) && assignSafepoint(lir, ins);
+}
+
 bool
 LIRGenerator::visitInitProp(MInitProp *ins)
 {
diff --git a/js/src/ion/Lowering.h b/js/src/ion/Lowering.h
index cc8cd249df8b..6e11bcdbf050 100644
--- a/js/src/ion/Lowering.h
+++ b/js/src/ion/Lowering.h
@@ -94,6 +94,7 @@ class LIRGenerator : public LIRGeneratorSpecific
     bool visitParNewCallObject(MParNewCallObject *ins);
     bool visitParNewDenseArray(MParNewDenseArray *ins);
     bool visitParBailout(MParBailout *ins);
+    bool visitInitElem(MInitElem *ins);
     bool visitInitProp(MInitProp *ins);
     bool visitCheckOverRecursed(MCheckOverRecursed *ins);
     bool visitParCheckOverRecursed(MParCheckOverRecursed *ins);
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 55e740c3c467..58437d641a54 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -1243,6 +1243,39 @@ class MInitProp
     }
 };
 
+class MInitElem
+  : public MAryInstruction<3>,
+    public Mix3Policy<ObjectPolicy<0>, BoxPolicy<1>, BoxPolicy<2> >
+{
+    MInitElem(MDefinition *obj, MDefinition *id, MDefinition *value)
+    {
+        setOperand(0, obj);
+        setOperand(1, id);
+        setOperand(2, value);
+        setResultType(MIRType_None);
+    }
+
+  public:
+    INSTRUCTION_HEADER(InitElem)
+
+    static MInitElem *New(MDefinition *obj, MDefinition *id, MDefinition *value) {
+        return new MInitElem(obj, id, value);
+    }
+
+    MDefinition *getObject() const {
+        return getOperand(0);
+    }
+    MDefinition *getId() const {
+        return getOperand(1);
+    }
+    MDefinition *getValue() const {
+        return getOperand(2);
+    }
+    TypePolicy *typePolicy() {
+        return this;
+    }
+};
+
 // Designates the start of call frame construction.
 // Generates code to adjust the stack pointer for the argument vector.
 // Argc is inferred by checking the use chain during lowering.
diff --git a/js/src/ion/MOpcodes.h b/js/src/ion/MOpcodes.h
index a5123a627ccd..06630fd7ae24 100644
--- a/js/src/ion/MOpcodes.h
+++ b/js/src/ion/MOpcodes.h
@@ -81,6 +81,7 @@ namespace ion {
     _(NewDeclEnvObject)                                                     \
     _(NewCallObject)                                                        \
     _(NewStringObject)                                                      \
+    _(InitElem)                                                             \
     _(InitProp)                                                             \
     _(Start)                                                                \
     _(OsrEntry)                                                             \
diff --git a/js/src/ion/ParallelArrayAnalysis.cpp b/js/src/ion/ParallelArrayAnalysis.cpp
index 364df7b0902d..3fe70a523437 100644
--- a/js/src/ion/ParallelArrayAnalysis.cpp
+++ b/js/src/ion/ParallelArrayAnalysis.cpp
@@ -172,6 +172,7 @@ class ParallelArrayVisitor : public MInstructionVisitor
     CUSTOM_OP(NewObject)
     CUSTOM_OP(NewCallObject)
     CUSTOM_OP(NewParallelArray)
+    UNSAFE_OP(InitElem)
     UNSAFE_OP(InitProp)
     SAFE_OP(Start)
     UNSAFE_OP(OsrEntry)
diff --git a/js/src/ion/TypePolicy.h b/js/src/ion/TypePolicy.h
index 3f209e53c857..3dd5812581b9 100644
--- a/js/src/ion/TypePolicy.h
+++ b/js/src/ion/TypePolicy.h
@@ -186,6 +186,20 @@ class MixPolicy : public TypePolicy
     }
 };
 
+// Combine three policies.
+template <class Policy1, class Policy2, class Policy3>
+class Mix3Policy : public TypePolicy
+{
+  public:
+    static bool staticAdjustInputs(MInstruction *ins) {
+        return Policy1::staticAdjustInputs(ins) && Policy2::staticAdjustInputs(ins) &&
+               Policy3::staticAdjustInputs(ins);
+    }
+    virtual bool adjustInputs(MInstruction *ins) {
+        return staticAdjustInputs(ins);
+    }
+};
+
 class CallSetElementPolicy : public SingleObjectPolicy
 {
   public:

From 4489ff4345cbd0b5533e8d9ddd721945e0293049 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Wed, 17 Apr 2013 12:03:17 +0200
Subject: [PATCH 112/438] Backout a0016de79bf9 and 862431c42e72 for breakage,
 r=red

---
 js/src/ion/CodeGenerator.cpp           |  86 ++++----------------
 js/src/ion/CodeGenerator.h             |   1 -
 js/src/ion/IonBuilder.cpp              |  18 +----
 js/src/ion/IonBuilder.h                |   1 -
 js/src/ion/LIR-Common.h                |  30 +------
 js/src/ion/LOpcodes.h                  |   1 -
 js/src/ion/Lowering.cpp                |  22 +----
 js/src/ion/Lowering.h                  |   1 -
 js/src/ion/MIR.cpp                     |   6 --
 js/src/ion/MIR.h                       | 106 ++-----------------------
 js/src/ion/MOpcodes.h                  |   1 -
 js/src/ion/ParallelArrayAnalysis.cpp   |   1 -
 js/src/ion/TypePolicy.cpp              |   2 -
 js/src/ion/TypePolicy.h                |  14 ----
 js/src/ion/VMFunctions.cpp             |   7 --
 js/src/ion/VMFunctions.h               |   1 -
 js/src/jit-test/tests/ion/bug861165.js |  85 --------------------
 17 files changed, 23 insertions(+), 360 deletions(-)
 delete mode 100644 js/src/jit-test/tests/ion/bug861165.js

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 67bc9ef15aca..5106493af101 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -2648,6 +2648,11 @@ CodeGenerator::visitNewStringObject(LNewStringObject *lir)
     return true;
 }
 
+typedef bool(*InitPropFn)(JSContext *cx, HandleObject obj,
+                          HandlePropertyName name, HandleValue value);
+static const VMFunction InitPropInfo =
+    FunctionInfo<InitPropFn>(InitProp);
+
 bool
 CodeGenerator::visitParNew(LParNew *lir)
 {
@@ -2742,28 +2747,6 @@ CodeGenerator::visitParBailout(LParBailout *lir)
     return true;
 }
 
-typedef bool(*InitElemFn)(JSContext *cx, HandleObject obj,
-                          HandleValue id, HandleValue value);
-static const VMFunction InitElemInfo =
-    FunctionInfo<InitElemFn>(InitElemOperation);
-
-bool
-CodeGenerator::visitInitElem(LInitElem *lir)
-{
-    Register objReg = ToRegister(lir->getObject());
-
-    pushArg(ToValue(lir, LInitElem::ValueIndex));
-    pushArg(ToValue(lir, LInitElem::IdIndex));
-    pushArg(objReg);
-
-    return callVM(InitElemInfo, lir);
-}
-
-typedef bool(*InitPropFn)(JSContext *cx, HandleObject obj,
-                          HandlePropertyName name, HandleValue value);
-static const VMFunction InitPropInfo =
-    FunctionInfo<InitPropFn>(InitProp);
-
 bool
 CodeGenerator::visitInitProp(LInitProp *lir)
 {
@@ -5578,76 +5561,35 @@ CodeGenerator::visitIn(LIn *ins)
     return callVM(OperatorInInfo, ins);
 }
 
-typedef bool (*OperatorInIFn)(JSContext *, uint32_t, HandleObject, JSBool *);
-static const VMFunction OperatorInIInfo = FunctionInfo<OperatorInIFn>(OperatorInI);
-
 bool
 CodeGenerator::visitInArray(LInArray *lir)
 {
-    const MInArray *mir = lir->mir();
     Register elements = ToRegister(lir->elements());
     Register initLength = ToRegister(lir->initLength());
     Register output = ToRegister(lir->output());
 
     // When the array is not packed we need to do a hole check in addition to the bounds check.
-    Label falseBranch, done, trueBranch;
-
-    OutOfLineCode *ool = NULL;
-    Label* failedInitLength = &falseBranch;
-
+    Label falseBranch, done;
     if (lir->index()->isConstant()) {
-        int32_t index = ToInt32(lir->index());
-
-        JS_ASSERT_IF(index < 0, mir->needsNegativeIntCheck());
-        if (mir->needsNegativeIntCheck()) {
-            ool = oolCallVM(OperatorInIInfo, lir,
-                            (ArgList(), Imm32(index), ToRegister(lir->object())),
-                            StoreRegisterTo(output));
-            failedInitLength = ool->entry();
-        }
-
-        masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(index), failedInitLength);
-        if (mir->needsHoleCheck()) {
-            Address address = Address(elements, index * sizeof(Value));
-            masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
+        masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(ToInt32(lir->index())), &falseBranch);
+        if (lir->mir()->needsHoleCheck()) {
+            masm.branchTestMagic(Assembler::Equal, Address(elements, ToInt32(lir->index()) * sizeof(Value)),
+                                 &falseBranch);
         }
     } else {
-        Label negativeIntCheck;
-        Register index = ToRegister(lir->index());
-
-        if (mir->needsNegativeIntCheck())
-            failedInitLength = &negativeIntCheck;
-
-        masm.branch32(Assembler::BelowOrEqual, initLength, index, failedInitLength);
-        if (mir->needsHoleCheck()) {
-            BaseIndex address = BaseIndex(elements, ToRegister(lir->index()), TimesEight);
-            masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
-        }
-        masm.jump(&trueBranch);
-
-        if (mir->needsNegativeIntCheck()) {
-            masm.bind(&negativeIntCheck);
-            ool = oolCallVM(OperatorInIInfo, lir,
-                            (ArgList(), index, ToRegister(lir->object())),
-                            StoreRegisterTo(output));
-
-            masm.testl(index, index);
-            masm.j(Assembler::Signed, ool->entry());
-            masm.jump(&falseBranch);
+        masm.branch32(Assembler::BelowOrEqual, initLength, ToRegister(lir->index()), &falseBranch);
+        if (lir->mir()->needsHoleCheck()) {
+            masm.branchTestMagic(Assembler::Equal, BaseIndex(elements, ToRegister(lir->index()), TimesEight),
+                                 &falseBranch);
         }
     }
 
-    masm.bind(&trueBranch);
     masm.move32(Imm32(1), output);
     masm.jump(&done);
 
     masm.bind(&falseBranch);
     masm.move32(Imm32(0), output);
     masm.bind(&done);
-
-    if (ool)
-        masm.bind(ool->rejoin());
-
     return true;
 }
 
diff --git a/js/src/ion/CodeGenerator.h b/js/src/ion/CodeGenerator.h
index b48e613a9490..4130a3611ebc 100644
--- a/js/src/ion/CodeGenerator.h
+++ b/js/src/ion/CodeGenerator.h
@@ -116,7 +116,6 @@ class CodeGenerator : public CodeGeneratorSpecific
     bool visitParNew(LParNew *lir);
     bool visitParNewDenseArray(LParNewDenseArray *lir);
     bool visitParBailout(LParBailout *lir);
-    bool visitInitElem(LInitElem *lir);
     bool visitInitProp(LInitProp *lir);
     bool visitCreateThis(LCreateThis *lir);
     bool visitCreateThisWithProto(LCreateThisWithProto *lir);
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index f4e080bdd360..0aa2d376f401 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -952,9 +952,6 @@ IonBuilder::inspectOpcode(JSOp op)
         return jsop_newobject(baseObj);
       }
 
-      case JSOP_INITELEM:
-        return jsop_initelem();
-
       case JSOP_INITELEM_ARRAY:
         return jsop_initelem_array();
 
@@ -4782,19 +4779,6 @@ IonBuilder::jsop_newobject(HandleObject baseObj)
     return resumeAfter(ins);
 }
 
-bool
-IonBuilder::jsop_initelem()
-{
-    MDefinition *value = current->pop();
-    MDefinition *id = current->pop();
-    MDefinition *obj = current->peek(-1);
-
-    MInitElem *initElem = MInitElem::New(obj, id, value);
-    current->add(initElem);
-
-    return resumeAfter(initElem);
-}
-
 bool
 IonBuilder::jsop_initelem_array()
 {
@@ -7410,7 +7394,7 @@ IonBuilder::jsop_in_dense()
     current->add(initLength);
 
     // Check if id < initLength and elem[id] not a hole.
-    MInArray *ins = MInArray::New(elements, id, initLength, obj, needsHoleCheck);
+    MInArray *ins = MInArray::New(elements, id, initLength, needsHoleCheck);
 
     current->add(ins);
     current->push(ins);
diff --git a/js/src/ion/IonBuilder.h b/js/src/ion/IonBuilder.h
index 91fdee673034..8f8f2a486734 100644
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -375,7 +375,6 @@ class IonBuilder : public MIRGenerator
     bool jsop_delprop(HandlePropertyName name);
     bool jsop_newarray(uint32_t count);
     bool jsop_newobject(HandleObject baseObj);
-    bool jsop_initelem();
     bool jsop_initelem_array();
     bool jsop_initprop(HandlePropertyName name);
     bool jsop_regexp(RegExpObject *reobj);
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index 56eaa8d0d19a..5d6ef835e6bf 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -478,26 +478,6 @@ class LParBailout : public LInstructionHelper<0, 0, 0>
     LIR_HEADER(ParBailout);
 };
 
-class LInitElem : public LCallInstructionHelper<0, 1 + 2*BOX_PIECES, 0>
-{
-  public:
-    LIR_HEADER(InitElem)
-
-    LInitElem(const LAllocation &object) {
-        setOperand(0, object);
-    }
-
-    static const size_t IdIndex = 1;
-    static const size_t ValueIndex = 1 + BOX_PIECES;
-
-    const LAllocation *getObject() {
-        return getOperand(0);
-    }
-    MInitElem *mir() const {
-        return mir_->toInitElem();
-    }
-};
-
 // Takes in an Object and a Value.
 class LInitProp : public LCallInstructionHelper<0, 1 + BOX_PIECES, 0>
 {
@@ -2738,18 +2718,15 @@ class LLoadElementV : public LInstructionHelper<BOX_PIECES, 2, 0>
     }
 };
 
-class LInArray : public LInstructionHelper<1, 4, 0>
+class LInArray : public LInstructionHelper<1, 3, 0>
 {
   public:
     LIR_HEADER(InArray)
 
-    LInArray(const LAllocation &elements, const LAllocation &index,
-             const LAllocation &initLength, const LAllocation &object)
-    {
+    LInArray(const LAllocation &elements, const LAllocation &index, const LAllocation &initLength) {
         setOperand(0, elements);
         setOperand(1, index);
         setOperand(2, initLength);
-        setOperand(3, object);
     }
     const MInArray *mir() const {
         return mir_->toInArray();
@@ -2763,9 +2740,6 @@ class LInArray : public LInstructionHelper<1, 4, 0>
     const LAllocation *initLength() {
         return getOperand(2);
     }
-    const LAllocation *object() {
-        return getOperand(3);
-    }
 };
 
 
diff --git a/js/src/ion/LOpcodes.h b/js/src/ion/LOpcodes.h
index 88142926f1c5..b7bf009b266c 100644
--- a/js/src/ion/LOpcodes.h
+++ b/js/src/ion/LOpcodes.h
@@ -32,7 +32,6 @@
     _(ParNewDenseArray)             \
     _(ParNewCallObject)             \
     _(ParBailout)                   \
-    _(InitElem)                     \
     _(InitProp)                     \
     _(CheckOverRecursed)            \
     _(ParCheckOverRecursed)         \
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index f36d0984a4d1..75de254f6577 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -237,18 +237,6 @@ LIRGenerator::visitParBailout(MParBailout *ins)
     return add(lir, ins);
 }
 
-bool
-LIRGenerator::visitInitElem(MInitElem *ins)
-{
-    LInitElem *lir = new LInitElem(useRegisterAtStart(ins->getObject()));
-    if (!useBoxAtStart(lir, LInitElem::IdIndex, ins->getId()))
-        return false;
-    if (!useBoxAtStart(lir, LInitElem::ValueIndex, ins->getValue()))
-        return false;
-
-    return add(lir, ins) && assignSafepoint(lir, ins);
-}
-
 bool
 LIRGenerator::visitInitProp(MInitProp *ins)
 {
@@ -1831,19 +1819,11 @@ LIRGenerator::visitInArray(MInArray *ins)
     JS_ASSERT(ins->elements()->type() == MIRType_Elements);
     JS_ASSERT(ins->index()->type() == MIRType_Int32);
     JS_ASSERT(ins->initLength()->type() == MIRType_Int32);
-    JS_ASSERT(ins->object()->type() == MIRType_Object);
     JS_ASSERT(ins->type() == MIRType_Boolean);
 
-    LAllocation object;
-    if (ins->needsNegativeIntCheck())
-        object = useRegister(ins->object());
-    else
-        object = LConstantIndex::Bogus();
-
     LInArray *lir = new LInArray(useRegister(ins->elements()),
                                  useRegisterOrConstant(ins->index()),
-                                 useRegister(ins->initLength()),
-                                 object);
+                                 useRegister(ins->initLength()));
     return define(lir, ins) && assignSafepoint(lir, ins);
 }
 
diff --git a/js/src/ion/Lowering.h b/js/src/ion/Lowering.h
index 6e11bcdbf050..cc8cd249df8b 100644
--- a/js/src/ion/Lowering.h
+++ b/js/src/ion/Lowering.h
@@ -94,7 +94,6 @@ class LIRGenerator : public LIRGeneratorSpecific
     bool visitParNewCallObject(MParNewCallObject *ins);
     bool visitParNewDenseArray(MParNewDenseArray *ins);
     bool visitParBailout(MParBailout *ins);
-    bool visitInitElem(MInitElem *ins);
     bool visitInitProp(MInitProp *ins);
     bool visitCheckOverRecursed(MCheckOverRecursed *ins);
     bool visitParCheckOverRecursed(MParCheckOverRecursed *ins);
diff --git a/js/src/ion/MIR.cpp b/js/src/ion/MIR.cpp
index 2914423b66b1..7b94d6c7419f 100644
--- a/js/src/ion/MIR.cpp
+++ b/js/src/ion/MIR.cpp
@@ -2007,12 +2007,6 @@ InlinePropertyTable::hasFunction(JSFunction *func) const
     return false;
 }
 
-bool
-MInArray::needsNegativeIntCheck() const
-{
-    return !index()->range() || index()->range()->lower() < 0;
-}
-
 MDefinition *
 MAsmJSUnsignedToDouble::foldsTo(bool useValueNumbers)
 {
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 58437d641a54..faa0d1ed38fa 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -1243,39 +1243,6 @@ class MInitProp
     }
 };
 
-class MInitElem
-  : public MAryInstruction<3>,
-    public Mix3Policy<ObjectPolicy<0>, BoxPolicy<1>, BoxPolicy<2> >
-{
-    MInitElem(MDefinition *obj, MDefinition *id, MDefinition *value)
-    {
-        setOperand(0, obj);
-        setOperand(1, id);
-        setOperand(2, value);
-        setResultType(MIRType_None);
-    }
-
-  public:
-    INSTRUCTION_HEADER(InitElem)
-
-    static MInitElem *New(MDefinition *obj, MDefinition *id, MDefinition *value) {
-        return new MInitElem(obj, id, value);
-    }
-
-    MDefinition *getObject() const {
-        return getOperand(0);
-    }
-    MDefinition *getId() const {
-        return getOperand(1);
-    }
-    MDefinition *getValue() const {
-        return getOperand(2);
-    }
-    TypePolicy *typePolicy() {
-        return this;
-    }
-};
-
 // Designates the start of call frame construction.
 // Generates code to adjust the stack pointer for the argument vector.
 // Argc is inferred by checking the use chain during lowering.
@@ -1687,57 +1654,6 @@ class MTernaryInstruction : public MAryInstruction<3>
     }
 };
 
-class MQuaternaryInstruction : public MAryInstruction<4>
-{
-  protected:
-    MQuaternaryInstruction(MDefinition *first, MDefinition *second,
-                           MDefinition *third, MDefinition *fourth)
-    {
-        setOperand(0, first);
-        setOperand(1, second);
-        setOperand(2, third);
-        setOperand(3, fourth);
-    }
-
-  protected:
-    HashNumber valueHash() const
-    {
-        MDefinition *first = getOperand(0);
-        MDefinition *second = getOperand(1);
-        MDefinition *third = getOperand(2);
-        MDefinition *fourth = getOperand(3);
-
-        return op() ^ first->valueNumber() ^ second->valueNumber() ^
-                      third->valueNumber() ^ fourth->valueNumber();
-    }
-
-    bool congruentTo(MDefinition *const &ins) const
-    {
-        if (op() != ins->op())
-            return false;
-
-        if (type() != ins->type())
-            return false;
-
-        if (isEffectful() || ins->isEffectful())
-            return false;
-
-        MDefinition *first = getOperand(0);
-        MDefinition *second = getOperand(1);
-        MDefinition *third = getOperand(2);
-        MDefinition *fourth = getOperand(3);
-        MDefinition *insFirst = ins->getOperand(0);
-        MDefinition *insSecond = ins->getOperand(1);
-        MDefinition *insThird = ins->getOperand(2);
-        MDefinition *insFourth = ins->getOperand(3);
-
-        return first->valueNumber() == insFirst->valueNumber() &&
-               second->valueNumber() == insSecond->valueNumber() &&
-               third->valueNumber() == insThird->valueNumber() &&
-               fourth->valueNumber() == insFourth->valueNumber();
-    }
-};
-
 class MCompare
   : public MBinaryInstruction,
     public ComparePolicy
@@ -6379,15 +6295,12 @@ class MIn
 
 // Test whether the index is in the array bounds or a hole.
 class MInArray
-  : public MQuaternaryInstruction,
-    public ObjectPolicy<3>
+  : public MTernaryInstruction
 {
     bool needsHoleCheck_;
 
-    MInArray(MDefinition *elements, MDefinition *index,
-             MDefinition *initLength, MDefinition *object,
-             bool needsHoleCheck)
-      : MQuaternaryInstruction(elements, index, initLength, object),
+    MInArray(MDefinition *elements, MDefinition *index, MDefinition *initLength, bool needsHoleCheck)
+      : MTernaryInstruction(elements, index, initLength),
         needsHoleCheck_(needsHoleCheck)
     {
         setResultType(MIRType_Boolean);
@@ -6401,10 +6314,8 @@ class MInArray
     INSTRUCTION_HEADER(InArray)
 
     static MInArray *New(MDefinition *elements, MDefinition *index,
-                         MDefinition *initLength, MDefinition *object,
-                         bool needsHoleCheck)
-    {
-        return new MInArray(elements, index, initLength, object, needsHoleCheck);
+                         MDefinition *initLength, bool needsHoleCheck) {
+        return new MInArray(elements, index, initLength, needsHoleCheck);
     }
 
     MDefinition *elements() const {
@@ -6416,19 +6327,12 @@ class MInArray
     MDefinition *initLength() const {
         return getOperand(2);
     }
-    MDefinition *object() const {
-        return getOperand(3);
-    }
     bool needsHoleCheck() const {
         return needsHoleCheck_;
     }
-    bool needsNegativeIntCheck() const;
     AliasSet getAliasSet() const {
         return AliasSet::Load(AliasSet::Element);
     }
-    TypePolicy *typePolicy() {
-        return this;
-    }
 };
 
 // Implementation for instanceof operator with specific rhs.
diff --git a/js/src/ion/MOpcodes.h b/js/src/ion/MOpcodes.h
index 06630fd7ae24..a5123a627ccd 100644
--- a/js/src/ion/MOpcodes.h
+++ b/js/src/ion/MOpcodes.h
@@ -81,7 +81,6 @@ namespace ion {
     _(NewDeclEnvObject)                                                     \
     _(NewCallObject)                                                        \
     _(NewStringObject)                                                      \
-    _(InitElem)                                                             \
     _(InitProp)                                                             \
     _(Start)                                                                \
     _(OsrEntry)                                                             \
diff --git a/js/src/ion/ParallelArrayAnalysis.cpp b/js/src/ion/ParallelArrayAnalysis.cpp
index 3fe70a523437..364df7b0902d 100644
--- a/js/src/ion/ParallelArrayAnalysis.cpp
+++ b/js/src/ion/ParallelArrayAnalysis.cpp
@@ -172,7 +172,6 @@ class ParallelArrayVisitor : public MInstructionVisitor
     CUSTOM_OP(NewObject)
     CUSTOM_OP(NewCallObject)
     CUSTOM_OP(NewParallelArray)
-    UNSAFE_OP(InitElem)
     UNSAFE_OP(InitProp)
     SAFE_OP(Start)
     UNSAFE_OP(OsrEntry)
diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index f26e28caecd9..9cec5d4a8f52 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -399,8 +399,6 @@ ObjectPolicy<Op>::staticAdjustInputs(MInstruction *ins)
 
 template bool ObjectPolicy<0>::staticAdjustInputs(MInstruction *ins);
 template bool ObjectPolicy<1>::staticAdjustInputs(MInstruction *ins);
-template bool ObjectPolicy<2>::staticAdjustInputs(MInstruction *ins);
-template bool ObjectPolicy<3>::staticAdjustInputs(MInstruction *ins);
 
 bool
 CallPolicy::adjustInputs(MInstruction *ins)
diff --git a/js/src/ion/TypePolicy.h b/js/src/ion/TypePolicy.h
index 3dd5812581b9..3f209e53c857 100644
--- a/js/src/ion/TypePolicy.h
+++ b/js/src/ion/TypePolicy.h
@@ -186,20 +186,6 @@ class MixPolicy : public TypePolicy
     }
 };
 
-// Combine three policies.
-template <class Policy1, class Policy2, class Policy3>
-class Mix3Policy : public TypePolicy
-{
-  public:
-    static bool staticAdjustInputs(MInstruction *ins) {
-        return Policy1::staticAdjustInputs(ins) && Policy2::staticAdjustInputs(ins) &&
-               Policy3::staticAdjustInputs(ins);
-    }
-    virtual bool adjustInputs(MInstruction *ins) {
-        return staticAdjustInputs(ins);
-    }
-};
-
 class CallSetElementPolicy : public SingleObjectPolicy
 {
   public:
diff --git a/js/src/ion/VMFunctions.cpp b/js/src/ion/VMFunctions.cpp
index b1dd826206a0..c9f2f8dda262 100644
--- a/js/src/ion/VMFunctions.cpp
+++ b/js/src/ion/VMFunctions.cpp
@@ -507,13 +507,6 @@ OperatorIn(JSContext *cx, HandleValue key, HandleObject obj, JSBool *out)
     return true;
 }
 
-bool
-OperatorInI(JSContext *cx, uint32_t index, HandleObject obj, JSBool *out)
-{
-    RootedValue key(cx, Int32Value(index));
-    return OperatorIn(cx, key, obj, out);
-}
-
 bool
 GetIntrinsicValue(JSContext *cx, HandlePropertyName name, MutableHandleValue rval)
 {
diff --git a/js/src/ion/VMFunctions.h b/js/src/ion/VMFunctions.h
index 13be91aea586..c7477ddd2b0f 100644
--- a/js/src/ion/VMFunctions.h
+++ b/js/src/ion/VMFunctions.h
@@ -521,7 +521,6 @@ bool SPSEnter(JSContext *cx, HandleScript script);
 bool SPSExit(JSContext *cx, HandleScript script);
 
 bool OperatorIn(JSContext *cx, HandleValue key, HandleObject obj, JSBool *out);
-bool OperatorInI(JSContext *cx, uint32_t index, HandleObject obj, JSBool *out);
 
 bool GetIntrinsicValue(JSContext *cx, HandlePropertyName name, MutableHandleValue rval);
 
diff --git a/js/src/jit-test/tests/ion/bug861165.js b/js/src/jit-test/tests/ion/bug861165.js
deleted file mode 100644
index 924dcbaaef86..000000000000
--- a/js/src/jit-test/tests/ion/bug861165.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// |jit-test| no-jm
-
-// IM has the following fastpaths:
-// - constant index (constant)
-// - need negative int check (neg)
-// - needs hole check (hole)
-// So to test everything we have to do:
-//            constant | neg | hole
-//  test 1:     0         0      0
-//  test 2:     1         0      0
-//  test 3:     0         1      0
-//  test 4:     1         1      0
-//  test 5:     0         0      1
-//  test 6:     1         0      1
-//  test 7:     0         1      1
-//  test 8:     1         1      1
-
-function test1(index, a) {
-  if (index < 0)
-    index = -index
-  return index in a;
-}
-assertEq(test1(1, [1,2]), true);
-
-function test2(a) {
-  return 0 in a;
-}
-assertEq(test2([1,2]), true);
-
-function test3(index, a) {
-  return index in a;
-}
-
-var arr3 = [];
-arr3["-1073741828"] = 17;
-assertEq(test3(-1073741828, arr3), true);
-
-function test4(a) {
-  return -1073741828 in a;
-}
-assertEq(test4(arr3), true);
-
-
-function test5(index, a) {
-  if (index < 0)
-    index = -index
-  return index in a;
-}
-var arr5 = [];
-arr5[0] = 1
-arr5[1] = 1
-arr5[2] = 1
-arr5[4] = 1
-assertEq(test5(1, arr5), true);
-assertEq(test5(3, arr5), false);
-
-function test7a(a) {
-  return 3 in a;
-}
-function test7b(a) {
-  return 4 in a;
-}
-assertEq(test7a(arr5), false);
-assertEq(test7b(arr5), true);
-
-function test8(index, a) {
-  return index in a;
-}
-arr5["-1073741828"] = 17;
-assertEq(test8(-1073741828, arr5), true);
-assertEq(test8(3, arr5), false);
-assertEq(test8(0, arr5), true);
-
-function test9a(a) {
-  return 0 in a;
-}
-function test9b(a) {
-  return 3 in a;
-}
-function test9c(a) {
-  return -1073741828 in a;
-}
-assertEq(test9a(arr5), true);
-assertEq(test9b(arr5), false);
-assertEq(test9c(arr5), true);

From ad42e347f99f9916ef10aa7c662a35fc301e07e9 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Wed, 17 Apr 2013 12:23:17 +0200
Subject: [PATCH 113/438] Bug 861251 - Inline string concatenation in
 IonMonkey. r=luke

---
 js/src/ion/CodeGenerator.cpp     | 51 ++++++++++++++++++++++++++++++--
 js/src/ion/IonMacroAssembler.cpp | 25 +++++++++++-----
 js/src/ion/IonMacroAssembler.h   |  3 ++
 js/src/ion/LIR-Common.h          |  8 +++--
 js/src/ion/Lowering.cpp          |  5 ++--
 js/src/vm/String.cpp             | 18 -----------
 js/src/vm/String.h               |  7 +++++
 7 files changed, 85 insertions(+), 32 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 5106493af101..02af8bcaad3e 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -3470,10 +3470,55 @@ CodeGenerator::visitEmulatesUndefinedAndBranch(LEmulatesUndefinedAndBranch *lir)
 bool
 CodeGenerator::visitConcat(LConcat *lir)
 {
-    pushArg(ToRegister(lir->rhs()));
-    pushArg(ToRegister(lir->lhs()));
-    if (!callVM(ConcatStringsInfo, lir))
+    Register lhs = ToRegister(lir->lhs());
+    Register rhs = ToRegister(lir->rhs());
+
+    Register output = ToRegister(lir->output());
+    Register temp = ToRegister(lir->temp());
+
+    OutOfLineCode *ool = oolCallVM(ConcatStringsInfo, lir, (ArgList(), lhs, rhs),
+                                   StoreRegisterTo(output));
+    if (!ool)
         return false;
+
+    Label done;
+
+    // If lhs is empty, return rhs.
+    Label leftEmpty;
+    masm.loadStringLength(lhs, temp);
+    masm.branchTest32(Assembler::Zero, temp, temp, &leftEmpty);
+
+    // If rhs is empty, return lhs.
+    Label rightEmpty;
+    masm.loadStringLength(rhs, output);
+    masm.branchTest32(Assembler::Zero, output, output, &rightEmpty);
+
+    // Ensure total length <= JSString::MAX_LENGTH.
+    masm.add32(output, temp);
+    masm.branch32(Assembler::Above, temp, Imm32(JSString::MAX_LENGTH), ool->entry());
+
+    // Allocate a new rope.
+    masm.newGCString(output, ool->entry());
+
+    // Store lengthAndFlags.
+    JS_STATIC_ASSERT(JSString::ROPE_FLAGS == 0);
+    masm.lshiftPtr(Imm32(JSString::LENGTH_SHIFT), temp);
+    masm.storePtr(temp, Address(output, JSString::offsetOfLengthAndFlags()));
+
+    // Store left and right nodes.
+    masm.storePtr(lhs, Address(output, JSRope::offsetOfLeft()));
+    masm.storePtr(rhs, Address(output, JSRope::offsetOfRight()));
+    masm.jump(&done);
+
+    masm.bind(&leftEmpty);
+    masm.mov(rhs, output);
+    masm.jump(&done);
+
+    masm.bind(&rightEmpty);
+    masm.mov(lhs, output);
+
+    masm.bind(&done);
+    masm.bind(ool->rejoin());
     return true;
 }
 
diff --git a/js/src/ion/IonMacroAssembler.cpp b/js/src/ion/IonMacroAssembler.cpp
index bcf85af67d84..c0488428a90d 100644
--- a/js/src/ion/IonMacroAssembler.cpp
+++ b/js/src/ion/IonMacroAssembler.cpp
@@ -418,16 +418,11 @@ MacroAssembler::clampDoubleToUint8(FloatRegister input, Register output)
 }
 
 void
-MacroAssembler::newGCThing(const Register &result,
-                           JSObject *templateObject, Label *fail)
+MacroAssembler::newGCThing(const Register &result, gc::AllocKind allocKind, Label *fail)
 {
     // Inlined equivalent of js::gc::NewGCThing() without failure case handling.
 
-    gc::AllocKind allocKind = templateObject->tenuredGetAllocKind();
-    JS_ASSERT(allocKind >= gc::FINALIZE_OBJECT0 && allocKind <= gc::FINALIZE_OBJECT_LAST);
-    int thingSize = (int)gc::Arena::thingSize(allocKind);
-
-    JS_ASSERT(!templateObject->hasDynamicElements());
+    int thingSize = int(gc::Arena::thingSize(allocKind));
 
     Zone *zone = GetIonContext()->compartment->zone();
 
@@ -452,6 +447,22 @@ MacroAssembler::newGCThing(const Register &result,
     subPtr(Imm32(thingSize), result);
 }
 
+void
+MacroAssembler::newGCThing(const Register &result, JSObject *templateObject, Label *fail)
+{
+    gc::AllocKind allocKind = templateObject->tenuredGetAllocKind();
+    JS_ASSERT(allocKind >= gc::FINALIZE_OBJECT0 && allocKind <= gc::FINALIZE_OBJECT_LAST);
+    JS_ASSERT(!templateObject->hasDynamicElements());
+
+    newGCThing(result, allocKind, fail);
+}
+
+void
+MacroAssembler::newGCString(const Register &result, Label *fail)
+{
+    newGCThing(result, js::gc::FINALIZE_STRING, fail);
+}
+
 void
 MacroAssembler::parNewGCThing(const Register &result,
                               const Register &threadContextReg,
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index 9b4571354eb8..6f0a583cf79c 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -553,7 +553,10 @@ class MacroAssembler : public MacroAssemblerSpecific
     }
 
     // Inline allocation.
+    void newGCThing(const Register &result, gc::AllocKind allocKind, Label *fail);
     void newGCThing(const Register &result, JSObject *templateObject, Label *fail);
+    void newGCString(const Register &result, Label *fail);
+
     void parNewGCThing(const Register &result,
                        const Register &threadContextReg,
                        const Register &tempReg1,
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index 5d6ef835e6bf..8a94858a9545 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -2158,14 +2158,15 @@ class LBinaryV : public LCallInstructionHelper<BOX_PIECES, 2 * BOX_PIECES, 0>
 };
 
 // Adds two string, returning a string.
-class LConcat : public LCallInstructionHelper<1, 2, 0>
+class LConcat : public LInstructionHelper<1, 2, 1>
 {
   public:
     LIR_HEADER(Concat)
 
-    LConcat(const LAllocation &lhs, const LAllocation &rhs) {
+    LConcat(const LAllocation &lhs, const LAllocation &rhs, const LDefinition &temp) {
         setOperand(0, lhs);
         setOperand(1, rhs);
+        setTemp(0, temp);
     }
 
     const LAllocation *lhs() {
@@ -2174,6 +2175,9 @@ class LConcat : public LCallInstructionHelper<1, 2, 0>
     const LAllocation *rhs() {
         return this->getOperand(1);
     }
+    const LDefinition *temp() {
+        return this->getTemp(0);
+    }
 };
 
 // Get uint16 character code from a string.
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 75de254f6577..e7d861784051 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -1265,9 +1265,10 @@ LIRGenerator::visitConcat(MConcat *ins)
 
     JS_ASSERT(lhs->type() == MIRType_String);
     JS_ASSERT(rhs->type() == MIRType_String);
+    JS_ASSERT(ins->type() == MIRType_String);
 
-    LConcat *lir = new LConcat(useRegisterAtStart(lhs), useRegisterAtStart(rhs));
-    if (!defineReturn(lir, ins))
+    LConcat *lir = new LConcat(useRegister(lhs), useRegister(rhs), temp());
+    if (!define(lir, ins))
         return false;
     return assignSafepoint(lir, ins);
 }
diff --git a/js/src/vm/String.cpp b/js/src/vm/String.cpp
index 1bb9b86c641f..dc62d96247ef 100644
--- a/js/src/vm/String.cpp
+++ b/js/src/vm/String.cpp
@@ -319,24 +319,6 @@ js::ConcatStrings(JSContext *cx,
     if (!JSString::validateLength(cxIfCanGC, wholeLength))
         return NULL;
 
-    if (JSShortString::lengthFits(wholeLength)) {
-        JSShortString *str = js_NewGCShortString<allowGC>(cx);
-        if (!str)
-            return NULL;
-        const jschar *leftChars = left->getChars(cx);
-        if (!leftChars)
-            return NULL;
-        const jschar *rightChars = right->getChars(cx);
-        if (!rightChars)
-            return NULL;
-
-        jschar *buf = str->init(wholeLength);
-        PodCopy(buf, leftChars, leftLen);
-        PodCopy(buf + leftLen, rightChars, rightLen);
-        buf[wholeLength] = 0;
-        return str;
-    }
-
     return JSRope::new_<allowGC>(cx, left, right, wholeLength);
 }
 
diff --git a/js/src/vm/String.h b/js/src/vm/String.h
index e7769c0e4ec9..a0c8514509c4 100644
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -465,6 +465,13 @@ class JSRope : public JSString
     }
 
     inline void markChildren(JSTracer *trc);
+
+    inline static size_t offsetOfLeft() {
+        return offsetof(JSRope, d.u1.left);
+    }
+    inline static size_t offsetOfRight() {
+        return offsetof(JSRope, d.s.u2.right);
+    }
 };
 
 JS_STATIC_ASSERT(sizeof(JSRope) == sizeof(JSString));

From 0bbd21d3cb14ff323d68c1618d2e99090e0f237d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 9 Apr 2013 12:05:12 +1200
Subject: [PATCH 114/438] Bug 841363. Ensure padding-rect edges are included in
 scrollable area used to compute scrollWidth/scrollHeight for overflow:visible
 elements. r=matspal

--HG--
extra : rebase_source : 067c9577f797350274783d3c7cc682b5f74b998a
---
 content/base/src/Element.cpp            | 10 ++++-
 layout/generic/test/Makefile.in         |  1 +
 layout/generic/test/test_bug841361.html | 56 +++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 layout/generic/test/test_bug841361.html

diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp
index eb77095fc392..109cdcabb30b 100644
--- a/content/base/src/Element.cpp
+++ b/content/base/src/Element.cpp
@@ -591,9 +591,17 @@ static nsSize GetScrollRectSizeForOverflowVisibleFrame(nsIFrame* aFrame)
 
   nsRect paddingRect = aFrame->GetPaddingRectRelativeToSelf();
   nsOverflowAreas overflowAreas(paddingRect, paddingRect);
+  // Add the scrollable overflow areas of children (if any) to the paddingRect.
+  // It's important to start with the paddingRect, otherwise if there are no
+  // children the overflow rect will be 0,0,0,0 which will force the point 0,0
+  // to be included in the final rect.
   nsLayoutUtils::UnionChildOverflow(aFrame, overflowAreas);
+  // Make sure that an empty padding-rect's edges are included, by adding
+  // the padding-rect in again with UnionEdges.
+  nsRect overflowRect =
+    overflowAreas.ScrollableOverflow().UnionEdges(paddingRect);
   return nsLayoutUtils::GetScrolledRect(aFrame,
-      overflowAreas.ScrollableOverflow(), paddingRect.Size(),
+      overflowRect, paddingRect.Size(),
       aFrame->StyleVisibility()->mDirection).Size();
 }
 
diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in
index 7f1a70ba81d0..e9659287b3aa 100644
--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -105,6 +105,7 @@ MOCHITEST_FILES = \
   test_bug785324.html \
   test_bug791616.html \
   test_bug831780.html \
+  test_bug841361.html \
   $(NULL)
 
 MOCHITEST_CHROME_FILES = \
diff --git a/layout/generic/test/test_bug841361.html b/layout/generic/test/test_bug841361.html
new file mode 100644
index 000000000000..cc7a23dbf457
--- /dev/null
+++ b/layout/generic/test/test_bug841361.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=841361
+-->
+<head>
+  <title>Test for Bug 841361</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=841361">Mozilla Bug 841361</a>
+<p id="display">
+
+<div style="width:500px; height:0;" id="a"></div>
+
+<div style="width:0; height:500px;" id="b"></div>
+
+<div style="width:500px;" id="c">
+  <div style="width:50px; height:50px; float:left; background:yellow"></div>
+  <div style="width:200px; height:50px; float:left; background:green"></div>
+</div>
+
+<div style="width:500px; height:0; overflow:hidden" id="d"></div>
+
+<div style="width:0; height:500px; overflow:hidden" id="e"></div>
+
+<div style="width:500px; overflow:hidden" id="f">
+  <div style="width:50px; height:50px; float:left; background:yellow"></div>
+  <div style="width:200px; height:50px; float:left; background:green"></div>
+</div>
+
+</p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+function doTest(id, w, h) {
+  var e = document.getElementById(id);
+  is(e.scrollWidth, w, "scrollWidth for element '" + id + "'");
+  is(e.scrollHeight, h, "scrollHeight for element '" + id + "'");
+}
+
+doTest("a", 500, 0);
+doTest("b", 0, 500);
+doTest("c", 500, 50);
+doTest("d", 500, 0);
+doTest("e", 0, 500);
+doTest("f", 500, 50);
+
+</script>
+</pre>
+</body>
+</html>

From 2b6af30e8f41d3024466cb2b61bb8bb6133934c9 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 15 Apr 2013 19:10:19 +1200
Subject: [PATCH 115/438] Bug 860253. Clear clip state on children of an
 nsDisplayTransform because they're in a different coordinate system, and
 we'll clip the nsDisplayTransform itself. r=mattwoodrow

--HG--
extra : rebase_source : 731dfa20fa0fda1feb7ab582deced011ff9c25fc
---
 layout/generic/nsSimplePageSequence.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index 0e73b688bf05..6ff5f6808e67 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -807,11 +807,19 @@ nsSimplePageSequenceFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
   nsDisplayList content;
-  nsIFrame* child = GetFirstPrincipalChild();
-  while (child) {
-    child->BuildDisplayListForStackingContext(aBuilder,
-        child->GetVisualOverflowRectRelativeToSelf(), &content);
-    child = child->GetNextSibling();
+
+  {
+    // Clear clip state while we construct the children of the
+    // nsDisplayTransform, since they'll be in a different coordinate system.
+    DisplayListClipState::AutoSaveRestore clipState(aBuilder);
+    clipState.Clear();
+
+    nsIFrame* child = GetFirstPrincipalChild();
+    while (child) {
+      child->BuildDisplayListForStackingContext(aBuilder,
+          child->GetVisualOverflowRectRelativeToSelf(), &content);
+      child = child->GetNextSibling();
+    }
   }
 
   content.AppendNewToTop(new (aBuilder)

From 520f871d999fca21f1a0529b58b63b65263267b7 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 16 Apr 2013 18:14:56 +1200
Subject: [PATCH 116/438] Bug 860579. Make FindContentInDocument use the frame
 tree as much as possible. r=mattwoodrow

--HG--
extra : rebase_source : c4d05d33fdc6b2bcc99437808f78ada8770f9263
---
 layout/base/crashtests/860579-1.html   | 21 ++++++++++++++++++++
 layout/base/crashtests/crashtests.list |  1 +
 layout/base/nsDisplayList.cpp          | 27 +++++++-------------------
 3 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 layout/base/crashtests/860579-1.html

diff --git a/layout/base/crashtests/860579-1.html b/layout/base/crashtests/860579-1.html
new file mode 100644
index 000000000000..3f7ef558b2e2
--- /dev/null
+++ b/layout/base/crashtests/860579-1.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+function addFrame(contents)
+{
+  var frame = document.createElement("iframe");
+  frame.src = "data:text/html," + contents;
+  document.body.appendChild(frame);
+}
+function boom()
+{
+  addFrame("1");
+  document.documentElement.offsetHeight;
+  addFrame("2");
+  document.body.style.display = "table-caption";
+}
+</script>
+</head>
+<body onload="boom();"></body>
+</html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index b3deafebf51e..392fac8a084b 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -391,5 +391,6 @@ load 770381-1.html
 load 795646.html
 load 813372-1.html
 load 836990-1.html
+load 860579-1.html
 pref(layers.force-active,true) load 859526-1.html
 pref(layers.force-active,true) load 859630-1.html
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index a01878d57b0e..a87409917665 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1396,28 +1396,15 @@ static void Sort(nsDisplayList* aList, int32_t aCount, nsDisplayList::SortLEQ aC
 }
 
 static nsIContent* FindContentInDocument(nsDisplayItem* aItem, nsIDocument* aDoc) {
-  nsIFrame* frame = aItem->GetUnderlyingFrame();
-  nsIContent* c = frame->GetContent();
-  for (;;) {
-    nsIDocument* d;
-    if (c) {
-      d = c->OwnerDoc();
-    } else {
-      d = frame->PresContext()->Document();
-    }
-    if (d == aDoc) {
-      return c;
-    }
-    nsIDocument* parentDoc = d->GetParentDocument();
-    if (!parentDoc) {
-      return nullptr;
-    }
-    c = parentDoc->FindContentForSubDocument(d);
-    if (!c) {
-      NS_ERROR("No content for subdocument?");
-      return nullptr;
+  nsIFrame* f = aItem->GetUnderlyingFrame();
+  while (f) {
+    nsPresContext* pc = f->PresContext();
+    if (pc->Document() == aDoc) {
+      return f->GetContent();
     }
+    f = nsLayoutUtils::GetCrossDocParentFrame(pc->PresShell()->GetRootFrame());
   }
+  return nullptr;
 }
 
 static bool IsContentLEQ(nsDisplayItem* aItem1, nsDisplayItem* aItem2,

From 88b40306f675744a938314c19e05a31a5b8f2bd5 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 17 Apr 2013 11:43:22 +0100
Subject: [PATCH 117/438] Bug 784387 - Handle duplicate reading list item case
 (r=bnicholson)

---
 mobile/android/base/BrowserApp.java           | 19 ++++++++---
 .../base/locales/en-US/android_strings.dtd    |  1 +
 mobile/android/base/strings.xml.in            |  1 +
 mobile/android/chrome/content/browser.js      | 32 +++++++++++++------
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 955e5fa6b843..891143c12052 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -73,6 +73,10 @@ abstract public class BrowserApp extends GeckoApp
 
     private static final int TABS_ANIMATION_DURATION = 450;
 
+    private static final int READER_ADD_SUCCESS = 0;
+    private static final int READER_ADD_FAILED = 1;
+    private static final int READER_ADD_DUPLICATE = 2;
+
     public static BrowserToolbar mBrowserToolbar;
     private AboutHome mAboutHome;
     protected Telemetry.Timer mAboutHomeStartupTimer = null;
@@ -431,9 +435,14 @@ abstract public class BrowserApp extends GeckoApp
         return super.onKeyDown(keyCode, event);
     }
 
-    void handleReaderAdded(boolean success, final String title, final String url) {
-        if (!success) {
-            showToast(R.string.reading_list_failed, Toast.LENGTH_SHORT);
+    void handleReaderAdded(int result, final String title, final String url) {
+        if (result != READER_ADD_SUCCESS) {
+            if (result == READER_ADD_FAILED) {
+                showToast(R.string.reading_list_failed, Toast.LENGTH_SHORT);
+            } else if (result == READER_ADD_DUPLICATE) {
+                showToast(R.string.reading_list_duplicate, Toast.LENGTH_SHORT);
+            }
+
             return;
         }
 
@@ -988,10 +997,10 @@ abstract public class BrowserApp extends GeckoApp
                 Telemetry.HistogramAdd("FENNEC_FAVICONS_COUNT", BrowserDB.getCount(getContentResolver(), "favicons"));
                 Telemetry.HistogramAdd("FENNEC_THUMBNAILS_COUNT", BrowserDB.getCount(getContentResolver(), "thumbnails"));
             } else if (event.equals("Reader:Added")) {
-                final boolean success = message.getBoolean("success");
+                final int result = message.getInt("result");
                 final String title = message.getString("title");
                 final String url = message.getString("url");
-                handleReaderAdded(success, title, url);
+                handleReaderAdded(result, title, url);
             } else if (event.equals("Reader:Removed")) {
                 final String url = message.getString("url");
                 handleReaderRemoved(url);
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 2aab6e913012..7b3af510c47b 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -182,6 +182,7 @@ size. -->
 <!ENTITY reading_list_added "Page added to your Reading List">
 <!ENTITY reading_list_removed "Page removed from your Reading List">
 <!ENTITY reading_list_failed "Failed to add page to your Reading List">
+<!ENTITY reading_list_duplicate "Page already in your Reading List">
 <!ENTITY reader "Reader">
 
 <!ENTITY masterpassword_create_title "Create Master Password">
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 641f57d94015..c349145c71cc 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -158,6 +158,7 @@
   <string name="reading_list_added">&reading_list_added;</string>
   <string name="reading_list_removed">&reading_list_removed;</string>
   <string name="reading_list_failed">&reading_list_failed;</string>
+  <string name="reading_list_duplicate">&reading_list_duplicate;</string>
   <string name="reader">&reader;</string>
 
   <string name="contextmenu_open_new_tab">&contextmenu_open_new_tab;</string>
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 46f8c47fc54a..d7153f912b74 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -6512,6 +6512,10 @@ let Reader = {
 
   DEBUG: 0,
 
+  READER_ADD_SUCCESS: 0,
+  READER_ADD_FAILED: 1,
+  READER_ADD_DUPLICATE: 2,
+
   // Don't try to parse the page if it has too many elements (for memory and
   // performance reasons)
   MAX_ELEMS_TO_PARSE: 3000,
@@ -6531,26 +6535,36 @@ let Reader = {
         let currentURI = tab.browser.currentURI;
         let url = currentURI.spec;
 
-        let sendResult = function(success, title) {
-          this.log("Reader:Add success=" + success + ", url=" + url + ", title=" + title);
+        let sendResult = function(result, title) {
+          this.log("Reader:Add success=" + result + ", url=" + url + ", title=" + title);
 
           sendMessageToJava({
             type: "Reader:Added",
-            success: success,
+            result: result,
             title: title,
             url: url,
           });
         }.bind(this);
 
-        this.getArticleForTab(aData, currentURI.specIgnoringRef, function (article) {
-          if (!article) {
-            sendResult(false, "");
+        this.getArticleFromCache(currentURI.specIgnoringRef, function (article) {
+          // If the article is already in reading list, bail
+          if (article) {
+            sendResult(this.READER_ADD_DUPLICATE, "");
             return;
           }
 
-          this.storeArticleInCache(article, function(success) {
-            sendResult(success, article.title);
-          });
+          this.getArticleForTab(aData, currentURI.specIgnoringRef, function (article) {
+            if (!article) {
+              sendResult(this.READER_ADD_FAILED, "");
+              return;
+            }
+
+            this.storeArticleInCache(article, function(success) {
+              let result = (success ? this.READER_ADD_SUCCESS :
+                  this.READER_ADD_FAILED);
+              sendResult(result, article.title);
+            }.bind(this));
+          }.bind(this));
         }.bind(this));
         break;
       }

From ed847aa5b66e362144308bf232d5ef40b2b36bc7 Mon Sep 17 00:00:00 2001
From: Aditya Bhardwaj <aditya2204@gmail.com>
Date: Wed, 17 Apr 2013 11:43:30 +0100
Subject: [PATCH 118/438] Bug 784387 - Long press on reader button to add to
 reading list (r=lucasr)

---
 mobile/android/base/BrowserToolbar.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index 71504e2d38d3..fc3f8114b1bb 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -321,6 +321,18 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
             }
         });
 
+        mReader.setOnLongClickListener(new Button.OnLongClickListener() {
+            public boolean onLongClick(View v) {
+                Tab tab = Tabs.getInstance().getSelectedTab();
+                if (tab != null) {
+                    tab.addToReadingList();
+                    return true;
+                }
+
+                return false;
+            }
+        });
+
         mShadow = (ImageView) mLayout.findViewById(R.id.shadow);
 
         mHandler = new Handler();

From d4e2debdd5e209436bfef367d12b55e6d5c3f9f2 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Wed, 17 Apr 2013 11:31:45 +0200
Subject: [PATCH 119/438] Bug 861165: IonMonkey: Correct behaviour for JSOP_IN
 on dense native with negative index, r=bhackett

---
 js/src/ion/CodeGenerator.cpp           | 58 +++++++++++++++---
 js/src/ion/IonBuilder.cpp              |  2 +-
 js/src/ion/LIR-Common.h                | 10 ++-
 js/src/ion/Lowering.cpp                | 10 ++-
 js/src/ion/MIR.cpp                     |  6 ++
 js/src/ion/MIR.h                       | 73 ++++++++++++++++++++--
 js/src/ion/TypePolicy.cpp              |  2 +
 js/src/ion/VMFunctions.cpp             |  7 +++
 js/src/ion/VMFunctions.h               |  1 +
 js/src/jit-test/tests/ion/bug861165.js | 85 ++++++++++++++++++++++++++
 10 files changed, 236 insertions(+), 18 deletions(-)
 create mode 100644 js/src/jit-test/tests/ion/bug861165.js

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 02af8bcaad3e..1fa342456e9f 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -5606,35 +5606,75 @@ CodeGenerator::visitIn(LIn *ins)
     return callVM(OperatorInInfo, ins);
 }
 
+typedef bool (*OperatorInIFn)(JSContext *, uint32_t, HandleObject, JSBool *);
+static const VMFunction OperatorInIInfo = FunctionInfo<OperatorInIFn>(OperatorInI);
+
 bool
 CodeGenerator::visitInArray(LInArray *lir)
 {
+    const MInArray *mir = lir->mir();
     Register elements = ToRegister(lir->elements());
     Register initLength = ToRegister(lir->initLength());
     Register output = ToRegister(lir->output());
 
     // When the array is not packed we need to do a hole check in addition to the bounds check.
-    Label falseBranch, done;
+    Label falseBranch, done, trueBranch;
+
+    OutOfLineCode *ool = NULL;
+    Label* failedInitLength = &falseBranch;
+
     if (lir->index()->isConstant()) {
-        masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(ToInt32(lir->index())), &falseBranch);
-        if (lir->mir()->needsHoleCheck()) {
-            masm.branchTestMagic(Assembler::Equal, Address(elements, ToInt32(lir->index()) * sizeof(Value)),
-                                 &falseBranch);
+        int32_t index = ToInt32(lir->index());
+
+        JS_ASSERT_IF(index < 0, mir->needsNegativeIntCheck());
+        if (mir->needsNegativeIntCheck()) {
+            ool = oolCallVM(OperatorInIInfo, lir,
+                            (ArgList(), Imm32(index), ToRegister(lir->object())),
+                            StoreRegisterTo(output));
+            failedInitLength = ool->entry();
+        }
+
+        masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(index), failedInitLength);
+        if (mir->needsHoleCheck()) {
+            Address address = Address(elements, index * sizeof(Value));
+            masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
         }
     } else {
-        masm.branch32(Assembler::BelowOrEqual, initLength, ToRegister(lir->index()), &falseBranch);
-        if (lir->mir()->needsHoleCheck()) {
-            masm.branchTestMagic(Assembler::Equal, BaseIndex(elements, ToRegister(lir->index()), TimesEight),
-                                 &falseBranch);
+        Label negativeIntCheck;
+        Register index = ToRegister(lir->index());
+
+        if (mir->needsNegativeIntCheck())
+            failedInitLength = &negativeIntCheck;
+
+        masm.branch32(Assembler::BelowOrEqual, initLength, index, failedInitLength);
+        if (mir->needsHoleCheck()) {
+            BaseIndex address = BaseIndex(elements, ToRegister(lir->index()), TimesEight);
+            masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
+        }
+        masm.jump(&trueBranch);
+
+        if (mir->needsNegativeIntCheck()) {
+            masm.bind(&negativeIntCheck);
+            ool = oolCallVM(OperatorInIInfo, lir,
+                            (ArgList(), index, ToRegister(lir->object())),
+                            StoreRegisterTo(output));
+
+            masm.branch32(Assembler::LessThan, index, Imm32(0), ool->entry());
+            masm.jump(&falseBranch);
         }
     }
 
+    masm.bind(&trueBranch);
     masm.move32(Imm32(1), output);
     masm.jump(&done);
 
     masm.bind(&falseBranch);
     masm.move32(Imm32(0), output);
     masm.bind(&done);
+
+    if (ool)
+        masm.bind(ool->rejoin());
+
     return true;
 }
 
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 0aa2d376f401..7cebe3ac3c62 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -7394,7 +7394,7 @@ IonBuilder::jsop_in_dense()
     current->add(initLength);
 
     // Check if id < initLength and elem[id] not a hole.
-    MInArray *ins = MInArray::New(elements, id, initLength, needsHoleCheck);
+    MInArray *ins = MInArray::New(elements, id, initLength, obj, needsHoleCheck);
 
     current->add(ins);
     current->push(ins);
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index 8a94858a9545..270ce61a9019 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -2722,15 +2722,18 @@ class LLoadElementV : public LInstructionHelper<BOX_PIECES, 2, 0>
     }
 };
 
-class LInArray : public LInstructionHelper<1, 3, 0>
+class LInArray : public LInstructionHelper<1, 4, 0>
 {
   public:
     LIR_HEADER(InArray)
 
-    LInArray(const LAllocation &elements, const LAllocation &index, const LAllocation &initLength) {
+    LInArray(const LAllocation &elements, const LAllocation &index,
+             const LAllocation &initLength, const LAllocation &object)
+    {
         setOperand(0, elements);
         setOperand(1, index);
         setOperand(2, initLength);
+        setOperand(3, object);
     }
     const MInArray *mir() const {
         return mir_->toInArray();
@@ -2744,6 +2747,9 @@ class LInArray : public LInstructionHelper<1, 3, 0>
     const LAllocation *initLength() {
         return getOperand(2);
     }
+    const LAllocation *object() {
+        return getOperand(3);
+    }
 };
 
 
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index e7d861784051..956adb261733 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -1820,11 +1820,19 @@ LIRGenerator::visitInArray(MInArray *ins)
     JS_ASSERT(ins->elements()->type() == MIRType_Elements);
     JS_ASSERT(ins->index()->type() == MIRType_Int32);
     JS_ASSERT(ins->initLength()->type() == MIRType_Int32);
+    JS_ASSERT(ins->object()->type() == MIRType_Object);
     JS_ASSERT(ins->type() == MIRType_Boolean);
 
+    LAllocation object;
+    if (ins->needsNegativeIntCheck())
+        object = useRegister(ins->object());
+    else
+        object = LConstantIndex::Bogus();
+
     LInArray *lir = new LInArray(useRegister(ins->elements()),
                                  useRegisterOrConstant(ins->index()),
-                                 useRegister(ins->initLength()));
+                                 useRegister(ins->initLength()),
+                                 object);
     return define(lir, ins) && assignSafepoint(lir, ins);
 }
 
diff --git a/js/src/ion/MIR.cpp b/js/src/ion/MIR.cpp
index 7b94d6c7419f..2914423b66b1 100644
--- a/js/src/ion/MIR.cpp
+++ b/js/src/ion/MIR.cpp
@@ -2007,6 +2007,12 @@ InlinePropertyTable::hasFunction(JSFunction *func) const
     return false;
 }
 
+bool
+MInArray::needsNegativeIntCheck() const
+{
+    return !index()->range() || index()->range()->lower() < 0;
+}
+
 MDefinition *
 MAsmJSUnsignedToDouble::foldsTo(bool useValueNumbers)
 {
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index faa0d1ed38fa..55e740c3c467 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -1654,6 +1654,57 @@ class MTernaryInstruction : public MAryInstruction<3>
     }
 };
 
+class MQuaternaryInstruction : public MAryInstruction<4>
+{
+  protected:
+    MQuaternaryInstruction(MDefinition *first, MDefinition *second,
+                           MDefinition *third, MDefinition *fourth)
+    {
+        setOperand(0, first);
+        setOperand(1, second);
+        setOperand(2, third);
+        setOperand(3, fourth);
+    }
+
+  protected:
+    HashNumber valueHash() const
+    {
+        MDefinition *first = getOperand(0);
+        MDefinition *second = getOperand(1);
+        MDefinition *third = getOperand(2);
+        MDefinition *fourth = getOperand(3);
+
+        return op() ^ first->valueNumber() ^ second->valueNumber() ^
+                      third->valueNumber() ^ fourth->valueNumber();
+    }
+
+    bool congruentTo(MDefinition *const &ins) const
+    {
+        if (op() != ins->op())
+            return false;
+
+        if (type() != ins->type())
+            return false;
+
+        if (isEffectful() || ins->isEffectful())
+            return false;
+
+        MDefinition *first = getOperand(0);
+        MDefinition *second = getOperand(1);
+        MDefinition *third = getOperand(2);
+        MDefinition *fourth = getOperand(3);
+        MDefinition *insFirst = ins->getOperand(0);
+        MDefinition *insSecond = ins->getOperand(1);
+        MDefinition *insThird = ins->getOperand(2);
+        MDefinition *insFourth = ins->getOperand(3);
+
+        return first->valueNumber() == insFirst->valueNumber() &&
+               second->valueNumber() == insSecond->valueNumber() &&
+               third->valueNumber() == insThird->valueNumber() &&
+               fourth->valueNumber() == insFourth->valueNumber();
+    }
+};
+
 class MCompare
   : public MBinaryInstruction,
     public ComparePolicy
@@ -6295,12 +6346,15 @@ class MIn
 
 // Test whether the index is in the array bounds or a hole.
 class MInArray
-  : public MTernaryInstruction
+  : public MQuaternaryInstruction,
+    public ObjectPolicy<3>
 {
     bool needsHoleCheck_;
 
-    MInArray(MDefinition *elements, MDefinition *index, MDefinition *initLength, bool needsHoleCheck)
-      : MTernaryInstruction(elements, index, initLength),
+    MInArray(MDefinition *elements, MDefinition *index,
+             MDefinition *initLength, MDefinition *object,
+             bool needsHoleCheck)
+      : MQuaternaryInstruction(elements, index, initLength, object),
         needsHoleCheck_(needsHoleCheck)
     {
         setResultType(MIRType_Boolean);
@@ -6314,8 +6368,10 @@ class MInArray
     INSTRUCTION_HEADER(InArray)
 
     static MInArray *New(MDefinition *elements, MDefinition *index,
-                         MDefinition *initLength, bool needsHoleCheck) {
-        return new MInArray(elements, index, initLength, needsHoleCheck);
+                         MDefinition *initLength, MDefinition *object,
+                         bool needsHoleCheck)
+    {
+        return new MInArray(elements, index, initLength, object, needsHoleCheck);
     }
 
     MDefinition *elements() const {
@@ -6327,12 +6383,19 @@ class MInArray
     MDefinition *initLength() const {
         return getOperand(2);
     }
+    MDefinition *object() const {
+        return getOperand(3);
+    }
     bool needsHoleCheck() const {
         return needsHoleCheck_;
     }
+    bool needsNegativeIntCheck() const;
     AliasSet getAliasSet() const {
         return AliasSet::Load(AliasSet::Element);
     }
+    TypePolicy *typePolicy() {
+        return this;
+    }
 };
 
 // Implementation for instanceof operator with specific rhs.
diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index 9cec5d4a8f52..f26e28caecd9 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -399,6 +399,8 @@ ObjectPolicy<Op>::staticAdjustInputs(MInstruction *ins)
 
 template bool ObjectPolicy<0>::staticAdjustInputs(MInstruction *ins);
 template bool ObjectPolicy<1>::staticAdjustInputs(MInstruction *ins);
+template bool ObjectPolicy<2>::staticAdjustInputs(MInstruction *ins);
+template bool ObjectPolicy<3>::staticAdjustInputs(MInstruction *ins);
 
 bool
 CallPolicy::adjustInputs(MInstruction *ins)
diff --git a/js/src/ion/VMFunctions.cpp b/js/src/ion/VMFunctions.cpp
index c9f2f8dda262..b1dd826206a0 100644
--- a/js/src/ion/VMFunctions.cpp
+++ b/js/src/ion/VMFunctions.cpp
@@ -507,6 +507,13 @@ OperatorIn(JSContext *cx, HandleValue key, HandleObject obj, JSBool *out)
     return true;
 }
 
+bool
+OperatorInI(JSContext *cx, uint32_t index, HandleObject obj, JSBool *out)
+{
+    RootedValue key(cx, Int32Value(index));
+    return OperatorIn(cx, key, obj, out);
+}
+
 bool
 GetIntrinsicValue(JSContext *cx, HandlePropertyName name, MutableHandleValue rval)
 {
diff --git a/js/src/ion/VMFunctions.h b/js/src/ion/VMFunctions.h
index c7477ddd2b0f..13be91aea586 100644
--- a/js/src/ion/VMFunctions.h
+++ b/js/src/ion/VMFunctions.h
@@ -521,6 +521,7 @@ bool SPSEnter(JSContext *cx, HandleScript script);
 bool SPSExit(JSContext *cx, HandleScript script);
 
 bool OperatorIn(JSContext *cx, HandleValue key, HandleObject obj, JSBool *out);
+bool OperatorInI(JSContext *cx, uint32_t index, HandleObject obj, JSBool *out);
 
 bool GetIntrinsicValue(JSContext *cx, HandlePropertyName name, MutableHandleValue rval);
 
diff --git a/js/src/jit-test/tests/ion/bug861165.js b/js/src/jit-test/tests/ion/bug861165.js
new file mode 100644
index 000000000000..924dcbaaef86
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug861165.js
@@ -0,0 +1,85 @@
+// |jit-test| no-jm
+
+// IM has the following fastpaths:
+// - constant index (constant)
+// - need negative int check (neg)
+// - needs hole check (hole)
+// So to test everything we have to do:
+//            constant | neg | hole
+//  test 1:     0         0      0
+//  test 2:     1         0      0
+//  test 3:     0         1      0
+//  test 4:     1         1      0
+//  test 5:     0         0      1
+//  test 6:     1         0      1
+//  test 7:     0         1      1
+//  test 8:     1         1      1
+
+function test1(index, a) {
+  if (index < 0)
+    index = -index
+  return index in a;
+}
+assertEq(test1(1, [1,2]), true);
+
+function test2(a) {
+  return 0 in a;
+}
+assertEq(test2([1,2]), true);
+
+function test3(index, a) {
+  return index in a;
+}
+
+var arr3 = [];
+arr3["-1073741828"] = 17;
+assertEq(test3(-1073741828, arr3), true);
+
+function test4(a) {
+  return -1073741828 in a;
+}
+assertEq(test4(arr3), true);
+
+
+function test5(index, a) {
+  if (index < 0)
+    index = -index
+  return index in a;
+}
+var arr5 = [];
+arr5[0] = 1
+arr5[1] = 1
+arr5[2] = 1
+arr5[4] = 1
+assertEq(test5(1, arr5), true);
+assertEq(test5(3, arr5), false);
+
+function test7a(a) {
+  return 3 in a;
+}
+function test7b(a) {
+  return 4 in a;
+}
+assertEq(test7a(arr5), false);
+assertEq(test7b(arr5), true);
+
+function test8(index, a) {
+  return index in a;
+}
+arr5["-1073741828"] = 17;
+assertEq(test8(-1073741828, arr5), true);
+assertEq(test8(3, arr5), false);
+assertEq(test8(0, arr5), true);
+
+function test9a(a) {
+  return 0 in a;
+}
+function test9b(a) {
+  return 3 in a;
+}
+function test9c(a) {
+  return -1073741828 in a;
+}
+assertEq(test9a(arr5), true);
+assertEq(test9b(arr5), false);
+assertEq(test9c(arr5), true);

From 22436b036a2b8980c882533d3462213b586d2b6c Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Wed, 17 Apr 2013 11:31:53 +0200
Subject: [PATCH 120/438] Bug 861116: IonBuilder: Add support for
 JSOP_INITELEM, r=jandem

---
 js/src/ion/CodeGenerator.cpp         | 27 ++++++++++++++++++-----
 js/src/ion/CodeGenerator.h           |  1 +
 js/src/ion/IonBuilder.cpp            | 16 ++++++++++++++
 js/src/ion/IonBuilder.h              |  1 +
 js/src/ion/LIR-Common.h              | 20 +++++++++++++++++
 js/src/ion/LOpcodes.h                |  1 +
 js/src/ion/Lowering.cpp              | 12 ++++++++++
 js/src/ion/Lowering.h                |  1 +
 js/src/ion/MIR.h                     | 33 ++++++++++++++++++++++++++++
 js/src/ion/MOpcodes.h                |  1 +
 js/src/ion/ParallelArrayAnalysis.cpp |  1 +
 js/src/ion/TypePolicy.h              | 14 ++++++++++++
 12 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 1fa342456e9f..506db97a3863 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -2648,11 +2648,6 @@ CodeGenerator::visitNewStringObject(LNewStringObject *lir)
     return true;
 }
 
-typedef bool(*InitPropFn)(JSContext *cx, HandleObject obj,
-                          HandlePropertyName name, HandleValue value);
-static const VMFunction InitPropInfo =
-    FunctionInfo<InitPropFn>(InitProp);
-
 bool
 CodeGenerator::visitParNew(LParNew *lir)
 {
@@ -2747,6 +2742,28 @@ CodeGenerator::visitParBailout(LParBailout *lir)
     return true;
 }
 
+typedef bool(*InitElemFn)(JSContext *cx, HandleObject obj,
+                          HandleValue id, HandleValue value);
+static const VMFunction InitElemInfo =
+    FunctionInfo<InitElemFn>(InitElemOperation);
+
+bool
+CodeGenerator::visitInitElem(LInitElem *lir)
+{
+    Register objReg = ToRegister(lir->getObject());
+
+    pushArg(ToValue(lir, LInitElem::ValueIndex));
+    pushArg(ToValue(lir, LInitElem::IdIndex));
+    pushArg(objReg);
+
+    return callVM(InitElemInfo, lir);
+}
+
+typedef bool(*InitPropFn)(JSContext *cx, HandleObject obj,
+                          HandlePropertyName name, HandleValue value);
+static const VMFunction InitPropInfo =
+    FunctionInfo<InitPropFn>(InitProp);
+
 bool
 CodeGenerator::visitInitProp(LInitProp *lir)
 {
diff --git a/js/src/ion/CodeGenerator.h b/js/src/ion/CodeGenerator.h
index 4130a3611ebc..b48e613a9490 100644
--- a/js/src/ion/CodeGenerator.h
+++ b/js/src/ion/CodeGenerator.h
@@ -116,6 +116,7 @@ class CodeGenerator : public CodeGeneratorSpecific
     bool visitParNew(LParNew *lir);
     bool visitParNewDenseArray(LParNewDenseArray *lir);
     bool visitParBailout(LParBailout *lir);
+    bool visitInitElem(LInitElem *lir);
     bool visitInitProp(LInitProp *lir);
     bool visitCreateThis(LCreateThis *lir);
     bool visitCreateThisWithProto(LCreateThisWithProto *lir);
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 7cebe3ac3c62..f4e080bdd360 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -952,6 +952,9 @@ IonBuilder::inspectOpcode(JSOp op)
         return jsop_newobject(baseObj);
       }
 
+      case JSOP_INITELEM:
+        return jsop_initelem();
+
       case JSOP_INITELEM_ARRAY:
         return jsop_initelem_array();
 
@@ -4779,6 +4782,19 @@ IonBuilder::jsop_newobject(HandleObject baseObj)
     return resumeAfter(ins);
 }
 
+bool
+IonBuilder::jsop_initelem()
+{
+    MDefinition *value = current->pop();
+    MDefinition *id = current->pop();
+    MDefinition *obj = current->peek(-1);
+
+    MInitElem *initElem = MInitElem::New(obj, id, value);
+    current->add(initElem);
+
+    return resumeAfter(initElem);
+}
+
 bool
 IonBuilder::jsop_initelem_array()
 {
diff --git a/js/src/ion/IonBuilder.h b/js/src/ion/IonBuilder.h
index 8f8f2a486734..91fdee673034 100644
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -375,6 +375,7 @@ class IonBuilder : public MIRGenerator
     bool jsop_delprop(HandlePropertyName name);
     bool jsop_newarray(uint32_t count);
     bool jsop_newobject(HandleObject baseObj);
+    bool jsop_initelem();
     bool jsop_initelem_array();
     bool jsop_initprop(HandlePropertyName name);
     bool jsop_regexp(RegExpObject *reobj);
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index 270ce61a9019..a758e6a00d28 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -478,6 +478,26 @@ class LParBailout : public LInstructionHelper<0, 0, 0>
     LIR_HEADER(ParBailout);
 };
 
+class LInitElem : public LCallInstructionHelper<0, 1 + 2*BOX_PIECES, 0>
+{
+  public:
+    LIR_HEADER(InitElem)
+
+    LInitElem(const LAllocation &object) {
+        setOperand(0, object);
+    }
+
+    static const size_t IdIndex = 1;
+    static const size_t ValueIndex = 1 + BOX_PIECES;
+
+    const LAllocation *getObject() {
+        return getOperand(0);
+    }
+    MInitElem *mir() const {
+        return mir_->toInitElem();
+    }
+};
+
 // Takes in an Object and a Value.
 class LInitProp : public LCallInstructionHelper<0, 1 + BOX_PIECES, 0>
 {
diff --git a/js/src/ion/LOpcodes.h b/js/src/ion/LOpcodes.h
index b7bf009b266c..88142926f1c5 100644
--- a/js/src/ion/LOpcodes.h
+++ b/js/src/ion/LOpcodes.h
@@ -32,6 +32,7 @@
     _(ParNewDenseArray)             \
     _(ParNewCallObject)             \
     _(ParBailout)                   \
+    _(InitElem)                     \
     _(InitProp)                     \
     _(CheckOverRecursed)            \
     _(ParCheckOverRecursed)         \
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 956adb261733..748d9ae84c06 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -237,6 +237,18 @@ LIRGenerator::visitParBailout(MParBailout *ins)
     return add(lir, ins);
 }
 
+bool
+LIRGenerator::visitInitElem(MInitElem *ins)
+{
+    LInitElem *lir = new LInitElem(useRegisterAtStart(ins->getObject()));
+    if (!useBoxAtStart(lir, LInitElem::IdIndex, ins->getId()))
+        return false;
+    if (!useBoxAtStart(lir, LInitElem::ValueIndex, ins->getValue()))
+        return false;
+
+    return add(lir, ins) && assignSafepoint(lir, ins);
+}
+
 bool
 LIRGenerator::visitInitProp(MInitProp *ins)
 {
diff --git a/js/src/ion/Lowering.h b/js/src/ion/Lowering.h
index cc8cd249df8b..6e11bcdbf050 100644
--- a/js/src/ion/Lowering.h
+++ b/js/src/ion/Lowering.h
@@ -94,6 +94,7 @@ class LIRGenerator : public LIRGeneratorSpecific
     bool visitParNewCallObject(MParNewCallObject *ins);
     bool visitParNewDenseArray(MParNewDenseArray *ins);
     bool visitParBailout(MParBailout *ins);
+    bool visitInitElem(MInitElem *ins);
     bool visitInitProp(MInitProp *ins);
     bool visitCheckOverRecursed(MCheckOverRecursed *ins);
     bool visitParCheckOverRecursed(MParCheckOverRecursed *ins);
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 55e740c3c467..58437d641a54 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -1243,6 +1243,39 @@ class MInitProp
     }
 };
 
+class MInitElem
+  : public MAryInstruction<3>,
+    public Mix3Policy<ObjectPolicy<0>, BoxPolicy<1>, BoxPolicy<2> >
+{
+    MInitElem(MDefinition *obj, MDefinition *id, MDefinition *value)
+    {
+        setOperand(0, obj);
+        setOperand(1, id);
+        setOperand(2, value);
+        setResultType(MIRType_None);
+    }
+
+  public:
+    INSTRUCTION_HEADER(InitElem)
+
+    static MInitElem *New(MDefinition *obj, MDefinition *id, MDefinition *value) {
+        return new MInitElem(obj, id, value);
+    }
+
+    MDefinition *getObject() const {
+        return getOperand(0);
+    }
+    MDefinition *getId() const {
+        return getOperand(1);
+    }
+    MDefinition *getValue() const {
+        return getOperand(2);
+    }
+    TypePolicy *typePolicy() {
+        return this;
+    }
+};
+
 // Designates the start of call frame construction.
 // Generates code to adjust the stack pointer for the argument vector.
 // Argc is inferred by checking the use chain during lowering.
diff --git a/js/src/ion/MOpcodes.h b/js/src/ion/MOpcodes.h
index a5123a627ccd..06630fd7ae24 100644
--- a/js/src/ion/MOpcodes.h
+++ b/js/src/ion/MOpcodes.h
@@ -81,6 +81,7 @@ namespace ion {
     _(NewDeclEnvObject)                                                     \
     _(NewCallObject)                                                        \
     _(NewStringObject)                                                      \
+    _(InitElem)                                                             \
     _(InitProp)                                                             \
     _(Start)                                                                \
     _(OsrEntry)                                                             \
diff --git a/js/src/ion/ParallelArrayAnalysis.cpp b/js/src/ion/ParallelArrayAnalysis.cpp
index 364df7b0902d..3fe70a523437 100644
--- a/js/src/ion/ParallelArrayAnalysis.cpp
+++ b/js/src/ion/ParallelArrayAnalysis.cpp
@@ -172,6 +172,7 @@ class ParallelArrayVisitor : public MInstructionVisitor
     CUSTOM_OP(NewObject)
     CUSTOM_OP(NewCallObject)
     CUSTOM_OP(NewParallelArray)
+    UNSAFE_OP(InitElem)
     UNSAFE_OP(InitProp)
     SAFE_OP(Start)
     UNSAFE_OP(OsrEntry)
diff --git a/js/src/ion/TypePolicy.h b/js/src/ion/TypePolicy.h
index 3f209e53c857..3dd5812581b9 100644
--- a/js/src/ion/TypePolicy.h
+++ b/js/src/ion/TypePolicy.h
@@ -186,6 +186,20 @@ class MixPolicy : public TypePolicy
     }
 };
 
+// Combine three policies.
+template <class Policy1, class Policy2, class Policy3>
+class Mix3Policy : public TypePolicy
+{
+  public:
+    static bool staticAdjustInputs(MInstruction *ins) {
+        return Policy1::staticAdjustInputs(ins) && Policy2::staticAdjustInputs(ins) &&
+               Policy3::staticAdjustInputs(ins);
+    }
+    virtual bool adjustInputs(MInstruction *ins) {
+        return staticAdjustInputs(ins);
+    }
+};
+
 class CallSetElementPolicy : public SingleObjectPolicy
 {
   public:

From efae06a65b8c5253ed2f10f5e444b08e8167fe31 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 17 Apr 2013 11:49:33 +0100
Subject: [PATCH 121/438] Bug 841941 - Add a mochitest to check that the order
 in which @value/@min/@max/@step are specified in markup makes no difference
 to the value that <input type=range> will be given. r=mounir

---
 content/html/content/test/forms/Makefile.in   |  1 +
 .../forms/test_input_range_attr_order.html    | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 content/html/content/test/forms/test_input_range_attr_order.html

diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in
index b51f387f2e05..bd692c436912 100644
--- a/content/html/content/test/forms/Makefile.in
+++ b/content/html/content/test/forms/Makefile.in
@@ -18,6 +18,7 @@ MOCHITEST_FILES = \
 		test_input_attributes_reflection.html \
 		test_input_list_attribute.html \
 		test_input_email.html \
+		test_input_range_attr_order.html \
 		test_input_range_key_events.html \
 		test_input_range_mouse_and_touch_events.html \
 		test_input_url.html \
diff --git a/content/html/content/test/forms/test_input_range_attr_order.html b/content/html/content/test/forms/test_input_range_attr_order.html
new file mode 100644
index 000000000000..3d3d6d6f7684
--- /dev/null
+++ b/content/html/content/test/forms/test_input_range_attr_order.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=841941
+-->
+<head>
+  <title>Test @min/@max/@step order for range</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <meta charset="UTF-8">
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=841941">Mozilla Bug 841941</a>
+<p id="display"></p>
+<div id="content">
+  <input type=range value=2 max=1.5 step=0.5>
+  <input type=range value=2 step=0.5 max=1.5>
+  <input type=range value=2 max=1.5 step=0.5>
+  <input type=range value=2 step=0.5 max=1.5>
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/**
+ * Test for Bug 841941
+ * This test checks that the order in which @min/@max/@step are specified in
+ * markup makes no difference to the value that <input type=range> will be
+ * given. Basically this checks that sanitization of the value does not occur
+ * until after the parser has finished with the element.
+ */
+SimpleTest.waitForExplicitFinish();
+SimpleTest.waitForFocus(function() {
+  test();
+  SimpleTest.finish();
+});
+
+function test() {
+  var ranges = document.querySelectorAll("input[type=range]");
+  for (var i = 0; i < ranges.length; i++) {
+    is(ranges.item(i).value, "1.5", "Check sanitization order for range " + i);
+  }
+}
+
+</script>
+</pre>
+</body>
+</html>

From 86ee6c8245c353089a80823edb5e7de377c70d5c Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Sat, 16 Mar 2013 01:40:06 +0530
Subject: [PATCH 122/438] Bug 814587 - Change Reader:Add to handle tabID and
 URL as input (r=bnicholson)

---
 mobile/android/base/Tab.java             | 10 ++++-
 mobile/android/chrome/content/browser.js | 54 +++++++++++++++++-------
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java
index 1fd10649111b..98ace2a72c5e 100644
--- a/mobile/android/base/Tab.java
+++ b/mobile/android/base/Tab.java
@@ -399,7 +399,15 @@ public class Tab {
         if (!mReaderEnabled)
             return;
 
-        GeckoEvent e = GeckoEvent.createBroadcastEvent("Reader:Add", String.valueOf(getId()));
+        JSONObject json = new JSONObject();
+        try {
+            json.put("tabID", String.valueOf(getId()));
+        } catch (JSONException e) {
+            Log.e(LOGTAG, "JSON error - failing to add to reading list", e);
+            return;
+        }
+
+        GeckoEvent e = GeckoEvent.createBroadcastEvent("Reader:Add", json.toString());
         GeckoAppShell.sendEventToGecko(e);
     }
 
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index d7153f912b74..eee668e8b8ef 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -6531,9 +6531,26 @@ let Reader = {
   observe: function(aMessage, aTopic, aData) {
     switch(aTopic) {
       case "Reader:Add": {
-        let tab = BrowserApp.getTabForId(aData);
-        let currentURI = tab.browser.currentURI;
-        let url = currentURI.spec;
+        let args = JSON.parse(aData);
+
+        let tabID = null;
+        let url, urlWithoutRef;
+
+        if ('tabID' in args) {
+          tabID = args.tabID;
+
+          let tab = BrowserApp.getTabForId(tabID);
+          let currentURI = tab.browser.currentURI;
+
+          url = currentURI.spec;
+          urlWithoutRef = currentURI.specIgnoringRef;
+        } else if ('url' in args) {
+          let uri = Services.io.newURI(args.url, null, null);
+          url = uri.spec;
+          urlWithoutRef = uri.specIgnoringRef;
+        } else {
+          throw new Error("Reader:Add requires a tabID or an URL as argument");
+        }
 
         let sendResult = function(result, title) {
           this.log("Reader:Add success=" + result + ", url=" + url + ", title=" + title);
@@ -6546,25 +6563,30 @@ let Reader = {
           });
         }.bind(this);
 
-        this.getArticleFromCache(currentURI.specIgnoringRef, function (article) {
+        let handleArticle = function(article) {
+          if (!article) {
+            sendResult(this.READER_ADD_FAILED, "");
+            return;
+          }
+
+          this.storeArticleInCache(article, function(success) {
+            let result = (success ? this.READER_ADD_SUCCESS : this.READER_ADD_FAILED);
+            sendResult(result, article.title);
+          }.bind(this));
+        }.bind(this);
+
+        this.getArticleFromCache(urlWithoutRef, function (article) {
           // If the article is already in reading list, bail
           if (article) {
             sendResult(this.READER_ADD_DUPLICATE, "");
             return;
           }
 
-          this.getArticleForTab(aData, currentURI.specIgnoringRef, function (article) {
-            if (!article) {
-              sendResult(this.READER_ADD_FAILED, "");
-              return;
-            }
-
-            this.storeArticleInCache(article, function(success) {
-              let result = (success ? this.READER_ADD_SUCCESS :
-                  this.READER_ADD_FAILED);
-              sendResult(result, article.title);
-            }.bind(this));
-          }.bind(this));
+          if (tabID != null) {
+            this.getArticleForTab(tabID, urlWithoutRef, handleArticle);
+          } else {
+            this.parseDocumentFromURL(urlWithoutRef, handleArticle);
+          }
         }.bind(this));
         break;
       }

From 2bbbd26f99fd7cd564be51047b6fdb93ddf5a6b1 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Tue, 9 Apr 2013 16:00:21 -0400
Subject: [PATCH 123/438] bug 860027 - remove
 XPTIInterfaceInfoManager::EnumerateInterfaces() r=bsmedberg, bholley

---
 js/xpconnect/src/XPCComponents.cpp            | 144 +++++-------------
 .../public/nsIInterfaceInfoManager.idl        |   4 +-
 .../xptinfo/src/xptiInterfaceInfoManager.cpp  |  22 ++-
 3 files changed, 53 insertions(+), 117 deletions(-)

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 69bc225c1e8d..9fc4e3148208 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -34,6 +34,7 @@
 #include "nsJSEnvironment.h"
 #include "nsXMLHttpRequest.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/XPTInterfaceInfoManager.h"
 #include "nsDOMClassInfoID.h"
 
 using namespace mozilla;
@@ -120,7 +121,7 @@ public:
     virtual ~nsXPCComponents_Interfaces();
 
 private:
-    nsCOMPtr<nsIInterfaceInfoManager> mManager;
+    nsCOMArray<nsIInterfaceInfo> mInterfaces;
 };
 
 /* void getInterfaces (out uint32_t count, [array, size_is (count), retval]
@@ -215,9 +216,9 @@ nsXPCComponents_Interfaces::GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
     return NS_ERROR_NOT_AVAILABLE;
 }
 
-nsXPCComponents_Interfaces::nsXPCComponents_Interfaces() :
-    mManager(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID))
+nsXPCComponents_Interfaces::nsXPCComponents_Interfaces()
 {
+    XPTInterfaceInfoManager::GetSingleton()->GetScriptableInterfaces(mInterfaces);
 }
 
 nsXPCComponents_Interfaces::~nsXPCComponents_Interfaces()
@@ -254,64 +255,36 @@ nsXPCComponents_Interfaces::NewEnumerate(nsIXPConnectWrappedNative *wrapper,
                                          uint32_t enum_op, jsval * statep,
                                          jsid * idp, bool *_retval)
 {
-    nsIEnumerator* e;
-
     switch (enum_op) {
         case JSENUMERATE_INIT:
         case JSENUMERATE_INIT_ALL:
         {
-            if (!mManager ||
-                NS_FAILED(mManager->EnumerateInterfaces(&e)) || !e ||
-                NS_FAILED(e->First()))
-
-            {
-                *statep = JSVAL_NULL;
-                return NS_ERROR_UNEXPECTED;
-            }
-
-            *statep = PRIVATE_TO_JSVAL(e);
+            *statep = JSVAL_ZERO;
             if (idp)
-                *idp = INT_TO_JSID(0); // indicate that we don't know the count
+                *idp = INT_TO_JSID(mInterfaces.Length());
             return NS_OK;
         }
         case JSENUMERATE_NEXT:
         {
-            nsCOMPtr<nsISupports> isup;
+            uint32_t idx = JSVAL_TO_INT(*statep);
+            nsIInterfaceInfo* interface = mInterfaces.SafeElementAt(idx);
+            *statep = UINT_TO_JSVAL(idx + 1);
 
-            e = (nsIEnumerator*) JSVAL_TO_PRIVATE(*statep);
+            if (interface) {
+                JSString* idstr;
+                const char* name;
 
-            while (1) {
-                if (static_cast<nsresult>(NS_ENUMERATOR_FALSE) == e->IsDone() &&
-                    NS_SUCCEEDED(e->CurrentItem(getter_AddRefs(isup))) && isup) {
-                    e->Next();
-                    nsCOMPtr<nsIInterfaceInfo> iface(do_QueryInterface(isup));
-                    if (iface) {
-                        JSString* idstr;
-                        const char* name;
-                        bool scriptable;
-
-                        if (NS_SUCCEEDED(iface->IsScriptable(&scriptable)) &&
-                            !scriptable) {
-                            continue;
-                        }
-
-                        if (NS_SUCCEEDED(iface->GetNameShared(&name)) && name &&
-                            nullptr != (idstr = JS_NewStringCopyZ(cx, name)) &&
-                            JS_ValueToId(cx, STRING_TO_JSVAL(idstr), idp)) {
-                            return NS_OK;
-                        }
-                    }
+                if (NS_SUCCEEDED(interface->GetNameShared(&name)) && name &&
+                        nullptr != (idstr = JS_NewStringCopyZ(cx, name)) &&
+                        JS_ValueToId(cx, STRING_TO_JSVAL(idstr), idp)) {
+                    return NS_OK;
                 }
-                // else...
-                break;
             }
-            // FALL THROUGH
+            // fall through
         }
 
         case JSENUMERATE_DESTROY:
         default:
-            e = (nsIEnumerator*) JSVAL_TO_PRIVATE(*statep);
-            NS_IF_RELEASE(e);
             *statep = JSVAL_NULL;
             return NS_OK;
     }
@@ -326,17 +299,16 @@ nsXPCComponents_Interfaces::NewResolve(nsIXPConnectWrappedNative *wrapper,
 {
     RootedObject obj(cx, objArg);
     RootedId id(cx, idArg);
-
-    if (!mManager || !JSID_IS_STRING(id))
-        return NS_OK;
-
     JSAutoByteString name;
     RootedString str(cx, JSID_TO_STRING(id));
 
-    // we only allow interfaces by name here
-    if (name.encodeLatin1(cx, JSID_TO_STRING(id)) && name.ptr()[0] != '{') {
+    if (JSID_IS_STRING(id) && name.encodeLatin1(cx, JSID_TO_STRING(id)) &&
+        name.ptr()[0] != '{')
+    {
+        // we only allow interfaces by name here
         nsCOMPtr<nsIInterfaceInfo> info;
-        mManager->GetInfoForName(name.ptr(), getter_AddRefs(info));
+        XPTInterfaceInfoManager::GetSingleton()->
+            GetInfoForName(name.ptr(), getter_AddRefs(info));
         if (!info)
             return NS_OK;
 
@@ -428,7 +400,7 @@ public:
     virtual ~nsXPCComponents_InterfacesByID();
 
 private:
-    nsCOMPtr<nsIInterfaceInfoManager> mManager;
+    nsCOMArray<nsIInterfaceInfo> mInterfaces;
 };
 
 /***************************************************************************/
@@ -524,9 +496,9 @@ nsXPCComponents_InterfacesByID::GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
     return NS_ERROR_NOT_AVAILABLE;
 }
 
-nsXPCComponents_InterfacesByID::nsXPCComponents_InterfacesByID() :
-    mManager(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID))
+nsXPCComponents_InterfacesByID::nsXPCComponents_InterfacesByID()
 {
+    XPTInterfaceInfoManager::GetSingleton()->GetScriptableInterfaces(mInterfaces);
 }
 
 nsXPCComponents_InterfacesByID::~nsXPCComponents_InterfacesByID()
@@ -561,68 +533,38 @@ nsXPCComponents_InterfacesByID::NewEnumerate(nsIXPConnectWrappedNative *wrapper,
                                              uint32_t enum_op, jsval * statep,
                                              jsid * idp, bool *_retval)
 {
-    nsIEnumerator* e;
-
     switch (enum_op) {
         case JSENUMERATE_INIT:
         case JSENUMERATE_INIT_ALL:
         {
-            if (!mManager ||
-                NS_FAILED(mManager->EnumerateInterfaces(&e)) || !e ||
-                NS_FAILED(e->First()))
-
-            {
-                *statep = JSVAL_NULL;
-                return NS_ERROR_UNEXPECTED;
-            }
-
-            *statep = PRIVATE_TO_JSVAL(e);
+            *statep = JSVAL_ZERO;
             if (idp)
-                *idp = INT_TO_JSID(0); // indicate that we don't know the count
+                *idp = INT_TO_JSID(mInterfaces.Length());
             return NS_OK;
         }
         case JSENUMERATE_NEXT:
         {
-            nsCOMPtr<nsISupports> isup;
+            uint32_t idx = JSVAL_TO_INT(*statep);
+            nsIInterfaceInfo* interface = mInterfaces.SafeElementAt(idx);
+            *statep = UINT_TO_JSVAL(idx + 1);
+            if (interface) {
+                nsIID const *iid;
+                char idstr[NSID_LENGTH];
+                JSString* jsstr;
 
-            e = (nsIEnumerator*) JSVAL_TO_PRIVATE(*statep);
-
-            while (1) {
-                if (static_cast<nsresult>(NS_ENUMERATOR_FALSE) == e->IsDone() &&
-                    NS_SUCCEEDED(e->CurrentItem(getter_AddRefs(isup))) && isup) {
-                    e->Next();
-                    nsCOMPtr<nsIInterfaceInfo> iface(do_QueryInterface(isup));
-                    if (iface) {
-                        nsIID const *iid;
-                        char idstr[NSID_LENGTH];
-                        JSString* jsstr;
-                        bool scriptable;
-
-                        if (NS_SUCCEEDED(iface->IsScriptable(&scriptable)) &&
-                            !scriptable) {
-                            continue;
-                        }
-
-                        if (NS_SUCCEEDED(iface->GetIIDShared(&iid))) {
-                            iid->ToProvidedString(idstr);
-                            jsstr = JS_NewStringCopyZ(cx, idstr);
-                            if (jsstr &&
-                                JS_ValueToId(cx, STRING_TO_JSVAL(jsstr), idp)) {
-                                return NS_OK;
-                            }
-                        }
+                if (NS_SUCCEEDED(interface->GetIIDShared(&iid))) {
+                    iid->ToProvidedString(idstr);
+                    jsstr = JS_NewStringCopyZ(cx, idstr);
+                    if (jsstr && JS_ValueToId(cx, STRING_TO_JSVAL(jsstr), idp)) {
+                        return NS_OK;
                     }
                 }
-                // else...
-                break;
             }
             // FALL THROUGH
         }
 
         case JSENUMERATE_DESTROY:
         default:
-            e = (nsIEnumerator*) JSVAL_TO_PRIVATE(*statep);
-            NS_IF_RELEASE(e);
             *statep = JSVAL_NULL;
             return NS_OK;
     }
@@ -639,9 +581,6 @@ nsXPCComponents_InterfacesByID::NewResolve(nsIXPConnectWrappedNative *wrapper,
     RootedId id(cx, idArg);
     RootedString str(cx, JSID_TO_STRING(id));
 
-    if (!mManager || !JSID_IS_STRING(id))
-        return NS_OK;
-
     if (38 != JS_GetStringLength(str))
         return NS_OK;
 
@@ -651,7 +590,8 @@ nsXPCComponents_InterfacesByID::NewResolve(nsIXPConnectWrappedNative *wrapper,
             return NS_OK;
 
         nsCOMPtr<nsIInterfaceInfo> info;
-        mManager->GetInfoForIID(&iid, getter_AddRefs(info));
+        XPTInterfaceInfoManager::GetSingleton()->
+            GetInfoForIID(&iid, getter_AddRefs(info));
         if (!info)
             return NS_OK;
 
diff --git a/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl b/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
index 72fb5f2f8a01..f0db98a2f6e1 100644
--- a/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
+++ b/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
@@ -12,7 +12,7 @@
 #include "nsISimpleEnumerator.idl"
 
 /* this is NOT intended to be scriptable */
-[uuid(8B161900-BE2B-11d2-9831-006008962422)]
+[uuid(1d53d8d9-1d92-428f-b5cc-198b55e897d7)]
 interface nsIInterfaceInfoManager : nsISupports
 {
     nsIInterfaceInfo getInfoForIID(in nsIIDPtr iid);
@@ -21,8 +21,6 @@ interface nsIInterfaceInfoManager : nsISupports
     nsIIDPtr getIIDForName(in string name);
     string   getNameForIID(in nsIIDPtr iid);
 
-    nsIEnumerator enumerateInterfaces();
-
     void autoRegisterInterfaces();
 
     nsIEnumerator enumerateInterfacesWhoseNamesStartWith(in string prefix);
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
index e1b7c874b55c..650c51dfb41e 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -268,32 +268,30 @@ XPTInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **_retval)
 static PLDHashOperator
 xpti_ArrayAppender(const char* name, xptiInterfaceEntry* entry, void* arg)
 {
-    nsISupportsArray* array = (nsISupportsArray*) arg;
+    nsCOMArray<nsIInterfaceInfo>* array = static_cast<nsCOMArray<nsIInterfaceInfo>*>(arg);
 
     nsCOMPtr<nsIInterfaceInfo> ii;
-    if (NS_SUCCEEDED(EntryToInfo(entry, getter_AddRefs(ii))))
+    if (NS_SUCCEEDED(EntryToInfo(entry, getter_AddRefs(ii)))) {
+      bool scriptable = false;
+      ii->IsScriptable(&scriptable);
+      if (scriptable) {
         array->AppendElement(ii);
+      }
+    }
     return PL_DHASH_NEXT;
 }
 
 /* nsIEnumerator enumerateInterfaces (); */
-NS_IMETHODIMP
-XPTInterfaceInfoManager::EnumerateInterfaces(nsIEnumerator **_retval)
+void
+XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray<nsIInterfaceInfo>& aInterfaces)
 {
     // I didn't want to incur the size overhead of using nsHashtable just to
     // make building an enumerator easier. So, this code makes a snapshot of 
     // the table using an nsISupportsArray and builds an enumerator for that.
     // We can afford this transient cost.
 
-    nsCOMPtr<nsISupportsArray> array;
-    NS_NewISupportsArray(getter_AddRefs(array));
-    if (!array)
-        return NS_ERROR_UNEXPECTED;
-
     ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor);
-    mWorkingSet.mNameTable.EnumerateRead(xpti_ArrayAppender, array);
-
-    return array->Enumerate(_retval);
+    mWorkingSet.mNameTable.EnumerateRead(xpti_ArrayAppender, &aInterfaces);
 }
 
 struct ArrayAndPrefix

From 7e00febe1e9ebb05d3638118ca1097a27fd5434f Mon Sep 17 00:00:00 2001
From: Norbert Lindenberg <mozilladev@lindenbergsoftware.com>
Date: Mon, 15 Apr 2013 14:35:27 -0700
Subject: [PATCH 124/438] Bug 837950 - Import test402 source files.  r=jwalden

--HG--
extra : rebase_source : 7de0eedbac0476fcc2a91fa8cce60a7437e56d2d
---
 js/src/tests/test402/HG-INFO                  |    7 +
 js/src/tests/test402/LICENSE                  |   28 +
 js/src/tests/test402/ch06/6.2/6.2.2_a.js      |   40 +
 js/src/tests/test402/ch06/6.2/6.2.2_b.js      |   41 +
 js/src/tests/test402/ch06/6.2/6.2.2_c.js      |   47 +
 js/src/tests/test402/ch06/6.2/6.2.3.js        |   69 +
 js/src/tests/test402/ch06/6.2/6.2.4.js        |   19 +
 js/src/tests/test402/ch06/6.2/browser.js      |    0
 js/src/tests/test402/ch06/6.2/shell.js        |    0
 js/src/tests/test402/ch06/6.3/6.3.1_a.js      |   25 +
 js/src/tests/test402/ch06/6.3/6.3.1_b.js      |   35 +
 js/src/tests/test402/ch06/6.3/browser.js      |    0
 js/src/tests/test402/ch06/6.3/shell.js        |    0
 js/src/tests/test402/ch06/6.4/6.4_a.js        |   22 +
 js/src/tests/test402/ch06/6.4/6.4_b.js        |   34 +
 js/src/tests/test402/ch06/6.4/6.4_c.js        |   36 +
 js/src/tests/test402/ch06/6.4/browser.js      |    0
 js/src/tests/test402/ch06/6.4/shell.js        |    0
 js/src/tests/test402/ch06/browser.js          |    0
 js/src/tests/test402/ch06/shell.js            |    0
 js/src/tests/test402/ch08/8.0/8.0.js          |   12 +
 js/src/tests/test402/ch08/8.0/8.0_L15.js      |   15 +
 js/src/tests/test402/ch08/8.0/browser.js      |    0
 js/src/tests/test402/ch08/8.0/shell.js        |    0
 js/src/tests/test402/ch08/browser.js          |    0
 js/src/tests/test402/ch08/shell.js            |    0
 js/src/tests/test402/ch09/9.1/9.1_a.js        |   18 +
 js/src/tests/test402/ch09/9.1/9.1_b.js        |   32 +
 js/src/tests/test402/ch09/9.1/browser.js      |    0
 js/src/tests/test402/ch09/9.1/shell.js        |    0
 js/src/tests/test402/ch09/9.2/9.2.1_1.js      |   23 +
 js/src/tests/test402/ch09/9.2/9.2.1_2.js      |   21 +
 js/src/tests/test402/ch09/9.2/9.2.1_3.js      |   87 ++
 js/src/tests/test402/ch09/9.2/9.2.1_4.js      |   46 +
 js/src/tests/test402/ch09/9.2/9.2.1_8_c_ii.js |   30 +
 js/src/tests/test402/ch09/9.2/9.2.1_8_c_vi.js |   18 +
 js/src/tests/test402/ch09/9.2/9.2.2.js        |   45 +
 js/src/tests/test402/ch09/9.2/9.2.3_5.js      |   22 +
 .../tests/test402/ch09/9.2/9.2.5_11_g_ii_2.js |   26 +
 js/src/tests/test402/ch09/9.2/9.2.5_6.js      |   22 +
 js/src/tests/test402/ch09/9.2/9.2.6_2.js      |   27 +
 js/src/tests/test402/ch09/9.2/9.2.6_4.js      |   23 +
 js/src/tests/test402/ch09/9.2/9.2.6_4_b.js    |   47 +
 js/src/tests/test402/ch09/9.2/9.2.6_4_c.js    |   32 +
 js/src/tests/test402/ch09/9.2/9.2.8_1_c.js    |   36 +
 js/src/tests/test402/ch09/9.2/9.2.8_4.js      |   35 +
 js/src/tests/test402/ch09/9.2/browser.js      |    0
 js/src/tests/test402/ch09/9.2/shell.js        |    0
 js/src/tests/test402/ch09/browser.js          |    0
 js/src/tests/test402/ch09/shell.js            |    0
 js/src/tests/test402/ch10/10.1/10.1.1_1.js    |   43 +
 js/src/tests/test402/ch10/10.1/10.1.1_10.js   |   18 +
 js/src/tests/test402/ch10/10.1/10.1.1_11.js   |   12 +
 js/src/tests/test402/ch10/10.1/10.1.1_13.js   |   13 +
 js/src/tests/test402/ch10/10.1/10.1.1_19_b.js |   44 +
 js/src/tests/test402/ch10/10.1/10.1.1_19_c.js |   63 +
 js/src/tests/test402/ch10/10.1/10.1.1_20.js   |   13 +
 js/src/tests/test402/ch10/10.1/10.1.1_23.js   |   13 +
 js/src/tests/test402/ch10/10.1/10.1.1_6.js    |   12 +
 js/src/tests/test402/ch10/10.1/10.1.1_a.js    |   14 +
 js/src/tests/test402/ch10/10.1/10.1.2.1_4.js  |   21 +
 js/src/tests/test402/ch10/10.1/10.1.2_a.js    |   30 +
 js/src/tests/test402/ch10/10.1/10.1.3.js      |   19 +
 js/src/tests/test402/ch10/10.1/10.1_L15.js    |   14 +
 js/src/tests/test402/ch10/10.1/browser.js     |    0
 js/src/tests/test402/ch10/10.1/shell.js       |    0
 js/src/tests/test402/ch10/10.2/10.2.1.js      |   22 +
 js/src/tests/test402/ch10/10.2/10.2.2_L15.js  |   14 +
 js/src/tests/test402/ch10/10.2/10.2.2_a.js    |   27 +
 js/src/tests/test402/ch10/10.2/10.2.2_b.js    |   13 +
 js/src/tests/test402/ch10/10.2/10.2.3_b.js    |   52 +
 js/src/tests/test402/ch10/10.2/browser.js     |    0
 js/src/tests/test402/ch10/10.2/shell.js       |    0
 js/src/tests/test402/ch10/10.3/10.3.1.js      |   13 +
 .../tests/test402/ch10/10.3/10.3.2_1_a_L15.js |   14 +
 js/src/tests/test402/ch10/10.3/10.3.2_1_c.js  |   36 +
 js/src/tests/test402/ch10/10.3/10.3.2_CS_a.js |   68 +
 .../tests/test402/ch10/10.3/10.3.2_CS_b_NN.js |   22 +
 .../tests/test402/ch10/10.3/10.3.2_CS_c_NN.js |   22 +
 .../tests/test402/ch10/10.3/10.3.2_CS_d_NN.js |   34 +
 js/src/tests/test402/ch10/10.3/10.3.2_L15.js  |   14 +
 js/src/tests/test402/ch10/10.3/10.3.3.js      |   47 +
 js/src/tests/test402/ch10/10.3/10.3.3_L15.js  |   14 +
 js/src/tests/test402/ch10/10.3/10.3_L15.js    |   14 +
 js/src/tests/test402/ch10/10.3/10.3_a.js      |   15 +
 js/src/tests/test402/ch10/10.3/10.3_b.js      |   33 +
 js/src/tests/test402/ch10/10.3/browser.js     |    0
 js/src/tests/test402/ch10/10.3/shell.js       |    0
 js/src/tests/test402/ch10/10.4/10.4_a.js      |   15 +
 js/src/tests/test402/ch10/10.4/browser.js     |    0
 js/src/tests/test402/ch10/10.4/shell.js       |    0
 js/src/tests/test402/ch10/browser.js          |    0
 js/src/tests/test402/ch10/shell.js            |    0
 js/src/tests/test402/ch11/11.1/11.1.1_1.js    |   43 +
 js/src/tests/test402/ch11/11.1/11.1.1_15.js   |   13 +
 js/src/tests/test402/ch11/11.1/11.1.1_17.js   |   81 ++
 js/src/tests/test402/ch11/11.1/11.1.1_19.js   |   31 +
 js/src/tests/test402/ch11/11.1/11.1.1_20_c.js |  196 +++
 js/src/tests/test402/ch11/11.1/11.1.1_21.js   |   15 +
 js/src/tests/test402/ch11/11.1/11.1.1_32.js   |   44 +
 js/src/tests/test402/ch11/11.1/11.1.1_34.js   |   12 +
 js/src/tests/test402/ch11/11.1/11.1.1_6.js    |   18 +
 js/src/tests/test402/ch11/11.1/11.1.1_7.js    |   12 +
 js/src/tests/test402/ch11/11.1/11.1.1_a.js    |   18 +
 js/src/tests/test402/ch11/11.1/11.1.2.1_4.js  |   21 +
 js/src/tests/test402/ch11/11.1/11.1.2.js      |   30 +
 js/src/tests/test402/ch11/11.1/11.1.3.js      |   19 +
 js/src/tests/test402/ch11/11.1/11.1_L15.js    |   14 +
 js/src/tests/test402/ch11/11.1/browser.js     |    0
 js/src/tests/test402/ch11/11.1/shell.js       |    0
 js/src/tests/test402/ch11/11.2/11.2.1.js      |   22 +
 js/src/tests/test402/ch11/11.2/11.2.2_L15.js  |   14 +
 js/src/tests/test402/ch11/11.2/11.2.2_a.js    |   28 +
 js/src/tests/test402/ch11/11.2/11.2.2_b.js    |   13 +
 js/src/tests/test402/ch11/11.2/11.2.3_b.js    |   46 +
 js/src/tests/test402/ch11/11.2/browser.js     |    0
 js/src/tests/test402/ch11/11.2/shell.js       |    0
 js/src/tests/test402/ch11/11.3/11.3.1.js      |   14 +
 .../tests/test402/ch11/11.3/11.3.2_1_a_L15.js |   14 +
 .../tests/test402/ch11/11.3/11.3.2_1_a_ii.js  |   27 +
 js/src/tests/test402/ch11/11.3/11.3.2_1_c.js  |   41 +
 js/src/tests/test402/ch11/11.3/11.3.2_FN_1.js |   19 +
 js/src/tests/test402/ch11/11.3/11.3.2_FN_2.js |   59 +
 .../tests/test402/ch11/11.3/11.3.2_FN_3_b.js  |   27 +
 .../tests/test402/ch11/11.3/11.3.2_FN_3_e.js  |   47 +
 js/src/tests/test402/ch11/11.3/11.3.2_L15.js  |   14 +
 js/src/tests/test402/ch11/11.3/11.3.2_TRF.js  |   52 +
 js/src/tests/test402/ch11/11.3/11.3.2_TRP.js  |   52 +
 js/src/tests/test402/ch11/11.3/11.3.3.js      |   31 +
 js/src/tests/test402/ch11/11.3/11.3.3_L15.js  |   14 +
 js/src/tests/test402/ch11/11.3/11.3_L15.js    |   14 +
 js/src/tests/test402/ch11/11.3/11.3_a.js      |   16 +
 js/src/tests/test402/ch11/11.3/11.3_b.js      |   33 +
 js/src/tests/test402/ch11/11.3/browser.js     |    0
 js/src/tests/test402/ch11/11.3/shell.js       |    0
 js/src/tests/test402/ch11/11.4/11.4_a.js      |   15 +
 js/src/tests/test402/ch11/11.4/browser.js     |    0
 js/src/tests/test402/ch11/11.4/shell.js       |    0
 js/src/tests/test402/ch11/browser.js          |    0
 js/src/tests/test402/ch11/shell.js            |    0
 js/src/tests/test402/ch12/12.1/12.1.1_1.js    |   43 +
 js/src/tests/test402/ch12/12.1/12.1.1_18.js   |   15 +
 js/src/tests/test402/ch12/12.1/12.1.1_22.js   |   18 +
 js/src/tests/test402/ch12/12.1/12.1.1_23.js   |   14 +
 js/src/tests/test402/ch12/12.1/12.1.1_25.js   |   12 +
 js/src/tests/test402/ch12/12.1/12.1.1_5.js    |   18 +
 js/src/tests/test402/ch12/12.1/12.1.1_6.js    |   12 +
 js/src/tests/test402/ch12/12.1/12.1.1_TDTO.js |  107 ++
 js/src/tests/test402/ch12/12.1/12.1.1_a.js    |   18 +
 js/src/tests/test402/ch12/12.1/12.1.2.1_4.js  |   21 +
 js/src/tests/test402/ch12/12.1/12.1.2.js      |   30 +
 js/src/tests/test402/ch12/12.1/12.1.3.js      |   19 +
 js/src/tests/test402/ch12/12.1/12.1_L15.js    |   14 +
 js/src/tests/test402/ch12/12.1/browser.js     |    0
 js/src/tests/test402/ch12/12.1/shell.js       |    0
 js/src/tests/test402/ch12/12.2/12.2.1.js      |   22 +
 js/src/tests/test402/ch12/12.2/12.2.2_L15.js  |   14 +
 js/src/tests/test402/ch12/12.2/12.2.2_a.js    |   28 +
 js/src/tests/test402/ch12/12.2/12.2.2_b.js    |   13 +
 js/src/tests/test402/ch12/12.2/12.2.3_b.js    |   47 +
 js/src/tests/test402/ch12/12.2/12.2.3_c.js    |   52 +
 js/src/tests/test402/ch12/12.2/browser.js     |    0
 js/src/tests/test402/ch12/12.2/shell.js       |    0
 js/src/tests/test402/ch12/12.3/12.3.1.js      |   14 +
 .../tests/test402/ch12/12.3/12.3.2_1_a_L15.js |   14 +
 js/src/tests/test402/ch12/12.3/12.3.2_1_c.js  |   34 +
 .../tests/test402/ch12/12.3/12.3.2_FDT_1.js   |   26 +
 .../test402/ch12/12.3/12.3.2_FDT_7_a_iv.js    |   32 +
 js/src/tests/test402/ch12/12.3/12.3.2_L15.js  |   14 +
 .../tests/test402/ch12/12.3/12.3.2_TLT_2.js   |   16 +
 js/src/tests/test402/ch12/12.3/12.3.3.js      |   52 +
 js/src/tests/test402/ch12/12.3/12.3.3_L15.js  |   14 +
 js/src/tests/test402/ch12/12.3/12.3_L15.js    |   14 +
 js/src/tests/test402/ch12/12.3/12.3_a.js      |   16 +
 js/src/tests/test402/ch12/12.3/12.3_b.js      |   33 +
 js/src/tests/test402/ch12/12.3/browser.js     |    0
 js/src/tests/test402/ch12/12.3/shell.js       |    0
 js/src/tests/test402/ch12/12.4/12.4_a.js      |   15 +
 js/src/tests/test402/ch12/12.4/browser.js     |    0
 js/src/tests/test402/ch12/12.4/shell.js       |    0
 js/src/tests/test402/ch12/browser.js          |    0
 js/src/tests/test402/ch12/shell.js            |    0
 js/src/tests/test402/ch13/13.1/13.1.1_1.js    |   24 +
 js/src/tests/test402/ch13/13.1/13.1.1_2.js    |   26 +
 js/src/tests/test402/ch13/13.1/13.1.1_3_1.js  |   26 +
 js/src/tests/test402/ch13/13.1/13.1.1_3_2.js  |   22 +
 js/src/tests/test402/ch13/13.1/13.1.1_6_1.js  |   65 +
 js/src/tests/test402/ch13/13.1/13.1.1_6_2.js  |   13 +
 js/src/tests/test402/ch13/13.1/13.1.1_7.js    |   33 +
 js/src/tests/test402/ch13/13.1/13.1.1_L15.js  |   14 +
 js/src/tests/test402/ch13/13.1/browser.js     |    0
 js/src/tests/test402/ch13/13.1/shell.js       |    0
 js/src/tests/test402/ch13/13.2/13.2.1_1.js    |   37 +
 js/src/tests/test402/ch13/13.2/13.2.1_4_1.js  |   67 +
 js/src/tests/test402/ch13/13.2/13.2.1_4_2.js  |   13 +
 js/src/tests/test402/ch13/13.2/13.2.1_5.js    |   41 +
 js/src/tests/test402/ch13/13.2/13.2.1_L15.js  |   14 +
 js/src/tests/test402/ch13/13.2/browser.js     |    0
 js/src/tests/test402/ch13/13.2/shell.js       |    0
 js/src/tests/test402/ch13/13.3/13.3.0_1.js    |   32 +
 js/src/tests/test402/ch13/13.3/13.3.0_2.js    |   26 +
 js/src/tests/test402/ch13/13.3/13.3.0_6_1.js  |   74 ++
 js/src/tests/test402/ch13/13.3/13.3.0_6_2.js  |   15 +
 js/src/tests/test402/ch13/13.3/13.3.0_7.js    |   58 +
 js/src/tests/test402/ch13/13.3/13.3.1_L15.js  |   14 +
 js/src/tests/test402/ch13/13.3/13.3.2_L15.js  |   14 +
 js/src/tests/test402/ch13/13.3/13.3.3_L15.js  |   14 +
 js/src/tests/test402/ch13/13.3/browser.js     |    0
 js/src/tests/test402/ch13/13.3/shell.js       |    0
 js/src/tests/test402/ch13/browser.js          |    0
 js/src/tests/test402/ch13/shell.js            |    0
 js/src/tests/test402/lib/testBuiltInObject.js |  124 ++
 js/src/tests/test402/lib/testIntl.js          | 1167 +++++++++++++++++
 213 files changed, 5761 insertions(+)
 create mode 100644 js/src/tests/test402/HG-INFO
 create mode 100644 js/src/tests/test402/LICENSE
 create mode 100644 js/src/tests/test402/ch06/6.2/6.2.2_a.js
 create mode 100644 js/src/tests/test402/ch06/6.2/6.2.2_b.js
 create mode 100644 js/src/tests/test402/ch06/6.2/6.2.2_c.js
 create mode 100644 js/src/tests/test402/ch06/6.2/6.2.3.js
 create mode 100644 js/src/tests/test402/ch06/6.2/6.2.4.js
 create mode 100644 js/src/tests/test402/ch06/6.2/browser.js
 create mode 100644 js/src/tests/test402/ch06/6.2/shell.js
 create mode 100644 js/src/tests/test402/ch06/6.3/6.3.1_a.js
 create mode 100644 js/src/tests/test402/ch06/6.3/6.3.1_b.js
 create mode 100644 js/src/tests/test402/ch06/6.3/browser.js
 create mode 100644 js/src/tests/test402/ch06/6.3/shell.js
 create mode 100644 js/src/tests/test402/ch06/6.4/6.4_a.js
 create mode 100644 js/src/tests/test402/ch06/6.4/6.4_b.js
 create mode 100644 js/src/tests/test402/ch06/6.4/6.4_c.js
 create mode 100644 js/src/tests/test402/ch06/6.4/browser.js
 create mode 100644 js/src/tests/test402/ch06/6.4/shell.js
 create mode 100644 js/src/tests/test402/ch06/browser.js
 create mode 100644 js/src/tests/test402/ch06/shell.js
 create mode 100644 js/src/tests/test402/ch08/8.0/8.0.js
 create mode 100644 js/src/tests/test402/ch08/8.0/8.0_L15.js
 create mode 100644 js/src/tests/test402/ch08/8.0/browser.js
 create mode 100644 js/src/tests/test402/ch08/8.0/shell.js
 create mode 100644 js/src/tests/test402/ch08/browser.js
 create mode 100644 js/src/tests/test402/ch08/shell.js
 create mode 100644 js/src/tests/test402/ch09/9.1/9.1_a.js
 create mode 100644 js/src/tests/test402/ch09/9.1/9.1_b.js
 create mode 100644 js/src/tests/test402/ch09/9.1/browser.js
 create mode 100644 js/src/tests/test402/ch09/9.1/shell.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.1_1.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.1_2.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.1_3.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.1_4.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.1_8_c_ii.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.1_8_c_vi.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.2.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.3_5.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.5_11_g_ii_2.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.5_6.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.6_2.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.6_4.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.6_4_b.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.6_4_c.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.8_1_c.js
 create mode 100644 js/src/tests/test402/ch09/9.2/9.2.8_4.js
 create mode 100644 js/src/tests/test402/ch09/9.2/browser.js
 create mode 100644 js/src/tests/test402/ch09/9.2/shell.js
 create mode 100644 js/src/tests/test402/ch09/browser.js
 create mode 100644 js/src/tests/test402/ch09/shell.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_1.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_10.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_11.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_13.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_19_b.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_19_c.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_20.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_23.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_6.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.1_a.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.2.1_4.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.2_a.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1.3.js
 create mode 100644 js/src/tests/test402/ch10/10.1/10.1_L15.js
 create mode 100644 js/src/tests/test402/ch10/10.1/browser.js
 create mode 100644 js/src/tests/test402/ch10/10.1/shell.js
 create mode 100644 js/src/tests/test402/ch10/10.2/10.2.1.js
 create mode 100644 js/src/tests/test402/ch10/10.2/10.2.2_L15.js
 create mode 100644 js/src/tests/test402/ch10/10.2/10.2.2_a.js
 create mode 100644 js/src/tests/test402/ch10/10.2/10.2.2_b.js
 create mode 100644 js/src/tests/test402/ch10/10.2/10.2.3_b.js
 create mode 100644 js/src/tests/test402/ch10/10.2/browser.js
 create mode 100644 js/src/tests/test402/ch10/10.2/shell.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.1.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.2_1_a_L15.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.2_1_c.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.2_CS_a.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.2_CS_b_NN.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.2_CS_c_NN.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.2_CS_d_NN.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.2_L15.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.3.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3.3_L15.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3_L15.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3_a.js
 create mode 100644 js/src/tests/test402/ch10/10.3/10.3_b.js
 create mode 100644 js/src/tests/test402/ch10/10.3/browser.js
 create mode 100644 js/src/tests/test402/ch10/10.3/shell.js
 create mode 100644 js/src/tests/test402/ch10/10.4/10.4_a.js
 create mode 100644 js/src/tests/test402/ch10/10.4/browser.js
 create mode 100644 js/src/tests/test402/ch10/10.4/shell.js
 create mode 100644 js/src/tests/test402/ch10/browser.js
 create mode 100644 js/src/tests/test402/ch10/shell.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_1.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_15.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_17.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_19.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_20_c.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_21.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_32.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_34.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_6.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_7.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.1_a.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.2.1_4.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.2.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1.3.js
 create mode 100644 js/src/tests/test402/ch11/11.1/11.1_L15.js
 create mode 100644 js/src/tests/test402/ch11/11.1/browser.js
 create mode 100644 js/src/tests/test402/ch11/11.1/shell.js
 create mode 100644 js/src/tests/test402/ch11/11.2/11.2.1.js
 create mode 100644 js/src/tests/test402/ch11/11.2/11.2.2_L15.js
 create mode 100644 js/src/tests/test402/ch11/11.2/11.2.2_a.js
 create mode 100644 js/src/tests/test402/ch11/11.2/11.2.2_b.js
 create mode 100644 js/src/tests/test402/ch11/11.2/11.2.3_b.js
 create mode 100644 js/src/tests/test402/ch11/11.2/browser.js
 create mode 100644 js/src/tests/test402/ch11/11.2/shell.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.1.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_1_a_L15.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_1_a_ii.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_1_c.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_FN_1.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_FN_2.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_FN_3_b.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_FN_3_e.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_L15.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_TRF.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.2_TRP.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.3.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3.3_L15.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3_L15.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3_a.js
 create mode 100644 js/src/tests/test402/ch11/11.3/11.3_b.js
 create mode 100644 js/src/tests/test402/ch11/11.3/browser.js
 create mode 100644 js/src/tests/test402/ch11/11.3/shell.js
 create mode 100644 js/src/tests/test402/ch11/11.4/11.4_a.js
 create mode 100644 js/src/tests/test402/ch11/11.4/browser.js
 create mode 100644 js/src/tests/test402/ch11/11.4/shell.js
 create mode 100644 js/src/tests/test402/ch11/browser.js
 create mode 100644 js/src/tests/test402/ch11/shell.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_1.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_18.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_22.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_23.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_25.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_5.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_6.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_TDTO.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.1_a.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.2.1_4.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.2.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1.3.js
 create mode 100644 js/src/tests/test402/ch12/12.1/12.1_L15.js
 create mode 100644 js/src/tests/test402/ch12/12.1/browser.js
 create mode 100644 js/src/tests/test402/ch12/12.1/shell.js
 create mode 100644 js/src/tests/test402/ch12/12.2/12.2.1.js
 create mode 100644 js/src/tests/test402/ch12/12.2/12.2.2_L15.js
 create mode 100644 js/src/tests/test402/ch12/12.2/12.2.2_a.js
 create mode 100644 js/src/tests/test402/ch12/12.2/12.2.2_b.js
 create mode 100644 js/src/tests/test402/ch12/12.2/12.2.3_b.js
 create mode 100644 js/src/tests/test402/ch12/12.2/12.2.3_c.js
 create mode 100644 js/src/tests/test402/ch12/12.2/browser.js
 create mode 100644 js/src/tests/test402/ch12/12.2/shell.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.1.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.2_1_a_L15.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.2_1_c.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.2_FDT_1.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.2_FDT_7_a_iv.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.2_L15.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.2_TLT_2.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.3.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3.3_L15.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3_L15.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3_a.js
 create mode 100644 js/src/tests/test402/ch12/12.3/12.3_b.js
 create mode 100644 js/src/tests/test402/ch12/12.3/browser.js
 create mode 100644 js/src/tests/test402/ch12/12.3/shell.js
 create mode 100644 js/src/tests/test402/ch12/12.4/12.4_a.js
 create mode 100644 js/src/tests/test402/ch12/12.4/browser.js
 create mode 100644 js/src/tests/test402/ch12/12.4/shell.js
 create mode 100644 js/src/tests/test402/ch12/browser.js
 create mode 100644 js/src/tests/test402/ch12/shell.js
 create mode 100644 js/src/tests/test402/ch13/13.1/13.1.1_1.js
 create mode 100644 js/src/tests/test402/ch13/13.1/13.1.1_2.js
 create mode 100644 js/src/tests/test402/ch13/13.1/13.1.1_3_1.js
 create mode 100644 js/src/tests/test402/ch13/13.1/13.1.1_3_2.js
 create mode 100644 js/src/tests/test402/ch13/13.1/13.1.1_6_1.js
 create mode 100644 js/src/tests/test402/ch13/13.1/13.1.1_6_2.js
 create mode 100644 js/src/tests/test402/ch13/13.1/13.1.1_7.js
 create mode 100644 js/src/tests/test402/ch13/13.1/13.1.1_L15.js
 create mode 100644 js/src/tests/test402/ch13/13.1/browser.js
 create mode 100644 js/src/tests/test402/ch13/13.1/shell.js
 create mode 100644 js/src/tests/test402/ch13/13.2/13.2.1_1.js
 create mode 100644 js/src/tests/test402/ch13/13.2/13.2.1_4_1.js
 create mode 100644 js/src/tests/test402/ch13/13.2/13.2.1_4_2.js
 create mode 100644 js/src/tests/test402/ch13/13.2/13.2.1_5.js
 create mode 100644 js/src/tests/test402/ch13/13.2/13.2.1_L15.js
 create mode 100644 js/src/tests/test402/ch13/13.2/browser.js
 create mode 100644 js/src/tests/test402/ch13/13.2/shell.js
 create mode 100644 js/src/tests/test402/ch13/13.3/13.3.0_1.js
 create mode 100644 js/src/tests/test402/ch13/13.3/13.3.0_2.js
 create mode 100644 js/src/tests/test402/ch13/13.3/13.3.0_6_1.js
 create mode 100644 js/src/tests/test402/ch13/13.3/13.3.0_6_2.js
 create mode 100644 js/src/tests/test402/ch13/13.3/13.3.0_7.js
 create mode 100644 js/src/tests/test402/ch13/13.3/13.3.1_L15.js
 create mode 100644 js/src/tests/test402/ch13/13.3/13.3.2_L15.js
 create mode 100644 js/src/tests/test402/ch13/13.3/13.3.3_L15.js
 create mode 100644 js/src/tests/test402/ch13/13.3/browser.js
 create mode 100644 js/src/tests/test402/ch13/13.3/shell.js
 create mode 100644 js/src/tests/test402/ch13/browser.js
 create mode 100644 js/src/tests/test402/ch13/shell.js
 create mode 100644 js/src/tests/test402/lib/testBuiltInObject.js
 create mode 100644 js/src/tests/test402/lib/testIntl.js

diff --git a/js/src/tests/test402/HG-INFO b/js/src/tests/test402/HG-INFO
new file mode 100644
index 000000000000..50ef8efc055b
--- /dev/null
+++ b/js/src/tests/test402/HG-INFO
@@ -0,0 +1,7 @@
+URL:         http://hg.ecmascript.org/tests/test262
+changeset:   363:4f586032baec
+tag:         tip
+user:        Norbert Lindenberg <ecmascript@lindenbergsoftware.com>
+date:        Sun Mar 24 23:48:59 2013 -0700
+summary:     New tests and test fixes for ECMAScript Internationalization API.
+
diff --git a/js/src/tests/test402/LICENSE b/js/src/tests/test402/LICENSE
new file mode 100644
index 000000000000..46b55a37b3e4
--- /dev/null
+++ b/js/src/tests/test402/LICENSE
@@ -0,0 +1,28 @@
+The << Software identified by reference to the Ecma Standard* ("Software)">>  is protected by copyright and is being 
+made available under the  "BSD License", included below. This Software may be subject to third party rights (rights 
+from parties other than Ecma International), including patent rights, and no licenses under such third party rights 
+are granted under this license even if the third party concerned is a member of Ecma International.  SEE THE ECMA 
+CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR 
+INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS*.
+
+Copyright (C) 2012-2013 Ecma International
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the 
+following conditions are met:
+1.   Redistributions of source code must retain the above copyright notice, this list of conditions and the following 
+     disclaimer.
+2.   Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the 
+     following disclaimer in the documentation and/or other materials provided with the distribution.
+3.   Neither the name of the authors nor Ecma International may be used to endorse or promote products derived from 
+     this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
+DAMAGE.
+
+* Ecma International Standards hereafter means Ecma International Standards as well as Ecma Technical Reports
\ No newline at end of file
diff --git a/js/src/tests/test402/ch06/6.2/6.2.2_a.js b/js/src/tests/test402/ch06/6.2/6.2.2_a.js
new file mode 100644
index 000000000000..a56894570b2c
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.2/6.2.2_a.js
@@ -0,0 +1,40 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that structurally valid language tags are accepted.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var validLanguageTags = [
+    "de", // ISO 639 language code
+    "de-DE", // + ISO 3166-1 country code
+    "DE-de", // tags are case-insensitive
+    "cmn", // ISO 639 language code
+    "cmn-Hans", // + script code
+    "CMN-hANS", // tags are case-insensitive
+    "cmn-hans-cn", // + ISO 3166-1 country code
+    "es-419", // + UN M.49 region code
+    "es-419-u-nu-latn-cu-bob", // + Unicode locale extension sequence
+    "i-klingon", // grandfathered tag
+    "cmn-hans-cn-t-ca-u-ca-x-t-u", // singleton subtags can also be used as private use subtags
+    "enochian-enochian", // language and variant subtags may be the same
+    "de-gregory-u-ca-gregory", // variant and extension subtags may be the same
+    "aa-a-foo-x-a-foo-bar", // variant subtags can also be used as private use subtags
+    "x-en-US-12345", // anything goes in private use tags
+    "x-12345-12345-en-US",
+    "x-en-US-12345-12345",
+    "x-en-u-foo",
+    "x-en-u-foo-u-bar"
+];
+
+testWithIntlConstructors(function (Constructor) {
+    validLanguageTags.forEach(function (tag) {
+        // this must not throw an exception for a valid language tag
+        var obj = new Constructor([tag]);
+    });
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch06/6.2/6.2.2_b.js b/js/src/tests/test402/ch06/6.2/6.2.2_b.js
new file mode 100644
index 000000000000..42d69e7c2e0f
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.2/6.2.2_b.js
@@ -0,0 +1,41 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that language tags with "_" are not accepted.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var invalidLanguageTags = [
+    "de_DE",
+    "DE_de",
+    "cmn_Hans",
+    "cmn-hans_cn",
+    "es_419",
+    "es-419-u-nu-latn-cu_bob",
+    "i_klingon",
+    "cmn-hans-cn-t-ca-u-ca-x_t-u",
+    "enochian_enochian",
+    "de-gregory_u-ca-gregory"
+];
+
+testWithIntlConstructors(function (Constructor) {
+    invalidLanguageTags.forEach(function (tag) {
+        var error;
+        try {
+            // this must throw an exception for an invalid language tag
+            var obj = new Constructor([tag]);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Invalid language tag " + tag + " was not rejected.");
+        } else if (error.name !== "RangeError") {
+            $ERROR("Invalid language tag " + tag + " was rejected with wrong error " + error.name + ".");
+        }
+    });
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch06/6.2/6.2.2_c.js b/js/src/tests/test402/ch06/6.2/6.2.2_c.js
new file mode 100644
index 000000000000..6d669ebefdff
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.2/6.2.2_c.js
@@ -0,0 +1,47 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that language tags with invalid subtag sequences are not accepted.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var invalidLanguageTags = [
+    "", // empty tag
+    "i", // singleton alone
+    "x", // private use without subtag
+    "u", // extension singleton in first place
+    "419", // region code in first place
+    "u-nu-latn-cu-bob", // extension sequence without language
+    "hans-cmn-cn", // "hans" could theoretically be a 4-letter language code,
+                   // but those can't be followed by extlang codes.
+    "cmn-hans-cn-u-u", // duplicate singleton
+    "cmn-hans-cn-t-u-ca-u", // duplicate singleton
+    "de-gregory-gregory", // duplicate variant
+    "*", // language range
+    "de-*", // language range
+    "中文", // non-ASCII letters
+    "en-ß", // non-ASCII letters
+    "ıd" // non-ASCII letters
+];
+
+testWithIntlConstructors(function (Constructor) {
+    invalidLanguageTags.forEach(function (tag) {
+        var error;
+        try {
+            // this must throw an exception for an invalid language tag
+            var obj = new Constructor([tag]);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Invalid language tag " + tag + " was not rejected.");
+        } else if (error.name !== "RangeError") {
+            $ERROR("Invalid language tag " + tag + " was rejected with wrong error " + error.name + ".");
+        }
+    });
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch06/6.2/6.2.3.js b/js/src/tests/test402/ch06/6.2/6.2.3.js
new file mode 100644
index 000000000000..4ae15ab271c1
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.2/6.2.3.js
@@ -0,0 +1,69 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012  Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that language tags are canonicalized in return values.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var canonicalizedTags = {
+    "de": ["de"],
+    "de-DE": ["de-DE", "de"],
+    "DE-de": ["de-DE", "de"],
+    "cmn": ["cmn"],
+    "CMN-hANS": ["cmn-Hans", "cmn"],
+    "cmn-hans-cn": ["cmn-Hans-CN", "cmn-Hans", "cmn"],
+    "es-419": ["es-419", "es"],
+    "es-419-u-nu-latn": ["es-419-u-nu-latn", "es-419", "es", "es-u-nu-latn"],
+    // -u-ca is incomplete, so it will not show up in resolvedOptions().locale
+    "cmn-hans-cn-u-ca-t-ca-x-t-u": ["cmn-Hans-CN-t-ca-u-ca-x-t-u", "cmn-Hans-CN-t-ca-x-t-u", "cmn-Hans-CN-t-ca-x-t", "cmn-Hans-CN-t-ca", "cmn-Hans-CN", "cmn-Hans", "cmn"],
+    "enochian-enochian": ["enochian-enochian", "enochian"],
+    "de-gregory-u-ca-gregory": ["de-gregory-u-ca-gregory", "de-gregory", "de-u-ca-gregory", "de"],
+    "no-nyn": ["nn"],
+    "i-klingon": ["tlh"],
+    "sgn-GR": ["gss"],
+    "ji": ["yi"],
+    "de-DD": ["de-DE", "de"],
+    "zh-hak-CN": ["hak-CN", "hak"],
+    "sgn-ils": ["ils"],
+    "in": ["id"],
+    "x-foo": ["x-foo"]
+};
+
+// make sure the data above is correct
+Object.getOwnPropertyNames(canonicalizedTags).forEach(function (tag) {
+    canonicalizedTags[tag].forEach(function (canonicalTag) {
+        if (!isCanonicalizedStructurallyValidLanguageTag(canonicalTag)) {
+            $ERROR("Test data \"" + canonicalTag + "\" is not canonicalized and structurally valid language tag.");
+        }
+    });
+});
+
+// now the actual test
+testWithIntlConstructors(function (Constructor) {
+    var defaultLocale = new Constructor().resolvedOptions().locale;
+    Object.getOwnPropertyNames(canonicalizedTags).forEach(function (tag) {
+        // use lookup locale matcher to keep the set of possible return values predictable
+
+        // Variant 1: construct an object and see whether its locale is canonicalized.
+        // In this variant, shortened forms or the default locale may be returned
+        var object = new Constructor([tag], {localeMatcher: "lookup"});
+        var locale = object.resolvedOptions().locale;
+        if (canonicalizedTags[tag].indexOf(locale) === -1 && locale !== defaultLocale) {
+            $ERROR("For " + tag + " got " + locale + "; expected one of " +
+                canonicalizedTags[tag].join(", ") + ".");
+        }
+        
+        // Variant 2: get the supported locales. If the tag is supported, it should be returned canonicalized but unshortened
+        var supported = Constructor.supportedLocalesOf([tag]);
+        if (supported.length > 0 && supported[0] !== canonicalizedTags[tag][0]) {
+            $ERROR("For " + tag + " got " + supported[0] + "; expected " +
+                canonicalizedTags[tag][0] + ".");
+        }            
+    });
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch06/6.2/6.2.4.js b/js/src/tests/test402/ch06/6.2/6.2.4.js
new file mode 100644
index 000000000000..6ca47af14265
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.2/6.2.4.js
@@ -0,0 +1,19 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the default locale is a String value representing the
+ * structurally valid and canonicalized BCP 47 language tag.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var defaultLocale = new Constructor().resolvedOptions().locale;
+    if (!isCanonicalizedStructurallyValidLanguageTag(defaultLocale)) {
+        $ERROR("Default locale \"" + defaultLocale + "\" is not canonicalized and structurally valid language tag.");
+    }
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch06/6.2/browser.js b/js/src/tests/test402/ch06/6.2/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch06/6.2/shell.js b/js/src/tests/test402/ch06/6.2/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch06/6.3/6.3.1_a.js b/js/src/tests/test402/ch06/6.3/6.3.1_a.js
new file mode 100644
index 000000000000..01cc18b0306b
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.3/6.3.1_a.js
@@ -0,0 +1,25 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that well-formed currency codes are accepted.
+ * @author Norbert Lindenberg
+ */
+
+var wellFormedCurrencyCodes = [
+    "BOB",
+    "EUR",
+    "usd", // currency codes are case-insensitive
+    "XdR",
+    "xTs"
+];
+
+wellFormedCurrencyCodes.forEach(function (code) {
+    // this must not throw an exception for a valid currency code
+    var format = new Intl.NumberFormat(["de-de"], {style: "currency", currency: code});
+    if (format.resolvedOptions().currency !== code.toUpperCase()) {
+        $ERROR("Currency " + code + " was not correctly accepted; turned into " +
+            format.resolvedOptions().currency + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch06/6.3/6.3.1_b.js b/js/src/tests/test402/ch06/6.3/6.3.1_b.js
new file mode 100644
index 000000000000..038dd1fc4a6c
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.3/6.3.1_b.js
@@ -0,0 +1,35 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that invalid currency codes are not accepted.
+ * @author Norbert Lindenberg
+ */
+
+var invalidCurrencyCodes = [
+    "",
+    "€",
+    "$",
+    "SFr.",
+    "DM",
+    "KR₩",
+    "702",
+    "ßP",
+    "ınr"
+];
+
+invalidCurrencyCodes.forEach(function (code) {
+    var error;
+    try {
+        // this must throw an exception for an invalid currency code
+        var format = new Intl.NumberFormat(["de-de"], {style: "currency", currency: code});
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Invalid currency code '" + code + "' was not rejected.");
+    } else if (error.name !== "RangeError") {
+        $ERROR("Invalid currency code '" + code + "' was rejected with wrong error " + error.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch06/6.3/browser.js b/js/src/tests/test402/ch06/6.3/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch06/6.3/shell.js b/js/src/tests/test402/ch06/6.3/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch06/6.4/6.4_a.js b/js/src/tests/test402/ch06/6.4/6.4_a.js
new file mode 100644
index 000000000000..05202353c05d
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.4/6.4_a.js
@@ -0,0 +1,22 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that valid time zone names are accepted.
+ * @author Norbert Lindenberg
+ */
+
+var validTimeZoneNames = [
+    "UTC",
+    "utc" // time zone names are case-insensitive
+];
+
+validTimeZoneNames.forEach(function (name) {
+    // this must not throw an exception for a valid time zone name
+    var format = new Intl.DateTimeFormat(["de-de"], {timeZone: name});
+    if (format.resolvedOptions().timeZone !== name.toUpperCase()) {
+        $ERROR("Time zone name " + name + " was not correctly accepted; turned into " +
+            format.resolvedOptions().timeZone + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch06/6.4/6.4_b.js b/js/src/tests/test402/ch06/6.4/6.4_b.js
new file mode 100644
index 000000000000..847d804e3c8b
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.4/6.4_b.js
@@ -0,0 +1,34 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that invalid time zone names are not accepted.
+ * @author Norbert Lindenberg
+ */
+
+var invalidTimeZoneNames = [
+    "",
+    "MEZ", // localized abbreviation
+    "Pacific Time", // localized long form
+    "cnsha", // BCP 47 time zone code
+    "invalid", // as the name says
+    "Europe/İstanbul", // non-ASCII letter
+    "asıa/baku", // non-ASCII letter
+    "europe/brußels"  // non-ASCII letter
+];
+
+invalidTimeZoneNames.forEach(function (name) {
+    var error;
+    try {
+        // this must throw an exception for an invalid time zone name
+        var format = new Intl.DateTimeFormat(["de-de"], {timeZone: name});
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Invalid time zone name " + name + " was not rejected.");
+    } else if (error.name !== "RangeError") {
+        $ERROR("Invalid time zone name " + name + " was rejected with wrong error " + error.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch06/6.4/6.4_c.js b/js/src/tests/test402/ch06/6.4/6.4_c.js
new file mode 100644
index 000000000000..a9969b648598
--- /dev/null
+++ b/js/src/tests/test402/ch06/6.4/6.4_c.js
@@ -0,0 +1,36 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that additional time zone names, if accepted, are handled correctly.
+ * @author Norbert Lindenberg
+ */
+
+// canonicalization specified in conformance clause
+var additionalTimeZoneNames = {
+    "Etc/GMT": "UTC",
+    "Greenwich": "UTC",
+    "PRC": "Asia/Shanghai",
+    "AmErIcA/LoS_aNgElEs": "America/Los_Angeles",
+    "etc/gmt+7": "Etc/GMT+7"
+};
+
+Object.getOwnPropertyNames(additionalTimeZoneNames).forEach(function (name) {
+    var format, error;
+    try {
+        format = new Intl.DateTimeFormat([], {timeZone: name});
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        var actual = format.resolvedOptions().timeZone;
+        var expected = additionalTimeZoneNames[name];
+        if (actual !== expected) {
+            $ERROR("Time zone name " + name + " was accepted, but incorrectly canonicalized to " +
+                actual + "; expected " + expected + ".");
+        }
+    } else if (error.name !== "RangeError") {
+        $ERROR("Time zone name " + name + " was rejected with wrong error " + error.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch06/6.4/browser.js b/js/src/tests/test402/ch06/6.4/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch06/6.4/shell.js b/js/src/tests/test402/ch06/6.4/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch06/browser.js b/js/src/tests/test402/ch06/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch06/shell.js b/js/src/tests/test402/ch06/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch08/8.0/8.0.js b/js/src/tests/test402/ch08/8.0/8.0.js
new file mode 100644
index 000000000000..dedda973b206
--- /dev/null
+++ b/js/src/tests/test402/ch08/8.0/8.0.js
@@ -0,0 +1,12 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl has Object.prototype as its prototype.
+ * @author Norbert Lindenberg
+ */
+
+if (Object.getPrototypeOf(Intl) !== Object.prototype) {
+    $ERROR("Intl doesn't have Object.prototype as its prototype.");
+}
+
diff --git a/js/src/tests/test402/ch08/8.0/8.0_L15.js b/js/src/tests/test402/ch08/8.0/8.0_L15.js
new file mode 100644
index 000000000000..0174bef54e57
--- /dev/null
+++ b/js/src/tests/test402/ch08/8.0/8.0_L15.js
@@ -0,0 +1,15 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(fnGlobalObject().Intl, false, false, []);
+testBuiltInObject(Intl, false, false, ["Collator", "NumberFormat", "DateTimeFormat"]);
+
diff --git a/js/src/tests/test402/ch08/8.0/browser.js b/js/src/tests/test402/ch08/8.0/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch08/8.0/shell.js b/js/src/tests/test402/ch08/8.0/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch08/browser.js b/js/src/tests/test402/ch08/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch08/shell.js b/js/src/tests/test402/ch08/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch09/9.1/9.1_a.js b/js/src/tests/test402/ch09/9.1/9.1_a.js
new file mode 100644
index 000000000000..b7358304bb63
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.1/9.1_a.js
@@ -0,0 +1,18 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that default locale is available.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var defaultLocale = new Constructor().resolvedOptions().locale;
+    var supportedLocales = Constructor.supportedLocalesOf([defaultLocale]);
+    if (supportedLocales.indexOf(defaultLocale) === -1) {
+        $ERROR("Default locale is not reported as available.");
+    }
+});
+
diff --git a/js/src/tests/test402/ch09/9.1/9.1_b.js b/js/src/tests/test402/ch09/9.1/9.1_b.js
new file mode 100644
index 000000000000..a0abc7fc1400
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.1/9.1_b.js
@@ -0,0 +1,32 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that appropriate fallback locales are provided for
+ *     supported locales.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var info = getLocaleSupportInfo(Constructor);
+    var fallback;
+    info.supported.forEach(function (locale) {
+        var pos = locale.lastIndexOf("-");
+        if (pos !== -1) {
+            fallback = locale.substring(0, pos);
+            if (info.supported.indexOf(fallback) === -1) {
+                $ERROR("Locale " + locale + " is supported, but fallback " + fallback + " isn't.");
+            }
+        }
+        var match = /([a-z]{2,3})(-[A-Z][a-z]{3})(-[A-Z]{2})/.exec(locale);
+        if (match !== null) {
+            fallback = match[1] + match[3];
+            if (info.supported.indexOf(fallback) === -1) {
+                $ERROR("Locale " + locale + " is supported, but fallback " + fallback + " isn't.");
+            }
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch09/9.1/browser.js b/js/src/tests/test402/ch09/9.1/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch09/9.1/shell.js b/js/src/tests/test402/ch09/9.1/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch09/9.2/9.2.1_1.js b/js/src/tests/test402/ch09/9.2/9.2.1_1.js
new file mode 100644
index 000000000000..7386fdeda0dc
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.1_1.js
@@ -0,0 +1,23 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that canonicalization of locale lists treats undefined and empty lists the same.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var supportedForUndefined = Constructor.supportedLocalesOf(undefined);
+    var supportedForEmptyList = Constructor.supportedLocalesOf([]);
+    if (supportedForUndefined.length !== supportedForEmptyList.length) {
+        $ERROR("Supported locales differ between undefined and empty list input.");
+    }
+    // we don't compare the elements because length should be 0 - let's just verify that
+    if (supportedForUndefined.length !== 0) {
+        $ERROR("Internal test error: Assumption about length being 0 is invalid.");
+    }
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.1_2.js b/js/src/tests/test402/ch09/9.2/9.2.1_2.js
new file mode 100644
index 000000000000..e4fb3756dbb7
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.1_2.js
@@ -0,0 +1,21 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a List is not affected by adversarial
+ *     changes to Array.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintArray();
+
+testWithIntlConstructors(function (Constructor) {
+    var defaultLocale = new Constructor().resolvedOptions().locale;
+    var canonicalized = Constructor.supportedLocalesOf([defaultLocale, defaultLocale]);
+    if (canonicalized.length > 1) {
+        $ERROR("Canonicalization didn't remove duplicate language tags from locale list.");
+    }
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.1_3.js b/js/src/tests/test402/ch09/9.2/9.2.1_3.js
new file mode 100644
index 000000000000..e403b17653eb
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.1_3.js
@@ -0,0 +1,87 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that a single string instead of a locale list is treated
+ *     as the locale list containing that string.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var validAndInvalidLanguageTags = [
+    "de", // ISO 639 language code
+    "de-DE", // + ISO 3166-1 country code
+    "DE-de", // tags are case-insensitive
+    "cmn", // ISO 639 language code
+    "cmn-Hans", // + script code
+    "CMN-hANS", // tags are case-insensitive
+    "cmn-hans-cn", // + ISO 3166-1 country code
+    "es-419", // + UN M.49 region code
+    "es-419-u-nu-latn-cu-bob", // + Unicode locale extension sequence
+    "i-klingon", // grandfathered tag
+    "cmn-hans-cn-t-ca-u-ca-x-t-u", // singleton subtags can also be used as private use subtags
+    "enochian-enochian", // language and variant subtags may be the same
+    "de-gregory-u-ca-gregory", // variant and extension subtags may be the same
+    "de_DE",
+    "DE_de",
+    "cmn_Hans",
+    "cmn-hans_cn",
+    "es_419",
+    "es-419-u-nu-latn-cu_bob",
+    "i_klingon",
+    "cmn-hans-cn-t-ca-u-ca-x_t-u",
+    "enochian_enochian",
+    "de-gregory_u-ca-gregory",
+    "i", // singleton alone
+    "x", // private use without subtag
+    "u", // extension singleton in first place
+    "419", // region code in first place
+    "u-nu-latn-cu-bob", // extension sequence without language
+    "hans-cmn-cn", // "hans" could theoretically be a 4-letter language code,
+                   // but those can't be followed by extlang codes.
+    "cmn-hans-cn-u-u", // duplicate singleton
+    "cmn-hans-cn-t-u-ca-u", // duplicate singleton
+    "de-gregory-gregory" // duplicate variant
+];
+
+testWithIntlConstructors(function (Constructor) {
+    validAndInvalidLanguageTags.forEach(function (locale) {
+        var obj1, obj2, locale1, locale2, error1, error2;
+        try {
+            obj1 = new Constructor(locale);
+            locale1 = obj1.resolvedOptions().locale;
+        } catch (e) {
+            error1 = e;
+        }
+        try {
+            obj2 = new Constructor([locale]);
+            locale2 = obj2.resolvedOptions().locale;
+        } catch (e) {
+            error2 = e;
+        }
+
+        if ((error1 === undefined) !== (error2 === undefined)) {
+            if (error1 === undefined) {
+                $ERROR("Single locale string " + locale +
+                    " was accepted, but locale list containing that string wasn't.");
+            } else {
+                $ERROR("Single locale string " + locale +
+                    " was rejected, but locale list containing that string wasn't.");
+            }
+        } else if (error1 === undefined) {
+             if (locale1 !== locale2) {
+                $ERROR("Single locale string " + locale + " results in " + locale1 +
+                    ", but locale list [" + locale + "] results in " + locale2 + ".");
+             }
+        } else {
+            if (error1.name !== error2.name) {
+                $ERROR("Single locale string " + locale + " results in error " + error1.name +
+                    ", but locale list [" + locale + "] results in error " + error2.name + ".");
+             }
+        }
+    });
+    
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.1_4.js b/js/src/tests/test402/ch09/9.2/9.2.1_4.js
new file mode 100644
index 000000000000..b9bb9db79d47
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.1_4.js
@@ -0,0 +1,46 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that non-objects are converted to objects before canonicalization.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    // undefined is handled separately
+    
+    // null should result in a TypeError
+    var error;
+    try {
+        var supportedForNull = Constructor.supportedLocalesOf(null);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Null as locale list was not rejected.");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Null as locale list was rejected with wrong error " + error.name + ".");
+    }    
+    
+    // let's use an empty list for comparison
+    var supportedForEmptyList = Constructor.supportedLocalesOf([]);
+    // we don't compare the elements because length should be 0 - let's just verify that
+    if (supportedForEmptyList.length !== 0) {
+        $ERROR("Internal test error: Assumption about length being 0 is invalid.");
+    }
+
+    // most non-objects will be interpreted as empty lists because a missing length property is interpreted as 0
+    var supportedForNumber = Constructor.supportedLocalesOf(5);
+    if (supportedForNumber.length !== supportedForEmptyList.length) {
+        $ERROR("Supported locales differ between numeric and empty list input.");
+    }
+    var supportedForBoolean = Constructor.supportedLocalesOf(true);
+    if (supportedForBoolean.length !== supportedForEmptyList.length) {
+        $ERROR("Supported locales differ between boolean and empty list input.");
+    }
+    
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.1_8_c_ii.js b/js/src/tests/test402/ch09/9.2/9.2.1_8_c_ii.js
new file mode 100644
index 000000000000..8dfb9b7b377f
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.1_8_c_ii.js
@@ -0,0 +1,30 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that values other than strings are not accepted as locales.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var notStringOrObject = [undefined, null, true, false, 0, 5, -5, NaN];
+
+testWithIntlConstructors(function (Constructor) {
+    notStringOrObject.forEach(function (value) {
+        var error;
+        try {
+            var supported = Constructor.supportedLocalesOf([value]);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("" + value + " as locale was not rejected.");
+        } else if (error.name !== "TypeError") {
+            $ERROR("" + value + " as locale was rejected with wrong error " + error.name + ".");
+        }
+    });
+    
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.1_8_c_vi.js b/js/src/tests/test402/ch09/9.2/9.2.1_8_c_vi.js
new file mode 100644
index 000000000000..ef78fa97b0c1
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.1_8_c_vi.js
@@ -0,0 +1,18 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that canonicalization of locale lists removes duplicate language tags.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var defaultLocale = new Constructor().resolvedOptions().locale;
+    var canonicalized = Constructor.supportedLocalesOf([defaultLocale, defaultLocale]);
+    if (canonicalized.length > 1) {
+        $ERROR("Canonicalization didn't remove duplicate language tags from locale list.");
+    }
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.2.js b/js/src/tests/test402/ch09/9.2/9.2.2.js
new file mode 100644
index 000000000000..cb74eaad2a53
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.2.js
@@ -0,0 +1,45 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that locales that are reported by resolvedOptions
+ *     are also reported by supportedLocalesOf.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var info = getLocaleSupportInfo(Constructor);
+    // this test should work equally for both matching algorithms
+    ["lookup", "best fit"].forEach(function (matcher) {
+        var supportedByConstructor = info.supported.concat(info.byFallback);
+        var supported = Constructor.supportedLocalesOf(supportedByConstructor,
+            {localeMatcher: matcher});
+        // we could check the length first, but it's probably more interesting which locales are missing
+        var i = 0;
+        var limit = Math.min(supportedByConstructor.length, supported.length);
+        while (i < limit && supportedByConstructor[i] === supported[i]) {
+            i++;
+        }
+        if (i < supportedByConstructor.length) {
+            $ERROR("Locale " + supportedByConstructor[i] +
+                " is returned by resolvedOptions but not by supportedLocalesOf.");
+        } else if (i < supported.length) {
+            $ERROR("Locale " + supported[i] +
+                " is returned by supportedLocalesOf but not by resolvedOptions.");
+        }
+    });
+    
+    // this test is only valid for lookup - best fit may find additional locales supported
+    var unsupportedByConstructor = info.unsupported;
+    var supported = Constructor.supportedLocalesOf(unsupportedByConstructor,
+            {localeMatcher: "lookup"});
+    if (supported.length > 0) {
+        $ERROR("Locale " + supported[0] +
+            " is returned by supportedLocalesOf but not by resolvedOptions.");
+    }
+
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.3_5.js b/js/src/tests/test402/ch09/9.2/9.2.3_5.js
new file mode 100644
index 000000000000..8ae8a216b630
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.3_5.js
@@ -0,0 +1,22 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a Record is not affected by adversarial
+ *     changes to Object.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintProperties(["locale", "extension", "extensionIndex"]);
+
+testWithIntlConstructors(function (Constructor) {
+    var locale = new Constructor(undefined, {localeMatcher: "lookup"}).resolvedOptions().locale;
+    if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
+        $ERROR("Constructor returns invalid locale " + locale + ".");
+    }
+
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.5_11_g_ii_2.js b/js/src/tests/test402/ch09/9.2/9.2.5_11_g_ii_2.js
new file mode 100644
index 000000000000..d4213d2dae4f
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.5_11_g_ii_2.js
@@ -0,0 +1,26 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that missing Unicode extension values default to true for
+ *     boolean keys.
+ * @author Norbert Lindenberg
+ */
+
+var extensions = ["-u-co-phonebk-kn", "-u-kn-co-phonebk"];
+extensions.forEach(function (extension) {
+    var defaultLocale = new Intl.Collator().resolvedOptions().locale;
+    var collator = new Intl.Collator([defaultLocale + extension], {usage: "sort"});
+    var locale = collator.resolvedOptions().locale;
+    var numeric = collator.resolvedOptions().numeric;
+    if (numeric !== undefined) {
+        if (numeric !== true) {
+            $ERROR("Default value for \"kn\" should be true, but is " + numeric + ".");
+        }
+        if (locale.indexOf("-kn") !== -1) {
+            $ERROR("\"kn\" is returned in locale, but shouldn't be.");
+        }
+    }
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.5_6.js b/js/src/tests/test402/ch09/9.2/9.2.5_6.js
new file mode 100644
index 000000000000..4bc904ee1700
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.5_6.js
@@ -0,0 +1,22 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a Record is not affected by adversarial
+ *     changes to Object.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintProperties(["dataLocale", "nu", "ca", "co", "locale"]);
+
+testWithIntlConstructors(function (Constructor) {
+    var locale = new Constructor(undefined, {localeMatcher: "lookup"}).resolvedOptions().locale;
+    if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
+        $ERROR("Constructor returns invalid locale " + locale + ".");
+    }
+
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.6_2.js b/js/src/tests/test402/ch09/9.2/9.2.6_2.js
new file mode 100644
index 000000000000..8d4f7efa9b80
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.6_2.js
@@ -0,0 +1,27 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a List is not affected by adversarial
+ *     changes to Array.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintArray();
+
+testWithIntlConstructors(function (Constructor) {
+    // this test should work equally for both matching algorithms
+    ["lookup", "best fit"].forEach(function (matcher) {
+        var defaultLocale = new Constructor().resolvedOptions().locale;
+        var canonicalized = Constructor.supportedLocalesOf([defaultLocale, defaultLocale],
+            {localeMatcher: matcher});
+        if (canonicalized.length > 1) {
+            $ERROR("Canonicalization with matcher " + matcher + " didn't remove duplicate language tags from locale list.");
+        }
+    });
+
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.6_4.js b/js/src/tests/test402/ch09/9.2/9.2.6_4.js
new file mode 100644
index 000000000000..7c053a381db4
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.6_4.js
@@ -0,0 +1,23 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that LookupSupportedLocales returns an empty list when
+ *     given an empty list.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    // this test should work equally for both matching algorithms
+    ["lookup", "best fit"].forEach(function (matcher) {
+        var supported = Constructor.supportedLocalesOf([], {localeMatcher: matcher});
+        if (supported.length !== 0) {
+            $ERROR("SupportedLocales with matcher " + matcher + " returned a non-empty list for an empty list.");
+        }
+    });
+
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.6_4_b.js b/js/src/tests/test402/ch09/9.2/9.2.6_4_b.js
new file mode 100644
index 000000000000..5b9a43157afa
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.6_4_b.js
@@ -0,0 +1,47 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Unicode locale extension sequences do not affect
+ *    whether a locale is considered supported, but are reported back.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    // this test should work equally for both matching algorithms
+    ["lookup", "best fit"].forEach(function (matcher) {
+        var info = getLocaleSupportInfo(Constructor);
+        var allLocales = info.supported.concat(info.byFallback, info.unsupported);
+        allLocales.forEach(function (locale) {
+            var validExtension = "-u-co-phonebk-nu-latn";
+            var invalidExtension = "-u-nu-invalid";
+            var supported1 = Constructor.supportedLocalesOf([locale],
+                {localeMatcher: matcher});
+            var supported2 = Constructor.supportedLocalesOf([locale + validExtension],
+                {localeMatcher: matcher});
+            var supported3 = Constructor.supportedLocalesOf([locale + invalidExtension],
+                {localeMatcher: matcher});
+            if (supported1.length === 1) {
+                if (supported2.length !== 1 || supported3.length !== 1) {
+                    $ERROR("Presence of Unicode locale extension sequence affects whether locale " +
+                        locale + " is considered supported with matcher " + matcher + ".");
+                }
+                if (supported2[0] !== locale + validExtension || supported3[0] !== locale + invalidExtension) {
+                    alert(locale + "; " + supported2[0] + "; " + supported3[0]);
+                    $ERROR("Unicode locale extension sequence is not correctly returned for locale " +
+                        locale + " with matcher " + matcher + ".");
+                }
+            } else {
+                if (supported2.length !== 0 || supported3.length !== 0) {
+                    $ERROR("Presence of Unicode locale extension sequence affects whether locale " +
+                        locale + " is considered supported with matcher " + matcher + ".");
+                }
+            }
+        });
+    });
+
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.6_4_c.js b/js/src/tests/test402/ch09/9.2/9.2.6_4_c.js
new file mode 100644
index 000000000000..de68a9b6643d
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.6_4_c.js
@@ -0,0 +1,32 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that LookupSupportedLocales includes the default locale
+ *     and doesn't include the "no linguistic content" locale.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    // this test should work equally for both matching algorithms
+    ["lookup", "best fit"].forEach(function (matcher) {
+        var defaultLocale = new Constructor().resolvedOptions().locale;
+        var noLinguisticContent = "zxx";
+        var supported = Constructor.supportedLocalesOf([defaultLocale, noLinguisticContent],
+            {localeMatcher: matcher});
+        if (supported.indexOf(defaultLocale) === -1) {
+            $ERROR("SupportedLocales didn't return default locale with matcher " + matcher + ".");
+        }
+        if (supported.indexOf(noLinguisticContent) !== -1) {
+            $ERROR("SupportedLocales returned the \"no linguistic content\" locale with matcher " + matcher + ".");
+        }
+        if (supported.length > 1) {
+            $ERROR("SupportedLocales returned stray locales: " + supported.join(", ") + " with matcher " + matcher + ".");
+        }
+    });
+
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.8_1_c.js b/js/src/tests/test402/ch09/9.2/9.2.8_1_c.js
new file mode 100644
index 000000000000..724db1edd18d
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.8_1_c.js
@@ -0,0 +1,36 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option localeMatcher is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var defaultLocale = new Constructor().resolvedOptions().locale;
+    
+    var validValues = [undefined, "lookup", "best fit", {toString: function () { return "lookup"; }}];
+    validValues.forEach(function (value) {
+        var supported = Constructor.supportedLocalesOf([defaultLocale], {localeMatcher: value});
+    });
+    
+    var invalidValues = [null, 0, 5, NaN, true, false, "invalid"];
+    invalidValues.forEach(function (value) {
+        var error;
+        try {
+            var supported = Constructor.supportedLocalesOf([defaultLocale], {localeMatcher: value});
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Invalid localeMatcher value " + value + " was not rejected.");
+        } else if (error.name !== "RangeError") {
+            $ERROR("Invalid localeMatcher value " + value + " was rejected with wrong error " + error.name + ".");
+        }
+    });
+    
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/9.2.8_4.js b/js/src/tests/test402/ch09/9.2/9.2.8_4.js
new file mode 100644
index 000000000000..79c362f62125
--- /dev/null
+++ b/js/src/tests/test402/ch09/9.2/9.2.8_4.js
@@ -0,0 +1,35 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the array returned by SupportedLocales is extensible,
+ *     but its properties are non-writable/non-configurable.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+function testFrozenProperty(obj, property) {
+    var desc = Object.getOwnPropertyDescriptor(obj, property);
+    if (desc.writable) {
+        $ERROR("Property " + property + " of object returned by SupportedLocales is writable.");
+    }
+    if (desc.configurable) {
+        $ERROR("Property " + property + " of object returned by SupportedLocales is configurable.");
+    }
+}
+
+testWithIntlConstructors(function (Constructor) {
+    var defaultLocale = new Constructor().resolvedOptions().locale;
+    var supported = Constructor.supportedLocalesOf([defaultLocale]);
+    if (!Object.isExtensible(supported)) {
+        $ERROR("Object returned by SupportedLocales is not extensible.");
+    }
+    for (var i = 0; i < supported.length; i++) {
+        testFrozenProperty(supported, i);
+    }
+    testFrozenProperty(supported, "length");
+
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch09/9.2/browser.js b/js/src/tests/test402/ch09/9.2/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch09/9.2/shell.js b/js/src/tests/test402/ch09/9.2/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch09/browser.js b/js/src/tests/test402/ch09/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch09/shell.js b/js/src/tests/test402/ch09/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_1.js b/js/src/tests/test402/ch10/10.1/10.1.1_1.js
new file mode 100644
index 000000000000..432e073fc5d2
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_1.js
@@ -0,0 +1,43 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that an object can't be re-initialized as a Collator.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var obj, error;
+    
+    // variant 1: use constructor in a "new" expression
+    obj = new Constructor();
+    try {
+        Intl.Collator.call(obj);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Re-initializing object created with \"new\" as Collator was not rejected.");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Re-initializing object created with \"new\" as Collator was rejected with wrong error " + error.name + ".");
+    }
+    
+    // variant 2: use constructor as a function
+    obj = Constructor.call({});
+    error = undefined;
+    try {
+        Intl.Collator.call(obj);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Re-initializing object created with constructor as function as Collator was not rejected.");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Re-initializing object created with constructor as function as Collator was rejected with wrong error " + error.name + ".");
+    }
+    
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_10.js b/js/src/tests/test402/ch10/10.1/10.1.1_10.js
new file mode 100644
index 000000000000..5c6b657b5977
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_10.js
@@ -0,0 +1,18 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a Record is not affected by adversarial
+ *     changes to Object.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintProperties(["localeMatcher", "kn", "kf"]);
+
+var locale = new Intl.Collator(undefined, {localeMatcher: "lookup"}).resolvedOptions().locale;
+if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
+    $ERROR("Collator returns invalid locale " + locale + ".");
+}
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_11.js b/js/src/tests/test402/ch10/10.1/10.1.1_11.js
new file mode 100644
index 000000000000..447fd8b2854a
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_11.js
@@ -0,0 +1,12 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option localeMatcher is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.Collator, "localeMatcher", "string", ["lookup", "best fit"], "best fit", {noReturn: true});
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_13.js b/js/src/tests/test402/ch10/10.1/10.1.1_13.js
new file mode 100644
index 000000000000..4129eebd2e44
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_13.js
@@ -0,0 +1,13 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the options numeric and caseFirst are processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.Collator, "numeric", "boolean", undefined, undefined, {isOptional: true});
+testOption(Intl.Collator, "caseFirst", "string", ["upper", "lower", "false"], undefined, {isOptional: true});
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_19_b.js b/js/src/tests/test402/ch10/10.1/10.1.1_19_b.js
new file mode 100644
index 000000000000..f1fef270440b
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_19_b.js
@@ -0,0 +1,44 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests the special handling of the "co" key in Intl.Collator.
+ * @author Norbert Lindenberg
+ */
+
+function checkCollation(extensionCoValue, usageValue, expectedCollations, expectedUsage) {
+    var requestLocale = extensionCoValue !== undefined ? "de-DE-u-co-" + extensionCoValue : "de-DE";
+    var options = usageValue !== undefined ? { usage: usageValue } : undefined;
+    var collator = new Intl.Collator([requestLocale], options);
+
+    var collation = collator.resolvedOptions().collation;
+    if (expectedCollations.indexOf(collation) === -1) {
+        $ERROR((extensionCoValue === undefined ? "Default collation" : "Collation for \"" + extensionCoValue) +
+            "\" should be " + expectedCollations.join(" or ") + ", but is " + collation + ".");
+    }
+
+    var usage = collator.resolvedOptions().usage;
+    if (expectedUsage !== usage) {
+        $ERROR((usageValue === undefined ? "Default usage" : "Usage") +
+            " should be " + expectedUsage + ", but is " + usage + ".");
+    }
+}
+
+checkCollation(undefined, undefined, ["default"], "sort");
+
+checkCollation("phonebk", undefined, ["phonebk", "default"], "sort");
+
+checkCollation("invalid", undefined, ["default"], "sort");
+
+checkCollation("standard", undefined, ["default"], "sort");
+
+checkCollation("standard", "search", ["default"], "search");
+
+checkCollation("standard", "sort", ["default"], "sort");
+
+checkCollation("search", undefined, ["default"], "sort");
+
+checkCollation("search", "search", ["default"], "search");
+
+checkCollation("search", "sort", ["default"], "sort");
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_19_c.js b/js/src/tests/test402/ch10/10.1/10.1.1_19_c.js
new file mode 100644
index 000000000000..4ad76d45bf7a
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_19_c.js
@@ -0,0 +1,63 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the options numeric and caseFirst can be
+ *     set through either the locale or the options.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var options = [
+    {key: "kn", property: "numeric", type: "boolean", values: [true, false]},
+    {key: "kf", property: "caseFirst", type: "string", values: ["upper", "lower", "false"]}
+];
+
+options.forEach(function (option) {
+    var defaultLocale = new Intl.Collator().resolvedOptions().locale;
+    var collator, opt, result;
+    
+    // find out which values are supported for a property in the default locale
+    var supportedValues = [];
+    option.values.forEach(function (value) {
+        opt = {};
+        opt[option.property] = value;
+        collator = new Intl.Collator([defaultLocale], opt);
+        result = collator.resolvedOptions()[option.property];
+        if (result !== undefined && supportedValues.indexOf(result) === -1) {
+            supportedValues.push(result);
+        }
+    });
+    
+    // verify that the supported values can also be set through the locale
+    supportedValues.forEach(function (value) {
+        collator = new Intl.Collator([defaultLocale + "-u-" + option.key + "-" + value]);
+        result = collator.resolvedOptions()[option.property];
+        if (result !== value) {
+            $ERROR("Property " + option.property + " couldn't be set through locale extension key " +
+                option.key + "; requested value: " + value + "; actual value: " + result + ".");
+        }
+    });
+    
+    // verify that the options setting overrides the locale setting
+    supportedValues.forEach(function (value) {
+        var otherValue;
+        option.values.forEach(function (possibleValue) {
+            if (possibleValue !== value) {
+                otherValue = possibleValue;
+            }
+        });
+        if (otherValue !== undefined) {
+            opt = {};
+            opt[option.property] = value;
+            collator = new Intl.Collator([defaultLocale + "-u-" + option.key + "-" + otherValue], opt);
+            result = collator.resolvedOptions()[option.property];
+            if (result !== value) {
+                $ERROR("Options value for property " + option.property + " doesn't override locale extension key " +
+                    option.key + "; requested value: " + value + "; actual value: " + result + ".");
+            }
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_20.js b/js/src/tests/test402/ch10/10.1/10.1.1_20.js
new file mode 100644
index 000000000000..97d70c0f957f
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_20.js
@@ -0,0 +1,13 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option sensitivity is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+// the fallback is variant only for usage === sort, but that happens to be the fallback for usage
+testOption(Intl.Collator, "sensitivity", "string", ["base", "accent", "case", "variant"], "variant");
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_23.js b/js/src/tests/test402/ch10/10.1/10.1.1_23.js
new file mode 100644
index 000000000000..0b5261509f22
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_23.js
@@ -0,0 +1,13 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option ignorePunctuation is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+// the fallback is variant only for usage === sort, but that happens to be the fallback for usage
+testOption(Intl.Collator, "ignorePunctuation", "boolean", undefined, false);
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_6.js b/js/src/tests/test402/ch10/10.1/10.1.1_6.js
new file mode 100644
index 000000000000..bc13436d76cc
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_6.js
@@ -0,0 +1,12 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option usage is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.Collator, "usage", "string", ["sort", "search"], "sort");
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.1_a.js b/js/src/tests/test402/ch10/10.1/10.1.1_a.js
new file mode 100644
index 000000000000..56d4b9789574
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.1_a.js
@@ -0,0 +1,14 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that constructing a Collator doesn't create or modify
+ *     unwanted properties on the RegExp constructor.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testForUnwantedRegExpChanges(function () {
+    new Intl.Collator("de-DE-u-co-phonebk");
+});
diff --git a/js/src/tests/test402/ch10/10.1/10.1.2.1_4.js b/js/src/tests/test402/ch10/10.1/10.1.2.1_4.js
new file mode 100644
index 000000000000..22e69065e609
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.2.1_4.js
@@ -0,0 +1,21 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that for non-object values passed as this to Collator a
+ * wrapper object will be initialized and returned.
+ * @author Norbert Lindenberg
+ */
+
+var thisValues = [true, 42, "国際化"];
+
+thisValues.forEach(function (value) {
+    var collator = Intl.Collator.call(value);
+    // check that the returned object functions as a collator
+    var referenceCollator = new Intl.Collator();
+    if (Intl.Collator.prototype.compare.call(collator, "a", "b") !== referenceCollator.compare("a", "b")) {
+        $ERROR("Collator initialized from " + value + " doesn't behave like normal collator.");
+    }
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.2_a.js b/js/src/tests/test402/ch10/10.1/10.1.2_a.js
new file mode 100644
index 000000000000..de69a48093f5
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.2_a.js
@@ -0,0 +1,30 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator can be subclassed.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+// get a collator and have it sort an array for comparison with the subclass
+var locales = ["tlh", "id", "en"];
+var a = ["A", "C", "E", "B", "D", "F"];
+var referenceCollator = new Intl.Collator(locales);
+var referenceSorted = a.slice().sort(referenceCollator.compare);
+
+function MyCollator(locales, options) {
+    Intl.Collator.call(this, locales, options);
+    // could initialize MyCollator properties
+}
+
+MyCollator.prototype = Object.create(Intl.Collator.prototype);
+MyCollator.prototype.constructor = MyCollator;
+// could add methods to MyCollator.prototype
+
+var collator = new MyCollator(locales);
+a.sort(collator.compare);
+testArraysAreSame(referenceSorted, a);
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1.3.js b/js/src/tests/test402/ch10/10.1/10.1.3.js
new file mode 100644
index 000000000000..7459d98d6b2b
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1.3.js
@@ -0,0 +1,19 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that objects constructed by Intl.Collator have the specified internal properties.
+ * @author Norbert Lindenberg
+ */
+
+var obj = new Intl.Collator();
+
+var actualPrototype = Object.getPrototypeOf(obj);
+if (actualPrototype !== Intl.Collator.prototype) {
+    $ERROR("Prototype of object constructed by Intl.Collator isn't Intl.Collator.prototype; got " + actualPrototype);
+}
+
+if (!Object.isExtensible(obj)) {
+    $ERROR("Object constructed by Intl.Collator must be extensible.");
+}
+
diff --git a/js/src/tests/test402/ch10/10.1/10.1_L15.js b/js/src/tests/test402/ch10/10.1/10.1_L15.js
new file mode 100644
index 000000000000..4dbabfd64637
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.1/10.1_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.Collator, true, true, ["supportedLocalesOf"], 0);
+
diff --git a/js/src/tests/test402/ch10/10.1/browser.js b/js/src/tests/test402/ch10/10.1/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/10.1/shell.js b/js/src/tests/test402/ch10/10.1/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/10.2/10.2.1.js b/js/src/tests/test402/ch10/10.2/10.2.1.js
new file mode 100644
index 000000000000..9eccb073c45f
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.2/10.2.1.js
@@ -0,0 +1,22 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator.prototype has the required attributes.
+ * @author Norbert Lindenberg
+ */
+
+var desc = Object.getOwnPropertyDescriptor(Intl.Collator, "prototype");
+if (desc === undefined) {
+    $ERROR("Intl.Collator.prototype is not defined.");
+}
+if (desc.writable) {
+    $ERROR("Intl.Collator.prototype must not be writable.");
+}
+if (desc.enumerable) {
+    $ERROR("Intl.Collator.prototype must not be enumerable.");
+}
+if (desc.configurable) {
+    $ERROR("Intl.Collator.prototype must not be configurable.");
+}
+
diff --git a/js/src/tests/test402/ch10/10.2/10.2.2_L15.js b/js/src/tests/test402/ch10/10.2/10.2.2_L15.js
new file mode 100644
index 000000000000..6ffcdde84da8
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.2/10.2.2_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator.supportedLocalesOf
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.Collator.supportedLocalesOf, true, false, [], 1);
+
diff --git a/js/src/tests/test402/ch10/10.2/10.2.2_a.js b/js/src/tests/test402/ch10/10.2/10.2.2_a.js
new file mode 100644
index 000000000000..5cf953ce820e
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.2/10.2.2_a.js
@@ -0,0 +1,27 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator has a supportedLocalesOf
+ * property, and it works as planned.
+ */
+
+var defaultLocale = new Intl.Collator().resolvedOptions().locale;
+var notSupported = 'zxx'; // "no linguistic content"
+var requestedLocales = [defaultLocale, notSupported];
+
+var supportedLocales;
+
+if (!Intl.Collator.hasOwnProperty('supportedLocalesOf')) {
+    $ERROR("Intl.Collator doesn't have a supportedLocalesOf property.");
+}
+
+supportedLocales = Intl.Collator.supportedLocalesOf(requestedLocales);
+if (supportedLocales.length !== 1) {
+    $ERROR('The length of supported locales list is not 1.');
+}
+
+if (supportedLocales[0] !== defaultLocale) {
+    $ERROR('The default locale is not returned in the supported list.');
+}
+
diff --git a/js/src/tests/test402/ch10/10.2/10.2.2_b.js b/js/src/tests/test402/ch10/10.2/10.2.2_b.js
new file mode 100644
index 000000000000..1b99fd8c5a3c
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.2/10.2.2_b.js
@@ -0,0 +1,13 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator.supportedLocalesOf
+ *     doesn't access arguments that it's not given.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintDataProperty(Object.prototype, "1");
+new Intl.Collator("und");
diff --git a/js/src/tests/test402/ch10/10.2/10.2.3_b.js b/js/src/tests/test402/ch10/10.2/10.2.3_b.js
new file mode 100644
index 000000000000..aef1e746a138
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.2/10.2.3_b.js
@@ -0,0 +1,52 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator does not accept Unicode locale
+ *     extension keys and values that are not allowed.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var testArray = [
+        "hello", "你好", "こんにちは",
+        "pêche", "peché", "1", "9", "10",
+        "ụ\u031B", "u\u031B\u0323", "ư\u0323", "u\u0323\u031B",
+        "Å", "Å", "A\u030A"
+];
+
+var defaultCollator = new Intl.Collator();
+var defaultOptions = defaultCollator.resolvedOptions();
+var defaultOptionsJSON = JSON.stringify(defaultOptions);
+var defaultLocale = defaultOptions.locale;
+var defaultSortedArray = testArray.slice(0).sort(defaultCollator.compare);
+
+var keyValues = {
+    "co": ["standard", "search", "invalid"],
+    "ka": ["noignore", "shifted", "invalid"],
+    "kb": ["true", "false", "invalid"],
+    "kc": ["true", "false", "invalid"],
+    "kh": ["true", "false", "invalid"],
+    "kk": ["true", "false", "invalid"],
+    "kr": ["latn-hira-hani", "hani-hira-latn", "invalid"],
+    "ks": ["level1", "level2", "level3", "level4", "identic", "invalid"],
+    "vt": ["1234-5678-9abc-edf0", "invalid"]
+};
+
+Object.getOwnPropertyNames(keyValues).forEach(function (key) {
+    keyValues[key].forEach(function (value) {
+        var collator = new Intl.Collator([defaultLocale + "-u-" + key + "-" + value]);
+        var options = collator.resolvedOptions();
+        if (options.locale !== defaultLocale) {
+            $ERROR("Locale " + options.locale + " is affected by key " +
+                key + "; value " + value + ".");
+        }
+        if (JSON.stringify(options) !== defaultOptionsJSON) {
+            $ERROR("Resolved options " + JSON.stringify(options) + " are affected by key " +
+                key + "; value " + value + ".");
+        }
+        testArraysAreSame(defaultSortedArray, testArray.sort(collator.compare));
+    });
+});
+
diff --git a/js/src/tests/test402/ch10/10.2/browser.js b/js/src/tests/test402/ch10/10.2/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/10.2/shell.js b/js/src/tests/test402/ch10/10.2/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/10.3/10.3.1.js b/js/src/tests/test402/ch10/10.3/10.3.1.js
new file mode 100644
index 000000000000..699949e18fa9
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.1.js
@@ -0,0 +1,13 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator.prototype.constructor is the
+ * Intl.Collator.
+ */
+
+if (Intl.Collator.prototype.constructor !== Intl.Collator) {
+    $ERROR("Intl.Collator.prototype.constructor is not the same as " +
+           "Intl.Collator");
+}
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.2_1_a_L15.js b/js/src/tests/test402/ch10/10.3/10.3.2_1_a_L15.js
new file mode 100644
index 000000000000..3d49601db802
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.2_1_a_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the function returned by Intl.Collator.prototype.compare
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(new Intl.Collator().compare, true, false, [], 2);
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.2_1_c.js b/js/src/tests/test402/ch10/10.3/10.3.2_1_c.js
new file mode 100644
index 000000000000..73f2bcf098c3
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.2_1_c.js
@@ -0,0 +1,36 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that compare function is bound to its Intl.Collator.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var strings = ["d", "O", "od", "oe", "of", "ö", "o\u0308", "X", "y", "Z", "Z.", "𠮷野家", "吉野家", "!A", "A", "b", "C"];
+var locales = [undefined, ["de"], ["de-u-co-phonebk"], ["en"], ["ja"], ["sv"]];
+var options = [
+    undefined,
+    {usage: "search"},
+    {sensitivity: "base", ignorePunctuation: true}
+];
+
+locales.forEach(function (locales) {
+    options.forEach(function (options) {
+        var collatorObj = new Intl.Collator(locales, options);
+        var compareFunc = collatorObj.compare;
+        var referenceSorted = strings.slice();
+        referenceSorted.sort(function (a, b) { return collatorObj.compare(a, b); });
+        var sorted = strings;
+        sorted.sort(compareFunc);
+        try {
+            testArraysAreSame(referenceSorted, sorted);
+        } catch (e) {
+            e.message += " (Testing with locales " + locales + "; options " +
+                (options ? JSON.stringify(options) : options) + ".)";
+            throw e;
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.2_CS_a.js b/js/src/tests/test402/ch10/10.3/10.3.2_CS_a.js
new file mode 100644
index 000000000000..a946245b403a
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.2_CS_a.js
@@ -0,0 +1,68 @@
+// Copyright 2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the function returned by Intl.Collator.prototype.compare
+ *     returns 0 when comparing Strings that are considered canonically equivalent
+ *     by the Unicode standard.
+ * @author Norbert Lindenberg
+ */
+
+var collator = new Intl.Collator();
+var pairs = [
+    // example from Unicode 5.0, section 3.7, definition D70
+    ["o\u0308", "ö"],
+    // examples from Unicode 5.0, chapter 3.11
+    ["ä\u0323", "a\u0323\u0308"],
+    ["a\u0308\u0323", "a\u0323\u0308"],
+    ["ạ\u0308", "a\u0323\u0308"],
+    ["ä\u0306", "a\u0308\u0306"],
+    ["ă\u0308", "a\u0306\u0308"],
+    // example from Unicode 5.0, chapter 3.12
+    ["\u1111\u1171\u11B6", "퓛"],
+    // examples from UTS 10, Unicode Collation Algorithm
+    ["Å", "Å"],
+    ["Å", "A\u030A"],
+    ["x\u031B\u0323", "x\u0323\u031B"],
+    ["ự", "ụ\u031B"],
+    ["ự", "u\u031B\u0323"],
+    ["ự", "ư\u0323"],
+    ["ự", "u\u0323\u031B"],
+    // examples from UAX 15, Unicode Normalization Forms
+    ["Ç", "C\u0327"],
+    ["q\u0307\u0323", "q\u0323\u0307"],
+    ["가", "\u1100\u1161"],
+    ["Å", "A\u030A"],
+    ["Ω", "Ω"],
+    ["Å", "A\u030A"],
+    ["ô", "o\u0302"],
+    ["ṩ", "s\u0323\u0307"],
+    ["ḋ\u0323", "d\u0323\u0307"],
+    ["ḋ\u0323", "ḍ\u0307"],
+    ["q\u0307\u0323", "q\u0323\u0307"],
+    // examples involving supplementary characters from UCD NormalizationTest.txt
+    ["\uD834\uDD5E", "\uD834\uDD57\uD834\uDD65"],
+    ["\uD87E\uDC2B", "北"]
+    
+];
+var i;
+for (i = 0; i < pairs.length; i++) {
+    var pair = pairs[i];
+    if (collator.compare(pair[0], pair[1]) !== 0) {
+        $ERROR("Collator.compare considers " + pair[0] + " (" + toU(pair[0]) +
+            ") ≠ " + pair[1] + " (" + toU(pair[1]) + ").");
+    }
+}
+
+function toU(s) {
+    var result = "";
+    var escape = "\\u0000";
+    var i;
+    for (i = 0; i < s.length; i++) {
+        var hex = s.charCodeAt(i).toString(16);
+        result += escape.substring(0, escape.length - hex.length) + hex;
+    }
+    return result;
+}
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.2_CS_b_NN.js b/js/src/tests/test402/ch10/10.3/10.3.2_CS_b_NN.js
new file mode 100644
index 000000000000..c417d2b8a3c1
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.2_CS_b_NN.js
@@ -0,0 +1,22 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the compare function isn't entirely unreasonable.
+ *     This test is not normative.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+// this test should be valid at least for the following locales
+var locales = ["de", "en", "es", "fr", "it"];
+locales = Intl.Collator.supportedLocalesOf(locales, {localeMatcher: "lookup"});
+locales.forEach(function (locale) {
+    var collator = new Intl.Collator([locale], {sensitivity: "variant", localeMatcher: "lookup"});
+    var a = ["L", "X", "C", "k", "Z", "H", "d", "m", "w", "A", "i", "f", "y", "E", "N", "V", "g", "J", "b"];
+    a.sort(collator.compare);
+    var expected = ["A", "b", "C", "d", "E", "f", "g", "H", "i", "J", "k", "L", "m", "N", "V", "w", "X", "y", "Z"];
+    testArraysAreSame(expected, a);
+});
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.2_CS_c_NN.js b/js/src/tests/test402/ch10/10.3/10.3.2_CS_c_NN.js
new file mode 100644
index 000000000000..5d5060be5acd
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.2_CS_c_NN.js
@@ -0,0 +1,22 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the compare function supports phonebook sorting if it says it does.
+ *     This test is not normative.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+// this test should be valid at least for the following locales
+var locales = ["de-DE-u-co-phonebk", "de-u-co-phonebk"];
+var collator = new Intl.Collator(locales, {localeMatcher: "lookup"});
+if (locales.indexOf(collator.resolvedOptions().locale) !== -1) {
+    var a = ["A", "b", "Af", "Ab", "od", "off", "Ä", "ö"];
+    a.sort(collator.compare);
+    var expected = ["A", "Ab", "Ä", "Af", "b", "od", "ö", "off"];
+    testArraysAreSame(expected, a);
+}
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.2_CS_d_NN.js b/js/src/tests/test402/ch10/10.3/10.3.2_CS_d_NN.js
new file mode 100644
index 000000000000..be5f1aa338df
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.2_CS_d_NN.js
@@ -0,0 +1,34 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the compare function supports different sensitivity settings.
+ *     This test is not normative.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+// this test should be valid at least for the following locales
+var locales = ["de", "en", "es", "it"];
+locales = Intl.Collator.supportedLocalesOf(locales, {localeMatcher: "lookup"});
+locales.forEach(function (locale) {
+    var target = "Aa";
+    var input = ["Aa", "bA", "E", "b", "aA", "fC", "áÁ", "Aã"];
+    var expected = {
+        "base": ["Aa", "aA", "áÁ", "Aã"],
+        "accent": ["Aa", "aA"],
+        "case": ["Aa", "Aã"],
+        "variant": ["Aa"]
+    };
+    Object.getOwnPropertyNames(expected).forEach(function (sensitivity) {
+        var collator = new Intl.Collator([locale], {usage: "search",
+                sensitivity: sensitivity, localeMatcher: "lookup"});
+        var matches = input.filter(function (v) {
+            return collator.compare(v, target) === 0;
+        });
+        testArraysAreSame(expected[sensitivity], matches);
+    });
+});
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.2_L15.js b/js/src/tests/test402/ch10/10.3/10.3.2_L15.js
new file mode 100644
index 000000000000..5845ea3ca177
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.2_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the getter for Intl.Collator.prototype.compare
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Object.getOwnPropertyDescriptor(Intl.Collator.prototype, "compare").get , true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.3.js b/js/src/tests/test402/ch10/10.3/10.3.3.js
new file mode 100644
index 000000000000..bc6b4fabb976
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.3.js
@@ -0,0 +1,47 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the object returned by Intl.Collator.prototype.resolvedOptions
+ *     has the right properties.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var actual = new Intl.Collator().resolvedOptions();
+
+var actual2 = new Intl.Collator().resolvedOptions();
+if (actual2 === actual) {
+    $ERROR("resolvedOptions returned the same object twice.");
+}
+
+// source: CLDR file common/bcp47/collation.xml; version CLDR 21.
+var collations = [
+    "default", // added
+    "big5han", 
+    "dict",
+    "direct",
+    "ducet",
+    "gb2312",
+    "phonebk",
+    "phonetic",
+    "pinyin",
+    "reformed",
+    // "search", // excluded
+    "searchjl",
+    // "standard", // excluded
+    "stroke",
+    "trad",
+    "unihan"
+];
+
+// this assumes the default values where the specification provides them
+mustHaveProperty(actual, "locale", isCanonicalizedStructurallyValidLanguageTag);
+mustHaveProperty(actual, "usage", ["sort"]);
+mustHaveProperty(actual, "sensitivity", ["variant"]);
+mustHaveProperty(actual, "ignorePunctuation", [false]);
+mustHaveProperty(actual, "collation", collations);
+mayHaveProperty(actual, "numeric", [true, false]);
+mayHaveProperty(actual, "caseFirst", ["upper", "lower", "false"]);
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3.3_L15.js b/js/src/tests/test402/ch10/10.3/10.3.3_L15.js
new file mode 100644
index 000000000000..718cc9fea6f5
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3.3_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator.prototype.resolvedOptions
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.Collator.prototype.resolvedOptions, true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3_L15.js b/js/src/tests/test402/ch10/10.3/10.3_L15.js
new file mode 100644
index 000000000000..60719736c1e6
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator.prototype
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.Collator.prototype, false, false, ["constructor", "compare", "resolvedOptions"]);
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3_a.js b/js/src/tests/test402/ch10/10.3/10.3_a.js
new file mode 100644
index 000000000000..aa2e52845967
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3_a.js
@@ -0,0 +1,15 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator.prototype is an object that
+ * has been initialized as an Intl.Collator.
+ */
+
+// test by calling a function that would fail if "this" were not an object
+// initialized as an Intl.Collator
+if (Intl.Collator.prototype.compare("aаあ아", "aаあ아") !== 0) {
+    $ERROR("Intl.Collator.prototype is not an object that has been " +
+        "initialized as an Intl.Collator.");
+}
+
diff --git a/js/src/tests/test402/ch10/10.3/10.3_b.js b/js/src/tests/test402/ch10/10.3/10.3_b.js
new file mode 100644
index 000000000000..9c3c2db32e23
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.3/10.3_b.js
@@ -0,0 +1,33 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator.prototype functions throw a
+ *     TypeError if called on a non-object value or an object that hasn't been
+ *     initialized as a Collator.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    "compare getter": Object.getOwnPropertyDescriptor(Intl.Collator.prototype, "compare").get,
+    resolvedOptions: Intl.Collator.prototype.resolvedOptions
+};
+var invalidTargets = [undefined, null, true, 0, "Collator", [], {}];
+
+Object.getOwnPropertyNames(functions).forEach(function (functionName) {
+    var f = functions[functionName];
+    invalidTargets.forEach(function (target) {
+        var error;
+        try {
+            f.call(target);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Calling " + functionName + " on " + target + " was not rejected.");
+        } else if (error.name !== "TypeError") {
+            $ERROR("Calling " + functionName + " on " + target + " was rejected with wrong error " + error.name + ".");
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch10/10.3/browser.js b/js/src/tests/test402/ch10/10.3/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/10.3/shell.js b/js/src/tests/test402/ch10/10.3/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/10.4/10.4_a.js b/js/src/tests/test402/ch10/10.4/10.4_a.js
new file mode 100644
index 000000000000..7527f65eb617
--- /dev/null
+++ b/js/src/tests/test402/ch10/10.4/10.4_a.js
@@ -0,0 +1,15 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.Collator instances have the specified properties.
+ * @author Norbert Lindenberg
+ */
+
+var obj = new Intl.Collator();
+
+var toStringValue = Object.prototype.toString.call(obj);
+if (toStringValue !== "[object Object]") {
+    $ERROR("Intl.Collator instance produces wrong [[Class]] - toString returns " + toStringValue + ".");
+}
+
diff --git a/js/src/tests/test402/ch10/10.4/browser.js b/js/src/tests/test402/ch10/10.4/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/10.4/shell.js b/js/src/tests/test402/ch10/10.4/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/browser.js b/js/src/tests/test402/ch10/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch10/shell.js b/js/src/tests/test402/ch10/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_1.js b/js/src/tests/test402/ch11/11.1/11.1.1_1.js
new file mode 100644
index 000000000000..33af1697512d
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_1.js
@@ -0,0 +1,43 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that an object can't be re-initialized as a NumberFormat.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var obj, error;
+    
+    // variant 1: use constructor in a "new" expression
+    obj = new Constructor();
+    try {
+        Intl.NumberFormat.call(obj);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Re-initializing object created with \"new\" as NumberFormat was not rejected.");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Re-initializing object created with \"new\" as NumberFormat was rejected with wrong error " + error.name + ".");
+    }
+    
+    // variant 2: use constructor as a function
+    obj = Constructor.call({});
+    error = undefined;
+    try {
+        Intl.NumberFormat.call(obj);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Re-initializing object created with constructor as function as NumberFormat was not rejected.");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Re-initializing object created with constructor as function as NumberFormat was rejected with wrong error " + error.name + ".");
+    }
+    
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_15.js b/js/src/tests/test402/ch11/11.1/11.1.1_15.js
new file mode 100644
index 000000000000..4d0467428c17
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_15.js
@@ -0,0 +1,13 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option style is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.NumberFormat, "style", "string", ["decimal", "percent", "currency"], "decimal",
+        {extra: {"currency": {currency: "CNY"}}});
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_17.js b/js/src/tests/test402/ch11/11.1/11.1.1_17.js
new file mode 100644
index 000000000000..08c0e8e5c510
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_17.js
@@ -0,0 +1,81 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option currency is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+var validValues = ["CNY", "USD", "EUR", "IDR", "jpy", {toString: function () {return "INR";}}];
+var invalidValues = ["$", "SFr.", "US$", "ßP", {toString: function () {return;}}];
+
+var defaultLocale = new Intl.NumberFormat().resolvedOptions().locale;
+
+validValues.forEach(function (value) {
+    var format, actual, expected;
+
+    // with currency style, we should get the upper case form back
+    format = new Intl.NumberFormat([defaultLocale], {style: "currency", currency: value});
+    actual = format.resolvedOptions().currency;
+    expected = value.toString().toUpperCase();
+    if (actual !== expected) {
+        $ERROR("Incorrect resolved currency with currency style - expected " +
+            expected + "; got " + actual + ".");
+    }
+    
+    // without currency style, we shouldn't get any currency back
+    format = new Intl.NumberFormat([defaultLocale], {currency: value});
+    actual = format.resolvedOptions().currency;
+    expected = undefined;
+    if (actual !== expected) {
+        $ERROR("Incorrect resolved currency with non-currency style - expected " +
+            expected + "; got " + actual + ".");
+    }
+    
+    // currencies specified through the locale must be ignored
+    format = new Intl.NumberFormat([defaultLocale + "-u-cu-krw"], {style: "currency", currency: value});
+    actual = format.resolvedOptions().currency;
+    expected = value.toString().toUpperCase();
+    if (actual !== expected) {
+        $ERROR("Incorrect resolved currency with -u-cu- and currency style - expected " +
+            expected + "; got " + actual + ".");
+    }
+    
+    format = new Intl.NumberFormat([defaultLocale + "-u-cu-krw"], {currency: value});
+    actual = format.resolvedOptions().currency;
+    expected = undefined;
+    if (actual !== expected) {
+        $ERROR("Incorrect resolved currency with -u-cu- and non-currency style - expected " +
+            expected + "; got " + actual + ".");
+    }
+});
+
+invalidValues.forEach(function (value) {
+    function expectError(f) {
+        var error;
+        try {
+            f();
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Invalid currency value " + value + " was not rejected.");
+        } else if (error.name !== "RangeError") {
+            $ERROR("Invalid currency value " + value + " was rejected with wrong error " + error.name + ".");
+        }
+    }
+
+    expectError(function () {
+            return new Intl.NumberFormat([defaultLocale], {style: "currency", currency: value});
+    });
+    expectError(function () {
+            return new Intl.NumberFormat([defaultLocale], {currency: value});
+    });
+    expectError(function () {
+            return new Intl.NumberFormat([defaultLocale + "-u-cu-krw"], {style: "currency", currency: value});
+    });
+    expectError(function () {
+            return new Intl.NumberFormat([defaultLocale + "-u-cu-krw"], {currency: value});
+    });
+});
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_19.js b/js/src/tests/test402/ch11/11.1/11.1.1_19.js
new file mode 100644
index 000000000000..e41ca5bec9bf
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_19.js
@@ -0,0 +1,31 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the currency style can not be used without a specified currency.
+ * @author Norbert Lindenberg
+ */
+
+var defaultLocale = new Intl.NumberFormat().resolvedOptions().locale;
+
+function expectError(f) {
+    var error;
+    try {
+        f();
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Invalid currency value " + value + " was not rejected.");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Invalid currency value " + value + " was rejected with wrong error " + error.name + ".");
+    }
+}
+
+expectError(function () {
+        return new Intl.NumberFormat([defaultLocale], {style: "currency"});
+});
+expectError(function () {
+        return new Intl.NumberFormat([defaultLocale + "-u-cu-krw"], {style: "currency"});
+});
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_20_c.js b/js/src/tests/test402/ch11/11.1/11.1.1_20_c.js
new file mode 100644
index 000000000000..20b7910b02ee
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_20_c.js
@@ -0,0 +1,196 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the number of fractional digits is determined correctly for currencies.
+ * @author Norbert Lindenberg
+ */
+
+// data from http://www.currency-iso.org/dl_iso_table_a1.xml, 2013-02-25
+var currencyDigits = {
+    AED: 2,
+    AFN: 2,
+    ALL: 2,
+    AMD: 2,
+    ANG: 2,
+    AOA: 2,
+    ARS: 2,
+    AUD: 2,
+    AWG: 2,
+    AZN: 2,
+    BAM: 2,
+    BBD: 2,
+    BDT: 2,
+    BGN: 2,
+    BHD: 3,
+    BIF: 0,
+    BMD: 2,
+    BND: 2,
+    BOB: 2,
+    BOV: 2,
+    BRL: 2,
+    BSD: 2,
+    BTN: 2,
+    BWP: 2,
+    BYR: 0,
+    BZD: 2,
+    CAD: 2,
+    CDF: 2,
+    CHE: 2,
+    CHF: 2,
+    CHW: 2,
+    CLF: 0,
+    CLP: 0,
+    CNY: 2,
+    COP: 2,
+    COU: 2,
+    CRC: 2,
+    CUC: 2,
+    CUP: 2,
+    CVE: 2,
+    CZK: 2,
+    DJF: 0,
+    DKK: 2,
+    DOP: 2,
+    DZD: 2,
+    EGP: 2,
+    ERN: 2,
+    ETB: 2,
+    EUR: 2,
+    FJD: 2,
+    FKP: 2,
+    GBP: 2,
+    GEL: 2,
+    GHS: 2,
+    GIP: 2,
+    GMD: 2,
+    GNF: 0,
+    GTQ: 2,
+    GYD: 2,
+    HKD: 2,
+    HNL: 2,
+    HRK: 2,
+    HTG: 2,
+    HUF: 2,
+    IDR: 2,
+    ILS: 2,
+    INR: 2,
+    IQD: 3,
+    IRR: 2,
+    ISK: 0,
+    JMD: 2,
+    JOD: 3,
+    JPY: 0,
+    KES: 2,
+    KGS: 2,
+    KHR: 2,
+    KMF: 0,
+    KPW: 2,
+    KRW: 0,
+    KWD: 3,
+    KYD: 2,
+    KZT: 2,
+    LAK: 2,
+    LBP: 2,
+    LKR: 2,
+    LRD: 2,
+    LSL: 2,
+    LTL: 2,
+    LVL: 2,
+    LYD: 3,
+    MAD: 2,
+    MDL: 2,
+    MGA: 2,
+    MKD: 2,
+    MMK: 2,
+    MNT: 2,
+    MOP: 2,
+    MRO: 2,
+    MUR: 2,
+    MVR: 2,
+    MWK: 2,
+    MXN: 2,
+    MXV: 2,
+    MYR: 2,
+    MZN: 2,
+    NAD: 2,
+    NGN: 2,
+    NIO: 2,
+    NOK: 2,
+    NPR: 2,
+    NZD: 2,
+    OMR: 3,
+    PAB: 2,
+    PEN: 2,
+    PGK: 2,
+    PHP: 2,
+    PKR: 2,
+    PLN: 2,
+    PYG: 0,
+    QAR: 2,
+    RON: 2,
+    RSD: 2,
+    RUB: 2,
+    RWF: 0,
+    SAR: 2,
+    SBD: 2,
+    SCR: 2,
+    SDG: 2,
+    SEK: 2,
+    SGD: 2,
+    SHP: 2,
+    SLL: 2,
+    SOS: 2,
+    SRD: 2,
+    SSP: 2,
+    STD: 2,
+    SVC: 2,
+    SYP: 2,
+    SZL: 2,
+    THB: 2,
+    TJS: 2,
+    TMT: 2,
+    TND: 3,
+    TOP: 2,
+    TRY: 2,
+    TTD: 2,
+    TWD: 2,
+    TZS: 2,
+    UAH: 2,
+//  UGX: 2, will be changed to 0 when maintenance agency releases updated table
+    USD: 2,
+    USN: 2,
+    USS: 2,
+    UYI: 0,
+    UYU: 2,
+    UZS: 2,
+    VEF: 2,
+    VND: 0,
+    VUV: 0,
+    WST: 2,
+    XAF: 0,
+    XCD: 2,
+    XOF: 0,
+    XPF: 0,
+    YER: 2,
+    ZAR: 2,
+    ZMW: 2,
+    ZWL: 2
+};
+
+Object.getOwnPropertyNames(currencyDigits).forEach(function (currency) {
+    var digits = currencyDigits[currency];
+    format = Intl.NumberFormat([], {style: "currency", currency: currency});
+    var min = format.resolvedOptions().minimumFractionDigits;
+    var max = format.resolvedOptions().maximumFractionDigits;
+    if (min !== digits) {
+        $ERROR("Didn't get correct minimumFractionDigits for currency " +
+            currency + "; expected " + digits + ", got " + min + ".");
+    }
+    if (max !== digits) {
+        $ERROR("Didn't get correct maximumFractionDigits for currency " +
+            currency + "; expected " + digits + ", got " + max + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_21.js b/js/src/tests/test402/ch11/11.1/11.1.1_21.js
new file mode 100644
index 000000000000..1751b8b5745f
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_21.js
@@ -0,0 +1,15 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option currencyDisplay is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.NumberFormat, "currencyDisplay", "string", ["code", "symbol", "name"],
+    "symbol", {extra: {any: {style: "currency", currency: "XDR"}}});
+testOption(Intl.NumberFormat, "currencyDisplay", "string", ["code", "symbol", "name"],
+    undefined, {noReturn: true});
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_32.js b/js/src/tests/test402/ch11/11.1/11.1.1_32.js
new file mode 100644
index 000000000000..9196318efbf2
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_32.js
@@ -0,0 +1,44 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the options minimumSignificantDigits and
+ *     maximumSignificantDigits are read in the right sequence.
+ * @author Norbert Lindenberg
+ */
+
+var read = 0;
+
+function readMinimumSignificantDigits() {
+    ++read;
+    if (read === 1) {
+        return 0; // invalid value, but on first read that's OK
+    } else if (read === 3) {
+        return 1; // valid value
+    } else {
+        $ERROR("minimumSignificantDigits read out of sequence: " + read + ".");
+    }
+}
+
+function readMaximumSignificantDigits() {
+    ++read;
+    if (read === 2) {
+        return 0; // invalid value, but on first read that's OK
+    } else if (read === 4) {
+        return 1; // valid value
+    } else {
+        $ERROR("maximumSignificantDigits read out of sequence: " + read + ".");
+    }
+}
+
+var options = {};
+Object.defineProperty(options, "minimumSignificantDigits",
+    { get: readMinimumSignificantDigits });
+Object.defineProperty(options, "maximumSignificantDigits",
+    { get: readMaximumSignificantDigits });
+
+new Intl.NumberFormat("de", options);
+
+if (read !== 4) {
+    $ERROR("insuffient number of property reads: " + read + ".");
+}
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_34.js b/js/src/tests/test402/ch11/11.1/11.1.1_34.js
new file mode 100644
index 000000000000..98ba9a06207a
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_34.js
@@ -0,0 +1,12 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option useGrouping is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.NumberFormat, "useGrouping", "boolean", undefined, true);
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_6.js b/js/src/tests/test402/ch11/11.1/11.1.1_6.js
new file mode 100644
index 000000000000..5b9d342ebf75
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_6.js
@@ -0,0 +1,18 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a Record is not affected by adversarial
+ *     changes to Object.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintProperties(["localeMatcher"]);
+
+var locale = new Intl.NumberFormat(undefined, {localeMatcher: "lookup"}).resolvedOptions().locale;
+if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
+    $ERROR("NumberFormat returns invalid locale " + locale + ".");
+}
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_7.js b/js/src/tests/test402/ch11/11.1/11.1.1_7.js
new file mode 100644
index 000000000000..4b13b245b74c
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_7.js
@@ -0,0 +1,12 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option localeMatcher is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.NumberFormat, "localeMatcher", "string", ["lookup", "best fit"], "best fit", {noReturn: true});
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.1_a.js b/js/src/tests/test402/ch11/11.1/11.1.1_a.js
new file mode 100644
index 000000000000..611816b61c16
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.1_a.js
@@ -0,0 +1,18 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that constructing a NumberFormat doesn't create or modify
+ *     unwanted properties on the RegExp constructor.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testForUnwantedRegExpChanges(function () {
+    new Intl.NumberFormat("de-DE-u-nu-latn");
+});
+
+testForUnwantedRegExpChanges(function () {
+    new Intl.NumberFormat("de-DE-u-nu-latn", {style: "currency", currency: "EUR"});
+});
diff --git a/js/src/tests/test402/ch11/11.1/11.1.2.1_4.js b/js/src/tests/test402/ch11/11.1/11.1.2.1_4.js
new file mode 100644
index 000000000000..18b5b98faf34
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.2.1_4.js
@@ -0,0 +1,21 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that for non-object values passed as this to NumberFormat a
+ * wrapper object will be initialized and returned.
+ * @author Norbert Lindenberg
+ */
+
+var thisValues = [true, 42, "国際化"];
+
+thisValues.forEach(function (value) {
+    var format = Intl.NumberFormat.call(value);
+    // check that the returned object functions as a number format
+    var referenceFormat = new Intl.NumberFormat();
+    if (Intl.NumberFormat.prototype.format.call(format, 12.3456) !== referenceFormat.format(12.3456)) {
+        $ERROR("NumberFormat initialized from " + value + " doesn't behave like normal number format.");
+    }
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.2.js b/js/src/tests/test402/ch11/11.1/11.1.2.js
new file mode 100644
index 000000000000..0ca8cbbdaef0
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.2.js
@@ -0,0 +1,30 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat can be subclassed.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+// get a number format and have it format an array of numbers for comparison with the subclass
+var locales = ["tlh", "id", "en"];
+var a = [0, 1, -1, -123456.789, -Infinity, NaN];
+var referenceNumberFormat = new Intl.NumberFormat(locales);
+var referenceFormatted = a.map(referenceNumberFormat.format);
+
+function MyNumberFormat(locales, options) {
+    Intl.NumberFormat.call(this, locales, options);
+    // could initialize MyNumberFormat properties
+}
+
+MyNumberFormat.prototype = Object.create(Intl.NumberFormat.prototype);
+MyNumberFormat.prototype.constructor = MyNumberFormat;
+// could add methods to MyNumberFormat.prototype
+
+var format = new MyNumberFormat(locales);
+var actual = a.map(format.format);
+testArraysAreSame(referenceFormatted, actual);
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1.3.js b/js/src/tests/test402/ch11/11.1/11.1.3.js
new file mode 100644
index 000000000000..f0bfb5552d8b
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1.3.js
@@ -0,0 +1,19 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that objects constructed by Intl.NumberFormat have the specified internal properties.
+ * @author Norbert Lindenberg
+ */
+
+var obj = new Intl.NumberFormat();
+
+var actualPrototype = Object.getPrototypeOf(obj);
+if (actualPrototype !== Intl.NumberFormat.prototype) {
+    $ERROR("Prototype of object constructed by Intl.NumberFormat isn't Intl.NumberFormat.prototype; got " + actualPrototype);
+}
+
+if (!Object.isExtensible(obj)) {
+    $ERROR("Object constructed by Intl.NumberFormat must be extensible.");
+}
+
diff --git a/js/src/tests/test402/ch11/11.1/11.1_L15.js b/js/src/tests/test402/ch11/11.1/11.1_L15.js
new file mode 100644
index 000000000000..e40ffc53e195
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.1/11.1_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.NumberFormat, true, true, ["supportedLocalesOf"], 0);
+
diff --git a/js/src/tests/test402/ch11/11.1/browser.js b/js/src/tests/test402/ch11/11.1/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/11.1/shell.js b/js/src/tests/test402/ch11/11.1/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/11.2/11.2.1.js b/js/src/tests/test402/ch11/11.2/11.2.1.js
new file mode 100644
index 000000000000..83bebb283575
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.2/11.2.1.js
@@ -0,0 +1,22 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype has the required attributes.
+ * @author Norbert Lindenberg
+ */
+
+var desc = Object.getOwnPropertyDescriptor(Intl.NumberFormat, "prototype");
+if (desc === undefined) {
+    $ERROR("Intl.NumberFormat.prototype is not defined.");
+}
+if (desc.writable) {
+    $ERROR("Intl.NumberFormat.prototype must not be writable.");
+}
+if (desc.enumerable) {
+    $ERROR("Intl.NumberFormat.prototype must not be enumerable.");
+}
+if (desc.configurable) {
+    $ERROR("Intl.NumberFormat.prototype must not be configurable.");
+}
+
diff --git a/js/src/tests/test402/ch11/11.2/11.2.2_L15.js b/js/src/tests/test402/ch11/11.2/11.2.2_L15.js
new file mode 100644
index 000000000000..49dce3bae91a
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.2/11.2.2_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.supportedLocalesOf
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.NumberFormat.supportedLocalesOf, true, false, [], 1);
+
diff --git a/js/src/tests/test402/ch11/11.2/11.2.2_a.js b/js/src/tests/test402/ch11/11.2/11.2.2_a.js
new file mode 100644
index 000000000000..c6c9f9a46dc6
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.2/11.2.2_a.js
@@ -0,0 +1,28 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat has a supportedLocalesOf
+ * property, and it works as planned.
+ * @author: Roozbeh Pournader
+ */
+
+var defaultLocale = new Intl.NumberFormat().resolvedOptions().locale;
+var notSupported = 'zxx'; // "no linguistic content"
+var requestedLocales = [defaultLocale, notSupported];
+    
+var supportedLocales;
+
+if (!Intl.NumberFormat.hasOwnProperty('supportedLocalesOf')) {
+    $ERROR("Intl.NumberFormat doesn't have a supportedLocalesOf property.");
+}
+    
+supportedLocales = Intl.NumberFormat.supportedLocalesOf(requestedLocales);
+if (supportedLocales.length !== 1) {
+    $ERROR('The length of supported locales list is not 1.');
+}
+    
+if (supportedLocales[0] !== defaultLocale) {
+    $ERROR('The default locale is not returned in the supported list.');
+}
+
diff --git a/js/src/tests/test402/ch11/11.2/11.2.2_b.js b/js/src/tests/test402/ch11/11.2/11.2.2_b.js
new file mode 100644
index 000000000000..6b4d77e7737a
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.2/11.2.2_b.js
@@ -0,0 +1,13 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.supportedLocalesOf
+ *     doesn't access arguments that it's not given.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintDataProperty(Object.prototype, "1");
+new Intl.NumberFormat("und");
diff --git a/js/src/tests/test402/ch11/11.2/11.2.3_b.js b/js/src/tests/test402/ch11/11.2/11.2.3_b.js
new file mode 100644
index 000000000000..70fe7cf119a2
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.2/11.2.3_b.js
@@ -0,0 +1,46 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat does not accept Unicode locale
+ *     extension keys and values that are not allowed.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var locales = ["ja-JP", "zh-Hans-CN", "zh-Hant-TW"];
+var input = 1234567.89;
+
+locales.forEach(function (locale) {
+    var defaultNumberFormat = new Intl.NumberFormat([locale]);
+    var defaultOptions = defaultNumberFormat.resolvedOptions();
+    var defaultOptionsJSON = JSON.stringify(defaultOptions);
+    var defaultLocale = defaultOptions.locale;
+    var defaultFormatted = defaultNumberFormat.format(input);
+
+    var keyValues = {
+        "cu": ["USD", "EUR", "JPY", "CNY", "TWD", "invalid"],
+        "nu": ["native", "traditio", "finance", "invalid"]
+    };
+    
+    Object.getOwnPropertyNames(keyValues).forEach(function (key) {
+        keyValues[key].forEach(function (value) {
+            var numberFormat = new Intl.NumberFormat([locale + "-u-" + key + "-" + value]);
+            var options = numberFormat.resolvedOptions();
+            if (options.locale !== defaultLocale) {
+                $ERROR("Locale " + options.locale + " is affected by key " +
+                key + "; value " + value + ".");
+            }
+            if (JSON.stringify(options) !== defaultOptionsJSON) {
+                $ERROR("Resolved options " + JSON.stringify(options) + " are affected by key " +
+                key + "; value " + value + ".");
+            }
+            if (defaultFormatted !== numberFormat.format(input)) {
+                $ERROR("Formatted value " + numberFormat.format(input) + " is affected by key " +
+                key + "; value " + value + ".");
+            }
+        });
+    });
+});
+
diff --git a/js/src/tests/test402/ch11/11.2/browser.js b/js/src/tests/test402/ch11/11.2/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/11.2/shell.js b/js/src/tests/test402/ch11/11.2/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/11.3/11.3.1.js b/js/src/tests/test402/ch11/11.3/11.3.1.js
new file mode 100644
index 000000000000..46c7fc519388
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.1.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype.constructor is the
+ * Intl.NumberFormat.
+ * @author: Roozbeh Pournader
+ */
+
+if (Intl.NumberFormat.prototype.constructor !== Intl.NumberFormat) {
+    $ERROR("Intl.NumberFormat.prototype.constructor is not the same as " +
+          "Intl.NumberFormat");
+}
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_1_a_L15.js b/js/src/tests/test402/ch11/11.3/11.3.2_1_a_L15.js
new file mode 100644
index 000000000000..8e1c9583505c
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_1_a_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the function returned by Intl.NumberFormat.prototype.format
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(new Intl.NumberFormat().format, true, false, [], 1);
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_1_a_ii.js b/js/src/tests/test402/ch11/11.3/11.3.2_1_a_ii.js
new file mode 100644
index 000000000000..cb284f43ef05
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_1_a_ii.js
@@ -0,0 +1,27 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype.format
+ * converts other types to numbers.
+ * @author: Roozbeh Pournader
+ */
+
+var formatter = new Intl.NumberFormat();
+var testData = [undefined, null, true, '0.6666666', {valueOf: function () { return '0.1234567';}}];
+var number;
+var i, input, correctResult, result;
+
+for (i in testData) {
+    input = testData[i];
+    number = +input;
+    correctResult = formatter.format(number);
+    
+    result = formatter.format(input);
+    if (result !== correctResult) {
+        $ERROR('Intl.NumberFormat does not convert other ' +
+            'types to numbers. Input: "'+input+'" Output: "'+result+'" '+
+            'Expected output: "'+correctResult+'"');
+    }
+}
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_1_c.js b/js/src/tests/test402/ch11/11.3/11.3.2_1_c.js
new file mode 100644
index 000000000000..3fc877b310b5
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_1_c.js
@@ -0,0 +1,41 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that format function is bound to its Intl.NumberFormat.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var numbers = [0, -0, 1, -1, 5.5, 123, -123, -123.45, 123.44501, 0.001234,
+    -0.00000000123, 0.00000000000000000000000000000123, 1.2, 0.0000000012344501,
+    123445.01, 12344501000000000000000000000000000, -12344501000000000000000000000000000,
+    Infinity, -Infinity, NaN];
+var locales = [undefined, ["de"], ["th-u-nu-thai"], ["en"], ["ja-u-nu-jpanfin"], ["ar-u-nu-arab"]];
+var options = [
+    undefined,
+    {style: "percent"},
+    {style: "currency", currency: "EUR", currencyDisplay: "symbol"},
+    {style: "currency", currency: "IQD", currencyDisplay: "symbol"},
+    {style: "currency", currency: "KMF", currencyDisplay: "symbol"},
+    {style: "currency", currency: "CLF", currencyDisplay: "symbol"},
+    {useGrouping: false, minimumIntegerDigits: 3, minimumFractionDigits: 1, maximumFractionDigits: 3}
+];
+
+locales.forEach(function (locales) {
+    options.forEach(function (options) {
+        var formatObj = new Intl.NumberFormat(locales, options);
+        var formatFunc = formatObj.format;
+        numbers.forEach(function (number) {
+            var referenceFormatted = formatObj.format(number);
+            var formatted = formatFunc(number);
+            if (referenceFormatted !== formatted) {
+                $ERROR("format function produces different result than format method for locales " +
+                    locales + "; options: " + (options ? JSON.stringify(options) : options) +
+                    " : " + formatted + " vs. " + referenceFormatted + ".");
+            }
+        });
+    });
+});
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_FN_1.js b/js/src/tests/test402/ch11/11.3/11.3.2_FN_1.js
new file mode 100644
index 000000000000..5f14e7772d03
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_FN_1.js
@@ -0,0 +1,19 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype.format
+ * doesn't treat all numbers as negative.
+ * @author: Roozbeh Pournader
+ */
+
+var formatter = new Intl.NumberFormat();
+  
+if (formatter.format(1) === formatter.format(-1)) {
+    $ERROR('Intl.NumberFormat is formatting 1 and -1 the same way.');
+}
+
+if (formatter.format(-0) !== formatter.format(0)) {
+    $ERROR('Intl.NumberFormat is formatting signed zeros differently.');
+}
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_FN_2.js b/js/src/tests/test402/ch11/11.3/11.3.2_FN_2.js
new file mode 100644
index 000000000000..ec11a679d0e6
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_FN_2.js
@@ -0,0 +1,59 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype.format
+ * handles NaN, Infinity, and -Infinity properly.
+ * @author: Roozbeh Pournader
+ */
+
+// FIXME: We are only listing Numeric_Type=Decimal. May need to add more
+// when the spec clarifies. Current as of Unicode 6.1.
+var hasUnicodeDigits = new RegExp('.*([' +
+    '0-9\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F' +
+    '\u09E6-\u09EF\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0BE6-\u0BEF' +
+    '\u0C66-\u0C6F\u0CE6-\u0CEF\u0D66-\u0D6F\u0E50-\u0E59\u0ED0-\u0ED9' +
+    '\u0F20-\u0F29\u1040-\u1049\u1090-\u1099\u17E0-\u17E9\u1810-\u1819' +
+    '\u1946-\u194F\u19D0-\u19D9\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59' +
+    '\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\uA620-\uA629\uA8D0-\uA8D9' +
+    '\uA900-\uA909\uA9D0-\uA9D9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19' +
+    ']|' +
+    '\uD801[\uDCA0-\uDCA9]|' +
+    '\uD804[\uDC66-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9]|' +
+    '\uD805[\uDEC0-\uDEC9]|' +
+    '\uD835[\uDFCE-\uDFFF])');
+
+var formatter = new Intl.NumberFormat();
+var formattedNaN = formatter.format(NaN);
+var formattedInfinity = formatter.format(Infinity);
+var formattedNegativeInfinity = formatter.format(-Infinity);
+
+if (formattedNaN === formattedInfinity) {
+    $ERROR('Intl.NumberFormat formats NaN and Infinity the ' +
+        'same way.');
+}
+
+if (formattedNaN === formattedNegativeInfinity) {
+    $ERROR('Intl.NumberFormat formats NaN and negative ' +
+        'Infinity the same way.');
+}
+
+if (formattedInfinity === formattedNegativeInfinity) {
+    $ERROR('Intl.NumberFormat formats Infinity and ' +
+        'negative Infinity the same way.');
+}
+
+if (hasUnicodeDigits.test(formattedNaN)) {
+    $ERROR('Intl.NumberFormat formats NaN using a digit.');
+}
+
+if (hasUnicodeDigits.test(formattedInfinity)) {
+    $ERROR('Intl.NumberFormat formats Infinity using a ' +
+        'digit.');
+}
+
+if (hasUnicodeDigits.test(formattedNegativeInfinity)) {
+    $ERROR('Intl.NumberFormat formats negative Infinity ' + 
+        'using a digit.');
+}
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_FN_3_b.js b/js/src/tests/test402/ch11/11.3/11.3.2_FN_3_b.js
new file mode 100644
index 000000000000..efe15575d9aa
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_FN_3_b.js
@@ -0,0 +1,27 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype.format
+ * formats percent values properly.
+ * @author: Roozbeh Pournader
+ */
+
+var numberFormatter = new Intl.NumberFormat();
+var percentFormatter = new Intl.NumberFormat(undefined, {style: 'percent'});
+
+var formattedTwenty = numberFormatter.format(20);
+var formattedTwentyPercent = percentFormatter.format(0.20);
+
+// FIXME: May not work for some theoretical locales where percents and
+// normal numbers are formatted using different numbering systems.
+if (formattedTwentyPercent.indexOf(formattedTwenty) === -1) {
+    $ERROR("Intl.NumberFormat's formatting of 20% does not include a " +
+        "formatting of 20 as a substring.");
+}
+
+// FIXME: Move this to somewhere appropriate
+if (percentFormatter.format(0.011) === percentFormatter.format(0.02)) {
+    $ERROR('Intl.NumberFormat is formatting 1.1% and 2% the same way.');
+}
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_FN_3_e.js b/js/src/tests/test402/ch11/11.3/11.3.2_FN_3_e.js
new file mode 100644
index 000000000000..234ae63254cf
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_FN_3_e.js
@@ -0,0 +1,47 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype.format
+ * supports all alternative numbering systems.
+ * @author: Roozbeh Pournader
+ */
+
+var numberingSystems = {
+    arab: 0x0660,
+    arabext: 0x06F0,
+    beng: 0x09E6,
+    deva: 0x0966,
+    fullwide: 0xFF10,
+    gujr: 0x0AE6,
+    guru: 0x0A66,
+    hanidec: [0x3007, 0x4E00, 0x4E8C, 0x4E09, 0x56DB,
+              0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D],
+    khmr: 0x17E0,
+    knda: 0x0CE6,
+    laoo: 0x0ED0,
+    latn: 0x0030,
+    mlym: 0x0D66,
+    mong: 0x1810,
+    mymr: 0x1040,
+    orya: 0x0B66,
+    tamldec: 0x0BE6,
+    telu: 0x0C66,
+    thai: 0x0E50,
+    tibt: 0x0F20
+};
+
+var options, formatter;
+var s, zeroCode, digitList;
+
+for (s in numberingSystems) {
+    zeroCode = numberingSystems[s];
+    if (typeof zeroCode === 'number') {
+        digitList = [zeroCode, zeroCode+1, zeroCode+2, zeroCode+3, zeroCode+4,
+                   zeroCode+5, zeroCode+6, zeroCode+7, zeroCode+8, zeroCode+9];
+        numberingSystems[s] = digitList;
+    }
+}
+
+// FIXME: Unfinished
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_L15.js b/js/src/tests/test402/ch11/11.3/11.3.2_L15.js
new file mode 100644
index 000000000000..17b688b7a9d1
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the getter for Intl.NumberFormat.prototype.format
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Object.getOwnPropertyDescriptor(Intl.NumberFormat.prototype, "format").get , true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_TRF.js b/js/src/tests/test402/ch11/11.3/11.3.2_TRF.js
new file mode 100644
index 000000000000..32ee5cd9aab4
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_TRF.js
@@ -0,0 +1,52 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the digits are determined correctly when specifying pre/post decimal digits.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var locales = [
+    new Intl.NumberFormat().resolvedOptions().locale,
+    "ar", "de", "th", "ja"
+];
+var numberingSystems = [
+    "arab",
+    "latn",
+    "thai",
+    "hanidec"
+];
+var testData = {
+    "0": "000.0",
+    "-0": "000.0",
+    "123": "123.0",
+    "-123": "-123.0",
+    "12345": "12345.0",
+    "-12345": "-12345.0",
+    "123.45": "123.45",
+    "-123.45": "-123.45",
+    "123.44501": "123.445",
+    "-123.44501": "-123.445",
+    "0.001234": "000.001",
+    "-0.001234": "-000.001",
+    "0.00000000123": "000.0",
+    "-0.00000000123": "-000.0",
+    "0.00000000000000000000000000000123": "000.0",
+    "-0.00000000000000000000000000000123": "-000.0",
+    "1.2": "001.2",
+    "-1.2": "-001.2",
+    "0.0000000012344501": "000.0",
+    "-0.0000000012344501": "-000.0",
+    "123445.01": "123445.01",
+    "-123445.01": "-123445.01",
+    "12344501000000000000000000000000000": "12344501000000000000000000000000000.0",
+    "-12344501000000000000000000000000000": "-12344501000000000000000000000000000.0"
+};
+
+testNumberFormat(locales, numberingSystems,
+    {useGrouping: false, minimumIntegerDigits: 3, minimumFractionDigits: 1, maximumFractionDigits: 3},
+    testData);
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.2_TRP.js b/js/src/tests/test402/ch11/11.3/11.3.2_TRP.js
new file mode 100644
index 000000000000..9409e258d14b
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.2_TRP.js
@@ -0,0 +1,52 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the digits are determined correctly when specifying significant digits.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var locales = [
+    new Intl.NumberFormat().resolvedOptions().locale,
+    "ar", "de", "th", "ja"
+];
+var numberingSystems = [
+    "arab",
+    "latn",
+    "thai",
+    "hanidec"
+];
+var testData = {
+    "0": "0.00",
+    "-0": "0.00",
+    "123": "123",
+    "-123": "-123",
+    "12345": "12345",
+    "-12345": "-12345",
+    "123.45": "123.45",
+    "-123.45": "-123.45",
+    "123.44501": "123.45",
+    "-123.44501": "-123.45",
+    "0.001234": "0.001234",
+    "-0.001234": "-0.001234",
+    "0.00000000123": "0.00000000123",
+    "-0.00000000123": "-0.00000000123",
+    "0.00000000000000000000000000000123": "0.00000000000000000000000000000123",
+    "-0.00000000000000000000000000000123": "-0.00000000000000000000000000000123",
+    "1.2": "1.20",
+    "-1.2": "-1.20",
+    "0.0000000012344501": "0.0000000012345",
+    "-0.0000000012344501": "-0.0000000012345",
+    "123445.01": "123450",
+    "-123445.01": "-123450",
+    "12344501000000000000000000000000000": "12345000000000000000000000000000000",
+    "-12344501000000000000000000000000000": "-12345000000000000000000000000000000"
+};
+
+testNumberFormat(locales, numberingSystems,
+    {useGrouping: false, minimumSignificantDigits: 3, maximumSignificantDigits: 5},
+    testData);
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.3.js b/js/src/tests/test402/ch11/11.3/11.3.3.js
new file mode 100644
index 000000000000..5a220ccc9b7a
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.3.js
@@ -0,0 +1,31 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the object returned by Intl.NumberFormat.prototype.resolvedOptions
+ *     has the right properties.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var actual = new Intl.NumberFormat().resolvedOptions();
+
+var actual2 = new Intl.NumberFormat().resolvedOptions();
+if (actual2 === actual) {
+    $ERROR("resolvedOptions returned the same object twice.");
+}
+
+// this assumes the default values where the specification provides them
+mustHaveProperty(actual, "locale", isCanonicalizedStructurallyValidLanguageTag);
+mustHaveProperty(actual, "numberingSystem", isValidNumberingSystem);
+mustHaveProperty(actual, "style", ["decimal"]);
+mustNotHaveProperty(actual, "currency");
+mustNotHaveProperty(actual, "currencyDisplay");
+mustHaveProperty(actual, "minimumIntegerDigits", [1]);
+mustHaveProperty(actual, "minimumFractionDigits", [0]);
+mustHaveProperty(actual, "maximumFractionDigits", [3]);
+mustNotHaveProperty(actual, "minimumSignificantDigits");
+mustNotHaveProperty(actual, "maximumSignificantDigits");
+mustHaveProperty(actual, "useGrouping", [true]);
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3.3_L15.js b/js/src/tests/test402/ch11/11.3/11.3.3_L15.js
new file mode 100644
index 000000000000..b9f95866d1af
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3.3_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype.resolvedOptions
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.NumberFormat.prototype.resolvedOptions, true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3_L15.js b/js/src/tests/test402/ch11/11.3/11.3_L15.js
new file mode 100644
index 000000000000..ac1f0c05dfe8
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.NumberFormat.prototype, false, false, ["constructor", "format", "resolvedOptions"]);
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3_a.js b/js/src/tests/test402/ch11/11.3/11.3_a.js
new file mode 100644
index 000000000000..282a10bf6ee7
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3_a.js
@@ -0,0 +1,16 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype is an object that
+ * has been initialized as an Intl.NumberFormat.
+ * @author: Roozbeh Pournader
+ */
+
+// test by calling a function that would fail if "this" were not an object
+// initialized as an Intl.NumberFormat
+if (typeof Intl.NumberFormat.prototype.format(0) !== "string") {
+    $ERROR("Intl.NumberFormat's prototype is not an object that has been " +
+        "initialized as an Intl.NumberFormat");
+}
+
diff --git a/js/src/tests/test402/ch11/11.3/11.3_b.js b/js/src/tests/test402/ch11/11.3/11.3_b.js
new file mode 100644
index 000000000000..6d0162b1d91e
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.3/11.3_b.js
@@ -0,0 +1,33 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat.prototype functions throw a
+ *     TypeError if called on a non-object value or an object that hasn't been
+ *     initialized as a NumberFormat.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    "format getter": Object.getOwnPropertyDescriptor(Intl.NumberFormat.prototype, "format").get,
+    resolvedOptions: Intl.NumberFormat.prototype.resolvedOptions
+};
+var invalidTargets = [undefined, null, true, 0, "NumberFormat", [], {}];
+
+Object.getOwnPropertyNames(functions).forEach(function (functionName) {
+    var f = functions[functionName];
+    invalidTargets.forEach(function (target) {
+        var error;
+        try {
+            f.call(target);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Calling " + functionName + " on " + target + " was not rejected.");
+        } else if (error.name !== "TypeError") {
+            $ERROR("Calling " + functionName + " on " + target + " was rejected with wrong error " + error.name + ".");
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch11/11.3/browser.js b/js/src/tests/test402/ch11/11.3/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/11.3/shell.js b/js/src/tests/test402/ch11/11.3/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/11.4/11.4_a.js b/js/src/tests/test402/ch11/11.4/11.4_a.js
new file mode 100644
index 000000000000..a562879ece36
--- /dev/null
+++ b/js/src/tests/test402/ch11/11.4/11.4_a.js
@@ -0,0 +1,15 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.NumberFormat instances have the specified properties.
+ * @author Norbert Lindenberg
+ */
+
+var obj = new Intl.NumberFormat();
+
+var toStringValue = Object.prototype.toString.call(obj);
+if (toStringValue !== "[object Object]") {
+    $ERROR("Intl.NumberFormat instance produces wrong [[Class]] - toString returns " + toStringValue + ".");
+}
+
diff --git a/js/src/tests/test402/ch11/11.4/browser.js b/js/src/tests/test402/ch11/11.4/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/11.4/shell.js b/js/src/tests/test402/ch11/11.4/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/browser.js b/js/src/tests/test402/ch11/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch11/shell.js b/js/src/tests/test402/ch11/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_1.js b/js/src/tests/test402/ch12/12.1/12.1.1_1.js
new file mode 100644
index 000000000000..8136fb421001
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_1.js
@@ -0,0 +1,43 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that an object can't be re-initialized as a DateTimeFormat.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testWithIntlConstructors(function (Constructor) {
+    var obj, error;
+    
+    // variant 1: use constructor in a "new" expression
+    obj = new Constructor();
+    try {
+        Intl.DateTimeFormat.call(obj);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Re-initializing object created with \"new\" as DateTimeFormat was not rejected.");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Re-initializing object created with \"new\" as DateTimeFormat was rejected with wrong error " + error.name + ".");
+    }
+    
+    // variant 2: use constructor as a function
+    obj = Constructor.call({});
+    error = undefined;
+    try {
+        Intl.DateTimeFormat.call(obj);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Re-initializing object created with constructor as function as DateTimeFormat was not rejected.");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Re-initializing object created with constructor as function as DateTimeFormat was rejected with wrong error " + error.name + ".");
+    }
+    
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_18.js b/js/src/tests/test402/ch12/12.1/12.1.1_18.js
new file mode 100644
index 000000000000..f75ea1e32749
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_18.js
@@ -0,0 +1,15 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option hour12 is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.DateTimeFormat, "hour12", "boolean", undefined, undefined,
+    {extra: {any: {hour: "numeric", minute: "numeric"}}});
+testOption(Intl.DateTimeFormat, "hour12", "boolean", undefined, undefined,
+    {noReturn: true});
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_22.js b/js/src/tests/test402/ch12/12.1/12.1.1_22.js
new file mode 100644
index 000000000000..5c317c6b9292
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_22.js
@@ -0,0 +1,18 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a Record is not affected by adversarial
+ *     changes to Object.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintProperties(["weekday", "era", "year", "month", "day", "hour", "minute", "second", "timeZone"]);
+
+var locale = new Intl.DateTimeFormat(undefined, {localeMatcher: "lookup"}).resolvedOptions().locale;
+if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
+    $ERROR("DateTimeFormat returns invalid locale " + locale + ".");
+}
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_23.js b/js/src/tests/test402/ch12/12.1/12.1.1_23.js
new file mode 100644
index 000000000000..d26e1d28c82e
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_23.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the options for the date and time components are processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+getDateTimeComponents().forEach(function (component) {
+    testOption(Intl.DateTimeFormat, component, "string", getDateTimeComponentValues(component), undefined, {isILD: true});
+});
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_25.js b/js/src/tests/test402/ch12/12.1/12.1.1_25.js
new file mode 100644
index 000000000000..ccaf7be035e0
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_25.js
@@ -0,0 +1,12 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option formatMatcher is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.DateTimeFormat, "formatMatcher", "string", ["basic", "best fit"], "best fit", {noReturn: true});
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_5.js b/js/src/tests/test402/ch12/12.1/12.1.1_5.js
new file mode 100644
index 000000000000..c6b166814c6d
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_5.js
@@ -0,0 +1,18 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a Record is not affected by adversarial
+ *     changes to Object.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintProperties(["localeMatcher"]);
+
+var locale = new Intl.DateTimeFormat(undefined, {localeMatcher: "lookup"}).resolvedOptions().locale;
+if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
+    $ERROR("DateTimeFormat returns invalid locale " + locale + ".");
+}
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_6.js b/js/src/tests/test402/ch12/12.1/12.1.1_6.js
new file mode 100644
index 000000000000..148ca02f6547
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_6.js
@@ -0,0 +1,12 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the option localeMatcher is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testOption(Intl.DateTimeFormat, "localeMatcher", "string", ["lookup", "best fit"], "best fit", {noReturn: true});
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_TDTO.js b/js/src/tests/test402/ch12/12.1/12.1.1_TDTO.js
new file mode 100644
index 000000000000..5df6a1cf2bef
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_TDTO.js
@@ -0,0 +1,107 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the set of options for the date and time components is processed correctly.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var locales = [[], ["zh-Hans-CN"], ["hi-IN"], ["en-US"], ["id-ID"]];
+var dates = [new Date(), new Date(0), new Date(Date.parse("1989-11-09T17:57:00Z"))];
+
+function testWithDateTimeFormat(options, expected) {
+    locales.forEach(function (locales) {
+        var format = new Intl.DateTimeFormat(locales, options);
+        var resolvedOptions = format.resolvedOptions();
+        getDateTimeComponents().forEach(function (component) {
+            if (resolvedOptions.hasOwnProperty(component)) {
+                if (!expected.hasOwnProperty(component)) {
+                    $ERROR("Unrequested component " + component +
+                        " added to expected subset " + JSON.stringify(expected) +
+                        "; locales " + locales + ", options " +
+                        (options ? JSON.stringify(options) : options) + ".");
+                }
+            } else {
+                if (expected.hasOwnProperty(component)) {
+                    $ERROR("Missing component " + component +
+                        " from expected subset " + JSON.stringify(expected) +
+                        "; locales " + locales + ", options " +
+                        (options ? JSON.stringify(options) : options) + ".");
+                }
+            }
+        });
+    });
+}
+
+function testWithToLocale(f, options, expected) {
+    // expected can be either one subset or an array of possible subsets
+    if (expected.length === undefined) {
+        expected = [expected];
+    }
+    locales.forEach(function (locales) {
+        dates.forEach(function (date) {
+            var formatted = Date.prototype[f].call(date, locales, options);
+            var expectedStrings = [];
+            expected.forEach(function (expected) {
+                var referenceFormat = new Intl.DateTimeFormat(locales, expected);
+                expectedStrings.push(referenceFormat.format(date));
+            });
+            if (expectedStrings.indexOf(formatted) === -1) {
+                $ERROR("Function " + f + " did not return expected string for locales " +
+                    locales + ", options " + (options? JSON.stringify(options) : options) +
+                    "; expected " +
+                    (expectedStrings.length === 1 ? expectedStrings[0] : "one of " + expectedStrings) +
+                    ", got " + formatted + ".");
+            }
+        });
+    });
+}   
+
+// any/date: steps 5a, 6a, 7a
+testWithDateTimeFormat(undefined, {year: "numeric", month: "numeric", day: "numeric"});
+
+// any/date: steps 5a, 6a
+testWithDateTimeFormat({year: "numeric", month: "numeric"}, {year: "numeric", month: "numeric"});
+
+// any/date: steps 5a, 6a
+testWithDateTimeFormat({hour: "numeric", minute: "numeric"}, {hour: "numeric", minute: "numeric"});
+
+// any/all: steps 5a, 6a, 7a, 8a
+testWithToLocale("toLocaleString", undefined, [
+        // the first one is not guaranteed to be supported; the second one is
+        {year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric"},
+        {weekday: "short", year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric"}
+]);
+
+// any/all: steps 5a, 6a
+testWithToLocale("toLocaleString", {year: "numeric", month: "numeric"}, {year: "numeric", month: "numeric"});
+
+// any/all: steps 5a, 6a
+testWithToLocale("toLocaleString", {hour: "numeric", minute: "numeric"}, {hour: "numeric", minute: "numeric"});
+
+// date/date: steps 5a, 7a
+testWithToLocale("toLocaleDateString", undefined, {year: "numeric", month: "numeric", day: "numeric"});
+
+// date/date: steps 5a
+testWithToLocale("toLocaleDateString", {year: "numeric", month: "numeric"}, {year: "numeric", month: "numeric"});
+
+// date/date: steps 5a, 7a
+testWithToLocale("toLocaleDateString", {hour: "numeric", minute: "numeric", second: "numeric"}, [
+        // the first one is not guaranteed to be supported; the second one is
+        {year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric"},
+        {weekday: "short", year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric"}
+]);
+
+// time/time: steps 6a, 8a
+testWithToLocale("toLocaleTimeString", undefined, {hour: "numeric", minute: "numeric", second: "numeric"});
+
+// time/time: steps 6a, 8a
+testWithToLocale("toLocaleTimeString", {weekday: "short", year: "numeric", month: "numeric", day: "numeric"},
+    {weekday: "short", year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric"});
+
+// time/time: steps 6a
+testWithToLocale("toLocaleTimeString", {hour: "numeric", minute: "numeric"}, {hour: "numeric", minute: "numeric"});
+
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.1_a.js b/js/src/tests/test402/ch12/12.1/12.1.1_a.js
new file mode 100644
index 000000000000..4f5f3dbf5ee8
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.1_a.js
@@ -0,0 +1,18 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that constructing a DateTimeFormat doesn't create or modify
+ *     unwanted properties on the RegExp constructor.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+testForUnwantedRegExpChanges(function () {
+    new Intl.DateTimeFormat("de-DE-u-ca-gregory");
+});
+
+testForUnwantedRegExpChanges(function () {
+    new Intl.DateTimeFormat("de-DE-u-ca-gregory", {timeZone: "UTC"});
+});
diff --git a/js/src/tests/test402/ch12/12.1/12.1.2.1_4.js b/js/src/tests/test402/ch12/12.1/12.1.2.1_4.js
new file mode 100644
index 000000000000..cb22be8f9986
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.2.1_4.js
@@ -0,0 +1,21 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that for non-object values passed as this to DateTimeFormat a
+ * wrapper object will be initialized and returned.
+ * @author Norbert Lindenberg
+ */
+
+var thisValues = [true, 42, "国際化"];
+
+thisValues.forEach(function (value) {
+    var format = Intl.DateTimeFormat.call(value);
+    // check that the returned object functions as a date-time format
+    var referenceFormat = new Intl.DateTimeFormat();
+    if (Intl.DateTimeFormat.prototype.format.call(format, new Date(111111111)) !== referenceFormat.format(new Date(111111111))) {
+        $ERROR("DateTimeFormat initialized from " + value + " doesn't behave like normal date-time format.");
+    }
+    return true;
+});
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.2.js b/js/src/tests/test402/ch12/12.1/12.1.2.js
new file mode 100644
index 000000000000..3ffed2ec82ad
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.2.js
@@ -0,0 +1,30 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat can be subclassed.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+// get a date-time format and have it format an array of dates for comparison with the subclass
+var locales = ["tlh", "id", "en"];
+var a = [new Date(0), Date.now(), new Date(Date.parse("1989-11-09T17:57:00Z"))];
+var referenceDateTimeFormat = new Intl.DateTimeFormat(locales);
+var referenceFormatted = a.map(referenceDateTimeFormat.format);
+
+function MyDateTimeFormat(locales, options) {
+    Intl.DateTimeFormat.call(this, locales, options);
+    // could initialize MyDateTimeFormat properties
+}
+
+MyDateTimeFormat.prototype = Object.create(Intl.DateTimeFormat.prototype);
+MyDateTimeFormat.prototype.constructor = MyDateTimeFormat;
+// could add methods to MyDateTimeFormat.prototype
+
+var format = new MyDateTimeFormat(locales);
+var actual = a.map(format.format);
+testArraysAreSame(referenceFormatted, actual);
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1.3.js b/js/src/tests/test402/ch12/12.1/12.1.3.js
new file mode 100644
index 000000000000..5e70bbb8f3d8
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1.3.js
@@ -0,0 +1,19 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that objects constructed by Intl.DateTimeFormat have the specified internal properties.
+ * @author Norbert Lindenberg
+ */
+
+var obj = new Intl.DateTimeFormat();
+
+var actualPrototype = Object.getPrototypeOf(obj);
+if (actualPrototype !== Intl.DateTimeFormat.prototype) {
+    $ERROR("Prototype of object constructed by Intl.DateTimeFormat isn't Intl.DateTimeFormat.prototype; got " + actualPrototype);
+}
+
+if (!Object.isExtensible(obj)) {
+    $ERROR("Object constructed by Intl.DateTimeFormat must be extensible.");
+}
+
diff --git a/js/src/tests/test402/ch12/12.1/12.1_L15.js b/js/src/tests/test402/ch12/12.1/12.1_L15.js
new file mode 100644
index 000000000000..46c4f5f50b8a
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.1/12.1_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.DateTimeFormat, true, true, ["supportedLocalesOf"], 0);
+
diff --git a/js/src/tests/test402/ch12/12.1/browser.js b/js/src/tests/test402/ch12/12.1/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/12.1/shell.js b/js/src/tests/test402/ch12/12.1/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/12.2/12.2.1.js b/js/src/tests/test402/ch12/12.2/12.2.1.js
new file mode 100644
index 000000000000..3590c0a9d2aa
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.2/12.2.1.js
@@ -0,0 +1,22 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat.prototype has the required attributes.
+ * @author Norbert Lindenberg
+ */
+
+var desc = Object.getOwnPropertyDescriptor(Intl.DateTimeFormat, "prototype");
+if (desc === undefined) {
+    $ERROR("Intl.DateTimeFormat.prototype is not defined.");
+}
+if (desc.writable) {
+    $ERROR("Intl.DateTimeFormat.prototype must not be writable.");
+}
+if (desc.enumerable) {
+    $ERROR("Intl.DateTimeFormat.prototype must not be enumerable.");
+}
+if (desc.configurable) {
+    $ERROR("Intl.DateTimeFormat.prototype must not be configurable.");
+}
+
diff --git a/js/src/tests/test402/ch12/12.2/12.2.2_L15.js b/js/src/tests/test402/ch12/12.2/12.2.2_L15.js
new file mode 100644
index 000000000000..8b21df1fd3a3
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.2/12.2.2_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat.supportedLocalesOf
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.DateTimeFormat.supportedLocalesOf, true, false, [], 1);
+
diff --git a/js/src/tests/test402/ch12/12.2/12.2.2_a.js b/js/src/tests/test402/ch12/12.2/12.2.2_a.js
new file mode 100644
index 000000000000..42eedc0a1a30
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.2/12.2.2_a.js
@@ -0,0 +1,28 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat has a supportedLocalesOf
+ * property, and it works as planned.
+ * @author: Roozbeh Pournader
+ */
+
+var defaultLocale = new Intl.DateTimeFormat().resolvedOptions().locale;
+var notSupported = 'zxx'; // "no linguistic content"
+var requestedLocales = [defaultLocale, notSupported];
+    
+var supportedLocales;
+
+if (!Intl.DateTimeFormat.hasOwnProperty('supportedLocalesOf')) {
+    $ERROR("Intl.DateTimeFormat doesn't have a supportedLocalesOf property.");
+}
+    
+supportedLocales = Intl.DateTimeFormat.supportedLocalesOf(requestedLocales);
+if (supportedLocales.length !== 1) {
+    $ERROR('The length of supported locales list is not 1.');
+}
+    
+if (supportedLocales[0] !== defaultLocale) {
+    $ERROR('The default locale is not returned in the supported list.');
+}
+
diff --git a/js/src/tests/test402/ch12/12.2/12.2.2_b.js b/js/src/tests/test402/ch12/12.2/12.2.2_b.js
new file mode 100644
index 000000000000..06bc8027e7e8
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.2/12.2.2_b.js
@@ -0,0 +1,13 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat.supportedLocalesOf
+ *     doesn't access arguments that it's not given.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintDataProperty(Object.prototype, "1");
+new Intl.DateTimeFormat("und");
diff --git a/js/src/tests/test402/ch12/12.2/12.2.3_b.js b/js/src/tests/test402/ch12/12.2/12.2.3_b.js
new file mode 100644
index 000000000000..65fd9dc5fb82
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.2/12.2.3_b.js
@@ -0,0 +1,47 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat does not accept Unicode locale
+ *     extension keys and values that are not allowed.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var locales = ["ja-JP", "zh-Hans-CN", "zh-Hant-TW"];
+var input = new Date(Date.parse("1989-11-09T17:57:00Z"));
+
+locales.forEach(function (locale) {
+    var defaultDateTimeFormat = new Intl.DateTimeFormat([locale]);
+    var defaultOptions = defaultDateTimeFormat.resolvedOptions();
+    var defaultOptionsJSON = JSON.stringify(defaultOptions);
+    var defaultLocale = defaultOptions.locale;
+    var defaultFormatted = defaultDateTimeFormat.format(input);
+
+    var keyValues = {
+        "cu": ["USD", "EUR", "JPY", "CNY", "TWD", "invalid"], // DateTimeFormat internally uses NumberFormat
+        "nu": ["native", "traditio", "finance", "invalid"],
+        "tz": ["usnavajo", "utcw01", "aumel", "uslax", "usnyc", "deber", "invalid"]
+    };
+    
+    Object.getOwnPropertyNames(keyValues).forEach(function (key) {
+        keyValues[key].forEach(function (value) {
+            var dateTimeFormat = new Intl.DateTimeFormat([locale + "-u-" + key + "-" + value]);
+            var options = dateTimeFormat.resolvedOptions();
+            if (options.locale !== defaultLocale) {
+                $ERROR("Locale " + options.locale + " is affected by key " +
+                key + "; value " + value + ".");
+            }
+            if (JSON.stringify(options) !== defaultOptionsJSON) {
+                $ERROR("Resolved options " + JSON.stringify(options) + " are affected by key " +
+                key + "; value " + value + ".");
+            }
+            if (defaultFormatted !== dateTimeFormat.format(input)) {
+                $ERROR("Formatted value " + dateTimeFormat.format(input) + " is affected by key " +
+                key + "; value " + value + ".");
+            }
+        });
+    });
+});
+
diff --git a/js/src/tests/test402/ch12/12.2/12.2.3_c.js b/js/src/tests/test402/ch12/12.2/12.2.3_c.js
new file mode 100644
index 000000000000..0aced6ca91a5
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.2/12.2.3_c.js
@@ -0,0 +1,52 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat provides the required date-time
+ *     format component subsets.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var locales = ["de-DE", "en-US", "hi-IN", "id-ID", "ja-JP", "th-TH", "zh-Hans-CN", "zh-Hant-TW", "zxx"];
+var subsets = [
+    {weekday: "long", year: "numeric", month: "numeric", day: "numeric",
+        hour: "numeric", minute: "numeric", second: "numeric"},
+    {weekday: "long", year: "numeric", month: "numeric", day: "numeric"},
+    {year: "numeric", month: "numeric", day: "numeric"},
+    {year: "numeric", month: "numeric"},
+    {month: "numeric", day: "numeric"},
+    {hour: "numeric", minute: "numeric", second: "numeric"},
+    {hour: "numeric", minute: "numeric"}
+];
+
+locales.forEach(function (locale) {
+    subsets.forEach(function (subset) {
+        var format = new Intl.DateTimeFormat([locale], subset);
+        var actual = format.resolvedOptions();
+        getDateTimeComponents().forEach(function (component) {
+            if (actual.hasOwnProperty(component)) {
+                if (!subset.hasOwnProperty(component)) {
+                    $ERROR("Unrequested component " + component +
+                        " added to requested subset " + JSON.stringify(subset) +
+                        "; locale " + locale + ".");
+                }
+                try {
+                    testValidDateTimeComponentValue(component, actual[component]);
+                } catch (e) {
+                    e.message += " (Testing locale " + locale + "; subset " +
+                        JSON.stringify(subset) + ")";
+                    throw e;
+                }
+            } else {
+                if (subset.hasOwnProperty(component)) {
+                    $ERROR("Missing component " + component +
+                        " from requested subset " + JSON.stringify(subset) +
+                        "; locale " + locale + ".");
+                }
+            }
+        });
+    });
+});
+
diff --git a/js/src/tests/test402/ch12/12.2/browser.js b/js/src/tests/test402/ch12/12.2/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/12.2/shell.js b/js/src/tests/test402/ch12/12.2/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/12.3/12.3.1.js b/js/src/tests/test402/ch12/12.3/12.3.1.js
new file mode 100644
index 000000000000..1755dd64bc1f
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.1.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat.prototype.constructor is the
+ * Intl.DateTimeFormat.
+ * @author: Roozbeh Pournader
+ */
+
+if (Intl.DateTimeFormat.prototype.constructor !== Intl.DateTimeFormat) {
+    $ERROR("Intl.DateTimeFormat.prototype.constructor is not the same as " +
+          "Intl.DateTimeFormat");
+}
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3.2_1_a_L15.js b/js/src/tests/test402/ch12/12.3/12.3.2_1_a_L15.js
new file mode 100644
index 000000000000..2fb768d09c2d
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.2_1_a_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the function returned by Intl.DateTimeFormat.prototype.format
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(new Intl.DateTimeFormat().format, true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3.2_1_c.js b/js/src/tests/test402/ch12/12.3/12.3.2_1_c.js
new file mode 100644
index 000000000000..d4b9f891fe47
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.2_1_c.js
@@ -0,0 +1,34 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that format function is bound to its Intl.DateTimeFormat.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var dates = [new Date(), new Date(0), new Date(Date.parse("1989-11-09T17:57:00Z"))];
+var locales = [undefined, ["de"], ["th-u-ca-gregory-nu-thai"], ["en"], ["ja-u-ca-japanese"], ["ar-u-ca-islamicc-nu-arab"]];
+var options = [
+    undefined,
+    {hour12: false},
+    {month: "long", day: "numeric", hour: "2-digit", minute: "2-digit"}
+];
+
+locales.forEach(function (locales) {
+    options.forEach(function (options) {
+        var formatObj = new Intl.DateTimeFormat(locales, options);
+        var formatFunc = formatObj.format;
+        dates.forEach(function (date) {
+            var referenceFormatted = formatObj.format(date);
+            var formatted = formatFunc(date);
+            if (referenceFormatted !== formatted) {
+                $ERROR("format function produces different result than format method for locales " +
+                    locales + "; options: " + (options ? JSON.stringify(options) : options) +
+                    " : " + formatted + " vs. " + referenceFormatted + ".");
+            }
+        });
+    });
+});
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3.2_FDT_1.js b/js/src/tests/test402/ch12/12.3/12.3.2_FDT_1.js
new file mode 100644
index 000000000000..d643d7928b2f
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.2_FDT_1.js
@@ -0,0 +1,26 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that format handles non-finite values correctly.
+ * @author Norbert Lindenberg
+ */
+
+var invalidValues = [NaN, Infinity, -Infinity];
+
+var format = new Intl.DateTimeFormat();
+
+invalidValues.forEach(function (value) {
+    var error;
+    try {
+        var result = format.format(value);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Invalid value " + value + " was not rejected.");
+    } else if (error.name !== "RangeError") {
+        $ERROR("Invalid value " + value + " was rejected with wrong error " + error.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3.2_FDT_7_a_iv.js b/js/src/tests/test402/ch12/12.3/12.3.2_FDT_7_a_iv.js
new file mode 100644
index 000000000000..f13878403954
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.2_FDT_7_a_iv.js
@@ -0,0 +1,32 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that format uses a proleptic Gregorian calendar with no year 0.
+ * @author Norbert Lindenberg
+ */
+
+var dates = [
+    0, // January 1, 1970
+    -62151602400000, // in June 1 BC
+    -8640000000000000 // beginning of ECMAScript time
+];
+
+var format = new Intl.DateTimeFormat(["en-US"], {year: "numeric", month: "long", timeZone: "UTC"});
+
+// this test requires a Gregorian calendar, which we usually find in the US
+if (format.resolvedOptions().calendar !== "gregory") {
+    $ERROR("Internal error: Didn't find Gregorian calendar");
+}
+
+dates.forEach(function (date) {
+    var year = new Date(date).getUTCFullYear();
+    var expectedYear = year <= 0 ? 1 - year : year;
+    var expectedYearString = expectedYear.toLocaleString(["en-US"], {useGrouping: false});
+    var dateString = format.format(date);
+    if (dateString.indexOf(expectedYearString) === -1) {
+        $ERROR("Formatted year doesn't contain expected year – expected " +
+            expectedYearString + ", got " + dateString + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3.2_L15.js b/js/src/tests/test402/ch12/12.3/12.3.2_L15.js
new file mode 100644
index 000000000000..73d309e26abc
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.2_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the getter for Intl.DateTimeFormat.prototype.format
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Object.getOwnPropertyDescriptor(Intl.DateTimeFormat.prototype, "format").get , true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3.2_TLT_2.js b/js/src/tests/test402/ch12/12.3/12.3.2_TLT_2.js
new file mode 100644
index 000000000000..bf0a8ed36fd6
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.2_TLT_2.js
@@ -0,0 +1,16 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that the behavior of a Record is not affected by adversarial
+ *     changes to Object.prototype.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintProperties(["weekday", "era", "year", "month", "day", "hour", "minute", "second", "inDST"]);
+
+var format = new Intl.DateTimeFormat();
+var time = format.format();
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3.3.js b/js/src/tests/test402/ch12/12.3/12.3.3.js
new file mode 100644
index 000000000000..b5735c3500e1
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.3.js
@@ -0,0 +1,52 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that the object returned by Intl.DateTimeFormat.prototype.resolvedOptions
+ *     has the right properties.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var actual = new Intl.DateTimeFormat().resolvedOptions();
+
+var actual2 = new Intl.DateTimeFormat().resolvedOptions();
+if (actual2 === actual) {
+    $ERROR("resolvedOptions returned the same object twice.");
+}
+
+// source: CLDR file common/bcp47/calendar.xml; version CLDR 21.
+var calendars = [
+    "buddhist",
+    "chinese",
+    "coptic",
+    "ethioaa",
+    "ethiopic",
+    "gregory",
+    "hebrew",
+    "indian",
+    "islamic",
+    "islamicc",
+    "iso8601",
+    "japanese",
+    "persian",
+    "roc"
+];
+
+// this assumes the default values where the specification provides them
+mustHaveProperty(actual, "locale", isCanonicalizedStructurallyValidLanguageTag);
+mustHaveProperty(actual, "calendar", calendars);
+mustHaveProperty(actual, "numberingSystem", isValidNumberingSystem);
+mustHaveProperty(actual, "timeZone", [undefined]);
+mustNotHaveProperty(actual, "weekday");
+mustNotHaveProperty(actual, "era");
+mustHaveProperty(actual, "year", ["2-digit", "numeric"]);
+mustHaveProperty(actual, "month", ["2-digit", "numeric", "narrow", "short", "long"]);
+mustHaveProperty(actual, "day", ["2-digit", "numeric"]);
+mustNotHaveProperty(actual, "hour");
+mustNotHaveProperty(actual, "minute");
+mustNotHaveProperty(actual, "second");
+mustNotHaveProperty(actual, "timeZoneName");
+mustNotHaveProperty(actual, "hour12");
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3.3_L15.js b/js/src/tests/test402/ch12/12.3/12.3.3_L15.js
new file mode 100644
index 000000000000..1b4079ebec8f
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3.3_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat.prototype.resolvedOptions
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.DateTimeFormat.prototype.resolvedOptions, true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3_L15.js b/js/src/tests/test402/ch12/12.3/12.3_L15.js
new file mode 100644
index 000000000000..55f1c16ca1e7
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat.prototype
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Intl.DateTimeFormat.prototype, false, false, ["constructor", "format", "resolvedOptions"]);
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3_a.js b/js/src/tests/test402/ch12/12.3/12.3_a.js
new file mode 100644
index 000000000000..e1d795b910de
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3_a.js
@@ -0,0 +1,16 @@
+// Copyright 2012 Google Inc.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat.prototype is an object that
+ * has been initialized as an Intl.DateTimeFormat.
+ * @author: Roozbeh Pournader
+ */
+
+// test by calling a function that would fail if "this" were not an object
+// initialized as an Intl.DateTimeFormat
+if (typeof Intl.DateTimeFormat.prototype.format(0) !== "string") {
+    $ERROR("Intl.DateTimeFormat's prototype is not an object that has been " +
+        "initialized as an Intl.DateTimeFormat");
+}
+
diff --git a/js/src/tests/test402/ch12/12.3/12.3_b.js b/js/src/tests/test402/ch12/12.3/12.3_b.js
new file mode 100644
index 000000000000..d905bf5712ab
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.3/12.3_b.js
@@ -0,0 +1,33 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat.prototype functions throw a
+ *     TypeError if called on a non-object value or an object that hasn't been
+ *     initialized as a DateTimeFormat.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    "format getter": Object.getOwnPropertyDescriptor(Intl.DateTimeFormat.prototype, "format").get,
+    resolvedOptions: Intl.DateTimeFormat.prototype.resolvedOptions
+};
+var invalidTargets = [undefined, null, true, 0, "DateTimeFormat", [], {}];
+
+Object.getOwnPropertyNames(functions).forEach(function (functionName) {
+    var f = functions[functionName];
+    invalidTargets.forEach(function (target) {
+        var error;
+        try {
+            f.call(target);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Calling " + functionName + " on " + target + " was not rejected.");
+        } else if (error.name !== "TypeError") {
+            $ERROR("Calling " + functionName + " on " + target + " was rejected with wrong error " + error.name + ".");
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch12/12.3/browser.js b/js/src/tests/test402/ch12/12.3/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/12.3/shell.js b/js/src/tests/test402/ch12/12.3/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/12.4/12.4_a.js b/js/src/tests/test402/ch12/12.4/12.4_a.js
new file mode 100644
index 000000000000..8e8d5954c0ba
--- /dev/null
+++ b/js/src/tests/test402/ch12/12.4/12.4_a.js
@@ -0,0 +1,15 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Intl.DateTimeFormat instances have the specified properties.
+ * @author Norbert Lindenberg
+ */
+
+var obj = new Intl.DateTimeFormat();
+
+var toStringValue = Object.prototype.toString.call(obj);
+if (toStringValue !== "[object Object]") {
+    $ERROR("Intl.DateTimeFormat instance produces wrong [[Class]] - toString returns " + toStringValue + ".");
+}
+
diff --git a/js/src/tests/test402/ch12/12.4/browser.js b/js/src/tests/test402/ch12/12.4/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/12.4/shell.js b/js/src/tests/test402/ch12/12.4/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/browser.js b/js/src/tests/test402/ch12/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch12/shell.js b/js/src/tests/test402/ch12/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch13/13.1/13.1.1_1.js b/js/src/tests/test402/ch13/13.1/13.1.1_1.js
new file mode 100644
index 000000000000..37be9711b34f
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.1/13.1.1_1.js
@@ -0,0 +1,24 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that localeCompare rejects values that can't be coerced to an object.
+ * @author Norbert Lindenberg
+ */
+
+var invalidValues = [undefined, null];
+ 
+invalidValues.forEach(function (value) {
+    var error;
+    try {
+        var result = String.prototype.localeCompare.call(value, "");
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("String.prototype.localeCompare did not reject this = " + value + ".");
+    } else if (error.name !== "TypeError") {
+        $ERROR("String.prototype.localeCompare rejected this = " + value + " with wrong error " + error.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch13/13.1/13.1.1_2.js b/js/src/tests/test402/ch13/13.1/13.1.1_2.js
new file mode 100644
index 000000000000..bad7c0fdd847
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.1/13.1.1_2.js
@@ -0,0 +1,26 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that localeCompare coerces this to a string.
+ * @author Norbert Lindenberg
+ */
+
+var thisValues = [true, 5, "hello", {toString: function () { return "good bye"; }}];
+var thatValues = ["true", "5", "hello", "good bye"];
+
+var i;
+for (i = 0; i < thisValues.length; i++) {
+    var j;
+    for (j = 0; j < thatValues.length; j++) {
+        var result = String.prototype.localeCompare.call(thisValues[i], thatValues[j]);
+        if ((result === 0) !== (i === j)) {
+            if (result === 0) {
+                $ERROR("localeCompare treats " + thisValues[i] + " and " + thatValues[j] + " as equal.");
+            } else {
+                $ERROR("localeCompare treats " + thisValues[i] + " and " + thatValues[j] + " as different.");
+            }
+        }
+    }
+}
+
diff --git a/js/src/tests/test402/ch13/13.1/13.1.1_3_1.js b/js/src/tests/test402/ch13/13.1/13.1.1_3_1.js
new file mode 100644
index 000000000000..113a2d9aa872
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.1/13.1.1_3_1.js
@@ -0,0 +1,26 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that localeCompare coerces that to a string.
+ * @author Norbert Lindenberg
+ */
+
+var thisValues = ["true", "5", "hello", "good bye"];
+var thatValues = [true, 5, "hello", {toString: function () { return "good bye"; }}];
+
+var i;
+for (i = 0; i < thisValues.length; i++) {
+    var j;
+    for (j = 0; j < thatValues.length; j++) {
+        var result = String.prototype.localeCompare.call(thisValues[i], thatValues[j]);
+        if ((result === 0) !== (i === j)) {
+            if (result === 0) {
+                $ERROR("localeCompare treats " + thisValues[i] + " and " + thatValues[j] + " as equal.");
+            } else {
+                $ERROR("localeCompare treats " + thisValues[i] + " and " + thatValues[j] + " as different.");
+            }
+        }
+    }
+}
+
diff --git a/js/src/tests/test402/ch13/13.1/13.1.1_3_2.js b/js/src/tests/test402/ch13/13.1/13.1.1_3_2.js
new file mode 100644
index 000000000000..441166c9fb03
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.1/13.1.1_3_2.js
@@ -0,0 +1,22 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that String.prototype.localeCompare treats a missing
+ *     "that" argument, undefined, and "undefined" as equivalent.
+ * @author Norbert Lindenberg
+ */
+
+var thisValues = ["a", "t", "u", "undefined", "UNDEFINED", "nicht definiert", "xyz", "未定义"];
+
+var i;
+for (i = 0; i < thisValues.length; i++) {
+    var thisValue = thisValues[i];
+    if (thisValue.localeCompare() !== thisValue.localeCompare(undefined)) {
+        $ERROR("String.prototype.localeCompare does not treat missing 'that' argument as undefined.");
+    }
+    if (thisValue.localeCompare(undefined) !== thisValue.localeCompare("undefined")) {
+        $ERROR("String.prototype.localeCompare does not treat undefined 'that' argument as \"undefined\".");
+    }
+}
+
diff --git a/js/src/tests/test402/ch13/13.1/13.1.1_6_1.js b/js/src/tests/test402/ch13/13.1/13.1.1_6_1.js
new file mode 100644
index 000000000000..30607d317164
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.1/13.1.1_6_1.js
@@ -0,0 +1,65 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that String.prototype.localeCompare throws the same exceptions as Intl.Collator.
+ * @author Norbert Lindenberg
+ */
+
+var locales = [null, [NaN], ["i"], ["de_DE"]];
+var options = [
+    {localeMatcher: null},
+    {usage: "invalid"},
+    {sensitivity: "invalid"}
+];
+
+locales.forEach(function (locales) {
+    var referenceError, error;
+    try {
+        var collator = new Intl.Collator(locales);
+    } catch (e) {
+        referenceError = e;
+    }
+    if (referenceError === undefined) {
+        $ERROR("Internal error: Expected exception was not thrown by Intl.Collator for locales " + locales + ".");
+    }
+    
+    try {
+        var result = "".localeCompare("", locales);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("String.prototype.localeCompare didn't throw exception for locales " + locales + ".");
+    } else if (error.name !== referenceError.name) {
+        $ERROR("String.prototype.localeCompare threw exception " + error.name +
+            " for locales " + locales + "; expected " + referenceError.name + ".");
+    }
+});
+
+options.forEach(function (options) {
+    var referenceError, error;
+    try {
+        var collator = new Intl.Collator([], options);
+    } catch (e) {
+        referenceError = e;
+    }
+    if (referenceError === undefined) {
+        $ERROR("Internal error: Expected exception was not thrown by Intl.Collator for options " +
+            JSON.stringify(options) + ".");
+    }
+    
+    try {
+        var result = "".localeCompare("", [], options);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("String.prototype.localeCompare didn't throw exception for options " +
+            JSON.stringify(options) + ".");
+    } else if (error.name !== referenceError.name) {
+        $ERROR("String.prototype.localeCompare threw exception " + error.name +
+            " for options " + JSON.stringify(options) + "; expected " + referenceError.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch13/13.1/13.1.1_6_2.js b/js/src/tests/test402/ch13/13.1/13.1.1_6_2.js
new file mode 100644
index 000000000000..481a7803b2fa
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.1/13.1.1_6_2.js
@@ -0,0 +1,13 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that String.prototype.localeCompare uses the standard
+ *     built-in Intl.Collator constructor.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintDataProperty(Intl, "Collator");
+"a".localeCompare("b");
diff --git a/js/src/tests/test402/ch13/13.1/13.1.1_7.js b/js/src/tests/test402/ch13/13.1/13.1.1_7.js
new file mode 100644
index 000000000000..f0c588f64c3d
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.1/13.1.1_7.js
@@ -0,0 +1,33 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that localeCompare produces the same results as Intl.Collator.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var strings = ["d", "O", "od", "oe", "of", "ö", "o\u0308", "X", "y", "Z", "Z.", "𠮷野家", "吉野家", "!A", "A", "b", "C"];
+var locales = [undefined, ["de"], ["de-u-co-phonebk"], ["en"], ["ja"], ["sv"]];
+var options = [
+    undefined,
+    {usage: "search"},
+    {sensitivity: "base", ignorePunctuation: true}
+];
+
+locales.forEach(function (locales) {
+    options.forEach(function (options) {
+        var referenceCollator = new Intl.Collator(locales, options);
+        var referenceSorted = strings.slice().sort(referenceCollator.compare);
+        
+        strings.sort(function (a, b) { return a.localeCompare(b, locales, options); });
+        try {
+            testArraysAreSame(referenceSorted, strings);
+        } catch (e) {
+            e.message += " (Testing with locales " + locales + "; options " + JSON.stringify(options) + ".)";
+            throw e;
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch13/13.1/13.1.1_L15.js b/js/src/tests/test402/ch13/13.1/13.1.1_L15.js
new file mode 100644
index 000000000000..d921de00052a
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.1/13.1.1_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that String.prototype.localeCompare
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(String.prototype.localeCompare, true, false, [], 1);
+
diff --git a/js/src/tests/test402/ch13/13.1/browser.js b/js/src/tests/test402/ch13/13.1/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch13/13.1/shell.js b/js/src/tests/test402/ch13/13.1/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch13/13.2/13.2.1_1.js b/js/src/tests/test402/ch13/13.2/13.2.1_1.js
new file mode 100644
index 000000000000..da1ee8fe58f4
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.2/13.2.1_1.js
@@ -0,0 +1,37 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that toLocaleString handles "this Number value" correctly.
+ * @author Norbert Lindenberg
+ */
+
+var invalidValues = [undefined, null, "5", false, {valueOf: function () { return 5; }}];
+var validValues = [5, NaN, -1234567.89, -Infinity];
+
+invalidValues.forEach(function (value) {
+    var error;
+    try {
+        var result = Number.prototype.toLocaleString.call(value);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Number.prototype.toLocaleString did not reject this = " + value + ".");
+    } else if (error.name !== "TypeError") {
+        $ERROR("Number.prototype.toLocaleString rejected this = " + value + " with wrong error " + error.name + ".");
+    }
+});
+
+// for valid values, just check that a Number value and the corresponding
+// Number object get the same result.
+validValues.forEach(function (value) {
+    var Constructor = Number; // to keep jshint happy
+    var valueResult = Number.prototype.toLocaleString.call(value);
+    var objectResult = Number.prototype.toLocaleString.call(new Constructor(value));
+    if (valueResult !== objectResult) {
+        $ERROR("Number.prototype.toLocaleString produces different results for Number value " +
+            value + " and corresponding Number object: " + valueResult + " vs. " + objectResult + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch13/13.2/13.2.1_4_1.js b/js/src/tests/test402/ch13/13.2/13.2.1_4_1.js
new file mode 100644
index 000000000000..e6e0b11638a3
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.2/13.2.1_4_1.js
@@ -0,0 +1,67 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Number.prototype.toLocaleString throws the same exceptions as Intl.NumberFormat.
+ * @author Norbert Lindenberg
+ */
+
+var locales = [null, [NaN], ["i"], ["de_DE"]];
+var options = [
+    {localeMatcher: null},
+    {style: "invalid"},
+    {style: "currency"},
+    {style: "currency", currency: "ßP"},
+    {maximumSignificantDigits: -Infinity}
+];
+
+locales.forEach(function (locales) {
+    var referenceError, error;
+    try {
+        var format = new Intl.NumberFormat(locales);
+    } catch (e) {
+        referenceError = e;
+    }
+    if (referenceError === undefined) {
+        $ERROR("Internal error: Expected exception was not thrown by Intl.NumberFormat for locales " + locales + ".");
+    }
+    
+    try {
+        var result = (0).toLocaleString(locales);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Number.prototype.toLocaleString didn't throw exception for locales " + locales + ".");
+    } else if (error.name !== referenceError.name) {
+        $ERROR("Number.prototype.toLocaleString threw exception " + error.name +
+            " for locales " + locales + "; expected " + referenceError.name + ".");
+    }
+});
+
+options.forEach(function (options) {
+    var referenceError, error;
+    try {
+        var format = new Intl.NumberFormat([], options);
+    } catch (e) {
+        referenceError = e;
+    }
+    if (referenceError === undefined) {
+        $ERROR("Internal error: Expected exception was not thrown by Intl.NumberFormat for options " +
+            JSON.stringify(options) + ".");
+    }
+    
+    try {
+        var result = (0).toLocaleString([], options);
+    } catch (e) {
+        error = e;
+    }
+    if (error === undefined) {
+        $ERROR("Number.prototype.toLocaleString didn't throw exception for options " +
+            JSON.stringify(options) + ".");
+    } else if (error.name !== referenceError.name) {
+        $ERROR("Number.prototype.toLocaleString threw exception " + error.name +
+            " for options " + JSON.stringify(options) + "; expected " + referenceError.name + ".");
+    }
+});
+
diff --git a/js/src/tests/test402/ch13/13.2/13.2.1_4_2.js b/js/src/tests/test402/ch13/13.2/13.2.1_4_2.js
new file mode 100644
index 000000000000..a79cfffde782
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.2/13.2.1_4_2.js
@@ -0,0 +1,13 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Number.prototype.toLocaleString uses the standard
+ *     built-in Intl.NumberFormat constructor.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintDataProperty(Intl, "NumberFormat");
+(0.0).toLocaleString();
diff --git a/js/src/tests/test402/ch13/13.2/13.2.1_5.js b/js/src/tests/test402/ch13/13.2/13.2.1_5.js
new file mode 100644
index 000000000000..eb953b64d4c4
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.2/13.2.1_5.js
@@ -0,0 +1,41 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Number.prototype.toLocaleString produces the same results as Intl.NumberFormat.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var numbers = [0, -0, 1, -1, 5.5, 123, -123, -123.45, 123.44501, 0.001234,
+    -0.00000000123, 0.00000000000000000000000000000123, 1.2, 0.0000000012344501,
+    123445.01, 12344501000000000000000000000000000, -12344501000000000000000000000000000,
+    Infinity, -Infinity, NaN];
+var locales = [undefined, ["de"], ["th-u-nu-thai"], ["en"], ["ja-u-nu-jpanfin"], ["ar-u-nu-arab"]];
+var options = [
+    undefined,
+    {style: "percent"},
+    {style: "currency", currency: "EUR", currencyDisplay: "symbol"},
+    {style: "currency", currency: "IQD", currencyDisplay: "symbol"},
+    {style: "currency", currency: "KMF", currencyDisplay: "symbol"},
+    {style: "currency", currency: "CLF", currencyDisplay: "symbol"},
+    {useGrouping: false, minimumIntegerDigits: 3, minimumFractionDigits: 1, maximumFractionDigits: 3}
+];
+
+locales.forEach(function (locales) {
+    options.forEach(function (options) {
+        var referenceNumberFormat = new Intl.NumberFormat(locales, options);
+        var referenceFormatted = numbers.map(referenceNumberFormat.format);
+        
+        var formatted = numbers.map(function (a) { return a.toLocaleString(locales, options); });
+        try {
+            testArraysAreSame(referenceFormatted, formatted);
+        } catch (e) {
+            e.message += " (Testing with locales " + locales + "; options " +
+            (options ? JSON.stringify(options) : options) + ".)";
+            throw e;
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch13/13.2/13.2.1_L15.js b/js/src/tests/test402/ch13/13.2/13.2.1_L15.js
new file mode 100644
index 000000000000..8b53f749635b
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.2/13.2.1_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Number.prototype.toLocaleString
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Number.prototype.toLocaleString, true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch13/13.2/browser.js b/js/src/tests/test402/ch13/13.2/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch13/13.2/shell.js b/js/src/tests/test402/ch13/13.2/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch13/13.3/13.3.0_1.js b/js/src/tests/test402/ch13/13.3/13.3.0_1.js
new file mode 100644
index 000000000000..0f2902162e42
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.3/13.3.0_1.js
@@ -0,0 +1,32 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. handle "this time value" correctly.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    toLocaleString: Date.prototype.toLocaleString,
+    toLocaleDateString: Date.prototype.toLocaleDateString,
+    toLocaleTimeString: Date.prototype.toLocaleTimeString
+};
+var invalidValues = [undefined, null, 5, "5", false, {valueOf: function () { return 5; }}];
+
+Object.getOwnPropertyNames(functions).forEach(function (p) {
+    var f = functions[p];
+    invalidValues.forEach(function (value) {
+        var error;
+        try {
+            var result = f.call(value);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Date.prototype." + p + " did not reject this = " + value + ".");
+        } else if (error.name !== "TypeError") {
+            $ERROR("Date.prototype." + p + " rejected this = " + value + " with wrong error " + error.name + ".");
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch13/13.3/13.3.0_2.js b/js/src/tests/test402/ch13/13.3/13.3.0_2.js
new file mode 100644
index 000000000000..7d5f32fa6866
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.3/13.3.0_2.js
@@ -0,0 +1,26 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. handle non-finite values correctly.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    toLocaleString: Date.prototype.toLocaleString,
+    toLocaleDateString: Date.prototype.toLocaleDateString,
+    toLocaleTimeString: Date.prototype.toLocaleTimeString
+};
+var invalidValues = [NaN, Infinity, -Infinity];
+
+Object.getOwnPropertyNames(functions).forEach(function (p) {
+    var f = functions[p];
+    invalidValues.forEach(function (value) {
+        var result = f.call(new Date(value));
+        if (result !== "Invalid Date") {
+            $ERROR("Date.prototype." + p + " did not return \"Invalid Date\" for " +
+                value + " – got " + result + " instead.");
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch13/13.3/13.3.0_6_1.js b/js/src/tests/test402/ch13/13.3/13.3.0_6_1.js
new file mode 100644
index 000000000000..c97b240b478d
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.3/13.3.0_6_1.js
@@ -0,0 +1,74 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. throws the same exceptions as Intl.DateTimeFormat.
+ * @author Norbert Lindenberg
+ */
+
+var functions = {
+    toLocaleString: Date.prototype.toLocaleString,
+    toLocaleDateString: Date.prototype.toLocaleDateString,
+    toLocaleTimeString: Date.prototype.toLocaleTimeString
+};
+var locales = [null, [NaN], ["i"], ["de_DE"]];
+var options = [
+    {localeMatcher: null},
+    {timeZone: "invalid"},
+    {hour: "long"},
+    {formatMatcher: "invalid"}
+];
+
+Object.getOwnPropertyNames(functions).forEach(function (p) {
+    var f = functions[p];
+    locales.forEach(function (locales) {
+        var referenceError, error;
+        try {
+            var format = new Intl.DateTimeFormat(locales);
+        } catch (e) {
+            referenceError = e;
+        }
+        if (referenceError === undefined) {
+            $ERROR("Internal error: Expected exception was not thrown by Intl.DateTimeFormat for locales " + locales + ".");
+        }
+        
+        try {
+            var result = f.call(new Date(), locales);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Date.prototype." + p + " didn't throw exception for locales " + locales + ".");
+        } else if (error.name !== referenceError.name) {
+            $ERROR("Date.prototype." + p + " threw exception " + error.name +
+                " for locales " + locales + "; expected " + referenceError.name + ".");
+        }
+    });
+    
+    options.forEach(function (options) {
+        var referenceError, error;
+        try {
+            var format = new Intl.DateTimeFormat([], options);
+        } catch (e) {
+            referenceError = e;
+        }
+        if (referenceError === undefined) {
+            $ERROR("Internal error: Expected exception was not thrown by Intl.DateTimeFormat for options " +
+                JSON.stringify(options) + ".");
+        }
+        
+        try {
+            var result = f.call(new Date(), [], options);
+        } catch (e) {
+            error = e;
+        }
+        if (error === undefined) {
+            $ERROR("Date.prototype." + p + " didn't throw exception for options " +
+                JSON.stringify(options) + ".");
+        } else if (error.name !== referenceError.name) {
+            $ERROR("Date.prototype." + p + " threw exception " + error.name +
+                " for options " + JSON.stringify(options) + "; expected " + referenceError.name + ".");
+        }
+    });
+});
+
diff --git a/js/src/tests/test402/ch13/13.3/13.3.0_6_2.js b/js/src/tests/test402/ch13/13.3/13.3.0_6_2.js
new file mode 100644
index 000000000000..dcce05906649
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.3/13.3.0_6_2.js
@@ -0,0 +1,15 @@
+// Copyright 2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. use the standard
+ *     built-in Intl.DateTimeFormat constructor.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+taintDataProperty(Intl, "DateTimeFormat");
+new Date().toLocaleString();
+new Date().toLocaleDateString();
+new Date().toLocaleTimeString();
diff --git a/js/src/tests/test402/ch13/13.3/13.3.0_7.js b/js/src/tests/test402/ch13/13.3/13.3.0_7.js
new file mode 100644
index 000000000000..fe7c9271d0cf
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.3/13.3.0_7.js
@@ -0,0 +1,58 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString & Co. produces the same results as Intl.DateTimeFormat.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testIntl.js");
+
+var functions = {
+    toLocaleString: [Date.prototype.toLocaleString,
+        {year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric"}],
+    toLocaleDateString: [Date.prototype.toLocaleDateString,
+        {year: "numeric", month: "numeric", day: "numeric"}],
+    toLocaleTimeString: [Date.prototype.toLocaleTimeString,
+        {hour: "numeric", minute: "numeric", second: "numeric"}]
+};
+var dates = [new Date(), new Date(0), new Date(Date.parse("1989-11-09T17:57:00Z"))];
+var locales = [undefined, ["de"], ["th-u-ca-gregory-nu-thai"], ["en"], ["ja-u-ca-japanese"], ["ar-u-ca-islamicc-nu-arab"]];
+var options = [
+    undefined,
+    {hour12: false},
+    {month: "long", day: "numeric", hour: "2-digit", minute: "2-digit"}
+];
+
+Object.getOwnPropertyNames(functions).forEach(function (p) {
+    var f = functions[p][0];
+    var defaults = functions[p][1];
+    locales.forEach(function (locales) {
+        options.forEach(function (options) {
+            var constructorOptions = options;
+            if (options === undefined) {
+                constructorOptions = defaults;
+            } else if (options.day === undefined) {
+                // for simplicity, our options above have either both date and time or neither
+                constructorOptions = Object.create(defaults);
+                for (var prop in options) {
+                    if (options.hasOwnProperty(prop)) {
+                        constructorOptions[prop] = options[prop];
+                    }
+                }
+            }
+            var referenceDateTimeFormat = new Intl.DateTimeFormat(locales, constructorOptions);
+            var referenceFormatted = dates.map(referenceDateTimeFormat.format);
+            
+            var formatted = dates.map(function (a) { return f.call(a, locales, options); });
+            try {
+                testArraysAreSame(referenceFormatted, formatted);
+            } catch (e) {
+                e.message += " (Testing with locales " + locales + "; options " +
+                    (options ? JSON.stringify(options) : options) + ".)";
+                throw e;
+            }
+        });
+    });
+});
+
diff --git a/js/src/tests/test402/ch13/13.3/13.3.1_L15.js b/js/src/tests/test402/ch13/13.3/13.3.1_L15.js
new file mode 100644
index 000000000000..a8c697c077df
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.3/13.3.1_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleString
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Date.prototype.toLocaleString, true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch13/13.3/13.3.2_L15.js b/js/src/tests/test402/ch13/13.3/13.3.2_L15.js
new file mode 100644
index 000000000000..5eeed944ea45
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.3/13.3.2_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleDateString
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Date.prototype.toLocaleDateString, true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch13/13.3/13.3.3_L15.js b/js/src/tests/test402/ch13/13.3/13.3.3_L15.js
new file mode 100644
index 000000000000..dac7c3513116
--- /dev/null
+++ b/js/src/tests/test402/ch13/13.3/13.3.3_L15.js
@@ -0,0 +1,14 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+
+/**
+ * @description Tests that Date.prototype.toLocaleTimeString
+ *     meets the requirements for built-in objects defined by the introduction of
+ *     chapter 15 of the ECMAScript Language Specification.
+ * @author Norbert Lindenberg
+ */
+
+$INCLUDE("testBuiltInObject.js");
+
+testBuiltInObject(Date.prototype.toLocaleTimeString, true, false, [], 0);
+
diff --git a/js/src/tests/test402/ch13/13.3/browser.js b/js/src/tests/test402/ch13/13.3/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch13/13.3/shell.js b/js/src/tests/test402/ch13/13.3/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch13/browser.js b/js/src/tests/test402/ch13/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/ch13/shell.js b/js/src/tests/test402/ch13/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/test402/lib/testBuiltInObject.js b/js/src/tests/test402/lib/testBuiltInObject.js
new file mode 100644
index 000000000000..3a8d24fdc462
--- /dev/null
+++ b/js/src/tests/test402/lib/testBuiltInObject.js
@@ -0,0 +1,124 @@
+// Copyright 2012 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * @description Tests that obj meets the requirements for built-in objects
+ *     defined by the introduction of chapter 15 of the ECMAScript Language Specification.
+ * @param {Object} obj the object to be tested.
+ * @param {boolean} isFunction whether the specification describes obj as a function.
+ * @param {boolean} isConstructor whether the specification describes obj as a constructor.
+ * @param {String[]} properties an array with the names of the built-in properties of obj,
+ *     excluding length, prototype, or properties with non-default attributes.
+ * @param {number} length for functions only: the length specified for the function
+ *     or derived from the argument list.
+ * @author Norbert Lindenberg
+ */
+
+function testBuiltInObject(obj, isFunction, isConstructor, properties, length) {
+
+    if (obj === undefined) {
+        $ERROR("Object being tested is undefined.");
+    }
+
+    var objString = Object.prototype.toString.call(obj);
+    if (isFunction) {
+        if (objString !== "[object Function]") {
+            $ERROR("The [[Class]] internal property of a built-in function must be " +
+                    "\"Function\", but toString() returns " + objString);
+        }
+    } else {
+        if (objString !== "[object Object]") {
+            $ERROR("The [[Class]] internal property of a built-in non-function object must be " +
+                    "\"Object\", but toString() returns " + objString);
+        }
+    }
+
+    if (!Object.isExtensible(obj)) {
+        $ERROR("Built-in objects must be extensible.");
+    }
+
+    if (isFunction && Object.getPrototypeOf(obj) !== Function.prototype) {
+        $ERROR("Built-in functions must have Function.prototype as their prototype.");
+    }
+
+    if (isConstructor && Object.getPrototypeOf(obj.prototype) !== Object.prototype) {
+        $ERROR("Built-in prototype objects must have Object.prototype as their prototype.");
+    }
+
+    // verification of the absence of the [[Construct]] internal property has
+    // been moved to the end of the test
+    
+    // verification of the absence of the prototype property has
+    // been moved to the end of the test
+
+    if (isFunction) {
+        
+        if (typeof obj.length !== "number" || obj.length !== Math.floor(obj.length)) {
+            $ERROR("Built-in functions must have a length property with an integer value.");
+        }
+    
+        if (obj.length !== length) {
+            $ERROR("Function's length property doesn't have specified value; expected " +
+                length + ", got " + obj.length + ".");
+        }
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "length");
+        if (desc.writable) {
+            $ERROR("The length property of a built-in function must not be writable.");
+        }
+        if (desc.enumerable) {
+            $ERROR("The length property of a built-in function must not be enumerable.");
+        }
+        if (desc.configurable) {
+            $ERROR("The length property of a built-in function must not be configurable.");
+        }
+    }
+
+    properties.forEach(function(prop) {
+        var desc = Object.getOwnPropertyDescriptor(obj, prop);
+        if (desc === undefined) {
+            $ERROR("Missing property " + prop + ".");
+        }
+        // accessor properties don't have writable attribute
+        if (desc.hasOwnProperty("writable") && !desc.writable) {
+            $ERROR("The " + prop + " property of this built-in function must be writable.");
+        }
+        if (desc.enumerable) {
+            $ERROR("The " + prop + " property of this built-in function must not be enumerable.");
+        }
+        if (!desc.configurable) {
+            $ERROR("The " + prop + " property of this built-in function must be configurable.");
+        }
+    });
+
+    // The remaining sections have been moved to the end of the test because
+    // unbound non-constructor functions written in JavaScript cannot possibly
+    // pass them, and we still want to test JavaScript implementations as much
+    // as possible.
+    
+    var exception;
+    if (isFunction && !isConstructor) {
+        // this is not a complete test for the presence of [[Construct]]:
+        // if it's absent, the exception must be thrown, but it may also
+        // be thrown if it's present and just has preconditions related to
+        // arguments or the this value that this statement doesn't meet.
+        try {
+            /*jshint newcap:false*/
+            var instance = new obj();
+        } catch (e) {
+            exception = e;
+        }
+        if (exception === undefined || exception.name !== "TypeError") {
+            $ERROR("Built-in functions that aren't constructors must throw TypeError when " +
+                "used in a \"new\" statement.");
+        }
+    }
+
+    if (isFunction && !isConstructor && obj.hasOwnProperty("prototype")) {
+        $ERROR("Built-in functions that aren't constructors must not have a prototype property.");
+    }
+
+    // passed the complete test!
+    return true;
+}
+
diff --git a/js/src/tests/test402/lib/testIntl.js b/js/src/tests/test402/lib/testIntl.js
new file mode 100644
index 000000000000..b009a2e9ed32
--- /dev/null
+++ b/js/src/tests/test402/lib/testIntl.js
@@ -0,0 +1,1167 @@
+// Copyright 2011-2012 Norbert Lindenberg. All rights reserved.
+// Copyright 2012-2013 Mozilla Corporation. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * This file contains shared functions for the tests in the conformance test
+ * suite for the ECMAScript Internationalization API.
+ * @author Norbert Lindenberg
+ */
+
+
+/**
+ * @description Calls the provided function for every service constructor in
+ * the Intl object, until f returns a falsy value. It returns the result of the
+ * last call to f, mapped to a boolean.
+ * @param {Function} f the function to call for each service constructor in
+ *     the Intl object.
+ *     @param {Function} Constructor the constructor object to test with.
+ * @result {Boolean} whether the test succeeded.
+ */
+function testWithIntlConstructors(f) {
+    var constructors = ["Collator", "NumberFormat", "DateTimeFormat"];
+    return constructors.every(function (constructor) {
+        var Constructor = Intl[constructor];
+        var result;
+        try {
+            result = f(Constructor);
+        } catch (e) {
+            e.message += " (Testing with " + constructor + ".)";
+            throw e;
+        }
+        return result;
+    });
+}
+
+
+/**
+ * Returns the name of the given constructor object, which must be one of
+ * Intl.Collator, Intl.NumberFormat, or Intl.DateTimeFormat.
+ * @param {object} Constructor a constructor
+ * @return {string} the name of the constructor
+ */
+function getConstructorName(Constructor) {
+    switch (Constructor) {
+        case Intl.Collator:
+            return "Collator";
+        case Intl.NumberFormat:
+            return "NumberFormat";
+        case Intl.DateTimeFormat:
+            return "DateTimeFormat";
+        default:
+            $ERROR("test internal error: unknown Constructor");
+    }
+}
+
+
+/**
+ * Taints a named data property of the given object by installing
+ * a setter that throws an exception.
+ * @param {object} obj the object whose data property to taint
+ * @param {string} property the property to taint
+ */
+function taintDataProperty(obj, property) {
+    Object.defineProperty(obj, property, {
+        set: function(value) {
+            $ERROR("Client code can adversely affect behavior: setter for " + property + ".");
+        },
+        enumerable: false,
+        configurable: true
+    });
+}
+
+
+/**
+ * Taints a named method of the given object by replacing it with a function
+ * that throws an exception.
+ * @param {object} obj the object whose method to taint
+ * @param {string} property the name of the method to taint
+ */
+function taintMethod(obj, property) {
+    Object.defineProperty(obj, property, {
+        value: function() {
+            $ERROR("Client code can adversely affect behavior: method " + property + ".");
+        },
+        writable: true,
+        enumerable: false,
+        configurable: true
+    });
+}
+
+
+/**
+ * Taints the given properties (and similarly named properties) by installing
+ * setters on Object.prototype that throw exceptions.
+ * @param {Array} properties an array of property names to taint
+ */
+function taintProperties(properties) {
+    properties.forEach(function (property) {
+        var adaptedProperties = [property, "__" + property, "_" + property, property + "_", property + "__"];
+        adaptedProperties.forEach(function (property) {
+            taintDataProperty(Object.prototype, property);
+        });
+    });
+}
+
+
+/**
+ * Taints the Array object by creating a setter for the property "0" and
+ * replacing some key methods with functions that throw exceptions.
+ */
+function taintArray() {
+    taintDataProperty(Array.prototype, "0");
+    taintMethod(Array.prototype, "indexOf");
+    taintMethod(Array.prototype, "join");
+    taintMethod(Array.prototype, "push");
+    taintMethod(Array.prototype, "slice");
+    taintMethod(Array.prototype, "sort");
+}
+
+
+// auxiliary data for getLocaleSupportInfo
+var languages = ["zh", "es", "en", "hi", "ur", "ar", "ja", "pa"];
+var scripts = ["Latn", "Hans", "Deva", "Arab", "Jpan", "Hant"];
+var countries = ["CN", "IN", "US", "PK", "JP", "TW", "HK", "SG"];
+var localeSupportInfo = {};
+
+
+/**
+ * Gets locale support info for the given constructor object, which must be one
+ * of Intl.Collator, Intl.NumberFormat, Intl.DateTimeFormat.
+ * @param {object} Constructor the constructor for which to get locale support info
+ * @return {object} locale support info with the following properties:
+ *     supported: array of fully supported language tags
+ *     byFallback: array of language tags that are supported through fallbacks
+ *     unsupported: array of unsupported language tags
+ */
+function getLocaleSupportInfo(Constructor) {
+    var constructorName = getConstructorName(Constructor);
+    if (localeSupportInfo[constructorName] !== undefined) {
+        return localeSupportInfo[constructorName];
+    }
+
+    var allTags = [];
+    var i, j, k;
+    var language, script, country;
+    for (i = 0; i < languages.length; i++) {
+        language = languages[i];
+        allTags.push(language);
+        for (j = 0; j < scripts.length; j++) {
+            script = scripts[j];
+            allTags.push(language + "-" + script);
+            for (k = 0; k < countries.length; k++) {
+                country = countries[k];
+                allTags.push(language + "-" + script + "-" + country);
+            }
+        }
+        for (k = 0; k < countries.length; k++) {
+            country = countries[k];
+            allTags.push(language + "-" + country);
+        }
+    }
+    
+    var supported = [];
+    var byFallback = [];
+    var unsupported = [];
+    for (i = 0; i < allTags.length; i++) {
+        var request = allTags[i];
+        var result = new Constructor([request], {localeMatcher: "lookup"}).resolvedOptions().locale;
+         if (request === result) {
+            supported.push(request);
+        } else if (request.indexOf(result) === 0) {
+            byFallback.push(request);
+        } else {
+            unsupported.push(request);
+        }
+    }
+    
+    localeSupportInfo[constructorName] = {
+        supported: supported,
+        byFallback: byFallback,
+        unsupported: unsupported
+    };
+    
+    return localeSupportInfo[constructorName];
+}
+        
+
+/**
+ * @description Tests whether locale is a String value representing a
+ * structurally valid and canonicalized BCP 47 language tag, as defined in
+ * sections 6.2.2 and 6.2.3 of the ECMAScript Internationalization API
+ * Specification.
+ * @param {String} locale the string to be tested.
+ * @result {Boolean} whether the test succeeded.
+ */
+function isCanonicalizedStructurallyValidLanguageTag(locale) {
+
+    /**
+     * Regular expression defining BCP 47 language tags.
+     *
+     * Spec: RFC 5646 section 2.1.
+     */
+    var alpha = "[a-zA-Z]",
+        digit = "[0-9]",
+        alphanum = "(" + alpha + "|" + digit + ")",
+        regular = "(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang)",
+        irregular = "(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)",
+        grandfathered = "(" + irregular + "|" + regular + ")",
+        privateuse = "(x(-[a-z0-9]{1,8})+)",
+        singleton = "(" + digit + "|[A-WY-Za-wy-z])",
+        extension = "(" + singleton + "(-" + alphanum + "{2,8})+)",
+        variant = "(" + alphanum + "{5,8}|(" + digit + alphanum + "{3}))",
+        region = "(" + alpha + "{2}|" + digit + "{3})",
+        script = "(" + alpha + "{4})",
+        extlang = "(" + alpha + "{3}(-" + alpha + "{3}){0,2})",
+        language = "(" + alpha + "{2,3}(-" + extlang + ")?|" + alpha + "{4}|" + alpha + "{5,8})",
+        langtag = language + "(-" + script + ")?(-" + region + ")?(-" + variant + ")*(-" + extension + ")*(-" + privateuse + ")?",
+        languageTag = "^(" + langtag + "|" + privateuse + "|" + grandfathered + ")$",
+        languageTagRE = new RegExp(languageTag, "i");
+    var duplicateSingleton = "-" + singleton + "-(.*-)?\\1(?!" + alphanum + ")",
+        duplicateSingletonRE = new RegExp(duplicateSingleton, "i"),
+        duplicateVariant = "(" + alphanum + "{2,8}-)+" + variant + "-(" + alphanum + "{2,8}-)*\\3(?!" + alphanum + ")",
+        duplicateVariantRE = new RegExp(duplicateVariant, "i");
+
+
+    /**
+     * Verifies that the given string is a well-formed BCP 47 language tag
+     * with no duplicate variant or singleton subtags.
+     *
+     * Spec: ECMAScript Internationalization API Specification, draft, 6.2.2.
+     */
+    function isStructurallyValidLanguageTag(locale) {
+        if (!languageTagRE.test(locale)) {
+            return false;
+        }
+        locale = locale.split(/-x-/)[0];
+        return !duplicateSingletonRE.test(locale) && !duplicateVariantRE.test(locale);
+    }
+
+
+    /**
+     * Mappings from complete tags to preferred values.
+     *
+     * Spec: IANA Language Subtag Registry.
+     */
+    var __tagMappings = {
+        // property names must be in lower case; values in canonical form
+
+        // grandfathered tags from IANA language subtag registry, file date 2011-08-25
+        "art-lojban": "jbo",
+        "cel-gaulish": "cel-gaulish",
+        "en-gb-oed": "en-GB-oed",
+        "i-ami": "ami",
+        "i-bnn": "bnn",
+        "i-default": "i-default",
+        "i-enochian": "i-enochian",
+        "i-hak": "hak",
+        "i-klingon": "tlh",
+        "i-lux": "lb",
+        "i-mingo": "i-mingo",
+        "i-navajo": "nv",
+        "i-pwn": "pwn",
+        "i-tao": "tao",
+        "i-tay": "tay",
+        "i-tsu": "tsu",
+        "no-bok": "nb",
+        "no-nyn": "nn",
+        "sgn-be-fr": "sfb",
+        "sgn-be-nl": "vgt",
+        "sgn-ch-de": "sgg",
+        "zh-guoyu": "cmn",
+        "zh-hakka": "hak",
+        "zh-min": "zh-min",
+        "zh-min-nan": "nan",
+        "zh-xiang": "hsn",
+        // deprecated redundant tags from IANA language subtag registry, file date 2011-08-25
+        "sgn-br": "bzs",
+        "sgn-co": "csn",
+        "sgn-de": "gsg",
+        "sgn-dk": "dsl",
+        "sgn-es": "ssp",
+        "sgn-fr": "fsl",
+        "sgn-gb": "bfi",
+        "sgn-gr": "gss",
+        "sgn-ie": "isg",
+        "sgn-it": "ise",
+        "sgn-jp": "jsl",
+        "sgn-mx": "mfs",
+        "sgn-ni": "ncs",
+        "sgn-nl": "dse",
+        "sgn-no": "nsl",
+        "sgn-pt": "psr",
+        "sgn-se": "swl",
+        "sgn-us": "ase",
+        "sgn-za": "sfs",
+        "zh-cmn": "cmn",
+        "zh-cmn-hans": "cmn-Hans",
+        "zh-cmn-hant": "cmn-Hant",
+        "zh-gan": "gan",
+        "zh-wuu": "wuu",
+        "zh-yue": "yue",
+        // deprecated variant with prefix from IANA language subtag registry, file date 2011-08-25
+        "ja-latn-hepburn-heploc": "ja-Latn-alalc97"
+    };
+
+
+    /**
+     * Mappings from non-extlang subtags to preferred values.
+     *
+     * Spec: IANA Language Subtag Registry.
+     */
+    var __subtagMappings = {
+        // property names and values must be in canonical case
+        // language subtags with Preferred-Value mappings from IANA language subtag registry, file date 2011-08-25
+        "in": "id",
+        "iw": "he",
+        "ji": "yi",
+        "jw": "jv",
+        "mo": "ro",
+        "ayx": "nun",
+        "cjr": "mom",
+        "cmk": "xch",
+        "drh": "khk",
+        "drw": "prs",
+        "gav": "dev",
+        "mst": "mry",
+        "myt": "mry",
+        "tie": "ras",
+        "tkk": "twm",
+        "tnf": "prs",
+        // region subtags with Preferred-Value mappings from IANA language subtag registry, file date 2011-08-25
+        "BU": "MM",
+        "DD": "DE",
+        "FX": "FR",
+        "TP": "TL",
+        "YD": "YE",
+        "ZR": "CD"
+    };
+
+
+    /**
+     * Mappings from extlang subtags to preferred values.
+     *
+     * Spec: IANA Language Subtag Registry.
+     */
+    var __extlangMappings = {
+        // extlang subtags with Preferred-Value mappings from IANA language subtag registry, file date 2011-08-25
+        // values are arrays with [0] the replacement value, [1] (if present) the prefix to be removed
+        "aao": ["aao", "ar"],
+        "abh": ["abh", "ar"],
+        "abv": ["abv", "ar"],
+        "acm": ["acm", "ar"],
+        "acq": ["acq", "ar"],
+        "acw": ["acw", "ar"],
+        "acx": ["acx", "ar"],
+        "acy": ["acy", "ar"],
+        "adf": ["adf", "ar"],
+        "ads": ["ads", "sgn"],
+        "aeb": ["aeb", "ar"],
+        "aec": ["aec", "ar"],
+        "aed": ["aed", "sgn"],
+        "aen": ["aen", "sgn"],
+        "afb": ["afb", "ar"],
+        "afg": ["afg", "sgn"],
+        "ajp": ["ajp", "ar"],
+        "apc": ["apc", "ar"],
+        "apd": ["apd", "ar"],
+        "arb": ["arb", "ar"],
+        "arq": ["arq", "ar"],
+        "ars": ["ars", "ar"],
+        "ary": ["ary", "ar"],
+        "arz": ["arz", "ar"],
+        "ase": ["ase", "sgn"],
+        "asf": ["asf", "sgn"],
+        "asp": ["asp", "sgn"],
+        "asq": ["asq", "sgn"],
+        "asw": ["asw", "sgn"],
+        "auz": ["auz", "ar"],
+        "avl": ["avl", "ar"],
+        "ayh": ["ayh", "ar"],
+        "ayl": ["ayl", "ar"],
+        "ayn": ["ayn", "ar"],
+        "ayp": ["ayp", "ar"],
+        "bbz": ["bbz", "ar"],
+        "bfi": ["bfi", "sgn"],
+        "bfk": ["bfk", "sgn"],
+        "bjn": ["bjn", "ms"],
+        "bog": ["bog", "sgn"],
+        "bqn": ["bqn", "sgn"],
+        "bqy": ["bqy", "sgn"],
+        "btj": ["btj", "ms"],
+        "bve": ["bve", "ms"],
+        "bvl": ["bvl", "sgn"],
+        "bvu": ["bvu", "ms"],
+        "bzs": ["bzs", "sgn"],
+        "cdo": ["cdo", "zh"],
+        "cds": ["cds", "sgn"],
+        "cjy": ["cjy", "zh"],
+        "cmn": ["cmn", "zh"],
+        "coa": ["coa", "ms"],
+        "cpx": ["cpx", "zh"],
+        "csc": ["csc", "sgn"],
+        "csd": ["csd", "sgn"],
+        "cse": ["cse", "sgn"],
+        "csf": ["csf", "sgn"],
+        "csg": ["csg", "sgn"],
+        "csl": ["csl", "sgn"],
+        "csn": ["csn", "sgn"],
+        "csq": ["csq", "sgn"],
+        "csr": ["csr", "sgn"],
+        "czh": ["czh", "zh"],
+        "czo": ["czo", "zh"],
+        "doq": ["doq", "sgn"],
+        "dse": ["dse", "sgn"],
+        "dsl": ["dsl", "sgn"],
+        "dup": ["dup", "ms"],
+        "ecs": ["ecs", "sgn"],
+        "esl": ["esl", "sgn"],
+        "esn": ["esn", "sgn"],
+        "eso": ["eso", "sgn"],
+        "eth": ["eth", "sgn"],
+        "fcs": ["fcs", "sgn"],
+        "fse": ["fse", "sgn"],
+        "fsl": ["fsl", "sgn"],
+        "fss": ["fss", "sgn"],
+        "gan": ["gan", "zh"],
+        "gom": ["gom", "kok"],
+        "gse": ["gse", "sgn"],
+        "gsg": ["gsg", "sgn"],
+        "gsm": ["gsm", "sgn"],
+        "gss": ["gss", "sgn"],
+        "gus": ["gus", "sgn"],
+        "hab": ["hab", "sgn"],
+        "haf": ["haf", "sgn"],
+        "hak": ["hak", "zh"],
+        "hds": ["hds", "sgn"],
+        "hji": ["hji", "ms"],
+        "hks": ["hks", "sgn"],
+        "hos": ["hos", "sgn"],
+        "hps": ["hps", "sgn"],
+        "hsh": ["hsh", "sgn"],
+        "hsl": ["hsl", "sgn"],
+        "hsn": ["hsn", "zh"],
+        "icl": ["icl", "sgn"],
+        "ils": ["ils", "sgn"],
+        "inl": ["inl", "sgn"],
+        "ins": ["ins", "sgn"],
+        "ise": ["ise", "sgn"],
+        "isg": ["isg", "sgn"],
+        "isr": ["isr", "sgn"],
+        "jak": ["jak", "ms"],
+        "jax": ["jax", "ms"],
+        "jcs": ["jcs", "sgn"],
+        "jhs": ["jhs", "sgn"],
+        "jls": ["jls", "sgn"],
+        "jos": ["jos", "sgn"],
+        "jsl": ["jsl", "sgn"],
+        "jus": ["jus", "sgn"],
+        "kgi": ["kgi", "sgn"],
+        "knn": ["knn", "kok"],
+        "kvb": ["kvb", "ms"],
+        "kvk": ["kvk", "sgn"],
+        "kvr": ["kvr", "ms"],
+        "kxd": ["kxd", "ms"],
+        "lbs": ["lbs", "sgn"],
+        "lce": ["lce", "ms"],
+        "lcf": ["lcf", "ms"],
+        "liw": ["liw", "ms"],
+        "lls": ["lls", "sgn"],
+        "lsg": ["lsg", "sgn"],
+        "lsl": ["lsl", "sgn"],
+        "lso": ["lso", "sgn"],
+        "lsp": ["lsp", "sgn"],
+        "lst": ["lst", "sgn"],
+        "lsy": ["lsy", "sgn"],
+        "ltg": ["ltg", "lv"],
+        "lvs": ["lvs", "lv"],
+        "lzh": ["lzh", "zh"],
+        "max": ["max", "ms"],
+        "mdl": ["mdl", "sgn"],
+        "meo": ["meo", "ms"],
+        "mfa": ["mfa", "ms"],
+        "mfb": ["mfb", "ms"],
+        "mfs": ["mfs", "sgn"],
+        "min": ["min", "ms"],
+        "mnp": ["mnp", "zh"],
+        "mqg": ["mqg", "ms"],
+        "mre": ["mre", "sgn"],
+        "msd": ["msd", "sgn"],
+        "msi": ["msi", "ms"],
+        "msr": ["msr", "sgn"],
+        "mui": ["mui", "ms"],
+        "mzc": ["mzc", "sgn"],
+        "mzg": ["mzg", "sgn"],
+        "mzy": ["mzy", "sgn"],
+        "nan": ["nan", "zh"],
+        "nbs": ["nbs", "sgn"],
+        "ncs": ["ncs", "sgn"],
+        "nsi": ["nsi", "sgn"],
+        "nsl": ["nsl", "sgn"],
+        "nsp": ["nsp", "sgn"],
+        "nsr": ["nsr", "sgn"],
+        "nzs": ["nzs", "sgn"],
+        "okl": ["okl", "sgn"],
+        "orn": ["orn", "ms"],
+        "ors": ["ors", "ms"],
+        "pel": ["pel", "ms"],
+        "pga": ["pga", "ar"],
+        "pks": ["pks", "sgn"],
+        "prl": ["prl", "sgn"],
+        "prz": ["prz", "sgn"],
+        "psc": ["psc", "sgn"],
+        "psd": ["psd", "sgn"],
+        "pse": ["pse", "ms"],
+        "psg": ["psg", "sgn"],
+        "psl": ["psl", "sgn"],
+        "pso": ["pso", "sgn"],
+        "psp": ["psp", "sgn"],
+        "psr": ["psr", "sgn"],
+        "pys": ["pys", "sgn"],
+        "rms": ["rms", "sgn"],
+        "rsi": ["rsi", "sgn"],
+        "rsl": ["rsl", "sgn"],
+        "sdl": ["sdl", "sgn"],
+        "sfb": ["sfb", "sgn"],
+        "sfs": ["sfs", "sgn"],
+        "sgg": ["sgg", "sgn"],
+        "sgx": ["sgx", "sgn"],
+        "shu": ["shu", "ar"],
+        "slf": ["slf", "sgn"],
+        "sls": ["sls", "sgn"],
+        "sqs": ["sqs", "sgn"],
+        "ssh": ["ssh", "ar"],
+        "ssp": ["ssp", "sgn"],
+        "ssr": ["ssr", "sgn"],
+        "svk": ["svk", "sgn"],
+        "swc": ["swc", "sw"],
+        "swh": ["swh", "sw"],
+        "swl": ["swl", "sgn"],
+        "syy": ["syy", "sgn"],
+        "tmw": ["tmw", "ms"],
+        "tse": ["tse", "sgn"],
+        "tsm": ["tsm", "sgn"],
+        "tsq": ["tsq", "sgn"],
+        "tss": ["tss", "sgn"],
+        "tsy": ["tsy", "sgn"],
+        "tza": ["tza", "sgn"],
+        "ugn": ["ugn", "sgn"],
+        "ugy": ["ugy", "sgn"],
+        "ukl": ["ukl", "sgn"],
+        "uks": ["uks", "sgn"],
+        "urk": ["urk", "ms"],
+        "uzn": ["uzn", "uz"],
+        "uzs": ["uzs", "uz"],
+        "vgt": ["vgt", "sgn"],
+        "vkk": ["vkk", "ms"],
+        "vkt": ["vkt", "ms"],
+        "vsi": ["vsi", "sgn"],
+        "vsl": ["vsl", "sgn"],
+        "vsv": ["vsv", "sgn"],
+        "wuu": ["wuu", "zh"],
+        "xki": ["xki", "sgn"],
+        "xml": ["xml", "sgn"],
+        "xmm": ["xmm", "ms"],
+        "xms": ["xms", "sgn"],
+        "yds": ["yds", "sgn"],
+        "ysl": ["ysl", "sgn"],
+        "yue": ["yue", "zh"],
+        "zib": ["zib", "sgn"],
+        "zlm": ["zlm", "ms"],
+        "zmi": ["zmi", "ms"],
+        "zsl": ["zsl", "sgn"],
+        "zsm": ["zsm", "ms"]
+    };
+
+
+    /**
+     * Canonicalizes the given well-formed BCP 47 language tag, including regularized case of subtags.
+     *
+     * Spec: ECMAScript Internationalization API Specification, draft, 6.2.3.
+     * Spec: RFC 5646, section 4.5.
+     */
+    function canonicalizeLanguageTag(locale) {
+
+        // start with lower case for easier processing, and because most subtags will need to be lower case anyway
+        locale = locale.toLowerCase();
+
+        // handle mappings for complete tags
+        if (__tagMappings.hasOwnProperty(locale)) {
+            return __tagMappings[locale];
+        }
+
+        var subtags = locale.split("-");
+        var i = 0;
+
+        // handle standard part: all subtags before first singleton or "x"
+        while (i < subtags.length) {
+            var subtag = subtags[i];
+            if (subtag.length === 1 && (i > 0 || subtag === "x")) {
+                break;
+            } else if (i !== 0 && subtag.length === 2) {
+                subtag = subtag.toUpperCase();
+            } else if (subtag.length === 4) {
+                subtag = subtag[0].toUpperCase() + subtag.substring(1).toLowerCase();
+            }
+            if (__subtagMappings.hasOwnProperty(subtag)) {
+                subtag = __subtagMappings[subtag];
+            } else if (__extlangMappings.hasOwnProperty(subtag)) {
+                subtag = __extlangMappings[subtag][0];
+                if (i === 1 && __extlangMappings[subtag][1] === subtags[0]) {
+                    subtags.shift();
+                    i--;
+                }
+            }
+            subtags[i] = subtag;
+            i++;
+        }
+        var normal = subtags.slice(0, i).join("-");
+
+        // handle extensions
+        var extensions = [];
+        while (i < subtags.length && subtags[i] !== "x") {
+            var extensionStart = i;
+            i++;
+            while (i < subtags.length && subtags[i].length > 1) {
+                i++;
+            }
+            var extension = subtags.slice(extensionStart, i).join("-");
+            extensions.push(extension);
+        }
+        extensions.sort();
+
+        // handle private use
+        var privateUse;
+        if (i < subtags.length) {
+            privateUse = subtags.slice(i).join("-");
+        }
+
+        // put everything back together
+        var canonical = normal;
+        if (extensions.length > 0) {
+            canonical += "-" + extensions.join("-");
+        }
+        if (privateUse !== undefined) {
+            if (canonical.length > 0) {
+                canonical += "-" + privateUse;
+            } else {
+                canonical = privateUse;
+            }
+        }
+
+        return canonical;
+    }
+
+    return typeof locale === "string" && isStructurallyValidLanguageTag(locale) &&
+            canonicalizeLanguageTag(locale) === locale;
+}
+
+
+/**
+ * Tests whether the named options property is correctly handled by the given constructor.
+ * @param {object} Constructor the constructor to test.
+ * @param {string} property the name of the options property to test.
+ * @param {string} type the type that values of the property are expected to have
+ * @param {Array} [values] an array of allowed values for the property. Not needed for boolean.
+ * @param {any} fallback the fallback value that the property assumes if not provided.
+ * @param {object} testOptions additional options:
+ *     @param {boolean} isOptional whether support for this property is optional for implementations.
+ *     @param {boolean} noReturn whether the resulting value of the property is not returned.
+ *     @param {boolean} isILD whether the resulting value of the property is implementation and locale dependent.
+ *     @param {object} extra additional option to pass along, properties are value -> {option: value}.
+ * @return {boolean} whether the test succeeded.
+ */
+function testOption(Constructor, property, type, values, fallback, testOptions) {
+    var isOptional = testOptions !== undefined && testOptions.isOptional === true;
+    var noReturn = testOptions !== undefined && testOptions.noReturn === true;
+    var isILD = testOptions !== undefined && testOptions.isILD === true;
+    
+    function addExtraOptions(options, value, testOptions) {
+        if (testOptions !== undefined && testOptions.extra !== undefined) {
+            var extra;
+            if (value !== undefined && testOptions.extra[value] !== undefined) {
+                extra = testOptions.extra[value];
+            } else if (testOptions.extra.any !== undefined) {
+                extra = testOptions.extra.any;
+            }
+            if (extra !== undefined) {
+                Object.getOwnPropertyNames(extra).forEach(function (prop) {
+                    options[prop] = extra[prop];
+                });
+            }
+        }
+    }
+
+    var testValues, options, obj, expected, actual, error;
+
+    // test that the specified values are accepted. Also add values that convert to specified values.
+    if (type === "boolean") {
+        if (values === undefined) {
+            values = [true, false];
+        }
+        testValues = values.slice(0);
+        testValues.push(888);
+        testValues.push(0);
+    } else if (type === "string") {
+        testValues = values.slice(0);
+        testValues.push({toString: function () { return values[0]; }});
+    }
+    testValues.forEach(function (value) {
+        options = {};
+        options[property] = value;
+        addExtraOptions(options, value, testOptions);
+        obj = new Constructor(undefined, options);
+        if (noReturn) {
+            if (obj.resolvedOptions().hasOwnProperty(property)) {
+                $ERROR("Option property " + property + " is returned, but shouldn't be.");
+            }
+        } else {
+            actual = obj.resolvedOptions()[property];
+            if (isILD) {
+                if (actual !== undefined && values.indexOf(actual) === -1) {
+                    $ERROR("Invalid value " + actual + " returned for property " + property + ".");
+                }
+            } else {
+                if (type === "boolean") {
+                    expected = Boolean(value);
+                } else if (type === "string") {
+                    expected = String(value);
+                }
+                if (actual !== expected && !(isOptional && actual === undefined)) {
+                    $ERROR("Option value " + value + " for property " + property +
+                        " was not accepted; got " + actual + " instead.");
+                }
+            }
+        }
+    });
+
+    // test that invalid values are rejected
+    if (type === "string") {
+        var invalidValues = ["invalidValue", -1, null];
+        // assume that we won't have values in caseless scripts
+        if (values[0].toUpperCase() !== values[0]) {
+            invalidValues.push(values[0].toUpperCase());
+        } else {
+            invalidValues.push(values[0].toLowerCase());
+        }
+        invalidValues.forEach(function (value) {
+            options = {};
+            options[property] = value;
+            addExtraOptions(options, value, testOptions);
+            error = undefined;
+            try {
+                obj = new Constructor(undefined, options);
+            } catch (e) {
+                error = e;
+            }
+            if (error === undefined) {
+                $ERROR("Invalid option value " + value + " for property " + property + " was not rejected.");
+            } else if (error.name !== "RangeError") {
+                $ERROR("Invalid option value " + value + " for property " + property + " was rejected with wrong error " + error.name + ".");
+            }
+        });
+    }
+
+    // test that fallback value or another valid value is used if no options value is provided
+    if (!noReturn) {
+        options = {};
+        addExtraOptions(options, undefined, testOptions);
+        obj = new Constructor(undefined, options);
+        actual = obj.resolvedOptions()[property];
+        if (!(isOptional && actual === undefined)) {
+            if (fallback !== undefined) {
+                if (actual !== fallback) {
+                    $ERROR("Option fallback value " + fallback + " for property " + property +
+                        " was not used; got " + actual + " instead.");
+                }
+            } else {
+                if (values.indexOf(actual) === -1 && !(isILD && actual === undefined)) {
+                    $ERROR("Invalid value " + actual + " returned for property " + property + ".");
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+
+/**
+ * Tests whether the named property of the given object has a valid value
+ * and the default attributes of the properties of an object literal.
+ * @param {Object} obj the object to be tested.
+ * @param {string} property the name of the property
+ * @param {Function|Array} valid either a function that tests value for validity and returns a boolean,
+ *     an array of valid values.
+ * @exception if the property has an invalid value.
+ */
+function testProperty(obj, property, valid) {
+    var desc = Object.getOwnPropertyDescriptor(obj, property);
+    if (!desc.writable) {
+        $ERROR("Property " + property + " must be writable.");
+    }
+    if (!desc.enumerable) {
+        $ERROR("Property " + property + " must be enumerable.");
+    }
+    if (!desc.configurable) {
+        $ERROR("Property " + property + " must be configurable.");
+    }
+    var value = desc.value;
+    var isValid = (typeof valid === "function") ? valid(value) : (valid.indexOf(value) !== -1);
+    if (!isValid) {
+        $ERROR("Property value " + value + " is not allowed for property " + property + ".");
+    }
+}
+
+
+/**
+ * Tests whether the named property of the given object, if present at all, has a valid value
+ * and the default attributes of the properties of an object literal.
+ * @param {Object} obj the object to be tested.
+ * @param {string} property the name of the property
+ * @param {Function|Array} valid either a function that tests value for validity and returns a boolean,
+ *     an array of valid values.
+ * @exception if the property is present and has an invalid value.
+ */
+function mayHaveProperty(obj, property, valid) {
+    if (obj.hasOwnProperty(property)) {
+        testProperty(obj, property, valid);
+    }
+}
+
+
+/**
+ * Tests whether the given object has the named property with a valid value
+ * and the default attributes of the properties of an object literal.
+ * @param {Object} obj the object to be tested.
+ * @param {string} property the name of the property
+ * @param {Function|Array} valid either a function that tests value for validity and returns a boolean,
+ *     an array of valid values.
+ * @exception if the property is missing or has an invalid value.
+ */
+function mustHaveProperty(obj, property, valid) {
+    if (!obj.hasOwnProperty(property)) {
+        $ERROR("Object is missing property " + property + ".");
+    }
+    testProperty(obj, property, valid);
+}
+
+
+/**
+ * Tests whether the given object does not have the named property.
+ * @param {Object} obj the object to be tested.
+ * @param {string} property the name of the property
+ * @exception if the property is present.
+ */
+function mustNotHaveProperty(obj, property) {
+    if (obj.hasOwnProperty(property)) {
+        $ERROR("Object has property it mustn't have: " + property + ".");
+    }
+}
+
+
+/**
+ * Properties of the RegExp constructor that may be affected by use of regular
+ * expressions, and the default values of these properties. Properties are from
+ * https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Deprecated_and_obsolete_features#RegExp_Properties
+ */
+var regExpProperties = ["$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8", "$9",
+    "$_", "$*", "$&", "$+", "$`", "$'",
+    "input", "lastMatch", "lastParen", "leftContext", "rightContext"
+];
+
+var regExpPropertiesDefaultValues = (function () {
+    var values = Object.create(null);
+    regExpProperties.forEach(function (property) {
+        values[property] = RegExp[property];
+    });
+    return values;
+}());
+
+
+/**
+ * Tests that executing the provided function (which may use regular expressions
+ * in its implementation) does not create or modify unwanted properties on the
+ * RegExp constructor.
+ */
+function testForUnwantedRegExpChanges(testFunc) {
+    regExpProperties.forEach(function (property) {
+        RegExp[property] = regExpPropertiesDefaultValues[property];
+    });
+    testFunc();
+    regExpProperties.forEach(function (property) {
+        if (RegExp[property] !== regExpPropertiesDefaultValues[property]) {
+            $ERROR("RegExp has unexpected property " + property + " with value " +
+                RegExp[property] + ".");
+        }
+    });
+}
+
+
+/**
+ * Tests whether name is a valid BCP 47 numbering system name
+ * and not excluded from use in the ECMAScript Internationalization API.
+ * @param {string} name the name to be tested.
+ * @return {boolean} whether name is a valid BCP 47 numbering system name and
+ *     allowed for use in the ECMAScript Internationalization API.
+ */
+
+function isValidNumberingSystem(name) {
+    
+    // source: CLDR file common/bcp47/number.xml; version CLDR 21.
+    var numberingSystems = [
+        "arab",
+        "arabext",
+        "armn",
+        "armnlow",
+        "bali",
+        "beng",
+        "brah",
+        "cakm",
+        "cham",
+        "deva",
+        "ethi",
+        "finance",
+        "fullwide",
+        "geor",
+        "grek",
+        "greklow",
+        "gujr",
+        "guru",
+        "hanidec",
+        "hans",
+        "hansfin",
+        "hant",
+        "hantfin",
+        "hebr",
+        "java",
+        "jpan",
+        "jpanfin",
+        "kali",
+        "khmr",
+        "knda",
+        "osma",            
+        "lana",
+        "lanatham",
+        "laoo",
+        "latn",
+        "lepc",
+        "limb",
+        "mlym",
+        "mong",
+        "mtei",
+        "mymr",
+        "mymrshan",
+        "native",
+        "nkoo",
+        "olck",
+        "orya",
+        "roman",
+        "romanlow",
+        "saur",
+        "shrd",
+        "sora",
+        "sund",
+        "talu",
+        "takr",
+        "taml",
+        "tamldec",
+        "telu",
+        "thai",
+        "tibt",
+        "traditio",
+        "vaii"
+    ];
+    
+    var excluded = [
+        "finance",
+        "native",
+        "traditio"
+    ];
+        
+    
+    return numberingSystems.indexOf(name) !== -1 && excluded.indexOf(name) === -1;
+}
+
+
+/**
+ * Provides the digits of numbering systems with simple digit mappings,
+ * as specified in 11.3.2.
+ */
+
+var numberingSystemDigits = {
+    arab: "٠١٢٣٤٥٦٧٨٩",
+    arabext: "۰۱۲۳۴۵۶۷۸۹",
+    beng: "০১২৩৪৫৬৭৮৯",
+    deva: "०१२३४५६७८९",
+    fullwide: "０１２３４５６７８９",
+    gujr: "૦૧૨૩૪૫૬૭૮૯",
+    guru: "੦੧੨੩੪੫੬੭੮੯",
+    hanidec: "〇一二三四五六七八九",
+    khmr: "០១២៣៤៥៦៧៨៩",
+    knda: "೦೧೨೩೪೫೬೭೮೯",
+    laoo: "໐໑໒໓໔໕໖໗໘໙",
+    latn: "0123456789",
+    mlym: "൦൧൨൩൪൫൬൭൮൯",
+    mong: "᠐᠑᠒᠓᠔᠕᠖᠗᠘᠙",
+    mymr: "၀၁၂၃၄၅၆၇၈၉",
+    orya: "୦୧୨୩୪୫୬୭୮୯",
+    tamldec: "௦௧௨௩௪௫௬௭௮௯",
+    telu: "౦౧౨౩౪౫౬౭౮౯",
+    thai: "๐๑๒๓๔๕๖๗๘๙",
+    tibt: "༠༡༢༣༤༥༦༧༨༩"
+};
+
+
+/**
+ * Tests that number formatting is handled correctly. The function checks that the
+ * digit sequences in formatted output are as specified, converted to the
+ * selected numbering system, and embedded in consistent localized patterns.
+ * @param {Array} locales the locales to be tested.
+ * @param {Array} numberingSystems the numbering systems to be tested.
+ * @param {Object} options the options to pass to Intl.NumberFormat. Options
+ *     must include {useGrouping: false}, and must cause 1.1 to be formatted
+ *     pre- and post-decimal digits.
+ * @param {Object} testData maps input data (in ES5 9.3.1 format) to expected output strings
+ *     in unlocalized format with Western digits.
+ */
+
+function testNumberFormat(locales, numberingSystems, options, testData) {
+    locales.forEach(function (locale) {
+        numberingSystems.forEach(function (numbering) {
+            var digits = numberingSystemDigits[numbering];
+            var format = new Intl.NumberFormat([locale + "-u-nu-" + numbering], options);
+    
+            function getPatternParts(positive) {
+                var n = positive ? 1.1 : -1.1;
+                var formatted = format.format(n);
+                var oneoneRE = "([^" + digits + "]*)[" + digits + "]+([^" + digits + "]+)[" + digits + "]+([^" + digits + "]*)";
+                var match = formatted.match(new RegExp(oneoneRE));
+                if (match === null) {
+                    $ERROR("Unexpected formatted " + n + " for " +
+                        format.resolvedOptions().locale + " and options " +
+                        JSON.stringify(options) + ": " + formatted);
+                }
+                return match;
+            }
+            
+            function toNumbering(raw) {
+                return raw.replace(/[0-9]/g, function (digit) {
+                    return digits[digit.charCodeAt(0) - "0".charCodeAt(0)];
+                });
+            }
+            
+            function buildExpected(raw, patternParts) {
+                var period = raw.indexOf(".");
+                if (period === -1) {
+                    return patternParts[1] + toNumbering(raw) + patternParts[3];
+                } else {
+                    return patternParts[1] + 
+                        toNumbering(raw.substring(0, period)) +
+                        patternParts[2] +
+                        toNumbering(raw.substring(period + 1)) +
+                        patternParts[3];
+                }
+            }
+            
+            if (format.resolvedOptions().numberingSystem === numbering) {
+                // figure out prefixes, infixes, suffixes for positive and negative values
+                var posPatternParts = getPatternParts(true);
+                var negPatternParts = getPatternParts(false);
+                
+                Object.getOwnPropertyNames(testData).forEach(function (input) {
+                    var rawExpected = testData[input];
+                    var patternParts;
+                    if (rawExpected[0] === "-") {
+                        patternParts = negPatternParts;
+                        rawExpected = rawExpected.substring(1);
+                    } else {
+                        patternParts = posPatternParts;
+                    }
+                    var expected = buildExpected(rawExpected, patternParts);
+                    var actual = format.format(input);
+                    if (actual !== expected) {
+                        $ERROR("Formatted value for " + input + ", " +
+                        format.resolvedOptions().locale + " and options " +
+                        JSON.stringify(options) + " is " + actual + "; expected " + expected + ".");
+                    }
+                });
+            }
+        });
+    });
+}
+
+
+/**
+ * Return the components of date-time formats.
+ * @return {Array} an array with all date-time components.
+ */
+
+function getDateTimeComponents() {
+    return ["weekday", "era", "year", "month", "day", "hour", "minute", "second", "timeZoneName"];
+}
+
+
+/**
+ * Return the valid values for the given date-time component, as specified
+ * by the table in section 12.1.1.
+ * @param {string} component a date-time component.
+ * @return {Array} an array with the valid values for the component.
+ */
+
+function getDateTimeComponentValues(component) {
+    
+    var components = {
+        weekday: ["narrow", "short", "long"],
+        era: ["narrow", "short", "long"],
+        year: ["2-digit", "numeric"],
+        month: ["2-digit", "numeric", "narrow", "short", "long"],
+        day: ["2-digit", "numeric"],
+        hour: ["2-digit", "numeric"],
+        minute: ["2-digit", "numeric"],
+        second: ["2-digit", "numeric"],
+        timeZoneName: ["short", "long"]
+    };
+    
+    var result = components[component];
+    if (result === undefined) {
+        $ERROR("Internal error: No values defined for date-time component " + component + ".");
+    }
+    return result;
+}
+
+
+/**
+ * Tests that the given value is valid for the given date-time component.
+ * @param {string} component a date-time component.
+ * @param {string} value the value to be tested.
+ * @return {boolean} true if the test succeeds.
+ * @exception if the test fails.
+ */
+
+function testValidDateTimeComponentValue(component, value) {
+    if (getDateTimeComponentValues(component).indexOf(value) === -1) {
+        $ERROR("Invalid value " + value + " for date-time component " + component + ".");
+    }
+    return true;
+}
+
+
+/**
+ * Verifies that the actual array matches the expected one in length, elements,
+ * and element order.
+ * @param {Array} expected the expected array.
+ * @param {Array} actual the actual array.
+ * @return {boolean} true if the test succeeds.
+ * @exception if the test fails.
+ */
+function testArraysAreSame(expected, actual) {
+    for (i = 0; i < Math.max(actual.length, expected.length); i++) {
+        if (actual[i] !== expected[i]) {
+            $ERROR("Result array element at index " + i + " should be \"" +
+                expected[i] + "\" but is \"" + actual[i] + "\".");
+        }
+    }
+    return true;
+}
+

From f79e34d84fdb517b4cd17fbb1a1096bdb10f91d6 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 5 Apr 2013 21:19:10 -0700
Subject: [PATCH 125/438] Bug 858677 - Make the internal deletion operations
 not take a strictness argument and a Value*, but rather take a JSBool* -- and
 let callers handle the property-couldn't-be-deleted (but no error occurred)
 case.  r=jorendorff

---
 js/src/builtin/Intl.cpp                       |   8 +-
 js/src/builtin/MapObject.cpp                  |   8 +-
 js/src/builtin/Module.cpp                     |   2 +-
 js/src/builtin/ParallelArray.cpp              |   4 +-
 js/src/builtin/TestingFunctions.cpp           |   2 +-
 js/src/gdb/gdb-tests.cpp                      |   2 +-
 js/src/ion/AsmJS.cpp                          |   2 +-
 js/src/jit-test/tests/basic/bug821850.js      |   2 +-
 .../jit-test/tests/basic/delete-non-config.js |   3 +-
 .../jsapi-tests/testAddPropertyPropcache.cpp  |   2 +-
 .../testCallNonGenericMethodOnProxy.cpp       |   2 +-
 js/src/jsapi-tests/testChromeBuffer.cpp       |   2 +-
 js/src/jsapi-tests/testClassGetter.cpp        |   2 +-
 js/src/jsapi-tests/testCustomIterator.cpp     |   2 +-
 js/src/jsapi-tests/testLookup.cpp             |   4 +-
 js/src/jsapi-tests/testNewObject.cpp          |   2 +-
 .../testObjectEmulatingUndefined.cpp          |   2 +-
 js/src/jsapi-tests/testOps.cpp                |   2 +-
 js/src/jsapi-tests/testProfileStrings.cpp     |   2 +-
 js/src/jsapi-tests/testPropCache.cpp          |   2 +-
 js/src/jsapi-tests/testResolveRecursion.cpp   |   4 +-
 js/src/jsapi-tests/tests.h                    |   2 +-
 js/src/jsapi.cpp                              |  34 ++--
 js/src/jsapi.h                                |  31 ++-
 js/src/jsarray.cpp                            | 187 ++++++++++++------
 js/src/jsbool.cpp                             |   5 +-
 js/src/jsclass.h                              |   8 +-
 js/src/jscntxtinlines.h                       |  10 +
 js/src/jsdate.cpp                             |   2 +-
 js/src/jsexn.cpp                              |   2 +-
 js/src/jsfun.cpp                              |   2 +-
 js/src/jsinterp.cpp                           |  76 ++++---
 js/src/jsiter.cpp                             |   8 +-
 js/src/jsmath.cpp                             |   2 +-
 js/src/jsnum.cpp                              |   2 +-
 js/src/jsobj.cpp                              |  55 +++---
 js/src/jsobj.h                                |  18 +-
 js/src/jsobjinlines.h                         |  17 +-
 js/src/json.cpp                               |   8 +-
 js/src/jsproxy.cpp                            |  33 ++--
 js/src/jsstr.cpp                              |   2 +-
 js/src/jstypedarray.cpp                       |  47 +++--
 js/src/jstypedarray.h                         |  15 +-
 js/src/jsweakmap.cpp                          |   2 +-
 js/src/methodjit/StubCalls.cpp                |  33 +++-
 js/src/perf/jsperf.cpp                        |   2 +-
 js/src/shell/js.cpp                           |  25 ++-
 .../reverse-order-of-low-high-accesses.js     |  88 +++++++++
 js/src/vm/ArgumentsObject.cpp                 |  11 +-
 js/src/vm/Debugger.cpp                        |  18 +-
 js/src/vm/GlobalObject.cpp                    |   2 +-
 js/src/vm/RegExpObject.cpp                    |   2 +-
 js/src/vm/RegExpStatics.cpp                   |   2 +-
 js/src/vm/ScopeObject.cpp                     |  20 +-
 js/src/vm/SelfHosting.cpp                     |   2 +-
 55 files changed, 526 insertions(+), 308 deletions(-)
 create mode 100644 js/src/tests/ecma_5/Array/reverse-order-of-low-high-accesses.js

diff --git a/js/src/builtin/Intl.cpp b/js/src/builtin/Intl.cpp
index d3463125da23..6e22cc76f358 100644
--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/Intl.cpp
@@ -582,7 +582,7 @@ static Class CollatorClass = {
     js_Object_str,
     JSCLASS_HAS_RESERVED_SLOTS(COLLATOR_SLOTS_COUNT),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -1060,7 +1060,7 @@ static Class NumberFormatClass = {
     js_Object_str,
     JSCLASS_HAS_RESERVED_SLOTS(NUMBER_FORMAT_SLOTS_COUNT),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -1509,7 +1509,7 @@ static Class DateTimeFormatClass = {
     js_Object_str,
     JSCLASS_HAS_RESERVED_SLOTS(DATE_TIME_FORMAT_SLOTS_COUNT),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -1985,7 +1985,7 @@ Class js::IntlClass = {
     js_Object_str,
     JSCLASS_HAS_CACHED_PROTO(JSProto_Intl),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/builtin/MapObject.cpp b/js/src/builtin/MapObject.cpp
index 1f6258f49bcc..08100842e2a9 100644
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -873,7 +873,7 @@ Class js::MapIteratorClass = {
     JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(MapIteratorObject::SlotCount),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -1013,7 +1013,7 @@ Class MapObject::class_ = {
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_CACHED_PROTO(JSProto_Map),
     JS_PropertyStub,         // addProperty
-    JS_PropertyStub,         // delProperty
+    JS_DeletePropertyStub,   // delProperty
     JS_PropertyStub,         // getProperty
     JS_StrictPropertyStub,   // setProperty
     JS_EnumerateStub,
@@ -1446,7 +1446,7 @@ Class js::SetIteratorClass = {
     JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(SetIteratorObject::SlotCount),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -1556,7 +1556,7 @@ Class SetObject::class_ = {
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_CACHED_PROTO(JSProto_Set),
     JS_PropertyStub,         // addProperty
-    JS_PropertyStub,         // delProperty
+    JS_DeletePropertyStub,   // delProperty
     JS_PropertyStub,         // getProperty
     JS_StrictPropertyStub,   // setProperty
     JS_EnumerateStub,
diff --git a/js/src/builtin/Module.cpp b/js/src/builtin/Module.cpp
index d70ec483e11e..2aaf96508585 100644
--- a/js/src/builtin/Module.cpp
+++ b/js/src/builtin/Module.cpp
@@ -7,7 +7,7 @@ Class js::ModuleClass = {
     "Module",
     JSCLASS_HAS_RESERVED_SLOTS(2) | JSCLASS_IS_ANONYMOUS,
     JS_PropertyStub,        /* addProperty */
-    JS_PropertyStub,        /* delProperty */
+    JS_DeletePropertyStub,  /* delProperty */
     JS_PropertyStub,        /* getProperty */
     JS_StrictPropertyStub,  /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/builtin/ParallelArray.cpp b/js/src/builtin/ParallelArray.cpp
index c98771d047e4..04bcae9f3af5 100644
--- a/js/src/builtin/ParallelArray.cpp
+++ b/js/src/builtin/ParallelArray.cpp
@@ -53,7 +53,7 @@ Class ParallelArrayObject::protoClass = {
     "ParallelArray",
     JSCLASS_HAS_CACHED_PROTO(JSProto_ParallelArray),
     JS_PropertyStub,         // addProperty
-    JS_PropertyStub,         // delProperty
+    JS_DeletePropertyStub,   // delProperty
     JS_PropertyStub,         // getProperty
     JS_StrictPropertyStub,   // setProperty
     JS_EnumerateStub,
@@ -65,7 +65,7 @@ Class ParallelArrayObject::class_ = {
     "ParallelArray",
     JSCLASS_HAS_CACHED_PROTO(JSProto_ParallelArray),
     JS_PropertyStub,         // addProperty
-    JS_PropertyStub,         // delProperty
+    JS_DeletePropertyStub,   // delProperty
     JS_PropertyStub,         // getProperty
     JS_StrictPropertyStub,   // setProperty
     JS_EnumerateStub,
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index e5f65c3a221b..9f9a57adf906 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -750,7 +750,7 @@ finalize_counter_finalize(JSFreeOp *fop, JSObject *obj)
 static JSClass FinalizeCounterClass = {
     "FinalizeCounter", JSCLASS_IS_ANONYMOUS,
     JS_PropertyStub,       /* addProperty */
-    JS_PropertyStub,       /* delProperty */
+    JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
     JS_StrictPropertyStub, /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/gdb/gdb-tests.cpp b/js/src/gdb/gdb-tests.cpp
index a19ed1e4d2fd..a5ce25cf364d 100644
--- a/js/src/gdb/gdb-tests.cpp
+++ b/js/src/gdb/gdb-tests.cpp
@@ -13,7 +13,7 @@ using namespace JS;
 /* The class of the global object. */
 JSClass global_class = {
     "global", JSCLASS_GLOBAL_FLAGS,
-    JS_PropertyStub,  JS_PropertyStub, JS_PropertyStub,  JS_StrictPropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub, JS_PropertyStub,  JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
diff --git a/js/src/ion/AsmJS.cpp b/js/src/ion/AsmJS.cpp
index d268f1f922b8..b955bc5fd570 100644
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -2286,7 +2286,7 @@ static Class AsmJSModuleClass = {
     JSCLASS_IS_ANONYMOUS | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(ASM_CODE_NUM_RESERVED_SLOTS),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jit-test/tests/basic/bug821850.js b/js/src/jit-test/tests/basic/bug821850.js
index 7c7e45a4fff7..fb0819c7b661 100644
--- a/js/src/jit-test/tests/basic/bug821850.js
+++ b/js/src/jit-test/tests/basic/bug821850.js
@@ -6,4 +6,4 @@ assertThrowsInstanceOf(function() {"use strict"; delete m.p;}, TypeError);
 
 x = new Proxy(m, {})
 assertEq(x.p, 3);
-assertEq((function fun() {"use strict"; return delete x.p; })(), false);
+assertThrowsInstanceOf(function fun() {"use strict"; return delete x.p; }, TypeError);
diff --git a/js/src/jit-test/tests/basic/delete-non-config.js b/js/src/jit-test/tests/basic/delete-non-config.js
index afc7631007c0..da6020cad89b 100644
--- a/js/src/jit-test/tests/basic/delete-non-config.js
+++ b/js/src/jit-test/tests/basic/delete-non-config.js
@@ -1,5 +1,4 @@
 var a = [0,1,2,3,4,5,6,7,8,9,10];
 for (var i = 0; i < 10; i++)
-    delete a.length;
+    assertEq(delete a.length, false);
 assertEq(delete a.length, false);
-
diff --git a/js/src/jsapi-tests/testAddPropertyPropcache.cpp b/js/src/jsapi-tests/testAddPropertyPropcache.cpp
index be190df1824c..8c6979e38a39 100644
--- a/js/src/jsapi-tests/testAddPropertyPropcache.cpp
+++ b/js/src/jsapi-tests/testAddPropertyPropcache.cpp
@@ -24,7 +24,7 @@ JSClass addPropertyClass = {
     "AddPropertyTester",
     0,
     addProperty,
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsapi-tests/testCallNonGenericMethodOnProxy.cpp b/js/src/jsapi-tests/testCallNonGenericMethodOnProxy.cpp
index 1ccc9430b20a..6dec466c4cd3 100644
--- a/js/src/jsapi-tests/testCallNonGenericMethodOnProxy.cpp
+++ b/js/src/jsapi-tests/testCallNonGenericMethodOnProxy.cpp
@@ -10,7 +10,7 @@ static JSClass CustomClass = {
   "CustomClass",
   JSCLASS_HAS_RESERVED_SLOTS(1),
   JS_PropertyStub,
-  JS_PropertyStub,
+  JS_DeletePropertyStub,
   JS_PropertyStub,
   JS_StrictPropertyStub,
   JS_EnumerateStub,
diff --git a/js/src/jsapi-tests/testChromeBuffer.cpp b/js/src/jsapi-tests/testChromeBuffer.cpp
index d476d797b3d9..2ea62f7c33ea 100644
--- a/js/src/jsapi-tests/testChromeBuffer.cpp
+++ b/js/src/jsapi-tests/testChromeBuffer.cpp
@@ -12,7 +12,7 @@ JSClass global_class = {
     "global",
     JSCLASS_IS_GLOBAL | JSCLASS_GLOBAL_FLAGS,
     JS_PropertyStub,
-    JS_PropertyStub,
+    JS_DeletePropertyStub,
     JS_PropertyStub,
     JS_StrictPropertyStub,
     JS_EnumerateStub,
diff --git a/js/src/jsapi-tests/testClassGetter.cpp b/js/src/jsapi-tests/testClassGetter.cpp
index 420ef24c4346..86c3229afce7 100644
--- a/js/src/jsapi-tests/testClassGetter.cpp
+++ b/js/src/jsapi-tests/testClassGetter.cpp
@@ -27,7 +27,7 @@ static JSClass ptestClass = {
     JSCLASS_HAS_PRIVATE,
 
     JS_PropertyStub,       // add
-    JS_PropertyStub,       // delete
+    JS_DeletePropertyStub, // delete
     test_prop_get,         // get
     JS_StrictPropertyStub, // set
     JS_EnumerateStub,
diff --git a/js/src/jsapi-tests/testCustomIterator.cpp b/js/src/jsapi-tests/testCustomIterator.cpp
index e1f628fc86e4..3c850811831e 100644
--- a/js/src/jsapi-tests/testCustomIterator.cpp
+++ b/js/src/jsapi-tests/testCustomIterator.cpp
@@ -32,7 +32,7 @@ js::Class HasCustomIterClass = {
     "HasCustomIter",
     0,
     JS_PropertyStub,
-    JS_PropertyStub,
+    JS_DeletePropertyStub,
     JS_PropertyStub,
     JS_StrictPropertyStub,
     JS_EnumerateStub,
diff --git a/js/src/jsapi-tests/testLookup.cpp b/js/src/jsapi-tests/testLookup.cpp
index 692ca846d5b1..65edab7c0ebc 100644
--- a/js/src/jsapi-tests/testLookup.cpp
+++ b/js/src/jsapi-tests/testLookup.cpp
@@ -41,7 +41,7 @@ static JSClass DocumentAllClass = {
     "DocumentAll",
     JSCLASS_EMULATES_UNDEFINED,
     JS_PropertyStub,
-    JS_PropertyStub,
+    JS_DeletePropertyStub,
     JS_PropertyStub,
     JS_StrictPropertyStub,
     JS_EnumerateStub,
@@ -78,7 +78,7 @@ document_resolve(JSContext *cx, JSHandleObject obj, JSHandleId id, unsigned flag
 
 static JSClass document_class = {
     "document", JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, (JSResolveOp) document_resolve, JS_ConvertStub
 };
 
diff --git a/js/src/jsapi-tests/testNewObject.cpp b/js/src/jsapi-tests/testNewObject.cpp
index 94b8607bb1db..5a97aa72e4ad 100644
--- a/js/src/jsapi-tests/testNewObject.cpp
+++ b/js/src/jsapi-tests/testNewObject.cpp
@@ -95,7 +95,7 @@ BEGIN_TEST(testNewObject_1)
     static JSClass cls = {
         "testNewObject_1",
         0,
-        JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+        JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
         JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
         NULL, NULL, NULL, constructHook
     };
diff --git a/js/src/jsapi-tests/testObjectEmulatingUndefined.cpp b/js/src/jsapi-tests/testObjectEmulatingUndefined.cpp
index 0ac5243a4b50..af5212a1b549 100644
--- a/js/src/jsapi-tests/testObjectEmulatingUndefined.cpp
+++ b/js/src/jsapi-tests/testObjectEmulatingUndefined.cpp
@@ -8,7 +8,7 @@ static JSClass ObjectEmulatingUndefinedClass = {
     "ObjectEmulatingUndefined",
     JSCLASS_EMULATES_UNDEFINED,
     JS_PropertyStub,
-    JS_PropertyStub,
+    JS_DeletePropertyStub,
     JS_PropertyStub,
     JS_StrictPropertyStub,
     JS_EnumerateStub,
diff --git a/js/src/jsapi-tests/testOps.cpp b/js/src/jsapi-tests/testOps.cpp
index 648493be1df0..e0f7d8fa68ed 100644
--- a/js/src/jsapi-tests/testOps.cpp
+++ b/js/src/jsapi-tests/testOps.cpp
@@ -23,7 +23,7 @@ my_convert(JSContext* context, JS::HandleObject obj, JSType type, JS::MutableHan
 static JSClass myClass = {
     "MyClass",
     0,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, my_convert
 };
 
diff --git a/js/src/jsapi-tests/testProfileStrings.cpp b/js/src/jsapi-tests/testProfileStrings.cpp
index bf6a82ca5e85..d02426e19ec6 100644
--- a/js/src/jsapi-tests/testProfileStrings.cpp
+++ b/js/src/jsapi-tests/testProfileStrings.cpp
@@ -27,7 +27,7 @@ reset(JSContext *cx)
 }
 
 static JSClass ptestClass = {
-    "Prof", 0, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    "Prof", 0, JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub,
     JS_StrictPropertyStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
diff --git a/js/src/jsapi-tests/testPropCache.cpp b/js/src/jsapi-tests/testPropCache.cpp
index 3920a1f06bfd..799347bd0567 100644
--- a/js/src/jsapi-tests/testPropCache.cpp
+++ b/js/src/jsapi-tests/testPropCache.cpp
@@ -20,7 +20,7 @@ CounterAdd(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHand
 static JSClass CounterClass = {
     "Counter",  /* name */
     0,  /* flags */
-    CounterAdd, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    CounterAdd, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
diff --git a/js/src/jsapi-tests/testResolveRecursion.cpp b/js/src/jsapi-tests/testResolveRecursion.cpp
index 43d7b2d2be99..f5f6bbffa6b5 100644
--- a/js/src/jsapi-tests/testResolveRecursion.cpp
+++ b/js/src/jsapi-tests/testResolveRecursion.cpp
@@ -20,8 +20,8 @@ BEGIN_TEST(testResolveRecursion)
         JSCLASS_NEW_RESOLVE | JSCLASS_HAS_PRIVATE,
 
         JS_PropertyStub,       // add
-        JS_PropertyStub,       // delete
-        JS_PropertyStub,         // get
+        JS_DeletePropertyStub, // delete
+        JS_PropertyStub,       // get
         JS_StrictPropertyStub, // set
         JS_EnumerateStub,
         (JSResolveOp) my_resolve,
diff --git a/js/src/jsapi-tests/tests.h b/js/src/jsapi-tests/tests.h
index e251ca981a23..60c3ba75d893 100644
--- a/js/src/jsapi-tests/tests.h
+++ b/js/src/jsapi-tests/tests.h
@@ -230,7 +230,7 @@ class JSAPITest
     static JSClass * basicGlobalClass() {
         static JSClass c = {
             "global", JSCLASS_GLOBAL_FLAGS,
-            JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+            JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
             JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
         };
         return &c;
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 3180e7f3e55e..6df21245fe8c 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3197,6 +3197,13 @@ JS_StrictPropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool s
     return JS_TRUE;
 }
 
+JS_PUBLIC_API(JSBool)
+JS_DeletePropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool *succeeded)
+{
+    *succeeded = true;
+    return true;
+}
+
 JS_PUBLIC_API(JSBool)
 JS_EnumerateStub(JSContext *cx, JSHandleObject obj)
 {
@@ -4432,16 +4439,17 @@ JS_DeletePropertyById2(JSContext *cx, JSObject *objArg, jsid id, jsval *rval)
 
     RootedValue value(cx);
 
+    JSBool succeeded;
     if (JSID_IS_SPECIAL(id)) {
         Rooted<SpecialId> sid(cx, JSID_TO_SPECIALID(id));
-        if (!JSObject::deleteSpecial(cx, obj, sid, &value, false))
+        if (!JSObject::deleteSpecial(cx, obj, sid, &succeeded))
             return false;
     } else {
-        if (!JSObject::deleteByValue(cx, obj, IdToValue(id), &value, false))
+        if (!JSObject::deleteByValue(cx, obj, IdToValue(id), &succeeded))
             return false;
     }
 
-    *rval = value;
+    *rval = BooleanValue(succeeded);
     return true;
 }
 
@@ -4454,11 +4462,11 @@ JS_DeleteElement2(JSContext *cx, JSObject *objArg, uint32_t index, jsval *rval)
     assertSameCompartment(cx, obj);
     JSAutoResolveFlags rf(cx, 0);
 
-    RootedValue value(cx);
-    if (!JSObject::deleteElement(cx, obj, index, &value, false))
+    JSBool succeeded;
+    if (!JSObject::deleteElement(cx, obj, index, &succeeded))
         return false;
 
-    *rval = value;
+    *rval = BooleanValue(succeeded);
     return true;
 }
 
@@ -4474,11 +4482,11 @@ JS_DeleteProperty2(JSContext *cx, JSObject *objArg, const char *name, jsval *rva
     if (!atom)
         return false;
 
-    RootedValue value(cx);
-    if (!JSObject::deleteByValue(cx, obj, StringValue(atom), &value, false))
+    JSBool succeeded;
+    if (!JSObject::deleteByValue(cx, obj, StringValue(atom), &succeeded))
         return false;
 
-    *rval = value;
+    *rval = BooleanValue(succeeded);
     return true;
 }
 
@@ -4494,11 +4502,11 @@ JS_DeleteUCProperty2(JSContext *cx, JSObject *objArg, const jschar *name, size_t
     if (!atom)
         return false;
 
-    RootedValue value(cx);
-    if (!JSObject::deleteByValue(cx, obj, StringValue(atom), &value, false))
+    JSBool succeeded;
+    if (!JSObject::deleteByValue(cx, obj, StringValue(atom), &succeeded))
         return false;
 
-    *rval = value;
+    *rval = BooleanValue(succeeded);
     return true;
 }
 
@@ -4650,7 +4658,7 @@ static Class prop_iter_class = {
     "PropertyIterator",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_HAS_RESERVED_SLOTS(1),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 3ea75be79d3b..11c78a73db90 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -820,11 +820,9 @@ typedef js::RawValue    JSRawValue;
 /* JSClass operation signatures. */
 
 /*
- * Add, delete, or get a property named by id in obj.  Note the jsid id
- * type -- id may be a string (Unicode property identifier) or an int (element
- * index).  The *vp out parameter, on success, is the new property value after
- * an add or get.  After a successful delete, *vp is JSVAL_FALSE iff
- * obj[id] can't be deleted (because it's permanent).
+ * Add or get a property named by id in obj.  Note the jsid id type -- id may
+ * be a string (Unicode property identifier) or an int (element index).  The
+ * *vp out parameter, on success, is the new property value after the action.
  */
 typedef JSBool
 (* JSPropertyOp)(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp);
@@ -839,6 +837,24 @@ typedef JSBool
 typedef JSBool
 (* JSStrictPropertyOp)(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool strict, JSMutableHandleValue vp);
 
+/*
+ * Delete a property named by id in obj.
+ *
+ * If an error occurred, return false as per normal JSAPI error practice.
+ *
+ * If no error occurred, but the deletion attempt wasn't allowed (perhaps
+ * because the property was non-configurable), set *succeeded to false and
+ * return true.  This will cause |delete obj[id]| to evaluate to false in
+ * non-strict mode code, and to throw a TypeError in strict mode code.
+ *
+ * If no error occurred and the deletion wasn't disallowed (this is *not* the
+ * same as saying that a deletion actually occurred -- deleting a non-existent
+ * property, or an inherited property, is allowed -- it's just pointless),
+ * set *succeeded to true and return true.
+ */
+typedef JSBool
+(* JSDeletePropertyOp)(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool *succeeded);
+
 /*
  * This function type is used for callbacks that enumerate the properties of
  * a JSObject.  The behavior depends on the value of enum_op:
@@ -2810,7 +2826,7 @@ struct JSClass {
 
     /* Mandatory non-null function pointer members. */
     JSPropertyOp        addProperty;
-    JSPropertyOp        delProperty;
+    JSDeletePropertyOp  delProperty;
     JSPropertyOp        getProperty;
     JSStrictPropertyOp  setProperty;
     JSEnumerateOp       enumerate;
@@ -2999,6 +3015,9 @@ JS_PropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandl
 extern JS_PUBLIC_API(JSBool)
 JS_StrictPropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool strict, JSMutableHandleValue vp);
 
+extern JS_PUBLIC_API(JSBool)
+JS_DeletePropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool *succeeded);
+
 extern JS_PUBLIC_API(JSBool)
 JS_EnumerateStub(JSContext *cx, JSHandleObject obj);
 
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index d3cbcc4be99d..3a54f904630e 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -325,20 +325,19 @@ SetArrayElement(JSContext *cx, HandleObject obj, double index, HandleValue v)
 }
 
 /*
- * Delete the element |index| from |obj|. If |strict|, do a strict
- * deletion: throw if the property is not configurable.
+ * Attempt to delete the element |index| from |obj| as if by
+ * |obj.[[Delete]](index)|.
  *
- * - Return 1 if the deletion succeeds (that is, ES5's [[Delete]] would
- *   return true)
+ * If an error occurs while attempting to delete the element (that is, the call
+ * to [[Delete]] threw), return false.
  *
- * - Return 0 if the deletion fails because the property is not
- *   configurable (that is, [[Delete]] would return false). Note that if
- *   |strict| is true we will throw, not return zero.
- *
- * - Return -1 if an exception occurs (that is, [[Delete]] would throw).
+ * Otherwise set *succeeded to indicate whether the deletion attempt succeeded
+ * (that is, whether the call to [[Delete]] returned true or false).  (Deletes
+ * generally fail only when the property is non-configurable, but proxies may
+ * implement different semantics.)
  */
-static int
-DeleteArrayElement(JSContext *cx, HandleObject obj, double index, bool strict)
+static bool
+DeleteArrayElement(JSContext *cx, HandleObject obj, double index, JSBool *succeeded)
 {
     JS_ASSERT(index >= 0);
     JS_ASSERT(floor(index) == index);
@@ -350,37 +349,34 @@ DeleteArrayElement(JSContext *cx, HandleObject obj, double index, bool strict)
                 obj->markDenseElementsNotPacked(cx);
                 obj->setDenseElement(idx, MagicValue(JS_ELEMENTS_HOLE));
                 if (!js_SuppressDeletedElement(cx, obj, idx))
-                    return -1;
+                    return false;
             }
         }
-        return 1;
+
+        *succeeded = true;
+        return true;
     }
 
-    RootedValue v(cx);
-    if (index <= UINT32_MAX) {
-        if (!JSObject::deleteElement(cx, obj, uint32_t(index), &v, strict))
-            return -1;
-    } else {
-        if (!JSObject::deleteByValue(cx, obj, DoubleValue(index), &v, strict))
-            return -1;
-    }
+    if (index <= UINT32_MAX)
+        return JSObject::deleteElement(cx, obj, uint32_t(index), succeeded);
 
-    return v.isTrue() ? 1 : 0;
+    return JSObject::deleteByValue(cx, obj, DoubleValue(index), succeeded);
 }
 
-/*
- * When hole is true, delete the property at the given index. Otherwise set
- * its value to v assuming v is rooted.
- */
-static JSBool
-SetOrDeleteArrayElement(JSContext *cx, HandleObject obj, double index,
-                        JSBool hole, HandleValue v)
+/* ES6 20130308 draft 9.3.5 */
+static bool
+DeletePropertyOrThrow(JSContext *cx, HandleObject obj, double index)
 {
-    if (hole) {
-        JS_ASSERT(v.isUndefined());
-        return DeleteArrayElement(cx, obj, index, true) >= 0;
-    }
-    return SetArrayElement(cx, obj, index, v);
+    JSBool succeeded;
+    if (!DeleteArrayElement(cx, obj, index, &succeeded))
+        return false;
+    if (succeeded)
+        return true;
+
+    RootedId id(cx);
+    if (!ValueToId<CanGC>(cx, NumberValue(index), &id))
+        return false;
+    return obj->reportNotConfigurable(cx, id, JSREPORT_ERROR);
 }
 
 JSBool
@@ -475,10 +471,20 @@ array_length_setter(JSContext *cx, HandleObject obj, HandleId id, JSBool strict,
                 JSObject::setArrayLength(cx, obj, oldlen + 1);
                 return false;
             }
-            int deletion = DeleteArrayElement(cx, obj, oldlen, strict);
-            if (deletion <= 0) {
+
+            JSBool succeeded;
+            if (!DeleteArrayElement(cx, obj, oldlen, &succeeded))
+                return false;
+            if (!succeeded) {
                 JSObject::setArrayLength(cx, obj, oldlen + 1);
-                return deletion >= 0;
+                if (!strict)
+                    return true;
+
+                RootedId id(cx);
+                if (!IndexToId(cx, oldlen, &id))
+                    return false;
+                obj->reportNotConfigurable(cx, id);
+                return false;
             }
         } while (oldlen != newlen);
     } else {
@@ -500,10 +506,18 @@ array_length_setter(JSContext *cx, HandleObject obj, HandleId id, JSBool strict,
                 return false;
             if (JSID_IS_VOID(nid))
                 break;
+
+            // XXX Bug!  We should fail fast on the highest non-configurable
+            //     property we find, as we do in the simple-loop case above.
+            //     But since we're iterating in unknown order here, we don't
+            //     know if we're hitting the highest non-configurable property
+            //     when we hit a failure.  For now just drop unsuccessful
+            //     deletion on the floor, as the previous code here did.
             uint32_t index;
-            RootedValue junk(cx);
+            JSBool succeeded;
             if (js_IdIsIndex(nid, &index) && index - newlen < gap &&
-                !JSObject::deleteElement(cx, obj, index, &junk, false)) {
+                !JSObject::deleteElement(cx, obj, index, &succeeded))
+            {
                 return false;
             }
         }
@@ -567,7 +581,7 @@ Class js::ArrayClass = {
     "Array",
     JSCLASS_HAS_CACHED_PROTO(JSProto_Array),
     array_addProperty,
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -1044,11 +1058,29 @@ array_reverse(JSContext *cx, unsigned argc, Value *vp)
         JSBool hole, hole2;
         if (!JS_CHECK_OPERATION_LIMIT(cx) ||
             !GetElement(cx, obj, i, &hole, &lowval) ||
-            !GetElement(cx, obj, len - i - 1, &hole2, &hival) ||
-            !SetOrDeleteArrayElement(cx, obj, len - i - 1, hole, lowval) ||
-            !SetOrDeleteArrayElement(cx, obj, i, hole2, hival)) {
+            !GetElement(cx, obj, len - i - 1, &hole2, &hival))
+        {
             return false;
         }
+
+        if (!hole && !hole2) {
+            if (!SetArrayElement(cx, obj, i, hival))
+                return false;
+            if (!SetArrayElement(cx, obj, len - i - 1, lowval))
+                return false;
+        } else if (hole && !hole2) {
+            if (!SetArrayElement(cx, obj, i, hival))
+                return false;
+            if (!DeletePropertyOrThrow(cx, obj, len - i - 1))
+                return false;
+        } else if (!hole && hole2) {
+            if (!DeletePropertyOrThrow(cx, obj, i))
+                return false;
+            if (!SetArrayElement(cx, obj, len - i - 1, lowval))
+                return false;
+        } else {
+            // No action required.
+        }
     }
     args.rval().setObject(*obj);
     return true;
@@ -1657,7 +1689,7 @@ js::array_sort(JSContext *cx, unsigned argc, Value *vp)
 
     /* Re-create any holes that sorted to the end of the array. */
     while (len > n) {
-        if (!JS_CHECK_OPERATION_LIMIT(cx) || DeleteArrayElement(cx, obj, --len, true) < 0)
+        if (!JS_CHECK_OPERATION_LIMIT(cx) || !DeletePropertyOrThrow(cx, obj, --len))
             return false;
     }
     args.rval().setObject(*obj);
@@ -1760,7 +1792,7 @@ array_pop_slowly(JSContext *cx, HandleObject obj, CallArgs &args)
     if (!GetElement(cx, obj, index, &hole, &elt))
         return false;
 
-    if (!hole && DeleteArrayElement(cx, obj, index, true) < 0)
+    if (!hole && !DeletePropertyOrThrow(cx, obj, index))
         return false;
 
     args.rval().set(elt);
@@ -1783,7 +1815,7 @@ array_pop_dense(JSContext *cx, HandleObject obj, CallArgs &args)
     if (!GetElement(cx, obj, index, &hole, &elt))
         return false;
 
-    if (!hole && DeleteArrayElement(cx, obj, index, true) < 0)
+    if (!hole && !DeletePropertyOrThrow(cx, obj, index))
         return false;
 
     args.rval().set(elt);
@@ -1871,15 +1903,21 @@ js::array_shift(JSContext *cx, unsigned argc, Value *vp)
         /* Slide down the array above the first element. */
         RootedValue value(cx);
         for (uint32_t i = 0; i < length; i++) {
-            if (!JS_CHECK_OPERATION_LIMIT(cx) ||
-                !GetElement(cx, obj, i + 1, &hole, &value) ||
-                !SetOrDeleteArrayElement(cx, obj, i, hole, value)) {
-                return JS_FALSE;
+            if (!JS_CHECK_OPERATION_LIMIT(cx))
+                return false;
+            if (!GetElement(cx, obj, i + 1, &hole, &value))
+                return false;
+            if (hole) {
+                if (!DeletePropertyOrThrow(cx, obj, i))
+                    return false;
+            } else {
+                if (!SetArrayElement(cx, obj, i, value))
+                    return false;
             }
         }
 
         /* Delete the only or last element when it exists. */
-        if (!hole && DeleteArrayElement(cx, obj, length, true) < 0)
+        if (!hole && !DeletePropertyOrThrow(cx, obj, length))
             return JS_FALSE;
     }
     return SetLengthProperty(cx, obj, length);
@@ -1927,10 +1965,16 @@ array_unshift(JSContext *cx, unsigned argc, Value *vp)
                 do {
                     --last, --upperIndex;
                     JSBool hole;
-                    if (!JS_CHECK_OPERATION_LIMIT(cx) ||
-                        !GetElement(cx, obj, last, &hole, &value) ||
-                        !SetOrDeleteArrayElement(cx, obj, upperIndex, hole, value)) {
-                        return JS_FALSE;
+                    if (!JS_CHECK_OPERATION_LIMIT(cx))
+                        return false;
+                    if (!GetElement(cx, obj, last, &hole, &value))
+                        return false;
+                    if (hole) {
+                        if (!DeletePropertyOrThrow(cx, obj, upperIndex))
+                            return false;
+                    } else {
+                        if (!SetArrayElement(cx, obj, upperIndex, value))
+                            return false;
                     }
                 } while (last != 0);
             }
@@ -2115,18 +2159,24 @@ array_splice(JSContext *cx, unsigned argc, Value *vp)
             /* Steps 12(a)-(b). */
             RootedValue fromValue(cx);
             for (uint32_t from = sourceIndex, to = targetIndex; from < len; from++, to++) {
-                JSBool hole;
-                if (!JS_CHECK_OPERATION_LIMIT(cx) ||
-                    !GetElement(cx, obj, from, &hole, &fromValue) ||
-                    !SetOrDeleteArrayElement(cx, obj, to, hole, fromValue))
-                {
+                if (!JS_CHECK_OPERATION_LIMIT(cx))
                     return false;
+
+                JSBool hole;
+                if (!GetElement(cx, obj, from, &hole, &fromValue))
+                    return false;
+                if (hole) {
+                    if (!DeletePropertyOrThrow(cx, obj, to))
+                        return false;
+                } else {
+                    if (!SetArrayElement(cx, obj, to, fromValue))
+                        return false;
                 }
             }
 
             /* Steps 12(c)-(d). */
             for (uint32_t k = len; k > finalLength; k--) {
-                if (DeleteArrayElement(cx, obj, k - 1, true) < 0)
+                if (!DeletePropertyOrThrow(cx, obj, k - 1))
                     return false;
             }
         }
@@ -2155,15 +2205,22 @@ array_splice(JSContext *cx, unsigned argc, Value *vp)
         } else {
             RootedValue fromValue(cx);
             for (double k = len - actualDeleteCount; k > actualStart; k--) {
+                if (!JS_CHECK_OPERATION_LIMIT(cx))
+                    return false;
+
                 double from = k + actualDeleteCount - 1;
                 double to = k + itemCount - 1;
 
                 JSBool hole;
-                if (!JS_CHECK_OPERATION_LIMIT(cx) ||
-                    !GetElement(cx, obj, from, &hole, &fromValue) ||
-                    !SetOrDeleteArrayElement(cx, obj, to, hole, fromValue))
-                {
+                if (!GetElement(cx, obj, from, &hole, &fromValue))
                     return false;
+
+                if (hole) {
+                    if (!DeletePropertyOrThrow(cx, obj, to))
+                        return false;
+                } else {
+                    if (!SetArrayElement(cx, obj, to, fromValue))
+                        return false;
                 }
             }
         }
diff --git a/js/src/jsbool.cpp b/js/src/jsbool.cpp
index b3a54c63c24e..843c3294c8b8 100644
--- a/js/src/jsbool.cpp
+++ b/js/src/jsbool.cpp
@@ -38,8 +38,9 @@ using namespace js::types;
 
 Class js::BooleanClass = {
     "Boolean",
-    JSCLASS_HAS_RESERVED_SLOTS(1) | JSCLASS_HAS_CACHED_PROTO(JSProto_Boolean),    JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JSCLASS_HAS_RESERVED_SLOTS(1) | JSCLASS_HAS_CACHED_PROTO(JSProto_Boolean),
+    JS_PropertyStub,         /* addProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsclass.h b/js/src/jsclass.h
index 86c0e5b86e68..bb01ff046043 100644
--- a/js/src/jsclass.h
+++ b/js/src/jsclass.h
@@ -180,11 +180,11 @@ typedef JSBool
 typedef JSBool
 (* SpecialAttributesOp)(JSContext *cx, HandleObject obj, HandleSpecialId sid, unsigned *attrsp);
 typedef JSBool
-(* DeletePropertyOp)(JSContext *cx, HandleObject obj, HandlePropertyName name, MutableHandleValue vp, JSBool strict);
+(* DeletePropertyOp)(JSContext *cx, HandleObject obj, HandlePropertyName name, JSBool *succeeded);
 typedef JSBool
-(* DeleteElementOp)(JSContext *cx, HandleObject obj, uint32_t index, MutableHandleValue vp, JSBool strict);
+(* DeleteElementOp)(JSContext *cx, HandleObject obj, uint32_t index, JSBool *succeeded);
 typedef JSBool
-(* DeleteSpecialOp)(JSContext *cx, HandleObject obj, HandleSpecialId sid, MutableHandleValue vp, JSBool strict);
+(* DeleteSpecialOp)(JSContext *cx, HandleObject obj, HandleSpecialId sid, JSBool *succeeded);
 
 
 typedef JSObject *
@@ -198,7 +198,7 @@ typedef void
                                                                               \
     /* Mandatory non-null function pointer members. */                        \
     JSPropertyOp        addProperty;                                          \
-    JSPropertyOp        delProperty;                                          \
+    JSDeletePropertyOp  delProperty;                                          \
     JSPropertyOp        getProperty;                                          \
     JSStrictPropertyOp  setProperty;                                          \
     JSEnumerateOp       enumerate;                                            \
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 9c9a03d3b1da..604b206b5ab9 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -422,6 +422,16 @@ CallJSPropertyOpSetter(JSContext *cx, StrictPropertyOp op, HandleObject obj, Han
     return op(cx, obj, id, strict, vp);
 }
 
+static inline bool
+CallJSDeletePropertyOp(JSContext *cx, JSDeletePropertyOp op, HandleObject receiver, HandleId id,
+                       JSBool *succeeded)
+{
+    JS_CHECK_RECURSION(cx, return false);
+
+    assertSameCompartment(cx, receiver, id);
+    return op(cx, receiver, id, succeeded);
+}
+
 inline bool
 CallSetter(JSContext *cx, HandleObject obj, HandleId id, StrictPropertyOp op, unsigned attrs,
            unsigned shortid, JSBool strict, MutableHandleValue vp)
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index 928c4a66a8ea..b3ce396f860d 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -511,7 +511,7 @@ Class js::DateClass = {
     JSCLASS_HAS_RESERVED_SLOTS(JSObject::DATE_CLASS_RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_Date),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 21d2a3afeb9e..68a5e1da59c2 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -68,7 +68,7 @@ Class js::ErrorClass = {
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_NEW_RESOLVE |
     JSCLASS_HAS_CACHED_PROTO(JSProto_Error),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 96d9eb2a4057..80ab7636f8a9 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -548,7 +548,7 @@ JS_FRIEND_DATA(Class) js::FunctionClass = {
     JSCLASS_NEW_RESOLVE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_CACHED_PROTO(JSProto_Function),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     fun_enumerate,
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 68b4c69e57b2..f1bb3881c222 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -177,7 +177,7 @@ const uint32_t JSSLOT_SAVED_ID        = 1;
 Class js_NoSuchMethodClass = {
     "NoSuchMethod",
     JSCLASS_HAS_RESERVED_SLOTS(2) | JSCLASS_IS_ANONYMOUS,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub,
 };
 
@@ -2129,9 +2129,15 @@ BEGIN_CASE(JSOP_DELPROP)
     RootedObject &obj = rootObject0;
     FETCH_OBJECT(cx, -1, obj);
 
-    MutableHandleValue res = MutableHandleValue::fromMarkedLocation(&regs.sp[-1]);
-    if (!JSObject::deleteProperty(cx, obj, name, res, script->strict))
+    JSBool succeeded;
+    if (!JSObject::deleteProperty(cx, obj, name, &succeeded))
         goto error;
+    if (!succeeded && script->strict) {
+        obj->reportNotConfigurable(cx, NameToId(name));
+        goto error;
+    }
+    MutableHandleValue res = MutableHandleValue::fromMarkedLocation(&regs.sp[-1]);
+    res.setBoolean(succeeded);
 }
 END_CASE(JSOP_DELPROP)
 
@@ -2144,10 +2150,22 @@ BEGIN_CASE(JSOP_DELELEM)
     RootedValue &propval = rootValue0;
     propval = regs.sp[-1];
 
-    MutableHandleValue res = MutableHandleValue::fromMarkedLocation(&regs.sp[-2]);
-    if (!JSObject::deleteByValue(cx, obj, propval, res, script->strict))
+    JSBool succeeded;
+    if (!JSObject::deleteByValue(cx, obj, propval, &succeeded))
         goto error;
+    if (!succeeded && script->strict) {
+        // XXX This observably calls ToString(propval).  We should convert to
+        //     PropertyKey and use that to delete, and to report an error if
+        //     necessary!
+        RootedId id(cx);
+        if (!ValueToId<CanGC>(cx, propval, &id))
+            goto error;
+        obj->reportNotConfigurable(cx, id);
+        goto error;
+    }
 
+    MutableHandleValue res = MutableHandleValue::fromMarkedLocation(&regs.sp[-2]);
+    res.setBoolean(succeeded);
     regs.sp--;
 }
 END_CASE(JSOP_DELELEM)
@@ -3613,22 +3631,17 @@ template <bool strict>
 bool
 js::DeleteProperty(JSContext *cx, HandleValue v, HandlePropertyName name, JSBool *bp)
 {
-    // default op result is false (failure)
-    *bp = true;
-
     // convert value to JSObject pointer
     RootedObject obj(cx, ToObjectFromStack(cx, v));
     if (!obj)
         return false;
 
-    // Call deleteProperty on obj
-    RootedValue result(cx, NullValue());
-    bool delprop_ok = JSObject::deleteProperty(cx, obj, name, &result, strict);
-    if (!delprop_ok)
+    if (!JSObject::deleteProperty(cx, obj, name, bp))
         return false;
-
-    // convert result into *bp and return
-    *bp = result.toBoolean();
+    if (strict && !*bp) {
+        obj->reportNotConfigurable(cx, NameToId(name));
+        return false;
+    }
     return true;
 }
 
@@ -3643,16 +3656,23 @@ js::DeleteElement(JSContext *cx, HandleValue val, HandleValue index, JSBool *bp)
     if (!obj)
         return false;
 
-    RootedValue result(cx);
-    if (!JSObject::deleteByValue(cx, obj, index, &result, strict))
+    if (!JSObject::deleteByValue(cx, obj, index, bp))
         return false;
-
-    *bp = result.toBoolean();
+    if (strict && !*bp) {
+        // XXX This observably calls ToString(propval).  We should convert to
+        //     PropertyKey and use that to delete, and to report an error if
+        //     necessary!
+        RootedId id(cx);
+        if (!ValueToId<CanGC>(cx, index, &id))
+            return false;
+        obj->reportNotConfigurable(cx, id);
+        return false;
+    }
     return true;
 }
 
-template bool js::DeleteElement<true> (JSContext *, HandleValue, HandleValue, JSBool *);
-template bool js::DeleteElement<false>(JSContext *, HandleValue, HandleValue, JSBool *);
+template bool js::DeleteElement<true> (JSContext *, HandleValue, HandleValue, JSBool *succeeded);
+template bool js::DeleteElement<false>(JSContext *, HandleValue, HandleValue, JSBool *succeeded);
 
 bool
 js::GetElement(JSContext *cx, MutableHandleValue lref, HandleValue rref, MutableHandleValue vp)
@@ -3755,10 +3775,16 @@ js::DeleteNameOperation(JSContext *cx, HandlePropertyName name, HandleObject sco
     if (!LookupName(cx, name, scopeObj, &scope, &pobj, &shape))
         return false;
 
-    /* ECMA says to return true if name is undefined or inherited. */
-    res.setBoolean(true);
-    if (shape)
-        return JSObject::deleteProperty(cx, scope, name, res, false);
+    if (!scope) {
+        // Return true for non-existent names.
+        res.setBoolean(true);
+        return true;
+    }
+
+    JSBool succeeded;
+    if (!JSObject::deleteProperty(cx, scope, name, &succeeded))
+        return false;
+    res.setBoolean(succeeded);
     return true;
 }
 
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 552bdd95fb13..0308f4daee56 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -837,7 +837,7 @@ Class PropertyIteratorObject::class_ = {
     JSCLASS_HAS_PRIVATE |
     JSCLASS_BACKGROUND_FINALIZE,
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -940,7 +940,7 @@ Class js::ElementIteratorClass = {
     JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(ElementIteratorObject::NumSlots),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -1298,7 +1298,7 @@ Class js::StopIterationClass = {
     JSCLASS_HAS_CACHED_PROTO(JSProto_StopIteration) |
     JSCLASS_FREEZE_PROTO,
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -1395,7 +1395,7 @@ Class js::GeneratorClass = {
     "Generator",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS,
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
index 97f880fe98d0..aa0526391cac 100644
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@@ -86,7 +86,7 @@ Class js::MathClass = {
     js_Math_str,
     JSCLASS_HAS_CACHED_PROTO(JSProto_Math),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index 8c9dc7aff420..e89b967840ae 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -409,7 +409,7 @@ Class js::NumberClass = {
     js_Number_str,
     JSCLASS_HAS_RESERVED_SLOTS(1) | JSCLASS_HAS_CACHED_PROTO(JSProto_Number),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index f8cb8b97e8a4..50097ee541bc 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -82,7 +82,7 @@ Class js::ObjectClass = {
     js_Object_str,
     JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -908,8 +908,8 @@ DefinePropertyOnObject(JSContext *cx, HandleObject obj, HandleId id, const PropD
      * redefining it or we had invoked its setter to change its value).
      */
     if (callDelProperty) {
-        RootedValue dummy(cx, UndefinedValue());
-        if (!CallJSPropertyOp(cx, obj2->getClass()->delProperty, obj2, id, &dummy))
+        JSBool succeeded;
+        if (!CallJSDeletePropertyOp(cx, obj2->getClass()->delProperty, obj2, id, &succeeded))
             return false;
     }
 
@@ -1617,27 +1617,26 @@ JSObject::nonNativeSetElement(JSContext *cx, HandleObject obj,
 }
 
 /* static */ bool
-JSObject::deleteByValue(JSContext *cx, HandleObject obj,
-                        const Value &property, MutableHandleValue rval, bool strict)
+JSObject::deleteByValue(JSContext *cx, HandleObject obj, const Value &property, JSBool *succeeded)
 {
     uint32_t index;
     if (IsDefinitelyIndex(property, &index))
-        return deleteElement(cx, obj, index, rval, strict);
+        return deleteElement(cx, obj, index, succeeded);
 
     RootedValue propval(cx, property);
     Rooted<SpecialId> sid(cx);
     if (ValueIsSpecial(obj, &propval, &sid, cx))
-        return deleteSpecial(cx, obj, sid, rval, strict);
+        return deleteSpecial(cx, obj, sid, succeeded);
 
     JSAtom *name = ToAtom<CanGC>(cx, propval);
     if (!name)
         return false;
 
     if (name->isIndex(&index))
-        return deleteElement(cx, obj, index, rval, strict);
+        return deleteElement(cx, obj, index, succeeded);
 
     Rooted<PropertyName*> propname(cx, name->asPropertyName());
-    return deleteProperty(cx, obj, propname, rval, strict);
+    return deleteProperty(cx, obj, propname, succeeded);
 }
 
 JS_FRIEND_API(bool)
@@ -2225,8 +2224,8 @@ js::DefineConstructorAndPrototype(JSContext *cx, HandleObject obj, JSProtoKey ke
 
 bad:
     if (named) {
-        RootedValue rval(cx);
-        JSObject::deleteByValue(cx, obj, StringValue(atom), &rval, false);
+        JSBool succeeded;
+        JSObject::deleteByValue(cx, obj, StringValue(atom), &succeeded);
     }
     if (cached)
         ClearClassObject(obj, key);
@@ -4367,10 +4366,8 @@ baseops::SetElementAttributes(JSContext *cx, HandleObject obj, uint32_t index, u
 }
 
 JSBool
-baseops::DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue rval, JSBool strict)
+baseops::DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, JSBool *succeeded)
 {
-    rval.setBoolean(true);
-
     RootedObject proto(cx);
     RootedShape shape(cx);
     if (!baseops::LookupProperty<CanGC>(cx, obj, id, &proto, &shape))
@@ -4378,17 +4375,17 @@ baseops::DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, MutableHand
     if (!shape || proto != obj) {
         /*
          * If no property, or the property comes from a prototype, call the
-         * class's delProperty hook, passing rval as the result parameter.
+         * class's delProperty hook, passing succeeded as the result parameter.
          */
-        return CallJSPropertyOp(cx, obj->getClass()->delProperty, obj, id, rval);
+        return CallJSDeletePropertyOp(cx, obj->getClass()->delProperty, obj, id, succeeded);
     }
 
     GCPoke(cx->runtime);
 
     if (IsImplicitDenseElement(shape)) {
-        if (!CallJSPropertyOp(cx, obj->getClass()->delProperty, obj, id, rval))
+        if (!CallJSDeletePropertyOp(cx, obj->getClass()->delProperty, obj, id, succeeded))
             return false;
-        if (rval.isFalse())
+        if (!succeeded)
             return true;
 
         JSObject::setDenseElementHole(cx, obj, JSID_TO_INT(id));
@@ -4396,9 +4393,7 @@ baseops::DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, MutableHand
     }
 
     if (!shape->configurable()) {
-        if (strict)
-            return obj->reportNotConfigurable(cx, id);
-        rval.setBoolean(false);
+        *succeeded = false;
         return true;
     }
 
@@ -4406,9 +4401,9 @@ baseops::DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, MutableHand
     if (!shape->getUserId(cx, &userid))
         return false;
 
-    if (!CallJSPropertyOp(cx, obj->getClass()->delProperty, obj, userid, rval))
+    if (!CallJSDeletePropertyOp(cx, obj->getClass()->delProperty, obj, userid, succeeded))
         return false;
-    if (rval.isFalse())
+    if (!succeeded)
         return true;
 
     return obj->removeProperty(cx, id) && js_SuppressDeletedProperty(cx, obj, id);
@@ -4416,28 +4411,26 @@ baseops::DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, MutableHand
 
 JSBool
 baseops::DeleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name,
-                        MutableHandleValue rval, JSBool strict)
+                        JSBool *succeeded)
 {
     Rooted<jsid> id(cx, NameToId(name));
-    return baseops::DeleteGeneric(cx, obj, id, rval, strict);
+    return baseops::DeleteGeneric(cx, obj, id, succeeded);
 }
 
 JSBool
-baseops::DeleteElement(JSContext *cx, HandleObject obj, uint32_t index,
-                       MutableHandleValue rval, JSBool strict)
+baseops::DeleteElement(JSContext *cx, HandleObject obj, uint32_t index, JSBool *succeeded)
 {
     RootedId id(cx);
     if (!IndexToId(cx, index, &id))
         return false;
-    return baseops::DeleteGeneric(cx, obj, id, rval, strict);
+    return baseops::DeleteGeneric(cx, obj, id, succeeded);
 }
 
 JSBool
-baseops::DeleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid,
-                       MutableHandleValue rval, JSBool strict)
+baseops::DeleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid, JSBool *succeeded)
 {
     Rooted<jsid> id(cx, SPECIALID_TO_JSID(sid));
-    return baseops::DeleteGeneric(cx, obj, id, rval, strict);
+    return baseops::DeleteGeneric(cx, obj, id, succeeded);
 }
 
 bool
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 25a8652c5ec5..919e33229145 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -192,16 +192,16 @@ extern JSBool
 SetElementAttributes(JSContext *cx, HandleObject obj, uint32_t index, unsigned *attrsp);
 
 extern JSBool
-DeleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name, MutableHandleValue rval, JSBool strict);
+DeleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name, JSBool *succeeded);
 
 extern JSBool
-DeleteElement(JSContext *cx, HandleObject obj, uint32_t index, MutableHandleValue rval, JSBool strict);
+DeleteElement(JSContext *cx, HandleObject obj, uint32_t index, JSBool *succeeded);
 
 extern JSBool
-DeleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid, MutableHandleValue rval, JSBool strict);
+DeleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid, JSBool *succeeded);
 
 extern JSBool
-DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue rval, JSBool strict);
+DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, JSBool *succeeded);
 
 } /* namespace js::baseops */
 
@@ -892,15 +892,13 @@ class JSObject : public js::ObjectImpl
 
     static inline bool deleteProperty(JSContext *cx, js::HandleObject obj,
                                       js::HandlePropertyName name,
-                                      js::MutableHandleValue rval, bool strict);
+                                      JSBool *succeeded);
     static inline bool deleteElement(JSContext *cx, js::HandleObject obj,
-                                     uint32_t index,
-                                     js::MutableHandleValue rval, bool strict);
+                                     uint32_t index, JSBool *succeeded);
     static inline bool deleteSpecial(JSContext *cx, js::HandleObject obj,
-                                     js::HandleSpecialId sid,
-                                     js::MutableHandleValue rval, bool strict);
+                                     js::HandleSpecialId sid, JSBool *succeeded);
     static bool deleteByValue(JSContext *cx, js::HandleObject obj,
-                              const js::Value &property, js::MutableHandleValue rval, bool strict);
+                              const js::Value &property, JSBool *succeeded);
 
     static inline bool enumerate(JSContext *cx, JS::HandleObject obj, JSIterateOp iterop,
                                  JS::MutableHandleValue statep, JS::MutableHandleId idp);
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 9213ae088914..a78e32222ba7 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -194,19 +194,18 @@ JSObject::getPropertyNoGC(JSContext *cx, JSObject *obj, JSObject *receiver,
 }
 
 /* static */ inline bool
-JSObject::deleteProperty(JSContext *cx, js::HandleObject obj,
-                         js::HandlePropertyName name, js::MutableHandleValue rval, bool strict)
+JSObject::deleteProperty(JSContext *cx, js::HandleObject obj, js::HandlePropertyName name,
+                         JSBool *succeeded)
 {
     JS::RootedId id(cx, js::NameToId(name));
     js::types::AddTypePropertyId(cx, obj, id, js::types::Type::UndefinedType());
     js::types::MarkTypePropertyConfigured(cx, obj, id);
     js::DeletePropertyOp op = obj->getOps()->deleteProperty;
-    return (op ? op : js::baseops::DeleteProperty)(cx, obj, name, rval, strict);
+    return (op ? op : js::baseops::DeleteProperty)(cx, obj, name, succeeded);
 }
 
 /* static */ inline bool
-JSObject::deleteElement(JSContext *cx, js::HandleObject obj,
-                        uint32_t index, js::MutableHandleValue rval, bool strict)
+JSObject::deleteElement(JSContext *cx, js::HandleObject obj, uint32_t index, JSBool *succeeded)
 {
     JS::RootedId id(cx);
     if (!js::IndexToId(cx, index, &id))
@@ -214,18 +213,18 @@ JSObject::deleteElement(JSContext *cx, js::HandleObject obj,
     js::types::AddTypePropertyId(cx, obj, id, js::types::Type::UndefinedType());
     js::types::MarkTypePropertyConfigured(cx, obj, id);
     js::DeleteElementOp op = obj->getOps()->deleteElement;
-    return (op ? op : js::baseops::DeleteElement)(cx, obj, index, rval, strict);
+    return (op ? op : js::baseops::DeleteElement)(cx, obj, index, succeeded);
 }
 
 /* static */ inline bool
-JSObject::deleteSpecial(JSContext *cx, js::HandleObject obj,
-                        js::HandleSpecialId sid, js::MutableHandleValue rval, bool strict)
+JSObject::deleteSpecial(JSContext *cx, js::HandleObject obj, js::HandleSpecialId sid,
+                        JSBool *succeeded)
 {
     JS::RootedId id(cx, SPECIALID_TO_JSID(sid));
     js::types::AddTypePropertyId(cx, obj, id, js::types::Type::UndefinedType());
     js::types::MarkTypePropertyConfigured(cx, obj, id);
     js::DeleteSpecialOp op = obj->getOps()->deleteSpecial;
-    return (op ? op : js::baseops::DeleteSpecial)(cx, obj, sid, rval, strict);
+    return (op ? op : js::baseops::DeleteSpecial)(cx, obj, sid, succeeded);
 }
 
 inline void
diff --git a/js/src/json.cpp b/js/src/json.cpp
index d03a8da9931f..66e73b9dea9a 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -45,7 +45,7 @@ Class js::JSONClass = {
     js_JSON_str,
     JSCLASS_HAS_CACHED_PROTO(JSProto_JSON),
     JS_PropertyStub,        /* addProperty */
-    JS_PropertyStub,        /* delProperty */
+    JS_DeletePropertyStub,  /* delProperty */
     JS_PropertyStub,        /* getProperty */
     JS_StrictPropertyStub,  /* setProperty */
     JS_EnumerateStub,
@@ -776,7 +776,8 @@ Walk(JSContext *cx, HandleObject holder, HandleId name, HandleValue reviver, Mut
 
                 if (newElement.isUndefined()) {
                     /* Step 2a(iii)(2). */
-                    if (!JSObject::deleteByValue(cx, obj, IdToValue(id), &newElement, false))
+                    JSBool succeeded;
+                    if (!JSObject::deleteByValue(cx, obj, IdToValue(id), &succeeded))
                         return false;
                 } else {
                     /* Step 2a(iii)(3). */
@@ -804,7 +805,8 @@ Walk(JSContext *cx, HandleObject holder, HandleId name, HandleValue reviver, Mut
 
                 if (newElement.isUndefined()) {
                     /* Step 2b(ii)(2). */
-                    if (!JSObject::deleteByValue(cx, obj, IdToValue(id), &newElement, false))
+                    JSBool succeeded;
+                    if (!JSObject::deleteByValue(cx, obj, IdToValue(id), &succeeded))
                         return false;
                 } else {
                     /* Step 2b(ii)(3). */
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index dda39fda162d..23220564a573 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -2948,41 +2948,36 @@ proxy_SetSpecialAttributes(JSContext *cx, HandleObject obj, HandleSpecialId sid,
 }
 
 static JSBool
-proxy_DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id,
-                    MutableHandleValue rval, JSBool strict)
+proxy_DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, JSBool *succeeded)
 {
-    // TODO: throwing away strict
     bool deleted;
-    if (!Proxy::delete_(cx, obj, id, &deleted) || !js_SuppressDeletedProperty(cx, obj, id))
+    if (!Proxy::delete_(cx, obj, id, &deleted))
         return false;
-    rval.setBoolean(deleted);
-    return true;
+    *succeeded = deleted;
+    return js_SuppressDeletedProperty(cx, obj, id);
 }
 
 static JSBool
-proxy_DeleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name,
-                     MutableHandleValue rval, JSBool strict)
+proxy_DeleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name, JSBool *succeeded)
 {
     Rooted<jsid> id(cx, NameToId(name));
-    return proxy_DeleteGeneric(cx, obj, id, rval, strict);
+    return proxy_DeleteGeneric(cx, obj, id, succeeded);
 }
 
 static JSBool
-proxy_DeleteElement(JSContext *cx, HandleObject obj, uint32_t index,
-                    MutableHandleValue rval, JSBool strict)
+proxy_DeleteElement(JSContext *cx, HandleObject obj, uint32_t index, JSBool *succeeded)
 {
     RootedId id(cx);
     if (!IndexToId(cx, index, &id))
         return false;
-    return proxy_DeleteGeneric(cx, obj, id, rval, strict);
+    return proxy_DeleteGeneric(cx, obj, id, succeeded);
 }
 
 static JSBool
-proxy_DeleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid,
-                    MutableHandleValue rval, JSBool strict)
+proxy_DeleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid, JSBool *succeeded)
 {
     Rooted<jsid> id(cx, SPECIALID_TO_JSID(sid));
-    return proxy_DeleteGeneric(cx, obj, id, rval, strict);
+    return proxy_DeleteGeneric(cx, obj, id, succeeded);
 }
 
 static void
@@ -3070,7 +3065,7 @@ JS_FRIEND_DATA(Class) js::ObjectProxyClass = {
     "Proxy",
     Class::NON_NATIVE | JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_HAS_RESERVED_SLOTS(4),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -3121,7 +3116,7 @@ JS_FRIEND_DATA(Class) js::OuterWindowProxyClass = {
     "Proxy",
     Class::NON_NATIVE | JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_HAS_RESERVED_SLOTS(4),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -3196,7 +3191,7 @@ JS_FRIEND_DATA(Class) js::FunctionProxyClass = {
     "Proxy",
     Class::NON_NATIVE | JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_HAS_RESERVED_SLOTS(6),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -3368,7 +3363,7 @@ Class js::ProxyClass = {
     "Proxy",
     JSCLASS_HAS_CACHED_PROTO(JSProto_Proxy),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 0e50cb0f7f74..de0dd134c7aa 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -424,7 +424,7 @@ Class js::StringClass = {
     JSCLASS_HAS_RESERVED_SLOTS(StringObject::RESERVED_SLOTS) |
     JSCLASS_NEW_RESOLVE | JSCLASS_HAS_CACHED_PROTO(JSProto_String),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     str_enumerate,
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 15b5c5daf67b..6d4beda2fdd6 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -1087,33 +1087,33 @@ ArrayBufferObject::obj_setSpecialAttributes(JSContext *cx, HandleObject obj,
 }
 
 JSBool
-ArrayBufferObject::obj_deleteProperty(JSContext *cx, HandleObject obj,
-                                      HandlePropertyName name, MutableHandleValue rval, JSBool strict)
+ArrayBufferObject::obj_deleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name,
+                                      JSBool *succeeded)
 {
     RootedObject delegate(cx, ArrayBufferDelegate(cx, obj));
     if (!delegate)
         return false;
-    return baseops::DeleteProperty(cx, delegate, name, rval, strict);
+    return baseops::DeleteProperty(cx, delegate, name, succeeded);
 }
 
 JSBool
-ArrayBufferObject::obj_deleteElement(JSContext *cx, HandleObject obj,
-                                     uint32_t index, MutableHandleValue rval, JSBool strict)
+ArrayBufferObject::obj_deleteElement(JSContext *cx, HandleObject obj, uint32_t index,
+                                     JSBool *succeeded)
 {
     RootedObject delegate(cx, ArrayBufferDelegate(cx, obj));
     if (!delegate)
         return false;
-    return baseops::DeleteElement(cx, delegate, index, rval, strict);
+    return baseops::DeleteElement(cx, delegate, index, succeeded);
 }
 
 JSBool
-ArrayBufferObject::obj_deleteSpecial(JSContext *cx, HandleObject obj,
-                                     HandleSpecialId sid, MutableHandleValue rval, JSBool strict)
+ArrayBufferObject::obj_deleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid,
+                                     JSBool *succeeded)
 {
     RootedObject delegate(cx, ArrayBufferDelegate(cx, obj));
     if (!delegate)
         return false;
-    return baseops::DeleteSpecial(cx, delegate, sid, rval, strict);
+    return baseops::DeleteSpecial(cx, delegate, sid, succeeded);
 }
 
 JSBool
@@ -1628,33 +1628,30 @@ class TypedArrayTemplate
     }
 
     static JSBool
-    obj_deleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name,
-                       MutableHandleValue rval, JSBool strict)
+    obj_deleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name, JSBool *succeeded)
     {
-        rval.setBoolean(true);
+        *succeeded = true;
         return true;
     }
 
     static JSBool
-    obj_deleteElement(JSContext *cx, HandleObject tarray, uint32_t index,
-                      MutableHandleValue rval, JSBool strict)
+    obj_deleteElement(JSContext *cx, HandleObject tarray, uint32_t index, JSBool *succeeded)
     {
         JS_ASSERT(tarray->isTypedArray());
 
         if (index < length(tarray)) {
-            rval.setBoolean(false);
+            *succeeded = false;
             return true;
         }
 
-        rval.setBoolean(true);
+        *succeeded = true;
         return true;
     }
 
     static JSBool
-    obj_deleteSpecial(JSContext *cx, HandleObject tarray, HandleSpecialId sid,
-                      MutableHandleValue rval, JSBool strict)
+    obj_deleteSpecial(JSContext *cx, HandleObject tarray, HandleSpecialId sid, JSBool *succeeded)
     {
-        rval.setBoolean(true);
+        *succeeded = true;
         return true;
     }
 
@@ -3279,7 +3276,7 @@ Class ArrayBufferObject::protoClass = {
     JSCLASS_HAS_RESERVED_SLOTS(ARRAYBUFFER_RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_ArrayBuffer),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -3295,7 +3292,7 @@ Class js::ArrayBufferClass = {
     JSCLASS_HAS_RESERVED_SLOTS(ARRAYBUFFER_RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_ArrayBuffer),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -3443,7 +3440,7 @@ IMPL_TYPED_ARRAY_COMBINED_UNWRAPPERS(Float64, double, double)
     JSCLASS_HAS_PRIVATE |                                                      \
     JSCLASS_HAS_CACHED_PROTO(JSProto_##_typedArray),                           \
     JS_PropertyStub,         /* addProperty */                                 \
-    JS_PropertyStub,         /* delProperty */                                 \
+    JS_DeletePropertyStub,   /* delProperty */                                 \
     JS_PropertyStub,         /* getProperty */                                 \
     JS_StrictPropertyStub,   /* setProperty */                                 \
     JS_EnumerateStub,                                                          \
@@ -3459,7 +3456,7 @@ IMPL_TYPED_ARRAY_COMBINED_UNWRAPPERS(Float64, double, double)
     JSCLASS_HAS_CACHED_PROTO(JSProto_##_typedArray) |                          \
     Class::NON_NATIVE,                                                         \
     JS_PropertyStub,         /* addProperty */                                 \
-    JS_PropertyStub,         /* delProperty */                                 \
+    JS_DeletePropertyStub,   /* delProperty */                                 \
     JS_PropertyStub,         /* getProperty */                                 \
     JS_StrictPropertyStub,   /* setProperty */                                 \
     JS_EnumerateStub,                                                          \
@@ -3659,7 +3656,7 @@ Class js::DataViewObject::protoClass = {
     JSCLASS_HAS_RESERVED_SLOTS(DataViewObject::RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_DataView),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -3674,7 +3671,7 @@ Class js::DataViewClass = {
     JSCLASS_HAS_RESERVED_SLOTS(DataViewObject::RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_DataView),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h
index e38313b16299..08ad9479e92c 100644
--- a/js/src/jstypedarray.h
+++ b/js/src/jstypedarray.h
@@ -119,15 +119,12 @@ class ArrayBufferObject : public JSObject
     static JSBool obj_setSpecialAttributes(JSContext *cx, HandleObject obj,
                                            HandleSpecialId sid, unsigned *attrsp);
 
-    static JSBool obj_deleteProperty(JSContext *cx, HandleObject obj,
-                                     HandlePropertyName name, MutableHandleValue rval,
-                                     JSBool strict);
-    static JSBool obj_deleteElement(JSContext *cx, HandleObject obj,
-                                    uint32_t index, MutableHandleValue rval,
-                                    JSBool strict);
-    static JSBool obj_deleteSpecial(JSContext *cx, HandleObject obj,
-                                    HandleSpecialId sid, MutableHandleValue rval,
-                                    JSBool strict);
+    static JSBool obj_deleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name,
+                                     JSBool *succeeded);
+    static JSBool obj_deleteElement(JSContext *cx, HandleObject obj, uint32_t index,
+                                    JSBool *succeeded);
+    static JSBool obj_deleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid,
+                                    JSBool *succeeded);
 
     static JSBool obj_enumerate(JSContext *cx, HandleObject obj, JSIterateOp enum_op,
                                 MutableHandleValue statep, MutableHandleId idp);
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index 5977bfca5971..dc0abbea626b 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -399,7 +399,7 @@ Class js::WeakMapClass = {
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_CACHED_PROTO(JSProto_WeakMap),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index c9fda4f151fe..5a6a8f956c2b 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -1357,8 +1357,11 @@ stubs::DelName(VMFrame &f, PropertyName *name_)
     f.regs.sp++;
     f.regs.sp[-1] = BooleanValue(true);
     if (prop) {
-        if (!JSObject::deleteProperty(f.cx, obj, name, MutableHandleValue::fromMarkedLocation(&f.regs.sp[-1]), false))
+        JSBool succeeded;
+        if (!JSObject::deleteProperty(f.cx, obj, name, &succeeded))
             THROW();
+        MutableHandleValue rval = MutableHandleValue::fromMarkedLocation(&f.regs.sp[-1]);
+        rval.setBoolean(succeeded);
     }
 }
 
@@ -1374,11 +1377,15 @@ stubs::DelProp(VMFrame &f, PropertyName *name_)
     if (!obj)
         THROW();
 
-    RootedValue rval(cx);
-    if (!JSObject::deleteProperty(cx, obj, name, &rval, strict))
+    JSBool succeeded;
+    if (!JSObject::deleteProperty(cx, obj, name, &succeeded))
         THROW();
+    if (strict && !succeeded) {
+        obj->reportNotConfigurable(cx, NameToId(name));
+        THROW();
+    }
 
-    f.regs.sp[-1] = rval;
+    f.regs.sp[-1] = BooleanValue(succeeded);
 }
 
 template void JS_FASTCALL stubs::DelProp<true>(VMFrame &f, PropertyName *name);
@@ -1396,10 +1403,22 @@ stubs::DelElem(VMFrame &f)
         THROW();
 
     const Value &propval = f.regs.sp[-1];
-    MutableHandleValue rval = MutableHandleValue::fromMarkedLocation(&f.regs.sp[-2]);
-
-    if (!JSObject::deleteByValue(cx, obj, propval, rval, strict))
+    JSBool succeeded;
+    if (!JSObject::deleteByValue(cx, obj, propval, &succeeded))
         THROW();
+    if (strict && !succeeded) {
+        // XXX This observably calls ToString(propval).  We should convert to
+        //     PropertyKey and use that to delete, and to report an error if
+        //     necessary -- but this code's all dying soon, so who cares?
+        RootedId id(cx);
+        if (!ValueToId<CanGC>(cx, propval, &id))
+            THROW();
+        obj->reportNotConfigurable(cx, id);
+        THROW();
+    }
+
+    MutableHandleValue rval = MutableHandleValue::fromMarkedLocation(&f.regs.sp[-2]);
+    rval.setBoolean(succeeded);
 }
 
 void JS_FASTCALL
diff --git a/js/src/perf/jsperf.cpp b/js/src/perf/jsperf.cpp
index 098361a964a4..7caa12a50a28 100644
--- a/js/src/perf/jsperf.cpp
+++ b/js/src/perf/jsperf.cpp
@@ -156,7 +156,7 @@ static void pm_finalize(JSFreeOp* fop, JSObject* obj);
 
 static JSClass pm_class = {
     "PerfMeasurement", JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, pm_finalize
 };
 
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 68f0c08168de..4c496dc4f09b 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -2450,7 +2450,7 @@ sandbox_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
 static JSClass sandbox_class = {
     "sandbox",
     JSCLASS_NEW_RESOLVE | JSCLASS_GLOBAL_FLAGS,
-    JS_PropertyStub,   JS_PropertyStub,
+    JS_PropertyStub,   JS_DeletePropertyStub,
     JS_PropertyStub,   JS_StrictPropertyStub,
     sandbox_enumerate, (JSResolveOp)sandbox_resolve,
     JS_ConvertStub
@@ -2713,7 +2713,7 @@ resolver_enumerate(JSContext *cx, HandleObject obj)
 static JSClass resolver_class = {
     "resolver",
     JSCLASS_NEW_RESOLVE | JSCLASS_HAS_RESERVED_SLOTS(1),
-    JS_PropertyStub,   JS_PropertyStub,
+    JS_PropertyStub,   JS_DeletePropertyStub,
     JS_PropertyStub,   JS_StrictPropertyStub,
     resolver_enumerate, (JSResolveOp)resolver_resolve,
     JS_ConvertStub
@@ -3526,7 +3526,7 @@ ObjectEmulatingUndefined(JSContext *cx, unsigned argc, jsval *vp)
         "ObjectEmulatingUndefined",
         JSCLASS_EMULATES_UNDEFINED,
         JS_PropertyStub,
-        JS_PropertyStub,
+        JS_DeletePropertyStub,
         JS_PropertyStub,
         JS_StrictPropertyStub,
         JS_EnumerateStub,
@@ -4040,15 +4040,20 @@ its_addProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue
 }
 
 static JSBool
-its_delProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue vp)
+its_delProperty(JSContext *cx, HandleObject obj, HandleId id, JSBool *succeeded)
 {
-    if (!its_noisy)
+    if (!its_noisy) {
+        *succeeded = true;
         return true;
+    }
 
     ToStringHelper idString(cx, id);
+    if (idString.threw())
+        return false;
+
     fprintf(gOutFile, "deleting its property %s,", idString.getBytes());
-    ToStringHelper valueString(cx, vp);
-    fprintf(gOutFile, " initial value %s\n", valueString.getBytes());
+
+    *succeeded = true;
     return true;
 }
 
@@ -4397,7 +4402,7 @@ global_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
 
 JSClass global_class = {
     "global", JSCLASS_NEW_RESOLVE | JSCLASS_GLOBAL_FLAGS,
-    JS_PropertyStub,  JS_PropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,
     JS_PropertyStub,  JS_StrictPropertyStub,
     global_enumerate, (JSResolveOp) global_resolve,
     JS_ConvertStub,   NULL
@@ -4503,7 +4508,7 @@ env_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
 
 static JSClass env_class = {
     "environment", JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub,  JS_PropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,
     JS_PropertyStub,  env_setProperty,
     env_enumerate, (JSResolveOp) env_resolve,
     JS_ConvertStub
@@ -4602,7 +4607,7 @@ static JSFunctionSpec dom_methods[] = {
 static JSClass dom_class = {
     "FakeDOMObject", JSCLASS_IS_DOMJSCLASS | JSCLASS_HAS_RESERVED_SLOTS(2),
     JS_PropertyStub,       /* addProperty */
-    JS_PropertyStub,       /* delProperty */
+    JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
     JS_StrictPropertyStub, /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/tests/ecma_5/Array/reverse-order-of-low-high-accesses.js b/js/src/tests/ecma_5/Array/reverse-order-of-low-high-accesses.js
new file mode 100644
index 000000000000..a9b1e80deb2d
--- /dev/null
+++ b/js/src/tests/ecma_5/Array/reverse-order-of-low-high-accesses.js
@@ -0,0 +1,88 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 858677;
+var summary =
+  "[].reverse should swap elements low to high using accesses to low " +
+  "elements, then accesses to high elements";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+var observed = [];
+
+// (0, 7) hits the lowerExists/upperExists case.
+// (1, 6) hits the !lowerExists/upperExists case.
+// (2, 5) hits the lowerExists/!upperExists case.
+// (3, 4) hits the !lowerExists/!upperExists case.
+//
+// It'd be a good idea to have a second version of this test at some point
+// where the "array" being reversed is a proxy, to detect proper ordering of
+// getproperty, hasproperty, setproperty into a hole, and deleteproperty from a
+// non-configurable element.  But at present our Array.prototype.reverse
+// implementation probably doesn't conform fully to all this (because our
+// internal MOP is still slightly off), so punt for now.
+var props =
+  {
+    0: {
+      configurable: true,
+      get: function() { observed.push("index 0 get"); return "index 0 get"; },
+      set: function(v) { observed.push("index 0 set: " + v); }
+    },
+    /* 1: hole */
+    2: {
+      configurable: true,
+      get: function() { observed.push("index 2 get"); return "index 2 get"; },
+      set: function(v) { observed.push("index 2 set: " + v); }
+    },
+    /* 3: hole */
+    /* 4: hole */
+    /* 5: hole */
+    6: {
+      configurable: true,
+      get: function() { observed.push("index 6 get"); return "index 6 get"; },
+      set: function(v) { observed.push("index 6 set: " + v); }
+    },
+    7: {
+      configurable: true,
+      get: function() { observed.push("index 7 get"); return "index 7 get"; },
+      set: function(v) { observed.push("index 7 set: " + v); }
+    },
+  };
+
+var arr = Object.defineProperties(new Array(8), props);
+
+arr.reverse();
+
+var expectedObserved =
+  ["index 0 get", "index 7 get", "index 0 set: index 7 get", "index 7 set: index 0 get",
+   "index 6 get",
+   "index 2 get"
+   /* nothing for 3/4 */];
+print(observed);
+// Do this before the assertions below futz even more with |observed|.
+assertEq(observed.length, expectedObserved.length);
+for (var i = 0; i < expectedObserved.length; i++)
+  assertEq(observed[i], expectedObserved[i]);
+
+assertEq(arr[0], "index 0 get"); // no deletion, setting doesn't overwrite
+assertEq(arr[1], "index 6 get"); // copies result of getter
+assertEq(2 in arr, false); // deleted
+assertEq(3 in arr, false); // never there
+assertEq(4 in arr, false); // never there
+assertEq(arr[5], "index 2 get"); // copies result of getter
+assertEq(6 in arr, false); // deleted
+assertEq(arr[7], "index 7 get"); // no deletion, setter doesn't overwrite
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("Tests complete");
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index f53e0d639d31..9e77cf3e6da1 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -210,7 +210,7 @@ ArgumentsObject::createUnexpected(JSContext *cx, AbstractFramePtr frame)
 }
 
 static JSBool
-args_delProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue vp)
+args_delProperty(JSContext *cx, HandleObject obj, HandleId id, JSBool *succeeded)
 {
     ArgumentsObject &argsobj = obj->asArguments();
     if (JSID_IS_INT(id)) {
@@ -222,6 +222,7 @@ args_delProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValu
     } else if (JSID_IS_ATOM(id, cx->names().callee)) {
         argsobj.asNormalArguments().clearCallee();
     }
+    *succeeded = true;
     return true;
 }
 
@@ -289,8 +290,8 @@ ArgSetter(JSContext *cx, HandleObject obj, HandleId id, JSBool strict, MutableHa
      * of setting it in case the user has changed the prototype to an object
      * that has a setter for this id.
      */
-    RootedValue value(cx);
-    return baseops::DeleteGeneric(cx, obj, id, &value, false) &&
+    JSBool succeeded;
+    return baseops::DeleteGeneric(cx, obj, id, &succeeded) &&
            baseops::DefineGeneric(cx, obj, id, vp, NULL, NULL, attrs);
 }
 
@@ -408,8 +409,8 @@ StrictArgSetter(JSContext *cx, HandleObject obj, HandleId id, JSBool strict, Mut
      * args_delProperty to clear the corresponding reserved slot so the GC can
      * collect its value.
      */
-    RootedValue value(cx);
-    return baseops::DeleteGeneric(cx, argsobj, id, &value, strict) &&
+    JSBool succeeded;
+    return baseops::DeleteGeneric(cx, argsobj, id, &succeeded) &&
            baseops::DefineGeneric(cx, argsobj, id, vp, NULL, NULL, attrs);
 }
 
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 1f822c2d3141..032867ff5841 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1659,7 +1659,7 @@ Class Debugger::jsclass = {
     "Debugger",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUG_COUNT),
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Debugger::finalize,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
@@ -2696,7 +2696,7 @@ Class DebuggerScript_class = {
     "Script",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGSCRIPT_COUNT),
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
@@ -3497,7 +3497,7 @@ DebuggerFrame_finalize(FreeOp *fop, RawObject obj)
 
 Class DebuggerFrame_class = {
     "Frame", JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGFRAME_COUNT),
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, DebuggerFrame_finalize
 };
 
@@ -3642,7 +3642,7 @@ DebuggerFrame_getOlder(JSContext *cx, unsigned argc, Value *vp)
 
 Class DebuggerArguments_class = {
     "Arguments", JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGARGUMENTS_COUNT),
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
@@ -4093,7 +4093,7 @@ Class DebuggerObject_class = {
     "Object",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGOBJECT_COUNT),
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
@@ -4542,8 +4542,12 @@ DebuggerObject_deleteProperty(JSContext *cx, unsigned argc, Value *vp)
     if (!cx->compartment->wrap(cx, &nameArg))
         return false;
 
+    JSBool succeeded;
     ErrorCopier ec(ac, dbg->toJSObject());
-    return JSObject::deleteByValue(cx, obj, nameArg, args.rval(), false);
+    if (!JSObject::deleteByValue(cx, obj, nameArg, &succeeded))
+        return false;
+    args.rval().setBoolean(succeeded);
+    return true;
 }
 
 enum SealHelperOp { Seal, Freeze, PreventExtensions };
@@ -4881,7 +4885,7 @@ Class DebuggerEnv_class = {
     "Environment",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGENV_COUNT),
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index b6716c25683e..97e2300eebf4 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -576,7 +576,7 @@ GlobalDebuggees_finalize(FreeOp *fop, RawObject obj)
 static Class
 GlobalDebuggees_class = {
     "GlobalDebuggee", JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, GlobalDebuggees_finalize
 };
 
diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
index e5dc014b5ba6..b2fe90262352 100644
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -209,7 +209,7 @@ Class js::RegExpClass = {
     JSCLASS_HAS_RESERVED_SLOTS(RegExpObject::RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_RegExp),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,        /* enumerate */
diff --git a/js/src/vm/RegExpStatics.cpp b/js/src/vm/RegExpStatics.cpp
index ff4b46b514b8..8f2b761fcaec 100644
--- a/js/src/vm/RegExpStatics.cpp
+++ b/js/src/vm/RegExpStatics.cpp
@@ -41,7 +41,7 @@ Class js::RegExpStaticsClass = {
     "RegExpStatics",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS,
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index d101aaf222c4..91025f40cbcf 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -260,7 +260,7 @@ JS_PUBLIC_DATA(Class) js::CallClass = {
     "Call",
     JSCLASS_IS_ANONYMOUS | JSCLASS_HAS_RESERVED_SLOTS(CallObject::RESERVED_SLOTS),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -273,7 +273,7 @@ Class js::DeclEnvClass = {
     JSCLASS_HAS_RESERVED_SLOTS(DeclEnvObject::RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -516,26 +516,26 @@ with_SetSpecialAttributes(JSContext *cx, HandleObject obj, HandleSpecialId sid,
 
 static JSBool
 with_DeleteProperty(JSContext *cx, HandleObject obj, HandlePropertyName name,
-                    MutableHandleValue rval, JSBool strict)
+                    JSBool *succeeded)
 {
     RootedObject actual(cx, &obj->asWith().object());
-    return JSObject::deleteProperty(cx, actual, name, rval, strict);
+    return JSObject::deleteProperty(cx, actual, name, succeeded);
 }
 
 static JSBool
 with_DeleteElement(JSContext *cx, HandleObject obj, uint32_t index,
-                   MutableHandleValue rval, JSBool strict)
+                   JSBool *succeeded)
 {
     RootedObject actual(cx, &obj->asWith().object());
-    return JSObject::deleteElement(cx, actual, index, rval, strict);
+    return JSObject::deleteElement(cx, actual, index, succeeded);
 }
 
 static JSBool
 with_DeleteSpecial(JSContext *cx, HandleObject obj, HandleSpecialId sid,
-                   MutableHandleValue rval, JSBool strict)
+                   JSBool *succeeded)
 {
     RootedObject actual(cx, &obj->asWith().object());
-    return JSObject::deleteSpecial(cx, actual, sid, rval, strict);
+    return JSObject::deleteSpecial(cx, actual, sid, succeeded);
 }
 
 static JSBool
@@ -557,7 +557,7 @@ Class js::WithClass = {
     JSCLASS_HAS_RESERVED_SLOTS(WithObject::RESERVED_SLOTS) |
     JSCLASS_IS_ANONYMOUS,
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
@@ -715,7 +715,7 @@ Class js::BlockClass = {
     JSCLASS_HAS_RESERVED_SLOTS(BlockObject::RESERVED_SLOTS) |
     JSCLASS_IS_ANONYMOUS,
     JS_PropertyStub,         /* addProperty */
-    JS_PropertyStub,         /* delProperty */
+    JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index a6aa8f4f0212..0fed32c33a84 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -38,7 +38,7 @@ selfHosting_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *rep
 
 static JSClass self_hosting_global_class = {
     "self-hosting-global", JSCLASS_GLOBAL_FLAGS,
-    JS_PropertyStub,  JS_PropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,
     JS_PropertyStub,  JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub,
     JS_ConvertStub,   NULL

From 763718651b141cdc2ad572ec4c41a5753f94b1d6 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 5 Apr 2013 21:22:55 -0700
Subject: [PATCH 126/438] Bug 858677 - Fix up code not built by SpiderMonkey to
 use the newly-changed deletion signatures.  r=bholley, r=billm

---
 content/xbl/src/nsXBLBinding.cpp              |  3 +-
 content/xbl/src/nsXBLDocumentInfo.cpp         |  2 +-
 .../document/src/nsXULPrototypeDocument.cpp   |  2 +-
 dom/base/nsDOMClassInfo.cpp                   | 22 ++++-----
 dom/base/nsDOMClassInfo.h                     |  2 +-
 dom/bindings/Codegen.py                       |  6 +--
 dom/indexedDB/IDBObjectStore.cpp              |  4 +-
 dom/plugins/base/nsJSNPRuntime.cpp            | 12 +++--
 dom/workers/Events.cpp                        |  8 ++--
 dom/workers/Exceptions.cpp                    |  2 +-
 dom/workers/File.cpp                          |  4 +-
 dom/workers/ImageData.cpp                     |  2 +-
 dom/workers/Location.cpp                      |  2 +-
 dom/workers/Navigator.cpp                     |  2 +-
 dom/workers/Worker.cpp                        |  8 ++--
 dom/workers/WorkerScope.cpp                   |  6 +--
 js/ipc/ObjectWrapperChild.cpp                 |  2 +-
 js/ipc/ObjectWrapperParent.cpp                | 43 +++++++++++++++--
 js/ipc/ObjectWrapperParent.h                  |  4 +-
 js/jsd/jsd_high.cpp                           |  2 +-
 js/src/ctypes/CTypes.cpp                      | 26 +++++------
 js/src/ctypes/Library.cpp                     |  2 +-
 js/xpconnect/idl/nsIXPCScriptable.idl         |  5 +-
 js/xpconnect/loader/mozJSComponentLoader.cpp  |  2 +-
 js/xpconnect/public/xpc_map_end.h             |  2 +-
 js/xpconnect/shell/xpcshell.cpp               |  4 +-
 js/xpconnect/src/XPCComponents.cpp            |  2 +-
 js/xpconnect/src/XPCJSContextStack.cpp        |  2 +-
 js/xpconnect/src/XPCQuickStubs.cpp            |  2 +-
 js/xpconnect/src/XPCWrappedNativeJSOps.cpp    | 46 ++++++++++++++-----
 js/xpconnect/src/XPCWrappedNativeScope.cpp    |  2 +-
 js/xpconnect/wrappers/XrayWrapper.cpp         |  4 +-
 netwerk/base/src/ProxyAutoConfig.cpp          |  2 +-
 startupcache/test/TestStartupCache.cpp        |  2 +-
 toolkit/components/telemetry/Telemetry.cpp    |  2 +-
 tools/profiler/SaveProfileTask.h              |  2 +-
 36 files changed, 154 insertions(+), 91 deletions(-)

diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp
index c2e48f8fd846..e5ff15be2741 100644
--- a/content/xbl/src/nsXBLBinding.cpp
+++ b/content/xbl/src/nsXBLBinding.cpp
@@ -101,7 +101,8 @@ nsXBLJSClass::nsXBLJSClass(const nsAFlatCString& aClassName,
     JSCLASS_NEW_RESOLVE |
     // Our one reserved slot holds the relevant nsXBLPrototypeBinding
     JSCLASS_HAS_RESERVED_SLOTS(1);
-  addProperty = delProperty = getProperty = ::JS_PropertyStub;
+  addProperty = getProperty = ::JS_PropertyStub;
+  delProperty = ::JS_DeletePropertyStub;
   setProperty = ::JS_StrictPropertyStub;
   enumerate = XBLEnumerate;
   resolve = JS_ResolveStub;
diff --git a/content/xbl/src/nsXBLDocumentInfo.cpp b/content/xbl/src/nsXBLDocumentInfo.cpp
index 16cca7e11e47..fef1da79af36 100644
--- a/content/xbl/src/nsXBLDocumentInfo.cpp
+++ b/content/xbl/src/nsXBLDocumentInfo.cpp
@@ -173,7 +173,7 @@ JSClass nsXBLDocGlobalObject::gSharedGlobalClass = {
     "nsXBLPrototypeScript compilation scope",
     JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS |
     JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_GLOBAL_FLAGS_WITH_SLOTS(0),
-    JS_PropertyStub,  JS_PropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,
     nsXBLDocGlobalObject_getProperty, nsXBLDocGlobalObject_setProperty,
     JS_EnumerateStub, nsXBLDocGlobalObject_resolve,
     JS_ConvertStub, nsXBLDocGlobalObject_finalize,
diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/content/xul/document/src/nsXULPrototypeDocument.cpp
index 8a1bd0500311..a3b04196caac 100644
--- a/content/xul/document/src/nsXULPrototypeDocument.cpp
+++ b/content/xul/document/src/nsXULPrototypeDocument.cpp
@@ -114,7 +114,7 @@ JSClass nsXULPDGlobalObject::gSharedGlobalClass = {
     "nsXULPrototypeScript compilation scope",
     JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS |
     JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_GLOBAL_FLAGS_WITH_SLOTS(0),
-    JS_PropertyStub,  JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, nsXULPDGlobalObject_resolve,  JS_ConvertStub,
     nsXULPDGlobalObject_finalize, nullptr, nullptr, nullptr, nullptr,
     nullptr
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index ebe23a56adc0..3a7a3c3cf3fb 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -1386,7 +1386,7 @@ NS_INTERFACE_MAP_END
 
 static JSClass sDOMConstructorProtoClass = {
   "DOM Constructor.prototype", 0,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, nullptr
 };
 
@@ -2681,8 +2681,7 @@ nsDOMClassInfo::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
 NS_IMETHODIMP
 nsDOMClassInfo::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                            JSObject *obj, jsid id, jsval *vp,
-                            bool *_retval)
+                            JSObject *obj, jsid id, bool *_retval)
 {
   NS_WARNING("nsDOMClassInfo::DelProperty Don't call me!");
 
@@ -3176,7 +3175,7 @@ static JSClass sGlobalScopePolluterClass = {
   "Global Scope Polluter",
   JSCLASS_NEW_RESOLVE,
   JS_PropertyStub,
-  JS_PropertyStub,
+  JS_DeletePropertyStub,
   nsWindowSH::GlobalScopePolluterGetProperty,
   JS_StrictPropertyStub,
   JS_EnumerateStub,
@@ -6316,7 +6315,7 @@ static JSClass sHTMLDocumentAllClass = {
   JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_NEW_RESOLVE |
   JSCLASS_EMULATES_UNDEFINED | JSCLASS_HAS_RESERVED_SLOTS(1),
   JS_PropertyStub,                                         /* addProperty */
-  JS_PropertyStub,                                         /* delProperty */
+  JS_DeletePropertyStub,                                   /* delProperty */
   nsHTMLDocumentSH::DocumentAllGetProperty,                /* getProperty */
   JS_StrictPropertyStub,                                   /* setProperty */
   JS_EnumerateStub,
@@ -6332,7 +6331,7 @@ static JSClass sHTMLDocumentAllHelperClass = {
   "HTML document.all helper class",
   JSCLASS_NEW_RESOLVE,
   JS_PropertyStub,                                         /* addProperty */
-  JS_PropertyStub,                                         /* delProperty */
+  JS_DeletePropertyStub,                                   /* delProperty */
   nsHTMLDocumentSH::DocumentAllHelperGetProperty,          /* getProperty */
   JS_StrictPropertyStub,                                   /* setProperty */
   JS_EnumerateStub,
@@ -6345,7 +6344,7 @@ static JSClass sHTMLDocumentAllTagsClass = {
   "HTML document.all.tags class",
   JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
   JS_PropertyStub,                                         /* addProperty */
-  JS_PropertyStub,                                         /* delProperty */
+  JS_DeletePropertyStub,                                   /* delProperty */
   JS_PropertyStub,                                         /* getProperty */
   JS_StrictPropertyStub,                                   /* setProperty */
   JS_EnumerateStub,
@@ -7429,7 +7428,7 @@ nsStorage2SH::SetProperty(nsIXPConnectWrappedNative *wrapper,
 NS_IMETHODIMP
 nsStorage2SH::DelProperty(nsIXPConnectWrappedNative *wrapper,
                           JSContext *cx, JSObject *obj, jsid id,
-                          jsval *vp, bool *_retval)
+                          bool *_retval)
 {
   nsCOMPtr<nsIDOMStorage> storage(do_QueryWrappedNative(wrapper));
   NS_ENSURE_TRUE(storage, NS_ERROR_UNEXPECTED);
@@ -7441,11 +7440,12 @@ nsStorage2SH::DelProperty(nsIXPConnectWrappedNative *wrapper,
   NS_ENSURE_TRUE(keyStr.init(cx, key), NS_ERROR_UNEXPECTED);
 
   nsresult rv = storage->RemoveItem(keyStr);
-  if (NS_SUCCEEDED(rv)) {
-    rv = NS_SUCCESS_I_DID_SOMETHING;
+  if (NS_FAILED(rv)) {
+    return rv;
   }
 
-  return rv;
+  *_retval = true;
+  return NS_SUCCESS_I_DID_SOMETHING;
 }
 
 
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index bb16a11f48fd..a4cdc6adb246 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -1041,7 +1041,7 @@ protected:
   NS_IMETHOD GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, jsid id, jsval *vp, bool *_retval);
   NS_IMETHOD DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                         JSObject *obj, jsid id, jsval *vp, bool *_retval);
+                         JSObject *obj, jsid id, bool *_retval);
   NS_IMETHOD NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                           JSObject *obj, uint32_t enum_op, jsval *statep,
                           jsid *idp, bool *_retval);
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 8e3e027c1355..aca253ae9aea 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -174,7 +174,7 @@ DOMJSClass Class = {
   { "%s",
     %s,
     %s, /* addProperty */
-    JS_PropertyStub,       /* delProperty */
+    JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
     JS_StrictPropertyStub, /* setProperty */
     JS_EnumerateStub,
@@ -223,7 +223,7 @@ class CGPrototypeJSClass(CGThing):
     "%sPrototype",
     JSCLASS_IS_DOMIFACEANDPROTOJSCLASS | JSCLASS_HAS_RESERVED_SLOTS(2),
     JS_PropertyStub,       /* addProperty */
-    JS_PropertyStub,       /* delProperty */
+    JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
     JS_StrictPropertyStub, /* setProperty */
     JS_EnumerateStub,
@@ -277,7 +277,7 @@ static DOMIfaceAndProtoJSClass InterfaceObjectClass = {
     "Function",
     JSCLASS_IS_DOMIFACEANDPROTOJSCLASS | JSCLASS_HAS_RESERVED_SLOTS(DOM_INTERFACE_SLOTS_BASE + %i),
     JS_PropertyStub,       /* addProperty */
-    JS_PropertyStub,       /* delProperty */
+    JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
     JS_StrictPropertyStub, /* setProperty */
     JS_EnumerateStub,
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index 9519ba58b90d..2ab1060cd5d0 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -570,7 +570,7 @@ class ThreadLocalJSRuntime
 JSClass ThreadLocalJSRuntime::sGlobalClass = {
   "IndexedDBTransactionThreadGlobal",
   JSCLASS_GLOBAL_FLAGS,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
@@ -835,7 +835,7 @@ public:
 
 JSClass IDBObjectStore::sDummyPropJSClass = {
   "dummy", 0,
-  JS_PropertyStub,  JS_PropertyStub,
+  JS_PropertyStub,  JS_DeletePropertyStub,
   JS_PropertyStub,  JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub,
   JS_ConvertStub
diff --git a/dom/plugins/base/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp
index f629afad7ca7..4f600ffe32e6 100644
--- a/dom/plugins/base/nsJSNPRuntime.cpp
+++ b/dom/plugins/base/nsJSNPRuntime.cpp
@@ -115,7 +115,7 @@ static JSBool
 NPObjWrapper_AddProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp);
 
 static JSBool
-NPObjWrapper_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp);
+NPObjWrapper_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool *succeeded);
 
 static JSBool
 NPObjWrapper_SetProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool strict,
@@ -188,7 +188,7 @@ NPObjectMember_Trace(JSTracer *trc, JSObject *obj);
 static JSClass sNPObjectMemberClass =
   {
     "NPObject Ambiguous Member class", JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS,
-    JS_PropertyStub, JS_PropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub,
     JS_PropertyStub, JS_StrictPropertyStub, JS_EnumerateStub,
     JS_ResolveStub, NPObjectMember_Convert,
     NPObjectMember_Finalize, nullptr, NPObjectMember_Call,
@@ -1197,7 +1197,7 @@ NPObjWrapper_AddProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMut
 }
 
 static JSBool
-NPObjWrapper_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp)
+NPObjWrapper_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool *succeeded)
 {
   NPObject *npobj = GetNPObject(cx, obj);
 
@@ -1217,12 +1217,14 @@ NPObjWrapper_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMut
     if (!ReportExceptionIfPending(cx))
       return JS_FALSE;
 
-    if (!hasProperty)
+    if (!hasProperty) {
+      *succeeded = true;
       return JS_TRUE;
+    }
   }
 
   if (!npobj->_class->removeProperty(npobj, identifier))
-    vp.set(JSVAL_FALSE);
+    *succeeded = false;
 
   return ReportExceptionIfPending(cx);
 }
diff --git a/dom/workers/Events.cpp b/dom/workers/Events.cpp
index 0fb2406ee4a1..8d62b3440a1a 100644
--- a/dom/workers/Events.cpp
+++ b/dom/workers/Events.cpp
@@ -331,7 +331,7 @@ private:
   JSClass _varname = { \
     _name, \
     JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT), \
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, \
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub, \
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize \
   };
 
@@ -586,7 +586,7 @@ private:
   JSClass _varname = { \
     _name, \
     JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT), \
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, \
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub, \
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize \
   };
 
@@ -772,7 +772,7 @@ private:
   JSClass _varname = { \
     _name, \
     JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT), \
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, \
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub, \
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize \
   };
 
@@ -951,7 +951,7 @@ private:
 JSClass ProgressEvent::sClass = {
   "ProgressEvent",
   JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize
 };
 
diff --git a/dom/workers/Exceptions.cpp b/dom/workers/Exceptions.cpp
index 9766bb85c9d9..ed212f319a41 100644
--- a/dom/workers/Exceptions.cpp
+++ b/dom/workers/Exceptions.cpp
@@ -157,7 +157,7 @@ private:
 JSClass DOMException::sClass = {
   "DOMException",
   JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize
 };
 
diff --git a/dom/workers/File.cpp b/dom/workers/File.cpp
index 047c0ca61cdf..7e59e7e0776f 100644
--- a/dom/workers/File.cpp
+++ b/dom/workers/File.cpp
@@ -203,7 +203,7 @@ private:
 JSClass Blob::sClass = {
   "Blob",
   JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize
 };
 
@@ -370,7 +370,7 @@ private:
 JSClass File::sClass = {
   "File",
   JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize
 };
 
diff --git a/dom/workers/ImageData.cpp b/dom/workers/ImageData.cpp
index 90fd6498a968..85d533fab0a2 100644
--- a/dom/workers/ImageData.cpp
+++ b/dom/workers/ImageData.cpp
@@ -135,7 +135,7 @@ private:
 JSClass ImageData::sClass = {
   "ImageData",
   JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize
 };
 
diff --git a/dom/workers/Location.cpp b/dom/workers/Location.cpp
index 21bfd098da76..772e8d4214e4 100644
--- a/dom/workers/Location.cpp
+++ b/dom/workers/Location.cpp
@@ -149,7 +149,7 @@ private:
 JSClass Location::sClass = {
   "WorkerLocation",
   JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize
 };
 
diff --git a/dom/workers/Navigator.cpp b/dom/workers/Navigator.cpp
index 3e898b84e811..69b45625e5aa 100644
--- a/dom/workers/Navigator.cpp
+++ b/dom/workers/Navigator.cpp
@@ -138,7 +138,7 @@ private:
 JSClass Navigator::sClass = {
   "WorkerNavigator",
   JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize
 };
 
diff --git a/dom/workers/Worker.cpp b/dom/workers/Worker.cpp
index 8abc5359fea9..387b3bdfcd8a 100644
--- a/dom/workers/Worker.cpp
+++ b/dom/workers/Worker.cpp
@@ -301,7 +301,7 @@ DOMJSClass Worker::sClass = {
     "Worker",
     JSCLASS_IS_DOMJSCLASS | JSCLASS_HAS_RESERVED_SLOTS(3) |
     JSCLASS_IMPLEMENTS_BARRIERS,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize,
     NULL, NULL, NULL, NULL, Trace
   },
@@ -321,7 +321,7 @@ DOMIfaceAndProtoJSClass Worker::sProtoClass = {
     "Worker",
     JSCLASS_IS_DOMIFACEANDPROTOJSCLASS | JSCLASS_HAS_RESERVED_SLOTS(2),
     JS_PropertyStub,       /* addProperty */
-    JS_PropertyStub,       /* delProperty */
+    JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
     JS_StrictPropertyStub, /* setProperty */
     JS_EnumerateStub,
@@ -464,7 +464,7 @@ DOMJSClass ChromeWorker::sClass = {
   { "ChromeWorker",
     JSCLASS_IS_DOMJSCLASS | JSCLASS_HAS_RESERVED_SLOTS(3) |
     JSCLASS_IMPLEMENTS_BARRIERS,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize,
     NULL, NULL, NULL, NULL, Trace,
   },
@@ -484,7 +484,7 @@ DOMIfaceAndProtoJSClass ChromeWorker::sProtoClass = {
     "ChromeWorker",
     JSCLASS_IS_DOMIFACEANDPROTOJSCLASS | JSCLASS_HAS_RESERVED_SLOTS(2),
     JS_PropertyStub,       /* addProperty */
-    JS_PropertyStub,       /* delProperty */
+    JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
     JS_StrictPropertyStub, /* setProperty */
     JS_EnumerateStub,
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
index e13a1142c8f8..81036b51677f 100644
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -612,7 +612,7 @@ private:
 JSClass WorkerGlobalScope::sClass = {
   "WorkerGlobalScope",
   0,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
@@ -878,7 +878,7 @@ DOMJSClass DedicatedWorkerGlobalScope::sClass = {
     "DedicatedWorkerGlobalScope",
     JSCLASS_DOM_GLOBAL | JSCLASS_IS_DOMJSCLASS | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_GLOBAL_FLAGS_WITH_SLOTS(3) | JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, reinterpret_cast<JSResolveOp>(Resolve), JS_ConvertStub,
     Finalize, NULL, NULL, NULL, NULL, Trace
   },
@@ -898,7 +898,7 @@ DOMIfaceAndProtoJSClass DedicatedWorkerGlobalScope::sProtoClass = {
     "DedicatedWorkerGlobalScope",
     JSCLASS_IS_DOMIFACEANDPROTOJSCLASS | JSCLASS_HAS_RESERVED_SLOTS(2),
     JS_PropertyStub,       /* addProperty */
-    JS_PropertyStub,       /* delProperty */
+    JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
     JS_StrictPropertyStub, /* setProperty */
     JS_EnumerateStub,
diff --git a/js/ipc/ObjectWrapperChild.cpp b/js/ipc/ObjectWrapperChild.cpp
index 7c90e3612cb0..7eb823a5440f 100644
--- a/js/ipc/ObjectWrapperChild.cpp
+++ b/js/ipc/ObjectWrapperChild.cpp
@@ -400,7 +400,7 @@ static const JSClass sCPOW_NewEnumerateState_JSClass = {
     "CPOW NewEnumerate State",
     JSCLASS_HAS_PRIVATE |
     JSCLASS_HAS_RESERVED_SLOTS(sNumNewEnumerateStateSlots),
-    JS_PropertyStub,  JS_PropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,
     JS_PropertyStub,  JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub,
     JS_ConvertStub,   CPOW_NewEnumerateState_Finalize
diff --git a/js/ipc/ObjectWrapperParent.cpp b/js/ipc/ObjectWrapperParent.cpp
index 9a80c99e7690..61a607107328 100644
--- a/js/ipc/ObjectWrapperParent.cpp
+++ b/js/ipc/ObjectWrapperParent.cpp
@@ -274,6 +274,43 @@ ObjectWrapperParent::jsval_from_JSVariant(JSContext* cx, const JSVariant& from,
     }
 }
 
+/*static*/ bool
+ObjectWrapperParent::boolean_from_JSVariant(JSContext* cx, const JSVariant& from,
+                                            JSBool* to)
+{
+    switch (from.type()) {
+    case JSVariant::Tvoid_t:
+        *to = false;
+        return true;
+    case JSVariant::TPObjectWrapperParent: {
+        JS::Rooted<JS::Value> v(cx);
+        if (!jsval_from_PObjectWrapperParent(cx, from.get_PObjectWrapperParent(), v.address()))
+            return false;
+        *to = JS::ToBoolean(v);
+        return true;
+    }
+    case JSVariant::TnsString:
+        {
+            JSString* str = JS_NewUCStringCopyZ(cx, from.get_nsString().BeginReading());
+            if (!str)
+                return false;
+            *to = JS::ToBoolean(JS::StringValue(str));
+            return true;
+        }
+    case JSVariant::Tint:
+        *to = from.get_int() != 0;
+        return true;
+    case JSVariant::Tdouble:
+        *to = JS::ToBoolean(JS::DoubleValue(from.get_double()));
+        return true;
+    case JSVariant::Tbool:
+        *to = from.get_bool();
+        return true;
+    default:
+        return false;
+    }
+}
+
 /*static*/ bool
 ObjectWrapperParent::
 JSObject_to_PObjectWrapperParent(JSContext* cx, JSObject* from, PObjectWrapperParent** to)
@@ -432,7 +469,7 @@ ObjectWrapperParent::CPOW_SetProperty(JSContext *cx, JSHandleObject obj, JSHandl
     
 /*static*/ JSBool
 ObjectWrapperParent::CPOW_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id,
-                                      JSMutableHandleValue vp)
+                                      JSBool *succeeded)
 {
     CPOW_LOG(("Calling CPOW_DelProperty (%s)...",
               JSVAL_TO_CSTR(cx, id)));
@@ -454,7 +491,7 @@ ObjectWrapperParent::CPOW_DelProperty(JSContext *cx, JSHandleObject obj, JSHandl
             self->CallDelProperty(in_id,
                                   aco.StatusPtr(), &out_v) &&
             aco.Ok() &&
-            jsval_from_JSVariant(cx, out_v, vp.address()));
+            boolean_from_JSVariant(cx, out_v, succeeded));
 }
 
 JSBool
@@ -691,4 +728,4 @@ ObjectWrapperParent::CPOW_HasInstance(JSContext *cx, JSHandleObject obj, JSMutab
             self->CallHasInstance(in_v,
                                   aco.StatusPtr(), bp) &&
             aco.Ok());
-}
\ No newline at end of file
+}
diff --git a/js/ipc/ObjectWrapperParent.h b/js/ipc/ObjectWrapperParent.h
index a389b52956d9..89b2e5139a70 100644
--- a/js/ipc/ObjectWrapperParent.h
+++ b/js/ipc/ObjectWrapperParent.h
@@ -63,7 +63,7 @@ private:
     CPOW_AddProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp);
 
     static JSBool
-    CPOW_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp);
+    CPOW_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool *succeeded);
 
     static JSBool
     CPOW_GetProperty(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp);
@@ -100,6 +100,8 @@ private:
     static bool jsval_to_JSVariant(JSContext* cx, jsval from, JSVariant* to);
     static bool jsval_from_JSVariant(JSContext* cx, const JSVariant& from,
                                      jsval* to);
+    static bool boolean_from_JSVariant(JSContext* cx, const JSVariant& from,
+                                       JSBool* to);
     static bool
     JSObject_to_PObjectWrapperParent(JSContext* cx, JSObject* from, PObjectWrapperParent** to);
     static bool
diff --git a/js/jsd/jsd_high.cpp b/js/jsd/jsd_high.cpp
index 3a7bea446e36..9ba321cd5e1f 100644
--- a/js/jsd/jsd_high.cpp
+++ b/js/jsd/jsd_high.cpp
@@ -52,7 +52,7 @@ CreateJSDGlobal(JSContext *cx, JSClass *clasp);
 static JSClass global_class = {
     "JSDGlobal", JSCLASS_GLOBAL_FLAGS |
     JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_StrictPropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,  JS_PropertyStub,  JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   global_finalize
 };
 
diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
index 4b29ed0ed1e5..e7213fc80c9f 100644
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@@ -444,14 +444,14 @@ namespace UInt64 {
 static JSClass sCTypesGlobalClass = {
   "ctypes",
   JSCLASS_HAS_RESERVED_SLOTS(CTYPESGLOBAL_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
 static JSClass sCABIClass = {
   "CABI",
   JSCLASS_HAS_RESERVED_SLOTS(CABI_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
@@ -461,7 +461,7 @@ static JSClass sCABIClass = {
 static JSClass sCTypeProtoClass = {
   "CType",
   JSCLASS_HAS_RESERVED_SLOTS(CTYPEPROTO_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, CType::FinalizeProtoClass,
   NULL, ConstructAbstract, NULL, ConstructAbstract
 };
@@ -471,14 +471,14 @@ static JSClass sCTypeProtoClass = {
 static JSClass sCDataProtoClass = {
   "CData",
   0,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
 static JSClass sCTypeClass = {
   "CType",
   JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_HAS_RESERVED_SLOTS(CTYPE_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, CType::Finalize,
   NULL, CType::ConstructData, CType::HasInstance, CType::ConstructData,
   CType::Trace
@@ -487,7 +487,7 @@ static JSClass sCTypeClass = {
 static JSClass sCDataClass = {
   "CData",
   JSCLASS_HAS_RESERVED_SLOTS(CDATA_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, ArrayType::Getter, ArrayType::Setter,
+  JS_PropertyStub, JS_DeletePropertyStub, ArrayType::Getter, ArrayType::Setter,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, CData::Finalize,
   NULL, FunctionType::Call, NULL, FunctionType::Call
 };
@@ -495,7 +495,7 @@ static JSClass sCDataClass = {
 static JSClass sCClosureClass = {
   "CClosure",
   JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_HAS_RESERVED_SLOTS(CCLOSURE_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, CClosure::Finalize,
   NULL, NULL, NULL, NULL, CClosure::Trace
 };
@@ -506,7 +506,7 @@ static JSClass sCClosureClass = {
 static JSClass sCDataFinalizerProtoClass = {
   "CDataFinalizer",
   0,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
@@ -519,7 +519,7 @@ static JSClass sCDataFinalizerProtoClass = {
 static JSClass sCDataFinalizerClass = {
   "CDataFinalizer",
   JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(CDATAFINALIZER_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, CDataFinalizer::Finalize,
 };
 
@@ -679,28 +679,28 @@ static JSFunctionSpec sFunctionInstanceFunctions[] = {
 static JSClass sInt64ProtoClass = {
   "Int64",
   0,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
 static JSClass sUInt64ProtoClass = {
   "UInt64",
   0,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
 static JSClass sInt64Class = {
   "Int64",
   JSCLASS_HAS_RESERVED_SLOTS(INT64_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Int64Base::Finalize
 };
 
 static JSClass sUInt64Class = {
   "UInt64",
   JSCLASS_HAS_RESERVED_SLOTS(INT64_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Int64Base::Finalize
 };
 
diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp
index f76221331c25..1c2f8ea7c5ff 100644
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -33,7 +33,7 @@ typedef Rooted<JSFlatString*>    RootedFlatString;
 static JSClass sLibraryClass = {
   "Library",
   JSCLASS_HAS_RESERVED_SLOTS(LIBRARY_SLOTS),
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub,JS_ResolveStub, JS_ConvertStub, Library::Finalize
 };
 
diff --git a/js/xpconnect/idl/nsIXPCScriptable.idl b/js/xpconnect/idl/nsIXPCScriptable.idl
index 569f3ff42082..4315e4dacdcb 100644
--- a/js/xpconnect/idl/nsIXPCScriptable.idl
+++ b/js/xpconnect/idl/nsIXPCScriptable.idl
@@ -19,7 +19,7 @@
  * boolean to PR_TRUE before making the call.  Implementations may skip writing
  * to *_retval unless they want to return PR_FALSE.
  */
-[uuid(1236e34a-21e0-423c-a8c8-9b3f1e6d7060)]
+[uuid(33b9d098-e680-4e4c-88a2-57cccceac145)]
 interface nsIXPCScriptable : nsISupports
 {
     /* bitflags used for 'flags' (only 32 bits available!) */
@@ -84,8 +84,7 @@ interface nsIXPCScriptable : nsISupports
                        in JSValPtr vp);
 
     boolean delProperty(in nsIXPConnectWrappedNative wrapper,
-                       in JSContextPtr cx, in JSObjectPtr obj, in jsid id,
-                       in JSValPtr vp);
+                       in JSContextPtr cx, in JSObjectPtr obj, in jsid id);
 
     // The returnCode should be set to NS_SUCCESS_I_DID_SOMETHING if
     // this method does something.
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index ae12a414638a..1532b39c8f8a 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -81,7 +81,7 @@ static JSClass kFakeBackstagePassJSClass =
     "FakeBackstagePass",
     0,
     JS_PropertyStub,
-    JS_PropertyStub,
+    JS_DeletePropertyStub,
     JS_PropertyStub,
     JS_StrictPropertyStub,
     JS_EnumerateStub,
diff --git a/js/xpconnect/public/xpc_map_end.h b/js/xpconnect/public/xpc_map_end.h
index 70c40454cb16..d101c87ceafe 100644
--- a/js/xpconnect/public/xpc_map_end.h
+++ b/js/xpconnect/public/xpc_map_end.h
@@ -113,7 +113,7 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::AddProperty(nsIXPConnectWrappedNative *wrapper,
 #endif
 
 #ifndef XPC_MAP_WANT_DELPROPERTY
-NS_IMETHODIMP XPC_MAP_CLASSNAME::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, jsval * vp, bool *_retval)
+NS_IMETHODIMP XPC_MAP_CLASSNAME::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, bool *_retval)
     {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
 #endif
 
diff --git a/js/xpconnect/shell/xpcshell.cpp b/js/xpconnect/shell/xpcshell.cpp
index 767156623aa8..79492ef16c4e 100644
--- a/js/xpconnect/shell/xpcshell.cpp
+++ b/js/xpconnect/shell/xpcshell.cpp
@@ -848,7 +848,7 @@ static JSFunctionSpec glob_functions[] = {
 
 JSClass global_class = {
     "global", 0,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_StrictPropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,  JS_PropertyStub,  JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   nullptr
 };
 
@@ -969,7 +969,7 @@ env_resolve(JSContext *cx, JSHandleObject obj, JSHandleId id, unsigned flags,
 
 static JSClass env_class = {
     "environment", JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub,  JS_PropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,
     JS_PropertyStub,  env_setProperty,
     env_enumerate, (JSResolveOp) env_resolve,
     JS_ConvertStub,   nullptr
diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 9fc4e3148208..392f083a5f2d 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -2992,7 +2992,7 @@ sandbox_convert(JSContext *cx, JSHandleObject obj, JSType type, JSMutableHandleV
 static JSClass SandboxClass = {
     "Sandbox",
     XPCONNECT_GLOBAL_FLAGS,
-    JS_PropertyStub,   JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub,   JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     sandbox_enumerate, sandbox_resolve, sandbox_convert,  sandbox_finalize,
     NULL, NULL, NULL, NULL, TraceXPCGlobal
 };
diff --git a/js/xpconnect/src/XPCJSContextStack.cpp b/js/xpconnect/src/XPCJSContextStack.cpp
index cab07993ba79..f1d09ba659da 100644
--- a/js/xpconnect/src/XPCJSContextStack.cpp
+++ b/js/xpconnect/src/XPCJSContextStack.cpp
@@ -134,7 +134,7 @@ SafeFinalize(JSFreeOp *fop, JSObject* obj)
 static JSClass global_class = {
     "global_for_XPCJSContextStack_SafeJSContext",
     XPCONNECT_GLOBAL_FLAGS,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, SafeGlobalResolve, JS_ConvertStub, SafeFinalize,
     NULL, NULL, NULL, NULL, TraceXPCGlobal
 };
diff --git a/js/xpconnect/src/XPCQuickStubs.cpp b/js/xpconnect/src/XPCQuickStubs.cpp
index d734d27a73dd..8432193d51e2 100644
--- a/js/xpconnect/src/XPCQuickStubs.cpp
+++ b/js/xpconnect/src/XPCQuickStubs.cpp
@@ -94,7 +94,7 @@ PointerFinalize(JSFreeOp *fop, JSObject *obj)
 JSClass
 PointerHolderClass = {
     "Pointer", JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, PointerFinalize
 };
 
diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
index 35125019ffeb..de781293e608 100644
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -498,6 +498,13 @@ XPC_WN_CannotModifyPropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id
     return Throw(NS_ERROR_XPC_CANT_MODIFY_PROP_ON_WN, cx);
 }
 
+static JSBool
+XPC_WN_CantDeletePropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id,
+                              JSBool *succeeded)
+{
+    return Throw(NS_ERROR_XPC_CANT_MODIFY_PROP_ON_WN, cx);
+}
+
 static JSBool
 XPC_WN_CannotModifyStrictPropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool strict,
                                       JSMutableHandleValue vp)
@@ -759,7 +766,7 @@ XPCWrappedNativeJSClass XPC_WN_NoHelper_JSClass = {
 
     /* Mandatory non-null function pointer members. */
     XPC_WN_OnlyIWrite_AddPropertyStub, // addProperty
-    XPC_WN_CannotModifyPropertyStub,   // delProperty
+    XPC_WN_CantDeletePropertyStub,     // delProperty
     JS_PropertyStub,                   // getProperty
     XPC_WN_OnlyIWrite_SetPropertyStub, // setProperty
 
@@ -843,6 +850,21 @@ XPC_WN_MaybeResolvingStrictPropertyStub(JSContext *cx, JSHandleObject obj, JSHan
     return XPC_WN_MaybeResolvingPropertyStub(cx, obj, id, vp);
 }
 
+static JSBool
+XPC_WN_MaybeResolvingDeletePropertyStub(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool *succeeded)
+{
+    MORPH_SLIM_WRAPPER(cx, obj);
+    XPCCallContext ccx(JS_CALLER, cx, obj);
+    XPCWrappedNative* wrapper = ccx.GetWrapper();
+    THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);
+
+    if (ccx.GetResolvingWrapper() == wrapper) {
+        *succeeded = true;
+        return true;
+    }
+    return Throw(NS_ERROR_XPC_CANT_MODIFY_PROP_ON_WN, cx);
+}
+
 // macro fun!
 #define PRE_HELPER_STUB_NO_SLIM                                               \
     XPCWrappedNative* wrapper =                                               \
@@ -891,10 +913,10 @@ XPC_WN_Helper_AddProperty(JSContext *cx, JSHandleObject obj, JSHandleId id,
 
 static JSBool
 XPC_WN_Helper_DelProperty(JSContext *cx, JSHandleObject obj, JSHandleId id,
-                          JSMutableHandleValue vp)
+                          JSBool *succeeded)
 {
     PRE_HELPER_STUB
-    DelProperty(wrapper, cx, obj, id, vp.address(), &retval);
+    DelProperty(wrapper, cx, obj, id, &retval);
     POST_HELPER_STUB
 }
 
@@ -1311,15 +1333,15 @@ XPCNativeScriptableShared::PopulateJSClass()
         addProperty = XPC_WN_CannotModifyPropertyStub;
     mJSClass.base.addProperty = addProperty;
 
-    JSPropertyOp delProperty;
+    JSDeletePropertyOp delProperty;
     if (mFlags.WantDelProperty())
         delProperty = XPC_WN_Helper_DelProperty;
     else if (mFlags.UseJSStubForDelProperty())
-        delProperty = JS_PropertyStub;
+        delProperty = JS_DeletePropertyStub;
     else if (mFlags.AllowPropModsDuringResolve())
-        delProperty = XPC_WN_MaybeResolvingPropertyStub;
+        delProperty = XPC_WN_MaybeResolvingDeletePropertyStub;
     else
-        delProperty = XPC_WN_CannotModifyPropertyStub;
+        delProperty = XPC_WN_CantDeletePropertyStub;
     mJSClass.base.delProperty = delProperty;
 
     if (mFlags.WantGetProperty())
@@ -1610,7 +1632,7 @@ js::Class XPC_WN_ModsAllowed_WithCall_Proto_JSClass = {
 
     /* Mandatory non-null function pointer members. */
     JS_PropertyStub,                // addProperty;
-    JS_PropertyStub,                // delProperty;
+    JS_DeletePropertyStub,          // delProperty;
     JS_PropertyStub,                // getProperty;
     JS_StrictPropertyStub,          // setProperty;
     XPC_WN_Shared_Proto_Enumerate,  // enumerate;
@@ -1635,7 +1657,7 @@ js::Class XPC_WN_ModsAllowed_NoCall_Proto_JSClass = {
 
     /* Mandatory non-null function pointer members. */
     JS_PropertyStub,                // addProperty;
-    JS_PropertyStub,                // delProperty;
+    JS_DeletePropertyStub,          // delProperty;
     JS_PropertyStub,                // getProperty;
     JS_StrictPropertyStub,          // setProperty;
     XPC_WN_Shared_Proto_Enumerate,  // enumerate;
@@ -1724,7 +1746,7 @@ js::Class XPC_WN_NoMods_WithCall_Proto_JSClass = {
 
     /* Mandatory non-null function pointer members. */
     XPC_WN_OnlyIWrite_Proto_AddPropertyStub,   // addProperty;
-     XPC_WN_CannotModifyPropertyStub,          // delProperty;
+    XPC_WN_CantDeletePropertyStub,             // delProperty;
     JS_PropertyStub,                           // getProperty;
     XPC_WN_OnlyIWrite_Proto_SetPropertyStub,   // setProperty;
     XPC_WN_Shared_Proto_Enumerate,             // enumerate;
@@ -1749,7 +1771,7 @@ js::Class XPC_WN_NoMods_NoCall_Proto_JSClass = {
 
     /* Mandatory non-null function pointer members. */
     XPC_WN_OnlyIWrite_Proto_AddPropertyStub,   // addProperty;
-    XPC_WN_CannotModifyPropertyStub,           // delProperty;
+    XPC_WN_CantDeletePropertyStub,             // delProperty;
     JS_PropertyStub,                           // getProperty;
     XPC_WN_OnlyIWrite_Proto_SetPropertyStub,   // setProperty;
     XPC_WN_Shared_Proto_Enumerate,             // enumerate;
@@ -1830,7 +1852,7 @@ js::Class XPC_WN_Tearoff_JSClass = {
     WRAPPER_SLOTS,                             // flags;
 
     XPC_WN_OnlyIWrite_AddPropertyStub,         // addProperty;
-    XPC_WN_CannotModifyPropertyStub,           // delProperty;
+    XPC_WN_CantDeletePropertyStub,             // delProperty;
     JS_PropertyStub,                           // getProperty;
     XPC_WN_OnlyIWrite_SetPropertyStub,         // setProperty;
     XPC_WN_TearOff_Enumerate,                  // enumerate;
diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp
index 488b8a4eace3..9593accc82da 100644
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -301,7 +301,7 @@ js::Class XPC_WN_NoHelper_Proto_JSClass = {
 
     /* Mandatory non-null function pointer members. */
     JS_PropertyStub,                // addProperty;
-    JS_PropertyStub,                // delProperty;
+    JS_DeletePropertyStub,          // delProperty;
     JS_PropertyStub,                // getProperty;
     JS_StrictPropertyStub,          // setProperty;
     JS_EnumerateStub,               // enumerate;
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index b3e6098e1fbf..d76dc37f9a68 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -42,7 +42,7 @@ namespace XrayUtils {
 JSClass HolderClass = {
     "NativePropertyHolder",
     JSCLASS_HAS_RESERVED_SLOTS(2),
-    JS_PropertyStub,        JS_PropertyStub, holder_get,      holder_set,
+    JS_PropertyStub,        JS_DeletePropertyStub, holder_get,      holder_set,
     JS_EnumerateStub,       JS_ResolveStub,  JS_ConvertStub
 };
 }
@@ -320,7 +320,7 @@ ExpandoObjectFinalize(JSFreeOp *fop, JSObject *obj)
 JSClass ExpandoObjectClass = {
     "XrayExpandoObject",
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_EXPANDO_COUNT),
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, ExpandoObjectFinalize
 };
 
diff --git a/netwerk/base/src/ProxyAutoConfig.cpp b/netwerk/base/src/ProxyAutoConfig.cpp
index 5727b39a8891..dec6ca456149 100644
--- a/netwerk/base/src/ProxyAutoConfig.cpp
+++ b/netwerk/base/src/ProxyAutoConfig.cpp
@@ -549,7 +549,7 @@ private:
 JSClass JSRuntimeWrapper::sGlobalClass = {
   "PACResolutionThreadGlobal",
   JSCLASS_GLOBAL_FLAGS,
-  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+  JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
 };
 
diff --git a/startupcache/test/TestStartupCache.cpp b/startupcache/test/TestStartupCache.cpp
index 1e78ec85263a..c5f07486e971 100644
--- a/startupcache/test/TestStartupCache.cpp
+++ b/startupcache/test/TestStartupCache.cpp
@@ -514,7 +514,7 @@ int main(int argc, char** argv)
   JSAutoRequest req(cx);
   static JSClass global_class = {
     "global", JSCLASS_NEW_RESOLVE | JSCLASS_GLOBAL_FLAGS | JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,
+    JS_PropertyStub,  JS_DeletePropertyStub,
     JS_PropertyStub,  JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub,
     JS_ConvertStub
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index c80725fc5234..222c96496660 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -694,7 +694,7 @@ WrapAndReturnHistogram(Histogram *h, JSContext *cx, JS::Value *ret)
   static JSClass JSHistogram_class = {
     "JSHistogram",  /* name */
     JSCLASS_HAS_PRIVATE, /* flags */
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+    JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
   };
 
diff --git a/tools/profiler/SaveProfileTask.h b/tools/profiler/SaveProfileTask.h
index 9e9d4ea561f4..afe8a0f94261 100644
--- a/tools/profiler/SaveProfileTask.h
+++ b/tools/profiler/SaveProfileTask.h
@@ -82,7 +82,7 @@ public:
       JSAutoRequest ar(cx);
       static JSClass c = {
           "global", JSCLASS_GLOBAL_FLAGS,
-          JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
+          JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
           JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub
       };
       JSObject *obj = JS_NewGlobalObject(cx, &c, NULL);

From 4b45f8cdcd155cc17dc9e4d96558c0b604dedd1e Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Mon, 15 Apr 2013 16:26:06 -0700
Subject: [PATCH 127/438] Backed out 2 changesets (bug 860572) for OSX build
 breakage

Backed out changeset d02e437f5b48 (bug 860572)
Backed out changeset c849d14e7f59 (bug 860572)
---
 js/src/gc/RootMarking.cpp          |  33 ++++-----
 js/src/gc/Verifier.cpp             |  17 ++---
 js/src/jsapi.h                     | 104 +----------------------------
 js/src/jspubtd.h                   |   1 -
 js/xpconnect/src/XPCComponents.cpp |  10 +--
 5 files changed, 23 insertions(+), 142 deletions(-)

diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index 4b55a109c40d..2f6e71da4ce6 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -68,7 +68,6 @@ MarkExactStackRoot(JSTracer *trc, Rooted<void*> *rooter, ThingRootKind kind)
       case THING_ROOT_ID:          MarkIdRoot(trc, (jsid *)addr, "exact-id"); break;
       case THING_ROOT_PROPERTY_ID: MarkIdRoot(trc, &((js::PropertyId *)addr)->asId(), "exact-propertyid"); break;
       case THING_ROOT_BINDINGS:    ((Bindings *)addr)->trace(trc); break;
-      case THING_ROOT_PROPERTY_DESCRIPTOR: ((JSPropertyDescriptor *)addr)->trace(trc); break;
       default: JS_NOT_REACHED("Invalid THING_ROOT kind"); break;
     }
 }
@@ -417,7 +416,19 @@ AutoGCRooter::trace(JSTracer *trc)
 
       case DESCRIPTOR : {
         PropertyDescriptor &desc = *static_cast<AutoPropertyDescriptorRooter *>(this);
-        desc.trace(trc);
+        if (desc.obj)
+            MarkObjectRoot(trc, &desc.obj, "Descriptor::obj");
+        MarkValueRoot(trc, &desc.value, "Descriptor::value");
+        if ((desc.attrs & JSPROP_GETTER) && desc.getter) {
+            JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, desc.getter);
+            MarkObjectRoot(trc, &tmp, "Descriptor::get");
+            desc.getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, tmp);
+        }
+        if (desc.attrs & JSPROP_SETTER && desc.setter) {
+            JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, desc.setter);
+            MarkObjectRoot(trc, &tmp, "Descriptor::set");
+            desc.setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, tmp);
+        }
         return;
       }
 
@@ -638,24 +649,6 @@ StackShape::AutoRooter::trace(JSTracer *trc)
     MarkIdRoot(trc, (jsid*) &shape->propid, "StackShape::AutoRooter id");
 }
 
-void
-JSPropertyDescriptor::trace(JSTracer *trc)
-{
-    if (obj)
-        MarkObjectRoot(trc, &obj, "Descriptor::obj");
-    MarkValueRoot(trc, &value, "Descriptor::value");
-    if ((attrs & JSPROP_GETTER) && getter) {
-        JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, getter);
-        MarkObjectRoot(trc, &tmp, "Descriptor::get");
-        getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, tmp);
-    }
-    if ((attrs & JSPROP_SETTER) && setter) {
-        JSObject *tmp = JS_FUNC_TO_DATA_PTR(JSObject *, setter);
-        MarkObjectRoot(trc, &tmp, "Descriptor::set");
-        setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, tmp);
-    }
-}
-
 void
 js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots)
 {
diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp
index 0b20188f9b40..2a45d31f7b6e 100644
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -30,23 +30,14 @@ using namespace mozilla;
 
 #if defined(DEBUG) && defined(JS_GC_ZEAL) && defined(JSGC_ROOT_ANALYSIS) && !defined(JS_THREADSAFE)
 
-template <typename T>
-bool
-CheckNonAddressThing(uintptr_t *w, T *t)
-{
-    return w >= (uintptr_t*)t && w < (uintptr_t*)(t + 1);
-}
-
 JS_ALWAYS_INLINE bool
 CheckStackRootThing(uintptr_t *w, void *address, ThingRootKind kind)
 {
-    if (kind == THING_ROOT_BINDINGS)
-        return CheckNonAddressThing(w, static_cast<Bindings*>(address));
+    if (kind != THING_ROOT_BINDINGS)
+        return address == static_cast<void*>(w);
 
-    if (kind == THING_ROOT_PROPERTY_DESCRIPTOR)
-        return CheckNonAddressThing(w, static_cast<PropertyDescriptor*>(address));
-
-    return address == static_cast<void*>(w);
+    Bindings *bp = static_cast<Bindings*>(address);
+    return w >= (uintptr_t*)bp && w < (uintptr_t*)(bp + 1);
 }
 
 struct Rooter {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 11c78a73db90..846073b1386d 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -3326,115 +3326,13 @@ struct JSPropertyDescriptor {
     unsigned           shortid;
     JSPropertyOp       getter;
     JSStrictPropertyOp setter;
-    JS::Value          value;
+    jsval              value;
 
     JSPropertyDescriptor() : obj(NULL), attrs(0), shortid(0), getter(NULL),
                              setter(NULL), value(JSVAL_VOID)
     {}
-
-    void trace(JSTracer *trc);
 };
 
-namespace JS {
-
-template <typename Outer>
-class PropertyDescriptorOperations
-{
-    const JSPropertyDescriptor * desc() const { return static_cast<const Outer*>(this)->extract(); }
-    JSPropertyDescriptor * desc() { return static_cast<Outer*>(this)->extract(); }
-
-  public:
-    bool isEnumerable() const { return desc()->attrs & JSPROP_ENUMERATE; }
-    bool isReadonly() const { return desc()->attrs & JSPROP_READONLY; }
-    bool isPermanent() const { return desc()->attrs & JSPROP_PERMANENT; }
-    bool hasNativeAccessors() const { return desc()->attrs & JSPROP_NATIVE_ACCESSORS; }
-    bool hasGetterObject() const { return desc()->attrs & JSPROP_GETTER; }
-    bool hasSetterObject() const { return desc()->attrs & JSPROP_SETTER; }
-    bool isShared() const { return desc()->attrs & JSPROP_SHARED; }
-    bool isIndex() const { return desc()->attrs & JSPROP_INDEX; }
-    bool hasShortId() const { return desc()->attrs & JSPROP_SHORTID; }
-    bool hasAttributes(unsigned attrs) const { return desc()->attrs & attrs; }
-
-    JS::MutableHandleObject obj() { return JS::MutableHandleObject::fromMarkedLocation(&desc()->obj); }
-    unsigned attributes() const { return desc()->attrs; }
-    unsigned shortid() const {
-        MOZ_ASSERT(hasShortId());
-        return desc()->shortid;
-    }
-    JSPropertyOp getter() const { MOZ_ASSERT(!hasGetterObject()); return desc()->getter; }
-    JSStrictPropertyOp setter() const { MOZ_ASSERT(!hasSetterObject()); return desc()->setter; }
-    JS::HandleObject getterObject() const {
-        MOZ_ASSERT(hasGetterObject());
-        return JS::HandleObject::fromMarkedLocation(reinterpret_cast<JSObject *const *>(&desc()->getter));
-    }
-    JS::HandleObject setterObject() const {
-        MOZ_ASSERT(hasSetterObject());
-        return JS::HandleObject::fromMarkedLocation(reinterpret_cast<JSObject *const *>(&desc()->setter));
-    }
-    JS::MutableHandleValue value() { return JS::MutableHandleValue::fromMarkedLocation(&desc()->value); }
-
-    void setAttributes(unsigned attrs) { desc()->attrs = attrs; }
-    void setShortId(unsigned shortid) { desc()->shortid = shortid; }
-    void setGetter(JSPropertyOp op) { desc->getter = op; }
-    void setSetter(JSStrictPropertyOp op) { desc->setter = op; }
-    void setGetterObject(JSObject *obj) { desc()->getter = reinterpret_cast<JSPropertyOp>(obj); }
-    void setSetterObject(JSObject *obj) { desc()->setter = reinterpret_cast<JSStrictPropertyOp>(obj); }
-};
-
-} /* namespace JS */
-
-namespace js {
-
-template <>
-struct RootMethods<JSPropertyDescriptor> {
-    static JSPropertyDescriptor initial() { return JSPropertyDescriptor(); }
-    static ThingRootKind kind() { return THING_ROOT_PROPERTY_DESCRIPTOR; }
-    static bool poisoned(const JSPropertyDescriptor &desc) {
-        return (desc.obj && JS::IsPoisonedPtr(desc.obj)) ||
-               (desc.attrs & JSPROP_GETTER && desc.getter && JS::IsPoisonedPtr(desc.getter)) ||
-               (desc.attrs & JSPROP_SETTER && desc.setter && JS::IsPoisonedPtr(desc.setter)) ||
-               (desc.value.isGCThing() && JS::IsPoisonedPtr(desc.value.toGCThing()));
-    }
-};
-
-template <>
-class RootedBase<JSPropertyDescriptor>
-  : public JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >
-{
-    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
-    const JSPropertyDescriptor *extract() const {
-        return static_cast<const JS::Rooted<JSPropertyDescriptor>*>(this)->address();
-    }
-    JSPropertyDescriptor *extract() {
-        return static_cast<JS::Rooted<JSPropertyDescriptor>*>(this)->address();
-    }
-};
-
-template <>
-class HandleBase<JSPropertyDescriptor>
-  : public JS::PropertyDescriptorOperations<JS::Handle<JSPropertyDescriptor> >
-{
-    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
-    const JSPropertyDescriptor *extract() const {
-        return static_cast<const JS::Handle<JSPropertyDescriptor>*>(this)->address();
-    }
-};
-
-template <>
-class MutableHandleBase<JSPropertyDescriptor>
-  : public JS::PropertyDescriptorOperations<JS::MutableHandle<JSPropertyDescriptor> >
-{
-    friend class JS::PropertyDescriptorOperations<JS::Rooted<JSPropertyDescriptor> >;
-    const JSPropertyDescriptor *extract() const {
-        return static_cast<const JS::MutableHandle<JSPropertyDescriptor>*>(this)->address();
-    }
-    JSPropertyDescriptor *extract() {
-        return static_cast<JS::MutableHandle<JSPropertyDescriptor>*>(this)->address();
-    }
-};
-
-} /* namespace js */
-
 /*
  * Like JS_GetPropertyAttrsGetterAndSetterById but will return a property on
  * an object on the prototype chain (returned in objp). If data->obj is null,
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index 5dd1c718d750..2159dd4f6cc6 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -244,7 +244,6 @@ enum ThingRootKind
     THING_ROOT_VALUE,
     THING_ROOT_TYPE,
     THING_ROOT_BINDINGS,
-    THING_ROOT_PROPERTY_DESCRIPTOR,
     THING_ROOT_LIMIT
 };
 
diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 392f083a5f2d..0bb740a91e91 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -2709,15 +2709,15 @@ nsXPCComponents_Utils::LookupMethod(const JS::Value& object,
 
         // Alright, now do the lookup.
         *retval = JSVAL_VOID;
-        Rooted<JSPropertyDescriptor> desc(cx);
-        if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, desc.address()))
+        JSPropertyDescriptor desc;
+        if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, &desc))
             return NS_ERROR_FAILURE;
 
         // First look for a method value. If that's not there, try a getter,
         // since historically lookupMethod also works for getters.
-        JSObject *methodObj = desc.value().isObject() ? &desc.value().toObject() : NULL;
-        if (!methodObj && desc.hasGetterObject())
-            methodObj = desc.getterObject();
+        JSObject *methodObj = desc.value.isObject() ? &desc.value.toObject() : NULL;
+        if (!methodObj && (desc.attrs & JSPROP_GETTER))
+            methodObj = JS_FUNC_TO_DATA_PTR(JSObject *, desc.getter);
 
         // Callers of this function seem to expect bound methods. Make it happen.
         // Note that this is unnecessary until bug 658909 is fixed.

From 26c10590c488d3bc226dbcccd5f3212e2847b2d2 Mon Sep 17 00:00:00 2001
From: Camilo Viecco <cviecco@mozilla.com>
Date: Mon, 15 Apr 2013 16:43:59 -0700
Subject: [PATCH 128/438] Bug 813418 - Backout fe8c74e402bc due to bustage
 CLOSED TREE

---
 security/manager/ssl/src/nsNSSCertificate.cpp |  39 +----
 .../manager/ssl/src/nsNSSCertificateDB.cpp    |  10 +-
 .../manager/ssl/src/nsUsageArrayHelper.cpp    | 135 +++++++++++++++---
 3 files changed, 125 insertions(+), 59 deletions(-)

diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp
index 66e8ac71c8f8..5ea2da7d5558 100644
--- a/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/security/manager/ssl/src/nsNSSCertificate.cpp
@@ -825,45 +825,8 @@ nsNSSCertificate::GetChain(nsIArray **_rvChain)
   nsresult rv;
   /* Get the cert chain from NSS */
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting chain for \"%s\"\n", mCert->nickname));
-
   ScopedCERTCertList nssChain;
-  SECStatus srv;
-  nssChain = nullptr;
-  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
-  CERTCertList *pkixNssChain = nullptr;
-
-  // We want to test all usages, but we start with server because most of the
-  // time Firefox users care about server certs.
-  srv = certVerifier->VerifyCert(mCert,
-                                 certificateUsageSSLServer, PR_Now(),
-                                 nullptr, /*XXX fixme*/
-                                 CertVerifier::FLAG_LOCAL_ONLY,
-                                 &pkixNssChain);
-  for (int usage = certificateUsageSSLClient;
-       usage < certificateUsageAnyCA && !pkixNssChain;
-       usage = usage << 1) {
-    if (usage == certificateUsageSSLServer) {
-      continue;
-    }
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("pipnss: PKIX attempting chain(%d) for '%s'\n",usage, mCert->nickname));
-    srv = certVerifier->VerifyCert(mCert,
-                                   certificateUsageSSLClient, PR_Now(),
-                                   nullptr, /*XXX fixme*/
-                                   CertVerifier::FLAG_LOCAL_ONLY,
-                                   &pkixNssChain);
-  }
-
-  if (!pkixNssChain) {
-    // There is not verified path for the chain, howeever we still want to 
-    // present to the user as much of a possible chain as possible, in the case
-    // where there was a problem with the cert or the issuers.
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("pipnss: getchain :CertVerify failed to get chain for '%s'\n", mCert->nickname));
-    nssChain = CERT_GetCertChainFromCert(mCert, PR_Now(), certUsageSSLClient);
-  } else {
-    nssChain = pkixNssChain;
-  }
-
+  nssChain = CERT_GetCertChainFromCert(mCert, PR_Now(), certUsageSSLClient);
   if (!nssChain)
     return NS_ERROR_FAILURE;
   /* enumerate the chain for scripting purposes */
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index f4283e0a5230..9debd7ed20ee 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -487,20 +487,20 @@ ImportCertsIntoPermanentStorage(const ScopedCERTCertList &certChain, const SECCe
   CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
   const PRTime now = PR_Now();
 
-  int chainLen = 0;
+  int chainLen=0;
+
   for (CERTCertListNode *chainNode = CERT_LIST_HEAD(certChain);
        !CERT_LIST_END(chainNode, certChain);
        chainNode = CERT_LIST_NEXT(chainNode)) {
     chainLen++;
   }
-
   SECItem **rawArray;
   rawArray = (SECItem **) PORT_Alloc(chainLen * sizeof(SECItem *));
   if (!rawArray) {
     return SECFailure;
   }
 
-  int i = 0;
+  int i=0;
   for (CERTCertListNode *chainNode = CERT_LIST_HEAD(certChain);
        !CERT_LIST_END(chainNode, certChain);
        chainNode = CERT_LIST_NEXT(chainNode), i++) {
@@ -509,7 +509,9 @@ ImportCertsIntoPermanentStorage(const ScopedCERTCertList &certChain, const SECCe
   CERT_ImportCerts(certdb, usage, chainLen,
                    rawArray,  nullptr, true, caOnly, nullptr);
 
-  PORT_Free(rawArray);   
+  PORT_Free(rawArray);
+
+   
   return SECSuccess;
 } 
 
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.cpp b/security/manager/ssl/src/nsUsageArrayHelper.cpp
index 34b5efdb58a8..38c497d51063 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.cpp
+++ b/security/manager/ssl/src/nsUsageArrayHelper.cpp
@@ -32,6 +32,66 @@ nsUsageArrayHelper::nsUsageArrayHelper(CERTCertificate *aCert)
   nssComponent = do_GetService(kNSSComponentCID, &m_rv);
 }
 
+// XXX: old, non-libpkix version of check that will be removed after the switch
+// to libpkix is final.
+void
+nsUsageArrayHelper::check(const char *suffix,
+                        SECCertificateUsage aCertUsage,
+                        uint32_t &aCounter,
+                        PRUnichar **outUsages)
+{
+  if (!aCertUsage) return;
+  nsAutoCString typestr;
+  switch (aCertUsage) {
+  case certificateUsageSSLClient:
+    typestr = "VerifySSLClient";
+    break;
+  case certificateUsageSSLServer:
+    typestr = "VerifySSLServer";
+    break;
+  case certificateUsageSSLServerWithStepUp:
+    typestr = "VerifySSLStepUp";
+    break;
+  case certificateUsageEmailSigner:
+    typestr = "VerifyEmailSigner";
+    break;
+  case certificateUsageEmailRecipient:
+    typestr = "VerifyEmailRecip";
+    break;
+  case certificateUsageObjectSigner:
+    typestr = "VerifyObjSign";
+    break;
+  case certificateUsageProtectedObjectSigner:
+    typestr = "VerifyProtectObjSign";
+    break;
+  case certificateUsageUserCertImport:
+    typestr = "VerifyUserImport";
+    break;
+  case certificateUsageSSLCA:
+    typestr = "VerifySSLCA";
+    break;
+  case certificateUsageVerifyCA:
+    typestr = "VerifyCAVerifier";
+    break;
+  case certificateUsageStatusResponder:
+    typestr = "VerifyStatusResponder";
+    break;
+  case certificateUsageAnyCA:
+    typestr = "VerifyAnyCA";
+    break;
+  default:
+    break;
+  }
+  if (!typestr.IsEmpty()) {
+    typestr.Append(suffix);
+    nsAutoString verifyDesc;
+    m_rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
+    if (NS_SUCCEEDED(m_rv)) {
+      outUsages[aCounter++] = ToNewUnicode(verifyDesc);
+    }
+  }
+}
+
 namespace {
 
 // Some validation errors are non-fatal in that, we should keep checking the
@@ -199,21 +259,67 @@ nsUsageArrayHelper::GetUsagesArray(const char *suffix,
   if (outArraySize < max_returned_out_array_size)
     return NS_ERROR_FAILURE;
 
-  // Bug 860076, this disabling ocsp for all NSS is incorrect.
-  if (!nsNSSComponent::globalConstFlagUsePKIXVerification && localOnly) {
-    nsresult rv;
-    nssComponent = do_GetService(kNSSComponentCID, &rv);
-    if (NS_FAILED(rv))
-      return rv;
-    
-    if (nssComponent) {
-      nssComponent->SkipOcsp();
-    }
-  }
-
   uint32_t &count = *_count;
   count = 0;
 
+// TODO: This block will be removed as soon as the switch to libpkix is
+// complete.
+if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+  if (localOnly) {
+    nssComponent->SkipOcsp();
+  }
+
+  SECCertificateUsage usages = 0;
+  int err = 0;
+  
+  // CERT_VerifyCertificateNow returns SECFailure unless the certificate is
+  // valid for all the given usages. Hoewver, we are only looking for the list
+  // of usages for which the cert *is* valid.
+  (void)
+  CERT_VerifyCertificateNow(defaultcertdb, mCert, true,
+			    certificateUsageSSLClient |
+			    certificateUsageSSLServer |
+			    certificateUsageSSLServerWithStepUp |
+			    certificateUsageEmailSigner |
+			    certificateUsageEmailRecipient |
+			    certificateUsageObjectSigner |
+			    certificateUsageSSLCA |
+			    certificateUsageStatusResponder,
+			    nullptr, &usages);
+  err = PR_GetError();
+
+  if (localOnly) {
+     nssComponent->SkipOcspOff();
+  }
+
+  // The following list of checks must be < max_returned_out_array_size
+  
+  check(suffix, usages & certificateUsageSSLClient, count, outUsages);
+  check(suffix, usages & certificateUsageSSLServer, count, outUsages);
+  check(suffix, usages & certificateUsageEmailSigner, count, outUsages);
+  check(suffix, usages & certificateUsageEmailRecipient, count, outUsages);
+  check(suffix, usages & certificateUsageObjectSigner, count, outUsages);
+#if 0
+  check(suffix, usages & certificateUsageProtectedObjectSigner, count, outUsages);
+  check(suffix, usages & certificateUsageUserCertImport, count, outUsages);
+#endif
+  check(suffix, usages & certificateUsageSSLCA, count, outUsages);
+#if 0
+  check(suffix, usages & certificateUsageVerifyCA, count, outUsages);
+#endif
+  check(suffix, usages & certificateUsageStatusResponder, count, outUsages);
+#if 0
+  check(suffix, usages & certificateUsageAnyCA, count, outUsages);
+#endif
+
+  if (count == 0) {
+    verifyFailed(_verified, err);
+  } else {
+    *_verified = nsNSSCertificate::VERIFIED_OK;
+  }
+  return NS_OK;
+}
+
   RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
   NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
 
@@ -253,11 +359,6 @@ nsUsageArrayHelper::GetUsagesArray(const char *suffix,
                  certificateUsageAnyCA, now, flags, count, outUsages);
 #endif
 
-  // Bug 860076, this disabling ocsp for all NSS is incorrect
-  if (!nsNSSComponent::globalConstFlagUsePKIXVerification && localOnly) {
-     nssComponent->SkipOcspOff();
-  }
-
   if (isFatalError(result) || count == 0) {
     MOZ_ASSERT(result != nsIX509Cert::VERIFIED_OK);
 

From 181f3b3cb5e5803fd94eae3c8f63f5f50d616e77 Mon Sep 17 00:00:00 2001
From: Camilo Viecco <cviecco@mozilla.com>
Date: Mon, 15 Apr 2013 16:44:38 -0700
Subject: [PATCH 129/438] Bug 813418 - Backout 7bcdee03b55 due to bustage
 CLOSED TREE

---
 security/manager/ssl/src/CertVerifier.cpp     |  14 +--
 .../ssl/src/SSLServerCertVerification.cpp     |  82 ++++++------
 .../manager/ssl/src/nsIdentityChecking.cpp    |   4 +-
 .../manager/ssl/src/nsNSSCertificateDB.cpp    | 119 ++++++++++--------
 security/manager/ssl/src/nsNSSComponent.cpp   |   6 +-
 5 files changed, 119 insertions(+), 106 deletions(-)

diff --git a/security/manager/ssl/src/CertVerifier.cpp b/security/manager/ssl/src/CertVerifier.cpp
index 355f85cdf7a8..6b021a8e01d7 100644
--- a/security/manager/ssl/src/CertVerifier.cpp
+++ b/security/manager/ssl/src/CertVerifier.cpp
@@ -217,12 +217,12 @@ CertVerifier::VerifyCert(CERTCertificate * cert,
 
   if (evPolicy != SEC_OID_UNKNOWN) {
     // EV setup!
-    // XXX 859872 The current flags are not quite correct. (use
-    // of ocsp flags for crl preferences).
+    // This flags are not quite correct, but it is what we have now, so keeping
+    // them identical for bug landing purposes. Should be fixed later!
     uint64_t revMethodFlags =
       CERT_REV_M_TEST_USING_THIS_METHOD
-      | ((mOCSPDownloadEnabled && !localOnly) ?
-          CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
+      | (mOCSPDownloadEnabled ? CERT_REV_M_ALLOW_NETWORK_FETCHING
+                              : CERT_REV_M_FORBID_NETWORK_FETCHING)
       | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
       | CERT_REV_M_REQUIRE_INFO_ON_MISSING_SOURCE
       | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
@@ -371,7 +371,6 @@ pkix_done:
 
     if (rv == SECSuccess) {
       if (! cvout[validationChainLocation].value.pointer.chain) {
-        PR_SetError(PR_UNKNOWN_ERROR, 0);
         return SECFailure;
       }
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert: I have a chain\n"));
@@ -383,8 +382,8 @@ pkix_done:
         if (!CERT_CompareCerts(trustAnchor, cert)) {
           PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("VerifyCert:  adding issuer to tail for display\n"));
           // note: rv is reused to catch errors on cert creation!
-          ScopedCERTCertificate tempCert(CERT_DupCertificate(trustAnchor));
-          rv = CERT_AddCertToListTail(*validationChain, tempCert);
+          rv = CERT_AddCertToListTail(*validationChain,
+                                      CERT_DupCertificate(trustAnchor));
           if (rv != SECSuccess) {
             CERT_DestroyCertList(*validationChain);
             *validationChain = nullptr;
@@ -398,7 +397,6 @@ pkix_done:
       }
     }
   }
-
   return rv;
 }
 
diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp
index a212c2b4954f..773189a2305a 100644
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
@@ -478,14 +478,16 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   
   PRTime now = PR_Now();
 
-  PLArenaPool *log_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+  PLArenaPool *log_arena = nullptr;
   PLArenaPoolCleanerFalseParam log_arena_cleaner(log_arena);
+  CERTVerifyLog * verify_log = nullptr;
+
+  log_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   if (!log_arena) {
     NS_ERROR("PORT_NewArena failed");
     return nullptr; // PORT_NewArena set error code
   }
-
-  CERTVerifyLog * verify_log = PORT_ArenaZNew(log_arena, CERTVerifyLog);
+  verify_log = PORT_ArenaZNew(log_arena, CERTVerifyLog);
   if (!verify_log) {
     NS_ERROR("PORT_ArenaZNew failed");
     return nullptr; // PORT_ArenaZNew set error code
@@ -494,7 +496,7 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   verify_log->arena = log_arena;
 
   srv = certVerifier->VerifyCert(cert, certificateUsageSSLServer, now,
-                                 infoObject, 0, nullptr, nullptr, verify_log);
+                                   infoObject, 0, nullptr, nullptr, verify_log);
 
   // We ignore the result code of the cert verification.
   // Either it is a failure, which is expected, and we'll process the
@@ -519,40 +521,44 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
     errorCodeMismatch = SSL_ERROR_BAD_CERT_DOMAIN;
   }
 
-  CERTVerifyLogNode *i_node;
-  for (i_node = verify_log->head; i_node; i_node = i_node->next)
-  {
-    switch (i_node->error)
+  if (verify_log) {
+    CERTVerifyLogNode *i_node;
+    for (i_node = verify_log->head; i_node; i_node = i_node->next)
     {
-      case SEC_ERROR_UNKNOWN_ISSUER:
-      case SEC_ERROR_CA_CERT_INVALID:
-      case SEC_ERROR_UNTRUSTED_ISSUER:
-      case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-      case SEC_ERROR_UNTRUSTED_CERT:
-      case SEC_ERROR_INADEQUATE_KEY_USAGE:
-      case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
-        // We group all these errors as "cert not trusted"
-        collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
-        if (errorCodeTrust == SECSuccess) {
-          errorCodeTrust = i_node->error;
-        }
-        break;
-      case SSL_ERROR_BAD_CERT_DOMAIN:
-        collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
-        if (errorCodeMismatch == SECSuccess) {
-          errorCodeMismatch = i_node->error;
-        }
-        break;
-      case SEC_ERROR_EXPIRED_CERTIFICATE:
-        collected_errors |= nsICertOverrideService::ERROR_TIME;
-        if (errorCodeExpired == SECSuccess) {
-          errorCodeExpired = i_node->error;
-        }
-        break;
-      default:
-        PR_SetError(i_node->error, 0);
-        return nullptr;
+      switch (i_node->error)
+      {
+        case SEC_ERROR_UNKNOWN_ISSUER:
+        case SEC_ERROR_CA_CERT_INVALID:
+        case SEC_ERROR_UNTRUSTED_ISSUER:
+        case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+        case SEC_ERROR_UNTRUSTED_CERT:
+        case SEC_ERROR_INADEQUATE_KEY_USAGE:
+        case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
+          // We group all these errors as "cert not trusted"
+          collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
+          if (errorCodeTrust == SECSuccess) {
+            errorCodeTrust = i_node->error;
+          }
+          break;
+        case SSL_ERROR_BAD_CERT_DOMAIN:
+          collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
+          if (errorCodeMismatch == SECSuccess) {
+            errorCodeMismatch = i_node->error;
+          }
+          break;
+        case SEC_ERROR_EXPIRED_CERTIFICATE:
+          collected_errors |= nsICertOverrideService::ERROR_TIME;
+          if (errorCodeExpired == SECSuccess) {
+            errorCodeExpired = i_node->error;
+          }
+          break;
+        default:
+          PR_SetError(i_node->error, 0);
+          return nullptr;
+      }
     }
+  } else {
+    // XXX set errorCodeTrust, errorCodeMismatch, errorCodeExpired, collected_errors
   }
 
   if (!collected_errors)
@@ -890,8 +896,8 @@ AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert,
     }
   }
 
-  ScopedCERTCertList certList(verifyCertChain);
-
+  ScopedCERTCertList certList(CERT_GetCertChainFromCert(cert, PR_Now(),
+                                                        certUsageSSLCA));
   if (!certList) {
     rv = SECFailure;
   } else {
diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index 52fc227df540..80e4e5797344 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -1038,7 +1038,7 @@ getRootsForOid(SECOidTag oid_tag)
   return certList;
 }
 
-} } // namespace mozilla::psm
+}}
 
 static bool 
 isApprovedForEV(SECOidTag policyOIDTag, CERTCertificate *rootCert)
@@ -1181,7 +1181,7 @@ SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
   return SECFailure;
 }
 
-} } // namespace mozilla::psm
+}}
 
 NS_IMETHODIMP
 nsSSLStatus::GetIsExtendedValidation(bool* aIsEV)
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index 9debd7ed20ee..ade4fdb62a8a 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -32,6 +32,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsIPrompt.h"
 #include "nsThreadUtils.h"
+#include "ScopedNSSTypes.h"
 #include "nsIObserverService.h"
 #include "nsRecentBadCerts.h"
 #include "SharedSSLState.h"
@@ -479,42 +480,6 @@ nsNSSCertificateDB::ImportCertificates(uint8_t * data, uint32_t length,
   return nsrv;
 }
 
-static 
-SECStatus 
-ImportCertsIntoPermanentStorage(const ScopedCERTCertList &certChain, const SECCertUsage usage,
-                               const PRBool caOnly)
-{
-  CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
-  const PRTime now = PR_Now();
-
-  int chainLen=0;
-
-  for (CERTCertListNode *chainNode = CERT_LIST_HEAD(certChain);
-       !CERT_LIST_END(chainNode, certChain);
-       chainNode = CERT_LIST_NEXT(chainNode)) {
-    chainLen++;
-  }
-  SECItem **rawArray;
-  rawArray = (SECItem **) PORT_Alloc(chainLen * sizeof(SECItem *));
-  if (!rawArray) {
-    return SECFailure;
-  }
-
-  int i=0;
-  for (CERTCertListNode *chainNode = CERT_LIST_HEAD(certChain);
-       !CERT_LIST_END(chainNode, certChain);
-       chainNode = CERT_LIST_NEXT(chainNode), i++) {
-    rawArray[i] = &chainNode->cert->derCert;
-  }
-  CERT_ImportCerts(certdb, usage, chainLen,
-                   rawArray,  nullptr, true, caOnly, nullptr);
-
-  PORT_Free(rawArray);
-
-   
-  return SECSuccess;
-} 
-
 
 /*
  *  [noscript] void importEmailCertificates(in charPtr data, in unsigned long length,
@@ -597,29 +562,53 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
        !CERT_LIST_END(node,certList);
        node = CERT_LIST_NEXT(node)) {
 
+    bool alert_and_skip = false;
+
     if (!node->cert) {
       continue;
     }
 
-    CERTCertList *verifyCertChain = nullptr;
-
     SECStatus rv = certVerifier->VerifyCert(node->cert,
                                             certificateUsageEmailRecipient,
-                                            now, ctx, 0, &verifyCertChain);
-
-    ScopedCERTCertList certChain(verifyCertChain);
-
+                                            now, ctx);
     if (rv != SECSuccess) {
+      alert_and_skip = true;
+    }
+
+    ScopedCERTCertificateList certChain;
+
+    if (!alert_and_skip) {
+      certChain = CERT_CertChainFromCert(node->cert, certUsageEmailRecipient,
+                                         false);
+      if (!certChain) {
+        alert_and_skip = true;
+      }
+    }
+
+    if (alert_and_skip) {    
       nsCOMPtr<nsIX509Cert> certToShow = nsNSSCertificate::Create(node->cert);
       DisplayCertificateAlert(ctx, "NotImportingUnverifiedCert", certToShow);
       continue;
     }
-    rv = ImportCertsIntoPermanentStorage(certChain, certUsageEmailRecipient, false);
-    if (rv != SECSuccess) {
-      goto loser;
-    } 
+
+    /*
+     * CertChain returns an array of SECItems, import expects an array of
+     * SECItem pointers. Create the SECItem Pointers from the array of
+     * SECItems.
+     */
+    rawArray = (SECItem **) PORT_Alloc(certChain->len * sizeof(SECItem *));
+    if (!rawArray) {
+      continue;
+    }
+    for (i=0; i < certChain->len; i++) {
+      rawArray[i] = &certChain->certs[i];
+    }
+    CERT_ImportCerts(certdb, certUsageEmailRecipient, certChain->len,
+                            rawArray,  nullptr, true, false, nullptr);
+
     CERT_SaveSMimeProfile(node->cert, nullptr, nullptr);
 
+    PORT_Free(rawArray);
   }
 
 loser:
@@ -768,21 +757,45 @@ nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfac
        !CERT_LIST_END(node,certList);
        node = CERT_LIST_NEXT(node)) {
 
-    //bool alert_and_skip = false;
-    CERTCertList *verifyCertChain = nullptr;
+    bool alert_and_skip = false;
 
     SECStatus rv = certVerifier->VerifyCert(node->cert, certificateUsageVerifyCA,
-                                            PR_Now(), ctx, 0, &verifyCertChain);
-
-    ScopedCERTCertList certChain(verifyCertChain);
-
+                                            PR_Now(), ctx);
     if (rv != SECSuccess) {
+      alert_and_skip = true;
+    }
+
+    ScopedCERTCertificateList certChain;
+
+    if (!alert_and_skip) {    
+      certChain = CERT_CertChainFromCert(node->cert, certUsageAnyCA, false);
+      if (!certChain) {
+        alert_and_skip = true;
+      }
+    }
+
+    if (alert_and_skip) {    
       nsCOMPtr<nsIX509Cert> certToShow = nsNSSCertificate::Create(node->cert);
       DisplayCertificateAlert(ctx, "NotImportingUnverifiedCert", certToShow);
       continue;
     }
 
-    ImportCertsIntoPermanentStorage(certChain, certUsageAnyCA, true);
+    /*
+     * CertChain returns an array of SECItems, import expects an array of
+     * SECItem pointers. Create the SECItem Pointers from the array of
+     * SECItems.
+     */
+    rawArray = (SECItem **) PORT_Alloc(certChain->len * sizeof(SECItem *));
+    if (!rawArray) {
+      continue;
+    }
+    for (int i=0; i < certChain->len; i++) {
+      rawArray[i] = &certChain->certs[i];
+    }
+    CERT_ImportCerts(CERT_GetDefaultCertDB(), certUsageAnyCA, certChain->len, 
+                            rawArray,  nullptr, true, true, nullptr);
+
+    PORT_Free(rawArray);
   }
   
   return NS_OK;
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 247a36be2cfe..57f8ac0528f4 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -2048,13 +2048,9 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, uint32_t aRSABufLen,
                                 GetDecryptKeyCallback, nullptr,
                                 DecryptionAllowedCallback);
 
-  if (!p7_info) {
-    return NS_ERROR_FAILURE;
-  }
-
   // Make sure we call SEC_PKCS7DestroyContentInfo after this point;
   // otherwise we leak data in p7_info
-
+  
   //-- If a plaintext was provided, hash it.
   SECItem digest;
   digest.data = nullptr;

From 915e0525f7e4c1f57b57a25a9a9229ebee3f9a3d Mon Sep 17 00:00:00 2001
From: Camilo Viecco <cviecco@mozilla.com>
Date: Mon, 15 Apr 2013 16:45:11 -0700
Subject: [PATCH 130/438] Bug 813418 - Backout 2f47fcb0a648 due to bustage
 CLOSED TREE

---
 security/manager/ssl/src/CertVerifier.h       |  65 -------
 security/manager/ssl/src/CryptoUtil.h         |  13 --
 security/manager/ssl/src/Makefile.in          |   2 +-
 .../ssl/src/SSLServerCertVerification.cpp     | 168 ++++++++++--------
 .../ssl/src/nsCERTValInParamWrapper.cpp       | 126 +++++++++++++
 .../manager/ssl/src/nsCERTValInParamWrapper.h |  71 ++++++++
 security/manager/ssl/src/nsCMS.cpp            |  46 +++--
 .../manager/ssl/src/nsIdentityChecking.cpp    | 116 +++++++++---
 security/manager/ssl/src/nsNSSCertificate.cpp |  50 +++---
 security/manager/ssl/src/nsNSSCertificate.h   |   4 +-
 .../manager/ssl/src/nsNSSCertificateDB.cpp    | 114 ++++++++----
 security/manager/ssl/src/nsNSSComponent.cpp   |  56 ++++--
 security/manager/ssl/src/nsNSSComponent.h     |  24 ++-
 .../manager/ssl/src/nsUsageArrayHelper.cpp    |  71 ++++----
 security/manager/ssl/src/nsUsageArrayHelper.h |   8 +-
 15 files changed, 623 insertions(+), 311 deletions(-)
 delete mode 100644 security/manager/ssl/src/CertVerifier.h
 delete mode 100644 security/manager/ssl/src/CryptoUtil.h
 create mode 100644 security/manager/ssl/src/nsCERTValInParamWrapper.cpp
 create mode 100644 security/manager/ssl/src/nsCERTValInParamWrapper.h

diff --git a/security/manager/ssl/src/CertVerifier.h b/security/manager/ssl/src/CertVerifier.h
deleted file mode 100644
index 96dbd5441cbd..000000000000
--- a/security/manager/ssl/src/CertVerifier.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* 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/. */
-
-#ifndef mozilla_psm__CertVerifier_h
-#define mozilla_psm__CertVerifier_h
-
-#include "mozilla/RefPtr.h"
-#include "CryptoUtil.h"
-#include "nsISupportsImpl.h"
-#include "certt.h"
-
-class nsIInterfaceRequestor;
-class nsNSSComponent;
-
-namespace mozilla { namespace psm {
-
-class CertVerifier
-{
-public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CertVerifier)
-
-  typedef unsigned int Flags;
-  static const Flags FLAG_LOCAL_ONLY;
-  // XXX: The localonly flag is ignored in the classic verification case
-
-  // *evOidPolicy == SEC_OID_UNKNOWN means the cert is NOT EV
-  SECStatus VerifyCert(CERTCertificate * cert,
-                       const SECCertificateUsage usage,
-                       const PRTime time,
-                       nsIInterfaceRequestor * pinArg,
-                       const Flags flags = 0,
-                       /*optional out*/ CERTCertList **validationChain = nullptr,
-                       /*optional out*/ SECOidTag *evOidPolicy = nullptr ,
-                       /*optional out*/ CERTVerifyLog *verifyLog = nullptr);
-
-  enum missing_cert_download_config { missing_cert_download_off = 0, missing_cert_download_on };
-  enum crl_download_config { crl_local_only = 0, crl_download_allowed };
-  enum ocsp_download_config { ocsp_off = 0, ocsp_on };
-  enum ocsp_strict_config { ocsp_relaxed = 0, ocsp_strict };
-  enum any_revo_fresh_config { any_revo_relaxed = 0, any_revo_strict };
-
-  bool IsOCSPDownloadEnabled() const { return mOCSPDownloadEnabled; }
-
-private:
-  CertVerifier(missing_cert_download_config ac, crl_download_config cdc,
-               ocsp_download_config odc, ocsp_strict_config osc,
-               any_revo_fresh_config arfc,
-               const char *firstNetworkRevocationMethod);
-  ~CertVerifier();
-
-  const bool mMissingCertDownloadEnabled;
-  const bool mCRLDownloadEnabled;
-  const bool mOCSPDownloadEnabled;
-  const bool mOCSPStrict;
-  const bool mRequireRevocationInfo;
-  const bool mCRLFirst;
-  friend class ::nsNSSComponent;
-};
-
-MOZ_WARN_UNUSED_RESULT TemporaryRef<CertVerifier> GetDefaultCertVerifier();
-
-} } // namespace mozilla::psm
-
-#endif // mozilla_psm__CertVerifier_h
diff --git a/security/manager/ssl/src/CryptoUtil.h b/security/manager/ssl/src/CryptoUtil.h
deleted file mode 100644
index 8d80f9aeb72f..000000000000
--- a/security/manager/ssl/src/CryptoUtil.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef mozilla_psm__CryptoUtil_h
-#define mozilla_psm__CryptoUtil_h
-
-#include <mozilla/RefPtr.h>
-#include "mozilla/Types.h"
-
-#ifdef MOZILLA_INTERNAL_API
-#define MOZ_CRYPTO_API(x) MOZ_EXPORT_API(x)
-#else
-#define MOZ_CRYPTO_API(x) MOZ_IMPORT_API(x)
-#endif
-
-#endif // mozilla_psm__CryptoUtil_h
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 4b87ab48e5e9..2898fbc7187c 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -20,7 +20,7 @@ LIBXUL_LIBRARY	= 1
 CPPSRCS = 				\
 	CryptoTask.cpp \
 	JARSignatureVerification.cpp \
-	CertVerifier.cpp     \
+	nsCERTValInParamWrapper.cpp     \
 	nsNSSCleaner.cpp                \
 	nsCertOverrideService.cpp   \
 	nsRecentBadCerts.cpp \
diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp
index 773189a2305a..746ed9010dae 100644
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
@@ -95,7 +95,6 @@
  */
 
 #include "SSLServerCertVerification.h"
-#include "CertVerifier.h"
 #include "nsIBadCertListener2.h"
 #include "nsICertOverrideService.h"
 #include "nsIStrictTransportSecurityService.h"
@@ -114,6 +113,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsIConsoleService.h"
 #include "PSMRunnable.h"
+#include "ScopedNSSTypes.h"
 #include "SharedSSLState.h"
 
 #include "ssl.h"
@@ -131,7 +131,6 @@ namespace {
 
 NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 
-NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
 NSSCleanupAutoPtrClass_WithParam(PLArenaPool, PORT_FreeArena, FalseParam, false)
 
 // do not use a nsCOMPtr to avoid static initializer/destructor
@@ -468,26 +467,31 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   }
 
   SECStatus srv;
+  nsresult nsrv;
 
-  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-  if (!certVerifier) {
-    NS_ERROR("GetDefaultCerVerifier failed");
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss) {
+    NS_ERROR("do_GetService(kNSSComponentCID) failed");
+    PR_SetError(defaultErrorCodeToReport, 0);
+    return nullptr;
+  }
+
+  RefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  if (NS_FAILED(nsrv)) {
+    NS_ERROR("GetDefaultCERTValInParam failed");
     PR_SetError(defaultErrorCodeToReport, 0);
     return nullptr;
   }
   
-  PRTime now = PR_Now();
-
-  PLArenaPool *log_arena = nullptr;
+  PLArenaPool *log_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   PLArenaPoolCleanerFalseParam log_arena_cleaner(log_arena);
-  CERTVerifyLog * verify_log = nullptr;
-
-  log_arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   if (!log_arena) {
     NS_ERROR("PORT_NewArena failed");
     return nullptr; // PORT_NewArena set error code
   }
-  verify_log = PORT_ArenaZNew(log_arena, CERTVerifyLog);
+
+  CERTVerifyLog *verify_log = PORT_ArenaZNew(log_arena, CERTVerifyLog);
   if (!verify_log) {
     NS_ERROR("PORT_ArenaZNew failed");
     return nullptr; // PORT_ArenaZNew set error code
@@ -495,8 +499,22 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
   CERTVerifyLogContentsCleaner verify_log_cleaner(verify_log);
   verify_log->arena = log_arena;
 
-  srv = certVerifier->VerifyCert(cert, certificateUsageSSLServer, now,
-                                   infoObject, 0, nullptr, nullptr, verify_log);
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+    srv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), cert,
+                                true, certificateUsageSSLServer,
+                                PR_Now(), static_cast<void*>(infoObject),
+                                verify_log, nullptr);
+  }
+  else {
+    CERTValOutParam cvout[2];
+    cvout[0].type = cert_po_errorLog;
+    cvout[0].value.pointer.log = verify_log;
+    cvout[1].type = cert_po_end;
+
+    srv = CERT_PKIXVerifyCert(cert, certificateUsageSSLServer,
+                              survivingParams->GetRawPointerForNSS(),
+                              cvout, static_cast<void*>(infoObject));
+  }
 
   // We ignore the result code of the cert verification.
   // Either it is a failure, which is expected, and we'll process the
@@ -521,44 +539,40 @@ CreateCertErrorRunnable(PRErrorCode defaultErrorCodeToReport,
     errorCodeMismatch = SSL_ERROR_BAD_CERT_DOMAIN;
   }
 
-  if (verify_log) {
-    CERTVerifyLogNode *i_node;
-    for (i_node = verify_log->head; i_node; i_node = i_node->next)
+  CERTVerifyLogNode *i_node;
+  for (i_node = verify_log->head; i_node; i_node = i_node->next)
+  {
+    switch (i_node->error)
     {
-      switch (i_node->error)
-      {
-        case SEC_ERROR_UNKNOWN_ISSUER:
-        case SEC_ERROR_CA_CERT_INVALID:
-        case SEC_ERROR_UNTRUSTED_ISSUER:
-        case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-        case SEC_ERROR_UNTRUSTED_CERT:
-        case SEC_ERROR_INADEQUATE_KEY_USAGE:
-        case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
-          // We group all these errors as "cert not trusted"
-          collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
-          if (errorCodeTrust == SECSuccess) {
-            errorCodeTrust = i_node->error;
-          }
-          break;
-        case SSL_ERROR_BAD_CERT_DOMAIN:
-          collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
-          if (errorCodeMismatch == SECSuccess) {
-            errorCodeMismatch = i_node->error;
-          }
-          break;
-        case SEC_ERROR_EXPIRED_CERTIFICATE:
-          collected_errors |= nsICertOverrideService::ERROR_TIME;
-          if (errorCodeExpired == SECSuccess) {
-            errorCodeExpired = i_node->error;
-          }
-          break;
-        default:
-          PR_SetError(i_node->error, 0);
-          return nullptr;
-      }
+      case SEC_ERROR_UNKNOWN_ISSUER:
+      case SEC_ERROR_CA_CERT_INVALID:
+      case SEC_ERROR_UNTRUSTED_ISSUER:
+      case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+      case SEC_ERROR_UNTRUSTED_CERT:
+      case SEC_ERROR_INADEQUATE_KEY_USAGE:
+      case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
+        // We group all these errors as "cert not trusted"
+        collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
+        if (errorCodeTrust == SECSuccess) {
+          errorCodeTrust = i_node->error;
+        }
+        break;
+      case SSL_ERROR_BAD_CERT_DOMAIN:
+        collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
+        if (errorCodeMismatch == SECSuccess) {
+          errorCodeMismatch = i_node->error;
+        }
+        break;
+      case SEC_ERROR_EXPIRED_CERTIFICATE:
+        collected_errors |= nsICertOverrideService::ERROR_TIME;
+        if (errorCodeExpired == SECSuccess) {
+          errorCodeExpired = i_node->error;
+        }
+        break;
+      default:
+        PR_SetError(i_node->error, 0);
+        return nullptr;
     }
-  } else {
-    // XXX set errorCodeTrust, errorCodeMismatch, errorCodeExpired, collected_errors
   }
 
   if (!collected_errors)
@@ -647,21 +661,31 @@ SSLServerCertVerificationJob::SSLServerCertVerificationJob(
 }
 
 SECStatus
-PSM_SSL_PKIX_AuthCertificate(CERTCertificate *peerCert,
-                             nsIInterfaceRequestor * pinarg,
-                             const char * hostname,
-                             CERTCertList **validationChain,
-                             SECOidTag *evOidPolicy)
+PSM_SSL_PKIX_AuthCertificate(CERTCertificate *peerCert, void * pinarg,
+                             const char * hostname)
 {
-    RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-    if (!certVerifier) {
-      PR_SetError(PR_INVALID_STATE_ERROR, 0);
-      return SECFailure;
+    SECStatus          rv;
+    
+    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+        rv = CERT_VerifyCertNow(CERT_GetDefaultCertDB(), peerCert, true,
+                                certUsageSSLServer, pinarg);
     }
+    else {
+        nsresult nsrv;
+        nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+        if (!inss)
+          return SECFailure;
+        RefPtr<nsCERTValInParamWrapper> survivingParams;
+        if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams)))
+          return SECFailure;
 
-    SECStatus rv = certVerifier->VerifyCert(peerCert,
-                                            certificateUsageSSLServer, PR_Now(),
-                                            pinarg, 0, validationChain , evOidPolicy);
+        CERTValOutParam cvout[1];
+        cvout[0].type = cert_po_end;
+
+        rv = CERT_PKIXVerifyCert(peerCert, certificateUsageSSLServer,
+                                survivingParams->GetRawPointerForNSS(),
+                                cvout, pinarg);
+    }
 
     if (rv == SECSuccess) {
         /* cert is OK.  This is the client side of an SSL connection.
@@ -873,12 +897,8 @@ AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert,
     }
   }
 
-  CERTCertList *verifyCertChain = nullptr;
-  SECOidTag evOidPolicy;
   SECStatus rv = PSM_SSL_PKIX_AuthCertificate(cert, infoObject,
-                                              infoObject->GetHostName(),
-                                              &verifyCertChain,
-                                              &evOidPolicy);
+                                              infoObject->GetHostName());
 
   // We want to remember the CA certs in the temp db, so that the application can find the
   // complete chain at any time it might need it.
@@ -888,12 +908,7 @@ AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert,
   RefPtr<nsNSSCertificate> nsc;
 
   if (!status || !status->mServerCert) {
-    if( rv == SECSuccess ){
-      nsc = nsNSSCertificate::Create(cert, &evOidPolicy);
-    }
-    else {
-      nsc = nsNSSCertificate::Create(cert);
-    }
+    nsc = nsNSSCertificate::Create(cert);
   }
 
   ScopedCERTCertList certList(CERT_GetCertChainFromCert(cert, PR_Now(),
@@ -922,6 +937,13 @@ AuthCertificate(TransportSecurityInfo * infoObject, CERTCertificate * cert,
   }
 
   if (rv == SECSuccess) {
+    if (nsc) {
+      bool dummyIsEV;
+      nsc->GetIsExtendedValidation(&dummyIsEV); // the nsc object will cache the status
+    }
+    
+    nsCOMPtr<nsINSSComponent> nssComponent;
+
     // We want to avoid storing any intermediate cert information when browsing
     // in private, transient contexts.
     if (!(providerFlags & nsISocketProvider::NO_PERMANENT_STORAGE)) {
diff --git a/security/manager/ssl/src/nsCERTValInParamWrapper.cpp b/security/manager/ssl/src/nsCERTValInParamWrapper.cpp
new file mode 100644
index 000000000000..a7efc3727aad
--- /dev/null
+++ b/security/manager/ssl/src/nsCERTValInParamWrapper.cpp
@@ -0,0 +1,126 @@
+/* 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 "nsCERTValInParamWrapper.h"
+
+NS_IMPL_THREADSAFE_ADDREF(nsCERTValInParamWrapper)
+NS_IMPL_THREADSAFE_RELEASE(nsCERTValInParamWrapper)
+
+nsCERTValInParamWrapper::nsCERTValInParamWrapper()
+:mAlreadyConstructed(false)
+,mCVIN(nullptr)
+,mRev(nullptr)
+{
+  MOZ_COUNT_CTOR(nsCERTValInParamWrapper);
+}
+
+nsCERTValInParamWrapper::~nsCERTValInParamWrapper()
+{
+  MOZ_COUNT_DTOR(nsCERTValInParamWrapper);
+  if (mRev) {
+    CERT_DestroyCERTRevocationFlags(mRev);
+  }
+  if (mCVIN)
+    PORT_Free(mCVIN);
+}
+
+nsresult nsCERTValInParamWrapper::Construct(missing_cert_download_config mcdc,
+                                            crl_download_config cdc,
+                                            ocsp_download_config odc,
+                                            ocsp_strict_config osc,
+                                            any_revo_fresh_config arfc,
+                                            const char *firstNetworkRevocationMethod)
+{
+  if (mAlreadyConstructed)
+    return NS_ERROR_FAILURE;
+
+  mOCSPDownloadEnabled = odc == ocsp_on;
+
+  CERTValInParam *p = (CERTValInParam*)PORT_Alloc(3 * sizeof(CERTValInParam));
+  if (!p)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  CERTRevocationFlags *rev = CERT_AllocCERTRevocationFlags(
+      cert_revocation_method_ocsp +1, 1,
+      cert_revocation_method_ocsp +1, 1);
+  
+  if (!rev) {
+    PORT_Free(p);
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  
+  p[0].type = cert_pi_useAIACertFetch;
+  p[0].value.scalar.b = (mcdc == missing_cert_download_on);
+  p[1].type = cert_pi_revocationFlags;
+  p[1].value.pointer.revocation = rev;
+  p[2].type = cert_pi_end;
+  
+  rev->leafTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
+  rev->chainTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
+    // implicit default source - makes no sense for CRLs
+    CERT_REV_M_IGNORE_IMPLICIT_DEFAULT_SOURCE
+
+    // let's not stop on fresh CRL. If OCSP is enabled, too, let's check it
+    | CERT_REV_M_CONTINUE_TESTING_ON_FRESH_INFO
+
+    // no fresh CRL? well, let other flag decide whether to fail or not
+    | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
+
+    // testing using local CRLs is always allowed
+    | CERT_REV_M_TEST_USING_THIS_METHOD
+
+    // no local crl and don't know where to get it from? ignore
+    | CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE
+
+    // crl download based on parameter
+    | ((cdc == crl_download_allowed) ?
+        CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
+    ;
+
+  rev->leafTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
+  rev->chainTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
+    // is ocsp enabled at all?
+    ((odc == ocsp_on) ?
+      CERT_REV_M_TEST_USING_THIS_METHOD : CERT_REV_M_DO_NOT_TEST_USING_THIS_METHOD)
+
+    // ocsp enabled controls network fetching, too
+    | ((odc == ocsp_on) ?
+        CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
+
+    // ocsp set to strict==required?
+    | ((osc == ocsp_strict) ?
+        CERT_REV_M_FAIL_ON_MISSING_FRESH_INFO : CERT_REV_M_IGNORE_MISSING_FRESH_INFO)
+
+    // if app has a default OCSP responder configured, let's use it
+    | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
+
+    // of course OCSP doesn't work without a source. let's accept such certs
+    | CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE
+
+    // ocsp success is sufficient
+    | CERT_REV_M_STOP_TESTING_ON_FRESH_INFO
+    ;
+
+  bool wantsCrlFirst = (firstNetworkRevocationMethod != nullptr)
+                          && (strcmp("crl", firstNetworkRevocationMethod) == 0);
+    
+  rev->leafTests.preferred_methods[0] =
+  rev->chainTests.preferred_methods[0] =
+    wantsCrlFirst ? cert_revocation_method_crl : cert_revocation_method_ocsp;
+
+  rev->leafTests.cert_rev_method_independent_flags =
+  rev->chainTests.cert_rev_method_independent_flags =
+    // avoiding the network is good, let's try local first
+    CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST
+
+    // is overall revocation requirement strict or relaxed?
+    | ((arfc == any_revo_strict) ?
+        CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE : CERT_REV_MI_NO_OVERALL_INFO_REQUIREMENT)
+    ;
+
+  mAlreadyConstructed = true;
+  mCVIN = p;
+  mRev = rev;
+  return NS_OK;
+}
diff --git a/security/manager/ssl/src/nsCERTValInParamWrapper.h b/security/manager/ssl/src/nsCERTValInParamWrapper.h
new file mode 100644
index 000000000000..dab0aaabcc90
--- /dev/null
+++ b/security/manager/ssl/src/nsCERTValInParamWrapper.h
@@ -0,0 +1,71 @@
+/* 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/. */
+
+#ifndef _nsCERTValInParamWrapper_H
+#define _nsCERTValInParamWrapper_H
+
+#include "nsISupports.h"
+#include "cert.h"
+
+/*
+ * This is a wrapper around type
+ * CERTValInParam is a nested input parameter type for CERT_PKIXVerifyCert.
+ * The values inside this type depend on application preferences,
+ * as a consequence it's expensive to construct this object.
+ * (and we shall avoid to access prefs from secondary threads anyway).
+ * We want to create an instance of that input type once, and use as long as possible.
+ * Every time the preferences change, we will create a new default object.
+ *
+ * A race is possible between "verification function is active and object in use"
+ * and "must switch to new defaults".
+ *
+ * The global default object may be replaced at any time with a new object.
+ * The contents of inner CERTValInParam are supposed to be stable (const).
+ *
+ * In order to protect against the race, we use a reference counted wrapper.
+ * Each user of a foreign nsCERTValInParamWrapper object
+ * (e.g. the current global default object)
+ * must use RefPtr<nsCERTValInParamWrapper> = other-object
+ * prior to calling CERT_PKIXVerifyCert.
+ * 
+ * This guarantees the object will still be alive after the call,
+ * and if the default object has been replaced in the meantime,
+ * the reference counter will go to zero, and the old default
+ * object will get destroyed automatically.
+ */
+class nsCERTValInParamWrapper
+{
+public:
+  NS_IMETHOD_(nsrefcnt) AddRef();
+  NS_IMETHOD_(nsrefcnt) Release();
+
+  bool IsOCSPDownloadEnabled() const { return mOCSPDownloadEnabled; }
+
+  nsCERTValInParamWrapper();
+  virtual ~nsCERTValInParamWrapper();
+
+  enum missing_cert_download_config { missing_cert_download_off = 0, missing_cert_download_on };
+  enum crl_download_config { crl_local_only = 0, crl_download_allowed };
+  enum ocsp_download_config { ocsp_off = 0, ocsp_on };
+  enum ocsp_strict_config { ocsp_relaxed = 0, ocsp_strict };
+  enum any_revo_fresh_config { any_revo_relaxed = 0, any_revo_strict };
+
+  nsresult Construct(missing_cert_download_config ac, crl_download_config cdc,
+                     ocsp_download_config odc, ocsp_strict_config osc,
+                     any_revo_fresh_config arfc,
+                     const char *firstNetworkRevocationMethod);
+
+private:
+  nsAutoRefCnt mRefCnt;
+  NS_DECL_OWNINGTHREAD
+  bool mAlreadyConstructed;
+  CERTValInParam *mCVIN;
+  CERTRevocationFlags *mRev;
+  bool mOCSPDownloadEnabled;
+  
+public:
+  CERTValInParam *GetRawPointerForNSS() { return mCVIN; }
+};
+
+#endif
diff --git a/security/manager/ssl/src/nsCMS.cpp b/security/manager/ssl/src/nsCMS.cpp
index 89da4298111a..1c183a562ca9 100644
--- a/security/manager/ssl/src/nsCMS.cpp
+++ b/security/manager/ssl/src/nsCMS.cpp
@@ -3,9 +3,8 @@
  * 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 "nsCMS.h"
-#include "CertVerifier.h"
 #include "nsISupports.h"
+#include "nsCMS.h"
 #include "nsNSSHelper.h"
 #include "nsNSSCertificate.h"
 #include "smime.h"
@@ -14,17 +13,19 @@
 #include "nsIArray.h"
 #include "nsArrayUtils.h"
 #include "nsCertVerificationThread.h"
+#include "nsCERTValInParamWrapper.h"
 #include "ScopedNSSTypes.h"
 
 #include "prlog.h"
 
-using namespace mozilla;
-using namespace mozilla::psm;
+#include "nsNSSComponent.h"
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gPIPNSSLog;
 #endif
 
+using namespace mozilla;
+
 static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsCMSMessage, nsICMSMessage, 
@@ -217,8 +218,9 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, uint32_
   NSSCMSSignedData *sigd = nullptr;
   NSSCMSSignerInfo *si;
   int32_t nsigners;
-  RefPtr<CertVerifier> certVerifier;
   nsresult rv = NS_ERROR_FAILURE;
+  RefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsCOMPtr<nsINSSComponent> inss;
 
   if (!NSS_CMSMessage_IsSigned(m_cmsMsg)) {
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - not signed\n"));
@@ -262,16 +264,32 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, uint32_
   // See bug 324474. We want to make sure the signing cert is 
   // still valid at the current time.
 
-  certVerifier = GetDefaultCertVerifier();
-  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+    if (CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), si->cert, true, 
+                                  certificateUsageEmailSigner,
+                                  si->cmsg->pwfn_arg, nullptr) != SECSuccess) {
+      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
+      rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
+      goto loser;
+    }
+  }
+  else {
+    CERTValOutParam cvout[1];
+    cvout[0].type = cert_po_end;
 
-  {
-    SECStatus srv = certVerifier->VerifyCert(si->cert,
-                                             certificateUsageEmailSigner,
-                                             PR_Now(), nullptr /*XXX pinarg*/);
-    if (srv != SECSuccess) {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
-             ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
+    inss = do_GetService(kNSSComponentCID, &rv);
+    if (!inss) {
+      goto loser;
+    }
+
+    if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams))) {
+      goto loser;
+    }
+    SECStatus stat = CERT_PKIXVerifyCert(si->cert, certificateUsageEmailSigner,
+			    survivingParams->GetRawPointerForNSS(),
+			    cvout, si->cmsg->pwfn_arg);
+    if (stat != SECSuccess) {
+      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
       rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
       goto loser;
     }
diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index 80e4e5797344..b9c5ca90a9c3 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -4,7 +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/. */
 
-#include "CertVerifier.h"
 #include "mozilla/RefPtr.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsStreamUtils.h"
@@ -21,7 +20,6 @@
 #include "ScopedNSSTypes.h"
 
 using namespace mozilla;
-using namespace mozilla::psm;
 
 #ifdef DEBUG
 #ifndef PSM_ENABLE_TEST_EV_ROOTS
@@ -1015,9 +1013,7 @@ isEVPolicy(SECOidTag policyOIDTag)
   return false;
 }
 
-namespace mozilla { namespace psm {
-
-CERTCertList*
+static CERTCertList*
 getRootsForOid(SECOidTag oid_tag)
 {
   CERTCertList *certList = CERT_NewCertList();
@@ -1038,8 +1034,6 @@ getRootsForOid(SECOidTag oid_tag)
   return certList;
 }
 
-}}
-
 static bool 
 isApprovedForEV(SECOidTag policyOIDTag, CERTCertificate *rootCert)
 {
@@ -1133,10 +1127,8 @@ nsNSSComponent::IdentityInfoInit()
   return PR_SUCCESS;
 }
 
-namespace mozilla { namespace psm {
-
 // Find the first policy OID that is known to be an EV policy OID.
-SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
+static SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
 {
   if (!cert)
     return SECFailure;
@@ -1181,8 +1173,6 @@ SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
   return SECFailure;
 }
 
-}}
-
 NS_IMETHODIMP
 nsSSLStatus::GetIsExtendedValidation(bool* aIsEV)
 {
@@ -1225,23 +1215,101 @@ nsNSSCertificate::hasValidEVOidTag(SECOidTag &resultOidTag, bool &validEV)
     return nrv;
   nssComponent->EnsureIdentityInfoLoaded();
 
-  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
+  RefPtr<nsCERTValInParamWrapper> certVal;
+  nrv = nssComponent->GetDefaultCERTValInParam(certVal);
+  NS_ENSURE_SUCCESS(nrv, nrv);
 
   validEV = false;
   resultOidTag = SEC_OID_UNKNOWN;
 
-  SECStatus rv = certVerifier->VerifyCert(mCert,
-                                          certificateUsageSSLServer, PR_Now(),
-                                          nullptr /* XXX pinarg*/,
-                                          0, nullptr, &resultOidTag);
+  SECOidTag oid_tag;
+  SECStatus rv = getFirstEVPolicy(mCert, oid_tag);
+  if (rv != SECSuccess)
+    return NS_OK;
 
-  if (rv != SECSuccess) {
-    resultOidTag = SEC_OID_UNKNOWN;
-  }
-  if (resultOidTag != SEC_OID_UNKNOWN) {
-    validEV = true;
+  if (oid_tag == SEC_OID_UNKNOWN) // not in our list of OIDs accepted for EV
+    return NS_OK;
+
+  ScopedCERTCertList rootList(getRootsForOid(oid_tag));
+
+  CERTRevocationMethodIndex preferedRevMethods[1] = { 
+    cert_revocation_method_ocsp
+  };
+
+  uint64_t revMethodFlags = 
+    CERT_REV_M_TEST_USING_THIS_METHOD
+    | (certVal->IsOCSPDownloadEnabled() ? CERT_REV_M_ALLOW_NETWORK_FETCHING
+                                        : CERT_REV_M_FORBID_NETWORK_FETCHING)
+    | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
+    | CERT_REV_M_REQUIRE_INFO_ON_MISSING_SOURCE
+    | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
+    | CERT_REV_M_STOP_TESTING_ON_FRESH_INFO;
+
+  uint64_t revMethodIndependentFlags = 
+    CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST
+    | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE;
+
+  uint64_t methodFlags[2];
+  methodFlags[cert_revocation_method_crl] = revMethodFlags;
+  methodFlags[cert_revocation_method_ocsp] = revMethodFlags;
+
+  CERTRevocationFlags rev;
+
+  rev.leafTests.number_of_defined_methods = cert_revocation_method_ocsp +1;
+  rev.leafTests.cert_rev_flags_per_method = methodFlags;
+  rev.leafTests.number_of_preferred_methods = 1;
+  rev.leafTests.preferred_methods = preferedRevMethods;
+  rev.leafTests.cert_rev_method_independent_flags =
+    revMethodIndependentFlags;
+
+  rev.chainTests.number_of_defined_methods = cert_revocation_method_ocsp +1;
+  rev.chainTests.cert_rev_flags_per_method = methodFlags;
+  rev.chainTests.number_of_preferred_methods = 1;
+  rev.chainTests.preferred_methods = preferedRevMethods;
+  rev.chainTests.cert_rev_method_independent_flags =
+    revMethodIndependentFlags;
+
+  CERTValInParam cvin[4];
+  cvin[0].type = cert_pi_policyOID;
+  cvin[0].value.arraySize = 1; 
+  cvin[0].value.array.oids = &oid_tag;
+
+  cvin[1].type = cert_pi_revocationFlags;
+  cvin[1].value.pointer.revocation = &rev;
+
+  cvin[2].type = cert_pi_trustAnchors;
+  cvin[2].value.pointer.chain = rootList;
+
+  cvin[3].type = cert_pi_end;
+
+  CERTValOutParam cvout[2];
+  cvout[0].type = cert_po_trustAnchor;
+  cvout[0].value.pointer.cert = nullptr;
+  cvout[1].type = cert_po_end;
+
+  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("calling CERT_PKIXVerifyCert nss cert %p\n", mCert.get()));
+  rv = CERT_PKIXVerifyCert(mCert, certificateUsageSSLServer,
+                           cvin, cvout, nullptr);
+  if (rv != SECSuccess)
+    return NS_OK;
+
+  ScopedCERTCertificate issuerCert(cvout[0].value.pointer.cert);
+
+#ifdef PR_LOGGING
+  if (PR_LOG_TEST(gPIPNSSLog, PR_LOG_DEBUG)) {
+    nsNSSCertificate ic(issuerCert);
+    nsAutoString fingerprint;
+    ic.GetSha1Fingerprint(fingerprint);
+    NS_LossyConvertUTF16toASCII fpa(fingerprint);
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CERT_PKIXVerifyCert returned success, issuer: %s, SHA1: %s\n", 
+      issuerCert->subjectName, fpa.get()));
   }
+#endif
+
+  validEV = isApprovedForEV(oid_tag, issuerCert);
+  if (validEV)
+    resultOidTag = oid_tag;
+ 
   return NS_OK;
 }
 
@@ -1277,10 +1345,8 @@ nsNSSCertificate::GetIsExtendedValidation(bool* aIsEV)
 
   if (mCachedEVStatus != ev_status_unknown) {
     *aIsEV = (mCachedEVStatus == ev_status_valid);
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSSCertificate::GetIsExtendedValidation value IS cached! \n"));
     return NS_OK;
   }
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSSCertificate::GetIsExtendedValidation value is NOT cached! \n"));
 
   SECOidTag oid_tag;
   return getValidEVOidTag(oid_tag, *aIsEV);
diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp
index 5ea2da7d5558..31d8228bbf5e 100644
--- a/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/security/manager/ssl/src/nsNSSCertificate.cpp
@@ -7,12 +7,11 @@
 #include "prerror.h"
 #include "prprf.h"
 
-#include "nsNSSCertificate.h"
-#include "CertVerifier.h"
 #include "nsNSSComponent.h" // for PIPNSS string bundle calls.
 #include "nsNSSCleaner.h"
 #include "nsCOMPtr.h"
 #include "nsIMutableArray.h"
+#include "nsNSSCertificate.h"
 #include "nsNSSCertValidity.h"
 #include "nsPKCS12Blob.h"
 #include "nsPK11TokenDB.h"
@@ -49,7 +48,6 @@
 #include "plbase64.h"
 
 using namespace mozilla;
-using namespace mozilla::psm;
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gPIPNSSLog;
@@ -77,14 +75,14 @@ NS_IMPL_THREADSAFE_ISUPPORTS7(nsNSSCertificate, nsIX509Cert,
 
 /* static */
 nsNSSCertificate*
-nsNSSCertificate::Create(CERTCertificate *cert, SECOidTag *evOidPolicy)
+nsNSSCertificate::Create(CERTCertificate *cert)
 {
   if (GeckoProcessType_Default != XRE_GetProcessType()) {
     NS_ERROR("Trying to initialize nsNSSCertificate in a non-chrome process!");
     return nullptr;
   }
   if (cert)
-    return new nsNSSCertificate(cert, evOidPolicy);
+    return new nsNSSCertificate(cert);
   else
     return new nsNSSCertificate();
 }
@@ -129,8 +127,7 @@ nsNSSCertificate::InitFromDER(char *certDER, int derLen)
   return true;
 }
 
-nsNSSCertificate::nsNSSCertificate(CERTCertificate *cert,
-                                   SECOidTag *evOidPolicy) :
+nsNSSCertificate::nsNSSCertificate(CERTCertificate *cert) : 
                                            mCert(nullptr),
                                            mPermDelete(false),
                                            mCertType(CERT_TYPE_NOT_YET_INITIALIZED),
@@ -145,18 +142,8 @@ nsNSSCertificate::nsNSSCertificate(CERTCertificate *cert,
   if (isAlreadyShutDown())
     return;
 
-  if (cert) {
+  if (cert) 
     mCert = CERT_DupCertificate(cert);
-    if (evOidPolicy) {
-      if ( *evOidPolicy == SEC_OID_UNKNOWN) {
-        mCachedEVStatus =  ev_status_invalid;
-      }
-      else {
-        mCachedEVStatus = ev_status_valid;
-      }
-      mCachedEVOidTag = *evOidPolicy;
-    }
-  }
 }
 
 nsNSSCertificate::nsNSSCertificate() : 
@@ -1214,9 +1201,15 @@ nsNSSCertificate::VerifyForUsage(uint32_t usage, uint32_t *verificationResult)
 
   NS_ENSURE_ARG(verificationResult);
 
-  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
-
+  nsresult nsrv;
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss)
+    return nsrv;
+  RefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  if (NS_FAILED(nsrv))
+    return nsrv;
+  
   SECCertificateUsage nss_usage;
   
   switch (usage)
@@ -1273,8 +1266,19 @@ nsNSSCertificate::VerifyForUsage(uint32_t usage, uint32_t *verificationResult)
       return NS_ERROR_FAILURE;
   }
 
-  SECStatus verify_result = certVerifier->VerifyCert(mCert, nss_usage, PR_Now(),
-                                                     nullptr /*XXX pinarg*/);
+  SECStatus verify_result;
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+    CERTCertDBHandle *defaultcertdb = CERT_GetDefaultCertDB();
+    verify_result = CERT_VerifyCertificateNow(defaultcertdb, mCert, true, 
+                                              nss_usage, nullptr, nullptr);
+  }
+  else {
+    CERTValOutParam cvout[1];
+    cvout[0].type = cert_po_end;
+    verify_result = CERT_PKIXVerifyCert(mCert, nss_usage,
+                                        survivingParams->GetRawPointerForNSS(),
+                                        cvout, nullptr);
+  }
   
   if (verify_result == SECSuccess)
   {
diff --git a/security/manager/ssl/src/nsNSSCertificate.h b/security/manager/ssl/src/nsNSSCertificate.h
index 8e3a7059a77e..f1c7066778ad 100644
--- a/security/manager/ssl/src/nsNSSCertificate.h
+++ b/security/manager/ssl/src/nsNSSCertificate.h
@@ -44,12 +44,12 @@ public:
   NS_DECL_NSISERIALIZABLE
   NS_DECL_NSICLASSINFO
 
-  nsNSSCertificate(CERTCertificate *cert,SECOidTag *evOidPolicy = nullptr);
+  nsNSSCertificate(CERTCertificate *cert);
   nsNSSCertificate();
   /* from a request? */
   virtual ~nsNSSCertificate();
   nsresult FormatUIStrings(const nsAutoString &nickname, nsAutoString &nickWithSerial, nsAutoString &details);
-  static nsNSSCertificate* Create(CERTCertificate *cert = nullptr, SECOidTag *evOidPolicy = nullptr);
+  static nsNSSCertificate* Create(CERTCertificate *cert = nullptr);
   static nsNSSCertificate* ConstructFromDER(char *certDER, int derLen);
 
   // It is the responsibility of the caller of this method to free the returned
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index ade4fdb62a8a..c41f115af1dc 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -7,10 +7,8 @@
 // only exported so PSM can use it for this specific purpose.
 #define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm
 
-#include "nsNSSCertificateDB.h"
-
-#include "CertVerifier.h"
 #include "nsNSSComponent.h"
+#include "nsNSSCertificateDB.h"
 #include "mozilla/Base64.h"
 #include "nsCOMPtr.h"
 #include "nsNSSCertificate.h"
@@ -48,7 +46,6 @@
 #include "plbase64.h"
 
 using namespace mozilla;
-using namespace mozilla::psm;
 using mozilla::psm::SharedSSLState;
 
 #ifdef PR_LOGGING
@@ -497,9 +494,22 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
   CERTCertificate **certArray = nullptr;
   ScopedCERTCertList certList;
   CERTCertListNode *node;
+  PRTime now;
+  SECCertUsage certusage;
+  SECCertificateUsage certificateusage;
   SECItem **rawArray;
   int numcerts;
   int i;
+  CERTValOutParam cvout[1];
+  cvout[0].type = cert_po_end;
+
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss)
+    return nsrv;
+  RefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  if (NS_FAILED(nsrv))
+    return nsrv;
  
   PLArenaPool *arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   if (!arena)
@@ -511,11 +521,9 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
     return NS_ERROR_FAILURE;
   }
 
-  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
-
   certdb = CERT_GetDefaultCertDB();
-  const PRTime now = PR_Now();
+  certusage = certUsageEmailRecipient;
+  certificateusage = certificateUsageEmailRecipient;
 
   numcerts = certCollection->numcerts;
 
@@ -529,7 +537,7 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
     rawArray[i] = &certCollection->rawCerts[i];
   }
 
-  srv = CERT_ImportCerts(certdb, certUsageEmailRecipient, numcerts, rawArray,
+  srv = CERT_ImportCerts(certdb, certusage, numcerts, rawArray, 
                          &certArray, false, false, nullptr);
 
   PORT_Free(rawArray);
@@ -557,6 +565,7 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
   /* go down the remaining list of certs and verify that they have
    * valid chains, then import them.
    */
+  now = PR_Now();
 
   for (node = CERT_LIST_HEAD(certList);
        !CERT_LIST_END(node,certList);
@@ -568,18 +577,25 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
       continue;
     }
 
-    SECStatus rv = certVerifier->VerifyCert(node->cert,
-                                            certificateUsageEmailRecipient,
-                                            now, ctx);
-    if (rv != SECSuccess) {
-      alert_and_skip = true;
+    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+      if (CERT_VerifyCert(certdb, node->cert,
+          true, certusage, now, ctx, nullptr) != SECSuccess) {
+        alert_and_skip = true;
+      }
+    }
+    else {
+      if (CERT_PKIXVerifyCert(node->cert, certificateusage,
+                              survivingParams->GetRawPointerForNSS(),
+                              cvout, ctx)
+          != SECSuccess) {
+        alert_and_skip = true;
+      }
     }
 
     ScopedCERTCertificateList certChain;
 
     if (!alert_and_skip) {
-      certChain = CERT_CertChainFromCert(node->cert, certUsageEmailRecipient,
-                                         false);
+      certChain = CERT_CertChainFromCert(node->cert, certusage, false);
       if (!certChain) {
         alert_and_skip = true;
       }
@@ -603,7 +619,7 @@ nsNSSCertificateDB::ImportEmailCertificate(uint8_t * data, uint32_t length,
     for (i=0; i < certChain->len; i++) {
       rawArray[i] = &certChain->certs[i];
     }
-    CERT_ImportCerts(certdb, certUsageEmailRecipient, certChain->len,
+    CERT_ImportCerts(certdb, certusage, certChain->len, 
                             rawArray,  nullptr, true, false, nullptr);
 
     CERT_SaveSMimeProfile(node->cert, nullptr, nullptr);
@@ -736,9 +752,14 @@ nsresult
 nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfaceRequestor *ctx)
 {
   SECItem **rawArray;
-  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-  if (!certVerifier)
-    return NS_ERROR_UNEXPECTED;
+  nsresult nsrv;
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss)
+    return nsrv;
+  RefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  if (NS_FAILED(nsrv))
+    return nsrv;
 
   /* filter out the certs we don't want */
   SECStatus srv = CERT_FilterCertListByUsage(certList, certUsageAnyCA, true);
@@ -759,10 +780,19 @@ nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfac
 
     bool alert_and_skip = false;
 
-    SECStatus rv = certVerifier->VerifyCert(node->cert, certificateUsageVerifyCA,
-                                            PR_Now(), ctx);
-    if (rv != SECSuccess) {
-      alert_and_skip = true;
+    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+      if (CERT_VerifyCert(CERT_GetDefaultCertDB(), node->cert, 
+          true, certUsageVerifyCA, PR_Now(), ctx, nullptr) != SECSuccess) {
+        alert_and_skip = true;
+      }
+    }
+    else {
+      if (CERT_PKIXVerifyCert(node->cert, certificateUsageVerifyCA,
+                              survivingParams->GetRawPointerForNSS(),
+                              cvout, ctx)
+          != SECSuccess) {
+        alert_and_skip = true;
+      }
     }
 
     ScopedCERTCertificateList certChain;
@@ -1294,8 +1324,18 @@ nsNSSCertificateDB::FindCertByEmailAddress(nsISupports *aToken, const char *aEma
 {
   nsNSSShutDownPreventionLock locker;
   
-  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
+  nsCOMPtr<nsINSSComponent> inss;
+  RefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsresult nsrv;
+  
+  if (nsNSSComponent::globalConstFlagUsePKIXVerification) {
+    inss = do_GetService(kNSSComponentCID, &nsrv);
+    if (!inss)
+      return nsrv;
+    nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+    if (NS_FAILED(nsrv))
+      return nsrv;
+  }
 
   ScopedCERTCertList certlist(
       PK11_FindCertsFromEmailAddress(aEmailAddress, nullptr));
@@ -1314,11 +1354,23 @@ nsNSSCertificateDB::FindCertByEmailAddress(nsISupports *aToken, const char *aEma
        !CERT_LIST_END(node, certlist);
        node = CERT_LIST_NEXT(node)) {
 
-    SECStatus srv = certVerifier->VerifyCert(node->cert,
-                                             certificateUsageEmailRecipient,
-                                             PR_Now(), nullptr /*XXX pinarg*/);
-    if (srv == SECSuccess) {
-      break;
+    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+      if (CERT_VerifyCert(CERT_GetDefaultCertDB(), node->cert,
+          true, certUsageEmailRecipient, PR_Now(), nullptr, nullptr) == SECSuccess) {
+        // found a valid certificate
+        break;
+      }
+    }
+    else {
+      CERTValOutParam cvout[1];
+      cvout[0].type = cert_po_end;
+      if (CERT_PKIXVerifyCert(node->cert, certificateUsageEmailRecipient,
+                              survivingParams->GetRawPointerForNSS(),
+                              cvout, nullptr)
+          == SECSuccess) {
+        // found a valid certificate
+        break;
+      }
     }
   }
 
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 57f8ac0528f4..8b91e5fc82e2 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -9,8 +9,6 @@
 #endif
 
 #include "nsNSSComponent.h"
-
-#include "CertVerifier.h"
 #include "nsNSSCallbacks.h"
 #include "nsNSSIOLayer.h"
 #include "nsCertVerificationThread.h"
@@ -69,6 +67,7 @@
 #include "nsNSSShutDown.h"
 #include "GeneratedEvents.h"
 #include "nsIKeyModule.h"
+#include "ScopedNSSTypes.h"
 #include "SharedSSLState.h"
 
 #include "nss.h"
@@ -1099,18 +1098,23 @@ void nsNSSComponent::setValidationOptions(nsIPrefBranch * pref)
                            ocspMode_FailureIsVerificationFailure
                            : ocspMode_FailureIsNotAVerificationFailure);
 
-  mDefaultCertVerifier = new CertVerifier(
+  RefPtr<nsCERTValInParamWrapper> newCVIN(new nsCERTValInParamWrapper);
+  if (NS_SUCCEEDED(newCVIN->Construct(
       aiaDownloadEnabled ? 
-        CertVerifier::missing_cert_download_on : CertVerifier::missing_cert_download_off,
+        nsCERTValInParamWrapper::missing_cert_download_on : nsCERTValInParamWrapper::missing_cert_download_off,
       crlDownloading ?
-        CertVerifier::crl_download_allowed : CertVerifier::crl_local_only,
+        nsCERTValInParamWrapper::crl_download_allowed : nsCERTValInParamWrapper::crl_local_only,
       ocspEnabled ? 
-        CertVerifier::ocsp_on : CertVerifier::ocsp_off,
+        nsCERTValInParamWrapper::ocsp_on : nsCERTValInParamWrapper::ocsp_off,
       ocspRequired ? 
-        CertVerifier::ocsp_strict : CertVerifier::ocsp_relaxed,
+        nsCERTValInParamWrapper::ocsp_strict : nsCERTValInParamWrapper::ocsp_relaxed,
       anyFreshRequired ?
-        CertVerifier::any_revo_strict : CertVerifier::any_revo_relaxed,
-      firstNetworkRevo.get());
+        nsCERTValInParamWrapper::any_revo_strict : nsCERTValInParamWrapper::any_revo_relaxed,
+      firstNetworkRevo.get()))) {
+    // Swap to new defaults, and will cause the old defaults to be released,
+    // as soon as any concurrent use of the old default objects has finished.
+    mDefaultCERTValInParam = newCVIN;
+  }
 
   /*
     * The new defaults might change the validity of already established SSL sessions,
@@ -1822,6 +1826,20 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
       // dynamic options from prefs
       setValidationOptions(mPrefBranch);
 
+      // static validation options for usagesarray - do not hit the network
+      mDefaultCERTValInParamLocalOnly = new nsCERTValInParamWrapper;
+      rv = mDefaultCERTValInParamLocalOnly->Construct(
+          nsCERTValInParamWrapper::missing_cert_download_off,
+          nsCERTValInParamWrapper::crl_local_only,
+          nsCERTValInParamWrapper::ocsp_off,
+          nsCERTValInParamWrapper::ocsp_relaxed,
+          nsCERTValInParamWrapper::any_revo_relaxed,
+          FIRST_REVO_METHOD_DEFAULT);
+      if (NS_FAILED(rv)) {
+        nsPSMInitPanic::SetPanic();
+        return rv;
+      }
+      
       RegisterMyOCSPAIAInfoCallback();
 
       mHttpForNSS.initTable();
@@ -2035,7 +2053,7 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, uint32_t aRSABufLen,
   *aPrincipal = nullptr;
 
   nsNSSShutDownPreventionLock locker;
-  ScopedSEC_PKCS7ContentInfo p7_info;
+  ScopedSEC_PKCS7ContentInfo p7_info; 
   unsigned char hash[SHA1_LENGTH]; 
 
   SECItem item;
@@ -2048,6 +2066,10 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, uint32_t aRSABufLen,
                                 GetDecryptKeyCallback, nullptr,
                                 DecryptionAllowedCallback);
 
+  if (!p7_info) {
+    return NS_ERROR_FAILURE;
+  }
+
   // Make sure we call SEC_PKCS7DestroyContentInfo after this point;
   // otherwise we leak data in p7_info
   
@@ -2504,12 +2526,22 @@ nsNSSComponent::IsNSSInitialized(bool *initialized)
 }
 
 NS_IMETHODIMP
-nsNSSComponent::GetDefaultCertVerifier(RefPtr<CertVerifier> &out)
+nsNSSComponent::GetDefaultCERTValInParam(RefPtr<nsCERTValInParamWrapper> &out)
 {
   MutexAutoLock lock(mutex);
   if (!mNSSInitialized)
       return NS_ERROR_NOT_INITIALIZED;
-  out = mDefaultCertVerifier;
+  out = mDefaultCERTValInParam;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsNSSComponent::GetDefaultCERTValInParamLocalOnly(RefPtr<nsCERTValInParamWrapper> &out)
+{
+  MutexAutoLock lock(mutex);
+  if (!mNSSInitialized)
+      return NS_ERROR_NOT_INITIALIZED;
+  out = mDefaultCERTValInParamLocalOnly;
   return NS_OK;
 }
 
diff --git a/security/manager/ssl/src/nsNSSComponent.h b/security/manager/ssl/src/nsNSSComponent.h
index 160a23390537..0f3ee52818ed 100644
--- a/security/manager/ssl/src/nsNSSComponent.h
+++ b/security/manager/ssl/src/nsNSSComponent.h
@@ -37,13 +37,7 @@
 
 #include "nsNSSHelper.h"
 #include "nsClientAuthRemember.h"
-
-namespace mozilla { namespace psm {
-
-class CertVerifier;
-
-} } // namespace mozilla::psm
-
+#include "nsCERTValInParamWrapper.h"
 
 #define NS_NSSCOMPONENT_CID \
 {0xa277189c, 0x1dd1, 0x11b2, {0xa8, 0xc9, 0xe4, 0xe8, 0xbf, 0xb1, 0x33, 0x8e}}
@@ -163,8 +157,10 @@ class NS_NO_VTABLE nsINSSComponent : public nsISupports {
 
   NS_IMETHOD IsNSSInitialized(bool *initialized) = 0;
 
-  NS_IMETHOD GetDefaultCertVerifier(
-                  mozilla::RefPtr<mozilla::psm::CertVerifier> &out) = 0;
+  NS_IMETHOD GetDefaultCERTValInParam(
+                  mozilla::RefPtr<nsCERTValInParamWrapper> &out) = 0;
+  NS_IMETHOD GetDefaultCERTValInParamLocalOnly(
+                  mozilla::RefPtr<nsCERTValInParamWrapper> &out) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsINSSComponent, NS_INSSCOMPONENT_IID)
@@ -268,8 +264,10 @@ public:
   NS_IMETHOD EnsureIdentityInfoLoaded();
   NS_IMETHOD IsNSSInitialized(bool *initialized);
 
-  NS_IMETHOD GetDefaultCertVerifier(
-                  mozilla::RefPtr<mozilla::psm::CertVerifier> &out);
+  NS_IMETHOD GetDefaultCERTValInParam(
+                  mozilla::RefPtr<nsCERTValInParamWrapper> &out);
+  NS_IMETHOD GetDefaultCERTValInParamLocalOnly(
+                  mozilla::RefPtr<nsCERTValInParamWrapper> &out);
 private:
 
   nsresult InitializeNSS(bool showWarningBox);
@@ -329,8 +327,8 @@ private:
   nsCertVerificationThread *mCertVerificationThread;
 
   nsNSSHttpInterface mHttpForNSS;
-  mozilla::RefPtr<mozilla::psm::CertVerifier> mDefaultCertVerifier;
-
+  mozilla::RefPtr<nsCERTValInParamWrapper> mDefaultCERTValInParam;
+  mozilla::RefPtr<nsCERTValInParamWrapper> mDefaultCERTValInParamLocalOnly;
 
   static PRStatus IdentityInfoInit(void);
   PRCallOnceType mIdentityInfoCallOnce;
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.cpp b/security/manager/ssl/src/nsUsageArrayHelper.cpp
index 38c497d51063..a8ed09d95739 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.cpp
+++ b/security/manager/ssl/src/nsUsageArrayHelper.cpp
@@ -16,7 +16,6 @@
 #include "secerr.h"
 
 using namespace mozilla;
-using namespace mozilla::psm;
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gPIPNSSLog;
@@ -119,10 +118,8 @@ isFatalError(uint32_t checkResult)
 uint32_t
 nsUsageArrayHelper::check(uint32_t previousCheckResult,
                           const char *suffix,
-                          CertVerifier * certVerifier,
                           SECCertificateUsage aCertUsage,
-                          PRTime time,
-                          CertVerifier::Flags flags,
+                          nsCERTValInParamWrapper * aValInParams,
                           uint32_t &aCounter,
                           PRUnichar **outUsages)
 {
@@ -178,8 +175,13 @@ nsUsageArrayHelper::check(uint32_t previousCheckResult,
     return nsIX509Cert::NOT_VERIFIED_UNKNOWN;
   }
 
-  SECStatus rv = certVerifier->VerifyCert(mCert, aCertUsage,
-                         time, nullptr /*XXX:wincx*/, flags);
+  SECStatus rv;
+  CERTValOutParam cvout[1];
+  cvout[0].type = cert_po_end;
+
+  rv = CERT_PKIXVerifyCert(mCert, aCertUsage,
+                           aValInParams->GetRawPointerForNSS(),
+                           cvout, nullptr);
 
   if (rv == SECSuccess) {
     typestr.Append(suffix);
@@ -296,6 +298,7 @@ if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
   
   check(suffix, usages & certificateUsageSSLClient, count, outUsages);
   check(suffix, usages & certificateUsageSSLServer, count, outUsages);
+  check(suffix, usages & certificateUsageSSLServerWithStepUp, count, outUsages);
   check(suffix, usages & certificateUsageEmailSigner, count, outUsages);
   check(suffix, usages & certificateUsageEmailRecipient, count, outUsages);
   check(suffix, usages & certificateUsageObjectSigner, count, outUsages);
@@ -320,43 +323,43 @@ if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
   return NS_OK;
 }
 
-  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
-  NS_ENSURE_TRUE(certVerifier, NS_ERROR_UNEXPECTED);
-
-  PRTime now = PR_Now();
-  CertVerifier::Flags flags = localOnly ? CertVerifier::FLAG_LOCAL_ONLY : 0;
+  RefPtr<nsCERTValInParamWrapper> params;
+  nsresult rv = localOnly ? nssComponent->GetDefaultCERTValInParamLocalOnly(params)
+                          : nssComponent->GetDefaultCERTValInParam(params);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   // The following list of checks must be < max_returned_out_array_size
 
   uint32_t result;
-  result = check(nsIX509Cert::VERIFIED_OK, suffix, certVerifier,
-                 certificateUsageSSLClient, now, flags, count, outUsages);
-  result = check(result, suffix, certVerifier,
-                 certificateUsageSSLServer, now, flags, count, outUsages);
-  result = check(result, suffix, certVerifier,
-                 certificateUsageEmailSigner, now, flags, count, outUsages);
-  result = check(result, suffix, certVerifier,
-                 certificateUsageEmailRecipient, now, flags, count, outUsages);
-  result = check(result, suffix, certVerifier,
-                 certificateUsageObjectSigner, now, flags, count, outUsages);
+  result = check(nsIX509Cert::VERIFIED_OK, suffix, certificateUsageSSLClient,
+                 params, count, outUsages);
+  result = check(result, suffix, certificateUsageSSLServer,
+                 params, count, outUsages);
+  result = check(result, suffix, certificateUsageSSLServerWithStepUp,
+                 params, count, outUsages);
+  result = check(result, suffix, certificateUsageEmailSigner,
+                 params, count, outUsages);
+  result = check(result, suffix, certificateUsageEmailRecipient,
+                 params, count, outUsages);
+  result = check(result, suffix, certificateUsageObjectSigner,
+                 params, count, outUsages);
 #if 0
-  result = check(result, suffix, certVerifier,
-                 certificateUsageProtectedObjectSigner, now, flags, count,
-                 outUsages);
-  result = check(result, suffix, certVerifier,
-                 certificateUsageUserCertImport, now, flags, count, outUsages);
+  result = check(result, suffix, certificateUsageProtectedObjectSigner,
+                 params, count, outUsages);
+  result = check(result, suffix, certificateUsageUserCertImport,
+                 params, count, outUsages);
 #endif
-  result = check(result, suffix, certVerifier,
-                 certificateUsageSSLCA, now, flags, count, outUsages);
+  result = check(result, suffix, certificateUsageSSLCA,
+                 params, count, outUsages);
 #if 0
-  result = check(result, suffix, certVerifier,
-                 certificateUsageVerifyCA, now, flags, count, outUsages);
+  result = check(result, suffix, certificateUsageVerifyCA,
+                 params, count, outUsages);
 #endif
-  result = check(result, suffix, certVerifier,
-                 certificateUsageStatusResponder, now, flags, count, outUsages);
+  result = check(result, suffix, certificateUsageStatusResponder,
+                 params, count, outUsages);
 #if 0
-  result = check(result, suffix, certVerifier,
-                 certificateUsageAnyCA, now, flags, count, outUsages);
+  result = checkPKIX(result, check(suffix, certificateUsageAnyCA,
+                 params, count, outUsages);
 #endif
 
   if (isFatalError(result) || count == 0) {
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.h b/security/manager/ssl/src/nsUsageArrayHelper.h
index c2abc4aa9f47..63b46257a6ef 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.h
+++ b/security/manager/ssl/src/nsUsageArrayHelper.h
@@ -5,10 +5,10 @@
 #ifndef _NSUSAGEARRAYHELPER_H_
 #define _NSUSAGEARRAYHELPER_H_
 
-#include "CertVerifier.h"
-#include "nsNSSComponent.h"
 #include "certt.h"
 
+#include "nsNSSComponent.h"
+
 class nsUsageArrayHelper
 {
 public:
@@ -38,10 +38,8 @@ private:
 
   uint32_t check(uint32_t previousCheckResult,
                  const char *suffix,
-                 mozilla::psm::CertVerifier * certVerifier,
                  SECCertificateUsage aCertUsage,
-                 PRTime time,
-                 mozilla::psm::CertVerifier::Flags flags,
+                 nsCERTValInParamWrapper * aValInParams,
                  uint32_t &aCounter,
                  PRUnichar **outUsages);
 

From 71d35ee552049cfd846c416f8bec25723c67706b Mon Sep 17 00:00:00 2001
From: Camilo Viecco <cviecco@mozilla.com>
Date: Mon, 15 Apr 2013 16:45:38 -0700
Subject: [PATCH 131/438] Bug 813418 - Backout 95add3006aaf due to bustage
 CLOSED TREE

---
 build/pgo/certs/cert8.db                      | Bin 65536 -> 65536 bytes
 build/pgo/certs/evintermediate.ca             |  34 ----------
 build/pgo/certs/evroot.ca                     |  32 ---------
 build/pgo/certs/key3.db                       | Bin 98304 -> 69632 bytes
 build/pgo/server-locations.txt                |   2 -
 .../manager/ssl/src/nsIdentityChecking.cpp    |  21 +-----
 .../ssl/tests/mochitest/bugs/Makefile.in      |   2 -
 .../mochitest/bugs/test_ev_validation.html    |  52 ---------------
 .../bugs/test_ev_validation_child.html        |  62 ------------------
 testing/mochitest/Makefile.in                 |   2 -
 testing/mochitest/intermediate-ev-tester.crl  | Bin 541 -> 0 bytes
 testing/mochitest/root-ev-tester.crl          | Bin 557 -> 0 bytes
 12 files changed, 1 insertion(+), 206 deletions(-)
 delete mode 100644 build/pgo/certs/evintermediate.ca
 delete mode 100644 build/pgo/certs/evroot.ca
 delete mode 100644 security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html
 delete mode 100644 security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html
 delete mode 100644 testing/mochitest/intermediate-ev-tester.crl
 delete mode 100644 testing/mochitest/root-ev-tester.crl

diff --git a/build/pgo/certs/cert8.db b/build/pgo/certs/cert8.db
index aa38b3b0d57ae2c303d6873e659ee0f288853e3e..3123b417b151a77a7ededbd77dc6e9a7c6fae898 100644
GIT binary patch
delta 60
zcmV-C0K@-)fCPYm1duxcAhA5eKLIF{0YFg%>MlSpvvEKj9kYNy%@MOeZ@>@%7?S~j
SF$8BWoi4G_XD+jyu47SUvlVIp

literal 65536
zcmeI52|QF?|G@7oc8aXYG6{)rXNF;rB}<Req7+%G!C)9m_9cWUiLylWRFaaElvF57
zAw`=ONu*UNvb0FW|K1_dn|j{o|GwVO=jn{k{g`v^x%Zy)y}$E2zkBZa{RUzera=&d
zg&=$b1nDDRp(zlALH?l|#5wW>+0V+rvHr7mL9@~CJ3T_5Apg-1S_a)F{lht2pGm(i
zxF8?^2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@
z00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve
z0)PM@@Sh@}0)5bXtM^Rrh@Ow$kZzmqeqFNeDec4B;o7UUqp3kuJE{>iP{UorL}Qjl
z59KkXkg|pHMSYvPBY6S&94VW$ndCugA=VPpi5^5UQH-ds>ZlT|oITf0e!0A_+%!2~
zIXT%lSy{;h$szCo1ONd*01yBK00BS%5C8-K0YCr{00aO5KmZT`1ONd*01yBK00BS%
z5C8-K0YKn4B7j6P=j7x>qOP-jf~LZeY#-oA{KHHf7K6oNa4;V`mtxExF(3Fa7&bNt
zj(9}mfw|amEAi}t*p(~3CO8GLh6Y3tSP0$2A;`Db)6c_~#_%AlV$cJKv*4L%KDVIw
zV$Wa(lSv~e6O3089O?Fc&IDh&k1qi^SQ4Ir7UB^UT0wX4^Je%45sW>Y86I@HH^al3
zC=bh`yK#b&$dMMvF-Rss0lA8|pO0^Vr?;<5&>ZwMg0KKuZjK-~-Cr3!x3U9`I2TqN
zZ3Y)cMAE^9=FOz}(meFh63CfU=z%nMFD6~Z!P6a<66GV3VG>b|sG&}Usn()=Bs57H
zNx~5~zczc48I1773Gy*KeCgiqbVmlwmrnjqv^f$ZGxk<v*dSaaW-0_nVz{x97z|Vq
zuJugrZo%==&%2A6DQ!=mT6Ay|mUP|f+2f+GIsaqS630JJH7&ko`f#qicytM)E3x9^
zs*-FE;g(HquOr=f4<s(+(Mnt}B=LBv_Wea!jp_|9)!eDcy^TFF{1%qaYozgwmVIv`
z6?oJK2b|PB<>NIQKQN0Zl1o+h*i=!@udBP^bI223{`ioTzSUXxX_l0|SKK!bx>9wL
zu=A{zx;-auFkaq0pN(5VR4lCLxL)(TpqF7h)8wdEALT|+3=_jNK1n|ap2^@6GvzEZ
zc3GF*A3N3cRrlF-ns?pq2c=A58$9YP*WOwmUfUt6$luoBqAk{+aJ=B5Y~hv9M78#S
z0tYM(17QwCVrmc~7hp+5#3ZNSMesslHfb>aEnT_jpj|-Opw{lo+IyxWMa0kov+xK)
zB*C*$sCJiDyOmdRXQk!B8|T?Q--qtDdcQxSJv-v*@6e+nxuE0K^JJXlO-V2>N=6XR
z2IDZ8A((=ur17e-GOUz2Cv$d;oQtoomzJvPnEt5h?dj>OJkp!#-YO2>Ojr*+j)2#M
zDX<zl9{CEvXdmZPVn?(T2NokDHF6&JAhd@&db%UZNQLR?Kx3*pc=>3Lm32g|A+nBv
zc(y31s|P97AK8Kpzd3kV#;86|CNOPgV_9z+?EBJq@8tkx@w}wuKSJP3`O}SB?=&^*
z`siG==Cy1s@SyJ?P~A=K-=ERF+Grdt!%#mL^gK1;nYj>m$d%hp3oph5zFOe^`tvqw
z^5M73?mE^N)W39ysh)btrCphL;#@ypq*P#2<A-N89J^0vtW|zmj@_Q`RZ&5F8^ny)
zdT2oAyzu7?ie-uT^MJRu&jnrWp&Oqb5;9lpEO~M4pwm>oj-JXq<C!{e^c&_ml6jAQ
z$BN_OPYAC4Ym4WV$}8UZOm*nJQtQ-fvum4hLm#8KsQ5Ui6~`yOnP$>iAFP+3%Lv47
z*kiw*?mt$mK#1=D4U|16^5Y>*aKzoeq0z-)5kv}+QElqiQEg;cBFe%t=pG)y8Oyvq
zofu3yVSyjRk?u%X>gCIDX9UxH8J-?QX_gv6Ml=ybwizD&G$zAw>^L-Dt&bG=_l7bo
zdQVv=hJK%hB0tPxh1bXHvy&iBIFeljF=<3b%o)sg{r(?0lz%f{G>IfN$~W_6I0;AG
z`y0akpD^J@EIgc`5F+ru5cj`lx&6wDxs<qa;ocN;Y{|X#5)Q{TxK?dzu)r>NDt~<u
zKI;3l@8H~RM$g!&HFJIZ1Xb&|kONYuynGZBa1NWAAy%}yW5ZCHS4mNFlWgRxbs}kV
z9>m$ref@U!#wYki8!bu?8U&_=2iEcwD@`|_M$%q%L~E^TP<d2UiQ<rXWv|tvdGB^6
z%R9EZ+r?!E=}2=HFAhB5xVLA@8iMD=r#&Yxu_aDhq*d8|SLYUkNop1-F%3DRv7m4;
zzfVTZ&Lo73;^S6$zh+0>=HAR_3tdm!n#r!d+;=UdMbyV}p+~9`v1%?Oh~jis^WGU%
z8+`dRg$HWRmMhMjPin}JC3f9UoS#S*`*KL3bi|6mvcr*BEX#~XhGHxXAvQDDx|lyO
zG5zx~7(5<_W!E2L<Iv2XND@q}!%r&c%3>EO^>MB_+=rMo{OA~r+Bh6Y0=MyprqFL>
z;~?XuAWB3I&kJ*ZwM1|jm<P?Aib7?}gmuw`G+qN%hsl}5Ow}0WAJ{u%hvDz+p2g_#
z1iT4s1kY!mhFCjz%q!Dqar6%p<;#Wn|64)K>%L*V&oX2JK5^<QUT$O8+jTOgxtQC}
zYvtYc?$)|fH5V((nK~7RgdRJvZKrjdI~4acQ+k7p_Ev*gyHu16MD?JigK*kzyUV6r
z{UxFh?;EO~=SIT<*x1pe>^<kXfY>>rJXb&UW}P}<>#@Ggw5k4$uEo>F`_cu=mmSPn
zxjOGvM(#0EQgy-gol9uPQW|g0%Pumyp})rGzGrmZ?C`X6j+LsP0?I`<_gALco}IQX
zvW&}qRto<m=Yw8@lxGIX{xSwvZy%6Mu=RgGbU&+9E<OF+D*m%2OWo8CC`P>u_#!BF
zHIx^-B<E64@3ECpfkF7IMv6J2?e1YwrRQx1csZ=;{=?%X2J=rG95|8RQbQj1A?Rx}
zp*u*%Ke45V_4<z;=g{AtGek`s%o#`sQND%9CNXT{;4l$qzBh7&zgm(wLGG0vZXTWi
z9>`1yYnp>Zgpqj-iW-GXMC=6Q>$fDVFlNqWWS)iYs7w#^VtCWX8LDu^zOk1?=MEy`
zk*T6sY(xZf&|&F}#4n8|_g)ckH9Pel?IT|;b8<SkaWJK-g!lqif9nwEvDbCtm~KzF
zvoEo@p-ReRe&3)_WY0TcrQSLr9Z9@P-Ep-KZc7Ijzud)Nacb9Tb8-LEr%A3Nt3H#p
z7H9^??EG`K&9?l`FUwvfzxyC=YaLJ7Qe36SHJ~lBv3i~}Ysed0J@j!8sn=d3`E7IK
ztEWa(GwNtVHYdvh>}4wt64Z*H#Ya_mPT|csOl;wpi6Kc&xzcAfP$~Q=t}QBz<KbE(
zt4sEY#_u+ir{*rPVsE#2uMy@*yz2cTS23qp>`J3{j=_-5n-=Ym=d}X~(Ym`9#V1gc
zq38a`E(!A9_pI?+Df+mUpv5subd)H~!*PTugh6lKkMGuS#}$I09~}pYBb|7{Lvero
zPNEM9ihsR0_D7W&uBj*lc{zI$eCXc(bZ>$K-P@Pp#Be}nt02f7`Nc-q^)EgoP5h9h
z0LvqTA@cYnZ9#YU^7N*82N4XvU58-c=j-B$P9x%A5uy-0ZMZPcn280nwaEE@yc0V?
z^@p2>{9Gm7$ARWWr}_HQ9Nb7qYavKLENt=QHcXs2!UrcfH6S2B#h&J<?CckW&SH-0
z2rM5o1u^%y5FOz?tRwJ*Ej-rWb&1KWH>!DHDoiG7l3+4fouzrkCdUXMujFvEJlu$A
zqoD5^`BTkP`|7ZqegXttvMVo;NtyOQVUy{V?Dz&hSD}0r8?VFbTM`<3BsFiI-Ogak
zuaojC+QaSjs&M*=>Zk9T*julv8sAqja^7!|RCnSw%yH<p$sF@NW*Z-rDo>raff~D9
zXPbTwzX)IcG-%eex#nawrBpeZV*Ns$3mE*RT#@?&=eeUM(mYG1Rn?u{#9=shMKo^d
zlCvi~EW$!12G036`Zs2Y6dUxkeq0>*$v&`hMrBI+0M;fkuBhDlCHsm8F;gRNynX!c
zf>W^m^|#^n0)vI6dzaqQ^XlBNui~}dbq9gfFYZR?tyIHz$;8|m5NmmqF9%8PN?S9<
zPtZet$AhMNfxK(Ih1PLn1(yh6Si&%g-SLMVh{)<dlU<dun(-Hs_Pu8OMRDwS$ir>s
z9;3Y>Xa)p@BX5}|(Dyi)K$L<dhLx7^sGc1=KZI6E=GVo(DQO7R39P9R%qfTm(FX;{
zHhrS0kspskBYhXO6sT$>b#>HgprS^@NOFSa{IsLyg<#CB1K&#a_JxaF&F$LZ?kyEO
zB;}e^RLahO?^>$DTG$pQTghmx#GDOHd~<}+T;Vi3W2Iq=ZSnl#?Uw^M-p$PvI^qD?
zX1sS5>F1=JJy9cj&9~0V^hUUX#vfA3MrqcXo>X17_4LEHQ-=PqTNv7Z)Uu>?m9hPe
zWp|}EV+)6$iuvIw-%U=BfAxhL4FX$Sy{k1;!zvFwcU-<3GiZ|7aXC{_z;BbkgV9rl
zOL}IMOSN8{XDt4R-Us4Q;^nYG<M{c!5_n>KPxVTLIeCM`Qi&%!gx_4K%2=$CvSn7#
z{p`5h5Pxf59-AFUwr=z2*5r^^nRQvH`QUE;@T#_h$KO2aIAbE=A2>ZH-s<_9Mc=G9
z#8#L9H7XXO6YRr|Il<@vfjP$#hO>w;%$!IVWQYV<YFHRWedtUlWgmvK$9GoXuvQ-t
z1)}CS$v~3uUpdFmEXnLuUeT5O68+DkE<K)YAm*XdR40YZ)kJ%0%nQUW-f#S-*=vw?
zx{`9&&`@+;f%s<La-(FX_Le7!dxV}pEbx2?-BEJ>LYzbATq|v&^J42JWB8iFlJgsI
zS1ty47q5J_>Ggw%k7c>41E=ko(!43kars2?Phn!09JFRBhj)}=uTG@Tt;!YUpBeU5
zq;C?!B|g)Y*hySxcY^(VOO`;-b*s~T7hI%rYLCC`H03PhdU3;)7gMqD7C&9tr1N@C
z*5I+*_9d=Z<2|IRz2d~s?nUAAtjW!HBsKDwWxk2{4R5xcd43~V?$i=)Yif%^p<__b
z?X1H5-mLT?<+44@B|!mErb$ld{TRL-s8IX`%BX}OQ`En{rPwj2M#beG`pki)K>~<9
zVTXuI%|zldiNgs?A!)+uBoYjhk^iXJjZIFfVe>QbZR=3T#jH=acM<do=;^+?->c-%
zVah>o-Pg{`wB5WPbBYY!eRM@hm9|32BIKC0>>9p}6>QHp>q_ms+92+kG;2Z4k*H3o
z{rQF;Hev&U>Z^qE*p?-1%*~9u^_p=-B*Tf3ajddu#gn@GQa*VHnT4X2*o&v8nBBd$
zWK(aSZbGq2=dhMTUXR05k&cYa`*FhT$SXK32KvqvL=|0O^FDv~DARL?wKuF<@X<c5
zL}KBV>a?=Z?pwzO%2i9GrIuc^UAXA=v#myc8m-AD2CA}~1j-7!v~H{T73Q6flq(B9
zww=NAUSi!e_8raV2LAjUFnFzF^@(QD`jCPA7U9$`gASiu(xsxk{F)!O6k&w&@ek_C
z(=!Ug#jHF9jvu~>8sEO7X1xOqmF!6rDo%C?qM+XHuo@AOt6{}A2U)G4MkFIE0#pJ$
zl$BiqX|DDzbY~JRm`r1`vRngcOfN^K7yD?*(e(xH!wVl&JiVQvQ446a82Wq!K^o{(
z%-^~oGN&Uoda@s06ZiK{jH(Lc73<%DfE}$6t98hn6SRu%?Ss7ef(THTUZ@_wUbOCF
zU0IzW?F-sRw1c(RXs1!PP@SpoHS;M4DH|zkDG$`$)h)>{NqbaMR8A=yD#t1upUpnI
zU7k(8T#ik?W0soi;7l_aj+v`x(#1=WXJGIF1ONd*01yBK00BS%5C8-K0YCr{00aO5
zKmZT`1ONd*01yBK00BS%5C8=JO#;Yk@DXR}3<z0L$CipXONR}=1|Q?(IDX~G@8Czr
zT1`CSG_6L3VdORZSEp%K^0#2{EBB-9fhA65!9CHIEBA_=;A*RJRB`lDo!7qnOf_}p
zy=3L(DLYi{6~qeDsg742It#=eY<6#OP|$uCVA4nb{GpbL!JO8j)-Qj=fY)C*TD$G3
zU(Otwi+z^?Tkyy8Ij3rSHQcgux126^4Nclt^dd~Dt=cXzq-Jm7p=g=H9PcCswY<u{
zY)5+9iQ3eQskiV)xHpShh2OQZf(#YO@t(XJ9pb(`^LHsFep1lh`p^Wf^NzhoxbV@6
zTzKw$JV8F2drgRq)G;5+v$eDR8|%}gO3Gunx;V<J7GT(>r5(N<=C0<FtGKAsy|u2%
zd>S|TNGkR*H|#w3&`?~jZO-j1`570f!%Gk%F^iG4Bc@{<jDF-DjT8Y+)MJ<XP3%NH
zUfZyInI+~dzwoxE#dKF+;xcC7oRTx!tqB{Qs<~gA-SHO>4hoE}4E<v<ru*&H0$T;|
z^O&CJ>Uz_a4sT@FOvn!!xQz1%^)MseTK{Q~t%$lOMX)YMDZ-(o^`n2S%V)PiICR?{
zMuwDsRcJTKuoMH|Xc~zAv#t8r{G{bO`$}go-CMDzG<55{Ijt32pYlrjnjQ`*=j*D#
zC)}eSaj~)BT^VzzHIIgWpt+XNnV-J>j~AN+`GwYNNT{uGXWCQ06dg(qKmF-#<jpLc
z$se|&g@LDI`-5jR3N^>Y!39n@1)mE?OOxsJ=Sg3bpje){`NEQ=P`k)f{RYz$T9&Py
z(;MEemwOma_eY(^(RCx=JkNgzZ)TQz53<hmo8K>lEKG;Cq?0Fe`3&NFGieUhqf2Xl
zpC(VP4>@Y_u>SA|Aa2Ck*@tYL!xj&oC0OIt&woqKe&_rAk8C@-#;ysqz9&&xOm5F%
z|7n<^k!67Yb7hUL9sGGkCsUnI?j1rGHS42)|6ASmBd@iQ2P!gAjRdP{lF@a|$O9Fb
zh^%vFCI7L#1~L499*XLuR{s)<eTK5@ZmPQb>pytfDlPTO*0^A(q;ErBX+q<&z3TI)
zQ(V_+zj+*%_wlBdsZ6xIvDwt-{Q>pNb(hQAbP|GR@HOsJ8dB%J<6v$lVqk1?Yz5<E
zYTIk^>rp{Tdgu964;{68$;I<HeuIsdVxrEHh6KGcOmTaBbP@?!&d;u`KCh*Ek3Nr(
zBai!bV$i~S0W&w`*oEv&k9X<WT97Fqtzow?bHVa!4FgX<n`8Mqx5}>;s<~jpx1XEx
zh3nm&E4$X7;^kk9W$!fN71_V+(>~nxtR!arCgomv+nVC4$gMVudE$fzBkLVSU-qrI
z%F}Rs@WY=84dw~lud^-hJL|N3eTrI(kh1y9K^&Y~Q!;T=bdC<~eS1Z8nYIm2pX_UR
z1G*A?7Tyo`+3%6f{BI52KN4>w;L=|Rm!OQ+Pa2QJeuHH)37Jwc5<du+fUFgFps}Jt
z{dc1yAj{%sL@Zfn(W_lj_J(mzv6{EG1|KMQ*{DuiP1YgJ>r@Fd<F#7R>hsM7jR*QE
z5?7sNO0KMu$8;05y0c%@<Z6A6+Mp|yn;$NACYW<=@=aX+fZ5a4D)shFGBZMtKxRd=
zh(hiLTG~-}cN-sX^SQOxR-E+cwY>GdXQoSJryq1%n;Z4b#>GswO^>bwZ~h1S)FYvi
zMgk=vV*<;$9<PA-QAOfq;YeKkh@%VkJ6DOx>@lnXfdo^CRH8bGqE12wgt5tq9GQRW
zde<V-nle3Wqo|oy?2FHR5PYZ2iZ{-XPpyI6W)w?((X==wP1}4yzs}tw^10JHwpi`O
zJNef}${7Z63D9R2;50iZL*49m+r>M}oVL$%o_X!kz9OO9&!eRN-0s}GTGsSZ{cf`$
z?@-7x&2*|FzEkIT$eZ$@b@iI5Iqn&_X!S0G5nYCzi+B_%AR8LvQBnXOiJgHYL?g#~
zYex#8F@cEVrbJj-q;XjyK7RH@m47YzE&pH3lO`xXoIk$2q&I!NA5swqCWG$bi@G+9
zyF6<*5+GrM-O|7C9Ep@=RsUC|gnZ}@<C}>1l|+gm$Eu9%`BrIk&)4$fbH|qd#uY6u
zf<$;=czbz!1_q659d7{HffZB}^<#<TN4>Gf<p>}-#DC2qjn9%ro9ChFN^$g2Co=;A
z+`QMj_>(kg<4a9POELZF$`mHeaon!&Iw9(>v?xI0xUloeB+beJTV~FSlO2rqdWqDX
zm7EU!BomQdHy5^@CwHg|4$5(CSy<z$wfoHTZVrFj6$OfHucQp7h`!<aXm-*uRn@PG
zi=iRbg{O5Fs=4yS_%#Te57u4nANts`Aj2$7xAb;^==56!&(a^NNbbq*^S207s-Rvp
z-lY3>f?xrdNey&>TC*(8h4^$Kk<Tz+kj-gWb78qwd`E54RTm5sk!X$TsLMa<qc=7Q
zOA#et@nJ73!GAZvNM0+U=^Eo)UVW$I>w<z-jZI&&pKt|Q?@8W?-D|a=!@s4!Hbyum
z*!ISko%mQ?D3Q(Q=;^I4P0YeO{#|N$d#oyR4y<rBZVRjG?3|P3Ca)b^sZ37#xVq|T
ze_T;fbo#t5u0U7YJ6~FghWsqc!`0h|@LjR&gEV^LgXRrR$$T~}74{umR3!a%!h_%V
zMtPn1gP!@P+q0$T@)gRsZQ}i)>xPdzo5)Sv$ryvBgT)dru`5i~R2+C>lv5c_#j6Gi
z*kjDP37%UAoK;d{w)nO#UlPD8jQ^7MJZ5vq;H7%PK3D1Yygqqu0@X}2y4c~c9%4B5
zR_`O&0)y#0)f{MgjPG{dY|5%zqd`TGTR)kubE6T4h6BYwkOu@!ZWVC9k|)%bLHwD2
zE_B$h0KauBWmY7OIY_rk8kqoNh5VSD39uho(JbfJ;m{c*HBGfKku-*r@J|AS{M0UZ
z!(M0=Rb4m5zcInuK$Rv@(w*#e{e%9RB(0pBp^xJA<th)(SXj-}?UuT*ijn@lD^t^8
zwyCV0eeh@YQ=eC{y?S#Bs(ey7>v%lhncT;FjOwO%ah|ZuF3zlr-dt*Vn8(g+jmfEu
zx}{;gp&Pf}{OmDf>4$vn>$`Yjg<r)K3%fYG58DMuNLN^4*dmw-OGl2z0wMh{7RdP9
zfObI-LM*+~y!B1bmCXFIfVy_7$V2Y;QmY>y`od+@wN}owfKx-kUhn;ag4x%zr|qod
zUY*3hzdwQYF8xt$&&|i#J)Y}*Pn$2l(~@6$O}b=fr5ic^(V2vywW8^#w5gVs3XS`m
z&Zf_$6p>t=-1X92t6jq@5?s<Mmb*o+Ja$M|Clxm~2m}ejOm=)2RLl{*I&qAcaZxIe
zXqjKf4@?0%(~CKZY{Dag&I(mAp6~=Q21aCZI1T`rG%i8}n*4Rdil0hml74sZIdgsr
zMV09v9C9Lz@1(3zCOl6vd4+<k@nNk+^q^M0{8Fu4O4#<@ia|Gp*9K`U=eVnU!@OQ{
zM~BJXnNaUgjws(Fjm}25uxy8rq+pN0-Al6>O_z1-JohayyJ=Uv_keMFf;-V<FpE;T
z*v+umwmtOH73?e>(=G4$=N*_x-D3nI1Bm;!FV^|&&f|B+#Bq*~`BlAs4)0x+-D|Mg
zujY%Avy9C)ZHPYg#4pUNH_)Z)nCg}5br<+#LZe>HzZDeUy=E61mi#c5lVj`oO$UX~
zA2C%>5PZ9e@+65(Ca)Ru*+R!LuDUC<FgHe}rrT`S1v$b2kIf0u#cCm2*SFmW-#i*3
z1j76ztjO?8G7kie2?PO&p?=3d4)=kZAb<2cV<H4Va_D*fLRbOZUnw*?HHV$T(z>WX
z`iwk={Yx0vzvZCJ5>zx)00o&+gUM*1R957GugSmX_WV=fEfT_C?8$l-FvDr1)n-ju
znNDp6RpW9>+S&o~v-M4c0i|s`c+!m)IBMV9;04=08NNSJb>VKvGM~1-evbG}B0iWM
zgV#m5m7;tirne_1#?7tbIdno{_8YAw+_<8Os1r`n`8?hGYBN(#F7@xd(oHD9o5y9R
zyxROWF7C*7X=U%>kVFT@tJMg}QAh0`d5-_UvPrB=yBxG1lYDymYKOTUGJ7vA@S7Lv
z^|B!^1S`F&onPnnnmCs#8=s1~*-J}zM<qtS)ohN9ZB|a$R~_bA%I(0>V3pOFLgin5
zd8;)4SsTlf5f*)7JLPX^t`;r0!N5K=a9feS>4D+RsDbE|Sy|7+T9i8n)41-6Z@pml
zKEk7fjdQfVEXQ(WBI$44{$UXoKmreaA8P=OP&TRI25^&Vpdq8eq)zp*BB_lF=I{lH
zdjvj!03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mA
zfB+x>2mk_r03ZMe00MvjAOHve0)PM@00;mAfB+x>2mk_r03ZMe00MvjAOHve0)PM@
P00;mAfB+!yza{X0cco0F

diff --git a/build/pgo/certs/evintermediate.ca b/build/pgo/certs/evintermediate.ca
deleted file mode 100644
index 17a048ad86c3..000000000000
--- a/build/pgo/certs/evintermediate.ca
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF9zCCBN+gAwIBAgIBAzANBgkqhkiG9w0BAQUFADCB4TELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MSMwIQYDVQQKExpN
-b3ppbGxhIC0gRVYgZGVidWcgdGVzdCBDQTEdMBsGA1UECxMUU2VjdXJpdHkgRW5n
-aW5lZXJpbmcxJjAkBgNVBAMTHUVWIFRlc3RpbmcgKHVudHJ1c3R3b3J0aHkpIENB
-MRMwEQYDVQQpEwpldi10ZXN0LWNhMSwwKgYJKoZIhvcNAQkBFh1jaGFybGF0YW5A
-dGVzdGluZy5leGFtcGxlLmNvbTAeFw0xMzAyMTQxNzU5MDlaFw0yMzAyMTIxNzU5
-MDlaMIHRMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50
-YWluIFZpZXcxIzAhBgNVBAoTGk1vemlsbGEgLSBFViBkZWJ1ZyB0ZXN0IENBMR0w
-GwYDVQQLExRTZWN1cml0eSBFbmdpbmVlcmluZzEWMBQGA1UEAxMNaW50ZXJtZWRp
-YXRlMzETMBEGA1UEKRMKZXYtdGVzdC1jYTEsMCoGCSqGSIb3DQEJARYdY2hhcmxh
-dGFuQHRlc3RpbmcuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDAfzrlJdawr7v8m7lslODk5FTqCiBO7tPxnWhAOEL5g05knLTZTc5J
-3ywmGoW6ae6RwPlWuqRuFd2Ea+yCawyjkUoLOpFH/xziDzvaS6LXNdJoxQqWk/LX
-8YYQVFfmxh8E11fz74IoCzX++mY1byaNONf3bLU2HU8vnVvENr1gy9Bzpm8wUuKm
-HkBYuG0SVzaeym2H/mo5PJICPVhPa+YxfEVS8EIFCigXGH7xrz/bPXnpfgsSJTnN
-4amBNkORfjf7H9x6IWkJGEkIvkVoYKT4iQ9q6/C4YDjWa9p5lA4F/qxnJefezH/I
-6hcqEODSaDsY+I6vsN8ks8r8MTTnd7BjAgMBAAGjggHGMIIBwjAdBgNVHQ4EFgQU
-fluXMAT0ZS21pV13vv46m8k7nRkwggEYBgNVHSMEggEPMIIBC4AUyJg651hwk+3B
-V0rQvQZv9n2bWPahgeekgeQwgeExCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEW
-MBQGA1UEBxMNTW91bnRhaW4gVmlldzEjMCEGA1UEChMaTW96aWxsYSAtIEVWIGRl
-YnVnIHRlc3QgQ0ExHTAbBgNVBAsTFFNlY3VyaXR5IEVuZ2luZWVyaW5nMSYwJAYD
-VQQDEx1FViBUZXN0aW5nICh1bnRydXN0d29ydGh5KSBDQTETMBEGA1UEKRMKZXYt
-dGVzdC1jYTEsMCoGCSqGSIb3DQEJARYdY2hhcmxhdGFuQHRlc3RpbmcuZXhhbXBs
-ZS5jb22CCQCvxT0iZiZJMjAMBgNVHRMEBTADAQH/MDYGA1UdHwQvMC0wK6ApoCeG
-JWh0dHA6Ly9leGFtcGxlLmNvbS9yb290LWV2LXRlc3Rlci5jcmwwPwYDVR0gBDgw
-NjA0BgRVHSAAMCwwKgYIKwYBBQUHAgEWHmh0dHA6Ly9teXRlc3Rkb21haW4ubG9j
-YWwvY3BzOzANBgkqhkiG9w0BAQUFAAOCAQEAC4grNTV5K8yqiAJ/0f6oIkTMqyJ4
-lyHXvvKXMHTpRZ7Jdy0aq5KTSHswx64ZRN7V2ds+czzDWgxX3rBuZZAgOW1JYva3
-Ps3XRYUiaTW8eeaWjuVRFAp7ytRmSsOGeOtHbez8jDmTqPRQ1mTMsMzpY4bFD8do
-5y0xsbz4DYIeeNnX9+XGB5u2ml8t5L8Cj65wwMAx9HlsjTrfQTMIwpwbNle6GuZ3
-9FzmE2piAND73yCgU5W66K2lZg8N6vHBq0UhPDCF72y8MlHxQOpTr3/jIGr4X7k9
-uyYq0Pw5Y/LKyGbyW5iMFdLzabm1ua8IWAf7DSFMH6L3WlK8mngCfJ1icQ==
------END CERTIFICATE-----
diff --git a/build/pgo/certs/evroot.ca b/build/pgo/certs/evroot.ca
deleted file mode 100644
index df220e446c44..000000000000
--- a/build/pgo/certs/evroot.ca
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFljCCBH6gAwIBAgIJAK/FPSJmJkkyMA0GCSqGSIb3DQEBBQUAMIHhMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxIzAh
-BgNVBAoTGk1vemlsbGEgLSBFViBkZWJ1ZyB0ZXN0IENBMR0wGwYDVQQLExRTZWN1
-cml0eSBFbmdpbmVlcmluZzEmMCQGA1UEAxMdRVYgVGVzdGluZyAodW50cnVzdHdv
-cnRoeSkgQ0ExEzARBgNVBCkTCmV2LXRlc3QtY2ExLDAqBgkqhkiG9w0BCQEWHWNo
-YXJsYXRhbkB0ZXN0aW5nLmV4YW1wbGUuY29tMB4XDTEzMDIxNDE3NDkwMFoXDTIz
-MDIxMjE3NDkwMFowgeExCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UE
-BxMNTW91bnRhaW4gVmlldzEjMCEGA1UEChMaTW96aWxsYSAtIEVWIGRlYnVnIHRl
-c3QgQ0ExHTAbBgNVBAsTFFNlY3VyaXR5IEVuZ2luZWVyaW5nMSYwJAYDVQQDEx1F
-ViBUZXN0aW5nICh1bnRydXN0d29ydGh5KSBDQTETMBEGA1UEKRMKZXYtdGVzdC1j
-YTEsMCoGCSqGSIb3DQEJARYdY2hhcmxhdGFuQHRlc3RpbmcuZXhhbXBsZS5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk+k5mvnrxhVdVnhaxCeDG
-ZC5kcC8951K3xTkh2JMtUpSQL2IoGLOZOWTNY+2wGNyHbdJjKDv1d0bzZfz3yDkB
-AbY6OcxS4WkwccKsyIzkdacpYWhi7kEFevm9p7TI8jdrpKmItrlqfZKfteh+K+DF
-XZF7xp6zpoUis6dykmk5v8RivpCZl7HIlsOW0wSqCocXWH/WWFgAQyozjW8MgGOL
-/eV2aLsx+yg7it9GMMtyidggwvlYM7O8vY0gJqQKXntbHq1zV7jIJ3bXzJceur+G
-Ce4HvsRHAQUSl6jUfm00aKkqS+1t3svZURIKM6qWAuIKMGcspv+L8lyn1KImG8M5
-AgMBAAGjggFNMIIBSTAdBgNVHQ4EFgQUyJg651hwk+3BV0rQvQZv9n2bWPYwggEY
-BgNVHSMEggEPMIIBC4AUyJg651hwk+3BV0rQvQZv9n2bWPahgeekgeQwgeExCzAJ
-BgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEj
-MCEGA1UEChMaTW96aWxsYSAtIEVWIGRlYnVnIHRlc3QgQ0ExHTAbBgNVBAsTFFNl
-Y3VyaXR5IEVuZ2luZWVyaW5nMSYwJAYDVQQDEx1FViBUZXN0aW5nICh1bnRydXN0
-d29ydGh5KSBDQTETMBEGA1UEKRMKZXYtdGVzdC1jYTEsMCoGCSqGSIb3DQEJARYd
-Y2hhcmxhdGFuQHRlc3RpbmcuZXhhbXBsZS5jb22CCQCvxT0iZiZJMjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAcKVLC9MbdSZjzkVBseCm6t49aIIBm
-xQrsTNV2Gnp5eIXBfUhNAfD0zbBcKHK9AfHmNT8ZK6iABjiOrnn6yQNufW5MMdNx
-+/4FtTmdlBPLpyuBY7re+XbIaPxr/jB9jJ1pmh52xH3wMkO7ATDQ2fqFnODFrUKS
-UpXzuydPnsCdu32KPSnewIrkDB10Sah7vw3uwASO2GWqaFtUDFWGpt6rYQTcOF8g
-7a6Zj0johBMQFHE3HDRebWxiOf21ppN/tvv0gtGiA0ZIXBezeLaJ+Hob1xTbi4sw
-sGYDKHPCrLuTZWXmkv0rAIkLLK4VHbsA5xYPQNJJsTpX3u0Z0vZxJd9/
------END CERTIFICATE-----
diff --git a/build/pgo/certs/key3.db b/build/pgo/certs/key3.db
index a99595c52a9f799b96b1a081e885916aa8e90237..f4edf2e72fbfede0ad14ff150df337352a729964 100644
GIT binary patch
delta 138
zcmZo@U~5>wGC^IGnSp_U3yArFm>q~&fLLdujWi?c#EUr_kJ#vMW;FQEzxlsCqk<F{
zLj(UQ9xt9LoFbfYZ1-3-n3*IP82Feqn1PD;m?xjAk=|Y@#+bvl`Du<c^JM!l>FrNt
j7^RsP6*z3V;LN<)dGlVINeV(h#Xf8x#hWX?wMzm3!qz60

delta 3400
zcmZvfcQ_ji*Ty3u#NJeFo|=8c3W8QBYF2DjYR@Q7hZ@mX39UA2uhy(qsTre)*_cJ`
z5vyvHhPG&FpAcW)?|Z-N`rhw-|G4k#oa>zX-}AdpY%ybOEcl6>03!eZVEZku-(vo)
zfAoK*=|LHo(<adMWIYvzuS5penTiM)5X&{pZqA+w;fJ_`Ey3<!pfCWy36cl>o^ygS
z+>f9{BX2l}Xf*ZPY8U=tflyFsn1KlEzeHD<<UtIQ{}v^7=n1m?%c47z695Tt0%WLi
zBY8joR^RZzo8g}5Kpy}sp7AJy$Bqx{-$Jt5n|>|p8H^aLR4$+Jzqn-#WME*7XB;$W
zYqavHelg4avi7fM<%7c870jC#QeeI-2jr`wHc(h?pY-7Bx4N*scNfuYIvhb<-vyk>
z_0Ksq*XDL7uC;D(r5m&=iKam=^Ez)$DG)wY`44%rJ}F1-h`;Mw>F8Kt{d<p$)j8~Z
z^}#dsR<EPWGITFr?=#}+eBilHN~nl9JBp-i{m6*|v>|I1mx@V(BzzN{b^gOo{PB5K
z!OZV9oHr&y7*wbcZQaXktufogTWmu{qdzu)v)m>ewcX7qS#AHN2xPR9bB*Rw?eKe<
z-lCPzv)92otHJ?BnxD}*@nt`{v8J$-#5NpqnqSL@`FW7lc2?1k5sQ7kX6o2LOm*a6
zdCyt=62mc<!*|rb!9}U;wJbz+Vc3=8V<xMZf-{(;jGdi_n(+}qgT+6(QXJjXlSrE$
z`ta-TR?W70%_vT>Tn~jGTC4c;Gf#O4vz?|Cu!*q+ko)7O_>&p0VMFO(*q>_S*@zkB
zwPQ@DT75Mg#W8#^UI!wt%e8rX8OVZzuBL4)s?hq8sITmwKe2`8Kh5%T0PElN;Kt*{
zAX-Yn(XY%L*KKc<R3E`bkrO51W~q_e8PH=B=is6jt|<z)(u!X&?9a_ii4v<BH`@E|
zm=_K#mA!Y5#rKOx)@8Y4J3fYHw+|j3_A-R8Uy4r-O^owser6K?ci4jI=Maqkf+y|h
zuoA|%b!i!K<rI@(b2NhQplC^e)jpvnXW)Rb5vF@u`}>D=zp8}x^yz1X8l2j%SNLC(
zy6ZV@L>?ZbBb6&Mm?RaGt#QzD$B)svwt~U}^U?3V7rb{%ZESVKF2XA($9uN5*t!Io
zenN+qP#?a5<S0H5DW6H2J0iIyE~QX|d&p4^Fbm(?TH#tFShRY+ao#db6`ed%=JlO8
zOOPQHm{s;<)zhj-cmu%^D|h*CZv&=@p<2{_KL^{GenN_{x?!e<0j~L{6|Y@Z`5Ptj
zJiPCP<Q~xQqZqbfk?yBR5Fa^EPM{yh-Esc50Qe-|wX~SA$87_E&8oJX)T{9M_fAyk
zy;|(d4y&`_-MkjbwGD4n2yt^wqLM7Cg{;-!tbW$@u~XI58J6b#o)&#Tu+l{F{Cnl-
zf;$;eMSa>o+|sHe2bO#CNNLcn!*{7Zfs!<SiFY|?30Q0u9`Oje5+in~R<fgAXuoEC
zt}3bhUKsFU@l@W4I7TT+N;Y5)A6p{TwVA8cDd^YWqS}iH2ixtCouMLqa%@SA_KVw=
zPifQlbx_-asyU@5M}2q4JLo*IVsitV_8t6HqPn93_0AXh%kE=cnP+cHE!f2Mj@n<Z
z!==QtVjEkuh3$;4SB9&BqyN;b!f^XlIQafR5gHQGkwR+Bgxy8C=-qmpSWmiAS-CKa
zueZKz@wlkjdXl|3kv7b!?V1{9Y)X@?$h}reMaI|^gT}d8OL@kp>ZW9Lx=X95-?U3$
z85e`c?`&~4stP)GUf8EH^M=cJB}Y^@kHeo}nF0p=IDH)?D|YJ2Bag?c7{3p@ssGBd
zKO}59nGz-OBZv7?-WVk5%`vVbIoA0kX(P)Bi&&ZJ9P#sdla!Am=X#_)$lfDelcUzV
zta>6erRDG#hG;=0nT69D^>vj*cJWM8J*U_|P6ebJ5I?Q$i;QGFCR9Sg4VE@mB*d}Q
z>&A6wZHJhucEX%Zp{C(Ec#wzg*N^wBeoY|Eq;cnsEx8s;?v0>5hPpoJ5u%_Rb45yL
znyfS4C^tc*u}QUE;IHftyCUxsBGWH*aHza^?Y0A9`}i2+8m5@0XFW-{)PffAV#KAZ
zH6QkZbv5;u`<@xF@%ylaq^d@m&)>sJVP3jLXXQN(*ne18%p;-YW?pP+J2v_E#t90@
zz4!3E3x9vFD@O?{{1ozIW;pjoBRlsEAb9UGyI_e8tq7D_nvNbxyl`;-dVec9{-LWC
zTZ#ZZe#A#;=g@AHZL*er{FE?>BCzg0ccS>~ErS3IzfV7~1||<?Q^a4vA7|J&vJxYY
zlFt1H!~p*nF(TZ*>2%2vO59w6{!d}#jRq4p(NIwRgeq742kHN#KoBeNHw<ZzeFzQm
z8*KX!E)amlH~jx`hiz0xqPwA6kAGFSbd^nfax{I_^Pk+|H+OG+stiUIKL(G(Jif3q
zvaCGH8k&SsXw&t)74msI*Nt<OlY4{04<dQJoOA;3i1pdd-z46VRv1!r=conv!9QOk
zB5~cPWXjcKrY7f6hq|Ec^5AGM2Thpja{MD&c6ui^O7ospZ88F}kQyF6?9P{BQ*h}5
zb>j=FHHXJz7uif}jUvH~Y@-Oa$JkBH!1br3<r^%7i;zNnyQ!wDYq3@g%uIg7DdDC%
zdpK`Wu1Vb0Dx4<VES0I`^A{H}*Tg;{2qTAVu*hTaTXQDS9tdF}@$&l$Ax#llT5EDo
z6!2I>xnm~%jF!P{gS%*DyrGk3pLF^fgHGIZ>jUtbk)5Rs<`mnIC}~q5G^2gKtcSZi
zfQBx4S+cKYoVWELfe;6SAW^i-^N%V0%GUZ{!om7vvWN)rPOp>1P4<@bDb(p?iA3xX
zljOwK*-|CJHIFi_=XRj==UDF;9{Q$?9UBCVV%$7Ptii7b`Whm?KH$!$M;&lr<s#Jh
zjDHZinPVRPDt^Eq$BJ8|<k{T7xviPI1CyrU{QBnO99P>-(+fch%^7q26aK!JU-6vX
zCVi<gpFSHMEEZJQ2)zisXpt44H6LOY_$bx;)&)kkDqYn*P=dI+33nR@W7LI}BCLX%
z{DAVPzo{)j+ONm#k96_ds$%afs(T~1j>@H`MHNiyjIJ1Bq@!~3CQ{rgl`ePJFu`L@
zPJM`c*FIZ$4|}un)5+O#2cCfEqlYj?_Ti^r{h`)x_>>#N!rPA;wANThbdA=K(nA=Y
z-DV{eSTlet96!wKJY2o8_|XBlf$g5sr_F8L+YSJVDqZD~qhtUv@e^c_HsF4RLjHEA
zbgUj~Kl%&MxdMAtWaJfcK#5@XlC*JHCo6S<#ZpudCdh(s`aq|E2&HdkzpsZG`CUlZ
zFH$9R`zJ9|yxyt-Pn_wvFOkq>MOZ-$6)9_&m;P2(AAyUnLcj|K4X9Xl-4)v+l9@g}
zQRdf?q@uOtYZKlR$Q5PkxCz;}NhKMR))$I9<_#$ceWpwf&ueI~lllJsS`zBgtFT>W
z+iZlnrS+n%(ap1MT%ZCMiHC}V*v@@>MIx}z4quAN(kaVFkjIFlPjC0!t?`7Z&xrH}
z1)sE*lbhnC$21(Q6tQgGW@CLw4hDyUZjlkRdMyQQ)u98coKdoes9qm-mV~4{FJpLi
zzjRp0$?#%Taz#!4{ifPREkmrQPmE3Grh2316xH6ys;SK}FjcxOb5$*AvbqrO-xo!C
zVG(8<Zo5>*ktdtZ8RlEK@^jWZl}W>Rg<gC!7EaQwXem|<#R{M`+O_k(cCWp4iOU{w
z`O8HjIKs+2vnIFWE7u2>KLU1Mk_!xFzBGXaPBj*GbTDy4&bCuC1HN7|YXkI~-t7|I
zks4I6vpW(%^p<HrYs_cC9w}^_2pnvUp7K5sXDHz{M*1Eo;287_>6ZB#=W-mM`B>;s
zS1g{lU7~k?!qR(_>dA7G9hT`2jrd<qzE}%Yn7Wmm+p$7hDyS7x&h!7;cvotIcEj#6
zmGa=L`~CHA=pIR$;$!+PCzXhpKdE$!UcoN6^C$kV_wP{dUnHr~To)<`mUgGhN$ciC
z128wN_7$m?(nL9JRMbG4gLz>l3fMOPm#BBG7R2$<B-S2i>({mW7WVqi#$mbgqsyC2
zI{nJG@A9dPB&*-c=G<As-y;FD^M#vSK4Z>0!`hlM7G&e89)dXvODS&3yWizv*BLEh
z?c2+d5joh1LAF+<b0}UlU5iS@4VB2Q1ah0=8LH>Nc}@RER>pasl@Pa-=aG66EUi`%
zWj=-boLG0s(6<}=4FgPRycUR_PqTVcfoQcwo;I`S7A;dEz2;C_!_6cb0>2$hr1U>|
zmvm6PX&%&k-BQ+N=x{7^S?IQp`OR!4RkCtmB;4<f_I!(qD`OY0{E~*hlU++k`eeSW
m>K96yVVb(|=?nRG;D5g*-R#5c|9pLjJd)Gw#K>7F=)VBB9696w

diff --git a/build/pgo/server-locations.txt b/build/pgo/server-locations.txt
index 98c7d3f34d3e..dbc0cf4af3f2 100644
--- a/build/pgo/server-locations.txt
+++ b/build/pgo/server-locations.txt
@@ -101,8 +101,6 @@ https://mismatch.expired.example.com:443	privileged,cert=expired
 https://mismatch.untrusted.example.com:443	privileged,cert=untrusted
 https://untrusted-expired.example.com:443	privileged,cert=untrustedandexpired
 https://mismatch.untrusted-expired.example.com:443	privileged,cert=untrustedandexpired
-https://ev-valid.example.com:443	privileged,cert=evvalid
-https://ev-invalid.example.com:443      priviliged,cert=evinvalid
 
 # This is here so that we don't load the default live bookmark over
 # the network in every test suite.
diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index b9c5ca90a9c3..da1304d13e53 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -109,21 +109,6 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
    * In other words, if you add another list, that uses the same dotted_oid
    * as an existing entry, then please use the same oid_name.
    */
-  {
-    // This is the testing EV signature.
-    // C=US, ST=CA, L=Mountain View, O=Mozilla - EV debug test CA, OU=Security Engineering, CN=EV Testing (untrustworthy) CA/name=ev-test-ca/emailAddress=charlatan@testing.example.com
-    "1.3.6.1.4.1.13769.666.666.666.1.500.9.1",
-    "DEBUGtesting EV OID",
-    SEC_OID_UNKNOWN,
-    "AD:FE:0E:44:16:45:B0:17:46:8B:76:01:74:B7:FF:64:5A:EC:35:91",
-    "MIHhMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWlu"
-    "IFZpZXcxIzAhBgNVBAoTGk1vemlsbGEgLSBFViBkZWJ1ZyB0ZXN0IENBMR0wGwYD"
-    "VQQLExRTZWN1cml0eSBFbmdpbmVlcmluZzEmMCQGA1UEAxMdRVYgVGVzdGluZyAo"
-    "dW50cnVzdHdvcnRoeSkgQ0ExEzARBgNVBCkTCmV2LXRlc3QtY2ExLDAqBgkqhkiG"
-    "9w0BCQEWHWNoYXJsYXRhbkB0ZXN0aW5nLmV4YW1wbGUuY29t",
-    "AK/FPSJmJkky",
-    nullptr
-  },
   {
     // CN=WellsSecure Public Root Certificate Authority,OU=Wells Fargo Bank NA,O=Wells Fargo WellsSecure,C=US
     "2.16.840.1.114171.500.9",
@@ -1076,11 +1061,7 @@ nsNSSComponent::IdentityInfoInit()
     ias.serialNumber.type = siUnsignedInteger;
 
     entry.cert = CERT_FindCertByIssuerAndSN(nullptr, &ias);
-
-    // The debug CA info is at position 0, and is NOT on the NSS root db
-    if (iEV != 0) {
-       NS_ASSERTION(entry.cert, "Could not find EV root in NSS storage");
-    }
+    NS_ASSERTION(entry.cert, "Could not find EV root in NSS storage");
 
     SECITEM_FreeItem(&ias.derIssuer, false);
     SECITEM_FreeItem(&ias.serialNumber, false);
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index f61c25dcc82b..8981ea47a8d9 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -15,8 +15,6 @@ MOCHITEST_FILES = \
         test_bug480509.html \
         test_bug483440.html \
         test_bug484111.html \
-	test_ev_validation.html \
-	test_ev_validation_child.html \
         $(NULL)
 
 MOCHITEST_CHROME_FILES = \
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html b/security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html
deleted file mode 100644
index 1e1812758519..000000000000
--- a/security/manager/ssl/tests/mochitest/bugs/test_ev_validation.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=813418
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 813418</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=813418">Mozilla Bug 813418</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-<script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-
-  var wnd = window.open("https://ev-valid.example.com/tests/security/ssl/bugs/test_ev_validation_child.html");
-  window.addEventListener("message", function(event) {
-     if (event.origin == "https://ev-valid.example.com") {
-       is(event.data, "EV", "Child was EV valid.");
-       wnd.close();
-       wnd = window.open("https://example.com/tests/security/ssl/bugs/test_ev_validation_child.html");
-     }
-     else if (event.origin == "https://example.com") {
-       is(event.data, "secure", "Child was just secure (NO EV) no ev flags present.");
-       wnd.close();
-       wnd = window.open("https://ev-invalid.example.com/tests/security/ssl/bugs/test_ev_validation_child.html");
-     }
-     else if (event.origin == "https://ev-invalid.example.com") {
-       is(event.data, "secure", "Child was just secure (NO EV ev cert from invalid anchor).");
-       wnd.close();
-       SimpleTest.finish(); //expected end of tests.
-     }
-     else{
-       ok(false,"something is broken");
-       SimpleTest.finish();
-     }
-
-    }, false);
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html b/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html
deleted file mode 100644
index 0faa27a015cc..000000000000
--- a/security/manager/ssl/tests/mochitest/bugs/test_ev_validation_child.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-<head>
-<title></title>
-<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript">
-
-function finish(state) {
-  try {
-    window.opener.postMessage(state, "*");
-    //the opener should close this window, no
-    // need to call simpletest.finish()
-    return;
-  }
-  catch(e){
-    if (window.opener) {
-      //could not sent the message?
-      ok(false,"could no opener window");
-    }
-  }
-}
-
-function onWindowLoad()
-{
-  if (!window.opener) {
-    ok(true, "Direct call, nothing to do");
-    SimpleTest.finish();
-  }
-
-  var ui = SpecialPowers.wrap(window)
-     .QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
-     .getInterface(SpecialPowers.Ci.nsIWebNavigation)
-     .QueryInterface(SpecialPowers.Ci.nsIDocShell)
-     .securityUI;
-
-  var isInsecure = !ui ||
-     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IS_INSECURE);
-  var isBroken = ui &&
-     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IS_BROKEN);
-  var isEV = ui &&
-     (ui.state & SpecialPowers.Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL);
- 
-  var gotState;
-  if (isInsecure)
-    gotState = "insecure";
-  else if (isBroken)
-    gotState = "broken";
-  else if (isEV)
-    gotState = "EV";
-  else
-    gotState = "secure";
-
-  finish(gotState);
-}
-
-</script>
-</head>
-
-<body onload="onWindowLoad()">
- <h1>Security_state_child</h1>
-</body>
-</html>
-
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 98ed5ee90d16..4f8240cc21cb 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -61,8 +61,6 @@ _SERV_FILES = 	\
  	 	plain-loop.html \
 		android.json \
 		b2g.json \
-		root-ev-tester.crl \
-		intermediate-ev-tester.crl \
 		$(NULL)	
 
 ifeq ($(MOZ_BUILD_APP),mobile/android)
diff --git a/testing/mochitest/intermediate-ev-tester.crl b/testing/mochitest/intermediate-ev-tester.crl
deleted file mode 100644
index 3d94e958fd77301027d4b0122c9213400f8704b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 541
zcmXqLVv;myVq`SnW#iOp^Jx3d%gD&e%3#oV(U9AKlZ`o)g-w_#G#JL=5N2|AG!!!s
z0m-ln^ZMqO=9MI7<|%|_rj{Ej8z_RrxrC*B^Q$s*auOAE6<os<Qc{yj(-lfmi%S%M
znq>{7L5jGAMS@e4ON%l~DivJw(lhf?Q;Rb5(qU#Z3-e~?m82Hsrlw>jmZTaR3L6N5
zv}p=+rIzV}%+gIxG}JNBf;*d&QA{>DBe5tau_Q6i0i*(GoL*{0Vs1fBs$Oz_t~jru
zv4N4HiJ^tDrKv%bIIj_iYXs$@1pqTJOc?yFKNoS^MFz8ox4U+%5f=A*l_93ASa{BV
z(e=k05@w&e-Yk{CRGa9v`6uJ|hV@IHntt$N5&CG@wymc)$won8`tHeH>6VN+{05wN
z&n}RxulnkFc2|vB`i}1}6fYm#WqwJc<6T(JZIKfvRv4BhwSISgYgN+FK1pBu*qZRh
z%GFC}ER|iu_;gj&l!NcD{PcZq=TaEPv&+bkY4-hMsS7GP=Qq8Ldm`Z_Jl$XU<D?Z<
zo=<(0+SlhM%#Y&o<8*oG%6Vbg28Q=nyLL?0p3_(K?qwF^32z0n1E;<@oxIs8=iZ&Y
nU9nLjL?l<eMN(XH_L^%KQY?zM-4^9l>(N@@aWr}ViC;$m*nPie

diff --git a/testing/mochitest/root-ev-tester.crl b/testing/mochitest/root-ev-tester.crl
deleted file mode 100644
index 4d0dee3a0e42bdd95c5df0476b04731a0e115e8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 557
zcmXqLV$w8dViYvsW#iOp^Jx3d%gD&e%3#p=(2(1JlZ`o)g-w_#G#JL=5N2|AG!!!s
z0m-ln^ZMqO=9MI7<|%|_rj{Ej8z_RrxrC*B^Q$s*auOAE6<os<Qc{yj(-lfmi%S%M
znq>{7L5jGAMS@e4ON%l~DivJw(lhf?Q;Rb5(hb!NR6x?q!m>b}AwWGqK?Mz<Ek&ip
zCFS`=B^i~PAY+6L1VQRFg}GA8bU|k8CMO!|7-+%0!O18lo1BqYl#^JJnCAde0W?W3
zwIVUMASYEXIX_pN*U;F&$k4>l!r08%JW8C`2*fpla?t{WxrvdHA@0bGzWj$X9A?&k
zaq?fdfHT>u;QSANel`7Uzpc3rUXS+Iv?;w0>=IdeabuFf?D_tD+RmYM3s{$2nLB^a
zO-YBED5u=u=*MrY7gdQy9u$7Dx<2f<TVBT^fdr}i`XH~ntj@LUlfxEl?QH%$?ZnUQ
z+wa8s$^=WJdD?y?=&k&n=~q~=fYaSP-d5t}HJ77->{%!HgM-+*n$@ZoU0EOg<sg^2
zZq|MQ{tHsftCQn5R_E(1Ws*11JnrE7A|lWC@Tc!jP9FSP@HmmZq3`s?%t@c$n}pT7
z6$|No@|=I-#Je`ToR5vsj#}n1mp5o`j1Rs%W#X1K=GW2`4bt3ah;@E2F`26%4*;lm
B!v+8V


From a1fea2c50612070379969079f650ea5d20c7b3e5 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Mon, 15 Apr 2013 18:05:48 -0600
Subject: [PATCH 132/438] Backout 8ba06fb1bba0 (bug 768288).

---
 js/src/ion/IonBuilder.cpp | 95 +++++++++++----------------------------
 js/src/ion/TypeOracle.cpp |  6 +++
 js/src/jsanalyze.cpp      |  2 +-
 js/src/jsscript.cpp       |  1 -
 js/src/jsscript.h         | 28 ++----------
 5 files changed, 36 insertions(+), 96 deletions(-)

diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index ef11dca01b66..e41193c06496 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -203,8 +203,7 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     RootedScript inlineScript(cx, target->nonLazyScript());
     ExecutionMode executionMode = info().executionMode();
     if (!CanIonCompile(inlineScript, executionMode)) {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to disable Ion compilation",
-                                  inlineScript->filename(), inlineScript->lineno);
+        IonSpew(IonSpew_Inlining, "Cannot inline due to disable Ion compilation");
         return false;
     }
 
@@ -213,8 +212,7 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         ion::IsBaselineEnabled(cx) &&
         !inlineScript->hasBaselineScript())
     {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline target with no baseline jitcode",
-                                  inlineScript->filename(), inlineScript->lineno);
+        IonSpew(IonSpew_Inlining, "Cannot inline target with no baseline jitcode");
         return false;
     }
 
@@ -222,8 +220,7 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     IonBuilder *builder = callerBuilder_;
     while (builder) {
         if (builder->script() == inlineScript) {
-            IonSpew(IonSpew_Inlining, "%s:%d Not inlining recursive call",
-                                       inlineScript->filename(), inlineScript->lineno);
+            IonSpew(IonSpew_Inlining, "Not inlining recursive call");
             return false;
         }
         builder = builder->callerBuilder_;
@@ -232,15 +229,12 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     RootedScript callerScript(cx, script());
 
     if (!oracle->canEnterInlinedFunction(target)) {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to oracle veto %d",
-                                  inlineScript->filename(), inlineScript->lineno,
-                                  script()->lineno);
+        IonSpew(IonSpew_Inlining, "Cannot inline due to oracle veto %d", script()->lineno);
         return false;
     }
 
     if (!oracle->callReturnTypeSetMatches(callerScript, pc, target)) {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to return typeset mismatch",
-                                  inlineScript->filename(), inlineScript->lineno);
+        IonSpew(IonSpew_Inlining, "Cannot inline due to return typeset mismatch");
         return false;
     }
 
@@ -249,8 +243,7 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         // For constructing calls the typeset of caller should intersect the callee's typeset.
         // Except for the |this| type, because that is created during execution depending on target.
         if (!oracle->callArgsTypeSetIntersects(NULL, callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
-                                      inlineScript->filename(), inlineScript->lineno);
+            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
             return false;
         }
     } else if (JSOp(*pc) == JSOP_FUNAPPLY) {
@@ -259,25 +252,18 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         // of fun.apply. Seeing a new type will only be noticed in the inlined call and
         // result in missed types in TI.
         if (!oracle->callArgsTypeSetMatches(callInfo.thisType(), callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
-                                       inlineScript->filename(), inlineScript->lineno);
+            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
             return false;
         }
     } else {
         // For normal calls the typeset of caller should intersect the callee's typeset.
         if (!oracle->callArgsTypeSetIntersects(callInfo.thisType(), callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
-                                      inlineScript->filename(), inlineScript->lineno);
+            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
             return false;
         }
     }
 
-    if (inlineScript->hasIonScript() && inlineScript->ionScript()->bailoutExpected()) {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to known bailing script",
-                                  inlineScript->filename(), inlineScript->lineno);
-        return false;
-    }
-
+    IonSpew(IonSpew_Inlining, "Inlining good to go!");
     return true;
 }
 
@@ -3060,12 +3046,6 @@ IonBuilder::inlineScriptedCall(CallInfo &callInfo, JSFunction *target)
 
     // Accumulate return values.
     MIRGraphExits &exits = *inlineBuilder.graph().exitAccumulator();
-    if (exits.length() == 0) {
-        // Inlining of functions that have no exit is not supported.
-        calleeScript->analysis()->setIonUninlineable();
-        abortReason_ = AbortReason_Inlining;
-        return false;
-    }
     MDefinition *retvalDefn = patchInlinedReturns(thisCall, exits, returnBlock);
     if (!retvalDefn)
         return false;
@@ -3246,17 +3226,24 @@ IonBuilder::makeInliningDecision(JSFunction *target, CallInfo &callInfo)
 
     // Heuristics!
 
-    IonBuilder *baseBuilder = this;
-    while (baseBuilder->callerBuilder_)
-        baseBuilder = baseBuilder->callerBuilder_;
+    // Cap the inlining depth.
+    if (IsSmallFunction(targetScript)) {
+        if (inliningDepth_ >= js_IonOptions.smallFunctionMaxInlineDepth) {
+            IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding allowed inline depth",
+                                      targetScript->filename(), targetScript->lineno);
+            return false;
+        }
+    } else {
+        if (inliningDepth_ >= js_IonOptions.maxInlineDepth) {
+            IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding allowed inline depth",
+                                      targetScript->filename(), targetScript->lineno);
+            return false;
+        }
+     }
 
-    // When caller is excessively large only inline small functions.
-    if (script()->length > js_IonOptions.inlineMaxTotalBytecodeLength &&
-        !IsSmallFunction(targetScript)) {
-        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: caller excessively large.",
-                                  targetScript->filename(), targetScript->lineno);
-        return false;
-    }
+    // Always inline the empty script up to the inlining depth.
+    if (targetScript->length == 1)
+        return true;
 
     // Callee must not be excessively large.
     // This heuristic also applies to the callsite as a whole.
@@ -3281,36 +3268,6 @@ IonBuilder::makeInliningDecision(JSFunction *target, CallInfo &callInfo)
         return false;
     }
 
-    // Cap the inlining depth.
-    uint32_t scriptMaxInlineDepth = targetScript->maxInlineDepth();
-    uint32_t globalMaxInlineDepth = js_IonOptions.maxInlineDepth;
-    if (IsSmallFunction(targetScript))
-        globalMaxInlineDepth = js_IonOptions.smallFunctionMaxInlineDepth;
-
-    // Cap the global inline depth.
-    if (inliningDepth_ >= globalMaxInlineDepth) {
-        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding global inline depth",
-                targetScript->filename(), targetScript->lineno);
-        baseBuilder->script()->disableInlineDepthCheck();
-        return false;
-    }
-
-    // Cap on scripts inline depth.
-    if (inliningDepth_ >= scriptMaxInlineDepth)
-    {
-        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding script inline depth.",
-                targetScript->filename(), targetScript->lineno);
-        return false;
-    }
-
-    // Update scripts max inline depth
-    // I.e. make sure that all known scripts that get inlined by this script still get inlined.
-    if (!baseBuilder->script()->isInlineDepthCheckDisabled()) {
-        uint32_t updatedInlineDepth = globalMaxInlineDepth - inliningDepth_ - 1;
-        if (updatedInlineDepth < baseBuilder->script()->maxInlineDepth())
-            baseBuilder->script()->setMaxInlineDepth(updatedInlineDepth);
-    }
-
     return true;
 }
 
diff --git a/js/src/ion/TypeOracle.cpp b/js/src/ion/TypeOracle.cpp
index 35aa88e63e26..6e67e7956079 100644
--- a/js/src/ion/TypeOracle.cpp
+++ b/js/src/ion/TypeOracle.cpp
@@ -703,6 +703,12 @@ TypeInferenceOracle::canEnterInlinedFunction(RawFunction target)
 {
     RootedScript targetScript(cx, target->nonLazyScript());
 
+    // Make sure empty script has type information, to allow inlining in more cases.
+    if (targetScript->length == 1) {
+        if (!targetScript->ensureRanInference(cx))
+            return false;
+    }
+
     if (!targetScript->hasAnalysis() ||
         !targetScript->analysis()->ranInference() ||
         !targetScript->analysis()->ranSSA())
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index 64eec6de4443..0e5312f58ce2 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -77,7 +77,7 @@ ScriptAnalysis::addJump(JSContext *cx, unsigned offset,
 
     if (offset < *currentOffset) {
         /* Scripts containing loops are never inlined. */
-        isJaegerInlineable = false;
+        isJaegerInlineable = isIonInlineable = false;
         hasLoops_ = true;
 
         if (code->analyzed) {
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index c978f3d2c967..ed61d59d663b 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1688,7 +1688,6 @@ JSScript::Create(JSContext *cx, HandleObject enclosingScope, bool savedCallerFun
     script->sourceStart = bufStart;
     script->sourceEnd = bufEnd;
     script->userBit = options.userBit;
-    script->maxInlineDepth_ = uint8_t(-1);
 
     return script;
 }
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 34cd5055602b..595287a6b12b 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -427,6 +427,9 @@ class JSScript : public js::gc::Cell
 
     // 16-bit fields.
 
+  private:
+    uint16_t        PADDING16;
+
     uint16_t        version;    /* JS version under which script was compiled */
 
   public:
@@ -442,11 +445,6 @@ class JSScript : public js::gc::Cell
     uint16_t        staticLevel;/* static level for display maintenance */
 
     // 8-bit fields.
-  private:
-    uint8_t        maxInlineDepth_; /* script max inline depth (IonMonkey)
-                                       uint8_t(-1): unitialized
-                                       uint8_t(-2): disabled */
-    uint8_t        PADDING8;
 
   public:
     // The kinds of the optional arrays.
@@ -810,26 +808,6 @@ class JSScript : public js::gc::Cell
         return maxLoopCount;
     }
 
-    void setMaxInlineDepth(uint32_t maxInlineDepth) {
-        if (maxInlineDepth >= uint8_t(-2)) {
-            disableInlineDepthCheck();
-            return;
-        }
-        maxInlineDepth_ = maxInlineDepth;
-    }
-
-    uint8_t maxInlineDepth() const {
-        return maxInlineDepth_;
-    }
-
-    void disableInlineDepthCheck() {
-        maxInlineDepth_ = uint8_t(-2);
-    }
-
-    bool isInlineDepthCheckDisabled() {
-        return maxInlineDepth_ == uint8_t(-2);
-    }
-
     /*
      * Size of the JITScript and all sections.  If |mallocSizeOf| is NULL, the
      * size is computed analytically.  (This method is implemented in

From 0bdd5c7abb2091e5d3ad96878d7c8e5b326d8874 Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Tue, 16 Apr 2013 11:43:22 +1200
Subject: [PATCH 133/438] Bug 861099, remove mBufferIsOpaque. r=mattwoodrow

--HG--
extra : rebase_source : 89b98f9a1d73bc549fe718e52882e71c42dd6d67
---
 gfx/layers/basic/BasicCanvasLayer.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gfx/layers/basic/BasicCanvasLayer.h b/gfx/layers/basic/BasicCanvasLayer.h
index 3e6fbe205791..d4f31f1b09ee 100644
--- a/gfx/layers/basic/BasicCanvasLayer.h
+++ b/gfx/layers/basic/BasicCanvasLayer.h
@@ -104,7 +104,6 @@ class BasicShadowableCanvasLayer : public BasicCanvasLayer,
 public:
   BasicShadowableCanvasLayer(BasicShadowLayerManager* aManager) :
     BasicCanvasLayer(aManager),
-    mBufferIsOpaque(false),
     mCanvasClient(nullptr)
   {
     MOZ_COUNT_CTOR(BasicShadowableCanvasLayer);
@@ -154,7 +153,6 @@ private:
     return BUFFER_IMAGE_SINGLE;
   }
 
-  bool mBufferIsOpaque;
   RefPtr<CanvasClient> mCanvasClient;
 };
 

From a461d0eae0a36ea6251b1347c2927d5dc94a540f Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Tue, 16 Apr 2013 13:20:18 +1200
Subject: [PATCH 134/438] Bug 846122 - Handle split multi-track Cues in
 nestegg.  r=padenot

---
 media/libnestegg/README_MOZILLA |  2 +-
 media/libnestegg/src/nestegg.c  | 27 ++++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/media/libnestegg/README_MOZILLA b/media/libnestegg/README_MOZILLA
index 49ac6a10434d..d770e7f9787a 100644
--- a/media/libnestegg/README_MOZILLA
+++ b/media/libnestegg/README_MOZILLA
@@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
 
 The nestegg git repository is: git://github.com/kinetiknz/nestegg.git
 
-The git commit ID used was ebdbb688fb13dd315fc9d16e6897adb5ee42b7bb.
+The git commit ID used was 443edc8d8cb1037275b055474256a7fa089766dc.
diff --git a/media/libnestegg/src/nestegg.c b/media/libnestegg/src/nestegg.c
index 59a1a4734c77..b2651f335571 100644
--- a/media/libnestegg/src/nestegg.c
+++ b/media/libnestegg/src/nestegg.c
@@ -1407,10 +1407,14 @@ ne_find_seek_for_id(struct ebml_list_node * seek_head, uint64_t id)
 }
 
 static struct cue_point *
-ne_find_cue_point_for_tstamp(struct ebml_list_node * cue_point, uint64_t scale, uint64_t tstamp)
+ne_find_cue_point_for_tstamp(nestegg * ctx, struct ebml_list_node * cue_point, unsigned int track, uint64_t scale, uint64_t tstamp)
 {
   uint64_t time;
   struct cue_point * c, * prev = NULL;
+  uint64_t track_number;
+  unsigned int t;
+  struct ebml_list_node * node;
+  struct cue_track_positions * pos;
 
   while (cue_point) {
     assert(cue_point->id == ID_CUE_POINT);
@@ -1419,14 +1423,27 @@ ne_find_cue_point_for_tstamp(struct ebml_list_node * cue_point, uint64_t scale,
     if (!prev)
       prev = c;
 
-    if (ne_get_uint(c->time, &time) == 0 && time * scale > tstamp)
-      break;
+    node = prev->cue_track_positions.head;
+    while (node) {
+      assert(node->id == ID_CUE_TRACK_POSITIONS);
+      pos = node->data;
+      if (ne_get_uint(pos->track, &track_number) != 0)
+        return NULL;
+
+      if (ne_map_track_number_to_index(ctx, track_number, &t) != 0)
+        return NULL;
+
+      if (ne_get_uint(c->time, &time) == 0 && time * scale > tstamp && t == track)
+        return prev;
+
+      node = node->next;
+    }
 
     prev = cue_point->data;
     cue_point = cue_point->next;
   }
 
-  return prev;
+  return NULL;
 }
 
 static int
@@ -1850,7 +1867,7 @@ nestegg_track_seek(nestegg * ctx, unsigned int track, uint64_t tstamp)
 
   tc_scale = ne_get_timecode_scale(ctx);
 
-  cue_point = ne_find_cue_point_for_tstamp(ctx->segment.cues.cue_point.head, tc_scale, tstamp);
+  cue_point = ne_find_cue_point_for_tstamp(ctx, ctx->segment.cues.cue_point.head, track, tc_scale, tstamp);
   if (!cue_point)
     return -1;
 

From bb3fe4cc6f1fb55c645090644aca175ab46f873c Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 15 Apr 2013 19:49:35 -0400
Subject: [PATCH 135/438] Bug 854319 - Part 1: Call BeginDecoding before
 OnDecodeThreadStart; r=cpearce

This is what WMFReader::OnDecodeThreadStart() expects.
---
 content/media/webaudio/MediaBufferDecoder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/media/webaudio/MediaBufferDecoder.cpp b/content/media/webaudio/MediaBufferDecoder.cpp
index a850178623f6..ab1c01264a90 100644
--- a/content/media/webaudio/MediaBufferDecoder.cpp
+++ b/content/media/webaudio/MediaBufferDecoder.cpp
@@ -418,10 +418,10 @@ MediaDecodeTask::Decode()
 {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  mDecoderReader->OnDecodeThreadStart();
-
   mBufferDecoder->BeginDecoding(NS_GetCurrentThread());
 
+  mDecoderReader->OnDecodeThreadStart();
+
   VideoInfo videoInfo;
   nsAutoPtr<MetadataTags> tags;
   nsresult rv = mDecoderReader->ReadMetadata(&videoInfo, getter_Transfers(tags));

From ed2b473e4519849cd733a4ffd35d6df56156127f Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 15 Apr 2013 20:08:03 -0400
Subject: [PATCH 136/438] Bug 854319 - Part 2: Always use a ref pointer when
 dealing with MediaResource objects; r=cpearce

---
 content/media/webaudio/MediaBufferDecoder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/media/webaudio/MediaBufferDecoder.cpp b/content/media/webaudio/MediaBufferDecoder.cpp
index ab1c01264a90..ad030ae1e6e6 100644
--- a/content/media/webaudio/MediaBufferDecoder.cpp
+++ b/content/media/webaudio/MediaBufferDecoder.cpp
@@ -97,7 +97,7 @@ private:
   // GetReentrantMonitor correctly.
   ReentrantMonitor mReentrantMonitor;
   nsCOMPtr<nsIThread> mDecodeThread;
-  nsAutoPtr<MediaResource> mResource;
+  nsRefPtr<MediaResource> mResource;
 };
 
 NS_IMPL_THREADSAFE_ISUPPORTS0(BufferDecoder)
@@ -389,7 +389,7 @@ MediaDecodeTask::CreateReader()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  BufferMediaResource* resource =
+  nsRefPtr<BufferMediaResource> resource =
     new BufferMediaResource(static_cast<uint8_t*> (mBuffer),
                             mLength, mPrincipal, mContentType);
 

From 8fce450089289df656b11ec76aa184ed0311e373 Mon Sep 17 00:00:00 2001
From: Luis de Bethencourt <luis@debethencourt.com>
Date: Mon, 15 Apr 2013 22:05:46 -0400
Subject: [PATCH 137/438] Bug 861324 - Remove unneeded mDecoder null check
 after usage. r=joedrew

---
 image/src/RasterImage.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index 19cca9bd4a94..5c9e5624241e 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -2674,9 +2674,6 @@ RasterImage::WriteToDecoder(const char *aBuffer, uint32_t aCount)
   mDecoder->Write(aBuffer, aCount);
   mInDecoder = false;
 
-  if (!mDecoder)
-    return NS_ERROR_FAILURE;
-
   CONTAINER_ENSURE_SUCCESS(mDecoder->GetDecoderError());
 
   // Keep track of the total number of bytes written over the lifetime of the

From 67005c35286a18b8109758f0f31908b8c6d6d620 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Mon, 15 Apr 2013 17:02:46 -0700
Subject: [PATCH 138/438] Bug 861543 - x86-64: Use movl instead of movabsq for
 32-bits immediates. r=nbp

Make the implementation of mov in the x86-64 assembler use
movl instead of movabsq for loading immediates which fit in 32-bit
immediate fields.  This reduces the size of the instructions.

Also, change several places to call mov instead of using movq directly,
so that they can take advantage of this optimization.

--HG--
extra : rebase_source : 32f9a56a1cd7c794fe07f289bfaad9c2e9f5a55a
---
 js/src/ion/x64/Assembler-x64.h      | 11 ++++++++++-
 js/src/ion/x64/MacroAssembler-x64.h | 26 +++++++++++++-------------
 js/src/ion/x64/Trampoline-x64.cpp   |  2 +-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/js/src/ion/x64/Assembler-x64.h b/js/src/ion/x64/Assembler-x64.h
index 680d24c4f741..379a88eea1ae 100644
--- a/js/src/ion/x64/Assembler-x64.h
+++ b/js/src/ion/x64/Assembler-x64.h
@@ -510,7 +510,16 @@ class Assembler : public AssemblerX86Shared
     }
 
     void mov(ImmWord word, const Register &dest) {
-        movq(word, dest);
+        // If the word value is in [0,UINT32_MAX], we can use the more compact
+        // movl instruction, which has a 32-bit immediate field which it
+        // zero-extends into the 64-bit register.
+        if (word.value <= UINT32_MAX) {
+            uint32_t value32 = static_cast<uint32_t>(word.value);
+            Imm32 imm32(static_cast<int32_t>(value32));
+            movl(imm32, dest);
+        } else {
+            movq(word, dest);
+        }
     }
     void mov(const Imm32 &imm32, const Register &dest) {
         movl(imm32, dest);
diff --git a/js/src/ion/x64/MacroAssembler-x64.h b/js/src/ion/x64/MacroAssembler-x64.h
index 186943bf95a5..6165a0c5fe60 100644
--- a/js/src/ion/x64/MacroAssembler-x64.h
+++ b/js/src/ion/x64/MacroAssembler-x64.h
@@ -79,7 +79,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
     // X64 helpers.
     /////////////////////////////////////////////////////////////////
     void call(ImmWord target) {
-        movq(target, rax);
+        mov(target, rax);
         call(rax);
     }
 
@@ -166,7 +166,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
         JS_ASSERT(dest.valueReg() != ScratchReg);
         if (payload != dest.valueReg())
             movq(payload, dest.valueReg());
-        movq(ImmShiftedTag(type), ScratchReg);
+        mov(ImmShiftedTag(type), ScratchReg);
         orq(Operand(ScratchReg), dest.valueReg());
     }
     void pushValue(ValueOperand val) {
@@ -207,7 +207,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
         JS_ASSERT(src != dest);
 
         JSValueShiftedTag tag = (JSValueShiftedTag)JSVAL_TYPE_TO_SHIFTED_TAG(type);
-        movq(ImmShiftedTag(tag), dest);
+        mov(ImmShiftedTag(tag), dest);
 #ifdef DEBUG
         if (type == JSVAL_TYPE_INT32 || type == JSVAL_TYPE_BOOLEAN) {
             Label upper32BitsZeroed;
@@ -344,7 +344,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
 
     void cmpPtr(const Register &lhs, const ImmWord rhs) {
         JS_ASSERT(lhs != ScratchReg);
-        movq(rhs, ScratchReg);
+        mov(rhs, ScratchReg);
         cmpq(lhs, ScratchReg);
     }
     void cmpPtr(const Register &lhs, const ImmGCPtr rhs) {
@@ -357,7 +357,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
         cmpq(lhs, ScratchReg);
     }
     void cmpPtr(const Operand &lhs, const ImmWord rhs) {
-        movq(rhs, ScratchReg);
+        mov(rhs, ScratchReg);
         cmpq(lhs, ScratchReg);
     }
     void cmpPtr(const Address &lhs, const ImmGCPtr rhs) {
@@ -413,7 +413,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
     }
     void addPtr(ImmWord imm, const Register &dest) {
         JS_ASSERT(dest != ScratchReg);
-        movq(imm, ScratchReg);
+        mov(imm, ScratchReg);
         addq(ScratchReg, dest);
     }
     void addPtr(const Address &src, const Register &dest) {
@@ -430,14 +430,14 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
     }
 
     void branch32(Condition cond, const AbsoluteAddress &lhs, Imm32 rhs, Label *label) {
-        movq(ImmWord(lhs.addr), ScratchReg);
+        mov(ImmWord(lhs.addr), ScratchReg);
         branch32(cond, Address(ScratchReg, 0), rhs, label);
     }
 
     // Specialization for AbsoluteAddress.
     void branchPtr(Condition cond, const AbsoluteAddress &addr, const Register &ptr, Label *label) {
         JS_ASSERT(ptr != ScratchReg);
-        movq(ImmWord(addr.addr), ScratchReg);
+        mov(ImmWord(addr.addr), ScratchReg);
         branchPtr(cond, Operand(ScratchReg, 0x0), ptr, label);
     }
 
@@ -493,13 +493,13 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
         movq(src, dest);
     }
     void movePtr(ImmWord imm, Register dest) {
-        movq(imm, dest);
+        mov(imm, dest);
     }
     void movePtr(ImmGCPtr imm, Register dest) {
         movq(imm, dest);
     }
     void loadPtr(const AbsoluteAddress &address, Register dest) {
-        movq(ImmWord(address.addr), ScratchReg);
+        mov(ImmWord(address.addr), ScratchReg);
         movq(Operand(ScratchReg, 0x0), dest);
     }
     void loadPtr(const Address &address, Register dest) {
@@ -516,7 +516,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
         shlq(Imm32(1), dest);
     }
     void storePtr(ImmWord imm, const Address &address) {
-        movq(imm, ScratchReg);
+        mov(imm, ScratchReg);
         movq(ScratchReg, Operand(address));
     }
     void storePtr(ImmGCPtr imm, const Address &address) {
@@ -530,7 +530,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
         movq(src, dest);
     }
     void storePtr(const Register &src, const AbsoluteAddress &address) {
-        movq(ImmWord(address.addr), ScratchReg);
+        mov(ImmWord(address.addr), ScratchReg);
         movq(src, Operand(ScratchReg, 0x0));
     }
     void rshiftPtr(Imm32 imm, Register dest) {
@@ -871,7 +871,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
         } pun;
         pun.d = d;
         if (!maybeInlineDouble(pun.u, dest)) {
-            movq(ImmWord(pun.u), ScratchReg);
+            mov(ImmWord(pun.u), ScratchReg);
             movqsd(ScratchReg, dest);
         }
     }
diff --git a/js/src/ion/x64/Trampoline-x64.cpp b/js/src/ion/x64/Trampoline-x64.cpp
index a8e1f6f86067..b25b253bed98 100644
--- a/js/src/ion/x64/Trampoline-x64.cpp
+++ b/js/src/ion/x64/Trampoline-x64.cpp
@@ -646,7 +646,7 @@ IonRuntime::generatePreBarrier(JSContext *cx, MIRType type)
     masm.PushRegsInMask(regs);
 
     JS_ASSERT(PreBarrierReg == rdx);
-    masm.movq(ImmWord(cx->runtime), rcx);
+    masm.mov(ImmWord(cx->runtime), rcx);
 
     masm.setupUnalignedABICall(2, rax);
     masm.passABIArg(rcx);

From 722e34041460af3e977f3e3da4b3f278d7b3323e Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Tue, 16 Apr 2013 14:58:44 +1200
Subject: [PATCH 139/438] Backout 5f7a95537199 (bug 846122).

---
 media/libnestegg/README_MOZILLA |  2 +-
 media/libnestegg/src/nestegg.c  | 27 +++++----------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/media/libnestegg/README_MOZILLA b/media/libnestegg/README_MOZILLA
index d770e7f9787a..49ac6a10434d 100644
--- a/media/libnestegg/README_MOZILLA
+++ b/media/libnestegg/README_MOZILLA
@@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
 
 The nestegg git repository is: git://github.com/kinetiknz/nestegg.git
 
-The git commit ID used was 443edc8d8cb1037275b055474256a7fa089766dc.
+The git commit ID used was ebdbb688fb13dd315fc9d16e6897adb5ee42b7bb.
diff --git a/media/libnestegg/src/nestegg.c b/media/libnestegg/src/nestegg.c
index b2651f335571..59a1a4734c77 100644
--- a/media/libnestegg/src/nestegg.c
+++ b/media/libnestegg/src/nestegg.c
@@ -1407,14 +1407,10 @@ ne_find_seek_for_id(struct ebml_list_node * seek_head, uint64_t id)
 }
 
 static struct cue_point *
-ne_find_cue_point_for_tstamp(nestegg * ctx, struct ebml_list_node * cue_point, unsigned int track, uint64_t scale, uint64_t tstamp)
+ne_find_cue_point_for_tstamp(struct ebml_list_node * cue_point, uint64_t scale, uint64_t tstamp)
 {
   uint64_t time;
   struct cue_point * c, * prev = NULL;
-  uint64_t track_number;
-  unsigned int t;
-  struct ebml_list_node * node;
-  struct cue_track_positions * pos;
 
   while (cue_point) {
     assert(cue_point->id == ID_CUE_POINT);
@@ -1423,27 +1419,14 @@ ne_find_cue_point_for_tstamp(nestegg * ctx, struct ebml_list_node * cue_point, u
     if (!prev)
       prev = c;
 
-    node = prev->cue_track_positions.head;
-    while (node) {
-      assert(node->id == ID_CUE_TRACK_POSITIONS);
-      pos = node->data;
-      if (ne_get_uint(pos->track, &track_number) != 0)
-        return NULL;
-
-      if (ne_map_track_number_to_index(ctx, track_number, &t) != 0)
-        return NULL;
-
-      if (ne_get_uint(c->time, &time) == 0 && time * scale > tstamp && t == track)
-        return prev;
-
-      node = node->next;
-    }
+    if (ne_get_uint(c->time, &time) == 0 && time * scale > tstamp)
+      break;
 
     prev = cue_point->data;
     cue_point = cue_point->next;
   }
 
-  return NULL;
+  return prev;
 }
 
 static int
@@ -1867,7 +1850,7 @@ nestegg_track_seek(nestegg * ctx, unsigned int track, uint64_t tstamp)
 
   tc_scale = ne_get_timecode_scale(ctx);
 
-  cue_point = ne_find_cue_point_for_tstamp(ctx, ctx->segment.cues.cue_point.head, track, tc_scale, tstamp);
+  cue_point = ne_find_cue_point_for_tstamp(ctx->segment.cues.cue_point.head, tc_scale, tstamp);
   if (!cue_point)
     return -1;
 

From d5d51e34cbf9338a97d1ddedbdb1bdcbde19ce8a Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 11 Apr 2013 20:42:01 -0700
Subject: [PATCH 140/438] Bug 859657 (part 1) - Don't measure MEMORY_EXPLICIT
 in telemetry because it can cause pauses.  r=jlebar.

--HG--
extra : rebase_source : 93a9d3896ec62d54ccfdaa6a8a90a5e9188fe67c
---
 toolkit/components/telemetry/Histograms.json  | 8 --------
 toolkit/components/telemetry/TelemetryPing.js | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 34a5a2679dd3..92ac84da765a 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -268,14 +268,6 @@
     "n_buckets": 25,
     "description": "Ratio of committed, unused memory to allocated memory in the heap (percentage)."
   },
-  "MEMORY_EXPLICIT": {
-    "kind": "exponential",
-    "low": 1024,
-    "high": "16 * 1024 * 1024",
-    "n_buckets": 200,
-    "extended_statistics_ok": true,
-    "description": "Explicit memory allocations (KB)"
-  },
   "GHOST_WINDOWS": {
     "kind": "exponential",
     "high": "128",
diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index ea56e3bcdd3a..7314c51a5347 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -58,12 +58,13 @@ const RWX_OWNER = 0700;
 //   * MEMORY_JS_GC_HEAP, and
 //   * MEMORY_JS_COMPARTMENTS_SYSTEM.
 //
+// We used to measure "explicit" too, but it could cause hangs, and the data
+// was always really noisy anyway.  See bug 859657.
 const MEM_HISTOGRAMS = {
   "js-gc-heap": "MEMORY_JS_GC_HEAP",
   "js-compartments/system": "MEMORY_JS_COMPARTMENTS_SYSTEM",
   "js-compartments/user": "MEMORY_JS_COMPARTMENTS_USER",
   "js-main-runtime-temporary-peak": "MEMORY_JS_MAIN_RUNTIME_TEMPORARY_PEAK",
-  "explicit": "MEMORY_EXPLICIT",
   "resident-fast": "MEMORY_RESIDENT",
   "vsize": "MEMORY_VSIZE",
   "storage-sqlite": "MEMORY_STORAGE_SQLITE",

From 1c97315e2284651059f617a7886a86b135ca9cbf Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 11 Apr 2013 20:52:32 -0700
Subject: [PATCH 141/438] Bug 859657 (part 2) - Remove
 nsIMemoryMultiReporter.explicitNonHeap because it's more trouble than it's
 worth;  also remove the "explicit" single reporter.  r=jlebar.

--HG--
extra : rebase_source : a146536a3dd0043082bcb1c26d980c4c6d4c0730
---
 content/base/src/nsDOMFile.cpp                |  7 --
 content/canvas/src/WebGLContextReporter.cpp   |  8 --
 dom/base/nsWindowMemoryReporter.cpp           | 16 ----
 dom/workers/WorkerPrivate.cpp                 | 36 +--------
 dom/workers/WorkerPrivate.h                   |  3 +-
 gfx/thebes/gfxASurface.cpp                    |  6 --
 gfx/thebes/gfxFont.cpp                        |  8 --
 gfx/thebes/gfxPlatformFontList.cpp            |  8 --
 gfx/thebes/gfxWindowsPlatform.cpp             |  9 ---
 image/src/imgLoader.cpp                       | 25 ------
 js/public/MemoryMetrics.h                     |  3 -
 js/src/jsapi.cpp                              |  1 -
 js/src/jscntxt.cpp                            | 18 -----
 js/src/jscntxt.h                              |  3 -
 js/src/jsmemorymetrics.cpp                    | 23 ------
 js/src/jstypedarray.cpp                       |  7 --
 js/xpconnect/src/XPCJSMemoryReporter.h        |  2 -
 js/xpconnect/src/XPCJSRuntime.cpp             | 16 ----
 storage/src/mozStorageService.cpp             |  7 --
 .../tests/test_memoryReporters.xul            | 10 +--
 xpcom/base/MapsMemoryReporter.cpp             |  7 --
 xpcom/base/nsCycleCollector.cpp               |  7 --
 xpcom/base/nsIMemoryReporter.idl              | 14 +---
 xpcom/base/nsMemoryReporterManager.cpp        | 80 +++----------------
 24 files changed, 19 insertions(+), 305 deletions(-)

diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index 2601738b7c8c..10490dc1b940 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -631,13 +631,6 @@ class nsDOMMemoryFileDataOwnerMemoryReporter MOZ_FINAL
     return NS_OK;
   }
 
-  NS_IMETHOD GetExplicitNonHeap(int64_t *aResult)
-  {
-    // All of this reporter's memory is on the heap.
-    *aResult = 0;
-    return NS_OK;
-  }
-
   NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *aCallback,
                             nsISupports *aClosure)
   {
diff --git a/content/canvas/src/WebGLContextReporter.cpp b/content/canvas/src/WebGLContextReporter.cpp
index 3f8d79f1bd39..c2da4d8d5b4d 100644
--- a/content/canvas/src/WebGLContextReporter.cpp
+++ b/content/canvas/src/WebGLContextReporter.cpp
@@ -26,14 +26,6 @@ WebGLMemoryMultiReporter::GetName(nsACString &aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-WebGLMemoryMultiReporter::GetExplicitNonHeap(int64_t *aAmount)
-{
-    // WebGLMemoryMultiReporterWrapper has no KIND_NONHEAP measurements.
-    *aAmount = 0;
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 WebGLMemoryMultiReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb, 
                                          nsISupports* aClosure)
diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp
index 84b9ea08cbe6..6fe4cc7accb4 100644
--- a/dom/base/nsWindowMemoryReporter.cpp
+++ b/dom/base/nsWindowMemoryReporter.cpp
@@ -410,14 +410,6 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsWindowMemoryReporter::GetExplicitNonHeap(int64_t* aAmount)
-{
-  // This reporter only measures heap memory, so we don't need to report any
-  // bytes for it.  However, the JS multi-reporter needs to be invoked.
-  return xpc::JSMemoryMultiReporter::GetExplicitNonHeap(aAmount);
-}
-
 uint32_t
 nsWindowMemoryReporter::GetGhostTimeout()
 {
@@ -668,14 +660,6 @@ GhostURLsReporter::GetName(nsACString& aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsWindowMemoryReporter::
-GhostURLsReporter::GetExplicitNonHeap(int64_t* aOut)
-{
-  *aOut = 0;
-  return NS_OK;
-}
-
 struct ReportGhostWindowsEnumeratorData
 {
   nsIMemoryMultiReporterCallback* callback;
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index a84cd3751f9f..bac8d8dfcc0e 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -1774,8 +1774,7 @@ public:
       MutexAutoLock lock(mMutex);
 
       if (!mWorkerPrivate ||
-          !mWorkerPrivate->BlockAndCollectRuntimeStats(/* aIsQuick = */ false,
-                                                       &rtStats)) {
+          !mWorkerPrivate->BlockAndCollectRuntimeStats(&rtStats)) {
         // Returning NS_OK here will effectively report 0 memory.
         return NS_OK;
       }
@@ -1785,24 +1784,6 @@ public:
                                                  aCallback, aClosure);
   }
 
-  NS_IMETHOD
-  GetExplicitNonHeap(int64_t* aAmount)
-  {
-    AssertIsOnMainThread();
-
-    {
-      MutexAutoLock lock(mMutex);
-
-      if (!mWorkerPrivate ||
-          !mWorkerPrivate->BlockAndCollectRuntimeStats(/* aIsQuick = */ true,
-                                                       aAmount)) {
-        *aAmount = 0;
-      }
-    }
-
-    return NS_OK;
-  }
-
 private:
   ~MemoryReporter()
   { }
@@ -2940,11 +2921,11 @@ WorkerPrivate::ScheduleDeletion(bool aWasPending)
 }
 
 bool
-WorkerPrivate::BlockAndCollectRuntimeStats(bool aIsQuick, void* aData)
+WorkerPrivate::BlockAndCollectRuntimeStats(JS::RuntimeStats* aRtStats)
 {
   AssertIsOnMainThread();
   mMutex.AssertCurrentThreadOwns();
-  NS_ASSERTION(aData, "Null data!");
+  NS_ASSERTION(aRtStats, "Null RuntimeStats!");
 
   NS_ASSERTION(!mMemoryReporterRunning, "How can we get reentered here?!");
 
@@ -2973,16 +2954,7 @@ WorkerPrivate::BlockAndCollectRuntimeStats(bool aIsQuick, void* aData)
   if (mMemoryReporter) {
     // Don't hold the lock while doing the actual report.
     MutexAutoUnlock unlock(mMutex);
-
-    if (aIsQuick) {
-      *static_cast<int64_t*>(aData) =
-        JS::GetExplicitNonHeapForRuntime(rt, JsWorkerMallocSizeOf);
-      succeeded = true;
-    } else {
-      succeeded =
-        JS::CollectRuntimeStats(rt, static_cast<JS::RuntimeStats*>(aData),
-                                nullptr);
-    }
+    succeeded = JS::CollectRuntimeStats(rt, aRtStats, nullptr);
   }
 
   NS_ASSERTION(mMemoryReporterRunning, "This isn't possible!");
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
index 1d9c8b5acbca..e07490964566 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -41,6 +41,7 @@ class nsIURI;
 class nsPIDOMWindow;
 class nsITimer;
 class nsIXPCScriptNotify;
+namespace JS { class RuntimeStats; }
 
 BEGIN_WORKERS_NAMESPACE
 
@@ -821,7 +822,7 @@ public:
   ScheduleDeletion(bool aWasPending);
 
   bool
-  BlockAndCollectRuntimeStats(bool aIsQuick, void* aData);
+  BlockAndCollectRuntimeStats(JS::RuntimeStats* aRtStats);
 
   bool
   XHRParamsAllowed() const
diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index 386cca665159..d3c60a7d8cf4 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -634,12 +634,6 @@ public:
 
         return NS_OK;
     }
-
-    NS_IMETHOD GetExplicitNonHeap(int64_t *n)
-    {
-        *n = 0; // this reporter makes neither "explicit" non NONHEAP reports
-        return NS_OK;
-    }
 };
 
 NS_IMPL_ISUPPORTS1(SurfaceMemoryReporter, nsIMemoryMultiReporter)
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index 875374599320..ccf93a5b6e14 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -1137,14 +1137,6 @@ gfxFontCache::MemoryReporter::CollectReports
     return NS_OK;
 }
 
-NS_IMETHODIMP
-gfxFontCache::MemoryReporter::GetExplicitNonHeap(int64_t* aAmount)
-{
-    // This reporter only measures heap memory.
-    *aAmount = 0;
-    return NS_OK;
-}
-
 // Observer for the memory-pressure notification, to trigger
 // flushing of the shaped-word caches
 class MemoryPressureObserver MOZ_FINAL : public nsIObserver,
diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp
index afb2f9d517ab..7dd9935f45a0 100644
--- a/gfx/thebes/gfxPlatformFontList.cpp
+++ b/gfx/thebes/gfxPlatformFontList.cpp
@@ -120,14 +120,6 @@ gfxPlatformFontList::MemoryReporter::CollectReports
     return NS_OK;
 }
 
-NS_IMETHODIMP
-gfxPlatformFontList::MemoryReporter::GetExplicitNonHeap(int64_t* aAmount)
-{
-    // This reporter only measures heap memory.
-    *aAmount = 0;
-    return NS_OK;
-}
-
 gfxPlatformFontList::gfxPlatformFontList(bool aNeedFullnamePostscriptNames)
     : mNeedFullnamePostscriptNames(aNeedFullnamePostscriptNames),
       mStartIndex(0), mIncrement(kNumFontsPerSlice), mNumFamilies(0)
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index 1ee71f336e40..6d913f07ffa6 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -323,15 +323,6 @@ public:
 
         return NS_OK;
     }
-
-    // nsIMemoryMultiReporter abstract method implementation
-    NS_IMETHOD
-    GetExplicitNonHeap(int64_t *aExplicitNonHeap)
-    {
-        // This reporter doesn't do any non-heap measurements.
-        *aExplicitNonHeap = 0;
-        return NS_OK;
-    }
 };
 NS_IMPL_ISUPPORTS1(GPUAdapterMultiReporter, nsIMemoryMultiReporter)
 #endif // ENABLE_GPU_MEM_REPORTER
diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp
index db829310e18c..03a1cf4cdec9 100644
--- a/image/src/imgLoader.cpp
+++ b/image/src/imgLoader.cpp
@@ -150,17 +150,6 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHOD GetExplicitNonHeap(int64_t *n)
-  {
-    size_t n2 = 0;
-    for (uint32_t i = 0; i < mKnownLoaders.Length(); i++) {
-      mKnownLoaders[i]->mChromeCache.EnumerateRead(EntryExplicitNonHeapSize, &n2);
-      mKnownLoaders[i]->mCache.EnumerateRead(EntryExplicitNonHeapSize, &n2);
-    }
-    *n = n2;
-    return NS_OK;
-  }
-
   static int64_t GetImagesContentUsedUncompressed()
   {
     size_t n = 0;
@@ -222,20 +211,6 @@ private:
     return PL_DHASH_NEXT;
   }
 
-  static PLDHashOperator EntryExplicitNonHeapSize(const nsACString&,
-                                                  imgCacheEntry *entry,
-                                                  void *userArg)
-  {
-    size_t *n = static_cast<size_t*>(userArg);
-    nsRefPtr<imgRequest> req = entry->GetRequest();
-    Image *image = static_cast<Image*>(req->mImage.get());
-    if (image) {
-      *n += image->NonHeapSizeOfDecoded();
-    }
-
-    return PL_DHASH_NEXT;
-  }
-
   static PLDHashOperator EntryUsedUncompressedSize(const nsACString&,
                                                    imgCacheEntry *entry,
                                                    void *userArg)
diff --git a/js/public/MemoryMetrics.h b/js/public/MemoryMetrics.h
index 14cf88ec4c60..f14dc73912cf 100644
--- a/js/public/MemoryMetrics.h
+++ b/js/public/MemoryMetrics.h
@@ -444,9 +444,6 @@ class ObjectPrivateVisitor
 extern JS_PUBLIC_API(bool)
 CollectRuntimeStats(JSRuntime *rt, RuntimeStats *rtStats, ObjectPrivateVisitor *opv);
 
-extern JS_PUBLIC_API(int64_t)
-GetExplicitNonHeapForRuntime(JSRuntime *rt, JSMallocSizeOfFun mallocSizeOf);
-
 extern JS_PUBLIC_API(size_t)
 SystemCompartmentCount(JSRuntime *rt);
 
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 6df21245fe8c..cfba78bcd547 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -880,7 +880,6 @@ JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
     data(NULL),
     gcLock(NULL),
     gcHelperThread(thisFromCtor()),
-    sizeOfNonHeapAsmJSArrays_(0),
 #ifdef JS_THREADSAFE
 #ifdef JS_ION
     workerThreadState(NULL),
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 2190cf5be7ae..9da194a90cf8 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -143,24 +143,6 @@ JSRuntime::sizeOfIncludingThis(JSMallocSizeOfFun mallocSizeOf, JS::RuntimeSizes
         rtSizes->scriptData += mallocSizeOf(r.front());
 }
 
-size_t
-JSRuntime::sizeOfExplicitNonHeap()
-{
-    size_t n = stackSpace.sizeOf();
-
-    if (execAlloc_) {
-        JS::CodeSizes sizes;
-        execAlloc_->sizeOfCode(&sizes);
-        n += sizes.jaeger + sizes.ion + sizes.baseline + sizes.asmJS +
-            sizes.regexp + sizes.other + sizes.unused;
-    }
-
-    if (bumpAlloc_)
-        n += bumpAlloc_->sizeOfNonHeapData();
-
-    return n;
-}
-
 void
 JSRuntime::triggerOperationCallback()
 {
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index fd90371f11b8..01ca74eba0e7 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -1204,8 +1204,6 @@ struct JSRuntime : private JS::shadow::Runtime,
     js::AsmJSMachExceptionHandler asmJSMachExceptionHandler;
 #endif
 
-    size_t              sizeOfNonHeapAsmJSArrays_;
-
 #ifdef JS_THREADSAFE
 # ifdef JS_ION
     js::WorkerThreadState *workerThreadState;
@@ -1405,7 +1403,6 @@ struct JSRuntime : private JS::shadow::Runtime,
     }
 
     void sizeOfIncludingThis(JSMallocSizeOfFun mallocSizeOf, JS::RuntimeSizes *runtime);
-    size_t sizeOfExplicitNonHeap();
 
   private:
 
diff --git a/js/src/jsmemorymetrics.cpp b/js/src/jsmemorymetrics.cpp
index fc82601c5c17..351d965446e5 100644
--- a/js/src/jsmemorymetrics.cpp
+++ b/js/src/jsmemorymetrics.cpp
@@ -375,29 +375,6 @@ JS::CollectRuntimeStats(JSRuntime *rt, RuntimeStats *rtStats, ObjectPrivateVisit
     return true;
 }
 
-JS_PUBLIC_API(int64_t)
-JS::GetExplicitNonHeapForRuntime(JSRuntime *rt, JSMallocSizeOfFun mallocSizeOf)
-{
-    // explicit/*/gc-heap/*
-    size_t n = size_t(JS_GetGCParameter(rt, JSGC_TOTAL_CHUNKS)) * gc::ChunkSize;
-
-    // Subtract decommitted arenas, which aren't included in "explicit".
-    size_t decommittedArenas = 0;
-    IterateChunks(rt, &decommittedArenas, DecommittedArenasChunkCallback);
-    n -= decommittedArenas;
-
-    // explicit/*/objects-extra/elements/asm.js (64-bit platforms only)
-    n += rt->sizeOfNonHeapAsmJSArrays_;
-
-    // explicit/runtime/mjit-code
-    // explicit/runtime/regexp-code
-    // explicit/runtime/stack-committed
-    // explicit/runtime/unused-code-memory
-    n += rt->sizeOfExplicitNonHeap();
-
-    return int64_t(n);
-}
-
 JS_PUBLIC_API(size_t)
 JS::SystemCompartmentCount(JSRuntime *rt)
 {
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 6d4beda2fdd6..bc07ee898708 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -379,11 +379,6 @@ ArrayBufferObject::prepareForAsmJS(JSContext *cx, Handle<ArrayBufferObject*> buf
     }
 # endif
 
-    // We don't include the PageSize at the front so that when we sum the
-    // individual asm.js arrays for all the compartments in the runtime, they
-    // match this number.
-    buffer->runtime()->sizeOfNonHeapAsmJSArrays_ += buffer->byteLength();
-
     // Copy over the current contents of the typed array.
     uint8_t *data = reinterpret_cast<uint8_t*>(p) + PageSize;
     memcpy(data, buffer->dataPointer(), buffer->byteLength());
@@ -407,8 +402,6 @@ ArrayBufferObject::releaseAsmJSArrayBuffer(FreeOp *fop, RawObject obj)
     ArrayBufferObject &buffer = obj->asArrayBuffer();
     JS_ASSERT(buffer.isAsmJSArrayBuffer());
 
-    buffer.runtime()->sizeOfNonHeapAsmJSArrays_ -= buffer.byteLength();
-
     uint8_t *p = buffer.dataPointer() - PageSize ;
     JS_ASSERT(uintptr_t(p) % PageSize == 0);
 # ifdef XP_WIN
diff --git a/js/xpconnect/src/XPCJSMemoryReporter.h b/js/xpconnect/src/XPCJSMemoryReporter.h
index fe507c5eacb2..ac95b7813035 100644
--- a/js/xpconnect/src/XPCJSMemoryReporter.h
+++ b/js/xpconnect/src/XPCJSMemoryReporter.h
@@ -26,8 +26,6 @@ public:
                                    WindowPaths *topWindowPaths,
                                    nsIMemoryMultiReporterCallback *cb,
                                    nsISupports *closure);
-
-    static nsresult GetExplicitNonHeap(int64_t *n);
 };
 
 }
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index a9a83b7a6da6..9632d264b81a 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -2150,14 +2150,6 @@ class JSCompartmentsMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
 
         return NS_OK;
     }
-
-    NS_IMETHOD
-    GetExplicitNonHeap(int64_t *n)
-    {
-        // This reporter does neither "explicit" nor NONHEAP measurements.
-        *n = 0;
-        return NS_OK;
-    }
 };
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(JSCompartmentsMultiReporter
@@ -2425,14 +2417,6 @@ JSMemoryMultiReporter::CollectReports(WindowPaths *windowPaths,
     return NS_OK;
 }
 
-nsresult
-JSMemoryMultiReporter::GetExplicitNonHeap(int64_t *n)
-{
-    JSRuntime *rt = nsXPConnect::GetRuntimeInstance()->GetJSRuntime();
-    *reinterpret_cast<int64_t*>(n) = JS::GetExplicitNonHeapForRuntime(rt, JsMallocSizeOf);
-    return NS_OK;
-}
-
 } // namespace xpc
 
 #ifdef MOZ_CRASHREPORTER
diff --git a/storage/src/mozStorageService.cpp b/storage/src/mozStorageService.cpp
index 2f8c69084167..75bd54696f89 100644
--- a/storage/src/mozStorageService.cpp
+++ b/storage/src/mozStorageService.cpp
@@ -163,13 +163,6 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHOD GetExplicitNonHeap(int64_t *aAmount)
-  {
-    // This reporter doesn't do any non-heap measurements.
-    *aAmount = 0;
-    return NS_OK;
-  }
-
 private:
   /**
    * Passes a single SQLite memory statistic to a memory multi-reporter
diff --git a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul b/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
index d1bd46e454f0..2b71260ce60d 100644
--- a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
+++ b/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
@@ -39,7 +39,6 @@
   const COUNT_CUMULATIVE = Ci.nsIMemoryReporter.UNITS_COUNT_CUMULATIVE;
   const PERCENTAGE = Ci.nsIMemoryReporter.UNITS_PERCENTAGE;
 
-  let explicitAmounts = [];
   let vsizeAmounts = [];
   let residentAmounts = [];
   let jsGcHeapAmounts = [];
@@ -60,9 +59,7 @@
   function handleReport(aProcess, aPath, aKind, aUnits, aAmount, aDescription)
   {
     // Record the values of some notable reporters.
-    if (aPath === "explicit") {
-      explicitAmounts.push(aAmount);
-    } else if (aPath === "vsize") {
+    if (aPath === "vsize") {
       vsizeAmounts.push(aAmount);
     } else if (aPath === "resident") {
       residentAmounts.push(aAmount);
@@ -122,10 +119,8 @@
     let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
     r.collectReports(handleReport, null);
 
-    // Access |name| and |explicitNonHeap| to make sure they don't crash or
-    // assert.
+    // Access |name| to make sure it doesn't crash or assert.
     dummy = r.name;
-    dummy = r.explicitNonHeap;
   }
 
   function checkSpecialReport(aName, aAmounts)
@@ -139,7 +134,6 @@
 
   // If mgr.explicit failed, we won't have "heap-allocated" either.
   if (haveExplicit) {
-    checkSpecialReport("explicit",       explicitAmounts);
     checkSpecialReport("heap-allocated", heapAllocatedAmounts);
   }
   checkSpecialReport("vsize",          vsizeAmounts);
diff --git a/xpcom/base/MapsMemoryReporter.cpp b/xpcom/base/MapsMemoryReporter.cpp
index 692484bc9e95..e95ddf112e44 100644
--- a/xpcom/base/MapsMemoryReporter.cpp
+++ b/xpcom/base/MapsMemoryReporter.cpp
@@ -128,13 +128,6 @@ public:
   CollectReports(nsIMemoryMultiReporterCallback *aCb,
                  nsISupports *aClosure);
 
-  NS_IMETHOD
-  GetExplicitNonHeap(int64_t *aAmount) {
-    // This reporter doesn't do any "explicit" measurements.
-    *aAmount = 0;
-    return NS_OK;
-  }
-
 private:
   // Search through /proc/self/maps for libxul.so, and set mLibxulDir to the
   // the directory containing libxul.
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 7d8b933ad7fb..b50af97af7f2 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -2431,13 +2431,6 @@ class CycleCollectorMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
         return NS_OK;
     }
 
-    NS_IMETHOD GetExplicitNonHeap(int64_t* n)
-    {
-        // This reporter does neither "explicit" nor NONHEAP measurements.
-        *n = 0;
-        return NS_OK;
-    }
-
   private:
     NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(MallocSizeOf)
 
diff --git a/xpcom/base/nsIMemoryReporter.idl b/xpcom/base/nsIMemoryReporter.idl
index c248a4fa043c..2ea043c54453 100644
--- a/xpcom/base/nsIMemoryReporter.idl
+++ b/xpcom/base/nsIMemoryReporter.idl
@@ -199,7 +199,7 @@ interface nsIMemoryMultiReporterCallback : nsISupports
  * (Compare and contrast this with nsIMemoryReporter, which allows all
  * fields except |amount| to be accessed without triggering computation.)
  */
-[scriptable, uuid(61d498d5-b460-4398-a8ea-7f75208534b4)]
+[scriptable, uuid(24d61ead-237b-4969-a6bd-73fd8fed1d99)]
 interface nsIMemoryMultiReporter : nsISupports
 {
   /*
@@ -214,18 +214,6 @@ interface nsIMemoryMultiReporter : nsISupports
    */
   void collectReports(in nsIMemoryMultiReporterCallback callback,
                       in nsISupports closure);
-
-  /*
-   * Return the sum of all this multi-reporter's measurements that have a
-   * path that starts with "explicit" and are KIND_NONHEAP.
-   *
-   * This is a hack that's required to implement
-   * nsIMemoryReporterManager::explicit efficiently, which is important --
-   * multi-reporters can special-case this operation so it's much faster
-   * than getting all the reports, filtering out the unneeded ones, and
-   * summing the remainder.
-   */
-  readonly attribute int64_t explicitNonHeap;
 };
 
 [scriptable, builtinclass, uuid(70b0e608-8dbf-4dc7-b88f-f1c745c1b48c)]
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 4bf20c351b45..02870d91cb52 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -594,27 +594,6 @@ private:
         return (int64_t) stats.allocated;
     }
 };
-
-// The computation of "explicit" fails if "heap-allocated" isn't available,
-// which is why this is depends on HAVE_JEMALLOC_STATS.
-class ExplicitReporter MOZ_FINAL : public MemoryReporterBase
-{
-public:
-    ExplicitReporter()
-      : MemoryReporterBase("explicit", KIND_OTHER, UNITS_BYTES,
-"This is the same measurement as the root of the 'explicit' tree.  However, "
-"it is measured at a different time and so gives slightly different results.")
-    {}
-
-    NS_IMETHOD GetAmount(int64_t *aAmount)
-    {
-        nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
-        if (mgr == nullptr)
-            return NS_ERROR_FAILURE;
-
-        return mgr->GetExplicit(aAmount);
-    }
-};
 #endif  // HAVE_JEMALLOC_STATS
 
 // Why is this here?  At first glance, you'd think it could be defined and
@@ -690,13 +669,6 @@ public:
 
     return NS_OK;
   }
-
-  NS_IMETHOD GetExplicitNonHeap(int64_t *n)
-  {
-    // No non-heap allocations.
-    *n = 0;
-    return NS_OK;
-  }
 };
 
 NS_IMPL_ISUPPORTS1(DMDMultiReporter, nsIMemoryMultiReporter)
@@ -727,7 +699,6 @@ nsMemoryReporterManager::Init()
     RegisterReporter(new HeapCommittedUnusedReporter);
     RegisterReporter(new HeapCommittedUnusedRatioReporter);
     RegisterReporter(new HeapDirtyReporter);
-    RegisterReporter(new ExplicitReporter);
 #endif
 
 #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
@@ -1107,54 +1078,23 @@ nsMemoryReporterManager::GetExplicit(int64_t *aExplicit)
         }
     }
 
-    // For each multi-reporter we could call CollectReports and filter out the
-    // non-explicit, non-NONHEAP measurements.  But that's lots of wasted work,
-    // so we instead use GetExplicitNonHeap() which exists purely for this
-    // purpose.
-    //
-    // (Actually, in debug builds we also do it the slow way and compare the
-    // result to the result obtained from GetExplicitNonHeap().  This
-    // guarantees the two measurement paths are equivalent.  This is wise
-    // because it's easy for memory reporters to have bugs.  But there's an
-    // exception if DMD is enabled, because that makes DMD think that all the
-    // blocks are double-counted.)
+    // For each multi-reporter we call CollectReports and filter out the
+    // non-explicit, non-NONHEAP measurements.  That's lots of wasted work,
+    // and we used to have a GetExplicitNonHeap() method which did this more
+    // efficiently, but it ended up being more trouble than it was worth.
 
-    int64_t explicitNonHeapMultiSize = 0;
+    nsRefPtr<ExplicitNonHeapCountingCallback> cb =
+      new ExplicitNonHeapCountingCallback();
+    nsRefPtr<Int64Wrapper> wrappedExplicitNonHeapMultiSize =
+      new Int64Wrapper();
     nsCOMPtr<nsISimpleEnumerator> e2;
     EnumerateMultiReporters(getter_AddRefs(e2));
     while (NS_SUCCEEDED(e2->HasMoreElements(&more)) && more) {
       nsCOMPtr<nsIMemoryMultiReporter> r;
       e2->GetNext(getter_AddRefs(r));
-      int64_t n;
-      rv = r->GetExplicitNonHeap(&n);
-      NS_ENSURE_SUCCESS(rv, rv);
-      explicitNonHeapMultiSize += n;
+      r->CollectReports(cb, wrappedExplicitNonHeapMultiSize);
     }
-
-#if defined(DEBUG) && !defined(MOZ_DMD)
-    nsRefPtr<ExplicitNonHeapCountingCallback> cb =
-      new ExplicitNonHeapCountingCallback();
-    nsRefPtr<Int64Wrapper> wrappedExplicitNonHeapMultiSize2 =
-      new Int64Wrapper();
-    nsCOMPtr<nsISimpleEnumerator> e3;
-    EnumerateMultiReporters(getter_AddRefs(e3));
-    while (NS_SUCCEEDED(e3->HasMoreElements(&more)) && more) {
-      nsCOMPtr<nsIMemoryMultiReporter> r;
-      e3->GetNext(getter_AddRefs(r));
-      r->CollectReports(cb, wrappedExplicitNonHeapMultiSize2);
-    }
-    int64_t explicitNonHeapMultiSize2 = wrappedExplicitNonHeapMultiSize2->mValue;
-
-    // Check the two measurements give the same result.  This was an
-    // NS_ASSERTION but they occasionally don't match due to races (bug
-    // 728990).
-    if (explicitNonHeapMultiSize != explicitNonHeapMultiSize2) {
-        NS_WARNING(nsPrintfCString("The two measurements of 'explicit' memory "
-                                   "usage don't match (%lld vs %lld)",
-                                   explicitNonHeapMultiSize,
-                                   explicitNonHeapMultiSize2).get());
-    }
-#endif  // defined(DEBUG) && !defined(MOZ_DMD)
+    int64_t explicitNonHeapMultiSize = wrappedExplicitNonHeapMultiSize->mValue;
 
     *aExplicit = heapAllocated + explicitNonHeapNormalSize + explicitNonHeapMultiSize;
     return NS_OK;

From 2d23bd6e9fa6850151a62f96ac96d8c707790be0 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Mon, 15 Apr 2013 20:45:48 -0700
Subject: [PATCH 142/438] Bug 859657 (follow-up) - Bustage fix for opt builds
 on a CLOSED TREE.  r=me.

---
 xpcom/base/nsMemoryReporterManager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 02870d91cb52..b498c4b28f89 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -991,7 +991,6 @@ nsMemoryReporterManager::GetResident(int64_t *aResident)
 #endif
 }
 
-#if defined(DEBUG) && !defined(MOZ_DMD)
 // This is just a wrapper for int64_t that implements nsISupports, so it can be
 // passed to nsIMemoryMultiReporter::CollectReports.
 class Int64Wrapper MOZ_FINAL : public nsISupports {
@@ -1027,7 +1026,6 @@ NS_IMPL_ISUPPORTS1(
   ExplicitNonHeapCountingCallback
 , nsIMemoryMultiReporterCallback
 )
-#endif  // defined(DEBUG) && !defined(MOZ_DMD)
 
 NS_IMETHODIMP
 nsMemoryReporterManager::GetExplicit(int64_t *aExplicit)

From 575b423ef17450e6ca9b9982888039f39266047a Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 16 Apr 2013 00:07:32 -0400
Subject: [PATCH 143/438] Bug 861893 - Do not hold on to
 nsITextServicesDocument unnecessarily in the editor and the spell checker
 code; r=roc

---
 editor/libeditor/html/nsHTMLEditor.cpp              |  2 --
 editor/libeditor/html/nsHTMLEditor.h                |  4 ----
 extensions/spellcheck/src/mozInlineSpellChecker.cpp | 13 +------------
 extensions/spellcheck/src/mozInlineSpellChecker.h   |  2 --
 4 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp
index 68a4bb08d76a..2bc2ce65cbb7 100644
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -162,7 +162,6 @@ nsHTMLEditor::HideAnonymousEditingUIs()
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLEditor, nsPlaintextEditor)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mTypeInState)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mStyleSheets)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mTextServices)
 
   tmp->HideAnonymousEditingUIs();
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
@@ -170,7 +169,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsHTMLEditor, nsPlaintextEditor)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTypeInState)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStyleSheets)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTextServices)
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTopLeftHandle)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTopHandle)
diff --git a/editor/libeditor/html/nsHTMLEditor.h b/editor/libeditor/html/nsHTMLEditor.h
index a6d9bf1952d7..9b46fe24432b 100644
--- a/editor/libeditor/html/nsHTMLEditor.h
+++ b/editor/libeditor/html/nsHTMLEditor.h
@@ -14,7 +14,6 @@
 #include "nsITableEditor.h"
 #include "nsIEditorMailSupport.h"
 #include "nsIEditorStyleSheets.h"
-#include "nsITextServicesDocument.h"
 
 #include "nsEditor.h"
 #include "nsIDOMElement.h"
@@ -766,9 +765,6 @@ protected:
   // an array for holding default style settings
   nsTArray<PropItem*> mDefaultStyles;
 
-   // for real-time spelling
-   nsCOMPtr<nsITextServicesDocument> mTextServices;
-
 protected:
 
   /* ANONYMOUS UTILS */
diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
index 0c995b68c26b..431188dbaa07 100644
--- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -481,9 +481,8 @@ NS_INTERFACE_MAP_END
 NS_IMPL_CYCLE_COLLECTING_ADDREF(mozInlineSpellChecker)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(mozInlineSpellChecker)
 
-NS_IMPL_CYCLE_COLLECTION_4(mozInlineSpellChecker,
+NS_IMPL_CYCLE_COLLECTION_3(mozInlineSpellChecker,
                            mSpellCheck,
-                           mTextServicesDocument,
                            mTreeWalker,
                            mCurrentSelectionAnchorNode)
 
@@ -675,16 +674,6 @@ mozInlineSpellChecker::SetEnableRealTimeSpell(bool aEnabled)
       res = spellchecker->InitSpellChecker(editor, false);
       NS_ENSURE_SUCCESS(res, res);
 
-      nsCOMPtr<nsITextServicesDocument> tsDoc = do_CreateInstance("@mozilla.org/textservices/textservicesdocument;1", &res);
-      NS_ENSURE_SUCCESS(res, res);
-
-      res = tsDoc->SetFilter(filter);
-      NS_ENSURE_SUCCESS(res, res);
-
-      res = tsDoc->InitWithEditor(editor);
-      NS_ENSURE_SUCCESS(res, res);
-
-      mTextServicesDocument = tsDoc;
       mSpellCheck = spellchecker;
 
       // spell checking is enabled, register our event listeners to track navigation
diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.h b/extensions/spellcheck/src/mozInlineSpellChecker.h
index 374efe644443..dcdb06c4bc56 100644
--- a/extensions/spellcheck/src/mozInlineSpellChecker.h
+++ b/extensions/spellcheck/src/mozInlineSpellChecker.h
@@ -11,7 +11,6 @@
 #include "nsIEditorSpellCheck.h"
 #include "nsIEditActionListener.h"
 #include "nsIInlineSpellChecker.h"
-#include "nsITextServicesDocument.h"
 #include "nsIDOMTreeWalker.h"
 #include "nsWeakReference.h"
 #include "nsEditor.h"
@@ -130,7 +129,6 @@ private:
 
   nsWeakPtr mEditor; 
   nsCOMPtr<nsIEditorSpellCheck> mSpellCheck;
-  nsCOMPtr<nsITextServicesDocument> mTextServicesDocument;
   nsCOMPtr<nsIDOMTreeWalker> mTreeWalker;
   nsCOMPtr<mozISpellI18NUtil> mConverter;
 

From 4134b5fe70af6a20a3cba41edc43d5bb783687b1 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 16 Apr 2013 00:08:04 -0400
Subject: [PATCH 144/438] Bug 861897 - Cleanup nsComposeTxtSrvFilter to use
 nsGkAtoms; r=roc

---
 content/base/src/nsGkAtomList.h               |  1 +
 editor/composer/src/nsComposeTxtSrvFilter.cpp | 50 +++++++------------
 editor/composer/src/nsComposeTxtSrvFilter.h   | 20 +-------
 3 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index 27a9c672de53..21efd138e7c9 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -45,6 +45,7 @@ GK_ATOM(mozgeneratedcontentbefore, "_moz_generated_content_before")
 GK_ATOM(mozgeneratedcontentafter, "_moz_generated_content_after")
 GK_ATOM(mozgeneratedcontentimage, "_moz_generated_content_image")
 GK_ATOM(mozquote, "_moz_quote")
+GK_ATOM(mozsignature, "moz-signature")
 GK_ATOM(_moz_is_glyph, "-moz-is-glyph")
 GK_ATOM(_moz_original_size, "_moz_original_size")
 GK_ATOM(_moz_target, "_moz_target")
diff --git a/editor/composer/src/nsComposeTxtSrvFilter.cpp b/editor/composer/src/nsComposeTxtSrvFilter.cpp
index 84577de2ec5c..bf3049601d1d 100644
--- a/editor/composer/src/nsComposeTxtSrvFilter.cpp
+++ b/editor/composer/src/nsComposeTxtSrvFilter.cpp
@@ -3,11 +3,9 @@
  * 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 "nsCaseTreatment.h"
 #include "nsComposeTxtSrvFilter.h"
 #include "nsError.h"                    // for NS_OK
 #include "nsIContent.h"                 // for nsIContent
-#include "nsID.h"
 #include "nsIDOMNode.h"                 // for nsIDOMNode
 #include "nsINameSpaceManager.h"        // for kNameSpaceID_None
 #include "nsLiteralString.h"            // for NS_LITERAL_STRING
@@ -16,25 +14,11 @@
 nsComposeTxtSrvFilter::nsComposeTxtSrvFilter() :
   mIsForMail(false)
 {
-
-  mBlockQuoteAtom  = do_GetAtom("blockquote");
-  mSpanAtom        = do_GetAtom("span");
-  mTableAtom       = do_GetAtom("table");
-  mMozQuoteAtom    = do_GetAtom("_moz_quote");
-  mClassAtom       = do_GetAtom("class");
-  mTypeAtom        = do_GetAtom("type");
-  mScriptAtom      = do_GetAtom("script");
-  mTextAreaAtom    = do_GetAtom("textarea");
-  mSelectAreaAtom  = do_GetAtom("select");
-  mMapAtom         = do_GetAtom("map");
-  mCiteAtom        = do_GetAtom("cite");
-  mTrueAtom        = do_GetAtom("true");
-  mMozSignatureAtom= do_GetAtom("moz-signature");
 }
 
 NS_IMPL_ISUPPORTS1(nsComposeTxtSrvFilter, nsITextServicesFilter)
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsComposeTxtSrvFilter::Skip(nsIDOMNode* aNode, bool *_retval)
 {
   *_retval = false;
@@ -45,32 +29,32 @@ nsComposeTxtSrvFilter::Skip(nsIDOMNode* aNode, bool *_retval)
   nsCOMPtr<nsIContent> content(do_QueryInterface(aNode));
   if (content) {
     nsIAtom *tag = content->Tag();
-    if (tag == mBlockQuoteAtom) {
+    if (tag == nsGkAtoms::blockquote) {
       if (mIsForMail) {
-        *_retval = content->AttrValueIs(kNameSpaceID_None, mTypeAtom,
-                                        mCiteAtom, eIgnoreCase);
+        *_retval = content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
+                                        nsGkAtoms::cite, eIgnoreCase);
       }
-    } else if (tag == mSpanAtom) {
+    } else if (tag == nsGkAtoms::span) {
       if (mIsForMail) {
-        *_retval = content->AttrValueIs(kNameSpaceID_None, mMozQuoteAtom,
-                                        mTrueAtom, eIgnoreCase);
+        *_retval = content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::mozquote,
+                                        nsGkAtoms::_true, eIgnoreCase);
         if (!*_retval) {
-          *_retval = content->AttrValueIs(kNameSpaceID_None, mClassAtom,
-                                          mMozSignatureAtom, eCaseMatters);
+          *_retval = content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::_class,
+                                          nsGkAtoms::mozsignature, eCaseMatters);
         }
-      }         
-    } else if (tag == mScriptAtom ||
-               tag == mTextAreaAtom ||
-               tag == mSelectAreaAtom ||
-               tag == mMapAtom) {
+      }
+    } else if (tag == nsGkAtoms::script ||
+               tag == nsGkAtoms::textarea ||
+               tag == nsGkAtoms::select ||
+               tag == nsGkAtoms::map) {
       *_retval = true;
-    } else if (tag == mTableAtom) {
+    } else if (tag == nsGkAtoms::table) {
       if (mIsForMail) {
         *_retval =
-          content->AttrValueIs(kNameSpaceID_None, mClassAtom,
+          content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::_class,
                                NS_LITERAL_STRING("moz-email-headers-table"),
                                eCaseMatters);
-      } 
+      }
     }
   }
 
diff --git a/editor/composer/src/nsComposeTxtSrvFilter.h b/editor/composer/src/nsComposeTxtSrvFilter.h
index 90cd4933c210..6a27ca9b0cad 100644
--- a/editor/composer/src/nsComposeTxtSrvFilter.h
+++ b/editor/composer/src/nsComposeTxtSrvFilter.h
@@ -6,8 +6,6 @@
 #ifndef nsComposeTxtSrvFilter_h__
 #define nsComposeTxtSrvFilter_h__
 
-#include "nsCOMPtr.h"                   // for nsCOMPtr
-#include "nsIAtom.h"                    // for nsIAtom
 #include "nsISupportsImpl.h"            // for NS_DECL_ISUPPORTS
 #include "nsITextServicesFilter.h"
 
@@ -18,11 +16,10 @@
  * This filter is used to skip over various form control nodes and
  * mail's cite nodes
  */
-class nsComposeTxtSrvFilter : public nsITextServicesFilter
+class nsComposeTxtSrvFilter MOZ_FINAL : public nsITextServicesFilter
 {
 public:
   nsComposeTxtSrvFilter();
-  virtual ~nsComposeTxtSrvFilter() {}
 
   // nsISupports interface...
   NS_DECL_ISUPPORTS
@@ -33,21 +30,8 @@ public:
   // Helper - Intializer
   void Init(bool aIsForMail) { mIsForMail = aIsForMail; }
 
-protected:
+private:
   bool              mIsForMail;
-  nsCOMPtr<nsIAtom> mBlockQuoteAtom;
-  nsCOMPtr<nsIAtom> mSpanAtom;         // mail plain text quotes are wrapped in span tags
-  nsCOMPtr<nsIAtom> mMozQuoteAtom;     // _moz_quote_
-  nsCOMPtr<nsIAtom> mTableAtom;
-  nsCOMPtr<nsIAtom> mClassAtom;
-  nsCOMPtr<nsIAtom> mTypeAtom;
-  nsCOMPtr<nsIAtom> mScriptAtom;
-  nsCOMPtr<nsIAtom> mTextAreaAtom;
-  nsCOMPtr<nsIAtom> mSelectAreaAtom;
-  nsCOMPtr<nsIAtom> mMapAtom;
-  nsCOMPtr<nsIAtom> mCiteAtom;
-  nsCOMPtr<nsIAtom> mTrueAtom;
-  nsCOMPtr<nsIAtom> mMozSignatureAtom;
 };
 
 #define NS_COMPOSERTXTSRVFILTER_CID \

From bf197ee0b6828c1a3894dba48df80953031cd515 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sun, 14 Apr 2013 14:18:43 -0400
Subject: [PATCH 145/438] Bug 834513 - Part 1: Refactor
 WebAudioDecodeJob::GetJSContext into AudioContext; r=roc

---
 content/media/webaudio/AudioContext.cpp       | 14 ++++++++++++++
 content/media/webaudio/AudioContext.h         |  2 ++
 content/media/webaudio/MediaBufferDecoder.cpp | 18 ++----------------
 content/media/webaudio/MediaBufferDecoder.h   |  1 -
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp
index 078f7715c8a4..c4fec440dc8f 100644
--- a/content/media/webaudio/AudioContext.cpp
+++ b/content/media/webaudio/AudioContext.cpp
@@ -247,5 +247,19 @@ AudioContext::Resume()
   }
 }
 
+JSContext*
+AudioContext::GetJSContext() const
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsCOMPtr<nsIScriptGlobalObject> scriptGlobal =
+    do_QueryInterface(GetParentObject());
+  nsIScriptContext* scriptContext = scriptGlobal->GetContext();
+  if (!scriptContext) {
+    return nullptr;
+  }
+  return scriptContext->GetNativeContext();
+}
+
 }
 }
diff --git a/content/media/webaudio/AudioContext.h b/content/media/webaudio/AudioContext.h
index 4ca8b006c09d..f3069b6de1e0 100644
--- a/content/media/webaudio/AudioContext.h
+++ b/content/media/webaudio/AudioContext.h
@@ -141,6 +141,8 @@ public:
   void UnregisterPannerNode(PannerNode* aNode);
   void UpdatePannerSource();
 
+  JSContext* GetJSContext() const;
+
 private:
   void RemoveFromDecodeQueue(WebAudioDecodeJob* aDecodeJob);
 
diff --git a/content/media/webaudio/MediaBufferDecoder.cpp b/content/media/webaudio/MediaBufferDecoder.cpp
index ad030ae1e6e6..9dd3d522e55a 100644
--- a/content/media/webaudio/MediaBufferDecoder.cpp
+++ b/content/media/webaudio/MediaBufferDecoder.cpp
@@ -591,7 +591,7 @@ WebAudioDecodeJob::FinalizeBufferData()
   MOZ_ASSERT(mOutput);
   MOZ_ASSERT(mChannels == mChannelBuffers.Length());
 
-  AutoPushJSContext cx(GetJSContext());
+  AutoPushJSContext cx(mContext->GetJSContext());
   if (!cx) {
     return false;
   }
@@ -603,20 +603,6 @@ WebAudioDecodeJob::FinalizeBufferData()
   return true;
 }
 
-JSContext*
-WebAudioDecodeJob::GetJSContext() const
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  nsCOMPtr<nsIScriptGlobalObject> scriptGlobal =
-    do_QueryInterface(mContext->GetParentObject());
-  nsIScriptContext* scriptContext = scriptGlobal->GetContext();
-  if (!scriptContext) {
-    return nullptr;
-  }
-  return scriptContext->GetNativeContext();
-}
-
 bool
 WebAudioDecodeJob::AllocateBuffer()
 {
@@ -624,7 +610,7 @@ WebAudioDecodeJob::AllocateBuffer()
   MOZ_ASSERT(NS_IsMainThread());
 
   // First, get a JSContext
-  AutoPushJSContext cx(GetJSContext());
+  AutoPushJSContext cx(mContext->GetJSContext());
   if (!cx) {
     return false;
   }
diff --git a/content/media/webaudio/MediaBufferDecoder.h b/content/media/webaudio/MediaBufferDecoder.h
index ed214208344d..75832008806f 100644
--- a/content/media/webaudio/MediaBufferDecoder.h
+++ b/content/media/webaudio/MediaBufferDecoder.h
@@ -50,7 +50,6 @@ struct WebAudioDecodeJob
   void OnFailure(ErrorCode aErrorCode);
 
   bool AllocateBuffer();
-  JSContext* GetJSContext() const;
   bool FinalizeBufferData();
 
   nsCString mContentType;

From aee7119fc8c0ac9b926e6294f46a0d31b4152deb Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 8 Apr 2013 16:09:35 +1200
Subject: [PATCH 146/438] Bug 849996. Check the correct frame for transforms in
 PushAbsoluteContainingBlock --- it might not be the containing block itself.
 r=bzbarsky

---
 layout/base/nsCSSFrameConstructor.cpp  | 37 ++++++++++++++++----------
 layout/base/nsCSSFrameConstructor.h    |  5 +++-
 layout/reftests/bugs/849996-1-ref.html | 23 ++++++++++++++++
 layout/reftests/bugs/849996-1.html     | 27 +++++++++++++++++++
 layout/reftests/bugs/reftest.list      |  1 +
 5 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 layout/reftests/bugs/849996-1-ref.html
 create mode 100644 layout/reftests/bugs/849996-1.html

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index deab4aed4a7e..6922d96963bf 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -791,7 +791,12 @@ public:
   // logic in GetAbsoluteContainingBlock.
   // Also makes aNewAbsoluteContainingBlock the containing block for
   // fixed-pos elements if necessary.
+  // aPositionedFrame is the frame whose style actually makes
+  // aNewAbsoluteContainingBlock a containing block. E.g. for a scrollable element
+  // aPositionedFrame is the element's primary frame and
+  // aNewAbsoluteContainingBlock is the scrolled frame.
   void PushAbsoluteContainingBlock(nsIFrame* aNewAbsoluteContainingBlock,
+                                   nsIFrame* aPositionedFrame,
                                    nsFrameConstructorSaveState& aSaveState);
 
   // Function to push the existing float containing block state and
@@ -1029,6 +1034,7 @@ AdjustAbsoluteContainingBlock(nsIFrame* aContainingBlockIn)
 
 void
 nsFrameConstructorState::PushAbsoluteContainingBlock(nsIFrame* aNewAbsoluteContainingBlock,
+                                                     nsIFrame* aPositionedFrame,
                                                      nsFrameConstructorSaveState& aSaveState)
 {
   aSaveState.mItems = &mAbsoluteItems;
@@ -1044,14 +1050,14 @@ nsFrameConstructorState::PushAbsoluteContainingBlock(nsIFrame* aNewAbsoluteConta
     mFixedItems = mAbsoluteItems;
   }
 
-  mAbsoluteItems = 
+  mAbsoluteItems =
     nsAbsoluteItems(AdjustAbsoluteContainingBlock(aNewAbsoluteContainingBlock));
 
   /* See if we're wiring the fixed-pos and abs-pos lists together.  This happens iff
    * we're a transformed element.
    */
-  mFixedPosIsAbsPos = aNewAbsoluteContainingBlock &&
-    aNewAbsoluteContainingBlock->StyleDisplay()->HasTransform(aNewAbsoluteContainingBlock);
+  mFixedPosIsAbsPos = aPositionedFrame &&
+      aPositionedFrame->StyleDisplay()->HasTransform(aPositionedFrame);
 
   if (aNewAbsoluteContainingBlock) {
     aNewAbsoluteContainingBlock->MarkAsAbsoluteContainingBlock();
@@ -1955,7 +1961,7 @@ nsCSSFrameConstructor::ConstructTable(nsFrameConstructorState& aState,
        (display->HasTransformStyle() &&
         aParentFrame->IsFrameOfType(nsIFrame::eSupportsCSSTransforms))) &&
       !aParentFrame->IsSVGText()) {
-    aState.PushAbsoluteContainingBlock(newFrame, absoluteSaveState);
+    aState.PushAbsoluteContainingBlock(newFrame, newFrame, absoluteSaveState);
   }
   if (aItem.mFCData->mBits & FCDATA_USE_CHILD_ITEMS) {
     ConstructFramesFromItemList(aState, aItem.mChildItems,
@@ -2357,6 +2363,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element*                 aDocEle
     // the root element
     mDocElementContainingBlock->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
     state.PushAbsoluteContainingBlock(mDocElementContainingBlock,
+                                      mDocElementContainingBlock,
                                       absoluteSaveState);
   }
 
@@ -2443,7 +2450,8 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element*                 aDocEle
                                               mDocElementContainingBlock),
                      mDocElementContainingBlock, styleContext,
                      &contentFrame, frameItems,
-                     display->IsPositioned(contentFrame), nullptr);
+                     display->IsPositioned(contentFrame) ? contentFrame : nullptr,
+                     nullptr);
       newFrame = frameItems.FirstChild();
       NS_ASSERTION(frameItems.OnlyChild(), "multiple root element frames");
     }
@@ -3064,7 +3072,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsFrameConstructorState& aState,
 
   newFrame->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
   if (newFrame->IsPositioned()) {
-    aState.PushAbsoluteContainingBlock(newFrame, absoluteSaveState);
+    aState.PushAbsoluteContainingBlock(newFrame, newFrame, absoluteSaveState);
   }
 
   ProcessChildren(aState, content, styleContext, blockFrame, true,
@@ -3615,7 +3623,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
     nsFrameConstructorSaveState absoluteSaveState;
 
     if (bits & FCDATA_FORCE_NULL_ABSPOS_CONTAINER) {
-      aState.PushAbsoluteContainingBlock(nullptr, absoluteSaveState);
+      aState.PushAbsoluteContainingBlock(nullptr, nullptr, absoluteSaveState);
     } else if (!(bits & FCDATA_SKIP_ABSPOS_PUSH)) {
       nsIFrame* cb = maybeAbsoluteContainingBlock;
       cb->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
@@ -3624,7 +3632,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
            (maybeAbsoluteContainingBlockDisplay->HasTransformStyle() &&
             cb->IsFrameOfType(nsIFrame::eSupportsCSSTransforms))) &&
           !cb->IsSVGText()) {
-        aState.PushAbsoluteContainingBlock(cb, absoluteSaveState);
+        aState.PushAbsoluteContainingBlock(cb, primaryFrame, absoluteSaveState);
       }
     }
 
@@ -4359,7 +4367,7 @@ nsCSSFrameConstructor::ConstructScrollableBlock(nsFrameConstructorState& aState,
   ConstructBlock(aState, scrolledContentStyle->StyleDisplay(), content,
                  newFrame, newFrame, scrolledContentStyle,
                  &scrolledFrame, blockItem,
-                 aDisplay->IsPositioned(scrolledFrame),
+                 aDisplay->IsPositioned(newFrame) ? newFrame : nullptr,
                  aItem.mPendingBinding);
 
   NS_ASSERTION(blockItem.FirstChild() == scrolledFrame,
@@ -4402,7 +4410,8 @@ nsCSSFrameConstructor::ConstructNonScrollableBlock(nsFrameConstructorState& aSta
   ConstructBlock(aState, aDisplay, aItem.mContent,
                  aState.GetGeometricParent(aDisplay, aParentFrame),
                  aParentFrame, styleContext, &newFrame,
-                 aFrameItems, aDisplay->IsPositioned(newFrame),
+                 aFrameItems,
+                 aDisplay->IsPositioned(newFrame) ? newFrame : nullptr,
                  aItem.mPendingBinding);
   return newFrame;
 }
@@ -10892,7 +10901,7 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
                                       nsStyleContext*          aStyleContext,
                                       nsIFrame**               aNewFrame,
                                       nsFrameItems&            aFrameItems,
-                                      bool                     aAbsPosContainer,
+                                      nsIFrame*                aPositionedFrameForAbsPosContainer,
                                       PendingBinding*          aPendingBinding)
 {
   // Create column wrapper if necessary
@@ -10937,9 +10946,9 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
   // in nsBlockFrame::CalculateContainingBlockSizeForAbsolutes.
   nsFrameConstructorSaveState absoluteSaveState;
   (*aNewFrame)->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
-  if (aAbsPosContainer) {
+  if (aPositionedFrameForAbsPosContainer) {
     //    NS_ASSERTION(aRelPos, "should have made area frame for this");
-    aState.PushAbsoluteContainingBlock(*aNewFrame, absoluteSaveState);
+    aState.PushAbsoluteContainingBlock(*aNewFrame, aPositionedFrameForAbsPosContainer, absoluteSaveState);
   }
 
   // Process the child content
@@ -11038,7 +11047,7 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
   if (positioned) {
     // Relatively positioned frames becomes a container for child
     // frames that are positioned
-    aState.PushAbsoluteContainingBlock(newFrame, absoluteSaveState);
+    aState.PushAbsoluteContainingBlock(newFrame, newFrame, absoluteSaveState);
   }
 
   // Process the child content
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 7a8db6e22858..68594ee848b6 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -1582,6 +1582,9 @@ private:
   // block
   // @param aContentParent is the parent the block would have if it
   // were in-flow
+  // @param aPositionedFrameForAbsPosContainer if non-null, then the new
+  // block should be an abs-pos container and aPositionedFrameForAbsPosContainer
+  // is the frame whose style is making this block an abs-pos container.
   // @param aPendingBinding the pending binding  from this block's frame
   // construction item.
   void ConstructBlock(nsFrameConstructorState& aState,
@@ -1592,7 +1595,7 @@ private:
                       nsStyleContext*          aStyleContext,
                       nsIFrame**               aNewFrame,
                       nsFrameItems&            aFrameItems,
-                      bool                     aAbsPosContainer,
+                      nsIFrame*                aPositionedFrameForAbsPosContainer,
                       PendingBinding*          aPendingBinding);
 
   nsIFrame* ConstructInline(nsFrameConstructorState& aState,
diff --git a/layout/reftests/bugs/849996-1-ref.html b/layout/reftests/bugs/849996-1-ref.html
new file mode 100644
index 000000000000..7b149f1ac807
--- /dev/null
+++ b/layout/reftests/bugs/849996-1-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#parent {
+  width: 200px;
+  height: 200px;
+  margin-left: 10px;
+  background: green;
+}
+#child {
+  width: 90px;
+  height: 90px;
+  background: red;
+}
+</style>
+</head>
+<body>
+<div id="parent">
+  <div id="child"></div>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/bugs/849996-1.html b/layout/reftests/bugs/849996-1.html
new file mode 100644
index 000000000000..b6cef62c2dd2
--- /dev/null
+++ b/layout/reftests/bugs/849996-1.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#parent {
+  width: 200px;
+  height: 200px;
+  overflow: hidden;
+  transform: translateX(10px);
+  background: green;
+}
+#child {
+  position: fixed;
+  top: -10px;
+  left: -10px;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+</style>
+</head>
+<body>
+<div id="parent">
+  <div id="child"></div>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 92192d7f219a..64b30cf6d44a 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1753,5 +1753,6 @@ skip-if(B2G) == 818276-1.html 818276-1-ref.html
 == 847850-1.html 847850-1-ref.html
 == 848421-1.html 848421-1-ref.html
 test-pref(layout.css.flexbox.enabled,true) == 849407-1.html 849407-1-ref.html
+== 849996-1.html 849996-1-ref.html
 == 858803-1.html 858803-1-ref.html
 != 860370.html 860370-notref.html

From 33f03795217185e4a2708dc7489803cb8ab991ca Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 9 Apr 2013 12:05:12 +1200
Subject: [PATCH 147/438] Bug 841363. Ensure padding-rect edges are included in
 scrollable area used to compute scrollWidth/scrollHeight for overflow:visible
 elements. r=matspal

---
 content/base/src/Element.cpp            |  9 ++--
 layout/generic/test/Makefile.in         |  1 +
 layout/generic/test/test_bug841361.html | 56 +++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 layout/generic/test/test_bug841361.html

diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp
index eb77095fc392..68480ceb10ab 100644
--- a/content/base/src/Element.cpp
+++ b/content/base/src/Element.cpp
@@ -589,11 +589,14 @@ static nsSize GetScrollRectSizeForOverflowVisibleFrame(nsIFrame* aFrame)
     return nsSize(0,0);
   }
 
-  nsRect paddingRect = aFrame->GetPaddingRectRelativeToSelf();
-  nsOverflowAreas overflowAreas(paddingRect, paddingRect);
+  nsOverflowAreas overflowAreas;
   nsLayoutUtils::UnionChildOverflow(aFrame, overflowAreas);
+  // Make sure that an empty padding-rect's edges are included
+  nsRect paddingRect = aFrame->GetPaddingRectRelativeToSelf();
+  nsRect overflowRect =
+    overflowAreas.ScrollableOverflow().UnionEdges(paddingRect);
   return nsLayoutUtils::GetScrolledRect(aFrame,
-      overflowAreas.ScrollableOverflow(), paddingRect.Size(),
+      overflowRect, paddingRect.Size(),
       aFrame->StyleVisibility()->mDirection).Size();
 }
 
diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in
index 7f1a70ba81d0..e9659287b3aa 100644
--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -105,6 +105,7 @@ MOCHITEST_FILES = \
   test_bug785324.html \
   test_bug791616.html \
   test_bug831780.html \
+  test_bug841361.html \
   $(NULL)
 
 MOCHITEST_CHROME_FILES = \
diff --git a/layout/generic/test/test_bug841361.html b/layout/generic/test/test_bug841361.html
new file mode 100644
index 000000000000..cc7a23dbf457
--- /dev/null
+++ b/layout/generic/test/test_bug841361.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=841361
+-->
+<head>
+  <title>Test for Bug 841361</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=841361">Mozilla Bug 841361</a>
+<p id="display">
+
+<div style="width:500px; height:0;" id="a"></div>
+
+<div style="width:0; height:500px;" id="b"></div>
+
+<div style="width:500px;" id="c">
+  <div style="width:50px; height:50px; float:left; background:yellow"></div>
+  <div style="width:200px; height:50px; float:left; background:green"></div>
+</div>
+
+<div style="width:500px; height:0; overflow:hidden" id="d"></div>
+
+<div style="width:0; height:500px; overflow:hidden" id="e"></div>
+
+<div style="width:500px; overflow:hidden" id="f">
+  <div style="width:50px; height:50px; float:left; background:yellow"></div>
+  <div style="width:200px; height:50px; float:left; background:green"></div>
+</div>
+
+</p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+function doTest(id, w, h) {
+  var e = document.getElementById(id);
+  is(e.scrollWidth, w, "scrollWidth for element '" + id + "'");
+  is(e.scrollHeight, h, "scrollHeight for element '" + id + "'");
+}
+
+doTest("a", 500, 0);
+doTest("b", 0, 500);
+doTest("c", 500, 50);
+doTest("d", 500, 0);
+doTest("e", 0, 500);
+doTest("f", 500, 50);
+
+</script>
+</pre>
+</body>
+</html>

From a3114aa95b16bcecc2b9d24d12f3176e1b18ad08 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 16 Apr 2013 18:14:56 +1200
Subject: [PATCH 148/438] Bug 860579. Make FindContentInDocument use the frame
 tree as much as possible. r=mattwoodrow

---
 layout/base/crashtests/860579-1.html   | 21 ++++++++++++++++++++
 layout/base/crashtests/crashtests.list |  1 +
 layout/base/nsDisplayList.cpp          | 27 +++++++-------------------
 3 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 layout/base/crashtests/860579-1.html

diff --git a/layout/base/crashtests/860579-1.html b/layout/base/crashtests/860579-1.html
new file mode 100644
index 000000000000..3f7ef558b2e2
--- /dev/null
+++ b/layout/base/crashtests/860579-1.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+function addFrame(contents)
+{
+  var frame = document.createElement("iframe");
+  frame.src = "data:text/html," + contents;
+  document.body.appendChild(frame);
+}
+function boom()
+{
+  addFrame("1");
+  document.documentElement.offsetHeight;
+  addFrame("2");
+  document.body.style.display = "table-caption";
+}
+</script>
+</head>
+<body onload="boom();"></body>
+</html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index b3deafebf51e..392fac8a084b 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -391,5 +391,6 @@ load 770381-1.html
 load 795646.html
 load 813372-1.html
 load 836990-1.html
+load 860579-1.html
 pref(layers.force-active,true) load 859526-1.html
 pref(layers.force-active,true) load 859630-1.html
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index a01878d57b0e..a87409917665 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1396,28 +1396,15 @@ static void Sort(nsDisplayList* aList, int32_t aCount, nsDisplayList::SortLEQ aC
 }
 
 static nsIContent* FindContentInDocument(nsDisplayItem* aItem, nsIDocument* aDoc) {
-  nsIFrame* frame = aItem->GetUnderlyingFrame();
-  nsIContent* c = frame->GetContent();
-  for (;;) {
-    nsIDocument* d;
-    if (c) {
-      d = c->OwnerDoc();
-    } else {
-      d = frame->PresContext()->Document();
-    }
-    if (d == aDoc) {
-      return c;
-    }
-    nsIDocument* parentDoc = d->GetParentDocument();
-    if (!parentDoc) {
-      return nullptr;
-    }
-    c = parentDoc->FindContentForSubDocument(d);
-    if (!c) {
-      NS_ERROR("No content for subdocument?");
-      return nullptr;
+  nsIFrame* f = aItem->GetUnderlyingFrame();
+  while (f) {
+    nsPresContext* pc = f->PresContext();
+    if (pc->Document() == aDoc) {
+      return f->GetContent();
     }
+    f = nsLayoutUtils::GetCrossDocParentFrame(pc->PresShell()->GetRootFrame());
   }
+  return nullptr;
 }
 
 static bool IsContentLEQ(nsDisplayItem* aItem1, nsDisplayItem* aItem2,

From badcb00fcbdbecf4ed7114325fed8ca9aa1b1e58 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 15 Apr 2013 19:10:19 +1200
Subject: [PATCH 149/438] Bug 860253. Clear clip state on children of an
 nsDisplayTransform because they're in a different coordinate system, and
 we'll clip the nsDisplayTransform itself. r=mattwoodrow

---
 layout/generic/nsSimplePageSequence.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index 0e73b688bf05..6ff5f6808e67 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -807,11 +807,19 @@ nsSimplePageSequenceFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
   nsDisplayList content;
-  nsIFrame* child = GetFirstPrincipalChild();
-  while (child) {
-    child->BuildDisplayListForStackingContext(aBuilder,
-        child->GetVisualOverflowRectRelativeToSelf(), &content);
-    child = child->GetNextSibling();
+
+  {
+    // Clear clip state while we construct the children of the
+    // nsDisplayTransform, since they'll be in a different coordinate system.
+    DisplayListClipState::AutoSaveRestore clipState(aBuilder);
+    clipState.Clear();
+
+    nsIFrame* child = GetFirstPrincipalChild();
+    while (child) {
+      child->BuildDisplayListForStackingContext(aBuilder,
+          child->GetVisualOverflowRectRelativeToSelf(), &content);
+      child = child->GetNextSibling();
+    }
   }
 
   content.AppendNewToTop(new (aBuilder)

From cd389da925df3db4983d8a4d9e6514d869b2d636 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 16 Apr 2013 08:20:40 +0200
Subject: [PATCH 150/438] Bug 861973 - Force STLport not to use its own
 allocator. r=ted

---
 build/stlport/stl/config/_android.h.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/stlport/stl/config/_android.h.in b/build/stlport/stl/config/_android.h.in
index bfe6b32ee39f..17ca9896f478 100644
--- a/build/stlport/stl/config/_android.h.in
+++ b/build/stlport/stl/config/_android.h.in
@@ -24,4 +24,8 @@
 #undef _STLP_NATIVE_CPP_RUNTIME_HEADER
 #define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../../system/include/header>
 
+// Use operator new instead of stlport own node allocator
+#undef _STLP_USE_NEWALLOC
+#define _STLP_USE_NEWALLOC 1
+
 #endif /* mozilla_stl_config__android_h */

From 803e59e01a3e0d6ed8f41375e38556c387bd063c Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sun, 17 Mar 2013 08:03:05 +0100
Subject: [PATCH 151/438] Bug 850332 - Use jemalloc inside mozglue.
 r=kats,r=mwu

---
 build/autoconf/android.m4        |   2 +-
 js/src/build/autoconf/android.m4 |   2 +-
 mozglue/android/nsGeckoUtils.cpp |   6 --
 mozglue/build/BionicGlue.cpp     | 151 +++++++++++++++++++++++--------
 mozglue/build/Makefile.in        |   2 +-
 5 files changed, 117 insertions(+), 46 deletions(-)

diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
index 2144d6e9f980..a3ceccd906d0 100644
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -254,7 +254,7 @@ if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
             fi
             STLPORT_SOURCES="$android_ndk/sources/cxx-stl/stlport"
             STLPORT_CPPFLAGS="-I$_objdir/build/stlport -I$android_ndk/sources/cxx-stl/stlport/stlport"
-            STLPORT_LIBS="-lstlport_static"
+            STLPORT_LIBS="-lstlport_static -static-libstdc++"
         elif test "$target" != "arm-android-eabi"; then
             dnl fail if we're not building with NDKr4
             AC_MSG_ERROR([Couldn't find path to stlport in the android ndk])
diff --git a/js/src/build/autoconf/android.m4 b/js/src/build/autoconf/android.m4
index 2144d6e9f980..a3ceccd906d0 100644
--- a/js/src/build/autoconf/android.m4
+++ b/js/src/build/autoconf/android.m4
@@ -254,7 +254,7 @@ if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
             fi
             STLPORT_SOURCES="$android_ndk/sources/cxx-stl/stlport"
             STLPORT_CPPFLAGS="-I$_objdir/build/stlport -I$android_ndk/sources/cxx-stl/stlport/stlport"
-            STLPORT_LIBS="-lstlport_static"
+            STLPORT_LIBS="-lstlport_static -static-libstdc++"
         elif test "$target" != "arm-android-eabi"; then
             dnl fail if we're not building with NDKr4
             AC_MSG_ERROR([Couldn't find path to stlport in the android ndk])
diff --git a/mozglue/android/nsGeckoUtils.cpp b/mozglue/android/nsGeckoUtils.cpp
index fa21db6933f3..0a5e327a76e7 100644
--- a/mozglue/android/nsGeckoUtils.cpp
+++ b/mozglue/android/nsGeckoUtils.cpp
@@ -5,12 +5,6 @@
 
 #include <jni.h>
 
-#ifdef MOZ_MEMORY
-// Wrap malloc and free to use jemalloc
-#define malloc __wrap_malloc
-#define free __wrap_free
-#endif
-
 #include <stdlib.h>
 #include <fcntl.h>
 #include "APKOpen.h"
diff --git a/mozglue/build/BionicGlue.cpp b/mozglue/build/BionicGlue.cpp
index a9f6c5d07c72..46ca2c3d6b66 100644
--- a/mozglue/build/BionicGlue.cpp
+++ b/mozglue/build/BionicGlue.cpp
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <android/log.h>
+#include <mozilla/Util.h>
 
 #include <vector>
 
@@ -20,7 +21,44 @@ struct AtForkFuncs {
   void (*parent)(void);
   void (*child)(void);
 };
-static std::vector<AtForkFuncs> atfork;
+
+/* jemalloc's initialization calls pthread_atfork. When pthread_atfork (see
+ * further below) stores the corresponding data, it's going to allocate memory,
+ * which will loop back to jemalloc's initialization, leading to a dead-lock.
+ * So, for that specific vector, we use a special allocator that returns a
+ * static buffer for small sizes, and force the initial vector capacity to
+ * a size enough to store one atfork function table. */
+template <typename T>
+struct SpecialAllocator: public std::allocator<T>
+{
+  SpecialAllocator(): bufUsed(false) {}
+
+  inline typename std::allocator<T>::pointer allocate(typename std::allocator<T>::size_type n, const void * = 0) {
+    if (!bufUsed && n == 1) {
+      bufUsed = true;
+      return buf.addr();
+    }
+    return reinterpret_cast<T *>(::operator new(sizeof(T) * n));
+  }
+
+  inline void deallocate(typename std::allocator<T>::pointer p, typename std::allocator<T>::size_type n) {
+    if (p == buf.addr())
+      bufUsed = false;
+    else
+      ::operator delete(p);
+  }
+
+  template<typename U>
+  struct rebind {
+    typedef SpecialAllocator<U> other;
+  };
+
+private:
+  mozilla::AlignedStorage2<T> buf;
+  bool bufUsed;
+};
+
+static std::vector<AtForkFuncs, SpecialAllocator<AtForkFuncs> > atfork;
 
 #ifdef MOZ_WIDGET_GONK
 #include "cpuacct.h"
@@ -46,6 +84,8 @@ WRAP(pthread_atfork)(void (*prepare)(void), void (*parent)(void), void (*child)(
   funcs.prepare = prepare;
   funcs.parent = parent;
   funcs.child = child;
+  if (!atfork.capacity())
+    atfork.reserve(1);
   atfork.push_back(funcs);
   return 0;
 }
@@ -133,40 +173,77 @@ PR_GetEnvLock(void)
 
 #ifndef MOZ_WIDGET_GONK
 #include <string.h>
-extern "C" NS_EXPORT void* __wrap_memccpy(void * a0, const void * a1, int a2, size_t a3) { return memccpy(a0, a1, a2, a3); }
-extern "C" NS_EXPORT void* __wrap_memchr(const void * a0, int a1, size_t a2) { return memchr(a0, a1, a2); }
-extern "C" NS_EXPORT void* __wrap_memrchr(const void * a0, int a1, size_t a2) { return memrchr(a0, a1, a2); }
-extern "C" NS_EXPORT int __wrap_memcmp(const void * a0, const void * a1, size_t a2) { return memcmp(a0, a1, a2); }
-extern "C" NS_EXPORT void* __wrap_memcpy(void * a0, const void * a1, size_t a2) { return memcpy(a0, a1, a2); }
-extern "C" NS_EXPORT void* __wrap_memmove(void * a0, const void * a1, size_t a2) { return memmove(a0, a1, a2); }
-extern "C" NS_EXPORT void* __wrap_memset(void * a0, int a1, size_t a2) { return memset(a0, a1, a2); }
-extern "C" NS_EXPORT void* __wrap_memmem(const void * a0, size_t a1, const void * a2, size_t a3) { return memmem(a0, a1, a2, a3); }
-extern "C" NS_EXPORT void __wrap_memswap(void * a0, void * a1, size_t a2) { memswap(a0, a1, a2); }
-extern "C" NS_EXPORT char* __wrap_index(const char * a0, int a1) { return index(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strchr(const char * a0, int a1) { return strchr(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strrchr(const char * a0, int a1) { return strrchr(a0, a1); }
-extern "C" NS_EXPORT size_t __wrap_strlen(const char * a0) { return strlen(a0); }
-extern "C" NS_EXPORT int __wrap_strcmp(const char * a0, const char * a1) { return strcmp(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strcpy(char * a0, const char * a1) { return strcpy(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strcat(char * a0, const char * a1) { return strcat(a0, a1); }
-extern "C" NS_EXPORT int __wrap_strcasecmp(const char * a0, const char * a1) { return strcasecmp(a0, a1); }
-extern "C" NS_EXPORT int __wrap_strncasecmp(const char * a0, const char * a1, size_t a2) { return strncasecmp(a0, a1, a2); }
-extern "C" NS_EXPORT char* __wrap_strstr(const char * a0, const char * a1) { return strstr(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strcasestr(const char * a0, const char * a1) { return strcasestr(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strtok(char * a0, const char * a1) { return strtok(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strtok_r(char * a0, const char * a1, char** a2) { return strtok_r(a0, a1, a2); }
-extern "C" NS_EXPORT char* __wrap_strerror(int a0) { return strerror(a0); }
-extern "C" NS_EXPORT int __wrap_strerror_r(int a0, char * a1, size_t a2) { return strerror_r(a0, a1, a2); }
-extern "C" NS_EXPORT size_t __wrap_strnlen(const char * a0, size_t a1) { return strnlen(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strncat(char * a0, const char * a1, size_t a2) { return strncat(a0, a1, a2); }
-extern "C" NS_EXPORT int __wrap_strncmp(const char * a0, const char * a1, size_t a2) { return strncmp(a0, a1, a2); }
-extern "C" NS_EXPORT char* __wrap_strncpy(char * a0, const char * a1, size_t a2) { return strncpy(a0, a1, a2); }
-extern "C" NS_EXPORT size_t __wrap_strlcat(char * a0, const char * a1, size_t a2) { return strlcat(a0, a1, a2); }
-extern "C" NS_EXPORT size_t __wrap_strlcpy(char * a0, const char * a1, size_t a2) { return strlcpy(a0, a1, a2); }
-extern "C" NS_EXPORT size_t __wrap_strcspn(const char * a0, const char * a1) { return strcspn(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strpbrk(const char * a0, const char * a1) { return strpbrk(a0, a1); }
-extern "C" NS_EXPORT char* __wrap_strsep(char ** a0, const char * a1) { return strsep(a0, a1); }
-extern "C" NS_EXPORT size_t __wrap_strspn(const char * a0, const char * a1) { return strspn(a0, a1); }
-extern "C" NS_EXPORT int __wrap_strcoll(const char * a0, const char * a1) { return strcoll(a0, a1); }
-extern "C" NS_EXPORT size_t __wrap_strxfrm(char * a0, const char * a1, size_t a2) { return strxfrm(a0, a1, a2); }
+extern "C" NS_EXPORT void* __real_memccpy(void * a0, const void * a1, int a2, size_t a3);
+extern "C" NS_EXPORT void* __real_memchr(const void * a0, int a1, size_t a2);
+extern "C" NS_EXPORT void* __real_memrchr(const void * a0, int a1, size_t a2);
+extern "C" NS_EXPORT int __real_memcmp(const void * a0, const void * a1, size_t a2);
+extern "C" NS_EXPORT void* __real_memcpy(void * a0, const void * a1, size_t a2);
+extern "C" NS_EXPORT void* __real_memmove(void * a0, const void * a1, size_t a2);
+extern "C" NS_EXPORT void* __real_memset(void * a0, int a1, size_t a2);
+extern "C" NS_EXPORT void* __real_memmem(const void * a0, size_t a1, const void * a2, size_t a3);
+extern "C" NS_EXPORT void __real_memswap(void * a0, void * a1, size_t a2);
+extern "C" NS_EXPORT char* __real_index(const char * a0, int a1);
+extern "C" NS_EXPORT char* __real_strchr(const char * a0, int a1);
+extern "C" NS_EXPORT char* __real_strrchr(const char * a0, int a1);
+extern "C" NS_EXPORT size_t __real_strlen(const char * a0);
+extern "C" NS_EXPORT int __real_strcmp(const char * a0, const char * a1);
+extern "C" NS_EXPORT char* __real_strcpy(char * a0, const char * a1);
+extern "C" NS_EXPORT char* __real_strcat(char * a0, const char * a1);
+extern "C" NS_EXPORT int __real_strcasecmp(const char * a0, const char * a1);
+extern "C" NS_EXPORT int __real_strncasecmp(const char * a0, const char * a1, size_t a2);
+extern "C" NS_EXPORT char* __real_strstr(const char * a0, const char * a1);
+extern "C" NS_EXPORT char* __real_strcasestr(const char * a0, const char * a1);
+extern "C" NS_EXPORT char* __real_strtok(char * a0, const char * a1);
+extern "C" NS_EXPORT char* __real_strtok_r(char * a0, const char * a1, char** a2);
+extern "C" NS_EXPORT char* __real_strerror(int a0);
+extern "C" NS_EXPORT int __real_strerror_r(int a0, char * a1, size_t a2);
+extern "C" NS_EXPORT size_t __real_strnlen(const char * a0, size_t a1);
+extern "C" NS_EXPORT char* __real_strncat(char * a0, const char * a1, size_t a2);
+extern "C" NS_EXPORT int __real_strncmp(const char * a0, const char * a1, size_t a2);
+extern "C" NS_EXPORT char* __real_strncpy(char * a0, const char * a1, size_t a2);
+extern "C" NS_EXPORT size_t __real_strlcat(char * a0, const char * a1, size_t a2);
+extern "C" NS_EXPORT size_t __real_strlcpy(char * a0, const char * a1, size_t a2);
+extern "C" NS_EXPORT size_t __real_strcspn(const char * a0, const char * a1);
+extern "C" NS_EXPORT char* __real_strpbrk(const char * a0, const char * a1);
+extern "C" NS_EXPORT char* __real_strsep(char ** a0, const char * a1);
+extern "C" NS_EXPORT size_t __real_strspn(const char * a0, const char * a1);
+extern "C" NS_EXPORT int __real_strcoll(const char * a0, const char * a1);
+extern "C" NS_EXPORT size_t __real_strxfrm(char * a0, const char * a1, size_t a2);
+
+extern "C" NS_EXPORT void* __wrap_memccpy(void * a0, const void * a1, int a2, size_t a3) { return __real_memccpy(a0, a1, a2, a3); }
+extern "C" NS_EXPORT void* __wrap_memchr(const void * a0, int a1, size_t a2) { return __real_memchr(a0, a1, a2); }
+extern "C" NS_EXPORT void* __wrap_memrchr(const void * a0, int a1, size_t a2) { return __real_memrchr(a0, a1, a2); }
+extern "C" NS_EXPORT int __wrap_memcmp(const void * a0, const void * a1, size_t a2) { return __real_memcmp(a0, a1, a2); }
+extern "C" NS_EXPORT void* __wrap_memcpy(void * a0, const void * a1, size_t a2) { return __real_memcpy(a0, a1, a2); }
+extern "C" NS_EXPORT void* __wrap_memmove(void * a0, const void * a1, size_t a2) { return __real_memmove(a0, a1, a2); }
+extern "C" NS_EXPORT void* __wrap_memset(void * a0, int a1, size_t a2) { return __real_memset(a0, a1, a2); }
+extern "C" NS_EXPORT void* __wrap_memmem(const void * a0, size_t a1, const void * a2, size_t a3) { return __real_memmem(a0, a1, a2, a3); }
+extern "C" NS_EXPORT void __wrap_memswap(void * a0, void * a1, size_t a2) { __real_memswap(a0, a1, a2); }
+extern "C" NS_EXPORT char* __wrap_index(const char * a0, int a1) { return __real_index(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strchr(const char * a0, int a1) { return __real_strchr(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strrchr(const char * a0, int a1) { return __real_strrchr(a0, a1); }
+extern "C" NS_EXPORT size_t __wrap_strlen(const char * a0) { return __real_strlen(a0); }
+extern "C" NS_EXPORT int __wrap_strcmp(const char * a0, const char * a1) { return __real_strcmp(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strcpy(char * a0, const char * a1) { return __real_strcpy(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strcat(char * a0, const char * a1) { return __real_strcat(a0, a1); }
+extern "C" NS_EXPORT int __wrap_strcasecmp(const char * a0, const char * a1) { return __real_strcasecmp(a0, a1); }
+extern "C" NS_EXPORT int __wrap_strncasecmp(const char * a0, const char * a1, size_t a2) { return __real_strncasecmp(a0, a1, a2); }
+extern "C" NS_EXPORT char* __wrap_strstr(const char * a0, const char * a1) { return __real_strstr(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strcasestr(const char * a0, const char * a1) { return __real_strcasestr(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strtok(char * a0, const char * a1) { return __real_strtok(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strtok_r(char * a0, const char * a1, char** a2) { return __real_strtok_r(a0, a1, a2); }
+extern "C" NS_EXPORT char* __wrap_strerror(int a0) { return __real_strerror(a0); }
+extern "C" NS_EXPORT int __wrap_strerror_r(int a0, char * a1, size_t a2) { return __real_strerror_r(a0, a1, a2); }
+extern "C" NS_EXPORT size_t __wrap_strnlen(const char * a0, size_t a1) { return __real_strnlen(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strncat(char * a0, const char * a1, size_t a2) { return __real_strncat(a0, a1, a2); }
+extern "C" NS_EXPORT int __wrap_strncmp(const char * a0, const char * a1, size_t a2) { return __real_strncmp(a0, a1, a2); }
+extern "C" NS_EXPORT char* __wrap_strncpy(char * a0, const char * a1, size_t a2) { return __real_strncpy(a0, a1, a2); }
+extern "C" NS_EXPORT size_t __wrap_strlcat(char * a0, const char * a1, size_t a2) { return __real_strlcat(a0, a1, a2); }
+extern "C" NS_EXPORT size_t __wrap_strlcpy(char * a0, const char * a1, size_t a2) { return __real_strlcpy(a0, a1, a2); }
+extern "C" NS_EXPORT size_t __wrap_strcspn(const char * a0, const char * a1) { return __real_strcspn(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strpbrk(const char * a0, const char * a1) { return __real_strpbrk(a0, a1); }
+extern "C" NS_EXPORT char* __wrap_strsep(char ** a0, const char * a1) { return __real_strsep(a0, a1); }
+extern "C" NS_EXPORT size_t __wrap_strspn(const char * a0, const char * a1) { return __real_strspn(a0, a1); }
+extern "C" NS_EXPORT int __wrap_strcoll(const char * a0, const char * a1) { return __real_strcoll(a0, a1); }
+extern "C" NS_EXPORT size_t __wrap_strxfrm(char * a0, const char * a1, size_t a2) { return __real_strxfrm(a0, a1, a2); }
 #endif
diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in
index ace0153e737b..ddd085dac57b 100644
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -115,7 +115,7 @@ endif
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
 
 ifeq (Android, $(OS_TARGET))
-WRAP_LDFLAGS =
+WRAP_LDFLAGS := $(filter -Wl%,$(WRAP_LDFLAGS))
 endif
 
 include $(topsrcdir)/config/rules.mk

From 2366df304af2b2024937204b24079f33b6a492a1 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Mon, 15 Apr 2013 06:02:16 -0600
Subject: [PATCH 152/438] Bug 845596 - Keep track of free variables during
 syntax parsing, r=jorendorff.

---
 js/src/frontend/FullParseHandler.h   |  62 +++++-
 js/src/frontend/ParseMaps-inl.h      |  25 ++-
 js/src/frontend/ParseMaps.cpp        |  65 ++----
 js/src/frontend/ParseMaps.h          | 143 ++++++++-----
 js/src/frontend/ParseNode.cpp        |   6 +-
 js/src/frontend/ParseNode.h          |  16 +-
 js/src/frontend/Parser.cpp           | 288 ++++++++++++---------------
 js/src/frontend/Parser.h             |  15 +-
 js/src/frontend/SyntaxParseHandler.h |  31 ++-
 9 files changed, 360 insertions(+), 291 deletions(-)

diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index f292c8b306e6..4152bc957c9c 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -48,7 +48,7 @@ class FullParseHandler
         foldConstants(foldConstants)
     {}
 
-    static Definition *null() { return NULL; }
+    static ParseNode *null() { return NULL; }
 
     ParseNode *freeTree(ParseNode *pn) { return allocator.freeTree(pn); }
     void prepareNodeForMutation(ParseNode *pn) { return allocator.prepareNodeForMutation(pn); }
@@ -62,6 +62,16 @@ class FullParseHandler
         pn->setOp(JSOP_NAME);
         return pn;
     }
+    Definition *newPlaceholder(ParseNode *pn, ParseContext<FullParseHandler> *pc) {
+        Definition *dn = (Definition *) NameNode::create(PNK_NAME, pn->pn_atom, this, pc);
+        if (!dn)
+            return NULL;
+
+        dn->setOp(JSOP_NOP);
+        dn->setDefn(true);
+        dn->pn_dflags |= PND_PLACEHOLDER;
+        return dn;
+    }
     ParseNode *newAtom(ParseNodeKind kind, JSAtom *atom, JSOp op = JSOP_NOP) {
         ParseNode *pn = NullaryNode::create(kind, this);
         if (!pn)
@@ -168,6 +178,9 @@ class FullParseHandler
     void setFunctionBox(ParseNode *pn, FunctionBox *funbox) {
         pn->pn_funbox = funbox;
     }
+    void addFunctionArgument(ParseNode *pn, ParseNode *argpn) {
+        pn->pn_body->append(argpn);
+    }
     inline ParseNode *newLexicalScope(ObjectBox *blockbox);
     bool isOperationWithoutParens(ParseNode *pn, ParseNodeKind kind) {
         return pn->isKind(kind) && !pn->isInParens();
@@ -192,6 +205,9 @@ class FullParseHandler
         JS_ASSERT(pn->pn_pos.begin <= pn->pn_pos.end);
     }
 
+    void setPosition(ParseNode *pn, const TokenPos &pos) {
+        pn->pn_pos = pos;
+    }
     TokenPos getPosition(ParseNode *pn) {
         return pn->pn_pos;
     }
@@ -254,6 +270,50 @@ class FullParseHandler
     }
 
     inline ParseNode *makeAssignment(ParseNode *pn, ParseNode *rhs);
+
+    static Definition *getDefinitionNode(Definition *dn) {
+        return dn;
+    }
+    static Definition::Kind getDefinitionKind(Definition *dn) {
+        return dn->kind();
+    }
+    void linkUseToDef(ParseNode *pn, Definition *dn)
+    {
+        JS_ASSERT(!pn->isUsed());
+        JS_ASSERT(!pn->isDefn());
+        JS_ASSERT(pn != dn->dn_uses);
+        JS_ASSERT(dn->isDefn());
+        pn->pn_link = dn->dn_uses;
+        dn->dn_uses = pn;
+        dn->pn_dflags |= pn->pn_dflags & PND_USE2DEF_FLAGS;
+        pn->setUsed(true);
+        pn->pn_lexdef = dn;
+    }
+    Definition *resolve(Definition *dn) {
+        return dn->resolve();
+    }
+    void deoptimizeUsesWithin(Definition *dn, const TokenPos &pos)
+    {
+        for (ParseNode *pnu = dn->dn_uses; pnu; pnu = pnu->pn_link) {
+            JS_ASSERT(pnu->isUsed());
+            JS_ASSERT(!pnu->isDefn());
+            if (pnu->pn_pos.begin >= pos.begin && pnu->pn_pos.end <= pos.end)
+                pnu->pn_dflags |= PND_DEOPTIMIZED;
+        }
+    }
+    bool dependencyCovered(ParseNode *pn, unsigned blockid, bool functionScope) {
+        return pn->pn_blockid >= blockid;
+    }
+
+    static uintptr_t definitionToBits(Definition *dn) {
+        return uintptr_t(dn);
+    }
+    static Definition *definitionFromBits(uintptr_t bits) {
+        return (Definition *) bits;
+    }
+    static Definition *nullDefinition() {
+        return NULL;
+    }
 };
 
 inline bool
diff --git a/js/src/frontend/ParseMaps-inl.h b/js/src/frontend/ParseMaps-inl.h
index 6d62fc344a84..55fca1a6eb66 100644
--- a/js/src/frontend/ParseMaps-inl.h
+++ b/js/src/frontend/ParseMaps-inl.h
@@ -48,18 +48,20 @@ ParseMapPool::allocate()
     return map;
 }
 
-inline Definition *
-AtomDecls::lookupFirst(JSAtom *atom) const
+template <typename ParseHandler>
+inline typename ParseHandler::DefinitionNode
+AtomDecls<ParseHandler>::lookupFirst(JSAtom *atom) const
 {
     JS_ASSERT(map);
     AtomDefnListPtr p = map->lookup(atom);
     if (!p)
-        return NULL;
-    return p.value().front();
+        return ParseHandler::nullDefinition();
+    return p.value().front<ParseHandler>();
 }
 
+template <typename ParseHandler>
 inline DefinitionList::Range
-AtomDecls::lookupMulti(JSAtom *atom) const
+AtomDecls<ParseHandler>::lookupMulti(JSAtom *atom) const
 {
     JS_ASSERT(map);
     if (AtomDefnListPtr p = map->lookup(atom))
@@ -67,15 +69,16 @@ AtomDecls::lookupMulti(JSAtom *atom) const
     return DefinitionList::Range();
 }
 
+template <typename ParseHandler>
 inline bool
-AtomDecls::addUnique(JSAtom *atom, Definition *defn)
+AtomDecls<ParseHandler>::addUnique(JSAtom *atom, DefinitionNode defn)
 {
     JS_ASSERT(map);
     AtomDefnListAddPtr p = map->lookupForAdd(atom);
     if (!p)
-        return map->add(p, atom, DefinitionList(defn));
+        return map->add(p, atom, DefinitionList(ParseHandler::definitionToBits(defn)));
     JS_ASSERT(!p.value().isMultiple());
-    p.value() = DefinitionList(defn);
+    p.value() = DefinitionList(ParseHandler::definitionToBits(defn));
     return true;
 }
 
@@ -99,15 +102,17 @@ AtomThingMapPtr<Map>::releaseMap(JSContext *cx)
     map_ = NULL;
 }
 
+template <typename ParseHandler>
 inline bool
-AtomDecls::init()
+AtomDecls<ParseHandler>::init()
 {
     map = cx->parseMapPool().acquire<AtomDefnListMap>();
     return map;
 }
 
+template <typename ParseHandler>
 inline
-AtomDecls::~AtomDecls()
+AtomDecls<ParseHandler>::~AtomDecls()
 {
     if (map)
         cx->parseMapPool().release(map);
diff --git a/js/src/frontend/ParseMaps.cpp b/js/src/frontend/ParseMaps.cpp
index ba117d230661..3426d861d903 100644
--- a/js/src/frontend/ParseMaps.cpp
+++ b/js/src/frontend/ParseMaps.cpp
@@ -5,10 +5,12 @@
  * 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 "ParseMaps-inl.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
+#include "FullParseHandler.h"
+#include "SyntaxParseHandler.h"
 
+#include "ParseMaps-inl.h"
 #include "vm/String-inl.h"
 
 using namespace js;
@@ -58,7 +60,7 @@ ParseMapPool::allocateFresh()
 }
 
 DefinitionList::Node *
-DefinitionList::allocNode(JSContext *cx, Definition *head, Node *tail)
+DefinitionList::allocNode(JSContext *cx, uintptr_t head, Node *tail)
 {
     Node *result = cx->tempLifoAlloc().new_<Node>(head, tail);
     if (!result)
@@ -66,58 +68,17 @@ DefinitionList::allocNode(JSContext *cx, Definition *head, Node *tail)
     return result;
 }
 
-bool
-DefinitionList::pushFront(JSContext *cx, Definition *val)
-{
-    Node *tail;
-    if (isMultiple()) {
-        tail = firstNode();
-    } else {
-        tail = allocNode(cx, defn(), NULL);
-        if (!tail)
-            return false;
-    }
-
-    Node *node = allocNode(cx, val, tail);
-    if (!node)
-        return false;
-    *this = DefinitionList(node);
-    return true;
-}
-
-bool
-DefinitionList::pushBack(JSContext *cx, Definition *val)
-{
-    Node *last;
-    if (isMultiple()) {
-        last = firstNode();
-        while (last->next)
-            last = last->next;
-    } else {
-        last = allocNode(cx, defn(), NULL);
-        if (!last)
-            return false;
-    }
-
-    Node *node = allocNode(cx, val, NULL);
-    if (!node)
-        return false;
-    last->next = node;
-    if (!isMultiple())
-        *this = DefinitionList(last);
-    return true;
-}
-
 #ifdef DEBUG
+template <typename ParseHandler>
 void
-AtomDecls::dump()
+AtomDecls<ParseHandler>::dump()
 {
     for (AtomDefnListRange r = map->all(); !r.empty(); r.popFront()) {
         fprintf(stderr, "atom: ");
         js_DumpAtom(r.front().key());
         const DefinitionList &dlist = r.front().value();
         for (DefinitionList::Range dr = dlist.all(); !dr.empty(); dr.popFront()) {
-            fprintf(stderr, "    defn: %p\n", (void *) dr.front());
+            fprintf(stderr, "    defn: %p\n", (void *) dr.front<ParseHandler>());
         }
     }
 }
@@ -133,19 +94,20 @@ DumpAtomDefnMap(const AtomDefnMapPtr &map)
     for (AtomDefnRange r = map->all(); !r.empty(); r.popFront()) {
         fprintf(stderr, "atom: ");
         js_DumpAtom(r.front().key());
-        fprintf(stderr, "defn: %p\n", (void *) r.front().value());
+        fprintf(stderr, "defn: %p\n", (void *) r.front().value().get<FullParseHandler>());
     }
 }
 #endif
 
+template <typename ParseHandler>
 bool
-AtomDecls::addShadow(JSAtom *atom, Definition *defn)
+AtomDecls<ParseHandler>::addShadow(JSAtom *atom, typename ParseHandler::DefinitionNode defn)
 {
     AtomDefnListAddPtr p = map->lookupForAdd(atom);
     if (!p)
-        return map->add(p, atom, DefinitionList(defn));
+        return map->add(p, atom, DefinitionList(ParseHandler::definitionToBits(defn)));
 
-    return p.value().pushFront(cx, defn);
+    return p.value().pushFront<ParseHandler>(cx, defn);
 }
 
 void
@@ -171,3 +133,6 @@ frontend::InitAtomMap(JSContext *cx, frontend::AtomIndexMap *indices, HeapPtrAto
         }
     }
 }
+
+template class AtomDecls<FullParseHandler>;
+template class AtomDecls<SyntaxParseHandler>;
diff --git a/js/src/frontend/ParseMaps.h b/js/src/frontend/ParseMaps.h
index 89451c1d3ccd..a8026167be12 100644
--- a/js/src/frontend/ParseMaps.h
+++ b/js/src/frontend/ParseMaps.h
@@ -18,11 +18,11 @@
 namespace js {
 namespace frontend {
 
-struct Definition;
+class DefinitionSingle;
 class DefinitionList;
 
 typedef InlineMap<JSAtom *, jsatomid, 24> AtomIndexMap;
-typedef InlineMap<JSAtom *, Definition *, 24> AtomDefnMap;
+typedef InlineMap<JSAtom *, DefinitionSingle, 24> AtomDefnMap;
 typedef InlineMap<JSAtom *, DefinitionList, 24> AtomDefnListMap;
 
 /*
@@ -135,15 +135,6 @@ struct AtomThingMapPtr
     Map &operator*() const { return *map_; }
 };
 
-struct AtomDefnMapPtr : public AtomThingMapPtr<AtomDefnMap>
-{
-    JS_ALWAYS_INLINE
-    Definition *lookupDefn(JSAtom *atom) {
-        AtomDefnMap::Ptr p = map_->lookup(atom);
-        return p ? p.value() : NULL;
-    }
-};
-
 typedef AtomThingMapPtr<AtomIndexMap> AtomIndexMapPtr;
 
 /*
@@ -165,9 +156,49 @@ class OwnedAtomThingMapPtr : public AtomThingMapPtrT
     }
 };
 
-typedef OwnedAtomThingMapPtr<AtomDefnMapPtr> OwnedAtomDefnMapPtr;
 typedef OwnedAtomThingMapPtr<AtomIndexMapPtr> OwnedAtomIndexMapPtr;
 
+/*
+ * DefinitionSingle and DefinitionList represent either a single definition
+ * or a list of them. The representation of definitions varies between
+ * parse handlers, being either a Definition* (FullParseHandler) or a
+ * Definition::Kind (SyntaxParseHandler). Methods on the below classes are
+ * templated to distinguish the kind of value wrapped by the class.
+ */
+
+/* Wrapper for a single definition. */
+class DefinitionSingle
+{
+    uintptr_t bits;
+
+  public:
+
+    template <typename ParseHandler>
+    static DefinitionSingle new_(typename ParseHandler::DefinitionNode defn)
+    {
+        DefinitionSingle res;
+        res.bits = ParseHandler::definitionToBits(defn);
+        return res;
+    }
+
+    template <typename ParseHandler>
+    typename ParseHandler::DefinitionNode get() {
+        return ParseHandler::definitionFromBits(bits);
+    }
+};
+
+struct AtomDefnMapPtr : public AtomThingMapPtr<AtomDefnMap>
+{
+    template <typename ParseHandler>
+    JS_ALWAYS_INLINE
+    typename ParseHandler::DefinitionNode lookupDefn(JSAtom *atom) {
+        AtomDefnMap::Ptr p = map_->lookup(atom);
+        return p ? p.value().get<ParseHandler>() : ParseHandler::nullDefinition();
+    }
+};
+
+typedef OwnedAtomThingMapPtr<AtomDefnMapPtr> OwnedAtomDefnMapPtr;
+
 /*
  * A nonempty list containing one or more pointers to Definitions.
  *
@@ -191,30 +222,24 @@ class DefinitionList
     /* A node in a linked list of Definitions. */
     struct Node
     {
-        Definition *defn;
+        uintptr_t bits;
         Node *next;
 
-        Node(Definition *defn, Node *next) : defn(defn), next(next) {}
+        Node(uintptr_t bits, Node *next) : bits(bits), next(next) {}
     };
 
     union {
-        Definition *defn;
-        Node *head;
         uintptr_t bits;
+        Node *head;
     } u;
 
-    Definition *defn() const {
-        JS_ASSERT(!isMultiple());
-        return u.defn;
-    }
-
     Node *firstNode() const {
         JS_ASSERT(isMultiple());
         return (Node *) (u.bits & ~0x1);
     }
 
     static Node *
-    allocNode(JSContext *cx, Definition *head, Node *tail);
+    allocNode(JSContext *cx, uintptr_t bits, Node *tail);
             
   public:
     class Range
@@ -222,40 +247,41 @@ class DefinitionList
         friend class DefinitionList;
 
         Node *node;
-        Definition *defn;
+        uintptr_t bits;
 
         explicit Range(const DefinitionList &list) {
             if (list.isMultiple()) {
                 node = list.firstNode();
-                defn = node->defn;
+                bits = node->bits;
             } else {
                 node = NULL;
-                defn = list.defn();
+                bits = list.u.bits;
             }
         }
 
       public:
         /* An empty Range. */
-        Range() : node(NULL), defn(NULL) {}
+        Range() : node(NULL), bits(0) {}
 
         void popFront() {
             JS_ASSERT(!empty());
             if (!node) {
-                defn = NULL;
+                bits = 0;
                 return;
             }
             node = node->next;
-            defn = node ? node->defn : NULL;
+            bits = node ? node->bits : 0;
         }
 
-        Definition *front() {
+        template <typename ParseHandler>
+        typename ParseHandler::DefinitionNode front() {
             JS_ASSERT(!empty());
-            return defn;
+            return ParseHandler::definitionFromBits(bits);
         }
 
         bool empty() const {
-            JS_ASSERT_IF(!defn, !node);
-            return !defn;
+            JS_ASSERT_IF(!bits, !node);
+            return !bits;
         }
     };
 
@@ -263,8 +289,8 @@ class DefinitionList
         u.bits = 0;
     }
 
-    explicit DefinitionList(Definition *defn) {
-        u.defn = defn;
+    explicit DefinitionList(uintptr_t bits) {
+        u.bits = bits;
         JS_ASSERT(!isMultiple());
     }
 
@@ -276,8 +302,9 @@ class DefinitionList
 
     bool isMultiple() const { return (u.bits & 0x1) != 0; }
 
-    Definition *front() {
-        return isMultiple() ? firstNode()->defn : defn();
+    template <typename ParseHandler>
+    typename ParseHandler::DefinitionNode front() {
+        return ParseHandler::definitionFromBits(isMultiple() ? firstNode()->bits : u.bits);
     }
 
     /*
@@ -294,7 +321,7 @@ class DefinitionList
         if (next->next)
             *this = DefinitionList(next);
         else
-            *this = DefinitionList(next->defn);
+            *this = DefinitionList(next->bits);
         return true;
     }
 
@@ -303,17 +330,31 @@ class DefinitionList
      *
      * Return true on success. On OOM, report on cx and return false.
      */
-    bool pushFront(JSContext *cx, Definition *val);
+    template <typename ParseHandler>
+    bool pushFront(JSContext *cx, typename ParseHandler::DefinitionNode defn) {
+        Node *tail;
+        if (isMultiple()) {
+            tail = firstNode();
+        } else {
+            tail = allocNode(cx, u.bits, NULL);
+            if (!tail)
+                return false;
+        }
 
-    /* Like pushFront, but add the given val to the end of the list. */
-    bool pushBack(JSContext *cx, Definition *val);
+        Node *node = allocNode(cx, ParseHandler::definitionToBits(defn), tail);
+        if (!node)
+            return false;
+        *this = DefinitionList(node);
+        return true;
+    }
 
     /* Overwrite the first Definition in the list. */
-    void setFront(Definition *val) {
+    template <typename ParseHandler>
+        void setFront(typename ParseHandler::DefinitionNode defn) {
         if (isMultiple())
-            firstNode()->defn = val;
+            firstNode()->bits = ParseHandler::definitionToBits(defn);
         else
-            *this = DefinitionList(val);
+            *this = DefinitionList(ParseHandler::definitionToBits(defn));
     }
 
     Range all() const { return Range(*this); }
@@ -341,8 +382,11 @@ class DefinitionList
  * method addShadow. When we leave the block associated with the let, the method
  * remove is used to unshadow the declaration immediately preceding it.
  */
+template <typename ParseHandler>
 class AtomDecls
 {
+    typedef typename ParseHandler::DefinitionNode DefinitionNode;
+
     /* AtomDeclsIter needs to get at the DefnListMap directly. */
     friend class AtomDeclsIter;
 
@@ -364,21 +408,21 @@ class AtomDecls
     }
 
     /* Return the definition at the head of the chain for |atom|. */
-    inline Definition *lookupFirst(JSAtom *atom) const;
+    inline DefinitionNode lookupFirst(JSAtom *atom) const;
 
     /* Perform a lookup that can iterate over the definitions associated with |atom|. */
     inline DefinitionList::Range lookupMulti(JSAtom *atom) const;
 
     /* Add-or-update a known-unique definition for |atom|. */
-    inline bool addUnique(JSAtom *atom, Definition *defn);
-    bool addShadow(JSAtom *atom, Definition *defn);
+    inline bool addUnique(JSAtom *atom, DefinitionNode defn);
+    bool addShadow(JSAtom *atom, DefinitionNode defn);
 
     /* Updating the definition for an entry that is known to exist is infallible. */
-    void updateFirst(JSAtom *atom, Definition *defn) {
+    void updateFirst(JSAtom *atom, DefinitionNode defn) {
         JS_ASSERT(map);
         AtomDefnListMap::Ptr p = map->lookup(atom);
         JS_ASSERT(p);
-        p.value().setFront(defn);
+        p.value().setFront<ParseHandler>(defn);
     }
 
     /* Remove the node at the head of the chain for |atom|. */
@@ -420,6 +464,9 @@ typedef AtomDefnListMap::Range  AtomDefnListRange;
 
 namespace mozilla {
 
+template <>
+struct IsPod<js::frontend::DefinitionSingle> : TrueType {};
+
 template <>
 struct IsPod<js::frontend::DefinitionList> : TrueType {};
 
diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index efafe29caf6c..f705e604db70 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -363,7 +363,7 @@ const char *
 Definition::kindString(Kind kind)
 {
     static const char *table[] = {
-        js_var_str, js_const_str, js_let_str, js_function_str, "argument", "unknown"
+        "", js_var_str, js_const_str, js_let_str, js_function_str, "argument", "unknown"
     };
 
     JS_ASSERT(unsigned(kind) <= unsigned(ARG));
@@ -461,7 +461,7 @@ Parser<FullParseHandler>::cloneParseTree(ParseNode *opn)
              */
             if (opn->isDefn()) {
                 opn->setDefn(false);
-                LinkUseToDef(opn, (Definition *) pn);
+                handler.linkUseToDef(opn, (Definition *) pn);
             }
         }
         break;
@@ -552,7 +552,7 @@ Parser<FullParseHandler>::cloneLeftHandSide(ParseNode *opn)
             pn->pn_dflags &= ~PND_BOUND;
             pn->setDefn(false);
 
-            LinkUseToDef(pn, (Definition *) opn);
+            handler.linkUseToDef(pn, (Definition *) opn);
         }
     }
     return pn;
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 08a25c9d8bae..f280390e2609 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -12,7 +12,6 @@
 
 #include "jsscript.h"
 
-#include "frontend/ParseMaps.h"
 #include "frontend/TokenStream.h"
 
 namespace js {
@@ -1215,7 +1214,7 @@ struct Definition : public ParseNode
         return pn_cookie.isFree();
     }
 
-    enum Kind { VAR, CONST, LET, ARG, NAMED_LAMBDA, PLACEHOLDER };
+    enum Kind { MISSING = 0, VAR, CONST, LET, ARG, NAMED_LAMBDA, PLACEHOLDER };
 
     bool canHaveInitializer() { return int(kind()) <= int(ARG); }
 
@@ -1298,19 +1297,6 @@ ParseNode::isConstant()
     }
 }
 
-inline void
-LinkUseToDef(ParseNode *pn, Definition *dn)
-{
-    JS_ASSERT(!pn->isUsed());
-    JS_ASSERT(!pn->isDefn());
-    JS_ASSERT(pn != dn->dn_uses);
-    pn->pn_link = dn->dn_uses;
-    dn->dn_uses = pn;
-    dn->pn_dflags |= pn->pn_dflags & PND_USE2DEF_FLAGS;
-    pn->setUsed(true);
-    pn->pn_lexdef = dn;
-}
-
 class ObjectBox {
   public:
     JSObject *object;
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 38d83598256d..88320dad663b 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -125,7 +125,7 @@ ParseContext<FullParseHandler>::define(JSContext *cx, HandlePropertyName name,
         JS_ASSERT(!decls_.lookupFirst(name));
 
     if (!prevDef)
-        prevDef = lexdeps.lookupDefn(name);
+        prevDef = lexdeps.lookupDefn<FullParseHandler>(name);
 
     if (prevDef) {
         ParseNode **pnup = &prevDef->dn_uses;
@@ -196,8 +196,7 @@ ParseContext<FullParseHandler>::define(JSContext *cx, HandlePropertyName name,
             return false;
         break;
 
-      case Definition::PLACEHOLDER:
-      case Definition::NAMED_LAMBDA:
+      default:
         JS_NOT_REACHED("unexpected kind");
         break;
     }
@@ -210,17 +209,20 @@ bool
 ParseContext<SyntaxParseHandler>::define(JSContext *cx, HandlePropertyName name, Node pn,
                                          Definition::Kind kind)
 {
-    return true;
+    JS_ASSERT(!decls_.lookupFirst(name));
+
+    if (lexdeps.lookupDefn<SyntaxParseHandler>(name))
+        lexdeps->remove(name);
+
+    return decls_.addUnique(name, kind);
 }
 
 template <typename ParseHandler>
 void
-ParseContext<ParseHandler>::prepareToAddDuplicateArg(Definition *prevDecl)
+ParseContext<ParseHandler>::prepareToAddDuplicateArg(HandlePropertyName name, DefinitionNode prevDecl)
 {
-    JS_ASSERT(prevDecl->kind() == Definition::ARG);
-    JS_ASSERT(decls_.lookupFirst(prevDecl->name()) == prevDecl);
-    JS_ASSERT(!prevDecl->isClosed());
-    decls_.remove(prevDecl->name());
+    JS_ASSERT(decls_.lookupFirst(name) == prevDecl);
+    decls_.remove(name);
 }
 
 template <typename ParseHandler>
@@ -258,7 +260,7 @@ template <typename ParseHandler>
 void
 ParseContext<ParseHandler>::popLetDecl(JSAtom *atom)
 {
-    JS_ASSERT(decls_.lookupFirst(atom)->isLet());
+    JS_ASSERT(ParseHandler::getDefinitionKind(decls_.lookupFirst(atom)) == Definition::LET);
     decls_.remove(atom);
 }
 
@@ -281,9 +283,7 @@ AppendPackedBindings(const ParseContext<ParseHandler> *pc, const DeclVector &vec
           case Definition::ARG:
             kind = ARGUMENT;
             break;
-          case Definition::LET:
-          case Definition::NAMED_LAMBDA:
-          case Definition::PLACEHOLDER:
+          default:
             JS_NOT_REACHED("unexpected dn->kind");
         }
 
@@ -821,11 +821,6 @@ Parser<ParseHandler>::checkStrictBinding(HandlePropertyName name, Node pn)
     return true;
 }
 
-template <>
-bool
-Parser<FullParseHandler>::defineArg(ParseNode *funcpn, HandlePropertyName name,
-                                    bool disallowDuplicateArgs, Definition **duplicatedArg);
-
 template <>
 ParseNode *
 Parser<FullParseHandler>::standaloneFunctionBody(HandleFunction fun, const AutoNameVector &formals,
@@ -875,27 +870,21 @@ template <>
 bool
 Parser<FullParseHandler>::checkFunctionArguments()
 {
-    /* Time to implement the odd semantics of 'arguments'. */
-    HandlePropertyName arguments = context->names().arguments;
-
     /*
      * Non-top-level functions use JSOP_DEFFUN which is a dynamic scope
      * operation which means it aliases any bindings with the same name.
-     * Due to the implicit declaration mechanism (below), 'arguments' will not
-     * have decls and, even if it did, they will not be noted as closed in the
-     * emitter. Thus, in the corner case of function-statement-overridding-
-     * arguments, flag the whole scope as dynamic.
      */
     if (FuncStmtSet *set = pc->funcStmts) {
         for (FuncStmtSet::Range r = set->all(); !r.empty(); r.popFront()) {
             PropertyName *name = r.front()->asPropertyName();
-            if (name == arguments)
-                pc->sc->setBindingsAccessedDynamically();
-            else if (Definition *dn = pc->decls().lookupFirst(name))
+            if (Definition *dn = pc->decls().lookupFirst(name))
                 dn->pn_dflags |= PND_CLOSED;
         }
     }
 
+    /* Time to implement the odd semantics of 'arguments'. */
+    HandlePropertyName arguments = context->names().arguments;
+
     /*
      * As explained by the ContextFlags::funArgumentsHasLocalBinding comment,
      * create a declaration for 'arguments' if there are any unbound uses in
@@ -903,7 +892,7 @@ Parser<FullParseHandler>::checkFunctionArguments()
      */
     for (AtomDefnRange r = pc->lexdeps->all(); !r.empty(); r.popFront()) {
         if (r.front().key() == arguments) {
-            Definition *dn = r.front().value();
+            Definition *dn = r.front().value().get<FullParseHandler>();
             pc->lexdeps->remove(arguments);
             dn->pn_dflags |= PND_IMPLICITARGUMENTS;
             if (!pc->define(context, arguments, dn, Definition::VAR))
@@ -979,7 +968,7 @@ Parser<FullParseHandler>::checkFunctionArguments()
             for (AtomDefnListMap::Range r = pc->decls().all(); !r.empty(); r.popFront()) {
                 DefinitionList &dlist = r.front().value();
                 for (DefinitionList::Range dr = dlist.all(); !dr.empty(); dr.popFront()) {
-                    Definition *dn = dr.front();
+                    Definition *dn = dr.front<FullParseHandler>();
                     if (dn->kind() == Definition::ARG && dn->isAssigned())
                         funbox->setDefinitelyNeedsArgsObj();
                 }
@@ -1045,23 +1034,6 @@ Parser<ParseHandler>::functionBody(FunctionSyntaxKind kind, FunctionBodyType typ
     return pn;
 }
 
-// Create a placeholder Definition node for |atom|.
-// Nb: unlike most functions that are passed a Parser, this one gets a
-// SharedContext passed in separately, because in this case |pc| may not equal
-// |parser->pc|.
-static Definition *
-MakePlaceholder(ParseNode *pn, FullParseHandler *handler, ParseContext<FullParseHandler> *pc)
-{
-    Definition *dn = (Definition *) NameNode::create(PNK_NAME, pn->pn_atom, handler, pc);
-    if (!dn)
-        return NULL;
-
-    dn->setOp(JSOP_NOP);
-    dn->setDefn(true);
-    dn->pn_dflags |= PND_PLACEHOLDER;
-    return dn;
-}
-
 static void
 ForgetUse(ParseNode *pn)
 {
@@ -1253,23 +1225,6 @@ MatchOrInsertSemicolon(JSContext *cx, TokenStream *ts)
     return true;
 }
 
-static bool
-DeoptimizeUsesWithin(Definition *dn, const TokenPos &pos)
-{
-    unsigned ndeoptimized = 0;
-
-    for (ParseNode *pnu = dn->dn_uses; pnu; pnu = pnu->pn_link) {
-        JS_ASSERT(pnu->isUsed());
-        JS_ASSERT(!pnu->isDefn());
-        if (pnu->pn_pos.begin >= pos.begin && pnu->pn_pos.end <= pos.end) {
-            pnu->pn_dflags |= PND_DEOPTIMIZED;
-            ++ndeoptimized;
-        }
-    }
-
-    return ndeoptimized != 0;
-}
-
 /*
  * Beware: this function is called for functions nested in other functions or
  * global scripts but not for functions compiled through the Function
@@ -1294,7 +1249,7 @@ Parser<FullParseHandler>::leaveFunction(ParseNode *fn, HandlePropertyName funNam
     if (pc->lexdeps->count()) {
         for (AtomDefnRange r = pc->lexdeps->all(); !r.empty(); r.popFront()) {
             JSAtom *atom = r.front().key();
-            Definition *dn = r.front().value();
+            Definition *dn = r.front().value().get<FullParseHandler>();
             JS_ASSERT(dn->isPlaceholder());
 
             if (atom == funName && kind == Expression) {
@@ -1337,12 +1292,12 @@ Parser<FullParseHandler>::leaveFunction(ParseNode *fn, HandlePropertyName funNam
              * having an extensible scope) or any enclosing 'with'.
              */
             if (funbox->hasExtensibleScope() || outerpc->parsingWith)
-                DeoptimizeUsesWithin(dn, fn->pn_pos);
+                handler.deoptimizeUsesWithin(dn, fn->pn_pos);
 
             if (!outer_dn) {
                 AtomDefnAddPtr p = outerpc->lexdeps->lookupForAdd(atom);
                 if (p) {
-                    outer_dn = p.value();
+                    outer_dn = p.value().get<FullParseHandler>();
                 } else {
                     /*
                      * Create a new placeholder for our outer lexdep. We could
@@ -1365,8 +1320,11 @@ Parser<FullParseHandler>::leaveFunction(ParseNode *fn, HandlePropertyName funNam
                      * inherited lexdeps into uses of a new outer definition
                      * allows us to handle both these cases in a natural way.
                      */
-                    outer_dn = MakePlaceholder(dn, &handler, outerpc);
-                    if (!outer_dn || !outerpc->lexdeps->add(p, atom, outer_dn))
+                    outer_dn = handler.newPlaceholder(dn, outerpc);
+                    if (!outer_dn)
+                        return false;
+                    DefinitionSingle def = DefinitionSingle::new_<FullParseHandler>(outer_dn);
+                    if (!outerpc->lexdeps->add(p, atom, def))
                         return false;
                 }
             }
@@ -1438,26 +1396,28 @@ Parser<SyntaxParseHandler>::leaveFunction(Node fn, HandlePropertyName funName,
  * argument with the same name. The caller may use this to report an error when
  * one of the abovementioned features occurs after a duplicate.
  */
-template <>
+template <typename ParseHandler>
 bool
-Parser<FullParseHandler>::defineArg(ParseNode *funcpn, HandlePropertyName name,
-                                    bool disallowDuplicateArgs, Definition **duplicatedArg)
+Parser<ParseHandler>::defineArg(Node funcpn, HandlePropertyName name,
+                                bool disallowDuplicateArgs, Node *duplicatedArg)
 {
     SharedContext *sc = pc->sc;
 
     /* Handle duplicate argument names. */
-    if (Definition *prevDecl = pc->decls().lookupFirst(name)) {
+    if (DefinitionNode prevDecl = pc->decls().lookupFirst(name)) {
+        Node pn = handler.getDefinitionNode(prevDecl);
+
         /*
          * Strict-mode disallows duplicate args. We may not know whether we are
          * in strict mode or not (since the function body hasn't been parsed).
-         * In such cases, reportStrictModeError will queue up the potential
-         * error and return 'true'.
+         * In such cases, report will queue up the potential error and return
+         * 'true'.
          */
         if (sc->needStrictChecks()) {
             JSAutoByteString bytes;
             if (!js_AtomToPrintableString(context, name, &bytes))
                 return false;
-            if (!report(ParseStrictError, pc->sc->strict, prevDecl,
+            if (!report(ParseStrictError, pc->sc->strict, pn,
                         JSMSG_DUPLICATE_FORMAL, bytes.ptr()))
             {
                 return false;
@@ -1465,36 +1425,29 @@ Parser<FullParseHandler>::defineArg(ParseNode *funcpn, HandlePropertyName name,
         }
 
         if (disallowDuplicateArgs) {
-            report(ParseError, false, prevDecl, JSMSG_BAD_DUP_ARGS);
+            report(ParseError, false, pn, JSMSG_BAD_DUP_ARGS);
             return false;
         }
 
         if (duplicatedArg)
-            *duplicatedArg = prevDecl;
+            *duplicatedArg = pn;
 
         /* ParseContext::define assumes and asserts prevDecl is not in decls. */
-        pc->prepareToAddDuplicateArg(prevDecl);
+        JS_ASSERT(handler.getDefinitionKind(prevDecl) == Definition::ARG);
+        pc->prepareToAddDuplicateArg(name, prevDecl);
     }
 
-    ParseNode *argpn = handler.newName(name, pc);
+    Node argpn = handler.newName(name, pc);
     if (!argpn)
         return false;
 
     if (!checkStrictBinding(name, argpn))
         return false;
 
-    funcpn->pn_body->append(argpn);
+    handler.addFunctionArgument(funcpn, argpn);
     return pc->define(context, name, argpn, Definition::ARG);
 }
 
-template <>
-bool
-Parser<SyntaxParseHandler>::defineArg(Node funcpn, HandlePropertyName name,
-                                      bool disallowDuplicateArgs, DefinitionNode *duplicatedArg)
-{
-    return true;
-}
-
 #if JS_HAS_DESTRUCTURING
 template <typename ParseHandler>
 /* static */ bool
@@ -1547,7 +1500,7 @@ Parser<ParseHandler>::functionArguments(FunctionSyntaxKind kind, Node *listp, No
 
     if (parenFreeArrow || !tokenStream.matchToken(TOK_RP)) {
         bool hasDefaults = false;
-        DefinitionNode duplicatedArg = null();
+        Node duplicatedArg = null();
         bool destructuringArg = false;
 #if JS_HAS_DESTRUCTURING
         Node list = null();
@@ -1737,7 +1690,7 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
              * pre-created definition node for this function that primaryExpr
              * put in pc->lexdeps on first forward reference, and recycle pn.
              */
-            if (Definition *fn = pc->lexdeps.lookupDefn(funName)) {
+            if (Definition *fn = pc->lexdeps.lookupDefn<FullParseHandler>(funName)) {
                 JS_ASSERT(fn->isDefn());
                 fn->setKind(PNK_FUNCTION);
                 fn->setArity(PN_CODE);
@@ -1790,6 +1743,15 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
             }
             if (!pc->funcStmts->put(funName))
                 return false;
+
+            /*
+             * Due to the implicit declaration mechanism, 'arguments' will not
+             * have decls and, even if it did, they will not be noted as closed
+             * in the emitter. Thus, in the corner case of function statements
+             * overridding arguments, flag the whole scope as dynamic.
+             */
+            if (funName == context->names().arguments)
+                pc->sc->setBindingsAccessedDynamically();
         }
 
         /* No further binding (in BindNameToSlot) is needed for functions. */
@@ -1807,6 +1769,36 @@ bool
 Parser<SyntaxParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
                                                     Node *pn, FunctionSyntaxKind kind)
 {
+    /* Function statements add a binding to the enclosing scope. */
+    bool bodyLevel = pc->atBodyLevel();
+
+    if (kind == Statement) {
+        /*
+         * Handle redeclaration and optimize cases where we can statically bind the
+         * function (thereby avoiding JSOP_DEFFUN and dynamic name lookup).
+         */
+        if (DefinitionNode dn = pc->decls().lookupFirst(funName)) {
+            if (dn == Definition::CONST) {
+                JSAutoByteString name;
+                if (!js_AtomToPrintableString(context, funName, &name) ||
+                    !report(ParseError, false, null(), JSMSG_REDECLARED_VAR,
+                            Definition::kindString(dn), name.ptr()))
+                {
+                    return false;
+                }
+            }
+        } else if (bodyLevel) {
+            if (pc->lexdeps.lookupDefn<SyntaxParseHandler>(funName))
+                pc->lexdeps->remove(funName);
+
+            if (!pc->define(context, funName, *pn, Definition::VAR))
+                return false;
+        }
+
+        if (!bodyLevel && funName == context->names().arguments)
+            pc->sc->setBindingsAccessedDynamically();
+    }
+
     return true;
 }
 
@@ -2474,17 +2466,17 @@ OuterLet(ParseContext<ParseHandler> *pc, StmtInfoPC *stmt, HandleAtom atom)
     return false;
 }
 
-template <>
+template <typename ParseHandler>
 /* static */ bool
-Parser<FullParseHandler>::bindVarOrConst(JSContext *cx, BindData<FullParseHandler> *data,
-                                         HandlePropertyName name, Parser<FullParseHandler> *parser)
+Parser<ParseHandler>::bindVarOrConst(JSContext *cx, BindData<ParseHandler> *data,
+                                     HandlePropertyName name, Parser<ParseHandler> *parser)
 {
-    ParseContext<FullParseHandler> *pc = parser->pc;
-    ParseNode *pn = data->pn;
+    ParseContext<ParseHandler> *pc = parser->pc;
+    Node pn = data->pn;
     bool isConstDecl = data->op == JSOP_DEFCONST;
 
     /* Default best op for pn is JSOP_NAME; we'll try to improve below. */
-    pn->setOp(JSOP_NAME);
+    parser->handler.setOp(pn, JSOP_NAME);
 
     if (!parser->checkStrictBinding(name, pn))
         return false;
@@ -2492,7 +2484,7 @@ Parser<FullParseHandler>::bindVarOrConst(JSContext *cx, BindData<FullParseHandle
     StmtInfoPC *stmt = LexicalLookup(pc, name, NULL, (StmtInfoPC *)NULL);
 
     if (stmt && stmt->type == STMT_WITH) {
-        pn->pn_dflags |= PND_DEOPTIMIZED;
+        parser->handler.setFlag(pn, PND_DEOPTIMIZED);
         if (pc->sc->isFunctionBox()) {
             FunctionBox *funbox = pc->sc->asFunctionBox();
             funbox->setMightAliasLocals();
@@ -2523,8 +2515,8 @@ Parser<FullParseHandler>::bindVarOrConst(JSContext *cx, BindData<FullParseHandle
      * is not allowed which allows us to turn any non-error redeclaration
      * into a use of the initial declaration.
      */
-    Definition *dn = defs.front();
-    Definition::Kind dn_kind = dn->kind();
+    DefinitionNode dn = defs.front<ParseHandler>();
+    Definition::Kind dn_kind = parser->handler.getDefinitionKind(dn);
     if (dn_kind == Definition::ARG) {
         JSAutoByteString bytes;
         if (!js_AtomToPrintableString(cx, name, &bytes))
@@ -2557,16 +2549,7 @@ Parser<FullParseHandler>::bindVarOrConst(JSContext *cx, BindData<FullParseHandle
         }
     }
 
-    LinkUseToDef(pn, dn);
-    return true;
-}
-
-template <>
-/* static */ bool
-Parser<SyntaxParseHandler>::bindVarOrConst(JSContext *cx, BindData<SyntaxParseHandler> *data,
-                                           HandlePropertyName name,
-                                           Parser<SyntaxParseHandler> *parser)
-{
+    parser->handler.linkUseToDef(pn, dn);
     return true;
 }
 
@@ -2589,21 +2572,20 @@ Parser<FullParseHandler>::makeSetCall(ParseNode *pn, unsigned msg)
     return true;
 }
 
-template <>
+template <typename ParseHandler>
 bool
-Parser<FullParseHandler>::noteNameUse(ParseNode *pn)
+Parser<ParseHandler>::noteNameUse(HandlePropertyName name, Node pn)
 {
-    RootedPropertyName name(context, pn->pn_atom->asPropertyName());
     StmtInfoPC *stmt = LexicalLookup(pc, name, NULL, (StmtInfoPC *)NULL);
 
     DefinitionList::Range defs = pc->decls().lookupMulti(name);
 
-    Definition *dn;
+    DefinitionNode dn;
     if (!defs.empty()) {
-        dn = defs.front();
+        dn = defs.front<ParseHandler>();
     } else {
         if (AtomDefnAddPtr p = pc->lexdeps->lookupForAdd(name)) {
-            dn = p.value();
+            dn = p.value().get<ParseHandler>();
         } else {
             /*
              * No definition before this use in any lexical scope.
@@ -2613,28 +2595,23 @@ Parser<FullParseHandler>::noteNameUse(ParseNode *pn)
              * - Be left as a free variable definition if we never
              *   see the real definition.
              */
-            dn = MakePlaceholder(pn, &handler, pc);
-            if (!dn || !pc->lexdeps->add(p, name, dn))
+            dn = handler.newPlaceholder(pn, pc);
+            if (!dn)
+                return false;
+            DefinitionSingle def = DefinitionSingle::new_<ParseHandler>(dn);
+            if (!pc->lexdeps->add(p, name, def))
                 return false;
         }
     }
 
-    JS_ASSERT(dn->isDefn());
-    LinkUseToDef(pn, dn);
+    handler.linkUseToDef(pn, dn);
 
     if (stmt && stmt->type == STMT_WITH)
-        pn->pn_dflags |= PND_DEOPTIMIZED;
+        handler.setFlag(pn, PND_DEOPTIMIZED);
 
     return true;
 }
 
-template <>
-bool
-Parser<SyntaxParseHandler>::noteNameUse(Node pn)
-{
-    return true;
-}
-
 #if JS_HAS_DESTRUCTURING
 
 template <>
@@ -2816,7 +2793,8 @@ Parser<FullParseHandler>::checkDestructuring(BindData<FullParseHandler> *data,
                  * officially linked to its def or registered in lexdeps. Do
                  * that now.
                  */
-                if (pair->pn_right == pair->pn_left && !noteNameUse(pn))
+                RootedPropertyName name(context, pn->pn_atom->asPropertyName());
+                if (pair->pn_right == pair->pn_left && !noteNameUse(name, pn))
                     return false;
                 ok = bindDestructuringLHS(pn);
             }
@@ -3143,9 +3121,9 @@ PushBlocklikeStatement(StmtInfoPC *stmt, StmtType type, ParseContext<ParseHandle
     return GenerateBlockId(pc, stmt->blockid);
 }
 
-template <>
-ParseNode *
-Parser<FullParseHandler>::newBindingNode(PropertyName *name, VarContext varContext)
+template <typename ParseHandler>
+typename ParseHandler::Node
+Parser<ParseHandler>::newBindingNode(PropertyName *name, bool functionScope, VarContext varContext)
 {
     /*
      * If this name is being injected into an existing block/function, see if
@@ -3156,13 +3134,15 @@ Parser<FullParseHandler>::newBindingNode(PropertyName *name, VarContext varConte
      */
     if (varContext == HoistVars) {
         if (AtomDefnPtr p = pc->lexdeps->lookup(name)) {
-            ParseNode *lexdep = p.value();
-            JS_ASSERT(lexdep->isPlaceholder());
-            if (lexdep->pn_blockid >= pc->blockid()) {
-                lexdep->pn_blockid = pc->blockid();
+            DefinitionNode lexdep = p.value().get<ParseHandler>();
+            JS_ASSERT(handler.getDefinitionKind(lexdep) == Definition::PLACEHOLDER);
+
+            Node pn = handler.getDefinitionNode(lexdep);
+            if (handler.dependencyCovered(pn, pc->blockid(), functionScope)) {
+                handler.setBlockId(pn, pc->blockid());
                 pc->lexdeps->remove(p);
-                lexdep->pn_pos = tokenStream.currentToken().pos;
-                return lexdep;
+                handler.setPosition(pn, tokenStream.currentToken().pos);
+                return pn;
             }
         }
     }
@@ -3172,13 +3152,6 @@ Parser<FullParseHandler>::newBindingNode(PropertyName *name, VarContext varConte
     return handler.newName(name, pc);
 }
 
-template <>
-SyntaxParseHandler::Node
-Parser<SyntaxParseHandler>::newBindingNode(PropertyName *name, VarContext varContext)
-{
-    return SyntaxParseHandler::NodeGeneric;
-}
-
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::switchStatement()
@@ -3904,7 +3877,7 @@ Parser<ParseHandler>::tryStatement()
               case TOK_NAME:
               {
                 RootedPropertyName label(context, tokenStream.currentToken().name());
-                catchName = newBindingNode(label);
+                catchName = newBindingNode(label, false);
                 if (!catchName)
                     return null();
                 data.pn = catchName;
@@ -4020,9 +3993,10 @@ Parser<ParseHandler>::withStatement()
      * to safely optimize binding globals (see bug 561923).
      */
     for (AtomDefnRange r = pc->lexdeps->all(); !r.empty(); r.popFront()) {
-        Definition *defn = r.front().value();
-        Definition *lexdep = defn->resolve();
-        DeoptimizeUsesWithin(lexdep, TokenPos::make(begin, tokenStream.currentToken().pos.begin));
+        DefinitionNode defn = r.front().value().get<ParseHandler>();
+        DefinitionNode lexdep = handler.resolve(defn);
+        handler.deoptimizeUsesWithin(lexdep,
+                                     TokenPos::make(begin, tokenStream.currentToken().pos.begin));
     }
 
     Node pn = handler.newBinary(PNK_WITH, objectExpr, innerBlock);
@@ -4594,7 +4568,7 @@ Parser<ParseHandler>::variables(ParseNodeKind kind, bool *psimple,
         }
 
         RootedPropertyName name(context, tokenStream.currentToken().name());
-        pn2 = newBindingNode(name, varContext);
+        pn2 = newBindingNode(name, kind == PNK_VAR || kind == PNK_CONST, varContext);
         if (!pn2)
             return null();
         if (data.op == JSOP_DEFCONST)
@@ -5445,7 +5419,7 @@ CompExprTransplanter::transplant(ParseNode *pn)
                      * generator) a use of a new placeholder in the generator's
                      * lexdeps.
                      */
-                    Definition *dn2 = MakePlaceholder(pn, &parser->handler, parser->pc);
+                    Definition *dn2 = parser->handler.newPlaceholder(pn, parser->pc);
                     if (!dn2)
                         return false;
                     dn2->pn_pos = root->pn_pos;
@@ -5464,7 +5438,8 @@ CompExprTransplanter::transplant(ParseNode *pn)
                     dn2->dn_uses = dn->dn_uses;
                     dn->dn_uses = *pnup;
                     *pnup = NULL;
-                    if (!pc->lexdeps->put(atom, dn2))
+                    DefinitionSingle def = DefinitionSingle::new_<FullParseHandler>(dn2);
+                    if (!pc->lexdeps->put(atom, def))
                         return false;
                     if (dn->isClosed())
                         dn2->pn_dflags |= PND_CLOSED;
@@ -5475,7 +5450,8 @@ CompExprTransplanter::transplant(ParseNode *pn)
                      * from the parent's lexdeps into the generator's lexdeps.
                      */
                     outerpc->lexdeps->remove(atom);
-                    if (!pc->lexdeps->put(atom, dn))
+                    DefinitionSingle def = DefinitionSingle::new_<FullParseHandler>(dn);
+                    if (!pc->lexdeps->put(atom, def))
                         return false;
                 } else if (dn->isImplicitArguments()) {
                     /*
@@ -5629,7 +5605,7 @@ Parser<FullParseHandler>::comprehensionTail(ParseNode *kid, unsigned blockid, bo
              * and it tries to bind all names to slots, so we must let it do
              * the deed.
              */
-            pn3 = newBindingNode(name);
+            pn3 = newBindingNode(name, false);
             if (!pn3)
                 return null();
             break;
@@ -6145,12 +6121,12 @@ Parser<ParseHandler>::identifierName()
 {
     JS_ASSERT(tokenStream.isCurrentTokenType(TOK_NAME));
 
-    PropertyName *name = tokenStream.currentToken().name();
+    RootedPropertyName name(context, tokenStream.currentToken().name());
     Node pn = handler.newName(name, pc);
     if (!pn)
         return null();
 
-    if (!pc->inDeclDestructuring && !noteNameUse(pn))
+    if (!pc->inDeclDestructuring && !noteNameUse(name, pn))
         return null();
 
     return pn;
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 060f94e3b1f9..2dcab9c3242a 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -85,6 +85,7 @@ struct ParseContext : public GenericParseContext
 {
     typedef StmtInfoPC StmtInfo;
     typedef typename ParseHandler::Node Node;
+    typedef typename ParseHandler::DefinitionNode DefinitionNode;
 
     uint32_t        bodyid;         /* block number of program/function body */
     uint32_t        blockidGen;     /* preincremented block number generator */
@@ -103,12 +104,12 @@ struct ParseContext : public GenericParseContext
     Node            blockNode;      /* parse node for a block with let declarations
                                        (block with its own lexical scope)  */
   private:
-    AtomDecls       decls_;         /* function, const, and var declarations */
+    AtomDecls<ParseHandler> decls_; /* function, const, and var declarations */
     DeclVector      args_;          /* argument definitions */
     DeclVector      vars_;          /* var/const definitions */
 
   public:
-    const AtomDecls &decls() const {
+    const AtomDecls<ParseHandler> &decls() const {
         return decls_;
     }
 
@@ -161,7 +162,7 @@ struct ParseContext : public GenericParseContext
     void popLetDecl(JSAtom *atom);
 
     /* See the sad story in defineArg. */
-    void prepareToAddDuplicateArg(Definition *prevDecl);
+    void prepareToAddDuplicateArg(HandlePropertyName name, DefinitionNode prevDecl);
 
     /* See the sad story in MakeDefIntoUse. */
     void updateDecl(JSAtom *atom, Node newDecl);
@@ -494,13 +495,13 @@ struct Parser : private AutoGCRooter, public StrictModeGetter
     bool checkStrictBinding(HandlePropertyName name, Node pn);
     bool checkDeleteExpression(Node *pn);
     bool defineArg(Node funcpn, HandlePropertyName name,
-                   bool disallowDuplicateArgs = false, DefinitionNode *duplicatedArg = NULL);
+                   bool disallowDuplicateArgs = false, Node *duplicatedArg = NULL);
     Node pushLexicalScope(StmtInfoPC *stmt);
     Node pushLexicalScope(Handle<StaticBlockObject*> blockObj, StmtInfoPC *stmt);
     Node pushLetScope(Handle<StaticBlockObject*> blockObj, StmtInfoPC *stmt);
-    bool noteNameUse(Node pn);
+    bool noteNameUse(HandlePropertyName name, Node pn);
     Node newRegExp(const jschar *chars, size_t length, RegExpFlag flags);
-    Node newBindingNode(PropertyName *name, VarContext varContext = HoistVars);
+    Node newBindingNode(PropertyName *name, bool functionScope, VarContext varContext = HoistVars);
     bool checkDestructuring(BindData<ParseHandler> *data, Node left, bool toplevel = true);
     bool bindDestructuringVar(BindData<ParseHandler> *data, Node pn);
     bool bindDestructuringLHS(Node pn);
@@ -521,7 +522,7 @@ struct Parser : private AutoGCRooter, public StrictModeGetter
     bindVarOrConst(JSContext *cx, BindData<ParseHandler> *data,
                    HandlePropertyName name, Parser<ParseHandler> *parser);
 
-    static DefinitionNode null() { return ParseHandler::null(); }
+    static Node null() { return ParseHandler::null(); }
 
     bool reportRedeclaration(Node pn, bool isConst, JSAtom *atom);
     bool reportBadReturn(Node pn, ParseReportKind kind, unsigned errnum, unsigned anonerrnum);
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index 085dec56800f..dd0ba4faedf1 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -27,7 +27,7 @@ class SyntaxParseHandler
         NodeStringExprStatement,
         NodeLValue
     };
-    typedef Node DefinitionNode;
+    typedef Definition::Kind DefinitionNode;
 
     SyntaxParseHandler(JSContext *cx, TokenStream &tokenStream, bool foldConstants)
       : lastAtom(NULL),
@@ -43,6 +43,9 @@ class SyntaxParseHandler
         lastAtom = name;
         return NodeName;
     }
+    DefinitionNode newPlaceholder(Node pn, ParseContext<SyntaxParseHandler> *pc) {
+        return Definition::PLACEHOLDER;
+    }
     Node newAtom(ParseNodeKind kind, JSAtom *atom, JSOp op = JSOP_NOP) {
         if (kind == PNK_STRING) {
             lastAtom = atom;
@@ -102,6 +105,7 @@ class SyntaxParseHandler
     Node newFunctionDefinition() { return NodeGeneric; }
     void setFunctionBody(Node pn, Node kid) {}
     void setFunctionBox(Node pn, FunctionBox *funbox) {}
+    void addFunctionArgument(Node pn, Node argpn) {}
     Node newLexicalScope(ObjectBox *blockbox) { return NodeGeneric; }
     bool isOperationWithoutParens(Node pn, ParseNodeKind kind) {
         // It is OK to return false here, callers should only use this method
@@ -119,6 +123,8 @@ class SyntaxParseHandler
     void setEndPosition(Node pn, Node oth) {}
     void setEndPosition(Node pn, uint32_t end) {}
 
+
+    void setPosition(Node pn, const TokenPos &pos) {}
     TokenPos getPosition(Node pn) {
         return tokenStream.currentToken().pos;
     }
@@ -154,6 +160,29 @@ class SyntaxParseHandler
     bool isEmptySemicolon(Node pn) { return false; }
 
     Node makeAssignment(Node pn, Node rhs) { return NodeGeneric; }
+
+    static Node getDefinitionNode(DefinitionNode dn) { return NodeGeneric; }
+    static Definition::Kind getDefinitionKind(DefinitionNode dn) { return dn; }
+    void linkUseToDef(Node pn, DefinitionNode dn) {}
+    DefinitionNode resolve(DefinitionNode dn) { return dn; }
+    void deoptimizeUsesWithin(DefinitionNode dn, const TokenPos &pos) {}
+    bool dependencyCovered(Node pn, unsigned blockid, bool functionScope) {
+        // Only resolve lexical dependencies in cases where a definition covers
+        // the entire function. Not enough information is kept to compare the
+        // dependency location with blockid.
+        return functionScope;
+    }
+
+    static uintptr_t definitionToBits(DefinitionNode dn) {
+        // Use a shift, as DefinitionList tags the lower bit of its associated union.
+        return uintptr_t(dn << 1);
+    }
+    static DefinitionNode definitionFromBits(uintptr_t bits) {
+        return (DefinitionNode) (bits >> 1);
+    }
+    static DefinitionNode nullDefinition() {
+        return Definition::MISSING;
+    }
 };
 
 } // namespace frontend

From a4706ed92ab361b056d47d25e7ed021e3b185db4 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 15 Apr 2013 13:17:22 +0100
Subject: [PATCH 153/438] bug 861403 - fix mixing of device pixels with global
 display pixels in MoveClient and ResizeClient calculations. r=roc

---
 widget/gtk2/nsWindow.cpp          |  9 +++------
 widget/windows/nsWindow.cpp       | 10 +++-------
 widget/xpwidgets/nsBaseWidget.cpp | 27 +++++++++++++++++++--------
 widget/xpwidgets/nsBaseWidget.h   | 10 ++++++++++
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/widget/gtk2/nsWindow.cpp b/widget/gtk2/nsWindow.cpp
index f3f1cf8920d5..59a7a61867e5 100644
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -995,8 +995,7 @@ nsWindow::Show(bool aState)
 NS_IMETHODIMP
 nsWindow::Resize(double aWidth, double aHeight, bool aRepaint)
 {
-    double scale =
-        mWindowType <= eWindowType_popup ? GetDefaultScale() : 1.0;
+    double scale = BoundsUseDisplayPixels() ? GetDefaultScale() : 1.0;
     int32_t width = NSToIntRound(scale * aWidth);
     int32_t height = NSToIntRound(scale * aHeight);
     ConstrainSize(&width, &height);
@@ -1076,8 +1075,7 @@ NS_IMETHODIMP
 nsWindow::Resize(double aX, double aY, double aWidth, double aHeight,
                  bool aRepaint)
 {
-    double scale =
-        mWindowType <= eWindowType_popup ? GetDefaultScale() : 1.0;
+    double scale = BoundsUseDisplayPixels() ? GetDefaultScale() : 1.0;
     int32_t width = NSToIntRound(scale * aWidth);
     int32_t height = NSToIntRound(scale * aHeight);
     ConstrainSize(&width, &height);
@@ -1165,8 +1163,7 @@ nsWindow::Move(double aX, double aY)
     LOG(("nsWindow::Move [%p] %f %f\n", (void *)this,
          aX, aY));
 
-    double scale =
-        mWindowType <= eWindowType_popup ? GetDefaultScale() : 1.0;
+    double scale = BoundsUseDisplayPixels() ? GetDefaultScale() : 1.0;
     int32_t x = NSToIntRound(aX * scale);
     int32_t y = NSToIntRound(aY * scale);
 
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index 91b95bf14b32..ff4f652ffdd7 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -1315,8 +1315,7 @@ NS_METHOD nsWindow::Move(double aX, double aY)
 
   // for top-level windows only, convert coordinates from global display pixels
   // (the "parent" coordinate space) to the window's device pixel space
-  double scale =
-    (mWindowType <= eWindowType_popup) ? GetDefaultScale() : 1.0;
+  double scale = BoundsUseDisplayPixels() ? GetDefaultScale() : 1.0;
   int32_t x = NSToIntRound(aX * scale);
   int32_t y = NSToIntRound(aY * scale);
 
@@ -1369,8 +1368,7 @@ NS_METHOD nsWindow::Resize(double aWidth, double aHeight, bool aRepaint)
 {
   // for top-level windows only, convert coordinates from global display pixels
   // (the "parent" coordinate space) to the window's device pixel space
-  double scale =
-    (mWindowType <= eWindowType_popup) ? GetDefaultScale() : 1.0;
+  double scale = BoundsUseDisplayPixels() ? GetDefaultScale() : 1.0;
   int32_t width = NSToIntRound(aWidth * scale);
   int32_t height = NSToIntRound(aHeight * scale);
 
@@ -1420,8 +1418,7 @@ NS_METHOD nsWindow::Resize(double aX, double aY, double aWidth, double aHeight,
 {
   // for top-level windows only, convert coordinates from global display pixels
   // (the "parent" coordinate space) to the window's device pixel space
-  double scale =
-    (mWindowType <= eWindowType_popup) ? GetDefaultScale() : 1.0;
+  double scale = BoundsUseDisplayPixels() ? GetDefaultScale() : 1.0;
   int32_t x = NSToIntRound(aX * scale);
   int32_t y = NSToIntRound(aY * scale);
   int32_t width = NSToIntRound(aWidth * scale);
@@ -1846,7 +1843,6 @@ NS_METHOD nsWindow::GetBounds(nsIntRect &aRect)
   } else {
     aRect = mBounds;
   }
-
   return NS_OK;
 }
 
diff --git a/widget/xpwidgets/nsBaseWidget.cpp b/widget/xpwidgets/nsBaseWidget.cpp
index edba4c2271ca..c300373e7a5f 100644
--- a/widget/xpwidgets/nsBaseWidget.cpp
+++ b/widget/xpwidgets/nsBaseWidget.cpp
@@ -1030,8 +1030,13 @@ NS_METHOD nsBaseWidget::SetWindowClass(const nsAString& xulWinType)
 NS_METHOD nsBaseWidget::MoveClient(double aX, double aY)
 {
   nsIntPoint clientOffset(GetClientOffset());
-  aX -= clientOffset.x;
-  aY -= clientOffset.y;
+
+  // GetClientOffset returns device pixels; scale back to display pixels
+  // if that's what this widget uses for the Move/Resize APIs
+  double scale = BoundsUseDisplayPixels() ? 1.0 / GetDefaultScale() : 1.0;
+  aX -= clientOffset.x * scale;
+  aY -= clientOffset.y * scale;
+
   return Move(aX, aY);
 }
 
@@ -1044,8 +1049,12 @@ NS_METHOD nsBaseWidget::ResizeClient(double aWidth,
 
   nsIntRect clientBounds;
   GetClientBounds(clientBounds);
-  aWidth = mBounds.width + (aWidth - clientBounds.width);
-  aHeight = mBounds.height + (aHeight - clientBounds.height);
+
+  // GetClientBounds and mBounds are device pixels; scale back to display pixels
+  // if that's what this widget uses for the Move/Resize APIs
+  double scale = BoundsUseDisplayPixels() ? 1.0 / GetDefaultScale() : 1.0;
+  aWidth = mBounds.width * scale + (aWidth - clientBounds.width * scale);
+  aHeight = mBounds.height * scale + (aHeight - clientBounds.height * scale);
 
   return Resize(aWidth, aHeight, aRepaint);
 }
@@ -1061,12 +1070,14 @@ NS_METHOD nsBaseWidget::ResizeClient(double aX,
 
   nsIntRect clientBounds;
   GetClientBounds(clientBounds);
-  aWidth = mBounds.width + (aWidth - clientBounds.width);
-  aHeight = mBounds.height + (aHeight - clientBounds.height);
+
+  double scale = BoundsUseDisplayPixels() ? 1.0 / GetDefaultScale() : 1.0;
+  aWidth = mBounds.width * scale + (aWidth - clientBounds.width * scale);
+  aHeight = mBounds.height * scale + (aHeight - clientBounds.height * scale);
 
   nsIntPoint clientOffset(GetClientOffset());
-  aX -= clientOffset.x;
-  aY -= clientOffset.y;
+  aX -= clientOffset.x * scale;
+  aY -= clientOffset.y * scale;
 
   return Resize(aX, aY, aWidth, aHeight, aRepaint);
 }
diff --git a/widget/xpwidgets/nsBaseWidget.h b/widget/xpwidgets/nsBaseWidget.h
index 5b92a9b3306d..9e11c7bcda83 100644
--- a/widget/xpwidgets/nsBaseWidget.h
+++ b/widget/xpwidgets/nsBaseWidget.h
@@ -118,6 +118,16 @@ public:
   virtual gfxASurface*    GetThebesSurface();
   NS_IMETHOD              SetModal(bool aModal); 
   NS_IMETHOD              SetWindowClass(const nsAString& xulWinType);
+  // Return whether this widget interprets parameters to Move and Resize APIs
+  // as "global display pixels" rather than "device pixels", and therefore
+  // applies its GetDefaultScale() value to them before using them as mBounds
+  // etc (which are always stored in device pixels).
+  // Note that APIs that -get- the widget's position/size/bounds, rather than
+  // -setting- them (i.e. moving or resizing the widget) will always return
+  // values in the widget's device pixels.
+  bool                    BoundsUseDisplayPixels() const {
+    return mWindowType <= eWindowType_popup;
+  }
   NS_IMETHOD              MoveClient(double aX, double aY);
   NS_IMETHOD              ResizeClient(double aWidth, double aHeight, bool aRepaint);
   NS_IMETHOD              ResizeClient(double aX, double aY, double aWidth, double aHeight, bool aRepaint);

From 297949d6610726e492584a375d12066a1e88f866 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Mon, 15 Apr 2013 13:30:28 +0100
Subject: [PATCH 154/438] Bug 861805 - Stop layers from snapping transforms for
 SVG content. r=roc

---
 gfx/layers/Layers.cpp             | 6 ++++--
 gfx/layers/Layers.h               | 7 ++++++-
 layout/base/FrameLayerBuilder.cpp | 5 +++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
index b30bcb79db5a..7a2e0bac0b61 100644
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -453,7 +453,8 @@ Layer::SnapTransformTranslation(const gfx3DMatrix& aTransform,
 
   gfxMatrix matrix2D;
   gfx3DMatrix result;
-  if (mManager->IsSnappingEffectiveTransforms() &&
+  if (!(mContentFlags & CONTENT_DISABLE_TRANSFORM_SNAPPING) &&
+      mManager->IsSnappingEffectiveTransforms() &&
       aTransform.Is2D(&matrix2D) &&
       !matrix2D.HasNonTranslation() &&
       matrix2D.HasNonIntegerTranslation()) {
@@ -485,7 +486,8 @@ Layer::SnapTransform(const gfx3DMatrix& aTransform,
 
   gfxMatrix matrix2D;
   gfx3DMatrix result;
-  if (mManager->IsSnappingEffectiveTransforms() &&
+  if (!(mContentFlags & CONTENT_DISABLE_TRANSFORM_SNAPPING) &&
+      mManager->IsSnappingEffectiveTransforms() &&
       aTransform.Is2D(&matrix2D) &&
       gfxSize(1.0, 1.0) <= aSnapRect.Size() &&
       matrix2D.PreservesAxisAlignedRectangles()) {
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index 94c3407a433e..4d8d589acb39 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -639,7 +639,12 @@ public:
      * transaction where there is no possibility of redrawing the content, so the
      * implementation should be ready for that.
      */
-    CONTENT_MAY_CHANGE_TRANSFORM = 0x08
+    CONTENT_MAY_CHANGE_TRANSFORM = 0x08,
+    /**
+     * This indicates that the content does not want to be snapped to pixel
+     * boundaries, so the layers code should not do transform snapping.
+     */
+    CONTENT_DISABLE_TRANSFORM_SNAPPING = 0x10
   };
   /**
    * CONSTRUCTION PHASE ONLY
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 7ebd53658c38..e2bc7c05deb2 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2940,6 +2940,11 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
       flags = Layer::CONTENT_OPAQUE;
     }
   }
+
+  if (aContainerFrame->GetStateBits() & NS_FRAME_SVG_LAYOUT) {
+    flags |= Layer::CONTENT_DISABLE_TRANSFORM_SNAPPING;
+  }
+
   containerLayer->SetContentFlags(flags);
 
   mContainerLayerGeneration = oldGeneration;

From f29df2e52febbb4f10c105cec81d8bcd942b4ee0 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Mon, 15 Apr 2013 14:38:48 +0200
Subject: [PATCH 155/438] Bug 600307 - localStorage and sessionStorage
 implementation overhaul, r=mak77+smaug, sr=smaug

---
 .../base/content/test/browser_aboutHome.js    |    6 +-
 .../sessionstore/src/SessionStorage.jsm       |   15 +-
 content/events/src/nsEventDispatcher.cpp      |    1 -
 docshell/base/nsDocShell.cpp                  |  218 +-
 docshell/base/nsDocShell.h                    |   14 +-
 docshell/base/nsIDocShell.idl                 |   19 +-
 dom/base/nsDOMClassInfo.cpp                   |   16 +-
 dom/base/nsDOMClassInfoClasses.h              |    2 -
 dom/base/nsGlobalWindow.cpp                   |  147 +-
 dom/base/nsGlobalWindow.h                     |    3 +-
 dom/indexedDB/CheckPermissionsHelper.cpp      |    1 -
 dom/interfaces/storage/moz.build              |    2 -
 dom/interfaces/storage/nsIDOMStorageItem.idl  |   28 -
 .../storage/nsIDOMStorageManager.idl          |   82 +-
 .../storage/nsIDOMStorageObsolete.idl         |   65 -
 dom/interfaces/storage/nsPIDOMStorage.h       |   41 +-
 dom/ipc/ContentChild.cpp                      |    6 +-
 dom/ipc/ContentChild.h                        |    2 +-
 dom/ipc/ContentParent.cpp                     |    9 +-
 dom/ipc/ContentParent.h                       |    2 +-
 dom/ipc/PContent.ipdl                         |   19 +-
 dom/src/storage/DOMStorage.cpp                |  353 ++++
 dom/src/storage/DOMStorage.h                  |   85 +
 dom/src/storage/DOMStorageCache.cpp           |  801 ++++++++
 dom/src/storage/DOMStorageCache.h             |  253 +++
 dom/src/storage/DOMStorageDBThread.cpp        | 1296 ++++++++++++
 dom/src/storage/DOMStorageDBThread.h          |  350 ++++
 dom/src/storage/DOMStorageIPC.cpp             |  712 +++++++
 dom/src/storage/DOMStorageIPC.h               |  191 ++
 dom/src/storage/DOMStorageManager.cpp         |  631 ++++++
 dom/src/storage/DOMStorageManager.h           |  127 ++
 dom/src/storage/DOMStorageObserver.cpp        |  332 +++
 dom/src/storage/DOMStorageObserver.h          |   62 +
 dom/src/storage/Makefile.in                   |   20 +-
 dom/src/storage/PStorage.ipdl                 |   66 +-
 dom/src/storage/StorageChild.cpp              |  250 ---
 dom/src/storage/StorageChild.h                |   71 -
 dom/src/storage/StorageParent.cpp             |  157 --
 dom/src/storage/StorageParent.h               |   60 -
 dom/src/storage/nsDOMStorage.cpp              | 1808 -----------------
 dom/src/storage/nsDOMStorage.h                |  486 -----
 dom/src/storage/nsDOMStorageBaseDB.cpp        |   86 -
 dom/src/storage/nsDOMStorageBaseDB.h          |   58 -
 dom/src/storage/nsDOMStorageDBWrapper.cpp     |  397 ----
 dom/src/storage/nsDOMStorageDBWrapper.h       |  238 ---
 dom/src/storage/nsDOMStorageMemoryDB.cpp      |  383 ----
 dom/src/storage/nsDOMStorageMemoryDB.h        |  145 --
 dom/src/storage/nsDOMStoragePersistentDB.cpp  | 1143 -----------
 dom/src/storage/nsDOMStoragePersistentDB.h    |  265 ---
 dom/src/storage/nsLocalStorageCache.cpp       |  416 ----
 dom/src/storage/nsLocalStorageCache.h         |  184 --
 dom/tests/mochitest/localstorage/Makefile.in  |    4 +-
 .../localstorage/frameBug624047.html          |   30 -
 .../localstorage/localStorageCommon.js        |   46 +
 .../localstorage/test_bug600307-DBOps.html    |  166 ++
 .../localstorage/test_bug624047.html          |   64 -
 .../localstorage/test_localStorageBase.html   |   37 +-
 .../test_localStorageFromChrome.xhtml         |    4 +-
 .../mochitest/sessionstorage/Makefile.in      |    2 +
 .../sessionstorage/test_cookieSession.html    |   98 +
 .../test_sessionStorageBase.html              |   23 +-
 .../test_sessionStorageBaseSessionOnly.html   |  214 ++
 .../windowwatcher/src/nsWindowWatcher.cpp     |   22 +-
 js/xpconnect/src/dom_quickstubs.qsconf        |    1 -
 layout/build/nsLayoutCID.h                    |   16 +-
 layout/build/nsLayoutModule.cpp               |   18 +-
 layout/build/nsLayoutStatics.cpp              |   11 +-
 testing/mochitest/b2g.json                    |    2 +
 toolkit/components/telemetry/Histograms.json  |   88 +-
 toolkit/content/Services.jsm                  |    2 +-
 .../test/unit/test_removeDataFromDomain.js    |    4 +-
 xpcom/base/ErrorList.h                        |    6 +
 72 files changed, 6181 insertions(+), 6801 deletions(-)
 delete mode 100644 dom/interfaces/storage/nsIDOMStorageItem.idl
 delete mode 100644 dom/interfaces/storage/nsIDOMStorageObsolete.idl
 create mode 100644 dom/src/storage/DOMStorage.cpp
 create mode 100644 dom/src/storage/DOMStorage.h
 create mode 100644 dom/src/storage/DOMStorageCache.cpp
 create mode 100644 dom/src/storage/DOMStorageCache.h
 create mode 100644 dom/src/storage/DOMStorageDBThread.cpp
 create mode 100644 dom/src/storage/DOMStorageDBThread.h
 create mode 100644 dom/src/storage/DOMStorageIPC.cpp
 create mode 100644 dom/src/storage/DOMStorageIPC.h
 create mode 100644 dom/src/storage/DOMStorageManager.cpp
 create mode 100644 dom/src/storage/DOMStorageManager.h
 create mode 100644 dom/src/storage/DOMStorageObserver.cpp
 create mode 100644 dom/src/storage/DOMStorageObserver.h
 delete mode 100644 dom/src/storage/StorageChild.cpp
 delete mode 100644 dom/src/storage/StorageChild.h
 delete mode 100644 dom/src/storage/StorageParent.cpp
 delete mode 100644 dom/src/storage/StorageParent.h
 delete mode 100644 dom/src/storage/nsDOMStorage.cpp
 delete mode 100644 dom/src/storage/nsDOMStorage.h
 delete mode 100644 dom/src/storage/nsDOMStorageBaseDB.cpp
 delete mode 100644 dom/src/storage/nsDOMStorageBaseDB.h
 delete mode 100644 dom/src/storage/nsDOMStorageDBWrapper.cpp
 delete mode 100644 dom/src/storage/nsDOMStorageDBWrapper.h
 delete mode 100644 dom/src/storage/nsDOMStorageMemoryDB.cpp
 delete mode 100644 dom/src/storage/nsDOMStorageMemoryDB.h
 delete mode 100644 dom/src/storage/nsDOMStoragePersistentDB.cpp
 delete mode 100644 dom/src/storage/nsDOMStoragePersistentDB.h
 delete mode 100644 dom/src/storage/nsLocalStorageCache.cpp
 delete mode 100644 dom/src/storage/nsLocalStorageCache.h
 delete mode 100644 dom/tests/mochitest/localstorage/frameBug624047.html
 create mode 100644 dom/tests/mochitest/localstorage/localStorageCommon.js
 create mode 100644 dom/tests/mochitest/localstorage/test_bug600307-DBOps.html
 delete mode 100644 dom/tests/mochitest/localstorage/test_bug624047.html
 create mode 100644 dom/tests/mochitest/sessionstorage/test_cookieSession.html
 create mode 100644 dom/tests/mochitest/sessionstorage/test_sessionStorageBaseSessionOnly.html

diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js
index b3a698f10061..ae7a6b5c6636 100644
--- a/browser/base/content/test/browser_aboutHome.js
+++ b/browser/base/content/test/browser_aboutHome.js
@@ -25,9 +25,9 @@ let gTests = [
   desc: "Check that clearing cookies does not clear storage",
   setup: function ()
   {
-    Cc["@mozilla.org/dom/storagemanager;1"]
-      .getService(Ci.nsIObserver)
-      .observe(null, "cookie-changed", "cleared");
+    Cc["@mozilla.org/observer-service;1"]
+      .getService(Ci.nsIObserverService)
+      .notifyObservers(null, "cookie-changed", "cleared");
   },
   run: function (aSnippetsMap)
   {
diff --git a/browser/components/sessionstore/src/SessionStorage.jsm b/browser/components/sessionstore/src/SessionStorage.jsm
index 8c14900c8d8a..cf217ab04bcc 100644
--- a/browser/components/sessionstore/src/SessionStorage.jsm
+++ b/browser/components/sessionstore/src/SessionStorage.jsm
@@ -85,7 +85,12 @@ let DomStorage = {
     for (let [host, data] in Iterator(aStorageData)) {
       let uri = Services.io.newURI(host, null, null);
       let principal = Services.scriptSecurityManager.getDocShellCodebasePrincipal(uri, aDocShell);
-      let storage = aDocShell.getSessionStorageForPrincipal(principal, "", true);
+      let storageManager = aDocShell.QueryInterface(Components.interfaces.nsIDOMStorageManager);
+
+      // There is no need to pass documentURI, it's only used to fill documentURI property of
+			// domstorage event, which in this case has no consumer.  Prevention of events in case
+			// of missing documentURI will be solved in a followup bug to bug 600307.
+      let storage = storageManager.createStorage(principal, "", aDocShell.usePrivateBrowsing);
 
       for (let [key, value] in Iterator(data)) {
         try {
@@ -110,12 +115,8 @@ let DomStorage = {
     let storage;
 
     try {
-      // Using getSessionStorageForPrincipal instead of
-      // getSessionStorageForURI just to be able to pass aCreate = false,
-      // that avoids creation of the sessionStorage object for the page
-      // earlier than the page really requires it. It was causing problems
-      // while accessing a storage when a page later changed its domain.
-      storage = aDocShell.getSessionStorageForPrincipal(aPrincipal, "", false);
+      let storageManager = aDocShell.QueryInterface(Components.interfaces.nsIDOMStorageManager);
+      storage = storageManager.getStorage(aPrincipal);
     } catch (e) {
       // sessionStorage might throw if it's turned off, see bug 458954
     }
diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp
index c73da62bbbf4..2be0fa4eb256 100644
--- a/content/events/src/nsEventDispatcher.cpp
+++ b/content/events/src/nsEventDispatcher.cpp
@@ -16,7 +16,6 @@
 #include "nsPIDOMWindow.h"
 #include "nsFrameLoader.h"
 #include "nsDOMTouchEvent.h"
-#include "nsDOMStorage.h"
 #include "GeckoProfiler.h"
 #include "GeneratedEvents.h"
 #include "mozilla/dom/EventTarget.h"
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 5db18712da09..783c4ba44001 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -849,8 +849,6 @@ nsDocShell::Init()
     rv = mContentListener->Init();
     NS_ENSURE_SUCCESS(rv, rv);
 
-    mStorages.Init();
-
     // We want to hold a strong ref to the loadgroup, so it better hold a weak
     // ref to us...  use an InterfaceRequestorProxy to do this.
     nsCOMPtr<InterfaceRequestorProxy> proxy =
@@ -917,6 +915,7 @@ NS_INTERFACE_MAP_BEGIN(nsDocShell)
     NS_INTERFACE_MAP_ENTRY(nsIWebShellServices)
     NS_INTERFACE_MAP_ENTRY(nsILinkHandler)
     NS_INTERFACE_MAP_ENTRY(nsIClipboardCommands)
+    NS_INTERFACE_MAP_ENTRY(nsIDOMStorageManager)
 NS_INTERFACE_MAP_END_INHERITING(nsDocLoader)
 
 ///*****************************************************************************
@@ -2596,199 +2595,70 @@ nsDocShell::HistoryTransactionRemoved(int32_t aIndex)
     return NS_OK;
 }
 
+nsIDOMStorageManager*
+nsDocShell::TopSessionStorageManager()
+{
+    nsresult rv;
+
+    nsCOMPtr<nsIDocShellTreeItem> topItem;
+    rv = GetSameTypeRootTreeItem(getter_AddRefs(topItem));
+    if (NS_FAILED(rv)) {
+        return nullptr;
+    }
+
+    if (!topItem) {
+        return nullptr;
+    }
+
+    nsDocShell* topDocShell = static_cast<nsDocShell*>(topItem.get());
+    if (topDocShell != this) {
+        return topDocShell->TopSessionStorageManager();
+    }
+
+    if (!mSessionStorageManager) {
+        mSessionStorageManager =
+            do_CreateInstance("@mozilla.org/dom/sessionStorage-manager;1");
+    }
+
+    return mSessionStorageManager;
+}
+
 NS_IMETHODIMP
 nsDocShell::GetSessionStorageForPrincipal(nsIPrincipal* aPrincipal,
                                           const nsAString& aDocumentURI,
                                           bool aCreate,
                                           nsIDOMStorage** aStorage)
 {
-    NS_ENSURE_ARG_POINTER(aStorage);
-    *aStorage = nullptr;
-
-    if (!aPrincipal)
-        return NS_OK;
-
-    nsresult rv;
-
-    nsCOMPtr<nsIDocShellTreeItem> topItem;
-    rv = GetSameTypeRootTreeItem(getter_AddRefs(topItem));
-    if (NS_FAILED(rv))
-        return rv;
-
-    if (!topItem)
-        return NS_ERROR_FAILURE;
-
-    nsDocShell* topDocShell = static_cast<nsDocShell*>(topItem.get());
-    if (topDocShell != this)
-        return topDocShell->GetSessionStorageForPrincipal(aPrincipal,
-                                                          aDocumentURI,
-                                                          aCreate,
-                                                          aStorage);
-
-    nsXPIDLCString origin;
-    rv = aPrincipal->GetOrigin(getter_Copies(origin));
-    if (NS_FAILED(rv))
-        return rv;
-
-    if (origin.IsEmpty())
-        return NS_OK;
-
-    if (!mStorages.Get(origin, aStorage) && aCreate) {
-        nsCOMPtr<nsIDOMStorage> newstorage =
-            do_CreateInstance("@mozilla.org/dom/storage;2");
-        if (!newstorage)
-            return NS_ERROR_OUT_OF_MEMORY;
-
-        nsCOMPtr<nsPIDOMStorage> pistorage = do_QueryInterface(newstorage);
-        if (!pistorage)
-            return NS_ERROR_FAILURE;
-
-        rv = pistorage->InitAsSessionStorage(aPrincipal, aDocumentURI, mInPrivateBrowsing);
-        if (NS_FAILED(rv))
-            return rv;
-
-        mStorages.Put(origin, newstorage);
-
-        newstorage.swap(*aStorage);
-#if defined(PR_LOGGING) && defined(DEBUG)
-        PR_LOG(gDocShellLog, PR_LOG_DEBUG,
-               ("nsDocShell[%p]: created a new sessionStorage %p",
-                this, *aStorage));
-#endif
-    }
-    else if (*aStorage) {
-        nsCOMPtr<nsPIDOMStorage> piStorage = do_QueryInterface(*aStorage);
-        if (piStorage) {
-            nsCOMPtr<nsIPrincipal> storagePrincipal = piStorage->Principal();
-
-            // The origin string used to map items in the hash table is 
-            // an implicit security check. That check is double-confirmed 
-            // by checking the principal a storage was demanded for 
-            // really is the principal for which that storage was originally 
-            // created. Originally, the check was hidden in the CanAccess 
-            // method but it's implementation has changed.
-            bool equals;
-            nsresult rv = aPrincipal->EqualsIgnoringDomain(storagePrincipal, &equals);
-            NS_ASSERTION(NS_SUCCEEDED(rv) && equals,
-                         "GetSessionStorageForPrincipal got a storage "
-                         "that could not be accessed!");
-
-            if (NS_FAILED(rv) || !equals) {
-                NS_RELEASE(*aStorage);
-                return NS_ERROR_DOM_SECURITY_ERR;
-            }
-        }
-
-#if defined(PR_LOGGING) && defined(DEBUG)
-        PR_LOG(gDocShellLog, PR_LOG_DEBUG,
-               ("nsDocShell[%p]: returns existing sessionStorage %p",
-                this, *aStorage));
-#endif
+    nsCOMPtr<nsIDOMStorageManager> manager = TopSessionStorageManager();
+    if (!manager) {
+        return NS_ERROR_UNEXPECTED;
     }
 
     if (aCreate) {
-        // We are asked to create a new storage object. This indicates
-        // that a new windows wants it. At this moment we "fork" the existing
-        // storage object (what it means is described in the paragraph bellow).
-        // We must create a single object per a single window to distinguish
-        // a window originating oparations on the storage object to succesfully
-        // prevent dispatch of a storage event to this same window that ivoked
-        // a change in its storage. We also do this to correctly fill
-        // documentURI property in the storage event.
-        //
-        // The difference between clone and fork is that clone creates
-        // a completelly new and independent storage, but fork only creates
-        // a new object wrapping the storage implementation and data and
-        // the forked storage then behaves completelly the same way as
-        // the storage it has been forked of, all such forked storage objects
-        // shares their state and data and change on one such object affects
-        // all others the same way.
-        nsCOMPtr<nsPIDOMStorage> piStorage = do_QueryInterface(*aStorage);
-        nsCOMPtr<nsIDOMStorage> fork = piStorage->Fork(aDocumentURI);
-#if defined(PR_LOGGING) && defined(DEBUG)
-        PR_LOG(gDocShellLog, PR_LOG_DEBUG,
-               ("nsDocShell[%p]: forked sessionStorage %p to %p",
-                this, *aStorage, fork.get()));
-#endif
-        fork.swap(*aStorage);
+        return manager->CreateStorage(aPrincipal, aDocumentURI,
+                                      mInPrivateBrowsing, aStorage);
     }
 
-    return NS_OK;
+    return manager->GetStorage(aPrincipal, mInPrivateBrowsing, aStorage);
 }
 
 nsresult
 nsDocShell::AddSessionStorage(nsIPrincipal* aPrincipal,
                               nsIDOMStorage* aStorage)
 {
-    NS_ENSURE_ARG_POINTER(aStorage);
-
-    if (!aPrincipal)
-        return NS_OK;
-
-    nsCOMPtr<nsIDocShellTreeItem> topItem;
-    nsresult rv = GetSameTypeRootTreeItem(getter_AddRefs(topItem));
-    if (NS_FAILED(rv))
-        return rv;
-
-    if (topItem) {
-        nsCOMPtr<nsIDocShell> topDocShell = do_QueryInterface(topItem);
-        if (topDocShell == this) {
-            nsXPIDLCString origin;
-            rv = aPrincipal->GetOrigin(getter_Copies(origin));
-            if (NS_FAILED(rv))
-                return rv;
-
-            if (origin.IsEmpty())
-                return NS_ERROR_FAILURE;
-
-            // Do not replace an existing session storage.
-            if (mStorages.GetWeak(origin))
-                return NS_ERROR_NOT_AVAILABLE;
-
-#if defined(PR_LOGGING) && defined(DEBUG)
-            PR_LOG(gDocShellLog, PR_LOG_DEBUG,
-                   ("nsDocShell[%p]: was added a sessionStorage %p",
-                    this, aStorage));
-#endif
-            mStorages.Put(origin, aStorage);
-        }
-        else {
-            return topDocShell->AddSessionStorage(aPrincipal, aStorage);
-        }
-    }
-
-    return NS_OK;
-}
-
-static PLDHashOperator
-CloneSessionStorages(nsCStringHashKey::KeyType aKey, nsIDOMStorage* aStorage,
-                     void* aUserArg)
-{
-    nsIDocShell *docShell = static_cast<nsIDocShell*>(aUserArg);
     nsCOMPtr<nsPIDOMStorage> pistorage = do_QueryInterface(aStorage);
-
-    if (pistorage) {
-        nsCOMPtr<nsIDOMStorage> storage = pistorage->Clone();
-        docShell->AddSessionStorage(pistorage->Principal(), storage);
+    nsIPrincipal* storagePrincipal = pistorage->GetPrincipal();
+    if (storagePrincipal != aPrincipal) {
+        NS_ERROR("Wanting to add a sessionStorage for different principal");
+        return NS_ERROR_DOM_SECURITY_ERR;
     }
 
-    return PL_DHASH_NEXT;
-}
+    nsCOMPtr<nsIDOMStorageManager> manager = TopSessionStorageManager();
+    if (!manager) {
+        return NS_ERROR_UNEXPECTED;
+    }
 
-NS_IMETHODIMP
-nsDocShell::CloneSessionStoragesTo(nsIDocShell* aDocShell)
-{
-    aDocShell->ClearSessionStorages();
-    mStorages.EnumerateRead(CloneSessionStorages, aDocShell);
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocShell::ClearSessionStorages()
-{
-    mStorages.Clear();
-    return NS_OK;
+    return manager->CloneStorage(aStorage);
 }
 
 NS_IMETHODIMP
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 588643b20811..51c72b97f2de 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -23,6 +23,7 @@
 #include "nsITextScroll.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIContentViewerContainer.h"
+#include "nsIDOMStorageManager.h"
 
 #include "nsDocLoader.h"
 #include "nsIURILoader.h"
@@ -146,7 +147,8 @@ class nsDocShell : public nsDocLoader,
                    public nsILoadContext,
                    public nsIWebShellServices,
                    public nsILinkHandler,
-                   public nsIClipboardCommands
+                   public nsIClipboardCommands,
+                   public nsIDOMStorageManager
 {
     friend class nsDSURIContentListener;
 
@@ -178,6 +180,7 @@ public:
     NS_DECL_NSIOBSERVER
     NS_DECL_NSICLIPBOARDCOMMANDS
     NS_DECL_NSIWEBSHELLSERVICES
+    NS_FORWARD_SAFE_NSIDOMSTORAGEMANAGER(TopSessionStorageManager())
 
     NS_IMETHOD Stop() {
         // Need this here because otherwise nsIWebNavigation::Stop
@@ -628,10 +631,8 @@ protected:
     
     void ReattachEditorToWindow(nsISHEntry *aSHEntry);
 
-    nsresult GetSessionStorageForURI(nsIURI* aURI,
-                                     const nsSubstring& aDocumentURI,
-                                     bool create,
-                                     nsIDOMStorage** aStorage);
+    nsCOMPtr<nsIDOMStorageManager> mSessionStorageManager;
+    nsIDOMStorageManager* TopSessionStorageManager();
 
     // helpers for executing commands
     nsresult GetControllerForCommand(const char *inCommand,
@@ -676,9 +677,6 @@ protected:
 
     bool HasUnloadedParent();
 
-    // hash of session storages, keyed by domain
-    nsInterfaceHashtable<nsCStringHashKey, nsIDOMStorage> mStorages;
-
     // Dimensions of the docshell
     nsIntRect                  mBounds;
     nsString                   mName;
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index c6e629c1e6f4..d2faf3443ac7 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -40,7 +40,7 @@ interface nsIWebBrowserPrint;
 interface nsIVariant;
 interface nsIPrivacyTransitionObserver;
 
-[scriptable, builtinclass, uuid(4277354d-5069-4278-935a-5d596ce9bfbf)]
+[scriptable, builtinclass, uuid(2b192c9c-dea4-4696-a445-1bef7bc0db6d)]
 interface nsIDocShell : nsIDocShellTreeItem
 {
   /**
@@ -407,6 +407,8 @@ interface nsIDocShell : nsIDocShellTreeItem
   void historyPurged(in long numEntries);
 
   /*
+   * @deprecated, use nsIDocShell.QueryInterface(nsIDOMStorageManager) instead.
+   *
    * Retrieves the WebApps session storage object for the supplied principal.
    *
    * @param principal returns a storage for this principal
@@ -420,6 +422,8 @@ interface nsIDocShell : nsIDocShellTreeItem
                                               in boolean create);
 
   /*
+   * @deprecated, use nsIDocShell.QueryInterface(nsIDOMStorageManager) instead.
+   *
    * Add a WebApps session storage object to the docshell.
    *
    * @param principal the principal the storage object is associated with
@@ -427,19 +431,6 @@ interface nsIDocShell : nsIDocShellTreeItem
    */
   void addSessionStorage(in nsIPrincipal principal, in nsIDOMStorage storage);
 
-  /**
-   * Clones all session storage objects and attaches them to the given docshell.
-   * Useful when duplicating tabs and their states.
-   *
-   * @param docShell the docshell to clone the sessionstorage objects to
-   */
-  void cloneSessionStoragesTo(in nsIDocShell docShell);
-
-  /**
-   * Removes all WebApps session storage objects attached to the docshell.
-   */
-  void clearSessionStorages();
-
   /**
    * Gets the channel for the currently loaded document, if any. 
    * For a new document load, this will be the channel of the previous document
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 42eb105e405a..ebe23a56adc0 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -229,7 +229,7 @@
 #include "nsIImageDocument.h"
 
 // Storage includes
-#include "nsDOMStorage.h"
+#include "DOMStorage.h"
 
 // Device Storage
 #include "nsIDOMDeviceStorage.h"
@@ -758,9 +758,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
   // since a call to addProperty() is always followed by a call to
   // setProperty(), except in the case when a getter or setter is set
   // for a property. But we don't care about getters or setters here.
-  NS_DEFINE_CLASSINFO_DATA(StorageObsolete, nsDOMGenericSH,
-                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
-
   NS_DEFINE_CLASSINFO_DATA(Storage, nsStorage2SH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS |
                            nsIXPCScriptable::WANT_NEWRESOLVE |
@@ -769,8 +766,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            nsIXPCScriptable::WANT_DELPROPERTY |
                            nsIXPCScriptable::DONT_ENUM_STATIC_PROPS |
                            nsIXPCScriptable::WANT_NEWENUMERATE)
-  NS_DEFINE_CLASSINFO_DATA(StorageItem, nsDOMGenericSH,
-                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
   NS_DEFINE_CLASSINFO_DATA(XULCommandEvent, nsEventSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -2069,19 +2064,10 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMXPathResult)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(StorageObsolete, nsIDOMStorageObsolete)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageObsolete)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(Storage, nsIDOMStorage)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorage)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(StorageItem, nsIDOMStorageItem)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageItem)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMToString)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(XULCommandEvent, nsIDOMXULCommandEvent)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULCommandEvent)
     DOM_CLASSINFO_UI_EVENT_MAP_ENTRIES
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index d65f6060cbaf..cf910eccca90 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -136,9 +136,7 @@ DOMCI_CLASS(XPathNSResolver)
 DOMCI_CLASS(XPathResult)
 
 // WhatWG WebApps Objects
-DOMCI_CLASS(StorageObsolete)
 DOMCI_CLASS(Storage)
-DOMCI_CLASS(StorageItem)
 
 DOMCI_CLASS(XULCommandEvent)
 DOMCI_CLASS(CommandEvent)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index dd6436922796..d2d9dcb2f4d5 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -18,12 +18,15 @@
 #include "nsPerformance.h"
 #include "nsDOMNavigationTiming.h"
 #include "nsBarProps.h"
-#include "nsDOMStorage.h"
+#include "nsIDOMStorage.h"
+#include "nsIDOMStorageManager.h"
+#include "DOMStorage.h"
 #include "nsDOMOfflineResourceList.h"
 #include "nsError.h"
 #include "nsIIdleService.h"
 #include "nsIPowerManagerService.h"
 #include "nsISizeOfEventTarget.h"
+#include "nsIPermissionManager.h"
 
 #ifdef XP_WIN
 #ifdef GetClassName
@@ -2520,9 +2523,38 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
     }
   }
 
+  PreloadLocalStorage();
+
   return NS_OK;
 }
 
+void
+nsGlobalWindow::PreloadLocalStorage()
+{
+  if (!Preferences::GetBool(kStorageEnabled)) {
+    return;
+  }
+
+  if (IsChromeWindow()) {
+    return;
+  }
+
+  nsIPrincipal* principal = GetPrincipal();
+  if (!principal) {
+    return;
+  }
+
+  nsresult rv;
+
+  nsCOMPtr<nsIDOMStorageManager> storageManager =
+    do_GetService("@mozilla.org/dom/localStorage-manager;1", &rv);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  storageManager->PrecacheStorage(principal);
+}
+
 void
 nsGlobalWindow::DispatchDOMWindowCreated()
 {
@@ -2708,19 +2740,6 @@ nsGlobalWindow::DetachFromDocShell()
 
   MaybeForgiveSpamCount();
   CleanUp(false);
-
-    if (mLocalStorage) {
-      nsCOMPtr<nsIPrivacyTransitionObserver> obs = do_GetInterface(mLocalStorage);
-      if (obs) {
-        mDocShell->AddWeakPrivacyTransitionObserver(obs);
-      }
-    }
-    if (mSessionStorage) {
-      nsCOMPtr<nsIPrivacyTransitionObserver> obs = do_GetInterface(mSessionStorage);
-      if (obs) {
-        mDocShell->AddWeakPrivacyTransitionObserver(obs);
-      }
-    }
 }
 
 void
@@ -8826,7 +8845,7 @@ nsGlobalWindow::GetSessionStorage(nsIDOMStorage ** aSessionStorage)
                    "window %x owned sessionStorage "
                    "that could not be accessed!");
       if (!canAccess) {
-          mSessionStorage = nullptr;
+        mSessionStorage = nullptr;
       }
     }
   }
@@ -8840,7 +8859,7 @@ nsGlobalWindow::GetSessionStorage(nsIDOMStorage ** aSessionStorage)
     }
 
     // If the document has the sandboxed origin flag set
-    // don't allow access to localStorage.
+    // don't allow access to sessionStorage.
     if (!mDoc) {
       return NS_ERROR_FAILURE;
     }
@@ -8849,10 +8868,17 @@ nsGlobalWindow::GetSessionStorage(nsIDOMStorage ** aSessionStorage)
       return NS_ERROR_DOM_SECURITY_ERR;
     }
 
-    nsresult rv = docShell->GetSessionStorageForPrincipal(principal,
-                                                          documentURI,
-                                                          true,
-                                                          getter_AddRefs(mSessionStorage));
+    nsresult rv;
+
+    nsCOMPtr<nsIDOMStorageManager> storageManager = do_QueryInterface(docShell, &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
+
+    rv = storageManager->CreateStorage(principal,
+                                       documentURI,
+                                       loadContext && loadContext->UsePrivateBrowsing(),
+                                       getter_AddRefs(mSessionStorage));
     NS_ENSURE_SUCCESS(rv, rv);
 
 #ifdef PR_LOGGING
@@ -8864,17 +8890,12 @@ nsGlobalWindow::GetSessionStorage(nsIDOMStorage ** aSessionStorage)
     if (!mSessionStorage) {
       return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
     }
-
-    nsCOMPtr<nsIPrivacyTransitionObserver> obs = do_GetInterface(mSessionStorage);
-    if (obs) {
-      docShell->AddWeakPrivacyTransitionObserver(obs);
-    }
   }
 
 #ifdef PR_LOGGING
-    if (PR_LOG_TEST(gDOMLeakPRLog, PR_LOG_DEBUG)) {
-      PR_LogPrint("nsGlobalWindow %p returns %p sessionStorage", this, mSessionStorage.get());
-    }
+  if (PR_LOG_TEST(gDOMLeakPRLog, PR_LOG_DEBUG)) {
+    PR_LogPrint("nsGlobalWindow %p returns %p sessionStorage", this, mSessionStorage.get());
+  }
 #endif
 
   NS_ADDREF(*aSessionStorage = mSessionStorage);
@@ -8898,41 +8919,38 @@ nsGlobalWindow::GetLocalStorage(nsIDOMStorage ** aLocalStorage)
 
     nsresult rv;
 
-    if (!nsDOMStorage::CanUseStorage())
+    if (!DOMStorage::CanUseStorage()) {
       return NS_ERROR_DOM_SECURITY_ERR;
+    }
 
     nsIPrincipal *principal = GetPrincipal();
-    if (!principal)
+    if (!principal) {
       return NS_OK;
+    }
 
     nsCOMPtr<nsIDOMStorageManager> storageManager =
-      do_GetService("@mozilla.org/dom/storagemanager;1", &rv);
+      do_GetService("@mozilla.org/dom/localStorage-manager;1", &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    nsString documentURI;
-    if (mDocument) {
-      mDocument->GetDocumentURI(documentURI);
-    }
-
     // If the document has the sandboxed origin flag set
     // don't allow access to localStorage.
     if (mDoc && (mDoc->GetSandboxFlags() & SANDBOXED_ORIGIN)) {
       return NS_ERROR_DOM_SECURITY_ERR;
     }
 
+    nsString documentURI;
+    if (mDocument) {
+      mDocument->GetDocumentURI(documentURI);
+    }
+
     nsIDocShell* docShell = GetDocShell();
     nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
 
-    rv = storageManager->GetLocalStorageForPrincipal(principal,
-                                                     documentURI,
-                                                     loadContext && loadContext->UsePrivateBrowsing(),
-                                                     getter_AddRefs(mLocalStorage));
+    rv = storageManager->CreateStorage(principal,
+                                       documentURI,
+                                       loadContext && loadContext->UsePrivateBrowsing(),
+                                       getter_AddRefs(mLocalStorage));
     NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsIPrivacyTransitionObserver> obs = do_GetInterface(mLocalStorage);
-    if (obs && docShell) {
-      docShell->AddWeakPrivacyTransitionObserver(obs);
-    }
   }
 
   NS_ADDREF(*aLocalStorage = mLocalStorage);
@@ -9506,8 +9524,13 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
     rv = event->GetStorageArea(getter_AddRefs(changingStorage));
     NS_ENSURE_SUCCESS(rv, rv);
 
+    bool fireMozStorageChanged = false;
+    principal = GetPrincipal();
+    if (!principal) {
+      return NS_OK;
+    }
+
     nsCOMPtr<nsPIDOMStorage> pistorage = do_QueryInterface(changingStorage);
-    nsPIDOMStorage::nsDOMStorageType storageType = pistorage->StorageType();
 
     nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(GetDocShell());
     bool isPrivate = loadContext && loadContext->UsePrivateBrowsing();
@@ -9515,28 +9538,21 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
       return NS_OK;
     }
 
-    bool fireMozStorageChanged = false;
-    principal = GetPrincipal();
-    switch (storageType)
+    switch (pistorage->GetType())
     {
     case nsPIDOMStorage::SessionStorage:
     {
-      nsCOMPtr<nsIDOMStorage> storage = mSessionStorage;
-      if (!storage) {
-        nsIDocShell* docShell = GetDocShell();
-        if (principal && docShell) {
-          // No need to pass documentURI here, it's only needed when we want
-          // to create a new storage, the third paramater would be true
-          docShell->GetSessionStorageForPrincipal(principal,
-                                                  EmptyString(),
-                                                  false,
-                                                  getter_AddRefs(storage));
-        }
+      bool check = false;
+
+      nsCOMPtr<nsIDOMStorageManager> storageManager = do_QueryInterface(GetDocShell());
+      if (storageManager) {
+        rv = storageManager->CheckStorage(principal, changingStorage, &check);
+        NS_ENSURE_SUCCESS(rv, rv);
       }
 
-      if (!pistorage->IsForkOf(storage)) {
-        // This storage event is coming from a different doc shell,
-        // i.e. it is a clone, ignore this event.
+      if (!check) {
+        // This storage event is not coming from our storage or is coming
+        // from a different docshell, i.e. it is a clone, ignore this event.
         return NS_OK;
       }
 
@@ -9549,13 +9565,14 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
       fireMozStorageChanged = SameCOMIdentity(mSessionStorage, changingStorage);
       break;
     }
+
     case nsPIDOMStorage::LocalStorage:
     {
       // Allow event fire only for the same principal storages
       // XXX We have to use EqualsIgnoreDomain after bug 495337 lands
-      nsIPrincipal *storagePrincipal = pistorage->Principal();
-      bool equals;
+      nsIPrincipal* storagePrincipal = pistorage->GetPrincipal();
 
+      bool equals = false;
       rv = storagePrincipal->Equals(principal, &equals);
       NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 806af650eeb6..0684c4b8c2f0 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -46,7 +46,6 @@
 #include "nsRect.h"
 #include "mozFlushType.h"
 #include "prclist.h"
-#include "nsIDOMStorageObsolete.h"
 #include "nsIDOMStorageEvent.h"
 #include "nsIDOMStorageIndexedDB.h"
 #include "nsIDOMOfflineResourceList.h"
@@ -1022,6 +1021,8 @@ protected:
                                   bool aDefaultStylesOnly,
                                   nsIDOMCSSStyleDeclaration** aReturn);
 
+  void PreloadLocalStorage();
+
   // When adding new member variables, be careful not to create cycles
   // through JavaScript.  If there is any chance that a member variable
   // could own objects that are implemented in JavaScript, then those
diff --git a/dom/indexedDB/CheckPermissionsHelper.cpp b/dom/indexedDB/CheckPermissionsHelper.cpp
index fce1f55f6d97..8c1bcd9b7491 100644
--- a/dom/indexedDB/CheckPermissionsHelper.cpp
+++ b/dom/indexedDB/CheckPermissionsHelper.cpp
@@ -17,7 +17,6 @@
 
 #include "CheckQuotaHelper.h"
 #include "nsContentUtils.h"
-#include "nsDOMStorage.h"
 #include "nsNetUtil.h"
 #include "nsThreadUtils.h"
 #include "mozilla/dom/quota/QuotaManager.h"
diff --git a/dom/interfaces/storage/moz.build b/dom/interfaces/storage/moz.build
index 69001ea6fbf4..31466faf6dfe 100644
--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@@ -8,9 +8,7 @@ XPIDL_SOURCES += [
     'nsIDOMStorage.idl',
     'nsIDOMStorageEvent.idl',
     'nsIDOMStorageIndexedDB.idl',
-    'nsIDOMStorageItem.idl',
     'nsIDOMStorageManager.idl',
-    'nsIDOMStorageObsolete.idl',
     'nsIDOMToString.idl',
 ]
 
diff --git a/dom/interfaces/storage/nsIDOMStorageItem.idl b/dom/interfaces/storage/nsIDOMStorageItem.idl
deleted file mode 100644
index dc0d349f3e6b..000000000000
--- a/dom/interfaces/storage/nsIDOMStorageItem.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "domstubs.idl"
-
-/**
- * Interface for a client side storage item. See
- * http://www.whatwg.org/specs/web-apps/current-work/#scs-client-side
- * for more information.
- *
- * A respresentation of a storage object item.
- */
-
-[scriptable, uuid(0CC37C78-4C5F-48E1-ADFC-7480B8FE9DC4)]
-interface nsIDOMStorageItem : nsISupports
-{
-  /**
-   * Indicates whether a key is available only in a secure context.
-   */
-  attribute boolean secure;
-
-  /**
-   * The value associated with the item.
-   */
-  attribute DOMString value;
-};
diff --git a/dom/interfaces/storage/nsIDOMStorageManager.idl b/dom/interfaces/storage/nsIDOMStorageManager.idl
index 67bea890b970..a839fb681798 100644
--- a/dom/interfaces/storage/nsIDOMStorageManager.idl
+++ b/dom/interfaces/storage/nsIDOMStorageManager.idl
@@ -8,23 +8,89 @@
 interface nsIDOMStorage;
 interface nsIPrincipal;
 
-[scriptable, uuid(b16b207c-d883-43f5-a27e-548e7f2f5c20)]
+/**
+ * General purpose interface that has two implementations, for localStorage
+ * resp. sessionStorage with "@mozilla.org/dom/localStorage-manager;1" resp.
+ * "@mozilla.org/dom/sessionStorage-manager;1" contract IDs.
+ */
+[scriptable, uuid(8096f9ea-fa61-4960-b5d7-fb30ac42c8d8)]
 interface nsIDOMStorageManager : nsISupports
 {
   /**
-   * Return the amount of disk space used by a domain.  Usage is checked
-   * against the domain of the page that set the key (the owner domain), not
-   * the domain of the storage object.
-   *
-   * @param aOwnerDomain The domain to check.
-   * @returns the space usage of the domain, in bytes.
+   * This starts async preloading of a storage cache for scope
+   * defined by the principal.
    */
-  long getUsage(in AString aOwnerDomain);
+  void precacheStorage(in nsIPrincipal aPrincipal);
 
   /**
+   * Returns instance of DOM storage object for given principal.
+   * A new object is always returned and it is ensured there is
+   * a storage for the scope created.
+   *
+   * @param aPrincipal
+   *    Principal to bound storage to.
+   * @param aDocumentURI
+   *    URL of the demanding document, used for DOM storage event only.
+   * @param aPrivate
+   *    Whether the demanding document is running in Private Browsing mode or not.
+   */
+  nsIDOMStorage createStorage(in nsIPrincipal aPrincipal,
+                              in DOMString aDocumentURI,
+                              [optional] in bool aPrivate);
+  /**
+   * Returns instance of DOM storage object for given principal.
+   * If there is no storage managed for the scope, then null is returned and
+   * no object is created.  Otherwise, an object (new) for the existing storage
+   * scope is returned.
+   *
+   * @param aPrincipal
+   *    Principal to bound storage to.
+   * @param aPrivate
+   *    Whether the demanding document is running in Private Browsing mode or not.
+   */
+  nsIDOMStorage getStorage(in nsIPrincipal aPrincipal,
+                           [optional] in bool aPrivate);
+
+  /**
+   * Clones given storage into this storage manager.
+   *
+   * @param aStorageToCloneFrom
+   *    The storage to copy all items from into this manager.  Manager will then
+   *    return a new and independent object that contains snapshot of data from
+   *    the moment this method was called.  Modification to this new object will
+   *    not affect the original storage content we cloned from and vice versa.
+   */
+  void cloneStorage(in nsIDOMStorage aStorageToCloneFrom);
+
+  /**
+   * Returns true if the storage belongs to the given principal and is managed
+   * (i.e. has been created and is cached) by this storage manager.
+   *
+   * @param aPrincipal
+   *    Principal to check the storage against.
+   * @param aStorage
+   *    The storage object to examine.
+   *
+   * @result
+   *    true when the storage object is bound with the principal and is managed
+   *         by this storage manager.
+   *    false otherwise
+   */
+  bool checkStorage(in nsIPrincipal aPrincipal,
+                    in nsIDOMStorage aStorage);
+
+  /**
+   * @deprecated
+   *
    * Returns instance of localStorage object for aURI's origin.
    * This method ensures there is always only a single instance
    * for a single origin.
+   *
+   * Currently just forwards to the createStorage method of this
+   * interface.
+   *
+   * Extension developers are strongly encouraged to use getStorage
+   * or createStorage method instead.
    */
   nsIDOMStorage getLocalStorageForPrincipal(in nsIPrincipal aPrincipal,
                                             in DOMString aDocumentURI,
diff --git a/dom/interfaces/storage/nsIDOMStorageObsolete.idl b/dom/interfaces/storage/nsIDOMStorageObsolete.idl
deleted file mode 100644
index f196ac5ab2c0..000000000000
--- a/dom/interfaces/storage/nsIDOMStorageObsolete.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "domstubs.idl"
-
-/**
- * Interface for client side storage. See
- * http://www.whatwg.org/specs/web-apps/current-work/#scs-client-side
- * for more information.
- *
- * A storage object stores an arbitrary set of key-value pairs, which
- * may be retrieved, modified and removed as needed. A key may only
- * exist once within a storage object, and only one value may be
- * associated with a particular key. Keys are stored in a particular
- * order with the condition that this order not change by merely changing
- * the value associated with a key, but the order may change when a
- * key is added or removed.
- */
-
-interface nsIDOMStorageItem;
-
-[scriptable, uuid(18013CF9-B104-49cf-9484-C2A7A845457E)]
-interface nsIDOMStorageObsolete : nsISupports
-{
-  /**
-   * The number of keys stored.
-   */
-  readonly attribute unsigned long length;
-
-  /**
-   * Retrieve the name of the key at a particular index.
-   *
-   * @param index index of the item to retrieve
-   * @returns the key at index
-   * @throws INDEX_SIZE_ERR if there is no key at that index
-   */
-  DOMString key(in unsigned long index);
-
-  /**
-   * Retrieve an item with a given key
-   *
-   * @param key key to retrieve
-   * @returns found item or null if the key was not found
-   */
-  nsIDOMStorageItem getItem(in DOMString key);
-
-  /**
-   * Assign a value with a key. If the key does not exist already, a new
-   * key is added associated with that value. If the key already exists,
-   * then the existing value is replaced with a new value.
-   *
-   * @param key key to set
-   * @param data data to associate with the key
-   */
-  void setItem(in DOMString key, in DOMString data);
-
-  /**
-   * Remove a key and its corresponding value.
-   *
-   * @param key key to remove
-   */
-  void removeItem(in DOMString key);
-};
diff --git a/dom/interfaces/storage/nsPIDOMStorage.h b/dom/interfaces/storage/nsPIDOMStorage.h
index 9d0fe8170449..f9ca9a3cb42d 100644
--- a/dom/interfaces/storage/nsPIDOMStorage.h
+++ b/dom/interfaces/storage/nsPIDOMStorage.h
@@ -8,43 +8,44 @@
 #define __nsPIDOMStorage_h_
 
 #include "nsISupports.h"
+#include "nsString.h"
 #include "nsTArray.h"
 
-class nsIDOMStorageObsolete;
-class nsIURI;
 class nsIPrincipal;
 
+namespace mozilla {
+namespace dom {
+
+class DOMStorageCache;
+class DOMStorageManager;
+
+} // ::dom
+} // ::mozilla
+
+// {09198A51-5D27-4992-97E4-38A9CEA2A65D}
 #define NS_PIDOMSTORAGE_IID \
-{ 0x9c292365, 0x6ae4, 0x461b,                           \
-  { 0x86, 0x98, 0xf5, 0x23, 0x6f, 0xfa, 0xd2, 0x30 } }
+  { 0x9198a51, 0x5d27, 0x4992, \
+    { 0x97, 0xe4, 0x38, 0xa9, 0xce, 0xa2, 0xa6, 0x5d } }
 
 class nsPIDOMStorage : public nsISupports
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_PIDOMSTORAGE_IID)
 
-  typedef enum {
-    Unknown = 0,
+  enum StorageType {
     LocalStorage = 1,
     SessionStorage = 2
-  } nsDOMStorageType;
+  };
 
-  virtual nsresult InitAsSessionStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                        bool aPrivate) = 0;
-  virtual nsresult InitAsLocalStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                      bool aPrivate) = 0;
+  virtual StorageType GetType() const = 0;
+  virtual mozilla::dom::DOMStorageManager* GetManager() const = 0;
+  virtual const mozilla::dom::DOMStorageCache* GetCache() const = 0;
 
-  virtual already_AddRefed<nsIDOMStorage> Clone() = 0;
-  virtual already_AddRefed<nsIDOMStorage> Fork(const nsSubstring &aDocumentURI) = 0;
-  virtual bool IsForkOf(nsIDOMStorage* aThat) = 0;
+  virtual nsTArray<nsString>* GetKeys() = 0;
 
-  virtual nsTArray<nsString> *GetKeys() = 0;
-
-  virtual nsIPrincipal* Principal() = 0;
+  virtual nsIPrincipal* GetPrincipal() = 0;
+  virtual bool PrincipalEquals(nsIPrincipal* principal) = 0;
   virtual bool CanAccess(nsIPrincipal *aPrincipal) = 0;
-
-  virtual nsDOMStorageType StorageType() = 0;
-
   virtual bool IsPrivate() = 0;
 };
 
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 6086c0e417b0..1e86af0b3092 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -19,7 +19,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/ExternalHelperAppChild.h"
 #include "mozilla/dom/PCrashReporterChild.h"
-#include "mozilla/dom/StorageChild.h"
+#include "mozilla/dom/DOMStorageIPC.h"
 #include "mozilla/Hal.h"
 #include "mozilla/hal_sandbox/PHalChild.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
@@ -839,7 +839,7 @@ ContentChild::DeallocPSms(PSmsChild* aSms)
 }
 
 PStorageChild*
-ContentChild::AllocPStorage(const StorageConstructData& aData)
+ContentChild::AllocPStorage()
 {
     NS_NOTREACHED("We should never be manually allocating PStorageChild actors");
     return nullptr;
@@ -848,7 +848,7 @@ ContentChild::AllocPStorage(const StorageConstructData& aData)
 bool
 ContentChild::DeallocPStorage(PStorageChild* aActor)
 {
-    StorageChild* child = static_cast<StorageChild*>(aActor);
+    DOMStorageDBChild* child = static_cast<DOMStorageDBChild*>(aActor);
     child->ReleaseIPDLReference();
     return true;
 }
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index f3e115b83839..af28f8c36ef8 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -142,7 +142,7 @@ public:
     virtual PSmsChild* AllocPSms();
     virtual bool DeallocPSms(PSmsChild*);
 
-    virtual PStorageChild* AllocPStorage(const StorageConstructData& aData);
+    virtual PStorageChild* AllocPStorage();
     virtual bool DeallocPStorage(PStorageChild* aActor);
 
     virtual PBluetoothChild* AllocPBluetooth();
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index afb0aaf385e5..ea2fc83feb8f 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -29,7 +29,7 @@
 #include "mozilla/dom/ExternalHelperAppParent.h"
 #include "mozilla/dom/PMemoryReportRequestParent.h"
 #include "mozilla/dom/power/PowerManagerService.h"
-#include "mozilla/dom/StorageParent.h"
+#include "mozilla/dom/DOMStorageIPC.h"
 #include "mozilla/dom/bluetooth/PBluetoothParent.h"
 #include "mozilla/dom/devicestorage/DeviceStorageRequestParent.h"
 #include "SmsParent.h"
@@ -1969,15 +1969,16 @@ ContentParent::DeallocPSms(PSmsParent* aSms)
 }
 
 PStorageParent*
-ContentParent::AllocPStorage(const StorageConstructData& aData)
+ContentParent::AllocPStorage()
 {
-    return new StorageParent(aData);
+    return new DOMStorageDBParent();
 }
 
 bool
 ContentParent::DeallocPStorage(PStorageParent* aActor)
 {
-    delete aActor;
+    DOMStorageDBParent* child = static_cast<DOMStorageDBParent*>(aActor);
+    child->ReleaseIPDLReference();
     return true;
 }
 
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 598b39a84b5d..a12d9f76a0c6 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -285,7 +285,7 @@ private:
     virtual PSmsParent* AllocPSms();
     virtual bool DeallocPSms(PSmsParent*);
 
-    virtual PStorageParent* AllocPStorage(const StorageConstructData& aData);
+    virtual PStorageParent* AllocPStorage();
     virtual bool DeallocPStorage(PStorageParent* aActor);
 
     virtual PBluetoothParent* AllocPBluetooth();
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index 5756a7d1ba69..f3a5064a3d24 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -50,23 +50,6 @@ using gfxIntSize;
 namespace mozilla {
 namespace dom {
 
-// Data required to clone an existing DOMStorageImpl in the parent
-struct StorageClone
-{
-    // Existing cross-process storage actor to clone
-    PStorage actor;
-    // Result of calling IsCallerSecure() in the child
-    bool callerSecure;
-};
-
-// When creating a new PStorage protocol, an existing one can be
-// cloned (see nsDOMStorage2::Clone)
-union StorageConstructData
-{
-    null_t;
-    StorageClone;
-};
-
 struct FontListEntry {
     nsString  familyName;
     nsString  faceName;
@@ -401,7 +384,7 @@ parent:
 
     PSpeechSynthesis();
 
-    PStorage(StorageConstructData data);
+    PStorage();
 
     PBluetooth();
 
diff --git a/dom/src/storage/DOMStorage.cpp b/dom/src/storage/DOMStorage.cpp
new file mode 100644
index 000000000000..20a69a7a4b0c
--- /dev/null
+++ b/dom/src/storage/DOMStorage.cpp
@@ -0,0 +1,353 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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 "DOMStorage.h"
+#include "DOMStorageCache.h"
+#include "DOMStorageManager.h"
+
+#include "nsIDOMStorageEvent.h"
+#include "nsIObserverService.h"
+#include "nsIScriptSecurityManager.h"
+#include "nsIPermissionManager.h"
+#include "nsIPrincipal.h"
+#include "nsICookiePermission.h"
+
+#include "nsDOMClassInfoID.h"
+#include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
+#include "GeneratedEvents.h"
+#include "nsThreadUtils.h"
+#include "nsContentUtils.h"
+#include "nsServiceManagerUtils.h"
+
+DOMCI_DATA(Storage, mozilla::dom::DOMStorage)
+
+namespace mozilla {
+namespace dom {
+
+NS_IMPL_ADDREF(DOMStorage)
+NS_IMPL_RELEASE(DOMStorage)
+
+NS_INTERFACE_MAP_BEGIN(DOMStorage)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorage)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMStorage)
+  NS_INTERFACE_MAP_ENTRY(nsPIDOMStorage)
+  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Storage)
+NS_INTERFACE_MAP_END
+
+DOMStorage::DOMStorage(DOMStorageManager* aManager,
+                       DOMStorageCache* aCache,
+                       const nsAString& aDocumentURI,
+                       nsIPrincipal* aPrincipal,
+                       bool aIsPrivate)
+: mManager(aManager)
+, mCache(aCache)
+, mDocumentURI(aDocumentURI)
+, mPrincipal(aPrincipal)
+, mIsPrivate(aIsPrivate)
+, mIsSessionOnly(false)
+{
+  mCache->Preload();
+}
+
+DOMStorage::~DOMStorage()
+{
+  mCache->KeepAlive();
+}
+
+// nsIDOMStorage (web content public API implementation)
+
+NS_IMETHODIMP
+DOMStorage::GetLength(uint32_t* aLength)
+{
+  if (!CanUseStorage(this)) {
+    return NS_ERROR_DOM_SECURITY_ERR;
+  }
+
+  return mCache->GetLength(this, aLength);
+}
+
+NS_IMETHODIMP
+DOMStorage::Key(uint32_t aIndex, nsAString& aRetval)
+{
+  if (!CanUseStorage(this)) {
+    return NS_ERROR_DOM_SECURITY_ERR;
+  }
+
+  return mCache->GetKey(this, aIndex, aRetval);
+}
+
+NS_IMETHODIMP
+DOMStorage::GetItem(const nsAString& aKey, nsAString& aRetval)
+{
+  if (!CanUseStorage(this)) {
+    return NS_ERROR_DOM_SECURITY_ERR;
+  }
+
+  return mCache->GetItem(this, aKey, aRetval);
+}
+
+NS_IMETHODIMP
+DOMStorage::SetItem(const nsAString& aKey, const nsAString& aData)
+{
+  if (!CanUseStorage(this)) {
+    return NS_ERROR_DOM_SECURITY_ERR;
+  }
+
+  Telemetry::Accumulate(GetType() == LocalStorage
+      ? Telemetry::LOCALDOMSTORAGE_KEY_SIZE_BYTES
+      : Telemetry::SESSIONDOMSTORAGE_KEY_SIZE_BYTES, aKey.Length());
+  Telemetry::Accumulate(GetType() == LocalStorage
+      ? Telemetry::LOCALDOMSTORAGE_VALUE_SIZE_BYTES
+      : Telemetry::SESSIONDOMSTORAGE_VALUE_SIZE_BYTES, aData.Length());
+
+  nsString old;
+  nsresult rv = mCache->SetItem(this, aKey, nsString(aData), old);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  if (rv != NS_SUCCESS_DOM_NO_OPERATION) {
+    BroadcastChangeNotification(aKey, old, aData);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DOMStorage::RemoveItem(const nsAString& aKey)
+{
+  if (!CanUseStorage(this)) {
+    return NS_ERROR_DOM_SECURITY_ERR;
+  }
+
+  nsAutoString old;
+  nsresult rv = mCache->RemoveItem(this, aKey, old);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  if (rv != NS_SUCCESS_DOM_NO_OPERATION) {
+    BroadcastChangeNotification(aKey, old, NullString());
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DOMStorage::Clear()
+{
+  if (!CanUseStorage(this)) {
+    return NS_ERROR_DOM_SECURITY_ERR;
+  }
+
+  nsresult rv = mCache->Clear(this);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  if (rv != NS_SUCCESS_DOM_NO_OPERATION) {
+    BroadcastChangeNotification(NullString(), NullString(), NullString());
+  }
+
+  return NS_OK;
+}
+
+namespace {
+
+class StorageNotifierRunnable : public nsRunnable
+{
+public:
+  StorageNotifierRunnable(nsISupports* aSubject)
+    : mSubject(aSubject)
+  { }
+
+  NS_DECL_NSIRUNNABLE
+
+private:
+  nsCOMPtr<nsISupports> mSubject;
+};
+
+NS_IMETHODIMP
+StorageNotifierRunnable::Run()
+{
+  nsCOMPtr<nsIObserverService> observerService =
+    mozilla::services::GetObserverService();
+  if (observerService) {
+    observerService->NotifyObservers(mSubject, "dom-storage2-changed", nullptr);
+  }
+  return NS_OK;
+}
+
+} // anonymous namespace
+
+void
+DOMStorage::BroadcastChangeNotification(const nsSubstring& aKey,
+                                        const nsSubstring& aOldValue,
+                                        const nsSubstring& aNewValue)
+{
+  nsCOMPtr<nsIDOMEvent> domEvent;
+  // Note, this DOM event should never reach JS. It is cloned later in
+  // nsGlobalWindow.
+  NS_NewDOMStorageEvent(getter_AddRefs(domEvent), nullptr, nullptr, nullptr);
+
+  nsCOMPtr<nsIDOMStorageEvent> event = do_QueryInterface(domEvent);
+  nsresult rv = event->InitStorageEvent(NS_LITERAL_STRING("storage"),
+                                        false,
+                                        false,
+                                        aKey,
+                                        aOldValue,
+                                        aNewValue,
+                                        mDocumentURI,
+                                        static_cast<nsIDOMStorage*>(this));
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  nsRefPtr<StorageNotifierRunnable> r = new StorageNotifierRunnable(event);
+  NS_DispatchToMainThread(r);
+}
+
+static const uint32_t ASK_BEFORE_ACCEPT = 1;
+static const uint32_t ACCEPT_SESSION = 2;
+static const uint32_t BEHAVIOR_REJECT = 2;
+
+static const char kPermissionType[] = "cookie";
+static const char kStorageEnabled[] = "dom.storage.enabled";
+static const char kCookiesBehavior[] = "network.cookie.cookieBehavior";
+static const char kCookiesLifetimePolicy[] = "network.cookie.lifetimePolicy";
+
+// static, public
+bool
+DOMStorage::CanUseStorage(DOMStorage* aStorage)
+{
+  // This method is responsible for correct setting of mIsSessionOnly.
+  // It doesn't work with mIsPrivate flag at all, since it is checked
+  // regardless mIsSessionOnly flag in DOMStorageCache code.
+  if (aStorage) {
+    aStorage->mIsSessionOnly = false;
+  }
+
+  if (!mozilla::Preferences::GetBool(kStorageEnabled)) {
+    return false;
+  }
+
+  // chrome can always use aStorage regardless of permission preferences
+  if (nsContentUtils::IsCallerChrome()) {
+    return true;
+  }
+
+  nsCOMPtr<nsIPrincipal> subjectPrincipal;
+  nsresult rv = nsContentUtils::GetSecurityManager()->
+                  GetSubjectPrincipal(getter_AddRefs(subjectPrincipal));
+  NS_ENSURE_SUCCESS(rv, false);
+
+  // if subjectPrincipal were null we'd have returned after
+  // IsCallerChrome().
+
+  nsCOMPtr<nsIPermissionManager> permissionManager =
+    do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
+  if (!permissionManager) {
+    return false;
+  }
+
+  uint32_t perm;
+  permissionManager->TestPermissionFromPrincipal(subjectPrincipal,
+                                                 kPermissionType, &perm);
+
+  if (perm == nsIPermissionManager::DENY_ACTION) {
+    return false;
+  }
+
+  if (perm == nsICookiePermission::ACCESS_SESSION) {
+    if (aStorage) {
+      aStorage->mIsSessionOnly = true;
+    }
+  } else if (perm != nsIPermissionManager::ALLOW_ACTION) {
+    uint32_t cookieBehavior = Preferences::GetUint(kCookiesBehavior);
+    uint32_t lifetimePolicy = Preferences::GetUint(kCookiesLifetimePolicy);
+
+    // Treat "ask every time" as "reject always".
+    if ((cookieBehavior == BEHAVIOR_REJECT || lifetimePolicy == ASK_BEFORE_ACCEPT)) {
+      return false;
+    }
+
+    if (lifetimePolicy == ACCEPT_SESSION && aStorage) {
+      aStorage->mIsSessionOnly = true;
+    }
+  }
+
+  if (aStorage) {
+    return aStorage->CanAccess(subjectPrincipal);
+  }
+
+  return true;
+}
+
+// nsPIDOMStorage
+
+nsPIDOMStorage::StorageType
+DOMStorage::GetType() const
+{
+  return mManager->Type();
+}
+
+nsIPrincipal*
+DOMStorage::GetPrincipal()
+{
+  return mPrincipal;
+}
+
+// Defined in DOMStorageManager.cpp
+extern bool
+PrincipalsEqual(nsIPrincipal* aObjectPrincipal, nsIPrincipal* aSubjectPrincipal);
+
+bool
+DOMStorage::PrincipalEquals(nsIPrincipal* aPrincipal)
+{
+  return PrincipalsEqual(mPrincipal, aPrincipal);
+}
+
+bool
+DOMStorage::CanAccess(nsIPrincipal* aPrincipal)
+{
+  // Allow C++ callers to access the storage
+  if (!aPrincipal) {
+    return true;
+  }
+
+  // For content, either the code base or domain must be the same.  When code
+  // base is the same, this is enough to say it is safe for a page to access
+  // this storage.
+
+  bool subsumes;
+  nsresult rv = aPrincipal->SubsumesIgnoringDomain(mPrincipal, &subsumes);
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+
+  if (!subsumes) {
+    nsresult rv = aPrincipal->Subsumes(mPrincipal, &subsumes);
+    if (NS_FAILED(rv)) {
+      return false;
+    }
+  }
+
+  return subsumes;
+}
+
+nsTArray<nsString>*
+DOMStorage::GetKeys()
+{
+  if (!CanUseStorage(this)) {
+    return new nsTArray<nsString>(); // return just an empty array
+  }
+
+  return mCache->GetKeys(this);
+}
+
+} // ::dom
+} // ::mozilla
diff --git a/dom/src/storage/DOMStorage.h b/dom/src/storage/DOMStorage.h
new file mode 100644
index 000000000000..af3645309d49
--- /dev/null
+++ b/dom/src/storage/DOMStorage.h
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef nsDOMStorage_h___
+#define nsDOMStorage_h___
+
+#include "nsIDOMStorage.h"
+#include "nsPIDOMStorage.h"
+#include "nsWeakReference.h"
+#include "nsAutoPtr.h"
+
+namespace mozilla {
+namespace dom {
+
+class DOMStorageManager;
+class DOMStorageCache;
+
+class DOMStorage MOZ_FINAL : public nsIDOMStorage
+                           , public nsPIDOMStorage
+                           , public nsSupportsWeakReference
+{
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIDOMSTORAGE
+
+  // nsPIDOMStorage
+  virtual StorageType GetType() const;
+  virtual DOMStorageManager* GetManager() const { return mManager; }
+  virtual const DOMStorageCache* GetCache() const { return mCache; }
+
+  virtual nsTArray<nsString>* GetKeys();
+  virtual nsIPrincipal* GetPrincipal();
+  virtual bool PrincipalEquals(nsIPrincipal* aPrincipal);
+  virtual bool CanAccess(nsIPrincipal* aPrincipal);
+  virtual bool IsPrivate() { return mIsPrivate; }
+
+  DOMStorage(DOMStorageManager* aManager,
+             DOMStorageCache* aCache,
+             const nsAString& aDocumentURI,
+             nsIPrincipal* aPrincipal,
+             bool aIsPrivate);
+  ~DOMStorage();
+
+  // The method checks whether the caller can use a storage.
+  // CanUseStorage is called before any DOM initiated operation
+  // on a storage is about to happen and ensures that the storage's
+  // session-only flag is properly set according the current settings.
+  // It is an optimization since the privileges check and session only
+  // state determination are complex and share the code (comes hand in
+  // hand together).
+  static bool CanUseStorage(DOMStorage* aStorage = nullptr);
+
+  bool IsPrivate() const { return mIsPrivate; }
+  bool IsSessionOnly() const { return mIsSessionOnly; }
+
+private:
+  friend class DOMStorageManager;
+  friend class DOMStorageCache;
+
+  nsRefPtr<DOMStorageManager> mManager;
+  nsRefPtr<DOMStorageCache> mCache;
+  nsString mDocumentURI;
+
+  // Principal this DOMStorage (i.e. localStorage or sessionStorage) has
+  // been created for
+  nsCOMPtr<nsIPrincipal> mPrincipal;
+
+  // Whether this storage is running in private-browsing window.
+  bool mIsPrivate : 1;
+
+  // Whether storage is set to persist data only per session, may change
+  // dynamically and is set by CanUseStorage function that is called
+  // before any operation on the storage.
+  bool mIsSessionOnly : 1;
+
+  void BroadcastChangeNotification(const nsSubstring& aKey,
+                                   const nsSubstring& aOldValue,
+                                   const nsSubstring& aNewValue);
+};
+
+} // ::dom
+} // ::mozilla
+
+#endif /* nsDOMStorage_h___ */
diff --git a/dom/src/storage/DOMStorageCache.cpp b/dom/src/storage/DOMStorageCache.cpp
new file mode 100644
index 000000000000..c2ac8409ca6b
--- /dev/null
+++ b/dom/src/storage/DOMStorageCache.cpp
@@ -0,0 +1,801 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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 "DOMStorageCache.h"
+
+#include "DOMStorage.h"
+#include "DOMStorageDBThread.h"
+#include "DOMStorageIPC.h"
+#include "DOMStorageManager.h"
+
+#include "nsDOMString.h"
+#include "nsXULAppAPI.h"
+#include "mozilla/unused.h"
+#include "nsProxyRelease.h"
+
+namespace mozilla {
+namespace dom {
+
+#define DOM_STORAGE_CACHE_KEEP_ALIVE_TIME_MS 20000
+
+// static
+DOMStorageDBBridge* DOMStorageCache::sDatabase = nullptr;
+
+namespace { // anon
+
+const uint32_t kDefaultSet = 0;
+const uint32_t kPrivateSet = 1;
+const uint32_t kSessionSet = 2;
+
+inline uint32_t
+GetDataSetIndex(bool aPrivate, bool aSessionOnly)
+{
+  if (aPrivate) {
+    return kPrivateSet;
+  }
+
+  if (aSessionOnly) {
+    return kSessionSet;
+  }
+
+  return kDefaultSet;
+}
+
+inline uint32_t
+GetDataSetIndex(const DOMStorage* aStorage)
+{
+  return GetDataSetIndex(aStorage->IsPrivate(), aStorage->IsSessionOnly());
+}
+
+} // anon
+
+// DOMStorageCacheBridge
+
+NS_IMPL_THREADSAFE_ADDREF(DOMStorageCacheBridge)
+
+// Since there is no consumer of return value of Release, we can turn this 
+// method to void to make implementation of asynchronous DOMStorageCache::Release
+// much simpler.
+NS_IMETHODIMP_(void) DOMStorageCacheBridge::Release(void)
+{
+  MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release");
+  nsrefcnt count = NS_AtomicDecrementRefcnt(mRefCnt);
+  NS_LOG_RELEASE(this, count, "DOMStorageCacheBridge");
+  if (0 == count) {
+    mRefCnt = 1; /* stabilize */
+    /* enable this to find non-threadsafe destructors: */
+    /* NS_ASSERT_OWNINGTHREAD(_class); */
+    delete (this);
+  }
+}
+
+// DOMStorageCache
+
+DOMStorageCache::DOMStorageCache(const nsACString* aScope)
+: mManager(nullptr)
+, mScope(*aScope)
+, mMonitor("DOMStorageCache")
+, mLoaded(false)
+, mLoadResult(NS_OK)
+, mInitialized(false)
+, mSessionOnlyDataSetActive(false)
+, mPreloadTelemetryRecorded(false)
+{
+  MOZ_COUNT_CTOR(DOMStorageCache);
+}
+
+DOMStorageCache::~DOMStorageCache()
+{
+  if (mManager) {
+    mManager->DropCache(this);
+  }
+
+  MOZ_COUNT_DTOR(DOMStorageCache);
+}
+
+NS_IMETHODIMP_(void)
+DOMStorageCache::Release(void)
+{
+  // We must actually release on the main thread since the cache removes it
+  // self from the manager's hash table.  And we don't want to lock access to
+  // that hash table.
+  if (NS_IsMainThread()) {
+    DOMStorageCacheBridge::Release();
+    return;
+  }
+
+  nsRefPtr<nsRunnableMethod<DOMStorageCacheBridge, void, false> > event =
+    NS_NewNonOwningRunnableMethod(static_cast<DOMStorageCacheBridge*>(this),
+                                  &DOMStorageCacheBridge::Release);
+
+  nsresult rv = NS_DispatchToMainThread(event);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("DOMStorageCache::Release() on a non-main thread");
+    DOMStorageCacheBridge::Release();
+  }
+}
+
+void
+DOMStorageCache::Init(DOMStorageManager* aManager,
+                      bool aPersistent,
+                      nsIPrincipal* aPrincipal,
+                      const nsACString& aQuotaScope)
+{
+  if (mInitialized) {
+    return;
+  }
+
+  mManager = aManager;
+  mInitialized = true;
+  mPrincipal = aPrincipal;
+  mPersistent = aPersistent;
+  mQuotaScope = aQuotaScope.IsEmpty() ? mScope : aQuotaScope;
+
+  if (mPersistent) {
+    Preload();
+  }
+}
+
+inline bool
+DOMStorageCache::Persist(const DOMStorage* aStorage) const
+{
+  return mPersistent &&
+         !aStorage->IsSessionOnly() &&
+         !aStorage->IsPrivate();
+}
+
+namespace { // anon
+
+PLDHashOperator
+CloneSetData(const nsAString& aKey, const nsString aValue, void* aArg)
+{
+  DOMStorageCache::Data* target = static_cast<DOMStorageCache::Data*>(aArg);
+  target->mKeys.Put(aKey, aValue);
+
+  return PL_DHASH_NEXT;
+}
+
+} // anon
+
+DOMStorageCache::Data&
+DOMStorageCache::DataSet(const DOMStorage* aStorage)
+{
+  uint32_t index = GetDataSetIndex(aStorage);
+
+  if (index == kSessionSet && !mSessionOnlyDataSetActive) {
+    // Session only data set is demanded but not filled with
+    // current data set, copy to session only set now.
+
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_SESSIONONLY_PRELOAD_BLOCKING_MS);
+
+    Data& defaultSet = mData[kDefaultSet];
+    Data& sessionSet = mData[kSessionSet];
+
+    defaultSet.mKeys.EnumerateRead(CloneSetData, &sessionSet);
+
+    mSessionOnlyDataSetActive = true;
+
+    // This updates sessionSet.mOriginQuotaUsage and also updates global usage
+    // for all session only data
+    ProcessUsageDelta(kSessionSet, defaultSet.mOriginQuotaUsage);
+  }
+
+  return mData[index];
+}
+
+bool
+DOMStorageCache::ProcessUsageDelta(const DOMStorage* aStorage, int64_t aDelta)
+{
+  return ProcessUsageDelta(GetDataSetIndex(aStorage), aDelta);
+}
+
+bool
+DOMStorageCache::ProcessUsageDelta(uint32_t aGetDataSetIndex, const int64_t aDelta)
+{
+  // Check limit per this origin
+  Data& data = mData[aGetDataSetIndex];
+  uint64_t newOriginUsage = data.mOriginQuotaUsage + aDelta;
+  if (aDelta > 0 && newOriginUsage > DOMStorageManager::GetQuota()) {
+    return false;
+  }
+
+  // Now check eTLD+1 limit
+  GetDatabase();
+  if (sDatabase) {
+    DOMStorageUsage* usage = sDatabase->GetScopeUsage(mQuotaScope);
+    if (!usage->CheckAndSetETLD1UsageDelta(aGetDataSetIndex, aDelta)) {
+      return false;
+    }
+  }
+
+  // Update size in our data set
+  data.mOriginQuotaUsage = newOriginUsage;
+  return true;
+}
+
+void
+DOMStorageCache::Preload()
+{
+  if (mLoaded || !mPersistent) {
+    return;
+  }
+
+  if (!StartDatabase()) {
+    mLoaded = true;
+    mLoadResult = NS_ERROR_FAILURE;
+    return;
+  }
+
+  sDatabase->AsyncPreload(this);
+  sDatabase->GetScopeUsage(mQuotaScope);
+}
+
+namespace { // anon
+
+// This class is passed to timer as a tick observer.  It refers the cache
+// and keeps it alive for a time.
+class DOMStorageCacheHolder : public nsITimerCallback
+{
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHODIMP
+  Notify(nsITimer* aTimer)
+  {
+    mCache = nullptr;
+    return NS_OK;
+  }
+
+  virtual ~DOMStorageCacheHolder() {}
+
+  nsRefPtr<DOMStorageCache> mCache;
+
+public:
+  DOMStorageCacheHolder(DOMStorageCache* aCache) : mCache(aCache) {}
+};
+
+NS_IMPL_ISUPPORTS1(DOMStorageCacheHolder, nsITimerCallback)
+
+} // anon
+
+void
+DOMStorageCache::KeepAlive()
+{
+  // Missing reference back to the manager means the cache is not responsible
+  // for its lifetime.  Used for keeping sessionStorage live forever.
+  if (!mManager) {
+    return;
+  }
+
+  if (!NS_IsMainThread()) {
+    // Timer and the holder must be initialized on the main thread.
+    nsRefPtr<nsRunnableMethod<DOMStorageCache> > event =
+      NS_NewRunnableMethod(this, &DOMStorageCache::KeepAlive);
+
+    NS_DispatchToMainThread(event);
+    return;
+  }
+
+  nsCOMPtr<nsITimer> timer = do_CreateInstance("@mozilla.org/timer;1");
+  if (!timer) {
+    return;
+  }
+
+  nsRefPtr<DOMStorageCacheHolder> holder = new DOMStorageCacheHolder(this);
+  timer->InitWithCallback(holder, DOM_STORAGE_CACHE_KEEP_ALIVE_TIME_MS,
+                          nsITimer::TYPE_ONE_SHOT);
+
+  mKeepAliveTimer.swap(timer);
+}
+
+namespace { // anon
+
+// The AutoTimer provided by telemetry headers is only using static,
+// i.e. compile time known ID, but here we know the ID only at run time.
+// Hence a new class.
+class TelemetryAutoTimer
+{
+public:
+  TelemetryAutoTimer(Telemetry::ID aId)
+    : id(aId), start(TimeStamp::Now()) {}
+  ~TelemetryAutoTimer()
+    { Telemetry::AccumulateDelta_impl<Telemetry::Millisecond>::compute(id, start); }
+private:
+  Telemetry::ID id;
+  const TimeStamp start;
+};
+
+} // anon
+
+void
+DOMStorageCache::WaitForPreload(Telemetry::ID aTelemetryID)
+{
+  if (!mPersistent) {
+    return;
+  }
+
+  bool loaded = mLoaded;
+
+  // Telemetry of rates of pending preloads
+  if (!mPreloadTelemetryRecorded) {
+    mPreloadTelemetryRecorded = true;
+    Telemetry::Accumulate(
+      Telemetry::LOCALDOMSTORAGE_PRELOAD_PENDING_ON_FIRST_ACCESS,
+      !loaded);
+  }
+
+  if (loaded) {
+    return;
+  }
+
+  // Measure which operation blocks and for how long
+  TelemetryAutoTimer timer(aTelemetryID);
+
+  // If preload already started (i.e. we got some first data, but not all)
+  // SyncPreload will just wait for it to finish rather then synchronously
+  // read from the database.  It seems to me more optimal.
+
+  // TODO place for A/B testing (force main thread load vs. let preload finish)
+  sDatabase->SyncPreload(this);
+}
+
+nsresult
+DOMStorageCache::GetLength(const DOMStorage* aStorage, uint32_t* aRetval)
+{
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_GETLENGTH_MS> autoTimer;
+
+  if (Persist(aStorage)) {
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_GETLENGTH_BLOCKING_MS);
+    if (NS_FAILED(mLoadResult)) {
+      return mLoadResult;
+    }
+  }
+
+  *aRetval = DataSet(aStorage).mKeys.Count();
+  return NS_OK;
+}
+
+namespace { // anon
+
+class IndexFinderData
+{
+public:
+  IndexFinderData(uint32_t aIndex, nsAString& aRetval)
+    : mIndex(aIndex), mKey(aRetval)
+  {
+    mKey.SetIsVoid(true);
+  }
+
+  uint32_t mIndex;
+  nsAString& mKey;
+};
+
+PLDHashOperator
+FindKeyOrder(const nsAString& aKey, const nsString aValue, void* aArg)
+{
+  IndexFinderData* data = static_cast<IndexFinderData*>(aArg);
+
+  if (data->mIndex--) {
+    return PL_DHASH_NEXT;
+  }
+
+  data->mKey = aKey;
+  return PL_DHASH_STOP;
+}
+
+} // anon
+
+nsresult
+DOMStorageCache::GetKey(const DOMStorage* aStorage, uint32_t aIndex, nsAString& aRetval)
+{
+  // XXX: This does a linear search for the key at index, which would
+  // suck if there's a large numer of indexes. Do we care? If so,
+  // maybe we need to have a lazily populated key array here or
+  // something?
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_GETKEY_MS> autoTimer;
+
+  if (Persist(aStorage)) {
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_GETKEY_BLOCKING_MS);
+    if (NS_FAILED(mLoadResult)) {
+      return mLoadResult;
+    }
+  }
+
+  IndexFinderData data(aIndex, aRetval);
+  DataSet(aStorage).mKeys.EnumerateRead(FindKeyOrder, &data);
+  return NS_OK;
+}
+
+namespace { // anon
+
+static PLDHashOperator
+KeysArrayBuilder(const nsAString& aKey, const nsString aValue, void* aArg)
+{
+  nsTArray<nsString>* keys = static_cast<nsTArray<nsString>* >(aArg);
+
+  keys->AppendElement(aKey);
+  return PL_DHASH_NEXT;
+}
+
+} // anon
+
+nsTArray<nsString>*
+DOMStorageCache::GetKeys(const DOMStorage* aStorage)
+{
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_GETALLKEYS_MS> autoTimer;
+
+  if (Persist(aStorage)) {
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_GETALLKEYS_BLOCKING_MS);
+  }
+
+  nsTArray<nsString>* result = new nsTArray<nsString>();
+  if (NS_SUCCEEDED(mLoadResult)) {
+    DataSet(aStorage).mKeys.EnumerateRead(KeysArrayBuilder, result);
+  }
+
+  return result;
+}
+
+nsresult
+DOMStorageCache::GetItem(const DOMStorage* aStorage, const nsAString& aKey,
+                         nsAString& aRetval)
+{
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_GETVALUE_MS> autoTimer;
+
+  if (Persist(aStorage)) {
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_GETVALUE_BLOCKING_MS);
+    if (NS_FAILED(mLoadResult)) {
+      return mLoadResult;
+    }
+  }
+
+  // not using AutoString since we don't want to copy buffer to result
+  nsString value;
+  if (!DataSet(aStorage).mKeys.Get(aKey, &value)) {
+    SetDOMStringToNull(value);
+  }
+
+  aRetval = value;
+
+  return NS_OK;
+}
+
+nsresult
+DOMStorageCache::SetItem(const DOMStorage* aStorage, const nsAString& aKey,
+                         const nsString& aValue, nsString& aOld)
+{
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_SETVALUE_MS> autoTimer;
+
+  if (Persist(aStorage)) {
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_SETVALUE_BLOCKING_MS);
+    if (NS_FAILED(mLoadResult)) {
+      return mLoadResult;
+    }
+  }
+
+  Data& data = DataSet(aStorage);
+  if (!data.mKeys.Get(aKey, &aOld)) {
+    SetDOMStringToNull(aOld);
+  }
+
+  // Check the quota first
+  const int64_t delta = static_cast<int64_t>(aValue.Length()) -
+                        static_cast<int64_t>(aOld.Length());
+  if (!ProcessUsageDelta(aStorage, delta)) {
+    return NS_ERROR_DOM_QUOTA_REACHED;
+  }
+
+  if (aValue == aOld && DOMStringIsNull(aValue) == DOMStringIsNull(aOld)) {
+    return NS_SUCCESS_DOM_NO_OPERATION;
+  }
+
+  data.mKeys.Put(aKey, aValue);
+
+  if (Persist(aStorage)) {
+    if (DOMStringIsNull(aOld)) {
+      return sDatabase->AsyncAddItem(this, aKey, aValue);
+    }
+
+    return sDatabase->AsyncUpdateItem(this, aKey, aValue);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+DOMStorageCache::RemoveItem(const DOMStorage* aStorage, const nsAString& aKey,
+                            nsString& aOld)
+{
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_REMOVEKEY_MS> autoTimer;
+
+  if (Persist(aStorage)) {
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_REMOVEKEY_BLOCKING_MS);
+    if (NS_FAILED(mLoadResult)) {
+      return mLoadResult;
+    }
+  }
+
+  Data& data = DataSet(aStorage);
+  if (!data.mKeys.Get(aKey, &aOld)) {
+    SetDOMStringToNull(aOld);
+    return NS_SUCCESS_DOM_NO_OPERATION;
+  }
+
+  // Recalculate the cached data size
+  const int64_t delta = -(static_cast<int64_t>(aOld.Length()));
+  unused << ProcessUsageDelta(aStorage, delta);
+  data.mKeys.Remove(aKey);
+
+  if (Persist(aStorage)) {
+    return sDatabase->AsyncRemoveItem(this, aKey);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+DOMStorageCache::Clear(const DOMStorage* aStorage)
+{
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_CLEAR_MS> autoTimer;
+
+  bool refresh = false;
+  if (Persist(aStorage)) {
+    // We need to preload all data (know the size) before we can proceeed
+    // to correctly decrease cached usage number.
+    // XXX as in case of unload, this is not technically needed now, but
+    // after super-scope quota introduction we have to do this.  Get telemetry
+    // right now.
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_CLEAR_BLOCKING_MS);
+    if (NS_FAILED(mLoadResult)) {
+      // When we failed to load data from the database, force delete of the
+      // scope data and make use of the storage possible again.
+      refresh = true;
+      mLoadResult = NS_OK;
+    }
+  }
+
+  Data& data = DataSet(aStorage);
+  bool hadData = !!data.mKeys.Count();
+
+  if (hadData) {
+    unused << ProcessUsageDelta(aStorage, -data.mOriginQuotaUsage);
+    data.mKeys.Clear();
+  }
+
+  if (Persist(aStorage) && (refresh || hadData)) {
+    return sDatabase->AsyncClear(this);
+  }
+
+  return hadData ? NS_OK : NS_SUCCESS_DOM_NO_OPERATION;
+}
+
+void
+DOMStorageCache::CloneFrom(const DOMStorageCache* aThat)
+{
+  mLoaded = aThat->mLoaded;
+  mInitialized = aThat->mInitialized;
+  mPersistent = aThat->mPersistent;
+  mSessionOnlyDataSetActive = aThat->mSessionOnlyDataSetActive;
+
+  for (uint32_t i = 0; i < kDataSetCount; ++i) {
+    aThat->mData[i].mKeys.EnumerateRead(CloneSetData, &mData[i]);
+    ProcessUsageDelta(i, aThat->mData[i].mOriginQuotaUsage);
+  }
+}
+
+// Defined in DOMStorageManager.cpp
+extern bool
+PrincipalsEqual(nsIPrincipal* aObjectPrincipal, nsIPrincipal* aSubjectPrincipal);
+
+bool
+DOMStorageCache::CheckPrincipal(nsIPrincipal* aPrincipal) const
+{
+  return PrincipalsEqual(mPrincipal, aPrincipal);
+}
+
+void
+DOMStorageCache::UnloadItems(uint32_t aUnloadFlags)
+{
+  if (aUnloadFlags & kUnloadDefault) {
+    // Must wait for preload to pass correct usage to ProcessUsageDelta
+    // XXX this is not technically needed right now since there is just
+    // per-origin isolated quota handling, but when we introduce super-
+    // -scope quotas, we have to do this.  Better to start getting
+    // telemetry right now.
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_UNLOAD_BLOCKING_MS);
+
+    mData[kDefaultSet].mKeys.Clear();
+    ProcessUsageDelta(kDefaultSet, -mData[kDefaultSet].mOriginQuotaUsage);
+  }
+
+  if (aUnloadFlags & kUnloadPrivate) {
+    mData[kPrivateSet].mKeys.Clear();
+    ProcessUsageDelta(kPrivateSet, -mData[kPrivateSet].mOriginQuotaUsage);
+  }
+
+  if (aUnloadFlags & kUnloadSession) {
+    mData[kSessionSet].mKeys.Clear();
+    ProcessUsageDelta(kSessionSet, -mData[kSessionSet].mOriginQuotaUsage);
+    mSessionOnlyDataSetActive = false;
+  }
+
+#ifdef DOM_STORAGE_TESTS
+  if (aUnloadFlags & kTestReload) {
+    WaitForPreload(Telemetry::LOCALDOMSTORAGE_UNLOAD_BLOCKING_MS);
+
+    mData[kDefaultSet].mKeys.Clear();
+    mLoaded = false; // This is only used in testing code
+    Preload();
+  }
+#endif
+}
+
+// DOMStorageCacheBridge
+
+uint32_t
+DOMStorageCache::LoadedCount()
+{
+  MonitorAutoLock monitor(mMonitor);
+  Data& data = mData[kDefaultSet];
+  return data.mKeys.Count();
+}
+
+bool
+DOMStorageCache::LoadItem(const nsAString& aKey, const nsString& aValue)
+{
+  MonitorAutoLock monitor(mMonitor);
+  if (mLoaded) {
+    return false;
+  }
+
+  Data& data = mData[kDefaultSet];
+  if (data.mKeys.Get(aKey, nullptr)) {
+    return true; // don't stop, just don't override
+  }
+
+  data.mKeys.Put(aKey, aValue);
+  data.mOriginQuotaUsage += aKey.Length() + aValue.Length();
+  return true;
+}
+
+void
+DOMStorageCache::LoadDone(nsresult aRv)
+{
+  // Keep the preloaded cache alive for a time
+  KeepAlive();
+
+  MonitorAutoLock monitor(mMonitor);
+  mLoadResult = aRv;
+  mLoaded = true;
+  monitor.Notify();
+}
+
+void
+DOMStorageCache::LoadWait()
+{
+  MonitorAutoLock monitor(mMonitor);
+  while (!mLoaded) {
+    monitor.Wait();
+  }
+}
+
+// DOMStorageUsage
+
+DOMStorageUsage::DOMStorageUsage(const nsACString& aScope)
+  : mScope(aScope)
+{
+  mUsage[kDefaultSet] = mUsage[kPrivateSet] = mUsage[kSessionSet] = 0LL;
+}
+
+namespace { // anon
+
+class LoadUsageRunnable : public nsRunnable
+{
+public:
+  LoadUsageRunnable(int64_t* aUsage, const int64_t aDelta)
+    : mTarget(aUsage)
+    , mDelta(aDelta)
+  {}
+
+private:
+  int64_t* mTarget;
+  int64_t mDelta;
+
+  NS_IMETHOD Run() { *mTarget = mDelta; return NS_OK; }
+};
+
+} // anon
+
+void
+DOMStorageUsage::LoadUsage(const int64_t aUsage)
+{
+  // Using kDefaultSet index since it is the index for the persitent data
+  // stored in the database we have just loaded usage for.
+  if (!NS_IsMainThread()) {
+    // In single process scenario we get this call from the DB thread
+    nsRefPtr<LoadUsageRunnable> r =
+      new LoadUsageRunnable(mUsage + kDefaultSet, aUsage);
+    NS_DispatchToMainThread(r);
+  } else {
+    // On a child process we get this on the main thread already
+    mUsage[kDefaultSet] += aUsage;
+  }
+}
+
+bool
+DOMStorageUsage::CheckAndSetETLD1UsageDelta(uint32_t aDataSetIndex, const int64_t aDelta)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  int64_t newUsage = mUsage[aDataSetIndex] + aDelta;
+  if (aDelta > 0 && newUsage > DOMStorageManager::GetQuota()) {
+    return false;
+  }
+
+  mUsage[aDataSetIndex] = newUsage;
+  return true;
+}
+
+
+// static
+DOMStorageDBBridge*
+DOMStorageCache::StartDatabase()
+{
+  if (sDatabase) {
+    return sDatabase;
+  }
+
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    nsAutoPtr<DOMStorageDBThread> db(new DOMStorageDBThread());
+
+    nsresult rv = db->Init();
+    if (NS_FAILED(rv)) {
+      return nullptr;
+    }
+
+    sDatabase = db.forget();
+  } else {
+    nsRefPtr<DOMStorageDBChild> db = new DOMStorageDBChild(
+        DOMLocalStorageManager::Self());
+
+    nsresult rv = db->Init();
+    if (NS_FAILED(rv)) {
+      return nullptr;
+    }
+
+    db.forget(&sDatabase);
+  }
+
+  return sDatabase;
+}
+
+// static
+DOMStorageDBBridge*
+DOMStorageCache::GetDatabase()
+{
+  return sDatabase;
+}
+
+// static
+nsresult
+DOMStorageCache::StopDatabase()
+{
+  if (!sDatabase) {
+    return NS_OK;
+  }
+
+  nsresult rv = sDatabase->Shutdown();
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    delete sDatabase;
+  } else {
+    DOMStorageDBChild* child = static_cast<DOMStorageDBChild*>(sDatabase);
+    NS_RELEASE(child);
+  }
+
+  sDatabase = nullptr;
+  return rv;
+}
+
+} // ::dom
+} // ::mozilla
diff --git a/dom/src/storage/DOMStorageCache.h b/dom/src/storage/DOMStorageCache.h
new file mode 100644
index 000000000000..c5626e46c433
--- /dev/null
+++ b/dom/src/storage/DOMStorageCache.h
@@ -0,0 +1,253 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef nsDOMStorageCache_h___
+#define nsDOMStorageCache_h___
+
+#include "nsIPrincipal.h"
+#include "nsITimer.h"
+
+#include "nsString.h"
+#include "nsDataHashtable.h"
+#include "nsHashKeys.h"
+#include "mozilla/Monitor.h"
+#include "mozilla/Telemetry.h"
+#include "nsAutoPtr.h"
+
+namespace mozilla {
+namespace dom {
+
+class DOMStorage;
+class DOMStorageManager;
+class DOMStorageDBBridge;
+
+// Interface class on which only the database or IPC may call.
+// Used to populate the cache with DB data.
+class DOMStorageCacheBridge
+{
+public:
+  NS_IMETHOD_(nsrefcnt) AddRef(void);
+  NS_IMETHOD_(void) Release(void);
+
+  virtual ~DOMStorageCacheBridge() {}
+
+  // The scope (origin) in the database usage format (reversed)
+  virtual const nsCString& Scope() const = 0;
+
+  // Whether the cache is already fully loaded
+  virtual bool Loaded() = 0;
+
+  // How many items has so far been loaded into the cache, used
+  // for optimization purposes
+  virtual uint32_t LoadedCount() = 0;
+
+  // Called by the database to load a key and its value to the cache
+  virtual bool LoadItem(const nsAString& aKey, const nsString& aValue) = 0;
+
+  // Called by the database after all keys and values has been loaded
+  // to this cache
+  virtual void LoadDone(nsresult aRv) = 0;
+
+  // Use to synchronously wait until the cache gets fully loaded with data,
+  // this method exits after LoadDone has been called
+  virtual void LoadWait() = 0;
+
+protected:
+  nsAutoRefCnt mRefCnt;
+};
+
+// Implementation of scope cache that is responsible for preloading data
+// for persistent storage (localStorage) and hold data for non-private,
+// private and session-only cookie modes.  It is also responsible for
+// persisting data changes using the database, works as a write-back cache.
+class DOMStorageCache : public DOMStorageCacheBridge
+{
+public:
+  NS_IMETHOD_(void) Release(void);
+
+  DOMStorageCache(const nsACString* aScope);
+  virtual ~DOMStorageCache();
+
+  void Init(DOMStorageManager* aManager, bool aPersistent, nsIPrincipal* aPrincipal,
+            const nsACString& aQuotaScope);
+
+  // Copies all data from the other storage.
+  void CloneFrom(const DOMStorageCache* aThat);
+
+  // Starts async preload of this cache if it persistent and not loaded.
+  void Preload();
+
+  // Keeps the cache alive (i.e. present in the manager's hash table) for a time.
+  void KeepAlive();
+
+  // The set of methods that are invoked by DOM storage web API.
+  // We are passing the DOMStorage object just to let the cache
+  // read properties like mPrivate and mSessionOnly.
+  // Get* methods return error when load from the database has failed.
+  nsresult GetLength(const DOMStorage* aStorage, uint32_t* aRetval);
+  nsresult GetKey(const DOMStorage* aStorage, uint32_t index, nsAString& aRetval);
+  nsresult GetItem(const DOMStorage* aStorage, const nsAString& aKey, nsAString& aRetval);
+  nsresult SetItem(const DOMStorage* aStorage, const nsAString& aKey, const nsString& aValue, nsString& aOld);
+  nsresult RemoveItem(const DOMStorage* aStorage, const nsAString& aKey, nsString& aOld);
+  nsresult Clear(const DOMStorage* aStorage);
+
+  nsTArray<nsString>* GetKeys(const DOMStorage* aStorage);
+
+  // Whether the principal equals principal the cache was created for
+  bool CheckPrincipal(nsIPrincipal* aPrincipal) const;
+  nsIPrincipal* Principal() const { return mPrincipal; }
+
+  // Starts the database engine thread or the IPC bridge
+  static DOMStorageDBBridge* StartDatabase();
+  static DOMStorageDBBridge* GetDatabase();
+
+  // Stops the thread and flushes all uncommited data
+  static nsresult StopDatabase();
+
+  // DOMStorageCacheBridge
+
+  virtual const nsCString& Scope() const { return mScope; }
+  virtual bool Loaded() { return mLoaded; }
+  virtual uint32_t LoadedCount();
+  virtual bool LoadItem(const nsAString& aKey, const nsString& aValue);
+  virtual void LoadDone(nsresult aRv);
+  virtual void LoadWait();
+
+  // Cache keeps 3 sets of data: regular, private and session-only.
+  // This class keeps keys and values for a set and also caches
+  // size of the data for quick per-origin quota checking.
+  class Data
+  {
+  public:
+    Data() : mOriginQuotaUsage(0) { mKeys.Init(); }
+    int64_t mOriginQuotaUsage;
+    nsDataHashtable<nsStringHashKey, nsString> mKeys;
+  };
+
+public:
+  // Number of data sets we keep: default, private, session
+  static const uint32_t kDataSetCount = 3;
+
+private:
+  // API to clear the cache data, this is invoked by chrome operations
+  // like cookie deletion.
+  friend class DOMStorageManager;
+
+  static const uint32_t kUnloadDefault = 1 << 0;
+  static const uint32_t kUnloadPrivate = 1 << 1;
+  static const uint32_t kUnloadSession = 1 << 2;
+  static const uint32_t kUnloadComplete =
+    kUnloadDefault | kUnloadPrivate | kUnloadSession;
+
+#ifdef DOM_STORAGE_TESTS
+  static const uint32_t kTestReload    = 1 << 15;
+#endif
+
+  void UnloadItems(uint32_t aUnloadFlags);
+
+private:
+  // Synchronously blocks until the cache is fully loaded from the database
+  void WaitForPreload(mozilla::Telemetry::ID aTelemetryID);
+
+  // Helper to get one of the 3 data sets (regular, private, session)
+  Data& DataSet(const DOMStorage* aStorage);
+
+  // Whether the storage change is about to persist
+  bool Persist(const DOMStorage* aStorage) const;
+
+  // Changes the quota usage on the given data set if it fits the quota.
+  // If not, then false is returned and no change to the set must be done.
+  bool ProcessUsageDelta(uint32_t aGetDataSetIndex, const int64_t aDelta);
+  bool ProcessUsageDelta(const DOMStorage* aStorage, const int64_t aDelta);
+
+private:
+  // When a cache is reponsible for its life time (in case of localStorage data
+  // cache) we need to refer our manager since removal of the cache from the hash
+  // table is handled in the destructor by call to the manager.
+  // Cache could potentially overlive the manager, hence the hard ref.
+  nsRefPtr<DOMStorageManager> mManager;
+
+  // Timer that holds this cache alive for a while after it has been preloaded.
+  nsCOMPtr<nsITimer> mKeepAliveTimer;
+
+  // Principal the cache has been initially created for, this is used only
+  // for sessionStorage access checks since sessionStorage objects are strictly
+  // scoped by a principal.  localStorage objects on the other hand are scoped by
+  // origin only.
+  nsCOMPtr<nsIPrincipal> mPrincipal;
+
+  // The scope this cache belongs to in the "DB format", i.e. reversed
+  nsCString mScope;
+
+  // The eTLD+1 scope used to count quota usage.
+  nsCString mQuotaScope;
+
+  // Non-private Browsing, Private Browsing and Session Only sets.
+  Data mData[kDataSetCount];
+
+  // This monitor is used to wait for full load of data.
+  mozilla::Monitor mMonitor;
+
+  // Flag that is initially false.  When the cache is about to work with
+  // the database (i.e. it is persistent) this flags is set to true after
+  // all keys and coresponding values are loaded from the database.
+  // This flag never goes from true back to false.
+  bool mLoaded;
+
+  // Result of load from the database.  Valid after mLoaded flag has been set.
+  nsresult mLoadResult;
+
+  // Init() method has been called
+  bool mInitialized : 1;
+
+  // This cache is about to be bound with the database (i.e. it has
+  // to load from the DB first and has to persist when modifying the
+  // default data set.)
+  bool mPersistent : 1;
+
+  // - False when the session-only data set was never used.
+  // - True after access to session-only data has been made for the first time.
+  // We also fill session-only data set with the default one at that moment.
+  // Drops back to false when session-only data are cleared from chrome.
+  bool mSessionOnlyDataSetActive : 1;
+
+  // Whether we have already captured state of the cache preload on our first access.
+  bool mPreloadTelemetryRecorded : 1;
+
+  // DOMStorageDBThread on the parent or single process,
+  // DOMStorageDBChild on the child process.
+  static DOMStorageDBBridge* sDatabase;
+};
+
+// DOMStorageUsage
+// Infrastructure to manage and check eTLD+1 quota
+class DOMStorageUsageBridge
+{
+public:
+  virtual ~DOMStorageUsageBridge() {}
+
+  virtual const nsCString& Scope() = 0;
+  virtual void LoadUsage(const int64_t aUsage) = 0;
+};
+
+class DOMStorageUsage : public DOMStorageUsageBridge
+{
+public:
+  DOMStorageUsage(const nsACString& aScope);
+
+  bool CheckAndSetETLD1UsageDelta(uint32_t aDataSetIndex, int64_t aUsageDelta);
+
+private:
+  virtual const nsCString& Scope() { return mScope; }
+  virtual void LoadUsage(const int64_t aUsage);
+
+  nsCString mScope;
+  int64_t mUsage[DOMStorageCache::kDataSetCount];
+};
+
+} // ::dom
+} // ::mozilla
+
+#endif
diff --git a/dom/src/storage/DOMStorageDBThread.cpp b/dom/src/storage/DOMStorageDBThread.cpp
new file mode 100644
index 000000000000..3a18cb0ebdd3
--- /dev/null
+++ b/dom/src/storage/DOMStorageDBThread.cpp
@@ -0,0 +1,1296 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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 "DOMStorageDBThread.h"
+#include "DOMStorageCache.h"
+
+#include "nsIEffectiveTLDService.h"
+#include "nsDirectoryServiceUtils.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsThreadUtils.h"
+#include "nsProxyRelease.h"
+#include "mozStorageCID.h"
+#include "mozStorageHelper.h"
+#include "mozIStorageService.h"
+#include "mozIStorageBindingParamsArray.h"
+#include "mozIStorageBindingParams.h"
+#include "mozIStorageValueArray.h"
+#include "mozIStorageFunction.h"
+#include "nsIObserverService.h"
+#include "nsIVariant.h"
+#include "mozilla/Services.h"
+
+// How long we collect write oprerations
+// before they are flushed to the database
+// In milliseconds.
+#define FLUSHING_INTERVAL_MS 5000
+
+namespace mozilla {
+namespace dom {
+
+DOMStorageDBBridge::DOMStorageDBBridge()
+{
+  mUsages.Init();
+}
+
+DOMStorageUsage*
+DOMStorageDBBridge::GetScopeUsage(const nsACString& aScope)
+{
+  DOMStorageUsage* usage;
+  if (mUsages.Get(aScope, &usage)) {
+    return usage;
+  }
+
+  usage = new DOMStorageUsage(aScope);
+  AsyncGetUsage(usage);
+  mUsages.Put(aScope, usage);
+
+  return usage;
+}
+
+
+DOMStorageDBThread::DOMStorageDBThread()
+: mThread(nullptr)
+, mMonitor("DOMStorageThreadMonitor")
+, mStopIOThread(false)
+, mDBReady(false)
+, mStatus(NS_OK)
+, mWorkerStatements(mWorkerConnection)
+, mReaderStatements(mReaderConnection)
+, mDirtyEpoch(0)
+, mFlushImmediately(false)
+, mPriorityCounter(0)
+{
+  mScopesHavingData.Init();
+}
+
+nsresult
+DOMStorageDBThread::Init()
+{
+  nsresult rv;
+
+  // Need to determine location on the main thread, since
+  // NS_GetSpecialDirectory access the atom table that can
+  // be accessed only on the main thread.
+  rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                              getter_AddRefs(mDatabaseFile));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mDatabaseFile->Append(NS_LITERAL_STRING("webappsstore.sqlite"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Ensure mozIStorageService init on the main thread first.
+  nsCOMPtr<mozIStorageService> service =
+    do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Need to keep the lock to avoid setting mThread later then
+  // the thread body executes.
+  MonitorAutoLock monitor(mMonitor);
+
+  mThread = PR_CreateThread(PR_USER_THREAD, &DOMStorageDBThread::ThreadFunc, this,
+                            PR_PRIORITY_LOW, PR_LOCAL_THREAD, PR_JOINABLE_THREAD,
+                            262144);
+  if (!mThread) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBThread::Shutdown()
+{
+  if (!mThread) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_SHUTDOWN_DATABASE_MS> timer;
+
+  {
+    MonitorAutoLock monitor(mMonitor);
+
+    // After we stop, no other operations can be accepted
+    mFlushImmediately = true;
+    mStopIOThread = true;
+    monitor.Notify();
+  }
+
+  mReaderStatements.FinalizeStatements();
+  if (mReaderConnection) {
+    mReaderConnection->Close();
+    mReaderConnection = nullptr;
+  }
+
+  PR_JoinThread(mThread);
+  mThread = nullptr;
+
+  return mStatus;
+}
+
+void
+DOMStorageDBThread::SyncPreload(DOMStorageCacheBridge* aCache, bool aForceSync)
+{
+  if (!aForceSync && aCache->LoadedCount()) {
+    // Preload already started for this cache, just wait for it to finish.
+    // LoadWait will exit after LoadDone on the cache has been called.
+    SetHigherPriority();
+    aCache->LoadWait();
+    SetDefaultPriority();
+    return;
+  }
+
+  // Bypass sync load when an update is pending in the queue to write, we would
+  // get incosistent data in the cache.  Also don't allow sync main-thread preload
+  // when DB open and init is still pending on the background thread.
+  if (mWALModeEnabled && mDBReady) {
+    bool pendingTasks;
+    {
+      MonitorAutoLock monitor(mMonitor);
+      pendingTasks = mPendingTasks.IsScopeUpdatePending(aCache->Scope()) ||
+                     mPendingTasks.IsScopeClearPending(aCache->Scope());
+    }
+
+    if (!pendingTasks) {
+      // WAL is enabled, thus do the load synchronously on the main thread.
+      DBOperation preload(DBOperation::opPreload, aCache);
+      preload.PerformAndFinalize(this);
+      return;
+    }
+  }
+
+  // Need to go asynchronously since WAL is not allowed or scheduled updates
+  // need to be flushed first.
+  // Schedule preload for this cache as the first operation.
+  nsresult rv = InsertDBOp(new DBOperation(DBOperation::opPreloadUrgent, aCache));
+
+  // LoadWait exits after LoadDone of the cache has been called.
+  if (NS_SUCCEEDED(rv)) {
+    aCache->LoadWait();
+  }
+}
+
+void
+DOMStorageDBThread::AsyncFlush()
+{
+  MonitorAutoLock monitor(mMonitor);
+  mFlushImmediately = true;
+  monitor.Notify();
+}
+
+bool
+DOMStorageDBThread::ShouldPreloadScope(const nsACString& aScope)
+{
+  MonitorAutoLock monitor(mMonitor);
+  return mScopesHavingData.Contains(aScope);
+}
+
+namespace { // anon
+
+PLDHashOperator
+GetScopesHavingDataEnum(nsCStringHashKey* aKey, void* aArg)
+{
+  InfallibleTArray<nsCString>* scopes =
+      static_cast<InfallibleTArray<nsCString>*>(aArg);
+  scopes->AppendElement(aKey->GetKey());
+  return PL_DHASH_NEXT;
+}
+
+} // anon
+
+void
+DOMStorageDBThread::GetScopesHavingData(InfallibleTArray<nsCString>* aScopes)
+{
+  MonitorAutoLock monitor(mMonitor);
+  mScopesHavingData.EnumerateEntries(GetScopesHavingDataEnum, aScopes);
+}
+
+nsresult
+DOMStorageDBThread::InsertDBOp(DOMStorageDBThread::DBOperation* aOperation)
+{
+  MonitorAutoLock monitor(mMonitor);
+
+  // Sentinel to don't forget to delete the operation when we exit early.
+  nsAutoPtr<DOMStorageDBThread::DBOperation> opScope(aOperation);
+
+  if (mStopIOThread) {
+    // Thread use after shutdown demanded.
+    MOZ_ASSERT(false);
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  if (NS_FAILED(mStatus)) {
+    MonitorAutoUnlock unlock(mMonitor);
+    aOperation->Finalize(mStatus);
+    return mStatus;
+  }
+
+  switch (aOperation->Type()) {
+  case DBOperation::opPreload:
+  case DBOperation::opPreloadUrgent:
+    if (mPendingTasks.IsScopeUpdatePending(aOperation->Scope())) {
+      // If there is a pending update operation for the scope first do the flush
+      // before we preload the cache.  This may happen in an extremely rare case
+      // when a child process throws away its cache before flush on the parent
+      // has finished.  If we would preloaded the cache as a priority operation 
+      // before the pending flush, we would have got an inconsistent cache content.
+      mFlushImmediately = true;
+    } else if (mPendingTasks.IsScopeClearPending(aOperation->Scope())) {
+      // The scope is scheduled to be cleared, so just quickly load as empty.
+      // We need to do this to prevent load of the DB data before the scope has
+      // actually been cleared from the database.  Preloads are processed
+      // immediately before update and clear operations on the database that
+      // are flushed periodically in batches.
+      MonitorAutoUnlock unlock(mMonitor);
+      aOperation->Finalize(NS_OK);
+      return NS_OK;
+    }
+    // NO BREAK
+
+  case DBOperation::opGetUsage:
+    if (aOperation->Type() == DBOperation::opPreloadUrgent) {
+      SetHigherPriority(); // Dropped back after urgent preload execution
+      mPreloads.InsertElementAt(0, aOperation);
+    } else {
+      mPreloads.AppendElement(aOperation);
+    }
+
+    // DB operation adopted, don't delete it.
+    opScope.forget();
+
+    // Immediately start executing this.
+    monitor.Notify();
+    break;
+
+  default:
+    // Update operations are first collected, coalesced and then flushed
+    // after a short time.
+    mPendingTasks.Add(aOperation);
+
+    // DB operation adopted, don't delete it.
+    opScope.forget();
+
+    ScheduleFlush();
+    break;
+  }
+
+  return NS_OK;
+}
+
+void
+DOMStorageDBThread::SetHigherPriority()
+{
+  ++mPriorityCounter;
+  PR_SetThreadPriority(mThread, PR_PRIORITY_URGENT);
+}
+
+void
+DOMStorageDBThread::SetDefaultPriority()
+{
+  if (--mPriorityCounter <= 0) {
+    PR_SetThreadPriority(mThread, PR_PRIORITY_LOW);
+  }
+}
+
+void
+DOMStorageDBThread::ThreadFunc(void* aArg)
+{
+  PR_SetCurrentThreadName("localStorage DB");
+
+  DOMStorageDBThread* thread = static_cast<DOMStorageDBThread*>(aArg);
+  thread->ThreadFunc();
+}
+
+void
+DOMStorageDBThread::ThreadFunc()
+{
+  nsresult rv = InitDatabase();
+
+  MonitorAutoLock lockMonitor(mMonitor);
+
+  if (NS_FAILED(rv)) {
+    mStatus = rv;
+    mStopIOThread = true;
+    return;
+  }
+
+  while (MOZ_LIKELY(!mStopIOThread || mPreloads.Length() || mPendingTasks.HasTasks())) {
+    if (MOZ_UNLIKELY(TimeUntilFlush() == 0)) {
+      // Flush time is up or flush has been forced, do it now.
+      UnscheduleFlush();
+      if (mPendingTasks.Prepare()) {
+        {
+          MonitorAutoUnlock unlockMonitor(mMonitor);
+          rv = mPendingTasks.Execute(this);
+        }
+
+        if (!mPendingTasks.Finalize(rv)) {
+          mStatus = rv;
+          NS_WARNING("localStorage DB access broken");
+        }
+      }
+      NotifyFlushCompletion();
+    } else if (MOZ_LIKELY(mPreloads.Length())) {
+      nsAutoPtr<DBOperation> op(mPreloads[0]);
+      mPreloads.RemoveElementAt(0);
+      {
+        MonitorAutoUnlock unlockMonitor(mMonitor);
+        op->PerformAndFinalize(this);
+      }
+
+      if (op->Type() == DBOperation::opPreloadUrgent) {
+        SetDefaultPriority(); // urgent preload unscheduled
+      }
+    } else if (MOZ_UNLIKELY(!mStopIOThread)) {
+      lockMonitor.Wait(TimeUntilFlush());
+    }
+  } // thread loop
+
+  mStatus = ShutdownDatabase();
+}
+
+extern void
+ReverseString(const nsCSubstring& aSource, nsCSubstring& aResult);
+
+namespace { // anon
+
+class nsReverseStringSQLFunction MOZ_FINAL : public mozIStorageFunction
+{
+  NS_DECL_ISUPPORTS
+  NS_DECL_MOZISTORAGEFUNCTION
+};
+
+NS_IMPL_ISUPPORTS1(nsReverseStringSQLFunction, mozIStorageFunction)
+
+NS_IMETHODIMP
+nsReverseStringSQLFunction::OnFunctionCall(
+    mozIStorageValueArray* aFunctionArguments, nsIVariant** aResult)
+{
+  nsresult rv;
+
+  nsAutoCString stringToReverse;
+  rv = aFunctionArguments->GetUTF8String(0, stringToReverse);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoCString result;
+  ReverseString(stringToReverse, result);
+
+  nsCOMPtr<nsIWritableVariant> outVar(do_CreateInstance(
+      NS_VARIANT_CONTRACTID, &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = outVar->SetAsAUTF8String(result);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  *aResult = outVar.get();
+  outVar.forget();
+  return NS_OK;
+}
+
+} // anon
+
+nsresult
+DOMStorageDBThread::OpenDatabaseConnection()
+{
+  nsresult rv;
+
+  nsCOMPtr<mozIStorageService> service
+      = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<mozIStorageConnection> connection;
+  rv = service->OpenUnsharedDatabase(mDatabaseFile, getter_AddRefs(connection));
+  if (rv == NS_ERROR_FILE_CORRUPTED) {
+    // delete the db and try opening again
+    rv = mDatabaseFile->Remove(false);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = service->OpenUnsharedDatabase(mDatabaseFile, getter_AddRefs(connection));
+  }
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (NS_IsMainThread()) {
+    connection.swap(mReaderConnection);
+  } else {
+    connection.swap(mWorkerConnection);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBThread::InitDatabase()
+{
+  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_INIT_DATABASE_MS> timer;
+
+  nsresult rv;
+
+  // Here we are on the worker thread. This opens the worker connection.
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  rv = OpenDatabaseConnection();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = TryJournalMode();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mozStorageTransaction transaction(mWorkerConnection, false);
+
+  // Ensure Gecko 1.9.1 storage table
+  rv = mWorkerConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+         "CREATE TABLE IF NOT EXISTS webappsstore2 ("
+         "scope TEXT, "
+         "key TEXT, "
+         "value TEXT, "
+         "secure INTEGER, "
+         "owner TEXT)"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mWorkerConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+        "CREATE UNIQUE INDEX IF NOT EXISTS scope_key_index"
+        " ON webappsstore2(scope, key)"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<mozIStorageFunction> function1(new nsReverseStringSQLFunction());
+  NS_ENSURE_TRUE(function1, NS_ERROR_OUT_OF_MEMORY);
+
+  rv = mWorkerConnection->CreateFunction(NS_LITERAL_CSTRING("REVERSESTRING"), 1, function1);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  bool exists;
+
+  // Check if there is storage of Gecko 1.9.0 and if so, upgrade that storage
+  // to actual webappsstore2 table and drop the obsolete table. First process
+  // this newer table upgrade to priority potential duplicates from older
+  // storage table.
+  rv = mWorkerConnection->TableExists(NS_LITERAL_CSTRING("webappsstore"),
+                                &exists);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (exists) {
+    rv = mWorkerConnection->ExecuteSimpleSQL(
+      NS_LITERAL_CSTRING("INSERT OR IGNORE INTO "
+                         "webappsstore2(scope, key, value, secure, owner) "
+                         "SELECT REVERSESTRING(domain) || '.:', key, value, secure, owner "
+                         "FROM webappsstore"));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = mWorkerConnection->ExecuteSimpleSQL(
+      NS_LITERAL_CSTRING("DROP TABLE webappsstore"));
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  // Check if there is storage of Gecko 1.8 and if so, upgrade that storage
+  // to actual webappsstore2 table and drop the obsolete table. Potential
+  // duplicates will be ignored.
+  rv = mWorkerConnection->TableExists(NS_LITERAL_CSTRING("moz_webappsstore"),
+                                &exists);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (exists) {
+    rv = mWorkerConnection->ExecuteSimpleSQL(
+      NS_LITERAL_CSTRING("INSERT OR IGNORE INTO "
+                         "webappsstore2(scope, key, value, secure, owner) "
+                         "SELECT REVERSESTRING(domain) || '.:', key, value, secure, domain "
+                         "FROM moz_webappsstore"));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = mWorkerConnection->ExecuteSimpleSQL(
+      NS_LITERAL_CSTRING("DROP TABLE moz_webappsstore"));
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  rv = transaction.Commit();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Database open and all initiation operation are done.  Switching this flag
+  // to true allow main thread to read directly from the database.
+  // If we would allow this sooner, we would have opened a window where main thread
+  // read might operate on a totaly broken and incosistent database.
+  mDBReady = true;
+
+  // List scopes having any stored data
+  nsCOMPtr<mozIStorageStatement> stmt;
+  rv = mWorkerConnection->CreateStatement(NS_LITERAL_CSTRING("SELECT DISTINCT scope FROM webappsstore2"),
+                                    getter_AddRefs(stmt));
+  NS_ENSURE_SUCCESS(rv, rv);
+  mozStorageStatementScoper scope(stmt);
+
+  while (NS_SUCCEEDED(rv = stmt->ExecuteStep(&exists)) && exists) {
+    nsAutoCString foundScope;
+    rv = stmt->GetUTF8String(0, foundScope);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    MonitorAutoLock monitor(mMonitor);
+    mScopesHavingData.PutEntry(foundScope);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBThread::SetJournalMode(bool aIsWal)
+{
+  nsresult rv;
+
+  nsAutoCString stmtString(
+    MOZ_STORAGE_UNIQUIFY_QUERY_STR "PRAGMA journal_mode = ");
+  if (aIsWal) {
+    stmtString.AppendLiteral("wal");
+  } else {
+    stmtString.AppendLiteral("truncate");
+  }
+
+  nsCOMPtr<mozIStorageStatement> stmt;
+  rv = mWorkerConnection->CreateStatement(stmtString, getter_AddRefs(stmt));
+  NS_ENSURE_SUCCESS(rv, rv);
+  mozStorageStatementScoper scope(stmt);
+
+  bool hasResult = false;
+  rv = stmt->ExecuteStep(&hasResult);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!hasResult) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsAutoCString journalMode;
+  rv = stmt->GetUTF8String(0, journalMode);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if ((aIsWal && !journalMode.EqualsLiteral("wal")) ||
+      (!aIsWal && !journalMode.EqualsLiteral("truncate"))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBThread::TryJournalMode()
+{
+  nsresult rv;
+
+  rv = SetJournalMode(true);
+  if (NS_FAILED(rv)) {
+    mWALModeEnabled = false;
+
+    rv = SetJournalMode(false);
+    NS_ENSURE_SUCCESS(rv, rv);
+  } else {
+    mWALModeEnabled = true;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBThread::ShutdownDatabase()
+{
+  nsresult rv = mStatus;
+
+  // Finalize the cached statements.
+  mWorkerStatements.FinalizeStatements();
+  if (mWorkerConnection) {
+    rv = mWorkerConnection->Close();
+    mWorkerConnection = nullptr;
+  }
+
+  return rv;
+}
+
+void
+DOMStorageDBThread::ScheduleFlush()
+{
+  if (mDirtyEpoch) {
+    return; // Already scheduled
+  }
+
+  mDirtyEpoch = PR_IntervalNow() | 1; // Must be non-zero to indicate we are scheduled
+
+  // Wake the monitor from indefinite sleep...
+  mMonitor.Notify();
+}
+
+void
+DOMStorageDBThread::UnscheduleFlush()
+{
+  // We are just about to do the flush, drop flags
+  mFlushImmediately = false;
+  mDirtyEpoch = 0;
+}
+
+PRIntervalTime
+DOMStorageDBThread::TimeUntilFlush()
+{
+  if (mFlushImmediately) {
+    return 0; // Do it now regardless the timeout.
+  }
+
+  MOZ_STATIC_ASSERT(PR_INTERVAL_NO_TIMEOUT != 0,
+      "PR_INTERVAL_NO_TIMEOUT must be non-zero");
+
+  if (!mDirtyEpoch) {
+    return PR_INTERVAL_NO_TIMEOUT; // No pending task...
+  }
+
+  static const PRIntervalTime kMaxAge = PR_MillisecondsToInterval(FLUSHING_INTERVAL_MS);
+
+  PRIntervalTime now = PR_IntervalNow() | 1;
+  PRIntervalTime age = now - mDirtyEpoch;
+  if (age > kMaxAge) {
+    return 0; // It is time.
+  }
+
+  return kMaxAge - age; // Time left, this is used to sleep the monitor
+}
+
+void
+DOMStorageDBThread::NotifyFlushCompletion()
+{
+#ifdef DOM_STORAGE_TESTS
+  if (!NS_IsMainThread()) {
+    nsRefPtr<nsRunnableMethod<DOMStorageDBThread, void, false> > event =
+      NS_NewNonOwningRunnableMethod(this, &DOMStorageDBThread::NotifyFlushCompletion);
+    NS_DispatchToMainThread(event);
+    return;
+  }
+
+  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+  if (obs) {
+    obs->NotifyObservers(nullptr, "domstorage-test-flushed", nullptr);
+  }
+#endif
+}
+
+// DOMStorageDBThread::DBOperation
+
+DOMStorageDBThread::DBOperation::DBOperation(const OperationType aType,
+                                             DOMStorageCacheBridge* aCache,
+                                             const nsAString& aKey,
+                                             const nsAString& aValue)
+: mType(aType)
+, mCache(aCache)
+, mKey(aKey)
+, mValue(aValue)
+{
+  MOZ_COUNT_CTOR(DOMStorageDBThread::DBOperation);
+}
+
+DOMStorageDBThread::DBOperation::DBOperation(const OperationType aType,
+                                             DOMStorageUsageBridge* aUsage)
+: mType(aType)
+, mUsage(aUsage)
+{
+  MOZ_COUNT_CTOR(DOMStorageDBThread::DBOperation);
+}
+
+DOMStorageDBThread::DBOperation::DBOperation(const OperationType aType,
+                                             const nsACString& aScope)
+: mType(aType)
+, mCache(nullptr)
+, mScope(aScope)
+{
+  MOZ_COUNT_CTOR(DOMStorageDBThread::DBOperation);
+}
+
+DOMStorageDBThread::DBOperation::~DBOperation()
+{
+  MOZ_COUNT_DTOR(DOMStorageDBThread::DBOperation);
+}
+
+const nsCString
+DOMStorageDBThread::DBOperation::Scope()
+{
+  if (mCache) {
+    return mCache->Scope();
+  }
+
+  return mScope;
+}
+
+const nsCString
+DOMStorageDBThread::DBOperation::Target()
+{
+  switch (mType) {
+    case opAddItem:
+    case opUpdateItem:
+    case opRemoveItem:
+      return Scope() + NS_LITERAL_CSTRING("|") + NS_ConvertUTF16toUTF8(mKey);
+
+    default:
+      return Scope();
+  }
+}
+
+void
+DOMStorageDBThread::DBOperation::PerformAndFinalize(DOMStorageDBThread* aThread)
+{
+  Finalize(Perform(aThread));
+}
+
+nsresult
+DOMStorageDBThread::DBOperation::Perform(DOMStorageDBThread* aThread)
+{
+  nsresult rv;
+
+  switch (mType) {
+  case opPreload:
+  case opPreloadUrgent:
+  {
+    // Already loaded?
+    if (mCache->Loaded()) {
+      break;
+    }
+
+    StatementCache* statements;
+    if (MOZ_UNLIKELY(NS_IsMainThread())) {
+      if (MOZ_UNLIKELY(!aThread->mReaderConnection)) {
+        // Do lazy main thread connection opening
+        rv = aThread->OpenDatabaseConnection();
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+
+      statements = &aThread->mReaderStatements;
+    } else {
+      statements = &aThread->mWorkerStatements;
+    }
+
+    // OFFSET is an optimization when we have to do a sync load
+    // and cache has already loaded some parts asynchronously.
+    // It skips keys we have already loaded.
+    nsCOMPtr<mozIStorageStatement> stmt = statements->GetCachedStatement(
+        "SELECT key, value FROM webappsstore2 "
+        "WHERE scope = :scope ORDER BY key "
+        "LIMIT -1 OFFSET :offset");
+    NS_ENSURE_STATE(stmt);
+    mozStorageStatementScoper scope(stmt);
+
+    rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
+                                    mCache->Scope());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("offset"),
+                               static_cast<int32_t>(mCache->LoadedCount()));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    bool exists;
+    while (NS_SUCCEEDED(rv = stmt->ExecuteStep(&exists)) && exists) {
+      nsAutoString key;
+      rv = stmt->GetString(0, key);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      nsAutoString value;
+      rv = stmt->GetString(1, value);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      if (!mCache->LoadItem(key, value)) {
+        break;
+      }
+    }
+
+    mCache->LoadDone(NS_OK);
+    break;
+  }
+
+  case opGetUsage:
+  {
+    nsCOMPtr<mozIStorageStatement> stmt = aThread->mWorkerStatements.GetCachedStatement(
+      "SELECT SUM(LENGTH(key) + LENGTH(value)) FROM webappsstore2"
+      " WHERE scope LIKE :scope"
+    );
+    NS_ENSURE_STATE(stmt);
+
+    mozStorageStatementScoper scope(stmt);
+
+    rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
+                                    mUsage->Scope() + NS_LITERAL_CSTRING("%"));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    bool exists;
+    rv = stmt->ExecuteStep(&exists);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    int64_t usage;
+    if (exists) {
+      rv = stmt->GetInt64(0, &usage);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    mUsage->LoadUsage(usage);
+    break;
+  }
+
+  case opAddItem:
+  case opUpdateItem:
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    nsCOMPtr<mozIStorageStatement> stmt = aThread->mWorkerStatements.GetCachedStatement(
+      "INSERT OR REPLACE INTO webappsstore2 (scope, key, value) "
+      "VALUES (:scope, :key, :value) "
+    );
+    NS_ENSURE_STATE(stmt);
+
+    mozStorageStatementScoper scope(stmt);
+
+    rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
+                                    mCache->Scope());
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = stmt->BindStringByName(NS_LITERAL_CSTRING("key"),
+                                mKey);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = stmt->BindStringByName(NS_LITERAL_CSTRING("value"),
+                                mValue);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = stmt->Execute();
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    aThread->mScopesHavingData.PutEntry(Scope());
+    break;
+  }
+
+  case opRemoveItem:
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    nsCOMPtr<mozIStorageStatement> stmt = aThread->mWorkerStatements.GetCachedStatement(
+      "DELETE FROM webappsstore2 "
+      "WHERE scope = :scope "
+        "AND key = :key "
+    );
+    NS_ENSURE_STATE(stmt);
+    mozStorageStatementScoper scope(stmt);
+
+    rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
+                                    mCache->Scope());
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = stmt->BindStringByName(NS_LITERAL_CSTRING("key"),
+                                mKey);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = stmt->Execute();
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    break;
+  }
+
+  case opClear:
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    nsCOMPtr<mozIStorageStatement> stmt = aThread->mWorkerStatements.GetCachedStatement(
+      "DELETE FROM webappsstore2 "
+      "WHERE scope = :scope"
+    );
+    NS_ENSURE_STATE(stmt);
+    mozStorageStatementScoper scope(stmt);
+
+    rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
+                                    mCache->Scope());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = stmt->Execute();
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    aThread->mScopesHavingData.RemoveEntry(Scope());
+    break;
+  }
+
+  case opClearAll:
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    nsCOMPtr<mozIStorageStatement> stmt = aThread->mWorkerStatements.GetCachedStatement(
+      "DELETE FROM webappsstore2"
+    );
+    NS_ENSURE_STATE(stmt);
+    mozStorageStatementScoper scope(stmt);
+
+    rv = stmt->Execute();
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    aThread->mScopesHavingData.Clear();
+    break;
+  }
+
+  case opClearMatchingScope:
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    nsCOMPtr<mozIStorageStatement> stmt = aThread->mWorkerStatements.GetCachedStatement(
+      "DELETE FROM webappsstore2"
+      " WHERE scope GLOB :scope"
+    );
+    NS_ENSURE_STATE(stmt);
+    mozStorageStatementScoper scope(stmt);
+
+    rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
+                                    mScope + NS_LITERAL_CSTRING("*"));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = stmt->Execute();
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    break;
+  }
+
+  default:
+    NS_ERROR("Unknown task type");
+    break;
+  }
+
+  return NS_OK;
+}
+
+void
+DOMStorageDBThread::DBOperation::Finalize(nsresult aRv)
+{
+  switch (mType) {
+  case opPreloadUrgent:
+  case opPreload:
+    if (NS_FAILED(aRv)) {
+      // When we are here, something failed when loading from the database.
+      // Notify that the storage is loaded to prevent deadlock of the main thread,
+      // even though it is actually empty or incomplete.
+      NS_WARNING("Failed to preload localStorage");
+    }
+
+    mCache->LoadDone(aRv);
+    break;
+
+  case opGetUsage:
+    if (NS_FAILED(aRv)) {
+      mUsage->LoadUsage(0);
+    }
+
+    break;
+
+  default:
+    if (NS_FAILED(aRv)) {
+      NS_WARNING("localStorage update/clear operation failed,"
+                 " data may not persist or clean up");
+    }
+
+    break;
+  }
+}
+
+// DOMStorageDBThread::PendingOperations
+
+DOMStorageDBThread::PendingOperations::PendingOperations()
+: mFlushFailureCount(0)
+{
+  mClears.Init();
+  mUpdates.Init();
+}
+
+bool
+DOMStorageDBThread::PendingOperations::HasTasks()
+{
+  return !!mUpdates.Count() || !!mClears.Count();
+}
+
+namespace { // anon
+
+PLDHashOperator
+ForgetUpdatesForScope(const nsACString& aMapping,
+                      nsAutoPtr<DOMStorageDBThread::DBOperation>& aPendingTask,
+                      void* aArg)
+{
+  DOMStorageDBThread::DBOperation* newOp = static_cast<DOMStorageDBThread::DBOperation*>(aArg);
+
+  if (newOp->Type() == DOMStorageDBThread::DBOperation::opClear &&
+      aPendingTask->Scope() != newOp->Scope()) {
+    return PL_DHASH_NEXT;
+  }
+
+  if (newOp->Type() == DOMStorageDBThread::DBOperation::opClearMatchingScope &&
+      !StringBeginsWith(aPendingTask->Scope(), newOp->Scope())) {
+    return PL_DHASH_NEXT;
+  }
+
+  return PL_DHASH_REMOVE;
+}
+
+} // anon
+
+bool
+DOMStorageDBThread::PendingOperations::CheckForCoalesceOpportunity(DBOperation* aNewOp,
+                                                                   DBOperation::OperationType aPendingType,
+                                                                   DBOperation::OperationType aNewType)
+{
+  if (aNewOp->Type() != aNewType) {
+    return false;
+  }
+
+  DOMStorageDBThread::DBOperation* pendingTask;
+  if (!mUpdates.Get(aNewOp->Target(), &pendingTask)) {
+    return false;
+  }
+
+  if (pendingTask->Type() != aPendingType) {
+    return false;
+  }
+
+  return true;
+}
+
+void
+DOMStorageDBThread::PendingOperations::Add(DOMStorageDBThread::DBOperation* aOperation)
+{
+  // Optimize: when a key to remove has never been written to disk
+  // just bypass this operation.  A kew is new when an operation scheduled
+  // to write it to the database is of type opAddItem.
+  if (CheckForCoalesceOpportunity(aOperation, DBOperation::opAddItem, DBOperation::opRemoveItem)) {
+    mUpdates.Remove(aOperation->Target());
+    delete aOperation;
+    return;
+  }
+
+  // Optimize: when changing a key that is new and has never been
+  // written to disk, keep type of the operation to store it at opAddItem.
+  // This allows optimization to just forget adding a new key when
+  // it is removed from the storage before flush.
+  if (CheckForCoalesceOpportunity(aOperation, DBOperation::opAddItem, DBOperation::opUpdateItem)) {
+    aOperation->mType = DBOperation::opAddItem;
+  }
+
+  // Optimize: to prevent lose of remove operation on a key when doing
+  // remove/set/remove on a previously existing key we have to change
+  // opAddItem to opUpdateItem on the new operation when there is opRemoveItem
+  // pending for the key.
+  if (CheckForCoalesceOpportunity(aOperation, DBOperation::opRemoveItem, DBOperation::opAddItem)) {
+    aOperation->mType = DBOperation::opUpdateItem;
+  }
+
+  switch (aOperation->Type())
+  {
+  // Operations on single keys
+
+  case DBOperation::opAddItem:
+  case DBOperation::opUpdateItem:
+  case DBOperation::opRemoveItem:
+    // Override any existing operation for the target (=scope+key).
+    mUpdates.Put(aOperation->Target(), aOperation);
+    break;
+
+  // Clear operations
+
+  case DBOperation::opClear:
+  case DBOperation::opClearMatchingScope:
+    // Drop all update (insert/remove) operations for equivavelent or matching scope.
+    // We do this as an optimization as well as a must based on the logic,
+    // if we would not delete the update tasks, changes would have been stored
+    // to the database after clear operations have been executed.
+    mUpdates.Enumerate(ForgetUpdatesForScope, aOperation);
+    mClears.Put(aOperation->Target(), aOperation);
+    break;
+
+  case DBOperation::opClearAll:
+    // Drop simply everything, this is a super-operation.
+    mUpdates.Clear();
+    mClears.Clear();
+    mClears.Put(aOperation->Target(), aOperation);
+    break;
+
+  default:
+    MOZ_ASSERT(false);
+    break;
+  }
+}
+
+namespace { // anon
+
+PLDHashOperator
+CollectTasks(const nsACString& aMapping, nsAutoPtr<DOMStorageDBThread::DBOperation>& aOperation, void* aArg)
+{
+  nsTArray<nsAutoPtr<DOMStorageDBThread::DBOperation> >* tasks =
+    static_cast<nsTArray<nsAutoPtr<DOMStorageDBThread::DBOperation> >*>(aArg);
+
+  tasks->AppendElement(aOperation.forget());
+  return PL_DHASH_NEXT;
+}
+
+} // anon
+
+bool
+DOMStorageDBThread::PendingOperations::Prepare()
+{
+  // Called under the lock
+
+  // First collect clear operations and then updates, we can
+  // do this since whenever a clear operation for a scope is
+  // scheduled, we drop all updates matching that scope. So,
+  // all scope-related update operations we have here now were
+  // scheduled after the clear operations.
+  mClears.Enumerate(CollectTasks, &mExecList);
+  mClears.Clear();
+
+  mUpdates.Enumerate(CollectTasks, &mExecList);
+  mUpdates.Clear();
+
+  return !!mExecList.Length();
+}
+
+nsresult
+DOMStorageDBThread::PendingOperations::Execute(DOMStorageDBThread* aThread)
+{
+  // Called outside the lock
+
+  mozStorageTransaction transaction(aThread->mWorkerConnection, false);
+
+  nsresult rv;
+
+  for (uint32_t i = 0; i < mExecList.Length(); ++i) {
+    DOMStorageDBThread::DBOperation* task = mExecList[i];
+    rv = task->Perform(aThread);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+
+  rv = transaction.Commit();
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  return NS_OK;
+}
+
+bool
+DOMStorageDBThread::PendingOperations::Finalize(nsresult aRv)
+{
+  // Called under the lock
+
+  // The list is kept on a failure to retry it
+  if (NS_FAILED(aRv)) {
+    // XXX Followup: we may try to reopen the database and flush these
+    // pending tasks, however testing showed that even though I/O is actually
+    // broken some amount of operations is left in sqlite+system buffers and
+    // seems like successfully flushed to disk.
+    // Tested by removing a flash card and disconnecting from network while
+    // using a network drive on Windows system.
+    NS_WARNING("Flush operation on localStorage database failed");
+
+    ++mFlushFailureCount;
+
+    return mFlushFailureCount >= 5;
+  }
+
+  mFlushFailureCount = 0;
+  mExecList.Clear();
+  return true;
+}
+
+namespace { // anon
+
+class FindPendingOperationForScopeData
+{
+public:
+  FindPendingOperationForScopeData(const nsACString& aScope) : mScope(aScope), mFound(false) {}
+  nsCString mScope;
+  bool mFound;
+};
+
+PLDHashOperator
+FindPendingClearForScope(const nsACString& aMapping,
+                         DOMStorageDBThread::DBOperation* aPendingOperation,
+                         void* aArg)
+{
+  FindPendingOperationForScopeData* data =
+    static_cast<FindPendingOperationForScopeData*>(aArg);
+
+  if (aPendingOperation->Type() == DOMStorageDBThread::DBOperation::opClearAll) {
+    data->mFound = true;
+    return PL_DHASH_STOP;
+  }
+
+  if (aPendingOperation->Type() == DOMStorageDBThread::DBOperation::opClear &&
+      data->mScope == aPendingOperation->Scope()) {
+    data->mFound = true;
+    return PL_DHASH_STOP;
+  }
+
+  if (aPendingOperation->Type() == DOMStorageDBThread::DBOperation::opClearMatchingScope &&
+      StringBeginsWith(data->mScope, aPendingOperation->Scope())) {
+    data->mFound = true;
+    return PL_DHASH_STOP;
+  }
+
+  return PL_DHASH_NEXT;
+}
+
+} // anon
+
+bool
+DOMStorageDBThread::PendingOperations::IsScopeClearPending(const nsACString& aScope)
+{
+  // Called under the lock
+
+  FindPendingOperationForScopeData data(aScope);
+  mClears.EnumerateRead(FindPendingClearForScope, &data);
+  if (data.mFound) {
+    return true;
+  }
+
+  for (uint32_t i = 0; i < mExecList.Length(); ++i) {
+    DOMStorageDBThread::DBOperation* task = mExecList[i];
+    FindPendingClearForScope(EmptyCString(), task, &data);
+
+    if (data.mFound) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+namespace { // anon
+
+PLDHashOperator
+FindPendingUpdateForScope(const nsACString& aMapping,
+                          DOMStorageDBThread::DBOperation* aPendingOperation,
+                          void* aArg)
+{
+  FindPendingOperationForScopeData* data =
+    static_cast<FindPendingOperationForScopeData*>(aArg);
+
+  if ((aPendingOperation->Type() == DOMStorageDBThread::DBOperation::opAddItem ||
+       aPendingOperation->Type() == DOMStorageDBThread::DBOperation::opUpdateItem ||
+       aPendingOperation->Type() == DOMStorageDBThread::DBOperation::opRemoveItem) &&
+       data->mScope == aPendingOperation->Scope()) {
+    data->mFound = true;
+    return PL_DHASH_STOP;
+  }
+
+  return PL_DHASH_NEXT;
+}
+
+} // anon
+
+bool
+DOMStorageDBThread::PendingOperations::IsScopeUpdatePending(const nsACString& aScope)
+{
+  // Called under the lock
+
+  FindPendingOperationForScopeData data(aScope);
+  mUpdates.EnumerateRead(FindPendingUpdateForScope, &data);
+  if (data.mFound) {
+    return true;
+  }
+
+  for (uint32_t i = 0; i < mExecList.Length(); ++i) {
+    DOMStorageDBThread::DBOperation* task = mExecList[i];
+    FindPendingUpdateForScope(EmptyCString(), task, &data);
+
+    if (data.mFound) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+} // ::dom
+} // ::mozilla
diff --git a/dom/src/storage/DOMStorageDBThread.h b/dom/src/storage/DOMStorageDBThread.h
new file mode 100644
index 000000000000..d6c6bda4a9d3
--- /dev/null
+++ b/dom/src/storage/DOMStorageDBThread.h
@@ -0,0 +1,350 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef DOMStorageDBThread_h___
+#define DOMStorageDBThread_h___
+
+#include "prthread.h"
+#include "prinrval.h"
+#include "nsTArray.h"
+#include "mozilla/Monitor.h"
+#include "mozilla/storage/StatementCache.h"
+#include "nsString.h"
+#include "nsCOMPtr.h"
+#include "nsClassHashtable.h"
+#include "nsIFile.h"
+
+class mozIStorageConnection;
+
+namespace mozilla {
+namespace dom {
+
+class DOMStorageCacheBridge;
+class DOMStorageUsageBridge;
+class DOMStorageUsage;
+
+typedef mozilla::storage::StatementCache<mozIStorageStatement> StatementCache;
+
+// Interface used by the cache to post operations to the asynchronous
+// database thread or process.
+class DOMStorageDBBridge
+{
+public:
+  DOMStorageDBBridge();
+  virtual ~DOMStorageDBBridge() {}
+
+  // Ensures the database engine is started
+  virtual nsresult Init() = 0;
+
+  // Releases the database and disallows its usage
+  virtual nsresult Shutdown() = 0;
+
+  // Asynchronously fills the cache with data from the database for first use.
+  // When |aPriority| is true, the preload operation is scheduled as the first one.
+  // This method is responsible to keep hard reference to the cache for the time of
+  // the preload or, when preload cannot be performed, call LoadDone() immediately.
+  virtual void AsyncPreload(DOMStorageCacheBridge* aCache, bool aPriority = false) = 0;
+
+  // Asynchronously fill the |usage| object with actual usage of data by its scope.
+  // The scope is eTLD+1 tops, never deeper subdomains.
+  virtual void AsyncGetUsage(DOMStorageUsageBridge* aUsage) = 0;
+
+  // Synchronously fills the cache, when |aForceSync| is false and cache already got some
+  // data before, the method waits for the running preload to finish
+  virtual void SyncPreload(DOMStorageCacheBridge* aCache, bool aForceSync = false) = 0;
+
+  // Called when an existing key is modified in the storage, schedules update to the database
+  virtual nsresult AsyncAddItem(DOMStorageCacheBridge* aCache, const nsAString& aKey, const nsAString& aValue) = 0;
+
+  // Called when an existing key is modified in the storage, schedules update to the database
+  virtual nsresult AsyncUpdateItem(DOMStorageCacheBridge* aCache, const nsAString& aKey, const nsAString& aValue) = 0;
+
+  // Called when an item is removed from the storage, schedules delete of the key
+  virtual nsresult AsyncRemoveItem(DOMStorageCacheBridge* aCache, const nsAString& aKey) = 0;
+
+  // Called when the whole storage is cleared by the DOM API, schedules delete of the scope
+  virtual nsresult AsyncClear(DOMStorageCacheBridge* aCache) = 0;
+
+  // Called when chrome deletes e.g. cookies, schedules delete of the whole database
+  virtual void AsyncClearAll() = 0;
+
+  // Called when only a domain and its subdomains or an app data is about to clear
+  virtual void AsyncClearMatchingScope(const nsACString& aScope) = 0;
+
+  // Forces scheduled DB operations to be early flushed to the disk
+  virtual void AsyncFlush() = 0;
+
+  // Check whether the scope has any data stored on disk and is thus allowed to preload
+  virtual bool ShouldPreloadScope(const nsACString& aScope) = 0;
+
+  // Get the complete list of scopes having data
+  virtual void GetScopesHavingData(InfallibleTArray<nsCString>* aScopes) = 0;
+
+  // Returns object keeping usage cache for the scope.
+  DOMStorageUsage* GetScopeUsage(const nsACString& aScope);
+
+protected:
+  // Keeps usage cache objects for eTLD+1 scopes we have touched.
+  nsClassHashtable<nsCStringHashKey, DOMStorageUsage> mUsages;
+};
+
+// The implementation of the the database engine, this directly works
+// with the sqlite or any other db API we are based on
+// This class is resposible for collecting and processing asynchronous 
+// DB operations over caches (DOMStorageCache) communicating though 
+// DOMStorageCacheBridge interface class
+class DOMStorageDBThread MOZ_FINAL : public DOMStorageDBBridge
+{
+public:
+  class PendingOperations;
+
+  // Representation of a singe database task, like adding and removing keys,
+  // (pre)loading the whole origin data, cleaning.
+  class DBOperation
+  {
+  public:
+    typedef enum {
+      // Only operation that reads data from the database
+      opPreload,
+      // The same as opPreload, just executed with highest priority
+      opPreloadUrgent,
+
+      // Load usage of a scope
+      opGetUsage,
+
+      // Operations invoked by the DOM content API
+      opAddItem,
+      opUpdateItem,
+      opRemoveItem,
+      opClear,
+
+      // Operations invoked by chrome
+      opClearAll,
+      opClearMatchingScope,
+    } OperationType;
+
+    DBOperation(const OperationType aType,
+                DOMStorageCacheBridge* aCache = nullptr,
+                const nsAString& aKey = EmptyString(),
+                const nsAString& aValue = EmptyString());
+    DBOperation(const OperationType aType,
+                DOMStorageUsageBridge* aUsage);
+    DBOperation(const OperationType aType,
+                const nsACString& aScope);
+    ~DBOperation();
+
+    // Executes the operation, doesn't necessarity have to be called on the I/O thread
+    void PerformAndFinalize(DOMStorageDBThread* aThread);
+
+    // Finalize the operation, i.e. do any internal cleanup and finish calls
+    void Finalize(nsresult aRv);
+
+    // The operation type
+    OperationType Type() { return mType; }
+
+    // The operation scope (=origin)
+    const nsCString Scope();
+
+    // |Scope + key| the operation is working with
+    const nsCString Target();
+
+  private:
+    // The operation implementation body
+    nsresult Perform(DOMStorageDBThread* aThread);
+
+    friend class PendingOperations;
+    OperationType mType;
+    nsRefPtr<DOMStorageCacheBridge> mCache;
+    DOMStorageUsageBridge* mUsage;
+    nsString mKey;
+    nsString mValue;
+    nsCString mScope;
+  };
+
+  // Encapsulation of collective and coalescing logic for all pending operations
+  // except preloads that are handled separately as priority operations
+  class PendingOperations {
+  public:
+    PendingOperations();
+
+    // Method responsible for coalescing redundant update operations with the same
+    // |Target()| or clear operations with the same or matching |Scope()|
+    void Add(DBOperation* aOperation);
+
+    // True when there are some scheduled operations to flush on disk
+    bool HasTasks();
+
+    // Moves collected operations to a local flat list to allow execution of the operation
+    // list out of the thread lock
+    bool Prepare();
+
+    // Executes the previously |Prepared()'ed| list of operations, retuns result, but doesn't
+    // handle it in any way in case of a failure
+    nsresult Execute(DOMStorageDBThread* aThread);
+
+    // Finalizes the pending operation list, returns false when too many operations failed
+    // to flush what indicates a long standing issue with the database access.
+    bool Finalize(nsresult aRv);
+
+    // true when a clear that deletes the given |scope| is among the pending operations;
+    // when a preload for that scope is being scheduled, it must be finished right away
+    bool IsScopeClearPending(const nsACString& aScope);
+
+    // Checks whether there is a pending update (or clear, actually) operation for this scope.
+    bool IsScopeUpdatePending(const nsACString& aScope);
+
+  private:
+    // Returns true iff new operation is of type newType and there is a pending 
+    // operation of type pendingType for the same key (target).
+    bool CheckForCoalesceOpportunity(DBOperation* aNewOp,
+                                     DBOperation::OperationType aPendingType,
+                                     DBOperation::OperationType aNewType);
+
+    // List of all clearing operations, executed first
+    nsClassHashtable<nsCStringHashKey, DBOperation> mClears;
+
+    // List of all update/insert operations, executed as second
+    nsClassHashtable<nsCStringHashKey, DBOperation> mUpdates;
+
+    // Collection of all tasks, valid only between Prepare() and Execute()
+    nsTArray<nsAutoPtr<DBOperation> > mExecList;
+
+    // Number of failing flush attempts
+    uint32_t mFlushFailureCount;
+  };
+
+public:
+  DOMStorageDBThread();
+  virtual ~DOMStorageDBThread() {}
+
+  virtual nsresult Init();
+  virtual nsresult Shutdown();
+
+  virtual void AsyncPreload(DOMStorageCacheBridge* aCache, bool aPriority = false)
+    { InsertDBOp(new DBOperation(aPriority ? DBOperation::opPreloadUrgent : DBOperation::opPreload, aCache)); }
+
+  virtual void SyncPreload(DOMStorageCacheBridge* aCache, bool aForce = false);
+
+  virtual void AsyncGetUsage(DOMStorageUsageBridge * aUsage)
+    { InsertDBOp(new DBOperation(DBOperation::opGetUsage, aUsage)); }
+
+  virtual nsresult AsyncAddItem(DOMStorageCacheBridge* aCache, const nsAString& aKey, const nsAString& aValue)
+    { return InsertDBOp(new DBOperation(DBOperation::opAddItem, aCache, aKey, aValue)); }
+
+  virtual nsresult AsyncUpdateItem(DOMStorageCacheBridge* aCache, const nsAString& aKey, const nsAString& aValue)
+    { return InsertDBOp(new DBOperation(DBOperation::opUpdateItem, aCache, aKey, aValue)); }
+
+  virtual nsresult AsyncRemoveItem(DOMStorageCacheBridge* aCache, const nsAString& aKey)
+    { return InsertDBOp(new DBOperation(DBOperation::opRemoveItem, aCache, aKey)); }
+
+  virtual nsresult AsyncClear(DOMStorageCacheBridge* aCache)
+    { return InsertDBOp(new DBOperation(DBOperation::opClear, aCache)); }
+
+  virtual void AsyncClearAll()
+    { InsertDBOp(new DBOperation(DBOperation::opClearAll)); }
+
+  virtual void AsyncClearMatchingScope(const nsACString& aScope)
+    { InsertDBOp(new DBOperation(DBOperation::opClearMatchingScope, aScope)); }
+
+  virtual void AsyncFlush();
+
+  virtual bool ShouldPreloadScope(const nsACString& aScope);
+  virtual void GetScopesHavingData(InfallibleTArray<nsCString>* aScopes);
+
+private:
+  nsCOMPtr<nsIFile> mDatabaseFile;
+  PRThread* mThread;
+
+  // The monitor we drive the thread with
+  Monitor mMonitor;
+
+  // Flag to stop, protected by the monitor
+  bool mStopIOThread;
+
+  // Whether WAL is enabled
+  bool mWALModeEnabled;
+
+  // Whether DB has already been open, avoid races between main thread reads
+  // and pending DB init in the background I/O thread
+  bool mDBReady;
+
+  // State of the database initiation
+  nsresult mStatus;
+
+  // List of scopes having data, for optimization purposes only
+  nsTHashtable<nsCStringHashKey> mScopesHavingData;
+
+  StatementCache mWorkerStatements;
+  StatementCache mReaderStatements;
+
+  // Connection used by the worker thread for all read and write ops
+  nsCOMPtr<mozIStorageConnection> mWorkerConnection;
+
+  // Connection used only on the main thread for sync read operations
+  nsCOMPtr<mozIStorageConnection> mReaderConnection;
+
+  // Time the first pending operation has been added to the pending operations
+  // list
+  PRIntervalTime mDirtyEpoch;
+
+  // Flag to force immediate flush of all pending operations
+  bool mFlushImmediately;
+
+  // List of preloading operations, in chronological or priority order.
+  // Executed prioritly over pending update operations.
+  nsTArray<DBOperation*> mPreloads;
+
+  // Collector of pending update operations
+  PendingOperations mPendingTasks;
+
+  // Counter of calls for thread priority rising.
+  int32_t mPriorityCounter;
+
+  // Helper to direct an operation to one of the arrays above;
+  // also checks IsScopeClearPending for preloads
+  nsresult InsertDBOp(DBOperation* aOperation);
+
+  // Opens the database, first thing we do after start of the thread.
+  nsresult OpenDatabaseConnection();
+  nsresult InitDatabase();
+  nsresult ShutdownDatabase();
+
+  // Tries to establish WAL mode
+  nsresult SetJournalMode(bool aIsWal);
+  nsresult TryJournalMode();
+
+  void SetHigherPriority();
+  void SetDefaultPriority();
+
+  // Ensures we flush pending tasks in some reasonble time
+  void ScheduleFlush();
+
+  // Called when flush of pending tasks is being executed
+  void UnscheduleFlush();
+
+  // This method is used for two purposes:
+  // 1. as a value passed to monitor.Wait() method
+  // 2. as in indicator that flush has to be performed
+  //
+  // Return:
+  // - PR_INTERVAL_NO_TIMEOUT when no pending tasks are scheduled
+  // - larger then zero when tasks have been scheduled, but it is
+  //   still not time to perform the flush ; it is actual interval
+  //   time to wait until the flush has to happen
+  // - 0 when it is time to do the flush
+  PRIntervalTime TimeUntilFlush();
+
+  // Notifies to the main thread that flush has completed
+  void NotifyFlushCompletion();
+
+  // Thread loop
+  static void ThreadFunc(void* aArg);
+  void ThreadFunc();
+};
+
+} // ::dom
+} // ::mozilla
+
+#endif /* DOMStorageDBThread_h___ */
diff --git a/dom/src/storage/DOMStorageIPC.cpp b/dom/src/storage/DOMStorageIPC.cpp
new file mode 100644
index 000000000000..77b32e78be1b
--- /dev/null
+++ b/dom/src/storage/DOMStorageIPC.cpp
@@ -0,0 +1,712 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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 "DOMStorageIPC.h"
+
+#include "DOMStorageManager.h"
+
+#include "mozilla/dom/ContentChild.h"
+#include "mozilla/unused.h"
+
+namespace mozilla {
+namespace dom {
+
+// ----------------------------------------------------------------------------
+// Child
+// ----------------------------------------------------------------------------
+
+NS_IMPL_THREADSAFE_ADDREF(DOMStorageDBChild)
+
+NS_IMETHODIMP_(nsrefcnt) DOMStorageDBChild::Release(void)
+{
+  NS_PRECONDITION(0 != mRefCnt, "dup release");
+  nsrefcnt count = --mRefCnt;
+  NS_LOG_RELEASE(this, count, "DOMStorageDBChild");
+  if (count == 1 && mIPCOpen) {
+    Send__delete__(this);
+    return 0;
+  }
+  if (count == 0) {
+    mRefCnt = 1;
+    delete this;
+    return 0;
+  }
+  return count;
+}
+
+void
+DOMStorageDBChild::AddIPDLReference()
+{
+  NS_ABORT_IF_FALSE(!mIPCOpen, "Attempting to retain multiple IPDL references");
+  mIPCOpen = true;
+  AddRef();
+}
+
+void
+DOMStorageDBChild::ReleaseIPDLReference()
+{
+  NS_ABORT_IF_FALSE(mIPCOpen, "Attempting to release non-existent IPDL reference");
+  mIPCOpen = false;
+  Release();
+}
+
+DOMStorageDBChild::DOMStorageDBChild(DOMLocalStorageManager* aManager)
+  : mManager(aManager)
+  , mStatus(NS_OK)
+  , mIPCOpen(false)
+{
+  mLoadingCaches.Init();
+}
+
+DOMStorageDBChild::~DOMStorageDBChild()
+{
+}
+
+nsTHashtable<nsCStringHashKey>&
+DOMStorageDBChild::ScopesHavingData()
+{
+  if (!mScopesHavingData.IsInitialized()) {
+    mScopesHavingData.Init();
+  }
+
+  return mScopesHavingData;
+}
+
+nsresult
+DOMStorageDBChild::Init()
+{
+  ContentChild* child = ContentChild::GetSingleton();
+  AddIPDLReference();
+  child->SendPStorageConstructor(this);
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBChild::Shutdown()
+{
+  // There is nothing to do here, IPC will release automatically and
+  // the actual thread running on the parent process will also stop
+  // automatically in profile-before-change topic observer.
+  return NS_OK;
+}
+
+void
+DOMStorageDBChild::AsyncPreload(DOMStorageCacheBridge* aCache, bool aPriority)
+{
+  if (mIPCOpen) {
+    // Adding ref to cache for the time of preload.  This ensures a reference to
+    // to the cache and that all keys will load into this cache object.
+    mLoadingCaches.PutEntry(aCache);
+    SendAsyncPreload(aCache->Scope(), aPriority);
+  } else {
+    // No IPC, no love.  But the LoadDone call is expected.
+    aCache->LoadDone(NS_ERROR_UNEXPECTED);
+  }
+}
+
+void
+DOMStorageDBChild::AsyncGetUsage(DOMStorageUsageBridge* aUsage)
+{
+  if (mIPCOpen) {
+    SendAsyncGetUsage(aUsage->Scope());
+  }
+}
+
+void
+DOMStorageDBChild::SyncPreload(DOMStorageCacheBridge* aCache, bool aForceSync)
+{
+  if (NS_FAILED(mStatus)) {
+    aCache->LoadDone(mStatus);
+    return;
+  }
+
+  if (!mIPCOpen) {
+    aCache->LoadDone(NS_ERROR_UNEXPECTED);
+    return;
+  }
+
+  // There is no way to put the child process to a wait state to receive all
+  // incoming async responses from the parent, hence we have to do a sync preload
+  // instead.  We are smart though, we only demand keys that are left to load in
+  // case the async preload has already loaded some keys.
+  InfallibleTArray<nsString> keys, values;
+  nsresult rv;
+  SendPreload(aCache->Scope(), aCache->LoadedCount(), &keys, &values, &rv);
+
+  for (uint32_t i = 0; i < keys.Length(); ++i) {
+    aCache->LoadItem(keys[i], values[i]);
+  }
+
+  aCache->LoadDone(rv);
+}
+
+nsresult
+DOMStorageDBChild::AsyncAddItem(DOMStorageCacheBridge* aCache,
+                                const nsAString& aKey,
+                                const nsAString& aValue)
+{
+  if (NS_FAILED(mStatus) || !mIPCOpen) {
+    return mStatus;
+  }
+
+  SendAsyncAddItem(aCache->Scope(), nsString(aKey), nsString(aValue));
+  ScopesHavingData().PutEntry(aCache->Scope());
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBChild::AsyncUpdateItem(DOMStorageCacheBridge* aCache,
+                                   const nsAString& aKey,
+                                   const nsAString& aValue)
+{
+  if (NS_FAILED(mStatus) || !mIPCOpen) {
+    return mStatus;
+  }
+
+  SendAsyncUpdateItem(aCache->Scope(), nsString(aKey), nsString(aValue));
+  ScopesHavingData().PutEntry(aCache->Scope());
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBChild::AsyncRemoveItem(DOMStorageCacheBridge* aCache,
+                                   const nsAString& aKey)
+{
+  if (NS_FAILED(mStatus) || !mIPCOpen) {
+    return mStatus;
+  }
+
+  SendAsyncRemoveItem(aCache->Scope(), nsString(aKey));
+  return NS_OK;
+}
+
+nsresult
+DOMStorageDBChild::AsyncClear(DOMStorageCacheBridge* aCache)
+{
+  if (NS_FAILED(mStatus) || !mIPCOpen) {
+    return mStatus;
+  }
+
+  SendAsyncClear(aCache->Scope());
+  ScopesHavingData().RemoveEntry(aCache->Scope());
+  return NS_OK;
+}
+
+bool
+DOMStorageDBChild::ShouldPreloadScope(const nsACString& aScope)
+{
+  // Return true if we didn't receive the aScope list yet.
+  // I tend to rather preserve a bit of early-after-start performance
+  // then a bit of memory here.
+  return !mScopesHavingData.IsInitialized() ||
+         mScopesHavingData.Contains(aScope);
+}
+
+bool
+DOMStorageDBChild::RecvObserve(const nsCString& aTopic,
+                               const nsCString& aScopePrefix)
+{
+  DOMStorageObserver::Self()->Notify(aTopic.get(), aScopePrefix);
+  return true;
+}
+
+bool
+DOMStorageDBChild::RecvScopesHavingData(const InfallibleTArray<nsCString>& aScopes)
+{
+  for (uint32_t i = 0; i < aScopes.Length(); ++i) {
+    ScopesHavingData().PutEntry(aScopes[i]);
+  }
+
+  return true;
+}
+
+bool
+DOMStorageDBChild::RecvLoadItem(const nsCString& aScope,
+                                const nsString& aKey,
+                                const nsString& aValue)
+{
+  DOMStorageCache* aCache = mManager->GetCache(aScope);
+  if (aCache) {
+    aCache->LoadItem(aKey, aValue);
+  }
+
+  return true;
+}
+
+bool
+DOMStorageDBChild::RecvLoadDone(const nsCString& aScope, const nsresult& aRv)
+{
+  DOMStorageCache* aCache = mManager->GetCache(aScope);
+  if (aCache) {
+    aCache->LoadDone(aRv);
+
+    // Just drop reference to this cache now since the load is done.
+    mLoadingCaches.RemoveEntry(static_cast<DOMStorageCacheBridge*>(aCache));
+  }
+
+  return true;
+}
+
+bool
+DOMStorageDBChild::RecvLoadUsage(const nsCString& aScope, const int64_t& aUsage)
+{
+  DOMStorageDBBridge* db = DOMStorageCache::GetDatabase();
+  if (!db) {
+    return false;
+  }
+
+  DOMStorageUsageBridge* scopeUsage = db->GetScopeUsage(aScope);
+  scopeUsage->LoadUsage(aUsage);
+  return true;
+}
+
+bool
+DOMStorageDBChild::RecvError(const nsresult& aRv)
+{
+  mStatus = aRv;
+  return true;
+}
+
+// ----------------------------------------------------------------------------
+// Parent
+// ----------------------------------------------------------------------------
+
+NS_IMPL_THREADSAFE_ADDREF(DOMStorageDBParent)
+NS_IMPL_THREADSAFE_RELEASE(DOMStorageDBParent)
+
+void
+DOMStorageDBParent::AddIPDLReference()
+{
+  NS_ABORT_IF_FALSE(!mIPCOpen, "Attempting to retain multiple IPDL references");
+  mIPCOpen = true;
+  AddRef();
+}
+
+void
+DOMStorageDBParent::ReleaseIPDLReference()
+{
+  NS_ABORT_IF_FALSE(mIPCOpen, "Attempting to release non-existent IPDL reference");
+  mIPCOpen = false;
+  Release();
+}
+
+namespace { // anon
+
+class SendScopesHavingDataRunnable : public nsRunnable
+{
+public:
+  SendScopesHavingDataRunnable(DOMStorageDBParent* aParent)
+    : mParent(aParent)
+  {}
+
+private:
+  NS_IMETHOD Run()
+  {
+    if (!mParent->IPCOpen()) {
+      return NS_OK;
+    }
+
+    DOMStorageDBBridge* db = DOMStorageCache::GetDatabase();
+    if (db) {
+      InfallibleTArray<nsCString> scopes;
+      db->GetScopesHavingData(&scopes);
+      mozilla::unused << mParent->SendScopesHavingData(scopes);
+    }
+
+    return NS_OK;
+  }
+
+  nsRefPtr<DOMStorageDBParent> mParent;
+};
+
+} // anon
+
+DOMStorageDBParent::DOMStorageDBParent()
+: mIPCOpen(false)
+{
+  DOMStorageObserver* observer = DOMStorageObserver::Self();
+  if (observer) {
+    observer->AddSink(this);
+  }
+
+  // We are always open by IPC only
+  AddIPDLReference();
+
+  // Cannot send directly from here since the channel
+  // is not completely built at this moment.
+  nsRefPtr<SendScopesHavingDataRunnable> r =
+    new SendScopesHavingDataRunnable(this);
+  NS_DispatchToCurrentThread(r);
+}
+
+DOMStorageDBParent::~DOMStorageDBParent()
+{
+  DOMStorageObserver* observer = DOMStorageObserver::Self();
+  if (observer) {
+    observer->RemoveSink(this);
+  }
+}
+
+DOMStorageDBParent::CacheParentBridge*
+DOMStorageDBParent::NewCache(const nsACString& aScope)
+{
+  return new CacheParentBridge(this, aScope);
+}
+
+bool
+DOMStorageDBParent::RecvAsyncPreload(const nsCString& aScope, const bool& aPriority)
+{
+  DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+  if (!db) {
+    return false;
+  }
+
+  db->AsyncPreload(NewCache(aScope), aPriority);
+  return true;
+}
+
+bool
+DOMStorageDBParent::RecvAsyncGetUsage(const nsCString& aScope)
+{
+  DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+  if (!db) {
+    return false;
+  }
+
+  // The object releases it self in LoadUsage method
+  UsageParentBridge* usage = new UsageParentBridge(this, aScope);
+  db->AsyncGetUsage(usage);
+  return true;
+}
+
+namespace { // anon
+
+// We need another implementation of DOMStorageCacheBridge to do
+// synchronous IPC preload.  This class just receives Load* notifications
+// and fills the returning arguments of RecvPreload with the database
+// values for us.
+class SyncLoadCacheHelper : public DOMStorageCacheBridge
+{
+public:
+  SyncLoadCacheHelper(const nsCString& aScope,
+                      uint32_t aAlreadyLoadedCount,
+                      InfallibleTArray<nsString>* aKeys,
+                      InfallibleTArray<nsString>* aValues,
+                      nsresult* rv)
+  : mMonitor("DOM Storage SyncLoad IPC")
+  , mScope(aScope)
+  , mKeys(aKeys)
+  , mValues(aValues)
+  , mRv(rv)
+  , mLoaded(false)
+  , mLoadedCount(aAlreadyLoadedCount)
+  {
+    // Precaution
+    *mRv = NS_ERROR_UNEXPECTED;
+  }
+
+  virtual const nsCString& Scope() const { return mScope; }
+  virtual bool Loaded() { return mLoaded; }
+  virtual uint32_t LoadedCount() { return mLoadedCount; }
+  virtual bool LoadItem(const nsAString& aKey, const nsString& aValue)
+  {
+    // Called on the aCache background thread
+    if (mLoaded) {
+      return false;
+    }
+
+    ++mLoadedCount;
+    mKeys->AppendElement(aKey);
+    mValues->AppendElement(aValue);
+    return true;
+  }
+
+  virtual void LoadDone(nsresult aRv)
+  {
+    // Called on the aCache background thread
+    MonitorAutoLock monitor(mMonitor);
+    mLoaded = true;
+    *mRv = aRv;
+    monitor.Notify();
+  }
+
+  virtual void LoadWait()
+  {
+    // Called on the main thread, exits after LoadDone() call
+    MonitorAutoLock monitor(mMonitor);
+    while (!mLoaded) {
+      monitor.Wait();
+    }
+  }
+
+private:
+  Monitor mMonitor;
+  nsCString mScope;
+  InfallibleTArray<nsString>* mKeys;
+  InfallibleTArray<nsString>* mValues;
+  nsresult* mRv;
+  bool mLoaded;
+  uint32_t mLoadedCount;
+};
+
+} // anon
+
+bool
+DOMStorageDBParent::RecvPreload(const nsCString& aScope,
+                                const uint32_t& aAlreadyLoadedCount,
+                                InfallibleTArray<nsString>* aKeys,
+                                InfallibleTArray<nsString>* aValues,
+                                nsresult* aRv)
+{
+  DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+  if (!db) {
+    return false;
+  }
+
+  nsRefPtr<SyncLoadCacheHelper> cache(
+    new SyncLoadCacheHelper(aScope, aAlreadyLoadedCount, aKeys, aValues, aRv));
+
+  db->SyncPreload(cache, true);
+  return true;
+}
+
+bool
+DOMStorageDBParent::RecvAsyncAddItem(const nsCString& aScope,
+                                     const nsString& aKey,
+                                     const nsString& aValue)
+{
+  DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+  if (!db) {
+    return false;
+  }
+
+  nsresult rv = db->AsyncAddItem(NewCache(aScope), aKey, aValue);
+  if (NS_FAILED(rv) && mIPCOpen) {
+    mozilla::unused << SendError(rv);
+  }
+
+  return true;
+}
+
+bool
+DOMStorageDBParent::RecvAsyncUpdateItem(const nsCString& aScope,
+                                        const nsString& aKey,
+                                        const nsString& aValue)
+{
+  DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+  if (!db) {
+    return false;
+  }
+
+  nsresult rv = db->AsyncUpdateItem(NewCache(aScope), aKey, aValue);
+  if (NS_FAILED(rv) && mIPCOpen) {
+    mozilla::unused << SendError(rv);
+  }
+
+  return true;
+}
+
+bool
+DOMStorageDBParent::RecvAsyncRemoveItem(const nsCString& aScope,
+                                        const nsString& aKey)
+{
+  DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+  if (!db) {
+    return false;
+  }
+
+  nsresult rv = db->AsyncRemoveItem(NewCache(aScope), aKey);
+  if (NS_FAILED(rv) && mIPCOpen) {
+    mozilla::unused << SendError(rv);
+  }
+
+  return true;
+}
+
+bool
+DOMStorageDBParent::RecvAsyncClear(const nsCString& aScope)
+{
+  DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+  if (!db) {
+    return false;
+  }
+
+  nsresult rv = db->AsyncClear(NewCache(aScope));
+  if (NS_FAILED(rv) && mIPCOpen) {
+    mozilla::unused << SendError(rv);
+  }
+
+  return true;
+}
+
+bool
+DOMStorageDBParent::RecvAsyncFlush()
+{
+  DOMStorageDBBridge* db = DOMStorageCache::GetDatabase();
+  if (!db) {
+    return false;
+  }
+
+  db->AsyncFlush();
+  return true;
+}
+
+// DOMStorageObserverSink
+
+nsresult
+DOMStorageDBParent::Observe(const char* aTopic,
+                            const nsACString& aScopePrefix)
+{
+  if (mIPCOpen) {
+    mozilla::unused << SendObserve(nsDependentCString(aTopic),
+                                   nsCString(aScopePrefix));
+  }
+
+  return NS_OK;
+}
+
+namespace { // anon
+
+// Results must be sent back on the main thread
+class LoadRunnable : public nsRunnable
+{
+public:
+  enum TaskType {
+    loadItem,
+    loadDone
+  };
+
+  LoadRunnable(DOMStorageDBParent* aParent,
+               TaskType aType,
+               const nsACString& aScope,
+               const nsAString& aKey = EmptyString(),
+               const nsAString& aValue = EmptyString())
+  : mParent(aParent)
+  , mType(aType)
+  , mScope(aScope)
+  , mKey(aKey)
+  , mValue(aValue)
+  { }
+
+  LoadRunnable(DOMStorageDBParent* aParent,
+               TaskType aType,
+               const nsACString& aScope,
+               nsresult aRv)
+  : mParent(aParent)
+  , mType(aType)
+  , mScope(aScope)
+  , mRv(aRv)
+  { }
+
+private:
+  nsRefPtr<DOMStorageDBParent> mParent;
+  TaskType mType;
+  nsCString mScope;
+  nsString mKey;
+  nsString mValue;
+  nsresult mRv;
+
+  NS_IMETHOD Run()
+  {
+    if (!mParent->IPCOpen()) {
+      return NS_OK;
+    }
+
+    switch (mType)
+    {
+    case loadItem:
+      mozilla::unused << mParent->SendLoadItem(mScope, mKey, mValue);
+      break;
+    case loadDone:
+      mozilla::unused << mParent->SendLoadDone(mScope, mRv);
+      break;
+    }
+
+    return NS_OK;
+  }
+};
+
+} // anon
+
+// DOMStorageDBParent::CacheParentBridge
+
+bool
+DOMStorageDBParent::CacheParentBridge::LoadItem(const nsAString& aKey, const nsString& aValue)
+{
+  if (mLoaded) {
+    return false;
+  }
+
+  ++mLoadedCount;
+
+  nsRefPtr<LoadRunnable> r =
+    new LoadRunnable(mParent, LoadRunnable::loadItem, mScope, aKey, aValue);
+  NS_DispatchToMainThread(r);
+  return true;
+}
+
+void
+DOMStorageDBParent::CacheParentBridge::LoadDone(nsresult aRv)
+{
+  // Prevent send of duplicate LoadDone.
+  if (mLoaded) {
+    return;
+  }
+
+  mLoaded = true;
+
+  nsRefPtr<LoadRunnable> r =
+    new LoadRunnable(mParent, LoadRunnable::loadDone, mScope, aRv);
+  NS_DispatchToMainThread(r);
+}
+
+void
+DOMStorageDBParent::CacheParentBridge::LoadWait()
+{
+  // Should never be called on this implementation
+  MOZ_ASSERT(false);
+}
+
+// DOMStorageDBParent::UsageParentBridge
+
+namespace { // anon
+
+class UsageRunnable : public nsRunnable
+{
+public:
+  UsageRunnable(DOMStorageDBParent* aParent, const nsACString& aScope, const int64_t& aUsage)
+  : mParent(aParent)
+  , mScope(aScope)
+  , mUsage(aUsage)
+  {}
+
+private:
+  NS_IMETHOD Run()
+  {
+    if (!mParent->IPCOpen()) {
+      return NS_OK;
+    }
+
+    mozilla::unused << mParent->SendLoadUsage(mScope, mUsage);
+    return NS_OK;
+  }
+
+  nsRefPtr<DOMStorageDBParent> mParent;
+  nsCString mScope;
+  int64_t mUsage;
+};
+
+} // anon
+
+void
+DOMStorageDBParent::UsageParentBridge::LoadUsage(const int64_t aUsage)
+{
+  nsRefPtr<UsageRunnable> r = new UsageRunnable(mParent, mScope, aUsage);
+  NS_DispatchToMainThread(r);
+  delete this;
+}
+
+} // ::dom
+} // ::mozilla
diff --git a/dom/src/storage/DOMStorageIPC.h b/dom/src/storage/DOMStorageIPC.h
new file mode 100644
index 000000000000..2a9c2342ccae
--- /dev/null
+++ b/dom/src/storage/DOMStorageIPC.h
@@ -0,0 +1,191 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef nsDOMStorageIPC_h___
+#define nsDOMStorageIPC_h___
+
+#include "mozilla/dom/PStorageChild.h"
+#include "mozilla/dom/PStorageParent.h"
+#include "DOMStorageDBThread.h"
+#include "DOMStorageCache.h"
+#include "DOMStorageObserver.h"
+#include "mozilla/Mutex.h"
+
+namespace mozilla {
+namespace dom {
+
+class DOMLocalStorageManager;
+
+// Child side of the IPC protocol, exposes as DB interface but
+// is responsible to send all requests to the parent process
+// and expects asynchronous answers. Those are then transparently
+// forwarded back to consumers on the child process.
+class DOMStorageDBChild MOZ_FINAL : public DOMStorageDBBridge
+                                  , public PStorageChild
+{
+public:
+  DOMStorageDBChild(DOMLocalStorageManager* aManager);
+  virtual ~DOMStorageDBChild();
+
+  NS_IMETHOD_(nsrefcnt) AddRef(void);
+  NS_IMETHOD_(nsrefcnt) Release(void);
+
+  void AddIPDLReference();
+  void ReleaseIPDLReference();
+
+  virtual nsresult Init();
+  virtual nsresult Shutdown();
+
+  virtual void AsyncPreload(DOMStorageCacheBridge* aCache, bool aPriority = false);
+  virtual void AsyncGetUsage(DOMStorageUsageBridge* aUsage);
+
+  virtual void SyncPreload(DOMStorageCacheBridge* aCache, bool aForceSync = false);
+
+  virtual nsresult AsyncAddItem(DOMStorageCacheBridge* aCache, const nsAString& aKey, const nsAString& aValue);
+  virtual nsresult AsyncUpdateItem(DOMStorageCacheBridge* aCache, const nsAString& aKey, const nsAString& aValue);
+  virtual nsresult AsyncRemoveItem(DOMStorageCacheBridge* aCache, const nsAString& aKey);
+  virtual nsresult AsyncClear(DOMStorageCacheBridge* aCache);
+
+  virtual void AsyncClearAll()
+    { mScopesHavingData.Clear(); /* NO-OP on the child process otherwise */ }
+
+  virtual void AsyncClearMatchingScope(const nsACString& aScope)
+    { /* NO-OP on the child process */ }
+
+  virtual void AsyncFlush()
+    { SendAsyncFlush(); }
+
+  virtual bool ShouldPreloadScope(const nsACString& aScope);
+  virtual void GetScopesHavingData(InfallibleTArray<nsCString>* aScopes)
+    { NS_NOTREACHED("Not implemented for child process"); }
+
+private:
+  bool RecvObserve(const nsCString& aTopic,
+                   const nsCString& aScopePrefix);
+  bool RecvLoadItem(const nsCString& aScope,
+                    const nsString& aKey,
+                    const nsString& aValue);
+  bool RecvLoadDone(const nsCString& aScope,
+                    const nsresult& aRv);
+  bool RecvScopesHavingData(const InfallibleTArray<nsCString>& aScopes);
+  bool RecvLoadUsage(const nsCString& aScope,
+                     const int64_t& aUsage);
+  bool RecvError(const nsresult& aRv);
+
+  nsTHashtable<nsCStringHashKey>& ScopesHavingData();
+
+  nsAutoRefCnt mRefCnt;
+
+  // Held to get caches to forward answers to.
+  nsRefPtr<DOMLocalStorageManager> mManager;
+
+  // Scopes having data hash, for optimization purposes only
+  nsTHashtable<nsCStringHashKey> mScopesHavingData;
+
+  // List of caches waiting for preload.  This ensures the contract that
+  // AsyncPreload call references the cache for time of the preload.
+  nsTHashtable<nsRefPtrHashKey<DOMStorageCacheBridge> > mLoadingCaches;
+
+  // Status of the remote database
+  nsresult mStatus;
+
+  bool mIPCOpen;
+};
+
+
+// Receives async requests from child processes and is responsible
+// to send back responses from the DB thread.  Exposes as a fake
+// DOMStorageCache consumer.
+// Also responsible for forwardning all chrome operation notifications
+// such as cookie cleaning etc to the child process.
+class DOMStorageDBParent MOZ_FINAL : public PStorageParent
+                                   , public DOMStorageObserverSink
+{
+public:
+  DOMStorageDBParent();
+  virtual ~DOMStorageDBParent();
+
+  NS_IMETHOD_(nsrefcnt) AddRef(void);
+  NS_IMETHOD_(nsrefcnt) Release(void);
+
+  void AddIPDLReference();
+  void ReleaseIPDLReference();
+
+  bool IPCOpen() { return mIPCOpen; }
+
+public:
+  // Fake cache class receiving async callbacks from DB thread, sending
+  // them back to appropriate cache object on the child process.
+  class CacheParentBridge : public DOMStorageCacheBridge {
+  public:
+    CacheParentBridge(DOMStorageDBParent* aParentDB, const nsACString& aScope)
+      : mParent(aParentDB), mScope(aScope), mLoaded(false), mLoadedCount(0) {}
+    virtual ~CacheParentBridge() {}
+
+    // DOMStorageCacheBridge
+    virtual const nsCString& Scope() const
+      { return mScope; }
+    virtual bool Loaded()
+      { return mLoaded; }
+    virtual uint32_t LoadedCount()
+      { return mLoadedCount; }
+
+    virtual bool LoadItem(const nsAString& aKey, const nsString& aValue);
+    virtual void LoadDone(nsresult aRv);
+    virtual void LoadWait();
+
+  private:
+    nsRefPtr<DOMStorageDBParent> mParent;
+    nsCString mScope;
+    bool mLoaded;
+    uint32_t mLoadedCount;
+  };
+
+  // Fake usage class receiving async callbacks from DB thread
+  class UsageParentBridge : public DOMStorageUsageBridge
+  {
+  public:
+    UsageParentBridge(DOMStorageDBParent* aParentDB, const nsACString& aScope)
+      : mParent(aParentDB), mScope(aScope) {}
+    virtual ~UsageParentBridge() {}
+
+    // DOMStorageUsageBridge
+    virtual const nsCString& Scope() { return mScope; }
+    virtual void LoadUsage(const int64_t usage);
+
+  private:
+    nsRefPtr<DOMStorageDBParent> mParent;
+    nsCString mScope;
+  };
+
+private:
+  // IPC
+  bool RecvAsyncPreload(const nsCString& aScope, const bool& aPriority);
+  bool RecvPreload(const nsCString& aScope, const uint32_t& aAlreadyLoadedCount,
+                   InfallibleTArray<nsString>* aKeys, InfallibleTArray<nsString>* aValues,
+                   nsresult* aRv);
+  bool RecvAsyncGetUsage(const nsCString& aScope);
+  bool RecvAsyncAddItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue);
+  bool RecvAsyncUpdateItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue);
+  bool RecvAsyncRemoveItem(const nsCString& aScope, const nsString& aKey);
+  bool RecvAsyncClear(const nsCString& aScope);
+  bool RecvAsyncFlush();
+
+  // DOMStorageObserverSink
+  virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix);
+
+private:
+  CacheParentBridge* NewCache(const nsACString& aScope);
+
+  nsAutoRefCnt mRefCnt;
+	
+	// True when IPC channel is open and Send*() methods are OK to use.
+  bool mIPCOpen;
+};
+
+} // ::dom
+} // ::mozilla
+
+#endif
diff --git a/dom/src/storage/DOMStorageManager.cpp b/dom/src/storage/DOMStorageManager.cpp
new file mode 100644
index 000000000000..0f605f9bc81e
--- /dev/null
+++ b/dom/src/storage/DOMStorageManager.cpp
@@ -0,0 +1,631 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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 "DOMStorageManager.h"
+#include "DOMStorage.h"
+#include "DOMStorageDBThread.h"
+
+#include "nsIScriptSecurityManager.h"
+#include "nsIEffectiveTLDService.h"
+
+#include "nsNetUtil.h"
+#include "nsPrintfCString.h"
+#include "nsXULAppAPI.h"
+#include "nsThreadUtils.h"
+#include "nsIObserverService.h"
+#include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
+
+// Only allow relatively small amounts of data since performance of
+// the synchronous IO is very bad.
+// We are enforcing simple per-origin quota only.
+#define DEFAULT_QUOTA_LIMIT (5 * 1024)
+
+namespace mozilla {
+namespace dom {
+
+namespace { // anon
+
+int32_t gQuotaLimit = DEFAULT_QUOTA_LIMIT;
+
+} // anon
+
+DOMLocalStorageManager*
+DOMLocalStorageManager::sSelf = nullptr;
+
+// static
+uint32_t
+DOMStorageManager::GetQuota()
+{
+  static bool preferencesInitialized = false;
+  if (!preferencesInitialized) {
+    mozilla::Preferences::AddIntVarCache(&gQuotaLimit, "dom.storage.default_quota",
+                                         DEFAULT_QUOTA_LIMIT);
+    preferencesInitialized = true;
+  }
+
+  return gQuotaLimit * 1024; // pref is in kBs
+}
+
+void
+ReverseString(const nsCSubstring& aSource, nsCSubstring& aResult)
+{
+  nsACString::const_iterator sourceBegin, sourceEnd;
+  aSource.BeginReading(sourceBegin);
+  aSource.EndReading(sourceEnd);
+
+  aResult.SetLength(aSource.Length());
+  nsACString::iterator destEnd;
+  aResult.EndWriting(destEnd);
+
+  while (sourceBegin != sourceEnd) {
+    *(--destEnd) = *sourceBegin;
+    ++sourceBegin;
+  }
+}
+
+nsresult
+CreateReversedDomain(const nsACString& aAsciiDomain,
+                     nsACString& aKey)
+{
+  if (aAsciiDomain.IsEmpty()) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  ReverseString(aAsciiDomain, aKey);
+
+  aKey.AppendLiteral(".");
+  return NS_OK;
+}
+
+bool
+PrincipalsEqual(nsIPrincipal* aObjectPrincipal, nsIPrincipal* aSubjectPrincipal)
+{
+  if (!aSubjectPrincipal) {
+    return true;
+  }
+
+  if (!aObjectPrincipal) {
+    return false;
+  }
+
+  bool equals;
+  nsresult rv = aSubjectPrincipal->EqualsIgnoringDomain(aObjectPrincipal, &equals);
+
+  NS_ASSERTION(NS_SUCCEEDED(rv) && equals,
+               "Trying to get DOM storage for wrong principal!");
+
+  if (NS_FAILED(rv) || !equals) {
+    return false;
+  }
+
+  return true;
+}
+
+NS_IMPL_ISUPPORTS1(DOMStorageManager,
+                   nsIDOMStorageManager)
+
+DOMStorageManager::DOMStorageManager(nsPIDOMStorage::StorageType aType)
+  : mType(aType)
+{
+  mCaches.Init(10);
+  DOMStorageObserver* observer = DOMStorageObserver::Self();
+  NS_ASSERTION(observer, "No DOMStorageObserver, cannot observe private data delete notifications!");
+
+  if (observer) {
+    observer->AddSink(this);
+  }
+}
+
+DOMStorageManager::~DOMStorageManager()
+{
+  DOMStorageObserver* observer = DOMStorageObserver::Self();
+  if (observer) {
+    observer->RemoveSink(this);
+  }
+}
+
+namespace { // anon
+
+nsresult
+CreateScopeKey(nsIPrincipal* aPrincipal,
+               nsACString& aKey)
+{
+  nsCOMPtr<nsIURI> uri;
+  nsresult rv = aPrincipal->GetURI(getter_AddRefs(uri));
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!uri) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  nsAutoCString domainScope;
+  rv = uri->GetAsciiHost(domainScope);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (domainScope.IsEmpty()) {
+    // About pages have an empty host but a valid path.  Since they are handled
+    // internally by our own redirector, we can trust them and use path as key.
+    // if file:/// protocol, let's make the exact directory the domain
+    bool isScheme = false;
+    if ((NS_SUCCEEDED(uri->SchemeIs("about", &isScheme)) && isScheme) ||
+        (NS_SUCCEEDED(uri->SchemeIs("moz-safe-about", &isScheme)) && isScheme)) {
+      rv = uri->GetPath(domainScope);
+      NS_ENSURE_SUCCESS(rv, rv);
+      // While the host is always canonicalized to lowercase, the path is not,
+      // thus need to force the casing.
+      ToLowerCase(domainScope);
+    } else if (NS_SUCCEEDED(uri->SchemeIs("file", &isScheme)) && isScheme) {
+      nsCOMPtr<nsIURL> url = do_QueryInterface(uri, &rv);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = url->GetDirectory(domainScope);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+  }
+
+  nsAutoCString key;
+
+  rv = CreateReversedDomain(domainScope, key);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  nsAutoCString scheme;
+  rv = uri->GetScheme(scheme);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  key.Append(NS_LITERAL_CSTRING(":") + scheme);
+
+  int32_t port = NS_GetRealPort(uri);
+  if (port != -1) {
+    key.Append(nsPrintfCString(":%d", port));
+  }
+
+  bool unknownAppId;
+  rv = aPrincipal->GetUnknownAppId(&unknownAppId);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!unknownAppId) {
+    uint32_t appId;
+    rv = aPrincipal->GetAppId(&appId);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    bool isInBrowserElement;
+    rv = aPrincipal->GetIsInBrowserElement(&isInBrowserElement);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if (appId == nsIScriptSecurityManager::NO_APP_ID && !isInBrowserElement) {
+      aKey.Assign(key);
+      return NS_OK;
+    }
+
+    aKey.Truncate();
+    aKey.AppendInt(appId);
+    aKey.Append(NS_LITERAL_CSTRING(":") + (isInBrowserElement ?
+                NS_LITERAL_CSTRING("t") : NS_LITERAL_CSTRING("f")) +
+                NS_LITERAL_CSTRING(":") + key);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+CreateQuotaDBKey(nsIPrincipal* aPrincipal,
+                 nsACString& aKey)
+{
+  nsresult rv;
+
+  nsAutoCString subdomainsDBKey;
+  nsCOMPtr<nsIEffectiveTLDService> eTLDService(do_GetService(
+    NS_EFFECTIVETLDSERVICE_CONTRACTID, &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIURI> uri;
+  rv = aPrincipal->GetURI(getter_AddRefs(uri));
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
+
+  nsAutoCString eTLDplusOne;
+  rv = eTLDService->GetBaseDomain(uri, 0, eTLDplusOne);
+  if (NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS == rv) {
+    // XXX bug 357323 - what to do for localhost/file exactly?
+    rv = uri->GetAsciiHost(eTLDplusOne);
+  }
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  CreateReversedDomain(eTLDplusOne, subdomainsDBKey);
+
+  bool unknownAppId;
+  rv = aPrincipal->GetUnknownAppId(&unknownAppId);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!unknownAppId) {
+    uint32_t appId;
+    rv = aPrincipal->GetAppId(&appId);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    bool isInBrowserElement;
+    rv = aPrincipal->GetIsInBrowserElement(&isInBrowserElement);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if (appId == nsIScriptSecurityManager::NO_APP_ID && !isInBrowserElement) {
+      aKey.Assign(subdomainsDBKey);
+      return NS_OK;
+    }
+
+    aKey.Truncate();
+    aKey.AppendInt(appId);
+    aKey.Append(NS_LITERAL_CSTRING(":") + (isInBrowserElement ?
+                NS_LITERAL_CSTRING("t") : NS_LITERAL_CSTRING("f")) +
+                NS_LITERAL_CSTRING(":") + subdomainsDBKey);
+  }
+
+  return NS_OK;
+}
+
+} // anon
+
+DOMStorageCache*
+DOMStorageManager::GetCache(const nsACString& aScope) const
+{
+  DOMStorageCacheHashKey* entry = mCaches.GetEntry(aScope);
+  if (!entry) {
+    return nullptr;
+  }
+
+  return entry->cache();
+}
+
+already_AddRefed<DOMStorageCache>
+DOMStorageManager::PutCache(const nsACString& aScope,
+                            nsIPrincipal* aPrincipal)
+{
+  DOMStorageCacheHashKey* entry = mCaches.PutEntry(aScope);
+  nsRefPtr<DOMStorageCache> cache = entry->cache();
+
+  nsAutoCString quotaScope;
+  CreateQuotaDBKey(aPrincipal, quotaScope);
+
+  switch (mType) {
+  case SessionStorage:
+    // Lifetime handled by the manager, don't persist
+    entry->HardRef();
+    cache->Init(nullptr, false, aPrincipal, quotaScope);
+    break;
+
+  case LocalStorage:
+    // Lifetime handled by the cache, do persist
+    cache->Init(this, true, aPrincipal, quotaScope);
+    break;
+
+  default:
+    MOZ_ASSERT(false);
+  }
+
+  return cache.forget();
+}
+
+void
+DOMStorageManager::DropCache(DOMStorageCache* aCache)
+{
+  if (!NS_IsMainThread()) {
+    NS_WARNING("DOMStorageManager::DropCache called on a non-main thread, shutting down?");
+  }
+
+  mCaches.RemoveEntry(aCache->Scope());
+}
+
+nsresult
+DOMStorageManager::GetStorageInternal(bool aCreate,
+                                      nsIPrincipal* aPrincipal,
+                                      const nsAString& aDocumentURI,
+                                      bool aPrivate,
+                                      nsIDOMStorage** aRetval)
+{
+  nsresult rv;
+
+  nsAutoCString scope;
+  rv = CreateScopeKey(aPrincipal, scope);
+  if (NS_FAILED(rv)) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  nsRefPtr<DOMStorageCache> cache = GetCache(scope);
+
+  // Get or create a cache for the given scope
+  if (!cache) {
+    if (!aCreate) {
+      *aRetval = nullptr;
+      return NS_OK;
+    }
+
+    if (!aRetval) {
+      // This is demand to just preload the cache, if the scope has
+      // no data stored, bypass creation and preload of the cache.
+      DOMStorageDBBridge* db = DOMStorageCache::GetDatabase();
+      if (db) {
+        if (!db->ShouldPreloadScope(scope)) {
+          return NS_OK;
+        }
+      } else {
+        if (scope.Equals(NS_LITERAL_CSTRING("knalb.:about"))) {
+          return NS_OK;
+        }
+      }
+    }
+
+    // There is always a single instance of a cache per scope
+    // in a single instance of a DOM storage manager.
+    cache = PutCache(scope, aPrincipal);
+  } else if (mType == SessionStorage) {
+    if (!cache->CheckPrincipal(aPrincipal)) {
+      return NS_ERROR_DOM_SECURITY_ERR;
+    }
+  }
+
+  if (aRetval) {
+    *aRetval = new DOMStorage(this, cache, aDocumentURI, aPrincipal, aPrivate);
+    NS_ADDREF(*aRetval);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DOMStorageManager::PrecacheStorage(nsIPrincipal* aPrincipal)
+{
+  return GetStorageInternal(true, aPrincipal, EmptyString(), false, nullptr);
+}
+
+NS_IMETHODIMP
+DOMStorageManager::CreateStorage(nsIPrincipal* aPrincipal,
+                                 const nsAString& aDocumentURI,
+                                 bool aPrivate,
+                                 nsIDOMStorage** aRetval)
+{
+  return GetStorageInternal(true, aPrincipal, aDocumentURI, aPrivate, aRetval);
+}
+
+NS_IMETHODIMP
+DOMStorageManager::GetStorage(nsIPrincipal* aPrincipal,
+                              bool aPrivate,
+                              nsIDOMStorage** aRetval)
+{
+  return GetStorageInternal(false, aPrincipal, EmptyString(), aPrivate, aRetval);
+}
+
+NS_IMETHODIMP
+DOMStorageManager::CloneStorage(nsIDOMStorage* aStorage)
+{
+  if (mType != SessionStorage) {
+    // Cloning is supported only for sessionStorage
+    return NS_ERROR_NOT_IMPLEMENTED;
+  }
+
+  nsCOMPtr<nsPIDOMStorage> pstorage = do_QueryInterface(aStorage);
+  if (!pstorage) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  const DOMStorageCache* origCache = pstorage->GetCache();
+
+  DOMStorageCache* existingCache = GetCache(origCache->Scope());
+  if (existingCache) {
+    // Do not replace an existing sessionStorage.
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  // Since this manager is sessionStorage manager, PutCache hard references
+  // the cache in our hashtable.
+  nsRefPtr<DOMStorageCache> newCache = PutCache(origCache->Scope(),
+                                                origCache->Principal());
+
+  newCache->CloneFrom(origCache);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DOMStorageManager::CheckStorage(nsIPrincipal* aPrincipal,
+                                nsIDOMStorage* aStorage,
+                                bool* aRetval)
+{
+  nsCOMPtr<nsPIDOMStorage> pstorage = do_QueryInterface(aStorage);
+  if (!pstorage) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  *aRetval = false;
+
+  if (!aPrincipal) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  nsAutoCString scope;
+  nsresult rv = CreateScopeKey(aPrincipal, scope);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  DOMStorageCache* cache = GetCache(scope);
+  if (cache != pstorage->GetCache()) {
+    return NS_OK;
+  }
+
+  if (!pstorage->PrincipalEquals(aPrincipal)) {
+    return NS_OK;
+  }
+
+  *aRetval = true;
+  return NS_OK;
+}
+
+// Obsolete nsIDOMStorageManager methods
+
+NS_IMETHODIMP
+DOMStorageManager::GetLocalStorageForPrincipal(nsIPrincipal* aPrincipal,
+                                               const nsAString& aDocumentURI,
+                                               bool aPrivate,
+                                               nsIDOMStorage** aRetval)
+{
+  if (mType != LocalStorage) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  return CreateStorage(aPrincipal, aDocumentURI, aPrivate, aRetval);
+}
+
+namespace { // anon
+
+class ClearCacheEnumeratorData
+{
+public:
+  ClearCacheEnumeratorData(uint32_t aFlags)
+    : mUnloadFlags(aFlags)
+  {}
+
+  uint32_t mUnloadFlags;
+  nsCString mKeyPrefix;
+};
+
+} // anon
+
+PLDHashOperator
+DOMStorageManager::ClearCacheEnumerator(DOMStorageCacheHashKey* aEntry, void* aClosure)
+{
+  DOMStorageCache* cache = aEntry->cache();
+  nsCString& key = const_cast<nsCString&>(cache->Scope());
+
+  ClearCacheEnumeratorData* data = static_cast<ClearCacheEnumeratorData*>(aClosure);
+
+  if (data->mKeyPrefix.IsEmpty() || StringBeginsWith(key, data->mKeyPrefix)) {
+    cache->UnloadItems(data->mUnloadFlags);
+  }
+
+  return PL_DHASH_NEXT;
+}
+
+nsresult
+DOMStorageManager::Observe(const char* aTopic, const nsACString& aScopePrefix)
+{
+  // Clear everything, caches + database
+  if (!strcmp(aTopic, "cookie-cleared")) {
+    ClearCacheEnumeratorData data(DOMStorageCache::kUnloadComplete);
+    mCaches.EnumerateEntries(ClearCacheEnumerator, &data);
+
+    return NS_OK;
+  }
+
+  // Clear from caches everything that has been stored
+  // while in session-only mode
+  if (!strcmp(aTopic, "session-only-cleared")) {
+    ClearCacheEnumeratorData data(DOMStorageCache::kUnloadSession);
+    data.mKeyPrefix = aScopePrefix;
+    mCaches.EnumerateEntries(ClearCacheEnumerator, &data);
+
+    return NS_OK;
+  }
+
+  // Clear everything (including so and pb data) from caches and database
+  // for the gived domain and subdomains.
+  if (!strcmp(aTopic, "domain-data-cleared")) {
+    ClearCacheEnumeratorData data(DOMStorageCache::kUnloadComplete);
+    data.mKeyPrefix = aScopePrefix;
+    mCaches.EnumerateEntries(ClearCacheEnumerator, &data);
+
+    return NS_OK;
+  }
+
+  // Clear all private-browsing caches
+  if (!strcmp(aTopic, "private-browsing-data-cleared")) {
+    ClearCacheEnumeratorData data(DOMStorageCache::kUnloadPrivate);
+    mCaches.EnumerateEntries(ClearCacheEnumerator, &data);
+
+    return NS_OK;
+  }
+
+  // Clear localStorage data beloging to an app.
+  if (!strcmp(aTopic, "app-data-cleared")) {
+
+    // sessionStorage is expected to stay
+    if (mType == SessionStorage) {
+      return NS_OK;
+    }
+
+    ClearCacheEnumeratorData data(DOMStorageCache::kUnloadComplete);
+    data.mKeyPrefix = aScopePrefix;
+    mCaches.EnumerateEntries(ClearCacheEnumerator, &data);
+
+    return NS_OK;
+  }
+
+  if (!strcmp(aTopic, "profile-change")) {
+    // For case caches are still referenced - clear them completely
+    ClearCacheEnumeratorData data(DOMStorageCache::kUnloadComplete);
+    mCaches.EnumerateEntries(ClearCacheEnumerator, &data);
+
+    mCaches.Clear();
+    return NS_OK;
+  }
+
+#ifdef DOM_STORAGE_TESTS
+  if (!strcmp(aTopic, "test-reload")) {
+    if (mType != LocalStorage) {
+      return NS_OK;
+    }
+
+    // This immediately completely reloads all caches from the database.
+    ClearCacheEnumeratorData data(DOMStorageCache::kTestReload);
+    mCaches.EnumerateEntries(ClearCacheEnumerator, &data);
+    return NS_OK;
+  }
+
+  if (!strcmp(aTopic, "test-flushed")) {
+    if (XRE_GetProcessType() != GeckoProcessType_Default) {
+      nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+      if (obs) {
+        obs->NotifyObservers(nullptr, "domstorage-test-flushed", nullptr);
+      }
+    }
+
+    return NS_OK;
+  }
+#endif
+
+  NS_ERROR("Unexpected topic");
+  return NS_ERROR_UNEXPECTED;
+}
+
+// DOMLocalStorageManager
+
+DOMLocalStorageManager::DOMLocalStorageManager()
+  : DOMStorageManager(LocalStorage)
+{
+  NS_ASSERTION(!sSelf, "Somebody is trying to do_CreateInstance(\"@mozilla/dom/localStorage-manager;1\"");
+  sSelf = this;
+
+  if (XRE_GetProcessType() != GeckoProcessType_Default) {
+    // Do this only on the child process.  The thread IPC bridge
+    // is also used to communicate chrome observer notifications.
+    // Note: must be called after we set sSelf
+    DOMStorageCache::StartDatabase();
+  }
+}
+
+DOMLocalStorageManager::~DOMLocalStorageManager()
+{
+  sSelf = nullptr;
+}
+
+// DOMSessionStorageManager
+
+DOMSessionStorageManager::DOMSessionStorageManager()
+  : DOMStorageManager(SessionStorage)
+{
+  if (XRE_GetProcessType() != GeckoProcessType_Default) {
+    // Do this only on the child process.  The thread IPC bridge
+    // is also used to communicate chrome observer notifications.
+    DOMStorageCache::StartDatabase();
+  }
+}
+
+} // ::dom
+} // ::mozilla
diff --git a/dom/src/storage/DOMStorageManager.h b/dom/src/storage/DOMStorageManager.h
new file mode 100644
index 000000000000..8ae1cf5ad1e5
--- /dev/null
+++ b/dom/src/storage/DOMStorageManager.h
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef nsDOMStorageManager_h__
+#define nsDOMStorageManager_h__
+
+#include "nsIDOMStorageManager.h"
+#include "DOMStorageObserver.h"
+
+#include "nsPIDOMStorage.h"
+#include "DOMStorageCache.h"
+
+#include "nsTHashtable.h"
+
+namespace mozilla {
+namespace dom {
+
+const nsPIDOMStorage::StorageType SessionStorage = nsPIDOMStorage::SessionStorage;
+const nsPIDOMStorage::StorageType LocalStorage = nsPIDOMStorage::LocalStorage;
+
+class DOMStorage;
+
+class DOMStorageManager : public nsIDOMStorageManager
+                        , public DOMStorageObserverSink
+{
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIDOMSTORAGEMANAGER
+
+public:
+  virtual nsPIDOMStorage::StorageType Type() { return mType; }
+
+  // Reads the preference for DOM storage quota
+  static uint32_t GetQuota();
+  // Gets (but not ensures) cache for the given scope
+  DOMStorageCache* GetCache(const nsACString& aScope) const;
+
+protected:
+  DOMStorageManager(nsPIDOMStorage::StorageType aType);
+  virtual ~DOMStorageManager();
+
+private:
+  // DOMStorageObserverSink, handler to various chrome clearing notification
+  virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix);
+
+  // Since nsTHashtable doesn't like multiple inheritance, we have to aggregate
+  // DOMStorageCache into the entry.
+  class DOMStorageCacheHashKey : public nsCStringHashKey
+  {
+  public:
+    DOMStorageCacheHashKey(const nsACString* aKey)
+      : nsCStringHashKey(aKey)
+      , mCache(new DOMStorageCache(aKey))
+    {}
+
+    DOMStorageCacheHashKey(const DOMStorageCacheHashKey& aOther)
+      : nsCStringHashKey(aOther)
+    {
+      NS_ERROR("Shouldn't be called");
+    }
+
+    DOMStorageCache* cache() { return mCache; }
+    // Keep the cache referenced forever, used for sessionStorage.
+    void HardRef() { mCacheRef = mCache; }
+
+  private:
+    // weak ref only since cache references its manager.
+    DOMStorageCache* mCache;
+    // hard ref when this is sessionStorage to keep it alive forever.
+    nsRefPtr<DOMStorageCache> mCacheRef;
+  };
+
+  // Ensures cache for a scope, when it doesn't exist it is created and initalized,
+  // this also starts preload of persistent data.
+  already_AddRefed<DOMStorageCache> PutCache(const nsACString& aScope,
+                                             nsIPrincipal* aPrincipal);
+
+  // Helper for creation of DOM storage objects
+  nsresult GetStorageInternal(bool aCreate,
+                              nsIPrincipal* aPrincipal,
+                              const nsAString& aDocumentURI,
+                              bool aPrivate,
+                              nsIDOMStorage** aRetval);
+
+  // Scope->cache map
+  nsTHashtable<DOMStorageCacheHashKey> mCaches;
+  const nsPIDOMStorage::StorageType mType;
+
+  static PLDHashOperator ClearCacheEnumerator(DOMStorageCacheHashKey* aCache,
+                                              void* aClosure);
+
+protected:
+  friend class DOMStorageCache;
+  // Releases cache since it is no longer referrered by any DOMStorage object.
+  virtual void DropCache(DOMStorageCache* aCache);
+};
+
+// Derived classes to allow two different contract ids, one for localStorage and
+// one for sessionStorage management.  localStorage manager is used as service
+// scoped to the application while sessionStorage managers are instantiated by each
+// top doc shell in the application since sessionStorages are isolated per top level
+// browsing context.  The code may easily by shared by both.
+
+class DOMLocalStorageManager MOZ_FINAL : public DOMStorageManager
+{
+public:
+  DOMLocalStorageManager();
+  virtual ~DOMLocalStorageManager();
+
+  // Global getter of localStorage manager service
+  static DOMLocalStorageManager* Self() { return sSelf; }
+
+private:
+  static DOMLocalStorageManager* sSelf;
+};
+
+class DOMSessionStorageManager MOZ_FINAL : public DOMStorageManager
+{
+public:
+  DOMSessionStorageManager();
+};
+
+} // ::dom
+} // ::mozilla
+
+#endif /* nsDOMStorageManager_h__ */
diff --git a/dom/src/storage/DOMStorageObserver.cpp b/dom/src/storage/DOMStorageObserver.cpp
new file mode 100644
index 000000000000..8176bd799b2d
--- /dev/null
+++ b/dom/src/storage/DOMStorageObserver.cpp
@@ -0,0 +1,332 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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 "DOMStorageObserver.h"
+
+#include "DOMStorageDBThread.h"
+#include "DOMStorageCache.h"
+
+#include "nsIObserverService.h"
+#include "nsIURI.h"
+#include "nsIURL.h"
+#include "nsIScriptSecurityManager.h"
+#include "nsIPermission.h"
+#include "nsIIDNService.h"
+#include "mozIApplicationClearPrivateDataParams.h"
+#include "nsICookiePermission.h"
+
+#include "nsPrintfCString.h"
+#include "nsXULAppAPI.h"
+#include "nsEscape.h"
+#include "nsNetCID.h"
+#include "mozilla/Services.h"
+#include "nsServiceManagerUtils.h"
+
+namespace mozilla {
+namespace dom {
+
+static const char kStartupTopic[] = "sessionstore-windows-restored";
+static const uint32_t kStartupDelay = 0;
+
+NS_IMPL_ISUPPORTS2(DOMStorageObserver,
+                   nsIObserver,
+                   nsISupportsWeakReference)
+
+DOMStorageObserver* DOMStorageObserver::sSelf = nullptr;
+
+extern nsresult
+CreateReversedDomain(const nsACString& aAsciiDomain, nsACString& aKey);
+
+// static
+nsresult
+DOMStorageObserver::Init()
+{
+  if (sSelf) {
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+  if (!obs) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  sSelf = new DOMStorageObserver();
+  NS_ADDREF(sSelf);
+
+  // Chrome clear operations.
+  obs->AddObserver(sSelf, kStartupTopic, true);
+  obs->AddObserver(sSelf, "cookie-changed", true);
+  obs->AddObserver(sSelf, "perm-changed", true);
+  obs->AddObserver(sSelf, "browser:purge-domain-data", true);
+  obs->AddObserver(sSelf, "last-pb-context-exited", true);
+  obs->AddObserver(sSelf, "webapps-clear-data", true);
+
+  // Shutdown
+  obs->AddObserver(sSelf, "profile-after-change", true);
+  obs->AddObserver(sSelf, "profile-before-change", true);
+  obs->AddObserver(sSelf, "xpcom-shutdown", true);
+
+#ifdef DOM_STORAGE_TESTS
+  // Testing
+  obs->AddObserver(sSelf, "domstorage-test-flush-force", true);
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    // Only to forward to child process.
+    obs->AddObserver(sSelf, "domstorage-test-flushed", true);
+  }
+
+  obs->AddObserver(sSelf, "domstorage-test-reload", true);
+#endif
+
+  return NS_OK;
+}
+
+// static
+nsresult
+DOMStorageObserver::Shutdown()
+{
+  if (!sSelf) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  NS_RELEASE(sSelf);
+  return NS_OK;
+}
+
+void
+DOMStorageObserver::AddSink(DOMStorageObserverSink* aObs)
+{
+  mSinks.AppendElement(aObs);
+}
+
+void
+DOMStorageObserver::RemoveSink(DOMStorageObserverSink* aObs)
+{
+  mSinks.RemoveElement(aObs);
+}
+
+void
+DOMStorageObserver::Notify(const char* aTopic, const nsACString& aData)
+{
+  for (uint32_t i = 0; i < mSinks.Length(); ++i) {
+    DOMStorageObserverSink* sink = mSinks[i];
+    sink->Observe(aTopic, aData);
+  }
+}
+
+NS_IMETHODIMP
+DOMStorageObserver::Observe(nsISupports* aSubject,
+                            const char* aTopic,
+                            const PRUnichar* aData)
+{
+  nsresult rv;
+
+  // Start the thread that opens the database.
+  if (!strcmp(aTopic, kStartupTopic)) {
+    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+    obs->RemoveObserver(this, kStartupTopic);
+
+    mDBThreadStartDelayTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
+    if (!mDBThreadStartDelayTimer) {
+      return NS_ERROR_UNEXPECTED;
+    }
+
+    mDBThreadStartDelayTimer->Init(this, nsITimer::TYPE_ONE_SHOT, kStartupDelay);
+
+    return NS_OK;
+  }
+
+  // Timer callback used to start the database a short timer after startup
+  if (!strcmp(aTopic, NS_TIMER_CALLBACK_TOPIC)) {
+    nsCOMPtr<nsITimer> timer = do_QueryInterface(aSubject);
+    if (!timer) {
+      return NS_ERROR_UNEXPECTED;
+    }
+
+    if (timer == mDBThreadStartDelayTimer) {
+      mDBThreadStartDelayTimer = nullptr;
+
+      DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+      NS_ENSURE_TRUE(db, NS_ERROR_FAILURE);
+    }
+
+    return NS_OK;
+  }
+
+  // Clear everything, caches + database
+  if (!strcmp(aTopic, "cookie-changed")) {
+    if (!NS_LITERAL_STRING("cleared").Equals(aData)) {
+      return NS_OK;
+    }
+
+    DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+    NS_ENSURE_TRUE(db, NS_ERROR_FAILURE);
+
+    db->AsyncClearAll();
+
+    Notify("cookie-cleared");
+
+    return NS_OK;
+  }
+
+  // Clear from caches everything that has been stored
+  // while in session-only mode
+  if (!strcmp(aTopic, "perm-changed")) {
+    // Check for cookie permission change
+    nsCOMPtr<nsIPermission> perm(do_QueryInterface(aSubject));
+    if (!perm) {
+      return NS_OK;
+    }
+
+    nsAutoCString type;
+    perm->GetType(type);
+    if (type != NS_LITERAL_CSTRING("cookie")) {
+      return NS_OK;
+    }
+
+    uint32_t cap = 0;
+    perm->GetCapability(&cap);
+    if (!(cap & nsICookiePermission::ACCESS_SESSION) ||
+        !NS_LITERAL_STRING("deleted").Equals(nsDependentString(aData))) {
+      return NS_OK;
+    }
+
+    nsAutoCString host;
+    perm->GetHost(host);
+    if (host.IsEmpty()) {
+      return NS_OK;
+    }
+
+    nsAutoCString scope;
+    rv = CreateReversedDomain(host, scope);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    Notify("session-only-cleared", scope);
+
+    return NS_OK;
+  }
+
+  // Clear everything (including so and pb data) from caches and database
+  // for the gived domain and subdomains.
+  if (!strcmp(aTopic, "browser:purge-domain-data")) {
+    // Convert the domain name to the ACE format
+    nsAutoCString aceDomain;
+    nsCOMPtr<nsIIDNService> converter = do_GetService(NS_IDNSERVICE_CONTRACTID);
+    if (converter) {
+      rv = converter->ConvertUTF8toACE(NS_ConvertUTF16toUTF8(aData), aceDomain);
+      NS_ENSURE_SUCCESS(rv, rv);
+    } else {
+      // In case the IDN service is not available, this is the best we can come up with!
+      NS_EscapeURL(NS_ConvertUTF16toUTF8(aData),
+                   esc_OnlyNonASCII | esc_AlwaysCopy,
+                   aceDomain);
+    }
+
+    nsAutoCString scopePrefix;
+    rv = CreateReversedDomain(aceDomain, scopePrefix);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+    NS_ENSURE_TRUE(db, NS_ERROR_FAILURE);
+
+    db->AsyncClearMatchingScope(scopePrefix);
+
+    Notify("domain-data-cleared", scopePrefix);
+
+    return NS_OK;
+  }
+
+  // Clear all private-browsing caches
+  if (!strcmp(aTopic, "last-pb-context-exited")) {
+    Notify("private-browsing-data-cleared");
+
+    return NS_OK;
+  }
+
+  // Clear data beloging to an app.
+  if (!strcmp(aTopic, "webapps-clear-data")) {
+    nsCOMPtr<mozIApplicationClearPrivateDataParams> params =
+      do_QueryInterface(aSubject);
+    if (!params) {
+      NS_ERROR("'webapps-clear-data' notification's subject should be a mozIApplicationClearPrivateDataParams");
+      return NS_ERROR_UNEXPECTED;
+    }
+
+    uint32_t appId;
+    bool browserOnly;
+
+    rv = params->GetAppId(&appId);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = params->GetBrowserOnly(&browserOnly);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    MOZ_ASSERT(appId != nsIScriptSecurityManager::UNKNOWN_APP_ID);
+
+    DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
+    NS_ENSURE_TRUE(db, NS_ERROR_FAILURE);
+
+    nsAutoCString scope;
+    scope.AppendInt(appId);
+    scope.Append(NS_LITERAL_CSTRING(":t:"));
+    db->AsyncClearMatchingScope(scope);
+    Notify("app-data-cleared", scope);
+
+    if (!browserOnly) {
+      scope.Truncate();
+      scope.AppendInt(appId);
+      scope.Append(NS_LITERAL_CSTRING(":f:"));
+      db->AsyncClearMatchingScope(scope);
+      Notify("app-data-cleared", scope);
+    }
+
+    return NS_OK;
+  }
+
+  if (!strcmp(aTopic, "profile-after-change")) {
+    Notify("profile-change");
+
+    return NS_OK;
+  }
+
+  if (!strcmp(aTopic, "profile-before-change") ||
+      !strcmp(aTopic, "xpcom-shutdown")) {
+    rv = DOMStorageCache::StopDatabase();
+    if (NS_FAILED(rv)) {
+      NS_WARNING("Error while stopping DOMStorage DB background thread");
+    }
+
+    return NS_OK;
+  }
+
+#ifdef DOM_STORAGE_TESTS
+  if (!strcmp(aTopic, "domstorage-test-flush-force")) {
+    DOMStorageDBBridge* db = DOMStorageCache::GetDatabase();
+    if (db) {
+      db->AsyncFlush();
+    }
+
+    return NS_OK;
+  }
+
+  if (!strcmp(aTopic, "domstorage-test-flushed")) {
+    // Only used to propagate to IPC children
+    Notify("test-flushed");
+
+    return NS_OK;
+  }
+
+  if (!strcmp(aTopic, "domstorage-test-reload")) {
+    Notify("test-reload");
+
+    return NS_OK;
+  }
+#endif
+
+  NS_ERROR("Unexpected topic");
+  return NS_ERROR_UNEXPECTED;
+}
+
+} // ::dom
+} // ::mozilla
diff --git a/dom/src/storage/DOMStorageObserver.h b/dom/src/storage/DOMStorageObserver.h
new file mode 100644
index 000000000000..24903e641c5b
--- /dev/null
+++ b/dom/src/storage/DOMStorageObserver.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef nsIDOMStorageObserver_h__
+#define nsIDOMStorageObserver_h__
+
+#include "nsIObserver.h"
+#include "nsITimer.h"
+#include "nsWeakReference.h"
+#include "nsTArray.h"
+#include "nsString.h"
+
+namespace mozilla {
+namespace dom {
+
+class DOMStorageObserver;
+
+// Implementers are DOMStorageManager and DOMStorageDBParent to forward to
+// child processes.
+class DOMStorageObserverSink
+{
+public:
+  virtual ~DOMStorageObserverSink() {}
+
+private:
+  friend class DOMStorageObserver;
+  virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix) = 0;
+};
+
+// Statically (though layout statics) initialized observer receiving and processing
+// chrome clearing notifications, such as cookie deletion etc.
+class DOMStorageObserver : public nsIObserver
+                         , public nsSupportsWeakReference
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  virtual ~DOMStorageObserver() {}
+
+  static nsresult Init();
+  static nsresult Shutdown();
+  static DOMStorageObserver* Self() { return sSelf; }
+
+  void AddSink(DOMStorageObserverSink* aObs);
+  void RemoveSink(DOMStorageObserverSink* aObs);
+  void Notify(const char* aTopic, const nsACString& aData = EmptyCString());
+
+private:
+  static DOMStorageObserver* sSelf;
+
+  // Weak references
+  nsTArray<DOMStorageObserverSink*> mSinks;
+  nsCOMPtr<nsITimer> mDBThreadStartDelayTimer;
+};
+
+} // ::dom
+} // ::mozilla
+
+#endif
diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in
index 5dbb19b37030..347c718fd273 100644
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -15,18 +15,16 @@ LIBRARY_NAME   = jsdomstorage_s
 LIBXUL_LIBRARY = 1
 
 CPPSRCS = \
-       nsDOMStorage.cpp \
-       nsDOMStorageBaseDB.cpp \
-       nsDOMStorageDBWrapper.cpp \
-       nsLocalStorageCache.cpp \
-       nsDOMStoragePersistentDB.cpp \
-       nsDOMStorageMemoryDB.cpp \
-       StorageChild.cpp \
-       StorageParent.cpp \
+       DOMStorage.cpp \
+       DOMStorageCache.cpp \
+       DOMStorageDBThread.cpp \
+       DOMStorageObserver.cpp \
+       DOMStorageManager.cpp \
+       DOMStorageIPC.cpp \
        $(NULL)
 
 EXPORTS_NAMESPACES = mozilla/dom
-EXPORTS_mozilla/dom = StorageChild.h StorageParent.h
+EXPORTS_mozilla/dom = DOMStorageIPC.h
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
@@ -37,6 +35,10 @@ LOCAL_INCLUDES = \
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
+ifdef ENABLE_TESTS
+DEFINES += -DDOM_STORAGE_TESTS
+endif
+
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/src/storage/PStorage.ipdl b/dom/src/storage/PStorage.ipdl
index ff05e8f90c01..f9dbef797043 100644
--- a/dom/src/storage/PStorage.ipdl
+++ b/dom/src/storage/PStorage.ipdl
@@ -6,61 +6,37 @@
 
 include protocol PContent;
 
-using mozilla::null_t;
-
 namespace mozilla {
 namespace dom {
 
-struct ItemData
-{
-  nsString value;
-  bool secure;
-};
-
-// A cross-process GetValue result -- either null, or containing the parameters
-// with which to initialize an nsIDOMStorageItem.
-union StorageItem
-{
-  null_t;
-  ItemData;
-};
-
-// This protocol is little more than a thin wrapper around the DOMStorageBase
-// class in nsDOMStorage.h.  The child implementation simply forwards the
-// arguments for any given call to the parent, and returns the result.
+/* This protocol bridges async access to the database thread running on the parent process
+ * and caches running on the child process.
+ */
 sync protocol PStorage
 {
   manager PContent;
 
 parent:
-  __delete__();
+  async __delete__();
 
-  Init(bool useDB, bool sessionOnly, bool isPrivate,
-       nsCString scopeDBKey, nsCString quotaDBKey, uint32_t storageType);
+  sync  Preload(nsCString scope, uint32_t alreadyLoadedCount)
+    returns (nsString[] keys, nsString[] values, nsresult rv);
+
+  async AsyncPreload(nsCString scope, bool priority);
+  async AsyncGetUsage(nsCString scope);
+  async AsyncAddItem(nsCString scope, nsString key, nsString value);
+  async AsyncUpdateItem(nsCString scope, nsString key, nsString value);
+  async AsyncRemoveItem(nsCString scope, nsString key);
+  async AsyncClear(nsCString scope);
+  async AsyncFlush();
   
-  sync GetKeys(bool callerSecure)
-      returns (nsString[] keys);
-  sync GetLength(bool callerSecure, bool sessionOnly)
-      returns (uint32_t length, nsresult rv);
-  sync GetKey(bool callerSecure, bool sessionOnly, uint32_t index)
-      returns (nsString key, nsresult rv);
-  sync GetValue(bool callerSecure, bool sessionOnly, nsString key)
-      returns (StorageItem item, nsresult rv);
-  sync SetValue(bool callerSecure, bool sessionOnly, nsString key, nsString data)
-      returns (nsString oldValue, nsresult rv);
-  sync RemoveValue(bool callerSecure, bool sessionOnly, nsString key)
-      returns (nsString oldValue, nsresult rv);
-  sync Clear(bool callerSecure, bool sessionOnly)
-      returns (int32_t oldCount, nsresult rv);
-
-  sync GetDBValue(nsString key)
-      returns (nsString value, bool secure, nsresult rv);
-  sync SetDBValue(nsString key, nsString value, bool secure)
-      returns (nsresult rv);
-  sync SetSecure(nsString key, bool secure)
-      returns (nsresult rv);
-
-  UpdatePrivateState(bool enabled);
+child:
+  async Observe(nsCString topic, nsCString scopePrefix);
+  async ScopesHavingData(nsCString[] scopes);
+  async LoadItem(nsCString scope, nsString key, nsString value);
+  async LoadDone(nsCString scope, nsresult rv);
+  async LoadUsage(nsCString scope, int64_t usage);
+  async Error(nsresult rv);
 };
 
 }
diff --git a/dom/src/storage/StorageChild.cpp b/dom/src/storage/StorageChild.cpp
deleted file mode 100644
index 884267a2952a..000000000000
--- a/dom/src/storage/StorageChild.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* vim: set sw=4 ts=8 et tw=80 ft=cpp : */
-/* 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 "StorageChild.h"
-#include "mozilla/dom/ContentChild.h"
-#include "nsError.h"
-
-#include "GeckoProfiler.h"
-
-namespace mozilla {
-namespace dom {
-
-NS_IMPL_CYCLE_COLLECTION_1(StorageChild, mStorage)
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(StorageChild)
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(StorageChild)
-  NS_INTERFACE_MAP_ENTRY(nsIPrivacyTransitionObserver)
-  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIPrivacyTransitionObserver)
-NS_INTERFACE_MAP_END
-
-NS_IMETHODIMP_(nsrefcnt) StorageChild::Release(void)
-{
-  NS_PRECONDITION(0 != mRefCnt, "dup release");
-  NS_ASSERT_OWNINGTHREAD(StorageChild);
-  nsISupports* base = NS_CYCLE_COLLECTION_CLASSNAME(StorageChild)::Upcast(this);
-  nsrefcnt count = mRefCnt.decr(base);
-  NS_LOG_RELEASE(this, count, "StorageChild");
-  if (count == 1 && mIPCOpen) {
-    Send__delete__(this);
-    return 0;
-  }
-  if (count == 0) {
-    mRefCnt.stabilizeForDeletion();
-    delete this;
-    return 0;
-  }
-  return count;
-}
-
-StorageChild::StorageChild(nsDOMStorage* aOwner)
-: mStorage(aOwner)
-, mIPCOpen(false)
-{
-}
-
-StorageChild::StorageChild(nsDOMStorage* aOwner, StorageChild& aOther)
-: DOMStorageBase(aOther)
-, mStorage(aOwner)
-, mIPCOpen(false)
-{
-}
-
-void
-StorageChild::AddIPDLReference()
-{
-  NS_ABORT_IF_FALSE(!mIPCOpen, "Attempting to retain multiple IPDL references");
-  mIPCOpen = true;
-  AddRef();
-}
-
-void
-StorageChild::ReleaseIPDLReference()
-{
-  NS_ABORT_IF_FALSE(mIPCOpen, "Attempting to release non-existent IPDL reference");
-  mIPCOpen = false;
-  Release();
-}
-
-bool
-StorageChild::CacheStoragePermissions()
-{
-  nsDOMStorage* storage = static_cast<nsDOMStorage*>(mStorage.get());
-  return storage->CacheStoragePermissions();
-}
-
-void
-StorageChild::InitRemote()
-{
-  ContentChild* child = ContentChild::GetSingleton();
-  AddIPDLReference();
-  child->SendPStorageConstructor(this, null_t());
-  SendInit(mUseDB, mSessionOnly, mInPrivateBrowsing, mScopeDBKey,
-           mQuotaDBKey, mStorageType);
-}
-
-void
-StorageChild::InitAsSessionStorage(nsIPrincipal* aPrincipal, bool aPrivate)
-{
-  DOMStorageBase::InitAsSessionStorage(aPrincipal, aPrivate);
-  InitRemote();
-}
-
-void
-StorageChild::InitAsLocalStorage(nsIPrincipal* aPrincipal, bool aPrivate)
-{
-  DOMStorageBase::InitAsLocalStorage(aPrincipal, aPrivate);
-  InitRemote();
-}
-
-nsTArray<nsString>*
-StorageChild::GetKeys(bool aCallerSecure)
-{
-  InfallibleTArray<nsString> remoteKeys;
-  SendGetKeys(aCallerSecure, &remoteKeys);
-  nsTArray<nsString>* keys = new nsTArray<nsString>;
-  *keys = remoteKeys;
-  return keys;
-}
-
-nsresult
-StorageChild::GetLength(bool aCallerSecure, uint32_t* aLength)
-{
-  nsresult rv;
-  SendGetLength(aCallerSecure, mSessionOnly, aLength, &rv);
-  return rv;
-}
-
-nsresult
-StorageChild::GetKey(bool aCallerSecure, uint32_t aIndex, nsAString& aKey)
-{
-  nsresult rv;
-  nsString key;
-  SendGetKey(aCallerSecure, mSessionOnly, aIndex, &key, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-  aKey = key;
-  return NS_OK;
-}
-
-// Unlike other cross-process forwarding methods, GetValue needs to replicate
-// the following behaviour of DOMStorageImpl::GetValue:
-//
-// - if a security error occurs, or the item isn't found, return null without
-//   propogating the error.
-//
-// If DOMStorageImpl::GetValue ever changes its behaviour, this should be kept
-// in sync.
-nsIDOMStorageItem*
-StorageChild::GetValue(bool aCallerSecure, const nsAString& aKey, nsresult* rv)
-{
-  PROFILER_LABEL("StorageChild", "GetValue");
-  nsresult rv2 = *rv = NS_OK;
-  StorageItem storageItem;
-  SendGetValue(aCallerSecure, mSessionOnly, nsString(aKey), &storageItem, &rv2);
-  if (rv2 == NS_ERROR_DOM_SECURITY_ERR || rv2 == NS_ERROR_DOM_NOT_FOUND_ERR)
-    return nullptr;
-  *rv = rv2;
-  if (NS_FAILED(*rv) || storageItem.type() == StorageItem::Tnull_t)
-    return nullptr;
-  const ItemData& data = storageItem.get_ItemData();
-  nsIDOMStorageItem* item = new nsDOMStorageItem(this, aKey, data.value(),
-                                                 data.secure());
-  return item;
-}
-
-nsresult
-StorageChild::SetValue(bool aCallerSecure, const nsAString& aKey,
-                       const nsAString& aData, nsAString& aOldData)
-{
-  nsresult rv;
-  nsString oldData;
-  SendSetValue(aCallerSecure, mSessionOnly, nsString(aKey), nsString(aData),
-               &oldData, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-  aOldData = oldData;
-  return NS_OK;
-}
-
-nsresult
-StorageChild::RemoveValue(bool aCallerSecure, const nsAString& aKey,
-                          nsAString& aOldData)
-{
-  nsresult rv;
-  nsString oldData;
-  SendRemoveValue(aCallerSecure, mSessionOnly, nsString(aKey), &oldData, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-  aOldData = oldData;
-  return NS_OK;
-}
-
-nsresult
-StorageChild::Clear(bool aCallerSecure, int32_t* aOldCount)
-{
-  nsresult rv;
-  int32_t oldCount;
-  SendClear(aCallerSecure, mSessionOnly, &oldCount, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-  *aOldCount = oldCount;
-  return NS_OK;
-}
-
-nsresult
-StorageChild::GetDBValue(const nsAString& aKey, nsAString& aValue,
-                         bool* aSecure)
-{
-  nsresult rv;
-  nsString value;
-  SendGetDBValue(nsString(aKey), &value, aSecure, &rv);
-  aValue = value;
-  return rv;
-}
-
-nsresult
-StorageChild::SetDBValue(const nsAString& aKey,
-                         const nsAString& aValue,
-                         bool aSecure)
-{
-  nsresult rv;
-  SendSetDBValue(nsString(aKey), nsString(aValue), aSecure, &rv);
-  return rv;
-}
-
-nsresult
-StorageChild::SetSecure(const nsAString& aKey, bool aSecure)
-{
-  nsresult rv;
-  SendSetSecure(nsString(aKey), aSecure, &rv);
-  return rv;
-}
-
-nsresult
-StorageChild::CloneFrom(bool aCallerSecure, DOMStorageBase* aThat)
-{
-  StorageChild* other = static_cast<StorageChild*>(aThat);
-  ContentChild* child = ContentChild::GetSingleton();
-  StorageClone clone(nullptr, other, aCallerSecure);
-  AddIPDLReference();
-  child->SendPStorageConstructor(this, clone);
-  SendInit(mUseDB, mSessionOnly, mInPrivateBrowsing,
-           mScopeDBKey, mQuotaDBKey, mStorageType);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-StorageChild::PrivateModeChanged(bool enabled)
-{
-  mInPrivateBrowsing = enabled;
-  SendUpdatePrivateState(enabled);
-  return NS_OK;
-}
-
-}
-}
diff --git a/dom/src/storage/StorageChild.h b/dom/src/storage/StorageChild.h
deleted file mode 100644
index 4f922a32cf27..000000000000
--- a/dom/src/storage/StorageChild.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* vim: set sw=4 ts=8 et tw=80 ft=cpp : */
-/* 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/. */
-
-#ifndef mozilla_dom_StorageChild_h
-#define mozilla_dom_StorageChild_h
-
-#include "mozilla/dom/PStorageChild.h"
-#include "nsDOMStorage.h"
-#include "nsCycleCollectionParticipant.h"
-
-namespace mozilla {
-namespace dom {
-
-class StorageChild : public PStorageChild
-                   , public DOMStorageBase
-                   , public nsSupportsWeakReference
-{
-public:
-  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(StorageChild, nsIPrivacyTransitionObserver)
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_NSIPRIVACYTRANSITIONOBSERVER
-  
-  StorageChild(nsDOMStorage* aOwner);
-  StorageChild(nsDOMStorage* aOwner, StorageChild& aOther);
-
-  virtual void InitAsSessionStorage(nsIPrincipal* aPrincipal, bool aPrivate);
-  virtual void InitAsLocalStorage(nsIPrincipal* aPrincipal, bool aPrivate);
-
-  virtual bool CacheStoragePermissions();
-  
-  virtual nsTArray<nsString>* GetKeys(bool aCallerSecure);
-  virtual nsresult GetLength(bool aCallerSecure, uint32_t* aLength);
-  virtual nsresult GetKey(bool aCallerSecure, uint32_t aIndex, nsAString& aKey);
-  virtual nsIDOMStorageItem* GetValue(bool aCallerSecure, const nsAString& aKey,
-                                      nsresult* rv);
-  virtual nsresult SetValue(bool aCallerSecure, const nsAString& aKey,
-                            const nsAString& aData, nsAString& aOldValue);
-  virtual nsresult RemoveValue(bool aCallerSecure, const nsAString& aKey,
-                               nsAString& aOldValue);
-  virtual nsresult Clear(bool aCallerSecure, int32_t* aOldCount);
-
-  virtual nsresult GetDBValue(const nsAString& aKey,
-                              nsAString& aValue,
-                              bool* aSecure);
-  virtual nsresult SetDBValue(const nsAString& aKey,
-                              const nsAString& aValue,
-                              bool aSecure);
-  virtual nsresult SetSecure(const nsAString& aKey, bool aSecure);
-
-  virtual nsresult CloneFrom(bool aCallerSecure, DOMStorageBase* aThat);
-
-  void AddIPDLReference();
-  void ReleaseIPDLReference();
-
-private:
-  void InitRemote();
-
-  // Unimplemented
-  StorageChild(const StorageChild&);
-
-  nsCOMPtr<nsIDOMStorageObsolete> mStorage;
-  bool mIPCOpen;
-};
-
-}
-}
-
-#endif
diff --git a/dom/src/storage/StorageParent.cpp b/dom/src/storage/StorageParent.cpp
deleted file mode 100644
index 87df1f909e06..000000000000
--- a/dom/src/storage/StorageParent.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* vim: set sw=4 ts=8 et tw=80 ft=cpp : */
-/* 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 "StorageParent.h"
-#include "mozilla/dom/PContentParent.h"
-#include "mozilla/unused.h"
-#include "nsDOMString.h"
-
-using mozilla::unused;
-
-namespace mozilla {
-namespace dom {
-
-StorageParent::StorageParent(const StorageConstructData& aData)
-{
-  if (aData.type() == StorageConstructData::Tnull_t) {
-    mStorage = new DOMStorageImpl(nullptr);
-  } else {
-    const StorageClone& clone = aData.get_StorageClone();
-    StorageParent* other = static_cast<StorageParent*>(clone.actorParent());
-    mStorage = new DOMStorageImpl(nullptr, *other->mStorage.get());
-    mStorage->CloneFrom(clone.callerSecure(), other->mStorage);
-  }
-}
-
-bool
-StorageParent::RecvInit(const bool& aUseDB,
-                        const bool& aSessionOnly,
-                        const bool& aPrivate,
-                        const nsCString& aScopeDBKey,
-                        const nsCString& aQuotaDBKey,
-                        const uint32_t& aStorageType)
-{
-  mStorage->InitFromChild(aUseDB, aSessionOnly, aPrivate,
-                          aScopeDBKey, aQuotaDBKey,
-                          aStorageType);
-  return true;
-}
-
-bool
-StorageParent::RecvUpdatePrivateState(const bool& aEnabled)
-{
-  mStorage->PrivateModeChanged(aEnabled);
-  return true;
-}
-
-bool
-StorageParent::RecvGetKeys(const bool& aCallerSecure, InfallibleTArray<nsString>* aKeys)
-{
-  // Callers are responsible for deallocating the array returned by mStorage->GetKeys
-  nsAutoPtr<nsTArray<nsString> > keys(mStorage->GetKeys(aCallerSecure));
-  aKeys->SwapElements(*keys);
-  return true;
-}
-
-bool
-StorageParent::RecvGetLength(const bool& aCallerSecure, const bool& aSessionOnly,
-                             uint32_t* aLength, nsresult* rv)
-{
-  mStorage->SetSessionOnly(aSessionOnly);
-  *rv = mStorage->GetLength(aCallerSecure, aLength);
-  return true;
-}
-
-bool
-StorageParent::RecvGetKey(const bool& aCallerSecure, const bool& aSessionOnly,
-                          const uint32_t& aIndex, nsString* aKey, nsresult* rv)
-{
-  mStorage->SetSessionOnly(aSessionOnly);
-  *rv = mStorage->GetKey(aCallerSecure, aIndex, *aKey);
-  return true;
-}
-
-bool
-StorageParent::RecvGetValue(const bool& aCallerSecure, const bool& aSessionOnly,
-                            const nsString& aKey, StorageItem* aItem,
-                            nsresult* rv)
-{
-  mStorage->SetSessionOnly(aSessionOnly);
-
-  // We need to ensure that a proper null representation is sent to the child
-  // if no item is found or an error occurs.
-
-  *rv = NS_OK;
-  nsCOMPtr<nsIDOMStorageItem> item = mStorage->GetValue(aCallerSecure, aKey, rv);
-  if (NS_FAILED(*rv) || !item) {
-    *aItem = null_t();
-    return true;
-  }
-
-  ItemData data(EmptyString(), false);
-  nsDOMStorageItem* internalItem = static_cast<nsDOMStorageItem*>(item.get());
-  data.value() = internalItem->GetValueInternal();
-  if (aCallerSecure)
-    data.secure() = internalItem->IsSecure();
-  *aItem = data;
-  return true;
-}
-
-bool
-StorageParent::RecvSetValue(const bool& aCallerSecure, const bool& aSessionOnly,
-                            const nsString& aKey, const nsString& aData,
-                            nsString* aOldValue, nsresult* rv)
-{
-  mStorage->SetSessionOnly(aSessionOnly);
-  *rv = mStorage->SetValue(aCallerSecure, aKey, aData, *aOldValue);
-  return true;
-}
-
-bool
-StorageParent::RecvRemoveValue(const bool& aCallerSecure, const bool& aSessionOnly,
-                               const nsString& aKey, nsString* aOldValue,
-                               nsresult* rv)
-{
-  mStorage->SetSessionOnly(aSessionOnly);
-  *rv = mStorage->RemoveValue(aCallerSecure, aKey, *aOldValue);
-  return true;
-}
-
-bool
-StorageParent::RecvClear(const bool& aCallerSecure, const bool& aSessionOnly,
-                         int32_t* aOldCount, nsresult* rv)
-{
-  mStorage->SetSessionOnly(aSessionOnly);
-  *rv = mStorage->Clear(aCallerSecure, aOldCount);
-  return true;
-}
-
-bool
-StorageParent::RecvGetDBValue(const nsString& aKey, nsString* aValue,
-                              bool* aSecure, nsresult* rv)
-{
-  *rv = mStorage->GetDBValue(aKey, *aValue, aSecure);
-  return true;
-}
-
-bool
-StorageParent::RecvSetDBValue(const nsString& aKey, const nsString& aValue,
-                              const bool& aSecure, nsresult* rv)
-{
-  *rv = mStorage->SetDBValue(aKey, aValue, aSecure);
-  return true;
-}
-
-bool
-StorageParent::RecvSetSecure(const nsString& aKey, const bool& aSecure,
-                             nsresult* rv)
-{
-  *rv = mStorage->SetSecure(aKey, aSecure);
-  return true;
-}
-
-}
-}
diff --git a/dom/src/storage/StorageParent.h b/dom/src/storage/StorageParent.h
deleted file mode 100644
index 47f9ff5db15c..000000000000
--- a/dom/src/storage/StorageParent.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* vim: set sw=4 ts=8 et tw=80 ft=cpp : */
-/* 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/. */
-
-#ifndef mozilla_dom_StorageParent_h
-#define mozilla_dom_StorageParent_h
-
-#include "mozilla/dom/PStorageParent.h"
-#include "nsDOMStorage.h"
-
-namespace mozilla {
-namespace dom {
-
-class StorageConstructData;
-
-class StorageParent : public PStorageParent
-{
-public:
-  StorageParent(const StorageConstructData& aData);
-
-private:
-  bool RecvGetKeys(const bool& aCallerSecure, InfallibleTArray<nsString>* aKeys);
-  bool RecvGetLength(const bool& aCallerSecure, const bool& aSessionOnly,
-                     uint32_t* aLength, nsresult* rv);
-  bool RecvGetKey(const bool& aCallerSecure, const bool& aSessionOnly,
-                  const uint32_t& aIndex,nsString* aKey, nsresult* rv);
-  bool RecvGetValue(const bool& aCallerSecure, const bool& aSessionOnly,
-                    const nsString& aKey, StorageItem* aItem, nsresult* rv);
-  bool RecvSetValue(const bool& aCallerSecure, const bool& aSessionOnly,
-                    const nsString& aKey, const nsString& aData,
-                    nsString* aOldValue, nsresult* rv);
-  bool RecvRemoveValue(const bool& aCallerSecure, const bool& aSessionOnly,
-                       const nsString& aKey, nsString* aOldData, nsresult* rv);
-  bool RecvClear(const bool& aCallerSecure, const bool& aSessionOnly,
-                 int32_t* aOldCount, nsresult* rv);
-
-  bool RecvGetDBValue(const nsString& aKey, nsString* aValue, bool* aSecure,
-                      nsresult* rv);
-  bool RecvSetDBValue(const nsString& aKey, const nsString& aValue,
-                      const bool& aSecure, nsresult* rv);
-  bool RecvSetSecure(const nsString& aKey, const bool& aSecure, nsresult* rv);
-
-  bool RecvInit(const bool& aUseDB,
-                const bool& aSessionOnly,
-                const bool& aPrivate,
-                const nsCString& aScopeDBKey,
-                const nsCString& aQuotaDBKey,
-                const uint32_t& aStorageType);
-
-  bool RecvUpdatePrivateState(const bool& aEnabled);
-
-  nsRefPtr<DOMStorageImpl> mStorage;
-};
-
-}
-}
-
-#endif
diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp
deleted file mode 100644
index 028b0cd0e482..000000000000
--- a/dom/src/storage/nsDOMStorage.cpp
+++ /dev/null
@@ -1,1808 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "mozilla/DebugOnly.h"
-
-#include "StorageChild.h"
-#include "StorageParent.h"
-#include "mozilla/dom/ContentChild.h"
-#include "nsXULAppAPI.h"
-using mozilla::dom::StorageChild;
-using mozilla::dom::ContentChild;
-
-#include "prnetdb.h"
-#include "nsCOMPtr.h"
-#include "nsError.h"
-#include "nsDOMClassInfoID.h"
-#include "nsDOMJSUtils.h"
-#include "nsUnicharUtils.h"
-#include "nsDOMStorage.h"
-#include "nsEscape.h"
-#include "nsContentUtils.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsIPrincipal.h"
-#include "nsIURI.h"
-#include "nsReadableUtils.h"
-#include "nsIObserverService.h"
-#include "nsNetUtil.h"
-#include "nsICookiePermission.h"
-#include "nsIPermission.h"
-#include "nsIPermissionManager.h"
-#include "nsCycleCollectionParticipant.h"
-#include "nsIJSContextStack.h"
-#include "nsDOMString.h"
-#include "nsNetCID.h"
-#include "mozilla/Preferences.h"
-#include "nsThreadUtils.h"
-#include "mozilla/Telemetry.h"
-#include "DictionaryHelpers.h"
-#include "GeneratedEvents.h"
-#include "mozIApplicationClearPrivateDataParams.h"
-
-// calls FlushAndEvictFromCache(false)
-#define NS_DOMSTORAGE_FLUSH_TIMER_TOPIC "domstorage-flush-timer"
-
-// calls FlushAndEvictFromCache(false)
-#define NS_DOMSTORAGE_FLUSH_FORCE_TOPIC "domstorage-flush-force"
-
-using namespace mozilla;
-
-static const uint32_t ASK_BEFORE_ACCEPT = 1;
-static const uint32_t ACCEPT_SESSION = 2;
-static const uint32_t BEHAVIOR_REJECT = 2;
-
-static const char kPermissionType[] = "cookie";
-static const char kStorageEnabled[] = "dom.storage.enabled";
-static const char kCookiesBehavior[] = "network.cookie.cookieBehavior";
-static const char kCookiesLifetimePolicy[] = "network.cookie.lifetimePolicy";
-
-//
-// Helper that tells us whether the caller is secure or not.
-//
-
-static bool
-IsCallerSecure()
-{
-  nsCOMPtr<nsIPrincipal> subjectPrincipal;
-  nsresult rv = nsContentUtils::GetSecurityManager()->
-                  GetSubjectPrincipal(getter_AddRefs(subjectPrincipal));
-  NS_ENSURE_SUCCESS(rv, false);
-
-  if (!subjectPrincipal) {
-    // No subject principal means no code is running. Default to not
-    // being secure in that case.
-
-    return false;
-  }
-
-  nsCOMPtr<nsIURI> codebase;
-  subjectPrincipal->GetURI(getter_AddRefs(codebase));
-
-  if (!codebase) {
-    return false;
-  }
-
-  nsCOMPtr<nsIURI> innerUri = NS_GetInnermostURI(codebase);
-
-  if (!innerUri) {
-    return false;
-  }
-
-  bool isHttps = false;
-  rv = innerUri->SchemeIs("https", &isHttps);
-
-  return NS_SUCCEEDED(rv) && isHttps;
-}
-
-nsSessionStorageEntry::nsSessionStorageEntry(KeyTypePointer aStr)
-  : nsStringHashKey(aStr), mItem(nullptr)
-{
-}
-
-nsSessionStorageEntry::nsSessionStorageEntry(const nsSessionStorageEntry& aToCopy)
-  : nsStringHashKey(aToCopy), mItem(nullptr)
-{
-  NS_ERROR("We're horked.");
-}
-
-nsSessionStorageEntry::~nsSessionStorageEntry()
-{
-}
-
-//
-// nsDOMStorageManager
-//
-
-nsDOMStorageManager* nsDOMStorageManager::gStorageManager;
-
-nsDOMStorageManager::nsDOMStorageManager()
-{
-}
-
-NS_IMPL_ISUPPORTS3(nsDOMStorageManager,
-                   nsIDOMStorageManager,
-                   nsIObserver,
-                   nsISupportsWeakReference)
-
-//static
-nsresult
-nsDOMStorageManager::Initialize()
-{
-  gStorageManager = new nsDOMStorageManager();
-  if (!gStorageManager)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  gStorageManager->mStorages.Init();
-  NS_ADDREF(gStorageManager);
-
-  // No observers needed in non-chrome
-  if (XRE_GetProcessType() != GeckoProcessType_Default)
-    return NS_OK;
-
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-  if (!os)
-    return NS_OK;
-
-  nsresult rv;
-  rv = os->AddObserver(gStorageManager, "cookie-changed", true);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = os->AddObserver(gStorageManager, "profile-after-change", true);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = os->AddObserver(gStorageManager, "perm-changed", true);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = os->AddObserver(gStorageManager, "browser:purge-domain-data", true);
-  NS_ENSURE_SUCCESS(rv, rv);
-  // Used for temporary table flushing
-  rv = os->AddObserver(gStorageManager, "profile-before-change", true);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = os->AddObserver(gStorageManager, NS_DOMSTORAGE_FLUSH_TIMER_TOPIC, true);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = os->AddObserver(gStorageManager, "last-pb-context-exited", true);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = os->AddObserver(gStorageManager, "webapps-clear-data", true);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-//static
-nsDOMStorageManager*
-nsDOMStorageManager::GetInstance()
-{
-  NS_ASSERTION(gStorageManager,
-               "nsDOMStorageManager::GetInstance() called before Initialize()");
-  NS_IF_ADDREF(gStorageManager);
-  return gStorageManager;
-}
-
-//static
-void
-nsDOMStorageManager::Shutdown()
-{
-  NS_IF_RELEASE(gStorageManager);
-  gStorageManager = nullptr;
-
-  ShutdownDB();
-}
-
-//static
-void
-nsDOMStorageManager::ShutdownDB()
-{
-  delete DOMStorageImpl::gStorageDB;
-  DOMStorageImpl::gStorageDB = nullptr;
-}
-
-static PLDHashOperator
-ClearStorage(nsDOMStorageEntry* aEntry, void* userArg)
-{
-  aEntry->mStorage->ClearAll();
-  return PL_DHASH_REMOVE;
-}
-
-static PLDHashOperator
-ClearStorageIfDomainMatches(nsDOMStorageEntry* aEntry, void* userArg)
-{
-  nsAutoCString* aKey = static_cast<nsAutoCString*> (userArg);
-  if (StringBeginsWith(aEntry->mStorage->GetScopeDBKey(), *aKey)) {
-    aEntry->mStorage->ClearAll();
-  }
-  return PL_DHASH_REMOVE;
-}
-
-nsresult
-nsDOMStorageManager::Observe(nsISupports *aSubject,
-                             const char *aTopic,
-                             const PRUnichar *aData)
-{
-  if (!strcmp(aTopic, "profile-after-change")) {
-  } else if (!strcmp(aTopic, "cookie-changed") &&
-             !nsCRT::strcmp(aData, NS_LITERAL_STRING("cleared").get())) {
-    mStorages.EnumerateEntries(ClearStorage, nullptr);
-
-    nsresult rv = DOMStorageImpl::InitDB();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return DOMStorageImpl::gStorageDB->RemoveAll();
-  } else if (!strcmp(aTopic, "perm-changed")) {
-    // Check for cookie permission change
-    nsCOMPtr<nsIPermission> perm(do_QueryInterface(aSubject));
-    if (perm) {
-      nsAutoCString type;
-      perm->GetType(type);
-      if (type != NS_LITERAL_CSTRING("cookie"))
-        return NS_OK;
-
-      uint32_t cap = 0;
-      perm->GetCapability(&cap);
-      if (!(cap & nsICookiePermission::ACCESS_SESSION) ||
-          nsDependentString(aData) != NS_LITERAL_STRING("deleted"))
-        return NS_OK;
-
-      nsAutoCString host;
-      perm->GetHost(host);
-      if (host.IsEmpty())
-        return NS_OK;
-
-      nsresult rv = DOMStorageImpl::InitDB();
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      return DOMStorageImpl::gStorageDB->DropSessionOnlyStoragesForHost(host);
-    }
-  } else if (!strcmp(aTopic, "timer-callback")) {
-    nsCOMPtr<nsIObserverService> obsserv = mozilla::services::GetObserverService();
-    if (obsserv)
-      obsserv->NotifyObservers(nullptr, NS_DOMSTORAGE_FLUSH_TIMER_TOPIC, nullptr);
-  } else if (!strcmp(aTopic, "browser:purge-domain-data")) {
-    // Convert the domain name to the ACE format
-    nsAutoCString aceDomain;
-    nsresult rv;
-    nsCOMPtr<nsIIDNService> converter = do_GetService(NS_IDNSERVICE_CONTRACTID);
-    if (converter) {
-      rv = converter->ConvertUTF8toACE(NS_ConvertUTF16toUTF8(aData), aceDomain);
-      NS_ENSURE_SUCCESS(rv, rv);
-    } else {
-      // In case the IDN service is not available, this is the best we can come up with!
-      NS_EscapeURL(NS_ConvertUTF16toUTF8(aData),
-                   esc_OnlyNonASCII | esc_AlwaysCopy,
-                   aceDomain);
-    }
-
-    nsAutoCString key;
-    rv = nsDOMStorageDBWrapper::CreateReversedDomain(aceDomain, key);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // Clear the storage entries for matching domains
-    mStorages.EnumerateEntries(ClearStorageIfDomainMatches, &key);
-
-    rv = DOMStorageImpl::InitDB();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    DOMStorageImpl::gStorageDB->RemoveOwner(aceDomain);
-  } else if (!strcmp(aTopic, "profile-before-change")) {
-    if (DOMStorageImpl::gStorageDB) {
-      DebugOnly<nsresult> rv =
-        DOMStorageImpl::gStorageDB->FlushAndEvictFromCache(true);
-      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
-                       "DOMStorage: cache commit failed");
-      DOMStorageImpl::gStorageDB->Close();
-      nsDOMStorageManager::ShutdownDB();
-    }
-  } else if (!strcmp(aTopic, NS_DOMSTORAGE_FLUSH_TIMER_TOPIC)) {
-    if (DOMStorageImpl::gStorageDB) {
-      DebugOnly<nsresult> rv =
-        DOMStorageImpl::gStorageDB->FlushAndEvictFromCache(false);
-      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
-                       "DOMStorage: cache commit failed");
-    }
-  } else if (!strcmp(aTopic, NS_DOMSTORAGE_FLUSH_FORCE_TOPIC)) {
-    if (DOMStorageImpl::gStorageDB) {
-      DebugOnly<nsresult> rv =
-        DOMStorageImpl::gStorageDB->FlushAndEvictFromCache(false);
-      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
-                       "DOMStorage: cache  commit failed");
-    }
-  } else if (!strcmp(aTopic, "last-pb-context-exited")) {
-    if (DOMStorageImpl::gStorageDB) {
-      return DOMStorageImpl::gStorageDB->DropPrivateBrowsingStorages();
-    }
-  } else if (!strcmp(aTopic, "webapps-clear-data")) {
-    if (!DOMStorageImpl::gStorageDB) {
-      return NS_OK;
-    }
-
-    nsCOMPtr<mozIApplicationClearPrivateDataParams> params =
-      do_QueryInterface(aSubject);
-    if (!params) {
-      NS_ERROR("'webapps-clear-data' notification's subject should be a mozIApplicationClearPrivateDataParams");
-      return NS_ERROR_UNEXPECTED;
-    }
-
-    uint32_t appId;
-    bool browserOnly;
-
-    nsresult rv = params->GetAppId(&appId);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = params->GetBrowserOnly(&browserOnly);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    MOZ_ASSERT(appId != nsIScriptSecurityManager::UNKNOWN_APP_ID);
-
-    return DOMStorageImpl::gStorageDB->RemoveAllForApp(appId, browserOnly);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMStorageManager::GetUsage(const nsAString& aDomain,
-                              int32_t *aUsage)
-{
-  nsresult rv = DOMStorageImpl::InitDB();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return DOMStorageImpl::gStorageDB->GetUsage(NS_ConvertUTF16toUTF8(aDomain),
-                                              aUsage, false);
-}
-
-NS_IMETHODIMP
-nsDOMStorageManager::GetLocalStorageForPrincipal(nsIPrincipal *aPrincipal,
-                                                 const nsSubstring &aDocumentURI,
-                                                 bool aPrivate,
-                                                 nsIDOMStorage **aResult)
-{
-  NS_ENSURE_ARG_POINTER(aPrincipal);
-  *aResult = nullptr;
-
-  nsresult rv;
-
-  nsRefPtr<nsDOMStorage2> storage = new nsDOMStorage2();
-  if (!storage)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  rv = storage->InitAsLocalStorage(aPrincipal, aDocumentURI, aPrivate);
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aResult = storage.get();
-  storage.forget();
-
-  return NS_OK;
-}
-
-void
-nsDOMStorageManager::AddToStoragesHash(DOMStorageImpl* aStorage)
-{
-  nsDOMStorageEntry* entry = mStorages.PutEntry(aStorage);
-  if (entry)
-    entry->mStorage = aStorage;
-}
-
-void
-nsDOMStorageManager::RemoveFromStoragesHash(DOMStorageImpl* aStorage)
-{
-  nsDOMStorageEntry* entry = mStorages.GetEntry(aStorage);
-  if (entry)
-    mStorages.RemoveEntry(aStorage);
-}
-
-//
-// nsDOMStorage
-//
-
-nsDOMStorageDBWrapper* DOMStorageImpl::gStorageDB = nullptr;
-
-nsDOMStorageEntry::nsDOMStorageEntry(KeyTypePointer aStr)
-  : nsPtrHashKey<const void>(aStr), mStorage(nullptr)
-{
-}
-
-nsDOMStorageEntry::nsDOMStorageEntry(const nsDOMStorageEntry& aToCopy)
-  : nsPtrHashKey<const void>(aToCopy), mStorage(nullptr)
-{
-  NS_ERROR("DOMStorage horked.");
-}
-
-nsDOMStorageEntry::~nsDOMStorageEntry()
-{
-}
-
-NS_IMPL_CYCLE_COLLECTION_1(nsDOMStorage, mStorageImpl)
-
-DOMCI_DATA(StorageObsolete, nsDOMStorage)
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMStorage)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMStorage)
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMStorage)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorageObsolete)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMStorageObsolete)
-  NS_INTERFACE_MAP_ENTRY(nsPIDOMStorage)
-  NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(StorageObsolete)
-NS_INTERFACE_MAP_END
-
-NS_IMETHODIMP
-nsDOMStorage::GetInterface(const nsIID & aIID, void **result)
-{
-  nsresult rv = mStorageImpl->QueryInterface(aIID, result);
-  if (NS_SUCCEEDED(rv))
-    return rv;
-  return QueryInterface(aIID, result);;
-}
-
-nsresult
-NS_NewDOMStorage2(nsISupports* aOuter, REFNSIID aIID, void** aResult)
-{
-  nsDOMStorage2* storage = new nsDOMStorage2();
-  return storage->QueryInterface(aIID, aResult);
-}
-
-DOMStorageBase::DOMStorageBase()
-  : mStorageType(nsPIDOMStorage::Unknown)
-  , mUseDB(false)
-  , mSessionOnly(true)
-  , mInPrivateBrowsing(false)
-{
-}
-
-DOMStorageBase::DOMStorageBase(DOMStorageBase& aThat)
-  : mStorageType(aThat.mStorageType)
-  , mUseDB(false) // Clones don't use the DB
-  , mSessionOnly(true)
-  , mScopeDBKey(aThat.mScopeDBKey)
-  , mQuotaDBKey(aThat.mQuotaDBKey)
-  , mInPrivateBrowsing(aThat.mInPrivateBrowsing)
-{
-}
-
-void
-DOMStorageBase::InitAsSessionStorage(nsIPrincipal* aPrincipal, bool aPrivate)
-{
-  MOZ_ASSERT(mQuotaDBKey.IsEmpty());
-  mUseDB = false;
-  mScopeDBKey.Truncate();
-  mStorageType = nsPIDOMStorage::SessionStorage;
-  mInPrivateBrowsing = aPrivate;
-}
-
-void
-DOMStorageBase::InitAsLocalStorage(nsIPrincipal* aPrincipal, bool aPrivate)
-{
-  nsDOMStorageDBWrapper::CreateScopeDBKey(aPrincipal, mScopeDBKey);
-
-  // XXX Bug 357323, we have to solve the issue how to define
-  // origin for file URLs. In that case CreateOriginScopeDBKey
-  // fails (the result is empty) and we must avoid database use
-  // in that case because it produces broken entries w/o owner.
-  mUseDB = !mScopeDBKey.IsEmpty();
-
-  nsDOMStorageDBWrapper::CreateQuotaDBKey(aPrincipal, mQuotaDBKey);
-  mStorageType = nsPIDOMStorage::LocalStorage;
-  mInPrivateBrowsing = aPrivate;
-}
-
-PLDHashOperator
-SessionStorageTraverser(nsSessionStorageEntry* aEntry, void* userArg) {
-  nsCycleCollectionTraversalCallback *cb = 
-      static_cast<nsCycleCollectionTraversalCallback*>(userArg);
-
-  cb->NoteXPCOMChild((nsIDOMStorageItem *) aEntry->mItem);
-
-  return PL_DHASH_NEXT;
-}
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_0(DOMStorageImpl)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(DOMStorageImpl)
-{
-  if (tmp->mItems.IsInitialized()) {
-    tmp->mItems.EnumerateEntries(SessionStorageTraverser, &cb);
-  }
-}
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMStorageImpl)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMStorageImpl)
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMStorageImpl)
-  NS_INTERFACE_MAP_ENTRY(nsIPrivacyTransitionObserver)
-  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIPrivacyTransitionObserver)
-NS_INTERFACE_MAP_END
-
-DOMStorageImpl::DOMStorageImpl(nsDOMStorage* aStorage)
-{
-  Init(aStorage);
-}
-
-DOMStorageImpl::DOMStorageImpl(nsDOMStorage* aStorage, DOMStorageImpl& aThat)
-  : DOMStorageBase(aThat)
-{
-  Init(aStorage);
-}
-
-void
-DOMStorageImpl::Init(nsDOMStorage* aStorage)
-{
-  mItemsCachedVersion = 0;
-  mItems.Init(8);
-  mOwner = aStorage;
-  if (nsDOMStorageManager::gStorageManager)
-    nsDOMStorageManager::gStorageManager->AddToStoragesHash(this);
-}
-
-DOMStorageImpl::~DOMStorageImpl()
-{
-  if (nsDOMStorageManager::gStorageManager)
-    nsDOMStorageManager::gStorageManager->RemoveFromStoragesHash(this);
-}
-
-nsresult
-DOMStorageImpl::InitDB()
-{
-  if (!gStorageDB) {
-    gStorageDB = new nsDOMStorageDBWrapper();
-    if (!gStorageDB)
-      return NS_ERROR_OUT_OF_MEMORY;
-
-    nsresult rv = gStorageDB->Init();
-    if (NS_FAILED(rv)) {
-      // Failed to initialize the DB, delete it and null out the
-      // pointer so we don't end up attempting to use an
-      // un-initialized DB later on.
-
-      delete gStorageDB;
-      gStorageDB = nullptr;
-
-      return rv;
-    }
-  }
-
-  return NS_OK;
-}
-
-void
-DOMStorageImpl::InitFromChild(bool aUseDB,
-                              bool aSessionOnly, bool aPrivate,
-                              const nsACString& aScopeDBKey,
-                              const nsACString& aQuotaDBKey,
-                              uint32_t aStorageType)
-{
-  mUseDB = aUseDB;
-  mSessionOnly = aSessionOnly;
-  mInPrivateBrowsing = aPrivate;
-  mScopeDBKey = aScopeDBKey;
-  mQuotaDBKey = aQuotaDBKey;
-  mStorageType = static_cast<nsPIDOMStorage::nsDOMStorageType>(aStorageType);
-}
-
-void
-DOMStorageImpl::SetSessionOnly(bool aSessionOnly)
-{
-  mSessionOnly = aSessionOnly;
-}
-
-bool
-DOMStorageImpl::CacheStoragePermissions()
-{
-  // If this is a cross-process situation, we don't have a real storage owner.
-  // All the correct checks have been done on the child, so we just need to
-  // make sure that our session-only status is correctly updated.
-  if (!mOwner)
-    return CanUseStorage();
-  
-  return mOwner->CacheStoragePermissions();
-}
-
-nsresult
-DOMStorageImpl::GetCachedValue(const nsAString& aKey, nsAString& aValue,
-                               bool* aSecure)
-{
-  aValue.Truncate();
-  *aSecure = false;
-
-  nsSessionStorageEntry *entry = mItems.GetEntry(aKey);
-  if (!entry)
-    return NS_ERROR_NOT_AVAILABLE;
-
-  aValue = entry->mItem->GetValueInternal();
-  *aSecure = entry->mItem->IsSecure();
-
-  return NS_OK;
-}
-
-nsresult
-DOMStorageImpl::GetDBValue(const nsAString& aKey, nsAString& aValue,
-                           bool* aSecure)
-{
-  aValue.Truncate();
-
-  if (!UseDB())
-    return NS_OK;
-
-  nsresult rv = InitDB();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoString value;
-  rv = gStorageDB->GetKeyValue(this, aKey, value, aSecure);
-
-  if (rv == NS_ERROR_DOM_NOT_FOUND_ERR) {
-    SetDOMStringToNull(aValue);
-  }
-
-  if (NS_FAILED(rv))
-    return rv;
-
-  aValue.Assign(value);
-
-  return NS_OK;
-}
-
-nsresult
-DOMStorageImpl::SetDBValue(const nsAString& aKey,
-                           const nsAString& aValue,
-                           bool aSecure)
-{
-  if (!UseDB())
-    return NS_OK;
-
-  nsresult rv = InitDB();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  CacheKeysFromDB();
-
-  rv = gStorageDB->SetKey(this, aKey, aValue, aSecure);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-DOMStorageImpl::SetSecure(const nsAString& aKey, bool aSecure)
-{
-  if (UseDB()) {
-    nsresult rv = InitDB();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return gStorageDB->SetSecure(this, aKey, aSecure);
-  }
-
-  nsSessionStorageEntry *entry = mItems.GetEntry(aKey);
-  NS_ASSERTION(entry, "Don't use SetSecure() with nonexistent keys!");
-
-  if (entry) {
-    entry->mItem->SetSecureInternal(aSecure);
-  }  
-
-  return NS_OK;
-}
-
-static PLDHashOperator
-ClearStorageItem(nsSessionStorageEntry* aEntry, void* userArg)
-{
-  aEntry->mItem->SetValueInternal(EmptyString());
-  return PL_DHASH_NEXT;
-}
-
-void
-DOMStorageImpl::ClearAll()
-{
-  mItems.EnumerateEntries(ClearStorageItem, nullptr);
-  mItemsCachedVersion = 0;
-}
-
-struct CopyArgs {
-  DOMStorageImpl* storage;
-  bool callerSecure;
-};
-
-static PLDHashOperator
-CopyStorageItems(nsSessionStorageEntry* aEntry, void* userArg)
-{
-  // When copying items from one impl to another, we may not
-  // have an mOwner that we can call SetItem on. Therefore we need
-  // to replicate its behaviour.
-  
-  CopyArgs* args = static_cast<CopyArgs*>(userArg);
-
-  nsAutoString unused;
-  nsresult rv = args->storage->SetValue(args->callerSecure, aEntry->GetKey(),
-                                        aEntry->mItem->GetValueInternal(), unused);
-  if (NS_FAILED(rv))
-    return PL_DHASH_NEXT;
-
-  if (aEntry->mItem->IsSecure()) {
-    args->storage->SetSecure(aEntry->GetKey(), true);
-  }
-
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-DOMStorageImpl::CloneFrom(bool aCallerSecure, DOMStorageBase* aThat)
-{
-  // For various reasons, we no longer call SetItem in CopyStorageItems,
-  // so we need to ensure that the storage permissions are correct.
-  if (!CacheStoragePermissions())
-    return NS_ERROR_DOM_SECURITY_ERR;
-  
-  DOMStorageImpl* that = static_cast<DOMStorageImpl*>(aThat);
-  CopyArgs args = { this, aCallerSecure };
-  that->mItems.EnumerateEntries(CopyStorageItems, &args);
-  return NS_OK;
-}
-
-nsresult
-DOMStorageImpl::CacheKeysFromDB()
-{
-  // cache all the keys in the hash. This is used by the Length and Key methods
-  // use this cache for better performance. The disadvantage is that the
-  // order may break if someone changes the keys in the database directly.
-  if (gStorageDB->IsScopeDirty(this)) {
-    nsresult rv = InitDB();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    mItems.Clear();
-
-    rv = gStorageDB->GetAllKeys(this, &mItems);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    gStorageDB->MarkScopeCached(this);
-  }
-
-  return NS_OK;
-}
-
-struct KeysArrayBuilderStruct
-{
-  bool callerIsSecure;
-  nsTArray<nsString> *keys;
-};
-
-static PLDHashOperator
-KeysArrayBuilder(nsSessionStorageEntry* aEntry, void* userArg)
-{
-  KeysArrayBuilderStruct *keystruct = (KeysArrayBuilderStruct *)userArg;
-  
-  if (keystruct->callerIsSecure || !aEntry->mItem->IsSecure())
-    keystruct->keys->AppendElement(aEntry->GetKey());
-
-  return PL_DHASH_NEXT;
-}
-
-nsTArray<nsString>*
-DOMStorageImpl::GetKeys(bool aCallerSecure)
-{
-  if (UseDB())
-    CacheKeysFromDB();
-
-  KeysArrayBuilderStruct keystruct;
-  keystruct.callerIsSecure = aCallerSecure;
-  keystruct.keys = new nsTArray<nsString>();
-  if (keystruct.keys)
-    mItems.EnumerateEntries(KeysArrayBuilder, &keystruct);
- 
-  return keystruct.keys;
-}
-
-class ItemCounterState
-{
- public:
-  ItemCounterState(bool aIsCallerSecure)
-  : mIsCallerSecure(aIsCallerSecure), mCount(0)
-  {
-  }
-
-  bool mIsCallerSecure;
-  uint32_t mCount;
- private:
-  ItemCounterState(); // Not to be implemented
-};
-
-static PLDHashOperator
-ItemCounter(nsSessionStorageEntry* aEntry, void* userArg)
-{
-  ItemCounterState *state = (ItemCounterState *)userArg;
-
-  if (state->mIsCallerSecure || !aEntry->mItem->IsSecure()) {
-    ++state->mCount;
-  }
-
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-DOMStorageImpl::GetLength(bool aCallerSecure, uint32_t* aLength)
-{
-  // Force reload of items from database.  This ensures sync localStorages for
-  // same origins among different windows.
-  if (UseDB())
-    CacheKeysFromDB();
-
-  ItemCounterState state(aCallerSecure);
-
-  mItems.EnumerateEntries(ItemCounter, &state);
-
-  *aLength = state.mCount;
-  return NS_OK;
-}
-
-class IndexFinderData
-{
- public:
-  IndexFinderData(bool aIsCallerSecure, uint32_t aWantedIndex)
-  : mIsCallerSecure(aIsCallerSecure), mIndex(0), mWantedIndex(aWantedIndex),
-    mItem(nullptr)
-  {
-  }
-
-  bool mIsCallerSecure;
-  uint32_t mIndex;
-  uint32_t mWantedIndex;
-  nsSessionStorageEntry *mItem;
-
- private:
-  IndexFinderData(); // Not to be implemented
-};
-
-static PLDHashOperator
-IndexFinder(nsSessionStorageEntry* aEntry, void* userArg)
-{
-  IndexFinderData *data = (IndexFinderData *)userArg;
-
-  if (data->mIndex == data->mWantedIndex &&
-      (data->mIsCallerSecure || !aEntry->mItem->IsSecure())) {
-    data->mItem = aEntry;
-
-    return PL_DHASH_STOP;
-  }
-
-  ++data->mIndex;
-
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-DOMStorageImpl::GetKey(bool aCallerSecure, uint32_t aIndex, nsAString& aKey)
-{
-  // XXX: This does a linear search for the key at index, which would
-  // suck if there's a large numer of indexes. Do we care? If so,
-  // maybe we need to have a lazily populated key array here or
-  // something?
-
-  if (UseDB()) {
-    CacheKeysFromDB();
-  }
-
-  IndexFinderData data(aCallerSecure, aIndex);
-  mItems.EnumerateEntries(IndexFinder, &data);
-
-  if (!data.mItem) {
-    // aIndex was larger than the number of accessible keys. Return null.
-    aKey.SetIsVoid(true);
-    return NS_OK;
-  }
-
-  aKey = data.mItem->GetKey();
-  return NS_OK;
-}
-
-// The behaviour of this function must be kept in sync with StorageChild::GetValue.
-// See the explanatory comment there for more details.
-nsIDOMStorageItem*
-DOMStorageImpl::GetValue(bool aCallerSecure, const nsAString& aKey,
-                         nsresult* aResult)
-{
-  nsSessionStorageEntry *entry = mItems.GetEntry(aKey);
-  nsIDOMStorageItem* item = nullptr;
-  if (entry) {
-    if (aCallerSecure || !entry->mItem->IsSecure()) {
-      item = entry->mItem;
-    }
-  }
-  else if (UseDB()) {
-    bool secure;
-    nsAutoString value;
-    nsresult rv = GetDBValue(aKey, value, &secure);
-    // return null if access isn't allowed or the key wasn't found
-    if (rv == NS_ERROR_DOM_SECURITY_ERR || rv == NS_ERROR_DOM_NOT_FOUND_ERR ||
-        (!aCallerSecure && secure))
-      return nullptr;
-
-    *aResult = rv;
-    NS_ENSURE_SUCCESS(rv, nullptr);
-
-    nsRefPtr<nsDOMStorageItem> newitem =
-        new nsDOMStorageItem(this, aKey, value, secure);
-    if (newitem && (entry = mItems.PutEntry(aKey))) {
-      item = entry->mItem = newitem;
-    }
-    else {
-      *aResult = NS_ERROR_OUT_OF_MEMORY;
-    }
-  }
-  return item;
-}
-
-nsresult
-DOMStorageImpl::SetValue(bool aIsCallerSecure, const nsAString& aKey,
-                         const nsAString& aData, nsAString& aOldValue)
-{
-  nsresult rv;
-  nsString oldValue;
-  SetDOMStringToNull(oldValue);
-
-  // First store the value to the database, we need to do this before we update
-  // the mItems cache.  SetDBValue is using the old cached value to decide
-  // on quota checking.
-  if (UseDB()) {
-    rv = SetDBValue(aKey, aData, aIsCallerSecure);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  nsSessionStorageEntry *entry = mItems.GetEntry(aKey);
-  if (entry) {
-    if (entry->mItem->IsSecure() && !aIsCallerSecure) {
-      return NS_ERROR_DOM_SECURITY_ERR;
-    }
-    oldValue = entry->mItem->GetValueInternal();
-    entry->mItem->SetValueInternal(aData);
-  }
-  else {
-    nsRefPtr<nsDOMStorageItem> newitem =
-        new nsDOMStorageItem(this, aKey, aData, aIsCallerSecure);
-    if (!newitem)
-      return NS_ERROR_OUT_OF_MEMORY;
-    entry = mItems.PutEntry(aKey);
-    NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
-    entry->mItem = newitem;
-  }
-  aOldValue = oldValue;
-  return NS_OK;
-}
-
-nsresult
-DOMStorageImpl::RemoveValue(bool aCallerSecure, const nsAString& aKey,
-                            nsAString& aOldValue)
-{
-  nsString oldValue;
-  nsSessionStorageEntry *entry = mItems.GetEntry(aKey);
-
-  if (entry && entry->mItem->IsSecure() && !aCallerSecure) {
-    return NS_ERROR_DOM_SECURITY_ERR;
-  }
-
-  if (UseDB()) {
-    nsresult rv = InitDB();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    CacheKeysFromDB();
-    entry = mItems.GetEntry(aKey);
-
-    nsAutoString value;
-    bool secureItem;
-    rv = GetDBValue(aKey, value, &secureItem);
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (!aCallerSecure && secureItem)
-      return NS_ERROR_DOM_SECURITY_ERR;
-
-    oldValue = value;
-
-    rv = gStorageDB->RemoveKey(this, aKey);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else if (entry) {
-    // clear string as StorageItems may be referencing this item
-    oldValue = entry->mItem->GetValueInternal();
-    entry->mItem->ClearValue();
-  }
-
-  if (entry) {
-    mItems.RawRemoveEntry(entry);
-  }
-  aOldValue = oldValue;
-  return NS_OK;
-}
-
-static PLDHashOperator
-CheckSecure(nsSessionStorageEntry* aEntry, void* userArg)
-{
-  bool* secure = (bool*)userArg;
-  if (aEntry->mItem->IsSecure()) {
-    *secure = true;
-    return PL_DHASH_STOP;
-  }
-
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-DOMStorageImpl::Clear(bool aCallerSecure, int32_t* aOldCount)
-{
-  if (UseDB())
-    CacheKeysFromDB();
-
-  int32_t oldCount = mItems.Count();
-
-  bool foundSecureItem = false;
-  mItems.EnumerateEntries(CheckSecure, &foundSecureItem);
-
-  if (foundSecureItem && !aCallerSecure) {
-    return NS_ERROR_DOM_SECURITY_ERR;
-  }
-
-  if (UseDB()) {
-    nsresult rv = InitDB();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = gStorageDB->ClearStorage(this);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  *aOldCount = oldCount;
-  mItems.Clear();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DOMStorageImpl::PrivateModeChanged(bool enabled)
-{
-  mInPrivateBrowsing = enabled;
-  CanUseStorage(); // cause mSessionOnly to update as well
-  mItems.Clear();
-  mItemsCachedVersion = 0;
-  return NS_OK;
-}
-
-nsDOMStorage::nsDOMStorage()
-  : mStorageType(nsPIDOMStorage::Unknown)
-  , mEventBroadcaster(nullptr)
-{
-  if (XRE_GetProcessType() != GeckoProcessType_Default)
-    mStorageImpl = new StorageChild(this);
-  else
-    mStorageImpl = new DOMStorageImpl(this);
-}
-
-nsDOMStorage::nsDOMStorage(nsDOMStorage& aThat)
-  : mStorageType(aThat.mStorageType)
-  , mPrincipal(aThat.mPrincipal)
-  , mEventBroadcaster(nullptr)
-{
-  if (XRE_GetProcessType() != GeckoProcessType_Default) {
-    StorageChild* other = static_cast<StorageChild*>(aThat.mStorageImpl.get());
-    mStorageImpl = new StorageChild(this, *other);
-  } else {
-    DOMStorageImpl* other = static_cast<DOMStorageImpl*>(aThat.mStorageImpl.get());
-    mStorageImpl = new DOMStorageImpl(this, *other);
-  }
-}
-
-nsDOMStorage::~nsDOMStorage()
-{
-}
-
-nsresult
-nsDOMStorage::InitAsSessionStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                   bool aPrivate)
-{
-  nsCOMPtr<nsIURI> uri;
-  nsresult rv = aPrincipal->GetURI(getter_AddRefs(uri));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!uri) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  mDocumentURI = aDocumentURI;
-  mPrincipal = aPrincipal;
-
-  mStorageType = SessionStorage;
-
-  mStorageImpl->InitAsSessionStorage(mPrincipal, aPrivate);
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorage::InitAsLocalStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                 bool aPrivate)
-{
-  nsCOMPtr<nsIURI> uri;
-  nsresult rv = aPrincipal->GetURI(getter_AddRefs(uri));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!uri) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  mDocumentURI = aDocumentURI;
-  mPrincipal = aPrincipal;
-
-  mStorageType = LocalStorage;
-
-  mStorageImpl->InitAsLocalStorage(aPrincipal, aPrivate);
-  return NS_OK;
-}
-
-bool
-DOMStorageBase::CanUseStorage()
-{
-  return nsDOMStorage::CanUseStorage(this);
-}
-
-//static
-bool
-nsDOMStorage::CanUseStorage(DOMStorageBase* aStorage /* = NULL */)
-{
-  if (aStorage) {
-    // check if the calling domain can use storage. Downgrade to session
-    // only if only session storage may be used.
-    aStorage->mSessionOnly = false;
-  }
-
-  if (!Preferences::GetBool(kStorageEnabled)) {
-    return false;
-  }
-
-  // chrome can always use storage regardless of permission preferences
-  if (nsContentUtils::IsCallerChrome())
-    return true;
-
-  nsCOMPtr<nsIPrincipal> subjectPrincipal;
-  nsresult rv = nsContentUtils::GetSecurityManager()->
-                  GetSubjectPrincipal(getter_AddRefs(subjectPrincipal));
-  NS_ENSURE_SUCCESS(rv, false);
-
-  // if subjectPrincipal were null we'd have returned after
-  // IsCallerChrome().
-
-  nsCOMPtr<nsIPermissionManager> permissionManager =
-    do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-  if (!permissionManager)
-    return false;
-
-  uint32_t perm;
-  permissionManager->TestPermissionFromPrincipal(subjectPrincipal,
-                                                 kPermissionType, &perm);
-
-  if (perm == nsIPermissionManager::DENY_ACTION)
-    return false;
-
-  // In private browsing mode we ougth to behave as in session-only cookies
-  // mode to prevent detection of being in private browsing mode and ensuring
-  // that there will be no traces left.
-  if (perm == nsICookiePermission::ACCESS_SESSION ||
-      (aStorage && aStorage->IsPrivate())) {
-    if (aStorage)
-      aStorage->mSessionOnly = true;
-  }
-  else if (perm != nsIPermissionManager::ALLOW_ACTION) {
-    uint32_t cookieBehavior = Preferences::GetUint(kCookiesBehavior);
-    uint32_t lifetimePolicy = Preferences::GetUint(kCookiesLifetimePolicy);
-
-    // Treat "ask every time" as "reject always".
-    if ((cookieBehavior == BEHAVIOR_REJECT || lifetimePolicy == ASK_BEFORE_ACCEPT))
-      return false;
-
-    if (lifetimePolicy == ACCEPT_SESSION && aStorage)
-      aStorage->mSessionOnly = true;
-  }
-
-  return true;
-}
-
-bool
-nsDOMStorage::CacheStoragePermissions()
-{
-  // Bug 488446, disallowing storage use when in session only mode.
-  // This is temporary fix before we find complete solution for storage
-  // behavior in private browsing mode or session-only cookies mode.
-  if (!mStorageImpl->CanUseStorage())
-    return false;
-
-  nsIScriptSecurityManager* ssm = nsContentUtils::GetSecurityManager();
-  if (!ssm)
-    return false;
-
-  nsCOMPtr<nsIPrincipal> subjectPrincipal;
-  nsresult rv = ssm->GetSubjectPrincipal(getter_AddRefs(subjectPrincipal));
-  NS_ENSURE_SUCCESS(rv, false);
-
-  return CanAccess(subjectPrincipal);
-}
-
-NS_IMETHODIMP
-nsDOMStorage::GetLength(uint32_t *aLength)
-{
-  if (!CacheStoragePermissions())
-    return NS_ERROR_DOM_SECURITY_ERR;
-  
-  return mStorageImpl->GetLength(IsCallerSecure(), aLength);
-}
-
-NS_IMETHODIMP
-nsDOMStorage::Key(uint32_t aIndex, nsAString& aKey)
-{
-  if (!CacheStoragePermissions())
-    return NS_ERROR_DOM_SECURITY_ERR;
-
-  return mStorageImpl->GetKey(IsCallerSecure(), aIndex, aKey);
-}
-
-nsIDOMStorageItem*
-nsDOMStorage::GetNamedItem(const nsAString& aKey, nsresult* aResult)
-{
-  if (!CacheStoragePermissions()) {
-    *aResult = NS_ERROR_DOM_SECURITY_ERR;
-    return nullptr;
-  }
-
-  *aResult = NS_OK;
-  return mStorageImpl->GetValue(IsCallerSecure(), aKey, aResult);
-}
-
-nsresult
-nsDOMStorage::GetItem(const nsAString& aKey, nsAString &aData)
-{
-  nsresult rv;
-
-  // IMPORTANT:
-  // CacheStoragePermissions() is called inside of
-  // GetItem(nsAString, nsIDOMStorageItem)
-  // To call it particularly in this method would just duplicate
-  // the call. If the code changes, make sure that call to
-  // CacheStoragePermissions() is put here!
-
-  nsCOMPtr<nsIDOMStorageItem> item;
-  rv = GetItem(aKey, getter_AddRefs(item));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (item) {
-    rv = item->GetValue(aData);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else
-    SetDOMStringToNull(aData);
-
-  return NS_OK;
-}
-
-static Telemetry::ID
-TelemetryIDForKey(nsPIDOMStorage::nsDOMStorageType type)
-{
-  switch (type) {
-  default:
-    MOZ_ASSERT(false);
-    // We need to return something to satisfy the compiler.
-    // Fallthrough.
-  case nsPIDOMStorage::LocalStorage:
-    return Telemetry::LOCALDOMSTORAGE_KEY_SIZE_BYTES;
-  case nsPIDOMStorage::SessionStorage:
-    return Telemetry::SESSIONDOMSTORAGE_KEY_SIZE_BYTES;
-  }
-}
-
-static Telemetry::ID
-TelemetryIDForValue(nsPIDOMStorage::nsDOMStorageType type)
-{
-  switch (type) {
-  default:
-    MOZ_ASSERT(false);
-    // We need to return something to satisfy the compiler.
-    // Fallthrough.
-  case nsPIDOMStorage::LocalStorage:
-    return Telemetry::LOCALDOMSTORAGE_VALUE_SIZE_BYTES;
-  case nsPIDOMStorage::SessionStorage:
-    return Telemetry::SESSIONDOMSTORAGE_VALUE_SIZE_BYTES;
-  }
-}
-
-NS_IMETHODIMP
-nsDOMStorage::GetItem(const nsAString& aKey, nsIDOMStorageItem **aItem)
-{
-  nsresult rv;
-
-  NS_IF_ADDREF(*aItem = GetNamedItem(aKey, &rv));
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsDOMStorage::SetItem(const nsAString& aKey, const nsAString& aData)
-{
-  if (!CacheStoragePermissions())
-    return NS_ERROR_DOM_SECURITY_ERR;
-
-  Telemetry::Accumulate(TelemetryIDForKey(mStorageType), aKey.Length());
-  Telemetry::Accumulate(TelemetryIDForValue(mStorageType), aData.Length());
-
-  nsString oldValue;
-  nsresult rv = mStorageImpl->SetValue(IsCallerSecure(), aKey, aData, oldValue);
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (oldValue != aData && mEventBroadcaster)
-    mEventBroadcaster->BroadcastChangeNotification(aKey, oldValue, aData);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsDOMStorage::RemoveItem(const nsAString& aKey)
-{
-  if (!CacheStoragePermissions())
-    return NS_ERROR_DOM_SECURITY_ERR;
-
-  nsString oldValue;
-  nsresult rv = mStorageImpl->RemoveValue(IsCallerSecure(), aKey, oldValue);
-  if (rv == NS_ERROR_DOM_NOT_FOUND_ERR)
-    return NS_OK;
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!oldValue.IsEmpty() && mEventBroadcaster) {
-    nsAutoString nullString;
-    SetDOMStringToNull(nullString);
-    mEventBroadcaster->BroadcastChangeNotification(aKey, oldValue, nullString);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorage::Clear()
-{
-  if (!CacheStoragePermissions())
-    return NS_ERROR_DOM_SECURITY_ERR;
-
-  int32_t oldCount;
-  nsresult rv = mStorageImpl->Clear(IsCallerSecure(), &oldCount);
-  if (NS_FAILED(rv))
-    return rv;
-  
-  if (oldCount && mEventBroadcaster) {
-    nsAutoString nullString;
-    SetDOMStringToNull(nullString);
-    mEventBroadcaster->BroadcastChangeNotification(nullString, nullString, nullString);
-  }
-
-  return NS_OK;
-}
-
-already_AddRefed<nsIDOMStorage>
-nsDOMStorage::Clone()
-{
-  NS_ASSERTION(false, "Old DOMStorage doesn't implement cloning");
-  return nullptr;
-}
-
-already_AddRefed<nsIDOMStorage>
-nsDOMStorage::Fork(const nsSubstring &aDocumentURI)
-{
-  NS_ASSERTION(false, "Old DOMStorage doesn't implement forking");
-  return nullptr;
-}
-
-bool nsDOMStorage::IsForkOf(nsIDOMStorage* aThat)
-{
-  NS_ASSERTION(false, "Old DOMStorage doesn't implement forking");
-  return false;
-}
-
-nsresult
-nsDOMStorage::CloneFrom(nsDOMStorage* aThat)
-{
-  return mStorageImpl->CloneFrom(IsCallerSecure(), aThat->mStorageImpl);
-}
-
-nsTArray<nsString> *
-nsDOMStorage::GetKeys()
-{
-  return mStorageImpl->GetKeys(IsCallerSecure());
-}
-
-nsIPrincipal*
-nsDOMStorage::Principal()
-{
-  return nullptr;
-}
-
-bool
-nsDOMStorage::CanAccessSystem(nsIPrincipal *aPrincipal)
-{
-  if (!aPrincipal)
-    return true;
-
-  nsIScriptSecurityManager* ssm = nsContentUtils::GetSecurityManager();
-  if (!ssm)
-    return false;
-
-  bool isSystem;
-  nsresult rv = ssm->IsSystemPrincipal(aPrincipal, &isSystem);
-
-  return NS_SUCCEEDED(rv) && isSystem;
-}
-
-bool
-nsDOMStorage::CanAccess(nsIPrincipal *aPrincipal)
-{
-  // Allow C++ callers to access the storage
-  if (!aPrincipal)
-    return true;
-
-  // Allow more powerful principals (e.g. system) to access the storage
-
-  // For content, either the code base or domain must be the same.  When code
-  // base is the same, this is enough to say it is safe for a page to access
-  // this storage.
-
-  bool subsumes;
-  nsresult rv = aPrincipal->SubsumesIgnoringDomain(mPrincipal, &subsumes);
-  if (NS_FAILED(rv))
-    return false;
-
-  if (!subsumes) {
-    nsresult rv = aPrincipal->Subsumes(mPrincipal, &subsumes);
-    if (NS_FAILED(rv))
-      return false;
-  }
-
-  return subsumes;
-}
-
-nsPIDOMStorage::nsDOMStorageType
-nsDOMStorage::StorageType()
-{
-  return mStorageType;
-}
-
-//
-// nsDOMStorage2
-//
-
-NS_IMPL_CYCLE_COLLECTION_1(nsDOMStorage2, mStorage)
-
-DOMCI_DATA(Storage, nsDOMStorage2)
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMStorage2)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMStorage2)
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMStorage2)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorage)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMStorage)
-  NS_INTERFACE_MAP_ENTRY(nsPIDOMStorage)
-  NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Storage)
-NS_INTERFACE_MAP_END
-
-NS_IMETHODIMP
-nsDOMStorage2::GetInterface(const nsIID & aIID, void **result)
-{
-  nsresult rv = mStorage->GetInterface(aIID, result);
-  if (NS_SUCCEEDED(rv))
-    return rv;
-  return QueryInterface(aIID, result);;
-}
-
-nsDOMStorage2::nsDOMStorage2()
-{
-}
-
-nsDOMStorage2::nsDOMStorage2(nsDOMStorage2& aThat)
-{
-  mStorage = new nsDOMStorage(*aThat.mStorage.get());
-  mPrincipal = aThat.mPrincipal;
-}
-
-nsresult
-nsDOMStorage2::InitAsSessionStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                    bool aPrivate)
-{
-  mStorage = new nsDOMStorage();
-  if (!mStorage)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  mPrincipal = aPrincipal;
-  mDocumentURI = aDocumentURI;
-
-  return mStorage->InitAsSessionStorage(aPrincipal, aDocumentURI, aPrivate);
-}
-
-nsresult
-nsDOMStorage2::InitAsLocalStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                  bool aPrivate)
-{
-  mStorage = new nsDOMStorage();
-  if (!mStorage)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  mPrincipal = aPrincipal;
-  mDocumentURI = aDocumentURI;
-
-  return mStorage->InitAsLocalStorage(aPrincipal, aDocumentURI, aPrivate);
-}
-
-already_AddRefed<nsIDOMStorage>
-nsDOMStorage2::Clone()
-{
-  nsDOMStorage2* storage = new nsDOMStorage2(*this);
-  if (!storage)
-    return nullptr;
-
-  storage->mStorage->CloneFrom(mStorage);
-  NS_ADDREF(storage);
-
-  return storage;
-}
-
-already_AddRefed<nsIDOMStorage>
-nsDOMStorage2::Fork(const nsSubstring &aDocumentURI)
-{
-  nsRefPtr<nsDOMStorage2> storage = new nsDOMStorage2();
-  storage->InitAsSessionStorageFork(mPrincipal, aDocumentURI, mStorage);
-  return storage.forget();
-}
-
-bool nsDOMStorage2::IsForkOf(nsIDOMStorage* aThat)
-{
-  if (!aThat)
-    return false;
-
-  nsDOMStorage2* storage = static_cast<nsDOMStorage2*>(aThat);
-  return mStorage == storage->mStorage;
-}
-
-void
-nsDOMStorage2::InitAsSessionStorageFork(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI, nsDOMStorage* aStorage)
-{
-  mPrincipal = aPrincipal;
-  mDocumentURI = aDocumentURI;
-  mStorage = aStorage;
-}
-
-nsTArray<nsString> *
-nsDOMStorage2::GetKeys()
-{
-  return mStorage->GetKeys();
-}
-
-nsIPrincipal*
-nsDOMStorage2::Principal()
-{
-  return mPrincipal;
-}
-
-bool
-nsDOMStorage2::CanAccess(nsIPrincipal *aPrincipal)
-{
-  return mStorage->CanAccess(aPrincipal);
-}
-
-nsPIDOMStorage::nsDOMStorageType
-nsDOMStorage2::StorageType()
-{
-  if (mStorage)
-    return mStorage->StorageType();
-
-  return nsPIDOMStorage::Unknown;
-}
-
-bool
-nsDOMStorage2::IsPrivate()
-{
-  return mStorage && mStorage->IsPrivate();
-}
-
-namespace {
-
-class StorageNotifierRunnable : public nsRunnable
-{
-public:
-  StorageNotifierRunnable(nsISupports* aSubject)
-    : mSubject(aSubject)
-  { }
-
-  NS_DECL_NSIRUNNABLE
-
-private:
-  nsCOMPtr<nsISupports> mSubject;
-};
-
-NS_IMETHODIMP
-StorageNotifierRunnable::Run()
-{
-  nsCOMPtr<nsIObserverService> observerService =
-    mozilla::services::GetObserverService();
-  if (observerService) {
-    observerService->NotifyObservers(mSubject, "dom-storage2-changed", nullptr);
-  }
-  return NS_OK;
-}
-
-} // anonymous namespace
-
-void
-nsDOMStorage2::BroadcastChangeNotification(const nsSubstring &aKey,
-                                           const nsSubstring &aOldValue,
-                                           const nsSubstring &aNewValue)
-{
-  nsresult rv;
-  nsCOMPtr<nsIDOMEvent> domEvent;
-  // Note, this DOM event should never reach JS. It is cloned later in
-  // nsGlobalWindow.
-  NS_NewDOMStorageEvent(getter_AddRefs(domEvent), nullptr, nullptr, nullptr);
-  nsCOMPtr<nsIDOMStorageEvent> event = do_QueryInterface(domEvent);
-  rv = event->InitStorageEvent(NS_LITERAL_STRING("storage"),
-                               false,
-                               false,
-                               aKey,
-                               aOldValue,
-                               aNewValue,
-                               mDocumentURI,
-                               static_cast<nsIDOMStorage*>(this));
-  if (NS_FAILED(rv)) {
-    return;
-  }
-
-  nsRefPtr<StorageNotifierRunnable> r = new StorageNotifierRunnable(event);
-  NS_DispatchToMainThread(r);
-}
-
-NS_IMETHODIMP
-nsDOMStorage2::GetLength(uint32_t *aLength)
-{
-  return mStorage->GetLength(aLength);
-}
-
-NS_IMETHODIMP
-nsDOMStorage2::Key(uint32_t aIndex, nsAString& aKey)
-{
-  return mStorage->Key(aIndex, aKey);
-}
-
-NS_IMETHODIMP
-nsDOMStorage2::GetItem(const nsAString& aKey, nsAString &aData)
-{
-  return mStorage->GetItem(aKey, aData);
-}
-
-NS_IMETHODIMP
-nsDOMStorage2::SetItem(const nsAString& aKey, const nsAString& aData)
-{
-  mStorage->mEventBroadcaster = this;
-  return mStorage->SetItem(aKey, aData);
-}
-
-NS_IMETHODIMP
-nsDOMStorage2::RemoveItem(const nsAString& aKey)
-{
-  mStorage->mEventBroadcaster = this;
-  return mStorage->RemoveItem(aKey);
-}
-
-NS_IMETHODIMP
-nsDOMStorage2::Clear()
-{
-  mStorage->mEventBroadcaster = this;
-  return mStorage->Clear();
-}
-
-//
-// nsDOMStorageItem
-//
-
-NS_IMPL_CYCLE_COLLECTION_1(nsDOMStorageItem, mStorage)
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMStorageItem)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMStorageItem)
-
-DOMCI_DATA(StorageItem, nsDOMStorageItem)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMStorageItem)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorageItem)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMStorageItem)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMToString)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(StorageItem)
-NS_INTERFACE_MAP_END
-
-nsDOMStorageItem::nsDOMStorageItem(DOMStorageBase* aStorage,
-                                   const nsAString& aKey,
-                                   const nsAString& aValue,
-                                   bool aSecure)
-  : mSecure(aSecure),
-    mKey(aKey),
-    mValue(aValue),
-    mStorage(aStorage)
-{
-}
-
-nsDOMStorageItem::~nsDOMStorageItem()
-{
-}
-
-NS_IMETHODIMP
-nsDOMStorageItem::GetSecure(bool* aSecure)
-{
-  if (!mStorage->CacheStoragePermissions() || !IsCallerSecure()) {
-    return NS_ERROR_DOM_INVALID_ACCESS_ERR;
-  }
-
-  if (mStorage->UseDB()) {
-    nsAutoString value;
-    return mStorage->GetDBValue(mKey, value, aSecure);
-  }
-
-  *aSecure = IsSecure();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMStorageItem::SetSecure(bool aSecure)
-{
-  if (!mStorage->CacheStoragePermissions() || !IsCallerSecure()) {
-    return NS_ERROR_DOM_INVALID_ACCESS_ERR;
-  }
-
-  if (mStorage->UseDB()) {
-    nsresult rv = mStorage->SetSecure(mKey, aSecure);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  mSecure = aSecure;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMStorageItem::GetValue(nsAString& aValue)
-{
-  if (!mStorage->CacheStoragePermissions())
-    return NS_ERROR_DOM_INVALID_ACCESS_ERR;
-
-  if (mStorage->UseDB()) {
-    bool secure;
-    nsresult rv = mStorage->GetDBValue(mKey, aValue, &secure);
-    if (rv == NS_ERROR_DOM_NOT_FOUND_ERR)
-      return NS_OK;
-    if (NS_SUCCEEDED(rv) && !IsCallerSecure() && secure)
-      return NS_ERROR_DOM_SECURITY_ERR;
-    return rv;
-  }
-
-  if (IsSecure() && !IsCallerSecure()) {
-    return NS_ERROR_DOM_SECURITY_ERR;
-  }
-
-  aValue = mValue;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMStorageItem::SetValue(const nsAString& aValue)
-{
-  if (!mStorage->CacheStoragePermissions())
-    return NS_ERROR_DOM_INVALID_ACCESS_ERR;
-
-  bool secureCaller = IsCallerSecure();
-
-  if (mStorage->UseDB()) {
-    // SetDBValue() does the security checks for us.
-    return mStorage->SetDBValue(mKey, aValue, secureCaller);
-  }
-
-  bool secureItem = IsSecure();
-
-  if (!secureCaller && secureItem) {
-    // The item is secure, but the caller isn't. Throw.
-    return NS_ERROR_DOM_SECURITY_ERR;
-  }
-
-  mValue = aValue;
-  mSecure = secureCaller;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMStorageItem::ToString(nsAString& aStr)
-{
-  return GetValue(aStr);
-}
-
diff --git a/dom/src/storage/nsDOMStorage.h b/dom/src/storage/nsDOMStorage.h
deleted file mode 100644
index d1387095d1e1..000000000000
--- a/dom/src/storage/nsDOMStorage.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef nsDOMStorage_h___
-#define nsDOMStorage_h___
-
-#include "nscore.h"
-#include "nsAutoPtr.h"
-#include "nsIDOMStorageObsolete.h"
-#include "nsIDOMStorage.h"
-#include "nsIDOMStorageItem.h"
-#include "nsIPermissionManager.h"
-#include "nsIPrivacyTransitionObserver.h"
-#include "nsInterfaceHashtable.h"
-#include "nsVoidArray.h"
-#include "nsTArray.h"
-#include "nsPIDOMStorage.h"
-#include "nsIDOMToString.h"
-#include "nsDOMEvent.h"
-#include "nsIDOMStorageEvent.h"
-#include "nsIDOMStorageManager.h"
-#include "nsCycleCollectionParticipant.h"
-#include "nsIObserver.h"
-#include "nsITimer.h"
-#include "nsWeakReference.h"
-#include "nsIInterfaceRequestor.h"
-#include "mozilla/Attributes.h"
-
-#include "nsDOMStorageDBWrapper.h"
-
-class nsDOMStorage;
-class nsIDOMStorage;
-class nsDOMStorageItem;
-class nsDOMStoragePersistentDB;
-
-namespace mozilla {
-namespace dom {
-class StorageParent;
-}
-}
-using mozilla::dom::StorageParent;
-
-class DOMStorageImpl;
-
-class nsDOMStorageEntry : public nsPtrHashKey<const void>
-{
-public:
-  nsDOMStorageEntry(KeyTypePointer aStr);
-  nsDOMStorageEntry(const nsDOMStorageEntry& aToCopy);
-  ~nsDOMStorageEntry();
-
-  // weak reference so that it can be deleted when no longer used
-  DOMStorageImpl* mStorage;
-};
-
-class nsSessionStorageEntry : public nsStringHashKey
-{
-public:
-  nsSessionStorageEntry(KeyTypePointer aStr);
-  nsSessionStorageEntry(const nsSessionStorageEntry& aToCopy);
-  ~nsSessionStorageEntry();
-
-  nsRefPtr<nsDOMStorageItem> mItem;
-};
-
-class nsDOMStorageManager MOZ_FINAL : public nsIDOMStorageManager
-                                    , public nsIObserver
-                                    , public nsSupportsWeakReference
-{
-public:
-  // nsISupports
-  NS_DECL_ISUPPORTS
-
-  // nsIDOMStorageManager
-  NS_DECL_NSIDOMSTORAGEMANAGER
-
-  // nsIObserver
-  NS_DECL_NSIOBSERVER
-
-  nsDOMStorageManager();
-
-  void AddToStoragesHash(DOMStorageImpl* aStorage);
-  void RemoveFromStoragesHash(DOMStorageImpl* aStorage);
-
-  nsresult ClearAllStorages();
-
-  static nsresult Initialize();
-  static nsDOMStorageManager* GetInstance();
-  static void Shutdown();
-  static void ShutdownDB();
-
-  /**
-   * Checks whether there is any data waiting to be flushed from a temp table.
-   */
-  bool UnflushedDataExists();
-
-  static nsDOMStorageManager* gStorageManager;
-
-protected:
-
-  nsTHashtable<nsDOMStorageEntry> mStorages;
-};
-
-class DOMStorageBase : public nsIPrivacyTransitionObserver
-{
-public:
-  DOMStorageBase();
-  DOMStorageBase(DOMStorageBase&);
-
-  virtual void InitAsSessionStorage(nsIPrincipal* aPrincipal, bool aPrivate);
-  virtual void InitAsLocalStorage(nsIPrincipal* aPrincipal, bool aPrivate);
-
-  virtual nsTArray<nsString>* GetKeys(bool aCallerSecure) = 0;
-  virtual nsresult GetLength(bool aCallerSecure, uint32_t* aLength) = 0;
-  virtual nsresult GetKey(bool aCallerSecure, uint32_t aIndex, nsAString& aKey) = 0;
-  virtual nsIDOMStorageItem* GetValue(bool aCallerSecure, const nsAString& aKey,
-                                      nsresult* rv) = 0;
-  virtual nsresult SetValue(bool aCallerSecure, const nsAString& aKey,
-                            const nsAString& aData, nsAString& aOldValue) = 0;
-  virtual nsresult RemoveValue(bool aCallerSecure, const nsAString& aKey,
-                               nsAString& aOldValue) = 0;
-  virtual nsresult Clear(bool aCallerSecure, int32_t* aOldCount) = 0;
-
-  // Call nsDOMStorage::CanUseStorage with |this|
-  bool CanUseStorage();
-
-  // If true, the contents of the storage should be stored in the
-  // database, otherwise this storage should act like a session
-  // storage.
-  // This call relies on mSessionOnly, and should only be used
-  // after a CacheStoragePermissions() call.  See the comments
-  // for mSessionOnly below.
-  bool UseDB() {
-    return mUseDB;
-  }
-
-  bool IsPrivate() {
-    return mInPrivateBrowsing;
-  }
-
-  // retrieve the value and secure state corresponding to a key out of storage.
-  virtual nsresult
-  GetDBValue(const nsAString& aKey,
-             nsAString& aValue,
-             bool* aSecure) = 0;
-
-  // set the value corresponding to a key in the storage. If
-  // aSecure is false, then attempts to modify a secure value
-  // throw NS_ERROR_DOM_INVALID_ACCESS_ERR
-  virtual nsresult
-  SetDBValue(const nsAString& aKey,
-             const nsAString& aValue,
-             bool aSecure) = 0;
-
-  // set the value corresponding to a key as secure.
-  virtual nsresult
-  SetSecure(const nsAString& aKey, bool aSecure) = 0;
-
-  virtual nsresult
-  CloneFrom(bool aCallerSecure, DOMStorageBase* aThat) = 0;
-
-  // e.g. "moc.rab.oof.:" or "moc.rab.oof.:http:80" depending
-  // on association with a domain (globalStorage) or
-  // an origin (localStorage).
-  nsCString& GetScopeDBKey() {return mScopeDBKey;}
-
-  // e.g. "moc.rab.%" - reversed eTLD+1 subpart of the domain.
-  nsCString& GetQuotaDBKey()
-  {
-    return mQuotaDBKey;
-  }
-
-  virtual bool CacheStoragePermissions() = 0;
-
-protected:
-  friend class nsDOMStorageManager;
-  friend class nsDOMStorage;
-
-  nsPIDOMStorage::nsDOMStorageType mStorageType;
-  
-  // true if the storage database should be used for values
-  bool mUseDB;
-
-  // true if the preferences indicates that this storage should be
-  // session only. This member is updated by
-  // CacheStoragePermissions(), using the current principal.
-  // CacheStoragePermissions() must be called at each entry point to
-  // make sure this stays up to date.
-  bool mSessionOnly;
-
-  // keys are used for database queries.
-  // see comments of the getters bellow.
-  nsCString mScopeDBKey;
-  nsCString mQuotaDBKey;
-
-  bool mInPrivateBrowsing;
-};
-
-class DOMStorageImpl MOZ_FINAL : public DOMStorageBase
-                               , public nsSupportsWeakReference
-{
-public:
-  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(DOMStorageImpl, nsIPrivacyTransitionObserver)
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_NSIPRIVACYTRANSITIONOBSERVER
-
-  DOMStorageImpl(nsDOMStorage*);
-  DOMStorageImpl(nsDOMStorage*, DOMStorageImpl&);
-  ~DOMStorageImpl();
-
-  bool SessionOnly() {
-    return mSessionOnly;
-  }
-
-  virtual nsTArray<nsString>* GetKeys(bool aCallerSecure);
-  virtual nsresult GetLength(bool aCallerSecure, uint32_t* aLength);
-  virtual nsresult GetKey(bool aCallerSecure, uint32_t aIndex, nsAString& aKey);
-  virtual nsIDOMStorageItem* GetValue(bool aCallerSecure, const nsAString& aKey,
-                                      nsresult* rv);
-  virtual nsresult SetValue(bool aCallerSecure, const nsAString& aKey,
-                            const nsAString& aData, nsAString& aOldValue);
-  virtual nsresult RemoveValue(bool aCallerSecure, const nsAString& aKey,
-                               nsAString& aOldValue);
-  virtual nsresult Clear(bool aCallerSecure, int32_t* aOldCount);
-
-  // cache the keys from the database for faster lookup
-  nsresult CacheKeysFromDB();
-
-  uint64_t CachedVersion() { return mItemsCachedVersion; }
-  void SetCachedVersion(uint64_t version) { mItemsCachedVersion = version; }
-  
-  // retrieve the value and secure state corresponding to a key out of storage
-  // that has been cached in mItems hash table.
-  nsresult
-  GetCachedValue(const nsAString& aKey,
-                 nsAString& aValue,
-                 bool* aSecure);
-
-  // retrieve the value and secure state corresponding to a key out of storage.
-  virtual nsresult
-  GetDBValue(const nsAString& aKey,
-             nsAString& aValue,
-             bool* aSecure);
-
-  // set the value corresponding to a key in the storage. If
-  // aSecure is false, then attempts to modify a secure value
-  // throw NS_ERROR_DOM_INVALID_ACCESS_ERR
-  virtual nsresult
-  SetDBValue(const nsAString& aKey,
-             const nsAString& aValue,
-             bool aSecure);
-
-  // set the value corresponding to a key as secure.
-  virtual nsresult
-  SetSecure(const nsAString& aKey, bool aSecure);
-
-  // clear all values from the store
-  void ClearAll();
-
-  virtual nsresult
-  CloneFrom(bool aCallerSecure, DOMStorageBase* aThat);
-
-  virtual bool CacheStoragePermissions();
-
-private:
-  static nsDOMStorageDBWrapper* gStorageDB;
-  friend class nsDOMStorageManager;
-  friend class nsDOMStoragePersistentDB;
-  friend class StorageParent;
-
-  void Init(nsDOMStorage*);
-
-  // Cross-process storage implementations never have InitAs(Session|Local|Global)Storage
-  // called, so the appropriate initialization needs to happen from the child.
-  void InitFromChild(bool aUseDB, bool aSessionOnly,
-                     bool aPrivate,
-                     const nsACString& aScopeDBKey,
-                     const nsACString& aQuotaDBKey,
-                     uint32_t aStorageType);
-  void SetSessionOnly(bool aSessionOnly);
-
-  static nsresult InitDB();
-
-  // 0 initially or a positive data version number assigned by gStorageDB
-  // after keys have been cached from the database
-  uint64_t mItemsCachedVersion;
-
-  // the key->value item pairs
-  nsTHashtable<nsSessionStorageEntry> mItems;
-
-  // Weak reference to the owning storage instance
-  nsDOMStorage* mOwner;
-};
-
-class nsDOMStorage2;
-
-class nsDOMStorage : public nsIDOMStorageObsolete,
-                     public nsPIDOMStorage,
-                     public nsIInterfaceRequestor
-{
-public:
-  nsDOMStorage();
-  nsDOMStorage(nsDOMStorage& aThat);
-  virtual ~nsDOMStorage();
-
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMStorage, nsIDOMStorageObsolete)
-
-  NS_DECL_NSIDOMSTORAGEOBSOLETE
-  NS_DECL_NSIINTERFACEREQUESTOR
-
-  // Helpers for implementing nsIDOMStorage
-  nsresult GetItem(const nsAString& key, nsAString& aData);
-  nsresult Clear();
-
-  // nsPIDOMStorage
-  virtual nsresult InitAsSessionStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                        bool aPrivate);
-  virtual nsresult InitAsLocalStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                      bool aPrivate);
-  virtual already_AddRefed<nsIDOMStorage> Clone();
-  virtual already_AddRefed<nsIDOMStorage> Fork(const nsSubstring &aDocumentURI);
-  virtual bool IsForkOf(nsIDOMStorage* aThat);
-  virtual nsTArray<nsString> *GetKeys();
-  virtual nsIPrincipal* Principal();
-  virtual bool CanAccess(nsIPrincipal *aPrincipal);
-  virtual nsDOMStorageType StorageType();
-  virtual bool IsPrivate() {
-    return mStorageImpl && mStorageImpl->IsPrivate();
-  }
-
-  // Check whether storage may be used by the caller, and whether it
-  // is session only.  Returns true if storage may be used.
-  static bool
-  CanUseStorage(DOMStorageBase* aStorage = nullptr);
-
-  // Check whether storage may be used.  Updates mSessionOnly based on
-  // the result of CanUseStorage.
-  bool
-  CacheStoragePermissions();
-
-  nsIDOMStorageItem* GetNamedItem(const nsAString& aKey, nsresult* aResult);
-
-  nsresult SetSecure(const nsAString& aKey, bool aSecure)
-  {
-    return mStorageImpl->SetSecure(aKey, aSecure);
-  }
-
-  nsresult CloneFrom(nsDOMStorage* aThat);
-
- protected:
-  friend class nsDOMStorage2;
-  friend class nsDOMStoragePersistentDB;
-
-  nsRefPtr<DOMStorageBase> mStorageImpl;
-
-  bool CanAccessSystem(nsIPrincipal *aPrincipal);
-
-  // document URI of the document this storage is bound to
-  nsString mDocumentURI;
-
-  // true if this storage was initialized as a localStorage object.  localStorage
-  // objects are scoped to scheme/host/port in the database, while globalStorage
-  // objects are scoped just to host.  this flag also tells the manager to map
-  // this storage also in mLocalStorages hash table.
-  nsDOMStorageType mStorageType;
-
-  friend class nsIDOMStorage2;
-  nsCOMPtr<nsIPrincipal> mPrincipal;
-  nsDOMStorage2* mEventBroadcaster;
-};
-
-class nsDOMStorage2 MOZ_FINAL : public nsIDOMStorage,
-                                public nsPIDOMStorage,
-                                public nsIInterfaceRequestor
-{
-public:
-  // nsISupports
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMStorage2, nsIDOMStorage)
-
-  nsDOMStorage2(nsDOMStorage2& aThat);
-  nsDOMStorage2();
-
-  NS_DECL_NSIDOMSTORAGE
-  NS_DECL_NSIINTERFACEREQUESTOR
-
-  // nsPIDOMStorage
-  virtual nsresult InitAsSessionStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                        bool aPrivate);
-  virtual nsresult InitAsLocalStorage(nsIPrincipal *aPrincipal, const nsSubstring &aDocumentURI,
-                                      bool aPrivate);
-  virtual already_AddRefed<nsIDOMStorage> Clone();
-  virtual already_AddRefed<nsIDOMStorage> Fork(const nsSubstring &aDocumentURI);
-  virtual bool IsForkOf(nsIDOMStorage* aThat);
-  virtual nsTArray<nsString> *GetKeys();
-  virtual nsIPrincipal* Principal();
-  virtual bool CanAccess(nsIPrincipal *aPrincipal);
-  virtual nsDOMStorageType StorageType();
-  virtual bool IsPrivate();
-
-  void BroadcastChangeNotification(const nsSubstring &aKey,
-                                   const nsSubstring &aOldValue,
-                                   const nsSubstring &aNewValue);
-  void InitAsSessionStorageFork(nsIPrincipal *aPrincipal,
-                                const nsSubstring &aDocumentURI,
-                                nsDOMStorage* aStorage);
-
-private:
-  // storages bound to an origin hold the principal to
-  // make security checks against it
-  nsCOMPtr<nsIPrincipal> mPrincipal;
-
-  // Needed for the storage event, this is address of the document this storage
-  // is bound to
-  nsString mDocumentURI;
-  nsRefPtr<nsDOMStorage> mStorage;
-};
-
-class nsDOMStorageItem : public nsIDOMStorageItem,
-                         public nsIDOMToString
-{
-public:
-  nsDOMStorageItem(DOMStorageBase* aStorage,
-                   const nsAString& aKey,
-                   const nsAString& aValue,
-                   bool aSecure);
-  virtual ~nsDOMStorageItem();
-
-  // nsISupports
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMStorageItem, nsIDOMStorageItem)
-
-  // nsIDOMStorageObsolete
-  NS_DECL_NSIDOMSTORAGEITEM
-
-  // nsIDOMToString
-  NS_DECL_NSIDOMTOSTRING
-
-  bool IsSecure()
-  {
-    return mSecure;
-  }
-
-  void SetSecureInternal(bool aSecure)
-  {
-    mSecure = aSecure;
-  }
-
-  const nsAString& GetValueInternal()
-  {
-    return mValue;
-  }
-
-  const void SetValueInternal(const nsAString& aValue)
-  {
-    mValue = aValue;
-  }
-
-  void ClearValue()
-  {
-    mValue.Truncate();
-  }
-
-protected:
-
-  // true if this value is for secure sites only
-  bool mSecure;
-
-  // key for the item
-  nsString mKey;
-
-  // value of the item
-  nsString mValue;
-
-  // If this item came from the db, mStorage points to the storage
-  // object where this item came from.
-  nsRefPtr<DOMStorageBase> mStorage;
-};
-
-nsresult
-NS_NewDOMStorage2(nsISupports* aOuter, REFNSIID aIID, void** aResult);
-
-#endif /* nsDOMStorage_h___ */
diff --git a/dom/src/storage/nsDOMStorageBaseDB.cpp b/dom/src/storage/nsDOMStorageBaseDB.cpp
deleted file mode 100644
index b7509a5f3d97..000000000000
--- a/dom/src/storage/nsDOMStorageBaseDB.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "nsDOMStorageBaseDB.h"
-#include "nsDOMStorage.h"
-#include "mozilla/Preferences.h"
-
-// Only allow relatively small amounts of data since performance of
-// the synchronous IO is very bad.
-#define DEFAULT_QUOTA_LIMIT (5 * 1024)
-
-uint64_t nsDOMStorageBaseDB::sGlobalVersion = 1;
-int32_t nsDOMStorageBaseDB::gQuotaLimit = DEFAULT_QUOTA_LIMIT * 1024;
-
-using namespace mozilla;
-
-/* static */
-void
-nsDOMStorageBaseDB::Init()
-{
-  Preferences::AddIntVarCache(&gQuotaLimit, "dom.storage.default_quota",
-                              DEFAULT_QUOTA_LIMIT);
-}
-
-nsDOMStorageBaseDB::nsDOMStorageBaseDB()
-{
-  mScopesVersion.Init(8);
-}
-
-// public
-
-void
-nsDOMStorageBaseDB::MarkScopeCached(DOMStorageImpl* aStorage)
-{
-  aStorage->SetCachedVersion(CachedScopeVersion(aStorage));
-}
-
-bool
-nsDOMStorageBaseDB::IsScopeDirty(DOMStorageImpl* aStorage)
-{
-  return !aStorage->CachedVersion() ||
-         (aStorage->CachedVersion() != CachedScopeVersion(aStorage));
-}
-
-// protected
-
-// static
-uint64_t
-nsDOMStorageBaseDB::NextGlobalVersion()
-{
-  sGlobalVersion++;
-  if (sGlobalVersion == 0) // Control overlap, never return 0
-    sGlobalVersion = 1;
-  return sGlobalVersion;
-}
-
-uint64_t
-nsDOMStorageBaseDB::CachedScopeVersion(DOMStorageImpl* aStorage)
-{
-  uint64_t currentVersion;
-  if (mScopesVersion.Get(aStorage->GetScopeDBKey(), &currentVersion))
-    return currentVersion;
-
-  mScopesVersion.Put(aStorage->GetScopeDBKey(), sGlobalVersion);
-  return sGlobalVersion;
-}
-
-void
-nsDOMStorageBaseDB::MarkScopeDirty(DOMStorageImpl* aStorage)
-{
-  uint64_t nextVersion = NextGlobalVersion();
-  mScopesVersion.Put(aStorage->GetScopeDBKey(), nextVersion);
-
-  // We may do this because the storage updates its cache along with
-  // updating the database.
-  aStorage->SetCachedVersion(nextVersion);
-}
-
-void
-nsDOMStorageBaseDB::MarkAllScopesDirty()
-{
-  mScopesVersion.Clear();
-  NextGlobalVersion();
-}
diff --git a/dom/src/storage/nsDOMStorageBaseDB.h b/dom/src/storage/nsDOMStorageBaseDB.h
deleted file mode 100644
index 01019cde5fae..000000000000
--- a/dom/src/storage/nsDOMStorageBaseDB.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef nsDOMStorageBaseDB_h___
-#define nsDOMStorageBaseDB_h___
-
-#include "nscore.h"
-#include "nsDataHashtable.h"
-
-class DOMStorageImpl;
-
-class nsDOMStorageBaseDB
-{
-public:
-  static void Init();
-
-  nsDOMStorageBaseDB();
-  virtual ~nsDOMStorageBaseDB() {}
-
-  /**
-   * Marks the storage as "cached" after the DOMStorageImpl object has loaded
-   * all items to its memory copy of the entries - IsScopeDirty returns false
-   * after call of this method for this storage.
-   *
-   * When a key is changed or deleted in the storage, the storage scope is
-   * marked as "dirty" again and makes the DOMStorageImpl object recache its
-   * keys on next access, because IsScopeDirty returns true again.
-   */
-  void MarkScopeCached(DOMStorageImpl* aStorage);
-
-  /**
-   * Test whether the storage for the scope (i.e. origin or host) has been
-   * changed since the last MarkScopeCached call.
-   */
-  bool IsScopeDirty(DOMStorageImpl* aStorage);
-
-  int32_t GetQuota() {
-    return gQuotaLimit * 1024;
-  }
-
-protected:
-  nsDataHashtable<nsCStringHashKey, uint64_t> mScopesVersion;
-
-  static uint64_t NextGlobalVersion();
-  uint64_t CachedScopeVersion(DOMStorageImpl* aStorage);
-
-  void MarkScopeDirty(DOMStorageImpl* aStorage);
-  void MarkAllScopesDirty();
-
-private:
-  static uint64_t sGlobalVersion;
-
-  static int32_t gQuotaLimit;
-};
-
-#endif /* nsDOMStorageDB_h___ */
diff --git a/dom/src/storage/nsDOMStorageDBWrapper.cpp b/dom/src/storage/nsDOMStorageDBWrapper.cpp
deleted file mode 100644
index 1c16f67850b4..000000000000
--- a/dom/src/storage/nsDOMStorageDBWrapper.cpp
+++ /dev/null
@@ -1,397 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "nsCOMPtr.h"
-#include "nsError.h"
-#include "nsDOMStorage.h"
-#include "nsDOMStorageDBWrapper.h"
-#include "nsIFile.h"
-#include "nsIURL.h"
-#include "nsIVariant.h"
-#include "nsIEffectiveTLDService.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "mozStorageCID.h"
-#include "mozStorageHelper.h"
-#include "mozIStorageService.h"
-#include "mozIStorageValueArray.h"
-#include "mozIStorageFunction.h"
-#include "nsPrintfCString.h"
-#include "nsNetUtil.h"
-#include "nsIPrincipal.h"
-
-void ReverseString(const nsCSubstring& source, nsCSubstring& result)
-{
-  nsACString::const_iterator sourceBegin, sourceEnd;
-  source.BeginReading(sourceBegin);
-  source.EndReading(sourceEnd);
-
-  result.SetLength(source.Length());
-  nsACString::iterator destEnd;
-  result.EndWriting(destEnd);
-
-  while (sourceBegin != sourceEnd) {
-    *(--destEnd) = *sourceBegin;
-    ++sourceBegin;
-  }
-}
-
-nsDOMStorageDBWrapper::nsDOMStorageDBWrapper()
-{
-}
-
-nsDOMStorageDBWrapper::~nsDOMStorageDBWrapper()
-{
-}
-
-void
-nsDOMStorageDBWrapper::Close()
-{
-  mPersistentDB.Close();
-}
-
-nsresult
-nsDOMStorageDBWrapper::Init()
-{
-  nsresult rv;
-
-  rv = mPersistentDB.Init(NS_LITERAL_STRING("webappsstore.sqlite"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mSessionOnlyDB.Init(&mPersistentDB);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mPrivateBrowsingDB.Init();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageDBWrapper::FlushAndEvictFromCache(bool aIsShuttingDown)
-{
-  nsresult rv = mPersistentDB.FlushAndEvictFromCache(aIsShuttingDown);
-
-  // Nothing in the cache?  Then no need for a timer.
-  if (!mPersistentDB.IsFlushTimerNeeded()) {
-    StopCacheFlushTimer();
-  }
-
-  return rv;
-}
-
-#define IMPL_FORWARDER_GUTS(_return, _code)                                \
-  PR_BEGIN_MACRO                                                      \
-  if (aStorage->IsPrivate())                                          \
-    _return mPrivateBrowsingDB._code;                                 \
-  if (aStorage->SessionOnly())                                        \
-    _return mSessionOnlyDB._code;                                     \
-  _return mPersistentDB._code;                                        \
-  PR_END_MACRO
-
-#define IMPL_FORWARDER(_code)                                  \
-  IMPL_FORWARDER_GUTS(return, _code)
-
-#define IMPL_VOID_FORWARDER(_code)                                    \
-  IMPL_FORWARDER_GUTS((void), _code)
-
-nsresult
-nsDOMStorageDBWrapper::GetAllKeys(DOMStorageImpl* aStorage,
-                                  nsTHashtable<nsSessionStorageEntry>* aKeys)
-{
-  IMPL_FORWARDER(GetAllKeys(aStorage, aKeys));
-}
-
-nsresult
-nsDOMStorageDBWrapper::GetKeyValue(DOMStorageImpl* aStorage,
-                                   const nsAString& aKey,
-                                   nsAString& aValue,
-                                   bool* aSecure)
-{
-  IMPL_FORWARDER(GetKeyValue(aStorage, aKey, aValue, aSecure));
-}
-
-nsresult
-nsDOMStorageDBWrapper::SetKey(DOMStorageImpl* aStorage,
-                              const nsAString& aKey,
-                              const nsAString& aValue,
-                              bool aSecure)
-{
-  IMPL_FORWARDER(SetKey(aStorage, aKey, aValue, aSecure));
-}
-
-nsresult
-nsDOMStorageDBWrapper::SetSecure(DOMStorageImpl* aStorage,
-                                 const nsAString& aKey,
-                                 const bool aSecure)
-{
-  IMPL_FORWARDER(SetSecure(aStorage, aKey, aSecure));
-}
-
-nsresult
-nsDOMStorageDBWrapper::RemoveKey(DOMStorageImpl* aStorage,
-                                 const nsAString& aKey)
-{
-  IMPL_FORWARDER(RemoveKey(aStorage, aKey));
-}
-
-nsresult
-nsDOMStorageDBWrapper::ClearStorage(DOMStorageImpl* aStorage)
-{
-  IMPL_FORWARDER(ClearStorage(aStorage));
-}
-
-void
-nsDOMStorageDBWrapper::MarkScopeCached(DOMStorageImpl* aStorage)
-{
-  IMPL_VOID_FORWARDER(MarkScopeCached(aStorage));
-}
-
-bool
-nsDOMStorageDBWrapper::IsScopeDirty(DOMStorageImpl* aStorage)
-{
-  IMPL_FORWARDER(IsScopeDirty(aStorage));
-}
-
-nsresult
-nsDOMStorageDBWrapper::DropSessionOnlyStoragesForHost(const nsACString& aHostName)
-{
-  return mSessionOnlyDB.RemoveOwner(aHostName);
-}
-
-nsresult
-nsDOMStorageDBWrapper::DropPrivateBrowsingStorages()
-{
-  return mPrivateBrowsingDB.RemoveAll();
-}
-
-nsresult
-nsDOMStorageDBWrapper::RemoveOwner(const nsACString& aOwner)
-{
-  nsresult rv;
-
-  rv = mPrivateBrowsingDB.RemoveOwner(aOwner);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mSessionOnlyDB.RemoveOwner(aOwner);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mPersistentDB.RemoveOwner(aOwner);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return rv;
-}
-
-
-nsresult
-nsDOMStorageDBWrapper::RemoveAll()
-{
-  nsresult rv;
-
-  rv = mPrivateBrowsingDB.RemoveAll();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mSessionOnlyDB.RemoveAll();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mPersistentDB.RemoveAll();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return rv;
-}
-
-nsresult
-nsDOMStorageDBWrapper::RemoveAllForApp(uint32_t aAppId, bool aOnlyBrowserElement)
-{
-  // We only care about removing the permament storage. Temporary storage such
-  // as session storage or private browsing storage will not be re-used anyway
-  // and will be automatically deleted at some point.
-  return mPersistentDB.RemoveAllForApp(aAppId, aOnlyBrowserElement);
-}
-
-nsresult
-nsDOMStorageDBWrapper::GetUsage(DOMStorageImpl* aStorage, int32_t *aUsage)
-{
-  IMPL_FORWARDER(GetUsage(aStorage, aUsage));
-}
-
-nsresult
-nsDOMStorageDBWrapper::GetUsage(const nsACString& aDomain,
-                                int32_t *aUsage, bool aPrivate)
-{
-  if (aPrivate)
-    return mPrivateBrowsingDB.GetUsage(aDomain, aUsage);
-
-#if 0
-  // XXX Check where from all this method gets called, not sure this should
-  // include any potential session-only data
-  nsresult rv;
-  rv = mSessionOnlyDB.GetUsage(aDomain, aUsage);
-  if (NS_SUECEEDED(rv))
-    return rv;
-#endif
-
-  return mPersistentDB.GetUsage(aDomain, aUsage);
-}
-
-nsresult
-nsDOMStorageDBWrapper::CreateScopeDBKey(nsIPrincipal* aPrincipal,
-                                        nsACString& aKey)
-{
-  nsCOMPtr<nsIURI> uri;
-  nsresult rv = aPrincipal->GetURI(getter_AddRefs(uri));
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
-
-  nsAutoCString domainScope;
-  rv = uri->GetAsciiHost(domainScope);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (domainScope.IsEmpty()) {
-    // About pages have an empty host but a valid path.  Since they are handled
-    // internally by our own redirector, we can trust them and use path as key.
-    // if file:/// protocol, let's make the exact directory the domain
-    bool isScheme = false;
-    if ((NS_SUCCEEDED(uri->SchemeIs("about", &isScheme)) && isScheme) ||
-        (NS_SUCCEEDED(uri->SchemeIs("moz-safe-about", &isScheme)) && isScheme)) {
-      rv = uri->GetPath(domainScope);
-      NS_ENSURE_SUCCESS(rv, rv);
-      // While the host is always canonicalized to lowercase, the path is not,
-      // thus need to force the casing.
-      ToLowerCase(domainScope);
-    }
-    else if (NS_SUCCEEDED(uri->SchemeIs("file", &isScheme)) && isScheme) {
-      nsCOMPtr<nsIURL> url = do_QueryInterface(uri, &rv);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = url->GetDirectory(domainScope);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-  }
-
-  nsAutoCString key;
-
-  rv = CreateReversedDomain(domainScope, key);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoCString scheme;
-  rv = uri->GetScheme(scheme);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  key.Append(NS_LITERAL_CSTRING(":") + scheme);
-
-  int32_t port = NS_GetRealPort(uri);
-  if (port != -1) {
-    key.Append(nsPrintfCString(":%d", port));
-  }
-
-  uint32_t appId;
-  rv = aPrincipal->GetAppId(&appId);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool isInBrowserElement;
-  rv = aPrincipal->GetIsInBrowserElement(&isInBrowserElement);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (appId == nsIScriptSecurityManager::NO_APP_ID && !isInBrowserElement) {
-    aKey.Assign(key);
-    return NS_OK;
-  }
-
-  aKey.Truncate();
-  aKey.AppendInt(appId);
-  aKey.Append(NS_LITERAL_CSTRING(":") + (isInBrowserElement ?
-              NS_LITERAL_CSTRING("t") : NS_LITERAL_CSTRING("f")) +
-              NS_LITERAL_CSTRING(":") + key);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageDBWrapper::CreateReversedDomain(const nsACString& aAsciiDomain,
-                                            nsACString& aKey)
-{
-  if (aAsciiDomain.IsEmpty())
-    return NS_ERROR_NOT_AVAILABLE;
-
-  ReverseString(aAsciiDomain, aKey);
-
-  aKey.AppendLiteral(".");
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageDBWrapper::CreateQuotaDBKey(nsIPrincipal* aPrincipal,
-                                        nsACString& aKey)
-{
-  nsresult rv;
-
-  nsAutoCString subdomainsDBKey;
-  nsCOMPtr<nsIEffectiveTLDService> eTLDService(do_GetService(
-    NS_EFFECTIVETLDSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsIURI> uri;
-  rv = aPrincipal->GetURI(getter_AddRefs(uri));
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
-
-  nsAutoCString eTLDplusOne;
-  rv = eTLDService->GetBaseDomain(uri, 0, eTLDplusOne);
-  if (NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS == rv) {
-    // XXX bug 357323 - what to do for localhost/file exactly?
-    rv = uri->GetAsciiHost(eTLDplusOne);
-  }
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  CreateReversedDomain(eTLDplusOne, subdomainsDBKey);
-
-  uint32_t appId;
-  rv = aPrincipal->GetAppId(&appId);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool isInBrowserElement;
-  rv = aPrincipal->GetIsInBrowserElement(&isInBrowserElement);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (appId == nsIScriptSecurityManager::NO_APP_ID && !isInBrowserElement) {
-    aKey.Assign(subdomainsDBKey);
-    return NS_OK;
-  }
-
-  aKey.Truncate();
-  aKey.AppendInt(appId);
-  aKey.Append(NS_LITERAL_CSTRING(":") + (isInBrowserElement ?
-              NS_LITERAL_CSTRING("t") : NS_LITERAL_CSTRING("f")) +
-              NS_LITERAL_CSTRING(":") + subdomainsDBKey);
-
-  return NS_OK;
-}
-
-void
-nsDOMStorageDBWrapper::EnsureCacheFlushTimer()
-{
-  if (!mCacheFlushTimer) {
-    nsresult rv;
-    mCacheFlushTimer = do_CreateInstance(NS_TIMER_CONTRACTID, &rv);
-
-    if (!NS_SUCCEEDED(rv)) {
-      mCacheFlushTimer = nullptr;
-      return;
-    }
-
-    mCacheFlushTimer->Init(nsDOMStorageManager::gStorageManager, 5000,
-                           nsITimer::TYPE_REPEATING_SLACK);
-  }
-}
-
-void
-nsDOMStorageDBWrapper::StopCacheFlushTimer()
-{
-  if (mCacheFlushTimer) {
-    mCacheFlushTimer->Cancel();
-    mCacheFlushTimer = nullptr;
-  }
-}
-
diff --git a/dom/src/storage/nsDOMStorageDBWrapper.h b/dom/src/storage/nsDOMStorageDBWrapper.h
deleted file mode 100644
index 6b760d846668..000000000000
--- a/dom/src/storage/nsDOMStorageDBWrapper.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef nsDOMStorageDB_h___
-#define nsDOMStorageDB_h___
-
-#include "nscore.h"
-#include "nsTHashtable.h"
-
-#include "nsDOMStoragePersistentDB.h"
-#include "nsDOMStorageMemoryDB.h"
-
-extern void ReverseString(const nsCSubstring& source, nsCSubstring& result);
-
-class nsDOMStorage;
-class nsSessionStorageEntry;
-
-/**
- * For the purposes of quota checking, we want to be able to efficiently
- * reference data items that belong to a host or its subhosts.  We do this by
- * using a reversed domain name as the key for an item.  For example, a
- * storage for foo.bar.com would use a key of 'moc.rab.oof.".
- *
- * Additionally, globalStorage and localStorage items must be distinguished.
- * globalStorage items are scoped to the host, and localStorage are items are
- * scoped to the scheme/host/port.  To scope localStorage data, its port and
- * scheme are appended to its key.  http://foo.bar.com is stored as
- * moc.rab.foo.:http:80.
- *
- * So the following queries can be used, for http://foo.bar.com:
- *
- * All data owned by globalStorage["foo.bar.com"] -> SELECT * WHERE Domain =
- * "moc.rab.foo.:"
- *
- * All data owned by localStorage -> SELECT * WHERE Domain =
- * "moc.rab.foo.:http:80"
- *
- * All data owned by foo.bar.com, in any storage ->
- * SELECT * WHERE Domain GLOB "moc.rab.foo.:*"
- *
- * All data owned by foo.bar.com or any subdomain, in any storage ->
- * SELECT * WHERE Domain GLOB "moc.rab.foo.*".
- *
- * This key is called the "scope DB key" throughout the code.  So the scope DB
- * key for localStorage at http://foo.bar.com is "moc.rab.foo.:http:80".
- *
- * When calculating quotas, we want to lump together everything in an ETLD+1.
- * So we use a "quota key" during lookups to calculate the quota.  So the
- * quota key for localStorage at http://foo.bar.com is "moc.rab.". */
-
-class nsDOMStorageDBWrapper
-{
-public:
-  nsDOMStorageDBWrapper();
-  ~nsDOMStorageDBWrapper();
-
-  /**
-   * Close the connections, finalizing all the cached statements.
-   */
-  void Close();
-
-  nsresult
-  Init();
-
-  /**
-   * Retrieve a list of all the keys associated with a particular domain.
-   */
-  nsresult
-  GetAllKeys(DOMStorageImpl* aStorage,
-             nsTHashtable<nsSessionStorageEntry>* aKeys);
-
-  /**
-   * Retrieve a value and secure flag for a key from storage.
-   *
-   * @throws NS_ERROR_DOM_NOT_FOUND_ERR if key not found
-   */
-  nsresult
-  GetKeyValue(DOMStorageImpl* aStorage,
-              const nsAString& aKey,
-              nsAString& aValue,
-              bool* aSecure);
-
-  /**
-   * Set the value and secure flag for a key in storage.
-   */
-  nsresult
-  SetKey(DOMStorageImpl* aStorage,
-         const nsAString& aKey,
-         const nsAString& aValue,
-         bool aSecure);
-
-  /**
-   * Set the secure flag for a key in storage. Does nothing if the key was
-   * not found.
-   */
-  nsresult
-  SetSecure(DOMStorageImpl* aStorage,
-            const nsAString& aKey,
-            const bool aSecure);
-
-  /**
-   * Removes a key from storage.
-   */
-  nsresult
-  RemoveKey(DOMStorageImpl* aStorage,
-            const nsAString& aKey);
-
-  /**
-    * Remove all keys belonging to this storage.
-    */
-  nsresult
-  ClearStorage(DOMStorageImpl* aStorage);
-
-  /**
-   * Drop session-only storage for a specific host and all it's subdomains
-   */
-  nsresult
-  DropSessionOnlyStoragesForHost(const nsACString& aHostName);
-
-  /**
-   * Drop everything we gathered to private browsing in-memory database
-   */
-  nsresult
-  DropPrivateBrowsingStorages();
-
-  /**
-   * Removes all keys added by a given domain.
-   */
-  nsresult
-  RemoveOwner(const nsACString& aOwner);
-
-  /**
-   * Removes all keys from storage. Used when clearing storage.
-   */
-  nsresult
-  RemoveAll();
-
-  /**
-   * Removes all keys from storage for a specific app.
-   * If aOnlyBrowserElement is true, it will remove only keys with the
-   * browserElement flag set.
-   * aAppId has to be a valid app id. It can't be NO_APP_ID or UNKNOWN_APP_ID.
-   */
-  nsresult
-  RemoveAllForApp(uint32_t aAppId, bool aOnlyBrowserElement);
-
-  /**
-    * Returns usage for a storage using its GetQuotaDBKey() as a key.
-    */
-  nsresult
-  GetUsage(DOMStorageImpl* aStorage, int32_t *aUsage);
-
-  /**
-    * Returns usage of the domain and optionaly by any subdomain.
-    */
-  nsresult
-  GetUsage(const nsACString& aDomain, int32_t *aUsage, bool aPrivate);
-
-  /**
-   * Marks the storage as "cached" after the DOMStorageImpl object has loaded
-   * all items to its memory copy of the entries - IsScopeDirty returns false
-   * after call of this method for this storage.
-   *
-   * When a key is changed or deleted in the storage, the storage scope is
-   * marked as "dirty" again and makes the DOMStorageImpl object recache its
-   * keys on next access, because IsScopeDirty returns true again.
-   */
-  void
-  MarkScopeCached(DOMStorageImpl* aStorage);
-
-  /**
-   * Test whether the storage for the scope (i.e. origin or host) has been
-   * changed since the last MarkScopeCached call.
-   */
-  bool
-  IsScopeDirty(DOMStorageImpl* aStorage);
-
-  /**
-    * Turns "http://foo.bar.com:80" to "moc.rab.oof.:http:80",
-    * i.e. reverses the host, appends a dot, appends the schema
-    * and a port number.
-    */
-  static nsresult CreateScopeDBKey(nsIPrincipal* aPrincipal, nsACString& aKey);
-
-  /**
-    * Turns "http://foo.bar.com" to "moc.rab.oof.",
-    * i.e. reverses the host and appends a dot.
-    */
-  static nsresult CreateReversedDomain(nsIURI* aUri, nsACString& aKey);
-  static nsresult CreateReversedDomain(const nsACString& aAsciiDomain, nsACString& aKey);
-
-  /**
-    * Turns "foo.bar.com" to "moc.rab.",
-    * i.e. extracts eTLD+1 from the host, reverses the result
-    * and appends a dot.
-    */
-  static nsresult CreateQuotaDBKey(nsIPrincipal* aPrincipal,
-                                   nsACString& aKey);
-
-  /**
-    * Turns "foo.bar.com" to "moc.rab.",
-    * i.e. extracts eTLD+1 from the host, reverses the result
-    * and appends a dot.
-    */
-  static nsresult CreateQuotaDBKey(const nsACString& aDomain,
-                                   nsACString& aKey)
-  {
-    return CreateReversedDomain(aDomain, aKey);
-  }
-
-  /**
-   * Ensures the cache flush timer is running. This is called when we add
-   * data that will need to be flushed.
-   */
-  void EnsureCacheFlushTimer();
-
-  /**
-   * Called by the timer or on shutdown/profile change to evict scopes
-   * that have not been used in a long time and to flush new data to disk.
-   */
-  nsresult FlushAndEvictFromCache(bool aIsShuttingDown);
-
-  /**
-   * Stops the cache flush timer.
-   */
-  void StopCacheFlushTimer();
-
-protected:
-  nsDOMStoragePersistentDB mPersistentDB;
-  nsDOMStorageMemoryDB mSessionOnlyDB;
-  nsDOMStorageMemoryDB mPrivateBrowsingDB;
-
-  nsCOMPtr<nsITimer> mCacheFlushTimer;
-};
-
-#endif /* nsDOMStorageDB_h___ */
diff --git a/dom/src/storage/nsDOMStorageMemoryDB.cpp b/dom/src/storage/nsDOMStorageMemoryDB.cpp
deleted file mode 100644
index 8c319cc4aa9d..000000000000
--- a/dom/src/storage/nsDOMStorageMemoryDB.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "nsCOMPtr.h"
-#include "nsError.h"
-#include "nsDOMStorage.h"
-#include "nsDOMStorageMemoryDB.h"
-#include "nsNetUtil.h"
-
-nsresult
-nsDOMStorageMemoryDB::Init(nsDOMStoragePersistentDB* aPreloadDB)
-{
-  mData.Init(20);
-
-  mPreloadDB = aPreloadDB;
-  return NS_OK;
-}
-
-static PLDHashOperator
-AllKeyEnum(nsSessionStorageEntry* aEntry, void* userArg)
-{
-  nsDOMStorageMemoryDB::nsStorageItemsTable *target =
-      (nsDOMStorageMemoryDB::nsStorageItemsTable *)userArg;
-
-  nsDOMStorageMemoryDB::nsInMemoryItem* item =
-      new nsDOMStorageMemoryDB::nsInMemoryItem();
-  if (!item)
-    return PL_DHASH_STOP;
-
-  aEntry->mItem->GetValue(item->mValue);
-  nsresult rv = aEntry->mItem->GetSecure(&item->mSecure);
-  if (NS_FAILED(rv))
-    item->mSecure = false;
-
-  target->Put(aEntry->GetKey(), item);
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-nsDOMStorageMemoryDB::GetItemsTable(DOMStorageImpl* aStorage,
-                                    nsInMemoryStorage** aMemoryStorage)
-{
-  if (mData.Get(aStorage->GetScopeDBKey(), aMemoryStorage))
-    return NS_OK;
-
-  *aMemoryStorage = nullptr;
-
-  nsInMemoryStorage* storageData = new nsInMemoryStorage();
-  if (!storageData)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  storageData->mTable.Init();
-
-  if (mPreloadDB) {
-    nsresult rv;
-
-    nsTHashtable<nsSessionStorageEntry> keys;
-    keys.Init();
-
-    rv = mPreloadDB->GetAllKeys(aStorage, &keys);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    mPreloading = true;
-    keys.EnumerateEntries(AllKeyEnum, &storageData->mTable);
-    mPreloading = false;
-  }
-
-  mData.Put(aStorage->GetScopeDBKey(), storageData);
-  *aMemoryStorage = storageData;
-
-  return NS_OK;
-}
-
-struct GetAllKeysEnumStruc
-{
-  nsTHashtable<nsSessionStorageEntry>* mTarget;
-  DOMStorageImpl* mStorage;
-};
-
-static PLDHashOperator
-GetAllKeysEnum(const nsAString& keyname,
-               nsDOMStorageMemoryDB::nsInMemoryItem* item,
-               void *closure)
-{
-  GetAllKeysEnumStruc* struc = (GetAllKeysEnumStruc*)closure;
-
-  nsSessionStorageEntry* entry = struc->mTarget->PutEntry(keyname);
-  if (!entry)
-    return PL_DHASH_STOP;
-
-  entry->mItem = new nsDOMStorageItem(struc->mStorage,
-                                      keyname,
-                                      EmptyString(),
-                                      item->mSecure);
-  if (!entry->mItem)
-    return PL_DHASH_STOP;
-
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-nsDOMStorageMemoryDB::GetAllKeys(DOMStorageImpl* aStorage,
-                                 nsTHashtable<nsSessionStorageEntry>* aKeys)
-{
-  nsresult rv;
-
-  nsInMemoryStorage* storage;
-  rv = GetItemsTable(aStorage, &storage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  GetAllKeysEnumStruc struc;
-  struc.mTarget = aKeys;
-  struc.mStorage = aStorage;
-  storage->mTable.EnumerateRead(GetAllKeysEnum, &struc);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageMemoryDB::GetKeyValue(DOMStorageImpl* aStorage,
-                                  const nsAString& aKey,
-                                  nsAString& aValue,
-                                  bool* aSecure)
-{
-  if (mPreloading) {
-    NS_PRECONDITION(mPreloadDB, "Must have a preload DB set when preloading");
-    return mPreloadDB->GetKeyValue(aStorage, aKey, aValue, aSecure);
-  }
-
-  nsresult rv;
-
-  nsInMemoryStorage* storage;
-  rv = GetItemsTable(aStorage, &storage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsInMemoryItem* item;
-  if (!storage->mTable.Get(aKey, &item))
-    return NS_ERROR_DOM_NOT_FOUND_ERR;
-
-  aValue = item->mValue;
-  *aSecure = item->mSecure;
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageMemoryDB::SetKey(DOMStorageImpl* aStorage,
-                             const nsAString& aKey,
-                             const nsAString& aValue,
-                             bool aSecure)
-{
-  nsresult rv;
-
-  nsInMemoryStorage* storage;
-  rv = GetItemsTable(aStorage, &storage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  int32_t usage = 0;
-  if (!aStorage->GetQuotaDBKey().IsEmpty()) {
-    rv = GetUsage(aStorage, &usage);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  usage += aKey.Length() + aValue.Length();
-
-  nsInMemoryItem* item;
-  if (!storage->mTable.Get(aKey, &item)) {
-    if (usage > GetQuota()) {
-      return NS_ERROR_DOM_QUOTA_REACHED;
-    }
-
-    item = new nsInMemoryItem();
-    if (!item)
-      return NS_ERROR_OUT_OF_MEMORY;
-
-    storage->mTable.Put(aKey, item);
-    storage->mUsageDelta += aKey.Length();
-  }
-  else
-  {
-    if (!aSecure && item->mSecure)
-      return NS_ERROR_DOM_SECURITY_ERR;
-    usage -= aKey.Length() + item->mValue.Length();
-    if (usage > GetQuota()) {
-      return NS_ERROR_DOM_QUOTA_REACHED;
-    }
-  }
-
-  storage->mUsageDelta += aValue.Length() - item->mValue.Length();
-
-  item->mValue = aValue;
-  item->mSecure = aSecure;
-
-  MarkScopeDirty(aStorage);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageMemoryDB::SetSecure(DOMStorageImpl* aStorage,
-                                const nsAString& aKey,
-                                const bool aSecure)
-{
-  nsresult rv;
-
-  nsInMemoryStorage* storage;
-  rv = GetItemsTable(aStorage, &storage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsInMemoryItem* item;
-  if (!storage->mTable.Get(aKey, &item))
-    return NS_ERROR_DOM_NOT_FOUND_ERR;
-
-  item->mSecure = aSecure;
-
-  MarkScopeDirty(aStorage);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageMemoryDB::RemoveKey(DOMStorageImpl* aStorage,
-                                const nsAString& aKey)
-{
-  nsresult rv;
-
-  nsInMemoryStorage* storage;
-  rv = GetItemsTable(aStorage, &storage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsInMemoryItem* item;
-  if (!storage->mTable.Get(aKey, &item))
-    return NS_ERROR_DOM_NOT_FOUND_ERR;
-
-  storage->mUsageDelta -= aKey.Length() + item->mValue.Length();
-  storage->mTable.Remove(aKey);
-
-  MarkScopeDirty(aStorage);
-
-  return NS_OK;
-}
-
-static PLDHashOperator
-RemoveAllKeysEnum(const nsAString& keyname,
-                  nsAutoPtr<nsDOMStorageMemoryDB::nsInMemoryItem>& item,
-                  void *closure)
-{
-  nsDOMStorageMemoryDB::nsInMemoryStorage* storage =
-      (nsDOMStorageMemoryDB::nsInMemoryStorage*)closure;
-
-  storage->mUsageDelta -= keyname.Length() + item->mValue.Length();
-  return PL_DHASH_REMOVE;
-}
-
-nsresult
-nsDOMStorageMemoryDB::ClearStorage(DOMStorageImpl* aStorage)
-{
-  nsresult rv;
-
-  nsInMemoryStorage* storage;
-  rv = GetItemsTable(aStorage, &storage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  storage->mTable.Enumerate(RemoveAllKeysEnum, storage);
-
-  MarkScopeDirty(aStorage);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageMemoryDB::DropStorage(DOMStorageImpl* aStorage)
-{
-  mData.Remove(aStorage->GetScopeDBKey());
-  MarkScopeDirty(aStorage);
-  return NS_OK;
-}
-
-struct RemoveOwnersStruc
-{
-  nsCString* mSubDomain;
-  bool mMatch;
-};
-
-static PLDHashOperator
-RemoveOwnersEnum(const nsACString& key,
-                 nsAutoPtr<nsDOMStorageMemoryDB::nsInMemoryStorage>& storage,
-                 void *closure)
-{
-  RemoveOwnersStruc* struc = (RemoveOwnersStruc*)closure;
-
-  if (StringBeginsWith(key, *(struc->mSubDomain)) == struc->mMatch)
-    return PL_DHASH_REMOVE;
-
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-nsDOMStorageMemoryDB::RemoveOwner(const nsACString& aOwner)
-{
-  nsAutoCString subdomainsDBKey;
-  nsDOMStorageDBWrapper::CreateReversedDomain(aOwner, subdomainsDBKey);
-
-  RemoveOwnersStruc struc;
-  struc.mSubDomain = &subdomainsDBKey;
-  struc.mMatch = true;
-  mData.Enumerate(RemoveOwnersEnum, &struc);
-
-  MarkAllScopesDirty();
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageMemoryDB::RemoveAll()
-{
-  mData.Clear(); // XXX Check this releases all instances
-
-  MarkAllScopesDirty();
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStorageMemoryDB::GetUsage(DOMStorageImpl* aStorage, int32_t *aUsage)
-{
-  return GetUsageInternal(aStorage->GetQuotaDBKey(), aUsage);
-}
-
-nsresult
-nsDOMStorageMemoryDB::GetUsage(const nsACString& aDomain,
-                               int32_t *aUsage)
-{
-  nsresult rv;
-
-  nsAutoCString quotaDBKey;
-  rv = nsDOMStorageDBWrapper::CreateQuotaDBKey(aDomain, quotaDBKey);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return GetUsageInternal(quotaDBKey, aUsage);
-}
-
-struct GetUsageEnumStruc
-{
-  int32_t mUsage;
-  nsCString mSubdomain;
-};
-
-static PLDHashOperator
-GetUsageEnum(const nsACString& key,
-             nsDOMStorageMemoryDB::nsInMemoryStorage* storageData,
-             void *closure)
-{
-  GetUsageEnumStruc* struc = (GetUsageEnumStruc*)closure;
-
-  if (StringBeginsWith(key, struc->mSubdomain)) {
-    struc->mUsage += storageData->mUsageDelta;
-  }
-
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-nsDOMStorageMemoryDB::GetUsageInternal(const nsACString& aQuotaDBKey,
-                                       int32_t *aUsage)
-{
-  GetUsageEnumStruc struc;
-  struc.mUsage = 0;
-  struc.mSubdomain = aQuotaDBKey;
-
-  if (mPreloadDB) {
-    nsresult rv;
-
-    rv = mPreloadDB->GetUsageInternal(aQuotaDBKey, &struc.mUsage);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  mData.EnumerateRead(GetUsageEnum, &struc);
-
-  *aUsage = struc.mUsage;
-  return NS_OK;
-}
diff --git a/dom/src/storage/nsDOMStorageMemoryDB.h b/dom/src/storage/nsDOMStorageMemoryDB.h
deleted file mode 100644
index da08ae2ea692..000000000000
--- a/dom/src/storage/nsDOMStorageMemoryDB.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef nsDOMStorageMemoryDB_h___
-#define nsDOMStorageMemoryDB_h___
-
-#include "nscore.h"
-#include "nsDOMStorageBaseDB.h"
-#include "nsClassHashtable.h"
-#include "nsDataHashtable.h"
-
-class nsDOMStoragePersistentDB;
-
-class nsDOMStorageMemoryDB : public nsDOMStorageBaseDB
-{
-public:
-  nsDOMStorageMemoryDB() : mPreloading(false) {}
-  ~nsDOMStorageMemoryDB() {}
-
-  class nsInMemoryItem
-  {
-  public:
-    bool mSecure;
-    nsString mValue;
-  };
-
-  typedef nsClassHashtable<nsStringHashKey, nsInMemoryItem> nsStorageItemsTable;
-
-  class nsInMemoryStorage
-  {
-  public:
-    nsStorageItemsTable mTable;
-    int32_t mUsageDelta;
-
-    nsInMemoryStorage() : mUsageDelta(0) {}
-  };
-
-  /**
-   * @param aPreloadDB
-   *    If non-null, data for a domain/origin will be preloaded from
-   *    the provided database. Used for session-only cookies mode to
-   *    provide existing data from the persistent database.
-   */
-  nsresult
-  Init(nsDOMStoragePersistentDB* aPreloadDB = nullptr);
-
-  /**
-   *
-   */
-  nsresult
-  GetItemsTable(DOMStorageImpl* aStorage,
-                nsInMemoryStorage** aMemoryStorage);
-
-  /**
-   * Retrieve a list of all the keys associated with a particular domain.
-   */
-  nsresult
-  GetAllKeys(DOMStorageImpl* aStorage,
-             nsTHashtable<nsSessionStorageEntry>* aKeys);
-
-  /**
-   * Retrieve a value and secure flag for a key from storage.
-   *
-   * @throws NS_ERROR_DOM_NOT_FOUND_ERR if key not found
-   */
-  nsresult
-  GetKeyValue(DOMStorageImpl* aStorage,
-              const nsAString& aKey,
-              nsAString& aValue,
-              bool* aSecure);
-
-  /**
-   * Set the value and secure flag for a key in storage.
-   */
-  nsresult
-  SetKey(DOMStorageImpl* aStorage,
-         const nsAString& aKey,
-         const nsAString& aValue,
-         bool aSecure);
-
-  /**
-   * Set the secure flag for a key in storage. Does nothing if the key was
-   * not found.
-   */
-  nsresult
-  SetSecure(DOMStorageImpl* aStorage,
-            const nsAString& aKey,
-            const bool aSecure);
-
-  /**
-   * Removes a key from storage.
-   */
-  nsresult
-  RemoveKey(DOMStorageImpl* aStorage,
-            const nsAString& aKey);
-
-  /**
-    * Remove all keys belonging to this storage.
-    */
-  nsresult
-  ClearStorage(DOMStorageImpl* aStorage);
-
-  /**
-   * If we have changed the persistent storage, drop any potential session storages
-   */
-  nsresult
-  DropStorage(DOMStorageImpl* aStorage);
-
-  /**
-   * Removes all keys added by a given domain.
-   */
-  nsresult
-  RemoveOwner(const nsACString& aOwner);
-
-  /**
-   * Removes all keys from storage. Used when clearing storage.
-   */
-  nsresult
-  RemoveAll();
-
-  /**
-    * Returns usage for a storage using its GetQuotaDBKey() as a key.
-    */
-  nsresult
-  GetUsage(DOMStorageImpl* aStorage, int32_t *aUsage);
-
-  /**
-    * Returns usage of the domain and optionaly by any subdomain.
-    */
-  nsresult
-  GetUsage(const nsACString& aDomain, int32_t *aUsage);
-
-protected:
-
-  nsClassHashtable<nsCStringHashKey, nsInMemoryStorage> mData;
-  nsDOMStoragePersistentDB* mPreloadDB;
-  bool mPreloading;
-
-  nsresult
-  GetUsageInternal(const nsACString& aQuotaDBKey, int32_t *aUsage);
-};
-
-#endif
diff --git a/dom/src/storage/nsDOMStoragePersistentDB.cpp b/dom/src/storage/nsDOMStoragePersistentDB.cpp
deleted file mode 100644
index 73169070ab1c..000000000000
--- a/dom/src/storage/nsDOMStoragePersistentDB.cpp
+++ /dev/null
@@ -1,1143 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "mozilla/Attributes.h"
-#include "mozilla/DebugOnly.h"
-
-#include "nsError.h"
-#include "nsDOMStorage.h"
-#include "nsDOMStorageDBWrapper.h"
-#include "nsDOMStoragePersistentDB.h"
-#include "nsIFile.h"
-#include "nsIVariant.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "mozStorageCID.h"
-#include "mozStorageHelper.h"
-#include "mozIStorageService.h"
-#include "mozIStorageBindingParamsArray.h"
-#include "mozIStorageBindingParams.h"
-#include "mozIStorageValueArray.h"
-#include "mozIStorageFunction.h"
-#include "nsNetUtil.h"
-#include "mozilla/Telemetry.h"
-#include "nsThreadUtils.h"
-
-#include "GeckoProfiler.h"
-
-using namespace mozilla;
-
-// Write Ahead Log's maximum size is 512KB
-#define MAX_WAL_SIZE_BYTES 512 * 1024
-
-namespace {
-
-/**
- * Notifier for asynchronous flushes
- */
-class FlushCallbackTask : public nsRunnable
-{
-public:
-  FlushCallbackTask(nsDOMStoragePersistentDB* aDB)
-    : mDB(aDB), mSuccess(true)
-  {}
-  NS_IMETHOD Run();
-  void SetFlushResult(bool aSucceeded)
-  {
-    MOZ_ASSERT(!NS_IsMainThread());
-    mSuccess = aSucceeded;
-  }
-private:
-  nsDOMStoragePersistentDB* mDB;
-  bool mSuccess;
-};
-
-/**
- * Task for off-main-thread flushes
- */
-class FlushTask : public nsRunnable {
-public:
-  FlushTask(nsDOMStoragePersistentDB* aDB, FlushCallbackTask* aCallback)
-    : mDB(aDB), mCallback(aCallback)
-  {}
-  NS_IMETHOD Run();
-private:
-  nsDOMStoragePersistentDB* mDB;
-  nsRefPtr<FlushCallbackTask> mCallback;
-};
-
-/**
- * The flush task runs on a helper thread to prevent main-thread jank.
- * It dispatches a completion notifier to the main thread.
- */
-nsresult
-FlushTask::Run()
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-
-  nsresult rv = mDB->Flush();
-  mCallback->SetFlushResult(NS_SUCCEEDED(rv));
-
-  // Dispatch a notification event to the main thread
-  rv = NS_DispatchToMainThread(mCallback, NS_DISPATCH_NORMAL);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-/**
- * FlushCallbackTask notifies the main thread of the results of
- * asynchronous flush operations
- */
-nsresult
-FlushCallbackTask::Run()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  mDB->HandleFlushComplete(mSuccess);
-  return NS_OK;
-}
-
-} // anonymous namespace
-
-nsresult
-nsDOMStoragePersistentDB::Flush()
-{
-  if (!mFlushStatements.Length()) {
-    return NS_OK;
-  }
-
-  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_TIMER_FLUSH_MS> timer;
-
-  // Make the flushes atomic
-  mozStorageTransaction transaction(mWriteConnection, false);
-
-  nsresult rv;
-  for (uint32_t i = 0; i < mFlushStatements.Length(); ++i) {
-    if (mFlushStatementParams[i]) {
-      rv = mFlushStatements[i]->BindParameters(mFlushStatementParams[i]);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-    rv = mFlushStatements[i]->Execute();
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  rv = transaction.Commit();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-/**
- * Succesful flushes clear the "pending" flags.
- * Failed flushes cause the scopes involved in the flush to be marked dirty.
- */
-void
-nsDOMStoragePersistentDB::HandleFlushComplete(bool aSucceeded)
-{
-  MOZ_ASSERT(mIsFlushPending);
-
-  if (aSucceeded) {
-    mCache.MarkScopesFlushed();
-  } else {
-    mCache.MarkFlushFailed();
-    mWasRemoveAllCalled |= mIsRemoveAllPending;
-  }
-
-  mIsRemoveAllPending = false;
-  mIsFlushPending = false;
-  mFlushStatements.Clear();
-  mFlushStatementParams.Clear();
-}
-
-class nsReverseStringSQLFunction MOZ_FINAL : public mozIStorageFunction
-{
-  NS_DECL_ISUPPORTS
-  NS_DECL_MOZISTORAGEFUNCTION
-};
-
-NS_IMPL_ISUPPORTS1(nsReverseStringSQLFunction, mozIStorageFunction)
-
-NS_IMETHODIMP
-nsReverseStringSQLFunction::OnFunctionCall(
-    mozIStorageValueArray *aFunctionArguments, nsIVariant **aResult)
-{
-  nsAutoCString stringToReverse;
-  nsresult rv = aFunctionArguments->GetUTF8String(0, stringToReverse);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoCString result;
-  ReverseString(stringToReverse, result);
-
-  nsCOMPtr<nsIWritableVariant> outVar(do_CreateInstance(
-      NS_VARIANT_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = outVar->SetAsAUTF8String(result);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  *aResult = outVar.get();
-  outVar.forget();
-  return NS_OK;
-}
-
-nsDOMStoragePersistentDB::nsDOMStoragePersistentDB()
-: mReadStatements(mReadConnection), mWriteStatements(mWriteConnection),
-  mWasRemoveAllCalled(false), mIsRemoveAllPending(false), mIsFlushPending(false)
-{
-  mQuotaUseByUncached.Init(16);
-}
-
-nsresult
-nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
-{
-  nsCOMPtr<nsIFile> storageFile;
-  nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                                       getter_AddRefs(storageFile));
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = storageFile->Append(aDatabaseName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<mozIStorageService> service;
-
-  service = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = service->OpenUnsharedDatabase(storageFile, getter_AddRefs(mWriteConnection));
-  if (rv == NS_ERROR_FILE_CORRUPTED) {
-    // delete the db and try opening again
-    rv = storageFile->Remove(false);
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = service->OpenUnsharedDatabase(storageFile, getter_AddRefs(mWriteConnection));
-  }
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // First try setting the DB's journal to WAL mode.
-  // WAL mode allows reads from the main thread to be concurrent with writes
-  // from the helper thread.
-  //
-  // Side note: The default sync mode for the DB is 'FULL' -- fsyncs after every
-  // transaction commit (very reliable).
-  if (NS_SUCCEEDED(SetJournalMode(true))) {
-    // Spawn helper thread
-    rv = ::NS_NewNamedThread("DOM Storage", getter_AddRefs(mFlushThread));
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = ConfigureWalBehavior();
-    NS_ENSURE_SUCCESS(rv, rv);
-  } else {
-    // Shared-memory WAL might not be supported on this platform, so fall back
-    // to truncate mode and reads+writes on the main thread.
-    rv = SetJournalMode(false);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  // Create a read-only clone
-  (void)mWriteConnection->Clone(true, getter_AddRefs(mReadConnection));
-  NS_ENSURE_TRUE(mReadConnection, NS_ERROR_FAILURE);
-
-  mozStorageTransaction transaction(mWriteConnection, false);
-
-  // Ensure Gecko 1.9.1 storage table
-  rv = mWriteConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-         "CREATE TABLE IF NOT EXISTS webappsstore2 ("
-         "scope TEXT, "
-         "key TEXT, "
-         "value TEXT, "
-         "secure INTEGER, "
-         "owner TEXT)"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mWriteConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-        "CREATE UNIQUE INDEX IF NOT EXISTS scope_key_index"
-        " ON webappsstore2(scope, key)"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<mozIStorageFunction> function1(new nsReverseStringSQLFunction());
-  NS_ENSURE_TRUE(function1, NS_ERROR_OUT_OF_MEMORY);
-
-  rv = mWriteConnection->CreateFunction(NS_LITERAL_CSTRING("REVERSESTRING"), 1, function1);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Check if there is storage of Gecko 1.9.0 and if so, upgrade that storage
-  // to actual webappsstore2 table and drop the obsolete table. First process
-  // this newer table upgrade to priority potential duplicates from older
-  // storage table.
-  bool exists;
-  rv = mWriteConnection->TableExists(NS_LITERAL_CSTRING("webappsstore"),
-                                     &exists);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (exists) {
-      rv = mWriteConnection->ExecuteSimpleSQL(
-             NS_LITERAL_CSTRING("INSERT OR IGNORE INTO "
-                                "webappsstore2(scope, key, value, secure, owner) "
-                                "SELECT REVERSESTRING(domain) || '.:', key, value, secure, owner "
-                                "FROM webappsstore"));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      rv = mWriteConnection->ExecuteSimpleSQL(
-             NS_LITERAL_CSTRING("DROP TABLE webappsstore"));
-      NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  // Check if there is storage of Gecko 1.8 and if so, upgrade that storage
-  // to actual webappsstore2 table and drop the obsolete table. Potential
-  // duplicates will be ignored.
-  rv = mWriteConnection->TableExists(NS_LITERAL_CSTRING("moz_webappsstore"),
-                                     &exists);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (exists) {
-      rv = mWriteConnection->ExecuteSimpleSQL(
-             NS_LITERAL_CSTRING("INSERT OR IGNORE INTO "
-                                "webappsstore2(scope, key, value, secure, owner) "
-                                "SELECT REVERSESTRING(domain) || '.:', key, value, secure, domain "
-                                "FROM moz_webappsstore"));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      rv = mWriteConnection->ExecuteSimpleSQL(
-             NS_LITERAL_CSTRING("DROP TABLE moz_webappsstore"));
-      NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  rv = transaction.Commit();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::SetJournalMode(bool aIsWal)
-{
-  nsAutoCString stmtString(
-    MOZ_STORAGE_UNIQUIFY_QUERY_STR "PRAGMA journal_mode = ");
-  if (aIsWal) {
-    stmtString.AppendLiteral("wal");
-  } else {
-    stmtString.AppendLiteral("truncate");
-  }
-
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mWriteConnection->CreateStatement(stmtString, getter_AddRefs(stmt));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool hasResult = false;
-  rv = stmt->ExecuteStep(&hasResult);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!hasResult) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsAutoCString journalMode;
-  rv = stmt->GetUTF8String(0, journalMode);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if ((aIsWal && !journalMode.EqualsLiteral("wal")) ||
-      (!aIsWal && !journalMode.EqualsLiteral("truncate"))) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::ConfigureWalBehavior()
-{
-  // Get the DB's page size
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mWriteConnection->CreateStatement(NS_LITERAL_CSTRING(
-    MOZ_STORAGE_UNIQUIFY_QUERY_STR "PRAGMA page_size"
-  ), getter_AddRefs(stmt));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool hasResult = false;
-  rv = stmt->ExecuteStep(&hasResult);
-  NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && hasResult, NS_ERROR_FAILURE);
-
-  int32_t pageSize = 0;
-  rv = stmt->GetInt32(0, &pageSize);
-  NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && pageSize > 0, NS_ERROR_UNEXPECTED);
-
-  // Set the threshold for auto-checkpointing the WAL.
-  // We don't want giant logs slowing down reads & shutdown.
-  int32_t thresholdInPages = static_cast<int32_t>(MAX_WAL_SIZE_BYTES / pageSize);
-  nsAutoCString thresholdPragma("PRAGMA wal_autocheckpoint = ");
-  thresholdPragma.AppendInt(thresholdInPages);
-  rv = mWriteConnection->ExecuteSimpleSQL(thresholdPragma);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Set the maximum WAL log size to reduce footprint on mobile (large empty
-  // WAL files will be truncated)
-  nsAutoCString journalSizePragma("PRAGMA journal_size_limit = ");
-  // bug 600307: mak recommends setting this to 3 times the auto-checkpoint threshold
-  journalSizePragma.AppendInt(MAX_WAL_SIZE_BYTES * 3);
-  rv = mWriteConnection->ExecuteSimpleSQL(journalSizePragma);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-void
-nsDOMStoragePersistentDB::Close()
-{
-  if (mFlushThread) {
-    mFlushThread->Shutdown();
-    mFlushThread = nullptr;
-  }
-
-  mFlushStatements.Clear();
-  mFlushStatementParams.Clear();
-  mReadStatements.FinalizeStatements();
-  mWriteStatements.FinalizeStatements();
-  mReadConnection->Close();
-  mWriteConnection->Close();
-
-  // The cache has already been force-flushed
-  DOMStorageImpl::gStorageDB->StopCacheFlushTimer();
-}
-
-bool
-nsDOMStoragePersistentDB::IsFlushTimerNeeded() const
-{
-  // We need the flush timer to evict unused scopes, flush changes
-  // and retry failed flushes.
-  return (mCache.Count() > 0 ||
-          mWasRemoveAllCalled || mIsRemoveAllPending ||
-          mIsFlushPending);
-}
-
-nsresult
-nsDOMStoragePersistentDB::FetchScope(DOMStorageImpl* aStorage,
-                                     nsScopeCache* aScopeCache)
-{
-  if (mWasRemoveAllCalled || mIsRemoveAllPending) {
-    return NS_OK;
-  }
-
-  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_FETCH_DOMAIN_MS> timer;
-
-  // Get the keys for the requested scope
-  nsCOMPtr<mozIStorageStatement> keysStmt = mReadStatements.GetCachedStatement(
-    "SELECT key, value, secure FROM webappsstore2"
-    " WHERE scope = :scopeKey"
-  );
-  NS_ENSURE_STATE(keysStmt);
-  mozStorageStatementScoper scope(keysStmt);
-
-  nsresult rv = keysStmt->BindUTF8StringByName(NS_LITERAL_CSTRING("scopeKey"),
-                                               aStorage->GetScopeDBKey());
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool exists;
-  while (NS_SUCCEEDED(rv = keysStmt->ExecuteStep(&exists)) && exists) {
-    nsAutoString key;
-    rv = keysStmt->GetString(0, key);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsAutoString value;
-    rv = keysStmt->GetString(1, value);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    int32_t secureInt = 0;
-    rv = keysStmt->GetInt32(2, &secureInt);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = aScopeCache->AddEntry(key, value, !!secureInt);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::EnsureScopeLoaded(DOMStorageImpl* aStorage)
-{
-  nsScopeCache* scopeCache = mCache.GetScope(aStorage->GetScopeDBKey());
-  if (scopeCache) {
-    return NS_OK;
-  }
-
-  scopeCache = new nsScopeCache();
-  nsresult rv = FetchScope(aStorage, scopeCache);
-  if (NS_FAILED(rv)) {
-    delete scopeCache;
-    return rv;
-  }
-  mCache.AddScope(aStorage->GetScopeDBKey(), scopeCache);
-
-  // Update amount of quota used by uncached data
-  nsAutoCString quotaKey(aStorage->GetQuotaDBKey());
-  int32_t uncachedSizeOnDisk = 0;
-  if (!quotaKey.IsEmpty() &&
-      mQuotaUseByUncached.Get(quotaKey, &uncachedSizeOnDisk)) {
-    uncachedSizeOnDisk -= scopeCache->GetQuotaUsage();
-    MOZ_ASSERT(uncachedSizeOnDisk >= 0);
-    mQuotaUseByUncached.Put(quotaKey, uncachedSizeOnDisk);
-  }
-
-  DOMStorageImpl::gStorageDB->EnsureCacheFlushTimer();
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::EnsureQuotaUsageLoaded(const nsACString& aQuotaKey)
-{
-  if (aQuotaKey.IsEmpty() || mQuotaUseByUncached.Get(aQuotaKey, nullptr)) {
-    return NS_OK;
-  } else if (mWasRemoveAllCalled || mIsRemoveAllPending) {
-    mQuotaUseByUncached.Put(aQuotaKey, 0);
-    return NS_OK;
-  }
-
-  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_FETCH_QUOTA_USE_MS> timer;
-
-  // Fetch information about all the scopes belonging to this site
-  nsCOMPtr<mozIStorageStatement> stmt;
-  stmt = mReadStatements.GetCachedStatement(
-    "SELECT scope, SUM(LENGTH(key) + LENGTH(value)) "
-    "FROM ( "
-      "SELECT scope, key, value FROM webappsstore2 "
-      "WHERE scope LIKE :quotaKey"
-    ") "
-    "GROUP BY scope"
-  );
-  NS_ENSURE_STATE(stmt);
-  mozStorageStatementScoper scope(stmt);
-
-  nsresult rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("quotaKey"),
-                                           aQuotaKey + NS_LITERAL_CSTRING("%"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  int32_t uncachedSize = 0;
-  bool exists;
-  while (NS_SUCCEEDED(rv = stmt->ExecuteStep(&exists)) && exists) {
-    nsAutoCString scopeName;
-    rv = stmt->GetUTF8String(0, scopeName);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    int32_t quotaUsage;
-    rv = stmt->GetInt32(1, &quotaUsage);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (!mCache.IsScopeCached(scopeName)) {
-      uncachedSize += quotaUsage;
-    }
-  }
-  mQuotaUseByUncached.Put(aQuotaKey, uncachedSize);
-  return NS_OK;
-}
-
-struct UpdateQuotaEnumData
-{
-  nsCString& mEvictedScope;
-  int32_t mEvictedSize;
-};
-
-static PLDHashOperator
-UpdateQuotaEnum(const nsACString& aQuotaKey,
-                int32_t& aUncachedSize,
-                void* aParams)
-{
-  UpdateQuotaEnumData* data = static_cast<UpdateQuotaEnumData*>(aParams);
-  if (StringBeginsWith(data->mEvictedScope, aQuotaKey)) {
-    aUncachedSize += data->mEvictedSize;
-    return PL_DHASH_STOP;
-  }
-  return PL_DHASH_NEXT;
-}
-
-void
-nsDOMStoragePersistentDB::EvictUnusedScopes()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  nsTArray<nsCString> evictedScopes;
-  nsTArray<int32_t> evictedSize;
-  mCache.EvictScopes(evictedScopes, evictedSize);
-
-  // Update quota use numbers
-  for (uint32_t i = 0; i < evictedScopes.Length(); ++i) {
-    UpdateQuotaEnumData data = { evictedScopes[i], evictedSize[i] };
-    mQuotaUseByUncached.Enumerate(UpdateQuotaEnum, &data);
-  }
-}
-
-/**
- * These helper methods bind flush data to SQL statements.
- */
-namespace {
-
-nsresult
-BindScope(mozIStorageStatement* aStmt,
-          const nsACString& aScopeName,
-          mozIStorageBindingParamsArray** aParamArray)
-{
-  nsCOMPtr<mozIStorageBindingParamsArray> paramArray;
-  aStmt->NewBindingParamsArray(getter_AddRefs(paramArray));
-
-  nsCOMPtr<mozIStorageBindingParams> params;
-  paramArray->NewBindingParams(getter_AddRefs(params));
-
-  nsresult rv = params->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
-                                             aScopeName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = paramArray->AddParams(params);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  paramArray.forget(aParamArray);
-
-  return NS_OK;
-}
-
-nsresult
-BindScopeAndKey(mozIStorageStatement* aStmt,
-                const nsACString& aScopeName,
-                const nsAString& aKey,
-                mozIStorageBindingParamsArray** aParamArray)
-{
-  nsCOMPtr<mozIStorageBindingParamsArray> paramArray;
-  aStmt->NewBindingParamsArray(getter_AddRefs(paramArray));
-
-  nsCOMPtr<mozIStorageBindingParams> params;
-  paramArray->NewBindingParams(getter_AddRefs(params));
-
-  nsresult rv = params->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
-                                             aScopeName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = params->BindStringByName(NS_LITERAL_CSTRING("key"),
-                                aKey);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = paramArray->AddParams(params);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  paramArray.forget(aParamArray);
-
-  return NS_OK;
-}
-
-nsresult
-BindInsertKey(mozIStorageStatement* aStmt,
-              const nsACString& aScopeName,
-              const nsAString& aKey,
-              const nsScopeCache::KeyEntry* aEntry,
-              mozIStorageBindingParamsArray** aParamArray)
-{
-  nsCOMPtr<mozIStorageBindingParamsArray> paramArray;
-  aStmt->NewBindingParamsArray(getter_AddRefs(paramArray));
-
-  nsCOMPtr<mozIStorageBindingParams> params;
-  paramArray->NewBindingParams(getter_AddRefs(params));
-
-  nsresult rv = params->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
-                                             aScopeName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = params->BindStringByName(NS_LITERAL_CSTRING("key"),
-                                aKey);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = params->BindStringByName(NS_LITERAL_CSTRING("value"),
-                                aEntry->mValue);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = params->BindInt32ByName(NS_LITERAL_CSTRING("secure"),
-                               aEntry->mIsSecure ? 1 : 0);
-
-  rv = paramArray->AddParams(params);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  paramArray.forget(aParamArray);
-
-  return NS_OK;
-}
-
-} // anonymous namespace (for binding helper functions)
-
-nsresult
-nsDOMStoragePersistentDB::PrepareFlushStatements(const FlushData& aDirtyData)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  mFlushStatements.Clear();
-  mFlushStatementParams.Clear();
-
-  nsCOMPtr<mozIStorageStatement> removeAllStmt = mWriteStatements.GetCachedStatement(
-    NS_LITERAL_CSTRING("DELETE FROM webappsstore2"));
-  NS_ENSURE_STATE(removeAllStmt);
-
-  nsCOMPtr<mozIStorageStatement> deleteScopeStmt = mWriteStatements.GetCachedStatement(
-    NS_LITERAL_CSTRING("DELETE FROM webappsstore2"
-                       " WHERE scope = :scope"));
-  NS_ENSURE_STATE(deleteScopeStmt);
-
-  nsCOMPtr<mozIStorageStatement> deleteKeyStmt = mWriteStatements.GetCachedStatement(
-    NS_LITERAL_CSTRING("DELETE FROM webappsstore2"
-                       " WHERE scope = :scope AND key = :key"));
-  NS_ENSURE_STATE(deleteKeyStmt);
-
-  nsCOMPtr<mozIStorageStatement> insertKeyStmt = mWriteStatements.GetCachedStatement(
-    NS_LITERAL_CSTRING("INSERT OR REPLACE INTO webappsstore2 (scope, key, value, secure)"
-                       " VALUES (:scope, :key, :value, :secure)"));
-  NS_ENSURE_STATE(insertKeyStmt);
-
-  nsCOMPtr<mozIStorageBindingParamsArray> tempArray;
-  const size_t dirtyScopeCount = aDirtyData.mScopeNames.Length();
-
-  // Clear all of disk storage if RemoveAll was called
-  if (mWasRemoveAllCalled) {
-    mFlushStatements.AppendElement(removeAllStmt);
-    tempArray = nullptr;
-    mFlushStatementParams.AppendElement(tempArray);
-  }
-
-  // A delete of the entire LocalStorage is a super-set of lesser deletes
-  if (!mWasRemoveAllCalled) {
-    // Delete individual scopes
-    nsresult rv;
-    for (uint32_t i = 0; i < dirtyScopeCount; ++i) {
-      if (aDirtyData.mChanged[i].mWasDeleted) {
-        rv = BindScope(deleteScopeStmt,
-                       aDirtyData.mScopeNames[i],
-                       getter_AddRefs(tempArray));
-        NS_ENSURE_SUCCESS(rv, rv);
-        mFlushStatements.AppendElement(deleteScopeStmt);
-        mFlushStatementParams.AppendElement(tempArray);
-      }
-    }
-
-    // Check if any deleted keys need to be flushed
-    for (uint32_t i = 0; i < dirtyScopeCount; ++i) {
-      const nsTArray<nsString>& deleted = *(aDirtyData.mChanged[i].mDeletedKeys);
-      size_t deletedKeyCount = deleted.Length();
-      for (uint32_t j = 0; j < deletedKeyCount; ++j) {
-        rv = BindScopeAndKey(deleteKeyStmt,
-                             aDirtyData.mScopeNames[i],
-                             deleted[j],
-                             getter_AddRefs(tempArray));
-        NS_ENSURE_SUCCESS(rv, rv);
-        mFlushStatements.AppendElement(deleteKeyStmt);
-        mFlushStatementParams.AppendElement(tempArray);
-      }
-    }
-  }
-
-  // Check for dirty keys to flush
-  for (uint32_t i = 0; i < dirtyScopeCount; ++i) {
-    const nsTArray<nsString>& dirtyKeys = aDirtyData.mChanged[i].mDirtyKeys;
-    const nsTArray<nsScopeCache::KeyEntry*>& dirtyValues =
-      aDirtyData.mChanged[i].mDirtyValues;
-    size_t dirtyKeyCount = dirtyKeys.Length();
-    for (uint32_t j = 0; j < dirtyKeyCount; ++j) {
-      nsresult rv = BindInsertKey(insertKeyStmt,
-                                  aDirtyData.mScopeNames[i],
-                                  dirtyKeys[j],
-                                  dirtyValues[j],
-                                  getter_AddRefs(tempArray));
-      NS_ENSURE_SUCCESS(rv, rv);
-      mFlushStatements.AppendElement(insertKeyStmt);
-      mFlushStatementParams.AppendElement(tempArray);
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::PrepareForFlush()
-{
-  // Get data to be flushed
-  FlushData dirtyData;
-  mCache.GetFlushData(&dirtyData);
-  if (!dirtyData.mChanged.Length() && !mWasRemoveAllCalled) {
-    return NS_OK;
-  }
-
-  // Convert the dirty data to SQL statements and parameters
-  nsresult rv = PrepareFlushStatements(dirtyData);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Mark the dirty scopes as being flushed
-  // i.e. clear dirty flags and set pending flag
-  mCache.MarkScopesPending();
-  mIsRemoveAllPending = mWasRemoveAllCalled;
-  mWasRemoveAllCalled = false;
-  mIsFlushPending = true;
-
-  return NS_OK;
-}
-
-/**
- * Flushes dirty data and evicts unused scopes.
- * This is the top-level method called by timer & shutdown code.
- */
-nsresult
-nsDOMStoragePersistentDB::FlushAndEvictFromCache(bool aIsShuttingDown)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  // Evict any scopes that were idle for more than the maximum idle time
-  EvictUnusedScopes();
-
-  // Don't flush again if there is a flush outstanding, except on shutdown
-  if (mIsFlushPending && !aIsShuttingDown) {
-    return NS_OK;
-  }
-
-  if (mFlushThread && aIsShuttingDown && mIsFlushPending) {
-    // Wait for the helper thread to finish flushing
-    // This will spin the event loop and cause the callback event to be
-    // handled on the main thread.
-    mFlushThread->Shutdown();
-    mFlushThread = nullptr;
-
-    // Get any remaining uncommitted data and flush it synchronously
-    nsresult rv = PrepareForFlush();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // The helper thread is guaranteed to not be using the DB at this point
-    // as the flush thread has been shut down.
-    rv = Flush();
-    NS_ENSURE_SUCCESS(rv, rv);
-  } else if (mFlushThread && !aIsShuttingDown) {
-    // Perform a regular flush on the helper thread
-    nsresult rv = PrepareForFlush();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // If no dirty data found, just return
-    if (!mIsFlushPending) {
-      return NS_OK;
-    }
-
-    // Allocate objects before async operations begin in case of OOM
-    nsRefPtr<FlushCallbackTask> callbackTask = new FlushCallbackTask(this);
-    nsRefPtr<FlushTask> flushTask = new FlushTask(this, callbackTask);
-
-    rv = mFlushThread->Dispatch(flushTask, NS_DISPATCH_NORMAL);
-    if (NS_FAILED(rv)) {
-      // Very unlikely error case
-      HandleFlushComplete(false);
-    }
-  } else {
-    // Two scenarios lead to flushing on the main thread:
-    // 1) WAL mode unsupported by DB, preventing reads concurrent with writes
-    // OR
-    // 2) This is the last flush before exit and no other flushes are pending
-    nsresult rv = PrepareForFlush();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // If no dirty data found, just return
-    if (!mIsFlushPending) {
-      return NS_OK;
-    }
-
-    rv = Flush();
-    HandleFlushComplete(NS_SUCCEEDED(rv));
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::GetAllKeys(DOMStorageImpl* aStorage,
-                                     nsTHashtable<nsSessionStorageEntry>* aKeys)
-{
-  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_GETALLKEYS_MS> timer;
-
-  nsresult rv = EnsureScopeLoaded(aStorage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsScopeCache* scopeCache = mCache.GetScope(aStorage->GetScopeDBKey());
-  MOZ_ASSERT(scopeCache);
-  rv = scopeCache->GetAllKeys(aStorage, aKeys);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::GetKeyValue(DOMStorageImpl* aStorage,
-                                      const nsAString& aKey,
-                                      nsAString& aValue,
-                                      bool* aSecure)
-{
-  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_GETVALUE_MS> timer;
-  PROFILER_LABEL("nsDOMStoragePersistentDB", "GetKeyValue");
-
-  nsresult rv = EnsureScopeLoaded(aStorage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsScopeCache* scopeCache = mCache.GetScope(aStorage->GetScopeDBKey());
-  MOZ_ASSERT(scopeCache);
-  if (scopeCache->GetKey(aKey, aValue, aSecure)) {
-    return NS_OK;
-  } else {
-    return NS_ERROR_DOM_NOT_FOUND_ERR;
-  }
-}
-
-nsresult
-nsDOMStoragePersistentDB::SetKey(DOMStorageImpl* aStorage,
-                                 const nsAString& aKey,
-                                 const nsAString& aValue,
-                                 bool aSecure)
-{
-  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_SETVALUE_MS> timer;
-
-  nsresult rv = EnsureScopeLoaded(aStorage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  int32_t usage = 0;
-  if (!aStorage->GetQuotaDBKey().IsEmpty()) {
-    rv = GetUsage(aStorage, &usage);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  usage += aKey.Length() + aValue.Length();
-
-  nsScopeCache* scopeCache = mCache.GetScope(aStorage->GetScopeDBKey());
-  MOZ_ASSERT(scopeCache);
-
-  nsAutoString previousValue;
-  bool secure;
-  bool keyExists = scopeCache->GetKey(aKey, previousValue, &secure);
-  if (keyExists) {
-    if (!aSecure && secure) {
-      return NS_ERROR_DOM_SECURITY_ERR;
-    }
-    usage -= aKey.Length() + previousValue.Length();
-  }
-
-  if (usage > GetQuota()) {
-    return NS_ERROR_DOM_QUOTA_REACHED;
-  }
-
-  rv = scopeCache->SetKey(aKey, aValue, aSecure);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  MarkScopeDirty(aStorage);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::SetSecure(DOMStorageImpl* aStorage,
-                                    const nsAString& aKey,
-                                    const bool aSecure)
-{
-  nsresult rv = EnsureScopeLoaded(aStorage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsScopeCache* scopeCache = mCache.GetScope(aStorage->GetScopeDBKey());
-  MOZ_ASSERT(scopeCache);
-
-  scopeCache->SetSecure(aKey, aSecure);
-
-  MarkScopeDirty(aStorage);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::RemoveKey(DOMStorageImpl* aStorage,
-                                    const nsAString& aKey)
-{
-  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_REMOVEKEY_MS> timer;
-
-  nsresult rv = EnsureScopeLoaded(aStorage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsScopeCache* scopeCache = mCache.GetScope(aStorage->GetScopeDBKey());
-  MOZ_ASSERT(scopeCache);
-
-  scopeCache->RemoveKey(aKey);
-
-  MarkScopeDirty(aStorage);
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::ClearStorage(DOMStorageImpl* aStorage)
-{
-  nsAutoCString scopeKey(aStorage->GetScopeDBKey());
-  nsAutoCString quotaKey(aStorage->GetQuotaDBKey());
-
-  // Invalidate the SITE's quota use if this SCOPE wasn't cached;
-  // we don't know the size of the scope we're deleting from disk
-  bool isScopeCached = mCache.IsScopeCached(scopeKey);
-
-  int32_t usage;
-  bool isSiteUsageCached = !quotaKey.IsEmpty() &&
-                           mQuotaUseByUncached.Get(quotaKey, &usage);
-
-  if (!isScopeCached && isSiteUsageCached) {
-    mQuotaUseByUncached.Remove(quotaKey);
-  }
-
-  nsScopeCache* scopeCache = mCache.GetScope(scopeKey);
-  if (!scopeCache) {
-    // Ensure there is a dirty scope that will remove this data from disk
-    scopeCache = new nsScopeCache();
-    mCache.AddScope(scopeKey, scopeCache);
-    DOMStorageImpl::gStorageDB->EnsureCacheFlushTimer();
-  }
-
-  // Mark scope deleted in the cache
-  scopeCache->DeleteScope();
-
-  MarkScopeDirty(aStorage);
-
-  return NS_OK;
-}
-
-static PLDHashOperator
-InvalidateMatchingQuotaEnum(const nsACString& aQuotaKey,
-                            int32_t&,
-                            void* aPattern)
-{
-  const nsACString* pattern = static_cast<nsACString*>(aPattern);
-  if (StringBeginsWith(*pattern, aQuotaKey)) {
-    return PL_DHASH_REMOVE;
-  } else {
-    return PL_DHASH_NEXT;
-  }
-}
-
-nsresult
-nsDOMStoragePersistentDB::FetchMatchingScopeNames(const nsACString& aPattern)
-{
-  nsCOMPtr<mozIStorageStatement> stmt = mReadStatements.GetCachedStatement(
-    "SELECT DISTINCT(scope) FROM webappsstore2"
-    " WHERE scope LIKE :scope"
-  );
-  NS_ENSURE_STATE(stmt);
-  mozStorageStatementScoper scope(stmt);
-
-  nsresult rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("scope"),
-                                           aPattern + NS_LITERAL_CSTRING("%"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool exists;
-  while (NS_SUCCEEDED(rv = stmt->ExecuteStep(&exists)) && exists) {
-    nsAutoCString scopeName;
-    rv = stmt->GetUTF8String(0, scopeName);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsScopeCache* scopeCache = mCache.GetScope(scopeName);
-    if (!scopeCache) {
-      scopeCache = new nsScopeCache();
-      mCache.AddScope(scopeName, scopeCache);
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::RemoveOwner(const nsACString& aOwner)
-{
-  nsAutoCString subdomainsDBKey;
-  nsDOMStorageDBWrapper::CreateReversedDomain(aOwner, subdomainsDBKey);
-
-  // Find matching scopes on disk first and set up placeholders
-  // for them in the cache
-  nsresult rv = FetchMatchingScopeNames(subdomainsDBKey);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Remove any matching scopes from cache
-  mCache.MarkMatchingScopesDeleted(subdomainsDBKey);
-
-  // Remove quota info, it may no longer be valid
-  mQuotaUseByUncached.Enumerate(InvalidateMatchingQuotaEnum, &subdomainsDBKey);
-
-  MarkAllScopesDirty();
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::RemoveAllForApp(uint32_t aAppId, bool aOnlyBrowserElement)
-{
-  nsAutoCString appIdString;
-  appIdString.AppendInt(aAppId);
-
-  nsAutoCString scopePattern = appIdString;
-  if (aOnlyBrowserElement) {
-    scopePattern.AppendLiteral(":t:");
-  } else {
-    scopePattern.AppendLiteral(":_:");
-  }
-
-  // Find matching scopes on disk first and create placeholders for them
-  // in the cache
-  nsresult rv = FetchMatchingScopeNames(scopePattern);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Remove any matching scopes from the cache that were not on disk
-  scopePattern = appIdString;
-  if (aOnlyBrowserElement) {
-    scopePattern.AppendLiteral(":t:");
-  } else {
-    scopePattern.AppendLiteral(":");
-  }
-  mCache.MarkMatchingScopesDeleted(scopePattern);
-
-  // Remove quota info, it may no longer be valid
-  mQuotaUseByUncached.Enumerate(InvalidateMatchingQuotaEnum, &scopePattern);
-
-  MarkAllScopesDirty();
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::RemoveAll()
-{
-  Telemetry::AutoTimer<Telemetry::LOCALDOMSTORAGE_REMOVEALL_MS> timer;
-
-  mCache.ForgetAllScopes();
-  mQuotaUseByUncached.Clear();
-  mWasRemoveAllCalled = true;
-
-  MarkAllScopesDirty();
-
-  DOMStorageImpl::gStorageDB->EnsureCacheFlushTimer();
-
-  return NS_OK;
-}
-
-nsresult
-nsDOMStoragePersistentDB::GetUsage(DOMStorageImpl* aStorage,
-                                   int32_t *aUsage)
-{
-  return GetUsageInternal(aStorage->GetQuotaDBKey(), aUsage);
-}
-
-nsresult
-nsDOMStoragePersistentDB::GetUsage(const nsACString& aDomain,
-                                   int32_t *aUsage)
-{
-  nsAutoCString quotaKey;
-  nsresult rv = nsDOMStorageDBWrapper::CreateQuotaDBKey(aDomain, quotaKey);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return GetUsageInternal(quotaKey, aUsage);
-}
-
-nsresult
-nsDOMStoragePersistentDB::GetUsageInternal(const nsACString& aQuotaKey,
-                                           int32_t *aUsage)
-{
-  nsresult rv = EnsureQuotaUsageLoaded(aQuotaKey);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  int32_t uncachedSize = 0;
-  DebugOnly<bool> found = mQuotaUseByUncached.Get(aQuotaKey, &uncachedSize);
-  MOZ_ASSERT(found);
-
-  int32_t cachedSize = mCache.GetQuotaUsage(aQuotaKey);
-
-  *aUsage = uncachedSize + cachedSize;
-
-  return NS_OK;
-}
-
diff --git a/dom/src/storage/nsDOMStoragePersistentDB.h b/dom/src/storage/nsDOMStoragePersistentDB.h
deleted file mode 100644
index 618425305aba..000000000000
--- a/dom/src/storage/nsDOMStoragePersistentDB.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef nsDOMStoragePersistentDB_h___
-#define nsDOMStoragePersistentDB_h___
-
-#include "nscore.h"
-#include "nsDOMStorageBaseDB.h"
-#include "mozIStorageConnection.h"
-#include "mozIStorageStatement.h"
-#include "mozilla/storage/StatementCache.h"
-#include "mozIStorageBindingParamsArray.h"
-#include "nsTHashtable.h"
-#include "nsDataHashtable.h"
-#include "nsIThread.h"
-
-#include "nsLocalStorageCache.h"
-
-class DOMStorageImpl;
-class nsSessionStorageEntry;
-
-class nsDOMStoragePersistentDB : public nsDOMStorageBaseDB
-{
-  typedef mozilla::storage::StatementCache<mozIStorageStatement> StatementCache;
-  typedef nsLocalStorageCache::FlushData FlushData;
-
-public:
-  nsDOMStoragePersistentDB();
-  ~nsDOMStoragePersistentDB() {}
-
-  nsresult
-  Init(const nsString& aDatabaseName);
-
-  /**
-   * Close the connection, finalizing all the cached statements.
-   */
-  void
-  Close();
-
-  /**
-   * Indicates whether any data is cached that might need to be
-   * flushed or evicted.
-   */
-  bool
-  IsFlushTimerNeeded() const;
-
-  /**
-   * Retrieve a list of all the keys associated with a particular domain.
-   */
-  nsresult
-  GetAllKeys(DOMStorageImpl* aStorage,
-             nsTHashtable<nsSessionStorageEntry>* aKeys);
-
-  /**
-   * Retrieve a value and secure flag for a key from storage.
-   *
-   * @throws NS_ERROR_DOM_NOT_FOUND_ERR if key not found
-   */
-  nsresult
-  GetKeyValue(DOMStorageImpl* aStorage,
-              const nsAString& aKey,
-              nsAString& aValue,
-              bool* aSecure);
-
-  /**
-   * Set the value and secure flag for a key in storage.
-   */
-  nsresult
-  SetKey(DOMStorageImpl* aStorage,
-         const nsAString& aKey,
-         const nsAString& aValue,
-         bool aSecure);
-
-  /**
-   * Set the secure flag for a key in storage. Does nothing if the key was
-   * not found.
-   */
-  nsresult
-  SetSecure(DOMStorageImpl* aStorage,
-            const nsAString& aKey,
-            const bool aSecure);
-
-  /**
-   * Removes a key from storage.
-   */
-  nsresult
-  RemoveKey(DOMStorageImpl* aStorage,
-            const nsAString& aKey);
-
-  /**
-   * Remove all keys belonging to this storage.
-   */
-  nsresult
-  ClearStorage(DOMStorageImpl* aStorage);
-
-  /**
-   * Removes all keys added by a given domain.
-   */
-  nsresult
-  RemoveOwner(const nsACString& aOwner);
-
-  /**
-   * Removes all keys from storage. Used when clearing storage.
-   */
-  nsresult
-  RemoveAll();
-
-  /**
-   * Removes all keys from storage for a specific app.
-   * If aOnlyBrowserElement is true, it will remove only keys with the
-   * browserElement flag set.
-   * aAppId has to be a valid app id. It can't be NO_APP_ID or UNKNOWN_APP_ID.
-   */
-  nsresult
-  RemoveAllForApp(uint32_t aAppId, bool aOnlyBrowserElement);
-
-  /**
-   * Returns usage for a storage using its GetQuotaDBKey() as a key.
-   */
-  nsresult
-  GetUsage(DOMStorageImpl* aStorage, int32_t *aUsage);
-
-  /**
-   * Returns usage of the domain and optionaly by any subdomain.
-   */
-  nsresult
-  GetUsage(const nsACString& aDomain, int32_t *aUsage);
-
-  /**
-   * Clears all in-memory data from private browsing mode
-   */
-  nsresult
-  ClearAllPrivateBrowsingData();
-
-  /**
-   * This is the top-level method called by timer & shutdown code.
-   *
-   * LocalStorage now flushes dirty items off the main thread to reduce
-   * main thread jank.
-   *
-   * When the flush timer fires, pointers to changed data are retrieved from
-   * nsLocalStorageCache on the main thread and are used to build an SQLite
-   * statement array with bound parameters that is then executed on a
-   * background thread. Only one flush operation is outstanding at once.
-   * After the flush operation completes, a notification task
-   * is enqueued on the main thread which updates the cache state.
-   *
-   * Cached scopes are evicted if they aren't dirty and haven't been used for
-   * the maximum idle time.
-   */
-  nsresult
-  FlushAndEvictFromCache(bool aMainThread);
-
-  /**
-   * Executes SQL statements for flushing dirty data to disk.
-   */
-  nsresult
-  Flush();
-
-  /**
-   * The notifier task calls this method to update cache state after a
-   * flush operation completes.
-   */
-  void
-  HandleFlushComplete(bool aSucceeded);
-
-private:
-
-  friend class nsDOMStorageMemoryDB;
-
-  /**
-   * Sets the database's journal mode to WAL or TRUNCATE.
-   */
-  nsresult
-  SetJournalMode(bool aIsWal);
-
-  /**
-   * Sets the threshold for auto-checkpointing the WAL.
-   */
-  nsresult
-  ConfigureWalBehavior();
-
-  /**
-   * Ensures that the scope's keys are cached.
-   */
-  nsresult
-  EnsureScopeLoaded(DOMStorageImpl* aStorage);
-
-  /**
-   * Fetches the scope's data from the database.
-   */
-  nsresult
-  FetchScope(DOMStorageImpl* aStorage, nsScopeCache* aScopeCache);
-
-  /**
-   * Ensures that the quota usage information for the site is known.
-   *
-   * The current quota usage is calculated from the space occupied by
-   * the cached scopes + the size of the uncached scopes on disk.
-   * This method ensures that the size of the site's uncached scopes
-   * on disk is known.
-   */
-  nsresult
-  EnsureQuotaUsageLoaded(const nsACString& aQuotaKey);
-
-  /**
-   * Fetches the size of scopes matching aQuotaDBKey from the database.
-   */
-  nsresult
-  FetchQuotaUsage(const nsACString& aQuotaDBKey);
-
-  nsresult
-  GetUsageInternal(const nsACString& aQuotaDBKey, int32_t *aUsage);
-
-  /**
-   * Helper function for RemoveOwner and RemoveAllForApp.
-   */
-  nsresult
-  FetchMatchingScopeNames(const nsACString& aPattern);
-
-  nsresult
-  PrepareFlushStatements(const FlushData& aFlushData);
-
-  /**
-   * Gathers the dirty data from the cache, prepares SQL statements and
-   * updates state flags
-   */
-  nsresult
-  PrepareForFlush();
-
-  /**
-   * Removes non-dirty scopes that haven't been used in X seconds.
-   */
-  void
-  EvictUnusedScopes();
-
-  /**
-   * DB data structures
-   */
-  nsTArray<nsCOMPtr<mozIStorageStatement> > mFlushStatements;
-  nsTArray<nsCOMPtr<mozIStorageBindingParamsArray> > mFlushStatementParams;
-  StatementCache mReadStatements;
-  StatementCache mWriteStatements;
-  nsCOMPtr<mozIStorageConnection> mReadConnection;
-  nsCOMPtr<mozIStorageConnection> mWriteConnection;
-
-  /**
-   * Cache state data
-   */
-  nsLocalStorageCache mCache;
-  nsDataHashtable<nsCStringHashKey, int32_t> mQuotaUseByUncached;
-  // Set if the DB needs to be emptied on next flush
-  bool mWasRemoveAllCalled;
-  // Set if the DB is currently getting emptied in an async flush
-  bool mIsRemoveAllPending;
-  // Set if a flush operation has been enqueued in the async thread
-  bool mIsFlushPending;
-
-  // Helper thread for flushing
-  nsCOMPtr<nsIThread> mFlushThread;
-};
-
-#endif /* nsDOMStorageDB_h___ */
diff --git a/dom/src/storage/nsLocalStorageCache.cpp b/dom/src/storage/nsLocalStorageCache.cpp
deleted file mode 100644
index 58db8a39d03a..000000000000
--- a/dom/src/storage/nsLocalStorageCache.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "nsDOMStorage.h"
-
-#include "nsLocalStorageCache.h"
-
-using namespace mozilla;
-
-// Scopes will be evicted from memory if not accessed (read or written)
-// for MAX_IDLE_TIME seconds
-#define MAX_IDLE_TIME (30) // seconds
-
-/**
- * Anonymous namespace holding helper enum functions
- */
-namespace {
-
-struct GetUsageEnumData
-{
-  const nsACString& mQuotaKey;
-  int32_t mUsage;
-};
-
-PLDHashOperator
-GetUsageEnum(const nsACString& aScopeName,
-             nsScopeCache* aScopeCache,
-             void* aParams)
-{
-  GetUsageEnumData* data = static_cast<GetUsageEnumData*>(aParams);
-  if (StringBeginsWith(aScopeName, data->mQuotaKey)) {
-    data->mUsage += aScopeCache->GetQuotaUsage();
-  }
-  return PL_DHASH_NEXT;
-}
-
-struct EvictEnumData
-{
-  nsTArray<nsCString>& mEvicted;
-  nsTArray<int32_t>& mEvictedSize;
-};
-
-struct GetAllKeysEnumData
-{
-  nsTHashtable<nsSessionStorageEntry>& mKeys;
-  DOMStorageImpl* mStorage;
-};
-
-PLDHashOperator
-GetAllKeysEnum(const nsAString& aKey,
-               nsScopeCache::KeyEntry* aEntry,
-               void* aParams)
-{
-  GetAllKeysEnumData* data = static_cast<GetAllKeysEnumData*>(aParams);
-  nsSessionStorageEntry* keyEntry = data->mKeys.PutEntry(aKey);
-  keyEntry->mItem = new nsDOMStorageItem(data->mStorage,
-                                         aKey,
-                                         aEntry->mValue,
-                                         aEntry->mIsSecure);
-  return PL_DHASH_NEXT;
-}
-
-PLDHashOperator
-MarkMatchingDeletedEnum(const nsACString& aScopeName,
-                        nsAutoPtr<nsScopeCache>& aScopeCache,
-                        void* aPattern)
-{
-  const nsACString* pattern = static_cast<const nsACString*>(aPattern);
-  if (!StringBeginsWith(aScopeName, *pattern)) {
-    return PL_DHASH_NEXT;
-  }
-
-  aScopeCache->DeleteScope();
-
-  return PL_DHASH_NEXT;
-}
-
-PLDHashOperator
-MarkKeysEnum(const nsAString& aKey,
-             nsAutoPtr<nsScopeCache::KeyEntry>& aEntry,
-             void* aDirtyState)
-{
-  aEntry->mIsDirty = *(static_cast<bool*>(aDirtyState));
-  return PL_DHASH_NEXT;
-}
-
-PLDHashOperator
-GetChangedKeysEnum(const nsAString& aKey,
-                   nsAutoPtr<nsScopeCache::KeyEntry>& aEntry,
-                   void* aParams)
-{
-  if (!aEntry->mIsDirty) {
-    return PL_DHASH_NEXT;
-  }
-
-  nsLocalStorageCache::FlushData::ChangeSet* changeSet =
-    static_cast<nsLocalStorageCache::FlushData::ChangeSet*>(aParams);
-
-  changeSet->mDirtyKeys.AppendElement(aKey);
-  changeSet->mDirtyValues.AppendElement(aEntry.get());
-
-  return PL_DHASH_NEXT;
-}
-
-PLDHashOperator
-GetEntrySize(const nsAString& aKey,
-             nsScopeCache::KeyEntry* aEntry,
-             void* aParam)
-{
-  int32_t* usage = static_cast<int32_t*>(aParam);
-  *usage += aKey.Length() + aEntry->mValue.Length();
-  return PL_DHASH_NEXT;
-}
-
-} // anonymous namespace
-
-
-nsLocalStorageCache::nsLocalStorageCache()
-{
-  mScopeCaches.Init(16);
-}
-
-nsScopeCache*
-nsLocalStorageCache::GetScope(const nsACString& aScopeName)
-{
-  nsScopeCache* scopeCache = nullptr;
-  if (mScopeCaches.Get(aScopeName, &scopeCache)) {
-    scopeCache->mAccessTime = PR_IntervalNow();
-  }
-  return scopeCache;
-}
-
-void
-nsLocalStorageCache::AddScope(const nsACString& aScopeName,
-                              nsScopeCache* aScopeCache)
-{
-  aScopeCache->mAccessTime = PR_IntervalNow();
-  mScopeCaches.Put(aScopeName, aScopeCache);
-}
-
-bool
-nsLocalStorageCache::IsScopeCached(const nsACString& aScopeName) const
-{
-  return mScopeCaches.Get(aScopeName, nullptr);
-}
-
-uint32_t
-nsLocalStorageCache::Count() const
-{
-  return mScopeCaches.Count();
-}
-
-int32_t
-nsLocalStorageCache::GetQuotaUsage(const nsACString& aQuotaKey) const
-{
-  GetUsageEnumData data = { aQuotaKey , 0 };
-  mScopeCaches.EnumerateRead(GetUsageEnum, &data);
-  return data.mUsage;
-}
-
-void
-nsLocalStorageCache::MarkMatchingScopesDeleted(const nsACString& aPattern)
-{
-  mScopeCaches.Enumerate(MarkMatchingDeletedEnum, (void*)&aPattern);
-}
-
-void
-nsLocalStorageCache::ForgetAllScopes()
-{
-  mScopeCaches.Clear();
-}
-
-/* static */
-PLDHashOperator
-nsLocalStorageCache::GetDirtyDataEnum(const nsACString& aScopeName,
-                                      nsScopeCache* aScopeCache,
-                                      void* aParams)
-{
-  if (!aScopeCache->mIsDirty) {
-    return PL_DHASH_NEXT;
-  }
-
-  FlushData* flushData = static_cast<FlushData*>(aParams);
-  FlushData::ChangeSet changeSet;
-
-  changeSet.mWasDeleted = aScopeCache->mWasScopeDeleted;
-  changeSet.mDeletedKeys = &aScopeCache->mDeletedKeys;
-
-  aScopeCache->mTable.Enumerate(GetChangedKeysEnum, &changeSet);
-
-  flushData->mScopeNames.AppendElement(aScopeName);
-  flushData->mChanged.AppendElement(changeSet);
-
-  return PL_DHASH_NEXT;
-}
-
-void
-nsLocalStorageCache::GetFlushData(FlushData* aData) const
-{
-  mScopeCaches.EnumerateRead(GetDirtyDataEnum, aData);
-}
-
-/* static */
-PLDHashOperator
-nsLocalStorageCache::SetFlushStateEnum(const nsACString& aScopeName,
-                                       nsAutoPtr<nsScopeCache>& aScopeCache,
-                                       void* aParams)
-{
-  FlushState* newState = static_cast<FlushState*>(aParams);
-  if (*newState == FLUSH_PENDING && aScopeCache->mIsDirty) {
-    // Mark all data clean before a flush to allow further changes during flush
-    bool isDirty = false;
-    aScopeCache->mTable.Enumerate(MarkKeysEnum, &isDirty);
-    aScopeCache->mDeletedKeys.Clear();
-    aScopeCache->mWasScopeDeleted = false;
-    aScopeCache->mIsDirty = false;
-    aScopeCache->mIsFlushPending = true;
-  } else if (*newState == FLUSHED && aScopeCache->mIsFlushPending) {
-    aScopeCache->mIsFlushPending = false;
-  } else if (*newState == FLUSH_FAILED && aScopeCache->mIsFlushPending) {
-    // After a flush fails, disk state is unchanged (thanks to transaction
-    // rollback) and the cache contains the correct current state.
-    // So to bring disk back in sync with cache, we simply delete all scope
-    // data from disk on next flush and write out *ALL* the scope's cached keys.
-    // To trigger this behavior, we mark mWasScopeDeleted = true and mark all
-    // keys dirty. Note that scope cache will not be evicted or re-fetched since
-    // it's marked dirty.
-    bool isDirty = true;
-    aScopeCache->mWasScopeDeleted = true;
-    aScopeCache->mTable.Enumerate(MarkKeysEnum, &isDirty);
-    aScopeCache->mIsFlushPending = false;
-    aScopeCache->mIsDirty = true;
-  }
-  return PL_DHASH_NEXT;
-}
-
-void
-nsLocalStorageCache::MarkScopesPending()
-{
-  FlushState newState = FLUSH_PENDING;
-  mScopeCaches.Enumerate(SetFlushStateEnum, &newState);
-}
-
-void
-nsLocalStorageCache::MarkScopesFlushed()
-{
-  FlushState newState = FLUSHED;
-  mScopeCaches.Enumerate(SetFlushStateEnum, &newState);
-}
-
-void
-nsLocalStorageCache::MarkFlushFailed()
-{
-  FlushState newState = FLUSH_FAILED;
-  mScopeCaches.Enumerate(SetFlushStateEnum, &newState);
-}
-
-/* static */
-PLDHashOperator
-nsLocalStorageCache::EvictEnum(const nsACString& aScopeName,
-                               nsAutoPtr<nsScopeCache>& aScopeCache,
-                               void* aParams)
-{
-  EvictEnumData* data = static_cast<EvictEnumData*>(aParams);
-
-  // We can't evict scopes currently getting flushed in case the flush fails
-  if (aScopeCache->mIsDirty || aScopeCache->mIsFlushPending) {
-    return PL_DHASH_NEXT;
-  }
-
-  static const PRIntervalTime kMaxIdleTime = PR_SecondsToInterval(MAX_IDLE_TIME);
-  bool evict = (PR_IntervalNow() - aScopeCache->mAccessTime) > kMaxIdleTime;
-
-  if (evict) {
-    data->mEvicted.AppendElement(aScopeName);
-    data->mEvictedSize.AppendElement(aScopeCache->GetQuotaUsage());
-    return PL_DHASH_REMOVE;
-  }
-
-  return PL_DHASH_NEXT;
-}
-
-void
-nsLocalStorageCache::EvictScopes(nsTArray<nsCString>& aEvicted,
-                                 nsTArray<int32_t>& aEvictedSize)
-{
-  EvictEnumData data = { aEvicted, aEvictedSize };
-  mScopeCaches.Enumerate(EvictEnum, &data);
-}
-
-///////////////////////////////////
-
-nsScopeCache::nsScopeCache()
-  : mWasScopeDeleted(false), mIsDirty(false), mIsFlushPending(false)
-{
-  mTable.Init();
-}
-
-nsresult
-nsScopeCache::AddEntry(const nsAString& aKey,
-                       const nsAString& aValue,
-                       bool aSecure)
-{
-  KeyEntry* entry = new KeyEntry();
-  entry->mValue = aValue;
-  entry->mIsSecure = aSecure;
-  entry->mIsDirty = false;
-
-  mTable.Put(aKey, entry);
-
-  return NS_OK;
-}
-
-nsresult
-nsScopeCache::GetAllKeys(DOMStorageImpl* aStorage,
-                         nsTHashtable<nsSessionStorageEntry>* aKeys) const
-{
-  GetAllKeysEnumData data = { *aKeys, aStorage };
-  mTable.EnumerateRead(GetAllKeysEnum, &data);
-  return NS_OK;
-}
-
-bool
-nsScopeCache::GetKey(const nsAString& aKey,
-                     nsAString& aValue,
-                     bool* aSecure) const
-{
-  KeyEntry* entry = nullptr;
-  if (mTable.Get(aKey, &entry)) {
-    aValue = entry->mValue;
-    *aSecure = entry->mIsSecure;
-    return true;
-  }
-
-  return false;
-}
-
-nsresult
-nsScopeCache::SetKey(const nsAString& aKey,
-                     const nsAString& aValue,
-                     bool aSecure)
-{
-  KeyEntry* entry = nullptr;
-  if (!mTable.Get(aKey, &entry)) {
-    entry = new KeyEntry();
-    mTable.Put(aKey, entry);
-  } else if (entry->mValue == aValue) {
-    // Don't mark the cache dirty if nothing changed
-    return NS_OK;
-  }
-
-  entry->mValue = aValue;
-  entry->mIsSecure = aSecure;
-  entry->mIsDirty = true;
-
-  mDeletedKeys.RemoveElement(aKey);
-
-  mIsDirty = true;
-
-  return NS_OK;
-}
-
-void
-nsScopeCache::SetSecure(const nsAString& aKey,
-                        bool aSecure)
-{
-  KeyEntry* entry = nullptr;
-  if (!mTable.Get(aKey, &entry)) {
-    return;
-  }
-
-  entry->mIsSecure = aSecure;
-  entry->mIsDirty = true;
-
-  mIsDirty = true;
-}
-
-void
-nsScopeCache::RemoveKey(const nsAString& aKey)
-{
-  KeyEntry* entry = nullptr;
-  if (!mTable.Get(aKey, &entry)) {
-    return;
-  }
-
-  nsAutoString key(aKey);
-  if (!mWasScopeDeleted) {
-    if (!mDeletedKeys.Contains(key)) {
-      mDeletedKeys.AppendElement(key);
-    }
-  }
-  mTable.Remove(key);
-
-  mIsDirty = true;
-}
-
-void
-nsScopeCache::DeleteScope()
-{
-  mTable.Clear();
-  mDeletedKeys.Clear();
-  mWasScopeDeleted = true;
-
-  mIsDirty = true;
-}
-
-int32_t
-nsScopeCache::GetQuotaUsage() const
-{
-  int32_t usage = 0;
-  mTable.EnumerateRead(GetEntrySize, &usage);
-  return usage;
-}
-
diff --git a/dom/src/storage/nsLocalStorageCache.h b/dom/src/storage/nsLocalStorageCache.h
deleted file mode 100644
index 56e5d02c6c3d..000000000000
--- a/dom/src/storage/nsLocalStorageCache.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef nsLocalStorageCache_h___
-#define nsLocalStorageCache_h___
-
-#include "nscore.h"
-#include "nsClassHashtable.h"
-#include "nsTHashtable.h"
-#include "nsTArray.h"
-
-class DOMStorageImpl;
-class nsSessionStorageEntry;
-
-/**
- * nsScopeCache is the representation of a single scope's contents
- * and its flush state.
- *
- * Typical state progression for a scope:
- *
- * 1. Scope is loaded into memory from disk:
- *    mIsDirty = false;
- *    mIsFlushPending = false;
- *
- * 2. A key is modified/deleted in the scope, or the entire scope is deleted:
- *    mIsDirty = *true*;
- *    mIsFlushPending = false;
- *
- * 3. Flush timer fires and dirty data is collected:
- *    mIsDirty = *false*;
- *    mIsFlushPending = *true*;
- *
- * 4a. If the flush succeds:
- *     mIsDirty = false;
- *     mIsFlushPending = *false*;
- *
- * 4b. If the flush fails for some reason
- *     e.g. profile dir is on network storage and the network is flaky
- *
- *     mIsDirty = *true*;
- *     mIsFlushPending = *false*;
- *
- *     Note that in this case, no data would be lost.
- *     On next flush, the scope would get deleted from the DB to bring
- *     the DB back to a known state and then ALL the cached keys would
- *     get written out.
- *     Failed flushes ought to be very rare.
- */
-class nsScopeCache
-{
-public:
-  nsScopeCache();
-  nsresult AddEntry(const nsAString& aKey,
-                    const nsAString& aValue,
-                    bool aSecure);
-  nsresult GetAllKeys(DOMStorageImpl* aStorage,
-                      nsTHashtable<nsSessionStorageEntry>* aKeys) const;
-  bool GetKey(const nsAString& aKey, nsAString& aValue, bool* aSecure) const;
-  nsresult SetKey(const nsAString& aKey, const nsAString& aValue, bool aSecure);
-  void SetSecure(const nsAString& aKey, bool aSecure);
-  void RemoveKey(const nsAString& aKey);
-  void DeleteScope();
-  int32_t GetQuotaUsage() const;
-
-  /**
-   * A single key/value pair in a scope.
-   */
-  class KeyEntry
-  {
-  public:
-    KeyEntry() : mIsSecure(false), mIsDirty(false) {}
-    nsString mValue;
-    bool mIsSecure;
-    bool mIsDirty;
-  };
-
-private:
-  friend class nsLocalStorageCache;
-
-  // Scope data
-  // -- Whether a scope should be deleted from DB first before any DB inserts
-  bool mWasScopeDeleted;
-  // -- Keys to be deleted from DB on next flush
-  nsTArray<nsString> mDeletedKeys;
-  // -- Mapping of scope keys to scope values
-  nsClassHashtable<nsStringHashKey, KeyEntry> mTable;
-
-  // Scope state:
-  // -- The last time the scope was used, helps decide whether to evict scope
-  PRIntervalTime mAccessTime;
-  // -- Whether the scope needs to be flushed to disk
-  // Note that dirty scopes can't be evicted
-  bool mIsDirty;
-  // -- Prevents eviction + is used to recover from bad flushes
-  bool mIsFlushPending;
-};
-
-/**
- * nsLocalStorageCache manages all the cached LocalStorage scopes.
- */
-class nsLocalStorageCache
-{
-public:
-  nsLocalStorageCache();
-
-  nsScopeCache* GetScope(const nsACString& aScopeName);
-  void AddScope(const nsACString& aScopeName, nsScopeCache* aScopeCache);
-  bool IsScopeCached(const nsACString& aScopeName) const;
-  uint32_t Count() const;
-
-  int32_t GetQuotaUsage(const nsACString& aQuotaKey) const;
-  void MarkMatchingScopesDeleted(const nsACString& aPattern);
-  void ForgetAllScopes();
-
-  /**
-   * Collection of all the dirty data across all scopes.
-   */
-  struct FlushData
-  {
-  public:
-    struct ChangeSet
-    {
-      bool mWasDeleted;
-      nsTArray<nsString>* mDeletedKeys;
-      nsTArray<nsString> mDirtyKeys;
-      nsTArray<nsScopeCache::KeyEntry*> mDirtyValues;
-    };
-    // A scope's name in mScopeNames has the same index as the
-    // scope's ChangeSet in mChanged
-    nsTArray<nsCString> mScopeNames;
-    nsTArray<ChangeSet> mChanged;
-  };
-
-  /**
-   * Fills the FlushData structure with the dirty items in the cache.
-   */
-  void GetFlushData(FlushData* aData) const;
-
-  /**
-   * These methods update the state of each cached scope and
-   * its keys. See description in nsScopeCache.
-   */
-  void MarkScopesPending();
-  void MarkScopesFlushed();
-  void MarkFlushFailed();
-
-  /**
-   * Evicts scopes not accessed since aMinAccessTime.
-   * Returns info about evicted scopes in aEvicted & aEvictedSize.
-   */
-  void EvictScopes(nsTArray<nsCString>& aEvicted,
-                   nsTArray<int32_t>& aEvictedSize);
-
-private:
-
-  static PLDHashOperator
-  GetDirtyDataEnum(const nsACString& aScopeName,
-                   nsScopeCache* aScopeCache,
-                   void* aParams);
-
-  enum FlushState {
-    FLUSH_PENDING,
-    FLUSHED,
-    FLUSH_FAILED
-  };
-  static PLDHashOperator
-  SetFlushStateEnum(const nsACString& aScopeName,
-                    nsAutoPtr<nsScopeCache>& aScopeCache,
-                    void* aParams);
-
-  static PLDHashOperator
-  EvictEnum(const nsACString& aScopeName,
-            nsAutoPtr<nsScopeCache>& aScopeCache,
-            void* aParams);
-
-private:
-  // Scopes currently cached in memory
-  // Maps: scope name -> scope's cache info
-  nsClassHashtable<nsCStringHashKey, nsScopeCache> mScopeCaches;
-};
-
-#endif
diff --git a/dom/tests/mochitest/localstorage/Makefile.in b/dom/tests/mochitest/localstorage/Makefile.in
index 95ac1ef0940c..c21e19510371 100644
--- a/dom/tests/mochitest/localstorage/Makefile.in
+++ b/dom/tests/mochitest/localstorage/Makefile.in
@@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_FILES	= \
     frameAppIsolation.html \
-    frameBug624047.html \
     frameChromeSlave.html \
     frameKeySync.html \
     frameMasterEqual.html \
@@ -27,9 +26,10 @@ MOCHITEST_FILES	= \
     interOriginFrame.js \
     interOriginTest.js \
     interOriginTest2.js \
+    localStorageCommon.js \
     test_appIsolation.html \
     test_brokenUTF-16.html \
-    test_bug624047.html \
+    test_bug600307-DBOps.html \
     test_bug746272-1.html \
     test_bug746272-2.html \
     test_cookieBlock.html \
diff --git a/dom/tests/mochitest/localstorage/frameBug624047.html b/dom/tests/mochitest/localstorage/frameBug624047.html
deleted file mode 100644
index 692bcf19a440..000000000000
--- a/dom/tests/mochitest/localstorage/frameBug624047.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>slave for bug 624047 test</title>
-
-<script type="text/javascript" src="interOriginFrame.js"></script>
-<script type="text/javascript">
-
-function doStep()
-{
-  localStorage.name = 1;
-  var timer = setInterval(function() {
-    is(localStorage.name, 1, "Value is still present");
-  }, 1000);
-  
-  setTimeout(function() {
-    clearTimeout(timer);
-    localStorage.clear();
-    postMsg("done");
-  }, 12000);
-  
-  return false;
-}
-
-</script>
-
-</head>
-
-<body onload="postMsg('frame loaded');">
-</body>
-</html>
diff --git a/dom/tests/mochitest/localstorage/localStorageCommon.js b/dom/tests/mochitest/localstorage/localStorageCommon.js
new file mode 100644
index 000000000000..3c314f1b351f
--- /dev/null
+++ b/dom/tests/mochitest/localstorage/localStorageCommon.js
@@ -0,0 +1,46 @@
+function localStorageFlush(cb)
+{
+  var ob = {
+    observe : function(sub, top, dat)
+    {
+      os().removeObserver(ob, "domstorage-test-flushed");
+      cb();
+    }
+  };
+  os().addObserver(ob, "domstorage-test-flushed", false);
+  notify("domstorage-test-flush-force");
+}
+
+function localStorageReload()
+{
+  notify("domstorage-test-reload");
+}
+
+function localStorageFlushAndReload(cb)
+{
+  localStorageFlush(function() {
+    localStorageReload();
+    cb();
+  });
+}
+
+function localStorageClearAll()
+{
+  os().notifyObservers(null, "cookie-changed", "cleared");
+}
+
+function localStorageClearDomain(domain)
+{
+  os().notifyObservers(null, "browser:purge-domain-data", domain);
+}
+
+function os()
+{
+  return SpecialPowers.Cc["@mozilla.org/observer-service;1"]
+                      .getService(SpecialPowers.Ci.nsIObserverService);
+}
+
+function notify(top)
+{
+  os().notifyObservers(null, top, null);
+}
diff --git a/dom/tests/mochitest/localstorage/test_bug600307-DBOps.html b/dom/tests/mochitest/localstorage/test_bug600307-DBOps.html
new file mode 100644
index 000000000000..8d539288b007
--- /dev/null
+++ b/dom/tests/mochitest/localstorage/test_bug600307-DBOps.html
@@ -0,0 +1,166 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>bug 600307</title>
+
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<script type="text/javascript" src="localStorageCommon.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+
+<script type="text/javascript">
+
+/*
+This is strictly implementation specific test for dom storage code from bug 600307.
+It exercises code for asynchronous data flushing with regard to cache life time and its preload.
+
+"flush + reload" means to tell the database to store all pending data then wipe the cached content and reload it from the db
+
+"reload" only means to simulate situation when there is a pending flush for an origin but a new cache is about to preload
+which is a corner case happening rarely ; this helps check the next preload operation will load correct data from the database anyway
+
+Case 1: set | flush + reload | remove | set | remove | flush + reload | get ?= null
+        checks coalescing optimization for single key changes does work correctly for repeated removals of a key
+
+Case 2: set | set | clear | flush + reload | count ?= 0
+        checks whether clear operation superseeds setting keys, the database must be empty for the origin
+
+Case 3: set | set | clear | reload | count ?= 0
+        check the corner case when a data clear flush is pending but a new cache is about to preload
+*/
+
+function startTest()
+{
+  // Have an untouched land
+  localStorage.clear();
+
+  // Initial flush
+  localStorageFlush(function() {
+  is(localStorage.length, 0, "localStorage empty at the test start");
+
+  // Basic test 1 (set a key, check presence after reload):
+  localStorage.setItem("item", "value");
+  localStorageFlushAndReload(function() {
+  is(localStorage.getItem("item"), "value", "Basic persistance works");
+  is(localStorage.length, 1, "1 item in localStorage");
+
+  // Basic test 2 (set a key twice, check presence of the last value):
+  localStorage.setItem("item", "value2");
+  localStorage.setItem("item", "value3");
+  localStorageFlushAndReload(function() {
+  is(localStorage.getItem("item"), "value3", "Basic persistance 2 works");
+
+  // Basic test 3 (remove a key, check it has been deleted):
+  localStorage.removeItem("item");
+  localStorageFlushAndReload(function() {
+  is(localStorage.getItem("item"), null, "Basic delete works");
+
+  // Basic test 4 (set and remove a key, check it is not present):
+  localStorage.setItem("item", "value4");
+  localStorage.removeItem("item");
+  localStorageFlushAndReload(function() {
+  is(localStorage.getItem("item"), null, "Basic delete 2 works");
+
+
+  // Case 1:
+  localStorage.setItem("item", "value");
+  localStorageFlushAndReload(function() {
+  localStorage.removeItem("item");
+  localStorage.setItem("item", "value2");
+  localStorage.removeItem("item");
+  localStorageFlushAndReload(function() {
+  is(localStorage.getItem("item"), null, "Item deleted in case 1");
+
+  // Case 2:
+  localStorage.setItem("item", "value");
+  localStorage.setItem("item2", "value2");
+  localStorage.clear();
+  localStorageFlushAndReload(function() {
+  is(localStorage.length, 0, "localStorage clean in case 2");
+
+  // Case 3:
+  localStorageFlush(function() {
+  localStorage.setItem("item", "value");
+  localStorage.setItem("item2", "value2");
+  localStorage.clear();
+  localStorageReload();
+  is(localStorage.length, 0, "localStorage clean in case 4");
+
+  if (SpecialPowers.Cc["@mozilla.org/xre/app-info;1"].getService(
+      SpecialPowers.Ci.nsIXULRuntime).processType != SpecialPowers.Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT) {
+    // Following tests cannot be run in a child/plugin process type
+    SimpleTest.finish();
+    return;
+  }
+
+  // Cookies clean 1
+  localStorageFlush(function() {
+  localStorage.setItem("item", "value");
+  localStorageClearAll();
+  is(localStorage.length, 0, "localStorage clean after cookies deletion");
+  localStorage.setItem("item2", "value2");
+  is(localStorage.getItem("item"), null, "Unexpected key 1, cookies delete");
+  is(localStorage.getItem("item2"), "value2", "Expected key 2, cookies delete");
+  localStorageFlushAndReload(function() {
+  is(localStorage.getItem("item"), null, "Unexpected key 1, cookies delete");
+  is(localStorage.getItem("item2"), "value2", "Expected key 2, cookies delete");
+
+  // Cookies clean 2
+  localStorage.clear();
+  localStorageFlush(function() {
+  localStorage.setItem("item", "value");
+  localStorageClearAll();
+  is(localStorage.length, 0, "localStorage clean after cookies deletion 2");
+  localStorageFlushAndReload(function() {
+  is(localStorage.length, 0, "localStorage clean after cookies deletion 2");
+
+
+  // Domain clean 1
+  localStorageFlush(function() {
+  localStorage.setItem("item", "value");
+  localStorageClearDomain("test");
+  is(localStorage.length, 0, "localStorage clean after domain deletion");
+  localStorage.setItem("item2", "value2");
+  is(localStorage.getItem("item"), null, "Unexpected key 1, domain delete");
+  is(localStorage.getItem("item2"), "value2", "Expected key 2, domain delete");
+  localStorageFlushAndReload(function() {
+  is(localStorage.getItem("item"), null, "Unexpected key 1, domain delete");
+  is(localStorage.getItem("item2"), "value2", "Expected key 2, domain delete");
+
+  // Domain clean 2
+  localStorage.clear();
+  localStorageFlush(function() {
+  localStorage.setItem("item", "value");
+  localStorageClearDomain("test");
+  is(localStorage.length, 0, "localStorage clean after domain deletion 2");
+  localStorageFlushAndReload(function() {
+  is(localStorage.length, 0, "localStorage clean after domain deletion 2");
+
+  SimpleTest.finish();
+
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+  });
+}
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+
+</head>
+
+<body onload="startTest();">
+</body>
+</html>
diff --git a/dom/tests/mochitest/localstorage/test_bug624047.html b/dom/tests/mochitest/localstorage/test_bug624047.html
deleted file mode 100644
index c071fd58b48c..000000000000
--- a/dom/tests/mochitest/localstorage/test_bug624047.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>bug 624047</title>
-
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript" src="interOriginTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<script type="text/javascript">
-
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-/*
-This test does the folliwing:
-- loads a page in an iframe that stores a value to localStorage
-- sooner then in 5 seconds reloads the page
-- now the page later then 5 seconds after load in the first step checks the
-  value is still present in localStorage (what is expected)
-- if not, the bug is still present
-*/
-
-function flushTables()
-{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var storageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
-    .getService(Components.interfaces.nsIObserver);
-  storageManager.observe(null, "domstorage-flush-force", null);
-}
-
-function startTest()
-{
-  slaveOrigin = "http://sub2.test2.example.org";
-  slave = document.getElementById("__test_frame").contentWindow;
-
-  flushTables();
-  slave.location = slaveOrigin + slavePath + "frameBug624047.html";
-  setTimeout(function() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    slaveLoadsPending = 1;
-    slave.location.reload();
-  }, 2000);
-}
-
-function doNextTest()
-{
-  SimpleTest.finish();
-}
-
-function doStep()
-{
-}
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-
-</head>
-
-<body onload="startTest();">
-  This test takes about 15s to complete... Please wait...
-  <br/>
-  <iframe src="" id="__test_frame"></iframe>
-</body>
-</html>
diff --git a/dom/tests/mochitest/localstorage/test_localStorageBase.html b/dom/tests/mochitest/localstorage/test_localStorageBase.html
index ed8ffc57a009..451d69b6a0b9 100644
--- a/dom/tests/mochitest/localstorage/test_localStorageBase.html
+++ b/dom/tests/mochitest/localstorage/test_localStorageBase.html
@@ -7,7 +7,31 @@
 
 <script type="text/javascript">
 
-var MOZ_STORAGE_CHANGED_COUNT = 21;
+var expectedEvents = [
+  "empty,null,",
+  "empty,,null",
+  "key1,null,value1",
+  "key1,value1,null",
+  "key1,null,value1",
+  "key2,null,value2",
+  "key2,value2,value2-2",
+  "key1,value1,value1-2",
+  "key2,value2-2,null",
+  "testA,null,valueA",
+  "testA,valueA,valueA2",
+  "testB,null,valueB",
+  "testB,valueB,valueB2",
+  "testC,null,valueC",
+  "testC,valueC,valueC2",
+  "testC,valueC2,null",
+  "testC,null,null",
+  "testC,null,null",
+  "null,null,test",
+  "null,test,null",
+  "null,null,test",
+  "null,test,null",
+  "null,null,null"
+];
 
 function startTest()
 {
@@ -28,12 +52,14 @@ function startTest()
   is(typeof localStorage["nonexisting2"], "undefined", "['nonexisting2'] is undefined");
   is(typeof localStorage.nonexisting2, "undefined", "nonexisting2 is undefined");
 
-  var mozStorageChangedReceived = 0;
   var localStorageCopy = localStorage;
 
   function onStorageChanged(e) {
-    if (e.storageArea == localStorageCopy)
-      mozStorageChangedReceived++;
+    if (e.storageArea == localStorageCopy) {
+      ok(expectedEvents.length > 0, "Not more then expected events encountered");
+      var receivedEvent = e.key + "," + e.oldValue + "," + e.newValue;
+      is(receivedEvent, expectedEvents.shift(), "Expected event data: " + receivedEvent);
+    }
   }
 
   // Listen for MozStorageChanged
@@ -204,8 +230,7 @@ function startTest()
 
   SimpleTest.executeSoon(function () {
     SpecialPowers.removeChromeEventListener("MozStorageChanged", onStorageChanged, false);
-    is(mozStorageChangedReceived, MOZ_STORAGE_CHANGED_COUNT,
-       "received the correct number of events");
+    is(expectedEvents.length, 0, "received the correct number of events");
 
     localStorage.clear();
     SimpleTest.finish();
diff --git a/dom/tests/mochitest/localstorage/test_localStorageFromChrome.xhtml b/dom/tests/mochitest/localstorage/test_localStorageFromChrome.xhtml
index cd11118b977c..0f4f1a3615f3 100644
--- a/dom/tests/mochitest/localstorage/test_localStorageFromChrome.xhtml
+++ b/dom/tests/mochitest/localstorage/test_localStorageFromChrome.xhtml
@@ -14,12 +14,12 @@ function startTest()
     .getService(Components.interfaces.nsIIOService);
   var ssm = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
     .getService(Components.interfaces.nsIScriptSecurityManager);
-  var dsm = Components.classes["@mozilla.org/dom/storagemanager;1"]
+  var dsm = Components.classes["@mozilla.org/dom/localStorage-manager;1"]
     .getService(Components.interfaces.nsIDOMStorageManager);
 
   var uri = ios.newURI(url, "", null);
   var principal = ssm.getNoAppCodebasePrincipal(uri);
-  var storage = dsm.getLocalStorageForPrincipal(principal, "");
+  var storage = dsm.createStorage(principal, "");
   
   storage.setItem("chromekey", "chromevalue");
   
diff --git a/dom/tests/mochitest/sessionstorage/Makefile.in b/dom/tests/mochitest/sessionstorage/Makefile.in
index a6ab5d9096c7..b21aeb69c345 100644
--- a/dom/tests/mochitest/sessionstorage/Makefile.in
+++ b/dom/tests/mochitest/sessionstorage/Makefile.in
@@ -17,6 +17,8 @@ MOCHITEST_FILES	= \
     frameNotEqual.html \
     file_http.html \
     file_https.html \
+    test_cookieSession.html \
+    test_sessionStorageBaseSessionOnly.html \
     test_sessionStorageBase.html \
     test_sessionStorageClone.html \
     test_sessionStorageReplace.html \
diff --git a/dom/tests/mochitest/sessionstorage/test_cookieSession.html b/dom/tests/mochitest/sessionstorage/test_cookieSession.html
new file mode 100644
index 000000000000..b011adc92a0c
--- /dev/null
+++ b/dom/tests/mochitest/sessionstorage/test_cookieSession.html
@@ -0,0 +1,98 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>cookie per-session only test</title>
+
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+
+<script type="text/javascript">
+
+/*
+  Set cookie access to be just per session and store to the sessionStorage.
+  Content stored must prevail only for session of the browser, so it must
+  be accessible in another window we try to access that key in the same
+  storage.
+ */
+
+function startTest()
+{
+  var io = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
+    .getService(SpecialPowers.Ci.nsIIOService);
+  var uri = io.newURI(window.location, "", null);
+  var cp = SpecialPowers.Cc["@mozilla.org/cookie/permission;1"]
+    .getService(SpecialPowers.Ci.nsICookiePermission);
+
+  // ==================== start of the test ============================
+
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_DEFAULT);
+
+  sessionStorage.setItem("persistent1", "persistent value 1");
+  sessionStorage.setItem("persistent2", "persistent value 2");
+
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_SESSION);
+
+  sessionStorage.setItem("session only", "session value");
+  is(sessionStorage.getItem("session only"), "session value", "Value present when cookies in session-only mode");
+  is(sessionStorage.getItem("persistent1"), "persistent value 1", "Persistent value present");
+  is(sessionStorage.getItem("persistent2"), "persistent value 2", "Persistent value present");
+
+  sessionStorage.setItem("persistent1", "changed persistent value 1");
+  sessionStorage.removeItem("persistent2");
+
+  is(sessionStorage.getItem("session only"), "session value", "Value present when cookies in session-only mode");
+  is(sessionStorage.getItem("persistent1"), "changed persistent value 1", "Persistent value present");
+  is(sessionStorage.getItem("persistent2"), null, "Persistent value removed");
+
+  // This clear has to delete only changes made in session only mode
+  sessionStorage.clear();
+
+  is(sessionStorage.getItem("session only"), null, "Value not present when cookies in session-only mode after delete");
+  is(sessionStorage.getItem("persistent1"), null, "Persistent value not present in session only after delete");
+  is(sessionStorage.getItem("persistent2"), null, "Persistent value not present in session only after delete");
+
+  sessionStorage.setItem("session only 2", "must be deleted on drop of session-only cookies permissions");
+
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_DEFAULT);
+
+  is(sessionStorage.getItem("session only"), null, "No value when cookies are in default mode");
+  is(sessionStorage.getItem("session only 2"), null, "No value when cookies are in default mode");
+  is(sessionStorage.getItem("persistent1"), "persistent value 1", "Persistent value present");
+  is(sessionStorage.getItem("persistent2"), "persistent value 2", "Persistent value present");
+
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_SESSION);
+
+  is(sessionStorage.getItem("session only"), null, "Value not present when cookies in session-only mode after delete");
+  is(sessionStorage.getItem("session only 2"), null, "Value not present when cookies in session-only mode after delete");
+  is(sessionStorage.getItem("persistent1"), "persistent value 1", "Persistent value present again");
+  is(sessionStorage.getItem("persistent2"), "persistent value 2", "Persistent value present again");
+
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_DEFAULT);
+
+  sessionStorage.clear();
+
+  is(sessionStorage.getItem("session only"), null, "No value when cookies are in default mode");
+  is(sessionStorage.getItem("persistent1"), null, "Persistent value not present after delete");
+  is(sessionStorage.getItem("persistent2"), null, "Persistent value not present after delete");
+
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_SESSION);
+
+  is(sessionStorage.getItem("session only"), null, "Value not present when cookies in session-only mode after delete");
+  is(sessionStorage.getItem("session only 2"), null, "No value when cookies are in default mode");
+  is(sessionStorage.getItem("persistent1"), null, "Persistent value not present in session only after delete");
+  is(sessionStorage.getItem("persistent2"), null, "Persistent value not present in session only after delete");
+
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_DEFAULT);
+
+  SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+
+</head>
+
+<body onload="startTest();">
+
+</body>
+</html>
diff --git a/dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html b/dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html
index e23aba011e91..a00d50bbf599 100644
--- a/dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html
+++ b/dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html
@@ -7,7 +7,18 @@
 
 <script type="text/javascript">
 
-var MOZ_STORAGE_CHANGED_COUNT = 8;
+var expectedEvents = [
+  "empty,null,",
+  "empty,,null",
+  "key1,null,value1",
+  "key1,value1,null",
+  "key1,null,value1",
+  "key2,null,value2",
+  "key2,value2,value2-2",
+  "key1,value1,value1-2",
+  "key2,value2-2,null",
+  "null,null,null"
+];
 
 function setup() {
   sessionStorage.clear();
@@ -37,8 +48,11 @@ function startTest()
   var sessionStorageCopy = sessionStorage;
 
   function onStorageChanged(e) {
-    if (e.storageArea == sessionStorageCopy)
-      mozStorageChangedReceived++;
+    if (e.storageArea == sessionStorageCopy) {
+      ok(expectedEvents.length > 0, "Not more then expected events encountered");
+      var receivedEvent = e.key + "," + e.oldValue + "," + e.newValue;
+      is(receivedEvent, expectedEvents.shift(), "Expected event data: " + receivedEvent);
+    }
   }
 
   // Listen for MozStorageChanged
@@ -148,8 +162,7 @@ function startTest()
 
   SimpleTest.executeSoon(function () {
     SpecialPowers.removeChromeEventListener("MozStorageChanged", onStorageChanged, false);
-    is(mozStorageChangedReceived, MOZ_STORAGE_CHANGED_COUNT,
-       "received the correct number of events");
+    is(expectedEvents.length, 0, "received the correct number of events");
 
     sessionStorage.clear();
     SimpleTest.finish();
diff --git a/dom/tests/mochitest/sessionstorage/test_sessionStorageBaseSessionOnly.html b/dom/tests/mochitest/sessionstorage/test_sessionStorageBaseSessionOnly.html
new file mode 100644
index 000000000000..7048777f7735
--- /dev/null
+++ b/dom/tests/mochitest/sessionstorage/test_sessionStorageBaseSessionOnly.html
@@ -0,0 +1,214 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>sessionStorage basic test, while in sesison only mode</title>
+
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+
+<script type="text/javascript">
+
+function startTest()
+{
+  var io = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
+    .getService(SpecialPowers.Ci.nsIIOService);
+  var uri = io.newURI(window.location, "", null);
+  var cp = SpecialPowers.Cc["@mozilla.org/cookie/permission;1"]
+    .getService(SpecialPowers.Ci.nsICookiePermission);
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_SESSION);
+
+
+  // Initially check the sessionStorage is empty
+  is(sessionStorage.length, 0, "The storage is empty [1]");
+  is(sessionStorage.key(0), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.key(-1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.key(1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.getItem("nonexisting"), null, "Nonexisting item is null (getItem())");
+  is(sessionStorage["nonexisting"], undefined, "Nonexisting item is undefined (array access)");
+  is(sessionStorage.nonexisting, undefined, "Nonexisting item is undefined (property access)");
+  sessionStorage.removeItem("nonexisting"); // Just check there is no exception
+
+  is(typeof sessionStorage.getItem("nonexisting"), "object", "getItem('nonexisting') is object");
+  is(typeof sessionStorage["nonexisting"], "undefined", "['nonexisting'] is undefined");
+  is(typeof sessionStorage.nonexisting, "undefined", "nonexisting is undefined");
+  is(typeof sessionStorage.getItem("nonexisting2"), "object", "getItem('nonexisting2') is object");
+  is(typeof sessionStorage["nonexisting2"], "undefined", "['nonexisting2'] is undefined");
+  is(typeof sessionStorage.nonexisting2, "undefined", "nonexisting2 is undefined");
+
+  // add an empty-value key
+  sessionStorage.setItem("empty", "");
+  is(sessionStorage.getItem("empty"), "", "Empty value (getItem())");
+  is(sessionStorage["empty"], "", "Empty value (array access)");
+  is(sessionStorage.empty, "", "Empty value (property access)");
+  is(typeof sessionStorage.getItem("empty"), "string", "getItem('empty') is string");
+  is(typeof sessionStorage["empty"], "string", "['empty'] is string");
+  is(typeof sessionStorage.empty, "string", "empty is string");
+  sessionStorage.removeItem("empty");
+  is(sessionStorage.length, 0, "The storage has no keys");
+  is(sessionStorage.getItem("empty"), null, "empty item is null (getItem())");
+  is(sessionStorage["empty"], undefined, "empty item is undefined (array access)");
+  is(sessionStorage.empty, undefined, "empty item is undefined (property access)");
+  is(typeof sessionStorage.getItem("empty"), "object", "getItem('empty') is object");
+  is(typeof sessionStorage["empty"], "undefined", "['empty'] is undefined");
+  is(typeof sessionStorage.empty, "undefined", "empty is undefined");
+
+  // add one key, check it is there
+  sessionStorage.setItem("key1", "value1");
+  is(sessionStorage.length, 1, "The storage has one key-value pair");
+  is(sessionStorage.key(0), "key1");
+  is(sessionStorage.key(-1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.key(1), null, "key() should return null for out-of-bounds access");
+
+  // check all access method give the correct result
+  // and are of the correct type
+  is(sessionStorage.getItem("key1"), "value1", "getItem('key1') == value1");
+  is(sessionStorage["key1"], "value1", "['key1'] == value1");
+  is(sessionStorage.key1, "value1", "key1 == value1");
+
+  is(typeof sessionStorage.getItem("key1"), "string", "getItem('key1') is string");
+  is(typeof sessionStorage["key1"], "string", "['key1'] is string");
+  is(typeof sessionStorage.key1, "string", "key1 is string");
+
+  // remove the previously added key and check the storage is empty
+  sessionStorage.removeItem("key1");
+  is(sessionStorage.length, 0, "The storage is empty [2]");
+  is(sessionStorage.key(0), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.getItem("key1"), null, "\'key1\' removed");
+
+  is(typeof sessionStorage.getItem("key1"), "object", "getItem('key1') is object");
+  is(typeof sessionStorage["key1"], "undefined", "['key1'] is undefined");
+  is(typeof sessionStorage.key1, "undefined", "key1 is undefined");
+
+  // add one key, check it is there
+  sessionStorage.setItem("key1", "value1");
+  is(sessionStorage.length, 1, "The storage has one key-value pair");
+  is(sessionStorage.key(0), "key1");
+  is(sessionStorage.getItem("key1"), "value1");
+
+  // add a second key
+  sessionStorage.setItem("key2", "value2");
+  is(sessionStorage.length, 2, "The storage has two key-value pairs");
+  is(sessionStorage.getItem("key1"), "value1");
+  is(sessionStorage.getItem("key2"), "value2");
+  var firstKey = sessionStorage.key(0);
+  var secondKey = sessionStorage.key(1);
+  ok((firstKey == 'key1' && secondKey == 'key2') ||
+     (firstKey == 'key2' && secondKey == 'key1'),
+     'key() API works.');
+
+  // change the second key
+  sessionStorage.setItem("key2", "value2-2");
+  is(sessionStorage.length, 2, "The storage has two key-value pairs");
+  is(sessionStorage.key(0), firstKey); // After key value changes the order must be preserved
+  is(sessionStorage.key(1), secondKey);
+  is(sessionStorage.key(-1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.key(2), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.getItem("key1"), "value1");
+  is(sessionStorage.getItem("key2"), "value2-2");
+
+  // change the first key
+  sessionStorage.setItem("key1", "value1-2");
+  is(sessionStorage.length, 2, "The storage has two key-value pairs");
+  is(sessionStorage.key(0), firstKey); // After key value changes the order must be preserved
+  is(sessionStorage.key(1), secondKey);
+  is(sessionStorage.key(-1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.key(2), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.getItem("key1"), "value1-2");
+  is(sessionStorage.getItem("key2"), "value2-2");
+
+  // remove the second key
+  sessionStorage.removeItem("key2");
+  is(sessionStorage.length, 1, "The storage has one key-value pair");
+  is(sessionStorage.key(0), "key1");
+  is(sessionStorage.key(-1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.key(1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.getItem("key1"), "value1-2");
+
+  // JS property test
+  sessionStorage.testA = "valueA";
+  is(sessionStorage.testA, "valueA");
+  is(sessionStorage["testA"], "valueA");
+  is(sessionStorage.getItem("testA"), "valueA");
+
+  sessionStorage.testA = "valueA2";
+  is(sessionStorage.testA, "valueA2");
+  is(sessionStorage["testA"], "valueA2");
+  is(sessionStorage.getItem("testA"), "valueA2");
+
+  sessionStorage["testB"] = "valueB";
+  is(sessionStorage.testB, "valueB");
+  is(sessionStorage["testB"], "valueB");
+  is(sessionStorage.getItem("testB"), "valueB");
+
+  sessionStorage["testB"] = "valueB2";
+  is(sessionStorage.testB, "valueB2");
+  is(sessionStorage["testB"], "valueB2");
+  is(sessionStorage.getItem("testB"), "valueB2");
+
+  sessionStorage.setItem("testC", "valueC");
+  is(sessionStorage.testC, "valueC");
+  is(sessionStorage["testC"], "valueC");
+  is(sessionStorage.getItem("testC"), "valueC");
+
+  sessionStorage.setItem("testC", "valueC2");
+  is(sessionStorage.testC, "valueC2");
+  is(sessionStorage["testC"], "valueC2");
+  is(sessionStorage.getItem("testC"), "valueC2");
+
+  sessionStorage.setItem("testC", null);
+  is("testC" in sessionStorage, true);
+  is(sessionStorage.getItem("testC"), "null");
+  is(sessionStorage["testC"], "null");
+  is(sessionStorage.testC, "null");
+
+  sessionStorage.removeItem("testC");
+  sessionStorage["testC"] = null;
+  is("testC" in sessionStorage, true);
+  is(sessionStorage.getItem("testC"), "null");
+  is(sessionStorage["testC"], "null");
+  is(sessionStorage.testC, "null");
+
+  sessionStorage.setItem(null, "test");
+  is("null" in sessionStorage, true);
+  is(sessionStorage.getItem("null"), "test");
+  is(sessionStorage.getItem(null), "test");
+  is(sessionStorage["null"], "test");
+  sessionStorage.removeItem(null, "test");
+  // bug 350023
+  todo_is("null" in sessionStorage, false);
+
+  sessionStorage.setItem(null, "test");
+  is("null" in sessionStorage, true);
+  sessionStorage.removeItem("null", "test");
+  // bug 350023
+  todo_is("null" in sessionStorage, false);
+
+  // Clear the storage
+  sessionStorage.clear();
+  is(sessionStorage.length, 0, "The storage is empty [3]");
+  is(sessionStorage.key(0), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.key(-1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.key(1), null, "key() should return null for out-of-bounds access");
+  is(sessionStorage.getItem("nonexisting"), null, "Nonexisting item is null");
+  is(sessionStorage.getItem("key1"), null, "key1 removed");
+  is(sessionStorage.getItem("key2"), null, "key2 removed");
+  sessionStorage.removeItem("nonexisting"); // Just check there is no exception
+  sessionStorage.removeItem("key1"); // Just check there is no exception
+  sessionStorage.removeItem("key2"); // Just check there is no exception
+
+
+  cp.setAccess(uri, SpecialPowers.Ci.nsICookiePermission.ACCESS_DEFAULT);
+
+  sessionStorage.clear();
+  SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+
+</head>
+
+<body onload="startTest();">
+
+</body>
+</html>
diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index 952d6fbc546b..e17b0544d522 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -48,9 +48,8 @@
 #include "nsIWindowProvider.h"
 #include "nsIMutableArray.h"
 #include "nsISupportsArray.h"
-#include "nsIDOMStorageObsolete.h"
 #include "nsIDOMStorage.h"
-#include "nsPIDOMStorage.h"
+#include "nsIDOMStorageManager.h"
 #include "nsIWidget.h"
 #include "nsFocusManager.h"
 #include "nsIPresShell.h"
@@ -1000,17 +999,14 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
     parentDocShell = piWindow->GetDocShell();
 
   if (subjectPrincipal && parentDocShell) {
-    nsCOMPtr<nsIDOMStorage> storage;
-    parentDocShell->GetSessionStorageForPrincipal(subjectPrincipal,
-                                                  EmptyString(), false,
-                                                  getter_AddRefs(storage));
-    nsCOMPtr<nsPIDOMStorage> piStorage =
-      do_QueryInterface(storage);
-    if (piStorage){
-      storage = piStorage->Clone();
-      newDocShell->AddSessionStorage(
-        piStorage->Principal(),
-        storage);
+    nsCOMPtr<nsIDOMStorageManager> parentStorageManager = do_QueryInterface(parentDocShell);
+    nsCOMPtr<nsIDOMStorageManager> newStorageManager = do_QueryInterface(newDocShell);
+
+    if (parentStorageManager && newStorageManager) {
+      nsCOMPtr<nsIDOMStorage> storage;
+      parentStorageManager->GetStorage(subjectPrincipal, isPrivateBrowsingWindow, getter_AddRefs(storage));
+      if (storage)
+        newStorageManager->CloneStorage(storage);
     }
   }
 
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index 456b18023eeb..84d44122b8a7 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -91,7 +91,6 @@ members = [
     'nsIDOMStorage.key',
     'nsIDOMStorage.removeItem',
     'nsIDOMStorage.clear',
-    'nsIDOMStorageItem.value',
 
     # dom/interfaces/xpath
     'nsIDOMXPathExpression.evaluate',
diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h
index f44bdadce45f..140a320a7084 100644
--- a/layout/build/nsLayoutCID.h
+++ b/layout/build/nsLayoutCID.h
@@ -63,17 +63,13 @@
 #define NS_CANVASRENDERINGCONTEXTWEBGL_CID \
 { 0x2fe88332, 0x31c6, 0x4829, { 0xb2, 0x47, 0xa0, 0x7d, 0x8a, 0x7e, 0xe8, 0x0fe } }
 
-// {8b449142-1eab-4bfa-9830-fab6ebb09774}
-#define NS_DOMSTORAGE_CID \
-{ 0x8b449142, 0x1eab, 0x4bfa, { 0x98, 0x30, 0xfa, 0xb6, 0xeb, 0xb0, 0x97, 0x74 } }
+// {A746DECD-AE74-4d86-8E75-4FDA81A9BE90}
+#define NS_DOMSESSIONSTORAGEMANAGER_CID               \
+{ 0xa746decd, 0xae74, 0x4d86, { 0x8e, 0x75, 0x4f, 0xda, 0x81, 0xa9, 0xbe, 0x90 } }
 
-// {27AECC62-7777-428e-B34C-5973A47B8298}
-#define NS_DOMSTORAGE2_CID \
-{ 0x27aecc62, 0x7777, 0x428e, { 0xb3, 0x4c, 0x59, 0x73, 0xa4, 0x7b, 0x82, 0x98 } }
-
-// {b88a4712-eb52-4c10-9b85-bf5894b510f0}
-#define NS_DOMSTORAGEMANAGER_CID               \
-{ 0xb88a4712, 0xeb52, 0x4c10, { 0x9b, 0x85, 0xbf, 0x58, 0x94, 0xb5, 0x10, 0xf0 } }
+// {656DB07C-AA80-49e4-BCE8-E431BAAE697D}
+#define NS_DOMLOCALSTORAGEMANAGER_CID               \
+{ 0x656db07c, 0xaa80, 0x49e4, { 0xbc, 0xe8, 0xe4, 0x31, 0xba, 0xae, 0x69, 0x7d } }
 
 // {93ad72a6-02cd-4716-9626-d47d5ec275ec}
 #define NS_DOMJSON_CID \
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 8b1bc562f49d..48d68de84dae 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -80,7 +80,7 @@
 #include "nsScriptNameSpaceManager.h"
 #include "nsIControllerContext.h"
 #include "nsDOMScriptObjectFactory.h"
-#include "nsDOMStorage.h"
+#include "DOMStorageManager.h"
 #include "nsJSON.h"
 #include "mozIApplicationClearPrivateDataParams.h"
 #include "mozilla/Attributes.h"
@@ -275,8 +275,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBlobProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMediaStreamProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHostObjectURI)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMParser)
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsDOMStorageManager,
-                                         nsDOMStorageManager::GetInstance)
+NS_GENERIC_FACTORY_CONSTRUCTOR(DOMSessionStorageManager)
+NS_GENERIC_FACTORY_CONSTRUCTOR(DOMLocalStorageManager)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsChannelPolicy)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(IndexedDatabaseManager,
                                          IndexedDatabaseManager::FactoryCreate)
@@ -768,8 +768,8 @@ NS_DEFINE_NAMED_CID(NS_XMLHTTPREQUEST_CID);
 NS_DEFINE_NAMED_CID(NS_EVENTSOURCE_CID);
 NS_DEFINE_NAMED_CID(NS_DOMACTIVITY_CID);
 NS_DEFINE_NAMED_CID(NS_DOMPARSER_CID);
-NS_DEFINE_NAMED_CID(NS_DOMSTORAGE2_CID);
-NS_DEFINE_NAMED_CID(NS_DOMSTORAGEMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_DOMSESSIONSTORAGEMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_DOMLOCALSTORAGEMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_DOMJSON_CID);
 NS_DEFINE_NAMED_CID(NS_TEXTEDITOR_CID);
 NS_DEFINE_NAMED_CID(INDEXEDDB_MANAGER_CID);
@@ -1054,8 +1054,8 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
   { &kNS_EVENTSOURCE_CID, false, NULL, EventSourceConstructor },
   { &kNS_DOMACTIVITY_CID, false, NULL, ActivityConstructor },
   { &kNS_DOMPARSER_CID, false, NULL, nsDOMParserConstructor },
-  { &kNS_DOMSTORAGE2_CID, false, NULL, NS_NewDOMStorage2 },
-  { &kNS_DOMSTORAGEMANAGER_CID, false, NULL, nsDOMStorageManagerConstructor },
+  { &kNS_DOMSESSIONSTORAGEMANAGER_CID, false, NULL, DOMSessionStorageManagerConstructor },
+  { &kNS_DOMLOCALSTORAGEMANAGER_CID, false, NULL, DOMLocalStorageManagerConstructor },
   { &kNS_DOMJSON_CID, false, NULL, NS_NewJSON },
   { &kNS_TEXTEDITOR_CID, false, NULL, nsPlaintextEditorConstructor },
   { &kINDEXEDDB_MANAGER_CID, false, NULL, IndexedDatabaseManagerConstructor },
@@ -1204,8 +1204,8 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
   { NS_EVENTSOURCE_CONTRACTID, &kNS_EVENTSOURCE_CID },
   { NS_DOMACTIVITY_CONTRACTID, &kNS_DOMACTIVITY_CID },
   { NS_DOMPARSER_CONTRACTID, &kNS_DOMPARSER_CID },
-  { "@mozilla.org/dom/storage;2", &kNS_DOMSTORAGE2_CID },
-  { "@mozilla.org/dom/storagemanager;1", &kNS_DOMSTORAGEMANAGER_CID },
+  { "@mozilla.org/dom/localStorage-manager;1", &kNS_DOMLOCALSTORAGEMANAGER_CID },
+  { "@mozilla.org/dom/sessionStorage-manager;1", &kNS_DOMSESSIONSTORAGEMANAGER_CID },
   { "@mozilla.org/dom/json;1", &kNS_DOMJSON_CID },
   { "@mozilla.org/editor/texteditor;1", &kNS_TEXTEDITOR_CID },
   { INDEXEDDB_MANAGER_CONTRACTID, &kINDEXEDDB_MANAGER_CID },
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index f52985d6f336..c262e267f749 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -41,7 +41,6 @@
 #include "nsXBLWindowKeyHandler.h"
 #include "nsXBLService.h"
 #include "txMozillaXSLTProcessor.h"
-#include "nsDOMStorage.h"
 #include "nsTreeSanitizer.h"
 #include "nsCellMap.h"
 #include "nsTextFrameTextRunCache.h"
@@ -59,7 +58,7 @@
 #include "nsMathMLAtoms.h"
 #include "nsMathMLOperators.h"
 #include "Navigator.h"
-#include "nsDOMStorageBaseDB.h"
+#include "DOMStorageObserver.h"
 #include "DisplayItemClip.h"
 
 #include "AudioChannelService.h"
@@ -217,9 +216,9 @@ nsLayoutStatics::Initialize()
     return rv;
   }
 
-  rv = nsDOMStorageManager::Initialize();
+  rv = DOMStorageObserver::Init();
   if (NS_FAILED(rv)) {
-    NS_ERROR("Could not initialize nsDOMStorageManager");
+    NS_ERROR("Could not initialize DOMStorageObserver");
     return rv;
   }
 
@@ -272,8 +271,6 @@ nsLayoutStatics::Initialize()
   nsCookieService::AppClearDataObserverInit();
   nsApplicationCacheService::AppClearDataObserverInit();
 
-  nsDOMStorageBaseDB::Init();
-
   InitializeDateCacheCleaner();
 
   return NS_OK;
@@ -290,7 +287,7 @@ nsLayoutStatics::Shutdown()
 #ifdef MOZ_XUL
   nsXULPopupManager::Shutdown();
 #endif
-  nsDOMStorageManager::Shutdown();
+  DOMStorageObserver::Shutdown();
   txMozillaXSLTProcessor::Shutdown();
   Attr::Shutdown();
   nsEventListenerManager::Shutdown();
diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json
index bd8e2915f094..bdb7b1f61ba1 100644
--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -412,7 +412,9 @@
 	"dom/tests/mochitest/localstorage/test_localStorageReplace.html":"",
 
         "dom/tests/mochitest/pointerlock/test_pointerlock-api.html":"",
+	"dom/tests/mochitest/sessionstorage/test_cookieSession.html":"",
 	"dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html":"",
+	"dom/tests/mochitest/sessionstorage/test_sessionStorageBaseSessionOnly.html":"",
 	"dom/tests/mochitest/sessionstorage/test_sessionStorageClone.html":"",
 	"dom/tests/mochitest/sessionstorage/test_sessionStorageHttpHttps.html":"",
 	"dom/tests/mochitest/sessionstorage/test_sessionStorageReplace.html":"",
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 53a492fb813d..07f6cfe4627a 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -2554,6 +2554,24 @@
     "kind": "boolean",
     "description": "DOM: Ranges that are detached on destruction (bug 702948)"
   },
+  "LOCALDOMSTORAGE_INIT_DATABASE_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to open the localStorage database (ms)"
+  },
+  "LOCALDOMSTORAGE_SHUTDOWN_DATABASE_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to flush and close the localStorage database (ms)"
+  },
+  "LOCALDOMSTORAGE_PRELOAD_PENDING_ON_FIRST_ACCESS": {
+    "kind": "boolean",
+    "description": "True when we had to wait for a pending preload on first access to localStorage data, false otherwise"
+  },
   "LOCALDOMSTORAGE_GETALLKEYS_MS": {
     "kind": "exponential",
     "high": "3000",
@@ -2561,6 +2579,41 @@
     "extended_statistics_ok": true,
     "description": "Time to return a list of all keys in domain's LocalStorage (ms)"
   },
+  "LOCALDOMSTORAGE_GETALLKEYS_BLOCKING_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to block before we return a list of all keys in domain's LocalStorage (ms)"
+  },
+  "LOCALDOMSTORAGE_GETKEY_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to return a key name in domain's LocalStorage (ms)"
+  },
+  "LOCALDOMSTORAGE_GETKEY_BLOCKING_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to block before we return a key name in domain's LocalStorage (ms)"
+  },
+  "LOCALDOMSTORAGE_GETLENGTH_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to return number of keys in domain's LocalStorage (ms)"
+  },
+  "LOCALDOMSTORAGE_GETLENGTH_BLOCKING_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to block before we return number of keys in domain's LocalStorage (ms)"
+  },
   "LOCALDOMSTORAGE_GETVALUE_MS": {
     "kind": "exponential",
     "high": "3000",
@@ -2568,6 +2621,13 @@
     "extended_statistics_ok": true,
     "description": "Time to return a value for a key in LocalStorage (ms)"
   },
+  "LOCALDOMSTORAGE_GETVALUE_BLOCKING_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to block before we return a value for a key in LocalStorage (ms)"
+  },
   "LOCALDOMSTORAGE_SETVALUE_MS": {
     "kind": "exponential",
     "high": "3000",
@@ -2575,6 +2635,13 @@
     "extended_statistics_ok": true,
     "description": "Time to set a single key's value in LocalStorage (ms)"
   },
+  "LOCALDOMSTORAGE_SETVALUE_BLOCKING_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to block before we set a single key's value in LocalStorage (ms)"
+  },
   "LOCALDOMSTORAGE_REMOVEKEY_MS": {
     "kind": "exponential",
     "high": "3000",
@@ -2582,33 +2649,40 @@
     "extended_statistics_ok": true,
     "description": "Time to remove a single key from LocalStorage (ms)"
   },
-  "LOCALDOMSTORAGE_REMOVEALL_MS": {
+  "LOCALDOMSTORAGE_REMOVEKEY_BLOCKING_MS": {
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to block before we remove a single key from LocalStorage (ms)"
+  },
+  "LOCALDOMSTORAGE_CLEAR_MS": {
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
     "extended_statistics_ok": true,
     "description": "Time to clear LocalStorage for all domains (ms)"
   },
-  "LOCALDOMSTORAGE_FETCH_DOMAIN_MS": {
+  "LOCALDOMSTORAGE_CLEAR_BLOCKING_MS": {
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
     "extended_statistics_ok": true,
-    "description": "Time to fetch LocalStorage data for a domain (ms)"
+    "description": "Time to block before we clear LocalStorage for all domains (ms)"
   },
-  "LOCALDOMSTORAGE_FETCH_QUOTA_USE_MS": {
+  "LOCALDOMSTORAGE_UNLOAD_BLOCKING_MS": {
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
     "extended_statistics_ok": true,
-    "description": "Time to fetch quota use stats for a TLD (ms)"
+    "description": "Time to fetch LocalStorage data before we can clean the cache (ms)"
   },
-  "LOCALDOMSTORAGE_TIMER_FLUSH_MS": {
+  "LOCALDOMSTORAGE_SESSIONONLY_PRELOAD_BLOCKING_MS": {
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
     "extended_statistics_ok": true,
-    "description": "Time to flush dirty entries from the cache (ms)"
+    "description": "Time to fetch LocalStorage data before we can expose them as session only data (ms)"
   },
   "LOCALDOMSTORAGE_KEY_SIZE_BYTES": {
     "kind": "exponential",
diff --git a/toolkit/content/Services.jsm b/toolkit/content/Services.jsm
index 93e78ddae128..6adb26965425 100644
--- a/toolkit/content/Services.jsm
+++ b/toolkit/content/Services.jsm
@@ -50,7 +50,7 @@ let initTable = [
   ["search", "@mozilla.org/browser/search-service;1", "nsIBrowserSearchService"],
 #endif
   ["storage", "@mozilla.org/storage/service;1", "mozIStorageService"],
-  ["domStorageManager", "@mozilla.org/dom/storagemanager;1", "nsIDOMStorageManager"],
+  ["domStorageManager", "@mozilla.org/dom/localStorage-manager;1", "nsIDOMStorageManager"],
   ["strings", "@mozilla.org/intl/stringbundle;1", "nsIStringBundleService"],
   ["telemetry", "@mozilla.org/base/telemetry;1", "nsITelemetry"],
   ["tm", "@mozilla.org/thread-manager;1", "nsIThreadManager"],
diff --git a/toolkit/forgetaboutsite/test/unit/test_removeDataFromDomain.js b/toolkit/forgetaboutsite/test/unit/test_removeDataFromDomain.js
index 9674f56db88b..ab10e8a598e2 100644
--- a/toolkit/forgetaboutsite/test/unit/test_removeDataFromDomain.js
+++ b/toolkit/forgetaboutsite/test/unit/test_removeDataFromDomain.js
@@ -659,9 +659,9 @@ function test_storage_cleared()
     let principal = Cc["@mozilla.org/scriptsecuritymanager;1"].
                     getService(Ci.nsIScriptSecurityManager).
                     getNoAppCodebasePrincipal(aURI);
-    let dsm = Cc["@mozilla.org/dom/storagemanager;1"].
+    let dsm = Cc["@mozilla.org/dom/localStorage-manager;1"].
               getService(Ci.nsIDOMStorageManager);
-    return dsm.getLocalStorageForPrincipal(principal, "");
+    return dsm.createStorage(principal, "");
   }
 
   let s = [
diff --git a/xpcom/base/ErrorList.h b/xpcom/base/ErrorList.h
index 16ebf38db78f..12e02ea419d2 100644
--- a/xpcom/base/ErrorList.h
+++ b/xpcom/base/ErrorList.h
@@ -500,6 +500,12 @@
   ERROR(NS_ERROR_DOM_RETVAL_UNDEFINED,             FAILURE(1013)),
   ERROR(NS_ERROR_DOM_QUOTA_REACHED,                FAILURE(1014)),
   ERROR(NS_ERROR_DOM_JS_EXCEPTION,                 FAILURE(1015)),
+
+  /* May be used to indicate when e.g. setting a property value didn't
+   * actually change the value, like for obj.foo = "bar"; obj.foo = "bar";
+   * the second assignment throws NS_SUCCESS_DOM_NO_OPERATION.
+   */
+  ERROR(NS_SUCCESS_DOM_NO_OPERATION,               SUCCESS(1)),
 #undef MODULE
 
 

From 53ca4cbef732425bbad9309db056dfc628132d75 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Mon, 15 Apr 2013 14:38:58 +0200
Subject: [PATCH 156/438] Bug 850362 - reintroduce bug 842852 - localStorage
 optimizations, r=mak77

---
 dom/src/storage/DOMStorageDBThread.cpp | 85 ++++++++++++++++++++------
 dom/src/storage/DOMStorageDBThread.h   |  3 +
 2 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/dom/src/storage/DOMStorageDBThread.cpp b/dom/src/storage/DOMStorageDBThread.cpp
index 3a18cb0ebdd3..db9845a711aa 100644
--- a/dom/src/storage/DOMStorageDBThread.cpp
+++ b/dom/src/storage/DOMStorageDBThread.cpp
@@ -27,6 +27,9 @@
 // In milliseconds.
 #define FLUSHING_INTERVAL_MS 5000
 
+// Write Ahead Log's maximum size is 512KB
+#define MAX_WAL_SIZE_BYTES 512 * 1024
+
 namespace mozilla {
 namespace dom {
 
@@ -118,12 +121,6 @@ DOMStorageDBThread::Shutdown()
     monitor.Notify();
   }
 
-  mReaderStatements.FinalizeStatements();
-  if (mReaderConnection) {
-    mReaderConnection->Close();
-    mReaderConnection = nullptr;
-  }
-
   PR_JoinThread(mThread);
   mThread = nullptr;
 
@@ -396,26 +393,22 @@ DOMStorageDBThread::OpenDatabaseConnection()
 {
   nsresult rv;
 
+  MOZ_ASSERT(!NS_IsMainThread());
+
   nsCOMPtr<mozIStorageService> service
       = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<mozIStorageConnection> connection;
-  rv = service->OpenUnsharedDatabase(mDatabaseFile, getter_AddRefs(connection));
+  rv = service->OpenUnsharedDatabase(mDatabaseFile, getter_AddRefs(mWorkerConnection));
   if (rv == NS_ERROR_FILE_CORRUPTED) {
     // delete the db and try opening again
     rv = mDatabaseFile->Remove(false);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = service->OpenUnsharedDatabase(mDatabaseFile, getter_AddRefs(connection));
+    rv = service->OpenUnsharedDatabase(mDatabaseFile, getter_AddRefs(mWorkerConnection));
   }
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (NS_IsMainThread()) {
-    connection.swap(mReaderConnection);
-  } else {
-    connection.swap(mWorkerConnection);
-  }
-
   return NS_OK;
 }
 
@@ -435,6 +428,10 @@ DOMStorageDBThread::InitDatabase()
   rv = TryJournalMode();
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // Create a read-only clone
+  (void)mWorkerConnection->Clone(true, getter_AddRefs(mReaderConnection));
+  NS_ENSURE_TRUE(mReaderConnection, NS_ERROR_FAILURE);
+
   mozStorageTransaction transaction(mWorkerConnection, false);
 
   // Ensure Gecko 1.9.1 storage table
@@ -578,18 +575,72 @@ DOMStorageDBThread::TryJournalMode()
     NS_ENSURE_SUCCESS(rv, rv);
   } else {
     mWALModeEnabled = true;
+
+    rv = ConfigureWALBehavior();
+    NS_ENSURE_SUCCESS(rv, rv);
   }
 
   return NS_OK;
 }
 
+nsresult
+DOMStorageDBThread::ConfigureWALBehavior()
+{
+  // Get the DB's page size
+  nsCOMPtr<mozIStorageStatement> stmt;
+  nsresult rv = mWorkerConnection->CreateStatement(NS_LITERAL_CSTRING(
+    MOZ_STORAGE_UNIQUIFY_QUERY_STR "PRAGMA page_size"
+  ), getter_AddRefs(stmt));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  bool hasResult = false;
+  rv = stmt->ExecuteStep(&hasResult);
+  NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && hasResult, NS_ERROR_FAILURE);
+
+  int32_t pageSize = 0;
+  rv = stmt->GetInt32(0, &pageSize);
+  NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && pageSize > 0, NS_ERROR_UNEXPECTED);
+
+  // Set the threshold for auto-checkpointing the WAL.
+  // We don't want giant logs slowing down reads & shutdown.
+  int32_t thresholdInPages = static_cast<int32_t>(MAX_WAL_SIZE_BYTES / pageSize);
+  nsAutoCString thresholdPragma("PRAGMA wal_autocheckpoint = ");
+  thresholdPragma.AppendInt(thresholdInPages);
+  rv = mWorkerConnection->ExecuteSimpleSQL(thresholdPragma);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Set the maximum WAL log size to reduce footprint on mobile (large empty
+  // WAL files will be truncated)
+  nsAutoCString journalSizePragma("PRAGMA journal_size_limit = ");
+  // bug 600307: mak recommends setting this to 3 times the auto-checkpoint threshold
+  journalSizePragma.AppendInt(MAX_WAL_SIZE_BYTES * 3);
+  rv = mWorkerConnection->ExecuteSimpleSQL(journalSizePragma);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
 nsresult
 DOMStorageDBThread::ShutdownDatabase()
 {
+  // Has to be called on the worker thread.
+  MOZ_ASSERT(!NS_IsMainThread());
+
   nsresult rv = mStatus;
 
+  mDBReady = false;
+
   // Finalize the cached statements.
+  mReaderStatements.FinalizeStatements();
   mWorkerStatements.FinalizeStatements();
+
+  if (mReaderConnection) {
+    // No need to sync access to mReaderConnection since the main thread
+    // is right now joining this thread, unable to execute any events.
+    mReaderConnection->Close();
+    mReaderConnection = nullptr;
+  }
+
   if (mWorkerConnection) {
     rv = mWorkerConnection->Close();
     mWorkerConnection = nullptr;
@@ -744,12 +795,6 @@ DOMStorageDBThread::DBOperation::Perform(DOMStorageDBThread* aThread)
 
     StatementCache* statements;
     if (MOZ_UNLIKELY(NS_IsMainThread())) {
-      if (MOZ_UNLIKELY(!aThread->mReaderConnection)) {
-        // Do lazy main thread connection opening
-        rv = aThread->OpenDatabaseConnection();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
       statements = &aThread->mReaderStatements;
     } else {
       statements = &aThread->mWorkerStatements;
diff --git a/dom/src/storage/DOMStorageDBThread.h b/dom/src/storage/DOMStorageDBThread.h
index d6c6bda4a9d3..7e930c1e7ed0 100644
--- a/dom/src/storage/DOMStorageDBThread.h
+++ b/dom/src/storage/DOMStorageDBThread.h
@@ -315,6 +315,9 @@ private:
   nsresult SetJournalMode(bool aIsWal);
   nsresult TryJournalMode();
 
+  // Sets the threshold for auto-checkpointing the WAL.
+  nsresult ConfigureWALBehavior();
+
   void SetHigherPriority();
   void SetDefaultPriority();
 

From fe05965115730b4b182d207bc602f8ddafaf3e05 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Mon, 15 Apr 2013 12:20:48 +0800
Subject: [PATCH 157/438] Bug 855190 - Use new async getCharsetForURI in
 /toolkit/components/places/tests/unit/test_bookmarks_json.js. r=mak

---
 .../places/tests/unit/test_bookmarks_html.js  |   7 +-
 .../places/tests/unit/test_bookmarks_json.js  | 167 ++++++++++--------
 2 files changed, 91 insertions(+), 83 deletions(-)

diff --git a/toolkit/components/places/tests/unit/test_bookmarks_html.js b/toolkit/components/places/tests/unit/test_bookmarks_html.js
index e1402f484e9d..a050a548f118 100644
--- a/toolkit/components/places/tests/unit/test_bookmarks_html.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_html.js
@@ -306,9 +306,8 @@ function testImportedBookmarksToFolder(aFolder)
 function checkItem(aExpected, aNode)
 {
   let id = aNode.itemId;
-  let deferred = Promise.defer();
 
-  Task.spawn(function() {
+  return Task.spawn(function() {
     for (prop in aExpected) {
       switch (prop) {
         case "type":
@@ -401,7 +400,5 @@ function checkItem(aExpected, aNode)
           throw new Error("Unknown property");
       }
     }
-  }).then(deferred.resolve);
-
-  return deferred.promise;
+  });
 }
diff --git a/toolkit/components/places/tests/unit/test_bookmarks_json.js b/toolkit/components/places/tests/unit/test_bookmarks_json.js
index 42bac7754e80..09a97186ecff 100644
--- a/toolkit/components/places/tests/unit/test_bookmarks_json.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_json.js
@@ -78,7 +78,7 @@ add_task(function test_import_bookmarks() {
   bookmarksFile = do_get_file("bookmarks.json");
 
   yield BookmarkJSONUtils.importFromFile(bookmarksFile, true);
-  testImportedBookmarks();
+  yield testImportedBookmarks();
 });
 
 add_task(function test_export_bookmarks() {
@@ -90,7 +90,7 @@ add_task(function test_export_bookmarks() {
 add_task(function test_import_exported_bookmarks() {
   remove_all_bookmarks();
   yield BookmarkJSONUtils.importFromFile(bookmarksExportedFile, true);
-  testImportedBookmarks();
+  yield testImportedBookmarks();
 });
 
 add_task(function test_import_ontop() {
@@ -98,7 +98,7 @@ add_task(function test_import_ontop() {
   yield BookmarkJSONUtils.importFromFile(bookmarksExportedFile, true);
   yield BookmarkJSONUtils.exportToFile(bookmarksExportedFile);
   yield BookmarkJSONUtils.importFromFile(bookmarksExportedFile, true);
-  testImportedBookmarks();
+  yield testImportedBookmarks();
 });
 
 add_task(function test_clean() {
@@ -128,7 +128,9 @@ function testImportedBookmarks() {
     let items = test_bookmarks[group];
     do_check_eq(root.childCount, items.length);
 
-    items.forEach(function (item, index) checkItem(item, root.getChild(index)));
+    for (let key in items) {
+      yield checkItem(items[key], root.getChild(key));
+    }
 
     root.containerOpen = false;
   }
@@ -136,85 +138,94 @@ function testImportedBookmarks() {
 
 function checkItem(aExpected, aNode) {
   let id = aNode.itemId;
-  for (prop in aExpected) {
-    switch (prop) {
-      case "type":
-        do_check_eq(aNode.type, aExpected.type);
-        break;
-      case "title":
-        do_check_eq(aNode.title, aExpected.title);
-        break;
-      case "description":
-        do_check_eq(PlacesUtils.annotations.getItemAnnotation(
-                    id, DESCRIPTION_ANNO), aExpected.description);
-        break;
-      case "dateAdded":
+
+  return Task.spawn(function() {
+    for (prop in aExpected) {
+      switch (prop) {
+        case "type":
+          do_check_eq(aNode.type, aExpected.type);
+          break;
+        case "title":
+          do_check_eq(aNode.title, aExpected.title);
+          break;
+        case "description":
+          do_check_eq(PlacesUtils.annotations.getItemAnnotation(
+                      id, DESCRIPTION_ANNO), aExpected.description);
+          break;
+        case "dateAdded":
           do_check_eq(PlacesUtils.bookmarks.getItemDateAdded(id),
                       aExpected.dateAdded);
-        break;
-      case "lastModified":
+          break;
+        case "lastModified":
           do_check_eq(PlacesUtils.bookmarks.getItemLastModified(id),
                       aExpected.lastModified);
-        break;
-      case "url":
-        PlacesUtils.livemarks.getLivemark(
-          { id: id },
-          function (aStatus, aLivemark) {
-            if (!Components.isSuccessCode(aStatus)) {
-              do_check_eq(aNode.uri, aExpected.url);
-            }
-          }
-        );
-        break;
-      case "icon":
-        let deferred = Promise.defer();
-        PlacesUtils.favicons.getFaviconDataForPage(
-          NetUtil.newURI(aExpected.url),
-          function (aURI, aDataLen, aData, aMimeType) {
-            let base64Icon = "data:image/png;base64," +
-              base64EncodeString(String.fromCharCode.apply(String, aData));
-            do_check_true(base64Icon == aExpected.icon);
-            deferred.resolve();
-        });
-        return deferred.promise;
-        break;
-      case "keyword":
-        break;
-      case "sidebar":
-        do_check_eq(PlacesUtils.annotations.itemHasAnnotation(
-                    id, LOAD_IN_SIDEBAR_ANNO), aExpected.sidebar);
-        break;
-      case "postData":
-        do_check_eq(PlacesUtils.annotations.getItemAnnotation(
-                    id, PlacesUtils.POST_DATA_ANNO), aExpected.postData);
-        break;
-      case "charset":
-        do_check_eq(PlacesUtils.history.getCharsetForURI(
-                    NetUtil.newURI(aNode.uri)), aExpected.charset);
-        break;
-      case "feedUrl":
-        PlacesUtils.livemarks.getLivemark(
-          { id: id },
-          function (aStatus, aLivemark) {
-            do_check_true(Components.isSuccessCode(aStatus));
-            do_check_eq(aLivemark.siteURI.spec, aExpected.url);
-            do_check_eq(aLivemark.feedURI.spec, Expected.feedUrl);
-          }
-        );
-        break;
-      case "children":
-        let folder = aNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
-        do_check_eq(folder.hasChildren, aExpected.children.length > 0);
-        folder.containerOpen = true;
-        do_check_eq(folder.childCount, aExpected.children.length);
+          break;
+        case "url":
+          yield function() {
+            let deferred = Promise.defer();
+            PlacesUtils.livemarks.getLivemark(
+              { id: id },
+              function (aStatus, aLivemark) {
+                if (!Components.isSuccessCode(aStatus)) {
+                  do_check_eq(aNode.uri, aExpected.url);
+                }
+                deferred.resolve();
+              });
+            return deferred.promise; }();
+          break;
+        case "icon":
+          yield function() {
+            let deferred = Promise.defer();
+            PlacesUtils.favicons.getFaviconDataForPage(
+              NetUtil.newURI(aExpected.url),
+              function (aURI, aDataLen, aData, aMimeType) {
+                let base64Icon = "data:image/png;base64," +
+                      base64EncodeString(String.fromCharCode.apply(String, aData));
+                do_check_true(base64Icon == aExpected.icon);
+                deferred.resolve();
+              });
+            return deferred.promise; }();
+          break;
+        case "keyword":
+          break;
+        case "sidebar":
+          do_check_eq(PlacesUtils.annotations.itemHasAnnotation(
+                      id, LOAD_IN_SIDEBAR_ANNO), aExpected.sidebar);
+          break;
+        case "postData":
+          do_check_eq(PlacesUtils.annotations.getItemAnnotation(
+                      id, PlacesUtils.POST_DATA_ANNO), aExpected.postData);
+          break;
+        case "charset":
+          let testURI = NetUtil.newURI(aNode.uri);
+          do_check_eq((yield PlacesUtils.getCharsetForURI(testURI)), aExpected.charset);
+          break;
+        case "feedUrl":
+          yield function() {
+            let deferred = Promise.defer();
+            PlacesUtils.livemarks.getLivemark(
+              { id: id },
+              function (aStatus, aLivemark) {
+                do_check_true(Components.isSuccessCode(aStatus));
+                do_check_eq(aLivemark.siteURI.spec, aExpected.url);
+                do_check_eq(aLivemark.feedURI.spec, aExpected.feedUrl);
+                deferred.resolve();
+              });
+            return deferred.promise; }();
+          break;
+        case "children":
+          let folder = aNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
+          do_check_eq(folder.hasChildren, aExpected.children.length > 0);
+          folder.containerOpen = true;
+          do_check_eq(folder.childCount, aExpected.children.length);
 
-        aExpected.children.forEach(
-          function (item, index) checkItem(item, folder.getChild(index)));
+          aExpected.children.forEach(function (item, index) checkItem(item, folder.getChild(index)));
 
-        folder.containerOpen = false;
-        break;
-      default:
-        throw new Error("Unknown property");
+          folder.containerOpen = false;
+          break;
+        default:
+          throw new Error("Unknown property");
+      }
     }
-  };
+  });
 }

From 2793bc2a0e46d6c2ab59e63e46f5d70c4d97b584 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Mon, 15 Apr 2013 08:50:35 -0400
Subject: [PATCH 158/438] bug 819734 - Token Bucket for Network Bursts part 1/2
 [base] r=honzab

---
 modules/libpref/src/init/all.js               |   5 +
 netwerk/base/src/EventTokenBucket.cpp         | 313 ++++++++++++++++++
 netwerk/base/src/EventTokenBucket.h           | 127 +++++++
 netwerk/base/src/Makefile.in                  |   1 +
 netwerk/protocol/http/nsHttpConnection.cpp    |   2 +-
 netwerk/protocol/http/nsHttpConnectionMgr.cpp |  64 +++-
 netwerk/protocol/http/nsHttpConnectionMgr.h   |  14 +
 netwerk/protocol/http/nsHttpHandler.cpp       |  56 ++++
 netwerk/protocol/http/nsHttpHandler.h         |  42 ++-
 netwerk/protocol/http/nsHttpTransaction.cpp   |  45 +++
 netwerk/protocol/http/nsHttpTransaction.h     |  28 ++
 11 files changed, 689 insertions(+), 8 deletions(-)
 create mode 100644 netwerk/base/src/EventTokenBucket.cpp
 create mode 100644 netwerk/base/src/EventTokenBucket.h

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index f20a542c0988..64eba14d90a4 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1003,6 +1003,11 @@ pref("network.http.spdy.send-buffer-size", 131072);
 
 pref("network.http.diagnostics", false);
 
+pref("network.http.pacing.requests.enabled", false);
+pref("network.http.pacing.requests.min-parallelism", 6);
+pref("network.http.pacing.requests.hz", 100);
+pref("network.http.pacing.requests.burst", 32);
+
 // default values for FTP
 // in a DSCP environment this should be 40 (0x28, or AF11), per RFC-4594,
 // Section 4.8 "High-Throughput Data Service Class", and 80 (0x50, or AF22)
diff --git a/netwerk/base/src/EventTokenBucket.cpp b/netwerk/base/src/EventTokenBucket.cpp
new file mode 100644
index 000000000000..cb0a3c826a86
--- /dev/null
+++ b/netwerk/base/src/EventTokenBucket.cpp
@@ -0,0 +1,313 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* 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 "EventTokenBucket.h"
+
+#include "nsNetUtil.h"
+#include "nsSocketTransportService2.h"
+
+extern PRThread *gSocketThread;
+
+namespace mozilla {
+namespace net {
+
+////////////////////////////////////////////
+// EventTokenBucketCancelable
+////////////////////////////////////////////
+
+class TokenBucketCancelable : public nsICancelable
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSICANCELABLE
+
+  TokenBucketCancelable(class ATokenBucketEvent *event);
+  virtual ~TokenBucketCancelable() {}
+  void Fire();
+
+private:
+  friend class EventTokenBucket;
+  ATokenBucketEvent *mEvent;
+};
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(TokenBucketCancelable, nsICancelable)
+
+TokenBucketCancelable::TokenBucketCancelable(ATokenBucketEvent *event)
+  : mEvent(event)
+{
+}
+
+NS_IMETHODIMP
+TokenBucketCancelable::Cancel(nsresult reason)
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  mEvent = nullptr;
+  return NS_OK;
+}
+
+void
+TokenBucketCancelable::Fire()
+{
+  if (!mEvent)
+    return;
+
+  ATokenBucketEvent *event = mEvent;
+  mEvent = nullptr;
+  event->OnTokenBucketAdmitted();
+}
+
+////////////////////////////////////////////
+// EventTokenBucket
+////////////////////////////////////////////
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(EventTokenBucket, nsITimerCallback)
+
+// by default 1hz with no burst
+EventTokenBucket::EventTokenBucket(uint32_t eventsPerSecond,
+                                   uint32_t burstSize)
+  : mUnitCost(kUsecPerSec)
+  , mMaxCredit(kUsecPerSec)
+  , mCredit(kUsecPerSec)
+  , mPaused(false)
+  , mStopped(false)
+  , mTimerArmed(false)
+{
+  MOZ_COUNT_CTOR(EventTokenBucket);
+  mLastUpdate = TimeStamp::Now();
+
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsresult rv;
+  nsCOMPtr<nsIEventTarget> sts;
+  nsCOMPtr<nsIIOService> ioService = do_GetIOService(&rv);
+  if (NS_SUCCEEDED(rv))
+    sts = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
+  if (NS_SUCCEEDED(rv))
+    mTimer = do_CreateInstance("@mozilla.org/timer;1");
+  if (mTimer)
+    mTimer->SetTarget(sts);
+  SetRate(eventsPerSecond, burstSize);
+}
+
+EventTokenBucket::~EventTokenBucket()
+{
+  SOCKET_LOG(("EventTokenBucket::dtor %p events=%d\n",
+              this, mEvents.GetSize()));
+
+  MOZ_COUNT_DTOR(EventTokenBucket);
+  if (mTimer && mTimerArmed)
+    mTimer->Cancel();
+
+  // Complete any queued events to prevent hangs
+  while (mEvents.GetSize()) {
+    nsRefPtr<TokenBucketCancelable> cancelable = 
+      dont_AddRef(static_cast<TokenBucketCancelable *>(mEvents.PopFront()));
+    cancelable->Fire();
+  }
+}
+
+void
+EventTokenBucket::SetRate(uint32_t eventsPerSecond,
+                          uint32_t burstSize)
+{
+  SOCKET_LOG(("EventTokenBucket::SetRate %p %u %u\n",
+              this, eventsPerSecond, burstSize));
+
+  if (eventsPerSecond > kMaxHz) {
+    eventsPerSecond = kMaxHz;
+    SOCKET_LOG(("  eventsPerSecond out of range\n"));
+  }
+
+  if (!eventsPerSecond) {
+    eventsPerSecond = 1;
+    SOCKET_LOG(("  eventsPerSecond out of range\n"));
+  }
+
+  mUnitCost = kUsecPerSec / eventsPerSecond;
+  mMaxCredit = mUnitCost * burstSize;
+  if (mMaxCredit > kUsecPerSec * 60 * 15) {
+    SOCKET_LOG(("  burstSize out of range\n"));
+    mMaxCredit = kUsecPerSec * 60 * 15;
+  }
+  mCredit = mMaxCredit;
+  mLastUpdate = TimeStamp::Now();
+}
+
+void
+EventTokenBucket::ClearCredits()
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  SOCKET_LOG(("EventTokenBucket::ClearCredits %p\n", this));
+  mCredit = 0;
+}
+
+uint32_t
+EventTokenBucket::BurstEventsAvailable()
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  return static_cast<uint32_t>(mCredit / mUnitCost);
+}
+
+uint32_t
+EventTokenBucket::QueuedEvents()
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  return mEvents.GetSize();
+}
+
+void
+EventTokenBucket::Pause()
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  SOCKET_LOG(("EventTokenBucket::Pause %p\n", this));
+  if (mPaused || mStopped)
+    return;
+
+  mPaused = true;
+  if (mTimerArmed) {
+    mTimer->Cancel();
+    mTimerArmed = false;
+  }
+}
+
+void
+EventTokenBucket::UnPause()
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  SOCKET_LOG(("EventTokenBucket::UnPause %p\n", this));
+  if (!mPaused || mStopped)
+    return;
+
+  mPaused = false;
+  DispatchEvents();
+  UpdateTimer();
+}
+
+nsresult
+EventTokenBucket::SubmitEvent(ATokenBucketEvent *event, nsICancelable **cancelable)
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  SOCKET_LOG(("EventTokenBucket::SubmitEvent %p\n", this));
+
+  if (mStopped || !mTimer)
+    return NS_ERROR_FAILURE;
+
+  UpdateCredits();
+
+  nsRefPtr<TokenBucketCancelable> cancelEvent = new TokenBucketCancelable(event);
+  // When this function exits the cancelEvent needs 2 references, one for the
+  // mEvents queue and one for the caller of SubmitEvent()
+
+  NS_ADDREF(*cancelable = cancelEvent.get());
+
+  if (mPaused || !TryImmediateDispatch(cancelEvent.get())) {
+    // queue it
+    SOCKET_LOG(("   queued\n"));
+    mEvents.Push(cancelEvent.forget().get());
+    UpdateTimer();
+  }
+  else {
+    SOCKET_LOG(("   dispatched synchronously\n"));
+  }
+
+  return NS_OK;
+}
+
+bool
+EventTokenBucket::TryImmediateDispatch(TokenBucketCancelable *cancelable)
+{
+  if (mCredit < mUnitCost)
+    return false;
+
+  mCredit -= mUnitCost;
+  cancelable->Fire();
+  return true;
+}
+
+void
+EventTokenBucket::DispatchEvents()
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  SOCKET_LOG(("EventTokenBucket::DispatchEvents %p %d\n", this, mPaused));
+  if (mPaused || mStopped)
+    return;
+
+  while (mEvents.GetSize() && mUnitCost <= mCredit) {
+    nsRefPtr<TokenBucketCancelable> cancelable = 
+      dont_AddRef(static_cast<TokenBucketCancelable *>(mEvents.PopFront()));
+    if (cancelable->mEvent) {
+      SOCKET_LOG(("EventTokenBucket::DispachEvents [%p] "
+                  "Dispatching queue token bucket event cost=%lu credit=%lu\n",
+                  this, mUnitCost, mCredit));
+      mCredit -= mUnitCost;
+      cancelable->Fire();
+    }
+  }
+}
+ 
+void
+EventTokenBucket::UpdateTimer()
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  if (mTimerArmed || mPaused || mStopped || !mEvents.GetSize() || !mTimer)
+    return;
+
+  if (mCredit >= mUnitCost)
+    return;
+
+  // determine the time needed to wait to accumulate enough credits to admit
+  // one more event and set the timer for that point. Always round it
+  // up because firing early doesn't help.
+  //
+  uint64_t deficit = mUnitCost - mCredit;
+  uint64_t msecWait = (deficit + (kUsecPerMsec - 1)) / kUsecPerMsec;
+
+  if (msecWait < 4) // minimum wait
+    msecWait = 4;
+  else if (msecWait > 60000) // maximum wait
+    msecWait = 60000;
+
+  SOCKET_LOG(("EventTokenBucket::UpdateTimer %p for %dms\n",
+              this, msecWait));
+  nsresult rv = mTimer->InitWithCallback(this, static_cast<uint32_t>(msecWait),
+                                         nsITimer::TYPE_ONE_SHOT);
+  mTimerArmed = NS_SUCCEEDED(rv);
+}
+
+NS_IMETHODIMP
+EventTokenBucket::Notify(nsITimer *timer)
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  SOCKET_LOG(("EventTokenBucket::Notify() %p\n", this));
+  mTimerArmed = false;
+  if (mStopped)
+    return NS_OK;
+
+  UpdateCredits();
+  DispatchEvents();
+  UpdateTimer();
+
+  return NS_OK;
+}
+
+void
+EventTokenBucket::UpdateCredits()
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+
+  TimeStamp now = TimeStamp::Now();
+  TimeDuration elapsed = now - mLastUpdate;
+  mLastUpdate = now;
+
+  mCredit += static_cast<uint64_t>(elapsed.ToMicroseconds());
+  if (mCredit > mMaxCredit)
+    mCredit = mMaxCredit;
+  SOCKET_LOG(("EventTokenBucket::UpdateCredits %p to %lu (%lu each.. %3.2f)\n",
+              this, mCredit, mUnitCost, (double)mCredit / mUnitCost));
+}
+
+} // mozilla::net
+} // mozilla
diff --git a/netwerk/base/src/EventTokenBucket.h b/netwerk/base/src/EventTokenBucket.h
new file mode 100644
index 000000000000..c7d86798ccf1
--- /dev/null
+++ b/netwerk/base/src/EventTokenBucket.h
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* 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/. */
+
+#ifndef NetEventTokenBucket_h__
+#define NetEventTokenBucket_h__
+
+#include "nsCOMPtr.h"
+#include "nsDeque.h"
+#include "nsICancelable.h"
+#include "nsITimer.h"
+
+#include "mozilla/TimeStamp.h"
+
+namespace mozilla {
+namespace net {
+
+/* A token bucket is used to govern the maximum rate a series of events
+   can be executed at. For instance if your event was "eat a piece of cake"
+   then a token bucket configured to allow "1 piece per day" would spread
+   the eating of a 8 piece cake over 8 days even if you tried to eat the
+   whole thing up front. In a practical sense it 'costs' 1 token to execute
+   an event and tokens are 'earned' at a particular rate as time goes by.
+   
+   The token bucket can be perfectly smooth or allow a configurable amount of
+   burstiness. A bursty token bucket allows you to save up unused credits, while
+   a perfectly smooth one would not. A smooth "1 per day" cake token bucket
+   would require 9 days to eat that cake if you skipped a slice on day 4
+   (use the token or lose it), while a token bucket configured with a burst
+   of 2 would just let you eat 2 slices on day 5 (the credits for day 4 and day
+   5) and finish the cake in the usual 8 days.
+
+   EventTokenBucket(hz=20, burst=5) creates a token bucket with the following properties:
+
+  + events from an infinite stream will be admitted 20 times per second (i.e.
+    hz=20 means 1 event per 50 ms). Timers will be used to space things evenly down to
+    5ms gaps (i.e. up to 200hz). Token buckets with rates greater than 200hz will admit
+    multiple events with 5ms gaps between them. 10000hz is the maximum rate and 1hz is
+    the minimum rate.
+
+  + The burst size controls the limit of 'credits' that a token bucket can accumulate
+    when idle. For our (20,5) example each event requires 50ms of credit (again, 20hz = 50ms
+    per event). a burst size of 5 means that the token bucket can accumulate a
+    maximum of 250ms (5 * 50ms) for this bucket. If no events have been admitted for the 
+    last full second the bucket can still only accumulate 250ms of credit - but that credit
+    means that 5 events can be admitted without delay. A burst size of 1 is the minimum.
+    The EventTokenBucket is created with maximum credits already applied, but they
+    can be cleared with the ClearCredits() method. The maximum burst size is
+    15 minutes worth of events.
+
+  + An event is submitted to the token bucket asynchronously through SubmitEvent().
+    The OnTokenBucketAdmitted() method of the submitted event is used as a callback
+    when the event is ready to run. A cancelable event is returned to the SubmitEvent() caller
+    for use in the case they do not wish to wait for the callback.
+*/
+
+class EventTokenBucket;
+
+class ATokenBucketEvent 
+{
+public:
+  virtual void OnTokenBucketAdmitted() = 0;
+};
+
+class TokenBucketCancelable;
+
+class EventTokenBucket : public nsITimerCallback
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSITIMERCALLBACK
+
+  // This should be constructed on the main thread
+  EventTokenBucket(uint32_t eventsPerSecond, uint32_t burstSize);
+  virtual ~EventTokenBucket();
+
+  // These public methods are all meant to be called from the socket thread
+  void ClearCredits();
+  uint32_t BurstEventsAvailable();
+  uint32_t QueuedEvents();
+
+  // a paused token bucket will not process any events, but it will accumulate
+  // credits. ClearCredits can be used before unpausing if desired.
+  void Pause();
+  void UnPause();
+  void Stop() { mStopped = true; }
+
+  // The returned cancelable event can only be canceled from the socket thread
+  nsresult SubmitEvent(ATokenBucketEvent *event, nsICancelable **cancelable);
+
+private:
+  friend class RunNotifyEvent;
+  friend class SetTimerEvent;
+
+  bool TryImmediateDispatch(TokenBucketCancelable *event);
+  void SetRate(uint32_t eventsPerSecond, uint32_t burstSize);
+
+  void DispatchEvents();
+  void UpdateTimer();
+  void UpdateCredits();
+
+  const static uint64_t kUsecPerSec =  1000000;
+  const static uint64_t kUsecPerMsec = 1000;
+  const static uint64_t kMaxHz = 10000;
+
+  uint64_t mUnitCost;   // usec of credit needed for 1 event (from eventsPerSecond)
+  uint64_t mMaxCredit; // usec mCredit limit (from busrtSize)
+  uint64_t mCredit; // usec of accumulated credit.
+
+  bool     mPaused;
+  bool     mStopped;
+  nsDeque  mEvents;
+  bool     mTimerArmed;
+  TimeStamp mLastUpdate;
+
+  // The timer is created on the main thread, but is armed and executes Notify()
+  // callbacks on the socket thread in order to maintain low latency of event
+  // delivery.
+  nsCOMPtr<nsITimer> mTimer;
+};
+
+} // ::mozilla::net
+} // ::mozilla
+
+#endif
diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in
index 6280bafa8283..6adaf024c112 100644
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -79,6 +79,7 @@ CPPSRCS		= \
 		ProxyAutoConfig.cpp \
 		Dashboard.cpp \
 		NetworkActivityMonitor.cpp \
+		EventTokenBucket.cpp \
 		$(NULL)
 
 LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/base
diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp
index a315d7adb9b3..88cc877226e3 100644
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -1247,7 +1247,7 @@ nsHttpConnection::OnSocketWritable()
         else {
             if (!mReportedSpdy) {
                 mReportedSpdy = true;
-                gHttpHandler->ConnMgr()->ReportSpdyConnection(this, mUsingSpdyVersion);
+                gHttpHandler->ConnMgr()->ReportSpdyConnection(this, mEverUsedSpdy);
             }
 
             LOG(("  writing transaction request stream\n"));
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
index 5a8ccb3f8fd0..08fccd0f5863 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -63,6 +63,7 @@ nsHttpConnectionMgr::nsHttpConnectionMgr()
     , mIsShuttingDown(false)
     , mNumActiveConns(0)
     , mNumIdleConns(0)
+    , mNumSpdyActiveConns(0)
     , mNumHalfOpenConns(0)
     , mTimeOfNextWakeUp(UINT64_MAX)
     , mTimeoutTickArmed(false)
@@ -413,6 +414,28 @@ nsHttpConnectionMgr::ProcessPendingQ()
     return PostEvent(&nsHttpConnectionMgr::OnMsgProcessPendingQ, 0, nullptr);
 }
 
+void
+nsHttpConnectionMgr::OnMsgUpdateRequestTokenBucket(int32_t, void *param)
+{
+    nsRefPtr<EventTokenBucket> tokenBucket =
+        dont_AddRef(static_cast<EventTokenBucket *>(param));
+    gHttpHandler->SetRequestTokenBucket(tokenBucket);
+}
+
+nsresult
+nsHttpConnectionMgr::UpdateRequestTokenBucket(EventTokenBucket *aBucket)
+{
+    nsRefPtr<EventTokenBucket> bucket(aBucket);
+    
+    // Call From main thread when a new EventTokenBucket has been made in order
+    // to post the new value to the socket thread.
+    nsresult rv = PostEvent(&nsHttpConnectionMgr::OnMsgUpdateRequestTokenBucket,
+                            0, bucket.get());
+    if (NS_SUCCEEDED(rv))
+        bucket.forget();
+    return rv;
+}
+
 // Given a nsHttpConnectionInfo find the connection entry object that
 // contains either the nshttpconnection or nshttptransaction parameter.
 // Normally this is done by the hashkey lookup of connectioninfo,
@@ -502,8 +525,9 @@ nsHttpConnectionMgr::ReportSpdyConnection(nsHttpConnection *conn,
 
     if (!usingSpdy)
         return;
-    
+
     ent->mUsingSpdy = true;
+    mNumSpdyActiveConns++;
 
     uint32_t ttl = conn->TimeToLive();
     uint64_t timeOfExpire = NowInSeconds() + ttl;
@@ -957,7 +981,7 @@ nsHttpConnectionMgr::ShutdownPassCB(const nsACString &key,
         conn = ent->mActiveConns[0];
 
         ent->mActiveConns.RemoveElementAt(0);
-        self->mNumActiveConns--;
+        self->DecrementActiveConnCount(conn);
 
         conn->Close(NS_ERROR_ABORT);
         NS_RELEASE(conn);
@@ -1588,6 +1612,23 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent,
         }
     }
 
+    // Subject most transactions at high parallelism to rate pacing.
+    // It will only be actually submitted to the
+    // token bucket once, and if possible it is granted admission synchronously.
+    // It is important to leave a transaction in the pending queue when blocked by
+    // pacing so it can be found on cancel if necessary.
+    // Transactions that cause blocking or bypass it (e.g. js/css) are not rate
+    // limited.
+    if (gHttpHandler->UseRequestTokenBucket() &&
+        (mNumActiveConns >= mNumSpdyActiveConns) && // just check for robustness sake
+        ((mNumActiveConns - mNumSpdyActiveConns) >= gHttpHandler->RequestTokenBucketMinParallelism()) &&
+        !(caps & (NS_HTTP_LOAD_AS_BLOCKING | NS_HTTP_LOAD_UNBLOCKED))) {
+        if (!trans->TryToRunPacedRequest()) {
+            LOG(("   blocked due to rate pacing\n"));
+            return NS_ERROR_NOT_AVAILABLE;
+        }
+    }
+
     // step 2
     // consider an idle persistent connection
     if (caps & NS_HTTP_ALLOW_KEEPALIVE) {
@@ -1678,6 +1719,11 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent,
          "[ci=%s trans=%x caps=%x conn=%x priority=%d]\n",
          ent->mConnInfo->HashKey().get(), trans, caps, conn, priority));
 
+    // It is possible for a rate-paced transaction to be dispatched independent
+    // of the token bucket when the amount of parallelization has changed or
+    // when a muxed connection (e.g. spdy or pipelines) becomes available.
+    trans->CancelPacing(NS_OK);
+
     if (conn->UsingSpdy()) {
         LOG(("Spdy Dispatch Transaction via Activate(). Transaction host = %s,"
              "Connection host = %s\n",
@@ -1765,7 +1811,7 @@ nsHttpConnectionMgr::DispatchAbstractTransaction(nsConnectionEntry *ent,
         ent->mActiveConns.RemoveElement(conn);
         if (conn == ent->mYellowConnection)
             ent->OnYellowComplete();
-        mNumActiveConns--;
+        DecrementActiveConnCount(conn);
         ConditionallyStopTimeoutTick();
 
         // sever back references to connection, and do so without triggering
@@ -1901,6 +1947,14 @@ nsHttpConnectionMgr::AddActiveConn(nsHttpConnection *conn,
     ActivateTimeoutTick();
 }
 
+void
+nsHttpConnectionMgr::DecrementActiveConnCount(nsHttpConnection *conn)
+{
+    mNumActiveConns--;
+    if (conn->EverUsedSpdy())
+        mNumSpdyActiveConns--;
+}
+
 void
 nsHttpConnectionMgr::StartedConnect()
 {
@@ -2213,13 +2267,13 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, void *param)
             // reused.
             conn->DontReuse();
         }
-        
+
         if (ent->mActiveConns.RemoveElement(conn)) {
             if (conn == ent->mYellowConnection)
                 ent->OnYellowComplete();
             nsHttpConnection *temp = conn;
             NS_RELEASE(temp);
-            mNumActiveConns--;
+            DecrementActiveConnCount(conn);
             ConditionallyStopTimeoutTick();
         }
 
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h
index c3c39b9c18f3..97614d600f2a 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.h
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.h
@@ -29,6 +29,12 @@ class nsHttpPipeline;
 
 class nsIHttpUpgradeListener;
 
+namespace mozilla {
+namespace net {
+class EventTokenBucket;
+}
+}
+
 //-----------------------------------------------------------------------------
 
 class nsHttpConnectionMgr : public nsIObserver
@@ -124,6 +130,10 @@ public:
     // been initialized.
     nsresult UpdateParam(nsParamName name, uint16_t value);
 
+    // called from main thread to post a new request token bucket
+    // to the socket thread
+    nsresult UpdateRequestTokenBucket(mozilla::net::EventTokenBucket *aBucket);
+
     // Lookup/Cancel HTTP->SPDY redirections
     bool GetSpdyAlternateProtocol(nsACString &key);
     void ReportSpdyAlternateProtocol(nsHttpConnection *);
@@ -517,6 +527,7 @@ private:
     nsresult CreateTransport(nsConnectionEntry *, nsAHttpTransaction *,
                              uint32_t, bool);
     void     AddActiveConn(nsHttpConnection *, nsConnectionEntry *);
+    void     DecrementActiveConnCount(nsHttpConnection *);
     void     StartedConnect();
     void     RecvdConnect();
 
@@ -605,6 +616,7 @@ private:
     void OnMsgClosePersistentConnections (int32_t, void *);
     void OnMsgProcessFeedback      (int32_t, void *);
     void OnMsgProcessAllSpdyPendingQ (int32_t, void *);
+    void OnMsgUpdateRequestTokenBucket (int32_t, void *);
 
     // Total number of active connections in all of the ConnectionEntry objects
     // that are accessed from mCT connection table.
@@ -612,6 +624,8 @@ private:
     // Total number of idle connections in all of the ConnectionEntry objects
     // that are accessed from mCT connection table.
     uint16_t mNumIdleConns;
+    // Total number of spdy connections which are a subset of the active conns
+    uint16_t mNumSpdyActiveConns;
     // Total number of connections in mHalfOpens ConnectionEntry objects
     // that are accessed from mCT connection table
     uint32_t mNumHalfOpenConns;
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index c617ef394529..4e520a7cebad 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -37,6 +37,8 @@
 #include "nsAlgorithm.h"
 #include "ASpdySession.h"
 #include "mozIApplicationClearPrivateDataParams.h"
+#include "nsICancelable.h"
+#include "EventTokenBucket.h"
 
 #include "nsIXULAppInfo.h"
 
@@ -186,6 +188,10 @@ nsHttpHandler::nsHttpHandler()
     , mSpdyPingTimeout(PR_SecondsToInterval(8))
     , mConnectTimeout(90000)
     , mParallelSpeculativeConnectLimit(6)
+    , mRequestTokenBucketEnabled(false)
+    , mRequestTokenBucketMinParallelism(6)
+    , mRequestTokenBucketHz(100)
+    , mRequestTokenBucketBurst(32)
     , mCritialRequestPrioritization(true)
 {
 #if defined(PR_LOGGING)
@@ -331,9 +337,22 @@ nsHttpHandler::Init()
         mObserverService->AddObserver(this, "webapps-clear-data", true);
     }
 
+    MakeNewRequestTokenBucket();
     return NS_OK;
 }
 
+void
+nsHttpHandler::MakeNewRequestTokenBucket()
+{
+    if (!mConnMgr)
+        return;
+
+    nsRefPtr<mozilla::net::EventTokenBucket> tokenBucket =
+        new mozilla::net::EventTokenBucket(mRequestTokenBucketHz,
+                                           mRequestTokenBucketBurst);
+    mConnMgr->UpdateRequestTokenBucket(tokenBucket);
+}
+
 nsresult
 nsHttpHandler::InitConnectionMgr()
 {
@@ -1197,6 +1216,40 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         }
     }
 
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.enabled"))) {
+        rv = prefs->GetBoolPref(HTTP_PREF("pacing.requests.enabled"),
+                                &cVar);
+        if (NS_SUCCEEDED(rv))
+            mRequestTokenBucketEnabled = cVar;
+    }
+
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.min-parallelism"))) {
+        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.min-parallelism"), &val);
+        if (NS_SUCCEEDED(rv))
+            mRequestTokenBucketMinParallelism = static_cast<uint16_t>(clamped(val, 1, 1024));
+    }
+
+    bool requestTokenBucketUpdated = false;
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.hz"))) {
+        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.hz"), &val);
+        if (NS_SUCCEEDED(rv)) {
+            mRequestTokenBucketHz = static_cast<uint32_t>(clamped(val, 1, 10000));
+            requestTokenBucketUpdated = true;
+        }
+    }
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.burst"))) {
+        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.burst"), &val);
+        if (NS_SUCCEEDED(rv)) {
+            mRequestTokenBucketBurst = val ? val : 1;
+            requestTokenBucketUpdated = true;
+        }
+    }
+    if (requestTokenBucketUpdated) {
+        mRequestTokenBucket = 
+            new mozilla::net::EventTokenBucket(mRequestTokenBucketHz,
+                                               mRequestTokenBucketBurst);
+    }
+
     //
     // Tracking options
     //
@@ -1270,6 +1323,9 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
             }
         }
     }
+    if (requestTokenBucketUpdated) {
+        MakeNewRequestTokenBucket();
+    }
 
 #undef PREF_CHANGED
 #undef MULTI_PREF_CHANGED
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index 80a9ffca8fb0..0d39080269c0 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -35,6 +35,14 @@ class nsHttpTransaction;
 class nsAHttpTransaction;
 class nsIHttpChannel;
 class nsIPrefBranch;
+class nsICancelable;
+
+namespace mozilla {
+namespace net {
+class ATokenBucketEvent;
+class EventTokenBucket;
+}
+}
 
 //-----------------------------------------------------------------------------
 // nsHttpHandler - protocol handler for HTTP and HTTPS
@@ -99,6 +107,9 @@ public:
     uint32_t       ParallelSpeculativeConnectLimit() { return mParallelSpeculativeConnectLimit; }
     bool           CritialRequestPrioritization() { return mCritialRequestPrioritization; }
 
+    bool           UseRequestTokenBucket() { return mRequestTokenBucketEnabled; }
+    uint16_t       RequestTokenBucketMinParallelism() { return mRequestTokenBucketMinParallelism; }
+
     bool           PromptTempRedirect()      { return mPromptTempRedirect; }
 
     nsHttpAuthCache     *AuthCache(bool aPrivate) {
@@ -408,12 +419,39 @@ private:
     // when starting a new speculative connection.
     uint32_t       mParallelSpeculativeConnectLimit;
 
+    // For Rate Pacing of HTTP/1 requests through a netwerk/base/src/EventTokenBucket
+    // Active requests <= *MinParallelism are not subject to the rate pacing
+    bool           mRequestTokenBucketEnabled;
+    uint16_t       mRequestTokenBucketMinParallelism;
+    uint32_t       mRequestTokenBucketHz;  // EventTokenBucket HZ
+    uint32_t       mRequestTokenBucketBurst; // EventTokenBucket Burst
+
     // Whether or not to block requests for non head js/css items (e.g. media)
     // while those elements load.
     bool           mCritialRequestPrioritization;
-};
 
-//-----------------------------------------------------------------------------
+private:
+    // For Rate Pacing Certain Network Events. Only assign this pointer on
+    // socket thread.
+    void MakeNewRequestTokenBucket();
+    nsRefPtr<mozilla::net::EventTokenBucket> mRequestTokenBucket;
+
+public:
+    // Socket thread only
+    nsresult SubmitPacedRequest(mozilla::net::ATokenBucketEvent *event,
+                                nsICancelable **cancel)
+    {
+        if (!mRequestTokenBucket)
+            return NS_ERROR_UNEXPECTED;
+        return mRequestTokenBucket->SubmitEvent(event, cancel);
+    }
+
+    // Socket thread only
+    void SetRequestTokenBucket(mozilla::net::EventTokenBucket *aTokenBucket)
+    {
+        mRequestTokenBucket = aTokenBucket;
+    }
+};
 
 extern nsHttpHandler *gHttpHandler;
 
diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp
index cea4aef408a0..8d772f9b2173 100644
--- a/netwerk/protocol/http/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
@@ -115,6 +115,9 @@ nsHttpTransaction::nsHttpTransaction()
     , mReportedResponseHeader(false)
     , mForTakeResponseHead(nullptr)
     , mResponseHeadTaken(false)
+    , mSubmittedRatePacing(false)
+    , mPassedRatePacing(false)
+    , mSynchronousRatePaceRequest(false)
 {
     LOG(("Creating nsHttpTransaction @%x\n", this));
     gHttpHandler->GetMaxPipelineObjectSize(&mMaxPipelineObjectSize);
@@ -124,6 +127,11 @@ nsHttpTransaction::~nsHttpTransaction()
 {
     LOG(("Destroying nsHttpTransaction @%x\n", this));
 
+    if (mTokenBucketCancel) {
+        mTokenBucketCancel->Cancel(NS_ERROR_ABORT);
+        mTokenBucketCancel = nullptr;
+    }
+
     // Force the callbacks to be released right now
     mCallbacks = nullptr;
 
@@ -688,6 +696,11 @@ nsHttpTransaction::Close(nsresult reason)
         return;
     }
 
+    if (mTokenBucketCancel) {
+        mTokenBucketCancel->Cancel(reason);
+        mTokenBucketCancel = nullptr;
+    }
+
     if (mActivityDistributor) {
         // report the reponse is complete if not already reported
         if (!mResponseIsComplete)
@@ -1616,6 +1629,38 @@ nsHttpTransaction::DeleteSelfOnConsumerThread()
     }
 }
 
+bool
+nsHttpTransaction::TryToRunPacedRequest()
+{
+    if (mSubmittedRatePacing)
+        return mPassedRatePacing;
+
+    mSubmittedRatePacing = true;
+    mSynchronousRatePaceRequest = true;
+    gHttpHandler->SubmitPacedRequest(this, getter_AddRefs(mTokenBucketCancel));
+    mSynchronousRatePaceRequest = false;
+    return mPassedRatePacing;
+}
+
+void
+nsHttpTransaction::OnTokenBucketAdmitted()
+{
+    mPassedRatePacing = true;
+    mTokenBucketCancel = nullptr;
+
+    if (!mSynchronousRatePaceRequest)
+        gHttpHandler->ConnMgr()->ProcessPendingQ(mConnInfo);
+}
+
+void
+nsHttpTransaction::CancelPacing(nsresult reason)
+{
+    if (mTokenBucketCancel) {
+        mTokenBucketCancel->Cancel(reason);
+        mTokenBucketCancel = nullptr;
+    }
+}
+
 //-----------------------------------------------------------------------------
 // nsHttpTransaction::nsISupports
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpTransaction.h b/netwerk/protocol/http/nsHttpTransaction.h
index df3187068a5a..0131442b9906 100644
--- a/netwerk/protocol/http/nsHttpTransaction.h
+++ b/netwerk/protocol/http/nsHttpTransaction.h
@@ -10,6 +10,7 @@
 #include "nsHttpHeaderArray.h"
 #include "nsAHttpTransaction.h"
 #include "nsAHttpConnection.h"
+#include "EventTokenBucket.h"
 #include "nsCOMPtr.h"
 
 #include "nsIPipe.h"
@@ -37,6 +38,7 @@ class UpdateSecurityCallbacks;
 //-----------------------------------------------------------------------------
 
 class nsHttpTransaction : public nsAHttpTransaction
+                        , public mozilla::net::ATokenBucketEvent
                         , public nsIInputStreamCallback
                         , public nsIOutputStreamCallback
 {
@@ -309,6 +311,32 @@ private:
         // true when ::Set has been called with a response header
         bool                            mSetup;
     } mRestartInProgressVerifier;
+
+// For Rate Pacing via an EventTokenBucket
+public:
+    // called by the connection manager to run this transaction through the
+    // token bucket. If the token bucket admits the transaction immediately it
+    // returns true. The function is called repeatedly until it returns true.
+    bool TryToRunPacedRequest();
+
+    // ATokenBucketEvent pure virtual implementation. Called by the token bucket
+    // when the transaction is ready to run. If this happens asynchrounously to
+    // token bucket submission the transaction just posts an event that causes
+    // the pending transaction queue to be rerun (and TryToRunPacedRequest() to
+    // be run again.
+    void OnTokenBucketAdmitted(); // ATokenBucketEvent
+
+    // CancelPacing() can be used to tell the token bucket to remove this
+    // transaction from the list of pending transactions. This is used when a
+    // transaction is believed to be HTTP/1 (and thus subject to rate pacing)
+    // but later can be dispatched via spdy (not subject to rate pacing).
+    void CancelPacing(nsresult reason);
+
+private:
+    bool mSubmittedRatePacing;
+    bool mPassedRatePacing;
+    bool mSynchronousRatePaceRequest;
+    nsCOMPtr<nsICancelable> mTokenBucketCancel;
 };
 
 #endif // nsHttpTransaction_h__

From 3cdb8b8d5f5a529b12c9801c30b16a18c0441da2 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Mon, 15 Apr 2013 09:40:53 -0400
Subject: [PATCH 159/438] bug 819734 - Token Bucket for Network Bursts part 2/2
 [windows timers] r=honzab

---
 netwerk/base/src/EventTokenBucket.cpp | 119 ++++++++++++++++++++++++++
 netwerk/base/src/EventTokenBucket.h   |  18 ++++
 2 files changed, 137 insertions(+)

diff --git a/netwerk/base/src/EventTokenBucket.cpp b/netwerk/base/src/EventTokenBucket.cpp
index cb0a3c826a86..ea3a7888e9be 100644
--- a/netwerk/base/src/EventTokenBucket.cpp
+++ b/netwerk/base/src/EventTokenBucket.cpp
@@ -9,6 +9,11 @@
 #include "nsNetUtil.h"
 #include "nsSocketTransportService2.h"
 
+#ifdef XP_WIN
+#include <windows.h>
+#include <mmsystem.h>
+#endif
+
 extern PRThread *gSocketThread;
 
 namespace mozilla {
@@ -74,6 +79,10 @@ EventTokenBucket::EventTokenBucket(uint32_t eventsPerSecond,
   , mPaused(false)
   , mStopped(false)
   , mTimerArmed(false)
+#ifdef XP_WIN
+  , mFineGrainTimerInUse(false)
+  , mFineGrainResetTimerArmed(false)
+#endif
 {
   MOZ_COUNT_CTOR(EventTokenBucket);
   mLastUpdate = TimeStamp::Now();
@@ -101,6 +110,14 @@ EventTokenBucket::~EventTokenBucket()
   if (mTimer && mTimerArmed)
     mTimer->Cancel();
 
+#ifdef XP_WIN
+  NormalTimers();
+  if (mFineGrainResetTimerArmed) {
+    mFineGrainResetTimerArmed = false;
+    mFineGrainResetTimer->Cancel();
+  }
+#endif
+
   // Complete any queued events to prevent hangs
   while (mEvents.GetSize()) {
     nsRefPtr<TokenBucketCancelable> cancelable = 
@@ -246,6 +263,11 @@ EventTokenBucket::DispatchEvents()
       cancelable->Fire();
     }
   }
+  
+#ifdef XP_WIN
+  if (!mEvents.GetSize())
+    WantNormalTimers();
+#endif
 }
  
 void
@@ -270,6 +292,10 @@ EventTokenBucket::UpdateTimer()
   else if (msecWait > 60000) // maximum wait
     msecWait = 60000;
 
+#ifdef XP_WIN
+  FineGrainTimers();
+#endif
+
   SOCKET_LOG(("EventTokenBucket::UpdateTimer %p for %dms\n",
               this, msecWait));
   nsresult rv = mTimer->InitWithCallback(this, static_cast<uint32_t>(msecWait),
@@ -281,6 +307,14 @@ NS_IMETHODIMP
 EventTokenBucket::Notify(nsITimer *timer)
 {
   MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+
+#ifdef XP_WIN
+  if (timer == mFineGrainResetTimer) {
+    FineGrainResetTimerNotify();
+    return NS_OK;
+  }
+#endif
+
   SOCKET_LOG(("EventTokenBucket::Notify() %p\n", this));
   mTimerArmed = false;
   if (mStopped)
@@ -309,5 +343,90 @@ EventTokenBucket::UpdateCredits()
               this, mCredit, mUnitCost, (double)mCredit / mUnitCost));
 }
 
+#ifdef XP_WIN
+void
+EventTokenBucket::FineGrainTimers()
+{
+  SOCKET_LOG(("EventTokenBucket::FineGrainTimers %p mFineGrainTimerInUse=%d\n",
+              this, mFineGrainTimerInUse));
+
+  mLastFineGrainTimerUse = TimeStamp::Now();
+
+  if (mFineGrainTimerInUse)
+    return;
+
+  if (mUnitCost > kCostFineGrainThreshold)
+    return;
+
+  SOCKET_LOG(("EventTokenBucket::FineGrainTimers %p timeBeginPeriod()\n",
+              this));
+
+  mFineGrainTimerInUse = true;
+  timeBeginPeriod(1);
+}
+
+void
+EventTokenBucket::NormalTimers()
+{
+  if (!mFineGrainTimerInUse)
+    return;
+  mFineGrainTimerInUse = false;
+
+  SOCKET_LOG(("EventTokenBucket::NormalTimers %p timeEndPeriod()\n", this));
+  timeEndPeriod(1);
+}
+
+void
+EventTokenBucket::WantNormalTimers()
+{
+    if (!mFineGrainTimerInUse)
+      return;
+    if (mFineGrainResetTimerArmed)
+      return;
+
+    TimeDuration elapsed(TimeStamp::Now() - mLastFineGrainTimerUse);
+    static const TimeDuration fiveSeconds = TimeDuration::FromSeconds(5);
+
+    if (elapsed >= fiveSeconds) {
+      NormalTimers();
+      return;
+    }
+    
+    if (!mFineGrainResetTimer)
+      mFineGrainResetTimer = do_CreateInstance("@mozilla.org/timer;1");
+
+    // if we can't delay the reset, just do it now
+    if (!mFineGrainResetTimer) {
+      NormalTimers();
+      return;
+    }
+
+    // pad the callback out 100ms to avoid having to round trip this again if the
+    // timer calls back just a tad early.
+    SOCKET_LOG(("EventTokenBucket::WantNormalTimers %p "
+                "Will reset timer granularity after delay", this));
+
+    mFineGrainResetTimer->InitWithCallback(
+      this,
+      static_cast<uint32_t>((fiveSeconds - elapsed).ToMilliseconds()) + 100,
+      nsITimer::TYPE_ONE_SHOT);
+    mFineGrainResetTimerArmed = true;
+}
+
+void
+EventTokenBucket::FineGrainResetTimerNotify()
+{
+  SOCKET_LOG(("EventTokenBucket::FineGrainResetTimerNotify() events = %d\n",
+              this, mEvents.GetSize()));
+  mFineGrainResetTimerArmed = false;
+
+  // If we are currently processing events then wait for the queue to drain
+  // before trying to reset back to normal timers again
+  if (!mEvents.GetSize())
+    WantNormalTimers();
+}
+
+#endif
+
 } // mozilla::net
 } // mozilla
diff --git a/netwerk/base/src/EventTokenBucket.h b/netwerk/base/src/EventTokenBucket.h
index c7d86798ccf1..7cd303fd36ec 100644
--- a/netwerk/base/src/EventTokenBucket.h
+++ b/netwerk/base/src/EventTokenBucket.h
@@ -119,6 +119,24 @@ private:
   // callbacks on the socket thread in order to maintain low latency of event
   // delivery.
   nsCOMPtr<nsITimer> mTimer;
+
+#ifdef XP_WIN
+  // Windows timers are 15ms granularity by default. When we have active events
+  // that need to be dispatched at 50ms  or less granularity we change the OS
+  // granularity to 1ms. 90 seconds after that need has elapsed we will change it
+  // back
+  const static uint64_t kCostFineGrainThreshold =  50 * kUsecPerMsec;
+
+  void FineGrainTimers(); // get 1ms granularity
+  void NormalTimers(); // reset to default granularity
+  void WantNormalTimers(); // reset after 90 seconds if not needed in interim
+  void FineGrainResetTimerNotify(); // delayed callback to reset
+
+  TimeStamp mLastFineGrainTimerUse;
+  bool mFineGrainTimerInUse;
+  bool mFineGrainResetTimerArmed;
+  nsCOMPtr<nsITimer> mFineGrainResetTimer;
+#endif
 };
 
 } // ::mozilla::net

From 7acac25401d917af6b26a17cb59ceaf87c7751b5 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Mon, 15 Apr 2013 09:41:27 -0400
Subject: [PATCH 160/438] bug 819734 - Token Bucket for Network Requests [a/b
 test] r=honzab

---
 docshell/base/nsDocShell.cpp                  |   9 +-
 modules/libpref/src/init/all.js               |   6 +
 netwerk/base/public/moz.build                 |   1 +
 netwerk/base/public/nsPILoadGroupInternal.idl |  28 ++++
 netwerk/base/src/nsLoadGroup.cpp              |  55 ++++++-
 netwerk/base/src/nsLoadGroup.h                |   8 +-
 netwerk/protocol/http/HttpBaseChannel.cpp     |  11 ++
 netwerk/protocol/http/HttpBaseChannel.h       |   1 +
 netwerk/protocol/http/nsHttpAtomList.h        |   1 +
 netwerk/protocol/http/nsHttpHandler.cpp       | 143 +++++++++++++-----
 netwerk/protocol/http/nsHttpHandler.h         |   7 +-
 .../protocol/http/nsIHttpChannelInternal.idl  |  10 +-
 toolkit/components/telemetry/Histograms.json  |  56 +++++++
 13 files changed, 293 insertions(+), 43 deletions(-)
 create mode 100644 netwerk/base/public/nsPILoadGroupInternal.idl

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 783c4ba44001..f39e88c4a2c9 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -94,7 +94,7 @@
 // so we can associate the document URI with the load group.
 // until this point, we have an evil hack:
 #include "nsIHttpChannelInternal.h"  
-
+#include "nsPILoadGroupInternal.h"
 
 // Local Includes
 #include "nsDocShellLoadInfo.h"
@@ -6548,10 +6548,15 @@ nsDocShell::EndPageLoad(nsIWebProgress * aProgress,
     if (timingChannel) {
         TimeStamp channelCreationTime;
         rv = timingChannel->GetChannelCreation(&channelCreationTime);
-        if (NS_SUCCEEDED(rv) && !channelCreationTime.IsNull())
+        if (NS_SUCCEEDED(rv) && !channelCreationTime.IsNull()) {
             Telemetry::AccumulateTimeDelta(
                 Telemetry::TOTAL_CONTENT_PAGE_LOAD_TIME,
                 channelCreationTime);
+            nsCOMPtr<nsPILoadGroupInternal> internalLoadGroup =
+                do_QueryInterface(mLoadGroup);
+            if (internalLoadGroup)
+                internalLoadGroup->OnEndPageLoad(aChannel);
+        }
     }
 
     // Timing is picked up by the window, we don't need it anymore
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 64eba14d90a4..fb3d341b8cc8 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1003,7 +1003,13 @@ pref("network.http.spdy.send-buffer-size", 131072);
 
 pref("network.http.diagnostics", false);
 
+#ifdef RELEASE_BUILD
 pref("network.http.pacing.requests.enabled", false);
+pref("network.http.pacing.requests.abtest", false);
+#else
+pref("network.http.pacing.requests.enabled", true);
+pref("network.http.pacing.requests.abtest", true);
+#endif
 pref("network.http.pacing.requests.min-parallelism", 6);
 pref("network.http.pacing.requests.hz", 100);
 pref("network.http.pacing.requests.burst", 32);
diff --git a/netwerk/base/public/moz.build b/netwerk/base/public/moz.build
index 590e6b0b943b..1a0535538b36 100644
--- a/netwerk/base/public/moz.build
+++ b/netwerk/base/public/moz.build
@@ -108,6 +108,7 @@ XPIDL_SOURCES += [
     'nsIUploadChannel.idl',
     'nsIUploadChannel2.idl',
     'nsPISocketTransportService.idl',
+    'nsPILoadGroupInternal.idl',
 ]
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
diff --git a/netwerk/base/public/nsPILoadGroupInternal.idl b/netwerk/base/public/nsPILoadGroupInternal.idl
new file mode 100644
index 000000000000..6b12304a4f60
--- /dev/null
+++ b/netwerk/base/public/nsPILoadGroupInternal.idl
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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 nsIChannel;
+
+/**
+ * Dumping ground for load group experimental work.
+ * This interface will never be frozen.  If you are
+ * using any feature exposed by this interface, be aware that this interface
+ * will change and you will be broken.  You have been warned.
+ */
+[scriptable, uuid(6ef2f8ac-9584-48f3-957a-0c94fff0c8c7)]
+interface nsPILoadGroupInternal : nsISupports
+{
+
+    /**
+     * Called when the load group has loaded main page and
+     * subresources. (i.e.essentially DOMComplete)
+     *
+     * @param aDefaultChanel
+     *        The request channel for the base apge
+     */
+    void OnEndPageLoad(in nsIChannel aDefaultChannel);
+};
diff --git a/netwerk/base/src/nsLoadGroup.cpp b/netwerk/base/src/nsLoadGroup.cpp
index af4f9992ae20..64c18523f9a2 100644
--- a/netwerk/base/src/nsLoadGroup.cpp
+++ b/netwerk/base/src/nsLoadGroup.cpp
@@ -21,6 +21,7 @@
 #include "nsReadableUtils.h"
 #include "nsString.h"
 #include "nsTArray.h"
+#include "nsIHttpChannelInternal.h"
 #include "mozilla/Telemetry.h"
 
 using namespace mozilla;
@@ -117,6 +118,7 @@ nsLoadGroup::nsLoadGroup(nsISupports* outer)
     , mDefaultLoadIsTimed(false)
     , mTimedRequests(0)
     , mCachedRequests(0)
+    , mTimedNonCachedRequestsUntilOnEndPageLoad(0)
 {
     NS_INIT_AGGREGATED(outer);
 
@@ -155,6 +157,7 @@ nsLoadGroup::~nsLoadGroup()
 NS_IMPL_AGGREGATED(nsLoadGroup)
 NS_INTERFACE_MAP_BEGIN_AGGREGATED(nsLoadGroup)
     NS_INTERFACE_MAP_ENTRY(nsILoadGroup)
+    NS_INTERFACE_MAP_ENTRY(nsPILoadGroupInternal)
     NS_INTERFACE_MAP_ENTRY(nsILoadGroupChild)
     NS_INTERFACE_MAP_ENTRY(nsIRequest)
     NS_INTERFACE_MAP_ENTRY(nsISupportsPriority)
@@ -631,8 +634,12 @@ nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports* ctxt,
             ++mTimedRequests;
             TimeStamp timeStamp;
             rv = timedChannel->GetCacheReadStart(&timeStamp);
-            if (NS_SUCCEEDED(rv) && !timeStamp.IsNull())
+            if (NS_SUCCEEDED(rv) && !timeStamp.IsNull()) {
                 ++mCachedRequests;
+            }
+            else {
+                mTimedNonCachedRequestsUntilOnEndPageLoad++;
+            }
 
             rv = timedChannel->GetAsyncOpen(&timeStamp);
             if (NS_SUCCEEDED(rv) && !timeStamp.IsNull()) {
@@ -812,6 +819,52 @@ nsLoadGroup::GetRootLoadGroup(nsILoadGroup * *aRootLoadGroup)
     return NS_OK;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// nsPILoadGroupInternal methods:
+
+NS_IMETHODIMP
+nsLoadGroup::OnEndPageLoad(nsIChannel *aDefaultChannel)
+{
+    // On page load of a page with at least 32 resources we want to record
+    // telemetry on which rate pacing algorithm was used to load the page and
+    // the page load time.
+    uint32_t requests = mTimedNonCachedRequestsUntilOnEndPageLoad;
+    mTimedNonCachedRequestsUntilOnEndPageLoad = 0;
+
+    nsCOMPtr<nsITimedChannel> timedChannel =
+        do_QueryInterface(aDefaultChannel);
+    if (!timedChannel)
+        return NS_OK;
+
+    nsCOMPtr<nsIHttpChannelInternal> internalHttpChannel =
+        do_QueryInterface(timedChannel);
+    if (!internalHttpChannel)
+        return NS_OK;
+
+    TimeStamp cacheReadStart;
+    TimeStamp asyncOpen;
+    uint32_t telemetryID;
+    nsresult rv = timedChannel->GetCacheReadStart(&cacheReadStart);
+    if (NS_SUCCEEDED(rv))
+        rv = timedChannel->GetAsyncOpen(&asyncOpen);
+    if (NS_SUCCEEDED(rv))
+        rv = internalHttpChannel->GetPacingTelemetryID(&telemetryID);
+    if (NS_FAILED(rv))
+        return NS_OK;
+
+    // Nothing to do if we don't have a start time or this was
+    // from the cache or we don't know what profile was used
+    if (asyncOpen.IsNull() || !cacheReadStart.IsNull() || !telemetryID)
+        return NS_OK;
+
+    if (requests < 32)
+        return NS_OK;
+
+    Telemetry::AccumulateTimeDelta(static_cast<Telemetry::ID>(telemetryID),
+                                   asyncOpen);
+    return NS_OK;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupportsPriority methods:
 
diff --git a/netwerk/base/src/nsLoadGroup.h b/netwerk/base/src/nsLoadGroup.h
index 918d59a21a06..e4d4d55dbbe4 100644
--- a/netwerk/base/src/nsLoadGroup.h
+++ b/netwerk/base/src/nsLoadGroup.h
@@ -8,6 +8,7 @@
 
 #include "nsILoadGroup.h"
 #include "nsILoadGroupChild.h"
+#include "nsPILoadGroupInternal.h"
 #include "nsIChannel.h"
 #include "nsIStreamListener.h"
 #include "nsAgg.h"
@@ -26,7 +27,8 @@ class  nsILoadGroupConnectionInfo;
 class nsLoadGroup : public nsILoadGroup,
                     public nsILoadGroupChild,
                     public nsISupportsPriority,
-                    public nsSupportsWeakReference
+                    public nsSupportsWeakReference,
+                    public nsPILoadGroupInternal
 {
 public:
     NS_DECL_AGGREGATED
@@ -38,6 +40,7 @@ public:
     ////////////////////////////////////////////////////////////////////////////
     // nsILoadGroup methods:
     NS_DECL_NSILOADGROUP
+    NS_DECL_NSPILOADGROUPINTERNAL
 
     ////////////////////////////////////////////////////////////////////////////
     // nsILoadGroupChild methods:
@@ -87,6 +90,9 @@ protected:
     bool                            mDefaultLoadIsTimed;
     uint32_t                        mTimedRequests;
     uint32_t                        mCachedRequests;
+
+    /* For nsPILoadGroupInternal */
+    uint32_t                        mTimedNonCachedRequestsUntilOnEndPageLoad;
 };
 
 #endif // nsLoadGroup_h__
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index 3c9f034eb563..c9f56fbb46aa 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -1399,6 +1399,17 @@ HttpBaseChannel::SetLoadUnblocked(bool aLoadUnblocked)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+HttpBaseChannel::GetPacingTelemetryID(uint32_t *aID)
+{
+  *aID = 0;
+  // Don't record pacing algorithm for spdy because it is effectively
+  // bypassed by the protocol mux
+  if (!mResponseHead || !mResponseHead->PeekHeader(nsHttp::X_Firefox_Spdy))
+    *aID = gHttpHandler->PacingTelemetryID();
+  return NS_OK;
+}
+
 //-----------------------------------------------------------------------------
 // HttpBaseChannel::nsISupportsPriority
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index 638a8ec328c3..c359e98e07bc 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -149,6 +149,7 @@ public:
   NS_IMETHOD SetLoadAsBlocking(bool aLoadAsBlocking);
   NS_IMETHOD GetLoadUnblocked(bool *aLoadUnblocked);
   NS_IMETHOD SetLoadUnblocked(bool aLoadUnblocked);
+  NS_IMETHOD GetPacingTelemetryID(uint32_t *aID);
   
   inline void CleanRedirectCacheChainIfNecessary()
   {
diff --git a/netwerk/protocol/http/nsHttpAtomList.h b/netwerk/protocol/http/nsHttpAtomList.h
index 4a63a45c996e..62e425a73684 100644
--- a/netwerk/protocol/http/nsHttpAtomList.h
+++ b/netwerk/protocol/http/nsHttpAtomList.h
@@ -85,6 +85,7 @@ HTTP_ATOM(Vary,                      "Vary")
 HTTP_ATOM(Version,                   "Version")
 HTTP_ATOM(WWW_Authenticate,          "WWW-Authenticate")
 HTTP_ATOM(Warning,                   "Warning")
+HTTP_ATOM(X_Firefox_Spdy,            "X-Firefox-Spdy")
 
 // methods are atoms too.
 //
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 4e520a7cebad..4fe9d0e987a4 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -43,6 +43,7 @@
 #include "nsIXULAppInfo.h"
 
 #include "mozilla/net/NeckoChild.h"
+#include "mozilla/Telemetry.h"
 
 #if defined(XP_UNIX)
 #include <sys/utsname.h>
@@ -189,6 +190,8 @@ nsHttpHandler::nsHttpHandler()
     , mConnectTimeout(90000)
     , mParallelSpeculativeConnectLimit(6)
     , mRequestTokenBucketEnabled(false)
+    , mRequestTokenBucketABTestEnabled(false)
+    , mRequestTokenBucketABTestProfile(0)
     , mRequestTokenBucketMinParallelism(6)
     , mRequestTokenBucketHz(100)
     , mRequestTokenBucketBurst(32)
@@ -348,8 +351,8 @@ nsHttpHandler::MakeNewRequestTokenBucket()
         return;
 
     nsRefPtr<mozilla::net::EventTokenBucket> tokenBucket =
-        new mozilla::net::EventTokenBucket(mRequestTokenBucketHz,
-                                           mRequestTokenBucketBurst);
+        new mozilla::net::EventTokenBucket(RequestTokenBucketHz(),
+                                           RequestTokenBucketBurst());
     mConnMgr->UpdateRequestTokenBucket(tokenBucket);
 }
 
@@ -774,6 +777,53 @@ nsHttpHandler::MaxSocketCount()
     return maxCount;
 }
 
+// Different profiles for when the Token Bucket ABTest is enabled
+static const uint32_t sNumberTokenBucketProfiles = 7;
+static const uint32_t sTokenBucketProfiles[sNumberTokenBucketProfiles][4] = {
+    // burst, hz, min-parallelism
+    { 32, 100, 6, Telemetry::HTTP_PLT_RATE_PACING_0 }, // balanced
+    { 16, 100, 6, Telemetry::HTTP_PLT_RATE_PACING_1 }, // start earlier
+    { 32, 200, 6, Telemetry::HTTP_PLT_RATE_PACING_2 }, // run faster
+    { 32, 50, 6, Telemetry::HTTP_PLT_RATE_PACING_3 },  // run slower
+    { 32, 1, 8, Telemetry::HTTP_PLT_RATE_PACING_4 },   // allow only min-parallelism
+    { 32, 1, 16, Telemetry::HTTP_PLT_RATE_PACING_5 },  // allow only min-parallelism (larger)
+    { 1000, 1000, 1000, Telemetry::HTTP_PLT_RATE_PACING_6 }, // unlimited
+};
+
+uint32_t
+nsHttpHandler::RequestTokenBucketBurst()
+{
+    return AllowExperiments() && mRequestTokenBucketABTestEnabled ?
+        sTokenBucketProfiles[mRequestTokenBucketABTestProfile][0] :
+        mRequestTokenBucketBurst;
+}
+
+uint32_t
+nsHttpHandler::RequestTokenBucketHz()
+{
+    return AllowExperiments() && mRequestTokenBucketABTestEnabled ?
+        sTokenBucketProfiles[mRequestTokenBucketABTestProfile][1] :
+        mRequestTokenBucketHz;
+}
+
+uint16_t
+nsHttpHandler::RequestTokenBucketMinParallelism()
+{
+    uint32_t rv =
+        AllowExperiments() && mRequestTokenBucketABTestEnabled ?
+        sTokenBucketProfiles[mRequestTokenBucketABTestProfile][2] :
+        mRequestTokenBucketMinParallelism;
+    return static_cast<uint16_t>(rv);
+}
+
+uint32_t
+nsHttpHandler::PacingTelemetryID()
+{
+    if (!mRequestTokenBucketEnabled || !mRequestTokenBucketABTestEnabled)
+        return 0;
+    return sTokenBucketProfiles[mRequestTokenBucketABTestProfile][3];
+}
+
 void
 nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
 {
@@ -1216,40 +1266,6 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         }
     }
 
-    if (PREF_CHANGED(HTTP_PREF("pacing.requests.enabled"))) {
-        rv = prefs->GetBoolPref(HTTP_PREF("pacing.requests.enabled"),
-                                &cVar);
-        if (NS_SUCCEEDED(rv))
-            mRequestTokenBucketEnabled = cVar;
-    }
-
-    if (PREF_CHANGED(HTTP_PREF("pacing.requests.min-parallelism"))) {
-        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.min-parallelism"), &val);
-        if (NS_SUCCEEDED(rv))
-            mRequestTokenBucketMinParallelism = static_cast<uint16_t>(clamped(val, 1, 1024));
-    }
-
-    bool requestTokenBucketUpdated = false;
-    if (PREF_CHANGED(HTTP_PREF("pacing.requests.hz"))) {
-        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.hz"), &val);
-        if (NS_SUCCEEDED(rv)) {
-            mRequestTokenBucketHz = static_cast<uint32_t>(clamped(val, 1, 10000));
-            requestTokenBucketUpdated = true;
-        }
-    }
-    if (PREF_CHANGED(HTTP_PREF("pacing.requests.burst"))) {
-        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.burst"), &val);
-        if (NS_SUCCEEDED(rv)) {
-            mRequestTokenBucketBurst = val ? val : 1;
-            requestTokenBucketUpdated = true;
-        }
-    }
-    if (requestTokenBucketUpdated) {
-        mRequestTokenBucket = 
-            new mozilla::net::EventTokenBucket(mRequestTokenBucketHz,
-                                               mRequestTokenBucketBurst);
-    }
-
     //
     // Tracking options
     //
@@ -1269,12 +1285,17 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         }
     }
 
+    // toggle to true anytime a token bucket related pref is changed.. that
+    // includes telemetry and allow-experiments because of the abtest profile
+    bool requestTokenBucketUpdated = false;
+
     //
     // Telemetry
     //
 
     if (PREF_CHANGED(TELEMETRY_ENABLED)) {
         cVar = false;
+        requestTokenBucketUpdated = true;
         rv = prefs->GetBoolPref(TELEMETRY_ENABLED, &cVar);
         if (NS_SUCCEEDED(rv)) {
             mTelemetryEnabled = cVar;
@@ -1284,9 +1305,9 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
     //
     // network.allow-experiments
     //
-
     if (PREF_CHANGED(ALLOW_EXPERIMENTS)) {
         cVar = true;
+        requestTokenBucketUpdated = true;
         rv = prefs->GetBoolPref(ALLOW_EXPERIMENTS, &cVar);
         if (NS_SUCCEEDED(rv)) {
             mAllowExperiments = cVar;
@@ -1327,6 +1348,54 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         MakeNewRequestTokenBucket();
     }
 
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.enabled"))) {
+        rv = prefs->GetBoolPref(HTTP_PREF("pacing.requests.enabled"),
+                                &cVar);
+        if (NS_SUCCEEDED(rv)){
+            requestTokenBucketUpdated = true;
+            mRequestTokenBucketEnabled = cVar;
+        }
+    }
+
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.abtest"))) {
+        rv = prefs->GetBoolPref(HTTP_PREF("pacing.requests.abtest"),
+                                &cVar);
+        if (NS_SUCCEEDED(rv)) {
+            mRequestTokenBucketABTestEnabled = cVar;
+            requestTokenBucketUpdated = true;
+            if (mRequestTokenBucketABTestEnabled) {
+                // just taking the remainder is not perfectly uniform but it doesn't
+                // matter here.
+                mRequestTokenBucketABTestProfile = rand() % sNumberTokenBucketProfiles;
+            }
+        }
+    }
+
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.min-parallelism"))) {
+        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.min-parallelism"), &val);
+        if (NS_SUCCEEDED(rv))
+            mRequestTokenBucketMinParallelism = static_cast<uint16_t>(clamped(val, 1, 1024));
+    }
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.hz"))) {
+        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.hz"), &val);
+        if (NS_SUCCEEDED(rv)) {
+            mRequestTokenBucketHz = static_cast<uint32_t>(clamped(val, 1, 10000));
+            requestTokenBucketUpdated = true;
+        }
+    }
+    if (PREF_CHANGED(HTTP_PREF("pacing.requests.burst"))) {
+        rv = prefs->GetIntPref(HTTP_PREF("pacing.requests.burst"), &val);
+        if (NS_SUCCEEDED(rv)) {
+            mRequestTokenBucketBurst = val ? val : 1;
+            requestTokenBucketUpdated = true;
+        }
+    }
+    if (requestTokenBucketUpdated) {
+        mRequestTokenBucket =
+            new mozilla::net::EventTokenBucket(RequestTokenBucketHz(),
+                                               RequestTokenBucketBurst());
+    }
+
 #undef PREF_CHANGED
 #undef MULTI_PREF_CHANGED
 }
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index 0d39080269c0..6c5178594635 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -108,7 +108,10 @@ public:
     bool           CritialRequestPrioritization() { return mCritialRequestPrioritization; }
 
     bool           UseRequestTokenBucket() { return mRequestTokenBucketEnabled; }
-    uint16_t       RequestTokenBucketMinParallelism() { return mRequestTokenBucketMinParallelism; }
+    uint16_t       RequestTokenBucketMinParallelism();
+    uint32_t       RequestTokenBucketHz();
+    uint32_t       RequestTokenBucketBurst();
+    uint32_t       PacingTelemetryID();
 
     bool           PromptTempRedirect()      { return mPromptTempRedirect; }
 
@@ -422,6 +425,8 @@ private:
     // For Rate Pacing of HTTP/1 requests through a netwerk/base/src/EventTokenBucket
     // Active requests <= *MinParallelism are not subject to the rate pacing
     bool           mRequestTokenBucketEnabled;
+    bool           mRequestTokenBucketABTestEnabled;
+    uint32_t       mRequestTokenBucketABTestProfile;
     uint16_t       mRequestTokenBucketMinParallelism;
     uint32_t       mRequestTokenBucketHz;  // EventTokenBucket HZ
     uint32_t       mRequestTokenBucketBurst; // EventTokenBucket Burst
diff --git a/netwerk/protocol/http/nsIHttpChannelInternal.idl b/netwerk/protocol/http/nsIHttpChannelInternal.idl
index bdfc0bb9bdca..d9f92fec8745 100644
--- a/netwerk/protocol/http/nsIHttpChannelInternal.idl
+++ b/netwerk/protocol/http/nsIHttpChannelInternal.idl
@@ -34,7 +34,7 @@ interface nsIHttpUpgradeListener : nsISupports
  * using any feature exposed by this interface, be aware that this interface
  * will change and you will be broken.  You have been warned.
  */
-[scriptable, uuid(74d13d41-85cd-490f-9942-300d0c01c726)]
+[scriptable, uuid(68074a18-49a8-44d8-852c-320ad4b1d308)]
 interface nsIHttpChannelInternal : nsISupports
 {
     /**
@@ -171,4 +171,12 @@ interface nsIHttpChannelInternal : nsISupports
      * exclusivity. Default false.
      */
     attribute boolean loadUnblocked;
+
+    /**
+     * bug 819734 we implement experimental rate pacing strategies for pages
+     * with large numbers of subresources. Several experimental profiles are
+     * available and this attribute corresponds to the profile used for this
+     * channel. (or at least the one active when it is queried.)
+     */
+     readonly attribute uint32_t pacingTelemetryID;
 };
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 07f6cfe4627a..34a5a2679dd3 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -1976,6 +1976,62 @@
     "extended_statistics_ok": true,
     "description": "Time spent in nsDiskCacheStreamIO::Close() on the main thread (ms)"
   },
+  "HTTP_PLT_RATE_PACING_0": {
+    "kind": "exponential",
+    "low": 100,
+    "high": "30000",
+    "n_buckets": 100,
+    "extended_statistics_ok": true,
+    "description": "HTTP: Total page load time (ms) with rate pacing algorithm 0 (burst=32, hz=100, par=6)"
+  },
+  "HTTP_PLT_RATE_PACING_1": {
+    "kind": "exponential",
+    "low": 100,
+    "high": "30000",
+    "n_buckets": 100,
+    "extended_statistics_ok": true,
+    "description": "HTTP: Total page load time (ms) with rate pacing algorithm 1 (burst=16, hz=100, par=6)"
+  },
+  "HTTP_PLT_RATE_PACING_2": {
+    "kind": "exponential",
+    "low": 100,
+    "high": "30000",
+    "n_buckets": 100,
+    "extended_statistics_ok": true,
+    "description": "HTTP: Total page load time (ms) with rate pacing algorithm 2 (burst=32, hz=200, par=6)"
+  },
+  "HTTP_PLT_RATE_PACING_3": {
+    "kind": "exponential",
+    "low": 100,
+    "high": "30000",
+    "n_buckets": 100,
+    "extended_statistics_ok": true,
+    "description": "HTTP: Total page load time (ms) with rate pacing algorithm 3 (burst=32, hz=50, par=6)"
+  },
+  "HTTP_PLT_RATE_PACING_4": {
+    "kind": "exponential",
+    "low": 100,
+    "high": "30000",
+    "n_buckets": 100,
+    "extended_statistics_ok": true,
+    "description": "HTTP: Total page load time (ms) with rate pacing algorithm 4 (burst=32, hz=1, par=8)"
+  },
+  "HTTP_PLT_RATE_PACING_5": {
+    "kind": "exponential",
+    "low": 100,
+    "high": "30000",
+    "n_buckets": 100,
+    "extended_statistics_ok": true,
+    "description": "HTTP: Total page load time (ms) with rate pacing algorithm 5 (burst=32, hz=1, par=16)"
+  },
+  "HTTP_PLT_RATE_PACING_6": {
+    "kind": "exponential",
+    "low": 100,
+    "high": "30000",
+    "n_buckets": 100,
+    "extended_statistics_ok": true,
+    "description": "HTTP: Total page load time (ms) with rate pacing algorithm 6 (burst=1000, hz=1000, par=1000)"
+  },
   "IDLE_NOTIFY_BACK_MS": {
     "kind": "exponential",
     "high": "5000",

From 3be2bb313f60f030a3388d54c999c1517e068550 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Mon, 15 Apr 2013 16:32:28 +0200
Subject: [PATCH 161/438] Bug 861857: TI: Fix testing the intersection between
 two types, r=jandem

---
 js/src/jsinfer.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index bae334abc56d..508eb23b1413 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -378,7 +378,7 @@ TypeSet::intersectionEmpty(TypeSet *other)
     if (unknown() || other->unknown())
         return false;
 
-    if (unknownObject() && unknownObject())
+    if (unknownObject() && other->unknownObject())
         return false;
 
     if (unknownObject() && other->getObjectCount() > 0)
@@ -392,12 +392,14 @@ TypeSet::intersectionEmpty(TypeSet *other)
         return false;
 
     // Test if there are object that are in both TypeSets
-    for (unsigned i = 0; i < getObjectCount(); i++) {
-        TypeObjectKey *obj = getObject(i);
-        if (!obj)
-            continue;
-        if (other->hasType(Type::ObjectType(obj)))
-            return false;
+    if (!unknownObject()) {
+        for (unsigned i = 0; i < getObjectCount(); i++) {
+            TypeObjectKey *obj = getObject(i);
+            if (!obj)
+                continue;
+            if (other->hasType(Type::ObjectType(obj)))
+                return false;
+        }
     }
 
     return true;

From 1f8653bbbc5e81c7ebe123f58dc2c166efe09e87 Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Mon, 15 Apr 2013 16:46:43 +0200
Subject: [PATCH 162/438] Bug 861141 - Connect Breakpad on Android to
 faulty.lib's mmap interface.  r=glandium,ted

---
 .../11-readsymboldatainternal-proto.patch     |  50 ++++++++
 .../src/common/linux/dump_symbols.h           |   9 ++
 tools/profiler/local_debug_info_symbolizer.cc | 117 +++++++++++++++++-
 3 files changed, 172 insertions(+), 4 deletions(-)
 create mode 100644 toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch

diff --git a/toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch b/toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch
new file mode 100644
index 000000000000..b91f9dced067
--- /dev/null
+++ b/toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch
@@ -0,0 +1,50 @@
+# HG changeset patch
+# User Julian Seward <jseward@acm.org>
+# Date 1365953823 -7200
+# Node ID 21d2964d1337c0fce7375025610298a818ddbd0f
+# Parent  ef802a6418f25841880359e6dab3e8240bfd0821
+Bug 861141 - Connect Breakpad on Android to faulty.lib's mmap interface.  r=ted.
+Adds a prototype for ReadSymbolDataInternal so it can be called from
+outside breakpad.
+
+diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
+--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
+@@ -36,16 +36,17 @@
+ #define COMMON_LINUX_DUMP_SYMBOLS_H__
+ 
+ #include <iostream>
+ #include <string>
+ #include <vector>
+ 
+ #include "common/symbol_data.h"
+ #include "common/using_std_string.h"
++#include "google_breakpad/common/breakpad_types.h"
+ 
+ namespace google_breakpad {
+ 
+ class Module;
+ 
+ // Find all the debugging information in OBJ_FILE, an ELF executable
+ // or shared library, and write it to SYM_STREAM in the Breakpad symbol
+ // file format.
+@@ -60,11 +61,19 @@ bool WriteSymbolFile(const string &obj_f
+ // As above, but simply return the debugging information in MODULE
+ // instead of writing it to a stream. The caller owns the resulting
+ // Module object and must delete it when finished.
+ bool ReadSymbolData(const string& obj_file,
+                     const std::vector<string>& debug_dirs,
+                     SymbolData symbol_data,
+                     Module** module);
+ 
++// Same as ReadSymbolData, except don't try to open the file; instead
++// just use the in-memory data (mapped image of it) located at OBJ_FILE.
++bool ReadSymbolDataInternal(const uint8_t* obj_file,
++                            const string& obj_filename,
++                            const std::vector<string>& debug_dirs,
++                            SymbolData symbol_data,
++                            Module** module);
++
+ }  // namespace google_breakpad
+ 
+ #endif  // COMMON_LINUX_DUMP_SYMBOLS_H__
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
index f3c92cd5005c..229657117361 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
@@ -41,6 +41,7 @@
 
 #include "common/symbol_data.h"
 #include "common/using_std_string.h"
+#include "google_breakpad/common/breakpad_types.h"
 
 namespace google_breakpad {
 
@@ -65,6 +66,14 @@ bool ReadSymbolData(const string& obj_file,
                     SymbolData symbol_data,
                     Module** module);
 
+// Same as ReadSymbolData, except don't try to open the file; instead
+// just use the in-memory data (mapped image of it) located at OBJ_FILE.
+bool ReadSymbolDataInternal(const uint8_t* obj_file,
+                            const string& obj_filename,
+                            const std::vector<string>& debug_dirs,
+                            SymbolData symbol_data,
+                            Module** module);
+
 }  // namespace google_breakpad
 
 #endif  // COMMON_LINUX_DUMP_SYMBOLS_H__
diff --git a/tools/profiler/local_debug_info_symbolizer.cc b/tools/profiler/local_debug_info_symbolizer.cc
index cbe8520aa4ba..650b9599378e 100644
--- a/tools/profiler/local_debug_info_symbolizer.cc
+++ b/tools/profiler/local_debug_info_symbolizer.cc
@@ -26,6 +26,16 @@
 # error "Unknown platform"
 #endif
 
+#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+# include "mozilla/Types.h"
+# include "ElfLoader.h"
+# include <dlfcn.h>
+# include <sys/mman.h>
+# include "nsString.h"
+# include "nsDirectoryServiceUtils.h"
+# include "nsDirectoryServiceDefs.h"
+#endif
+
 #include "local_debug_info_symbolizer.h"
 
 namespace google_breakpad {
@@ -40,6 +50,98 @@ LocalDebugInfoSymbolizer::~LocalDebugInfoSymbolizer() {
 # endif
 }
 
+#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+
+// Find out where the installation's lib directory is, since we'll
+// have to look in there to get hold of libmozglue.so.  Returned
+// C string is heap allocated and the caller must deallocate it.
+static char* get_installation_lib_dir ( void )
+{
+  nsCOMPtr<nsIProperties>
+    directoryService(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID));
+  if (!directoryService) return NULL;
+  nsCOMPtr<nsIFile> greDir;
+  nsresult rv = directoryService->Get(NS_GRE_DIR, NS_GET_IID(nsIFile),
+                                      getter_AddRefs(greDir));
+  if (NS_FAILED(rv)) return NULL;
+  nsCString path;
+  rv = greDir->GetNativePath(path);
+  if (NS_FAILED(rv)) return NULL;
+  return strdup(path.get());
+}
+
+// Read symbol data from a file on Android.  OBJ_FILENAME has
+// three possible cases:
+//
+// (1) /foo/bar/xyzzy/blah.apk!/libwurble.so
+//     We hand it as-is to faulty.lib and let it fish the relevant
+//     bits out of the APK.
+//
+// (2) libmozglue.so
+//     This is part of the Fennec installation, but is not in the
+//     APK.  Instead we have to figure out the installation path
+//     and look for it there.
+//
+// (3) libanythingelse.so
+//     faulty.lib assumes this is a system library, and prepends
+//     "/system/lib/" to the path.  So as in (1), we can give it
+//     as-is to faulty.lib.
+//
+// Hence only (2) requires special-casing here.
+//
+static bool ReadSymbolData_ANDROID(const string& obj_filename,
+                                   const std::vector<string>& debug_dirs,
+                                   SymbolData symbol_data,
+                                   Module** module)
+{
+  string obj_file_to_use = obj_filename;
+
+  // Do (2) in the comment above.
+  if (obj_file_to_use == "libmozglue.so") {
+    char* libdir = get_installation_lib_dir();
+    if (libdir) {
+      obj_file_to_use = string(libdir) + "/lib/" + obj_file_to_use;
+      free(libdir);
+    }
+  }
+
+  // Regardless of whether the file is inside an APK or not, we ask
+  // faulty.lib to map it, then call ReadSymbolDataInternal, then
+  // unmap and dlclose it.
+  void* hdl = dlopen(obj_file_to_use.c_str(), RTLD_GLOBAL | RTLD_LAZY);
+  if (!hdl) {
+    BPLOG(INFO) << "ReadSymbolData_APK: Failed to get handle for ELF file \'"
+                << obj_file_to_use << "\'";
+    return false;
+  }
+
+  size_t sz = __dl_get_mappable_length(hdl);
+  if (sz == 0) {
+    dlclose(hdl);
+    BPLOG(INFO) << "ReadSymbolData_APK: Unable to get size for ELF file \'"
+                << obj_file_to_use << "\'";
+    return false;
+  }
+
+  void* image = __dl_mmap(hdl, NULL, sz, 0);
+  if (image == MAP_FAILED) {
+    dlclose(hdl);
+    BPLOG(INFO) << "ReadSymbolData_APK: Failed to mmap ELF file \'"
+                << obj_file_to_use << "\'";
+    return false;
+  }
+
+  bool ok = ReadSymbolDataInternal((const uint8_t*)image,
+                                   obj_file_to_use, debug_dirs,
+                                   symbol_data, module);
+  __dl_munmap(hdl, image, sz);
+  dlclose(hdl);
+
+  return ok;
+}
+#endif /* defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) */
+
+
 StackFrameSymbolizer::SymbolizerResult
 LocalDebugInfoSymbolizer::FillSourceLineInfo(const CodeModules* modules,
                                              const SystemInfo* system_info,
@@ -61,10 +163,17 @@ LocalDebugInfoSymbolizer::FillSourceLineInfo(const CodeModules* modules,
         no_symbol_modules_.end()) {
       return kNoError;
     }
-    if (!ReadSymbolData(module->code_file(),
-                        debug_dirs_,
-                        ONLY_CFI,
-                        &debug_info_module)) {
+
+    bool ok = false;
+#   if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+    ok = ReadSymbolData_ANDROID(module->code_file(), debug_dirs_,
+                                ONLY_CFI, &debug_info_module);
+#   else
+    ok = ReadSymbolData(module->code_file(), debug_dirs_,
+                        ONLY_CFI, &debug_info_module);
+#   endif
+
+    if (!ok) {
       if (debug_info_module)
         delete debug_info_module;
       no_symbol_modules_.insert(module->code_file());

From 32bc2e5c590b93767a45d3755a0179b7d126289c Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Mon, 15 Apr 2013 15:29:37 +0100
Subject: [PATCH 163/438] Bug 861269 - GC: Continuing the rooting of XPConnect
 - Convert id_ to idArg style arguments r=bholley

--HG--
extra : rebase_source : a0a88749928f3f622b5626adfc8aa23382d06611
---
 js/xpconnect/src/XPCComponents.cpp         |  4 ++--
 js/xpconnect/src/XPCRuntimeService.cpp     | 18 +++++++++---------
 js/xpconnect/src/XPCWrappedNativeJSOps.cpp |  4 ++--
 js/xpconnect/src/XPCWrappedNativeScope.cpp |  4 ++--
 js/xpconnect/wrappers/XrayWrapper.cpp      | 10 +++++-----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index fb971190b4d3..3253644d1b70 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -4450,12 +4450,12 @@ nsXPCComponents_Utils::GetComponentsForScope(const jsval &vscope, JSContext *cx,
 }
 
 NS_IMETHODIMP
-nsXPCComponents_Utils::Dispatch(const jsval &runnable_, const jsval &scope,
+nsXPCComponents_Utils::Dispatch(const jsval &runnableArg, const jsval &scope,
                                 JSContext *cx)
 {
     // Enter the given compartment, if any, and rewrap runnable.
     Maybe<JSAutoCompartment> ac;
-    RootedValue runnable(cx, runnable_);
+    RootedValue runnable(cx, runnableArg);
     if (scope.isObject()) {
         JSObject *scopeObj = js::UncheckedUnwrap(&scope.toObject());
         if (!scopeObj)
diff --git a/js/xpconnect/src/XPCRuntimeService.cpp b/js/xpconnect/src/XPCRuntimeService.cpp
index cb4dd16de0c0..aef22cadb4ac 100644
--- a/js/xpconnect/src/XPCRuntimeService.cpp
+++ b/js/xpconnect/src/XPCRuntimeService.cpp
@@ -43,29 +43,29 @@ NS_IMPL_THREADSAFE_RELEASE(BackstagePass)
 /* bool newResolve (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsval id, in uint32_t flags, out JSObjectPtr objp); */
 NS_IMETHODIMP
 BackstagePass::NewResolve(nsIXPConnectWrappedNative *wrapper,
-                          JSContext * cx, JSObject * obj_,
-                          jsid id_, uint32_t flags,
-                          JSObject * *objp_, bool *_retval)
+                          JSContext * cx, JSObject * objArg,
+                          jsid idArg, uint32_t flags,
+                          JSObject * *objpArg, bool *_retval)
 {
-    JS::RootedObject obj(cx, obj_);
-    JS::RootedId id(cx, id_);
+    JS::RootedObject obj(cx, objArg);
+    JS::RootedId id(cx, idArg);
 
     JSBool resolved;
 
     *_retval = !!JS_ResolveStandardClass(cx, obj, id, &resolved);
     if (!*_retval) {
-        *objp_ = nullptr;
+        *objpArg = nullptr;
         return NS_OK;
     }
 
     if (resolved) {
-        *objp_ = obj;
+        *objpArg = obj;
         return NS_OK;
     }
 
-    JS::RootedObject objp(cx, *objp_);
+    JS::RootedObject objp(cx, *objpArg);
     *_retval = !!ResolveWorkerClasses(cx, obj, id, flags, &objp);
-    *objp_ = objp;
+    *objpArg = objp;
     return NS_OK;
 }
 
diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
index b2a5753b4c71..35125019ffeb 100644
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -715,9 +715,9 @@ XPC_WN_NoHelper_Resolve(JSContext *cx, JSHandleObject obj, JSHandleId id)
 }
 
 static JSObject *
-XPC_WN_OuterObject(JSContext *cx, JSHandleObject obj_)
+XPC_WN_OuterObject(JSContext *cx, JSHandleObject objArg)
 {
-    JSObject *obj = obj_;
+    JSObject *obj = objArg;
 
     XPCWrappedNative *wrapper =
         static_cast<XPCWrappedNative *>(js::GetObjectPrivate(obj));
diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp
index 80354fa02c09..488b8a4eace3 100644
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -268,9 +268,9 @@ XPCWrappedNativeScope::EnsureXBLScope(JSContext *cx)
 }
 
 namespace xpc {
-JSObject *GetXBLScope(JSContext *cx, JSObject *contentScope_)
+JSObject *GetXBLScope(JSContext *cx, JSObject *contentScopeArg)
 {
-    JS::RootedObject contentScope(cx, contentScope_);
+    JS::RootedObject contentScope(cx, contentScopeArg);
     JSAutoCompartment ac(cx, contentScope);
     JSObject *scope = EnsureCompartmentPrivate(contentScope)->scope->EnsureXBLScope(cx);
     NS_ENSURE_TRUE(scope, nullptr); // See bug 858642.
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 61c2acd2db67..b3e6098e1fbf 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -362,11 +362,11 @@ XrayTraits::expandoObjectMatchesConsumer(JSContext *cx,
 JSObject *
 XrayTraits::getExpandoObjectInternal(JSContext *cx, HandleObject target,
                                      nsIPrincipal *origin,
-                                     JSObject *exclusiveGlobal_)
+                                     JSObject *exclusiveGlobalArg)
 {
     // The expando object lives in the compartment of the target, so all our
     // work needs to happen there.
-    RootedObject exclusiveGlobal(cx, exclusiveGlobal_);
+    RootedObject exclusiveGlobal(cx, exclusiveGlobalArg);
     JSAutoCompartment ac(cx, target);
     if (!JS_WrapObject(cx, exclusiveGlobal.address()))
         return NULL;
@@ -477,10 +477,10 @@ XrayTraits::cloneExpandoChain(JSContext *cx, HandleObject dst, HandleObject src)
 }
 
 namespace XrayUtils {
-bool CloneExpandoChain(JSContext *cx, JSObject *dst_, JSObject *src_)
+bool CloneExpandoChain(JSContext *cx, JSObject *dstArg, JSObject *srcArg)
 {
-    RootedObject dst(cx, dst_);
-    RootedObject src(cx, src_);
+    RootedObject dst(cx, dstArg);
+    RootedObject src(cx, srcArg);
     return GetXrayTraits(src)->cloneExpandoChain(cx, dst, src);
 }
 }

From af1f7cbb11cc87579ebe9be44c22476c2452c60d Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Mon, 15 Apr 2013 15:29:51 +0100
Subject: [PATCH 164/438] Bug 861269 - GC: Continuing the rooting of XPConnect
 - Root nsXPConnect.cpp r=bholley

--HG--
extra : rebase_source : 4bbe3cc3891cb4b3f820454f0f73acea99b36378
---
 js/xpconnect/src/nsXPConnect.cpp | 83 +++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 34 deletions(-)

diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index a740d86a8551..84136594fc6e 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -43,6 +43,7 @@
 
 using namespace mozilla::dom;
 using namespace xpc;
+using namespace JS;
 
 NS_IMPL_THREADSAFE_ISUPPORTS7(nsXPConnect,
                               nsIXPConnect,
@@ -931,7 +932,7 @@ nsXPConnect::InitClasses(JSContext * aJSContext, JSObject * aGlobalJSObj)
 {
     NS_ASSERTION(aJSContext, "bad param");
     NS_ASSERTION(aGlobalJSObj, "bad param");
-    JS::RootedObject globalJSObj(aJSContext, aGlobalJSObj);
+    RootedObject globalJSObj(aJSContext, aGlobalJSObj);
 
     // Nest frame chain save/restore in request created by XPCCallContext.
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
@@ -1038,8 +1039,8 @@ CreateGlobalObject(JSContext *cx, JSClass *clasp, nsIPrincipal *principal,
     NS_ABORT_IF_FALSE(NS_IsMainThread(), "using a principal off the main thread?");
     MOZ_ASSERT(principal);
 
-    JS::RootedObject global(cx,
-                            JS_NewGlobalObject(cx, clasp, nsJSPrincipals::get(principal), zoneSpec));
+    RootedObject global(cx,
+                        JS_NewGlobalObject(cx, clasp, nsJSPrincipals::get(principal), zoneSpec));
     if (!global)
         return nullptr;
     JSAutoCompartment ac(cx, global);
@@ -1101,7 +1102,7 @@ nsXPConnect::InitClassesWithNewWrappedGlobal(JSContext * aJSContext,
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Grab a copy of the global and enter its compartment.
-    JSObject *global = wrappedGlobal->GetFlatJSObject();
+    RootedObject global(ccx, wrappedGlobal->GetFlatJSObject());
     MOZ_ASSERT(!js::GetObjectParent(global));
     JSAutoCompartment ac(ccx, global);
 
@@ -1137,7 +1138,7 @@ xpc_MorphSlimWrapper(JSContext *cx, nsISupports *tomorph)
     if (!cache)
         return NS_OK;
 
-    JS::RootedObject obj(cx, cache->GetWrapper());
+    RootedObject obj(cx, cache->GetWrapper());
     if (!obj || !IS_SLIM_WRAPPER(obj))
         return NS_OK;
     NS_ENSURE_STATE(MorphSlimWrapper(cx, obj));
@@ -1146,7 +1147,7 @@ xpc_MorphSlimWrapper(JSContext *cx, nsISupports *tomorph)
 
 static nsresult
 NativeInterface2JSObject(XPCLazyCallContext & lccx,
-                         JSObject * aScope,
+                         HandleObject aScope,
                          nsISupports *aCOMObj,
                          nsWrapperCache *aCache,
                          const nsIID * aIID,
@@ -1175,16 +1176,17 @@ NativeInterface2JSObject(XPCLazyCallContext & lccx,
 /* nsIXPConnectJSObjectHolder wrapNative (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDRef aIID); */
 NS_IMETHODIMP
 nsXPConnect::WrapNative(JSContext * aJSContext,
-                        JSObject * aScope,
+                        JSObject * aScopeArg,
                         nsISupports *aCOMObj,
                         const nsIID & aIID,
                         nsIXPConnectJSObjectHolder **aHolder)
 {
     NS_ASSERTION(aHolder, "bad param");
     NS_ASSERTION(aJSContext, "bad param");
-    NS_ASSERTION(aScope, "bad param");
+    NS_ASSERTION(aScopeArg, "bad param");
     NS_ASSERTION(aCOMObj, "bad param");
 
+    RootedObject aScope(aJSContext, aScopeArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if (!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -1198,7 +1200,7 @@ nsXPConnect::WrapNative(JSContext * aJSContext,
 /* void wrapNativeToJSVal (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDPtr aIID, out jsval aVal, out nsIXPConnectJSObjectHolder aHolder); */
 NS_IMETHODIMP
 nsXPConnect::WrapNativeToJSVal(JSContext * aJSContext,
-                               JSObject * aScope,
+                               JSObject * aScopeArg,
                                nsISupports *aCOMObj,
                                nsWrapperCache *aCache,
                                const nsIID * aIID,
@@ -1207,12 +1209,13 @@ nsXPConnect::WrapNativeToJSVal(JSContext * aJSContext,
                                nsIXPConnectJSObjectHolder **aHolder)
 {
     NS_ASSERTION(aJSContext, "bad param");
-    NS_ASSERTION(aScope, "bad param");
+    NS_ASSERTION(aScopeArg, "bad param");
     NS_ASSERTION(aCOMObj, "bad param");
 
     if (aHolder)
         *aHolder = nullptr;
 
+    RootedObject aScope(aJSContext, aScopeArg);
     XPCLazyCallContext lccx(NATIVE_CALLER, aJSContext);
 
     return NativeInterface2JSObject(lccx, aScope, aCOMObj, aCache, aIID,
@@ -1222,16 +1225,17 @@ nsXPConnect::WrapNativeToJSVal(JSContext * aJSContext,
 /* void wrapJS (in JSContextPtr aJSContext, in JSObjectPtr aJSObj, in nsIIDRef aIID, [iid_is (aIID), retval] out nsQIResult result); */
 NS_IMETHODIMP
 nsXPConnect::WrapJS(JSContext * aJSContext,
-                    JSObject * aJSObj,
+                    JSObject * aJSObjArg,
                     const nsIID & aIID,
                     void * *result)
 {
     NS_ASSERTION(aJSContext, "bad param");
-    NS_ASSERTION(aJSObj, "bad param");
+    NS_ASSERTION(aJSObjArg, "bad param");
     NS_ASSERTION(result, "bad param");
 
     *result = nullptr;
 
+    RootedObject aJSObj(aJSContext, aJSObjArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if (!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -1268,17 +1272,18 @@ nsXPConnect::JSValToVariant(JSContext *cx,
 NS_IMETHODIMP
 nsXPConnect::WrapJSAggregatedToNative(nsISupports *aOuter,
                                       JSContext * aJSContext,
-                                      JSObject * aJSObj,
+                                      JSObject * aJSObjArg,
                                       const nsIID & aIID,
                                       void * *result)
 {
     NS_ASSERTION(aOuter, "bad param");
     NS_ASSERTION(aJSContext, "bad param");
-    NS_ASSERTION(aJSObj, "bad param");
+    NS_ASSERTION(aJSObjArg, "bad param");
     NS_ASSERTION(result, "bad param");
 
     *result = nullptr;
 
+    RootedObject aJSObj(aJSContext, aJSObjArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if (!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -1293,13 +1298,14 @@ nsXPConnect::WrapJSAggregatedToNative(nsISupports *aOuter,
 /* nsIXPConnectWrappedNative getWrappedNativeOfJSObject (in JSContextPtr aJSContext, in JSObjectPtr aJSObj); */
 NS_IMETHODIMP
 nsXPConnect::GetWrappedNativeOfJSObject(JSContext * aJSContext,
-                                        JSObject * aJSObj,
+                                        JSObject * aJSObjArg,
                                         nsIXPConnectWrappedNative **_retval)
 {
     NS_ASSERTION(aJSContext, "bad param");
-    NS_ASSERTION(aJSObj, "bad param");
+    NS_ASSERTION(aJSObjArg, "bad param");
     NS_ASSERTION(_retval, "bad param");
 
+    RootedObject aJSObj(aJSContext, aJSObjArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if (!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -1354,18 +1360,19 @@ nsXPConnect::GetNativeOfWrapper(JSContext * aJSContext,
 /* nsIXPConnectWrappedNative getWrappedNativeOfNativeObject (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDRef aIID); */
 NS_IMETHODIMP
 nsXPConnect::GetWrappedNativeOfNativeObject(JSContext * aJSContext,
-                                            JSObject * aScope,
+                                            JSObject * aScopeArg,
                                             nsISupports *aCOMObj,
                                             const nsIID & aIID,
                                             nsIXPConnectWrappedNative **_retval)
 {
     NS_ASSERTION(aJSContext, "bad param");
-    NS_ASSERTION(aScope, "bad param");
+    NS_ASSERTION(aScopeArg, "bad param");
     NS_ASSERTION(aCOMObj, "bad param");
     NS_ASSERTION(_retval, "bad param");
 
     *_retval = nullptr;
 
+    RootedObject aScope(aJSContext, aScopeArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if (!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -1395,10 +1402,12 @@ nsXPConnect::GetWrappedNativeOfNativeObject(JSContext * aJSContext,
  *                                    in nsISupports aCOMObj); */
 NS_IMETHODIMP
 nsXPConnect::ReparentWrappedNativeIfFound(JSContext * aJSContext,
-                                          JSObject * aScope,
-                                          JSObject * aNewParent,
+                                          JSObject * aScopeArg,
+                                          JSObject * aNewParentArg,
                                           nsISupports *aCOMObj)
 {
+    RootedObject aScope(aJSContext, aScopeArg);
+    RootedObject aNewParent(aJSContext, aNewParentArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if (!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -1408,7 +1417,7 @@ nsXPConnect::ReparentWrappedNativeIfFound(JSContext * aJSContext,
     if (!scope || !scope2)
         return UnexpectedFailure(NS_ERROR_FAILURE);
 
-    JS::RootedObject newParent(ccx, aNewParent);
+    RootedObject newParent(ccx, aNewParent);
     return XPCWrappedNative::
         ReparentWrapperIfFound(ccx, scope, scope2, newParent,
                                aCOMObj);
@@ -1431,8 +1440,9 @@ MoveableWrapperFinder(JSDHashTable *table, JSDHashEntryHdr *hdr,
 
 /* void rescueOrphansInScope(in JSContextPtr aJSContext, in JSObjectPtr  aScope); */
 NS_IMETHODIMP
-nsXPConnect::RescueOrphansInScope(JSContext *aJSContext, JSObject *aScope)
+nsXPConnect::RescueOrphansInScope(JSContext *aJSContext, JSObject *aScopeArg)
 {
+    RootedObject aScope(aJSContext, aScopeArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if (!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -1641,11 +1651,11 @@ nsXPConnect::CreateSandbox(JSContext *cx, nsIPrincipal *principal,
 
     *_retval = nullptr;
 
-    jsval rval = JSVAL_VOID;
-    AUTO_MARK_JSVAL(ccx, &rval);
+    RootedValue rval(cx, JSVAL_VOID);
+    AUTO_MARK_JSVAL(ccx, rval.address());
 
     SandboxOptions options(cx);
-    nsresult rv = xpc_CreateSandboxObject(cx, &rval, principal, options);
+    nsresult rv = xpc_CreateSandboxObject(cx, rval.address(), principal, options);
     NS_ASSERTION(NS_FAILED(rv) || !JSVAL_IS_PRIMITIVE(rval),
                  "Bad return value from xpc_CreateSandboxObject()!");
 
@@ -1667,8 +1677,8 @@ nsXPConnect::EvalInSandboxObject(const nsAString& source, const char *filename,
     if (!sandboxArg)
         return NS_ERROR_INVALID_ARG;
 
-    JS::RootedObject sandbox(cx, sandboxArg);
-    JS::RootedValue rval(cx);
+    RootedObject sandbox(cx, sandboxArg);
+    RootedValue rval(cx);
     nsresult rv = xpc_EvalInSandbox(cx, sandbox, source, filename ? filename :
                                     "x-bogus://XPConnect/Sandbox", 1, JSVERSION_DEFAULT,
                                     returnStringOnly, &rval);
@@ -1680,10 +1690,11 @@ nsXPConnect::EvalInSandboxObject(const nsAString& source, const char *filename,
 /* nsIXPConnectJSObjectHolder getWrappedNativePrototype (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsIClassInfo aClassInfo); */
 NS_IMETHODIMP
 nsXPConnect::GetWrappedNativePrototype(JSContext * aJSContext,
-                                       JSObject * aScope,
+                                       JSObject * aScopeArg,
                                        nsIClassInfo *aClassInfo,
                                        nsIXPConnectJSObjectHolder **_retval)
 {
+    RootedObject aScope(aJSContext, aScopeArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if (!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -1867,13 +1878,15 @@ nsXPConnect::DebugDumpEvalInJSStackFrame(uint32_t aFrameNumber, const char *aSou
 
 /* jsval variantToJS (in JSContextPtr ctx, in JSObjectPtr scope, in nsIVariant value); */
 NS_IMETHODIMP
-nsXPConnect::VariantToJS(JSContext* ctx, JSObject* scope, nsIVariant* value, jsval* _retval)
+nsXPConnect::VariantToJS(JSContext* ctx, JSObject* scopeArg, nsIVariant* value,
+                         jsval* _retval)
 {
     NS_PRECONDITION(ctx, "bad param");
-    NS_PRECONDITION(scope, "bad param");
+    NS_PRECONDITION(scopeArg, "bad param");
     NS_PRECONDITION(value, "bad param");
     NS_PRECONDITION(_retval, "bad param");
 
+    RootedObject scope(ctx, scopeArg);
     XPCCallContext ccx(NATIVE_CALLER, ctx);
     if (!ccx.IsValid())
         return NS_ERROR_FAILURE;
@@ -2201,9 +2214,10 @@ nsXPConnect::GetPrincipal(JSObject* obj, bool allowShortCircuit) const
 }
 
 NS_IMETHODIMP
-nsXPConnect::HoldObject(JSContext *aJSContext, JSObject *aObject,
+nsXPConnect::HoldObject(JSContext *aJSContext, JSObject *aObjectArg,
                         nsIXPConnectJSObjectHolder **aHolder)
 {
+    RootedObject aObject(aJSContext, aObjectArg);
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     XPCJSObjectHolder* objHolder = XPCJSObjectHolder::newHolder(ccx, aObject);
     if (!objHolder)
@@ -2467,7 +2481,7 @@ const uint8_t HAS_ORIGIN_PRINCIPALS_FLAG        = 2;
 
 static nsresult
 WriteScriptOrFunction(nsIObjectOutputStream *stream, JSContext *cx,
-                      JSScript *script, JSObject *functionObj)
+                      JSScript *script, HandleObject functionObj)
 {
     // Exactly one of script or functionObj must be given
     MOZ_ASSERT(!script != !functionObj);
@@ -2592,7 +2606,7 @@ ReadScriptOrFunction(nsIObjectInputStream *stream, JSContext *cx,
 NS_IMETHODIMP
 nsXPConnect::WriteScript(nsIObjectOutputStream *stream, JSContext *cx, JSScript *script)
 {
-    return WriteScriptOrFunction(stream, cx, script, nullptr);
+    return WriteScriptOrFunction(stream, cx, script, NullPtr());
 }
 
 NS_IMETHODIMP
@@ -2602,8 +2616,9 @@ nsXPConnect::ReadScript(nsIObjectInputStream *stream, JSContext *cx, JSScript **
 }
 
 NS_IMETHODIMP
-nsXPConnect::WriteFunction(nsIObjectOutputStream *stream, JSContext *cx, JSObject *functionObj)
+nsXPConnect::WriteFunction(nsIObjectOutputStream *stream, JSContext *cx, JSObject *functionObjArg)
 {
+    RootedObject functionObj(cx, functionObjArg);
     return WriteScriptOrFunction(stream, cx, nullptr, functionObj);
 }
 

From b2767312e0d21f00d74feb4f0609fe47bf9213ff Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Mon, 15 Apr 2013 15:30:05 +0100
Subject: [PATCH 165/438] Bug 861269 - GC: Continuing the rooting of XPConnect
 - Root XPCJSID.cpp r=bholley

--HG--
extra : rebase_source : 3702d37309dd711a6db9173d0c6ab6142ce78544
---
 js/xpconnect/src/XPCConvert.cpp |  3 ++-
 js/xpconnect/src/XPCJSID.cpp    | 47 +++++++++++++++++++--------------
 js/xpconnect/src/xpcprivate.h   |  2 +-
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp
index 6a6e2ed70c2f..a201d126a3ec 100644
--- a/js/xpconnect/src/XPCConvert.cpp
+++ b/js/xpconnect/src/XPCConvert.cpp
@@ -169,8 +169,9 @@ XPCConvert::NativeData2JS(XPCLazyCallContext& lccx, jsval* d, const void* s,
                 nsID* iid2 = *((nsID**)s);
                 if (!iid2)
                     break;
+                JS::RootedObject scope(cx, lccx.GetScopeForNewJSObjects());
                 JSObject* obj;
-                if (!(obj = xpc_NewIDObject(cx, lccx.GetScopeForNewJSObjects(), *iid2)))
+                if (!(obj = xpc_NewIDObject(cx, scope, *iid2)))
                     return false;
                 *d = OBJECT_TO_JSVAL(obj);
                 break;
diff --git a/js/xpconnect/src/XPCJSID.cpp b/js/xpconnect/src/XPCJSID.cpp
index 461d6ba0d8b9..15ff3efb0a59 100644
--- a/js/xpconnect/src/XPCJSID.cpp
+++ b/js/xpconnect/src/XPCJSID.cpp
@@ -13,6 +13,7 @@
 #include "XPCWrapper.h"
 
 using namespace mozilla::dom;
+using namespace JS;
 
 /***************************************************************************/
 // nsJSID
@@ -388,10 +389,12 @@ nsJSIID::NewID(nsIInterfaceInfo* aInfo)
 /* bool resolve (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsval id); */
 NS_IMETHODIMP
 nsJSIID::NewResolve(nsIXPConnectWrappedNative *wrapper,
-                    JSContext * cx, JSObject * obj,
-                    jsid id, uint32_t flags,
+                    JSContext * cx, JSObject * objArg,
+                    jsid idArg, uint32_t flags,
                     JSObject * *objp, bool *_retval)
 {
+    RootedObject obj(cx, objArg);
+    RootedId id(cx, idArg);
     XPCCallContext ccx(JS_CALLER, cx);
 
     AutoMarkingNativeInterfacePtr iface(ccx);
@@ -422,10 +425,11 @@ nsJSIID::NewResolve(nsIXPConnectWrappedNative *wrapper,
 /* bool enumerate (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj); */
 NS_IMETHODIMP
 nsJSIID::Enumerate(nsIXPConnectWrappedNative *wrapper,
-                   JSContext * cx, JSObject * obj, bool *_retval)
+                   JSContext * cx, JSObject * objArg, bool *_retval)
 {
     // In this case, let's just eagerly resolve...
 
+    RootedObject obj(cx, objArg);
     XPCCallContext ccx(JS_CALLER, cx);
 
     AutoMarkingNativeInterfacePtr iface(ccx);
@@ -470,13 +474,14 @@ nsJSIID::Enumerate(nsIXPConnectWrappedNative *wrapper,
  * from |cx|.
  */
 static JSObject *
-FindObjectForHasInstance(JSContext *cx, JSObject *obj)
+FindObjectForHasInstance(JSContext *cx, HandleObject objArg)
 {
+    RootedObject obj(cx, objArg);
     while (obj && !IS_WRAPPER_CLASS(js::GetObjectClass(obj)) && !IsDOMObject(obj))
     {
         if (js::IsWrapper(obj))
             obj = js::CheckedUnwrap(obj, /* stopAtOuter = */ false);
-        else if (!js::GetObjectProto(cx, obj, &obj))
+        else if (!js::GetObjectProto(cx, obj, obj.address()))
             return nullptr;
     }
     return obj;
@@ -494,7 +499,7 @@ nsJSIID::HasInstance(nsIXPConnectWrappedNative *wrapper,
 
     if (!JSVAL_IS_PRIMITIVE(val)) {
         // we have a JSObject
-        JS::RootedObject obj(cx, JSVAL_TO_OBJECT(val));
+        RootedObject obj(cx, JSVAL_TO_OBJECT(val));
 
         NS_ASSERTION(obj, "when is an object not an object?");
 
@@ -703,23 +708,22 @@ GetIIDArg(uint32_t argc, const JS::Value& val, JSContext* cx)
     return iid;
 }
 
-static JSObject*
-GetWrapperObject()
+static void
+GetWrapperObject(MutableHandleObject obj)
 {
+    obj.set(NULL);
     nsXPConnect* xpc = nsXPConnect::GetXPConnect();
     if (!xpc)
-        return NULL;
+        return;
 
     nsAXPCNativeCallContext *ccxp = NULL;
     xpc->GetCurrentNativeCallContext(&ccxp);
     if (!ccxp)
-        return NULL;
+        return;
 
     nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
     ccxp->GetCalleeWrapper(getter_AddRefs(wrapper));
-    JSObject* obj;
-    wrapper->GetJSObject(&obj);
-    return obj;
+    wrapper->GetJSObject(obj.address());
 }
 
 /* nsISupports createInstance (); */
@@ -730,7 +734,8 @@ nsJSCID::CreateInstance(const JS::Value& iidval, JSContext* cx,
     if (!mDetails.IsValid())
         return NS_ERROR_XPC_BAD_CID;
 
-    JSObject* obj = GetWrapperObject();
+    RootedObject obj(cx);
+    GetWrapperObject(&obj);
     if (!obj) {
         return NS_ERROR_UNEXPECTED;
     }
@@ -776,7 +781,8 @@ nsJSCID::GetService(const JS::Value& iidval, JSContext* cx,
     if (!mDetails.IsValid())
         return NS_ERROR_XPC_BAD_CID;
 
-    JSObject* obj = GetWrapperObject();
+    RootedObject obj(cx);
+    GetWrapperObject(&obj);
     if (!obj) {
         return NS_ERROR_UNEXPECTED;
     }
@@ -808,10 +814,10 @@ nsJSCID::GetService(const JS::Value& iidval, JSContext* cx,
     if (NS_FAILED(rv) || !srvc)
         return NS_ERROR_XPC_GS_RETURNED_FAILURE;
 
-    JSObject* instJSObj;
+    RootedObject instJSObj(cx);
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
     rv = nsXPConnect::GetXPConnect()->WrapNative(cx, obj, srvc, *iid, getter_AddRefs(holder));
-    if (NS_FAILED(rv) || !holder || NS_FAILED(holder->GetJSObject(&instJSObj)))
+    if (NS_FAILED(rv) || !holder || NS_FAILED(holder->GetJSObject(instJSObj.address())))
         return NS_ERROR_XPC_CANT_CREATE_WN;
 
     *retval = OBJECT_TO_JSVAL(instJSObj);
@@ -821,10 +827,11 @@ nsJSCID::GetService(const JS::Value& iidval, JSContext* cx,
 /* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsJSCID::Construct(nsIXPConnectWrappedNative *wrapper,
-                   JSContext * cx, JSObject * obj,
+                   JSContext * cx, JSObject * objArg,
                    uint32_t argc, jsval * argv, jsval * vp,
                    bool *_retval)
 {
+    RootedObject obj(cx, objArg);
     XPCJSRuntime* rt = nsXPConnect::GetRuntimeInstance();
     if (!rt)
         return NS_ERROR_FAILURE;
@@ -849,7 +856,7 @@ nsJSCID::HasInstance(nsIXPConnectWrappedNative *wrapper,
 
     if (!JSVAL_IS_PRIMITIVE(val)) {
         // we have a JSObject
-        JSObject* obj = JSVAL_TO_OBJECT(val);
+        RootedObject obj(cx, &val.toObject());
 
         NS_ASSERTION(obj, "when is an object not an object?");
 
@@ -878,7 +885,7 @@ nsJSCID::HasInstance(nsIXPConnectWrappedNative *wrapper,
 // additional utilities...
 
 JSObject *
-xpc_NewIDObject(JSContext *cx, JSObject* jsobj, const nsID& aID)
+xpc_NewIDObject(JSContext *cx, HandleObject jsobj, const nsID& aID)
 {
     JSObject *obj = nullptr;
 
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 0fc8a91963f9..78f86b4acce2 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -3731,7 +3731,7 @@ private:
 /***************************************************************************/
 
 extern JSObject*
-xpc_NewIDObject(JSContext *cx, JSObject* jsobj, const nsID& aID);
+xpc_NewIDObject(JSContext *cx, JS::HandleObject jsobj, const nsID& aID);
 
 extern const nsID*
 xpc_JSObjectToID(JSContext *cx, JSObject* obj);

From f7e974613d6223324db335be3abe9bfc61b2483f Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Mon, 15 Apr 2013 17:25:16 +0200
Subject: [PATCH 166/438] Bug 861800 - Make UnwinderThread2 a bit less verbose.
  r=bgirard

---
 tools/profiler/UnwinderThread2.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/profiler/UnwinderThread2.cpp b/tools/profiler/UnwinderThread2.cpp
index c88f318fde78..a48bc64f045e 100644
--- a/tools/profiler/UnwinderThread2.cpp
+++ b/tools/profiler/UnwinderThread2.cpp
@@ -866,6 +866,10 @@ static void* unwind_thr_fn(void* exit_nowV)
   */
   int* exit_now = (int*)exit_nowV;
   int ms_to_sleep_if_empty = 1;
+
+  const int longest_sleep_ms = 1000;
+  bool show_sleep_message = true;
+
   while (1) {
 
     if (*exit_now != 0) break;
@@ -889,15 +893,21 @@ static void* unwind_thr_fn(void* exit_nowV)
       MOZ_ASSERT(oldest_seqNo == ~0ULL);
       spinLock_release(&g_spinLock);
       if (ms_to_sleep_if_empty > 100 && LOGLEVEL >= 2) {
-        LOGF("BPUnw: unwinder: sleep for %d ms", ms_to_sleep_if_empty);
+        if (show_sleep_message)
+          LOGF("BPUnw: unwinder: sleep for %d ms", ms_to_sleep_if_empty);
+        /* If we've already shown the message for the longest sleep,
+           don't show it again, until the next round of sleeping
+           starts. */
+        if (ms_to_sleep_if_empty == longest_sleep_ms)
+          show_sleep_message = false;
       }
       sleep_ms(ms_to_sleep_if_empty);
       if (ms_to_sleep_if_empty < 20) {
         ms_to_sleep_if_empty += 2;
       } else {
         ms_to_sleep_if_empty = (15 * ms_to_sleep_if_empty) / 10;
-        if (ms_to_sleep_if_empty > 1000)
-          ms_to_sleep_if_empty = 1000;
+        if (ms_to_sleep_if_empty > longest_sleep_ms)
+          ms_to_sleep_if_empty = longest_sleep_ms;
       }
       continue;
     }
@@ -1246,6 +1256,7 @@ static void* unwind_thr_fn(void* exit_nowV)
     buff->state = S_EMPTY;
     spinLock_release(&g_spinLock);
     ms_to_sleep_if_empty = 1;
+    show_sleep_message = true;
   }
   return NULL;
 }

From ff40ac36dbd1d46d01f8b165cda1a42e4af52d1a Mon Sep 17 00:00:00 2001
From: Vladan Djeric <vdjeric@mozilla.com>
Date: Mon, 15 Apr 2013 12:08:04 -0400
Subject: [PATCH 167/438] Bug 860544 - Typo in field name in Telemetry ping.
 r=froydnj

---
 toolkit/components/telemetry/TelemetryPing.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index 26baa4d2b87b..ea56e3bcdd3a 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -419,7 +419,7 @@ TelemetryPing.prototype = {
                      "adapterDriverDate", "adapterDescription2",
                      "adapterVendorID2", "adapterDeviceID2", "adapterRAM2",
                      "adapterDriver2", "adapterDriverVersion2",
-                     "adapterDriverDate2", "isGPU2Active", "D2DEnabled;",
+                     "adapterDriverDate2", "isGPU2Active", "D2DEnabled",
                      "DWriteEnabled", "DWriteVersion"
                     ];
 

From fb4a3fd5b1d3c3ae21d217d15388fbf7e4cf9257 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Mon, 15 Apr 2013 12:28:38 -0400
Subject: [PATCH 168/438] Bug 446041 - Force sharing printer settings in Linux
 because GTK doesn't have support for per printer settings. r=roc

---
 widget/xpwidgets/nsPrintOptionsImpl.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/widget/xpwidgets/nsPrintOptionsImpl.cpp b/widget/xpwidgets/nsPrintOptionsImpl.cpp
index af814e4d00c9..fd71ffaf290f 100644
--- a/widget/xpwidgets/nsPrintOptionsImpl.cpp
+++ b/widget/xpwidgets/nsPrintOptionsImpl.cpp
@@ -1047,6 +1047,9 @@ nsPrintOptions::InitPrintSettingsFromPrefs(nsIPrintSettings* aPS,
   nsresult rv = ReadPrefs(aPS, prtName, aFlags);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // Do not use printer name in Linux because GTK backend does not support
+  // per printer settings.
+#ifndef MOZ_X11
   // Get the Printer Name from the PrintSettings
   // to use as a prefix for Pref Names
   rv = GetAdjustedPrinterName(aPS, aUsePNP, prtName);
@@ -1061,6 +1064,7 @@ nsPrintOptions::InitPrintSettingsFromPrefs(nsIPrintSettings* aPS,
   rv = ReadPrefs(aPS, prtName, aFlags);
   if (NS_SUCCEEDED(rv))
     aPS->SetIsInitializedFromPrefs(true);
+#endif
 
   return NS_OK;
 }
@@ -1077,9 +1081,13 @@ nsPrintOptions::SavePrintSettingsToPrefs(nsIPrintSettings *aPS,
   NS_ENSURE_ARG_POINTER(aPS);
   nsAutoString prtName;
 
+  // Do not use printer name in Linux because GTK backend does not support
+  // per printer settings.
+#ifndef MOZ_X11
   // Get the printer name from the PrinterSettings for an optional prefix.
   nsresult rv = GetAdjustedPrinterName(aPS, aUsePrinterNamePrefix, prtName);
   NS_ENSURE_SUCCESS(rv, rv);
+#endif
 
   // Write the prefs, with or without a printer name prefix.
   return WritePrefs(aPS, prtName, aFlags);

From 5d442bca1200629f56f684abe7b7c07fc1a436a1 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 15 Apr 2013 18:36:13 +0200
Subject: [PATCH 169/438] Bug 861796 - Fix crash in LibHandle::~LibHandle.
 r=nfroyd

---
 mozglue/linker/ElfLoader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mozglue/linker/ElfLoader.cpp b/mozglue/linker/ElfLoader.cpp
index aad2829ea7e1..41600bdc0544 100644
--- a/mozglue/linker/ElfLoader.cpp
+++ b/mozglue/linker/ElfLoader.cpp
@@ -181,7 +181,7 @@ LeafName(const char *path)
 LibHandle::~LibHandle()
 {
   free(path);
-  if (mappable->GetKind() != Mappable::MAPPABLE_EXTRACT_FILE)
+  if (mappable && mappable->GetKind() != Mappable::MAPPABLE_EXTRACT_FILE)
     delete mappable;
 }
 

From 9593d34ccec92076466d0c88cf2596218c481215 Mon Sep 17 00:00:00 2001
From: Shane Caraveo <scaraveo@mozilla.com>
Date: Thu, 11 Apr 2013 15:43:40 -0700
Subject: [PATCH 170/438] bug 859715 protect against migration failures of
 social providers, r=markh

---
 toolkit/components/social/SocialService.jsm   | 43 ++++++++++++++++---
 .../xpcshell/test_SocialServiceMigration22.js |  5 +++
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/toolkit/components/social/SocialService.jsm b/toolkit/components/social/SocialService.jsm
index 29a1b88f7b35..ab0e249b4935 100644
--- a/toolkit/components/social/SocialService.jsm
+++ b/toolkit/components/social/SocialService.jsm
@@ -126,20 +126,38 @@ let ActiveProviders = {
 function migrateSettings() {
   let activeProviders;
   try {
-    // we don't care what the value is, if it is set, we've already migrated
     activeProviders = Services.prefs.getCharPref("social.activeProviders");
   } catch(e) {
-    // do nothing
+    // not set, we'll check if we need to migrate older prefs
   }
   if (activeProviders) {
     // migration from fx21 to fx22 or later
     // ensure any *builtin* provider in activeproviders is in user level prefs
     for (let origin in ActiveProviders._providers) {
-      let prefname = getPrefnameFromOrigin(origin);
+      let prefname;
+      try {
+        prefname = getPrefnameFromOrigin(origin);
+      } catch(e) {
+        // Our preference is missing or bad, remove from ActiveProviders and
+        // continue. This is primarily an error-case and should only be
+        // reached by either messing with preferences or hitting the one or
+        // two days of nightly that ran into it, so we'll flush right away.
+        ActiveProviders.delete(origin);
+        ActiveProviders.flush();
+        continue;
+      }
       if (!Services.prefs.prefHasUserValue(prefname)) {
         // if we've got an active *builtin* provider, ensure that the pref
         // is set at a user-level as that will signify *installed* status.
-        let manifest = JSON.parse(Services.prefs.getComplexValue(prefname, Ci.nsISupportsString).data);
+        let manifest;
+        try {
+          manifest = JSON.parse(Services.prefs.getComplexValue(prefname, Ci.nsISupportsString).data);
+        } catch(e) {
+          // see comment in the delete/flush code above.
+          ActiveProviders.delete(origin);
+          ActiveProviders.flush();
+          continue;
+        }
         // our default manifests have been updated with the builtin flags as of
         // fx22, delete it so we can set the user-pref
         delete manifest.builtin;
@@ -167,7 +185,13 @@ function migrateSettings() {
   let prefs = manifestPrefs.getChildList("", []);
   for (let pref of prefs) {
     try {
-      let manifest = JSON.parse(manifestPrefs.getComplexValue(pref, Ci.nsISupportsString).data);
+      let manifest;
+      try {
+        manifest = JSON.parse(manifestPrefs.getComplexValue(pref, Ci.nsISupportsString).data);
+      } catch(e) {
+        // bad or missing preference, we wont update this one.
+        continue;
+      }
       if (manifest && typeof(manifest) == "object" && manifest.origin) {
         // our default manifests have been updated with the builtin flags as of
         // fx22, delete it so we can set the user-pref
@@ -196,7 +220,14 @@ function initService() {
     Services.obs.removeObserver(xpcomShutdown, "xpcom-shutdown");
   }, "xpcom-shutdown", false);
 
-  migrateSettings();
+  try {
+    migrateSettings();
+  } catch(e) {
+    // no matter what, if migration fails we do not want to render social
+    // unusable. Worst case scenario is that, when upgrading Firefox, previously
+    // enabled providers are not migrated.
+    Cu.reportError("Error migrating social settings: " + e);
+  }
   // Initialize the MozSocialAPI
   if (SocialServiceInternal.enabled)
     MozSocialAPI.enabled = true;
diff --git a/toolkit/components/social/test/xpcshell/test_SocialServiceMigration22.js b/toolkit/components/social/test/xpcshell/test_SocialServiceMigration22.js
index b36489c729ba..af84c3b21e5a 100644
--- a/toolkit/components/social/test/xpcshell/test_SocialServiceMigration22.js
+++ b/toolkit/components/social/test/xpcshell/test_SocialServiceMigration22.js
@@ -26,6 +26,8 @@ function run_test() {
              createInstance(Ci.nsISupportsString);
   let active = {};
   active[manifest.origin] = 1;
+  // bad.origin tests that a missing manifest does not break migration, bug 859715
+  active["bad.origin"] = 1;
   activeVal.data = JSON.stringify(active);
   Services.prefs.setComplexValue("social.activeProviders",
                                  Ci.nsISupportsString, activeVal);
@@ -57,4 +59,7 @@ function testMigration(manifest, next) {
   do_check_true(activeProviders[manifest.origin]);
   do_check_true(MANIFEST_PREFS.prefHasUserValue(manifest.origin));
   do_check_true(JSON.parse(DEFAULT_PREFS.getCharPref(manifest.origin)).builtin);
+
+  // bug 859715, this should have been removed during migration
+  do_check_false(!!activeProviders["bad.origin"]);
 }

From c03ee3b90503fad4a6a420297da61af66bd5948e Mon Sep 17 00:00:00 2001
From: Stephen Pohl <spohl.mozilla.bugs@gmail.com>
Date: Mon, 15 Apr 2013 13:04:55 -0400
Subject: [PATCH 171/438] Bug 861748 - Disable synchronous scroll to top or
 bottom of the page when page bounce behavior is turned off. r=smichaud

---
 .../base/content/browser-gestureSupport.js    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/browser/base/content/browser-gestureSupport.js b/browser/base/content/browser-gestureSupport.js
index d7cd75d9a4f2..31e75f849eb4 100644
--- a/browser/base/content/browser-gestureSupport.js
+++ b/browser/base/content/browser-gestureSupport.js
@@ -192,15 +192,17 @@ let gGestureSupport = {
                                           aEvent.DIRECTION_LEFT;
 
     let isVerticalSwipe = false;
-    if (aEvent.direction == aEvent.DIRECTION_UP) {
-      isVerticalSwipe = true;
-      // Force a synchronous scroll to the top of the page.
-      content.scrollTo(content.scrollX, 0);
-    }
-    else if (aEvent.direction == aEvent.DIRECTION_DOWN) {
-      isVerticalSwipe = true;
-      // Force a synchronous scroll to the bottom of the page.
-      content.scrollTo(content.scrollX, content.scrollMaxY);
+    if (gHistorySwipeAnimation.active) {
+      if (aEvent.direction == aEvent.DIRECTION_UP) {
+        isVerticalSwipe = true;
+        // Force a synchronous scroll to the top of the page.
+        content.scrollTo(content.scrollX, 0);
+      }
+      else if (aEvent.direction == aEvent.DIRECTION_DOWN) {
+        isVerticalSwipe = true;
+        // Force a synchronous scroll to the bottom of the page.
+        content.scrollTo(content.scrollX, content.scrollMaxY);
+      }
     }
 
     gHistorySwipeAnimation.startAnimation(isVerticalSwipe);

From eb73453fff2e29358c2acfe6d95b0268b3469265 Mon Sep 17 00:00:00 2001
From: Allison Naaktgeboren <ally@mozilla.com>
Date: Mon, 15 Apr 2013 10:42:20 -0700
Subject: [PATCH 172/438] Bug 85955 -Don't thumbnail capture when in snapped
 view.r=rsilveira

---
 browser/metro/base/content/browser-ui.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/browser/metro/base/content/browser-ui.js b/browser/metro/base/content/browser-ui.js
index 7a375e0d36a2..7614892947e8 100644
--- a/browser/metro/base/content/browser-ui.js
+++ b/browser/metro/base/content/browser-ui.js
@@ -884,6 +884,13 @@ var BrowserUI = {
       return false;
     }
 
+    // Don't capture pages in snapped mode, this produces 2/3 black
+    // thumbs or stretched out ones
+    //   Ci.nsIWinMetroUtils.snapped is inaccessible on
+    //   desktop/nonwindows systems
+    if(Elements.windowState.getAttribute("viewstate") == "snapped") {
+      return false;
+    }
     // There's no point in taking screenshot of loading pages.
     if (aBrowser.docShell.busyFlags != Ci.nsIDocShell.BUSY_FLAGS_NONE) {
       return false;

From 1cda4edae8a6670215adaa9fab45fbdb462e66aa Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 15 Apr 2013 18:53:03 +0100
Subject: [PATCH 173/438] bug 857192 - use float instead of integer CSS pixels
 to track available space for image. r=bz

---
 content/html/document/src/ImageDocument.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/content/html/document/src/ImageDocument.cpp b/content/html/document/src/ImageDocument.cpp
index 21ad4ed64f63..b95cf153f6ce 100644
--- a/content/html/document/src/ImageDocument.cpp
+++ b/content/html/document/src/ImageDocument.cpp
@@ -113,8 +113,8 @@ protected:
   nsresult ScrollImageTo(int32_t aX, int32_t aY, bool restoreImage);
 
   float GetRatio() {
-    return std::min((float)mVisibleWidth / mImageWidth,
-                  (float)mVisibleHeight / mImageHeight);
+    return std::min(mVisibleWidth / mImageWidth,
+                    mVisibleHeight / mImageHeight);
   }
 
   void ResetZoomLevel();
@@ -132,8 +132,8 @@ protected:
 
   nsCOMPtr<nsIContent>          mImageContent;
 
-  int32_t                       mVisibleWidth;
-  int32_t                       mVisibleHeight;
+  float                         mVisibleWidth;
+  float                         mVisibleHeight;
   int32_t                       mImageWidth;
   int32_t                       mImageHeight;
 
@@ -728,8 +728,8 @@ ImageDocument::CheckOverflowing(bool changeState)
     nsPresContext *context = shell->GetPresContext();
     nsRect visibleArea = context->GetVisibleArea();
 
-    mVisibleWidth = nsPresContext::AppUnitsToIntCSSPixels(visibleArea.width);
-    mVisibleHeight = nsPresContext::AppUnitsToIntCSSPixels(visibleArea.height);
+    mVisibleWidth = nsPresContext::AppUnitsToFloatCSSPixels(visibleArea.width);
+    mVisibleHeight = nsPresContext::AppUnitsToFloatCSSPixels(visibleArea.height);
   }
 
   bool imageWasOverflowing = mImageIsOverflowing;

From a811ad45635d7949dbfe1be4cb75cb6fd1919d67 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Mon, 15 Apr 2013 19:59:55 +0200
Subject: [PATCH 174/438] Bug 768288: IonMonkey: Enable inlining of functions
 with loops, r=djvj

---
 js/src/ion/IonBuilder.cpp | 89 +++++++++++++++++++++++++++------------
 js/src/ion/TypeOracle.cpp |  6 ---
 js/src/jsanalyze.cpp      |  2 +-
 js/src/jsscript.cpp       |  1 +
 js/src/jsscript.h         | 28 ++++++++++--
 5 files changed, 90 insertions(+), 36 deletions(-)

diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index e41193c06496..3fd3b2cea121 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -203,7 +203,8 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     RootedScript inlineScript(cx, target->nonLazyScript());
     ExecutionMode executionMode = info().executionMode();
     if (!CanIonCompile(inlineScript, executionMode)) {
-        IonSpew(IonSpew_Inlining, "Cannot inline due to disable Ion compilation");
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to disable Ion compilation",
+                                  inlineScript->filename(), inlineScript->lineno);
         return false;
     }
 
@@ -212,7 +213,8 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         ion::IsBaselineEnabled(cx) &&
         !inlineScript->hasBaselineScript())
     {
-        IonSpew(IonSpew_Inlining, "Cannot inline target with no baseline jitcode");
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline target with no baseline jitcode",
+                                  inlineScript->filename(), inlineScript->lineno);
         return false;
     }
 
@@ -220,7 +222,8 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     IonBuilder *builder = callerBuilder_;
     while (builder) {
         if (builder->script() == inlineScript) {
-            IonSpew(IonSpew_Inlining, "Not inlining recursive call");
+            IonSpew(IonSpew_Inlining, "%s:%d Not inlining recursive call",
+                                       inlineScript->filename(), inlineScript->lineno);
             return false;
         }
         builder = builder->callerBuilder_;
@@ -229,12 +232,15 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     RootedScript callerScript(cx, script());
 
     if (!oracle->canEnterInlinedFunction(target)) {
-        IonSpew(IonSpew_Inlining, "Cannot inline due to oracle veto %d", script()->lineno);
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to oracle veto %d",
+                                  inlineScript->filename(), inlineScript->lineno,
+                                  script()->lineno);
         return false;
     }
 
     if (!oracle->callReturnTypeSetMatches(callerScript, pc, target)) {
-        IonSpew(IonSpew_Inlining, "Cannot inline due to return typeset mismatch");
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to return typeset mismatch",
+                                  inlineScript->filename(), inlineScript->lineno);
         return false;
     }
 
@@ -243,7 +249,8 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         // For constructing calls the typeset of caller should intersect the callee's typeset.
         // Except for the |this| type, because that is created during execution depending on target.
         if (!oracle->callArgsTypeSetIntersects(NULL, callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
+            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
+                                      inlineScript->filename(), inlineScript->lineno);
             return false;
         }
     } else if (JSOp(*pc) == JSOP_FUNAPPLY) {
@@ -252,18 +259,25 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         // of fun.apply. Seeing a new type will only be noticed in the inlined call and
         // result in missed types in TI.
         if (!oracle->callArgsTypeSetMatches(callInfo.thisType(), callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
+            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
+                                       inlineScript->filename(), inlineScript->lineno);
             return false;
         }
     } else {
         // For normal calls the typeset of caller should intersect the callee's typeset.
         if (!oracle->callArgsTypeSetIntersects(callInfo.thisType(), callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
+            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
+                                      inlineScript->filename(), inlineScript->lineno);
             return false;
         }
     }
 
-    IonSpew(IonSpew_Inlining, "Inlining good to go!");
+    if (inlineScript->hasIonScript() && inlineScript->ionScript()->bailoutExpected()) {
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to known bailing script",
+                                  inlineScript->filename(), inlineScript->lineno);
+        return false;
+    }
+
     return true;
 }
 
@@ -3226,24 +3240,17 @@ IonBuilder::makeInliningDecision(JSFunction *target, CallInfo &callInfo)
 
     // Heuristics!
 
-    // Cap the inlining depth.
-    if (IsSmallFunction(targetScript)) {
-        if (inliningDepth_ >= js_IonOptions.smallFunctionMaxInlineDepth) {
-            IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding allowed inline depth",
-                                      targetScript->filename(), targetScript->lineno);
-            return false;
-        }
-    } else {
-        if (inliningDepth_ >= js_IonOptions.maxInlineDepth) {
-            IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding allowed inline depth",
-                                      targetScript->filename(), targetScript->lineno);
-            return false;
-        }
-     }
+    IonBuilder *baseBuilder = this;
+    while (baseBuilder->callerBuilder_)
+        baseBuilder = baseBuilder->callerBuilder_;
 
-    // Always inline the empty script up to the inlining depth.
-    if (targetScript->length == 1)
-        return true;
+    // When caller is excessively large only inline small functions.
+    if (script()->length > js_IonOptions.inlineMaxTotalBytecodeLength &&
+        !IsSmallFunction(targetScript)) {
+        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: caller excessively large.",
+                                  targetScript->filename(), targetScript->lineno);
+        return false;
+    }
 
     // Callee must not be excessively large.
     // This heuristic also applies to the callsite as a whole.
@@ -3268,6 +3275,36 @@ IonBuilder::makeInliningDecision(JSFunction *target, CallInfo &callInfo)
         return false;
     }
 
+    // Cap the inlining depth.
+    uint32_t scriptMaxInlineDepth = targetScript->maxInlineDepth();
+    uint32_t globalMaxInlineDepth = js_IonOptions.maxInlineDepth;
+    if (IsSmallFunction(targetScript))
+        globalMaxInlineDepth = js_IonOptions.smallFunctionMaxInlineDepth;
+
+    // Cap the global inline depth.
+    if (inliningDepth_ >= globalMaxInlineDepth) {
+        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding global inline depth",
+                targetScript->filename(), targetScript->lineno);
+        baseBuilder->script()->disableInlineDepthCheck();
+        return false;
+    }
+
+    // Cap on scripts inline depth.
+    if (inliningDepth_ >= scriptMaxInlineDepth)
+    {
+        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding script inline depth.",
+                targetScript->filename(), targetScript->lineno);
+        return false;
+    }
+
+    // Update scripts max inline depth
+    // I.e. make sure that all known scripts that get inlined by this script still get inlined.
+    if (!baseBuilder->script()->isInlineDepthCheckDisabled()) {
+        uint32_t updatedInlineDepth = globalMaxInlineDepth - inliningDepth_ - 1;
+        if (updatedInlineDepth < baseBuilder->script()->maxInlineDepth())
+            baseBuilder->script()->setMaxInlineDepth(updatedInlineDepth);
+    }
+
     return true;
 }
 
diff --git a/js/src/ion/TypeOracle.cpp b/js/src/ion/TypeOracle.cpp
index 6e67e7956079..35aa88e63e26 100644
--- a/js/src/ion/TypeOracle.cpp
+++ b/js/src/ion/TypeOracle.cpp
@@ -703,12 +703,6 @@ TypeInferenceOracle::canEnterInlinedFunction(RawFunction target)
 {
     RootedScript targetScript(cx, target->nonLazyScript());
 
-    // Make sure empty script has type information, to allow inlining in more cases.
-    if (targetScript->length == 1) {
-        if (!targetScript->ensureRanInference(cx))
-            return false;
-    }
-
     if (!targetScript->hasAnalysis() ||
         !targetScript->analysis()->ranInference() ||
         !targetScript->analysis()->ranSSA())
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index 0e5312f58ce2..64eec6de4443 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -77,7 +77,7 @@ ScriptAnalysis::addJump(JSContext *cx, unsigned offset,
 
     if (offset < *currentOffset) {
         /* Scripts containing loops are never inlined. */
-        isJaegerInlineable = isIonInlineable = false;
+        isJaegerInlineable = false;
         hasLoops_ = true;
 
         if (code->analyzed) {
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index ed61d59d663b..c978f3d2c967 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1688,6 +1688,7 @@ JSScript::Create(JSContext *cx, HandleObject enclosingScope, bool savedCallerFun
     script->sourceStart = bufStart;
     script->sourceEnd = bufEnd;
     script->userBit = options.userBit;
+    script->maxInlineDepth_ = uint8_t(-1);
 
     return script;
 }
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 595287a6b12b..34cd5055602b 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -427,9 +427,6 @@ class JSScript : public js::gc::Cell
 
     // 16-bit fields.
 
-  private:
-    uint16_t        PADDING16;
-
     uint16_t        version;    /* JS version under which script was compiled */
 
   public:
@@ -445,6 +442,11 @@ class JSScript : public js::gc::Cell
     uint16_t        staticLevel;/* static level for display maintenance */
 
     // 8-bit fields.
+  private:
+    uint8_t        maxInlineDepth_; /* script max inline depth (IonMonkey)
+                                       uint8_t(-1): unitialized
+                                       uint8_t(-2): disabled */
+    uint8_t        PADDING8;
 
   public:
     // The kinds of the optional arrays.
@@ -808,6 +810,26 @@ class JSScript : public js::gc::Cell
         return maxLoopCount;
     }
 
+    void setMaxInlineDepth(uint32_t maxInlineDepth) {
+        if (maxInlineDepth >= uint8_t(-2)) {
+            disableInlineDepthCheck();
+            return;
+        }
+        maxInlineDepth_ = maxInlineDepth;
+    }
+
+    uint8_t maxInlineDepth() const {
+        return maxInlineDepth_;
+    }
+
+    void disableInlineDepthCheck() {
+        maxInlineDepth_ = uint8_t(-2);
+    }
+
+    bool isInlineDepthCheckDisabled() {
+        return maxInlineDepth_ == uint8_t(-2);
+    }
+
     /*
      * Size of the JITScript and all sections.  If |mallocSizeOf| is NULL, the
      * size is computed analytically.  (This method is implemented in

From 37b411dd6a8fad0d6e491c7a6f9ffc14ddea5eb1 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 12 Apr 2013 16:39:24 -0400
Subject: [PATCH 175/438] Bug 861372 - delete checks for FPU_IS_ARM_FPA;
 r=mjrosenb

---
 js/src/assembler/assembler/AssemblerBufferWithConstantPool.h | 2 +-
 js/src/ion/arm/MacroAssembler-arm.cpp                        | 2 +-
 js/src/vm/NumericConversions.h                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
index 72bf57f95041..467f9c9e8cbe 100644
--- a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
+++ b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
@@ -240,7 +240,7 @@ public:
 
         union DoublePun {
             struct {
-#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+#if defined(IS_LITTLE_ENDIAN)
                 uint32_t lo, hi;
 #else
                 uint32_t hi, lo;
diff --git a/js/src/ion/arm/MacroAssembler-arm.cpp b/js/src/ion/arm/MacroAssembler-arm.cpp
index 651bbf4035e2..561a0b358802 100644
--- a/js/src/ion/arm/MacroAssembler-arm.cpp
+++ b/js/src/ion/arm/MacroAssembler-arm.cpp
@@ -1282,7 +1282,7 @@ MacroAssemblerARM::ma_vimm(double value, FloatRegister dest, Condition cc)
 {
     union DoublePun {
         struct {
-#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+#if defined(IS_LITTLE_ENDIAN)
             uint32_t lo, hi;
 #else
             uint32_t hi, lo;
diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
index fd4c79417f89..42e69d63dd75 100644
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -23,7 +23,7 @@ namespace detail {
 
 union DoublePun {
     struct {
-#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+#if defined(IS_LITTLE_ENDIAN)
         uint32_t lo, hi;
 #else
         uint32_t hi, lo;

From 82ad423a28fbda2cdff64842e8da7b29351100a3 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 15 Apr 2013 11:52:07 -0400
Subject: [PATCH 176/438] Bug 861909 - only add ARM support for clang and llvm
 on linux; r=glandium

DONTBUILD because NPOTB
---
 build/unix/build-clang/build-clang.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/unix/build-clang/build-clang.py b/build/unix/build-clang/build-clang.py
index d89b70af8b2e..ba1323269afa 100755
--- a/build/unix/build-clang/build-clang.py
+++ b/build/unix/build-clang/build-clang.py
@@ -98,8 +98,16 @@ def build_one_stage_aux(stage_dir, is_stage_one):
     build_dir = stage_dir + "/build"
     inst_dir = stage_dir + "/clang"
 
+    targets = ["x86", "x86_64"]
+    # The Darwin equivalents of binutils appear to have intermittent problems
+    # with objects in compiler-rt that are compiled for arm.  Since the arm
+    # support is only necessary for iOS (which we don't support), only enable
+    # arm support on Linux.
+    if not isDarwin:
+        targets.append("arm")
+
     configure_opts = ["--enable-optimized",
-                      "--enable-targets=x86,x86_64,arm",
+                      "--enable-targets=" + ",".join(targets),
                       "--disable-assertions",
                       "--prefix=%s" % inst_dir,
                       "--with-gcc-toolchain=/tools/gcc-4.7.2-0moz1"]

From 37468489459833f740899cad02bd83d229b28b13 Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@freebst.org>
Date: Mon, 15 Apr 2013 14:21:20 -0400
Subject: [PATCH 177/438] bug 733712 - don't call atk_object_set_name()
 r=tbsaunde

---
 accessible/src/atk/AccessibleWrap.cpp | 44 +++++++++++++++++++++------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/accessible/src/atk/AccessibleWrap.cpp b/accessible/src/atk/AccessibleWrap.cpp
index 916c739d0f9e..2d28a2d022da 100644
--- a/accessible/src/atk/AccessibleWrap.cpp
+++ b/accessible/src/atk/AccessibleWrap.cpp
@@ -141,6 +141,8 @@ struct MaiAtkObjectClass
 
 static guint mai_atk_object_signals [LAST_SIGNAL] = { 0, };
 
+static void MaybeFireNameChange(AtkObject* aAtkObj, const nsString& aNewName);
+
 G_BEGIN_DECLS
 /* callbacks for MaiAtkObject */
 static void classInitCB(AtkObjectClass *aClass);
@@ -600,16 +602,41 @@ getNameCB(AtkObject* aAtkObj)
   if (!accWrap)
     return nullptr;
 
-  nsAutoString uniName;
-  accWrap->Name(uniName);
+  nsAutoString name;
+  accWrap->Name(name);
 
-  NS_ConvertUTF8toUTF16 objName(aAtkObj->name);
-  if (!uniName.Equals(objName))
-    atk_object_set_name(aAtkObj, NS_ConvertUTF16toUTF8(uniName).get());
+  // XXX Firing an event from here does not seem right
+  MaybeFireNameChange(aAtkObj, name);
 
   return aAtkObj->name;
 }
 
+static void
+MaybeFireNameChange(AtkObject* aAtkObj, const nsString& aNewName)
+{
+  NS_ConvertUTF16toUTF8 newNameUTF8(aNewName);
+  if (newNameUTF8.Equals(aAtkObj->name))
+    return;
+
+  // Below we duplicate the functionality of atk_object_set_name(),
+  // but without calling atk_object_get_name(). Instead of
+  // atk_object_get_name() we directly access aAtkObj->name. This is because
+  // atk_object_get_name() would call getNameCB() which would call
+  // MaybeFireNameChange() (or atk_object_set_name() before this problem was
+  // fixed) and we would get an infinite recursion.
+  // See http://bugzilla.mozilla.org/733712
+
+  // Do not notify for initial name setting.
+  // See bug http://bugzilla.gnome.org/665870
+  bool notify = !!aAtkObj->name;
+
+  free(aAtkObj->name);
+  aAtkObj->name = strdup(newNameUTF8.get());
+
+  if (notify)
+    g_object_notify(G_OBJECT(aAtkObj), "accessible-name");
+}
+
 const gchar *
 getDescriptionCB(AtkObject *aAtkObj)
 {
@@ -617,7 +644,7 @@ getDescriptionCB(AtkObject *aAtkObj)
     if (!accWrap || accWrap->IsDefunct())
         return nullptr;
 
-    /* nsIAccessible is responsible for the non-nullptr description */
+    /* nsIAccessible is responsible for the nonnull description */
     nsAutoString uniDesc;
     accWrap->Description(uniDesc);
 
@@ -975,9 +1002,8 @@ AccessibleWrap::FirePlatformEvent(AccEvent* aEvent)
       {
         nsAutoString newName;
         accessible->Name(newName);
-        NS_ConvertUTF16toUTF8 utf8Name(newName);
-        if (!atkObj->name || !utf8Name.Equals(atkObj->name))
-          atk_object_set_name(atkObj, utf8Name.get());
+
+        MaybeFireNameChange(atkObj, newName);
 
         break;
       }

From d3d051361876c1d41d1d5c4c9dafaffc3d1cd868 Mon Sep 17 00:00:00 2001
From: Sean Stangl <sstangl@mozilla.com>
Date: Mon, 15 Apr 2013 11:33:03 -0700
Subject: [PATCH 178/438] Bug 860029 - Standardize Modelines in the JS Module.
 r=njn

---
 js/ipc/CPOWTypes.h                            |  3 +-
 js/ipc/ContextWrapperChild.h                  |  3 +-
 js/ipc/ContextWrapperParent.h                 |  3 +-
 js/ipc/ObjectWrapperChild.cpp                 |  3 +-
 js/ipc/ObjectWrapperChild.h                   |  3 +-
 js/ipc/ObjectWrapperParent.cpp                |  5 +--
 js/ipc/ObjectWrapperParent.h                  |  3 +-
 js/jsd/jsd.h                                  |  5 ++-
 js/jsd/jsd_atom.cpp                           |  5 ++-
 js/jsd/jsd_high.cpp                           |  5 ++-
 js/jsd/jsd_hook.cpp                           |  5 ++-
 js/jsd/jsd_java.cpp                           |  5 ++-
 js/jsd/jsd_lock.cpp                           |  5 ++-
 js/jsd/jsd_lock.h                             |  5 ++-
 js/jsd/jsd_obj.cpp                            |  5 ++-
 js/jsd/jsd_scpt.cpp                           |  5 ++-
 js/jsd/jsd_stak.cpp                           |  5 ++-
 js/jsd/jsd_step.cpp                           |  5 ++-
 js/jsd/jsd_text.cpp                           |  5 ++-
 js/jsd/jsd_val.cpp                            |  5 ++-
 js/jsd/jsd_xpc.cpp                            |  4 +-
 js/jsd/jsd_xpc.h                              |  4 +-
 js/jsd/jsdebug.cpp                            |  5 ++-
 js/jsd/jsdebug.h                              |  5 ++-
 js/jsd/jsdstubs.cpp                           |  5 ++-
 js/jsd/jshash.cpp                             |  2 +-
 js/jsd/jshash.h                               |  4 +-
 js/jsd/resource.h                             |  5 ++-
 js/public/Anchor.h                            |  5 +--
 js/public/CallArgs.h                          |  5 +--
 js/public/CharacterEncoding.h                 |  3 +-
 js/public/GCAPI.h                             |  8 ++--
 js/public/HashTable.h                         |  5 +--
 js/public/HeapAPI.h                           |  8 ++--
 js/public/LegacyIntTypes.h                    |  5 ++-
 js/public/MemoryMetrics.h                     |  5 +--
 js/public/PropertyKey.h                       |  5 +--
 js/public/RequiredDefines.h                   |  3 +-
 js/public/RootingAPI.h                        |  3 +-
 js/public/TemplateLib.h                       |  5 +--
 js/public/Utility.h                           |  5 +--
 js/public/Value.h                             |  5 +--
 js/public/Vector.h                            |  5 +--
 js/src/TraceLogging.cpp                       | 10 ++---
 js/src/TraceLogging.h                         | 10 ++---
 js/src/assembler/assembler/ARMAssembler.cpp   |  2 +-
 js/src/assembler/assembler/ARMAssembler.h     |  2 +-
 js/src/assembler/assembler/ARMv7Assembler.h   |  2 +-
 .../assembler/AbstractMacroAssembler.h        |  2 +-
 js/src/assembler/assembler/AssemblerBuffer.h  |  2 +-
 .../AssemblerBufferWithConstantPool.h         |  2 +-
 js/src/assembler/assembler/CodeLocation.h     |  2 +-
 js/src/assembler/assembler/LinkBuffer.h       |  2 +-
 js/src/assembler/assembler/MacroAssembler.h   |  2 +-
 .../assembler/assembler/MacroAssemblerARM.cpp |  2 +-
 .../assembler/assembler/MacroAssemblerARM.h   |  2 +-
 .../assembler/assembler/MacroAssemblerARMv7.h |  2 +-
 .../assembler/MacroAssemblerCodeRef.h         |  2 +-
 .../assembler/assembler/MacroAssemblerSparc.h |  4 +-
 .../assembler/assembler/MacroAssemblerX86.h   |  2 +-
 .../assembler/MacroAssemblerX86Common.cpp     |  4 +-
 .../assembler/MacroAssemblerX86Common.h       |  2 +-
 .../assembler/MacroAssemblerX86_64.h          |  2 +-
 js/src/assembler/assembler/RepatchBuffer.h    |  2 +-
 js/src/assembler/assembler/SparcAssembler.h   |  4 +-
 js/src/assembler/assembler/X86Assembler.h     |  2 +-
 js/src/assembler/jit/ExecutableAllocator.cpp  |  4 +-
 js/src/assembler/moco/MocoStubs.h             |  5 +--
 js/src/builtin/Eval.cpp                       |  3 +-
 js/src/builtin/Eval.h                         |  5 +--
 js/src/builtin/Intl.cpp                       |  2 +-
 js/src/builtin/Intl.h                         |  2 +-
 js/src/builtin/Iterator-inl.h                 |  9 ++--
 js/src/builtin/MapObject.cpp                  |  5 +--
 js/src/builtin/MapObject.h                    |  5 +--
 js/src/builtin/Module.cpp                     |  6 +++
 js/src/builtin/Module.h                       |  6 +++
 js/src/builtin/Object.cpp                     |  5 +--
 js/src/builtin/Object.h                       |  5 +--
 js/src/builtin/ParallelArray.cpp              |  5 +--
 js/src/builtin/ParallelArray.h                |  5 +--
 js/src/builtin/Profilers.cpp                  |  9 ++--
 js/src/builtin/Profilers.h                    |  3 +-
 js/src/builtin/RegExp.cpp                     |  5 +--
 js/src/builtin/RegExp.h                       |  5 +--
 js/src/builtin/TestingFunctions.cpp           |  9 ++--
 js/src/builtin/TestingFunctions.h             |  9 ++--
 js/src/ctypes/CTypes.cpp                      |  5 ++-
 js/src/ctypes/Library.cpp                     |  5 ++-
 js/src/devtools/jint/treesearch.py            |  3 +-
 js/src/devtools/sharkctl.cpp                  |  3 +-
 js/src/devtools/sharkctl.h                    |  3 +-
 js/src/ds/BitArray.h                          |  5 +--
 js/src/ds/InlineMap.h                         |  5 +--
 js/src/ds/LifoAlloc.cpp                       |  5 +--
 js/src/ds/LifoAlloc.h                         |  5 +--
 js/src/ds/PriorityQueue.h                     |  5 +--
 js/src/ds/Sort.h                              |  5 +--
 js/src/ds/SplayTree.h                         |  5 +--
 js/src/editline/editline.c                    |  1 -
 js/src/editline/editline.h                    |  1 -
 js/src/editline/sysunix.c                     |  1 -
 js/src/editline/unix.h                        |  1 -
 js/src/frontend/BytecodeCompiler.cpp          |  3 +-
 js/src/frontend/BytecodeCompiler.h            |  3 +-
 js/src/frontend/BytecodeEmitter.cpp           |  3 +-
 js/src/frontend/BytecodeEmitter.h             |  3 +-
 js/src/frontend/FoldConstants.cpp             |  3 +-
 js/src/frontend/FoldConstants.h               |  3 +-
 js/src/frontend/FullParseHandler.h            |  3 +-
 js/src/frontend/NameFunctions.cpp             |  3 +-
 js/src/frontend/NameFunctions.h               |  3 +-
 js/src/frontend/ParseMaps-inl.h               |  5 +--
 js/src/frontend/ParseMaps.cpp                 |  5 +--
 js/src/frontend/ParseMaps.h                   |  5 +--
 js/src/frontend/ParseNode-inl.h               |  2 +-
 js/src/frontend/ParseNode.cpp                 |  3 +-
 js/src/frontend/ParseNode.h                   |  3 +-
 js/src/frontend/Parser-inl.h                  |  3 +-
 js/src/frontend/Parser.cpp                    |  3 +-
 js/src/frontend/Parser.h                      |  3 +-
 js/src/frontend/SharedContext-inl.h           |  3 +-
 js/src/frontend/SharedContext.h               |  3 +-
 js/src/frontend/SyntaxParseHandler.h          |  3 +-
 js/src/frontend/TokenStream.cpp               |  3 +-
 js/src/frontend/TokenStream.h                 |  4 +-
 js/src/gc/Barrier-inl.h                       |  3 +-
 js/src/gc/Barrier.h                           |  3 +-
 js/src/gc/FindSCCs-inl.h                      |  8 ++--
 js/src/gc/FindSCCs.h                          |  8 ++--
 js/src/gc/GCInternals.h                       |  3 +-
 js/src/gc/Heap.h                              |  8 ++--
 js/src/gc/Iteration.cpp                       |  3 +-
 js/src/gc/Marking.cpp                         |  9 ++--
 js/src/gc/Marking.h                           | 11 +++--
 js/src/gc/Memory.cpp                          |  7 ++-
 js/src/gc/Memory.h                            |  7 ++-
 js/src/gc/RootMarking.cpp                     |  3 +-
 js/src/gc/Statistics.cpp                      |  3 +-
 js/src/gc/Statistics.h                        |  3 +-
 js/src/gc/StoreBuffer.cpp                     |  9 ++--
 js/src/gc/StoreBuffer.h                       |  7 ++-
 js/src/gc/Verifier.cpp                        |  3 +-
 js/src/gc/Zone.cpp                            |  3 +-
 js/src/gc/Zone.h                              |  5 +--
 js/src/gdb/gdb-tests.h                        |  2 +-
 js/src/ion/AliasAnalysis.cpp                  |  5 +--
 js/src/ion/AliasAnalysis.h                    |  5 +--
 js/src/ion/AsmJS.cpp                          |  5 +--
 js/src/ion/AsmJS.h                            |  5 +--
 js/src/ion/AsmJSLink.cpp                      |  5 +--
 js/src/ion/AsmJSModule.h                      |  5 +--
 js/src/ion/AsmJSSignalHandlers.cpp            |  5 +--
 js/src/ion/BacktrackingAllocator.cpp          |  5 +--
 js/src/ion/BacktrackingAllocator.h            |  5 +--
 js/src/ion/Bailouts.cpp                       |  5 +--
 js/src/ion/Bailouts.h                         |  5 +--
 js/src/ion/BaselineBailouts.cpp               |  5 +--
 js/src/ion/BaselineCompiler.cpp               |  5 +--
 js/src/ion/BaselineCompiler.h                 |  5 +--
 js/src/ion/BaselineFrame-inl.h                |  5 +--
 js/src/ion/BaselineFrame.cpp                  |  5 +--
 js/src/ion/BaselineFrame.h                    |  5 +--
 js/src/ion/BaselineFrameInfo.cpp              |  5 +--
 js/src/ion/BaselineFrameInfo.h                |  5 +--
 js/src/ion/BaselineHelpers.h                  |  5 +--
 js/src/ion/BaselineIC.cpp                     |  5 +--
 js/src/ion/BaselineIC.h                       |  5 +--
 js/src/ion/BaselineInspector.cpp              |  5 +--
 js/src/ion/BaselineInspector.h                |  5 +--
 js/src/ion/BaselineJIT.cpp                    |  5 +--
 js/src/ion/BaselineJIT.h                      |  5 +--
 js/src/ion/BaselineRegisters.h                |  5 +--
 js/src/ion/BitSet.cpp                         |  5 +--
 js/src/ion/BitSet.h                           |  5 +--
 js/src/ion/C1Spewer.cpp                       |  5 +--
 js/src/ion/C1Spewer.h                         |  5 +--
 js/src/ion/CodeGenerator.cpp                  |  5 +--
 js/src/ion/CodeGenerator.h                    |  5 +--
 js/src/ion/CompactBuffer.h                    |  5 +--
 js/src/ion/CompileInfo-inl.h                  |  5 +--
 js/src/ion/CompileInfo.h                      |  5 +--
 js/src/ion/CompilerRoot.h                     |  5 +--
 js/src/ion/EdgeCaseAnalysis.cpp               |  5 +--
 js/src/ion/EdgeCaseAnalysis.h                 |  5 +--
 js/src/ion/EffectiveAddressAnalysis.cpp       |  5 +--
 js/src/ion/EffectiveAddressAnalysis.h         |  5 +--
 js/src/ion/ExecutionModeInlines.h             |  5 +--
 js/src/ion/FixedArityList.h                   |  5 +--
 js/src/ion/FixedList.h                        |  5 +--
 js/src/ion/InlineList.h                       |  5 +--
 js/src/ion/Ion.cpp                            |  5 +--
 js/src/ion/Ion.h                              |  5 +--
 js/src/ion/IonAllocPolicy.h                   |  5 +--
 js/src/ion/IonAnalysis.cpp                    |  5 +--
 js/src/ion/IonAnalysis.h                      |  5 +--
 js/src/ion/IonBuilder.cpp                     |  5 +--
 js/src/ion/IonBuilder.h                       |  5 +--
 js/src/ion/IonCaches.cpp                      |  5 +--
 js/src/ion/IonCaches.h                        |  5 +--
 js/src/ion/IonCode.h                          |  5 +--
 js/src/ion/IonCompartment.h                   |  5 +--
 js/src/ion/IonFrameIterator-inl.h             |  5 +--
 js/src/ion/IonFrameIterator.h                 |  5 +--
 js/src/ion/IonFrames-inl.h                    |  5 +--
 js/src/ion/IonFrames.cpp                      |  5 +--
 js/src/ion/IonFrames.h                        |  5 +--
 js/src/ion/IonInstrumentation.h               |  5 +--
 js/src/ion/IonLinker.h                        |  5 +--
 js/src/ion/IonMacroAssembler.cpp              |  5 +--
 js/src/ion/IonMacroAssembler.h                |  5 +--
 js/src/ion/IonSpewer.cpp                      |  5 +--
 js/src/ion/IonSpewer.h                        |  5 +--
 js/src/ion/IonTypes.h                         |  5 +--
 js/src/ion/JSONSpewer.cpp                     |  5 +--
 js/src/ion/JSONSpewer.h                       |  5 +--
 js/src/ion/LICM.cpp                           |  5 +--
 js/src/ion/LICM.h                             |  5 +--
 js/src/ion/LIR-Common.h                       |  5 +--
 js/src/ion/LIR-inl.h                          |  5 +--
 js/src/ion/LIR.cpp                            |  5 +--
 js/src/ion/LIR.h                              |  5 +--
 js/src/ion/LOpcodes.h                         |  5 +--
 js/src/ion/LinearScan.cpp                     |  5 +--
 js/src/ion/LinearScan.h                       |  5 +--
 js/src/ion/LiveRangeAllocator.cpp             |  5 +--
 js/src/ion/LiveRangeAllocator.h               |  5 +--
 js/src/ion/Lowering.cpp                       |  5 +--
 js/src/ion/Lowering.h                         |  5 +--
 js/src/ion/MCallOptimize.cpp                  |  5 +--
 js/src/ion/MIR.cpp                            |  5 +--
 js/src/ion/MIR.h                              |  5 +--
 js/src/ion/MIRGenerator.h                     |  5 +--
 js/src/ion/MIRGraph.cpp                       |  5 +--
 js/src/ion/MIRGraph.h                         |  5 +--
 js/src/ion/MOpcodes.h                         |  5 +--
 js/src/ion/MoveEmitter.h                      |  5 +--
 js/src/ion/MoveResolver.cpp                   |  5 +--
 js/src/ion/MoveResolver.h                     |  5 +--
 js/src/ion/ParallelArrayAnalysis.cpp          |  5 +--
 js/src/ion/ParallelArrayAnalysis.h            |  5 +--
 js/src/ion/ParallelFunctions.cpp              |  5 +--
 js/src/ion/ParallelFunctions.h                |  5 +--
 js/src/ion/PcScriptCache-inl.h                |  5 +--
 js/src/ion/PcScriptCache.h                    |  5 +--
 js/src/ion/RangeAnalysis.cpp                  |  5 +--
 js/src/ion/RangeAnalysis.h                    |  5 +--
 js/src/ion/RegisterAllocator.cpp              |  5 +--
 js/src/ion/RegisterAllocator.h                |  5 +--
 js/src/ion/RegisterSets.h                     |  5 +--
 js/src/ion/Registers.h                        |  5 +--
 js/src/ion/Safepoints.cpp                     |  5 +--
 js/src/ion/Safepoints.h                       |  5 +--
 js/src/ion/SnapshotReader.h                   |  5 +--
 js/src/ion/SnapshotWriter.h                   |  5 +--
 js/src/ion/Snapshots.cpp                      |  5 +--
 js/src/ion/StackSlotAllocator.h               |  5 +--
 js/src/ion/StupidAllocator.cpp                |  5 +--
 js/src/ion/StupidAllocator.h                  |  5 +--
 js/src/ion/TypeOracle.cpp                     |  5 +--
 js/src/ion/TypeOracle.h                       |  5 +--
 js/src/ion/TypePolicy.cpp                     |  5 +--
 js/src/ion/TypePolicy.h                       |  5 +--
 js/src/ion/UnreachableCodeElimination.cpp     |  5 +--
 js/src/ion/UnreachableCodeElimination.h       |  5 +--
 js/src/ion/VMFunctions.cpp                    |  5 +--
 js/src/ion/VMFunctions.h                      |  5 +--
 js/src/ion/ValueNumbering.cpp                 |  5 +--
 js/src/ion/ValueNumbering.h                   |  5 +--
 js/src/ion/arm/Architecture-arm.cpp           |  6 +--
 js/src/ion/arm/Architecture-arm.h             |  5 +--
 js/src/ion/arm/Assembler-arm.cpp              |  5 +--
 js/src/ion/arm/Assembler-arm.h                |  5 +--
 js/src/ion/arm/Bailouts-arm.cpp               |  5 +--
 js/src/ion/arm/BaselineCompiler-arm.cpp       |  5 +--
 js/src/ion/arm/BaselineCompiler-arm.h         |  5 +--
 js/src/ion/arm/BaselineHelpers-arm.h          |  5 +--
 js/src/ion/arm/BaselineIC-arm.cpp             |  5 +--
 js/src/ion/arm/BaselineRegisters-arm.h        |  5 +--
 js/src/ion/arm/CodeGenerator-arm.cpp          |  5 +--
 js/src/ion/arm/CodeGenerator-arm.h            |  5 +--
 js/src/ion/arm/IonFrames-arm.cpp              |  5 +--
 js/src/ion/arm/IonFrames-arm.h                |  5 +--
 js/src/ion/arm/LIR-arm.h                      |  5 +--
 js/src/ion/arm/LOpcodes-arm.h                 |  5 +--
 js/src/ion/arm/Lowering-arm.cpp               |  5 +--
 js/src/ion/arm/Lowering-arm.h                 |  5 +--
 js/src/ion/arm/MacroAssembler-arm.cpp         |  5 +--
 js/src/ion/arm/MacroAssembler-arm.h           |  5 +--
 js/src/ion/arm/MoveEmitter-arm.cpp            |  5 +--
 js/src/ion/arm/MoveEmitter-arm.h              |  5 +--
 js/src/ion/arm/Trampoline-arm.cpp             |  5 +--
 js/src/ion/shared/Assembler-shared.h          |  5 +--
 js/src/ion/shared/Assembler-x86-shared.cpp    |  5 +--
 js/src/ion/shared/Assembler-x86-shared.h      |  5 +--
 js/src/ion/shared/BaselineCompiler-shared.cpp |  5 +--
 js/src/ion/shared/BaselineCompiler-shared.h   |  5 +--
 .../shared/BaselineCompiler-x86-shared.cpp    |  5 +--
 .../ion/shared/BaselineCompiler-x86-shared.h  |  5 +--
 js/src/ion/shared/BaselineIC-x86-shared.cpp   |  5 +--
 js/src/ion/shared/CodeGenerator-shared-inl.h  |  5 +--
 js/src/ion/shared/CodeGenerator-shared.cpp    |  5 +--
 js/src/ion/shared/CodeGenerator-shared.h      |  5 +--
 .../ion/shared/CodeGenerator-x86-shared.cpp   |  5 +--
 js/src/ion/shared/CodeGenerator-x86-shared.h  |  5 +--
 js/src/ion/shared/IonAssemblerBuffer.h        |  5 +--
 .../IonAssemblerBufferWithConstantPools.h     |  5 +--
 js/src/ion/shared/IonFrames-shared.h          | 44 +++----------------
 js/src/ion/shared/IonFrames-x86-shared.cpp    |  5 +--
 js/src/ion/shared/IonFrames-x86-shared.h      |  5 +--
 js/src/ion/shared/LIR-x86-shared.h            |  5 +--
 js/src/ion/shared/Lowering-shared-inl.h       |  5 +--
 js/src/ion/shared/Lowering-shared.cpp         |  5 +--
 js/src/ion/shared/Lowering-shared.h           |  5 +--
 js/src/ion/shared/Lowering-x86-shared.cpp     |  5 +--
 js/src/ion/shared/Lowering-x86-shared.h       |  5 +--
 js/src/ion/shared/MacroAssembler-x86-shared.h |  5 +--
 js/src/ion/shared/MoveEmitter-x86-shared.cpp  |  5 +--
 js/src/ion/shared/MoveEmitter-x86-shared.h    |  5 +--
 js/src/ion/x64/Architecture-x64.h             |  5 +--
 js/src/ion/x64/Assembler-x64.cpp              |  5 +--
 js/src/ion/x64/Assembler-x64.h                |  5 +--
 js/src/ion/x64/Bailouts-x64.cpp               |  5 +--
 js/src/ion/x64/BaselineCompiler-x64.cpp       |  5 +--
 js/src/ion/x64/BaselineCompiler-x64.h         |  5 +--
 js/src/ion/x64/BaselineHelpers-x64.h          |  5 +--
 js/src/ion/x64/BaselineIC-x64.cpp             |  5 +--
 js/src/ion/x64/BaselineRegisters-x64.h        |  5 +--
 js/src/ion/x64/CodeGenerator-x64.cpp          |  5 +--
 js/src/ion/x64/CodeGenerator-x64.h            |  5 +--
 js/src/ion/x64/LIR-x64.h                      |  5 +--
 js/src/ion/x64/LOpcodes-x64.h                 |  5 +--
 js/src/ion/x64/Lowering-x64.cpp               |  5 +--
 js/src/ion/x64/Lowering-x64.h                 |  5 +--
 js/src/ion/x64/MacroAssembler-x64.cpp         |  5 +--
 js/src/ion/x64/MacroAssembler-x64.h           |  5 +--
 js/src/ion/x64/Trampoline-x64.cpp             |  5 +--
 js/src/ion/x86/Architecture-x86.h             |  5 +--
 js/src/ion/x86/Assembler-x86.cpp              |  5 +--
 js/src/ion/x86/Assembler-x86.h                |  5 +--
 js/src/ion/x86/Bailouts-x86.cpp               |  5 +--
 js/src/ion/x86/BaselineCompiler-x86.cpp       |  5 +--
 js/src/ion/x86/BaselineCompiler-x86.h         |  5 +--
 js/src/ion/x86/BaselineHelpers-x86.h          |  5 +--
 js/src/ion/x86/BaselineIC-x86.cpp             |  5 +--
 js/src/ion/x86/BaselineRegisters-x86.h        |  5 +--
 js/src/ion/x86/CodeGenerator-x86.cpp          |  5 +--
 js/src/ion/x86/CodeGenerator-x86.h            |  5 +--
 js/src/ion/x86/LIR-x86.h                      |  5 +--
 js/src/ion/x86/LOpcodes-x86.h                 |  5 +--
 js/src/ion/x86/Lowering-x86.cpp               |  5 +--
 js/src/ion/x86/Lowering-x86.h                 |  5 +--
 js/src/ion/x86/MacroAssembler-x86.cpp         |  5 +--
 js/src/ion/x86/MacroAssembler-x86.h           |  5 +--
 js/src/ion/x86/Trampoline-x86.cpp             |  5 +--
 .../jit-test/tests/auto-regress/bug557946.js  |  2 +-
 .../jit-test/tests/auto-regress/bug558618.js  |  2 +-
 js/src/jit-test/tests/basic/bug535760.js      |  2 +-
 js/src/jit-test/tests/basic/bug541191-1.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-2.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-3.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-4.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-5.js    |  2 +-
 js/src/jit-test/tests/basic/bug592927.js      |  2 +-
 js/src/jit-test/tests/basic/bug602088.js      |  2 +-
 js/src/jit-test/tests/basic/bug606083.js      |  2 +-
 js/src/jit-test/tests/basic/bug616762.js      |  2 +-
 js/src/jit-test/tests/basic/bug633409-1.js    |  2 +-
 js/src/jit-test/tests/basic/bug633409-2.js    |  2 +-
 js/src/jit-test/tests/ion/bug674664-3.js      |  2 +-
 js/src/jit-test/tests/ion/bug684362.js        |  2 +-
 js/src/jit-test/tests/ion/bug747271.js        |  2 +-
 js/src/jit-test/tests/ion/bug750588.js        |  2 +-
 js/src/jit-test/tests/ion/bug772901.js        |  2 +-
 js/src/jit-test/tests/ion/testPos.js          |  2 +-
 js/src/jit-test/tests/ion/testSubtract.js     |  2 +-
 js/src/jit-test/tests/ion/testVAndBranch.js   |  2 +-
 js/src/jit-test/tests/ion/truncateToInt32.js  |  2 +-
 js/src/jit-test/tests/ion/valueToInt32.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug592973-1.js   |  2 +-
 js/src/jit-test/tests/jaeger/bug592973-3.js   |  2 +-
 js/src/jit-test/tests/jaeger/bug597378.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug600139.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug600424.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug601982.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug604381.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug616508.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug625438.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug627486.js     |  2 +-
 .../jit-test/tests/jaeger/floatTypedArrays.js |  2 +-
 .../tests/jaeger/normalIntTypedArrays.js      |  2 +-
 .../tests/jaeger/smallIntTypedArrays.js       |  2 +-
 .../tests/jaeger/testCallElemAfterGC.js       |  2 +-
 .../tests/jaeger/testDenseCallElem.js         |  2 +-
 js/src/jit-test/tests/jaeger/testForOps.js    |  2 +-
 .../jit-test/tests/jaeger/testPropCallElem.js |  2 +-
 .../tests/jaeger/testPropCallElem2.js         |  2 +-
 .../jit-test/tests/jaeger/testSetElem-Easy.js |  2 +-
 .../tests/jaeger/testSetElem-Indexed.js       |  2 +-
 .../tests/jaeger/testSetElem-NewProto.js      |  2 +-
 .../tests/jaeger/testSetTypedFloatArray.js    |  2 +-
 .../tests/jaeger/testSetTypedIntArray.js      |  2 +-
 .../tests/jaeger/testShiftSameBacking.js      |  2 +-
 js/src/jsalloc.cpp                            |  5 +--
 js/src/jsalloc.h                              |  5 +--
 js/src/jsanalyze.cpp                          |  6 +--
 js/src/jsanalyze.h                            |  6 +--
 js/src/jsapi-tests/selfTest.cpp               |  2 +-
 .../jsapi-tests/testAddPropertyPropcache.cpp  |  2 +-
 js/src/jsapi-tests/testArgumentsObject.cpp    |  2 +-
 js/src/jsapi-tests/testArrayBuffer.cpp        |  2 +-
 js/src/jsapi-tests/testBug604087.cpp          |  2 +-
 js/src/jsapi-tests/testClassGetter.cpp        |  2 +-
 js/src/jsapi-tests/testCloneScript.cpp        |  2 +-
 js/src/jsapi-tests/testContexts.cpp           |  6 +--
 js/src/jsapi-tests/testDebugger.cpp           |  2 +-
 js/src/jsapi-tests/testDeepFreeze.cpp         |  2 +-
 .../testDefineGetterSetterNonEnumerable.cpp   |  2 +-
 js/src/jsapi-tests/testDefineProperty.cpp     |  2 +-
 js/src/jsapi-tests/testEnclosingFunction.cpp  |  2 +-
 js/src/jsapi-tests/testErrorCopying.cpp       |  2 +-
 js/src/jsapi-tests/testFindSCCs.cpp           |  2 +-
 js/src/jsapi-tests/testFunctionProperties.cpp |  2 +-
 js/src/jsapi-tests/testGCOutOfMemory.cpp      |  2 +-
 js/src/jsapi-tests/testGetPropertyDefault.cpp |  2 +-
 js/src/jsapi-tests/testIndexToString.cpp      |  2 +-
 js/src/jsapi-tests/testIntString.cpp          |  2 +-
 js/src/jsapi-tests/testJSEvaluateScript.cpp   |  2 +-
 js/src/jsapi-tests/testLookup.cpp             |  2 +-
 js/src/jsapi-tests/testNewObject.cpp          |  2 +-
 js/src/jsapi-tests/testOps.cpp                |  2 +-
 js/src/jsapi-tests/testParseJSON.cpp          |  2 +-
 js/src/jsapi-tests/testProfileStrings.cpp     |  2 +-
 js/src/jsapi-tests/testPropCache.cpp          |  2 +-
 .../testRegExpInstanceProperties.cpp          |  2 +-
 js/src/jsapi-tests/testResolveRecursion.cpp   |  2 +-
 js/src/jsapi-tests/testSameValue.cpp          |  2 +-
 js/src/jsapi-tests/testScriptInfo.cpp         |  2 +-
 js/src/jsapi-tests/testScriptObject.cpp       |  2 +-
 js/src/jsapi-tests/testSetProperty.cpp        |  2 +-
 js/src/jsapi-tests/testStringBuffer.cpp       |  2 +-
 js/src/jsapi-tests/testTrap.cpp               |  2 +-
 js/src/jsapi-tests/testTypedArrays.cpp        |  2 +-
 js/src/jsapi-tests/testUTF8.cpp               |  2 +-
 js/src/jsapi-tests/testXDR.cpp                |  2 +-
 js/src/jsapi-tests/tests.cpp                  |  3 +-
 js/src/jsapi-tests/tests.h                    |  3 +-
 js/src/jsapi-tests/valueABI.c                 |  3 +-
 js/src/jsapi.cpp                              |  5 +--
 js/src/jsapi.h                                |  3 +-
 js/src/jsarray.cpp                            |  3 +-
 js/src/jsarray.h                              |  2 +-
 js/src/jsatom.cpp                             |  2 +-
 js/src/jsatom.h                               |  2 +-
 js/src/jsatominlines.h                        |  4 +-
 js/src/jsbool.cpp                             |  2 +-
 js/src/jsbool.h                               |  4 +-
 js/src/jsboolinlines.h                        |  4 +-
 js/src/jsclass.h                              |  5 +--
 js/src/jsclist.h                              |  5 ++-
 js/src/jsclone.cpp                            |  1 +
 js/src/jsclone.h                              |  1 +
 js/src/jscntxt.cpp                            |  5 +--
 js/src/jscntxt.h                              |  3 +-
 js/src/jscntxtinlines.h                       |  5 +--
 js/src/jscompartment.cpp                      |  5 +--
 js/src/jscompartment.h                        |  5 +--
 js/src/jscompartmentinlines.h                 |  5 +--
 js/src/jscpucfg.h                             |  4 +-
 js/src/jscrashformat.h                        |  5 +--
 js/src/jscrashreport.cpp                      |  5 +--
 js/src/jscrashreport.h                        |  5 +--
 js/src/jsdate.cpp                             |  3 +-
 js/src/jsdate.h                               |  4 +-
 js/src/jsdbgapi.cpp                           |  3 +-
 js/src/jsdbgapi.h                             |  3 +-
 js/src/jsdhash.cpp                            |  5 ++-
 js/src/jsdhash.h                              |  5 ++-
 js/src/jsdtoa.cpp                             |  2 +-
 js/src/jsdtoa.h                               |  4 +-
 js/src/jsexn.cpp                              |  3 +-
 js/src/jsexn.h                                |  4 +-
 js/src/jsfriendapi.cpp                        |  5 +--
 js/src/jsfriendapi.h                          |  2 +-
 js/src/jsfun.cpp                              |  5 +--
 js/src/jsfun.h                                |  4 +-
 js/src/jsfuninlines.h                         |  5 +--
 js/src/jsgc.cpp                               |  3 +-
 js/src/jsgc.h                                 |  2 +-
 js/src/jsgcinlines.h                          |  2 +-
 js/src/jsinfer.cpp                            |  6 +--
 js/src/jsinfer.h                              |  6 +--
 js/src/jsinferinlines.h                       |  6 +--
 js/src/jsinterp.cpp                           |  5 +--
 js/src/jsinterp.h                             |  5 +--
 js/src/jsinterpinlines.h                      |  5 +--
 js/src/jsiter.cpp                             |  3 +-
 js/src/jsiter.h                               |  3 +-
 js/src/jskwgen.cpp                            |  3 +-
 js/src/jslibmath.h                            |  5 +--
 js/src/jslock.h                               |  3 +-
 js/src/jslog2.cpp                             |  5 ++-
 js/src/jsmath.cpp                             |  5 +--
 js/src/jsmath.h                               |  4 +-
 js/src/jsmemorymetrics.cpp                    |  5 +--
 js/src/jsnativestack.cpp                      |  5 +--
 js/src/jsnativestack.h                        |  5 +--
 js/src/jsnum.cpp                              |  2 +-
 js/src/jsnum.h                                |  4 +-
 js/src/jsnuminlines.h                         |  4 +-
 js/src/jsobj.cpp                              |  3 +-
 js/src/jsobj.h                                |  3 +-
 js/src/jsobjinlines.h                         |  3 +-
 js/src/json.cpp                               |  3 +-
 js/src/json.h                                 |  4 +-
 js/src/jsonparser.cpp                         |  3 +-
 js/src/jsonparser.h                           |  3 +-
 js/src/jsopcode.cpp                           |  5 +--
 js/src/jsopcode.h                             |  4 +-
 js/src/jsopcodeinlines.h                      |  4 +-
 js/src/jsoplengen.cpp                         |  3 +-
 js/src/jsprf.cpp                              |  5 ++-
 js/src/jsprf.h                                |  5 ++-
 js/src/jsprobes.cpp                           |  3 +-
 js/src/jsprobes.h                             |  5 +--
 js/src/jspropertycache.cpp                    |  5 +--
 js/src/jspropertycache.h                      |  3 +-
 js/src/jspropertycacheinlines.h               |  3 +-
 js/src/jspropertytree.cpp                     |  6 +--
 js/src/jspropertytree.h                       |  6 +--
 js/src/jsprototypes.h                         |  5 +--
 js/src/jsproxy.cpp                            |  9 ++--
 js/src/jsproxy.h                              |  5 +--
 js/src/jsprvtd.h                              |  2 +-
 js/src/jspubtd.h                              |  2 +-
 js/src/jsreflect.cpp                          |  5 +--
 js/src/jsreflect.h                            |  5 +--
 js/src/jsscript.cpp                           |  3 +-
 js/src/jsscript.h                             |  3 +-
 js/src/jsscriptinlines.h                      |  3 +-
 js/src/jsstr.cpp                              |  5 +--
 js/src/jsstr.h                                |  5 +--
 js/src/jsstrinlines.h                         |  4 +-
 js/src/jstypedarray.cpp                       |  6 +--
 js/src/jstypedarray.h                         |  6 +--
 js/src/jstypedarrayinlines.h                  |  6 +--
 js/src/jstypes.h                              |  5 ++-
 js/src/jsutil.cpp                             |  4 +-
 js/src/jsutil.h                               |  4 +-
 js/src/jsversion.h                            |  4 +-
 js/src/jswatchpoint.cpp                       |  2 +-
 js/src/jswatchpoint.h                         |  2 +-
 js/src/jsweakcache.h                          |  5 +--
 js/src/jsweakmap.cpp                          |  5 +--
 js/src/jsweakmap.h                            |  5 +--
 js/src/jswin.h                                |  4 +-
 js/src/jsworkers.cpp                          |  6 +--
 js/src/jsworkers.h                            |  6 +--
 js/src/jswrapper.cpp                          |  5 +--
 js/src/jswrapper.h                            |  5 +--
 js/src/methodjit/BaseAssembler.h              |  5 +--
 js/src/methodjit/BaseCompiler.h               |  5 +--
 js/src/methodjit/CodeGenIncludes.h            |  5 +--
 js/src/methodjit/Compiler.cpp                 |  5 +--
 js/src/methodjit/Compiler.h                   |  5 +--
 js/src/methodjit/FastArithmetic.cpp           |  5 +--
 js/src/methodjit/FastBuiltins.cpp             |  5 +--
 js/src/methodjit/FastOps.cpp                  |  5 +--
 js/src/methodjit/FrameEntry.h                 |  5 +--
 js/src/methodjit/FrameState-inl.h             |  5 +--
 js/src/methodjit/FrameState.cpp               |  5 +--
 js/src/methodjit/FrameState.h                 |  5 +--
 js/src/methodjit/ICChecker.h                  |  5 +--
 js/src/methodjit/ICLabels.h                   |  5 +--
 js/src/methodjit/ICRepatcher.h                |  5 +--
 js/src/methodjit/ImmutableSync.cpp            |  5 +--
 js/src/methodjit/ImmutableSync.h              |  5 +--
 js/src/methodjit/InlineFrameAssembler.h       |  5 +--
 js/src/methodjit/InvokeHelpers.cpp            |  5 +--
 js/src/methodjit/Logging.cpp                  |  5 +--
 js/src/methodjit/Logging.h                    |  5 +--
 js/src/methodjit/LoopState.cpp                |  5 +--
 js/src/methodjit/LoopState.h                  |  5 +--
 js/src/methodjit/MachineRegs.h                |  5 +--
 js/src/methodjit/MethodJIT.cpp                |  5 +--
 js/src/methodjit/MethodJIT.h                  |  5 +--
 js/src/methodjit/MonoIC.cpp                   |  5 +--
 js/src/methodjit/MonoIC.h                     |  5 +--
 js/src/methodjit/NunboxAssembler.h            |  5 +--
 js/src/methodjit/PolyIC.cpp                   |  5 +--
 js/src/methodjit/PolyIC.h                     |  5 +--
 js/src/methodjit/PunboxAssembler.h            |  5 +--
 js/src/methodjit/RematInfo.h                  |  5 +--
 js/src/methodjit/Retcon.cpp                   |  5 +--
 js/src/methodjit/Retcon.h                     |  5 +--
 js/src/methodjit/StubCalls-inl.h              |  5 +--
 js/src/methodjit/StubCalls.cpp                |  5 +--
 js/src/methodjit/StubCalls.h                  |  5 +--
 js/src/methodjit/StubCompiler.cpp             |  5 +--
 js/src/methodjit/StubCompiler.h               |  5 +--
 js/src/methodjit/TrampolineCompiler.cpp       |  5 +--
 js/src/methodjit/TrampolineCompiler.h         |  5 +--
 js/src/methodjit/TrampolineMIPS.cpp           |  5 +--
 js/src/methodjit/TypedArrayIC.h               |  5 +--
 js/src/perf/jsperf.cpp                        |  2 +-
 js/src/perf/jsperf.h                          |  2 +-
 js/src/perf/pm_linux.cpp                      |  2 +-
 js/src/perf/pm_stub.cpp                       |  2 +-
 js/src/prmjtime.cpp                           |  2 +-
 js/src/prmjtime.h                             |  4 +-
 js/src/shell/js.cpp                           |  3 +-
 js/src/shell/jsheaptools.cpp                  |  3 +-
 js/src/shell/jsheaptools.h                    |  3 +-
 js/src/shell/jsoptparse.cpp                   |  3 +-
 js/src/shell/jsoptparse.h                     |  3 +-
 .../ecma_2/Exceptions/exception-010-n.js      |  1 -
 .../ecma_2/Exceptions/exception-011-n.js      |  1 -
 .../ecma_2/FunctionObjects/apply-001-n.js     |  1 -
 .../tests/ecma_3/Exceptions/regress-58946.js  |  1 -
 .../tests/ecma_3/ExecutionContexts/10.1.3.js  |  1 -
 .../ecma_3/ExecutionContexts/10.1.4-1.js      |  1 -
 .../ecma_3/ExecutionContexts/regress-23346.js |  1 -
 js/src/tests/ecma_3/FunExpr/fe-001-n.js       |  1 -
 js/src/tests/ecma_3/FunExpr/fe-001.js         |  1 -
 js/src/tests/ecma_3/FunExpr/fe-002.js         |  1 -
 .../ecma_3/NumberFormatting/tostring-001.js   |  1 -
 js/src/tests/ecma_3/RegExp/regress-24712.js   |  1 -
 js/src/tests/ecma_3/RegExp/regress-28686.js   |  1 -
 js/src/tests/ecma_3/Unicode/uc-001-n.js       |  1 -
 js/src/tests/ecma_3/Unicode/uc-001.js         |  1 -
 js/src/tests/ecma_3/Unicode/uc-002-n.js       |  1 -
 js/src/tests/ecma_3/Unicode/uc-002.js         |  1 -
 js/src/tests/ecma_3/Unicode/uc-003.js         |  1 -
 js/src/tests/ecma_3/Unicode/uc-004.js         |  1 -
 .../js1_5/Exceptions/catchguard-002-n.js      |  1 -
 .../js1_5/Exceptions/catchguard-003-n.js      |  1 -
 js/src/tests/js1_5/GetSet/getset-002.js       |  1 -
 .../js1_5/extensions/catchguard-001-n.js      |  1 -
 .../tests/js1_5/extensions/catchguard-001.js  |  1 -
 .../tests/js1_5/extensions/catchguard-002.js  |  1 -
 .../tests/js1_5/extensions/catchguard-003.js  |  1 -
 js/src/tests/js1_5/extensions/getset-001.js   |  1 -
 .../tests/js1_5/extensions/regress-50447-1.js |  1 -
 .../tests/js1_5/extensions/regress-50447.js   |  1 -
 js/src/tests/js1_6/shell.js                   |  1 -
 js/src/tests/js1_7/shell.js                   |  1 -
 js/src/tests/js1_8/shell.js                   |  1 -
 js/src/tests/js1_8_1/shell.js                 |  1 -
 js/src/tests/shell.js                         |  1 -
 js/src/vm/ArgumentsObject-inl.h               |  3 +-
 js/src/vm/ArgumentsObject.cpp                 |  3 +-
 js/src/vm/ArgumentsObject.h                   |  3 +-
 js/src/vm/BooleanObject-inl.h                 |  3 +-
 js/src/vm/BooleanObject.h                     |  3 +-
 js/src/vm/CharacterEncoding.cpp               |  3 +-
 js/src/vm/CommonPropertyNames.h               |  5 +--
 js/src/vm/DateTime.cpp                        |  6 +--
 js/src/vm/DateTime.h                          |  6 +--
 js/src/vm/Debugger.cpp                        |  5 +--
 js/src/vm/Debugger.h                          |  5 +--
 js/src/vm/ForkJoin.cpp                        |  3 +-
 js/src/vm/ForkJoin.h                          |  3 +-
 js/src/vm/GlobalObject-inl.h                  |  3 +-
 js/src/vm/GlobalObject.cpp                    |  3 +-
 js/src/vm/GlobalObject.h                      |  3 +-
 js/src/vm/Keywords.h                          |  5 +--
 js/src/vm/MatchPairs.h                        |  5 +--
 js/src/vm/Monitor.cpp                         |  3 +-
 js/src/vm/Monitor.h                           |  3 +-
 js/src/vm/NumberObject-inl.h                  |  3 +-
 js/src/vm/NumberObject.h                      |  3 +-
 js/src/vm/NumericConversions.h                |  7 ++-
 js/src/vm/ObjectImpl-inl.h                    |  7 ++-
 js/src/vm/ObjectImpl.cpp                      |  7 ++-
 js/src/vm/ObjectImpl.h                        |  7 ++-
 js/src/vm/ParallelDo.cpp                      |  5 +--
 js/src/vm/ParallelDo.h                        |  5 +--
 js/src/vm/PropertyKey.cpp                     |  2 +-
 js/src/vm/RegExpObject-inl.h                  |  5 +--
 js/src/vm/RegExpObject.cpp                    |  5 +--
 js/src/vm/RegExpObject.h                      |  5 +--
 js/src/vm/RegExpStatics-inl.h                 |  5 +--
 js/src/vm/RegExpStatics.cpp                   |  5 +--
 js/src/vm/RegExpStatics.h                     |  5 +--
 js/src/vm/SPSProfiler.cpp                     |  5 +--
 js/src/vm/SPSProfiler.h                       |  5 +--
 js/src/vm/ScopeObject-inl.h                   |  3 +-
 js/src/vm/ScopeObject.cpp                     |  5 +--
 js/src/vm/ScopeObject.h                       |  3 +-
 js/src/vm/SelfHosting.cpp                     |  5 +--
 js/src/vm/Shape-inl.h                         |  5 ++-
 js/src/vm/Shape.cpp                           |  3 +-
 js/src/vm/Shape.h                             |  5 +--
 js/src/vm/Stack-inl.h                         |  5 +--
 js/src/vm/Stack.cpp                           |  5 +--
 js/src/vm/Stack.h                             |  5 +--
 js/src/vm/String-inl.h                        |  5 +--
 js/src/vm/String.cpp                          |  5 +--
 js/src/vm/String.h                            |  5 +--
 js/src/vm/StringBuffer.cpp                    |  6 +--
 js/src/vm/StringBuffer.h                      |  6 +--
 js/src/vm/StringObject-inl.h                  |  3 +-
 js/src/vm/StringObject.h                      |  3 +-
 js/src/vm/ThreadPool.cpp                      |  6 +--
 js/src/vm/ThreadPool.h                        |  3 +-
 js/src/vm/Unicode.h                           |  4 +-
 js/src/vm/Xdr.cpp                             |  2 +-
 js/src/vm/Xdr.h                               |  3 +-
 js/src/yarr/ASCIICType.h                      |  4 +-
 js/src/yarr/BumpPointerAllocator.h            |  4 +-
 js/src/yarr/CheckedArithmetic.h               |  3 +-
 js/src/yarr/MatchResult.h                     |  4 +-
 js/src/yarr/OSAllocator.h                     |  4 +-
 js/src/yarr/OSAllocatorOS2.cpp                |  4 +-
 js/src/yarr/OSAllocatorPosix.cpp              |  4 +-
 js/src/yarr/OSAllocatorWin.cpp                |  4 +-
 js/src/yarr/PageAllocation.h                  |  4 +-
 js/src/yarr/PageBlock.cpp                     |  4 +-
 js/src/yarr/PageBlock.h                       |  4 +-
 js/src/yarr/VMTags.h                          |  4 +-
 js/src/yarr/Yarr.h                            |  4 +-
 js/src/yarr/YarrCanonicalizeUCS2.cpp          |  4 +-
 js/src/yarr/YarrCanonicalizeUCS2.h            |  4 +-
 js/src/yarr/YarrInterpreter.cpp               |  4 +-
 js/src/yarr/YarrInterpreter.h                 |  4 +-
 js/src/yarr/YarrJIT.cpp                       |  3 +-
 js/src/yarr/YarrJIT.h                         |  3 +-
 js/src/yarr/YarrParser.h                      |  3 +-
 js/src/yarr/YarrPattern.cpp                   |  3 +-
 js/src/yarr/YarrPattern.h                     |  3 +-
 js/src/yarr/YarrSyntaxChecker.cpp             |  4 +-
 js/src/yarr/YarrSyntaxChecker.h               |  4 +-
 js/src/yarr/wtfbridge.h                       |  6 +--
 733 files changed, 1279 insertions(+), 1725 deletions(-)

diff --git a/js/ipc/CPOWTypes.h b/js/ipc/CPOWTypes.h
index 46195f9ee72d..56d84cd3f717 100644
--- a/js/ipc/CPOWTypes.h
+++ b/js/ipc/CPOWTypes.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ContextWrapperChild.h b/js/ipc/ContextWrapperChild.h
index ec42b78ba6d7..b6d1c9505c17 100644
--- a/js/ipc/ContextWrapperChild.h
+++ b/js/ipc/ContextWrapperChild.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ContextWrapperParent.h b/js/ipc/ContextWrapperParent.h
index 01fca526411d..671521b36b2a 100644
--- a/js/ipc/ContextWrapperParent.h
+++ b/js/ipc/ContextWrapperParent.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ObjectWrapperChild.cpp b/js/ipc/ObjectWrapperChild.cpp
index 7c90e3612cb0..247eaf0605fd 100644
--- a/js/ipc/ObjectWrapperChild.cpp
+++ b/js/ipc/ObjectWrapperChild.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ObjectWrapperChild.h b/js/ipc/ObjectWrapperChild.h
index dff0afd2f9a9..f9a270cacce5 100644
--- a/js/ipc/ObjectWrapperChild.h
+++ b/js/ipc/ObjectWrapperChild.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/ipc/ObjectWrapperParent.cpp b/js/ipc/ObjectWrapperParent.cpp
index 9a80c99e7690..54b81d11681c 100644
--- a/js/ipc/ObjectWrapperParent.cpp
+++ b/js/ipc/ObjectWrapperParent.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
@@ -691,4 +690,4 @@ ObjectWrapperParent::CPOW_HasInstance(JSContext *cx, JSHandleObject obj, JSMutab
             self->CallHasInstance(in_v,
                                   aco.StatusPtr(), bp) &&
             aco.Ok());
-}
\ No newline at end of file
+}
diff --git a/js/ipc/ObjectWrapperParent.h b/js/ipc/ObjectWrapperParent.h
index a389b52956d9..af147b1f800d 100644
--- a/js/ipc/ObjectWrapperParent.h
+++ b/js/ipc/ObjectWrapperParent.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/jsd.h b/js/jsd/jsd.h
index c0043b986a74..a5dab01407a8 100644
--- a/js/jsd/jsd.h
+++ b/js/jsd/jsd.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_atom.cpp b/js/jsd/jsd_atom.cpp
index 5517b997d644..dec6b391457a 100644
--- a/js/jsd/jsd_atom.cpp
+++ b/js/jsd/jsd_atom.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_high.cpp b/js/jsd/jsd_high.cpp
index 3a7bea446e36..7887f8fc73e2 100644
--- a/js/jsd/jsd_high.cpp
+++ b/js/jsd/jsd_high.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_hook.cpp b/js/jsd/jsd_hook.cpp
index 9f8fa947f082..95e631804472 100644
--- a/js/jsd/jsd_hook.cpp
+++ b/js/jsd/jsd_hook.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_java.cpp b/js/jsd/jsd_java.cpp
index 4bfcccde93ba..c5c0aec2aaf9 100644
--- a/js/jsd/jsd_java.cpp
+++ b/js/jsd/jsd_java.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_lock.cpp b/js/jsd/jsd_lock.cpp
index c8a827b8f941..628d2fd621e7 100644
--- a/js/jsd/jsd_lock.cpp
+++ b/js/jsd/jsd_lock.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_lock.h b/js/jsd/jsd_lock.h
index a3eb821be953..b1e8c31053bd 100644
--- a/js/jsd/jsd_lock.h
+++ b/js/jsd/jsd_lock.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_obj.cpp b/js/jsd/jsd_obj.cpp
index dc7c927cab99..cc0e8bb754bf 100644
--- a/js/jsd/jsd_obj.cpp
+++ b/js/jsd/jsd_obj.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_scpt.cpp b/js/jsd/jsd_scpt.cpp
index f4ef023d45ea..67c53f92791d 100644
--- a/js/jsd/jsd_scpt.cpp
+++ b/js/jsd/jsd_scpt.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_stak.cpp b/js/jsd/jsd_stak.cpp
index 8e5fbb384aa5..7dac8eb3befd 100644
--- a/js/jsd/jsd_stak.cpp
+++ b/js/jsd/jsd_stak.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_step.cpp b/js/jsd/jsd_step.cpp
index 0396a5cb7318..da1886a2b03f 100644
--- a/js/jsd/jsd_step.cpp
+++ b/js/jsd/jsd_step.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_text.cpp b/js/jsd/jsd_text.cpp
index bc851a3def41..ab11e82eac8b 100644
--- a/js/jsd/jsd_text.cpp
+++ b/js/jsd/jsd_text.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_val.cpp b/js/jsd/jsd_val.cpp
index a8cad6d005a9..97385a98af32 100644
--- a/js/jsd/jsd_val.cpp
+++ b/js/jsd/jsd_val.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsd_xpc.cpp b/js/jsd/jsd_xpc.cpp
index 8ce10b932552..ea1ef4b837dd 100644
--- a/js/jsd/jsd_xpc.cpp
+++ b/js/jsd/jsd_xpc.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/jsd_xpc.h b/js/jsd/jsd_xpc.h
index da383e30f9d9..4dbfe7cab405 100644
--- a/js/jsd/jsd_xpc.h
+++ b/js/jsd/jsd_xpc.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/jsdebug.cpp b/js/jsd/jsdebug.cpp
index 06954cead55f..7e893c69d149 100644
--- a/js/jsd/jsdebug.cpp
+++ b/js/jsd/jsdebug.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsdebug.h b/js/jsd/jsdebug.h
index 0971ba121f17..a3a05eeb1f15 100644
--- a/js/jsd/jsdebug.h
+++ b/js/jsd/jsdebug.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jsdstubs.cpp b/js/jsd/jsdstubs.cpp
index 68cf75b79889..22420410251c 100644
--- a/js/jsd/jsdstubs.cpp
+++ b/js/jsd/jsdstubs.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/jsd/jshash.cpp b/js/jsd/jshash.cpp
index 6ae4e549ea34..d4caf2ce833f 100644
--- a/js/jsd/jshash.cpp
+++ b/js/jsd/jshash.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/jshash.h b/js/jsd/jshash.h
index 5c44b7ba964a..e21c7b786a04 100644
--- a/js/jsd/jshash.h
+++ b/js/jsd/jshash.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/jsd/resource.h b/js/jsd/resource.h
index d40e61ae13d1..69874fe0ff30 100644
--- a/js/jsd/resource.h
+++ b/js/jsd/resource.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/public/Anchor.h b/js/public/Anchor.h
index 166ada5cd28e..d0c2476cf726 100644
--- a/js/public/Anchor.h
+++ b/js/public/Anchor.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/CallArgs.h b/js/public/CallArgs.h
index 6ecc4273de8d..5b474f0ac3b3 100644
--- a/js/public/CallArgs.h
+++ b/js/public/CallArgs.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/CharacterEncoding.h b/js/public/CharacterEncoding.h
index 36d8670a0821..63e5cc6650ca 100644
--- a/js/public/CharacterEncoding.h
+++ b/js/public/CharacterEncoding.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/GCAPI.h b/js/public/GCAPI.h
index 1231ca97b9f9..80d8f8a426fb 100644
--- a/js/public/GCAPI.h
+++ b/js/public/GCAPI.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef js_gc_api_h___
 #define js_gc_api_h___
diff --git a/js/public/HashTable.h b/js/public/HashTable.h
index 5cc7ea4e8b9e..acd4e310ac79 100644
--- a/js/public/HashTable.h
+++ b/js/public/HashTable.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/HeapAPI.h b/js/public/HeapAPI.h
index 47cb5602123d..cd50b7e1bbcb 100644
--- a/js/public/HeapAPI.h
+++ b/js/public/HeapAPI.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef js_heap_api_h___
 #define js_heap_api_h___
diff --git a/js/public/LegacyIntTypes.h b/js/public/LegacyIntTypes.h
index 30944efda61e..387a68b9e9d1 100644
--- a/js/public/LegacyIntTypes.h
+++ b/js/public/LegacyIntTypes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/public/MemoryMetrics.h b/js/public/MemoryMetrics.h
index 14cf88ec4c60..e5f9ea3b5bce 100644
--- a/js/public/MemoryMetrics.h
+++ b/js/public/MemoryMetrics.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/PropertyKey.h b/js/public/PropertyKey.h
index 5d048195f51e..53158c26f30f 100644
--- a/js/public/PropertyKey.h
+++ b/js/public/PropertyKey.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/RequiredDefines.h b/js/public/RequiredDefines.h
index 8dc47e251c95..2be2efbf9a3b 100644
--- a/js/public/RequiredDefines.h
+++ b/js/public/RequiredDefines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
index 9f9fa9df53f0..5d139292fe38 100644
--- a/js/public/RootingAPI.h
+++ b/js/public/RootingAPI.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/TemplateLib.h b/js/public/TemplateLib.h
index 58966b166f9f..a4ff6829125f 100644
--- a/js/public/TemplateLib.h
+++ b/js/public/TemplateLib.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/Utility.h b/js/public/Utility.h
index 70f09d6b22a9..2a883323ff63 100644
--- a/js/public/Utility.h
+++ b/js/public/Utility.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/Value.h b/js/public/Value.h
index a9a7bfd40005..57e951a1defd 100644
--- a/js/public/Value.h
+++ b/js/public/Value.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/public/Vector.h b/js/public/Vector.h
index b8e2ea698504..5f40dd634b8c 100644
--- a/js/public/Vector.h
+++ b/js/public/Vector.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/TraceLogging.cpp b/js/src/TraceLogging.cpp
index 49fe2d3e8ace..1c64a67fd68d 100644
--- a/js/src/TraceLogging.cpp
+++ b/js/src/TraceLogging.cpp
@@ -1,8 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=4 sw=4 et tw=79: */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "TraceLogging.h"
 #include <cstdarg>
diff --git a/js/src/TraceLogging.h b/js/src/TraceLogging.h
index eebadfc1e14d..2e6d5ba9ac38 100644
--- a/js/src/TraceLogging.h
+++ b/js/src/TraceLogging.h
@@ -1,8 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=4 sw=4 et tw=79: */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #if !defined(TraceLogging_h__)
 #define TraceLogging_h__
diff --git a/js/src/assembler/assembler/ARMAssembler.cpp b/js/src/assembler/assembler/ARMAssembler.cpp
index a9ada8e9a2c5..18f742b80b6a 100644
--- a/js/src/assembler/assembler/ARMAssembler.cpp
+++ b/js/src/assembler/assembler/ARMAssembler.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/ARMAssembler.h b/js/src/assembler/assembler/ARMAssembler.h
index e04b251b7439..2c1d712158d8 100644
--- a/js/src/assembler/assembler/ARMAssembler.h
+++ b/js/src/assembler/assembler/ARMAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009, 2010 University of Szeged
diff --git a/js/src/assembler/assembler/ARMv7Assembler.h b/js/src/assembler/assembler/ARMv7Assembler.h
index 1f96585ee16c..1a83139887fd 100644
--- a/js/src/assembler/assembler/ARMv7Assembler.h
+++ b/js/src/assembler/assembler/ARMv7Assembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AbstractMacroAssembler.h b/js/src/assembler/assembler/AbstractMacroAssembler.h
index 286fad954742..2bfb275b6884 100644
--- a/js/src/assembler/assembler/AbstractMacroAssembler.h
+++ b/js/src/assembler/assembler/AbstractMacroAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AssemblerBuffer.h b/js/src/assembler/assembler/AssemblerBuffer.h
index d21182527b52..a2e7c3840331 100644
--- a/js/src/assembler/assembler/AssemblerBuffer.h
+++ b/js/src/assembler/assembler/AssemblerBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
index 467f9c9e8cbe..2578692dc47a 100644
--- a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
+++ b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/CodeLocation.h b/js/src/assembler/assembler/CodeLocation.h
index 490157688614..d9bc6d4175fb 100644
--- a/js/src/assembler/assembler/CodeLocation.h
+++ b/js/src/assembler/assembler/CodeLocation.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/LinkBuffer.h b/js/src/assembler/assembler/LinkBuffer.h
index 35913c87aaf7..1e6fb4b35249 100644
--- a/js/src/assembler/assembler/LinkBuffer.h
+++ b/js/src/assembler/assembler/LinkBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssembler.h b/js/src/assembler/assembler/MacroAssembler.h
index 8bf9c0b0a80e..2b77445e14cf 100644
--- a/js/src/assembler/assembler/MacroAssembler.h
+++ b/js/src/assembler/assembler/MacroAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerARM.cpp b/js/src/assembler/assembler/MacroAssemblerARM.cpp
index 89db1e2d859e..9c76e8fd43e7 100644
--- a/js/src/assembler/assembler/MacroAssemblerARM.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerARM.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/MacroAssemblerARM.h b/js/src/assembler/assembler/MacroAssemblerARM.h
index 831ccbb8a183..6e18c54b84dc 100644
--- a/js/src/assembler/assembler/MacroAssemblerARM.h
+++ b/js/src/assembler/assembler/MacroAssemblerARM.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc.
diff --git a/js/src/assembler/assembler/MacroAssemblerARMv7.h b/js/src/assembler/assembler/MacroAssemblerARMv7.h
index 2bdb6e8fdb5e..0abeb2b31de0 100644
--- a/js/src/assembler/assembler/MacroAssemblerARMv7.h
+++ b/js/src/assembler/assembler/MacroAssemblerARMv7.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerCodeRef.h b/js/src/assembler/assembler/MacroAssemblerCodeRef.h
index 101ffcb098d5..bcf3903f9b13 100644
--- a/js/src/assembler/assembler/MacroAssemblerCodeRef.h
+++ b/js/src/assembler/assembler/MacroAssemblerCodeRef.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerSparc.h b/js/src/assembler/assembler/MacroAssemblerSparc.h
index 1d89f17790e7..3692b3e0b272 100644
--- a/js/src/assembler/assembler/MacroAssemblerSparc.h
+++ b/js/src/assembler/assembler/MacroAssemblerSparc.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99: */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/MacroAssemblerX86.h b/js/src/assembler/assembler/MacroAssemblerX86.h
index c6ab40f587fa..c782ad60d006 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerX86Common.cpp b/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
index b94a345ff649..e65b2a3d7c62 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99: */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/MacroAssemblerX86Common.h b/js/src/assembler/assembler/MacroAssemblerX86Common.h
index 30bb1ed26afc..b0bef29120c2 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerX86_64.h b/js/src/assembler/assembler/MacroAssemblerX86_64.h
index c4b67dcaeb03..c3be4145695a 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86_64.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86_64.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/RepatchBuffer.h b/js/src/assembler/assembler/RepatchBuffer.h
index 003479211b43..0a3deb3c27d2 100644
--- a/js/src/assembler/assembler/RepatchBuffer.h
+++ b/js/src/assembler/assembler/RepatchBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/SparcAssembler.h b/js/src/assembler/assembler/SparcAssembler.h
index 4e3d5b14559a..19217a7cafd0 100644
--- a/js/src/assembler/assembler/SparcAssembler.h
+++ b/js/src/assembler/assembler/SparcAssembler.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99: */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/X86Assembler.h b/js/src/assembler/assembler/X86Assembler.h
index 2293098864f3..1533bdfa95e9 100644
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/jit/ExecutableAllocator.cpp b/js/src/assembler/jit/ExecutableAllocator.cpp
index 59e1c259b673..bd8b1d3ba24d 100644
--- a/js/src/assembler/jit/ExecutableAllocator.cpp
+++ b/js/src/assembler/jit/ExecutableAllocator.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
diff --git a/js/src/assembler/moco/MocoStubs.h b/js/src/assembler/moco/MocoStubs.h
index 7ce6da5e329b..df3d1f979745 100644
--- a/js/src/assembler/moco/MocoStubs.h
+++ b/js/src/assembler/moco/MocoStubs.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Eval.cpp b/js/src/builtin/Eval.cpp
index a29c89517709..a5c203d5b342 100644
--- a/js/src/builtin/Eval.cpp
+++ b/js/src/builtin/Eval.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Eval.h b/js/src/builtin/Eval.h
index e6eaeefa5b04..133c4b28ebcb 100644
--- a/js/src/builtin/Eval.h
+++ b/js/src/builtin/Eval.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Intl.cpp b/js/src/builtin/Intl.cpp
index d3463125da23..4c49405d8909 100644
--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/Intl.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Intl.h b/js/src/builtin/Intl.h
index 3db27dc63767..eefec5dbcaaa 100644
--- a/js/src/builtin/Intl.h
+++ b/js/src/builtin/Intl.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Iterator-inl.h b/js/src/builtin/Iterator-inl.h
index 7f93219af814..e6c838cdeb98 100644
--- a/js/src/builtin/Iterator-inl.h
+++ b/js/src/builtin/Iterator-inl.h
@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef Iterator_inl_h_
 #define Iterator_inl_h_
diff --git a/js/src/builtin/MapObject.cpp b/js/src/builtin/MapObject.cpp
index 1f6258f49bcc..cff6e0a8c746 100644
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/MapObject.h b/js/src/builtin/MapObject.h
index 3661c4cc498b..f8f006472dab 100644
--- a/js/src/builtin/MapObject.h
+++ b/js/src/builtin/MapObject.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Module.cpp b/js/src/builtin/Module.cpp
index d70ec483e11e..4acec92e6e5b 100644
--- a/js/src/builtin/Module.cpp
+++ b/js/src/builtin/Module.cpp
@@ -1,3 +1,9 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "jsobjinlines.h"
 #include "builtin/Module.h"
 
diff --git a/js/src/builtin/Module.h b/js/src/builtin/Module.h
index 7a6386ebc434..f1bdef1ef1ba 100644
--- a/js/src/builtin/Module.h
+++ b/js/src/builtin/Module.h
@@ -1,3 +1,9 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
+
 #ifndef Module_h___
 #define Module_h___
 
diff --git a/js/src/builtin/Object.cpp b/js/src/builtin/Object.cpp
index 188911c74896..8171d873284b 100644
--- a/js/src/builtin/Object.cpp
+++ b/js/src/builtin/Object.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Object.h b/js/src/builtin/Object.h
index a08fcdfb818e..c6a29225e957 100644
--- a/js/src/builtin/Object.h
+++ b/js/src/builtin/Object.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/ParallelArray.cpp b/js/src/builtin/ParallelArray.cpp
index c98771d047e4..49bb5a05cd10 100644
--- a/js/src/builtin/ParallelArray.cpp
+++ b/js/src/builtin/ParallelArray.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/ParallelArray.h b/js/src/builtin/ParallelArray.h
index d63b87872fb2..443ebad5952a 100644
--- a/js/src/builtin/ParallelArray.h
+++ b/js/src/builtin/ParallelArray.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/Profilers.cpp b/js/src/builtin/Profilers.cpp
index 43b9bea178e5..853d61d89111 100644
--- a/js/src/builtin/Profilers.cpp
+++ b/js/src/builtin/Profilers.cpp
@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 /* Profiling-related API */
 
diff --git a/js/src/builtin/Profilers.h b/js/src/builtin/Profilers.h
index 872830de12d3..59c4e992024d 100644
--- a/js/src/builtin/Profilers.h
+++ b/js/src/builtin/Profilers.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index eeccfcb1129c..502ca8fc6784 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/RegExp.h b/js/src/builtin/RegExp.h
index 90662e9ed8bf..60fb782be9f9 100644
--- a/js/src/builtin/RegExp.h
+++ b/js/src/builtin/RegExp.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index e5f65c3a221b..a66d482f9d1a 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "jsapi.h"
 #include "jsbool.h"
diff --git a/js/src/builtin/TestingFunctions.h b/js/src/builtin/TestingFunctions.h
index 9bcb1e31d2e6..52b9bef76ce3 100644
--- a/js/src/builtin/TestingFunctions.h
+++ b/js/src/builtin/TestingFunctions.h
@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef TestingFunctions_h__
 #define TestingFunctions_h__
diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
index 4b29ed0ed1e5..6ba4b7be7dae 100644
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@@ -1,5 +1,6 @@
-/* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp
index f76221331c25..9ad6f8fd1301 100644
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -1,5 +1,6 @@
-/* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=2 sw=2 et tw=99:
+ * 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/. */
 
diff --git a/js/src/devtools/jint/treesearch.py b/js/src/devtools/jint/treesearch.py
index c06a62b88011..2cbc45335814 100644
--- a/js/src/devtools/jint/treesearch.py
+++ b/js/src/devtools/jint/treesearch.py
@@ -1,9 +1,8 @@
+# vim: set ts=8 sts=4 et sw=4 tw=99:
 # 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/.
 
-# vim: set ts=4 sw=4 tw=99 et: 
-
 import os, re
 import tempfile
 import subprocess
diff --git a/js/src/devtools/sharkctl.cpp b/js/src/devtools/sharkctl.cpp
index 14a550247af2..86fdfc936d22 100644
--- a/js/src/devtools/sharkctl.cpp
+++ b/js/src/devtools/sharkctl.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/devtools/sharkctl.h b/js/src/devtools/sharkctl.h
index e381cfd32ba3..bb3038d3ae6a 100644
--- a/js/src/devtools/sharkctl.h
+++ b/js/src/devtools/sharkctl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/BitArray.h b/js/src/ds/BitArray.h
index 4d0d0e64bb63..a20796d4dbe4 100644
--- a/js/src/ds/BitArray.h
+++ b/js/src/ds/BitArray.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/InlineMap.h b/js/src/ds/InlineMap.h
index 68ca36fb3973..d11172463de8 100644
--- a/js/src/ds/InlineMap.h
+++ b/js/src/ds/InlineMap.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/LifoAlloc.cpp b/js/src/ds/LifoAlloc.cpp
index c019a7ca12d5..b9621600f512 100644
--- a/js/src/ds/LifoAlloc.cpp
+++ b/js/src/ds/LifoAlloc.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/LifoAlloc.h b/js/src/ds/LifoAlloc.h
index d7233c932a87..167a61c52a90 100644
--- a/js/src/ds/LifoAlloc.h
+++ b/js/src/ds/LifoAlloc.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/PriorityQueue.h b/js/src/ds/PriorityQueue.h
index 1e9e26c918db..8ef6531bb12f 100644
--- a/js/src/ds/PriorityQueue.h
+++ b/js/src/ds/PriorityQueue.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/Sort.h b/js/src/ds/Sort.h
index 4061f75cb4fe..46542e5bf882 100644
--- a/js/src/ds/Sort.h
+++ b/js/src/ds/Sort.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ds/SplayTree.h b/js/src/ds/SplayTree.h
index 390282363f9f..8df268335fa6 100644
--- a/js/src/ds/SplayTree.h
+++ b/js/src/ds/SplayTree.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/editline/editline.c b/js/src/editline/editline.c
index f98d048a4112..21946a6250b8 100644
--- a/js/src/editline/editline.c
+++ b/js/src/editline/editline.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/editline/editline.h b/js/src/editline/editline.h
index 5895322f1be1..0616de03a221 100644
--- a/js/src/editline/editline.h
+++ b/js/src/editline/editline.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/editline/sysunix.c b/js/src/editline/sysunix.c
index 0035640a29f6..d45db6c79baa 100644
--- a/js/src/editline/sysunix.c
+++ b/js/src/editline/sysunix.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/editline/unix.h b/js/src/editline/unix.h
index 3d8687632232..ec4a762acb58 100644
--- a/js/src/editline/unix.h
+++ b/js/src/editline/unix.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index 24fe869ecd53..fc891b210dd1 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index 1b13ffe9ed13..9f1164e69400 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 336445f7ccec..8d90567bb301 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index 3b0bc3b4a31b..e84c80e29f24 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/FoldConstants.cpp b/js/src/frontend/FoldConstants.cpp
index b78d821f897b..cbad2eb6675a 100644
--- a/js/src/frontend/FoldConstants.cpp
+++ b/js/src/frontend/FoldConstants.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/FoldConstants.h b/js/src/frontend/FoldConstants.h
index a1bf9d14e9ad..86da781e8d80 100644
--- a/js/src/frontend/FoldConstants.h
+++ b/js/src/frontend/FoldConstants.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index 4152bc957c9c..57b338de55d6 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/NameFunctions.cpp b/js/src/frontend/NameFunctions.cpp
index 22b9e961d2c1..01d2585d4e88 100644
--- a/js/src/frontend/NameFunctions.cpp
+++ b/js/src/frontend/NameFunctions.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/NameFunctions.h b/js/src/frontend/NameFunctions.h
index d2f9437cd191..adfb3920ad4d 100644
--- a/js/src/frontend/NameFunctions.h
+++ b/js/src/frontend/NameFunctions.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseMaps-inl.h b/js/src/frontend/ParseMaps-inl.h
index 55fca1a6eb66..ceefb4c8af89 100644
--- a/js/src/frontend/ParseMaps-inl.h
+++ b/js/src/frontend/ParseMaps-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseMaps.cpp b/js/src/frontend/ParseMaps.cpp
index 3426d861d903..34b1c8ede742 100644
--- a/js/src/frontend/ParseMaps.cpp
+++ b/js/src/frontend/ParseMaps.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseMaps.h b/js/src/frontend/ParseMaps.h
index a8026167be12..b986bb10d0b4 100644
--- a/js/src/frontend/ParseMaps.h
+++ b/js/src/frontend/ParseMaps.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseNode-inl.h b/js/src/frontend/ParseNode-inl.h
index d35c61409ec2..15da9b41d96e 100644
--- a/js/src/frontend/ParseNode-inl.h
+++ b/js/src/frontend/ParseNode-inl.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index f705e604db70..26b22639f07e 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index f280390e2609..7b2acefd33a6 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/Parser-inl.h b/js/src/frontend/Parser-inl.h
index 1fe084ce700f..b689f3bddd73 100644
--- a/js/src/frontend/Parser-inl.h
+++ b/js/src/frontend/Parser-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 88320dad663b..f69d4190a359 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 2dcab9c3242a..22b006981d50 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/SharedContext-inl.h b/js/src/frontend/SharedContext-inl.h
index 74cac685efc8..247501f07d01 100644
--- a/js/src/frontend/SharedContext-inl.h
+++ b/js/src/frontend/SharedContext-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 4b5bfff63a06..7212e66d3080 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index dd0ba4faedf1..2d32ae516bee 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
index 69b9477666ab..5435b683f0c7 100644
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/frontend/TokenStream.h b/js/src/frontend/TokenStream.h
index 0997a8049aa4..dad7e88ae2c1 100644
--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Barrier-inl.h b/js/src/gc/Barrier-inl.h
index acab9ef1610d..0329d1e740e6 100644
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
index 0a1009721abb..13f2a509a2e1 100644
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/FindSCCs-inl.h b/js/src/gc/FindSCCs-inl.h
index 552ce53be271..24ae0b1de3eb 100644
--- a/js/src/gc/FindSCCs-inl.h
+++ b/js/src/gc/FindSCCs-inl.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "jsfriendapi.h"
 
diff --git a/js/src/gc/FindSCCs.h b/js/src/gc/FindSCCs.h
index ccd5f5991fbf..c8ed79d70a9c 100644
--- a/js/src/gc/FindSCCs.h
+++ b/js/src/gc/FindSCCs.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef gc_findsccs_h___
 #define gc_findsccs_h___
diff --git a/js/src/gc/GCInternals.h b/js/src/gc/GCInternals.h
index e661aac9e88e..f900778b106e 100644
--- a/js/src/gc/GCInternals.h
+++ b/js/src/gc/GCInternals.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h
index bf73c24f80d5..e5e7f7b67bc9 100644
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef gc_heap_h___
 #define gc_heap_h___
diff --git a/js/src/gc/Iteration.cpp b/js/src/gc/Iteration.cpp
index 607fd215aef5..76693e5fecff 100644
--- a/js/src/gc/Iteration.cpp
+++ b/js/src/gc/Iteration.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index f527fb650715..f6b18144a985 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 tw=79 et:
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "mozilla/DebugOnly.h"
 
diff --git a/js/src/gc/Marking.h b/js/src/gc/Marking.h
index 499becc6aad8..3d89bd3e607b 100644
--- a/js/src/gc/Marking.h
+++ b/js/src/gc/Marking.h
@@ -1,9 +1,8 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- */
-/* 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifndef gc_marking_h___
 #define gc_marking_h___
diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
index e2bec9717391..399177771718 100644
--- a/js/src/gc/Memory.cpp
+++ b/js/src/gc/Memory.cpp
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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 "mozilla/Assertions.h"
 
diff --git a/js/src/gc/Memory.h b/js/src/gc/Memory.h
index bf78cd0594bc..b73c266bf2cb 100644
--- a/js/src/gc/Memory.h
+++ b/js/src/gc/Memory.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef jsgc_memory_h___
 #define jsgc_memory_h___
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index 2f6e71da4ce6..f97bb1503c81 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp
index dcbd00f563c9..377c3b21b796 100644
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Statistics.h b/js/src/gc/Statistics.h
index 934df0668de8..027600bc0c64 100644
--- a/js/src/gc/Statistics.h
+++ b/js/src/gc/Statistics.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/StoreBuffer.cpp b/js/src/gc/StoreBuffer.cpp
index 0a1523096e28..236fcbd1cf6e 100644
--- a/js/src/gc/StoreBuffer.cpp
+++ b/js/src/gc/StoreBuffer.cpp
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- */
-/* 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/. */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
 #ifdef JSGC_GENERATIONAL
 
diff --git a/js/src/gc/StoreBuffer.h b/js/src/gc/StoreBuffer.h
index 5409eb02a2b5..d927d098f695 100644
--- a/js/src/gc/StoreBuffer.h
+++ b/js/src/gc/StoreBuffer.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifdef JSGC_GENERATIONAL
 #ifndef jsgc_storebuffer_h___
diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp
index 2a45d31f7b6e..d7f714e9679d 100644
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Zone.cpp b/js/src/gc/Zone.cpp
index 49976dd6c65c..8d4be70cdbdf 100644
--- a/js/src/gc/Zone.cpp
+++ b/js/src/gc/Zone.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index b9c42184afb3..4fb93bf50250 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/gdb/gdb-tests.h b/js/src/gdb/gdb-tests.h
index 70fdd8e94fc5..e9141d51528e 100644
--- a/js/src/gdb/gdb-tests.h
+++ b/js/src/gdb/gdb-tests.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * 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
diff --git a/js/src/ion/AliasAnalysis.cpp b/js/src/ion/AliasAnalysis.cpp
index f90fff43905d..9a9ca27929c9 100644
--- a/js/src/ion/AliasAnalysis.cpp
+++ b/js/src/ion/AliasAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AliasAnalysis.h b/js/src/ion/AliasAnalysis.h
index 36fd648e5467..64de011e513d 100644
--- a/js/src/ion/AliasAnalysis.h
+++ b/js/src/ion/AliasAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJS.cpp b/js/src/ion/AsmJS.cpp
index d268f1f922b8..62c1e545c98a 100644
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJS.h b/js/src/ion/AsmJS.h
index b27e152e2593..98b297edcbcd 100644
--- a/js/src/ion/AsmJS.h
+++ b/js/src/ion/AsmJS.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJSLink.cpp b/js/src/ion/AsmJSLink.cpp
index 46e87e0841b1..977ab27b46d2 100644
--- a/js/src/ion/AsmJSLink.cpp
+++ b/js/src/ion/AsmJSLink.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJSModule.h b/js/src/ion/AsmJSModule.h
index ae5d1e89a5de..72bf651c5c6a 100644
--- a/js/src/ion/AsmJSModule.h
+++ b/js/src/ion/AsmJSModule.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/AsmJSSignalHandlers.cpp b/js/src/ion/AsmJSSignalHandlers.cpp
index 0fa3af4adbc2..4e477392ea1d 100644
--- a/js/src/ion/AsmJSSignalHandlers.cpp
+++ b/js/src/ion/AsmJSSignalHandlers.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BacktrackingAllocator.cpp b/js/src/ion/BacktrackingAllocator.cpp
index 491b49a3bd2f..e42befd3ade5 100644
--- a/js/src/ion/BacktrackingAllocator.cpp
+++ b/js/src/ion/BacktrackingAllocator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BacktrackingAllocator.h b/js/src/ion/BacktrackingAllocator.h
index ccf0a2e611fb..51b8ff62ce4e 100644
--- a/js/src/ion/BacktrackingAllocator.h
+++ b/js/src/ion/BacktrackingAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Bailouts.cpp b/js/src/ion/Bailouts.cpp
index 2cffb267d201..aa4f2d14a458 100644
--- a/js/src/ion/Bailouts.cpp
+++ b/js/src/ion/Bailouts.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Bailouts.h b/js/src/ion/Bailouts.h
index 8694db28b92f..d9d514d9e102 100644
--- a/js/src/ion/Bailouts.h
+++ b/js/src/ion/Bailouts.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineBailouts.cpp b/js/src/ion/BaselineBailouts.cpp
index 75e2573e594f..53b7628f2f15 100644
--- a/js/src/ion/BaselineBailouts.cpp
+++ b/js/src/ion/BaselineBailouts.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineCompiler.cpp b/js/src/ion/BaselineCompiler.cpp
index c50b0d0b11b7..15f392397a97 100644
--- a/js/src/ion/BaselineCompiler.cpp
+++ b/js/src/ion/BaselineCompiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineCompiler.h b/js/src/ion/BaselineCompiler.h
index 7e7fe1d4b6da..3c72e32a66c5 100644
--- a/js/src/ion/BaselineCompiler.h
+++ b/js/src/ion/BaselineCompiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrame-inl.h b/js/src/ion/BaselineFrame-inl.h
index 37f82ba5019e..cf3226aa5360 100644
--- a/js/src/ion/BaselineFrame-inl.h
+++ b/js/src/ion/BaselineFrame-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrame.cpp b/js/src/ion/BaselineFrame.cpp
index e9d317ea54f4..299ef4af564c 100644
--- a/js/src/ion/BaselineFrame.cpp
+++ b/js/src/ion/BaselineFrame.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrame.h b/js/src/ion/BaselineFrame.h
index 476c66978fae..7d9642b0d12a 100644
--- a/js/src/ion/BaselineFrame.h
+++ b/js/src/ion/BaselineFrame.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrameInfo.cpp b/js/src/ion/BaselineFrameInfo.cpp
index 39e1c4556286..17dcd2765c9b 100644
--- a/js/src/ion/BaselineFrameInfo.cpp
+++ b/js/src/ion/BaselineFrameInfo.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineFrameInfo.h b/js/src/ion/BaselineFrameInfo.h
index d02ecbc6af0b..eae34e232184 100644
--- a/js/src/ion/BaselineFrameInfo.h
+++ b/js/src/ion/BaselineFrameInfo.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineHelpers.h b/js/src/ion/BaselineHelpers.h
index 1502dba2a617..1c2bd3dc0061 100644
--- a/js/src/ion/BaselineHelpers.h
+++ b/js/src/ion/BaselineHelpers.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineIC.cpp b/js/src/ion/BaselineIC.cpp
index 6c3494bbb287..4403911b76a8 100644
--- a/js/src/ion/BaselineIC.cpp
+++ b/js/src/ion/BaselineIC.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineIC.h b/js/src/ion/BaselineIC.h
index f9c08e770f11..461628faf47e 100644
--- a/js/src/ion/BaselineIC.h
+++ b/js/src/ion/BaselineIC.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineInspector.cpp b/js/src/ion/BaselineInspector.cpp
index 26a6273f3dd5..b8490f92d4f1 100644
--- a/js/src/ion/BaselineInspector.cpp
+++ b/js/src/ion/BaselineInspector.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineInspector.h b/js/src/ion/BaselineInspector.h
index 5fb59f6ed015..cef840718a53 100644
--- a/js/src/ion/BaselineInspector.h
+++ b/js/src/ion/BaselineInspector.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineJIT.cpp b/js/src/ion/BaselineJIT.cpp
index 3dfce7916f15..8061224465aa 100644
--- a/js/src/ion/BaselineJIT.cpp
+++ b/js/src/ion/BaselineJIT.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineJIT.h b/js/src/ion/BaselineJIT.h
index 2c9e914c5042..33244f8ca2ed 100644
--- a/js/src/ion/BaselineJIT.h
+++ b/js/src/ion/BaselineJIT.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BaselineRegisters.h b/js/src/ion/BaselineRegisters.h
index c9d0d4136a8e..26365375481d 100644
--- a/js/src/ion/BaselineRegisters.h
+++ b/js/src/ion/BaselineRegisters.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BitSet.cpp b/js/src/ion/BitSet.cpp
index 1b3ec5863dc2..bbe12ce97f6c 100644
--- a/js/src/ion/BitSet.cpp
+++ b/js/src/ion/BitSet.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/BitSet.h b/js/src/ion/BitSet.h
index 03903c74a3ac..f9b9dc38dd3b 100644
--- a/js/src/ion/BitSet.h
+++ b/js/src/ion/BitSet.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/C1Spewer.cpp b/js/src/ion/C1Spewer.cpp
index 7f17319efa40..8934dc09d28e 100644
--- a/js/src/ion/C1Spewer.cpp
+++ b/js/src/ion/C1Spewer.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/C1Spewer.h b/js/src/ion/C1Spewer.h
index fe05132a9407..66248f3528ba 100644
--- a/js/src/ion/C1Spewer.h
+++ b/js/src/ion/C1Spewer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 3b827b76d31a..5106493af101 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CodeGenerator.h b/js/src/ion/CodeGenerator.h
index 348fb3ce14f5..4130a3611ebc 100644
--- a/js/src/ion/CodeGenerator.h
+++ b/js/src/ion/CodeGenerator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CompactBuffer.h b/js/src/ion/CompactBuffer.h
index c3ca501190d5..fb29b780e3d8 100644
--- a/js/src/ion/CompactBuffer.h
+++ b/js/src/ion/CompactBuffer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CompileInfo-inl.h b/js/src/ion/CompileInfo-inl.h
index 666da9777c4d..85971562381a 100644
--- a/js/src/ion/CompileInfo-inl.h
+++ b/js/src/ion/CompileInfo-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CompileInfo.h b/js/src/ion/CompileInfo.h
index 237e9e4e1a4b..2288b20460f6 100644
--- a/js/src/ion/CompileInfo.h
+++ b/js/src/ion/CompileInfo.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/CompilerRoot.h b/js/src/ion/CompilerRoot.h
index 81e9386ac417..141924b7094a 100644
--- a/js/src/ion/CompilerRoot.h
+++ b/js/src/ion/CompilerRoot.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/EdgeCaseAnalysis.cpp b/js/src/ion/EdgeCaseAnalysis.cpp
index 18a7547581e9..38cb200838b4 100644
--- a/js/src/ion/EdgeCaseAnalysis.cpp
+++ b/js/src/ion/EdgeCaseAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/EdgeCaseAnalysis.h b/js/src/ion/EdgeCaseAnalysis.h
index bb744dd40eab..a322257996bf 100644
--- a/js/src/ion/EdgeCaseAnalysis.h
+++ b/js/src/ion/EdgeCaseAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/EffectiveAddressAnalysis.cpp b/js/src/ion/EffectiveAddressAnalysis.cpp
index 76fa88a36e06..e936a6ebfe8d 100644
--- a/js/src/ion/EffectiveAddressAnalysis.cpp
+++ b/js/src/ion/EffectiveAddressAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/EffectiveAddressAnalysis.h b/js/src/ion/EffectiveAddressAnalysis.h
index e7f3dc9f2e71..a86e871290b1 100644
--- a/js/src/ion/EffectiveAddressAnalysis.h
+++ b/js/src/ion/EffectiveAddressAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ExecutionModeInlines.h b/js/src/ion/ExecutionModeInlines.h
index 1f86e4a8d294..8a4c2d758ebd 100644
--- a/js/src/ion/ExecutionModeInlines.h
+++ b/js/src/ion/ExecutionModeInlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/FixedArityList.h b/js/src/ion/FixedArityList.h
index d737ad4e1d02..4cf6ccf51827 100644
--- a/js/src/ion/FixedArityList.h
+++ b/js/src/ion/FixedArityList.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/FixedList.h b/js/src/ion/FixedList.h
index 9213d0744955..2062ad8d64e3 100644
--- a/js/src/ion/FixedList.h
+++ b/js/src/ion/FixedList.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/InlineList.h b/js/src/ion/InlineList.h
index 7bc21801de30..00897619b123 100644
--- a/js/src/ion/InlineList.h
+++ b/js/src/ion/InlineList.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index 3298897730b4..9a227fa73aeb 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Ion.h b/js/src/ion/Ion.h
index c9e4f0cd8fa2..d11485db6fe6 100644
--- a/js/src/ion/Ion.h
+++ b/js/src/ion/Ion.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonAllocPolicy.h b/js/src/ion/IonAllocPolicy.h
index 8c828f71528f..f604a5005b49 100644
--- a/js/src/ion/IonAllocPolicy.h
+++ b/js/src/ion/IonAllocPolicy.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonAnalysis.cpp b/js/src/ion/IonAnalysis.cpp
index fc13e62faec3..58a070c42954 100644
--- a/js/src/ion/IonAnalysis.cpp
+++ b/js/src/ion/IonAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonAnalysis.h b/js/src/ion/IonAnalysis.h
index 42b02bb3f961..0f311da802df 100644
--- a/js/src/ion/IonAnalysis.h
+++ b/js/src/ion/IonAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 3fd3b2cea121..cf372aa04ddb 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonBuilder.h b/js/src/ion/IonBuilder.h
index 4b1422e29608..8f8f2a486734 100644
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonCaches.cpp b/js/src/ion/IonCaches.cpp
index 6cb2874769ef..e5983da59c2d 100644
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonCaches.h b/js/src/ion/IonCaches.h
index ec61d6a13604..00c05567ab47 100644
--- a/js/src/ion/IonCaches.h
+++ b/js/src/ion/IonCaches.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonCode.h b/js/src/ion/IonCode.h
index 0a4aeb1f34b9..ec4a86d60e9c 100644
--- a/js/src/ion/IonCode.h
+++ b/js/src/ion/IonCode.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonCompartment.h b/js/src/ion/IonCompartment.h
index 5a5681f110f6..472cf55fba5d 100644
--- a/js/src/ion/IonCompartment.h
+++ b/js/src/ion/IonCompartment.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrameIterator-inl.h b/js/src/ion/IonFrameIterator-inl.h
index 5b1094bda4d7..2740d9432b5b 100644
--- a/js/src/ion/IonFrameIterator-inl.h
+++ b/js/src/ion/IonFrameIterator-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrameIterator.h b/js/src/ion/IonFrameIterator.h
index e85656fb4265..fb0a339ae79d 100644
--- a/js/src/ion/IonFrameIterator.h
+++ b/js/src/ion/IonFrameIterator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrames-inl.h b/js/src/ion/IonFrames-inl.h
index 1267a565856f..a1fa889785c8 100644
--- a/js/src/ion/IonFrames-inl.h
+++ b/js/src/ion/IonFrames-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrames.cpp b/js/src/ion/IonFrames.cpp
index 880a6396905d..4f24db565cad 100644
--- a/js/src/ion/IonFrames.cpp
+++ b/js/src/ion/IonFrames.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonFrames.h b/js/src/ion/IonFrames.h
index 6872c96a3422..5e598e244b27 100644
--- a/js/src/ion/IonFrames.h
+++ b/js/src/ion/IonFrames.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonInstrumentation.h b/js/src/ion/IonInstrumentation.h
index cb8ceae9119a..62d9ea1f6951 100644
--- a/js/src/ion/IonInstrumentation.h
+++ b/js/src/ion/IonInstrumentation.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonLinker.h b/js/src/ion/IonLinker.h
index 979385254362..b818368ccbaa 100644
--- a/js/src/ion/IonLinker.h
+++ b/js/src/ion/IonLinker.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonMacroAssembler.cpp b/js/src/ion/IonMacroAssembler.cpp
index 808218f3df8b..bcf85af67d84 100644
--- a/js/src/ion/IonMacroAssembler.cpp
+++ b/js/src/ion/IonMacroAssembler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index b08f08d277cc..9b4571354eb8 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonSpewer.cpp b/js/src/ion/IonSpewer.cpp
index 002a36193d12..c911955b57cf 100644
--- a/js/src/ion/IonSpewer.cpp
+++ b/js/src/ion/IonSpewer.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonSpewer.h b/js/src/ion/IonSpewer.h
index 19696dc286e6..4f6ad0eaa776 100644
--- a/js/src/ion/IonSpewer.h
+++ b/js/src/ion/IonSpewer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/IonTypes.h b/js/src/ion/IonTypes.h
index b033e28f18c3..6e60a39c6159 100644
--- a/js/src/ion/IonTypes.h
+++ b/js/src/ion/IonTypes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/JSONSpewer.cpp b/js/src/ion/JSONSpewer.cpp
index bc3a4c363984..466941ddd7a5 100644
--- a/js/src/ion/JSONSpewer.cpp
+++ b/js/src/ion/JSONSpewer.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/JSONSpewer.h b/js/src/ion/JSONSpewer.h
index 8726b48fcd26..556faa9081bb 100644
--- a/js/src/ion/JSONSpewer.h
+++ b/js/src/ion/JSONSpewer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LICM.cpp b/js/src/ion/LICM.cpp
index d40970a65994..d93f1c22f248 100644
--- a/js/src/ion/LICM.cpp
+++ b/js/src/ion/LICM.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LICM.h b/js/src/ion/LICM.h
index ab40b2b6df91..e2f53fafdc65 100644
--- a/js/src/ion/LICM.h
+++ b/js/src/ion/LICM.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index f2ddb2d08264..5d6ef835e6bf 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LIR-inl.h b/js/src/ion/LIR-inl.h
index af24d9769146..de4d08ede26c 100644
--- a/js/src/ion/LIR-inl.h
+++ b/js/src/ion/LIR-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LIR.cpp b/js/src/ion/LIR.cpp
index 7c70b2a51cda..d0f96070f6c0 100644
--- a/js/src/ion/LIR.cpp
+++ b/js/src/ion/LIR.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LIR.h b/js/src/ion/LIR.h
index 096cbd374ce0..dcbc44e47b4c 100644
--- a/js/src/ion/LIR.h
+++ b/js/src/ion/LIR.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LOpcodes.h b/js/src/ion/LOpcodes.h
index 227aeac052a4..b7bf009b266c 100644
--- a/js/src/ion/LOpcodes.h
+++ b/js/src/ion/LOpcodes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LinearScan.cpp b/js/src/ion/LinearScan.cpp
index b073db985a1e..8318716ca2d0 100644
--- a/js/src/ion/LinearScan.cpp
+++ b/js/src/ion/LinearScan.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LinearScan.h b/js/src/ion/LinearScan.h
index 3cf8d80740e3..4dcd24a207ca 100644
--- a/js/src/ion/LinearScan.h
+++ b/js/src/ion/LinearScan.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LiveRangeAllocator.cpp b/js/src/ion/LiveRangeAllocator.cpp
index b35e731eb3ab..154c2767204b 100644
--- a/js/src/ion/LiveRangeAllocator.cpp
+++ b/js/src/ion/LiveRangeAllocator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/LiveRangeAllocator.h b/js/src/ion/LiveRangeAllocator.h
index d48aece848d9..3c81bc90903a 100644
--- a/js/src/ion/LiveRangeAllocator.h
+++ b/js/src/ion/LiveRangeAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 5a3bbd5c0823..75de254f6577 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Lowering.h b/js/src/ion/Lowering.h
index 4d39160fb155..cc8cd249df8b 100644
--- a/js/src/ion/Lowering.h
+++ b/js/src/ion/Lowering.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MCallOptimize.cpp b/js/src/ion/MCallOptimize.cpp
index d05b5f5f1378..98e986259127 100644
--- a/js/src/ion/MCallOptimize.cpp
+++ b/js/src/ion/MCallOptimize.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIR.cpp b/js/src/ion/MIR.cpp
index 8eb9b1165495..7b94d6c7419f 100644
--- a/js/src/ion/MIR.cpp
+++ b/js/src/ion/MIR.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 0e1f6ec87acf..faa0d1ed38fa 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIRGenerator.h b/js/src/ion/MIRGenerator.h
index 39cbba47602c..a734cbdef71b 100644
--- a/js/src/ion/MIRGenerator.h
+++ b/js/src/ion/MIRGenerator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIRGraph.cpp b/js/src/ion/MIRGraph.cpp
index 3a02a3394f4d..addbda66aecd 100644
--- a/js/src/ion/MIRGraph.cpp
+++ b/js/src/ion/MIRGraph.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MIRGraph.h b/js/src/ion/MIRGraph.h
index 21f77942f95d..f5b62e11623e 100644
--- a/js/src/ion/MIRGraph.h
+++ b/js/src/ion/MIRGraph.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MOpcodes.h b/js/src/ion/MOpcodes.h
index c27a8b14251e..a5123a627ccd 100644
--- a/js/src/ion/MOpcodes.h
+++ b/js/src/ion/MOpcodes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MoveEmitter.h b/js/src/ion/MoveEmitter.h
index 9a88bd12703d..095b5d9e6da6 100644
--- a/js/src/ion/MoveEmitter.h
+++ b/js/src/ion/MoveEmitter.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MoveResolver.cpp b/js/src/ion/MoveResolver.cpp
index 1d4c76b7f681..a2b661c3130e 100644
--- a/js/src/ion/MoveResolver.cpp
+++ b/js/src/ion/MoveResolver.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/MoveResolver.h b/js/src/ion/MoveResolver.h
index 0f816e15be54..8a20e1021a09 100644
--- a/js/src/ion/MoveResolver.h
+++ b/js/src/ion/MoveResolver.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ParallelArrayAnalysis.cpp b/js/src/ion/ParallelArrayAnalysis.cpp
index 3d92c14267fe..364df7b0902d 100644
--- a/js/src/ion/ParallelArrayAnalysis.cpp
+++ b/js/src/ion/ParallelArrayAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ParallelArrayAnalysis.h b/js/src/ion/ParallelArrayAnalysis.h
index 93e4ce36de2d..2c2eba228b37 100644
--- a/js/src/ion/ParallelArrayAnalysis.h
+++ b/js/src/ion/ParallelArrayAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ParallelFunctions.cpp b/js/src/ion/ParallelFunctions.cpp
index 1b821503b328..e0c7ca406778 100644
--- a/js/src/ion/ParallelFunctions.cpp
+++ b/js/src/ion/ParallelFunctions.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ParallelFunctions.h b/js/src/ion/ParallelFunctions.h
index b74e5cfa7aee..1fe9fcc333ff 100644
--- a/js/src/ion/ParallelFunctions.h
+++ b/js/src/ion/ParallelFunctions.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/PcScriptCache-inl.h b/js/src/ion/PcScriptCache-inl.h
index 9a852d0ed453..fdf5acfd19ab 100644
--- a/js/src/ion/PcScriptCache-inl.h
+++ b/js/src/ion/PcScriptCache-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/PcScriptCache.h b/js/src/ion/PcScriptCache.h
index 4d8eca0cbe31..9f9a3d79c87c 100644
--- a/js/src/ion/PcScriptCache.h
+++ b/js/src/ion/PcScriptCache.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RangeAnalysis.cpp b/js/src/ion/RangeAnalysis.cpp
index 918dc33bf90b..229b3a552b8d 100644
--- a/js/src/ion/RangeAnalysis.cpp
+++ b/js/src/ion/RangeAnalysis.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RangeAnalysis.h b/js/src/ion/RangeAnalysis.h
index 830d3a3167de..0ffdc4752288 100644
--- a/js/src/ion/RangeAnalysis.h
+++ b/js/src/ion/RangeAnalysis.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RegisterAllocator.cpp b/js/src/ion/RegisterAllocator.cpp
index f9986453416f..335eae5265a8 100644
--- a/js/src/ion/RegisterAllocator.cpp
+++ b/js/src/ion/RegisterAllocator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RegisterAllocator.h b/js/src/ion/RegisterAllocator.h
index d98704d38d03..fe76b3504ee9 100644
--- a/js/src/ion/RegisterAllocator.h
+++ b/js/src/ion/RegisterAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/RegisterSets.h b/js/src/ion/RegisterSets.h
index b1ec16bcd735..9679f9f734df 100644
--- a/js/src/ion/RegisterSets.h
+++ b/js/src/ion/RegisterSets.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Registers.h b/js/src/ion/Registers.h
index e942d2e0474e..988d544f279c 100644
--- a/js/src/ion/Registers.h
+++ b/js/src/ion/Registers.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Safepoints.cpp b/js/src/ion/Safepoints.cpp
index 180b929d0301..8af0573240d7 100644
--- a/js/src/ion/Safepoints.cpp
+++ b/js/src/ion/Safepoints.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Safepoints.h b/js/src/ion/Safepoints.h
index 6e81e75e6442..4ae9e14bbfaf 100644
--- a/js/src/ion/Safepoints.h
+++ b/js/src/ion/Safepoints.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/SnapshotReader.h b/js/src/ion/SnapshotReader.h
index 61c930852a6a..497763da8e8c 100644
--- a/js/src/ion/SnapshotReader.h
+++ b/js/src/ion/SnapshotReader.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/SnapshotWriter.h b/js/src/ion/SnapshotWriter.h
index 9044da1dc405..9c90e6a7a757 100644
--- a/js/src/ion/SnapshotWriter.h
+++ b/js/src/ion/SnapshotWriter.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/Snapshots.cpp b/js/src/ion/Snapshots.cpp
index bc761faf75f8..3605148521c0 100644
--- a/js/src/ion/Snapshots.cpp
+++ b/js/src/ion/Snapshots.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/StackSlotAllocator.h b/js/src/ion/StackSlotAllocator.h
index d08c63797170..e0b978324b9e 100644
--- a/js/src/ion/StackSlotAllocator.h
+++ b/js/src/ion/StackSlotAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/StupidAllocator.cpp b/js/src/ion/StupidAllocator.cpp
index c0646ac78f24..699194afc6ef 100644
--- a/js/src/ion/StupidAllocator.cpp
+++ b/js/src/ion/StupidAllocator.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/StupidAllocator.h b/js/src/ion/StupidAllocator.h
index 77534641f7ba..5c1279ddeaa4 100644
--- a/js/src/ion/StupidAllocator.h
+++ b/js/src/ion/StupidAllocator.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/TypeOracle.cpp b/js/src/ion/TypeOracle.cpp
index 35aa88e63e26..6ad76ecaa892 100644
--- a/js/src/ion/TypeOracle.cpp
+++ b/js/src/ion/TypeOracle.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/TypeOracle.h b/js/src/ion/TypeOracle.h
index bf13fdd6b8bf..d75a1cb77f32 100644
--- a/js/src/ion/TypeOracle.h
+++ b/js/src/ion/TypeOracle.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index 2d4f90a542d4..ce60a3528c03 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/TypePolicy.h b/js/src/ion/TypePolicy.h
index 310dd73e99ec..3f209e53c857 100644
--- a/js/src/ion/TypePolicy.h
+++ b/js/src/ion/TypePolicy.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/UnreachableCodeElimination.cpp b/js/src/ion/UnreachableCodeElimination.cpp
index 75367fd313c0..50a27363928f 100644
--- a/js/src/ion/UnreachableCodeElimination.cpp
+++ b/js/src/ion/UnreachableCodeElimination.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/UnreachableCodeElimination.h b/js/src/ion/UnreachableCodeElimination.h
index 99a61eed7b7b..9999afb47443 100644
--- a/js/src/ion/UnreachableCodeElimination.h
+++ b/js/src/ion/UnreachableCodeElimination.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/VMFunctions.cpp b/js/src/ion/VMFunctions.cpp
index 15b33c5190d4..c9f2f8dda262 100644
--- a/js/src/ion/VMFunctions.cpp
+++ b/js/src/ion/VMFunctions.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/VMFunctions.h b/js/src/ion/VMFunctions.h
index 7439a9b56276..c7477ddd2b0f 100644
--- a/js/src/ion/VMFunctions.h
+++ b/js/src/ion/VMFunctions.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ValueNumbering.cpp b/js/src/ion/ValueNumbering.cpp
index 597fb89170f4..a8b83b5dc950 100644
--- a/js/src/ion/ValueNumbering.cpp
+++ b/js/src/ion/ValueNumbering.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/ValueNumbering.h b/js/src/ion/ValueNumbering.h
index 24db39cde1a1..edb1f40558f2 100644
--- a/js/src/ion/ValueNumbering.h
+++ b/js/src/ion/ValueNumbering.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Architecture-arm.cpp b/js/src/ion/arm/Architecture-arm.cpp
index 567715f688d1..7fc302930308 100644
--- a/js/src/ion/arm/Architecture-arm.cpp
+++ b/js/src/ion/arm/Architecture-arm.cpp
@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+
 #define HWCAP_ARMv7 (1 << 31)
 #include <mozilla/StandardInteger.h>
 
diff --git a/js/src/ion/arm/Architecture-arm.h b/js/src/ion/arm/Architecture-arm.h
index 3257c31ff1c0..0471efb88357 100644
--- a/js/src/ion/arm/Architecture-arm.h
+++ b/js/src/ion/arm/Architecture-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Assembler-arm.cpp b/js/src/ion/arm/Assembler-arm.cpp
index a2c178ee7f8a..820f99c9b615 100644
--- a/js/src/ion/arm/Assembler-arm.cpp
+++ b/js/src/ion/arm/Assembler-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Assembler-arm.h b/js/src/ion/arm/Assembler-arm.h
index 620270bcf3f2..80f1b7737255 100644
--- a/js/src/ion/arm/Assembler-arm.h
+++ b/js/src/ion/arm/Assembler-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Bailouts-arm.cpp b/js/src/ion/arm/Bailouts-arm.cpp
index bb51f8f3fbc6..21968bde4b1d 100644
--- a/js/src/ion/arm/Bailouts-arm.cpp
+++ b/js/src/ion/arm/Bailouts-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineCompiler-arm.cpp b/js/src/ion/arm/BaselineCompiler-arm.cpp
index 53ddd75857b0..7ed88a3f246a 100644
--- a/js/src/ion/arm/BaselineCompiler-arm.cpp
+++ b/js/src/ion/arm/BaselineCompiler-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineCompiler-arm.h b/js/src/ion/arm/BaselineCompiler-arm.h
index baaaff529d02..5485204398d3 100644
--- a/js/src/ion/arm/BaselineCompiler-arm.h
+++ b/js/src/ion/arm/BaselineCompiler-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineHelpers-arm.h b/js/src/ion/arm/BaselineHelpers-arm.h
index 6dd5795c0f39..6d5611eb5437 100644
--- a/js/src/ion/arm/BaselineHelpers-arm.h
+++ b/js/src/ion/arm/BaselineHelpers-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineIC-arm.cpp b/js/src/ion/arm/BaselineIC-arm.cpp
index 079b5b33d15c..25a1b40c0e5e 100644
--- a/js/src/ion/arm/BaselineIC-arm.cpp
+++ b/js/src/ion/arm/BaselineIC-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/BaselineRegisters-arm.h b/js/src/ion/arm/BaselineRegisters-arm.h
index 4ba983e6e7d5..53c908850855 100644
--- a/js/src/ion/arm/BaselineRegisters-arm.h
+++ b/js/src/ion/arm/BaselineRegisters-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/CodeGenerator-arm.cpp b/js/src/ion/arm/CodeGenerator-arm.cpp
index 4acfde24e38c..b28d73f5f080 100644
--- a/js/src/ion/arm/CodeGenerator-arm.cpp
+++ b/js/src/ion/arm/CodeGenerator-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/CodeGenerator-arm.h b/js/src/ion/arm/CodeGenerator-arm.h
index a0e421d57ac0..4c9940ade643 100644
--- a/js/src/ion/arm/CodeGenerator-arm.h
+++ b/js/src/ion/arm/CodeGenerator-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/IonFrames-arm.cpp b/js/src/ion/arm/IonFrames-arm.cpp
index 0b90bb2c48fb..fe5bd1c65b69 100644
--- a/js/src/ion/arm/IonFrames-arm.cpp
+++ b/js/src/ion/arm/IonFrames-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/IonFrames-arm.h b/js/src/ion/arm/IonFrames-arm.h
index f5b38c324f4a..c9d5268c6af5 100644
--- a/js/src/ion/arm/IonFrames-arm.h
+++ b/js/src/ion/arm/IonFrames-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/LIR-arm.h b/js/src/ion/arm/LIR-arm.h
index 7e0997c14bb3..f9db2e9b6e05 100644
--- a/js/src/ion/arm/LIR-arm.h
+++ b/js/src/ion/arm/LIR-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/LOpcodes-arm.h b/js/src/ion/arm/LOpcodes-arm.h
index 7745129aa645..1f53b9baabc8 100644
--- a/js/src/ion/arm/LOpcodes-arm.h
+++ b/js/src/ion/arm/LOpcodes-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Lowering-arm.cpp b/js/src/ion/arm/Lowering-arm.cpp
index 867f69bbffd3..f5aecb3ed4ef 100644
--- a/js/src/ion/arm/Lowering-arm.cpp
+++ b/js/src/ion/arm/Lowering-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Lowering-arm.h b/js/src/ion/arm/Lowering-arm.h
index 4436f2cd1cd3..0472fa1489e5 100644
--- a/js/src/ion/arm/Lowering-arm.h
+++ b/js/src/ion/arm/Lowering-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/MacroAssembler-arm.cpp b/js/src/ion/arm/MacroAssembler-arm.cpp
index 561a0b358802..0076f8d27058 100644
--- a/js/src/ion/arm/MacroAssembler-arm.cpp
+++ b/js/src/ion/arm/MacroAssembler-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/MacroAssembler-arm.h b/js/src/ion/arm/MacroAssembler-arm.h
index a383576e8331..18b258b750cc 100644
--- a/js/src/ion/arm/MacroAssembler-arm.h
+++ b/js/src/ion/arm/MacroAssembler-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/MoveEmitter-arm.cpp b/js/src/ion/arm/MoveEmitter-arm.cpp
index b6f1b409e900..289ecc795d80 100644
--- a/js/src/ion/arm/MoveEmitter-arm.cpp
+++ b/js/src/ion/arm/MoveEmitter-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/MoveEmitter-arm.h b/js/src/ion/arm/MoveEmitter-arm.h
index 783cf1c966e1..8d63c095c83d 100644
--- a/js/src/ion/arm/MoveEmitter-arm.h
+++ b/js/src/ion/arm/MoveEmitter-arm.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/arm/Trampoline-arm.cpp b/js/src/ion/arm/Trampoline-arm.cpp
index a8dd69f463b4..3f313235f059 100644
--- a/js/src/ion/arm/Trampoline-arm.cpp
+++ b/js/src/ion/arm/Trampoline-arm.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-shared.h b/js/src/ion/shared/Assembler-shared.h
index eb6371fb2b68..dec722212e45 100644
--- a/js/src/ion/shared/Assembler-shared.h
+++ b/js/src/ion/shared/Assembler-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-x86-shared.cpp b/js/src/ion/shared/Assembler-x86-shared.cpp
index 689a5a6876d3..09accd9c7bb8 100644
--- a/js/src/ion/shared/Assembler-x86-shared.cpp
+++ b/js/src/ion/shared/Assembler-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-x86-shared.h b/js/src/ion/shared/Assembler-x86-shared.h
index 41cb8e0bc5da..66f49ef47131 100644
--- a/js/src/ion/shared/Assembler-x86-shared.h
+++ b/js/src/ion/shared/Assembler-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-shared.cpp b/js/src/ion/shared/BaselineCompiler-shared.cpp
index 7b8bbfe05fc9..47831a5c82cc 100644
--- a/js/src/ion/shared/BaselineCompiler-shared.cpp
+++ b/js/src/ion/shared/BaselineCompiler-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-shared.h b/js/src/ion/shared/BaselineCompiler-shared.h
index a0baa943e584..2a23e44ed56b 100644
--- a/js/src/ion/shared/BaselineCompiler-shared.h
+++ b/js/src/ion/shared/BaselineCompiler-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-x86-shared.cpp b/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
index 9c23197aafe1..9c3db57f63a2 100644
--- a/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
+++ b/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-x86-shared.h b/js/src/ion/shared/BaselineCompiler-x86-shared.h
index 56d1b2de020b..20ecdec89408 100644
--- a/js/src/ion/shared/BaselineCompiler-x86-shared.h
+++ b/js/src/ion/shared/BaselineCompiler-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/BaselineIC-x86-shared.cpp b/js/src/ion/shared/BaselineIC-x86-shared.cpp
index cc5bf7e616d4..a671664ad752 100644
--- a/js/src/ion/shared/BaselineIC-x86-shared.cpp
+++ b/js/src/ion/shared/BaselineIC-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared-inl.h b/js/src/ion/shared/CodeGenerator-shared-inl.h
index 7bf3b611417f..67f4aeee310a 100644
--- a/js/src/ion/shared/CodeGenerator-shared-inl.h
+++ b/js/src/ion/shared/CodeGenerator-shared-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared.cpp b/js/src/ion/shared/CodeGenerator-shared.cpp
index 568e0d684500..3017b431e153 100644
--- a/js/src/ion/shared/CodeGenerator-shared.cpp
+++ b/js/src/ion/shared/CodeGenerator-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared.h b/js/src/ion/shared/CodeGenerator-shared.h
index 1695dc5c45cc..a99934e46968 100644
--- a/js/src/ion/shared/CodeGenerator-shared.h
+++ b/js/src/ion/shared/CodeGenerator-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-x86-shared.cpp b/js/src/ion/shared/CodeGenerator-x86-shared.cpp
index eaa4ac482f2e..80a6adb35e5f 100644
--- a/js/src/ion/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/ion/shared/CodeGenerator-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-x86-shared.h b/js/src/ion/shared/CodeGenerator-x86-shared.h
index 93305081b7b5..547ddbd588de 100644
--- a/js/src/ion/shared/CodeGenerator-x86-shared.h
+++ b/js/src/ion/shared/CodeGenerator-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/IonAssemblerBuffer.h b/js/src/ion/shared/IonAssemblerBuffer.h
index 47653f94955a..59c51eacc751 100644
--- a/js/src/ion/shared/IonAssemblerBuffer.h
+++ b/js/src/ion/shared/IonAssemblerBuffer.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h b/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
index 8b9b1055e2f4..8dcb2f3eb249 100644
--- a/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
+++ b/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/IonFrames-shared.h b/js/src/ion/shared/IonFrames-shared.h
index 794da5226709..2b6f12f1da78 100644
--- a/js/src/ion/shared/IonFrames-shared.h
+++ b/js/src/ion/shared/IonFrames-shared.h
@@ -1,43 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Anderson <dvander@alliedmods.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
+
 #ifndef jsion_ionframes_shared_h__
 #define jsion_ionframes_shared_h__
 
diff --git a/js/src/ion/shared/IonFrames-x86-shared.cpp b/js/src/ion/shared/IonFrames-x86-shared.cpp
index 55ca61030a89..fe9dc1f19531 100644
--- a/js/src/ion/shared/IonFrames-x86-shared.cpp
+++ b/js/src/ion/shared/IonFrames-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/IonFrames-x86-shared.h b/js/src/ion/shared/IonFrames-x86-shared.h
index 04f055884d71..9100f3b38413 100644
--- a/js/src/ion/shared/IonFrames-x86-shared.h
+++ b/js/src/ion/shared/IonFrames-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/LIR-x86-shared.h b/js/src/ion/shared/LIR-x86-shared.h
index 4cec8fbed08a..5d12830436c9 100644
--- a/js/src/ion/shared/LIR-x86-shared.h
+++ b/js/src/ion/shared/LIR-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared-inl.h b/js/src/ion/shared/Lowering-shared-inl.h
index a67981a03684..6139c7ea0647 100644
--- a/js/src/ion/shared/Lowering-shared-inl.h
+++ b/js/src/ion/shared/Lowering-shared-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared.cpp b/js/src/ion/shared/Lowering-shared.cpp
index 577196d1aa65..7ab7b2e314f9 100644
--- a/js/src/ion/shared/Lowering-shared.cpp
+++ b/js/src/ion/shared/Lowering-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared.h b/js/src/ion/shared/Lowering-shared.h
index 5f8b34c24237..0808833a0284 100644
--- a/js/src/ion/shared/Lowering-shared.h
+++ b/js/src/ion/shared/Lowering-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-x86-shared.cpp b/js/src/ion/shared/Lowering-x86-shared.cpp
index 95496d77e916..f2ed21d6b7fb 100644
--- a/js/src/ion/shared/Lowering-x86-shared.cpp
+++ b/js/src/ion/shared/Lowering-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-x86-shared.h b/js/src/ion/shared/Lowering-x86-shared.h
index 797f552baeb2..99a3c6cf3c50 100644
--- a/js/src/ion/shared/Lowering-x86-shared.h
+++ b/js/src/ion/shared/Lowering-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/MacroAssembler-x86-shared.h b/js/src/ion/shared/MacroAssembler-x86-shared.h
index 644e302b3f5a..f28f229dd7b8 100644
--- a/js/src/ion/shared/MacroAssembler-x86-shared.h
+++ b/js/src/ion/shared/MacroAssembler-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/MoveEmitter-x86-shared.cpp b/js/src/ion/shared/MoveEmitter-x86-shared.cpp
index 99e50bef2134..8c8c6290923d 100644
--- a/js/src/ion/shared/MoveEmitter-x86-shared.cpp
+++ b/js/src/ion/shared/MoveEmitter-x86-shared.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/shared/MoveEmitter-x86-shared.h b/js/src/ion/shared/MoveEmitter-x86-shared.h
index bbc2a5ef1fe9..915dd13b5091 100644
--- a/js/src/ion/shared/MoveEmitter-x86-shared.h
+++ b/js/src/ion/shared/MoveEmitter-x86-shared.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Architecture-x64.h b/js/src/ion/x64/Architecture-x64.h
index 707fb2a43c04..3a832c95df18 100644
--- a/js/src/ion/x64/Architecture-x64.h
+++ b/js/src/ion/x64/Architecture-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Assembler-x64.cpp b/js/src/ion/x64/Assembler-x64.cpp
index bdb88083fb02..bdcbe791d2e1 100644
--- a/js/src/ion/x64/Assembler-x64.cpp
+++ b/js/src/ion/x64/Assembler-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Assembler-x64.h b/js/src/ion/x64/Assembler-x64.h
index 680d24c4f741..bf4a95980831 100644
--- a/js/src/ion/x64/Assembler-x64.h
+++ b/js/src/ion/x64/Assembler-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Bailouts-x64.cpp b/js/src/ion/x64/Bailouts-x64.cpp
index 8062c8814f3a..4f9e265c62f8 100644
--- a/js/src/ion/x64/Bailouts-x64.cpp
+++ b/js/src/ion/x64/Bailouts-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineCompiler-x64.cpp b/js/src/ion/x64/BaselineCompiler-x64.cpp
index 45c9bf09c30b..e0bce0af7d51 100644
--- a/js/src/ion/x64/BaselineCompiler-x64.cpp
+++ b/js/src/ion/x64/BaselineCompiler-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineCompiler-x64.h b/js/src/ion/x64/BaselineCompiler-x64.h
index 1bfb02ba220b..ddac8c9c4133 100644
--- a/js/src/ion/x64/BaselineCompiler-x64.h
+++ b/js/src/ion/x64/BaselineCompiler-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineHelpers-x64.h b/js/src/ion/x64/BaselineHelpers-x64.h
index 939d8d9f5e9a..0e5c802f13ea 100644
--- a/js/src/ion/x64/BaselineHelpers-x64.h
+++ b/js/src/ion/x64/BaselineHelpers-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineIC-x64.cpp b/js/src/ion/x64/BaselineIC-x64.cpp
index 57d71a05a150..7359d26eb661 100644
--- a/js/src/ion/x64/BaselineIC-x64.cpp
+++ b/js/src/ion/x64/BaselineIC-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/BaselineRegisters-x64.h b/js/src/ion/x64/BaselineRegisters-x64.h
index f3b9d69d187c..72a64a55bb1f 100644
--- a/js/src/ion/x64/BaselineRegisters-x64.h
+++ b/js/src/ion/x64/BaselineRegisters-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/CodeGenerator-x64.cpp b/js/src/ion/x64/CodeGenerator-x64.cpp
index b7d720810de1..e94fe12fdb71 100644
--- a/js/src/ion/x64/CodeGenerator-x64.cpp
+++ b/js/src/ion/x64/CodeGenerator-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/CodeGenerator-x64.h b/js/src/ion/x64/CodeGenerator-x64.h
index 5360dc710413..35e103cd3254 100644
--- a/js/src/ion/x64/CodeGenerator-x64.h
+++ b/js/src/ion/x64/CodeGenerator-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/LIR-x64.h b/js/src/ion/x64/LIR-x64.h
index f1a8d03fe3a5..f5366d747f8d 100644
--- a/js/src/ion/x64/LIR-x64.h
+++ b/js/src/ion/x64/LIR-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/LOpcodes-x64.h b/js/src/ion/x64/LOpcodes-x64.h
index 8a276914ac25..fb479d48ce5a 100644
--- a/js/src/ion/x64/LOpcodes-x64.h
+++ b/js/src/ion/x64/LOpcodes-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Lowering-x64.cpp b/js/src/ion/x64/Lowering-x64.cpp
index d8eda3c9430b..525d0ecabfb7 100644
--- a/js/src/ion/x64/Lowering-x64.cpp
+++ b/js/src/ion/x64/Lowering-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Lowering-x64.h b/js/src/ion/x64/Lowering-x64.h
index f479e5d1d8b9..176041735618 100644
--- a/js/src/ion/x64/Lowering-x64.h
+++ b/js/src/ion/x64/Lowering-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/MacroAssembler-x64.cpp b/js/src/ion/x64/MacroAssembler-x64.cpp
index daf6a8b23875..c91b2471c35e 100644
--- a/js/src/ion/x64/MacroAssembler-x64.cpp
+++ b/js/src/ion/x64/MacroAssembler-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/MacroAssembler-x64.h b/js/src/ion/x64/MacroAssembler-x64.h
index 186943bf95a5..8672a2e8e730 100644
--- a/js/src/ion/x64/MacroAssembler-x64.h
+++ b/js/src/ion/x64/MacroAssembler-x64.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x64/Trampoline-x64.cpp b/js/src/ion/x64/Trampoline-x64.cpp
index a8e1f6f86067..fc8be268141b 100644
--- a/js/src/ion/x64/Trampoline-x64.cpp
+++ b/js/src/ion/x64/Trampoline-x64.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Architecture-x86.h b/js/src/ion/x86/Architecture-x86.h
index 4c32e49df5b3..61ffbdd3f787 100644
--- a/js/src/ion/x86/Architecture-x86.h
+++ b/js/src/ion/x86/Architecture-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Assembler-x86.cpp b/js/src/ion/x86/Assembler-x86.cpp
index d9cf3d312c9a..e09285f8022c 100644
--- a/js/src/ion/x86/Assembler-x86.cpp
+++ b/js/src/ion/x86/Assembler-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Assembler-x86.h b/js/src/ion/x86/Assembler-x86.h
index 3f894a8868fb..3099f80a9b6d 100644
--- a/js/src/ion/x86/Assembler-x86.h
+++ b/js/src/ion/x86/Assembler-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Bailouts-x86.cpp b/js/src/ion/x86/Bailouts-x86.cpp
index 72e3eab4081b..731ef2c7e3ad 100644
--- a/js/src/ion/x86/Bailouts-x86.cpp
+++ b/js/src/ion/x86/Bailouts-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineCompiler-x86.cpp b/js/src/ion/x86/BaselineCompiler-x86.cpp
index 4ae0b3c74d3d..618ac55080c5 100644
--- a/js/src/ion/x86/BaselineCompiler-x86.cpp
+++ b/js/src/ion/x86/BaselineCompiler-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineCompiler-x86.h b/js/src/ion/x86/BaselineCompiler-x86.h
index cd1af33574a7..dcc7eeabbfbf 100644
--- a/js/src/ion/x86/BaselineCompiler-x86.h
+++ b/js/src/ion/x86/BaselineCompiler-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineHelpers-x86.h b/js/src/ion/x86/BaselineHelpers-x86.h
index 6222189a46b5..30f7db30986e 100644
--- a/js/src/ion/x86/BaselineHelpers-x86.h
+++ b/js/src/ion/x86/BaselineHelpers-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineIC-x86.cpp b/js/src/ion/x86/BaselineIC-x86.cpp
index 56a5dd0bba66..01a0b54bfc49 100644
--- a/js/src/ion/x86/BaselineIC-x86.cpp
+++ b/js/src/ion/x86/BaselineIC-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/BaselineRegisters-x86.h b/js/src/ion/x86/BaselineRegisters-x86.h
index e8a88217be9f..b28bda46ea29 100644
--- a/js/src/ion/x86/BaselineRegisters-x86.h
+++ b/js/src/ion/x86/BaselineRegisters-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/CodeGenerator-x86.cpp b/js/src/ion/x86/CodeGenerator-x86.cpp
index fd36974e9792..4884d5118e26 100644
--- a/js/src/ion/x86/CodeGenerator-x86.cpp
+++ b/js/src/ion/x86/CodeGenerator-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/CodeGenerator-x86.h b/js/src/ion/x86/CodeGenerator-x86.h
index 9fdc4b6a1b05..c4a58322e4db 100644
--- a/js/src/ion/x86/CodeGenerator-x86.h
+++ b/js/src/ion/x86/CodeGenerator-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/LIR-x86.h b/js/src/ion/x86/LIR-x86.h
index b56ab4788770..a27412302000 100644
--- a/js/src/ion/x86/LIR-x86.h
+++ b/js/src/ion/x86/LIR-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/LOpcodes-x86.h b/js/src/ion/x86/LOpcodes-x86.h
index 7944813552d1..5b4b9f49e2ca 100644
--- a/js/src/ion/x86/LOpcodes-x86.h
+++ b/js/src/ion/x86/LOpcodes-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Lowering-x86.cpp b/js/src/ion/x86/Lowering-x86.cpp
index debcc669fceb..9ef6d6d51c45 100644
--- a/js/src/ion/x86/Lowering-x86.cpp
+++ b/js/src/ion/x86/Lowering-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Lowering-x86.h b/js/src/ion/x86/Lowering-x86.h
index db6347ea5af3..f283e8a41053 100644
--- a/js/src/ion/x86/Lowering-x86.h
+++ b/js/src/ion/x86/Lowering-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/MacroAssembler-x86.cpp b/js/src/ion/x86/MacroAssembler-x86.cpp
index d620f46a0792..4183d3c9f372 100644
--- a/js/src/ion/x86/MacroAssembler-x86.cpp
+++ b/js/src/ion/x86/MacroAssembler-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/MacroAssembler-x86.h b/js/src/ion/x86/MacroAssembler-x86.h
index 5912f3ec3537..18f95d8bb89d 100644
--- a/js/src/ion/x86/MacroAssembler-x86.h
+++ b/js/src/ion/x86/MacroAssembler-x86.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/ion/x86/Trampoline-x86.cpp b/js/src/ion/x86/Trampoline-x86.cpp
index c6345788f956..088d7678bc91 100644
--- a/js/src/ion/x86/Trampoline-x86.cpp
+++ b/js/src/ion/x86/Trampoline-x86.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jit-test/tests/auto-regress/bug557946.js b/js/src/jit-test/tests/auto-regress/bug557946.js
index 37cde015b269..8d1e95c53b17 100644
--- a/js/src/jit-test/tests/auto-regress/bug557946.js
+++ b/js/src/jit-test/tests/auto-regress/bug557946.js
@@ -1,7 +1,7 @@
 // Binary: cache/js-dbg-64-6f1a38b94754-linux
 // Flags: -j
 //
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 var x = 0;
 var y = 0;
diff --git a/js/src/jit-test/tests/auto-regress/bug558618.js b/js/src/jit-test/tests/auto-regress/bug558618.js
index 1618adb14b19..3fe1dfb257ec 100644
--- a/js/src/jit-test/tests/auto-regress/bug558618.js
+++ b/js/src/jit-test/tests/auto-regress/bug558618.js
@@ -1,7 +1,7 @@
 // Binary: cache/js-dbg-64-e69034463eeb-linux
 // Flags: -j
 //
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 function f() {
     this.search = function(a, b, c) {
         arguments[3] = { }
diff --git a/js/src/jit-test/tests/basic/bug535760.js b/js/src/jit-test/tests/basic/bug535760.js
index e7e1fce14880..dd00b961522c 100644
--- a/js/src/jit-test/tests/basic/bug535760.js
+++ b/js/src/jit-test/tests/basic/bug535760.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 function foundit(items, n) {
     for (var i = 0; i < 10; i++)
         arguments[2](items, this);
diff --git a/js/src/jit-test/tests/basic/bug541191-1.js b/js/src/jit-test/tests/basic/bug541191-1.js
index 78f0caf10ad8..74ccae82976e 100644
--- a/js/src/jit-test/tests/basic/bug541191-1.js
+++ b/js/src/jit-test/tests/basic/bug541191-1.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-2.js b/js/src/jit-test/tests/basic/bug541191-2.js
index 1d232dc332a9..d270b7de1e2b 100644
--- a/js/src/jit-test/tests/basic/bug541191-2.js
+++ b/js/src/jit-test/tests/basic/bug541191-2.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-3.js b/js/src/jit-test/tests/basic/bug541191-3.js
index f4e01b9e1802..f447d49d1e2d 100644
--- a/js/src/jit-test/tests/basic/bug541191-3.js
+++ b/js/src/jit-test/tests/basic/bug541191-3.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-4.js b/js/src/jit-test/tests/basic/bug541191-4.js
index 0ecbb9177425..5d15bedb5c16 100644
--- a/js/src/jit-test/tests/basic/bug541191-4.js
+++ b/js/src/jit-test/tests/basic/bug541191-4.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-5.js b/js/src/jit-test/tests/basic/bug541191-5.js
index a2f9e5714f0c..f87217b2ccee 100644
--- a/js/src/jit-test/tests/basic/bug541191-5.js
+++ b/js/src/jit-test/tests/basic/bug541191-5.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug592927.js b/js/src/jit-test/tests/basic/bug592927.js
index dc74a5af9062..69f0bd237e46 100644
--- a/js/src/jit-test/tests/basic/bug592927.js
+++ b/js/src/jit-test/tests/basic/bug592927.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(x, y) {
     x(f);
     assertEq(y, "hello");
diff --git a/js/src/jit-test/tests/basic/bug602088.js b/js/src/jit-test/tests/basic/bug602088.js
index 283b546acc3c..7e00d9b4c26d 100644
--- a/js/src/jit-test/tests/basic/bug602088.js
+++ b/js/src/jit-test/tests/basic/bug602088.js
@@ -1,5 +1,5 @@
 // |jit-test| error: TypeError
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 var p = Proxy.createFunction({}, function(x, y) { undefined.x(); });
 print(new p(1, 2));
diff --git a/js/src/jit-test/tests/basic/bug606083.js b/js/src/jit-test/tests/basic/bug606083.js
index fc2594b0ead3..d8049b94fa13 100644
--- a/js/src/jit-test/tests/basic/bug606083.js
+++ b/js/src/jit-test/tests/basic/bug606083.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(L) {
     do {
      L: for (var i = 0; i < L; i++) {
diff --git a/js/src/jit-test/tests/basic/bug616762.js b/js/src/jit-test/tests/basic/bug616762.js
index 89b8ddd18ab0..02f5c953cf59 100644
--- a/js/src/jit-test/tests/basic/bug616762.js
+++ b/js/src/jit-test/tests/basic/bug616762.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 document = {
     ready: function (x) {
         this.exec = x;
diff --git a/js/src/jit-test/tests/basic/bug633409-1.js b/js/src/jit-test/tests/basic/bug633409-1.js
index 1f65ccc8445f..20eaa6cda58e 100644
--- a/js/src/jit-test/tests/basic/bug633409-1.js
+++ b/js/src/jit-test/tests/basic/bug633409-1.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 x = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 };
 
 for (i in x)
diff --git a/js/src/jit-test/tests/basic/bug633409-2.js b/js/src/jit-test/tests/basic/bug633409-2.js
index 349af466a2b3..d3c498d6d235 100644
--- a/js/src/jit-test/tests/basic/bug633409-2.js
+++ b/js/src/jit-test/tests/basic/bug633409-2.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 var o1 = {p1: 1};
 var o2 = {p1: 1, p2: 2};
diff --git a/js/src/jit-test/tests/ion/bug674664-3.js b/js/src/jit-test/tests/ion/bug674664-3.js
index 7838e8738048..ce5a828d57c3 100644
--- a/js/src/jit-test/tests/ion/bug674664-3.js
+++ b/js/src/jit-test/tests/ion/bug674664-3.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f0(p0) {
     var v0;
     do {
diff --git a/js/src/jit-test/tests/ion/bug684362.js b/js/src/jit-test/tests/ion/bug684362.js
index dd2f606fc653..9a83b053d711 100644
--- a/js/src/jit-test/tests/ion/bug684362.js
+++ b/js/src/jit-test/tests/ion/bug684362.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(a) {
     var k = a;
     T: for (;;) {
diff --git a/js/src/jit-test/tests/ion/bug747271.js b/js/src/jit-test/tests/ion/bug747271.js
index 2a751177f5ad..176a44a5833a 100644
--- a/js/src/jit-test/tests/ion/bug747271.js
+++ b/js/src/jit-test/tests/ion/bug747271.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function randomFloat () {
     // note that in fuzz-testing, this can used as the size of a buffer to allocate.
     // so it shouldn't return astronomic values. The maximum value 10000000 is already quite big.
diff --git a/js/src/jit-test/tests/ion/bug750588.js b/js/src/jit-test/tests/ion/bug750588.js
index 63bab41d6190..6fa44d9cce63 100644
--- a/js/src/jit-test/tests/ion/bug750588.js
+++ b/js/src/jit-test/tests/ion/bug750588.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function S() {
   var t = new Float32Array(1);
diff --git a/js/src/jit-test/tests/ion/bug772901.js b/js/src/jit-test/tests/ion/bug772901.js
index 13928ced8592..eb71f6afb8a2 100644
--- a/js/src/jit-test/tests/ion/bug772901.js
+++ b/js/src/jit-test/tests/ion/bug772901.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f(x) {
     delete ((x)++);
diff --git a/js/src/jit-test/tests/ion/testPos.js b/js/src/jit-test/tests/ion/testPos.js
index 1d79df2fc636..197650e9b1fb 100644
--- a/js/src/jit-test/tests/ion/testPos.js
+++ b/js/src/jit-test/tests/ion/testPos.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f_int(x) {
     return +x;
 }
diff --git a/js/src/jit-test/tests/ion/testSubtract.js b/js/src/jit-test/tests/ion/testSubtract.js
index ad75a03f2ef0..2b4389b2a8fe 100644
--- a/js/src/jit-test/tests/ion/testSubtract.js
+++ b/js/src/jit-test/tests/ion/testSubtract.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f_int(x, y) {
     return x - y;
 }
diff --git a/js/src/jit-test/tests/ion/testVAndBranch.js b/js/src/jit-test/tests/ion/testVAndBranch.js
index e2ac44234227..c1fcc00e961f 100644
--- a/js/src/jit-test/tests/ion/testVAndBranch.js
+++ b/js/src/jit-test/tests/ion/testVAndBranch.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(x) {
     if (x)
         return true;
diff --git a/js/src/jit-test/tests/ion/truncateToInt32.js b/js/src/jit-test/tests/ion/truncateToInt32.js
index f48b7f16aef7..462b411ad1fe 100644
--- a/js/src/jit-test/tests/ion/truncateToInt32.js
+++ b/js/src/jit-test/tests/ion/truncateToInt32.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function w(y)
 {
diff --git a/js/src/jit-test/tests/ion/valueToInt32.js b/js/src/jit-test/tests/ion/valueToInt32.js
index c879c2d75a10..65ad561eca4d 100644
--- a/js/src/jit-test/tests/ion/valueToInt32.js
+++ b/js/src/jit-test/tests/ion/valueToInt32.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f(x, y) {
     // Confuse the type analysis to not know the type of x.
diff --git a/js/src/jit-test/tests/jaeger/bug592973-1.js b/js/src/jit-test/tests/jaeger/bug592973-1.js
index 470f84ee359b..d3bafac623db 100644
--- a/js/src/jit-test/tests/jaeger/bug592973-1.js
+++ b/js/src/jit-test/tests/jaeger/bug592973-1.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(x) {
     if (x) {
         let y;
diff --git a/js/src/jit-test/tests/jaeger/bug592973-3.js b/js/src/jit-test/tests/jaeger/bug592973-3.js
index ae4694955f5c..541c39981a4c 100644
--- a/js/src/jit-test/tests/jaeger/bug592973-3.js
+++ b/js/src/jit-test/tests/jaeger/bug592973-3.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f([a, b, c, d]) {
   a = b;
   return function () { return a + b + c + d; };
diff --git a/js/src/jit-test/tests/jaeger/bug597378.js b/js/src/jit-test/tests/jaeger/bug597378.js
index 454935bb9320..c766407ab58c 100644
--- a/js/src/jit-test/tests/jaeger/bug597378.js
+++ b/js/src/jit-test/tests/jaeger/bug597378.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(a, b) {
     var o = a;
     var q = b;
diff --git a/js/src/jit-test/tests/jaeger/bug600139.js b/js/src/jit-test/tests/jaeger/bug600139.js
index 2fdedf42d5cf..61fa7283a03a 100644
--- a/js/src/jit-test/tests/jaeger/bug600139.js
+++ b/js/src/jit-test/tests/jaeger/bug600139.js
@@ -1,5 +1,5 @@
 // |jit-test| error: ReferenceError
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(a, b, c) {
     if (!a.__SSi) {
         throw Components.returnCode = Cr.NS_ERROR_INVALID_ARG;
diff --git a/js/src/jit-test/tests/jaeger/bug600424.js b/js/src/jit-test/tests/jaeger/bug600424.js
index 44bb4e7c9b4c..e59a06614f21 100644
--- a/js/src/jit-test/tests/jaeger/bug600424.js
+++ b/js/src/jit-test/tests/jaeger/bug600424.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 function f(a) {
     var x = {
         g: function () {
diff --git a/js/src/jit-test/tests/jaeger/bug601982.js b/js/src/jit-test/tests/jaeger/bug601982.js
index b78f0704c69d..99f4bf906fc4 100644
--- a/js/src/jit-test/tests/jaeger/bug601982.js
+++ b/js/src/jit-test/tests/jaeger/bug601982.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 sw=4 tw=99 et: */
+/* vim: set ts=8 sts=4 et sw=4 tw=99: */
 
 function J(i) {
     /* Cause a branch to build(?) */
diff --git a/js/src/jit-test/tests/jaeger/bug604381.js b/js/src/jit-test/tests/jaeger/bug604381.js
index 365c9e3d2b16..3ca01cb36234 100644
--- a/js/src/jit-test/tests/jaeger/bug604381.js
+++ b/js/src/jit-test/tests/jaeger/bug604381.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function F() {
     var T = { };
diff --git a/js/src/jit-test/tests/jaeger/bug616508.js b/js/src/jit-test/tests/jaeger/bug616508.js
index 38ca2360f1aa..d29bf75f9b5e 100644
--- a/js/src/jit-test/tests/jaeger/bug616508.js
+++ b/js/src/jit-test/tests/jaeger/bug616508.js
@@ -1,5 +1,5 @@
 // |jit-test| error: ReferenceError
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 // Note: modified from original test, which used Uint32Array in place of Array,
 // because the behavior has changed in a way that this will throw a TypeError
diff --git a/js/src/jit-test/tests/jaeger/bug625438.js b/js/src/jit-test/tests/jaeger/bug625438.js
index 494bfd1342fd..32586d8ab4fa 100644
--- a/js/src/jit-test/tests/jaeger/bug625438.js
+++ b/js/src/jit-test/tests/jaeger/bug625438.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 var count = 0;
 this.watch("x", function() {
diff --git a/js/src/jit-test/tests/jaeger/bug627486.js b/js/src/jit-test/tests/jaeger/bug627486.js
index f87d27e18a47..7acc3b01e957 100644
--- a/js/src/jit-test/tests/jaeger/bug627486.js
+++ b/js/src/jit-test/tests/jaeger/bug627486.js
@@ -1,5 +1,5 @@
 // |jit-test| error: TypeError
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 g = undefined;
 function L() { }
 
diff --git a/js/src/jit-test/tests/jaeger/floatTypedArrays.js b/js/src/jit-test/tests/jaeger/floatTypedArrays.js
index da1abe0c40ea..51ea7c0a16f6 100644
--- a/js/src/jit-test/tests/jaeger/floatTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/floatTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testFloat32Array(L) {
     var f = new Float32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js b/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
index dc5ed7b45270..8bb4627fa678 100644
--- a/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testInt32Array(L) {
     var f = new Int32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js b/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
index 3ed2f2bcb553..c63d36bf2aea 100644
--- a/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testInt8Array(L) {
     var f = new Int8Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js b/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
index f9e7825a6378..369aa2c6fb86 100644
--- a/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
+++ b/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
@@ -1,4 +1,4 @@
-// vim: ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function A() {
     this.x = 12;
diff --git a/js/src/jit-test/tests/jaeger/testDenseCallElem.js b/js/src/jit-test/tests/jaeger/testDenseCallElem.js
index eadb77f55b9f..0301048bf31a 100644
--- a/js/src/jit-test/tests/jaeger/testDenseCallElem.js
+++ b/js/src/jit-test/tests/jaeger/testDenseCallElem.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function fillDense(a) {
 }
diff --git a/js/src/jit-test/tests/jaeger/testForOps.js b/js/src/jit-test/tests/jaeger/testForOps.js
index 5704e070de07..382f096121ff 100644
--- a/js/src/jit-test/tests/jaeger/testForOps.js
+++ b/js/src/jit-test/tests/jaeger/testForOps.js
@@ -1,5 +1,5 @@
 // |jit-test| mjitalways
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function assertObjectsEqual(obj1, obj2) {
     assertEq(obj1.a, obj2.a);
diff --git a/js/src/jit-test/tests/jaeger/testPropCallElem.js b/js/src/jit-test/tests/jaeger/testPropCallElem.js
index fd067bbf7a50..2bb97fbe64a1 100644
--- a/js/src/jit-test/tests/jaeger/testPropCallElem.js
+++ b/js/src/jit-test/tests/jaeger/testPropCallElem.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testUKeyUObject(a, key1, key2, key3) {
     a.a = function () { return this.d; }
diff --git a/js/src/jit-test/tests/jaeger/testPropCallElem2.js b/js/src/jit-test/tests/jaeger/testPropCallElem2.js
index 328193ae4b21..43f8efb0fb57 100644
--- a/js/src/jit-test/tests/jaeger/testPropCallElem2.js
+++ b/js/src/jit-test/tests/jaeger/testPropCallElem2.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testUKeyUObject(a, key1, key2, key3) {
     a.a = function () { return this.d; }
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-Easy.js b/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
index 9eb9d0688689..ed8fc7c9a9bb 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testBadSetElems(obj, key) {
     obj[key] = 5;
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js b/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
index 146092fbb5d4..01b42bd6b392 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f() {
     return [[], [], [], []];
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js b/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
index 91d71401d489..f202513d534a 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f() {
     return [[], [], [], []];
diff --git a/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js b/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
index 49ea74a8b94c..33e38dd3fc3f 100644
--- a/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
+++ b/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testSetTypedFloat32Array(k) {
     var ar = new Float32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js b/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
index bf3099c50c0f..89e943b698a7 100644
--- a/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
+++ b/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function testSetTypedInt8Array(k) {
     var ar = new Int8Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testShiftSameBacking.js b/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
index cb2ce0059b46..1cbe064d3fef 100644
--- a/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
+++ b/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
@@ -1,4 +1,4 @@
-// vim: set ts=4 sw=4 tw=99 et:
+// vim: set ts=8 sts=4 et sw=4 tw=99:
 
 function f(a) {
     var x = a;
diff --git a/js/src/jsalloc.cpp b/js/src/jsalloc.cpp
index a5ceae2a22c5..744eb68cb9d7 100644
--- a/js/src/jsalloc.cpp
+++ b/js/src/jsalloc.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsalloc.h b/js/src/jsalloc.h
index 7d76a7c701ad..7d2690b69a79 100644
--- a/js/src/jsalloc.h
+++ b/js/src/jsalloc.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index 64eec6de4443..43dd7ea25d02 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsanalyze.h b/js/src/jsanalyze.h
index 2be5bcdaf3c2..e1b60575aaed 100644
--- a/js/src/jsanalyze.h
+++ b/js/src/jsanalyze.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsapi-tests/selfTest.cpp b/js/src/jsapi-tests/selfTest.cpp
index 91f25ccce612..39202abb5720 100644
--- a/js/src/jsapi-tests/selfTest.cpp
+++ b/js/src/jsapi-tests/selfTest.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testAddPropertyPropcache.cpp b/js/src/jsapi-tests/testAddPropertyPropcache.cpp
index be190df1824c..10acaf89c2f0 100644
--- a/js/src/jsapi-tests/testAddPropertyPropcache.cpp
+++ b/js/src/jsapi-tests/testAddPropertyPropcache.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testArgumentsObject.cpp b/js/src/jsapi-tests/testArgumentsObject.cpp
index 81c79608fd73..0d34e41b2dad 100644
--- a/js/src/jsapi-tests/testArgumentsObject.cpp
+++ b/js/src/jsapi-tests/testArgumentsObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testArrayBuffer.cpp b/js/src/jsapi-tests/testArrayBuffer.cpp
index 081146c3d690..a8299a611b51 100644
--- a/js/src/jsapi-tests/testArrayBuffer.cpp
+++ b/js/src/jsapi-tests/testArrayBuffer.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 
 #include "tests.h"
diff --git a/js/src/jsapi-tests/testBug604087.cpp b/js/src/jsapi-tests/testBug604087.cpp
index c3a907a20b91..f66c702aab19 100644
--- a/js/src/jsapi-tests/testBug604087.cpp
+++ b/js/src/jsapi-tests/testBug604087.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests JS_TransplantObject
  */
diff --git a/js/src/jsapi-tests/testClassGetter.cpp b/js/src/jsapi-tests/testClassGetter.cpp
index 420ef24c4346..7b3ecb728447 100644
--- a/js/src/jsapi-tests/testClassGetter.cpp
+++ b/js/src/jsapi-tests/testClassGetter.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests the JSClass::getProperty hook
  */
diff --git a/js/src/jsapi-tests/testCloneScript.cpp b/js/src/jsapi-tests/testCloneScript.cpp
index 14e6882dd431..91ff93d76180 100644
--- a/js/src/jsapi-tests/testCloneScript.cpp
+++ b/js/src/jsapi-tests/testCloneScript.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Test script cloning.
  */
diff --git a/js/src/jsapi-tests/testContexts.cpp b/js/src/jsapi-tests/testContexts.cpp
index 1f65b462a2d0..e863a4086ee1 100644
--- a/js/src/jsapi-tests/testContexts.cpp
+++ b/js/src/jsapi-tests/testContexts.cpp
@@ -1,11 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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 "tests.h"
 
 BEGIN_TEST(testContexts_IsRunning)
diff --git a/js/src/jsapi-tests/testDebugger.cpp b/js/src/jsapi-tests/testDebugger.cpp
index 586a24da62ba..577fffa08129 100644
--- a/js/src/jsapi-tests/testDebugger.cpp
+++ b/js/src/jsapi-tests/testDebugger.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDeepFreeze.cpp b/js/src/jsapi-tests/testDeepFreeze.cpp
index 9b95af5b0bbf..48d31f6bcaa2 100644
--- a/js/src/jsapi-tests/testDeepFreeze.cpp
+++ b/js/src/jsapi-tests/testDeepFreeze.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
index 7f07b640e842..d28c8affb58a 100644
--- a/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
+++ b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDefineProperty.cpp b/js/src/jsapi-tests/testDefineProperty.cpp
index b5617799adae..739dfafdb6c5 100644
--- a/js/src/jsapi-tests/testDefineProperty.cpp
+++ b/js/src/jsapi-tests/testDefineProperty.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testEnclosingFunction.cpp b/js/src/jsapi-tests/testEnclosingFunction.cpp
index 2549b6f181aa..0a88f6c598e1 100644
--- a/js/src/jsapi-tests/testEnclosingFunction.cpp
+++ b/js/src/jsapi-tests/testEnclosingFunction.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Test script cloning.
  */
diff --git a/js/src/jsapi-tests/testErrorCopying.cpp b/js/src/jsapi-tests/testErrorCopying.cpp
index 1923879d2763..bda243b85265 100644
--- a/js/src/jsapi-tests/testErrorCopying.cpp
+++ b/js/src/jsapi-tests/testErrorCopying.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests that the column number of error reports is properly copied over from
  * other reports when invoked from the C++ api.
diff --git a/js/src/jsapi-tests/testFindSCCs.cpp b/js/src/jsapi-tests/testFindSCCs.cpp
index 1e98800059e4..ad38b56ac036 100644
--- a/js/src/jsapi-tests/testFindSCCs.cpp
+++ b/js/src/jsapi-tests/testFindSCCs.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testFunctionProperties.cpp b/js/src/jsapi-tests/testFunctionProperties.cpp
index 9fee41561803..b70f95bcb0e0 100644
--- a/js/src/jsapi-tests/testFunctionProperties.cpp
+++ b/js/src/jsapi-tests/testFunctionProperties.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testGCOutOfMemory.cpp b/js/src/jsapi-tests/testGCOutOfMemory.cpp
index 83aa3c774f85..49e3db00f819 100644
--- a/js/src/jsapi-tests/testGCOutOfMemory.cpp
+++ b/js/src/jsapi-tests/testGCOutOfMemory.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
diff --git a/js/src/jsapi-tests/testGetPropertyDefault.cpp b/js/src/jsapi-tests/testGetPropertyDefault.cpp
index 4dc9664fb921..8aa0323d8c3e 100644
--- a/js/src/jsapi-tests/testGetPropertyDefault.cpp
+++ b/js/src/jsapi-tests/testGetPropertyDefault.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testIndexToString.cpp b/js/src/jsapi-tests/testIndexToString.cpp
index 0b59b6f0b402..998e65218614 100644
--- a/js/src/jsapi-tests/testIndexToString.cpp
+++ b/js/src/jsapi-tests/testIndexToString.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testIntString.cpp b/js/src/jsapi-tests/testIntString.cpp
index 18b3d53371e5..fc627d62430d 100644
--- a/js/src/jsapi-tests/testIntString.cpp
+++ b/js/src/jsapi-tests/testIntString.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testJSEvaluateScript.cpp b/js/src/jsapi-tests/testJSEvaluateScript.cpp
index 875ae83094be..72d92e751432 100644
--- a/js/src/jsapi-tests/testJSEvaluateScript.cpp
+++ b/js/src/jsapi-tests/testJSEvaluateScript.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 
 #include "tests.h"
diff --git a/js/src/jsapi-tests/testLookup.cpp b/js/src/jsapi-tests/testLookup.cpp
index 692ca846d5b1..74125b62cbdf 100644
--- a/js/src/jsapi-tests/testLookup.cpp
+++ b/js/src/jsapi-tests/testLookup.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testNewObject.cpp b/js/src/jsapi-tests/testNewObject.cpp
index 94b8607bb1db..03dac00c0a36 100644
--- a/js/src/jsapi-tests/testNewObject.cpp
+++ b/js/src/jsapi-tests/testNewObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testOps.cpp b/js/src/jsapi-tests/testOps.cpp
index 648493be1df0..c883439b0e39 100644
--- a/js/src/jsapi-tests/testOps.cpp
+++ b/js/src/jsapi-tests/testOps.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests for operators and implicit type conversion.
  */
diff --git a/js/src/jsapi-tests/testParseJSON.cpp b/js/src/jsapi-tests/testParseJSON.cpp
index abfe849ec214..87255505bc6f 100644
--- a/js/src/jsapi-tests/testParseJSON.cpp
+++ b/js/src/jsapi-tests/testParseJSON.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testProfileStrings.cpp b/js/src/jsapi-tests/testProfileStrings.cpp
index bf6a82ca5e85..15b265ca6fce 100644
--- a/js/src/jsapi-tests/testProfileStrings.cpp
+++ b/js/src/jsapi-tests/testProfileStrings.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Tests the stack-based instrumentation profiler on a JSRuntime
  */
diff --git a/js/src/jsapi-tests/testPropCache.cpp b/js/src/jsapi-tests/testPropCache.cpp
index 3920a1f06bfd..9c619183dc34 100644
--- a/js/src/jsapi-tests/testPropCache.cpp
+++ b/js/src/jsapi-tests/testPropCache.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
index 5fdebda8acac..717c7dccac2b 100644
--- a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
+++ b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testResolveRecursion.cpp b/js/src/jsapi-tests/testResolveRecursion.cpp
index 43d7b2d2be99..58f387e585ed 100644
--- a/js/src/jsapi-tests/testResolveRecursion.cpp
+++ b/js/src/jsapi-tests/testResolveRecursion.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testSameValue.cpp b/js/src/jsapi-tests/testSameValue.cpp
index 6f1c75b54e60..3d35df3a671b 100644
--- a/js/src/jsapi-tests/testSameValue.cpp
+++ b/js/src/jsapi-tests/testSameValue.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testScriptInfo.cpp b/js/src/jsapi-tests/testScriptInfo.cpp
index 3265ed9fc430..2fa8f29429a4 100644
--- a/js/src/jsapi-tests/testScriptInfo.cpp
+++ b/js/src/jsapi-tests/testScriptInfo.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testScriptObject.cpp b/js/src/jsapi-tests/testScriptObject.cpp
index 4075976864c7..29a522dfa857 100644
--- a/js/src/jsapi-tests/testScriptObject.cpp
+++ b/js/src/jsapi-tests/testScriptObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testSetProperty.cpp b/js/src/jsapi-tests/testSetProperty.cpp
index 598d5d24d8fa..8003c473b35a 100644
--- a/js/src/jsapi-tests/testSetProperty.cpp
+++ b/js/src/jsapi-tests/testSetProperty.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testStringBuffer.cpp b/js/src/jsapi-tests/testStringBuffer.cpp
index 51c232381d27..ebbd2dff1f61 100644
--- a/js/src/jsapi-tests/testStringBuffer.cpp
+++ b/js/src/jsapi-tests/testStringBuffer.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testTrap.cpp b/js/src/jsapi-tests/testTrap.cpp
index 3e66a388ec06..a1bde8d9d2d8 100644
--- a/js/src/jsapi-tests/testTrap.cpp
+++ b/js/src/jsapi-tests/testTrap.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testTypedArrays.cpp b/js/src/jsapi-tests/testTypedArrays.cpp
index 00ec3704e356..8aba225ac576 100644
--- a/js/src/jsapi-tests/testTypedArrays.cpp
+++ b/js/src/jsapi-tests/testTypedArrays.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testUTF8.cpp b/js/src/jsapi-tests/testUTF8.cpp
index 941177369b89..2ec6b06898ef 100644
--- a/js/src/jsapi-tests/testUTF8.cpp
+++ b/js/src/jsapi-tests/testUTF8.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testXDR.cpp b/js/src/jsapi-tests/testXDR.cpp
index e8d934a83d6d..c47d82897726 100644
--- a/js/src/jsapi-tests/testXDR.cpp
+++ b/js/src/jsapi-tests/testXDR.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/tests.cpp b/js/src/jsapi-tests/tests.cpp
index 6ce8c30b6244..30b89be2d3b8 100644
--- a/js/src/jsapi-tests/tests.cpp
+++ b/js/src/jsapi-tests/tests.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsapi-tests/tests.h b/js/src/jsapi-tests/tests.h
index e251ca981a23..d9579ef9ec50 100644
--- a/js/src/jsapi-tests/tests.h
+++ b/js/src/jsapi-tests/tests.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsapi-tests/valueABI.c b/js/src/jsapi-tests/valueABI.c
index 89a5693ee393..65b31d38c48e 100644
--- a/js/src/jsapi-tests/valueABI.c
+++ b/js/src/jsapi-tests/valueABI.c
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sw=4 et tw=99 ft=c:
- *
  * 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/. */
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 3180e7f3e55e..a506b06fb23c 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index cd4d151ca4f1..610c7f8071e6 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index d3cbcc4be99d..cf6da3726fc4 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsarray.h b/js/src/jsarray.h
index a61d7a829deb..7cb15822c18b 100644
--- a/js/src/jsarray.h
+++ b/js/src/jsarray.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index e0178dedd302..a675149a54aa 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsatom.h b/js/src/jsatom.h
index 9ff01bd6fac1..1aa15269e9d6 100644
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsatominlines.h b/js/src/jsatominlines.h
index 2d5df3d44029..421bf141b6be 100644
--- a/js/src/jsatominlines.h
+++ b/js/src/jsatominlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsbool.cpp b/js/src/jsbool.cpp
index b3a54c63c24e..1b29be168a50 100644
--- a/js/src/jsbool.cpp
+++ b/js/src/jsbool.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsbool.h b/js/src/jsbool.h
index 1676d523af87..0d847ec30514 100644
--- a/js/src/jsbool.h
+++ b/js/src/jsbool.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsboolinlines.h b/js/src/jsboolinlines.h
index 1f2b361d276e..58ed270c1966 100644
--- a/js/src/jsboolinlines.h
+++ b/js/src/jsboolinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsclass.h b/js/src/jsclass.h
index 86c0e5b86e68..a8559ea554ab 100644
--- a/js/src/jsclass.h
+++ b/js/src/jsclass.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsclist.h b/js/src/jsclist.h
index 4881104eee79..8782307fa4ab 100644
--- a/js/src/jsclist.h
+++ b/js/src/jsclist.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsclone.cpp b/js/src/jsclone.cpp
index e3b249e486eb..885bfc01a1ba 100644
--- a/js/src/jsclone.cpp
+++ b/js/src/jsclone.cpp
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsclone.h b/js/src/jsclone.h
index 5a3326152b65..595bf8f013a1 100644
--- a/js/src/jsclone.h
+++ b/js/src/jsclone.h
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 2190cf5be7ae..9e36c88415c6 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index b3b0fad13626..487903125723 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 9c9a03d3b1da..58de7e00b258 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 41961c8b8b2e..2a6dc4dc4edf 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index d4fda4b68e7d..454f13137d3a 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscompartmentinlines.h b/js/src/jscompartmentinlines.h
index e9724ff9b047..c9c747b55e96 100644
--- a/js/src/jscompartmentinlines.h
+++ b/js/src/jscompartmentinlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
index 3d2022dbe292..1b7baf996f1a 100644
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscrashformat.h b/js/src/jscrashformat.h
index cf274f336018..7d3940d9f661 100644
--- a/js/src/jscrashformat.h
+++ b/js/src/jscrashformat.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscrashreport.cpp b/js/src/jscrashreport.cpp
index 6cb415aeb716..1ebac89fa44f 100644
--- a/js/src/jscrashreport.cpp
+++ b/js/src/jscrashreport.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscrashreport.h b/js/src/jscrashreport.h
index beeb76151ba1..cb2336be00d1 100644
--- a/js/src/jscrashreport.h
+++ b/js/src/jscrashreport.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index 928c4a66a8ea..666e72e3912a 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdate.h b/js/src/jsdate.h
index 514160ecd634..67c2ca067981 100644
--- a/js/src/jsdate.h
+++ b/js/src/jsdate.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index be6e447aad9c..a3ed445bd705 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdbgapi.h b/js/src/jsdbgapi.h
index e47c33a85718..d6f5b2e9db25 100644
--- a/js/src/jsdbgapi.h
+++ b/js/src/jsdbgapi.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdhash.cpp b/js/src/jsdhash.cpp
index 51b5cb5d94bd..00b0dbdbc04b 100644
--- a/js/src/jsdhash.cpp
+++ b/js/src/jsdhash.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsdhash.h b/js/src/jsdhash.h
index c8f02b18b708..1f7830fd2b1f 100644
--- a/js/src/jsdhash.h
+++ b/js/src/jsdhash.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsdtoa.cpp b/js/src/jsdtoa.cpp
index b8b57eb3f368..9d94bebaf5e9 100644
--- a/js/src/jsdtoa.cpp
+++ b/js/src/jsdtoa.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsdtoa.h b/js/src/jsdtoa.h
index c55b8277ed40..dfd5393d1090 100644
--- a/js/src/jsdtoa.h
+++ b/js/src/jsdtoa.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 21d2a3afeb9e..4ba3778e74e2 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsexn.h b/js/src/jsexn.h
index 4d14278db6f8..c7b8882bdce6 100644
--- a/js/src/jsexn.h
+++ b/js/src/jsexn.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index d2e8a0b84b12..cb69671550fe 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index a95600ac89a7..c0f4c975cb29 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 96d9eb2a4057..bbc90d477d64 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index 4fce726bc1cf..d1cf351dcbc0 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
@@ -212,7 +212,7 @@ class JSFunction : public JSObject
 
     js::RawScript getOrCreateScript(JSContext *cx) {
         JS_ASSERT(isInterpreted());
-				JS_ASSERT(cx);
+        JS_ASSERT(cx);
         if (isInterpretedLazy()) {
             JS::RootedFunction self(cx, this);
             js::MaybeCheckStackRoots(cx);
diff --git a/js/src/jsfuninlines.h b/js/src/jsfuninlines.h
index 0a0b49ad79c4..a15eb7ec3b48 100644
--- a/js/src/jsfuninlines.h
+++ b/js/src/jsfuninlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index f89147853304..7e5e0fda211c 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 6b26f57faadb..22894caf3bdf 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index a684d0636d5f..9fc17ff96585 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 508eb23b1413..75d40a8f30e7 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsinfer.h b/js/src/jsinfer.h
index 1043a9954265..2d26722ad9f7 100644
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h
index c6d29d39a7ea..c3dbb5f8f067 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 68b4c69e57b2..5e16c739dc08 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 9cbd70dbeafa..9887aa0e6db9 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=78:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index 56a513dd30bc..989cb28cb43c 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 552bdd95fb13..39e49e81b684 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsiter.h b/js/src/jsiter.h
index 3d7627384df6..6640de902901 100644
--- a/js/src/jsiter.h
+++ b/js/src/jsiter.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jskwgen.cpp b/js/src/jskwgen.cpp
index c488184603f7..c5e66707fb98 100644
--- a/js/src/jskwgen.cpp
+++ b/js/src/jskwgen.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jslibmath.h b/js/src/jslibmath.h
index 778d7f8ae1de..bcd136a1a79b 100644
--- a/js/src/jslibmath.h
+++ b/js/src/jslibmath.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jslock.h b/js/src/jslock.h
index 025aaea0af82..b4a28a9fa9c4 100644
--- a/js/src/jslock.h
+++ b/js/src/jslock.h
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+
 #ifndef jslock_h__
 #define jslock_h__
 
diff --git a/js/src/jslog2.cpp b/js/src/jslog2.cpp
index d02400721365..cee3d0d13e22 100644
--- a/js/src/jslog2.cpp
+++ b/js/src/jslog2.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
index 97f880fe98d0..424ad79ed60e 100644
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsmath.h b/js/src/jsmath.h
index 91150d809fc9..4f2a4b467eca 100644
--- a/js/src/jsmath.h
+++ b/js/src/jsmath.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsmemorymetrics.cpp b/js/src/jsmemorymetrics.cpp
index fc82601c5c17..e744b6be9d6d 100644
--- a/js/src/jsmemorymetrics.cpp
+++ b/js/src/jsmemorymetrics.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
index 9fec01d35f0d..cd301292d72d 100644
--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
@@ -1,7 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 et sw=4 tw=80:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsnativestack.h b/js/src/jsnativestack.h
index 3f823f56d22f..916bee2d0394 100644
--- a/js/src/jsnativestack.h
+++ b/js/src/jsnativestack.h
@@ -1,7 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 et sw=4 tw=80:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index 8c9dc7aff420..49e89fc124e5 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsnum.h b/js/src/jsnum.h
index 653ff12fddf0..0f765f3c616b 100644
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsnuminlines.h b/js/src/jsnuminlines.h
index c17909fdb52e..1c4dcf515d56 100644
--- a/js/src/jsnuminlines.h
+++ b/js/src/jsnuminlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index f8cb8b97e8a4..347cbbf5d1e4 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 25a8652c5ec5..a2e6a3e7deae 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 9213ae088914..20790e56c8d9 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/json.cpp b/js/src/json.cpp
index d03a8da9931f..467c3ca0b8f5 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/json.h b/js/src/json.h
index bb21f9145151..7fa2c117c804 100644
--- a/js/src/json.h
+++ b/js/src/json.h
@@ -1,4 +1,6 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsonparser.cpp b/js/src/jsonparser.cpp
index 3b4b1ebb2a8c..9c89d08b4997 100644
--- a/js/src/jsonparser.cpp
+++ b/js/src/jsonparser.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsonparser.h b/js/src/jsonparser.h
index 10c954055ff8..d8df9946b27b 100644
--- a/js/src/jsonparser.h
+++ b/js/src/jsonparser.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index aafd8bbf4b6e..2ce6dfc2c2a0 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsopcode.h b/js/src/jsopcode.h
index 1d1e17cbce46..f0ec5c580cb3 100644
--- a/js/src/jsopcode.h
+++ b/js/src/jsopcode.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsopcodeinlines.h b/js/src/jsopcodeinlines.h
index 5fd85cd891da..701be7785e5a 100644
--- a/js/src/jsopcodeinlines.h
+++ b/js/src/jsopcodeinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsoplengen.cpp b/js/src/jsoplengen.cpp
index 4bef284c5f5f..808f5ed778b9 100644
--- a/js/src/jsoplengen.cpp
+++ b/js/src/jsoplengen.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsprf.cpp b/js/src/jsprf.cpp
index 0a2ebc8e41e5..08fb08ff3fb5 100644
--- a/js/src/jsprf.cpp
+++ b/js/src/jsprf.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsprf.h b/js/src/jsprf.h
index 4c2bef91d29e..c0891f0e9e90 100644
--- a/js/src/jsprf.h
+++ b/js/src/jsprf.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsprobes.cpp b/js/src/jsprobes.cpp
index 3a103ea612b0..b2217b1b8c1f 100644
--- a/js/src/jsprobes.cpp
+++ b/js/src/jsprobes.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsprobes.h b/js/src/jsprobes.h
index 601bc5c70a03..0bd391a2b70a 100644
--- a/js/src/jsprobes.h
+++ b/js/src/jsprobes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspropertycache.cpp b/js/src/jspropertycache.cpp
index 20d074edd5f1..98a84f21df78 100644
--- a/js/src/jspropertycache.cpp
+++ b/js/src/jspropertycache.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=98:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspropertycache.h b/js/src/jspropertycache.h
index b63aff4c7026..ce0acab2c78f 100644
--- a/js/src/jspropertycache.h
+++ b/js/src/jspropertycache.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=98:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspropertycacheinlines.h b/js/src/jspropertycacheinlines.h
index 48e1a7874db7..910a9e180a74 100644
--- a/js/src/jspropertycacheinlines.h
+++ b/js/src/jspropertycacheinlines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspropertytree.cpp b/js/src/jspropertytree.cpp
index cf32bfac4e1a..6e8843821c1d 100644
--- a/js/src/jspropertytree.cpp
+++ b/js/src/jspropertytree.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jspropertytree.h b/js/src/jspropertytree.h
index 4c3fbd725a2a..d269e2937c4e 100644
--- a/js/src/jspropertytree.h
+++ b/js/src/jspropertytree.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsprototypes.h b/js/src/jsprototypes.h
index 27f5c84450b1..007d25d7204f 100644
--- a/js/src/jsprototypes.h
+++ b/js/src/jsprototypes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index dda39fda162d..df2f78af54c4 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -1,10 +1,9 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/.
- */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include <string.h>
 #include "jsapi.h"
 #include "jscntxt.h"
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index a6f7851744c8..54e91db7fa61 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsprvtd.h b/js/src/jsprvtd.h
index a131e61ba6e0..4db5ed8c36d0 100644
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index 2159dd4f6cc6..ab124ee57104 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsreflect.cpp b/js/src/jsreflect.cpp
index 16978563e9c8..e97e31344415 100644
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsreflect.h b/js/src/jsreflect.h
index b517c1bc4d90..be973527970c 100644
--- a/js/src/jsreflect.h
+++ b/js/src/jsreflect.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index c978f3d2c967..358f76c8f547 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 34cd5055602b..14c76c85bb4d 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsscriptinlines.h b/js/src/jsscriptinlines.h
index 2861ea2e5f4c..560aa44a14ab 100644
--- a/js/src/jsscriptinlines.h
+++ b/js/src/jsscriptinlines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79 ft=cpp:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 0e50cb0f7f74..bbd9401bad3f 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsstr.h b/js/src/jsstr.h
index 10ae7b2fc106..8a1d270ad720 100644
--- a/js/src/jsstr.h
+++ b/js/src/jsstr.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsstrinlines.h b/js/src/jsstrinlines.h
index 82550466197c..262a1d11a33a 100644
--- a/js/src/jsstrinlines.h
+++ b/js/src/jsstrinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 15b5c5daf67b..c09511515e8d 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h
index e38313b16299..0a7602a850c5 100644
--- a/js/src/jstypedarray.h
+++ b/js/src/jstypedarray.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jstypedarrayinlines.h b/js/src/jstypedarrayinlines.h
index 22e30038b946..952ecb100505 100644
--- a/js/src/jstypedarrayinlines.h
+++ b/js/src/jstypedarrayinlines.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jstypes.h b/js/src/jstypes.h
index c83e7fed26e3..b597cf3b987b 100644
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsutil.cpp b/js/src/jsutil.cpp
index f04077996b08..fc4341002444 100644
--- a/js/src/jsutil.cpp
+++ b/js/src/jsutil.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsutil.h b/js/src/jsutil.h
index ff77e41a8893..ed7e0989e0f7 100644
--- a/js/src/jsutil.h
+++ b/js/src/jsutil.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsversion.h b/js/src/jsversion.h
index 50e2fa6beb0b..64f2ad217675 100644
--- a/js/src/jsversion.h
+++ b/js/src/jsversion.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jswatchpoint.cpp b/js/src/jswatchpoint.cpp
index 152eb4d0f211..42b6a272bd8d 100644
--- a/js/src/jswatchpoint.cpp
+++ b/js/src/jswatchpoint.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jswatchpoint.h b/js/src/jswatchpoint.h
index 2c05f77c77f3..47179327d6df 100644
--- a/js/src/jswatchpoint.h
+++ b/js/src/jswatchpoint.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsweakcache.h b/js/src/jsweakcache.h
index bc3ac58b2c57..54d810032461 100644
--- a/js/src/jsweakcache.h
+++ b/js/src/jsweakcache.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index 5977bfca5971..8f01f6aa4ccd 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsweakmap.h b/js/src/jsweakmap.h
index 47a7f42eff72..bc130e10c6ef 100644
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jswin.h b/js/src/jswin.h
index 50b548cb8fd7..689d23810677 100644
--- a/js/src/jswin.h
+++ b/js/src/jswin.h
@@ -1,4 +1,6 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsworkers.cpp b/js/src/jsworkers.cpp
index d80ee15f3037..f6a2e279f741 100644
--- a/js/src/jsworkers.cpp
+++ b/js/src/jsworkers.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jsworkers.h b/js/src/jsworkers.h
index a3b7edafda00..89baca26d7ca 100644
--- a/js/src/jsworkers.h
+++ b/js/src/jsworkers.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 3f21082891d9..4d8aceb2cef2 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index 3e7985cb6b2a..e8423b993b23 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/BaseAssembler.h b/js/src/methodjit/BaseAssembler.h
index 7b84a48e532f..9e3af92cd4dc 100644
--- a/js/src/methodjit/BaseAssembler.h
+++ b/js/src/methodjit/BaseAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/BaseCompiler.h b/js/src/methodjit/BaseCompiler.h
index 3531ec04d773..ad3af9d3da38 100644
--- a/js/src/methodjit/BaseCompiler.h
+++ b/js/src/methodjit/BaseCompiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/CodeGenIncludes.h b/js/src/methodjit/CodeGenIncludes.h
index 23378e5e7e89..3cddee0a5638 100644
--- a/js/src/methodjit/CodeGenIncludes.h
+++ b/js/src/methodjit/CodeGenIncludes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index ef5680120c5d..b934effe95db 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Compiler.h b/js/src/methodjit/Compiler.h
index 5cafd3e298a4..9652a071c8fb 100644
--- a/js/src/methodjit/Compiler.h
+++ b/js/src/methodjit/Compiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FastArithmetic.cpp b/js/src/methodjit/FastArithmetic.cpp
index f2f6d19a1ea2..44c2361cacb3 100644
--- a/js/src/methodjit/FastArithmetic.cpp
+++ b/js/src/methodjit/FastArithmetic.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FastBuiltins.cpp b/js/src/methodjit/FastBuiltins.cpp
index 5415930e9ab2..8d907b836fbc 100644
--- a/js/src/methodjit/FastBuiltins.cpp
+++ b/js/src/methodjit/FastBuiltins.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FastOps.cpp b/js/src/methodjit/FastOps.cpp
index 45d038a9047c..4d6ec3126640 100644
--- a/js/src/methodjit/FastOps.cpp
+++ b/js/src/methodjit/FastOps.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FrameEntry.h b/js/src/methodjit/FrameEntry.h
index 53e6b0b493c0..5d3b5c38218f 100644
--- a/js/src/methodjit/FrameEntry.h
+++ b/js/src/methodjit/FrameEntry.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FrameState-inl.h b/js/src/methodjit/FrameState-inl.h
index a12867a47e38..0a4b6439c1e5 100644
--- a/js/src/methodjit/FrameState-inl.h
+++ b/js/src/methodjit/FrameState-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FrameState.cpp b/js/src/methodjit/FrameState.cpp
index bdfbf2ffbece..186fb524e86c 100644
--- a/js/src/methodjit/FrameState.cpp
+++ b/js/src/methodjit/FrameState.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/FrameState.h b/js/src/methodjit/FrameState.h
index 85f1f959d913..f568943a70c3 100644
--- a/js/src/methodjit/FrameState.h
+++ b/js/src/methodjit/FrameState.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ICChecker.h b/js/src/methodjit/ICChecker.h
index 93c4889bf992..44c06cc100e5 100644
--- a/js/src/methodjit/ICChecker.h
+++ b/js/src/methodjit/ICChecker.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ICLabels.h b/js/src/methodjit/ICLabels.h
index 4b422ff94883..8d4e8ad2106c 100644
--- a/js/src/methodjit/ICLabels.h
+++ b/js/src/methodjit/ICLabels.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ICRepatcher.h b/js/src/methodjit/ICRepatcher.h
index 79c7666b9a00..2d5ea4035caa 100644
--- a/js/src/methodjit/ICRepatcher.h
+++ b/js/src/methodjit/ICRepatcher.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ImmutableSync.cpp b/js/src/methodjit/ImmutableSync.cpp
index a763b5c0a479..7cef76bb72ff 100644
--- a/js/src/methodjit/ImmutableSync.cpp
+++ b/js/src/methodjit/ImmutableSync.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/ImmutableSync.h b/js/src/methodjit/ImmutableSync.h
index f232175db78f..bd1429efa655 100644
--- a/js/src/methodjit/ImmutableSync.h
+++ b/js/src/methodjit/ImmutableSync.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/InlineFrameAssembler.h b/js/src/methodjit/InlineFrameAssembler.h
index 12d3bac8f3b6..b80bb52d24bd 100644
--- a/js/src/methodjit/InlineFrameAssembler.h
+++ b/js/src/methodjit/InlineFrameAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index c02d6db68996..582558fb60f2 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Logging.cpp b/js/src/methodjit/Logging.cpp
index 5bca55ccc240..7ecf536d8bb1 100644
--- a/js/src/methodjit/Logging.cpp
+++ b/js/src/methodjit/Logging.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Logging.h b/js/src/methodjit/Logging.h
index fff123e911ce..6825f0313695 100644
--- a/js/src/methodjit/Logging.h
+++ b/js/src/methodjit/Logging.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/LoopState.cpp b/js/src/methodjit/LoopState.cpp
index 21e65fd40865..92e9c6dffce8 100644
--- a/js/src/methodjit/LoopState.cpp
+++ b/js/src/methodjit/LoopState.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/LoopState.h b/js/src/methodjit/LoopState.h
index 6280bf2598bc..3518ba88e5eb 100644
--- a/js/src/methodjit/LoopState.h
+++ b/js/src/methodjit/LoopState.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MachineRegs.h b/js/src/methodjit/MachineRegs.h
index e355dd7b6cab..2b5d80c51600 100644
--- a/js/src/methodjit/MachineRegs.h
+++ b/js/src/methodjit/MachineRegs.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
index 94f145bf00fd..7741b59b7fa9 100644
--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MethodJIT.h b/js/src/methodjit/MethodJIT.h
index c813d1fc47f6..a60415f82e0c 100644
--- a/js/src/methodjit/MethodJIT.h
+++ b/js/src/methodjit/MethodJIT.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MonoIC.cpp b/js/src/methodjit/MonoIC.cpp
index b07bdeab577d..f633ef29d8a9 100644
--- a/js/src/methodjit/MonoIC.cpp
+++ b/js/src/methodjit/MonoIC.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/MonoIC.h b/js/src/methodjit/MonoIC.h
index 852dacc02f65..acb0acdc6aef 100644
--- a/js/src/methodjit/MonoIC.h
+++ b/js/src/methodjit/MonoIC.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/NunboxAssembler.h b/js/src/methodjit/NunboxAssembler.h
index 9d764a5f0e88..8c30afc06815 100644
--- a/js/src/methodjit/NunboxAssembler.h
+++ b/js/src/methodjit/NunboxAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp
index df176bc13de1..f76a68abdbf0 100644
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/PolyIC.h b/js/src/methodjit/PolyIC.h
index f7b4423c3f09..e17226aaeb2a 100644
--- a/js/src/methodjit/PolyIC.h
+++ b/js/src/methodjit/PolyIC.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/PunboxAssembler.h b/js/src/methodjit/PunboxAssembler.h
index 959ba595f306..7a066bd4ffc9 100644
--- a/js/src/methodjit/PunboxAssembler.h
+++ b/js/src/methodjit/PunboxAssembler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/RematInfo.h b/js/src/methodjit/RematInfo.h
index cd9ec7a2e50d..c0bdc40e3881 100644
--- a/js/src/methodjit/RematInfo.h
+++ b/js/src/methodjit/RematInfo.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Retcon.cpp b/js/src/methodjit/Retcon.cpp
index d91286108123..2479236a3a5c 100644
--- a/js/src/methodjit/Retcon.cpp
+++ b/js/src/methodjit/Retcon.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/Retcon.h b/js/src/methodjit/Retcon.h
index d4e688bf7046..8e4105644347 100644
--- a/js/src/methodjit/Retcon.h
+++ b/js/src/methodjit/Retcon.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCalls-inl.h b/js/src/methodjit/StubCalls-inl.h
index cf5903865f93..47f4725e04fa 100644
--- a/js/src/methodjit/StubCalls-inl.h
+++ b/js/src/methodjit/StubCalls-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index c9fda4f151fe..1d49c4fa0a2a 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCalls.h b/js/src/methodjit/StubCalls.h
index 23dc2420d03f..e620b37dba3d 100644
--- a/js/src/methodjit/StubCalls.h
+++ b/js/src/methodjit/StubCalls.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCompiler.cpp b/js/src/methodjit/StubCompiler.cpp
index f366d8e826ac..77754e2f60f9 100644
--- a/js/src/methodjit/StubCompiler.cpp
+++ b/js/src/methodjit/StubCompiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/StubCompiler.h b/js/src/methodjit/StubCompiler.h
index e2a0d49c4e03..be3b4b97c021 100644
--- a/js/src/methodjit/StubCompiler.h
+++ b/js/src/methodjit/StubCompiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/TrampolineCompiler.cpp b/js/src/methodjit/TrampolineCompiler.cpp
index 81478f2d8891..4860a7ecb522 100644
--- a/js/src/methodjit/TrampolineCompiler.cpp
+++ b/js/src/methodjit/TrampolineCompiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/TrampolineCompiler.h b/js/src/methodjit/TrampolineCompiler.h
index 11e118be78fe..e3d4a6e8bffc 100644
--- a/js/src/methodjit/TrampolineCompiler.h
+++ b/js/src/methodjit/TrampolineCompiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/TrampolineMIPS.cpp b/js/src/methodjit/TrampolineMIPS.cpp
index 7be2e42d01a3..4da001eda725 100644
--- a/js/src/methodjit/TrampolineMIPS.cpp
+++ b/js/src/methodjit/TrampolineMIPS.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/methodjit/TypedArrayIC.h b/js/src/methodjit/TypedArrayIC.h
index aa86cb2f8ead..16deeb770adb 100644
--- a/js/src/methodjit/TypedArrayIC.h
+++ b/js/src/methodjit/TypedArrayIC.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/perf/jsperf.cpp b/js/src/perf/jsperf.cpp
index 098361a964a4..b153e0a61d2f 100644
--- a/js/src/perf/jsperf.cpp
+++ b/js/src/perf/jsperf.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/jsperf.h b/js/src/perf/jsperf.h
index 265478c33ebb..aaf513342736 100644
--- a/js/src/perf/jsperf.h
+++ b/js/src/perf/jsperf.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/pm_linux.cpp b/js/src/perf/pm_linux.cpp
index 3156354bdff7..de5675eff5e9 100644
--- a/js/src/perf/pm_linux.cpp
+++ b/js/src/perf/pm_linux.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/pm_stub.cpp b/js/src/perf/pm_stub.cpp
index 4af53cb1250f..cf82288f093c 100644
--- a/js/src/perf/pm_stub.cpp
+++ b/js/src/perf/pm_stub.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/prmjtime.cpp b/js/src/prmjtime.cpp
index a5bb6478220b..4fa2ae2359ff 100644
--- a/js/src/prmjtime.cpp
+++ b/js/src/prmjtime.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/prmjtime.h b/js/src/prmjtime.h
index e7b13c35d4a0..30ee7c080b99 100644
--- a/js/src/prmjtime.h
+++ b/js/src/prmjtime.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 68f0c08168de..32608379f44c 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/jsheaptools.cpp b/js/src/shell/jsheaptools.cpp
index 4cae34a43cf5..e5d38ba1538c 100644
--- a/js/src/shell/jsheaptools.cpp
+++ b/js/src/shell/jsheaptools.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/jsheaptools.h b/js/src/shell/jsheaptools.h
index 55e12ab39ffc..326102668a2c 100644
--- a/js/src/shell/jsheaptools.h
+++ b/js/src/shell/jsheaptools.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp
index 1a54690de8c8..0556b747eb76 100644
--- a/js/src/shell/jsoptparse.cpp
+++ b/js/src/shell/jsoptparse.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/shell/jsoptparse.h b/js/src/shell/jsoptparse.h
index 7e2ef72e994a..9e52cb97871a 100644
--- a/js/src/shell/jsoptparse.h
+++ b/js/src/shell/jsoptparse.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/tests/ecma_2/Exceptions/exception-010-n.js b/js/src/tests/ecma_2/Exceptions/exception-010-n.js
index 95f5ef725d3d..51931804e4ca 100644
--- a/js/src/tests/ecma_2/Exceptions/exception-010-n.js
+++ b/js/src/tests/ecma_2/Exceptions/exception-010-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_2/Exceptions/exception-011-n.js b/js/src/tests/ecma_2/Exceptions/exception-011-n.js
index 533765a69f28..dc08346ca9a1 100644
--- a/js/src/tests/ecma_2/Exceptions/exception-011-n.js
+++ b/js/src/tests/ecma_2/Exceptions/exception-011-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js b/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
index f19fce62e90f..932f51ab804e 100644
--- a/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
+++ b/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Exceptions/regress-58946.js b/js/src/tests/ecma_3/Exceptions/regress-58946.js
index c961e5ab739a..1147fdd633d6 100644
--- a/js/src/tests/ecma_3/Exceptions/regress-58946.js
+++ b/js/src/tests/ecma_3/Exceptions/regress-58946.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
index 3f8b6a84778f..5352534a3f38 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
index 1e6b115a61b2..97ec349a0e59 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js b/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
index 41ae113c9123..1a6cb1a21ddc 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-001-n.js b/js/src/tests/ecma_3/FunExpr/fe-001-n.js
index 55c57212ec40..d1f9c3e49545 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-001-n.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-001-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-001.js b/js/src/tests/ecma_3/FunExpr/fe-001.js
index a68d6e10aa12..f80f34e2e8c4 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-001.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-001.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-002.js b/js/src/tests/ecma_3/FunExpr/fe-002.js
index 9ee5bfbaf250..5619fbbb65da 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-002.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-002.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/NumberFormatting/tostring-001.js b/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
index 49915472953e..8634f53dd4f7 100644
--- a/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
+++ b/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/RegExp/regress-24712.js b/js/src/tests/ecma_3/RegExp/regress-24712.js
index dfaded2661f0..d675f6a3c184 100644
--- a/js/src/tests/ecma_3/RegExp/regress-24712.js
+++ b/js/src/tests/ecma_3/RegExp/regress-24712.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/RegExp/regress-28686.js b/js/src/tests/ecma_3/RegExp/regress-28686.js
index 669455ba6893..1e3871f1968c 100644
--- a/js/src/tests/ecma_3/RegExp/regress-28686.js
+++ b/js/src/tests/ecma_3/RegExp/regress-28686.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-001-n.js b/js/src/tests/ecma_3/Unicode/uc-001-n.js
index 80dc1a782939..566c7459f5a7 100644
--- a/js/src/tests/ecma_3/Unicode/uc-001-n.js
+++ b/js/src/tests/ecma_3/Unicode/uc-001-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-001.js b/js/src/tests/ecma_3/Unicode/uc-001.js
index 2a81693d5ff1..bfb8fd515ef4 100644
--- a/js/src/tests/ecma_3/Unicode/uc-001.js
+++ b/js/src/tests/ecma_3/Unicode/uc-001.js
@@ -1,6 +1,5 @@
 // |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-002-n.js b/js/src/tests/ecma_3/Unicode/uc-002-n.js
index 6d673f88b983..ca09090d6304 100644
--- a/js/src/tests/ecma_3/Unicode/uc-002-n.js
+++ b/js/src/tests/ecma_3/Unicode/uc-002-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-002.js b/js/src/tests/ecma_3/Unicode/uc-002.js
index 93d78b9ebb70..1ff15d3769ab 100644
--- a/js/src/tests/ecma_3/Unicode/uc-002.js
+++ b/js/src/tests/ecma_3/Unicode/uc-002.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-003.js b/js/src/tests/ecma_3/Unicode/uc-003.js
index f77b3b9dcea0..d06815cf941a 100644
--- a/js/src/tests/ecma_3/Unicode/uc-003.js
+++ b/js/src/tests/ecma_3/Unicode/uc-003.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-004.js b/js/src/tests/ecma_3/Unicode/uc-004.js
index a82eb3528c37..5d243d56de3f 100644
--- a/js/src/tests/ecma_3/Unicode/uc-004.js
+++ b/js/src/tests/ecma_3/Unicode/uc-004.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/Exceptions/catchguard-002-n.js b/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
index 08b9f52d499a..fbbcecd3bc99 100644
--- a/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
+++ b/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/Exceptions/catchguard-003-n.js b/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
index c768f1f046f8..0d4e1767e5e4 100644
--- a/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
+++ b/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/GetSet/getset-002.js b/js/src/tests/js1_5/GetSet/getset-002.js
index 114a282fb778..d2a5c2218024 100644
--- a/js/src/tests/js1_5/GetSet/getset-002.js
+++ b/js/src/tests/js1_5/GetSet/getset-002.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-001-n.js b/js/src/tests/js1_5/extensions/catchguard-001-n.js
index 8d357fd39ac4..8e0a5ad7feee 100644
--- a/js/src/tests/js1_5/extensions/catchguard-001-n.js
+++ b/js/src/tests/js1_5/extensions/catchguard-001-n.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-001.js b/js/src/tests/js1_5/extensions/catchguard-001.js
index c1e447f105f4..da531a13ec3b 100644
--- a/js/src/tests/js1_5/extensions/catchguard-001.js
+++ b/js/src/tests/js1_5/extensions/catchguard-001.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-002.js b/js/src/tests/js1_5/extensions/catchguard-002.js
index 8148ca45e455..da590140236a 100644
--- a/js/src/tests/js1_5/extensions/catchguard-002.js
+++ b/js/src/tests/js1_5/extensions/catchguard-002.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-003.js b/js/src/tests/js1_5/extensions/catchguard-003.js
index 9e64f89d23ed..97f2cbfea310 100644
--- a/js/src/tests/js1_5/extensions/catchguard-003.js
+++ b/js/src/tests/js1_5/extensions/catchguard-003.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/getset-001.js b/js/src/tests/js1_5/extensions/getset-001.js
index 2e6b9488dab5..2609f359aa9c 100644
--- a/js/src/tests/js1_5/extensions/getset-001.js
+++ b/js/src/tests/js1_5/extensions/getset-001.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/regress-50447-1.js b/js/src/tests/js1_5/extensions/regress-50447-1.js
index 55ca6aca7f00..96d801b128d8 100644
--- a/js/src/tests/js1_5/extensions/regress-50447-1.js
+++ b/js/src/tests/js1_5/extensions/regress-50447-1.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/regress-50447.js b/js/src/tests/js1_5/extensions/regress-50447.js
index 1621d5576395..32044a8edc4e 100644
--- a/js/src/tests/js1_5/extensions/regress-50447.js
+++ b/js/src/tests/js1_5/extensions/regress-50447.js
@@ -1,6 +1,5 @@
 // |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_6/shell.js b/js/src/tests/js1_6/shell.js
index d378e171db67..a5bfae873392 100644
--- a/js/src/tests/js1_6/shell.js
+++ b/js/src/tests/js1_6/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_7/shell.js b/js/src/tests/js1_7/shell.js
index 13cf0022e7a7..9c935544e6ca 100644
--- a/js/src/tests/js1_7/shell.js
+++ b/js/src/tests/js1_7/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_8/shell.js b/js/src/tests/js1_8/shell.js
index d61c2d6a07b9..934ae1489d02 100644
--- a/js/src/tests/js1_8/shell.js
+++ b/js/src/tests/js1_8/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/js1_8_1/shell.js b/js/src/tests/js1_8_1/shell.js
index d8fe725b7444..f4eadfbb411d 100644
--- a/js/src/tests/js1_8_1/shell.js
+++ b/js/src/tests/js1_8_1/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
  * 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/. */
diff --git a/js/src/tests/shell.js b/js/src/tests/shell.js
index 08abb3bb518e..c2d42e4e6fd3 100644
--- a/js/src/tests/shell.js
+++ b/js/src/tests/shell.js
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject-inl.h b/js/src/vm/ArgumentsObject-inl.h
index b94c1de19f4e..c442eda6e559 100644
--- a/js/src/vm/ArgumentsObject-inl.h
+++ b/js/src/vm/ArgumentsObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index f53e0d639d31..b7598bab1aaf 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index 162ceeea73e4..fbb70f0b84f4 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/BooleanObject-inl.h b/js/src/vm/BooleanObject-inl.h
index c36e75d05111..b84171b8eb1d 100644
--- a/js/src/vm/BooleanObject-inl.h
+++ b/js/src/vm/BooleanObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/BooleanObject.h b/js/src/vm/BooleanObject.h
index 0df94da2cf86..3892a404e19e 100644
--- a/js/src/vm/BooleanObject.h
+++ b/js/src/vm/BooleanObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/CharacterEncoding.cpp b/js/src/vm/CharacterEncoding.cpp
index 96d94d86cb19..79266f4fd4db 100644
--- a/js/src/vm/CharacterEncoding.cpp
+++ b/js/src/vm/CharacterEncoding.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index 2f363a4a0d51..48acbbbcbbb8 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp
index 4bf194cf7add..9c839c7ef156 100644
--- a/js/src/vm/DateTime.cpp
+++ b/js/src/vm/DateTime.cpp
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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 "DateTime.h"
 
diff --git a/js/src/vm/DateTime.h b/js/src/vm/DateTime.h
index 4dff3186439e..3d006a8f7654 100644
--- a/js/src/vm/DateTime.h
+++ b/js/src/vm/DateTime.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef DateTime_h___
 #define DateTime_h___
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index a2d6598cfb2d..cd8d5e7cf4f8 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index cda35fb0d7d8..69c5230ce203 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ForkJoin.cpp b/js/src/vm/ForkJoin.cpp
index 6c654568eeeb..f636cbae1a21 100644
--- a/js/src/vm/ForkJoin.cpp
+++ b/js/src/vm/ForkJoin.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ForkJoin.h b/js/src/vm/ForkJoin.h
index 1b89efdc4377..a5c244310e73 100644
--- a/js/src/vm/ForkJoin.h
+++ b/js/src/vm/ForkJoin.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/GlobalObject-inl.h b/js/src/vm/GlobalObject-inl.h
index 9797cfd3918b..06d103aee0f1 100644
--- a/js/src/vm/GlobalObject-inl.h
+++ b/js/src/vm/GlobalObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index b6716c25683e..7e329bda043a 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/GlobalObject.h b/js/src/vm/GlobalObject.h
index 783d4fdf18c7..3886b133c09b 100644
--- a/js/src/vm/GlobalObject.h
+++ b/js/src/vm/GlobalObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Keywords.h b/js/src/vm/Keywords.h
index 0f0409a2e150..cc2d5dbc982e 100644
--- a/js/src/vm/Keywords.h
+++ b/js/src/vm/Keywords.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/MatchPairs.h b/js/src/vm/MatchPairs.h
index 8fd9320dab85..1018d7d67b33 100644
--- a/js/src/vm/MatchPairs.h
+++ b/js/src/vm/MatchPairs.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Monitor.cpp b/js/src/vm/Monitor.cpp
index 0cd21ae23443..f92ee48dc477 100644
--- a/js/src/vm/Monitor.cpp
+++ b/js/src/vm/Monitor.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Monitor.h b/js/src/vm/Monitor.h
index e13f138ce939..9b0144586bde 100644
--- a/js/src/vm/Monitor.h
+++ b/js/src/vm/Monitor.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/NumberObject-inl.h b/js/src/vm/NumberObject-inl.h
index e2822f9cc375..651cb93d6ddd 100644
--- a/js/src/vm/NumberObject-inl.h
+++ b/js/src/vm/NumberObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/NumberObject.h b/js/src/vm/NumberObject.h
index dc0ab3bdea74..48ee6383da35 100644
--- a/js/src/vm/NumberObject.h
+++ b/js/src/vm/NumberObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
index 42e69d63dd75..674df8cb58c0 100644
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef NumericConversions_h___
 #define NumericConversions_h___
diff --git a/js/src/vm/ObjectImpl-inl.h b/js/src/vm/ObjectImpl-inl.h
index 8423dacb09ad..a4048fac745a 100644
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/ObjectImpl-inl.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef ObjectImpl_inl_h___
 #define ObjectImpl_inl_h___
diff --git a/js/src/vm/ObjectImpl.cpp b/js/src/vm/ObjectImpl.cpp
index c009fc680b5e..7375b3da6419 100644
--- a/js/src/vm/ObjectImpl.cpp
+++ b/js/src/vm/ObjectImpl.cpp
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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 "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
diff --git a/js/src/vm/ObjectImpl.h b/js/src/vm/ObjectImpl.h
index d683b4380ef6..a765088b45fe 100644
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef ObjectImpl_h___
 #define ObjectImpl_h___
diff --git a/js/src/vm/ParallelDo.cpp b/js/src/vm/ParallelDo.cpp
index 6f4b63fdb064..461e5acff556 100644
--- a/js/src/vm/ParallelDo.cpp
+++ b/js/src/vm/ParallelDo.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ParallelDo.h b/js/src/vm/ParallelDo.h
index 807174528857..3188c147bd54 100644
--- a/js/src/vm/ParallelDo.h
+++ b/js/src/vm/ParallelDo.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/PropertyKey.cpp b/js/src/vm/PropertyKey.cpp
index d7ca7b371607..0935cd377c8b 100644
--- a/js/src/vm/PropertyKey.cpp
+++ b/js/src/vm/PropertyKey.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h
index d6a0f04fac13..d1f3371356d2 100644
--- a/js/src/vm/RegExpObject-inl.h
+++ b/js/src/vm/RegExpObject-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
index e5dc014b5ba6..e26bb82834be 100644
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h
index 61d329dedc73..929d7147ee06 100644
--- a/js/src/vm/RegExpObject.h
+++ b/js/src/vm/RegExpObject.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpStatics-inl.h b/js/src/vm/RegExpStatics-inl.h
index d70fdf2dccec..8b8842e40c71 100644
--- a/js/src/vm/RegExpStatics-inl.h
+++ b/js/src/vm/RegExpStatics-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpStatics.cpp b/js/src/vm/RegExpStatics.cpp
index ff4b46b514b8..662c8e68596f 100644
--- a/js/src/vm/RegExpStatics.cpp
+++ b/js/src/vm/RegExpStatics.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/RegExpStatics.h b/js/src/vm/RegExpStatics.h
index 9a7a84e934da..422424f91a0a 100644
--- a/js/src/vm/RegExpStatics.h
+++ b/js/src/vm/RegExpStatics.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/SPSProfiler.cpp b/js/src/vm/SPSProfiler.cpp
index 8e44d71ca853..d39903b61960 100644
--- a/js/src/vm/SPSProfiler.cpp
+++ b/js/src/vm/SPSProfiler.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/SPSProfiler.h b/js/src/vm/SPSProfiler.h
index 80c6b09e6baf..16defd8a6f94 100644
--- a/js/src/vm/SPSProfiler.h
+++ b/js/src/vm/SPSProfiler.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ScopeObject-inl.h b/js/src/vm/ScopeObject-inl.h
index 63daedcba784..d85c8879ac26 100644
--- a/js/src/vm/ScopeObject-inl.h
+++ b/js/src/vm/ScopeObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index d101aaf222c4..e9fffddbb290 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 6; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ScopeObject.h b/js/src/vm/ScopeObject.h
index fdb9303803e9..b9cb94f584eb 100644
--- a/js/src/vm/ScopeObject.h
+++ b/js/src/vm/ScopeObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index a6aa8f4f0212..356fec739a0d 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Shape-inl.h b/js/src/vm/Shape-inl.h
index b0d0ab45f502..2abc80cfaa94 100644
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/vm/Shape.cpp b/js/src/vm/Shape.cpp
index 8e3c7996f461..674e67958f74 100644
--- a/js/src/vm/Shape.cpp
+++ b/js/src/vm/Shape.cpp
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
index 46ed68612c14..73986fa1294c 100644
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Stack-inl.h b/js/src/vm/Stack-inl.h
index 4d77179b9a29..a925de1e4e9c 100644
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 5780e66b656c..2bd273a71dae 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index e10c627d5f22..e197fc03fcec 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/String-inl.h b/js/src/vm/String-inl.h
index 7be763b696d9..981a9651b55d 100644
--- a/js/src/vm/String-inl.h
+++ b/js/src/vm/String-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/String.cpp b/js/src/vm/String.cpp
index d6d550fd40bf..1bb9b86c641f 100644
--- a/js/src/vm/String.cpp
+++ b/js/src/vm/String.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/String.h b/js/src/vm/String.h
index 9fd5899cd988..e7769c0e4ec9 100644
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=79 ft=cpp:
- *
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/StringBuffer.cpp b/js/src/vm/StringBuffer.cpp
index 459571a70dc6..1ecc31c7f046 100644
--- a/js/src/vm/StringBuffer.cpp
+++ b/js/src/vm/StringBuffer.cpp
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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 "vm/StringBuffer.h"
 
diff --git a/js/src/vm/StringBuffer.h b/js/src/vm/StringBuffer.h
index 7706e83032dd..92ab4f8c6eeb 100644
--- a/js/src/vm/StringBuffer.h
+++ b/js/src/vm/StringBuffer.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
+ * 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/. */
 
 #ifndef StringBuffer_h___
 #define StringBuffer_h___
diff --git a/js/src/vm/StringObject-inl.h b/js/src/vm/StringObject-inl.h
index 0940081d9e0e..b1b01bbdddc3 100644
--- a/js/src/vm/StringObject-inl.h
+++ b/js/src/vm/StringObject-inl.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/StringObject.h b/js/src/vm/StringObject.h
index 75446443365c..59510956a0e6 100644
--- a/js/src/vm/StringObject.h
+++ b/js/src/vm/StringObject.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/ThreadPool.cpp b/js/src/vm/ThreadPool.cpp
index 7eee4965cc11..754ad507d2cd 100644
--- a/js/src/vm/ThreadPool.cpp
+++ b/js/src/vm/ThreadPool.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vim: set ts=4 sw=4 et tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/vm/ThreadPool.h b/js/src/vm/ThreadPool.h
index 901894137ad8..75698d526ad5 100644
--- a/js/src/vm/ThreadPool.h
+++ b/js/src/vm/ThreadPool.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Unicode.h b/js/src/vm/Unicode.h
index a83a0925de36..27fde7a60373 100644
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -1,4 +1,6 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 
diff --git a/js/src/vm/Xdr.cpp b/js/src/vm/Xdr.cpp
index 34fc4b6b0668..d248926f9cca 100644
--- a/js/src/vm/Xdr.cpp
+++ b/js/src/vm/Xdr.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index 3ad573a6de0f..46a00ba9de51 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/yarr/ASCIICType.h b/js/src/yarr/ASCIICType.h
index a3ae9f4455e2..2082b758bc56 100644
--- a/js/src/yarr/ASCIICType.h
+++ b/js/src/yarr/ASCIICType.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/BumpPointerAllocator.h b/js/src/yarr/BumpPointerAllocator.h
index 6d23a684831e..a43a5d8ba2d4 100644
--- a/js/src/yarr/BumpPointerAllocator.h
+++ b/js/src/yarr/BumpPointerAllocator.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/CheckedArithmetic.h b/js/src/yarr/CheckedArithmetic.h
index 0f60971d0f1f..21aa188bd969 100644
--- a/js/src/yarr/CheckedArithmetic.h
+++ b/js/src/yarr/CheckedArithmetic.h
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/MatchResult.h b/js/src/yarr/MatchResult.h
index e28ac4bbf42f..4ebc936779d5 100644
--- a/js/src/yarr/MatchResult.h
+++ b/js/src/yarr/MatchResult.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/OSAllocator.h b/js/src/yarr/OSAllocator.h
index ecfdc3b042ec..c8b815b52d2e 100644
--- a/js/src/yarr/OSAllocator.h
+++ b/js/src/yarr/OSAllocator.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorOS2.cpp b/js/src/yarr/OSAllocatorOS2.cpp
index ead003084dd1..466b9e949d81 100644
--- a/js/src/yarr/OSAllocatorOS2.cpp
+++ b/js/src/yarr/OSAllocatorOS2.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorPosix.cpp b/js/src/yarr/OSAllocatorPosix.cpp
index 99bf061467ca..013b6af0771a 100644
--- a/js/src/yarr/OSAllocatorPosix.cpp
+++ b/js/src/yarr/OSAllocatorPosix.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorWin.cpp b/js/src/yarr/OSAllocatorWin.cpp
index 08df9e98aefb..a5d5fa7db823 100644
--- a/js/src/yarr/OSAllocatorWin.cpp
+++ b/js/src/yarr/OSAllocatorWin.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageAllocation.h b/js/src/yarr/PageAllocation.h
index a86f37116e50..42a57f6ae5fe 100644
--- a/js/src/yarr/PageAllocation.h
+++ b/js/src/yarr/PageAllocation.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageBlock.cpp b/js/src/yarr/PageBlock.cpp
index 047172d6476f..0ffc1bc95157 100644
--- a/js/src/yarr/PageBlock.cpp
+++ b/js/src/yarr/PageBlock.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageBlock.h b/js/src/yarr/PageBlock.h
index 145bb0a8d63a..ea98f42f2237 100644
--- a/js/src/yarr/PageBlock.h
+++ b/js/src/yarr/PageBlock.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/VMTags.h b/js/src/yarr/VMTags.h
index fe6a006d3601..f44136907fe7 100644
--- a/js/src/yarr/VMTags.h
+++ b/js/src/yarr/VMTags.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/Yarr.h b/js/src/yarr/Yarr.h
index 110ae4124bed..da9a0ec70f33 100644
--- a/js/src/yarr/Yarr.h
+++ b/js/src/yarr/Yarr.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
  * All rights reserved.
diff --git a/js/src/yarr/YarrCanonicalizeUCS2.cpp b/js/src/yarr/YarrCanonicalizeUCS2.cpp
index ce3a372a6a63..e6d334212fd3 100644
--- a/js/src/yarr/YarrCanonicalizeUCS2.cpp
+++ b/js/src/yarr/YarrCanonicalizeUCS2.cpp
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrCanonicalizeUCS2.h b/js/src/yarr/YarrCanonicalizeUCS2.h
index 735064ac803b..874af40e8693 100644
--- a/js/src/yarr/YarrCanonicalizeUCS2.h
+++ b/js/src/yarr/YarrCanonicalizeUCS2.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrInterpreter.cpp b/js/src/yarr/YarrInterpreter.cpp
index 296e7d5c9559..176fa381ac6e 100644
--- a/js/src/yarr/YarrInterpreter.cpp
+++ b/js/src/yarr/YarrInterpreter.cpp
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
  *
diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
index ae40fa7d1cac..0a3da2fbb1c9 100644
--- a/js/src/yarr/YarrInterpreter.h
+++ b/js/src/yarr/YarrInterpreter.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrJIT.cpp b/js/src/yarr/YarrJIT.cpp
index 225933ff5a5a..d570f4697d42 100644
--- a/js/src/yarr/YarrJIT.cpp
+++ b/js/src/yarr/YarrJIT.cpp
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrJIT.h b/js/src/yarr/YarrJIT.h
index fad19adfdf44..b4c03b7e9b23 100644
--- a/js/src/yarr/YarrJIT.h
+++ b/js/src/yarr/YarrJIT.h
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrParser.h b/js/src/yarr/YarrParser.h
index f5d1aca6095c..7cbeea0f010d 100644
--- a/js/src/yarr/YarrParser.h
+++ b/js/src/yarr/YarrParser.h
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrPattern.cpp b/js/src/yarr/YarrPattern.cpp
index f091b984884c..3de728032c18 100644
--- a/js/src/yarr/YarrPattern.cpp
+++ b/js/src/yarr/YarrPattern.cpp
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h
index 737de608199f..3baaf5369ed1 100644
--- a/js/src/yarr/YarrPattern.h
+++ b/js/src/yarr/YarrPattern.h
@@ -1,4 +1,5 @@
-/* vim: set ts=4 sw=4 tw=99 et:
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
diff --git a/js/src/yarr/YarrSyntaxChecker.cpp b/js/src/yarr/YarrSyntaxChecker.cpp
index 34fb5010cfc9..bd4b8dc05025 100644
--- a/js/src/yarr/YarrSyntaxChecker.cpp
+++ b/js/src/yarr/YarrSyntaxChecker.cpp
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrSyntaxChecker.h b/js/src/yarr/YarrSyntaxChecker.h
index b6848e752681..e42d8afa8184 100644
--- a/js/src/yarr/YarrSyntaxChecker.h
+++ b/js/src/yarr/YarrSyntaxChecker.h
@@ -1,4 +1,6 @@
-/*
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h
index a7646b87ea34..890b269355f0 100644
--- a/js/src/yarr/wtfbridge.h
+++ b/js/src/yarr/wtfbridge.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99 ft=cpp: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * 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/. */
 

From 040ed30c64ce4775432d973ea6701bef6aa8f726 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 15 Apr 2013 14:41:46 -0400
Subject: [PATCH 179/438] Bug 748495 - Don't call setCSSViewport unnecessarily.
 r=Cwiiis

---
 mobile/android/chrome/content/browser.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 93f4b921f803..f0a85a37c626 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3567,7 +3567,12 @@ Tab.prototype = {
   },
 
   setBrowserSize: function(aWidth, aHeight) {
+    if (Math.abs(this.browserWidth - aWidth) < 1e-6 && Math.abs(this.browserHeight - aHeight) < 1e-6) {
+      return;
+    }
+
     this.browserWidth = aWidth;
+    this.browserHeight = aHeight;
 
     if (!this.browser.contentWindow)
       return;

From e021e62e302e86fdcdbe360e9e78070bbb13f08e Mon Sep 17 00:00:00 2001
From: David Keeler <dkeeler@mozilla.com>
Date: Mon, 15 Apr 2013 11:51:52 -0700
Subject: [PATCH 180/438] bug 847621 - follow-up to fix SOURCE url r=bsmith
 DONTBUILD because NPOTB

---
 security/manager/tools/getHSTSPreloadList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/manager/tools/getHSTSPreloadList.js b/security/manager/tools/getHSTSPreloadList.js
index eafdee090d18..53f945bd41bb 100644
--- a/security/manager/tools/getHSTSPreloadList.js
+++ b/security/manager/tools/getHSTSPreloadList.js
@@ -30,7 +30,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource:///modules/XPCOMUtils.jsm");
 
-const SOURCE = "https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_security_state_static.json";
+const SOURCE = "https://src.chromium.org/chrome/trunk/src/net/http/transport_security_state_static.json";
 const OUTPUT = "nsSTSPreloadList.inc";
 const ERROR_OUTPUT = "nsSTSPreloadList.errors";
 const MINIMUM_REQUIRED_MAX_AGE = 60 * 60 * 24 * 7 * 18;

From 2c149ba1b68c7a5d80c33009a2f3151a61328c0a Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 15 Apr 2013 12:22:31 -0700
Subject: [PATCH 181/438] Back out e6f337d218b4 (bug 768288) for bug648747.js
 jit-test failures CLOSED TREE

---
 js/src/ion/IonBuilder.cpp | 89 ++++++++++++---------------------------
 js/src/ion/TypeOracle.cpp |  6 +++
 js/src/jsanalyze.cpp      |  2 +-
 js/src/jsscript.cpp       |  1 -
 js/src/jsscript.h         | 28 ++----------
 5 files changed, 36 insertions(+), 90 deletions(-)

diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index cf372aa04ddb..8a4b4f8f8974 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -202,8 +202,7 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     RootedScript inlineScript(cx, target->nonLazyScript());
     ExecutionMode executionMode = info().executionMode();
     if (!CanIonCompile(inlineScript, executionMode)) {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to disable Ion compilation",
-                                  inlineScript->filename(), inlineScript->lineno);
+        IonSpew(IonSpew_Inlining, "Cannot inline due to disable Ion compilation");
         return false;
     }
 
@@ -212,8 +211,7 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         ion::IsBaselineEnabled(cx) &&
         !inlineScript->hasBaselineScript())
     {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline target with no baseline jitcode",
-                                  inlineScript->filename(), inlineScript->lineno);
+        IonSpew(IonSpew_Inlining, "Cannot inline target with no baseline jitcode");
         return false;
     }
 
@@ -221,8 +219,7 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     IonBuilder *builder = callerBuilder_;
     while (builder) {
         if (builder->script() == inlineScript) {
-            IonSpew(IonSpew_Inlining, "%s:%d Not inlining recursive call",
-                                       inlineScript->filename(), inlineScript->lineno);
+            IonSpew(IonSpew_Inlining, "Not inlining recursive call");
             return false;
         }
         builder = builder->callerBuilder_;
@@ -231,15 +228,12 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     RootedScript callerScript(cx, script());
 
     if (!oracle->canEnterInlinedFunction(target)) {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to oracle veto %d",
-                                  inlineScript->filename(), inlineScript->lineno,
-                                  script()->lineno);
+        IonSpew(IonSpew_Inlining, "Cannot inline due to oracle veto %d", script()->lineno);
         return false;
     }
 
     if (!oracle->callReturnTypeSetMatches(callerScript, pc, target)) {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to return typeset mismatch",
-                                  inlineScript->filename(), inlineScript->lineno);
+        IonSpew(IonSpew_Inlining, "Cannot inline due to return typeset mismatch");
         return false;
     }
 
@@ -248,8 +242,7 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         // For constructing calls the typeset of caller should intersect the callee's typeset.
         // Except for the |this| type, because that is created during execution depending on target.
         if (!oracle->callArgsTypeSetIntersects(NULL, callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
-                                      inlineScript->filename(), inlineScript->lineno);
+            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
             return false;
         }
     } else if (JSOp(*pc) == JSOP_FUNAPPLY) {
@@ -258,25 +251,18 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         // of fun.apply. Seeing a new type will only be noticed in the inlined call and
         // result in missed types in TI.
         if (!oracle->callArgsTypeSetMatches(callInfo.thisType(), callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
-                                       inlineScript->filename(), inlineScript->lineno);
+            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
             return false;
         }
     } else {
         // For normal calls the typeset of caller should intersect the callee's typeset.
         if (!oracle->callArgsTypeSetIntersects(callInfo.thisType(), callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
-                                      inlineScript->filename(), inlineScript->lineno);
+            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
             return false;
         }
     }
 
-    if (inlineScript->hasIonScript() && inlineScript->ionScript()->bailoutExpected()) {
-        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to known bailing script",
-                                  inlineScript->filename(), inlineScript->lineno);
-        return false;
-    }
-
+    IonSpew(IonSpew_Inlining, "Inlining good to go!");
     return true;
 }
 
@@ -3239,17 +3225,24 @@ IonBuilder::makeInliningDecision(JSFunction *target, CallInfo &callInfo)
 
     // Heuristics!
 
-    IonBuilder *baseBuilder = this;
-    while (baseBuilder->callerBuilder_)
-        baseBuilder = baseBuilder->callerBuilder_;
+    // Cap the inlining depth.
+    if (IsSmallFunction(targetScript)) {
+        if (inliningDepth_ >= js_IonOptions.smallFunctionMaxInlineDepth) {
+            IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding allowed inline depth",
+                                      targetScript->filename(), targetScript->lineno);
+            return false;
+        }
+    } else {
+        if (inliningDepth_ >= js_IonOptions.maxInlineDepth) {
+            IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding allowed inline depth",
+                                      targetScript->filename(), targetScript->lineno);
+            return false;
+        }
+     }
 
-    // When caller is excessively large only inline small functions.
-    if (script()->length > js_IonOptions.inlineMaxTotalBytecodeLength &&
-        !IsSmallFunction(targetScript)) {
-        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: caller excessively large.",
-                                  targetScript->filename(), targetScript->lineno);
-        return false;
-    }
+    // Always inline the empty script up to the inlining depth.
+    if (targetScript->length == 1)
+        return true;
 
     // Callee must not be excessively large.
     // This heuristic also applies to the callsite as a whole.
@@ -3274,36 +3267,6 @@ IonBuilder::makeInliningDecision(JSFunction *target, CallInfo &callInfo)
         return false;
     }
 
-    // Cap the inlining depth.
-    uint32_t scriptMaxInlineDepth = targetScript->maxInlineDepth();
-    uint32_t globalMaxInlineDepth = js_IonOptions.maxInlineDepth;
-    if (IsSmallFunction(targetScript))
-        globalMaxInlineDepth = js_IonOptions.smallFunctionMaxInlineDepth;
-
-    // Cap the global inline depth.
-    if (inliningDepth_ >= globalMaxInlineDepth) {
-        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding global inline depth",
-                targetScript->filename(), targetScript->lineno);
-        baseBuilder->script()->disableInlineDepthCheck();
-        return false;
-    }
-
-    // Cap on scripts inline depth.
-    if (inliningDepth_ >= scriptMaxInlineDepth)
-    {
-        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding script inline depth.",
-                targetScript->filename(), targetScript->lineno);
-        return false;
-    }
-
-    // Update scripts max inline depth
-    // I.e. make sure that all known scripts that get inlined by this script still get inlined.
-    if (!baseBuilder->script()->isInlineDepthCheckDisabled()) {
-        uint32_t updatedInlineDepth = globalMaxInlineDepth - inliningDepth_ - 1;
-        if (updatedInlineDepth < baseBuilder->script()->maxInlineDepth())
-            baseBuilder->script()->setMaxInlineDepth(updatedInlineDepth);
-    }
-
     return true;
 }
 
diff --git a/js/src/ion/TypeOracle.cpp b/js/src/ion/TypeOracle.cpp
index 6ad76ecaa892..a54068563498 100644
--- a/js/src/ion/TypeOracle.cpp
+++ b/js/src/ion/TypeOracle.cpp
@@ -702,6 +702,12 @@ TypeInferenceOracle::canEnterInlinedFunction(RawFunction target)
 {
     RootedScript targetScript(cx, target->nonLazyScript());
 
+    // Make sure empty script has type information, to allow inlining in more cases.
+    if (targetScript->length == 1) {
+        if (!targetScript->ensureRanInference(cx))
+            return false;
+    }
+
     if (!targetScript->hasAnalysis() ||
         !targetScript->analysis()->ranInference() ||
         !targetScript->analysis()->ranSSA())
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index 43dd7ea25d02..bda8e36751e5 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -77,7 +77,7 @@ ScriptAnalysis::addJump(JSContext *cx, unsigned offset,
 
     if (offset < *currentOffset) {
         /* Scripts containing loops are never inlined. */
-        isJaegerInlineable = false;
+        isJaegerInlineable = isIonInlineable = false;
         hasLoops_ = true;
 
         if (code->analyzed) {
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 358f76c8f547..3135a6159e31 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1687,7 +1687,6 @@ JSScript::Create(JSContext *cx, HandleObject enclosingScope, bool savedCallerFun
     script->sourceStart = bufStart;
     script->sourceEnd = bufEnd;
     script->userBit = options.userBit;
-    script->maxInlineDepth_ = uint8_t(-1);
 
     return script;
 }
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 14c76c85bb4d..38f8b8d69d6e 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -426,6 +426,9 @@ class JSScript : public js::gc::Cell
 
     // 16-bit fields.
 
+  private:
+    uint16_t        PADDING16;
+
     uint16_t        version;    /* JS version under which script was compiled */
 
   public:
@@ -441,11 +444,6 @@ class JSScript : public js::gc::Cell
     uint16_t        staticLevel;/* static level for display maintenance */
 
     // 8-bit fields.
-  private:
-    uint8_t        maxInlineDepth_; /* script max inline depth (IonMonkey)
-                                       uint8_t(-1): unitialized
-                                       uint8_t(-2): disabled */
-    uint8_t        PADDING8;
 
   public:
     // The kinds of the optional arrays.
@@ -809,26 +807,6 @@ class JSScript : public js::gc::Cell
         return maxLoopCount;
     }
 
-    void setMaxInlineDepth(uint32_t maxInlineDepth) {
-        if (maxInlineDepth >= uint8_t(-2)) {
-            disableInlineDepthCheck();
-            return;
-        }
-        maxInlineDepth_ = maxInlineDepth;
-    }
-
-    uint8_t maxInlineDepth() const {
-        return maxInlineDepth_;
-    }
-
-    void disableInlineDepthCheck() {
-        maxInlineDepth_ = uint8_t(-2);
-    }
-
-    bool isInlineDepthCheckDisabled() {
-        return maxInlineDepth_ == uint8_t(-2);
-    }
-
     /*
      * Size of the JITScript and all sections.  If |mallocSizeOf| is NULL, the
      * size is computed analytically.  (This method is implemented in

From 055e8d693c254e4a58ecc62966bff9624702af85 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Mon, 15 Apr 2013 12:45:29 -0700
Subject: [PATCH 182/438] Bug 848519 - Part 1: Move files. r=gavin

--HG--
rename : services/common/preferences.js => toolkit/modules/Preferences.jsm
rename : services/common/tests/unit/test_preferences.js => toolkit/modules/tests/xpcshell/test_Preferences.js
---
 services/common/preferences.js => toolkit/modules/Preferences.jsm | 0
 .../modules/tests/xpcshell/test_Preferences.js                    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename services/common/preferences.js => toolkit/modules/Preferences.jsm (100%)
 rename services/common/tests/unit/test_preferences.js => toolkit/modules/tests/xpcshell/test_Preferences.js (100%)

diff --git a/services/common/preferences.js b/toolkit/modules/Preferences.jsm
similarity index 100%
rename from services/common/preferences.js
rename to toolkit/modules/Preferences.jsm
diff --git a/services/common/tests/unit/test_preferences.js b/toolkit/modules/tests/xpcshell/test_Preferences.js
similarity index 100%
rename from services/common/tests/unit/test_preferences.js
rename to toolkit/modules/tests/xpcshell/test_Preferences.js

From 9ecf1e93c14a0a7935a3ea50ce5e2663213795a0 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Mon, 15 Apr 2013 12:45:33 -0700
Subject: [PATCH 183/438] Bug 848519 - Part 2: Update Makefile.in and test
 harness. r=gavin

---
 services/common/Makefile.in                        | 1 -
 services/common/tests/unit/test_load_modules.js    | 1 -
 services/common/tests/unit/xpcshell.ini            | 1 -
 toolkit/modules/Makefile.in                        | 1 +
 toolkit/modules/tests/xpcshell/test_Preferences.js | 4 +++-
 toolkit/modules/tests/xpcshell/xpcshell.ini        | 1 +
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/services/common/Makefile.in b/services/common/Makefile.in
index db08d99b2248..cf9a878e8a16 100644
--- a/services/common/Makefile.in
+++ b/services/common/Makefile.in
@@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 modules := \
   log4moz.js \
-  preferences.js \
   storageservice.js \
   stringbundle.js \
   tokenserverclient.js \
diff --git a/services/common/tests/unit/test_load_modules.js b/services/common/tests/unit/test_load_modules.js
index 06c2005747b3..abb5b659f8a6 100644
--- a/services/common/tests/unit/test_load_modules.js
+++ b/services/common/tests/unit/test_load_modules.js
@@ -5,7 +5,6 @@ const modules = [
   "async.js",
   "bagheeraclient.js",
   "log4moz.js",
-  "preferences.js",
   "rest.js",
   "storageservice.js",
   "stringbundle.js",
diff --git a/services/common/tests/unit/xpcshell.ini b/services/common/tests/unit/xpcshell.ini
index 64c12a7e713a..d9314c193c44 100644
--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@@ -27,7 +27,6 @@ firefox-appdir = browser
 [test_bagheera_client.js]
 [test_log4moz.js]
 [test_observers.js]
-[test_preferences.js]
 [test_restrequest.js]
 [test_tokenauthenticatedrequest.js]
 
diff --git a/toolkit/modules/Makefile.in b/toolkit/modules/Makefile.in
index 338effd08bf1..353fba44dde9 100644
--- a/toolkit/modules/Makefile.in
+++ b/toolkit/modules/Makefile.in
@@ -11,6 +11,7 @@ include $(DEPTH)/config/autoconf.mk
 
 EXTRA_JS_MODULES := \
   NewTabUtils.jsm \
+	Preferences.jsm \
   Sqlite.jsm \
   TelemetryTimestamps.jsm \
   Timer.jsm \
diff --git a/toolkit/modules/tests/xpcshell/test_Preferences.js b/toolkit/modules/tests/xpcshell/test_Preferences.js
index f144c4c9c6c6..2b08cb94b513 100644
--- a/toolkit/modules/tests/xpcshell/test_Preferences.js
+++ b/toolkit/modules/tests/xpcshell/test_Preferences.js
@@ -1,7 +1,9 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-Cu.import("resource://services-common/preferences.js");
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, manager: Cm} = Components;
+
+Cu.import("resource://gre/modules/Preferences.jsm");
 
 function run_test() {
   run_next_test();
diff --git a/toolkit/modules/tests/xpcshell/xpcshell.ini b/toolkit/modules/tests/xpcshell/xpcshell.ini
index de3b2dcac6ed..9b2b53a44e04 100644
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -3,6 +3,7 @@ head =
 tail =
 
 [test_newtab-migrate-v1.js]
+[test_Preferences.js]
 [test_sqlite.js]
 [test_TelemetryTimestamps.js]
 [test_timer.js]

From 0481627d399ac1137cf7b3a0eb48071335d408b6 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Mon, 15 Apr 2013 12:45:37 -0700
Subject: [PATCH 184/438] Bug 848519 - Part 3: Replace
 services-common/preferences.js with gre/modules/Preferences.jsm in imports.
 r=gavin

---
 browser/base/content/abouthealthreport/abouthealth.js  |  2 +-
 .../content/test/browser_datareporting_notification.js |  2 +-
 dom/push/src/PushService.js                            |  2 +-
 services/common/rest.js                                |  2 +-
 services/common/storageservice.js                      |  2 +-
 services/common/tests/unit/test_utils_dateprefs.js     |  2 +-
 services/common/tokenserverclient.js                   |  2 +-
 services/datareporting/DataReportingService.js         |  2 +-
 services/datareporting/sessions.jsm                    |  2 +-
 services/datareporting/tests/xpcshell/test_policy.js   |  2 +-
 services/healthreport/healthreporter.jsm               |  2 +-
 services/healthreport/providers.jsm                    |  2 +-
 .../healthreport/tests/xpcshell/test_healthreporter.js |  2 +-
 services/metrics/dataprovider.jsm                      |  2 +-
 .../metrics/tests/xpcshell/test_metrics_provider.js    |  2 +-
 services/sync/modules/engines/addons.js                |  2 +-
 services/sync/modules/engines/prefs.js                 |  2 +-
 services/sync/modules/engines/tabs.js                  |  2 +-
 services/sync/modules/resource.js                      |  2 +-
 services/sync/modules/service.js                       |  2 +-
 services/sync/modules/util.js                          | 10 +++++-----
 services/sync/tests/unit/test_addon_utils.js           |  2 +-
 services/sync/tests/unit/test_addons_engine.js         |  2 +-
 services/sync/tests/unit/test_addons_store.js          |  2 +-
 services/sync/tests/unit/test_prefs_store.js           |  2 +-
 services/sync/tests/unit/test_prefs_tracker.js         |  2 +-
 services/sync/tests/unit/test_service_migratePrefs.js  |  2 +-
 27 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/browser/base/content/abouthealthreport/abouthealth.js b/browser/base/content/abouthealthreport/abouthealth.js
index ad0aaa5fb094..84c054bca44b 100644
--- a/browser/base/content/abouthealthreport/abouthealth.js
+++ b/browser/base/content/abouthealthreport/abouthealth.js
@@ -6,7 +6,7 @@
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
-Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 const reporter = Cc["@mozilla.org/datareporting/service;1"]
diff --git a/browser/base/content/test/browser_datareporting_notification.js b/browser/base/content/test/browser_datareporting_notification.js
index 2e7d3f7e67a0..78ff065b7f40 100644
--- a/browser/base/content/test/browser_datareporting_notification.js
+++ b/browser/base/content/test/browser_datareporting_notification.js
@@ -5,7 +5,7 @@
 function sendNotifyRequest(name) {
   let ns = {};
   Components.utils.import("resource://gre/modules/services/datareporting/policy.jsm", ns);
-  Components.utils.import("resource://services-common/preferences.js", ns);
+  Components.utils.import("resource://gre/modules/Preferences.jsm", ns);
 
   let service = Components.classes["@mozilla.org/datareporting/service;1"]
                                   .getService(Components.interfaces.nsISupports)
diff --git a/dom/push/src/PushService.js b/dom/push/src/PushService.js
index a4182c92b00b..17abe1c43e4a 100644
--- a/dom/push/src/PushService.js
+++ b/dom/push/src/PushService.js
@@ -17,7 +17,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
-Cu.import("resource://gre/modules/services-common/preferences.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
 
 const prefs = new Preferences("services.push.");
diff --git a/services/common/rest.js b/services/common/rest.js
index f4dd4773cf1e..f0af94b90ea2 100644
--- a/services/common/rest.js
+++ b/services/common/rest.js
@@ -14,10 +14,10 @@ this.EXPORTED_SYMBOLS = [
 
 #endif
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://services-common/log4moz.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 
 XPCOMUtils.defineLazyModuleGetter(this, "CryptoUtils",
diff --git a/services/common/storageservice.js b/services/common/storageservice.js
index 89670a31a5da..1cb8b3f6b79e 100644
--- a/services/common/storageservice.js
+++ b/services/common/storageservice.js
@@ -33,9 +33,9 @@ this.EXPORTED_SYMBOLS = [
 
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://services-common/async.js");
 Cu.import("resource://services-common/log4moz.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/rest.js");
 Cu.import("resource://services-common/utils.js");
 
diff --git a/services/common/tests/unit/test_utils_dateprefs.js b/services/common/tests/unit/test_utils_dateprefs.js
index a11d354c7e5e..fcec5423572e 100644
--- a/services/common/tests/unit/test_utils_dateprefs.js
+++ b/services/common/tests/unit/test_utils_dateprefs.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://services-common/utils.js");
 
 
diff --git a/services/common/tokenserverclient.js b/services/common/tokenserverclient.js
index db7f4cf879ca..57a61e56d040 100644
--- a/services/common/tokenserverclient.js
+++ b/services/common/tokenserverclient.js
@@ -13,8 +13,8 @@ this.EXPORTED_SYMBOLS = [
 
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://services-common/log4moz.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/rest.js");
 Cu.import("resource://services-common/utils.js");
 
diff --git a/services/datareporting/DataReportingService.js b/services/datareporting/DataReportingService.js
index 56919f93dd98..e9b262154e3d 100644
--- a/services/datareporting/DataReportingService.js
+++ b/services/datareporting/DataReportingService.js
@@ -6,8 +6,8 @@
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 
 
diff --git a/services/datareporting/sessions.jsm b/services/datareporting/sessions.jsm
index f8aeaf131323..e0f524e00d38 100644
--- a/services/datareporting/sessions.jsm
+++ b/services/datareporting/sessions.jsm
@@ -14,9 +14,9 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 #endif
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://services-common/log4moz.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 
 
diff --git a/services/datareporting/tests/xpcshell/test_policy.js b/services/datareporting/tests/xpcshell/test_policy.js
index 4fbbfee5582e..4cc9ad607332 100644
--- a/services/datareporting/tests/xpcshell/test_policy.js
+++ b/services/datareporting/tests/xpcshell/test_policy.js
@@ -5,7 +5,7 @@
 
 const {utils: Cu} = Components;
 
-Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/services/datareporting/policy.jsm");
 Cu.import("resource://testing-common/services/datareporting/mocks.jsm");
 
diff --git a/services/healthreport/healthreporter.jsm b/services/healthreport/healthreporter.jsm
index c39a43a9e265..d11c85ef41af 100644
--- a/services/healthreport/healthreporter.jsm
+++ b/services/healthreport/healthreporter.jsm
@@ -19,10 +19,10 @@ Cu.import("resource://services-common/bagheeraclient.js");
 #endif
 
 Cu.import("resource://services-common/log4moz.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
 Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/TelemetryStopwatch.jsm");
diff --git a/services/healthreport/providers.jsm b/services/healthreport/providers.jsm
index 70cc560ae80d..49faea684efb 100644
--- a/services/healthreport/providers.jsm
+++ b/services/healthreport/providers.jsm
@@ -35,10 +35,10 @@ Cu.import("resource://gre/modules/Metrics.jsm");
 
 Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
 Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 
 XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
diff --git a/services/healthreport/tests/xpcshell/test_healthreporter.js b/services/healthreport/tests/xpcshell/test_healthreporter.js
index f42626bbf951..3895da327f28 100644
--- a/services/healthreport/tests/xpcshell/test_healthreporter.js
+++ b/services/healthreport/tests/xpcshell/test_healthreporter.js
@@ -6,9 +6,9 @@
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://services-common/observers.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
 Cu.import("resource://gre/modules/Metrics.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/services/healthreport/healthreporter.jsm");
 Cu.import("resource://gre/modules/services/datareporting/policy.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
diff --git a/services/metrics/dataprovider.jsm b/services/metrics/dataprovider.jsm
index 0d1e4afab2b5..8679db8dfa0e 100644
--- a/services/metrics/dataprovider.jsm
+++ b/services/metrics/dataprovider.jsm
@@ -18,9 +18,9 @@ const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
 #endif
 
 Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://services-common/log4moz.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 
 
diff --git a/services/metrics/tests/xpcshell/test_metrics_provider.js b/services/metrics/tests/xpcshell/test_metrics_provider.js
index d204c600ab32..af4cd8098f4e 100644
--- a/services/metrics/tests/xpcshell/test_metrics_provider.js
+++ b/services/metrics/tests/xpcshell/test_metrics_provider.js
@@ -6,8 +6,8 @@
 const {utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Metrics.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://testing-common/services/metrics/mocks.jsm");
 
 
diff --git a/services/sync/modules/engines/addons.js b/services/sync/modules/engines/addons.js
index c9299eb04964..d8cf014be0ea 100644
--- a/services/sync/modules/engines/addons.js
+++ b/services/sync/modules/engines/addons.js
@@ -42,8 +42,8 @@ Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/util.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-common/async.js");
-Cu.import("resource://services-common/preferences.js");
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
                                   "resource://gre/modules/AddonManager.jsm");
diff --git a/services/sync/modules/engines/prefs.js b/services/sync/modules/engines/prefs.js
index d6363c6f9e7f..2418cd0dc5be 100644
--- a/services/sync/modules/engines/prefs.js
+++ b/services/sync/modules/engines/prefs.js
@@ -15,8 +15,8 @@ Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/util.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-common/utils.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://gre/modules/LightweightThemeManager.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 
 const PREFS_GUID = CommonUtils.encodeBase64URL(Services.appinfo.ID);
 
diff --git a/services/sync/modules/engines/tabs.js b/services/sync/modules/engines/tabs.js
index ad1331e5cc5e..24dbf0b2fae2 100644
--- a/services/sync/modules/engines/tabs.js
+++ b/services/sync/modules/engines/tabs.js
@@ -10,13 +10,13 @@ const Cu = Components.utils;
 
 const TABS_TTL = 604800; // 7 days
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/engines/clients.js");
 Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/util.js");
 Cu.import("resource://services-sync/constants.js");
-Cu.import("resource://services-common/preferences.js");
 
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm");
diff --git a/services/sync/modules/resource.js b/services/sync/modules/resource.js
index bb5b8b53c78f..e6587cd43f07 100644
--- a/services/sync/modules/resource.js
+++ b/services/sync/modules/resource.js
@@ -12,10 +12,10 @@ const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://services-common/async.js");
 Cu.import("resource://services-common/log4moz.js");
 Cu.import("resource://services-common/observers.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/util.js");
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 905f2509dea8..fcb8275c4703 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -18,9 +18,9 @@ const PBKDF2_KEY_BYTES = 16;
 const CRYPTO_COLLECTION = "crypto";
 const KEYS_WBO = "keys";
 
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://services-common/log4moz.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/engines.js");
diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js
index 915920b640ff..32d85b4c316a 100644
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@@ -9,17 +9,17 @@ const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
 Cu.import("resource://services-common/log4moz.js");
 Cu.import("resource://services-common/observers.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/stringbundle.js");
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource://services-common/async.js", this);
 Cu.import("resource://services-crypto/utils.js");
 Cu.import("resource://services-sync/constants.js");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
-Cu.import("resource://gre/modules/Services.jsm", this);
-Cu.import("resource://gre/modules/PlacesUtils.jsm", this);
-Cu.import("resource://gre/modules/NetUtil.jsm", this);
 Cu.import("resource://gre/modules/FileUtils.jsm", this);
+Cu.import("resource://gre/modules/NetUtil.jsm", this);
+Cu.import("resource://gre/modules/PlacesUtils.jsm", this);
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 
 /*
  * Utility functions
diff --git a/services/sync/tests/unit/test_addon_utils.js b/services/sync/tests/unit/test_addon_utils.js
index b1ab9cd0d08a..49824cd4ce15 100644
--- a/services/sync/tests/unit/test_addon_utils.js
+++ b/services/sync/tests/unit/test_addon_utils.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://services-sync/addonutils.js");
 Cu.import("resource://services-sync/util.js");
 
diff --git a/services/sync/tests/unit/test_addons_engine.js b/services/sync/tests/unit/test_addons_engine.js
index 3bcb94accac1..4244ddc2a45a 100644
--- a/services/sync/tests/unit/test_addons_engine.js
+++ b/services/sync/tests/unit/test_addons_engine.js
@@ -4,9 +4,9 @@
 "use strict";
 
 Cu.import("resource://gre/modules/AddonManager.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://services-common/async.js");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-sync/addonsreconciler.js");
 Cu.import("resource://services-sync/engines/addons.js");
 Cu.import("resource://services-sync/service.js");
diff --git a/services/sync/tests/unit/test_addons_store.js b/services/sync/tests/unit/test_addons_store.js
index 86198c8d39b8..4a0e419ab0c2 100644
--- a/services/sync/tests/unit/test_addons_store.js
+++ b/services/sync/tests/unit/test_addons_store.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://services-sync/addonutils.js");
 Cu.import("resource://services-sync/engines/addons.js");
 Cu.import("resource://services-sync/service.js");
diff --git a/services/sync/tests/unit/test_prefs_store.js b/services/sync/tests/unit/test_prefs_store.js
index dd007ecec4db..35a2ece1fe9b 100644
--- a/services/sync/tests/unit/test_prefs_store.js
+++ b/services/sync/tests/unit/test_prefs_store.js
@@ -2,8 +2,8 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 Cu.import("resource://gre/modules/LightweightThemeManager.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource://services-sync/engines/prefs.js");
 Cu.import("resource://services-sync/service.js");
diff --git a/services/sync/tests/unit/test_prefs_tracker.js b/services/sync/tests/unit/test_prefs_tracker.js
index dd45f239852f..17ccaa43e30f 100644
--- a/services/sync/tests/unit/test_prefs_tracker.js
+++ b/services/sync/tests/unit/test_prefs_tracker.js
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/engines/prefs.js");
diff --git a/services/sync/tests/unit/test_service_migratePrefs.js b/services/sync/tests/unit/test_service_migratePrefs.js
index 72dd2c6e209a..89a147c06a43 100644
--- a/services/sync/tests/unit/test_service_migratePrefs.js
+++ b/services/sync/tests/unit/test_service_migratePrefs.js
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://services-sync/util.js");
 
 function test_migrate_logging() {

From 23acd6102658b22c643e7e35eb1a34c35cee24b0 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 15 Apr 2013 12:55:38 -0700
Subject: [PATCH 185/438] Back out a5a1dd3bd8ae (bug 860029) for stupidorange

---
 js/ipc/CPOWTypes.h                            |  3 +-
 js/ipc/ContextWrapperChild.h                  |  3 +-
 js/ipc/ContextWrapperParent.h                 |  3 +-
 js/ipc/ObjectWrapperChild.cpp                 |  3 +-
 js/ipc/ObjectWrapperChild.h                   |  3 +-
 js/ipc/ObjectWrapperParent.cpp                |  5 ++-
 js/ipc/ObjectWrapperParent.h                  |  3 +-
 js/jsd/jsd.h                                  |  5 +--
 js/jsd/jsd_atom.cpp                           |  5 +--
 js/jsd/jsd_high.cpp                           |  5 +--
 js/jsd/jsd_hook.cpp                           |  5 +--
 js/jsd/jsd_java.cpp                           |  5 +--
 js/jsd/jsd_lock.cpp                           |  5 +--
 js/jsd/jsd_lock.h                             |  5 +--
 js/jsd/jsd_obj.cpp                            |  5 +--
 js/jsd/jsd_scpt.cpp                           |  5 +--
 js/jsd/jsd_stak.cpp                           |  5 +--
 js/jsd/jsd_step.cpp                           |  5 +--
 js/jsd/jsd_text.cpp                           |  5 +--
 js/jsd/jsd_val.cpp                            |  5 +--
 js/jsd/jsd_xpc.cpp                            |  4 +-
 js/jsd/jsd_xpc.h                              |  4 +-
 js/jsd/jsdebug.cpp                            |  5 +--
 js/jsd/jsdebug.h                              |  5 +--
 js/jsd/jsdstubs.cpp                           |  5 +--
 js/jsd/jshash.cpp                             |  2 +-
 js/jsd/jshash.h                               |  4 +-
 js/jsd/resource.h                             |  5 +--
 js/public/Anchor.h                            |  5 ++-
 js/public/CallArgs.h                          |  5 ++-
 js/public/CharacterEncoding.h                 |  3 +-
 js/public/GCAPI.h                             |  8 ++--
 js/public/HashTable.h                         |  5 ++-
 js/public/HeapAPI.h                           |  8 ++--
 js/public/LegacyIntTypes.h                    |  5 +--
 js/public/MemoryMetrics.h                     |  5 ++-
 js/public/PropertyKey.h                       |  5 ++-
 js/public/RequiredDefines.h                   |  3 +-
 js/public/RootingAPI.h                        |  3 +-
 js/public/TemplateLib.h                       |  5 ++-
 js/public/Utility.h                           |  5 ++-
 js/public/Value.h                             |  5 ++-
 js/public/Vector.h                            |  5 ++-
 js/src/TraceLogging.cpp                       | 10 ++---
 js/src/TraceLogging.h                         | 10 ++---
 js/src/assembler/assembler/ARMAssembler.cpp   |  2 +-
 js/src/assembler/assembler/ARMAssembler.h     |  2 +-
 js/src/assembler/assembler/ARMv7Assembler.h   |  2 +-
 .../assembler/AbstractMacroAssembler.h        |  2 +-
 js/src/assembler/assembler/AssemblerBuffer.h  |  2 +-
 .../AssemblerBufferWithConstantPool.h         |  2 +-
 js/src/assembler/assembler/CodeLocation.h     |  2 +-
 js/src/assembler/assembler/LinkBuffer.h       |  2 +-
 js/src/assembler/assembler/MacroAssembler.h   |  2 +-
 .../assembler/assembler/MacroAssemblerARM.cpp |  2 +-
 .../assembler/assembler/MacroAssemblerARM.h   |  2 +-
 .../assembler/assembler/MacroAssemblerARMv7.h |  2 +-
 .../assembler/MacroAssemblerCodeRef.h         |  2 +-
 .../assembler/assembler/MacroAssemblerSparc.h |  4 +-
 .../assembler/assembler/MacroAssemblerX86.h   |  2 +-
 .../assembler/MacroAssemblerX86Common.cpp     |  4 +-
 .../assembler/MacroAssemblerX86Common.h       |  2 +-
 .../assembler/MacroAssemblerX86_64.h          |  2 +-
 js/src/assembler/assembler/RepatchBuffer.h    |  2 +-
 js/src/assembler/assembler/SparcAssembler.h   |  4 +-
 js/src/assembler/assembler/X86Assembler.h     |  2 +-
 js/src/assembler/jit/ExecutableAllocator.cpp  |  4 +-
 js/src/assembler/moco/MocoStubs.h             |  5 ++-
 js/src/builtin/Eval.cpp                       |  3 +-
 js/src/builtin/Eval.h                         |  5 ++-
 js/src/builtin/Intl.cpp                       |  2 +-
 js/src/builtin/Intl.h                         |  2 +-
 js/src/builtin/Iterator-inl.h                 |  9 ++--
 js/src/builtin/MapObject.cpp                  |  5 ++-
 js/src/builtin/MapObject.h                    |  5 ++-
 js/src/builtin/Module.cpp                     |  6 ---
 js/src/builtin/Module.h                       |  6 ---
 js/src/builtin/Object.cpp                     |  5 ++-
 js/src/builtin/Object.h                       |  5 ++-
 js/src/builtin/ParallelArray.cpp              |  5 ++-
 js/src/builtin/ParallelArray.h                |  5 ++-
 js/src/builtin/Profilers.cpp                  |  9 ++--
 js/src/builtin/Profilers.h                    |  3 +-
 js/src/builtin/RegExp.cpp                     |  5 ++-
 js/src/builtin/RegExp.h                       |  5 ++-
 js/src/builtin/TestingFunctions.cpp           |  9 ++--
 js/src/builtin/TestingFunctions.h             |  9 ++--
 js/src/ctypes/CTypes.cpp                      |  5 +--
 js/src/ctypes/Library.cpp                     |  5 +--
 js/src/devtools/jint/treesearch.py            |  3 +-
 js/src/devtools/sharkctl.cpp                  |  3 +-
 js/src/devtools/sharkctl.h                    |  3 +-
 js/src/ds/BitArray.h                          |  5 ++-
 js/src/ds/InlineMap.h                         |  5 ++-
 js/src/ds/LifoAlloc.cpp                       |  5 ++-
 js/src/ds/LifoAlloc.h                         |  5 ++-
 js/src/ds/PriorityQueue.h                     |  5 ++-
 js/src/ds/Sort.h                              |  5 ++-
 js/src/ds/SplayTree.h                         |  5 ++-
 js/src/editline/editline.c                    |  1 +
 js/src/editline/editline.h                    |  1 +
 js/src/editline/sysunix.c                     |  1 +
 js/src/editline/unix.h                        |  1 +
 js/src/frontend/BytecodeCompiler.cpp          |  3 +-
 js/src/frontend/BytecodeCompiler.h            |  3 +-
 js/src/frontend/BytecodeEmitter.cpp           |  3 +-
 js/src/frontend/BytecodeEmitter.h             |  3 +-
 js/src/frontend/FoldConstants.cpp             |  3 +-
 js/src/frontend/FoldConstants.h               |  3 +-
 js/src/frontend/FullParseHandler.h            |  3 +-
 js/src/frontend/NameFunctions.cpp             |  3 +-
 js/src/frontend/NameFunctions.h               |  3 +-
 js/src/frontend/ParseMaps-inl.h               |  5 ++-
 js/src/frontend/ParseMaps.cpp                 |  5 ++-
 js/src/frontend/ParseMaps.h                   |  5 ++-
 js/src/frontend/ParseNode-inl.h               |  2 +-
 js/src/frontend/ParseNode.cpp                 |  3 +-
 js/src/frontend/ParseNode.h                   |  3 +-
 js/src/frontend/Parser-inl.h                  |  3 +-
 js/src/frontend/Parser.cpp                    |  3 +-
 js/src/frontend/Parser.h                      |  3 +-
 js/src/frontend/SharedContext-inl.h           |  3 +-
 js/src/frontend/SharedContext.h               |  3 +-
 js/src/frontend/SyntaxParseHandler.h          |  3 +-
 js/src/frontend/TokenStream.cpp               |  3 +-
 js/src/frontend/TokenStream.h                 |  4 +-
 js/src/gc/Barrier-inl.h                       |  3 +-
 js/src/gc/Barrier.h                           |  3 +-
 js/src/gc/FindSCCs-inl.h                      |  8 ++--
 js/src/gc/FindSCCs.h                          |  8 ++--
 js/src/gc/GCInternals.h                       |  3 +-
 js/src/gc/Heap.h                              |  8 ++--
 js/src/gc/Iteration.cpp                       |  3 +-
 js/src/gc/Marking.cpp                         |  9 ++--
 js/src/gc/Marking.h                           | 11 ++---
 js/src/gc/Memory.cpp                          |  7 +--
 js/src/gc/Memory.h                            |  7 +--
 js/src/gc/RootMarking.cpp                     |  3 +-
 js/src/gc/Statistics.cpp                      |  3 +-
 js/src/gc/Statistics.h                        |  3 +-
 js/src/gc/StoreBuffer.cpp                     |  9 ++--
 js/src/gc/StoreBuffer.h                       |  7 +--
 js/src/gc/Verifier.cpp                        |  3 +-
 js/src/gc/Zone.cpp                            |  3 +-
 js/src/gc/Zone.h                              |  5 ++-
 js/src/gdb/gdb-tests.h                        |  2 +-
 js/src/ion/AliasAnalysis.cpp                  |  5 ++-
 js/src/ion/AliasAnalysis.h                    |  5 ++-
 js/src/ion/AsmJS.cpp                          |  5 ++-
 js/src/ion/AsmJS.h                            |  5 ++-
 js/src/ion/AsmJSLink.cpp                      |  5 ++-
 js/src/ion/AsmJSModule.h                      |  5 ++-
 js/src/ion/AsmJSSignalHandlers.cpp            |  5 ++-
 js/src/ion/BacktrackingAllocator.cpp          |  5 ++-
 js/src/ion/BacktrackingAllocator.h            |  5 ++-
 js/src/ion/Bailouts.cpp                       |  5 ++-
 js/src/ion/Bailouts.h                         |  5 ++-
 js/src/ion/BaselineBailouts.cpp               |  5 ++-
 js/src/ion/BaselineCompiler.cpp               |  5 ++-
 js/src/ion/BaselineCompiler.h                 |  5 ++-
 js/src/ion/BaselineFrame-inl.h                |  5 ++-
 js/src/ion/BaselineFrame.cpp                  |  5 ++-
 js/src/ion/BaselineFrame.h                    |  5 ++-
 js/src/ion/BaselineFrameInfo.cpp              |  5 ++-
 js/src/ion/BaselineFrameInfo.h                |  5 ++-
 js/src/ion/BaselineHelpers.h                  |  5 ++-
 js/src/ion/BaselineIC.cpp                     |  5 ++-
 js/src/ion/BaselineIC.h                       |  5 ++-
 js/src/ion/BaselineInspector.cpp              |  5 ++-
 js/src/ion/BaselineInspector.h                |  5 ++-
 js/src/ion/BaselineJIT.cpp                    |  5 ++-
 js/src/ion/BaselineJIT.h                      |  5 ++-
 js/src/ion/BaselineRegisters.h                |  5 ++-
 js/src/ion/BitSet.cpp                         |  5 ++-
 js/src/ion/BitSet.h                           |  5 ++-
 js/src/ion/C1Spewer.cpp                       |  5 ++-
 js/src/ion/C1Spewer.h                         |  5 ++-
 js/src/ion/CodeGenerator.cpp                  |  5 ++-
 js/src/ion/CodeGenerator.h                    |  5 ++-
 js/src/ion/CompactBuffer.h                    |  5 ++-
 js/src/ion/CompileInfo-inl.h                  |  5 ++-
 js/src/ion/CompileInfo.h                      |  5 ++-
 js/src/ion/CompilerRoot.h                     |  5 ++-
 js/src/ion/EdgeCaseAnalysis.cpp               |  5 ++-
 js/src/ion/EdgeCaseAnalysis.h                 |  5 ++-
 js/src/ion/EffectiveAddressAnalysis.cpp       |  5 ++-
 js/src/ion/EffectiveAddressAnalysis.h         |  5 ++-
 js/src/ion/ExecutionModeInlines.h             |  5 ++-
 js/src/ion/FixedArityList.h                   |  5 ++-
 js/src/ion/FixedList.h                        |  5 ++-
 js/src/ion/InlineList.h                       |  5 ++-
 js/src/ion/Ion.cpp                            |  5 ++-
 js/src/ion/Ion.h                              |  5 ++-
 js/src/ion/IonAllocPolicy.h                   |  5 ++-
 js/src/ion/IonAnalysis.cpp                    |  5 ++-
 js/src/ion/IonAnalysis.h                      |  5 ++-
 js/src/ion/IonBuilder.cpp                     |  5 ++-
 js/src/ion/IonBuilder.h                       |  5 ++-
 js/src/ion/IonCaches.cpp                      |  5 ++-
 js/src/ion/IonCaches.h                        |  5 ++-
 js/src/ion/IonCode.h                          |  5 ++-
 js/src/ion/IonCompartment.h                   |  5 ++-
 js/src/ion/IonFrameIterator-inl.h             |  5 ++-
 js/src/ion/IonFrameIterator.h                 |  5 ++-
 js/src/ion/IonFrames-inl.h                    |  5 ++-
 js/src/ion/IonFrames.cpp                      |  5 ++-
 js/src/ion/IonFrames.h                        |  5 ++-
 js/src/ion/IonInstrumentation.h               |  5 ++-
 js/src/ion/IonLinker.h                        |  5 ++-
 js/src/ion/IonMacroAssembler.cpp              |  5 ++-
 js/src/ion/IonMacroAssembler.h                |  5 ++-
 js/src/ion/IonSpewer.cpp                      |  5 ++-
 js/src/ion/IonSpewer.h                        |  5 ++-
 js/src/ion/IonTypes.h                         |  5 ++-
 js/src/ion/JSONSpewer.cpp                     |  5 ++-
 js/src/ion/JSONSpewer.h                       |  5 ++-
 js/src/ion/LICM.cpp                           |  5 ++-
 js/src/ion/LICM.h                             |  5 ++-
 js/src/ion/LIR-Common.h                       |  5 ++-
 js/src/ion/LIR-inl.h                          |  5 ++-
 js/src/ion/LIR.cpp                            |  5 ++-
 js/src/ion/LIR.h                              |  5 ++-
 js/src/ion/LOpcodes.h                         |  5 ++-
 js/src/ion/LinearScan.cpp                     |  5 ++-
 js/src/ion/LinearScan.h                       |  5 ++-
 js/src/ion/LiveRangeAllocator.cpp             |  5 ++-
 js/src/ion/LiveRangeAllocator.h               |  5 ++-
 js/src/ion/Lowering.cpp                       |  5 ++-
 js/src/ion/Lowering.h                         |  5 ++-
 js/src/ion/MCallOptimize.cpp                  |  5 ++-
 js/src/ion/MIR.cpp                            |  5 ++-
 js/src/ion/MIR.h                              |  5 ++-
 js/src/ion/MIRGenerator.h                     |  5 ++-
 js/src/ion/MIRGraph.cpp                       |  5 ++-
 js/src/ion/MIRGraph.h                         |  5 ++-
 js/src/ion/MOpcodes.h                         |  5 ++-
 js/src/ion/MoveEmitter.h                      |  5 ++-
 js/src/ion/MoveResolver.cpp                   |  5 ++-
 js/src/ion/MoveResolver.h                     |  5 ++-
 js/src/ion/ParallelArrayAnalysis.cpp          |  5 ++-
 js/src/ion/ParallelArrayAnalysis.h            |  5 ++-
 js/src/ion/ParallelFunctions.cpp              |  5 ++-
 js/src/ion/ParallelFunctions.h                |  5 ++-
 js/src/ion/PcScriptCache-inl.h                |  5 ++-
 js/src/ion/PcScriptCache.h                    |  5 ++-
 js/src/ion/RangeAnalysis.cpp                  |  5 ++-
 js/src/ion/RangeAnalysis.h                    |  5 ++-
 js/src/ion/RegisterAllocator.cpp              |  5 ++-
 js/src/ion/RegisterAllocator.h                |  5 ++-
 js/src/ion/RegisterSets.h                     |  5 ++-
 js/src/ion/Registers.h                        |  5 ++-
 js/src/ion/Safepoints.cpp                     |  5 ++-
 js/src/ion/Safepoints.h                       |  5 ++-
 js/src/ion/SnapshotReader.h                   |  5 ++-
 js/src/ion/SnapshotWriter.h                   |  5 ++-
 js/src/ion/Snapshots.cpp                      |  5 ++-
 js/src/ion/StackSlotAllocator.h               |  5 ++-
 js/src/ion/StupidAllocator.cpp                |  5 ++-
 js/src/ion/StupidAllocator.h                  |  5 ++-
 js/src/ion/TypeOracle.cpp                     |  5 ++-
 js/src/ion/TypeOracle.h                       |  5 ++-
 js/src/ion/TypePolicy.cpp                     |  5 ++-
 js/src/ion/TypePolicy.h                       |  5 ++-
 js/src/ion/UnreachableCodeElimination.cpp     |  5 ++-
 js/src/ion/UnreachableCodeElimination.h       |  5 ++-
 js/src/ion/VMFunctions.cpp                    |  5 ++-
 js/src/ion/VMFunctions.h                      |  5 ++-
 js/src/ion/ValueNumbering.cpp                 |  5 ++-
 js/src/ion/ValueNumbering.h                   |  5 ++-
 js/src/ion/arm/Architecture-arm.cpp           |  6 +--
 js/src/ion/arm/Architecture-arm.h             |  5 ++-
 js/src/ion/arm/Assembler-arm.cpp              |  5 ++-
 js/src/ion/arm/Assembler-arm.h                |  5 ++-
 js/src/ion/arm/Bailouts-arm.cpp               |  5 ++-
 js/src/ion/arm/BaselineCompiler-arm.cpp       |  5 ++-
 js/src/ion/arm/BaselineCompiler-arm.h         |  5 ++-
 js/src/ion/arm/BaselineHelpers-arm.h          |  5 ++-
 js/src/ion/arm/BaselineIC-arm.cpp             |  5 ++-
 js/src/ion/arm/BaselineRegisters-arm.h        |  5 ++-
 js/src/ion/arm/CodeGenerator-arm.cpp          |  5 ++-
 js/src/ion/arm/CodeGenerator-arm.h            |  5 ++-
 js/src/ion/arm/IonFrames-arm.cpp              |  5 ++-
 js/src/ion/arm/IonFrames-arm.h                |  5 ++-
 js/src/ion/arm/LIR-arm.h                      |  5 ++-
 js/src/ion/arm/LOpcodes-arm.h                 |  5 ++-
 js/src/ion/arm/Lowering-arm.cpp               |  5 ++-
 js/src/ion/arm/Lowering-arm.h                 |  5 ++-
 js/src/ion/arm/MacroAssembler-arm.cpp         |  5 ++-
 js/src/ion/arm/MacroAssembler-arm.h           |  5 ++-
 js/src/ion/arm/MoveEmitter-arm.cpp            |  5 ++-
 js/src/ion/arm/MoveEmitter-arm.h              |  5 ++-
 js/src/ion/arm/Trampoline-arm.cpp             |  5 ++-
 js/src/ion/shared/Assembler-shared.h          |  5 ++-
 js/src/ion/shared/Assembler-x86-shared.cpp    |  5 ++-
 js/src/ion/shared/Assembler-x86-shared.h      |  5 ++-
 js/src/ion/shared/BaselineCompiler-shared.cpp |  5 ++-
 js/src/ion/shared/BaselineCompiler-shared.h   |  5 ++-
 .../shared/BaselineCompiler-x86-shared.cpp    |  5 ++-
 .../ion/shared/BaselineCompiler-x86-shared.h  |  5 ++-
 js/src/ion/shared/BaselineIC-x86-shared.cpp   |  5 ++-
 js/src/ion/shared/CodeGenerator-shared-inl.h  |  5 ++-
 js/src/ion/shared/CodeGenerator-shared.cpp    |  5 ++-
 js/src/ion/shared/CodeGenerator-shared.h      |  5 ++-
 .../ion/shared/CodeGenerator-x86-shared.cpp   |  5 ++-
 js/src/ion/shared/CodeGenerator-x86-shared.h  |  5 ++-
 js/src/ion/shared/IonAssemblerBuffer.h        |  5 ++-
 .../IonAssemblerBufferWithConstantPools.h     |  5 ++-
 js/src/ion/shared/IonFrames-shared.h          | 44 ++++++++++++++++---
 js/src/ion/shared/IonFrames-x86-shared.cpp    |  5 ++-
 js/src/ion/shared/IonFrames-x86-shared.h      |  5 ++-
 js/src/ion/shared/LIR-x86-shared.h            |  5 ++-
 js/src/ion/shared/Lowering-shared-inl.h       |  5 ++-
 js/src/ion/shared/Lowering-shared.cpp         |  5 ++-
 js/src/ion/shared/Lowering-shared.h           |  5 ++-
 js/src/ion/shared/Lowering-x86-shared.cpp     |  5 ++-
 js/src/ion/shared/Lowering-x86-shared.h       |  5 ++-
 js/src/ion/shared/MacroAssembler-x86-shared.h |  5 ++-
 js/src/ion/shared/MoveEmitter-x86-shared.cpp  |  5 ++-
 js/src/ion/shared/MoveEmitter-x86-shared.h    |  5 ++-
 js/src/ion/x64/Architecture-x64.h             |  5 ++-
 js/src/ion/x64/Assembler-x64.cpp              |  5 ++-
 js/src/ion/x64/Assembler-x64.h                |  5 ++-
 js/src/ion/x64/Bailouts-x64.cpp               |  5 ++-
 js/src/ion/x64/BaselineCompiler-x64.cpp       |  5 ++-
 js/src/ion/x64/BaselineCompiler-x64.h         |  5 ++-
 js/src/ion/x64/BaselineHelpers-x64.h          |  5 ++-
 js/src/ion/x64/BaselineIC-x64.cpp             |  5 ++-
 js/src/ion/x64/BaselineRegisters-x64.h        |  5 ++-
 js/src/ion/x64/CodeGenerator-x64.cpp          |  5 ++-
 js/src/ion/x64/CodeGenerator-x64.h            |  5 ++-
 js/src/ion/x64/LIR-x64.h                      |  5 ++-
 js/src/ion/x64/LOpcodes-x64.h                 |  5 ++-
 js/src/ion/x64/Lowering-x64.cpp               |  5 ++-
 js/src/ion/x64/Lowering-x64.h                 |  5 ++-
 js/src/ion/x64/MacroAssembler-x64.cpp         |  5 ++-
 js/src/ion/x64/MacroAssembler-x64.h           |  5 ++-
 js/src/ion/x64/Trampoline-x64.cpp             |  5 ++-
 js/src/ion/x86/Architecture-x86.h             |  5 ++-
 js/src/ion/x86/Assembler-x86.cpp              |  5 ++-
 js/src/ion/x86/Assembler-x86.h                |  5 ++-
 js/src/ion/x86/Bailouts-x86.cpp               |  5 ++-
 js/src/ion/x86/BaselineCompiler-x86.cpp       |  5 ++-
 js/src/ion/x86/BaselineCompiler-x86.h         |  5 ++-
 js/src/ion/x86/BaselineHelpers-x86.h          |  5 ++-
 js/src/ion/x86/BaselineIC-x86.cpp             |  5 ++-
 js/src/ion/x86/BaselineRegisters-x86.h        |  5 ++-
 js/src/ion/x86/CodeGenerator-x86.cpp          |  5 ++-
 js/src/ion/x86/CodeGenerator-x86.h            |  5 ++-
 js/src/ion/x86/LIR-x86.h                      |  5 ++-
 js/src/ion/x86/LOpcodes-x86.h                 |  5 ++-
 js/src/ion/x86/Lowering-x86.cpp               |  5 ++-
 js/src/ion/x86/Lowering-x86.h                 |  5 ++-
 js/src/ion/x86/MacroAssembler-x86.cpp         |  5 ++-
 js/src/ion/x86/MacroAssembler-x86.h           |  5 ++-
 js/src/ion/x86/Trampoline-x86.cpp             |  5 ++-
 .../jit-test/tests/auto-regress/bug557946.js  |  2 +-
 .../jit-test/tests/auto-regress/bug558618.js  |  2 +-
 js/src/jit-test/tests/basic/bug535760.js      |  2 +-
 js/src/jit-test/tests/basic/bug541191-1.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-2.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-3.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-4.js    |  2 +-
 js/src/jit-test/tests/basic/bug541191-5.js    |  2 +-
 js/src/jit-test/tests/basic/bug592927.js      |  2 +-
 js/src/jit-test/tests/basic/bug602088.js      |  2 +-
 js/src/jit-test/tests/basic/bug606083.js      |  2 +-
 js/src/jit-test/tests/basic/bug616762.js      |  2 +-
 js/src/jit-test/tests/basic/bug633409-1.js    |  2 +-
 js/src/jit-test/tests/basic/bug633409-2.js    |  2 +-
 js/src/jit-test/tests/ion/bug674664-3.js      |  2 +-
 js/src/jit-test/tests/ion/bug684362.js        |  2 +-
 js/src/jit-test/tests/ion/bug747271.js        |  2 +-
 js/src/jit-test/tests/ion/bug750588.js        |  2 +-
 js/src/jit-test/tests/ion/bug772901.js        |  2 +-
 js/src/jit-test/tests/ion/testPos.js          |  2 +-
 js/src/jit-test/tests/ion/testSubtract.js     |  2 +-
 js/src/jit-test/tests/ion/testVAndBranch.js   |  2 +-
 js/src/jit-test/tests/ion/truncateToInt32.js  |  2 +-
 js/src/jit-test/tests/ion/valueToInt32.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug592973-1.js   |  2 +-
 js/src/jit-test/tests/jaeger/bug592973-3.js   |  2 +-
 js/src/jit-test/tests/jaeger/bug597378.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug600139.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug600424.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug601982.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug604381.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug616508.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug625438.js     |  2 +-
 js/src/jit-test/tests/jaeger/bug627486.js     |  2 +-
 .../jit-test/tests/jaeger/floatTypedArrays.js |  2 +-
 .../tests/jaeger/normalIntTypedArrays.js      |  2 +-
 .../tests/jaeger/smallIntTypedArrays.js       |  2 +-
 .../tests/jaeger/testCallElemAfterGC.js       |  2 +-
 .../tests/jaeger/testDenseCallElem.js         |  2 +-
 js/src/jit-test/tests/jaeger/testForOps.js    |  2 +-
 .../jit-test/tests/jaeger/testPropCallElem.js |  2 +-
 .../tests/jaeger/testPropCallElem2.js         |  2 +-
 .../jit-test/tests/jaeger/testSetElem-Easy.js |  2 +-
 .../tests/jaeger/testSetElem-Indexed.js       |  2 +-
 .../tests/jaeger/testSetElem-NewProto.js      |  2 +-
 .../tests/jaeger/testSetTypedFloatArray.js    |  2 +-
 .../tests/jaeger/testSetTypedIntArray.js      |  2 +-
 .../tests/jaeger/testShiftSameBacking.js      |  2 +-
 js/src/jsalloc.cpp                            |  5 ++-
 js/src/jsalloc.h                              |  5 ++-
 js/src/jsanalyze.cpp                          |  6 +--
 js/src/jsanalyze.h                            |  6 +--
 js/src/jsapi-tests/selfTest.cpp               |  2 +-
 .../jsapi-tests/testAddPropertyPropcache.cpp  |  2 +-
 js/src/jsapi-tests/testArgumentsObject.cpp    |  2 +-
 js/src/jsapi-tests/testArrayBuffer.cpp        |  2 +-
 js/src/jsapi-tests/testBug604087.cpp          |  2 +-
 js/src/jsapi-tests/testClassGetter.cpp        |  2 +-
 js/src/jsapi-tests/testCloneScript.cpp        |  2 +-
 js/src/jsapi-tests/testContexts.cpp           |  6 ++-
 js/src/jsapi-tests/testDebugger.cpp           |  2 +-
 js/src/jsapi-tests/testDeepFreeze.cpp         |  2 +-
 .../testDefineGetterSetterNonEnumerable.cpp   |  2 +-
 js/src/jsapi-tests/testDefineProperty.cpp     |  2 +-
 js/src/jsapi-tests/testEnclosingFunction.cpp  |  2 +-
 js/src/jsapi-tests/testErrorCopying.cpp       |  2 +-
 js/src/jsapi-tests/testFindSCCs.cpp           |  2 +-
 js/src/jsapi-tests/testFunctionProperties.cpp |  2 +-
 js/src/jsapi-tests/testGCOutOfMemory.cpp      |  2 +-
 js/src/jsapi-tests/testGetPropertyDefault.cpp |  2 +-
 js/src/jsapi-tests/testIndexToString.cpp      |  2 +-
 js/src/jsapi-tests/testIntString.cpp          |  2 +-
 js/src/jsapi-tests/testJSEvaluateScript.cpp   |  2 +-
 js/src/jsapi-tests/testLookup.cpp             |  2 +-
 js/src/jsapi-tests/testNewObject.cpp          |  2 +-
 js/src/jsapi-tests/testOps.cpp                |  2 +-
 js/src/jsapi-tests/testParseJSON.cpp          |  2 +-
 js/src/jsapi-tests/testProfileStrings.cpp     |  2 +-
 js/src/jsapi-tests/testPropCache.cpp          |  2 +-
 .../testRegExpInstanceProperties.cpp          |  2 +-
 js/src/jsapi-tests/testResolveRecursion.cpp   |  2 +-
 js/src/jsapi-tests/testSameValue.cpp          |  2 +-
 js/src/jsapi-tests/testScriptInfo.cpp         |  2 +-
 js/src/jsapi-tests/testScriptObject.cpp       |  2 +-
 js/src/jsapi-tests/testSetProperty.cpp        |  2 +-
 js/src/jsapi-tests/testStringBuffer.cpp       |  2 +-
 js/src/jsapi-tests/testTrap.cpp               |  2 +-
 js/src/jsapi-tests/testTypedArrays.cpp        |  2 +-
 js/src/jsapi-tests/testUTF8.cpp               |  2 +-
 js/src/jsapi-tests/testXDR.cpp                |  2 +-
 js/src/jsapi-tests/tests.cpp                  |  3 +-
 js/src/jsapi-tests/tests.h                    |  3 +-
 js/src/jsapi-tests/valueABI.c                 |  3 +-
 js/src/jsapi.cpp                              |  5 ++-
 js/src/jsapi.h                                |  3 +-
 js/src/jsarray.cpp                            |  3 +-
 js/src/jsarray.h                              |  2 +-
 js/src/jsatom.cpp                             |  2 +-
 js/src/jsatom.h                               |  2 +-
 js/src/jsatominlines.h                        |  4 +-
 js/src/jsbool.cpp                             |  2 +-
 js/src/jsbool.h                               |  4 +-
 js/src/jsboolinlines.h                        |  4 +-
 js/src/jsclass.h                              |  5 ++-
 js/src/jsclist.h                              |  5 +--
 js/src/jsclone.cpp                            |  1 -
 js/src/jsclone.h                              |  1 -
 js/src/jscntxt.cpp                            |  5 ++-
 js/src/jscntxt.h                              |  3 +-
 js/src/jscntxtinlines.h                       |  5 ++-
 js/src/jscompartment.cpp                      |  5 ++-
 js/src/jscompartment.h                        |  5 ++-
 js/src/jscompartmentinlines.h                 |  5 ++-
 js/src/jscpucfg.h                             |  4 +-
 js/src/jscrashformat.h                        |  5 ++-
 js/src/jscrashreport.cpp                      |  5 ++-
 js/src/jscrashreport.h                        |  5 ++-
 js/src/jsdate.cpp                             |  3 +-
 js/src/jsdate.h                               |  4 +-
 js/src/jsdbgapi.cpp                           |  3 +-
 js/src/jsdbgapi.h                             |  3 +-
 js/src/jsdhash.cpp                            |  5 +--
 js/src/jsdhash.h                              |  5 +--
 js/src/jsdtoa.cpp                             |  2 +-
 js/src/jsdtoa.h                               |  4 +-
 js/src/jsexn.cpp                              |  3 +-
 js/src/jsexn.h                                |  4 +-
 js/src/jsfriendapi.cpp                        |  5 ++-
 js/src/jsfriendapi.h                          |  2 +-
 js/src/jsfun.cpp                              |  5 ++-
 js/src/jsfun.h                                |  4 +-
 js/src/jsfuninlines.h                         |  5 ++-
 js/src/jsgc.cpp                               |  3 +-
 js/src/jsgc.h                                 |  2 +-
 js/src/jsgcinlines.h                          |  2 +-
 js/src/jsinfer.cpp                            |  6 +--
 js/src/jsinfer.h                              |  6 +--
 js/src/jsinferinlines.h                       |  6 +--
 js/src/jsinterp.cpp                           |  5 ++-
 js/src/jsinterp.h                             |  5 ++-
 js/src/jsinterpinlines.h                      |  5 ++-
 js/src/jsiter.cpp                             |  3 +-
 js/src/jsiter.h                               |  3 +-
 js/src/jskwgen.cpp                            |  3 +-
 js/src/jslibmath.h                            |  5 ++-
 js/src/jslock.h                               |  3 +-
 js/src/jslog2.cpp                             |  5 +--
 js/src/jsmath.cpp                             |  5 ++-
 js/src/jsmath.h                               |  4 +-
 js/src/jsmemorymetrics.cpp                    |  5 ++-
 js/src/jsnativestack.cpp                      |  5 ++-
 js/src/jsnativestack.h                        |  5 ++-
 js/src/jsnum.cpp                              |  2 +-
 js/src/jsnum.h                                |  4 +-
 js/src/jsnuminlines.h                         |  4 +-
 js/src/jsobj.cpp                              |  3 +-
 js/src/jsobj.h                                |  3 +-
 js/src/jsobjinlines.h                         |  3 +-
 js/src/json.cpp                               |  3 +-
 js/src/json.h                                 |  4 +-
 js/src/jsonparser.cpp                         |  3 +-
 js/src/jsonparser.h                           |  3 +-
 js/src/jsopcode.cpp                           |  5 ++-
 js/src/jsopcode.h                             |  4 +-
 js/src/jsopcodeinlines.h                      |  4 +-
 js/src/jsoplengen.cpp                         |  3 +-
 js/src/jsprf.cpp                              |  5 +--
 js/src/jsprf.h                                |  5 +--
 js/src/jsprobes.cpp                           |  3 +-
 js/src/jsprobes.h                             |  5 ++-
 js/src/jspropertycache.cpp                    |  5 ++-
 js/src/jspropertycache.h                      |  3 +-
 js/src/jspropertycacheinlines.h               |  3 +-
 js/src/jspropertytree.cpp                     |  6 +--
 js/src/jspropertytree.h                       |  6 +--
 js/src/jsprototypes.h                         |  5 ++-
 js/src/jsproxy.cpp                            |  9 ++--
 js/src/jsproxy.h                              |  5 ++-
 js/src/jsprvtd.h                              |  2 +-
 js/src/jspubtd.h                              |  2 +-
 js/src/jsreflect.cpp                          |  5 ++-
 js/src/jsreflect.h                            |  5 ++-
 js/src/jsscript.cpp                           |  3 +-
 js/src/jsscript.h                             |  3 +-
 js/src/jsscriptinlines.h                      |  3 +-
 js/src/jsstr.cpp                              |  5 ++-
 js/src/jsstr.h                                |  5 ++-
 js/src/jsstrinlines.h                         |  4 +-
 js/src/jstypedarray.cpp                       |  6 +--
 js/src/jstypedarray.h                         |  6 +--
 js/src/jstypedarrayinlines.h                  |  6 +--
 js/src/jstypes.h                              |  5 +--
 js/src/jsutil.cpp                             |  4 +-
 js/src/jsutil.h                               |  4 +-
 js/src/jsversion.h                            |  4 +-
 js/src/jswatchpoint.cpp                       |  2 +-
 js/src/jswatchpoint.h                         |  2 +-
 js/src/jsweakcache.h                          |  5 ++-
 js/src/jsweakmap.cpp                          |  5 ++-
 js/src/jsweakmap.h                            |  5 ++-
 js/src/jswin.h                                |  4 +-
 js/src/jsworkers.cpp                          |  6 +--
 js/src/jsworkers.h                            |  6 +--
 js/src/jswrapper.cpp                          |  5 ++-
 js/src/jswrapper.h                            |  5 ++-
 js/src/methodjit/BaseAssembler.h              |  5 ++-
 js/src/methodjit/BaseCompiler.h               |  5 ++-
 js/src/methodjit/CodeGenIncludes.h            |  5 ++-
 js/src/methodjit/Compiler.cpp                 |  5 ++-
 js/src/methodjit/Compiler.h                   |  5 ++-
 js/src/methodjit/FastArithmetic.cpp           |  5 ++-
 js/src/methodjit/FastBuiltins.cpp             |  5 ++-
 js/src/methodjit/FastOps.cpp                  |  5 ++-
 js/src/methodjit/FrameEntry.h                 |  5 ++-
 js/src/methodjit/FrameState-inl.h             |  5 ++-
 js/src/methodjit/FrameState.cpp               |  5 ++-
 js/src/methodjit/FrameState.h                 |  5 ++-
 js/src/methodjit/ICChecker.h                  |  5 ++-
 js/src/methodjit/ICLabels.h                   |  5 ++-
 js/src/methodjit/ICRepatcher.h                |  5 ++-
 js/src/methodjit/ImmutableSync.cpp            |  5 ++-
 js/src/methodjit/ImmutableSync.h              |  5 ++-
 js/src/methodjit/InlineFrameAssembler.h       |  5 ++-
 js/src/methodjit/InvokeHelpers.cpp            |  5 ++-
 js/src/methodjit/Logging.cpp                  |  5 ++-
 js/src/methodjit/Logging.h                    |  5 ++-
 js/src/methodjit/LoopState.cpp                |  5 ++-
 js/src/methodjit/LoopState.h                  |  5 ++-
 js/src/methodjit/MachineRegs.h                |  5 ++-
 js/src/methodjit/MethodJIT.cpp                |  5 ++-
 js/src/methodjit/MethodJIT.h                  |  5 ++-
 js/src/methodjit/MonoIC.cpp                   |  5 ++-
 js/src/methodjit/MonoIC.h                     |  5 ++-
 js/src/methodjit/NunboxAssembler.h            |  5 ++-
 js/src/methodjit/PolyIC.cpp                   |  5 ++-
 js/src/methodjit/PolyIC.h                     |  5 ++-
 js/src/methodjit/PunboxAssembler.h            |  5 ++-
 js/src/methodjit/RematInfo.h                  |  5 ++-
 js/src/methodjit/Retcon.cpp                   |  5 ++-
 js/src/methodjit/Retcon.h                     |  5 ++-
 js/src/methodjit/StubCalls-inl.h              |  5 ++-
 js/src/methodjit/StubCalls.cpp                |  5 ++-
 js/src/methodjit/StubCalls.h                  |  5 ++-
 js/src/methodjit/StubCompiler.cpp             |  5 ++-
 js/src/methodjit/StubCompiler.h               |  5 ++-
 js/src/methodjit/TrampolineCompiler.cpp       |  5 ++-
 js/src/methodjit/TrampolineCompiler.h         |  5 ++-
 js/src/methodjit/TrampolineMIPS.cpp           |  5 ++-
 js/src/methodjit/TypedArrayIC.h               |  5 ++-
 js/src/perf/jsperf.cpp                        |  2 +-
 js/src/perf/jsperf.h                          |  2 +-
 js/src/perf/pm_linux.cpp                      |  2 +-
 js/src/perf/pm_stub.cpp                       |  2 +-
 js/src/prmjtime.cpp                           |  2 +-
 js/src/prmjtime.h                             |  4 +-
 js/src/shell/js.cpp                           |  3 +-
 js/src/shell/jsheaptools.cpp                  |  3 +-
 js/src/shell/jsheaptools.h                    |  3 +-
 js/src/shell/jsoptparse.cpp                   |  3 +-
 js/src/shell/jsoptparse.h                     |  3 +-
 .../ecma_2/Exceptions/exception-010-n.js      |  1 +
 .../ecma_2/Exceptions/exception-011-n.js      |  1 +
 .../ecma_2/FunctionObjects/apply-001-n.js     |  1 +
 .../tests/ecma_3/Exceptions/regress-58946.js  |  1 +
 .../tests/ecma_3/ExecutionContexts/10.1.3.js  |  1 +
 .../ecma_3/ExecutionContexts/10.1.4-1.js      |  1 +
 .../ecma_3/ExecutionContexts/regress-23346.js |  1 +
 js/src/tests/ecma_3/FunExpr/fe-001-n.js       |  1 +
 js/src/tests/ecma_3/FunExpr/fe-001.js         |  1 +
 js/src/tests/ecma_3/FunExpr/fe-002.js         |  1 +
 .../ecma_3/NumberFormatting/tostring-001.js   |  1 +
 js/src/tests/ecma_3/RegExp/regress-24712.js   |  1 +
 js/src/tests/ecma_3/RegExp/regress-28686.js   |  1 +
 js/src/tests/ecma_3/Unicode/uc-001-n.js       |  1 +
 js/src/tests/ecma_3/Unicode/uc-001.js         |  1 +
 js/src/tests/ecma_3/Unicode/uc-002-n.js       |  1 +
 js/src/tests/ecma_3/Unicode/uc-002.js         |  1 +
 js/src/tests/ecma_3/Unicode/uc-003.js         |  1 +
 js/src/tests/ecma_3/Unicode/uc-004.js         |  1 +
 .../js1_5/Exceptions/catchguard-002-n.js      |  1 +
 .../js1_5/Exceptions/catchguard-003-n.js      |  1 +
 js/src/tests/js1_5/GetSet/getset-002.js       |  1 +
 .../js1_5/extensions/catchguard-001-n.js      |  1 +
 .../tests/js1_5/extensions/catchguard-001.js  |  1 +
 .../tests/js1_5/extensions/catchguard-002.js  |  1 +
 .../tests/js1_5/extensions/catchguard-003.js  |  1 +
 js/src/tests/js1_5/extensions/getset-001.js   |  1 +
 .../tests/js1_5/extensions/regress-50447-1.js |  1 +
 .../tests/js1_5/extensions/regress-50447.js   |  1 +
 js/src/tests/js1_6/shell.js                   |  1 +
 js/src/tests/js1_7/shell.js                   |  1 +
 js/src/tests/js1_8/shell.js                   |  1 +
 js/src/tests/js1_8_1/shell.js                 |  1 +
 js/src/tests/shell.js                         |  1 +
 js/src/vm/ArgumentsObject-inl.h               |  3 +-
 js/src/vm/ArgumentsObject.cpp                 |  3 +-
 js/src/vm/ArgumentsObject.h                   |  3 +-
 js/src/vm/BooleanObject-inl.h                 |  3 +-
 js/src/vm/BooleanObject.h                     |  3 +-
 js/src/vm/CharacterEncoding.cpp               |  3 +-
 js/src/vm/CommonPropertyNames.h               |  5 ++-
 js/src/vm/DateTime.cpp                        |  6 +--
 js/src/vm/DateTime.h                          |  6 +--
 js/src/vm/Debugger.cpp                        |  5 ++-
 js/src/vm/Debugger.h                          |  5 ++-
 js/src/vm/ForkJoin.cpp                        |  3 +-
 js/src/vm/ForkJoin.h                          |  3 +-
 js/src/vm/GlobalObject-inl.h                  |  3 +-
 js/src/vm/GlobalObject.cpp                    |  3 +-
 js/src/vm/GlobalObject.h                      |  3 +-
 js/src/vm/Keywords.h                          |  5 ++-
 js/src/vm/MatchPairs.h                        |  5 ++-
 js/src/vm/Monitor.cpp                         |  3 +-
 js/src/vm/Monitor.h                           |  3 +-
 js/src/vm/NumberObject-inl.h                  |  3 +-
 js/src/vm/NumberObject.h                      |  3 +-
 js/src/vm/NumericConversions.h                |  7 +--
 js/src/vm/ObjectImpl-inl.h                    |  7 +--
 js/src/vm/ObjectImpl.cpp                      |  7 +--
 js/src/vm/ObjectImpl.h                        |  7 +--
 js/src/vm/ParallelDo.cpp                      |  5 ++-
 js/src/vm/ParallelDo.h                        |  5 ++-
 js/src/vm/PropertyKey.cpp                     |  2 +-
 js/src/vm/RegExpObject-inl.h                  |  5 ++-
 js/src/vm/RegExpObject.cpp                    |  5 ++-
 js/src/vm/RegExpObject.h                      |  5 ++-
 js/src/vm/RegExpStatics-inl.h                 |  5 ++-
 js/src/vm/RegExpStatics.cpp                   |  5 ++-
 js/src/vm/RegExpStatics.h                     |  5 ++-
 js/src/vm/SPSProfiler.cpp                     |  5 ++-
 js/src/vm/SPSProfiler.h                       |  5 ++-
 js/src/vm/ScopeObject-inl.h                   |  3 +-
 js/src/vm/ScopeObject.cpp                     |  5 ++-
 js/src/vm/ScopeObject.h                       |  3 +-
 js/src/vm/SelfHosting.cpp                     |  5 ++-
 js/src/vm/Shape-inl.h                         |  5 +--
 js/src/vm/Shape.cpp                           |  3 +-
 js/src/vm/Shape.h                             |  5 ++-
 js/src/vm/Stack-inl.h                         |  5 ++-
 js/src/vm/Stack.cpp                           |  5 ++-
 js/src/vm/Stack.h                             |  5 ++-
 js/src/vm/String-inl.h                        |  5 ++-
 js/src/vm/String.cpp                          |  5 ++-
 js/src/vm/String.h                            |  5 ++-
 js/src/vm/StringBuffer.cpp                    |  6 +--
 js/src/vm/StringBuffer.h                      |  6 +--
 js/src/vm/StringObject-inl.h                  |  3 +-
 js/src/vm/StringObject.h                      |  3 +-
 js/src/vm/ThreadPool.cpp                      |  6 +--
 js/src/vm/ThreadPool.h                        |  3 +-
 js/src/vm/Unicode.h                           |  4 +-
 js/src/vm/Xdr.cpp                             |  2 +-
 js/src/vm/Xdr.h                               |  3 +-
 js/src/yarr/ASCIICType.h                      |  4 +-
 js/src/yarr/BumpPointerAllocator.h            |  4 +-
 js/src/yarr/CheckedArithmetic.h               |  3 +-
 js/src/yarr/MatchResult.h                     |  4 +-
 js/src/yarr/OSAllocator.h                     |  4 +-
 js/src/yarr/OSAllocatorOS2.cpp                |  4 +-
 js/src/yarr/OSAllocatorPosix.cpp              |  4 +-
 js/src/yarr/OSAllocatorWin.cpp                |  4 +-
 js/src/yarr/PageAllocation.h                  |  4 +-
 js/src/yarr/PageBlock.cpp                     |  4 +-
 js/src/yarr/PageBlock.h                       |  4 +-
 js/src/yarr/VMTags.h                          |  4 +-
 js/src/yarr/Yarr.h                            |  4 +-
 js/src/yarr/YarrCanonicalizeUCS2.cpp          |  4 +-
 js/src/yarr/YarrCanonicalizeUCS2.h            |  4 +-
 js/src/yarr/YarrInterpreter.cpp               |  4 +-
 js/src/yarr/YarrInterpreter.h                 |  4 +-
 js/src/yarr/YarrJIT.cpp                       |  3 +-
 js/src/yarr/YarrJIT.h                         |  3 +-
 js/src/yarr/YarrParser.h                      |  3 +-
 js/src/yarr/YarrPattern.cpp                   |  3 +-
 js/src/yarr/YarrPattern.h                     |  3 +-
 js/src/yarr/YarrSyntaxChecker.cpp             |  4 +-
 js/src/yarr/YarrSyntaxChecker.h               |  4 +-
 js/src/yarr/wtfbridge.h                       |  6 +--
 733 files changed, 1725 insertions(+), 1279 deletions(-)

diff --git a/js/ipc/CPOWTypes.h b/js/ipc/CPOWTypes.h
index 56d84cd3f717..46195f9ee72d 100644
--- a/js/ipc/CPOWTypes.h
+++ b/js/ipc/CPOWTypes.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/ipc/ContextWrapperChild.h b/js/ipc/ContextWrapperChild.h
index b6d1c9505c17..ec42b78ba6d7 100644
--- a/js/ipc/ContextWrapperChild.h
+++ b/js/ipc/ContextWrapperChild.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/ipc/ContextWrapperParent.h b/js/ipc/ContextWrapperParent.h
index 671521b36b2a..01fca526411d 100644
--- a/js/ipc/ContextWrapperParent.h
+++ b/js/ipc/ContextWrapperParent.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/ipc/ObjectWrapperChild.cpp b/js/ipc/ObjectWrapperChild.cpp
index 247eaf0605fd..7c90e3612cb0 100644
--- a/js/ipc/ObjectWrapperChild.cpp
+++ b/js/ipc/ObjectWrapperChild.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/ipc/ObjectWrapperChild.h b/js/ipc/ObjectWrapperChild.h
index f9a270cacce5..dff0afd2f9a9 100644
--- a/js/ipc/ObjectWrapperChild.h
+++ b/js/ipc/ObjectWrapperChild.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/ipc/ObjectWrapperParent.cpp b/js/ipc/ObjectWrapperParent.cpp
index 54b81d11681c..9a80c99e7690 100644
--- a/js/ipc/ObjectWrapperParent.cpp
+++ b/js/ipc/ObjectWrapperParent.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
@@ -690,4 +691,4 @@ ObjectWrapperParent::CPOW_HasInstance(JSContext *cx, JSHandleObject obj, JSMutab
             self->CallHasInstance(in_v,
                                   aco.StatusPtr(), bp) &&
             aco.Ok());
-}
+}
\ No newline at end of file
diff --git a/js/ipc/ObjectWrapperParent.h b/js/ipc/ObjectWrapperParent.h
index af147b1f800d..a389b52956d9 100644
--- a/js/ipc/ObjectWrapperParent.h
+++ b/js/ipc/ObjectWrapperParent.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/jsd/jsd.h b/js/jsd/jsd.h
index a5dab01407a8..c0043b986a74 100644
--- a/js/jsd/jsd.h
+++ b/js/jsd/jsd.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_atom.cpp b/js/jsd/jsd_atom.cpp
index dec6b391457a..5517b997d644 100644
--- a/js/jsd/jsd_atom.cpp
+++ b/js/jsd/jsd_atom.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_high.cpp b/js/jsd/jsd_high.cpp
index 7887f8fc73e2..3a7bea446e36 100644
--- a/js/jsd/jsd_high.cpp
+++ b/js/jsd/jsd_high.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_hook.cpp b/js/jsd/jsd_hook.cpp
index 95e631804472..9f8fa947f082 100644
--- a/js/jsd/jsd_hook.cpp
+++ b/js/jsd/jsd_hook.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_java.cpp b/js/jsd/jsd_java.cpp
index c5c0aec2aaf9..4bfcccde93ba 100644
--- a/js/jsd/jsd_java.cpp
+++ b/js/jsd/jsd_java.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_lock.cpp b/js/jsd/jsd_lock.cpp
index 628d2fd621e7..c8a827b8f941 100644
--- a/js/jsd/jsd_lock.cpp
+++ b/js/jsd/jsd_lock.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_lock.h b/js/jsd/jsd_lock.h
index b1e8c31053bd..a3eb821be953 100644
--- a/js/jsd/jsd_lock.h
+++ b/js/jsd/jsd_lock.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_obj.cpp b/js/jsd/jsd_obj.cpp
index cc0e8bb754bf..dc7c927cab99 100644
--- a/js/jsd/jsd_obj.cpp
+++ b/js/jsd/jsd_obj.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_scpt.cpp b/js/jsd/jsd_scpt.cpp
index 67c53f92791d..f4ef023d45ea 100644
--- a/js/jsd/jsd_scpt.cpp
+++ b/js/jsd/jsd_scpt.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_stak.cpp b/js/jsd/jsd_stak.cpp
index 7dac8eb3befd..8e5fbb384aa5 100644
--- a/js/jsd/jsd_stak.cpp
+++ b/js/jsd/jsd_stak.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_step.cpp b/js/jsd/jsd_step.cpp
index da1886a2b03f..0396a5cb7318 100644
--- a/js/jsd/jsd_step.cpp
+++ b/js/jsd/jsd_step.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_text.cpp b/js/jsd/jsd_text.cpp
index ab11e82eac8b..bc851a3def41 100644
--- a/js/jsd/jsd_text.cpp
+++ b/js/jsd/jsd_text.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_val.cpp b/js/jsd/jsd_val.cpp
index 97385a98af32..a8cad6d005a9 100644
--- a/js/jsd/jsd_val.cpp
+++ b/js/jsd/jsd_val.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsd_xpc.cpp b/js/jsd/jsd_xpc.cpp
index ea1ef4b837dd..8ce10b932552 100644
--- a/js/jsd/jsd_xpc.cpp
+++ b/js/jsd/jsd_xpc.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/jsd/jsd_xpc.h b/js/jsd/jsd_xpc.h
index 4dbfe7cab405..da383e30f9d9 100644
--- a/js/jsd/jsd_xpc.h
+++ b/js/jsd/jsd_xpc.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/jsd/jsdebug.cpp b/js/jsd/jsdebug.cpp
index 7e893c69d149..06954cead55f 100644
--- a/js/jsd/jsdebug.cpp
+++ b/js/jsd/jsdebug.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsdebug.h b/js/jsd/jsdebug.h
index a3a05eeb1f15..0971ba121f17 100644
--- a/js/jsd/jsdebug.h
+++ b/js/jsd/jsdebug.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jsdstubs.cpp b/js/jsd/jsdstubs.cpp
index 22420410251c..68cf75b79889 100644
--- a/js/jsd/jsdstubs.cpp
+++ b/js/jsd/jsdstubs.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
 
diff --git a/js/jsd/jshash.cpp b/js/jsd/jshash.cpp
index d4caf2ce833f..6ae4e549ea34 100644
--- a/js/jsd/jshash.cpp
+++ b/js/jsd/jshash.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/jsd/jshash.h b/js/jsd/jshash.h
index e21c7b786a04..5c44b7ba964a 100644
--- a/js/jsd/jshash.h
+++ b/js/jsd/jshash.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/jsd/resource.h b/js/jsd/resource.h
index 69874fe0ff30..d40e61ae13d1 100644
--- a/js/jsd/resource.h
+++ b/js/jsd/resource.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
 
diff --git a/js/public/Anchor.h b/js/public/Anchor.h
index d0c2476cf726..166ada5cd28e 100644
--- a/js/public/Anchor.h
+++ b/js/public/Anchor.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/public/CallArgs.h b/js/public/CallArgs.h
index 5b474f0ac3b3..6ecc4273de8d 100644
--- a/js/public/CallArgs.h
+++ b/js/public/CallArgs.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/public/CharacterEncoding.h b/js/public/CharacterEncoding.h
index 63e5cc6650ca..36d8670a0821 100644
--- a/js/public/CharacterEncoding.h
+++ b/js/public/CharacterEncoding.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/public/GCAPI.h b/js/public/GCAPI.h
index 80d8f8a426fb..1231ca97b9f9 100644
--- a/js/public/GCAPI.h
+++ b/js/public/GCAPI.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+ */
+/* 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/. */
 
 #ifndef js_gc_api_h___
 #define js_gc_api_h___
diff --git a/js/public/HashTable.h b/js/public/HashTable.h
index acd4e310ac79..5cc7ea4e8b9e 100644
--- a/js/public/HashTable.h
+++ b/js/public/HashTable.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/public/HeapAPI.h b/js/public/HeapAPI.h
index cd50b7e1bbcb..47cb5602123d 100644
--- a/js/public/HeapAPI.h
+++ b/js/public/HeapAPI.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+ */
+/* 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/. */
 
 #ifndef js_heap_api_h___
 #define js_heap_api_h___
diff --git a/js/public/LegacyIntTypes.h b/js/public/LegacyIntTypes.h
index 387a68b9e9d1..30944efda61e 100644
--- a/js/public/LegacyIntTypes.h
+++ b/js/public/LegacyIntTypes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
 
diff --git a/js/public/MemoryMetrics.h b/js/public/MemoryMetrics.h
index e5f9ea3b5bce..14cf88ec4c60 100644
--- a/js/public/MemoryMetrics.h
+++ b/js/public/MemoryMetrics.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/public/PropertyKey.h b/js/public/PropertyKey.h
index 53158c26f30f..5d048195f51e 100644
--- a/js/public/PropertyKey.h
+++ b/js/public/PropertyKey.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/public/RequiredDefines.h b/js/public/RequiredDefines.h
index 2be2efbf9a3b..8dc47e251c95 100644
--- a/js/public/RequiredDefines.h
+++ b/js/public/RequiredDefines.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
index 5d139292fe38..9f9fa9df53f0 100644
--- a/js/public/RootingAPI.h
+++ b/js/public/RootingAPI.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/public/TemplateLib.h b/js/public/TemplateLib.h
index a4ff6829125f..58966b166f9f 100644
--- a/js/public/TemplateLib.h
+++ b/js/public/TemplateLib.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/public/Utility.h b/js/public/Utility.h
index 2a883323ff63..70f09d6b22a9 100644
--- a/js/public/Utility.h
+++ b/js/public/Utility.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/public/Value.h b/js/public/Value.h
index 57e951a1defd..a9a7bfd40005 100644
--- a/js/public/Value.h
+++ b/js/public/Value.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/public/Vector.h b/js/public/Vector.h
index 5f40dd634b8c..b8e2ea698504 100644
--- a/js/public/Vector.h
+++ b/js/public/Vector.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/TraceLogging.cpp b/js/src/TraceLogging.cpp
index 1c64a67fd68d..49fe2d3e8ace 100644
--- a/js/src/TraceLogging.cpp
+++ b/js/src/TraceLogging.cpp
@@ -1,8 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=4 sw=4 et tw=79: */
+/* 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 "TraceLogging.h"
 #include <cstdarg>
diff --git a/js/src/TraceLogging.h b/js/src/TraceLogging.h
index 2e6d5ba9ac38..eebadfc1e14d 100644
--- a/js/src/TraceLogging.h
+++ b/js/src/TraceLogging.h
@@ -1,8 +1,8 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=4 sw=4 et tw=79: */
+/* 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/. */
 
 #if !defined(TraceLogging_h__)
 #define TraceLogging_h__
diff --git a/js/src/assembler/assembler/ARMAssembler.cpp b/js/src/assembler/assembler/ARMAssembler.cpp
index 18f742b80b6a..a9ada8e9a2c5 100644
--- a/js/src/assembler/assembler/ARMAssembler.cpp
+++ b/js/src/assembler/assembler/ARMAssembler.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/ARMAssembler.h b/js/src/assembler/assembler/ARMAssembler.h
index 2c1d712158d8..e04b251b7439 100644
--- a/js/src/assembler/assembler/ARMAssembler.h
+++ b/js/src/assembler/assembler/ARMAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009, 2010 University of Szeged
diff --git a/js/src/assembler/assembler/ARMv7Assembler.h b/js/src/assembler/assembler/ARMv7Assembler.h
index 1a83139887fd..1f96585ee16c 100644
--- a/js/src/assembler/assembler/ARMv7Assembler.h
+++ b/js/src/assembler/assembler/ARMv7Assembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AbstractMacroAssembler.h b/js/src/assembler/assembler/AbstractMacroAssembler.h
index 2bfb275b6884..286fad954742 100644
--- a/js/src/assembler/assembler/AbstractMacroAssembler.h
+++ b/js/src/assembler/assembler/AbstractMacroAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AssemblerBuffer.h b/js/src/assembler/assembler/AssemblerBuffer.h
index a2e7c3840331..d21182527b52 100644
--- a/js/src/assembler/assembler/AssemblerBuffer.h
+++ b/js/src/assembler/assembler/AssemblerBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
index 2578692dc47a..467f9c9e8cbe 100644
--- a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
+++ b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/CodeLocation.h b/js/src/assembler/assembler/CodeLocation.h
index d9bc6d4175fb..490157688614 100644
--- a/js/src/assembler/assembler/CodeLocation.h
+++ b/js/src/assembler/assembler/CodeLocation.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/LinkBuffer.h b/js/src/assembler/assembler/LinkBuffer.h
index 1e6fb4b35249..35913c87aaf7 100644
--- a/js/src/assembler/assembler/LinkBuffer.h
+++ b/js/src/assembler/assembler/LinkBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssembler.h b/js/src/assembler/assembler/MacroAssembler.h
index 2b77445e14cf..8bf9c0b0a80e 100644
--- a/js/src/assembler/assembler/MacroAssembler.h
+++ b/js/src/assembler/assembler/MacroAssembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerARM.cpp b/js/src/assembler/assembler/MacroAssemblerARM.cpp
index 9c76e8fd43e7..89db1e2d859e 100644
--- a/js/src/assembler/assembler/MacroAssemblerARM.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerARM.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 University of Szeged
diff --git a/js/src/assembler/assembler/MacroAssemblerARM.h b/js/src/assembler/assembler/MacroAssemblerARM.h
index 6e18c54b84dc..831ccbb8a183 100644
--- a/js/src/assembler/assembler/MacroAssemblerARM.h
+++ b/js/src/assembler/assembler/MacroAssemblerARM.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc.
diff --git a/js/src/assembler/assembler/MacroAssemblerARMv7.h b/js/src/assembler/assembler/MacroAssemblerARMv7.h
index 0abeb2b31de0..2bdb6e8fdb5e 100644
--- a/js/src/assembler/assembler/MacroAssemblerARMv7.h
+++ b/js/src/assembler/assembler/MacroAssemblerARMv7.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerCodeRef.h b/js/src/assembler/assembler/MacroAssemblerCodeRef.h
index bcf3903f9b13..101ffcb098d5 100644
--- a/js/src/assembler/assembler/MacroAssemblerCodeRef.h
+++ b/js/src/assembler/assembler/MacroAssemblerCodeRef.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerSparc.h b/js/src/assembler/assembler/MacroAssemblerSparc.h
index 3692b3e0b272..1d89f17790e7 100644
--- a/js/src/assembler/assembler/MacroAssemblerSparc.h
+++ b/js/src/assembler/assembler/MacroAssemblerSparc.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/MacroAssemblerX86.h b/js/src/assembler/assembler/MacroAssemblerX86.h
index c782ad60d006..c6ab40f587fa 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerX86Common.cpp b/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
index e65b2a3d7c62..b94a345ff649 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/MacroAssemblerX86Common.h b/js/src/assembler/assembler/MacroAssemblerX86Common.h
index b0bef29120c2..30bb1ed26afc 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/MacroAssemblerX86_64.h b/js/src/assembler/assembler/MacroAssemblerX86_64.h
index c3be4145695a..c4b67dcaeb03 100644
--- a/js/src/assembler/assembler/MacroAssemblerX86_64.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86_64.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/RepatchBuffer.h b/js/src/assembler/assembler/RepatchBuffer.h
index 0a3deb3c27d2..003479211b43 100644
--- a/js/src/assembler/assembler/RepatchBuffer.h
+++ b/js/src/assembler/assembler/RepatchBuffer.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2009 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/assembler/SparcAssembler.h b/js/src/assembler/assembler/SparcAssembler.h
index 19217a7cafd0..4e3d5b14559a 100644
--- a/js/src/assembler/assembler/SparcAssembler.h
+++ b/js/src/assembler/assembler/SparcAssembler.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99: */
 /* 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/. */
diff --git a/js/src/assembler/assembler/X86Assembler.h b/js/src/assembler/assembler/X86Assembler.h
index 1533bdfa95e9..2293098864f3 100644
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2008 Apple Inc. All rights reserved.
diff --git a/js/src/assembler/jit/ExecutableAllocator.cpp b/js/src/assembler/jit/ExecutableAllocator.cpp
index bd8b1d3ba24d..59e1c259b673 100644
--- a/js/src/assembler/jit/ExecutableAllocator.cpp
+++ b/js/src/assembler/jit/ExecutableAllocator.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
diff --git a/js/src/assembler/moco/MocoStubs.h b/js/src/assembler/moco/MocoStubs.h
index df3d1f979745..7ce6da5e329b 100644
--- a/js/src/assembler/moco/MocoStubs.h
+++ b/js/src/assembler/moco/MocoStubs.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/Eval.cpp b/js/src/builtin/Eval.cpp
index a5c203d5b342..a29c89517709 100644
--- a/js/src/builtin/Eval.cpp
+++ b/js/src/builtin/Eval.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/src/builtin/Eval.h b/js/src/builtin/Eval.h
index 133c4b28ebcb..e6eaeefa5b04 100644
--- a/js/src/builtin/Eval.h
+++ b/js/src/builtin/Eval.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/Intl.cpp b/js/src/builtin/Intl.cpp
index 4c49405d8909..d3463125da23 100644
--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/Intl.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/builtin/Intl.h b/js/src/builtin/Intl.h
index eefec5dbcaaa..3db27dc63767 100644
--- a/js/src/builtin/Intl.h
+++ b/js/src/builtin/Intl.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/builtin/Iterator-inl.h b/js/src/builtin/Iterator-inl.h
index e6c838cdeb98..7f93219af814 100644
--- a/js/src/builtin/Iterator-inl.h
+++ b/js/src/builtin/Iterator-inl.h
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
 #ifndef Iterator_inl_h_
 #define Iterator_inl_h_
diff --git a/js/src/builtin/MapObject.cpp b/js/src/builtin/MapObject.cpp
index cff6e0a8c746..1f6258f49bcc 100644
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/MapObject.h b/js/src/builtin/MapObject.h
index f8f006472dab..3661c4cc498b 100644
--- a/js/src/builtin/MapObject.h
+++ b/js/src/builtin/MapObject.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/Module.cpp b/js/src/builtin/Module.cpp
index 4acec92e6e5b..d70ec483e11e 100644
--- a/js/src/builtin/Module.cpp
+++ b/js/src/builtin/Module.cpp
@@ -1,9 +1,3 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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 "jsobjinlines.h"
 #include "builtin/Module.h"
 
diff --git a/js/src/builtin/Module.h b/js/src/builtin/Module.h
index f1bdef1ef1ba..7a6386ebc434 100644
--- a/js/src/builtin/Module.h
+++ b/js/src/builtin/Module.h
@@ -1,9 +1,3 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
-
 #ifndef Module_h___
 #define Module_h___
 
diff --git a/js/src/builtin/Object.cpp b/js/src/builtin/Object.cpp
index 8171d873284b..188911c74896 100644
--- a/js/src/builtin/Object.cpp
+++ b/js/src/builtin/Object.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/Object.h b/js/src/builtin/Object.h
index c6a29225e957..a08fcdfb818e 100644
--- a/js/src/builtin/Object.h
+++ b/js/src/builtin/Object.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/ParallelArray.cpp b/js/src/builtin/ParallelArray.cpp
index 49bb5a05cd10..c98771d047e4 100644
--- a/js/src/builtin/ParallelArray.cpp
+++ b/js/src/builtin/ParallelArray.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/ParallelArray.h b/js/src/builtin/ParallelArray.h
index 443ebad5952a..d63b87872fb2 100644
--- a/js/src/builtin/ParallelArray.h
+++ b/js/src/builtin/ParallelArray.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/Profilers.cpp b/js/src/builtin/Profilers.cpp
index 853d61d89111..43b9bea178e5 100644
--- a/js/src/builtin/Profilers.cpp
+++ b/js/src/builtin/Profilers.cpp
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
 /* Profiling-related API */
 
diff --git a/js/src/builtin/Profilers.h b/js/src/builtin/Profilers.h
index 59c4e992024d..872830de12d3 100644
--- a/js/src/builtin/Profilers.h
+++ b/js/src/builtin/Profilers.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index 502ca8fc6784..eeccfcb1129c 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/RegExp.h b/js/src/builtin/RegExp.h
index 60fb782be9f9..90662e9ed8bf 100644
--- a/js/src/builtin/RegExp.h
+++ b/js/src/builtin/RegExp.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index a66d482f9d1a..e5f65c3a221b 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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 "jsapi.h"
 #include "jsbool.h"
diff --git a/js/src/builtin/TestingFunctions.h b/js/src/builtin/TestingFunctions.h
index 52b9bef76ce3..9bcb1e31d2e6 100644
--- a/js/src/builtin/TestingFunctions.h
+++ b/js/src/builtin/TestingFunctions.h
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
 #ifndef TestingFunctions_h__
 #define TestingFunctions_h__
diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
index 6ba4b7be7dae..4b29ed0ed1e5 100644
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/* 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/. */
 
diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp
index 9ad6f8fd1301..f76221331c25 100644
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/* 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/. */
 
diff --git a/js/src/devtools/jint/treesearch.py b/js/src/devtools/jint/treesearch.py
index 2cbc45335814..c06a62b88011 100644
--- a/js/src/devtools/jint/treesearch.py
+++ b/js/src/devtools/jint/treesearch.py
@@ -1,8 +1,9 @@
-# vim: set ts=8 sts=4 et sw=4 tw=99:
 # 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/.
 
+# vim: set ts=4 sw=4 tw=99 et: 
+
 import os, re
 import tempfile
 import subprocess
diff --git a/js/src/devtools/sharkctl.cpp b/js/src/devtools/sharkctl.cpp
index 86fdfc936d22..14a550247af2 100644
--- a/js/src/devtools/sharkctl.cpp
+++ b/js/src/devtools/sharkctl.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/src/devtools/sharkctl.h b/js/src/devtools/sharkctl.h
index bb3038d3ae6a..e381cfd32ba3 100644
--- a/js/src/devtools/sharkctl.h
+++ b/js/src/devtools/sharkctl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/src/ds/BitArray.h b/js/src/ds/BitArray.h
index a20796d4dbe4..4d0d0e64bb63 100644
--- a/js/src/ds/BitArray.h
+++ b/js/src/ds/BitArray.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/ds/InlineMap.h b/js/src/ds/InlineMap.h
index d11172463de8..68ca36fb3973 100644
--- a/js/src/ds/InlineMap.h
+++ b/js/src/ds/InlineMap.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/ds/LifoAlloc.cpp b/js/src/ds/LifoAlloc.cpp
index b9621600f512..c019a7ca12d5 100644
--- a/js/src/ds/LifoAlloc.cpp
+++ b/js/src/ds/LifoAlloc.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/ds/LifoAlloc.h b/js/src/ds/LifoAlloc.h
index 167a61c52a90..d7233c932a87 100644
--- a/js/src/ds/LifoAlloc.h
+++ b/js/src/ds/LifoAlloc.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/ds/PriorityQueue.h b/js/src/ds/PriorityQueue.h
index 8ef6531bb12f..1e9e26c918db 100644
--- a/js/src/ds/PriorityQueue.h
+++ b/js/src/ds/PriorityQueue.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/ds/Sort.h b/js/src/ds/Sort.h
index 46542e5bf882..4061f75cb4fe 100644
--- a/js/src/ds/Sort.h
+++ b/js/src/ds/Sort.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/ds/SplayTree.h b/js/src/ds/SplayTree.h
index 8df268335fa6..390282363f9f 100644
--- a/js/src/ds/SplayTree.h
+++ b/js/src/ds/SplayTree.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/editline/editline.c b/js/src/editline/editline.c
index 21946a6250b8..f98d048a4112 100644
--- a/js/src/editline/editline.c
+++ b/js/src/editline/editline.c
@@ -1,4 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/editline/editline.h b/js/src/editline/editline.h
index 0616de03a221..5895322f1be1 100644
--- a/js/src/editline/editline.h
+++ b/js/src/editline/editline.h
@@ -1,4 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/editline/sysunix.c b/js/src/editline/sysunix.c
index d45db6c79baa..0035640a29f6 100644
--- a/js/src/editline/sysunix.c
+++ b/js/src/editline/sysunix.c
@@ -1,4 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/editline/unix.h b/js/src/editline/unix.h
index ec4a762acb58..3d8687632232 100644
--- a/js/src/editline/unix.h
+++ b/js/src/editline/unix.h
@@ -1,4 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index fc891b210dd1..24fe869ecd53 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index 9f1164e69400..1b13ffe9ed13 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 8d90567bb301..336445f7ccec 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index e84c80e29f24..3b0bc3b4a31b 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/src/frontend/FoldConstants.cpp b/js/src/frontend/FoldConstants.cpp
index cbad2eb6675a..b78d821f897b 100644
--- a/js/src/frontend/FoldConstants.cpp
+++ b/js/src/frontend/FoldConstants.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/FoldConstants.h b/js/src/frontend/FoldConstants.h
index 86da781e8d80..a1bf9d14e9ad 100644
--- a/js/src/frontend/FoldConstants.h
+++ b/js/src/frontend/FoldConstants.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index 57b338de55d6..4152bc957c9c 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=4 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/frontend/NameFunctions.cpp b/js/src/frontend/NameFunctions.cpp
index 01d2585d4e88..22b9e961d2c1 100644
--- a/js/src/frontend/NameFunctions.cpp
+++ b/js/src/frontend/NameFunctions.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/NameFunctions.h b/js/src/frontend/NameFunctions.h
index adfb3920ad4d..d2f9437cd191 100644
--- a/js/src/frontend/NameFunctions.h
+++ b/js/src/frontend/NameFunctions.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/ParseMaps-inl.h b/js/src/frontend/ParseMaps-inl.h
index ceefb4c8af89..55fca1a6eb66 100644
--- a/js/src/frontend/ParseMaps-inl.h
+++ b/js/src/frontend/ParseMaps-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/frontend/ParseMaps.cpp b/js/src/frontend/ParseMaps.cpp
index 34b1c8ede742..3426d861d903 100644
--- a/js/src/frontend/ParseMaps.cpp
+++ b/js/src/frontend/ParseMaps.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/frontend/ParseMaps.h b/js/src/frontend/ParseMaps.h
index b986bb10d0b4..a8026167be12 100644
--- a/js/src/frontend/ParseMaps.h
+++ b/js/src/frontend/ParseMaps.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/frontend/ParseNode-inl.h b/js/src/frontend/ParseNode-inl.h
index 15da9b41d96e..d35c61409ec2 100644
--- a/js/src/frontend/ParseNode-inl.h
+++ b/js/src/frontend/ParseNode-inl.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  * 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/. */
diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index 26b22639f07e..f705e604db70 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 7b2acefd33a6..f280390e2609 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/Parser-inl.h b/js/src/frontend/Parser-inl.h
index b689f3bddd73..1fe084ce700f 100644
--- a/js/src/frontend/Parser-inl.h
+++ b/js/src/frontend/Parser-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index f69d4190a359..88320dad663b 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 22b006981d50..2dcab9c3242a 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=4 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/frontend/SharedContext-inl.h b/js/src/frontend/SharedContext-inl.h
index 247501f07d01..74cac685efc8 100644
--- a/js/src/frontend/SharedContext-inl.h
+++ b/js/src/frontend/SharedContext-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 7212e66d3080..4b5bfff63a06 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index 2d32ae516bee..dd0ba4faedf1 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=4 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
index 5435b683f0c7..69b9477666ab 100644
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/frontend/TokenStream.h b/js/src/frontend/TokenStream.h
index dad7e88ae2c1..0997a8049aa4 100644
--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/gc/Barrier-inl.h b/js/src/gc/Barrier-inl.h
index 0329d1e740e6..acab9ef1610d 100644
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
index 13f2a509a2e1..0a1009721abb 100644
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/FindSCCs-inl.h b/js/src/gc/FindSCCs-inl.h
index 24ae0b1de3eb..552ce53be271 100644
--- a/js/src/gc/FindSCCs-inl.h
+++ b/js/src/gc/FindSCCs-inl.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+ */
+/* 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 "jsfriendapi.h"
 
diff --git a/js/src/gc/FindSCCs.h b/js/src/gc/FindSCCs.h
index c8ed79d70a9c..ccd5f5991fbf 100644
--- a/js/src/gc/FindSCCs.h
+++ b/js/src/gc/FindSCCs.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+ */
+/* 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/. */
 
 #ifndef gc_findsccs_h___
 #define gc_findsccs_h___
diff --git a/js/src/gc/GCInternals.h b/js/src/gc/GCInternals.h
index f900778b106e..e661aac9e88e 100644
--- a/js/src/gc/GCInternals.h
+++ b/js/src/gc/GCInternals.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h
index e5e7f7b67bc9..bf73c24f80d5 100644
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+ */
+/* 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/. */
 
 #ifndef gc_heap_h___
 #define gc_heap_h___
diff --git a/js/src/gc/Iteration.cpp b/js/src/gc/Iteration.cpp
index 76693e5fecff..607fd215aef5 100644
--- a/js/src/gc/Iteration.cpp
+++ b/js/src/gc/Iteration.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index f6b18144a985..f527fb650715 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+ * vim: set ts=4 sw=4 tw=79 et:
+ */
+/* 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 "mozilla/DebugOnly.h"
 
diff --git a/js/src/gc/Marking.h b/js/src/gc/Marking.h
index 3d89bd3e607b..499becc6aad8 100644
--- a/js/src/gc/Marking.h
+++ b/js/src/gc/Marking.h
@@ -1,8 +1,9 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ */
+/* 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/. */
 
 #ifndef gc_marking_h___
 #define gc_marking_h___
diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
index 399177771718..e2bec9717391 100644
--- a/js/src/gc/Memory.cpp
+++ b/js/src/gc/Memory.cpp
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
+ * 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 "mozilla/Assertions.h"
 
diff --git a/js/src/gc/Memory.h b/js/src/gc/Memory.h
index b73c266bf2cb..bf78cd0594bc 100644
--- a/js/src/gc/Memory.h
+++ b/js/src/gc/Memory.h
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
+ * 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/. */
 
 #ifndef jsgc_memory_h___
 #define jsgc_memory_h___
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index f97bb1503c81..2f6e71da4ce6 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp
index 377c3b21b796..dcbd00f563c9 100644
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/Statistics.h b/js/src/gc/Statistics.h
index 027600bc0c64..934df0668de8 100644
--- a/js/src/gc/Statistics.h
+++ b/js/src/gc/Statistics.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/StoreBuffer.cpp b/js/src/gc/StoreBuffer.cpp
index 236fcbd1cf6e..0a1523096e28 100644
--- a/js/src/gc/StoreBuffer.cpp
+++ b/js/src/gc/StoreBuffer.cpp
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
+ * vim: set ts=8 sw=4 et tw=78:
+ */
+/* 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/. */
 
 #ifdef JSGC_GENERATIONAL
 
diff --git a/js/src/gc/StoreBuffer.h b/js/src/gc/StoreBuffer.h
index d927d098f695..5409eb02a2b5 100644
--- a/js/src/gc/StoreBuffer.h
+++ b/js/src/gc/StoreBuffer.h
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
+ * 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/. */
 
 #ifdef JSGC_GENERATIONAL
 #ifndef jsgc_storebuffer_h___
diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp
index d7f714e9679d..2a45d31f7b6e 100644
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/Zone.cpp b/js/src/gc/Zone.cpp
index 8d4be70cdbdf..49976dd6c65c 100644
--- a/js/src/gc/Zone.cpp
+++ b/js/src/gc/Zone.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index 4fb93bf50250..b9c42184afb3 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/src/gdb/gdb-tests.h b/js/src/gdb/gdb-tests.h
index e9141d51528e..70fdd8e94fc5 100644
--- a/js/src/gdb/gdb-tests.h
+++ b/js/src/gdb/gdb-tests.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * 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
diff --git a/js/src/ion/AliasAnalysis.cpp b/js/src/ion/AliasAnalysis.cpp
index 9a9ca27929c9..f90fff43905d 100644
--- a/js/src/ion/AliasAnalysis.cpp
+++ b/js/src/ion/AliasAnalysis.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/AliasAnalysis.h b/js/src/ion/AliasAnalysis.h
index 64de011e513d..36fd648e5467 100644
--- a/js/src/ion/AliasAnalysis.h
+++ b/js/src/ion/AliasAnalysis.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/AsmJS.cpp b/js/src/ion/AsmJS.cpp
index 62c1e545c98a..d268f1f922b8 100644
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/AsmJS.h b/js/src/ion/AsmJS.h
index 98b297edcbcd..b27e152e2593 100644
--- a/js/src/ion/AsmJS.h
+++ b/js/src/ion/AsmJS.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/AsmJSLink.cpp b/js/src/ion/AsmJSLink.cpp
index 977ab27b46d2..46e87e0841b1 100644
--- a/js/src/ion/AsmJSLink.cpp
+++ b/js/src/ion/AsmJSLink.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/AsmJSModule.h b/js/src/ion/AsmJSModule.h
index 72bf651c5c6a..ae5d1e89a5de 100644
--- a/js/src/ion/AsmJSModule.h
+++ b/js/src/ion/AsmJSModule.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/AsmJSSignalHandlers.cpp b/js/src/ion/AsmJSSignalHandlers.cpp
index 4e477392ea1d..0fa3af4adbc2 100644
--- a/js/src/ion/AsmJSSignalHandlers.cpp
+++ b/js/src/ion/AsmJSSignalHandlers.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BacktrackingAllocator.cpp b/js/src/ion/BacktrackingAllocator.cpp
index e42befd3ade5..491b49a3bd2f 100644
--- a/js/src/ion/BacktrackingAllocator.cpp
+++ b/js/src/ion/BacktrackingAllocator.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BacktrackingAllocator.h b/js/src/ion/BacktrackingAllocator.h
index 51b8ff62ce4e..ccf0a2e611fb 100644
--- a/js/src/ion/BacktrackingAllocator.h
+++ b/js/src/ion/BacktrackingAllocator.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Bailouts.cpp b/js/src/ion/Bailouts.cpp
index aa4f2d14a458..2cffb267d201 100644
--- a/js/src/ion/Bailouts.cpp
+++ b/js/src/ion/Bailouts.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Bailouts.h b/js/src/ion/Bailouts.h
index d9d514d9e102..8694db28b92f 100644
--- a/js/src/ion/Bailouts.h
+++ b/js/src/ion/Bailouts.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineBailouts.cpp b/js/src/ion/BaselineBailouts.cpp
index 53b7628f2f15..75e2573e594f 100644
--- a/js/src/ion/BaselineBailouts.cpp
+++ b/js/src/ion/BaselineBailouts.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineCompiler.cpp b/js/src/ion/BaselineCompiler.cpp
index 15f392397a97..c50b0d0b11b7 100644
--- a/js/src/ion/BaselineCompiler.cpp
+++ b/js/src/ion/BaselineCompiler.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineCompiler.h b/js/src/ion/BaselineCompiler.h
index 3c72e32a66c5..7e7fe1d4b6da 100644
--- a/js/src/ion/BaselineCompiler.h
+++ b/js/src/ion/BaselineCompiler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineFrame-inl.h b/js/src/ion/BaselineFrame-inl.h
index cf3226aa5360..37f82ba5019e 100644
--- a/js/src/ion/BaselineFrame-inl.h
+++ b/js/src/ion/BaselineFrame-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineFrame.cpp b/js/src/ion/BaselineFrame.cpp
index 299ef4af564c..e9d317ea54f4 100644
--- a/js/src/ion/BaselineFrame.cpp
+++ b/js/src/ion/BaselineFrame.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineFrame.h b/js/src/ion/BaselineFrame.h
index 7d9642b0d12a..476c66978fae 100644
--- a/js/src/ion/BaselineFrame.h
+++ b/js/src/ion/BaselineFrame.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineFrameInfo.cpp b/js/src/ion/BaselineFrameInfo.cpp
index 17dcd2765c9b..39e1c4556286 100644
--- a/js/src/ion/BaselineFrameInfo.cpp
+++ b/js/src/ion/BaselineFrameInfo.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineFrameInfo.h b/js/src/ion/BaselineFrameInfo.h
index eae34e232184..d02ecbc6af0b 100644
--- a/js/src/ion/BaselineFrameInfo.h
+++ b/js/src/ion/BaselineFrameInfo.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineHelpers.h b/js/src/ion/BaselineHelpers.h
index 1c2bd3dc0061..1502dba2a617 100644
--- a/js/src/ion/BaselineHelpers.h
+++ b/js/src/ion/BaselineHelpers.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineIC.cpp b/js/src/ion/BaselineIC.cpp
index 4403911b76a8..6c3494bbb287 100644
--- a/js/src/ion/BaselineIC.cpp
+++ b/js/src/ion/BaselineIC.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineIC.h b/js/src/ion/BaselineIC.h
index 461628faf47e..f9c08e770f11 100644
--- a/js/src/ion/BaselineIC.h
+++ b/js/src/ion/BaselineIC.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineInspector.cpp b/js/src/ion/BaselineInspector.cpp
index b8490f92d4f1..26a6273f3dd5 100644
--- a/js/src/ion/BaselineInspector.cpp
+++ b/js/src/ion/BaselineInspector.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineInspector.h b/js/src/ion/BaselineInspector.h
index cef840718a53..5fb59f6ed015 100644
--- a/js/src/ion/BaselineInspector.h
+++ b/js/src/ion/BaselineInspector.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineJIT.cpp b/js/src/ion/BaselineJIT.cpp
index 8061224465aa..3dfce7916f15 100644
--- a/js/src/ion/BaselineJIT.cpp
+++ b/js/src/ion/BaselineJIT.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineJIT.h b/js/src/ion/BaselineJIT.h
index 33244f8ca2ed..2c9e914c5042 100644
--- a/js/src/ion/BaselineJIT.h
+++ b/js/src/ion/BaselineJIT.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BaselineRegisters.h b/js/src/ion/BaselineRegisters.h
index 26365375481d..c9d0d4136a8e 100644
--- a/js/src/ion/BaselineRegisters.h
+++ b/js/src/ion/BaselineRegisters.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BitSet.cpp b/js/src/ion/BitSet.cpp
index bbe12ce97f6c..1b3ec5863dc2 100644
--- a/js/src/ion/BitSet.cpp
+++ b/js/src/ion/BitSet.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/BitSet.h b/js/src/ion/BitSet.h
index f9b9dc38dd3b..03903c74a3ac 100644
--- a/js/src/ion/BitSet.h
+++ b/js/src/ion/BitSet.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/C1Spewer.cpp b/js/src/ion/C1Spewer.cpp
index 8934dc09d28e..7f17319efa40 100644
--- a/js/src/ion/C1Spewer.cpp
+++ b/js/src/ion/C1Spewer.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/C1Spewer.h b/js/src/ion/C1Spewer.h
index 66248f3528ba..fe05132a9407 100644
--- a/js/src/ion/C1Spewer.h
+++ b/js/src/ion/C1Spewer.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 5106493af101..3b827b76d31a 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/CodeGenerator.h b/js/src/ion/CodeGenerator.h
index 4130a3611ebc..348fb3ce14f5 100644
--- a/js/src/ion/CodeGenerator.h
+++ b/js/src/ion/CodeGenerator.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/CompactBuffer.h b/js/src/ion/CompactBuffer.h
index fb29b780e3d8..c3ca501190d5 100644
--- a/js/src/ion/CompactBuffer.h
+++ b/js/src/ion/CompactBuffer.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/CompileInfo-inl.h b/js/src/ion/CompileInfo-inl.h
index 85971562381a..666da9777c4d 100644
--- a/js/src/ion/CompileInfo-inl.h
+++ b/js/src/ion/CompileInfo-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/CompileInfo.h b/js/src/ion/CompileInfo.h
index 2288b20460f6..237e9e4e1a4b 100644
--- a/js/src/ion/CompileInfo.h
+++ b/js/src/ion/CompileInfo.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/CompilerRoot.h b/js/src/ion/CompilerRoot.h
index 141924b7094a..81e9386ac417 100644
--- a/js/src/ion/CompilerRoot.h
+++ b/js/src/ion/CompilerRoot.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/EdgeCaseAnalysis.cpp b/js/src/ion/EdgeCaseAnalysis.cpp
index 38cb200838b4..18a7547581e9 100644
--- a/js/src/ion/EdgeCaseAnalysis.cpp
+++ b/js/src/ion/EdgeCaseAnalysis.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/EdgeCaseAnalysis.h b/js/src/ion/EdgeCaseAnalysis.h
index a322257996bf..bb744dd40eab 100644
--- a/js/src/ion/EdgeCaseAnalysis.h
+++ b/js/src/ion/EdgeCaseAnalysis.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/EffectiveAddressAnalysis.cpp b/js/src/ion/EffectiveAddressAnalysis.cpp
index e936a6ebfe8d..76fa88a36e06 100644
--- a/js/src/ion/EffectiveAddressAnalysis.cpp
+++ b/js/src/ion/EffectiveAddressAnalysis.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/EffectiveAddressAnalysis.h b/js/src/ion/EffectiveAddressAnalysis.h
index a86e871290b1..e7f3dc9f2e71 100644
--- a/js/src/ion/EffectiveAddressAnalysis.h
+++ b/js/src/ion/EffectiveAddressAnalysis.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/ExecutionModeInlines.h b/js/src/ion/ExecutionModeInlines.h
index 8a4c2d758ebd..1f86e4a8d294 100644
--- a/js/src/ion/ExecutionModeInlines.h
+++ b/js/src/ion/ExecutionModeInlines.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/FixedArityList.h b/js/src/ion/FixedArityList.h
index 4cf6ccf51827..d737ad4e1d02 100644
--- a/js/src/ion/FixedArityList.h
+++ b/js/src/ion/FixedArityList.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/FixedList.h b/js/src/ion/FixedList.h
index 2062ad8d64e3..9213d0744955 100644
--- a/js/src/ion/FixedList.h
+++ b/js/src/ion/FixedList.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/InlineList.h b/js/src/ion/InlineList.h
index 00897619b123..7bc21801de30 100644
--- a/js/src/ion/InlineList.h
+++ b/js/src/ion/InlineList.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index 9a227fa73aeb..3298897730b4 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Ion.h b/js/src/ion/Ion.h
index d11485db6fe6..c9e4f0cd8fa2 100644
--- a/js/src/ion/Ion.h
+++ b/js/src/ion/Ion.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonAllocPolicy.h b/js/src/ion/IonAllocPolicy.h
index f604a5005b49..8c828f71528f 100644
--- a/js/src/ion/IonAllocPolicy.h
+++ b/js/src/ion/IonAllocPolicy.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonAnalysis.cpp b/js/src/ion/IonAnalysis.cpp
index 58a070c42954..fc13e62faec3 100644
--- a/js/src/ion/IonAnalysis.cpp
+++ b/js/src/ion/IonAnalysis.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonAnalysis.h b/js/src/ion/IonAnalysis.h
index 0f311da802df..42b02bb3f961 100644
--- a/js/src/ion/IonAnalysis.h
+++ b/js/src/ion/IonAnalysis.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 8a4b4f8f8974..e41193c06496 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonBuilder.h b/js/src/ion/IonBuilder.h
index 8f8f2a486734..4b1422e29608 100644
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonCaches.cpp b/js/src/ion/IonCaches.cpp
index e5983da59c2d..6cb2874769ef 100644
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonCaches.h b/js/src/ion/IonCaches.h
index 00c05567ab47..ec61d6a13604 100644
--- a/js/src/ion/IonCaches.h
+++ b/js/src/ion/IonCaches.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonCode.h b/js/src/ion/IonCode.h
index ec4a86d60e9c..0a4aeb1f34b9 100644
--- a/js/src/ion/IonCode.h
+++ b/js/src/ion/IonCode.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonCompartment.h b/js/src/ion/IonCompartment.h
index 472cf55fba5d..5a5681f110f6 100644
--- a/js/src/ion/IonCompartment.h
+++ b/js/src/ion/IonCompartment.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonFrameIterator-inl.h b/js/src/ion/IonFrameIterator-inl.h
index 2740d9432b5b..5b1094bda4d7 100644
--- a/js/src/ion/IonFrameIterator-inl.h
+++ b/js/src/ion/IonFrameIterator-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonFrameIterator.h b/js/src/ion/IonFrameIterator.h
index fb0a339ae79d..e85656fb4265 100644
--- a/js/src/ion/IonFrameIterator.h
+++ b/js/src/ion/IonFrameIterator.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonFrames-inl.h b/js/src/ion/IonFrames-inl.h
index a1fa889785c8..1267a565856f 100644
--- a/js/src/ion/IonFrames-inl.h
+++ b/js/src/ion/IonFrames-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonFrames.cpp b/js/src/ion/IonFrames.cpp
index 4f24db565cad..880a6396905d 100644
--- a/js/src/ion/IonFrames.cpp
+++ b/js/src/ion/IonFrames.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonFrames.h b/js/src/ion/IonFrames.h
index 5e598e244b27..6872c96a3422 100644
--- a/js/src/ion/IonFrames.h
+++ b/js/src/ion/IonFrames.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonInstrumentation.h b/js/src/ion/IonInstrumentation.h
index 62d9ea1f6951..cb8ceae9119a 100644
--- a/js/src/ion/IonInstrumentation.h
+++ b/js/src/ion/IonInstrumentation.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonLinker.h b/js/src/ion/IonLinker.h
index b818368ccbaa..979385254362 100644
--- a/js/src/ion/IonLinker.h
+++ b/js/src/ion/IonLinker.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonMacroAssembler.cpp b/js/src/ion/IonMacroAssembler.cpp
index bcf85af67d84..808218f3df8b 100644
--- a/js/src/ion/IonMacroAssembler.cpp
+++ b/js/src/ion/IonMacroAssembler.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index 9b4571354eb8..b08f08d277cc 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonSpewer.cpp b/js/src/ion/IonSpewer.cpp
index c911955b57cf..002a36193d12 100644
--- a/js/src/ion/IonSpewer.cpp
+++ b/js/src/ion/IonSpewer.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonSpewer.h b/js/src/ion/IonSpewer.h
index 4f6ad0eaa776..19696dc286e6 100644
--- a/js/src/ion/IonSpewer.h
+++ b/js/src/ion/IonSpewer.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/IonTypes.h b/js/src/ion/IonTypes.h
index 6e60a39c6159..b033e28f18c3 100644
--- a/js/src/ion/IonTypes.h
+++ b/js/src/ion/IonTypes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/JSONSpewer.cpp b/js/src/ion/JSONSpewer.cpp
index 466941ddd7a5..bc3a4c363984 100644
--- a/js/src/ion/JSONSpewer.cpp
+++ b/js/src/ion/JSONSpewer.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/JSONSpewer.h b/js/src/ion/JSONSpewer.h
index 556faa9081bb..8726b48fcd26 100644
--- a/js/src/ion/JSONSpewer.h
+++ b/js/src/ion/JSONSpewer.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LICM.cpp b/js/src/ion/LICM.cpp
index d93f1c22f248..d40970a65994 100644
--- a/js/src/ion/LICM.cpp
+++ b/js/src/ion/LICM.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LICM.h b/js/src/ion/LICM.h
index e2f53fafdc65..ab40b2b6df91 100644
--- a/js/src/ion/LICM.h
+++ b/js/src/ion/LICM.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index 5d6ef835e6bf..f2ddb2d08264 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LIR-inl.h b/js/src/ion/LIR-inl.h
index de4d08ede26c..af24d9769146 100644
--- a/js/src/ion/LIR-inl.h
+++ b/js/src/ion/LIR-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LIR.cpp b/js/src/ion/LIR.cpp
index d0f96070f6c0..7c70b2a51cda 100644
--- a/js/src/ion/LIR.cpp
+++ b/js/src/ion/LIR.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LIR.h b/js/src/ion/LIR.h
index dcbc44e47b4c..096cbd374ce0 100644
--- a/js/src/ion/LIR.h
+++ b/js/src/ion/LIR.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LOpcodes.h b/js/src/ion/LOpcodes.h
index b7bf009b266c..227aeac052a4 100644
--- a/js/src/ion/LOpcodes.h
+++ b/js/src/ion/LOpcodes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LinearScan.cpp b/js/src/ion/LinearScan.cpp
index 8318716ca2d0..b073db985a1e 100644
--- a/js/src/ion/LinearScan.cpp
+++ b/js/src/ion/LinearScan.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LinearScan.h b/js/src/ion/LinearScan.h
index 4dcd24a207ca..3cf8d80740e3 100644
--- a/js/src/ion/LinearScan.h
+++ b/js/src/ion/LinearScan.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LiveRangeAllocator.cpp b/js/src/ion/LiveRangeAllocator.cpp
index 154c2767204b..b35e731eb3ab 100644
--- a/js/src/ion/LiveRangeAllocator.cpp
+++ b/js/src/ion/LiveRangeAllocator.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/LiveRangeAllocator.h b/js/src/ion/LiveRangeAllocator.h
index 3c81bc90903a..d48aece848d9 100644
--- a/js/src/ion/LiveRangeAllocator.h
+++ b/js/src/ion/LiveRangeAllocator.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 75de254f6577..5a3bbd5c0823 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Lowering.h b/js/src/ion/Lowering.h
index cc8cd249df8b..4d39160fb155 100644
--- a/js/src/ion/Lowering.h
+++ b/js/src/ion/Lowering.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MCallOptimize.cpp b/js/src/ion/MCallOptimize.cpp
index 98e986259127..d05b5f5f1378 100644
--- a/js/src/ion/MCallOptimize.cpp
+++ b/js/src/ion/MCallOptimize.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MIR.cpp b/js/src/ion/MIR.cpp
index 7b94d6c7419f..8eb9b1165495 100644
--- a/js/src/ion/MIR.cpp
+++ b/js/src/ion/MIR.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index faa0d1ed38fa..0e1f6ec87acf 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MIRGenerator.h b/js/src/ion/MIRGenerator.h
index a734cbdef71b..39cbba47602c 100644
--- a/js/src/ion/MIRGenerator.h
+++ b/js/src/ion/MIRGenerator.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MIRGraph.cpp b/js/src/ion/MIRGraph.cpp
index addbda66aecd..3a02a3394f4d 100644
--- a/js/src/ion/MIRGraph.cpp
+++ b/js/src/ion/MIRGraph.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MIRGraph.h b/js/src/ion/MIRGraph.h
index f5b62e11623e..21f77942f95d 100644
--- a/js/src/ion/MIRGraph.h
+++ b/js/src/ion/MIRGraph.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MOpcodes.h b/js/src/ion/MOpcodes.h
index a5123a627ccd..c27a8b14251e 100644
--- a/js/src/ion/MOpcodes.h
+++ b/js/src/ion/MOpcodes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MoveEmitter.h b/js/src/ion/MoveEmitter.h
index 095b5d9e6da6..9a88bd12703d 100644
--- a/js/src/ion/MoveEmitter.h
+++ b/js/src/ion/MoveEmitter.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MoveResolver.cpp b/js/src/ion/MoveResolver.cpp
index a2b661c3130e..1d4c76b7f681 100644
--- a/js/src/ion/MoveResolver.cpp
+++ b/js/src/ion/MoveResolver.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/MoveResolver.h b/js/src/ion/MoveResolver.h
index 8a20e1021a09..0f816e15be54 100644
--- a/js/src/ion/MoveResolver.h
+++ b/js/src/ion/MoveResolver.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/ParallelArrayAnalysis.cpp b/js/src/ion/ParallelArrayAnalysis.cpp
index 364df7b0902d..3d92c14267fe 100644
--- a/js/src/ion/ParallelArrayAnalysis.cpp
+++ b/js/src/ion/ParallelArrayAnalysis.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/ParallelArrayAnalysis.h b/js/src/ion/ParallelArrayAnalysis.h
index 2c2eba228b37..93e4ce36de2d 100644
--- a/js/src/ion/ParallelArrayAnalysis.h
+++ b/js/src/ion/ParallelArrayAnalysis.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/ParallelFunctions.cpp b/js/src/ion/ParallelFunctions.cpp
index e0c7ca406778..1b821503b328 100644
--- a/js/src/ion/ParallelFunctions.cpp
+++ b/js/src/ion/ParallelFunctions.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/ParallelFunctions.h b/js/src/ion/ParallelFunctions.h
index 1fe9fcc333ff..b74e5cfa7aee 100644
--- a/js/src/ion/ParallelFunctions.h
+++ b/js/src/ion/ParallelFunctions.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/PcScriptCache-inl.h b/js/src/ion/PcScriptCache-inl.h
index fdf5acfd19ab..9a852d0ed453 100644
--- a/js/src/ion/PcScriptCache-inl.h
+++ b/js/src/ion/PcScriptCache-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/PcScriptCache.h b/js/src/ion/PcScriptCache.h
index 9f9a3d79c87c..4d8eca0cbe31 100644
--- a/js/src/ion/PcScriptCache.h
+++ b/js/src/ion/PcScriptCache.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/RangeAnalysis.cpp b/js/src/ion/RangeAnalysis.cpp
index 229b3a552b8d..918dc33bf90b 100644
--- a/js/src/ion/RangeAnalysis.cpp
+++ b/js/src/ion/RangeAnalysis.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/RangeAnalysis.h b/js/src/ion/RangeAnalysis.h
index 0ffdc4752288..830d3a3167de 100644
--- a/js/src/ion/RangeAnalysis.h
+++ b/js/src/ion/RangeAnalysis.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/RegisterAllocator.cpp b/js/src/ion/RegisterAllocator.cpp
index 335eae5265a8..f9986453416f 100644
--- a/js/src/ion/RegisterAllocator.cpp
+++ b/js/src/ion/RegisterAllocator.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/RegisterAllocator.h b/js/src/ion/RegisterAllocator.h
index fe76b3504ee9..d98704d38d03 100644
--- a/js/src/ion/RegisterAllocator.h
+++ b/js/src/ion/RegisterAllocator.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/RegisterSets.h b/js/src/ion/RegisterSets.h
index 9679f9f734df..b1ec16bcd735 100644
--- a/js/src/ion/RegisterSets.h
+++ b/js/src/ion/RegisterSets.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Registers.h b/js/src/ion/Registers.h
index 988d544f279c..e942d2e0474e 100644
--- a/js/src/ion/Registers.h
+++ b/js/src/ion/Registers.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Safepoints.cpp b/js/src/ion/Safepoints.cpp
index 8af0573240d7..180b929d0301 100644
--- a/js/src/ion/Safepoints.cpp
+++ b/js/src/ion/Safepoints.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Safepoints.h b/js/src/ion/Safepoints.h
index 4ae9e14bbfaf..6e81e75e6442 100644
--- a/js/src/ion/Safepoints.h
+++ b/js/src/ion/Safepoints.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/SnapshotReader.h b/js/src/ion/SnapshotReader.h
index 497763da8e8c..61c930852a6a 100644
--- a/js/src/ion/SnapshotReader.h
+++ b/js/src/ion/SnapshotReader.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/SnapshotWriter.h b/js/src/ion/SnapshotWriter.h
index 9c90e6a7a757..9044da1dc405 100644
--- a/js/src/ion/SnapshotWriter.h
+++ b/js/src/ion/SnapshotWriter.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/Snapshots.cpp b/js/src/ion/Snapshots.cpp
index 3605148521c0..bc761faf75f8 100644
--- a/js/src/ion/Snapshots.cpp
+++ b/js/src/ion/Snapshots.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/StackSlotAllocator.h b/js/src/ion/StackSlotAllocator.h
index e0b978324b9e..d08c63797170 100644
--- a/js/src/ion/StackSlotAllocator.h
+++ b/js/src/ion/StackSlotAllocator.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/StupidAllocator.cpp b/js/src/ion/StupidAllocator.cpp
index 699194afc6ef..c0646ac78f24 100644
--- a/js/src/ion/StupidAllocator.cpp
+++ b/js/src/ion/StupidAllocator.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/StupidAllocator.h b/js/src/ion/StupidAllocator.h
index 5c1279ddeaa4..77534641f7ba 100644
--- a/js/src/ion/StupidAllocator.h
+++ b/js/src/ion/StupidAllocator.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/TypeOracle.cpp b/js/src/ion/TypeOracle.cpp
index a54068563498..6e67e7956079 100644
--- a/js/src/ion/TypeOracle.cpp
+++ b/js/src/ion/TypeOracle.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/TypeOracle.h b/js/src/ion/TypeOracle.h
index d75a1cb77f32..bf13fdd6b8bf 100644
--- a/js/src/ion/TypeOracle.h
+++ b/js/src/ion/TypeOracle.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index ce60a3528c03..2d4f90a542d4 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/TypePolicy.h b/js/src/ion/TypePolicy.h
index 3f209e53c857..310dd73e99ec 100644
--- a/js/src/ion/TypePolicy.h
+++ b/js/src/ion/TypePolicy.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/UnreachableCodeElimination.cpp b/js/src/ion/UnreachableCodeElimination.cpp
index 50a27363928f..75367fd313c0 100644
--- a/js/src/ion/UnreachableCodeElimination.cpp
+++ b/js/src/ion/UnreachableCodeElimination.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/UnreachableCodeElimination.h b/js/src/ion/UnreachableCodeElimination.h
index 9999afb47443..99a61eed7b7b 100644
--- a/js/src/ion/UnreachableCodeElimination.h
+++ b/js/src/ion/UnreachableCodeElimination.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/VMFunctions.cpp b/js/src/ion/VMFunctions.cpp
index c9f2f8dda262..15b33c5190d4 100644
--- a/js/src/ion/VMFunctions.cpp
+++ b/js/src/ion/VMFunctions.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/VMFunctions.h b/js/src/ion/VMFunctions.h
index c7477ddd2b0f..7439a9b56276 100644
--- a/js/src/ion/VMFunctions.h
+++ b/js/src/ion/VMFunctions.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/ValueNumbering.cpp b/js/src/ion/ValueNumbering.cpp
index a8b83b5dc950..597fb89170f4 100644
--- a/js/src/ion/ValueNumbering.cpp
+++ b/js/src/ion/ValueNumbering.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/ValueNumbering.h b/js/src/ion/ValueNumbering.h
index edb1f40558f2..24db39cde1a1 100644
--- a/js/src/ion/ValueNumbering.h
+++ b/js/src/ion/ValueNumbering.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/Architecture-arm.cpp b/js/src/ion/arm/Architecture-arm.cpp
index 7fc302930308..567715f688d1 100644
--- a/js/src/ion/arm/Architecture-arm.cpp
+++ b/js/src/ion/arm/Architecture-arm.cpp
@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
-
 #define HWCAP_ARMv7 (1 << 31)
 #include <mozilla/StandardInteger.h>
 
diff --git a/js/src/ion/arm/Architecture-arm.h b/js/src/ion/arm/Architecture-arm.h
index 0471efb88357..3257c31ff1c0 100644
--- a/js/src/ion/arm/Architecture-arm.h
+++ b/js/src/ion/arm/Architecture-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/Assembler-arm.cpp b/js/src/ion/arm/Assembler-arm.cpp
index 820f99c9b615..a2c178ee7f8a 100644
--- a/js/src/ion/arm/Assembler-arm.cpp
+++ b/js/src/ion/arm/Assembler-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/Assembler-arm.h b/js/src/ion/arm/Assembler-arm.h
index 80f1b7737255..620270bcf3f2 100644
--- a/js/src/ion/arm/Assembler-arm.h
+++ b/js/src/ion/arm/Assembler-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/Bailouts-arm.cpp b/js/src/ion/arm/Bailouts-arm.cpp
index 21968bde4b1d..bb51f8f3fbc6 100644
--- a/js/src/ion/arm/Bailouts-arm.cpp
+++ b/js/src/ion/arm/Bailouts-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/BaselineCompiler-arm.cpp b/js/src/ion/arm/BaselineCompiler-arm.cpp
index 7ed88a3f246a..53ddd75857b0 100644
--- a/js/src/ion/arm/BaselineCompiler-arm.cpp
+++ b/js/src/ion/arm/BaselineCompiler-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/BaselineCompiler-arm.h b/js/src/ion/arm/BaselineCompiler-arm.h
index 5485204398d3..baaaff529d02 100644
--- a/js/src/ion/arm/BaselineCompiler-arm.h
+++ b/js/src/ion/arm/BaselineCompiler-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/BaselineHelpers-arm.h b/js/src/ion/arm/BaselineHelpers-arm.h
index 6d5611eb5437..6dd5795c0f39 100644
--- a/js/src/ion/arm/BaselineHelpers-arm.h
+++ b/js/src/ion/arm/BaselineHelpers-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/BaselineIC-arm.cpp b/js/src/ion/arm/BaselineIC-arm.cpp
index 25a1b40c0e5e..079b5b33d15c 100644
--- a/js/src/ion/arm/BaselineIC-arm.cpp
+++ b/js/src/ion/arm/BaselineIC-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/BaselineRegisters-arm.h b/js/src/ion/arm/BaselineRegisters-arm.h
index 53c908850855..4ba983e6e7d5 100644
--- a/js/src/ion/arm/BaselineRegisters-arm.h
+++ b/js/src/ion/arm/BaselineRegisters-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/CodeGenerator-arm.cpp b/js/src/ion/arm/CodeGenerator-arm.cpp
index b28d73f5f080..4acfde24e38c 100644
--- a/js/src/ion/arm/CodeGenerator-arm.cpp
+++ b/js/src/ion/arm/CodeGenerator-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/CodeGenerator-arm.h b/js/src/ion/arm/CodeGenerator-arm.h
index 4c9940ade643..a0e421d57ac0 100644
--- a/js/src/ion/arm/CodeGenerator-arm.h
+++ b/js/src/ion/arm/CodeGenerator-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/IonFrames-arm.cpp b/js/src/ion/arm/IonFrames-arm.cpp
index fe5bd1c65b69..0b90bb2c48fb 100644
--- a/js/src/ion/arm/IonFrames-arm.cpp
+++ b/js/src/ion/arm/IonFrames-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/IonFrames-arm.h b/js/src/ion/arm/IonFrames-arm.h
index c9d5268c6af5..f5b38c324f4a 100644
--- a/js/src/ion/arm/IonFrames-arm.h
+++ b/js/src/ion/arm/IonFrames-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/LIR-arm.h b/js/src/ion/arm/LIR-arm.h
index f9db2e9b6e05..7e0997c14bb3 100644
--- a/js/src/ion/arm/LIR-arm.h
+++ b/js/src/ion/arm/LIR-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/LOpcodes-arm.h b/js/src/ion/arm/LOpcodes-arm.h
index 1f53b9baabc8..7745129aa645 100644
--- a/js/src/ion/arm/LOpcodes-arm.h
+++ b/js/src/ion/arm/LOpcodes-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/Lowering-arm.cpp b/js/src/ion/arm/Lowering-arm.cpp
index f5aecb3ed4ef..867f69bbffd3 100644
--- a/js/src/ion/arm/Lowering-arm.cpp
+++ b/js/src/ion/arm/Lowering-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/Lowering-arm.h b/js/src/ion/arm/Lowering-arm.h
index 0472fa1489e5..4436f2cd1cd3 100644
--- a/js/src/ion/arm/Lowering-arm.h
+++ b/js/src/ion/arm/Lowering-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/MacroAssembler-arm.cpp b/js/src/ion/arm/MacroAssembler-arm.cpp
index 0076f8d27058..561a0b358802 100644
--- a/js/src/ion/arm/MacroAssembler-arm.cpp
+++ b/js/src/ion/arm/MacroAssembler-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/MacroAssembler-arm.h b/js/src/ion/arm/MacroAssembler-arm.h
index 18b258b750cc..a383576e8331 100644
--- a/js/src/ion/arm/MacroAssembler-arm.h
+++ b/js/src/ion/arm/MacroAssembler-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/MoveEmitter-arm.cpp b/js/src/ion/arm/MoveEmitter-arm.cpp
index 289ecc795d80..b6f1b409e900 100644
--- a/js/src/ion/arm/MoveEmitter-arm.cpp
+++ b/js/src/ion/arm/MoveEmitter-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/MoveEmitter-arm.h b/js/src/ion/arm/MoveEmitter-arm.h
index 8d63c095c83d..783cf1c966e1 100644
--- a/js/src/ion/arm/MoveEmitter-arm.h
+++ b/js/src/ion/arm/MoveEmitter-arm.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/arm/Trampoline-arm.cpp b/js/src/ion/arm/Trampoline-arm.cpp
index 3f313235f059..a8dd69f463b4 100644
--- a/js/src/ion/arm/Trampoline-arm.cpp
+++ b/js/src/ion/arm/Trampoline-arm.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-shared.h b/js/src/ion/shared/Assembler-shared.h
index dec722212e45..eb6371fb2b68 100644
--- a/js/src/ion/shared/Assembler-shared.h
+++ b/js/src/ion/shared/Assembler-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-x86-shared.cpp b/js/src/ion/shared/Assembler-x86-shared.cpp
index 09accd9c7bb8..689a5a6876d3 100644
--- a/js/src/ion/shared/Assembler-x86-shared.cpp
+++ b/js/src/ion/shared/Assembler-x86-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/Assembler-x86-shared.h b/js/src/ion/shared/Assembler-x86-shared.h
index 66f49ef47131..41cb8e0bc5da 100644
--- a/js/src/ion/shared/Assembler-x86-shared.h
+++ b/js/src/ion/shared/Assembler-x86-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-shared.cpp b/js/src/ion/shared/BaselineCompiler-shared.cpp
index 47831a5c82cc..7b8bbfe05fc9 100644
--- a/js/src/ion/shared/BaselineCompiler-shared.cpp
+++ b/js/src/ion/shared/BaselineCompiler-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-shared.h b/js/src/ion/shared/BaselineCompiler-shared.h
index 2a23e44ed56b..a0baa943e584 100644
--- a/js/src/ion/shared/BaselineCompiler-shared.h
+++ b/js/src/ion/shared/BaselineCompiler-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-x86-shared.cpp b/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
index 9c3db57f63a2..9c23197aafe1 100644
--- a/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
+++ b/js/src/ion/shared/BaselineCompiler-x86-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/BaselineCompiler-x86-shared.h b/js/src/ion/shared/BaselineCompiler-x86-shared.h
index 20ecdec89408..56d1b2de020b 100644
--- a/js/src/ion/shared/BaselineCompiler-x86-shared.h
+++ b/js/src/ion/shared/BaselineCompiler-x86-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/BaselineIC-x86-shared.cpp b/js/src/ion/shared/BaselineIC-x86-shared.cpp
index a671664ad752..cc5bf7e616d4 100644
--- a/js/src/ion/shared/BaselineIC-x86-shared.cpp
+++ b/js/src/ion/shared/BaselineIC-x86-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared-inl.h b/js/src/ion/shared/CodeGenerator-shared-inl.h
index 67f4aeee310a..7bf3b611417f 100644
--- a/js/src/ion/shared/CodeGenerator-shared-inl.h
+++ b/js/src/ion/shared/CodeGenerator-shared-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared.cpp b/js/src/ion/shared/CodeGenerator-shared.cpp
index 3017b431e153..568e0d684500 100644
--- a/js/src/ion/shared/CodeGenerator-shared.cpp
+++ b/js/src/ion/shared/CodeGenerator-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-shared.h b/js/src/ion/shared/CodeGenerator-shared.h
index a99934e46968..1695dc5c45cc 100644
--- a/js/src/ion/shared/CodeGenerator-shared.h
+++ b/js/src/ion/shared/CodeGenerator-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-x86-shared.cpp b/js/src/ion/shared/CodeGenerator-x86-shared.cpp
index 80a6adb35e5f..eaa4ac482f2e 100644
--- a/js/src/ion/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/ion/shared/CodeGenerator-x86-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/CodeGenerator-x86-shared.h b/js/src/ion/shared/CodeGenerator-x86-shared.h
index 547ddbd588de..93305081b7b5 100644
--- a/js/src/ion/shared/CodeGenerator-x86-shared.h
+++ b/js/src/ion/shared/CodeGenerator-x86-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/IonAssemblerBuffer.h b/js/src/ion/shared/IonAssemblerBuffer.h
index 59c51eacc751..47653f94955a 100644
--- a/js/src/ion/shared/IonAssemblerBuffer.h
+++ b/js/src/ion/shared/IonAssemblerBuffer.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h b/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
index 8dcb2f3eb249..8b9b1055e2f4 100644
--- a/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
+++ b/js/src/ion/shared/IonAssemblerBufferWithConstantPools.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/IonFrames-shared.h b/js/src/ion/shared/IonFrames-shared.h
index 2b6f12f1da78..794da5226709 100644
--- a/js/src/ion/shared/IonFrames-shared.h
+++ b/js/src/ion/shared/IonFrames-shared.h
@@ -1,9 +1,43 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * 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/. */
-
+ * vim: set ts=4 sw=4 et tw=79:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   David Anderson <dvander@alliedmods.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 #ifndef jsion_ionframes_shared_h__
 #define jsion_ionframes_shared_h__
 
diff --git a/js/src/ion/shared/IonFrames-x86-shared.cpp b/js/src/ion/shared/IonFrames-x86-shared.cpp
index fe9dc1f19531..55ca61030a89 100644
--- a/js/src/ion/shared/IonFrames-x86-shared.cpp
+++ b/js/src/ion/shared/IonFrames-x86-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/IonFrames-x86-shared.h b/js/src/ion/shared/IonFrames-x86-shared.h
index 9100f3b38413..04f055884d71 100644
--- a/js/src/ion/shared/IonFrames-x86-shared.h
+++ b/js/src/ion/shared/IonFrames-x86-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/LIR-x86-shared.h b/js/src/ion/shared/LIR-x86-shared.h
index 5d12830436c9..4cec8fbed08a 100644
--- a/js/src/ion/shared/LIR-x86-shared.h
+++ b/js/src/ion/shared/LIR-x86-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared-inl.h b/js/src/ion/shared/Lowering-shared-inl.h
index 6139c7ea0647..a67981a03684 100644
--- a/js/src/ion/shared/Lowering-shared-inl.h
+++ b/js/src/ion/shared/Lowering-shared-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared.cpp b/js/src/ion/shared/Lowering-shared.cpp
index 7ab7b2e314f9..577196d1aa65 100644
--- a/js/src/ion/shared/Lowering-shared.cpp
+++ b/js/src/ion/shared/Lowering-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-shared.h b/js/src/ion/shared/Lowering-shared.h
index 0808833a0284..5f8b34c24237 100644
--- a/js/src/ion/shared/Lowering-shared.h
+++ b/js/src/ion/shared/Lowering-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-x86-shared.cpp b/js/src/ion/shared/Lowering-x86-shared.cpp
index f2ed21d6b7fb..95496d77e916 100644
--- a/js/src/ion/shared/Lowering-x86-shared.cpp
+++ b/js/src/ion/shared/Lowering-x86-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/Lowering-x86-shared.h b/js/src/ion/shared/Lowering-x86-shared.h
index 99a3c6cf3c50..797f552baeb2 100644
--- a/js/src/ion/shared/Lowering-x86-shared.h
+++ b/js/src/ion/shared/Lowering-x86-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/MacroAssembler-x86-shared.h b/js/src/ion/shared/MacroAssembler-x86-shared.h
index f28f229dd7b8..644e302b3f5a 100644
--- a/js/src/ion/shared/MacroAssembler-x86-shared.h
+++ b/js/src/ion/shared/MacroAssembler-x86-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/MoveEmitter-x86-shared.cpp b/js/src/ion/shared/MoveEmitter-x86-shared.cpp
index 8c8c6290923d..99e50bef2134 100644
--- a/js/src/ion/shared/MoveEmitter-x86-shared.cpp
+++ b/js/src/ion/shared/MoveEmitter-x86-shared.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/shared/MoveEmitter-x86-shared.h b/js/src/ion/shared/MoveEmitter-x86-shared.h
index 915dd13b5091..bbc2a5ef1fe9 100644
--- a/js/src/ion/shared/MoveEmitter-x86-shared.h
+++ b/js/src/ion/shared/MoveEmitter-x86-shared.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/Architecture-x64.h b/js/src/ion/x64/Architecture-x64.h
index 3a832c95df18..707fb2a43c04 100644
--- a/js/src/ion/x64/Architecture-x64.h
+++ b/js/src/ion/x64/Architecture-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/Assembler-x64.cpp b/js/src/ion/x64/Assembler-x64.cpp
index bdcbe791d2e1..bdb88083fb02 100644
--- a/js/src/ion/x64/Assembler-x64.cpp
+++ b/js/src/ion/x64/Assembler-x64.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/Assembler-x64.h b/js/src/ion/x64/Assembler-x64.h
index bf4a95980831..680d24c4f741 100644
--- a/js/src/ion/x64/Assembler-x64.h
+++ b/js/src/ion/x64/Assembler-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/Bailouts-x64.cpp b/js/src/ion/x64/Bailouts-x64.cpp
index 4f9e265c62f8..8062c8814f3a 100644
--- a/js/src/ion/x64/Bailouts-x64.cpp
+++ b/js/src/ion/x64/Bailouts-x64.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/BaselineCompiler-x64.cpp b/js/src/ion/x64/BaselineCompiler-x64.cpp
index e0bce0af7d51..45c9bf09c30b 100644
--- a/js/src/ion/x64/BaselineCompiler-x64.cpp
+++ b/js/src/ion/x64/BaselineCompiler-x64.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/BaselineCompiler-x64.h b/js/src/ion/x64/BaselineCompiler-x64.h
index ddac8c9c4133..1bfb02ba220b 100644
--- a/js/src/ion/x64/BaselineCompiler-x64.h
+++ b/js/src/ion/x64/BaselineCompiler-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/BaselineHelpers-x64.h b/js/src/ion/x64/BaselineHelpers-x64.h
index 0e5c802f13ea..939d8d9f5e9a 100644
--- a/js/src/ion/x64/BaselineHelpers-x64.h
+++ b/js/src/ion/x64/BaselineHelpers-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/BaselineIC-x64.cpp b/js/src/ion/x64/BaselineIC-x64.cpp
index 7359d26eb661..57d71a05a150 100644
--- a/js/src/ion/x64/BaselineIC-x64.cpp
+++ b/js/src/ion/x64/BaselineIC-x64.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/BaselineRegisters-x64.h b/js/src/ion/x64/BaselineRegisters-x64.h
index 72a64a55bb1f..f3b9d69d187c 100644
--- a/js/src/ion/x64/BaselineRegisters-x64.h
+++ b/js/src/ion/x64/BaselineRegisters-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/CodeGenerator-x64.cpp b/js/src/ion/x64/CodeGenerator-x64.cpp
index e94fe12fdb71..b7d720810de1 100644
--- a/js/src/ion/x64/CodeGenerator-x64.cpp
+++ b/js/src/ion/x64/CodeGenerator-x64.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/CodeGenerator-x64.h b/js/src/ion/x64/CodeGenerator-x64.h
index 35e103cd3254..5360dc710413 100644
--- a/js/src/ion/x64/CodeGenerator-x64.h
+++ b/js/src/ion/x64/CodeGenerator-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/LIR-x64.h b/js/src/ion/x64/LIR-x64.h
index f5366d747f8d..f1a8d03fe3a5 100644
--- a/js/src/ion/x64/LIR-x64.h
+++ b/js/src/ion/x64/LIR-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/LOpcodes-x64.h b/js/src/ion/x64/LOpcodes-x64.h
index fb479d48ce5a..8a276914ac25 100644
--- a/js/src/ion/x64/LOpcodes-x64.h
+++ b/js/src/ion/x64/LOpcodes-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/Lowering-x64.cpp b/js/src/ion/x64/Lowering-x64.cpp
index 525d0ecabfb7..d8eda3c9430b 100644
--- a/js/src/ion/x64/Lowering-x64.cpp
+++ b/js/src/ion/x64/Lowering-x64.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/Lowering-x64.h b/js/src/ion/x64/Lowering-x64.h
index 176041735618..f479e5d1d8b9 100644
--- a/js/src/ion/x64/Lowering-x64.h
+++ b/js/src/ion/x64/Lowering-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/MacroAssembler-x64.cpp b/js/src/ion/x64/MacroAssembler-x64.cpp
index c91b2471c35e..daf6a8b23875 100644
--- a/js/src/ion/x64/MacroAssembler-x64.cpp
+++ b/js/src/ion/x64/MacroAssembler-x64.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/MacroAssembler-x64.h b/js/src/ion/x64/MacroAssembler-x64.h
index 8672a2e8e730..186943bf95a5 100644
--- a/js/src/ion/x64/MacroAssembler-x64.h
+++ b/js/src/ion/x64/MacroAssembler-x64.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x64/Trampoline-x64.cpp b/js/src/ion/x64/Trampoline-x64.cpp
index fc8be268141b..a8e1f6f86067 100644
--- a/js/src/ion/x64/Trampoline-x64.cpp
+++ b/js/src/ion/x64/Trampoline-x64.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/Architecture-x86.h b/js/src/ion/x86/Architecture-x86.h
index 61ffbdd3f787..4c32e49df5b3 100644
--- a/js/src/ion/x86/Architecture-x86.h
+++ b/js/src/ion/x86/Architecture-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/Assembler-x86.cpp b/js/src/ion/x86/Assembler-x86.cpp
index e09285f8022c..d9cf3d312c9a 100644
--- a/js/src/ion/x86/Assembler-x86.cpp
+++ b/js/src/ion/x86/Assembler-x86.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/Assembler-x86.h b/js/src/ion/x86/Assembler-x86.h
index 3099f80a9b6d..3f894a8868fb 100644
--- a/js/src/ion/x86/Assembler-x86.h
+++ b/js/src/ion/x86/Assembler-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/Bailouts-x86.cpp b/js/src/ion/x86/Bailouts-x86.cpp
index 731ef2c7e3ad..72e3eab4081b 100644
--- a/js/src/ion/x86/Bailouts-x86.cpp
+++ b/js/src/ion/x86/Bailouts-x86.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/BaselineCompiler-x86.cpp b/js/src/ion/x86/BaselineCompiler-x86.cpp
index 618ac55080c5..4ae0b3c74d3d 100644
--- a/js/src/ion/x86/BaselineCompiler-x86.cpp
+++ b/js/src/ion/x86/BaselineCompiler-x86.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/BaselineCompiler-x86.h b/js/src/ion/x86/BaselineCompiler-x86.h
index dcc7eeabbfbf..cd1af33574a7 100644
--- a/js/src/ion/x86/BaselineCompiler-x86.h
+++ b/js/src/ion/x86/BaselineCompiler-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/BaselineHelpers-x86.h b/js/src/ion/x86/BaselineHelpers-x86.h
index 30f7db30986e..6222189a46b5 100644
--- a/js/src/ion/x86/BaselineHelpers-x86.h
+++ b/js/src/ion/x86/BaselineHelpers-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/BaselineIC-x86.cpp b/js/src/ion/x86/BaselineIC-x86.cpp
index 01a0b54bfc49..56a5dd0bba66 100644
--- a/js/src/ion/x86/BaselineIC-x86.cpp
+++ b/js/src/ion/x86/BaselineIC-x86.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/BaselineRegisters-x86.h b/js/src/ion/x86/BaselineRegisters-x86.h
index b28bda46ea29..e8a88217be9f 100644
--- a/js/src/ion/x86/BaselineRegisters-x86.h
+++ b/js/src/ion/x86/BaselineRegisters-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/CodeGenerator-x86.cpp b/js/src/ion/x86/CodeGenerator-x86.cpp
index 4884d5118e26..fd36974e9792 100644
--- a/js/src/ion/x86/CodeGenerator-x86.cpp
+++ b/js/src/ion/x86/CodeGenerator-x86.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/CodeGenerator-x86.h b/js/src/ion/x86/CodeGenerator-x86.h
index c4a58322e4db..9fdc4b6a1b05 100644
--- a/js/src/ion/x86/CodeGenerator-x86.h
+++ b/js/src/ion/x86/CodeGenerator-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/LIR-x86.h b/js/src/ion/x86/LIR-x86.h
index a27412302000..b56ab4788770 100644
--- a/js/src/ion/x86/LIR-x86.h
+++ b/js/src/ion/x86/LIR-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/LOpcodes-x86.h b/js/src/ion/x86/LOpcodes-x86.h
index 5b4b9f49e2ca..7944813552d1 100644
--- a/js/src/ion/x86/LOpcodes-x86.h
+++ b/js/src/ion/x86/LOpcodes-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/Lowering-x86.cpp b/js/src/ion/x86/Lowering-x86.cpp
index 9ef6d6d51c45..debcc669fceb 100644
--- a/js/src/ion/x86/Lowering-x86.cpp
+++ b/js/src/ion/x86/Lowering-x86.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/Lowering-x86.h b/js/src/ion/x86/Lowering-x86.h
index f283e8a41053..db6347ea5af3 100644
--- a/js/src/ion/x86/Lowering-x86.h
+++ b/js/src/ion/x86/Lowering-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/MacroAssembler-x86.cpp b/js/src/ion/x86/MacroAssembler-x86.cpp
index 4183d3c9f372..d620f46a0792 100644
--- a/js/src/ion/x86/MacroAssembler-x86.cpp
+++ b/js/src/ion/x86/MacroAssembler-x86.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/MacroAssembler-x86.h b/js/src/ion/x86/MacroAssembler-x86.h
index 18f95d8bb89d..5912f3ec3537 100644
--- a/js/src/ion/x86/MacroAssembler-x86.h
+++ b/js/src/ion/x86/MacroAssembler-x86.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/ion/x86/Trampoline-x86.cpp b/js/src/ion/x86/Trampoline-x86.cpp
index 088d7678bc91..c6345788f956 100644
--- a/js/src/ion/x86/Trampoline-x86.cpp
+++ b/js/src/ion/x86/Trampoline-x86.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jit-test/tests/auto-regress/bug557946.js b/js/src/jit-test/tests/auto-regress/bug557946.js
index 8d1e95c53b17..37cde015b269 100644
--- a/js/src/jit-test/tests/auto-regress/bug557946.js
+++ b/js/src/jit-test/tests/auto-regress/bug557946.js
@@ -1,7 +1,7 @@
 // Binary: cache/js-dbg-64-6f1a38b94754-linux
 // Flags: -j
 //
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 
 var x = 0;
 var y = 0;
diff --git a/js/src/jit-test/tests/auto-regress/bug558618.js b/js/src/jit-test/tests/auto-regress/bug558618.js
index 3fe1dfb257ec..1618adb14b19 100644
--- a/js/src/jit-test/tests/auto-regress/bug558618.js
+++ b/js/src/jit-test/tests/auto-regress/bug558618.js
@@ -1,7 +1,7 @@
 // Binary: cache/js-dbg-64-e69034463eeb-linux
 // Flags: -j
 //
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 function f() {
     this.search = function(a, b, c) {
         arguments[3] = { }
diff --git a/js/src/jit-test/tests/basic/bug535760.js b/js/src/jit-test/tests/basic/bug535760.js
index dd00b961522c..e7e1fce14880 100644
--- a/js/src/jit-test/tests/basic/bug535760.js
+++ b/js/src/jit-test/tests/basic/bug535760.js
@@ -1,4 +1,4 @@
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 function foundit(items, n) {
     for (var i = 0; i < 10; i++)
         arguments[2](items, this);
diff --git a/js/src/jit-test/tests/basic/bug541191-1.js b/js/src/jit-test/tests/basic/bug541191-1.js
index 74ccae82976e..78f0caf10ad8 100644
--- a/js/src/jit-test/tests/basic/bug541191-1.js
+++ b/js/src/jit-test/tests/basic/bug541191-1.js
@@ -1,4 +1,4 @@
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-2.js b/js/src/jit-test/tests/basic/bug541191-2.js
index d270b7de1e2b..1d232dc332a9 100644
--- a/js/src/jit-test/tests/basic/bug541191-2.js
+++ b/js/src/jit-test/tests/basic/bug541191-2.js
@@ -1,4 +1,4 @@
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-3.js b/js/src/jit-test/tests/basic/bug541191-3.js
index f447d49d1e2d..f4e01b9e1802 100644
--- a/js/src/jit-test/tests/basic/bug541191-3.js
+++ b/js/src/jit-test/tests/basic/bug541191-3.js
@@ -1,4 +1,4 @@
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-4.js b/js/src/jit-test/tests/basic/bug541191-4.js
index 5d15bedb5c16..0ecbb9177425 100644
--- a/js/src/jit-test/tests/basic/bug541191-4.js
+++ b/js/src/jit-test/tests/basic/bug541191-4.js
@@ -1,4 +1,4 @@
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug541191-5.js b/js/src/jit-test/tests/basic/bug541191-5.js
index f87217b2ccee..a2f9e5714f0c 100644
--- a/js/src/jit-test/tests/basic/bug541191-5.js
+++ b/js/src/jit-test/tests/basic/bug541191-5.js
@@ -1,4 +1,4 @@
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 
 function g(a, b, c, d) {
     return "" + a + b + c + d;
diff --git a/js/src/jit-test/tests/basic/bug592927.js b/js/src/jit-test/tests/basic/bug592927.js
index 69f0bd237e46..dc74a5af9062 100644
--- a/js/src/jit-test/tests/basic/bug592927.js
+++ b/js/src/jit-test/tests/basic/bug592927.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f(x, y) {
     x(f);
     assertEq(y, "hello");
diff --git a/js/src/jit-test/tests/basic/bug602088.js b/js/src/jit-test/tests/basic/bug602088.js
index 7e00d9b4c26d..283b546acc3c 100644
--- a/js/src/jit-test/tests/basic/bug602088.js
+++ b/js/src/jit-test/tests/basic/bug602088.js
@@ -1,5 +1,5 @@
 // |jit-test| error: TypeError
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 
 var p = Proxy.createFunction({}, function(x, y) { undefined.x(); });
 print(new p(1, 2));
diff --git a/js/src/jit-test/tests/basic/bug606083.js b/js/src/jit-test/tests/basic/bug606083.js
index d8049b94fa13..fc2594b0ead3 100644
--- a/js/src/jit-test/tests/basic/bug606083.js
+++ b/js/src/jit-test/tests/basic/bug606083.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f(L) {
     do {
      L: for (var i = 0; i < L; i++) {
diff --git a/js/src/jit-test/tests/basic/bug616762.js b/js/src/jit-test/tests/basic/bug616762.js
index 02f5c953cf59..89b8ddd18ab0 100644
--- a/js/src/jit-test/tests/basic/bug616762.js
+++ b/js/src/jit-test/tests/basic/bug616762.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 document = {
     ready: function (x) {
         this.exec = x;
diff --git a/js/src/jit-test/tests/basic/bug633409-1.js b/js/src/jit-test/tests/basic/bug633409-1.js
index 20eaa6cda58e..1f65ccc8445f 100644
--- a/js/src/jit-test/tests/basic/bug633409-1.js
+++ b/js/src/jit-test/tests/basic/bug633409-1.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 x = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 };
 
 for (i in x)
diff --git a/js/src/jit-test/tests/basic/bug633409-2.js b/js/src/jit-test/tests/basic/bug633409-2.js
index d3c498d6d235..349af466a2b3 100644
--- a/js/src/jit-test/tests/basic/bug633409-2.js
+++ b/js/src/jit-test/tests/basic/bug633409-2.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 var o1 = {p1: 1};
 var o2 = {p1: 1, p2: 2};
diff --git a/js/src/jit-test/tests/ion/bug674664-3.js b/js/src/jit-test/tests/ion/bug674664-3.js
index ce5a828d57c3..7838e8738048 100644
--- a/js/src/jit-test/tests/ion/bug674664-3.js
+++ b/js/src/jit-test/tests/ion/bug674664-3.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f0(p0) {
     var v0;
     do {
diff --git a/js/src/jit-test/tests/ion/bug684362.js b/js/src/jit-test/tests/ion/bug684362.js
index 9a83b053d711..dd2f606fc653 100644
--- a/js/src/jit-test/tests/ion/bug684362.js
+++ b/js/src/jit-test/tests/ion/bug684362.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f(a) {
     var k = a;
     T: for (;;) {
diff --git a/js/src/jit-test/tests/ion/bug747271.js b/js/src/jit-test/tests/ion/bug747271.js
index 176a44a5833a..2a751177f5ad 100644
--- a/js/src/jit-test/tests/ion/bug747271.js
+++ b/js/src/jit-test/tests/ion/bug747271.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function randomFloat () {
     // note that in fuzz-testing, this can used as the size of a buffer to allocate.
     // so it shouldn't return astronomic values. The maximum value 10000000 is already quite big.
diff --git a/js/src/jit-test/tests/ion/bug750588.js b/js/src/jit-test/tests/ion/bug750588.js
index 6fa44d9cce63..63bab41d6190 100644
--- a/js/src/jit-test/tests/ion/bug750588.js
+++ b/js/src/jit-test/tests/ion/bug750588.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function S() {
   var t = new Float32Array(1);
diff --git a/js/src/jit-test/tests/ion/bug772901.js b/js/src/jit-test/tests/ion/bug772901.js
index eb71f6afb8a2..13928ced8592 100644
--- a/js/src/jit-test/tests/ion/bug772901.js
+++ b/js/src/jit-test/tests/ion/bug772901.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function f(x) {
     delete ((x)++);
diff --git a/js/src/jit-test/tests/ion/testPos.js b/js/src/jit-test/tests/ion/testPos.js
index 197650e9b1fb..1d79df2fc636 100644
--- a/js/src/jit-test/tests/ion/testPos.js
+++ b/js/src/jit-test/tests/ion/testPos.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f_int(x) {
     return +x;
 }
diff --git a/js/src/jit-test/tests/ion/testSubtract.js b/js/src/jit-test/tests/ion/testSubtract.js
index 2b4389b2a8fe..ad75a03f2ef0 100644
--- a/js/src/jit-test/tests/ion/testSubtract.js
+++ b/js/src/jit-test/tests/ion/testSubtract.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f_int(x, y) {
     return x - y;
 }
diff --git a/js/src/jit-test/tests/ion/testVAndBranch.js b/js/src/jit-test/tests/ion/testVAndBranch.js
index c1fcc00e961f..e2ac44234227 100644
--- a/js/src/jit-test/tests/ion/testVAndBranch.js
+++ b/js/src/jit-test/tests/ion/testVAndBranch.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f(x) {
     if (x)
         return true;
diff --git a/js/src/jit-test/tests/ion/truncateToInt32.js b/js/src/jit-test/tests/ion/truncateToInt32.js
index 462b411ad1fe..f48b7f16aef7 100644
--- a/js/src/jit-test/tests/ion/truncateToInt32.js
+++ b/js/src/jit-test/tests/ion/truncateToInt32.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function w(y)
 {
diff --git a/js/src/jit-test/tests/ion/valueToInt32.js b/js/src/jit-test/tests/ion/valueToInt32.js
index 65ad561eca4d..c879c2d75a10 100644
--- a/js/src/jit-test/tests/ion/valueToInt32.js
+++ b/js/src/jit-test/tests/ion/valueToInt32.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function f(x, y) {
     // Confuse the type analysis to not know the type of x.
diff --git a/js/src/jit-test/tests/jaeger/bug592973-1.js b/js/src/jit-test/tests/jaeger/bug592973-1.js
index d3bafac623db..470f84ee359b 100644
--- a/js/src/jit-test/tests/jaeger/bug592973-1.js
+++ b/js/src/jit-test/tests/jaeger/bug592973-1.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f(x) {
     if (x) {
         let y;
diff --git a/js/src/jit-test/tests/jaeger/bug592973-3.js b/js/src/jit-test/tests/jaeger/bug592973-3.js
index 541c39981a4c..ae4694955f5c 100644
--- a/js/src/jit-test/tests/jaeger/bug592973-3.js
+++ b/js/src/jit-test/tests/jaeger/bug592973-3.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f([a, b, c, d]) {
   a = b;
   return function () { return a + b + c + d; };
diff --git a/js/src/jit-test/tests/jaeger/bug597378.js b/js/src/jit-test/tests/jaeger/bug597378.js
index c766407ab58c..454935bb9320 100644
--- a/js/src/jit-test/tests/jaeger/bug597378.js
+++ b/js/src/jit-test/tests/jaeger/bug597378.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f(a, b) {
     var o = a;
     var q = b;
diff --git a/js/src/jit-test/tests/jaeger/bug600139.js b/js/src/jit-test/tests/jaeger/bug600139.js
index 61fa7283a03a..2fdedf42d5cf 100644
--- a/js/src/jit-test/tests/jaeger/bug600139.js
+++ b/js/src/jit-test/tests/jaeger/bug600139.js
@@ -1,5 +1,5 @@
 // |jit-test| error: ReferenceError
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f(a, b, c) {
     if (!a.__SSi) {
         throw Components.returnCode = Cr.NS_ERROR_INVALID_ARG;
diff --git a/js/src/jit-test/tests/jaeger/bug600424.js b/js/src/jit-test/tests/jaeger/bug600424.js
index e59a06614f21..44bb4e7c9b4c 100644
--- a/js/src/jit-test/tests/jaeger/bug600424.js
+++ b/js/src/jit-test/tests/jaeger/bug600424.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 function f(a) {
     var x = {
         g: function () {
diff --git a/js/src/jit-test/tests/jaeger/bug601982.js b/js/src/jit-test/tests/jaeger/bug601982.js
index 99f4bf906fc4..b78f0704c69d 100644
--- a/js/src/jit-test/tests/jaeger/bug601982.js
+++ b/js/src/jit-test/tests/jaeger/bug601982.js
@@ -1,4 +1,4 @@
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
+/* vim: set ts=4 sw=4 tw=99 et: */
 
 function J(i) {
     /* Cause a branch to build(?) */
diff --git a/js/src/jit-test/tests/jaeger/bug604381.js b/js/src/jit-test/tests/jaeger/bug604381.js
index 3ca01cb36234..365c9e3d2b16 100644
--- a/js/src/jit-test/tests/jaeger/bug604381.js
+++ b/js/src/jit-test/tests/jaeger/bug604381.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function F() {
     var T = { };
diff --git a/js/src/jit-test/tests/jaeger/bug616508.js b/js/src/jit-test/tests/jaeger/bug616508.js
index d29bf75f9b5e..38ca2360f1aa 100644
--- a/js/src/jit-test/tests/jaeger/bug616508.js
+++ b/js/src/jit-test/tests/jaeger/bug616508.js
@@ -1,5 +1,5 @@
 // |jit-test| error: ReferenceError
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 // Note: modified from original test, which used Uint32Array in place of Array,
 // because the behavior has changed in a way that this will throw a TypeError
diff --git a/js/src/jit-test/tests/jaeger/bug625438.js b/js/src/jit-test/tests/jaeger/bug625438.js
index 32586d8ab4fa..494bfd1342fd 100644
--- a/js/src/jit-test/tests/jaeger/bug625438.js
+++ b/js/src/jit-test/tests/jaeger/bug625438.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 var count = 0;
 this.watch("x", function() {
diff --git a/js/src/jit-test/tests/jaeger/bug627486.js b/js/src/jit-test/tests/jaeger/bug627486.js
index 7acc3b01e957..f87d27e18a47 100644
--- a/js/src/jit-test/tests/jaeger/bug627486.js
+++ b/js/src/jit-test/tests/jaeger/bug627486.js
@@ -1,5 +1,5 @@
 // |jit-test| error: TypeError
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 g = undefined;
 function L() { }
 
diff --git a/js/src/jit-test/tests/jaeger/floatTypedArrays.js b/js/src/jit-test/tests/jaeger/floatTypedArrays.js
index 51ea7c0a16f6..da1abe0c40ea 100644
--- a/js/src/jit-test/tests/jaeger/floatTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/floatTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function testFloat32Array(L) {
     var f = new Float32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js b/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
index 8bb4627fa678..dc5ed7b45270 100644
--- a/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/normalIntTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function testInt32Array(L) {
     var f = new Int32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js b/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
index c63d36bf2aea..3ed2f2bcb553 100644
--- a/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
+++ b/js/src/jit-test/tests/jaeger/smallIntTypedArrays.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function testInt8Array(L) {
     var f = new Int8Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js b/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
index 369aa2c6fb86..f9e7825a6378 100644
--- a/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
+++ b/js/src/jit-test/tests/jaeger/testCallElemAfterGC.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: ts=4 sw=4 tw=99 et:
 
 function A() {
     this.x = 12;
diff --git a/js/src/jit-test/tests/jaeger/testDenseCallElem.js b/js/src/jit-test/tests/jaeger/testDenseCallElem.js
index 0301048bf31a..eadb77f55b9f 100644
--- a/js/src/jit-test/tests/jaeger/testDenseCallElem.js
+++ b/js/src/jit-test/tests/jaeger/testDenseCallElem.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function fillDense(a) {
 }
diff --git a/js/src/jit-test/tests/jaeger/testForOps.js b/js/src/jit-test/tests/jaeger/testForOps.js
index 382f096121ff..5704e070de07 100644
--- a/js/src/jit-test/tests/jaeger/testForOps.js
+++ b/js/src/jit-test/tests/jaeger/testForOps.js
@@ -1,5 +1,5 @@
 // |jit-test| mjitalways
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function assertObjectsEqual(obj1, obj2) {
     assertEq(obj1.a, obj2.a);
diff --git a/js/src/jit-test/tests/jaeger/testPropCallElem.js b/js/src/jit-test/tests/jaeger/testPropCallElem.js
index 2bb97fbe64a1..fd067bbf7a50 100644
--- a/js/src/jit-test/tests/jaeger/testPropCallElem.js
+++ b/js/src/jit-test/tests/jaeger/testPropCallElem.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function testUKeyUObject(a, key1, key2, key3) {
     a.a = function () { return this.d; }
diff --git a/js/src/jit-test/tests/jaeger/testPropCallElem2.js b/js/src/jit-test/tests/jaeger/testPropCallElem2.js
index 43f8efb0fb57..328193ae4b21 100644
--- a/js/src/jit-test/tests/jaeger/testPropCallElem2.js
+++ b/js/src/jit-test/tests/jaeger/testPropCallElem2.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function testUKeyUObject(a, key1, key2, key3) {
     a.a = function () { return this.d; }
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-Easy.js b/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
index ed8fc7c9a9bb..9eb9d0688689 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-Easy.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function testBadSetElems(obj, key) {
     obj[key] = 5;
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js b/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
index 01b42bd6b392..146092fbb5d4 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-Indexed.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function f() {
     return [[], [], [], []];
diff --git a/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js b/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
index f202513d534a..91d71401d489 100644
--- a/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
+++ b/js/src/jit-test/tests/jaeger/testSetElem-NewProto.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function f() {
     return [[], [], [], []];
diff --git a/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js b/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
index 33e38dd3fc3f..49ea74a8b94c 100644
--- a/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
+++ b/js/src/jit-test/tests/jaeger/testSetTypedFloatArray.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function testSetTypedFloat32Array(k) {
     var ar = new Float32Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js b/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
index 89e943b698a7..bf3099c50c0f 100644
--- a/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
+++ b/js/src/jit-test/tests/jaeger/testSetTypedIntArray.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function testSetTypedInt8Array(k) {
     var ar = new Int8Array(8);
diff --git a/js/src/jit-test/tests/jaeger/testShiftSameBacking.js b/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
index 1cbe064d3fef..cb2ce0059b46 100644
--- a/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
+++ b/js/src/jit-test/tests/jaeger/testShiftSameBacking.js
@@ -1,4 +1,4 @@
-// vim: set ts=8 sts=4 et sw=4 tw=99:
+// vim: set ts=4 sw=4 tw=99 et:
 
 function f(a) {
     var x = a;
diff --git a/js/src/jsalloc.cpp b/js/src/jsalloc.cpp
index 744eb68cb9d7..a5ceae2a22c5 100644
--- a/js/src/jsalloc.cpp
+++ b/js/src/jsalloc.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsalloc.h b/js/src/jsalloc.h
index 7d2690b69a79..7d76a7c701ad 100644
--- a/js/src/jsalloc.h
+++ b/js/src/jsalloc.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index bda8e36751e5..0e5312f58ce2 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jsanalyze.h b/js/src/jsanalyze.h
index e1b60575aaed..2be5bcdaf3c2 100644
--- a/js/src/jsanalyze.h
+++ b/js/src/jsanalyze.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jsapi-tests/selfTest.cpp b/js/src/jsapi-tests/selfTest.cpp
index 39202abb5720..91f25ccce612 100644
--- a/js/src/jsapi-tests/selfTest.cpp
+++ b/js/src/jsapi-tests/selfTest.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testAddPropertyPropcache.cpp b/js/src/jsapi-tests/testAddPropertyPropcache.cpp
index 10acaf89c2f0..be190df1824c 100644
--- a/js/src/jsapi-tests/testAddPropertyPropcache.cpp
+++ b/js/src/jsapi-tests/testAddPropertyPropcache.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testArgumentsObject.cpp b/js/src/jsapi-tests/testArgumentsObject.cpp
index 0d34e41b2dad..81c79608fd73 100644
--- a/js/src/jsapi-tests/testArgumentsObject.cpp
+++ b/js/src/jsapi-tests/testArgumentsObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testArrayBuffer.cpp b/js/src/jsapi-tests/testArrayBuffer.cpp
index a8299a611b51..081146c3d690 100644
--- a/js/src/jsapi-tests/testArrayBuffer.cpp
+++ b/js/src/jsapi-tests/testArrayBuffer.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 
 #include "tests.h"
diff --git a/js/src/jsapi-tests/testBug604087.cpp b/js/src/jsapi-tests/testBug604087.cpp
index f66c702aab19..c3a907a20b91 100644
--- a/js/src/jsapi-tests/testBug604087.cpp
+++ b/js/src/jsapi-tests/testBug604087.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Tests JS_TransplantObject
  */
diff --git a/js/src/jsapi-tests/testClassGetter.cpp b/js/src/jsapi-tests/testClassGetter.cpp
index 7b3ecb728447..420ef24c4346 100644
--- a/js/src/jsapi-tests/testClassGetter.cpp
+++ b/js/src/jsapi-tests/testClassGetter.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Tests the JSClass::getProperty hook
  */
diff --git a/js/src/jsapi-tests/testCloneScript.cpp b/js/src/jsapi-tests/testCloneScript.cpp
index 91ff93d76180..14e6882dd431 100644
--- a/js/src/jsapi-tests/testCloneScript.cpp
+++ b/js/src/jsapi-tests/testCloneScript.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Test script cloning.
  */
diff --git a/js/src/jsapi-tests/testContexts.cpp b/js/src/jsapi-tests/testContexts.cpp
index e863a4086ee1..1f65b462a2d0 100644
--- a/js/src/jsapi-tests/testContexts.cpp
+++ b/js/src/jsapi-tests/testContexts.cpp
@@ -1,9 +1,11 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 sw=4 et tw=99:
+ */
+/* 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 "tests.h"
 
 BEGIN_TEST(testContexts_IsRunning)
diff --git a/js/src/jsapi-tests/testDebugger.cpp b/js/src/jsapi-tests/testDebugger.cpp
index 577fffa08129..586a24da62ba 100644
--- a/js/src/jsapi-tests/testDebugger.cpp
+++ b/js/src/jsapi-tests/testDebugger.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDeepFreeze.cpp b/js/src/jsapi-tests/testDeepFreeze.cpp
index 48d31f6bcaa2..9b95af5b0bbf 100644
--- a/js/src/jsapi-tests/testDeepFreeze.cpp
+++ b/js/src/jsapi-tests/testDeepFreeze.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
index d28c8affb58a..7f07b640e842 100644
--- a/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
+++ b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testDefineProperty.cpp b/js/src/jsapi-tests/testDefineProperty.cpp
index 739dfafdb6c5..b5617799adae 100644
--- a/js/src/jsapi-tests/testDefineProperty.cpp
+++ b/js/src/jsapi-tests/testDefineProperty.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testEnclosingFunction.cpp b/js/src/jsapi-tests/testEnclosingFunction.cpp
index 0a88f6c598e1..2549b6f181aa 100644
--- a/js/src/jsapi-tests/testEnclosingFunction.cpp
+++ b/js/src/jsapi-tests/testEnclosingFunction.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Test script cloning.
  */
diff --git a/js/src/jsapi-tests/testErrorCopying.cpp b/js/src/jsapi-tests/testErrorCopying.cpp
index bda243b85265..1923879d2763 100644
--- a/js/src/jsapi-tests/testErrorCopying.cpp
+++ b/js/src/jsapi-tests/testErrorCopying.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Tests that the column number of error reports is properly copied over from
  * other reports when invoked from the C++ api.
diff --git a/js/src/jsapi-tests/testFindSCCs.cpp b/js/src/jsapi-tests/testFindSCCs.cpp
index ad38b56ac036..1e98800059e4 100644
--- a/js/src/jsapi-tests/testFindSCCs.cpp
+++ b/js/src/jsapi-tests/testFindSCCs.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testFunctionProperties.cpp b/js/src/jsapi-tests/testFunctionProperties.cpp
index b70f95bcb0e0..9fee41561803 100644
--- a/js/src/jsapi-tests/testFunctionProperties.cpp
+++ b/js/src/jsapi-tests/testFunctionProperties.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testGCOutOfMemory.cpp b/js/src/jsapi-tests/testGCOutOfMemory.cpp
index 49e3db00f819..83aa3c774f85 100644
--- a/js/src/jsapi-tests/testGCOutOfMemory.cpp
+++ b/js/src/jsapi-tests/testGCOutOfMemory.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
diff --git a/js/src/jsapi-tests/testGetPropertyDefault.cpp b/js/src/jsapi-tests/testGetPropertyDefault.cpp
index 8aa0323d8c3e..4dc9664fb921 100644
--- a/js/src/jsapi-tests/testGetPropertyDefault.cpp
+++ b/js/src/jsapi-tests/testGetPropertyDefault.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testIndexToString.cpp b/js/src/jsapi-tests/testIndexToString.cpp
index 998e65218614..0b59b6f0b402 100644
--- a/js/src/jsapi-tests/testIndexToString.cpp
+++ b/js/src/jsapi-tests/testIndexToString.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testIntString.cpp b/js/src/jsapi-tests/testIntString.cpp
index fc627d62430d..18b3d53371e5 100644
--- a/js/src/jsapi-tests/testIntString.cpp
+++ b/js/src/jsapi-tests/testIntString.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testJSEvaluateScript.cpp b/js/src/jsapi-tests/testJSEvaluateScript.cpp
index 72d92e751432..875ae83094be 100644
--- a/js/src/jsapi-tests/testJSEvaluateScript.cpp
+++ b/js/src/jsapi-tests/testJSEvaluateScript.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 
 #include "tests.h"
diff --git a/js/src/jsapi-tests/testLookup.cpp b/js/src/jsapi-tests/testLookup.cpp
index 74125b62cbdf..692ca846d5b1 100644
--- a/js/src/jsapi-tests/testLookup.cpp
+++ b/js/src/jsapi-tests/testLookup.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testNewObject.cpp b/js/src/jsapi-tests/testNewObject.cpp
index 03dac00c0a36..94b8607bb1db 100644
--- a/js/src/jsapi-tests/testNewObject.cpp
+++ b/js/src/jsapi-tests/testNewObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testOps.cpp b/js/src/jsapi-tests/testOps.cpp
index c883439b0e39..648493be1df0 100644
--- a/js/src/jsapi-tests/testOps.cpp
+++ b/js/src/jsapi-tests/testOps.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Tests for operators and implicit type conversion.
  */
diff --git a/js/src/jsapi-tests/testParseJSON.cpp b/js/src/jsapi-tests/testParseJSON.cpp
index 87255505bc6f..abfe849ec214 100644
--- a/js/src/jsapi-tests/testParseJSON.cpp
+++ b/js/src/jsapi-tests/testParseJSON.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testProfileStrings.cpp b/js/src/jsapi-tests/testProfileStrings.cpp
index 15b265ca6fce..bf6a82ca5e85 100644
--- a/js/src/jsapi-tests/testProfileStrings.cpp
+++ b/js/src/jsapi-tests/testProfileStrings.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * Tests the stack-based instrumentation profiler on a JSRuntime
  */
diff --git a/js/src/jsapi-tests/testPropCache.cpp b/js/src/jsapi-tests/testPropCache.cpp
index 9c619183dc34..3920a1f06bfd 100644
--- a/js/src/jsapi-tests/testPropCache.cpp
+++ b/js/src/jsapi-tests/testPropCache.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
index 717c7dccac2b..5fdebda8acac 100644
--- a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
+++ b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testResolveRecursion.cpp b/js/src/jsapi-tests/testResolveRecursion.cpp
index 58f387e585ed..43d7b2d2be99 100644
--- a/js/src/jsapi-tests/testResolveRecursion.cpp
+++ b/js/src/jsapi-tests/testResolveRecursion.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testSameValue.cpp b/js/src/jsapi-tests/testSameValue.cpp
index 3d35df3a671b..6f1c75b54e60 100644
--- a/js/src/jsapi-tests/testSameValue.cpp
+++ b/js/src/jsapi-tests/testSameValue.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testScriptInfo.cpp b/js/src/jsapi-tests/testScriptInfo.cpp
index 2fa8f29429a4..3265ed9fc430 100644
--- a/js/src/jsapi-tests/testScriptInfo.cpp
+++ b/js/src/jsapi-tests/testScriptInfo.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testScriptObject.cpp b/js/src/jsapi-tests/testScriptObject.cpp
index 29a522dfa857..4075976864c7 100644
--- a/js/src/jsapi-tests/testScriptObject.cpp
+++ b/js/src/jsapi-tests/testScriptObject.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testSetProperty.cpp b/js/src/jsapi-tests/testSetProperty.cpp
index 8003c473b35a..598d5d24d8fa 100644
--- a/js/src/jsapi-tests/testSetProperty.cpp
+++ b/js/src/jsapi-tests/testSetProperty.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testStringBuffer.cpp b/js/src/jsapi-tests/testStringBuffer.cpp
index ebbd2dff1f61..51c232381d27 100644
--- a/js/src/jsapi-tests/testStringBuffer.cpp
+++ b/js/src/jsapi-tests/testStringBuffer.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testTrap.cpp b/js/src/jsapi-tests/testTrap.cpp
index a1bde8d9d2d8..3e66a388ec06 100644
--- a/js/src/jsapi-tests/testTrap.cpp
+++ b/js/src/jsapi-tests/testTrap.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testTypedArrays.cpp b/js/src/jsapi-tests/testTypedArrays.cpp
index 8aba225ac576..00ec3704e356 100644
--- a/js/src/jsapi-tests/testTypedArrays.cpp
+++ b/js/src/jsapi-tests/testTypedArrays.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testUTF8.cpp b/js/src/jsapi-tests/testUTF8.cpp
index 2ec6b06898ef..941177369b89 100644
--- a/js/src/jsapi-tests/testUTF8.cpp
+++ b/js/src/jsapi-tests/testUTF8.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/testXDR.cpp b/js/src/jsapi-tests/testXDR.cpp
index c47d82897726..e8d934a83d6d 100644
--- a/js/src/jsapi-tests/testXDR.cpp
+++ b/js/src/jsapi-tests/testXDR.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
  */
 /* 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
diff --git a/js/src/jsapi-tests/tests.cpp b/js/src/jsapi-tests/tests.cpp
index 30b89be2d3b8..6ce8c30b6244 100644
--- a/js/src/jsapi-tests/tests.cpp
+++ b/js/src/jsapi-tests/tests.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsapi-tests/tests.h b/js/src/jsapi-tests/tests.h
index d9579ef9ec50..e251ca981a23 100644
--- a/js/src/jsapi-tests/tests.h
+++ b/js/src/jsapi-tests/tests.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsapi-tests/valueABI.c b/js/src/jsapi-tests/valueABI.c
index 65b31d38c48e..89a5693ee393 100644
--- a/js/src/jsapi-tests/valueABI.c
+++ b/js/src/jsapi-tests/valueABI.c
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sw=4 et tw=99 ft=c:
+ *
  * 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/. */
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index a506b06fb23c..3180e7f3e55e 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 610c7f8071e6..cd4d151ca4f1 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index cf6da3726fc4..d3cbcc4be99d 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set sw=4 ts=8 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsarray.h b/js/src/jsarray.h
index 7cb15822c18b..a61d7a829deb 100644
--- a/js/src/jsarray.h
+++ b/js/src/jsarray.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index a675149a54aa..e0178dedd302 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsatom.h b/js/src/jsatom.h
index 1aa15269e9d6..9ff01bd6fac1 100644
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsatominlines.h b/js/src/jsatominlines.h
index 421bf141b6be..2d5df3d44029 100644
--- a/js/src/jsatominlines.h
+++ b/js/src/jsatominlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsbool.cpp b/js/src/jsbool.cpp
index 1b29be168a50..b3a54c63c24e 100644
--- a/js/src/jsbool.cpp
+++ b/js/src/jsbool.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsbool.h b/js/src/jsbool.h
index 0d847ec30514..1676d523af87 100644
--- a/js/src/jsbool.h
+++ b/js/src/jsbool.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsboolinlines.h b/js/src/jsboolinlines.h
index 58ed270c1966..1f2b361d276e 100644
--- a/js/src/jsboolinlines.h
+++ b/js/src/jsboolinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsclass.h b/js/src/jsclass.h
index a8559ea554ab..86c0e5b86e68 100644
--- a/js/src/jsclass.h
+++ b/js/src/jsclass.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsclist.h b/js/src/jsclist.h
index 8782307fa4ab..4881104eee79 100644
--- a/js/src/jsclist.h
+++ b/js/src/jsclist.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
 
diff --git a/js/src/jsclone.cpp b/js/src/jsclone.cpp
index 885bfc01a1ba..e3b249e486eb 100644
--- a/js/src/jsclone.cpp
+++ b/js/src/jsclone.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jsclone.h b/js/src/jsclone.h
index 595bf8f013a1..5a3326152b65 100644
--- a/js/src/jsclone.h
+++ b/js/src/jsclone.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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/. */
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 9e36c88415c6..2190cf5be7ae 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 487903125723..b3b0fad13626 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 58de7e00b258..9c9a03d3b1da 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 2a6dc4dc4edf..41961c8b8b2e 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 454f13137d3a..d4fda4b68e7d 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/src/jscompartmentinlines.h b/js/src/jscompartmentinlines.h
index c9c747b55e96..e9724ff9b047 100644
--- a/js/src/jscompartmentinlines.h
+++ b/js/src/jscompartmentinlines.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
index 1b7baf996f1a..3d2022dbe292 100644
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jscrashformat.h b/js/src/jscrashformat.h
index 7d3940d9f661..cf274f336018 100644
--- a/js/src/jscrashformat.h
+++ b/js/src/jscrashformat.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jscrashreport.cpp b/js/src/jscrashreport.cpp
index 1ebac89fa44f..6cb415aeb716 100644
--- a/js/src/jscrashreport.cpp
+++ b/js/src/jscrashreport.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jscrashreport.h b/js/src/jscrashreport.h
index cb2336be00d1..beeb76151ba1 100644
--- a/js/src/jscrashreport.h
+++ b/js/src/jscrashreport.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index 666e72e3912a..928c4a66a8ea 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsdate.h b/js/src/jsdate.h
index 67c2ca067981..514160ecd634 100644
--- a/js/src/jsdate.h
+++ b/js/src/jsdate.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index a3ed445bd705..be6e447aad9c 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsdbgapi.h b/js/src/jsdbgapi.h
index d6f5b2e9db25..e47c33a85718 100644
--- a/js/src/jsdbgapi.h
+++ b/js/src/jsdbgapi.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsdhash.cpp b/js/src/jsdhash.cpp
index 00b0dbdbc04b..51b5cb5d94bd 100644
--- a/js/src/jsdhash.cpp
+++ b/js/src/jsdhash.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/src/jsdhash.h b/js/src/jsdhash.h
index 1f7830fd2b1f..c8f02b18b708 100644
--- a/js/src/jsdhash.h
+++ b/js/src/jsdhash.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/src/jsdtoa.cpp b/js/src/jsdtoa.cpp
index 9d94bebaf5e9..b8b57eb3f368 100644
--- a/js/src/jsdtoa.cpp
+++ b/js/src/jsdtoa.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsdtoa.h b/js/src/jsdtoa.h
index dfd5393d1090..c55b8277ed40 100644
--- a/js/src/jsdtoa.h
+++ b/js/src/jsdtoa.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 4ba3778e74e2..21d2a3afeb9e 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsexn.h b/js/src/jsexn.h
index c7b8882bdce6..4d14278db6f8 100644
--- a/js/src/jsexn.h
+++ b/js/src/jsexn.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index cb69671550fe..d2e8a0b84b12 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index c0f4c975cb29..a95600ac89a7 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index bbc90d477d64..96d9eb2a4057 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index d1cf351dcbc0..4fce726bc1cf 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
@@ -212,7 +212,7 @@ class JSFunction : public JSObject
 
     js::RawScript getOrCreateScript(JSContext *cx) {
         JS_ASSERT(isInterpreted());
-        JS_ASSERT(cx);
+				JS_ASSERT(cx);
         if (isInterpretedLazy()) {
             JS::RootedFunction self(cx, this);
             js::MaybeCheckStackRoots(cx);
diff --git a/js/src/jsfuninlines.h b/js/src/jsfuninlines.h
index a15eb7ec3b48..0a0b49ad79c4 100644
--- a/js/src/jsfuninlines.h
+++ b/js/src/jsfuninlines.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 7e5e0fda211c..f89147853304 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 22894caf3bdf..6b26f57faadb 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index 9fc17ff96585..a684d0636d5f 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 75d40a8f30e7..508eb23b1413 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jsinfer.h b/js/src/jsinfer.h
index 2d26722ad9f7..1043a9954265 100644
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h
index c3dbb5f8f067..c6d29d39a7ea 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 5e16c739dc08..68b4c69e57b2 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 9887aa0e6db9..9cbd70dbeafa 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index 989cb28cb43c..56a513dd30bc 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 39e49e81b684..552bdd95fb13 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsiter.h b/js/src/jsiter.h
index 6640de902901..3d7627384df6 100644
--- a/js/src/jsiter.h
+++ b/js/src/jsiter.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jskwgen.cpp b/js/src/jskwgen.cpp
index c5e66707fb98..c488184603f7 100644
--- a/js/src/jskwgen.cpp
+++ b/js/src/jskwgen.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set sw=4 ts=8 et 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/. */
diff --git a/js/src/jslibmath.h b/js/src/jslibmath.h
index bcd136a1a79b..778d7f8ae1de 100644
--- a/js/src/jslibmath.h
+++ b/js/src/jslibmath.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/src/jslock.h b/js/src/jslock.h
index b4a28a9fa9c4..025aaea0af82 100644
--- a/js/src/jslock.h
+++ b/js/src/jslock.h
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
-
 #ifndef jslock_h__
 #define jslock_h__
 
diff --git a/js/src/jslog2.cpp b/js/src/jslog2.cpp
index cee3d0d13e22..d02400721365 100644
--- a/js/src/jslog2.cpp
+++ b/js/src/jslog2.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
index 424ad79ed60e..97f880fe98d0 100644
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsmath.h b/js/src/jsmath.h
index 4f2a4b467eca..91150d809fc9 100644
--- a/js/src/jsmath.h
+++ b/js/src/jsmath.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsmemorymetrics.cpp b/js/src/jsmemorymetrics.cpp
index e744b6be9d6d..fc82601c5c17 100644
--- a/js/src/jsmemorymetrics.cpp
+++ b/js/src/jsmemorymetrics.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
index cd301292d72d..9fec01d35f0d 100644
--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
@@ -1,6 +1,7 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 et sw=4 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/. */
 
diff --git a/js/src/jsnativestack.h b/js/src/jsnativestack.h
index 916bee2d0394..3f823f56d22f 100644
--- a/js/src/jsnativestack.h
+++ b/js/src/jsnativestack.h
@@ -1,6 +1,7 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: set ts=8 et sw=4 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/. */
 
diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index 49e89fc124e5..8c9dc7aff420 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsnum.h b/js/src/jsnum.h
index 0f765f3c616b..653ff12fddf0 100644
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsnuminlines.h b/js/src/jsnuminlines.h
index 1c4dcf515d56..c17909fdb52e 100644
--- a/js/src/jsnuminlines.h
+++ b/js/src/jsnuminlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 347cbbf5d1e4..f8cb8b97e8a4 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
+ *
  * 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/. */
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index a2e6a3e7deae..25a8652c5ec5 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 20790e56c8d9..9213ae088914 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 467c3ca0b8f5..d03a8da9931f 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/json.h b/js/src/json.h
index 7fa2c117c804..bb21f9145151 100644
--- a/js/src/json.h
+++ b/js/src/json.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* 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/. */
 
diff --git a/js/src/jsonparser.cpp b/js/src/jsonparser.cpp
index 9c89d08b4997..3b4b1ebb2a8c 100644
--- a/js/src/jsonparser.cpp
+++ b/js/src/jsonparser.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsonparser.h b/js/src/jsonparser.h
index d8df9946b27b..10c954055ff8 100644
--- a/js/src/jsonparser.h
+++ b/js/src/jsonparser.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 2ce6dfc2c2a0..aafd8bbf4b6e 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set sw=4 ts=8 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsopcode.h b/js/src/jsopcode.h
index f0ec5c580cb3..1d1e17cbce46 100644
--- a/js/src/jsopcode.h
+++ b/js/src/jsopcode.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsopcodeinlines.h b/js/src/jsopcodeinlines.h
index 701be7785e5a..5fd85cd891da 100644
--- a/js/src/jsopcodeinlines.h
+++ b/js/src/jsopcodeinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsoplengen.cpp b/js/src/jsoplengen.cpp
index 808f5ed778b9..4bef284c5f5f 100644
--- a/js/src/jsoplengen.cpp
+++ b/js/src/jsoplengen.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set sw=4 ts=8 et 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/. */
diff --git a/js/src/jsprf.cpp b/js/src/jsprf.cpp
index 08fb08ff3fb5..0a2ebc8e41e5 100644
--- a/js/src/jsprf.cpp
+++ b/js/src/jsprf.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
 
diff --git a/js/src/jsprf.h b/js/src/jsprf.h
index c0891f0e9e90..4c2bef91d29e 100644
--- a/js/src/jsprf.h
+++ b/js/src/jsprf.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
 
diff --git a/js/src/jsprobes.cpp b/js/src/jsprobes.cpp
index b2217b1b8c1f..3a103ea612b0 100644
--- a/js/src/jsprobes.cpp
+++ b/js/src/jsprobes.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/src/jsprobes.h b/js/src/jsprobes.h
index 0bd391a2b70a..601bc5c70a03 100644
--- a/js/src/jsprobes.h
+++ b/js/src/jsprobes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et 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/. */
diff --git a/js/src/jspropertycache.cpp b/js/src/jspropertycache.cpp
index 98a84f21df78..20d074edd5f1 100644
--- a/js/src/jspropertycache.cpp
+++ b/js/src/jspropertycache.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=98:
+ *
  * 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/. */
diff --git a/js/src/jspropertycache.h b/js/src/jspropertycache.h
index ce0acab2c78f..b63aff4c7026 100644
--- a/js/src/jspropertycache.h
+++ b/js/src/jspropertycache.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=98:
+ *
  * 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/. */
diff --git a/js/src/jspropertycacheinlines.h b/js/src/jspropertycacheinlines.h
index 910a9e180a74..48e1a7874db7 100644
--- a/js/src/jspropertycacheinlines.h
+++ b/js/src/jspropertycacheinlines.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jspropertytree.cpp b/js/src/jspropertytree.cpp
index 6e8843821c1d..cf32bfac4e1a 100644
--- a/js/src/jspropertytree.cpp
+++ b/js/src/jspropertytree.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jspropertytree.h b/js/src/jspropertytree.h
index d269e2937c4e..4c3fbd725a2a 100644
--- a/js/src/jspropertytree.h
+++ b/js/src/jspropertytree.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jsprototypes.h b/js/src/jsprototypes.h
index 007d25d7204f..27f5c84450b1 100644
--- a/js/src/jsprototypes.h
+++ b/js/src/jsprototypes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index df2f78af54c4..dda39fda162d 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -1,9 +1,10 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
-
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 #include <string.h>
 #include "jsapi.h"
 #include "jscntxt.h"
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 54e91db7fa61..a6f7851744c8 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsprvtd.h b/js/src/jsprvtd.h
index 4db5ed8c36d0..a131e61ba6e0 100644
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index ab124ee57104..2159dd4f6cc6 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsreflect.cpp b/js/src/jsreflect.cpp
index e97e31344415..16978563e9c8 100644
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsreflect.h b/js/src/jsreflect.h
index be973527970c..b517c1bc4d90 100644
--- a/js/src/jsreflect.h
+++ b/js/src/jsreflect.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 3135a6159e31..ed61d59d663b 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 38f8b8d69d6e..595287a6b12b 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsscriptinlines.h b/js/src/jsscriptinlines.h
index 560aa44a14ab..2861ea2e5f4c 100644
--- a/js/src/jsscriptinlines.h
+++ b/js/src/jsscriptinlines.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index bbd9401bad3f..0e50cb0f7f74 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsstr.h b/js/src/jsstr.h
index 8a1d270ad720..10ae7b2fc106 100644
--- a/js/src/jsstr.h
+++ b/js/src/jsstr.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/jsstrinlines.h b/js/src/jsstrinlines.h
index 262a1d11a33a..82550466197c 100644
--- a/js/src/jsstrinlines.h
+++ b/js/src/jsstrinlines.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index c09511515e8d..15b5c5daf67b 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h
index 0a7602a850c5..e38313b16299 100644
--- a/js/src/jstypedarray.h
+++ b/js/src/jstypedarray.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jstypedarrayinlines.h b/js/src/jstypedarrayinlines.h
index 952ecb100505..22e30038b946 100644
--- a/js/src/jstypedarrayinlines.h
+++ b/js/src/jstypedarrayinlines.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jstypes.h b/js/src/jstypes.h
index b597cf3b987b..c83e7fed26e3 100644
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
 
diff --git a/js/src/jsutil.cpp b/js/src/jsutil.cpp
index fc4341002444..f04077996b08 100644
--- a/js/src/jsutil.cpp
+++ b/js/src/jsutil.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsutil.h b/js/src/jsutil.h
index ed7e0989e0f7..ff77e41a8893 100644
--- a/js/src/jsutil.h
+++ b/js/src/jsutil.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jsversion.h b/js/src/jsversion.h
index 64f2ad217675..50e2fa6beb0b 100644
--- a/js/src/jsversion.h
+++ b/js/src/jsversion.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/jswatchpoint.cpp b/js/src/jswatchpoint.cpp
index 42b6a272bd8d..152eb4d0f211 100644
--- a/js/src/jswatchpoint.cpp
+++ b/js/src/jswatchpoint.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jswatchpoint.h b/js/src/jswatchpoint.h
index 47179327d6df..2c05f77c77f3 100644
--- a/js/src/jswatchpoint.h
+++ b/js/src/jswatchpoint.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsweakcache.h b/js/src/jsweakcache.h
index 54d810032461..bc3ac58b2c57 100644
--- a/js/src/jsweakcache.h
+++ b/js/src/jsweakcache.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index 8f01f6aa4ccd..5977bfca5971 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jsweakmap.h b/js/src/jsweakmap.h
index bc130e10c6ef..47a7f42eff72 100644
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jswin.h b/js/src/jswin.h
index 689d23810677..50b548cb8fd7 100644
--- a/js/src/jswin.h
+++ b/js/src/jswin.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* 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/. */
 
diff --git a/js/src/jsworkers.cpp b/js/src/jsworkers.cpp
index f6a2e279f741..d80ee15f3037 100644
--- a/js/src/jsworkers.cpp
+++ b/js/src/jsworkers.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jsworkers.h b/js/src/jsworkers.h
index 89baca26d7ca..a3b7edafda00 100644
--- a/js/src/jsworkers.h
+++ b/js/src/jsworkers.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 4d8aceb2cef2..3f21082891d9 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index e8423b993b23..3e7985cb6b2a 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/BaseAssembler.h b/js/src/methodjit/BaseAssembler.h
index 9e3af92cd4dc..7b84a48e532f 100644
--- a/js/src/methodjit/BaseAssembler.h
+++ b/js/src/methodjit/BaseAssembler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/BaseCompiler.h b/js/src/methodjit/BaseCompiler.h
index ad3af9d3da38..3531ec04d773 100644
--- a/js/src/methodjit/BaseCompiler.h
+++ b/js/src/methodjit/BaseCompiler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/CodeGenIncludes.h b/js/src/methodjit/CodeGenIncludes.h
index 3cddee0a5638..23378e5e7e89 100644
--- a/js/src/methodjit/CodeGenIncludes.h
+++ b/js/src/methodjit/CodeGenIncludes.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index b934effe95db..ef5680120c5d 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/Compiler.h b/js/src/methodjit/Compiler.h
index 9652a071c8fb..5cafd3e298a4 100644
--- a/js/src/methodjit/Compiler.h
+++ b/js/src/methodjit/Compiler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/FastArithmetic.cpp b/js/src/methodjit/FastArithmetic.cpp
index 44c2361cacb3..f2f6d19a1ea2 100644
--- a/js/src/methodjit/FastArithmetic.cpp
+++ b/js/src/methodjit/FastArithmetic.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/FastBuiltins.cpp b/js/src/methodjit/FastBuiltins.cpp
index 8d907b836fbc..5415930e9ab2 100644
--- a/js/src/methodjit/FastBuiltins.cpp
+++ b/js/src/methodjit/FastBuiltins.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/FastOps.cpp b/js/src/methodjit/FastOps.cpp
index 4d6ec3126640..45d038a9047c 100644
--- a/js/src/methodjit/FastOps.cpp
+++ b/js/src/methodjit/FastOps.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/FrameEntry.h b/js/src/methodjit/FrameEntry.h
index 5d3b5c38218f..53e6b0b493c0 100644
--- a/js/src/methodjit/FrameEntry.h
+++ b/js/src/methodjit/FrameEntry.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/FrameState-inl.h b/js/src/methodjit/FrameState-inl.h
index 0a4b6439c1e5..a12867a47e38 100644
--- a/js/src/methodjit/FrameState-inl.h
+++ b/js/src/methodjit/FrameState-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/FrameState.cpp b/js/src/methodjit/FrameState.cpp
index 186fb524e86c..bdfbf2ffbece 100644
--- a/js/src/methodjit/FrameState.cpp
+++ b/js/src/methodjit/FrameState.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/FrameState.h b/js/src/methodjit/FrameState.h
index f568943a70c3..85f1f959d913 100644
--- a/js/src/methodjit/FrameState.h
+++ b/js/src/methodjit/FrameState.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/ICChecker.h b/js/src/methodjit/ICChecker.h
index 44c06cc100e5..93c4889bf992 100644
--- a/js/src/methodjit/ICChecker.h
+++ b/js/src/methodjit/ICChecker.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/ICLabels.h b/js/src/methodjit/ICLabels.h
index 8d4e8ad2106c..4b422ff94883 100644
--- a/js/src/methodjit/ICLabels.h
+++ b/js/src/methodjit/ICLabels.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/ICRepatcher.h b/js/src/methodjit/ICRepatcher.h
index 2d5ea4035caa..79c7666b9a00 100644
--- a/js/src/methodjit/ICRepatcher.h
+++ b/js/src/methodjit/ICRepatcher.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/ImmutableSync.cpp b/js/src/methodjit/ImmutableSync.cpp
index 7cef76bb72ff..a763b5c0a479 100644
--- a/js/src/methodjit/ImmutableSync.cpp
+++ b/js/src/methodjit/ImmutableSync.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/ImmutableSync.h b/js/src/methodjit/ImmutableSync.h
index bd1429efa655..f232175db78f 100644
--- a/js/src/methodjit/ImmutableSync.h
+++ b/js/src/methodjit/ImmutableSync.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/InlineFrameAssembler.h b/js/src/methodjit/InlineFrameAssembler.h
index b80bb52d24bd..12d3bac8f3b6 100644
--- a/js/src/methodjit/InlineFrameAssembler.h
+++ b/js/src/methodjit/InlineFrameAssembler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index 582558fb60f2..c02d6db68996 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/Logging.cpp b/js/src/methodjit/Logging.cpp
index 7ecf536d8bb1..5bca55ccc240 100644
--- a/js/src/methodjit/Logging.cpp
+++ b/js/src/methodjit/Logging.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/Logging.h b/js/src/methodjit/Logging.h
index 6825f0313695..fff123e911ce 100644
--- a/js/src/methodjit/Logging.h
+++ b/js/src/methodjit/Logging.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/LoopState.cpp b/js/src/methodjit/LoopState.cpp
index 92e9c6dffce8..21e65fd40865 100644
--- a/js/src/methodjit/LoopState.cpp
+++ b/js/src/methodjit/LoopState.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/LoopState.h b/js/src/methodjit/LoopState.h
index 3518ba88e5eb..6280bf2598bc 100644
--- a/js/src/methodjit/LoopState.h
+++ b/js/src/methodjit/LoopState.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/MachineRegs.h b/js/src/methodjit/MachineRegs.h
index 2b5d80c51600..e355dd7b6cab 100644
--- a/js/src/methodjit/MachineRegs.h
+++ b/js/src/methodjit/MachineRegs.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
index 7741b59b7fa9..94f145bf00fd 100644
--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/MethodJIT.h b/js/src/methodjit/MethodJIT.h
index a60415f82e0c..c813d1fc47f6 100644
--- a/js/src/methodjit/MethodJIT.h
+++ b/js/src/methodjit/MethodJIT.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/MonoIC.cpp b/js/src/methodjit/MonoIC.cpp
index f633ef29d8a9..b07bdeab577d 100644
--- a/js/src/methodjit/MonoIC.cpp
+++ b/js/src/methodjit/MonoIC.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/MonoIC.h b/js/src/methodjit/MonoIC.h
index acb0acdc6aef..852dacc02f65 100644
--- a/js/src/methodjit/MonoIC.h
+++ b/js/src/methodjit/MonoIC.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/NunboxAssembler.h b/js/src/methodjit/NunboxAssembler.h
index 8c30afc06815..9d764a5f0e88 100644
--- a/js/src/methodjit/NunboxAssembler.h
+++ b/js/src/methodjit/NunboxAssembler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp
index f76a68abdbf0..df176bc13de1 100644
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/PolyIC.h b/js/src/methodjit/PolyIC.h
index e17226aaeb2a..f7b4423c3f09 100644
--- a/js/src/methodjit/PolyIC.h
+++ b/js/src/methodjit/PolyIC.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/PunboxAssembler.h b/js/src/methodjit/PunboxAssembler.h
index 7a066bd4ffc9..959ba595f306 100644
--- a/js/src/methodjit/PunboxAssembler.h
+++ b/js/src/methodjit/PunboxAssembler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/RematInfo.h b/js/src/methodjit/RematInfo.h
index c0bdc40e3881..cd9ec7a2e50d 100644
--- a/js/src/methodjit/RematInfo.h
+++ b/js/src/methodjit/RematInfo.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/Retcon.cpp b/js/src/methodjit/Retcon.cpp
index 2479236a3a5c..d91286108123 100644
--- a/js/src/methodjit/Retcon.cpp
+++ b/js/src/methodjit/Retcon.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/Retcon.h b/js/src/methodjit/Retcon.h
index 8e4105644347..d4e688bf7046 100644
--- a/js/src/methodjit/Retcon.h
+++ b/js/src/methodjit/Retcon.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/StubCalls-inl.h b/js/src/methodjit/StubCalls-inl.h
index 47f4725e04fa..cf5903865f93 100644
--- a/js/src/methodjit/StubCalls-inl.h
+++ b/js/src/methodjit/StubCalls-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index 1d49c4fa0a2a..c9fda4f151fe 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/StubCalls.h b/js/src/methodjit/StubCalls.h
index e620b37dba3d..23dc2420d03f 100644
--- a/js/src/methodjit/StubCalls.h
+++ b/js/src/methodjit/StubCalls.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/StubCompiler.cpp b/js/src/methodjit/StubCompiler.cpp
index 77754e2f60f9..f366d8e826ac 100644
--- a/js/src/methodjit/StubCompiler.cpp
+++ b/js/src/methodjit/StubCompiler.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/StubCompiler.h b/js/src/methodjit/StubCompiler.h
index be3b4b97c021..e2a0d49c4e03 100644
--- a/js/src/methodjit/StubCompiler.h
+++ b/js/src/methodjit/StubCompiler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/TrampolineCompiler.cpp b/js/src/methodjit/TrampolineCompiler.cpp
index 4860a7ecb522..81478f2d8891 100644
--- a/js/src/methodjit/TrampolineCompiler.cpp
+++ b/js/src/methodjit/TrampolineCompiler.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/TrampolineCompiler.h b/js/src/methodjit/TrampolineCompiler.h
index e3d4a6e8bffc..11e118be78fe 100644
--- a/js/src/methodjit/TrampolineCompiler.h
+++ b/js/src/methodjit/TrampolineCompiler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/TrampolineMIPS.cpp b/js/src/methodjit/TrampolineMIPS.cpp
index 4da001eda725..7be2e42d01a3 100644
--- a/js/src/methodjit/TrampolineMIPS.cpp
+++ b/js/src/methodjit/TrampolineMIPS.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/methodjit/TypedArrayIC.h b/js/src/methodjit/TypedArrayIC.h
index 16deeb770adb..aa86cb2f8ead 100644
--- a/js/src/methodjit/TypedArrayIC.h
+++ b/js/src/methodjit/TypedArrayIC.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/perf/jsperf.cpp b/js/src/perf/jsperf.cpp
index b153e0a61d2f..098361a964a4 100644
--- a/js/src/perf/jsperf.cpp
+++ b/js/src/perf/jsperf.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/jsperf.h b/js/src/perf/jsperf.h
index aaf513342736..265478c33ebb 100644
--- a/js/src/perf/jsperf.h
+++ b/js/src/perf/jsperf.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/pm_linux.cpp b/js/src/perf/pm_linux.cpp
index de5675eff5e9..3156354bdff7 100644
--- a/js/src/perf/pm_linux.cpp
+++ b/js/src/perf/pm_linux.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/perf/pm_stub.cpp b/js/src/perf/pm_stub.cpp
index cf82288f093c..4af53cb1250f 100644
--- a/js/src/perf/pm_stub.cpp
+++ b/js/src/perf/pm_stub.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
diff --git a/js/src/prmjtime.cpp b/js/src/prmjtime.cpp
index 4fa2ae2359ff..a5bb6478220b 100644
--- a/js/src/prmjtime.cpp
+++ b/js/src/prmjtime.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/prmjtime.h b/js/src/prmjtime.h
index 30ee7c080b99..e7b13c35d4a0 100644
--- a/js/src/prmjtime.h
+++ b/js/src/prmjtime.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 32608379f44c..68f0c08168de 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/shell/jsheaptools.cpp b/js/src/shell/jsheaptools.cpp
index e5d38ba1538c..4cae34a43cf5 100644
--- a/js/src/shell/jsheaptools.cpp
+++ b/js/src/shell/jsheaptools.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/shell/jsheaptools.h b/js/src/shell/jsheaptools.h
index 326102668a2c..55e12ab39ffc 100644
--- a/js/src/shell/jsheaptools.h
+++ b/js/src/shell/jsheaptools.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp
index 0556b747eb76..1a54690de8c8 100644
--- a/js/src/shell/jsoptparse.cpp
+++ b/js/src/shell/jsoptparse.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/shell/jsoptparse.h b/js/src/shell/jsoptparse.h
index 9e52cb97871a..7e2ef72e994a 100644
--- a/js/src/shell/jsoptparse.h
+++ b/js/src/shell/jsoptparse.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_2/Exceptions/exception-010-n.js b/js/src/tests/ecma_2/Exceptions/exception-010-n.js
index 51931804e4ca..95f5ef725d3d 100644
--- a/js/src/tests/ecma_2/Exceptions/exception-010-n.js
+++ b/js/src/tests/ecma_2/Exceptions/exception-010-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_2/Exceptions/exception-011-n.js b/js/src/tests/ecma_2/Exceptions/exception-011-n.js
index dc08346ca9a1..533765a69f28 100644
--- a/js/src/tests/ecma_2/Exceptions/exception-011-n.js
+++ b/js/src/tests/ecma_2/Exceptions/exception-011-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js b/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
index 932f51ab804e..f19fce62e90f 100644
--- a/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
+++ b/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Exceptions/regress-58946.js b/js/src/tests/ecma_3/Exceptions/regress-58946.js
index 1147fdd633d6..c961e5ab739a 100644
--- a/js/src/tests/ecma_3/Exceptions/regress-58946.js
+++ b/js/src/tests/ecma_3/Exceptions/regress-58946.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
index 5352534a3f38..3f8b6a84778f 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
index 97ec349a0e59..1e6b115a61b2 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js b/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
index 1a6cb1a21ddc..41ae113c9123 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
+++ b/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-001-n.js b/js/src/tests/ecma_3/FunExpr/fe-001-n.js
index d1f9c3e49545..55c57212ec40 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-001-n.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-001-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-001.js b/js/src/tests/ecma_3/FunExpr/fe-001.js
index f80f34e2e8c4..a68d6e10aa12 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-001.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-001.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/FunExpr/fe-002.js b/js/src/tests/ecma_3/FunExpr/fe-002.js
index 5619fbbb65da..9ee5bfbaf250 100644
--- a/js/src/tests/ecma_3/FunExpr/fe-002.js
+++ b/js/src/tests/ecma_3/FunExpr/fe-002.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/NumberFormatting/tostring-001.js b/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
index 8634f53dd4f7..49915472953e 100644
--- a/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
+++ b/js/src/tests/ecma_3/NumberFormatting/tostring-001.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/RegExp/regress-24712.js b/js/src/tests/ecma_3/RegExp/regress-24712.js
index d675f6a3c184..dfaded2661f0 100644
--- a/js/src/tests/ecma_3/RegExp/regress-24712.js
+++ b/js/src/tests/ecma_3/RegExp/regress-24712.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/RegExp/regress-28686.js b/js/src/tests/ecma_3/RegExp/regress-28686.js
index 1e3871f1968c..669455ba6893 100644
--- a/js/src/tests/ecma_3/RegExp/regress-28686.js
+++ b/js/src/tests/ecma_3/RegExp/regress-28686.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-001-n.js b/js/src/tests/ecma_3/Unicode/uc-001-n.js
index 566c7459f5a7..80dc1a782939 100644
--- a/js/src/tests/ecma_3/Unicode/uc-001-n.js
+++ b/js/src/tests/ecma_3/Unicode/uc-001-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-001.js b/js/src/tests/ecma_3/Unicode/uc-001.js
index bfb8fd515ef4..2a81693d5ff1 100644
--- a/js/src/tests/ecma_3/Unicode/uc-001.js
+++ b/js/src/tests/ecma_3/Unicode/uc-001.js
@@ -1,5 +1,6 @@
 // |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-002-n.js b/js/src/tests/ecma_3/Unicode/uc-002-n.js
index ca09090d6304..6d673f88b983 100644
--- a/js/src/tests/ecma_3/Unicode/uc-002-n.js
+++ b/js/src/tests/ecma_3/Unicode/uc-002-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-002.js b/js/src/tests/ecma_3/Unicode/uc-002.js
index 1ff15d3769ab..93d78b9ebb70 100644
--- a/js/src/tests/ecma_3/Unicode/uc-002.js
+++ b/js/src/tests/ecma_3/Unicode/uc-002.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-003.js b/js/src/tests/ecma_3/Unicode/uc-003.js
index d06815cf941a..f77b3b9dcea0 100644
--- a/js/src/tests/ecma_3/Unicode/uc-003.js
+++ b/js/src/tests/ecma_3/Unicode/uc-003.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/ecma_3/Unicode/uc-004.js b/js/src/tests/ecma_3/Unicode/uc-004.js
index 5d243d56de3f..a82eb3528c37 100644
--- a/js/src/tests/ecma_3/Unicode/uc-004.js
+++ b/js/src/tests/ecma_3/Unicode/uc-004.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/Exceptions/catchguard-002-n.js b/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
index fbbcecd3bc99..08b9f52d499a 100644
--- a/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
+++ b/js/src/tests/js1_5/Exceptions/catchguard-002-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/Exceptions/catchguard-003-n.js b/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
index 0d4e1767e5e4..c768f1f046f8 100644
--- a/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
+++ b/js/src/tests/js1_5/Exceptions/catchguard-003-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/GetSet/getset-002.js b/js/src/tests/js1_5/GetSet/getset-002.js
index d2a5c2218024..114a282fb778 100644
--- a/js/src/tests/js1_5/GetSet/getset-002.js
+++ b/js/src/tests/js1_5/GetSet/getset-002.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-001-n.js b/js/src/tests/js1_5/extensions/catchguard-001-n.js
index 8e0a5ad7feee..8d357fd39ac4 100644
--- a/js/src/tests/js1_5/extensions/catchguard-001-n.js
+++ b/js/src/tests/js1_5/extensions/catchguard-001-n.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-001.js b/js/src/tests/js1_5/extensions/catchguard-001.js
index da531a13ec3b..c1e447f105f4 100644
--- a/js/src/tests/js1_5/extensions/catchguard-001.js
+++ b/js/src/tests/js1_5/extensions/catchguard-001.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-002.js b/js/src/tests/js1_5/extensions/catchguard-002.js
index da590140236a..8148ca45e455 100644
--- a/js/src/tests/js1_5/extensions/catchguard-002.js
+++ b/js/src/tests/js1_5/extensions/catchguard-002.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/catchguard-003.js b/js/src/tests/js1_5/extensions/catchguard-003.js
index 97f2cbfea310..9e64f89d23ed 100644
--- a/js/src/tests/js1_5/extensions/catchguard-003.js
+++ b/js/src/tests/js1_5/extensions/catchguard-003.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/getset-001.js b/js/src/tests/js1_5/extensions/getset-001.js
index 2609f359aa9c..2e6b9488dab5 100644
--- a/js/src/tests/js1_5/extensions/getset-001.js
+++ b/js/src/tests/js1_5/extensions/getset-001.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/regress-50447-1.js b/js/src/tests/js1_5/extensions/regress-50447-1.js
index 96d801b128d8..55ca6aca7f00 100644
--- a/js/src/tests/js1_5/extensions/regress-50447-1.js
+++ b/js/src/tests/js1_5/extensions/regress-50447-1.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_5/extensions/regress-50447.js b/js/src/tests/js1_5/extensions/regress-50447.js
index 32044a8edc4e..1621d5576395 100644
--- a/js/src/tests/js1_5/extensions/regress-50447.js
+++ b/js/src/tests/js1_5/extensions/regress-50447.js
@@ -1,5 +1,6 @@
 // |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_6/shell.js b/js/src/tests/js1_6/shell.js
index a5bfae873392..d378e171db67 100644
--- a/js/src/tests/js1_6/shell.js
+++ b/js/src/tests/js1_6/shell.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_7/shell.js b/js/src/tests/js1_7/shell.js
index 9c935544e6ca..13cf0022e7a7 100644
--- a/js/src/tests/js1_7/shell.js
+++ b/js/src/tests/js1_7/shell.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_8/shell.js b/js/src/tests/js1_8/shell.js
index 934ae1489d02..d61c2d6a07b9 100644
--- a/js/src/tests/js1_8/shell.js
+++ b/js/src/tests/js1_8/shell.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/js1_8_1/shell.js b/js/src/tests/js1_8_1/shell.js
index f4eadfbb411d..d8fe725b7444 100644
--- a/js/src/tests/js1_8_1/shell.js
+++ b/js/src/tests/js1_8_1/shell.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
  * 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/. */
diff --git a/js/src/tests/shell.js b/js/src/tests/shell.js
index c2d42e4e6fd3..08abb3bb518e 100644
--- a/js/src/tests/shell.js
+++ b/js/src/tests/shell.js
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject-inl.h b/js/src/vm/ArgumentsObject-inl.h
index c442eda6e559..b94c1de19f4e 100644
--- a/js/src/vm/ArgumentsObject-inl.h
+++ b/js/src/vm/ArgumentsObject-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index b7598bab1aaf..f53e0d639d31 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index fbb70f0b84f4..162ceeea73e4 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/BooleanObject-inl.h b/js/src/vm/BooleanObject-inl.h
index b84171b8eb1d..c36e75d05111 100644
--- a/js/src/vm/BooleanObject-inl.h
+++ b/js/src/vm/BooleanObject-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/BooleanObject.h b/js/src/vm/BooleanObject.h
index 3892a404e19e..0df94da2cf86 100644
--- a/js/src/vm/BooleanObject.h
+++ b/js/src/vm/BooleanObject.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/CharacterEncoding.cpp b/js/src/vm/CharacterEncoding.cpp
index 79266f4fd4db..96d94d86cb19 100644
--- a/js/src/vm/CharacterEncoding.cpp
+++ b/js/src/vm/CharacterEncoding.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index 48acbbbcbbb8..2f363a4a0d51 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp
index 9c839c7ef156..4bf194cf7add 100644
--- a/js/src/vm/DateTime.cpp
+++ b/js/src/vm/DateTime.cpp
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
+ * 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 "DateTime.h"
 
diff --git a/js/src/vm/DateTime.h b/js/src/vm/DateTime.h
index 3d006a8f7654..4dff3186439e 100644
--- a/js/src/vm/DateTime.h
+++ b/js/src/vm/DateTime.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
+ * 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/. */
 
 #ifndef DateTime_h___
 #define DateTime_h___
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index cd8d5e7cf4f8..a2d6598cfb2d 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index 69c5230ce203..cda35fb0d7d8 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/ForkJoin.cpp b/js/src/vm/ForkJoin.cpp
index f636cbae1a21..6c654568eeeb 100644
--- a/js/src/vm/ForkJoin.cpp
+++ b/js/src/vm/ForkJoin.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/ForkJoin.h b/js/src/vm/ForkJoin.h
index a5c244310e73..1b89efdc4377 100644
--- a/js/src/vm/ForkJoin.h
+++ b/js/src/vm/ForkJoin.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/GlobalObject-inl.h b/js/src/vm/GlobalObject-inl.h
index 06d103aee0f1..9797cfd3918b 100644
--- a/js/src/vm/GlobalObject-inl.h
+++ b/js/src/vm/GlobalObject-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index 7e329bda043a..b6716c25683e 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/vm/GlobalObject.h b/js/src/vm/GlobalObject.h
index 3886b133c09b..783d4fdf18c7 100644
--- a/js/src/vm/GlobalObject.h
+++ b/js/src/vm/GlobalObject.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/Keywords.h b/js/src/vm/Keywords.h
index cc2d5dbc982e..0f0409a2e150 100644
--- a/js/src/vm/Keywords.h
+++ b/js/src/vm/Keywords.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set sw=4 ts=8 et 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/. */
diff --git a/js/src/vm/MatchPairs.h b/js/src/vm/MatchPairs.h
index 1018d7d67b33..8fd9320dab85 100644
--- a/js/src/vm/MatchPairs.h
+++ b/js/src/vm/MatchPairs.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/Monitor.cpp b/js/src/vm/Monitor.cpp
index f92ee48dc477..0cd21ae23443 100644
--- a/js/src/vm/Monitor.cpp
+++ b/js/src/vm/Monitor.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/vm/Monitor.h b/js/src/vm/Monitor.h
index 9b0144586bde..e13f138ce939 100644
--- a/js/src/vm/Monitor.h
+++ b/js/src/vm/Monitor.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/NumberObject-inl.h b/js/src/vm/NumberObject-inl.h
index 651cb93d6ddd..e2822f9cc375 100644
--- a/js/src/vm/NumberObject-inl.h
+++ b/js/src/vm/NumberObject-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/NumberObject.h b/js/src/vm/NumberObject.h
index 48ee6383da35..dc0ab3bdea74 100644
--- a/js/src/vm/NumberObject.h
+++ b/js/src/vm/NumberObject.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
index 674df8cb58c0..42e69d63dd75 100644
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
+ * 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/. */
 
 #ifndef NumericConversions_h___
 #define NumericConversions_h___
diff --git a/js/src/vm/ObjectImpl-inl.h b/js/src/vm/ObjectImpl-inl.h
index a4048fac745a..8423dacb09ad 100644
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/ObjectImpl-inl.h
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
+ * 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/. */
 
 #ifndef ObjectImpl_inl_h___
 #define ObjectImpl_inl_h___
diff --git a/js/src/vm/ObjectImpl.cpp b/js/src/vm/ObjectImpl.cpp
index 7375b3da6419..c009fc680b5e 100644
--- a/js/src/vm/ObjectImpl.cpp
+++ b/js/src/vm/ObjectImpl.cpp
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
+ * 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 "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
diff --git a/js/src/vm/ObjectImpl.h b/js/src/vm/ObjectImpl.h
index a765088b45fe..d683b4380ef6 100644
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -1,8 +1,9 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
+ * 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/. */
 
 #ifndef ObjectImpl_h___
 #define ObjectImpl_h___
diff --git a/js/src/vm/ParallelDo.cpp b/js/src/vm/ParallelDo.cpp
index 461e5acff556..6f4b63fdb064 100644
--- a/js/src/vm/ParallelDo.cpp
+++ b/js/src/vm/ParallelDo.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/ParallelDo.h b/js/src/vm/ParallelDo.h
index 3188c147bd54..807174528857 100644
--- a/js/src/vm/ParallelDo.h
+++ b/js/src/vm/ParallelDo.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/PropertyKey.cpp b/js/src/vm/PropertyKey.cpp
index 0935cd377c8b..d7ca7b371607 100644
--- a/js/src/vm/PropertyKey.cpp
+++ b/js/src/vm/PropertyKey.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h
index d1f3371356d2..d6a0f04fac13 100644
--- a/js/src/vm/RegExpObject-inl.h
+++ b/js/src/vm/RegExpObject-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
index e26bb82834be..e5dc014b5ba6 100644
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h
index 929d7147ee06..61d329dedc73 100644
--- a/js/src/vm/RegExpObject.h
+++ b/js/src/vm/RegExpObject.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/RegExpStatics-inl.h b/js/src/vm/RegExpStatics-inl.h
index 8b8842e40c71..d70fdf2dccec 100644
--- a/js/src/vm/RegExpStatics-inl.h
+++ b/js/src/vm/RegExpStatics-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/RegExpStatics.cpp b/js/src/vm/RegExpStatics.cpp
index 662c8e68596f..ff4b46b514b8 100644
--- a/js/src/vm/RegExpStatics.cpp
+++ b/js/src/vm/RegExpStatics.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/RegExpStatics.h b/js/src/vm/RegExpStatics.h
index 422424f91a0a..9a7a84e934da 100644
--- a/js/src/vm/RegExpStatics.h
+++ b/js/src/vm/RegExpStatics.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/SPSProfiler.cpp b/js/src/vm/SPSProfiler.cpp
index d39903b61960..8e44d71ca853 100644
--- a/js/src/vm/SPSProfiler.cpp
+++ b/js/src/vm/SPSProfiler.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/SPSProfiler.h b/js/src/vm/SPSProfiler.h
index 16defd8a6f94..80c6b09e6baf 100644
--- a/js/src/vm/SPSProfiler.h
+++ b/js/src/vm/SPSProfiler.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/ScopeObject-inl.h b/js/src/vm/ScopeObject-inl.h
index d85c8879ac26..63daedcba784 100644
--- a/js/src/vm/ScopeObject-inl.h
+++ b/js/src/vm/ScopeObject-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index e9fffddbb290..d101aaf222c4 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 6; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/ScopeObject.h b/js/src/vm/ScopeObject.h
index b9cb94f584eb..fdb9303803e9 100644
--- a/js/src/vm/ScopeObject.h
+++ b/js/src/vm/ScopeObject.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index 356fec739a0d..a6aa8f4f0212 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/Shape-inl.h b/js/src/vm/Shape-inl.h
index 2abc80cfaa94..b0d0ab45f502 100644
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
 
diff --git a/js/src/vm/Shape.cpp b/js/src/vm/Shape.cpp
index 674e67958f74..8e3c7996f461 100644
--- a/js/src/vm/Shape.cpp
+++ b/js/src/vm/Shape.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
index 73986fa1294c..46ed68612c14 100644
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99:
+ *
  * 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/. */
diff --git a/js/src/vm/Stack-inl.h b/js/src/vm/Stack-inl.h
index a925de1e4e9c..4d77179b9a29 100644
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 2bd273a71dae..5780e66b656c 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index e197fc03fcec..e10c627d5f22 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/String-inl.h b/js/src/vm/String-inl.h
index 981a9651b55d..7be763b696d9 100644
--- a/js/src/vm/String-inl.h
+++ b/js/src/vm/String-inl.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/String.cpp b/js/src/vm/String.cpp
index 1bb9b86c641f..d6d550fd40bf 100644
--- a/js/src/vm/String.cpp
+++ b/js/src/vm/String.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/String.h b/js/src/vm/String.h
index e7769c0e4ec9..9fd5899cd988 100644
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
  * 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/. */
diff --git a/js/src/vm/StringBuffer.cpp b/js/src/vm/StringBuffer.cpp
index 1ecc31c7f046..459571a70dc6 100644
--- a/js/src/vm/StringBuffer.cpp
+++ b/js/src/vm/StringBuffer.cpp
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
+ * 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 "vm/StringBuffer.h"
 
diff --git a/js/src/vm/StringBuffer.h b/js/src/vm/StringBuffer.h
index 92ab4f8c6eeb..7706e83032dd 100644
--- a/js/src/vm/StringBuffer.h
+++ b/js/src/vm/StringBuffer.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
+ * 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/. */
 
 #ifndef StringBuffer_h___
 #define StringBuffer_h___
diff --git a/js/src/vm/StringObject-inl.h b/js/src/vm/StringObject-inl.h
index b1b01bbdddc3..0940081d9e0e 100644
--- a/js/src/vm/StringObject-inl.h
+++ b/js/src/vm/StringObject-inl.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/StringObject.h b/js/src/vm/StringObject.h
index 59510956a0e6..75446443365c 100644
--- a/js/src/vm/StringObject.h
+++ b/js/src/vm/StringObject.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/ThreadPool.cpp b/js/src/vm/ThreadPool.cpp
index 754ad507d2cd..7eee4965cc11 100644
--- a/js/src/vm/ThreadPool.cpp
+++ b/js/src/vm/ThreadPool.cpp
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* vim: set ts=4 sw=4 et tw=99: */
+/* 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/. */
 
diff --git a/js/src/vm/ThreadPool.h b/js/src/vm/ThreadPool.h
index 75698d526ad5..901894137ad8 100644
--- a/js/src/vm/ThreadPool.h
+++ b/js/src/vm/ThreadPool.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/vm/Unicode.h b/js/src/vm/Unicode.h
index 27fde7a60373..a83a0925de36 100644
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* 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/. */
 
diff --git a/js/src/vm/Xdr.cpp b/js/src/vm/Xdr.cpp
index d248926f9cca..34fc4b6b0668 100644
--- a/js/src/vm/Xdr.cpp
+++ b/js/src/vm/Xdr.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
  * 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/. */
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index 46a00ba9de51..3ad573a6de0f 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
+ *
  * 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/. */
diff --git a/js/src/yarr/ASCIICType.h b/js/src/yarr/ASCIICType.h
index 2082b758bc56..a3ae9f4455e2 100644
--- a/js/src/yarr/ASCIICType.h
+++ b/js/src/yarr/ASCIICType.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/BumpPointerAllocator.h b/js/src/yarr/BumpPointerAllocator.h
index a43a5d8ba2d4..6d23a684831e 100644
--- a/js/src/yarr/BumpPointerAllocator.h
+++ b/js/src/yarr/BumpPointerAllocator.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/CheckedArithmetic.h b/js/src/yarr/CheckedArithmetic.h
index 21aa188bd969..0f60971d0f1f 100644
--- a/js/src/yarr/CheckedArithmetic.h
+++ b/js/src/yarr/CheckedArithmetic.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* vim: set ts=4 sw=4 tw=99 et:
  *
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/MatchResult.h b/js/src/yarr/MatchResult.h
index 4ebc936779d5..e28ac4bbf42f 100644
--- a/js/src/yarr/MatchResult.h
+++ b/js/src/yarr/MatchResult.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/OSAllocator.h b/js/src/yarr/OSAllocator.h
index c8b815b52d2e..ecfdc3b042ec 100644
--- a/js/src/yarr/OSAllocator.h
+++ b/js/src/yarr/OSAllocator.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorOS2.cpp b/js/src/yarr/OSAllocatorOS2.cpp
index 466b9e949d81..ead003084dd1 100644
--- a/js/src/yarr/OSAllocatorOS2.cpp
+++ b/js/src/yarr/OSAllocatorOS2.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorPosix.cpp b/js/src/yarr/OSAllocatorPosix.cpp
index 013b6af0771a..99bf061467ca 100644
--- a/js/src/yarr/OSAllocatorPosix.cpp
+++ b/js/src/yarr/OSAllocatorPosix.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/OSAllocatorWin.cpp b/js/src/yarr/OSAllocatorWin.cpp
index a5d5fa7db823..08df9e98aefb 100644
--- a/js/src/yarr/OSAllocatorWin.cpp
+++ b/js/src/yarr/OSAllocatorWin.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageAllocation.h b/js/src/yarr/PageAllocation.h
index 42a57f6ae5fe..a86f37116e50 100644
--- a/js/src/yarr/PageAllocation.h
+++ b/js/src/yarr/PageAllocation.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageBlock.cpp b/js/src/yarr/PageBlock.cpp
index 0ffc1bc95157..047172d6476f 100644
--- a/js/src/yarr/PageBlock.cpp
+++ b/js/src/yarr/PageBlock.cpp
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/PageBlock.h b/js/src/yarr/PageBlock.h
index ea98f42f2237..145bb0a8d63a 100644
--- a/js/src/yarr/PageBlock.h
+++ b/js/src/yarr/PageBlock.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Copyright (C) 2010 Apple Inc. All rights reserved.
diff --git a/js/src/yarr/VMTags.h b/js/src/yarr/VMTags.h
index f44136907fe7..fe6a006d3601 100644
--- a/js/src/yarr/VMTags.h
+++ b/js/src/yarr/VMTags.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/Yarr.h b/js/src/yarr/Yarr.h
index da9a0ec70f33..110ae4124bed 100644
--- a/js/src/yarr/Yarr.h
+++ b/js/src/yarr/Yarr.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
  * All rights reserved.
diff --git a/js/src/yarr/YarrCanonicalizeUCS2.cpp b/js/src/yarr/YarrCanonicalizeUCS2.cpp
index e6d334212fd3..ce3a372a6a63 100644
--- a/js/src/yarr/YarrCanonicalizeUCS2.cpp
+++ b/js/src/yarr/YarrCanonicalizeUCS2.cpp
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrCanonicalizeUCS2.h b/js/src/yarr/YarrCanonicalizeUCS2.h
index 874af40e8693..735064ac803b 100644
--- a/js/src/yarr/YarrCanonicalizeUCS2.h
+++ b/js/src/yarr/YarrCanonicalizeUCS2.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrInterpreter.cpp b/js/src/yarr/YarrInterpreter.cpp
index 176fa381ac6e..296e7d5c9559 100644
--- a/js/src/yarr/YarrInterpreter.cpp
+++ b/js/src/yarr/YarrInterpreter.cpp
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
  *
diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
index 0a3da2fbb1c9..ae40fa7d1cac 100644
--- a/js/src/yarr/YarrInterpreter.h
+++ b/js/src/yarr/YarrInterpreter.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrJIT.cpp b/js/src/yarr/YarrJIT.cpp
index d570f4697d42..225933ff5a5a 100644
--- a/js/src/yarr/YarrJIT.cpp
+++ b/js/src/yarr/YarrJIT.cpp
@@ -1,5 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* vim: set ts=4 sw=4 tw=99 et:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrJIT.h b/js/src/yarr/YarrJIT.h
index b4c03b7e9b23..fad19adfdf44 100644
--- a/js/src/yarr/YarrJIT.h
+++ b/js/src/yarr/YarrJIT.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* vim: set ts=4 sw=4 tw=99 et:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrParser.h b/js/src/yarr/YarrParser.h
index 7cbeea0f010d..f5d1aca6095c 100644
--- a/js/src/yarr/YarrParser.h
+++ b/js/src/yarr/YarrParser.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* vim: set ts=4 sw=4 tw=99 et:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
diff --git a/js/src/yarr/YarrPattern.cpp b/js/src/yarr/YarrPattern.cpp
index 3de728032c18..f091b984884c 100644
--- a/js/src/yarr/YarrPattern.cpp
+++ b/js/src/yarr/YarrPattern.cpp
@@ -1,5 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* vim: set ts=4 sw=4 tw=99 et:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h
index 3baaf5369ed1..737de608199f 100644
--- a/js/src/yarr/YarrPattern.h
+++ b/js/src/yarr/YarrPattern.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* vim: set ts=4 sw=4 tw=99 et:
  *
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Peter Varga (pvarga@inf.u-szeged.hu), University of Szeged
diff --git a/js/src/yarr/YarrSyntaxChecker.cpp b/js/src/yarr/YarrSyntaxChecker.cpp
index bd4b8dc05025..34fb5010cfc9 100644
--- a/js/src/yarr/YarrSyntaxChecker.cpp
+++ b/js/src/yarr/YarrSyntaxChecker.cpp
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/YarrSyntaxChecker.h b/js/src/yarr/YarrSyntaxChecker.h
index e42d8afa8184..b6848e752681 100644
--- a/js/src/yarr/YarrSyntaxChecker.h
+++ b/js/src/yarr/YarrSyntaxChecker.h
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
+/*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h
index 890b269355f0..a7646b87ea34 100644
--- a/js/src/yarr/wtfbridge.h
+++ b/js/src/yarr/wtfbridge.h
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99 ft=cpp: */
+/* 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/. */
 

From 6ce54168afa84cf50fe897242f4e08006c14d959 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Mon, 15 Apr 2013 22:00:06 +0200
Subject: [PATCH 186/438] Bug 856368 - Remove DEBUG_TRACEMALLOC_PRESARENA. 
 r=roc

---
 layout/base/nsIPresShell.h  |  6 +++---
 layout/base/nsPresArena.cpp | 32 --------------------------------
 layout/base/nsPresArena.h   | 12 ------------
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 82d35f2160fc..175b812ee3cb 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -228,7 +228,7 @@ public:
 #ifdef DEBUG
     mPresArenaAllocCount--;
 #endif
-    if (PRESARENA_MUST_FREE_DURING_DESTROY || !mIsDestroying)
+    if (!mIsDestroying)
       mFrameArena.FreeByFrameID(aID, aPtr);
   }
 
@@ -253,7 +253,7 @@ public:
 #ifdef DEBUG
     mPresArenaAllocCount--;
 #endif
-    if (PRESARENA_MUST_FREE_DURING_DESTROY || !mIsDestroying)
+    if (!mIsDestroying)
       mFrameArena.FreeByObjectID(aID, aPtr);
   }
 
@@ -279,7 +279,7 @@ public:
 #ifdef DEBUG
     mPresArenaAllocCount--;
 #endif
-    if (PRESARENA_MUST_FREE_DURING_DESTROY || !mIsDestroying)
+    if (!mIsDestroying)
       mFrameArena.FreeBySize(aSize, aPtr);
   }
 
diff --git a/layout/base/nsPresArena.cpp b/layout/base/nsPresArena.cpp
index 8b833b0ae3c0..a3896190506d 100644
--- a/layout/base/nsPresArena.cpp
+++ b/layout/base/nsPresArena.cpp
@@ -239,8 +239,6 @@ ARENA_POISON_init()
   return PR_SUCCESS;
 }
 
-#ifndef DEBUG_TRACEMALLOC_PRESARENA
-
 // All keys to this hash table fit in 32 bits (see below) so we do not
 // bother actually hashing them.
 
@@ -467,36 +465,6 @@ nsPresArena::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf,
   mState->SizeOfIncludingThis(aMallocSizeOf, aArenaStats);
 }
 
-#else
-// Stub implementation that forwards everything to malloc and does not
-// poison allocations (it still initializes the poison value though,
-// for external use through GetPoisonValue()).
-
-struct nsPresArena::State
-{
-
-  State()
-  {
-    PR_CallOnce(&ARENA_POISON_guard, ARENA_POISON_init);
-  }
-
-  void* Allocate(uint32_t /* unused */, size_t aSize)
-  {
-    return moz_malloc(aSize);
-  }
-
-  void Free(uint32_t /* unused */, void* aPtr)
-  {
-    moz_free(aPtr);
-  }
-};
-
-void
-nsPresArena::SizeOfExcludingThis(nsMallocSizeOfFun, nsArenaMemoryStats*)
-{}
-
-#endif // DEBUG_TRACEMALLOC_PRESARENA
-
 // Public interface
 nsPresArena::nsPresArena()
   : mState(new nsPresArena::State())
diff --git a/layout/base/nsPresArena.h b/layout/base/nsPresArena.h
index 8670b4048173..234d904e3987 100644
--- a/layout/base/nsPresArena.h
+++ b/layout/base/nsPresArena.h
@@ -15,18 +15,6 @@
 
 struct nsArenaMemoryStats;
 
-// Uncomment this to disable arenas, instead forwarding to
-// malloc for every allocation.
-//#define DEBUG_TRACEMALLOC_PRESARENA 1
-
-// The debugging version of nsPresArena does not free all the memory it
-// allocated when the arena itself is destroyed.
-#ifdef DEBUG_TRACEMALLOC_PRESARENA
-#define PRESARENA_MUST_FREE_DURING_DESTROY true
-#else
-#define PRESARENA_MUST_FREE_DURING_DESTROY false
-#endif
-
 class nsPresArena {
 public:
   nsPresArena();

From 62e2d164d65c1d1a462aa5470f09ee908e487717 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Mon, 15 Apr 2013 22:00:06 +0200
Subject: [PATCH 187/438] Bug 856368 - Merge nsPresArena::mState into
 nsPresArena itself.  r=roc

---
 layout/base/nsPresArena.cpp         | 389 ++++++++++++----------------
 layout/base/nsPresArena.h           |  52 +++-
 layout/style/nsCSSRuleProcessor.cpp |  14 +-
 3 files changed, 222 insertions(+), 233 deletions(-)

diff --git a/layout/base/nsPresArena.cpp b/layout/base/nsPresArena.cpp
index a3896190506d..e81bd32b2c40 100644
--- a/layout/base/nsPresArena.cpp
+++ b/layout/base/nsPresArena.cpp
@@ -7,13 +7,20 @@
 
 /* arena allocation for the frame tree and closely-related objects */
 
+// Even on 32-bit systems, we allocate objects from the frame arena
+// that require 8-byte alignment.  The cast to uintptr_t is needed
+// because plarena isn't as careful about mask construction as it
+// ought to be.
+#define ALIGN_SHIFT 3
+#define PL_ARENA_CONST_ALIGN_MASK ((uintptr_t(1) << ALIGN_SHIFT) - 1)
+#include "plarena.h"
+// plarena.h needs to be included first to make it use the above
+// PL_ARENA_CONST_ALIGN_MASK in this file.
+
 #include "nsPresArena.h"
 #include "nsCRT.h"
 #include "nsDebug.h"
-#include "nsTArray.h"
-#include "nsTHashtable.h"
 #include "prinit.h"
-#include "prlog.h"
 #include "nsArenaMemoryStats.h"
 #include "nsCOMPtr.h"
 #include "nsServiceManagerUtils.h"
@@ -23,17 +30,6 @@
 #include "nsICrashReporter.h"
 #endif
 
-#include "mozilla/StandardInteger.h"
-#include "mozilla/MemoryChecking.h"
-
-// Even on 32-bit systems, we allocate objects from the frame arena
-// that require 8-byte alignment.  The cast to uintptr_t is needed
-// because plarena isn't as careful about mask construction as it
-// ought to be.
-#define ALIGN_SHIFT 3
-#define PL_ARENA_CONST_ALIGN_MASK ((uintptr_t(1) << ALIGN_SHIFT) - 1)
-#include "plarena.h"
-
 #ifdef _WIN32
 # include <windows.h>
 #elif !defined(__OS2__)
@@ -239,277 +235,226 @@ ARENA_POISON_init()
   return PR_SUCCESS;
 }
 
-// All keys to this hash table fit in 32 bits (see below) so we do not
-// bother actually hashing them.
-
-namespace {
-
-class FreeList : public PLDHashEntryHdr
+nsPresArena::nsPresArena()
 {
-public:
-  typedef uint32_t KeyType;
-  nsTArray<void *> mEntries;
-  size_t mEntrySize;
-  size_t mEntriesEverAllocated;
-
-  typedef const void* KeyTypePointer;
-  KeyTypePointer mKey;
-
-  FreeList(KeyTypePointer aKey)
-  : mEntrySize(0), mEntriesEverAllocated(0), mKey(aKey) {}
-  // Default copy constructor and destructor are ok.
-
-  bool KeyEquals(KeyTypePointer const aKey) const
-  { return mKey == aKey; }
-
-  static KeyTypePointer KeyToPointer(KeyType aKey)
-  { return NS_INT32_TO_PTR(aKey); }
-
-  static PLDHashNumber HashKey(KeyTypePointer aKey)
-  { return NS_PTR_TO_INT32(aKey); }
-
-  enum { ALLOW_MEMMOVE = false };
-};
-
+  mFreeLists.Init();
+  PL_INIT_ARENA_POOL(&mPool, "PresArena", ARENA_PAGE_SIZE);
+  PR_CallOnce(&ARENA_POISON_guard, ARENA_POISON_init);
 }
 
-struct nsPresArena::State {
-  nsTHashtable<FreeList> mFreeLists;
-  PLArenaPool mPool;
-
-  State()
-  {
-    mFreeLists.Init();
-    PL_INIT_ARENA_POOL(&mPool, "PresArena", ARENA_PAGE_SIZE);
-    PR_CallOnce(&ARENA_POISON_guard, ARENA_POISON_init);
-  }
-
+nsPresArena::~nsPresArena()
+{
 #if defined(MOZ_HAVE_MEM_CHECKS)
-  static PLDHashOperator UnpoisonFreeList(FreeList* aEntry, void*)
-  {
-    nsTArray<void*>::index_type len;
-    while ((len = aEntry->mEntries.Length())) {
-      void* result = aEntry->mEntries.ElementAt(len - 1);
-      aEntry->mEntries.RemoveElementAt(len - 1);
-      MOZ_MAKE_MEM_UNDEFINED(result, aEntry->mEntrySize);
-    }
-    return PL_DHASH_NEXT;
-  }
+  mFreeLists.EnumerateEntries(UnpoisonFreeList, nullptr);
 #endif
+  PL_FinishArenaPool(&mPool);
+}
 
-  ~State()
-  {
-#if defined(MOZ_HAVE_MEM_CHECKS)
-    mFreeLists.EnumerateEntries(UnpoisonFreeList, nullptr);
-#endif
-    PL_FinishArenaPool(&mPool);
+void*
+nsPresArena::Allocate(uint32_t aCode, size_t aSize)
+{
+  NS_ABORT_IF_FALSE(aSize > 0, "PresArena cannot allocate zero bytes");
+
+  // We only hand out aligned sizes
+  aSize = PL_ARENA_ALIGN(&mPool, aSize);
+
+  // If there is no free-list entry for this type already, we have
+  // to create one now, to record its size.
+  FreeList* list = mFreeLists.PutEntry(aCode);
+
+  nsTArray<void*>::index_type len = list->mEntries.Length();
+  if (list->mEntrySize == 0) {
+    NS_ABORT_IF_FALSE(len == 0, "list with entries but no recorded size");
+    list->mEntrySize = aSize;
+  } else {
+    NS_ABORT_IF_FALSE(list->mEntrySize == aSize,
+                      "different sizes for same object type code");
   }
 
-  void* Allocate(uint32_t aCode, size_t aSize)
-  {
-    NS_ABORT_IF_FALSE(aSize > 0, "PresArena cannot allocate zero bytes");
-
-    // We only hand out aligned sizes
-    aSize = PL_ARENA_ALIGN(&mPool, aSize);
-
-    // If there is no free-list entry for this type already, we have
-    // to create one now, to record its size.
-    FreeList* list = mFreeLists.PutEntry(aCode);
-
-    nsTArray<void*>::index_type len = list->mEntries.Length();
-    if (list->mEntrySize == 0) {
-      NS_ABORT_IF_FALSE(len == 0, "list with entries but no recorded size");
-      list->mEntrySize = aSize;
-    } else {
-      NS_ABORT_IF_FALSE(list->mEntrySize == aSize,
-                        "different sizes for same object type code");
-    }
-
-    void* result;
-    if (len > 0) {
-      // LIFO behavior for best cache utilization
-      result = list->mEntries.ElementAt(len - 1);
-      list->mEntries.RemoveElementAt(len - 1);
+  void* result;
+  if (len > 0) {
+    // LIFO behavior for best cache utilization
+    result = list->mEntries.ElementAt(len - 1);
+    list->mEntries.RemoveElementAt(len - 1);
 #if defined(DEBUG)
-      {
-        MOZ_MAKE_MEM_DEFINED(result, list->mEntrySize);
-        char* p = reinterpret_cast<char*>(result);
-        char* limit = p + list->mEntrySize;
-        for (; p < limit; p += sizeof(uintptr_t)) {
-          uintptr_t val = *reinterpret_cast<uintptr_t*>(p);
-          NS_ABORT_IF_FALSE(val == ARENA_POISON,
-                            nsPrintfCString("PresArena: poison overwritten; "
-                                            "wanted %.16llx "
-                                            "found %.16llx "
-                                            "errors in bits %.16llx",
-                                            uint64_t(ARENA_POISON),
-                                            uint64_t(val),
-                                            uint64_t(ARENA_POISON ^ val)
-                                            ).get());
-        }
+    {
+      MOZ_MAKE_MEM_DEFINED(result, list->mEntrySize);
+      char* p = reinterpret_cast<char*>(result);
+      char* limit = p + list->mEntrySize;
+      for (; p < limit; p += sizeof(uintptr_t)) {
+        uintptr_t val = *reinterpret_cast<uintptr_t*>(p);
+        NS_ABORT_IF_FALSE(val == ARENA_POISON,
+                          nsPrintfCString("PresArena: poison overwritten; "
+                                          "wanted %.16llx "
+                                          "found %.16llx "
+                                          "errors in bits %.16llx",
+                                          uint64_t(ARENA_POISON),
+                                          uint64_t(val),
+                                          uint64_t(ARENA_POISON ^ val)
+                                          ).get());
       }
+    }
 #endif
-      MOZ_MAKE_MEM_UNDEFINED(result, list->mEntrySize);
-      return result;
-    }
-
-    // Allocate a new chunk from the arena
-    list->mEntriesEverAllocated++;
-    PL_ARENA_ALLOCATE(result, &mPool, aSize);
-    if (!result) {
-      NS_RUNTIMEABORT("out of memory");
-    }
+    MOZ_MAKE_MEM_UNDEFINED(result, list->mEntrySize);
     return result;
   }
 
-  void Free(uint32_t aCode, void* aPtr)
-  {
-    // Try to recycle this entry.
-    FreeList* list = mFreeLists.GetEntry(aCode);
-    NS_ABORT_IF_FALSE(list, "no free list for pres arena object");
-    NS_ABORT_IF_FALSE(list->mEntrySize > 0, "PresArena cannot free zero bytes");
+  // Allocate a new chunk from the arena
+  list->mEntriesEverAllocated++;
+  PL_ARENA_ALLOCATE(result, &mPool, aSize);
+  if (!result) {
+    NS_RUNTIMEABORT("out of memory");
+  }
+  return result;
+}
 
-    char* p = reinterpret_cast<char*>(aPtr);
-    char* limit = p + list->mEntrySize;
-    for (; p < limit; p += sizeof(uintptr_t)) {
-      *reinterpret_cast<uintptr_t*>(p) = ARENA_POISON;
-    }
+void
+nsPresArena::Free(uint32_t aCode, void* aPtr)
+{
+  // Try to recycle this entry.
+  FreeList* list = mFreeLists.GetEntry(aCode);
+  NS_ABORT_IF_FALSE(list, "no free list for pres arena object");
+  NS_ABORT_IF_FALSE(list->mEntrySize > 0, "PresArena cannot free zero bytes");
 
-    MOZ_MAKE_MEM_NOACCESS(aPtr, list->mEntrySize);
-    list->mEntries.AppendElement(aPtr);
+  char* p = reinterpret_cast<char*>(aPtr);
+  char* limit = p + list->mEntrySize;
+  for (; p < limit; p += sizeof(uintptr_t)) {
+    *reinterpret_cast<uintptr_t*>(p) = ARENA_POISON;
   }
 
-  static size_t SizeOfFreeListEntryExcludingThis(FreeList* aEntry,
-                                                 nsMallocSizeOfFun aMallocSizeOf,
-                                                 void *)
-  {
-    return aEntry->mEntries.SizeOfExcludingThis(aMallocSizeOf);
+  MOZ_MAKE_MEM_NOACCESS(aPtr, list->mEntrySize);
+  list->mEntries.AppendElement(aPtr);
+}
+
+/* static */ size_t
+nsPresArena::SizeOfFreeListEntryExcludingThis(
+  FreeList* aEntry, nsMallocSizeOfFun aMallocSizeOf, void*)
+{
+  return aEntry->mEntries.SizeOfExcludingThis(aMallocSizeOf);
+}
+
+size_t
+nsPresArena::SizeOfIncludingThisFromMalloc(nsMallocSizeOfFun aMallocSizeOf) const
+{
+  size_t n = aMallocSizeOf(this);
+  n += PL_SizeOfArenaPoolExcludingPool(&mPool, aMallocSizeOf);
+  n += mFreeLists.SizeOfExcludingThis(SizeOfFreeListEntryExcludingThis,
+                                      aMallocSizeOf);
+  return n;
+}
+
+struct EnumerateData {
+  nsArenaMemoryStats* stats;
+  size_t total;
+};
+
+#if defined(MOZ_HAVE_MEM_CHECKS)
+/* static */ PLDHashOperator
+nsPresArena::UnpoisonFreeList(FreeList* aEntry, void*)
+{
+  nsTArray<void*>::index_type len;
+  while ((len = aEntry->mEntries.Length())) {
+    void* result = aEntry->mEntries.ElementAt(len - 1);
+    aEntry->mEntries.RemoveElementAt(len - 1);
+    MOZ_MAKE_MEM_UNDEFINED(result, aEntry->mEntrySize);
   }
+  return PL_DHASH_NEXT;
+}
+#endif
 
-  size_t SizeOfIncludingThisFromMalloc(nsMallocSizeOfFun aMallocSizeOf) const
-  {
-    size_t n = aMallocSizeOf(this);
-    n += PL_SizeOfArenaPoolExcludingPool(&mPool, aMallocSizeOf);
-    n += mFreeLists.SizeOfExcludingThis(SizeOfFreeListEntryExcludingThis,
-                                        aMallocSizeOf);
-    return n;
-  }
+/* static */ PLDHashOperator
+nsPresArena::FreeListEnumerator(FreeList* aEntry, void* aData)
+{
+  EnumerateData* data = static_cast<EnumerateData*>(aData);
+  // Note that we're not measuring the size of the entries on the free
+  // list here.  The free list knows how many objects we've allocated
+  // ever (which includes any objects that may be on the FreeList's
+  // |mEntries| at this point) and we're using that to determine the
+  // total size of objects allocated with a given ID.
+  size_t totalSize = aEntry->mEntrySize * aEntry->mEntriesEverAllocated;
+  size_t* p;
 
-  struct EnumerateData {
-    nsArenaMemoryStats* stats;
-    size_t total;
-  };
-
-  static PLDHashOperator FreeListEnumerator(FreeList* aEntry, void* aData)
-  {
-    EnumerateData* data = static_cast<EnumerateData*>(aData);
-    // Note that we're not measuring the size of the entries on the free
-    // list here.  The free list knows how many objects we've allocated
-    // ever (which includes any objects that may be on the FreeList's
-    // |mEntries| at this point) and we're using that to determine the
-    // total size of objects allocated with a given ID.
-    size_t totalSize = aEntry->mEntrySize * aEntry->mEntriesEverAllocated;
-    size_t* p;
-
-    switch (NS_PTR_TO_INT32(aEntry->mKey)) {
-#define FRAME_ID(classname)                                        \
-      case nsQueryFrame::classname##_id:                           \
-        p = &data->stats->FRAME_ID_STAT_FIELD(classname);          \
-        break;
+  switch (NS_PTR_TO_INT32(aEntry->mKey)) {
+#define FRAME_ID(classname)                                      \
+    case nsQueryFrame::classname##_id:                           \
+      p = &data->stats->FRAME_ID_STAT_FIELD(classname);          \
+      break;
 #include "nsFrameIdList.h"
 #undef FRAME_ID
-    case nsLineBox_id:
-      p = &data->stats->mLineBoxes;
-      break;
-    case nsRuleNode_id:
-      p = &data->stats->mRuleNodes;
-      break;
-    case nsStyleContext_id:
-      p = &data->stats->mStyleContexts;
-      break;
-    default:
-      return PL_DHASH_NEXT;
-    }
-
-    *p += totalSize;
-    data->total += totalSize;
-
+  case nsLineBox_id:
+    p = &data->stats->mLineBoxes;
+    break;
+  case nsRuleNode_id:
+    p = &data->stats->mRuleNodes;
+    break;
+  case nsStyleContext_id:
+    p = &data->stats->mStyleContexts;
+    break;
+  default:
     return PL_DHASH_NEXT;
   }
 
-  void SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf,
-                           nsArenaMemoryStats* aArenaStats)
-  {
-    // We do a complicated dance here because we want to measure the
-    // space taken up by the different kinds of objects in the arena,
-    // but we don't have pointers to those objects.  And even if we did,
-    // we wouldn't be able to use aMallocSizeOf on them, since they were
-    // allocated out of malloc'd chunks of memory.  So we compute the
-    // size of the arena as known by malloc and we add up the sizes of
-    // all the objects that we care about.  Subtracting these two
-    // quantities gives us a catch-all "other" number, which includes
-    // slop in the arena itself as well as the size of objects that
-    // we've not measured explicitly.
+  *p += totalSize;
+  data->total += totalSize;
 
-    size_t mallocSize = SizeOfIncludingThisFromMalloc(aMallocSizeOf);
-    EnumerateData data = { aArenaStats, 0 };
-    mFreeLists.EnumerateEntries(FreeListEnumerator, &data);
-    aArenaStats->mOther = mallocSize - data.total;
-  }
-};
+  return PL_DHASH_NEXT;
+}
 
 void
 nsPresArena::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf,
                                  nsArenaMemoryStats* aArenaStats)
 {
-  mState->SizeOfIncludingThis(aMallocSizeOf, aArenaStats);
-}
+  // We do a complicated dance here because we want to measure the
+  // space taken up by the different kinds of objects in the arena,
+  // but we don't have pointers to those objects.  And even if we did,
+  // we wouldn't be able to use aMallocSizeOf on them, since they were
+  // allocated out of malloc'd chunks of memory.  So we compute the
+  // size of the arena as known by malloc and we add up the sizes of
+  // all the objects that we care about.  Subtracting these two
+  // quantities gives us a catch-all "other" number, which includes
+  // slop in the arena itself as well as the size of objects that
+  // we've not measured explicitly.
 
-// Public interface
-nsPresArena::nsPresArena()
-  : mState(new nsPresArena::State())
-{}
-
-nsPresArena::~nsPresArena()
-{
-  delete mState;
+  size_t mallocSize = SizeOfIncludingThisFromMalloc(aMallocSizeOf);
+  EnumerateData data = { aArenaStats, 0 };
+  mFreeLists.EnumerateEntries(FreeListEnumerator, &data);
+  aArenaStats->mOther = mallocSize - data.total;
 }
 
 void*
 nsPresArena::AllocateBySize(size_t aSize)
 {
-  return mState->Allocate(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER),
-                          aSize);
+  return Allocate(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aSize);
 }
 
 void
 nsPresArena::FreeBySize(size_t aSize, void* aPtr)
 {
-  mState->Free(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aPtr);
+  Free(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aPtr);
 }
 
 void*
 nsPresArena::AllocateByFrameID(nsQueryFrame::FrameIID aID, size_t aSize)
 {
-  return mState->Allocate(aID, aSize);
+  return Allocate(aID, aSize);
 }
 
 void
 nsPresArena::FreeByFrameID(nsQueryFrame::FrameIID aID, void* aPtr)
 {
-  mState->Free(aID, aPtr);
+  Free(aID, aPtr);
 }
 
 void*
 nsPresArena::AllocateByObjectID(ObjectID aID, size_t aSize)
 {
-  return mState->Allocate(aID, aSize);
+  return Allocate(aID, aSize);
 }
 
 void
 nsPresArena::FreeByObjectID(ObjectID aID, void* aPtr)
 {
-  mState->Free(aID, aPtr);
+  Free(aID, aPtr);
 }
 
 /* static */ uintptr_t
diff --git a/layout/base/nsPresArena.h b/layout/base/nsPresArena.h
index 234d904e3987..424f65590b1a 100644
--- a/layout/base/nsPresArena.h
+++ b/layout/base/nsPresArena.h
@@ -8,10 +8,13 @@
 #ifndef nsPresArena_h___
 #define nsPresArena_h___
 
+#include "mozilla/MemoryChecking.h"
+#include "mozilla/StandardInteger.h"
 #include "nscore.h"
 #include "nsQueryFrame.h"
-
-#include "mozilla/StandardInteger.h"
+#include "nsTArray.h"
+#include "nsTHashtable.h"
+#include "plarena.h"
 
 struct nsArenaMemoryStats;
 
@@ -66,8 +69,49 @@ public:
   static uintptr_t GetPoisonValue();
 
 private:
-  struct State;
-  State* mState;
+  void* Allocate(uint32_t aCode, size_t aSize);
+  void Free(uint32_t aCode, void* aPtr);
+
+  // All keys to this hash table fit in 32 bits (see below) so we do not
+  // bother actually hashing them.
+  class FreeList : public PLDHashEntryHdr
+  {
+  public:
+    typedef uint32_t KeyType;
+    nsTArray<void *> mEntries;
+    size_t mEntrySize;
+    size_t mEntriesEverAllocated;
+
+    typedef const void* KeyTypePointer;
+    KeyTypePointer mKey;
+
+    FreeList(KeyTypePointer aKey)
+    : mEntrySize(0), mEntriesEverAllocated(0), mKey(aKey) {}
+    // Default copy constructor and destructor are ok.
+
+    bool KeyEquals(KeyTypePointer const aKey) const
+    { return mKey == aKey; }
+
+    static KeyTypePointer KeyToPointer(KeyType aKey)
+    { return NS_INT32_TO_PTR(aKey); }
+
+    static PLDHashNumber HashKey(KeyTypePointer aKey)
+    { return NS_PTR_TO_INT32(aKey); }
+
+    enum { ALLOW_MEMMOVE = false };
+  };
+
+#if defined(MOZ_HAVE_MEM_CHECKS)
+  static PLDHashOperator UnpoisonFreeList(FreeList* aEntry, void*);
+#endif
+  static PLDHashOperator FreeListEnumerator(FreeList* aEntry, void* aData);
+  static size_t SizeOfFreeListEntryExcludingThis(FreeList* aEntry,
+                                                 nsMallocSizeOfFun aMallocSizeOf,
+                                                 void*);
+  size_t SizeOfIncludingThisFromMalloc(nsMallocSizeOfFun aMallocSizeOf) const;
+
+  nsTHashtable<FreeList> mFreeLists;
+  PLArenaPool mPool;
 };
 
 #endif
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index b76fffa4a1df..bce620102a63 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -9,17 +9,16 @@
  * matching and cascading
  */
 
-#include "mozilla/Util.h"
+#define PL_ARENA_CONST_ALIGN_MASK 7
+// We want page-sized arenas so there's no fragmentation involved.
+// Including plarena.h must come first to avoid it being included by some
+// header file thereby making PL_ARENA_CONST_ALIGN_MASK ineffective.
+#define NS_CASCADEENUMDATA_ARENA_BLOCK_SIZE (4096)
+#include "plarena.h"
 
 #include "nsCSSRuleProcessor.h"
 #include "nsRuleProcessorData.h"
 #include <algorithm>
-
-#define PL_ARENA_CONST_ALIGN_MASK 7
-// We want page-sized arenas so there's no fragmentation involved.
-#define NS_CASCADEENUMDATA_ARENA_BLOCK_SIZE (4096)
-#include "plarena.h"
-
 #include "nsCRT.h"
 #include "nsIAtom.h"
 #include "pldhash.h"
@@ -60,6 +59,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/Likely.h"
+#include "mozilla/Util.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

From 11a4e4ae9f6c3cb9c70920f86529f7dc868e3baa Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Mon, 15 Apr 2013 22:00:06 +0200
Subject: [PATCH 188/438] Bug 856368 - Adjust memory reporter SizeOf methods
 accordingly.  r=roc

---
 layout/base/nsPresArena.cpp | 15 ++++-----------
 layout/base/nsPresArena.h   |  1 -
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/layout/base/nsPresArena.cpp b/layout/base/nsPresArena.cpp
index e81bd32b2c40..c3e051ae6385 100644
--- a/layout/base/nsPresArena.cpp
+++ b/layout/base/nsPresArena.cpp
@@ -333,16 +333,6 @@ nsPresArena::SizeOfFreeListEntryExcludingThis(
   return aEntry->mEntries.SizeOfExcludingThis(aMallocSizeOf);
 }
 
-size_t
-nsPresArena::SizeOfIncludingThisFromMalloc(nsMallocSizeOfFun aMallocSizeOf) const
-{
-  size_t n = aMallocSizeOf(this);
-  n += PL_SizeOfArenaPoolExcludingPool(&mPool, aMallocSizeOf);
-  n += mFreeLists.SizeOfExcludingThis(SizeOfFreeListEntryExcludingThis,
-                                      aMallocSizeOf);
-  return n;
-}
-
 struct EnumerateData {
   nsArenaMemoryStats* stats;
   size_t total;
@@ -415,7 +405,10 @@ nsPresArena::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf,
   // slop in the arena itself as well as the size of objects that
   // we've not measured explicitly.
 
-  size_t mallocSize = SizeOfIncludingThisFromMalloc(aMallocSizeOf);
+  size_t mallocSize = PL_SizeOfArenaPoolExcludingPool(&mPool, aMallocSizeOf);
+  mallocSize += mFreeLists.SizeOfExcludingThis(SizeOfFreeListEntryExcludingThis,
+                                               aMallocSizeOf);
+
   EnumerateData data = { aArenaStats, 0 };
   mFreeLists.EnumerateEntries(FreeListEnumerator, &data);
   aArenaStats->mOther = mallocSize - data.total;
diff --git a/layout/base/nsPresArena.h b/layout/base/nsPresArena.h
index 424f65590b1a..cdc89a527ef2 100644
--- a/layout/base/nsPresArena.h
+++ b/layout/base/nsPresArena.h
@@ -108,7 +108,6 @@ private:
   static size_t SizeOfFreeListEntryExcludingThis(FreeList* aEntry,
                                                  nsMallocSizeOfFun aMallocSizeOf,
                                                  void*);
-  size_t SizeOfIncludingThisFromMalloc(nsMallocSizeOfFun aMallocSizeOf) const;
 
   nsTHashtable<FreeList> mFreeLists;
   PLArenaPool mPool;

From d7cb6e0ea44494cda8c577722d58d1cb841e492a Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Mon, 15 Apr 2013 22:00:06 +0200
Subject: [PATCH 189/438] Bug 856368 - Inline the AllocateBy* and FreeBy*
 methods into the header.  r=roc

---
 layout/base/nsPresArena.cpp | 40 ++-------------------------------
 layout/base/nsPresArena.h   | 44 ++++++++++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/layout/base/nsPresArena.cpp b/layout/base/nsPresArena.cpp
index c3e051ae6385..4459247c8a19 100644
--- a/layout/base/nsPresArena.cpp
+++ b/layout/base/nsPresArena.cpp
@@ -250,7 +250,7 @@ nsPresArena::~nsPresArena()
   PL_FinishArenaPool(&mPool);
 }
 
-void*
+NS_HIDDEN_(void*)
 nsPresArena::Allocate(uint32_t aCode, size_t aSize)
 {
   NS_ABORT_IF_FALSE(aSize > 0, "PresArena cannot allocate zero bytes");
@@ -308,7 +308,7 @@ nsPresArena::Allocate(uint32_t aCode, size_t aSize)
   return result;
 }
 
-void
+NS_HIDDEN_(void)
 nsPresArena::Free(uint32_t aCode, void* aPtr)
 {
   // Try to recycle this entry.
@@ -414,42 +414,6 @@ nsPresArena::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf,
   aArenaStats->mOther = mallocSize - data.total;
 }
 
-void*
-nsPresArena::AllocateBySize(size_t aSize)
-{
-  return Allocate(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aSize);
-}
-
-void
-nsPresArena::FreeBySize(size_t aSize, void* aPtr)
-{
-  Free(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aPtr);
-}
-
-void*
-nsPresArena::AllocateByFrameID(nsQueryFrame::FrameIID aID, size_t aSize)
-{
-  return Allocate(aID, aSize);
-}
-
-void
-nsPresArena::FreeByFrameID(nsQueryFrame::FrameIID aID, void* aPtr)
-{
-  Free(aID, aPtr);
-}
-
-void*
-nsPresArena::AllocateByObjectID(ObjectID aID, size_t aSize)
-{
-  return Allocate(aID, aSize);
-}
-
-void
-nsPresArena::FreeByObjectID(ObjectID aID, void* aPtr)
-{
-  Free(aID, aPtr);
-}
-
 /* static */ uintptr_t
 nsPresArena::GetPoisonValue()
 {
diff --git a/layout/base/nsPresArena.h b/layout/base/nsPresArena.h
index cdc89a527ef2..33638d1320a8 100644
--- a/layout/base/nsPresArena.h
+++ b/layout/base/nsPresArena.h
@@ -23,15 +23,6 @@ public:
   nsPresArena();
   ~nsPresArena();
 
-  // Pool allocation with recycler lists indexed by object size, aSize.
-  NS_HIDDEN_(void*) AllocateBySize(size_t aSize);
-  NS_HIDDEN_(void)  FreeBySize(size_t aSize, void* aPtr);
-
-  // Pool allocation with recycler lists indexed by frame-type ID.
-  // Every aID must always be used with the same object size, aSize.
-  NS_HIDDEN_(void*) AllocateByFrameID(nsQueryFrame::FrameIID aID, size_t aSize);
-  NS_HIDDEN_(void)  FreeByFrameID(nsQueryFrame::FrameIID aID, void* aPtr);
-
   enum ObjectID {
     nsLineBox_id = nsQueryFrame::NON_FRAME_MARKER,
     nsRuleNode_id,
@@ -47,10 +38,37 @@ public:
     NON_OBJECT_MARKER = 0x40000000
   };
 
+  // Pool allocation with recycler lists indexed by object size, aSize.
+  NS_HIDDEN_(void*) AllocateBySize(size_t aSize)
+  {
+    return Allocate(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aSize);
+  }
+  NS_HIDDEN_(void) FreeBySize(size_t aSize, void* aPtr)
+  {
+    Free(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aPtr);
+  }
+
+  // Pool allocation with recycler lists indexed by frame-type ID.
+  // Every aID must always be used with the same object size, aSize.
+  NS_HIDDEN_(void*) AllocateByFrameID(nsQueryFrame::FrameIID aID, size_t aSize)
+  {
+    return Allocate(aID, aSize);
+  }
+  NS_HIDDEN_(void) FreeByFrameID(nsQueryFrame::FrameIID aID, void* aPtr)
+  {
+    Free(aID, aPtr);
+  }
+
   // Pool allocation with recycler lists indexed by object-type ID (see above).
   // Every aID must always be used with the same object size, aSize.
-  NS_HIDDEN_(void*) AllocateByObjectID(ObjectID aID, size_t aSize);
-  NS_HIDDEN_(void)  FreeByObjectID(ObjectID aID, void* aPtr);
+  NS_HIDDEN_(void*) AllocateByObjectID(ObjectID aID, size_t aSize)
+  {
+    return Allocate(aID, aSize);
+  }
+  NS_HIDDEN_(void) FreeByObjectID(ObjectID aID, void* aPtr)
+  {
+    Free(aID, aPtr);
+  }
 
   /**
    * Fill aArenaStats with sizes of interesting objects allocated in
@@ -69,8 +87,8 @@ public:
   static uintptr_t GetPoisonValue();
 
 private:
-  void* Allocate(uint32_t aCode, size_t aSize);
-  void Free(uint32_t aCode, void* aPtr);
+  NS_HIDDEN_(void*) Allocate(uint32_t aCode, size_t aSize);
+  NS_HIDDEN_(void) Free(uint32_t aCode, void* aPtr);
 
   // All keys to this hash table fit in 32 bits (see below) so we do not
   // bother actually hashing them.

From 479bcdbb382b4663f04924291b9a33c9fde93fee Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Mon, 15 Apr 2013 22:00:06 +0200
Subject: [PATCH 190/438] Bug 856368 - Convert some comments into proper
 doc-comments.  r=roc

---
 layout/base/nsPresArena.h | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/layout/base/nsPresArena.h b/layout/base/nsPresArena.h
index 33638d1320a8..be3c6f9639f2 100644
--- a/layout/base/nsPresArena.h
+++ b/layout/base/nsPresArena.h
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/* arena allocation for the frame tree and closely-related objects */
+
 #ifndef nsPresArena_h___
 #define nsPresArena_h___
 
@@ -29,16 +31,20 @@ public:
     nsStyleContext_id,
     nsFrameList_id,
 
-    // The PresArena implementation uses this bit to distinguish objects
-    // allocated by size from objects allocated by type ID (that is, frames
-    // using AllocateByFrameID and other objects using AllocateByObjectID).
-    // It should not collide with any Object ID (above) or frame ID (in
-    // nsQueryFrame.h).  It is not 0x80000000 to avoid the question of
-    // whether enumeration constants are signed.
+    /**
+     * The PresArena implementation uses this bit to distinguish objects
+     * allocated by size from objects allocated by type ID (that is, frames
+     * using AllocateByFrameID and other objects using AllocateByObjectID).
+     * It should not collide with any Object ID (above) or frame ID (in
+     * nsQueryFrame.h).  It is not 0x80000000 to avoid the question of
+     * whether enumeration constants are signed.
+     */
     NON_OBJECT_MARKER = 0x40000000
   };
 
-  // Pool allocation with recycler lists indexed by object size, aSize.
+  /**
+   * Pool allocation with recycler lists indexed by object size, aSize.
+   */
   NS_HIDDEN_(void*) AllocateBySize(size_t aSize)
   {
     return Allocate(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aSize);
@@ -48,8 +54,10 @@ public:
     Free(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aPtr);
   }
 
-  // Pool allocation with recycler lists indexed by frame-type ID.
-  // Every aID must always be used with the same object size, aSize.
+  /**
+   * Pool allocation with recycler lists indexed by frame-type ID.
+   * Every aID must always be used with the same object size, aSize.
+   */
   NS_HIDDEN_(void*) AllocateByFrameID(nsQueryFrame::FrameIID aID, size_t aSize)
   {
     return Allocate(aID, aSize);
@@ -59,8 +67,10 @@ public:
     Free(aID, aPtr);
   }
 
-  // Pool allocation with recycler lists indexed by object-type ID (see above).
-  // Every aID must always be used with the same object size, aSize.
+  /**
+   * Pool allocation with recycler lists indexed by object-type ID (see above).
+   * Every aID must always be used with the same object size, aSize.
+   */
   NS_HIDDEN_(void*) AllocateByObjectID(ObjectID aID, size_t aSize)
   {
     return Allocate(aID, aSize);

From d9a1cad09472b93b9e68a4b0146e545dafc01ef7 Mon Sep 17 00:00:00 2001
From: Jason Duell <jduell.mcbugs@gmail.com>
Date: Mon, 18 Mar 2013 10:51:00 -0700
Subject: [PATCH 191/438] Bug 851214 - Allow OOP mozbrowser w/o enclosing app
 r?honza

---
 netwerk/ipc/NeckoParent.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp
index 0bf17fd51d76..ee620e7acbab 100644
--- a/netwerk/ipc/NeckoParent.cpp
+++ b/netwerk/ipc/NeckoParent.cpp
@@ -98,13 +98,6 @@ NeckoParent::GetValidatedAppInfo(const SerializedLoadContext& aSerialized,
       if (tabParent->HasOwnApp()) {
         return "TabParent reports NECKO_NO_APP_ID but also is an app";
       }
-      if (UsingNeckoIPCSecurity() && tabParent->IsBrowserElement()) {
-        // <iframe mozbrowser> which doesn't have an <iframe mozapp> above it.
-        // This is not supported now, and we'll need to do a code audit to make
-        // sure we can handle it (i.e don't short-circuit using separate
-        // namespace if just appID==0)
-        return "TabParent reports appId=NECKO_NO_APP_ID but is a mozbrowser";
-      }
     }
   } else {
     // Only trust appId/inBrowser from child-side loadcontext if we're in

From d0bb2f8df74f68f4d36c2559ed0c4543b4ad3ead Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Wed, 17 Apr 2013 15:02:24 -0500
Subject: [PATCH 192/438] Bug 862025 - Ignore monocle vertical drag orientation
 for single line text inputs. r=bbondy

---
 browser/metro/base/content/Util.js                         | 4 ++++
 .../metro/base/content/contenthandlers/SelectionHandler.js | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/browser/metro/base/content/Util.js b/browser/metro/base/content/Util.js
index 9968f524502f..eef44e22d19c 100644
--- a/browser/metro/base/content/Util.js
+++ b/browser/metro/base/content/Util.js
@@ -185,6 +185,10 @@ let Util = {
             aElement instanceof Ci.nsIDOMHTMLTextAreaElement);
   },
 
+  isMultilineInput: function isMultilineInput(aElement) {
+    return (aElement instanceof Ci.nsIDOMHTMLTextAreaElement);
+  },
+
   isLink: function isLink(aElement) {
     return ((aElement instanceof Ci.nsIDOMHTMLAnchorElement && aElement.href) ||
             (aElement instanceof Ci.nsIDOMHTMLAreaElement && aElement.href) ||
diff --git a/browser/metro/base/content/contenthandlers/SelectionHandler.js b/browser/metro/base/content/contenthandlers/SelectionHandler.js
index 89a007ed3af9..1b65daf533d3 100644
--- a/browser/metro/base/content/contenthandlers/SelectionHandler.js
+++ b/browser/metro/base/content/contenthandlers/SelectionHandler.js
@@ -842,13 +842,16 @@ var SelectionHandler = {
 
     let orientation = this._pointOrientationToRect(aClientPoint);
     let result = { speed: 1, trigger: false, start: false, end: false };
+    let ml = Util.isMultilineInput(this._targetElement);
 
-    if (orientation.left || orientation.top) {
+    // This could be improved such that we only select to the beginning of
+    // the line when dragging left but not up.
+    if (orientation.left || (ml && orientation.top)) {
       this._addEditSelection(kSelectionNodeAnchor);
       result.speed = orientation.left + orientation.top;
       result.trigger = true;
       result.end = true;
-    } else if (orientation.right || orientation.bottom) {
+    } else if (orientation.right || (ml && orientation.bottom)) {
       this._addEditSelection(kSelectionNodeFocus);
       result.speed = orientation.right + orientation.bottom;
       result.trigger = true;

From 35d113c9cdf75fa214ba42b2bc0b3b3b94b2b971 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Wed, 17 Apr 2013 15:02:24 -0500
Subject: [PATCH 193/438] Bug 854070 - Add a bit of directional hysteresis when
 converting a caret monocle drag to selection. r=bbondy

---
 .../content/helperui/SelectionHelperUI.js     | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/browser/metro/base/content/helperui/SelectionHelperUI.js b/browser/metro/base/content/helperui/SelectionHelperUI.js
index 86180fbe6554..10d282e05ed3 100644
--- a/browser/metro/base/content/helperui/SelectionHelperUI.js
+++ b/browser/metro/base/content/helperui/SelectionHelperUI.js
@@ -16,6 +16,9 @@
 // Y axis scroll distance that will disable this module and cancel selection
 const kDisableOnScrollDistance = 25;
 
+// Drag hysteresis programmed into monocle drag moves
+const kDragHysteresisDistance = 10;
+
 /*
  * Markers
  */
@@ -99,6 +102,8 @@ Marker.prototype = {
   _selectionHelperUI: null,
   _xPos: 0,
   _yPos: 0,
+  _xDrag: 0,
+  _yDrag: 0,
   _tag: "",
   _hPlane: 0,
   _vPlane: 0,
@@ -174,6 +179,8 @@ Marker.prototype = {
   },
 
   dragStart: function dragStart(aX, aY) {
+    this._xDrag = 0;
+    this._yDrag = 0;
     this._selectionHelperUI.markerDragStart(this);
   },
 
@@ -184,7 +191,15 @@ Marker.prototype = {
   moveBy: function moveBy(aDx, aDy, aClientX, aClientY) {
     this._xPos -= aDx;
     this._yPos -= aDy;
-    let direction = (aDx >= 0 && aDy >= 0 ? "start" : "end");
+    this._xDrag -= aDx;
+    this._yDrag -= aDy;
+    // Add a bit of hysteresis to our directional detection so "big fingers"
+    // are detected accurately.
+    let direction = "tbd";
+    if (Math.abs(this._xDrag) > kDragHysteresisDistance ||
+        Math.abs(this._yDrag) > kDragHysteresisDistance) {
+      direction = (this._xDrag <= 0 && this._yDrag <= 0 ? "start" : "end");
+    }
     // We may swap markers in markerDragMove. If markerDragMove
     // returns true keep processing, otherwise get out of here.
     if (this._selectionHelperUI.markerDragMove(this, direction)) {
@@ -973,11 +988,16 @@ var SelectionHelperUI = {
 
   markerDragMove: function markerDragMove(aMarker, aDirection) {
     if (aMarker.tag == "caret") {
-      // We are going to transition from caret browsing mode to selection
-      // mode on drag. So swap the caret monocle for a start or end monocle
-      // depending on the direction of the drag, and start selecting text.
-      this._transitionFromCaretToSelection(aDirection);
-      return false;
+      // If direction is "tbd" the drag monocle hasn't determined which
+      // direction the user is dragging.
+      if (aDirection != "tbd") {
+        // We are going to transition from caret browsing mode to selection
+        // mode on drag. So swap the caret monocle for a start or end monocle
+        // depending on the direction of the drag, and start selecting text.
+        this._transitionFromCaretToSelection(aDirection);
+        return false;
+      }
+      return true;
     }
     let json = this._getMarkerBaseMessage();
     json.change = aMarker.tag;

From f32710dcdf82d0eeeafe867d6d0958d1943cf854 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 17 Apr 2013 16:08:11 -0400
Subject: [PATCH 194/438] Bug 847898 - Put Android Beam support behind a
 confvar variable. r=mfinkle

---
 configure.in                               | 9 +++++++++
 mobile/android/base/AndroidManifest.xml.in | 4 ++++
 mobile/android/base/AppConstants.java.in   | 7 +++++++
 mobile/android/base/BrowserApp.java        | 6 +++---
 mobile/android/confvars.sh                 | 3 +++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index af24709aeb45..2e0cea550412 100644
--- a/configure.in
+++ b/configure.in
@@ -4263,6 +4263,7 @@ MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_ANDROID_WALLPAPER=
+MOZ_ANDROID_BEAM=
 ACCESSIBILITY=1
 MOZ_SYS_MSG=
 MOZ_TIME_MANAGER=
@@ -5146,6 +5147,13 @@ if test -n "$MOZ_ANDROID_WALLPAPER"; then
     AC_DEFINE(MOZ_ANDROID_WALLPAPER)
 fi
 
+dnl ========================================================
+dnl = Enable NFC permission on Android
+dnl ========================================================
+if test -n "$MOZ_ANDROID_BEAM"; then
+    AC_DEFINE(MOZ_ANDROID_BEAM)
+fi
+
 dnl ========================================================
 dnl = Build Personal Security Manager
 dnl ========================================================
@@ -8594,6 +8602,7 @@ AC_SUBST(MOZ_METRO)
 AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_WALLPAPER)
+AC_SUBST(MOZ_ANDROID_BEAM)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 8b1cd0c4e8c9..19fce07c2840 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -44,9 +44,11 @@
     <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
     <uses-feature android:name="android.hardware.touchscreen"/>
 
+#ifdef MOZ_ANDROID_BEAM
     <!-- Android Beam support -->
     <uses-permission android:name="android.permission.NFC"/>
     <uses-feature android:name="android.hardware.nfc"/>
+#endif
 
 #ifdef MOZ_WEBRTC
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -125,12 +127,14 @@
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
 
+#ifdef MOZ_ANDROID_BEAM
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="http" />
                 <data android:scheme="https" />
             </intent-filter>
+#endif
 
             <meta-data android:name="android.app.searchable"
                        android:resource="@xml/searchable" />
diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
index 33825d6d7a49..605b2d6cc057 100644
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -86,4 +86,11 @@ public class AppConstants {
 #else
     false;
 #endif
+
+    public static final boolean MOZ_ANDROID_BEAM =
+#ifdef MOZ_ANDROID_BEAM
+    true;
+#else
+    false;
+#endif
 }
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 891143c12052..c5f0d5b0052e 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -536,7 +536,7 @@ abstract public class BrowserApp extends GeckoApp
         Distribution.init(this, getPackageResourcePath());
         JavaAddonManager.getInstance().init(getApplicationContext());
 
-        if (Build.VERSION.SDK_INT >= 14) {
+        if (AppConstants.MOZ_ANDROID_BEAM && Build.VERSION.SDK_INT >= 14) {
             NfcAdapter nfc = NfcAdapter.getDefaultAdapter(this);
             if (nfc != null) {
                 nfc.setNdefPushMessageCallback(new NfcAdapter.CreateNdefMessageCallback() {
@@ -632,7 +632,7 @@ abstract public class BrowserApp extends GeckoApp
         unregisterEventListener("Feedback:MaybeLater");
         unregisterEventListener("Telemetry:Gather");
 
-        if (Build.VERSION.SDK_INT >= 14) {
+        if (AppConstants.MOZ_ANDROID_BEAM && Build.VERSION.SDK_INT >= 14) {
             NfcAdapter nfc = NfcAdapter.getDefaultAdapter(this);
             if (nfc != null) {
                 // null this out even though the docs say it's not needed,
@@ -1664,7 +1664,7 @@ abstract public class BrowserApp extends GeckoApp
 
         String action = intent.getAction();
 
-        if (Build.VERSION.SDK_INT >= 10 && NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action)) {
+        if (AppConstants.MOZ_ANDROID_BEAM && Build.VERSION.SDK_INT >= 10 && NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action)) {
             String uri = intent.getDataString();
             GeckoAppShell.sendEventToGecko(GeckoEvent.createURILoadEvent(uri));
         }
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 57d72fda5531..5d9c60031028 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -22,6 +22,9 @@ MOZ_MEDIA_NAVIGATOR=1
 # Enable SET_WALLPAPER permission
 MOZ_ANDROID_WALLPAPER=1
 
+# Enable NFC permission
+MOZ_ANDROID_BEAM=1
+
 if test "$LIBXUL_SDK"; then
 MOZ_XULRUNNER=1
 else

From 8ee9ad14d69a16ac5291bb4cc7f2a484cc952078 Mon Sep 17 00:00:00 2001
From: Shane Caraveo <scaraveo@mozilla.com>
Date: Wed, 17 Apr 2013 12:43:30 -0700
Subject: [PATCH 195/438] bug 851653 add services to addonprovider for fhr,
 r=gps

---
 services/healthreport/providers.jsm           | 28 ++++++++++++++++++-
 .../tests/xpcshell/test_provider_addons.js    | 23 ++++++++++++---
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/services/healthreport/providers.jsm b/services/healthreport/providers.jsm
index 2815c1f63140..09c47c1dde7f 100644
--- a/services/healthreport/providers.jsm
+++ b/services/healthreport/providers.jsm
@@ -681,6 +681,29 @@ function AddonCountsMeasurement() {
 AddonCountsMeasurement.prototype = Object.freeze({
   __proto__: Metrics.Measurement.prototype,
 
+  name: "counts",
+  version: 2,
+
+  fields: {
+    theme: DAILY_LAST_NUMERIC_FIELD,
+    lwtheme: DAILY_LAST_NUMERIC_FIELD,
+    plugin: DAILY_LAST_NUMERIC_FIELD,
+    extension: DAILY_LAST_NUMERIC_FIELD,
+    service: DAILY_LAST_NUMERIC_FIELD,
+  },
+});
+
+
+/**
+ * Legacy version of addons counts before services was added.
+ */
+function AddonCountsMeasurement1() {
+  Metrics.Measurement.call(this);
+}
+
+AddonCountsMeasurement1.prototype = Object.freeze({
+  __proto__: Metrics.Measurement.prototype,
+
   name: "counts",
   version: 1,
 
@@ -719,12 +742,14 @@ AddonsProvider.prototype = Object.freeze({
   FULL_DETAIL_TYPES: [
     "plugin",
     "extension",
+    "service",
   ],
 
   name: "org.mozilla.addons",
 
   measurementTypes: [
     ActiveAddonsMeasurement,
+    AddonCountsMeasurement1,
     AddonCountsMeasurement,
   ],
 
@@ -770,7 +795,8 @@ AddonsProvider.prototype = Object.freeze({
 
       let now = new Date();
       let active = this.getMeasurement("active", 1);
-      let counts = this.getMeasurement("counts", 1);
+      let counts = this.getMeasurement(AddonCountsMeasurement.prototype.name,
+                                       AddonCountsMeasurement.prototype.version);
 
       this.enqueueStorageOperation(function storageAddons() {
         for (let type in data.counts) {
diff --git a/services/healthreport/tests/xpcshell/test_provider_addons.js b/services/healthreport/tests/xpcshell/test_provider_addons.js
index b2d8e482b982..ecaaa8d86260 100644
--- a/services/healthreport/tests/xpcshell/test_provider_addons.js
+++ b/services/healthreport/tests/xpcshell/test_provider_addons.js
@@ -88,6 +88,18 @@ add_task(function test_collect() {
       installDate: now,
       updateDate: now,
     },
+    {
+      id: "addon3",
+      userDisabled: false,
+      appDisabled: false,
+      version: "4",
+      type: "service",
+      scope: 1,
+      foreignInstall: false,
+      hasBinaryComponents: false,
+      installDate: now,
+      updateDate: now,
+    },
   ];
 
   monkeypatchAddons(provider, addons);
@@ -104,29 +116,32 @@ add_task(function test_collect() {
   let json = data.singular.get("addons")[1];
   let value = JSON.parse(json);
   do_check_eq(typeof(value), "object");
-  do_check_eq(Object.keys(value).length, 2);
+  do_check_eq(Object.keys(value).length, 3);
   do_check_true("addon0" in value);
   do_check_true("addon1" in value);
+  do_check_true("addon3" in value);
 
   let serializer = active.serializer(active.SERIALIZE_JSON);
   let serialized = serializer.singular(data.singular);
   do_check_eq(typeof(serialized), "object");
-  do_check_eq(Object.keys(serialized).length, 3);   // Our two keys, plus _v.
+  do_check_eq(Object.keys(serialized).length, 4);   // Our three keys, plus _v.
   do_check_true("addon0" in serialized);
   do_check_true("addon1" in serialized);
+  do_check_true("addon3" in serialized);
   do_check_eq(serialized._v, 1);
 
-  let counts = provider.getMeasurement("counts", 1);
+  let counts = provider.getMeasurement("counts", 2);
   data = yield counts.getValues();
   do_check_eq(data.days.size, 1);
   do_check_eq(data.singular.size, 0);
   do_check_true(data.days.hasDay(now));
 
   value = data.days.getDay(now);
-  do_check_eq(value.size, 3);
+  do_check_eq(value.size, 4);
   do_check_eq(value.get("extension"), 1);
   do_check_eq(value.get("plugin"), 1);
   do_check_eq(value.get("theme"), 1);
+  do_check_eq(value.get("service"), 1);
 
   yield provider.shutdown();
   yield storage.close();

From 783b2ce156c09391b2f7343503963d783cdd9368 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Wed, 17 Apr 2013 15:48:35 -0400
Subject: [PATCH 196/438] Bug 861958: Support pre-negotiated streams greater
 than the currently-allocated number r=tuexen

---
 netwerk/sctp/datachannel/DataChannel.cpp | 141 ++++++++++++++++-------
 1 file changed, 99 insertions(+), 42 deletions(-)

diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp
index c79aa2972737..11f52a0745dc 100644
--- a/netwerk/sctp/datachannel/DataChannel.cpp
+++ b/netwerk/sctp/datachannel/DataChannel.cpp
@@ -1842,7 +1842,8 @@ DataChannelConnection::Open(const nsACString& label, const nsACString& protocol,
     return nullptr;
   }
 
-  if (aStream != INVALID_STREAM && mStreams[aStream]) {
+  // Don't look past currently-negotiated streams
+  if (aStream != INVALID_STREAM && aStream < mStreams.Length() && mStreams[aStream]) {
     LOG(("ERROR: external negotiation of already-open channel %u", aStream));
     // XXX How do we indicate this up to the application?  Probably the
     // caller's job, but we may need to return an error code.
@@ -1873,55 +1874,96 @@ DataChannelConnection::OpenFinish(already_AddRefed<DataChannel> aChannel)
   // Normally 1 reference if called from ::Open(), or 2 if called from
   // ProcessQueuedOpens() unless the DOMDataChannel was gc'd
   uint16_t stream = channel->mStream;
+  bool queue = false;
 
   mLock.AssertCurrentThreadOwns();
 
-  if (stream == INVALID_STREAM || mState != OPEN) {
-    if (mState == OPEN) { // implies INVALID_STREAM
-      // Don't try to find a stream if not open - mAllocateEven isn't set yet
+  // Cases we care about:
+  // Pre-negotiated:
+  //    Not Open:
+  //      Doesn't fit:
+  //         -> change initial ask or renegotiate after open
+  //      -> queue open
+  //    Open:
+  //      Doesn't fit:
+  //         -> RequestMoreStreams && queue
+  //      Does fit:
+  //         -> open
+  // Not negotiated:
+  //    Not Open:
+  //      -> queue open
+  //    Open:
+  //      -> Try to get a stream
+  //      Doesn't fit:
+  //         -> RequestMoreStreams && queue
+  //      Does fit:
+  //         -> open
+  // So the Open cases are basically the same
+  // Not Open cases are simply queue for non-negotiated, and
+  // either change the initial ask or possibly renegotiate after open.
+
+  if (mState == OPEN) {
+    if (stream == INVALID_STREAM) {
       stream = FindFreeStream(); // may be INVALID_STREAM if we need more
-      if (stream == INVALID_STREAM) {
-        if (!RequestMoreStreams()) {
-          channel->mState = CLOSED;
-          if (channel->mFlags & DATA_CHANNEL_FLAGS_FINISH_OPEN) {
-            // We already returned the channel to the app.
-            NS_ERROR("Failed to request more streams");
-            NS_DispatchToMainThread(new DataChannelOnMessageAvailable(
-                                      DataChannelOnMessageAvailable::ON_CHANNEL_CLOSED, this,
-                                      channel));
-            return channel.forget();
-          }
-          // we'll be destroying the channel, but it never really got set up
-          // Alternative would be to RUN_ON_THREAD(channel.forget(),::Destroy,...) and
-          // Dispatch it to ourselves
-          return nullptr;
-        }
+    }
+    if (stream == INVALID_STREAM || stream >= mStreams.Length()) {
+      // RequestMoreStreams() limits to MAX_NUM_STREAMS -- allocate extra streams 
+      // to avoid going back immediately for more if the ask to N, N+1, etc
+      int32_t more_needed = (stream == INVALID_STREAM) ? 16 :
+                            (stream-((int32_t)mStreams.Length())) + 16;
+      if (!RequestMoreStreams(more_needed)) {
+        // Something bad happened... we're done
+        goto request_error_cleanup;
       }
-      // if INVALID here, we need to queue
+      queue = true;
     }
-    if (stream != INVALID_STREAM) {
-      // just allocated (& OPEN), or externally negotiated
-      mStreams[stream] = channel; // holds a reference
-      channel->mStream = stream;
-    }
-
-    LOG(("Finishing open: channel %p, stream = %u", channel.get(), stream));
-
-    if (stream == INVALID_STREAM || mState != OPEN) {
-      // we're going to queue
-
-      LOG(("Queuing channel %p (%u) to finish open", channel.get(), stream));
-      // Also serves to mark we told the app
-      channel->mFlags |= DATA_CHANNEL_FLAGS_FINISH_OPEN;
-      channel->AddRef(); // we need a ref for the nsDeQue and one to return
-      mPending.Push(channel);
-      return channel.forget();
-    } // else OPEN and we selected a stream
   } else {
-    // OPEN and externally negotiated stream
-    mStreams[stream] = channel;
-    mStreams[stream] = channel; // holds a reference
+    // not OPEN
+    if (stream != INVALID_STREAM && stream >= mStreams.Length() &&
+        mState == CLOSED) {
+      // Update number of streams for init message
+      struct sctp_initmsg initmsg;
+      socklen_t len = sizeof(initmsg);
+      int32_t total_needed = stream+16;
+
+      memset(&initmsg, 0, sizeof(initmsg));
+      if (usrsctp_getsockopt(mMasterSocket, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, &len) < 0) {
+        LOG(("*** failed getsockopt SCTP_INITMSG"));
+        goto request_error_cleanup;
+      }
+      LOG(("Setting number of SCTP streams to %u, was %u/%u", total_needed,
+           initmsg.sinit_num_ostreams, initmsg.sinit_max_instreams));
+      initmsg.sinit_num_ostreams  = total_needed;
+      initmsg.sinit_max_instreams = MAX_NUM_STREAMS;
+      if (usrsctp_setsockopt(mMasterSocket, IPPROTO_SCTP, SCTP_INITMSG, &initmsg,
+                             (socklen_t)sizeof(initmsg)) < 0) {
+        LOG(("*** failed setsockopt SCTP_INITMSG, errno %d", errno));
+        goto request_error_cleanup;
+      }
+
+      int32_t old_len = mStreams.Length();
+      mStreams.AppendElements(total_needed - old_len);
+      for (int32_t i = old_len; i < total_needed; ++i) {
+        mStreams[i] = nullptr;
+      }
+    }
+    // else if state is CONNECTING, we'll just re-negotiate when OpenFinish
+    // is called, if needed
+    queue = true;
   }
+  if (queue) {
+    LOG(("Queuing channel %p (%u) to finish open", channel.get(), stream));
+    // Also serves to mark we told the app
+    channel->mFlags |= DATA_CHANNEL_FLAGS_FINISH_OPEN;
+    channel->AddRef(); // we need a ref for the nsDeQue and one to return
+    mPending.Push(channel);
+    return channel.forget();
+  }
+
+  MOZ_ASSERT(stream != INVALID_STREAM);
+  // just allocated (& OPEN), or externally negotiated
+  mStreams[stream] = channel; // holds a reference
+  channel->mStream = stream;
 
 #ifdef TEST_QUEUED_DATA
   // It's painful to write a test for this...
@@ -1970,6 +2012,21 @@ DataChannelConnection::OpenFinish(already_AddRefed<DataChannel> aChannel)
                             channel));
 
   return channel.forget();
+
+request_error_cleanup:
+  channel->mState = CLOSED;
+  if (channel->mFlags & DATA_CHANNEL_FLAGS_FINISH_OPEN) {
+    // We already returned the channel to the app.
+    NS_ERROR("Failed to request more streams");
+    NS_DispatchToMainThread(new DataChannelOnMessageAvailable(
+                              DataChannelOnMessageAvailable::ON_CHANNEL_CLOSED, this,
+                              channel));
+    return channel.forget();
+  }
+  // we'll be destroying the channel, but it never really got set up
+  // Alternative would be to RUN_ON_THREAD(channel.forget(),::Destroy,...) and
+  // Dispatch it to ourselves
+  return nullptr;
 }
 
 int32_t

From 857009063fcdb286d5cc44ee7bebc31acda95230 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Wed, 17 Apr 2013 22:16:14 +0200
Subject: [PATCH 197/438] Bug 844549 - Backout the test for bug 395609 since it
 refers to external resources (http://google.com/). r=test-only

---
 layout/xul/base/src/crashtests/395609.xul      | 16 ----------------
 layout/xul/base/src/crashtests/crashtests.list |  1 -
 2 files changed, 17 deletions(-)
 delete mode 100644 layout/xul/base/src/crashtests/395609.xul

diff --git a/layout/xul/base/src/crashtests/395609.xul b/layout/xul/base/src/crashtests/395609.xul
deleted file mode 100644
index 65988102ecd3..000000000000
--- a/layout/xul/base/src/crashtests/395609.xul
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<box style=" display: -moz-inline-stack; position: absolute; " id="a"/>
-
-<box style="display: table-row;" observes="a">
-<box onoverflow="event.currentTarget.parentNode.removeAttribute('style')">
-<box style="position: absolute;"/>
-<box style=" display: table-cell;">
-  <box style="overflow: auto; float: right; " onoverflow="event.target.parentNode.removeChild(event.target)" />
-</box>
-</box>
-<box style="position: fixed; ">
-  <editor src="http://google.com/"/>
-</box>
-</box>
-</window>
\ No newline at end of file
diff --git a/layout/xul/base/src/crashtests/crashtests.list b/layout/xul/base/src/crashtests/crashtests.list
index 1a38a75491ee..375b95abe44b 100644
--- a/layout/xul/base/src/crashtests/crashtests.list
+++ b/layout/xul/base/src/crashtests/crashtests.list
@@ -47,7 +47,6 @@ load 387033-1.xhtml
 load 387080-1.xul
 load 391974-1.html
 load 394120-1.xhtml
-skip-if(B2G||browserIsRemote) load 395609.xul # bug 844549
 load 397304-1.html
 load 398326-1.xhtml
 load 399013.xul

From e46f28dbdf6efa07d5eeb356269a7c9b4f7c704d Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Wed, 17 Apr 2013 22:16:14 +0200
Subject: [PATCH 198/438] Bug 701504 - Null out all
 BidiParagraphData::mPrevFrame when starting a new block.  r=smontagu

---
 layout/base/crashtests/701504.html     | 24 ++++++++++++++++++++++++
 layout/base/crashtests/crashtests.list |  1 +
 layout/base/nsBidiPresUtils.cpp        | 16 ++++++++++++++--
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 layout/base/crashtests/701504.html

diff --git a/layout/base/crashtests/701504.html b/layout/base/crashtests/701504.html
new file mode 100644
index 000000000000..011331077840
--- /dev/null
+++ b/layout/base/crashtests/701504.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+function boom()
+{
+  document.documentElement.offsetHeight;
+
+  var x = document.getElementById('x');
+  x.removeChild(x.childNodes[1]);
+
+  document.documentElement.offsetHeight;
+}
+
+</script>
+</head>
+<body onload="boom();">
+
+<div style="-moz-column-count: 2;"><span style="unicode-bidi: -moz-isolate;" id="x"><span style="direction: rtl;"></span> <span style="unicode-bidi: -moz-isolate; white-space: pre;">
+x</span></span></div>
+
+</body>
+</html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 392fac8a084b..e242e027ce4f 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -368,6 +368,7 @@ load 691118-1.html
 load 695861.html
 load 698335.html
 needs-focus pref(accessibility.browsewithcaret,true) load 699353-1.html
+load 701504.html
 load 707098.html
 load 722137.html
 load 725535.html
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 91f03ca4e6b8..aad1966b70f4 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -199,6 +199,13 @@ struct BidiParagraphData {
     }
   }
 
+  void ResetForNewBlock()
+  {
+    for (BidiParagraphData* bpd = this; bpd; bpd = bpd->mSubParagraph) {
+      bpd->mPrevFrame = nullptr;
+    }
+  }
+
   void AppendFrame(nsIFrame* aFrame,
                    nsBlockInFlowLineIterator* aLineIter,
                    nsIContent* aContent = nullptr)
@@ -603,8 +610,7 @@ nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
        block = static_cast<nsBlockFrame*>(block->GetNextContinuation())) {
     block->RemoveStateBits(NS_BLOCK_NEEDS_BIDI_RESOLUTION);
     nsBlockInFlowLineIterator lineIter(block, block->begin_lines());
-    bpd.mPrevFrame = nullptr;
-    bpd.GetSubParagraph()->mPrevFrame = nullptr;
+    bpd.ResetForNewBlock();
     TraverseFrames(aBlockFrame, &lineIter, block->GetFirstPrincipalChild(), &bpd);
     // XXX what about overflow lines?
   }
@@ -920,6 +926,10 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame*              aBlockFrame,
   if (!aCurrentFrame)
     return;
 
+#ifdef DEBUG
+  nsBlockFrame* initialLineContainer = aLineIter->GetContainer();
+#endif
+
   nsIFrame* childFrame = aCurrentFrame;
   do {
     /*
@@ -1165,6 +1175,8 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame*              aBlockFrame,
     }
     childFrame = nextSibling;
   } while (childFrame);
+
+  MOZ_ASSERT(initialLineContainer == aLineIter->GetContainer());
 }
 
 void

From db4a38d7ac473a20be054e92181d7bd366332147 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Wed, 17 Apr 2013 22:16:14 +0200
Subject: [PATCH 199/438] Bug 485149 - Using box-shadow on a <fieldset> with
 <legend> does not follow box shape.  r=roc

---
 layout/base/nsCSSRendering.cpp               |  3 +-
 layout/base/nsDisplayList.cpp                |  2 +-
 layout/forms/nsFieldSetFrame.cpp             | 36 ++++----
 layout/generic/nsIFrame.h                    |  8 ++
 layout/reftests/box-shadow/fieldset-ref.html | 95 ++++++++++++++++++++
 layout/reftests/box-shadow/fieldset.html     | 90 +++++++++++++++++++
 layout/reftests/box-shadow/reftest.list      |  1 +
 7 files changed, 218 insertions(+), 17 deletions(-)
 create mode 100644 layout/reftests/box-shadow/fieldset-ref.html
 create mode 100644 layout/reftests/box-shadow/fieldset.html

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index c0c63b5bf9ea..076c232755bb 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1214,7 +1214,8 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
   } else {
     nativeTheme = false;
     nscoord twipsRadii[8];
-    NS_ASSERTION(aFrameArea.Size() == aForFrame->GetSize(), "unexpected size");
+    NS_ASSERTION(aFrameArea.Size() == aForFrame->VisualBorderRectRelativeToSelf().Size(),
+                 "unexpected size");
     hasBorderRadius = aForFrame->GetBorderRadii(twipsRadii);
     if (hasBorderRadius) {
       ComputePixelRadii(twipsRadii, twipsPerPixel, &borderRadii);
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index a87409917665..0969a050c33a 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -2385,7 +2385,7 @@ void
 nsDisplayBoxShadowOuter::Paint(nsDisplayListBuilder* aBuilder,
                                nsRenderingContext* aCtx) {
   nsPoint offset = ToReferenceFrame();
-  nsRect borderRect = nsRect(offset, mFrame->GetSize());
+  nsRect borderRect = mFrame->VisualBorderRectRelativeToSelf() + offset;
   nsPresContext* presContext = mFrame->PresContext();
   nsAutoTArray<nsRect,10> rects;
   ComputeDisjointRectangles(mVisibleRegion, &rects);
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 74f253ae8b59..6ba523262aa1 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -3,9 +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/. */
 
-// YY need to pass isMultiple before create called
-
-//#include "nsFormControlFrame.h"
 #include "nsContainerFrame.h"
 #include "nsLegendFrame.h"
 #include "nsIDOMNode.h"
@@ -13,7 +10,6 @@
 #include "nsIDOMHTMLLegendElement.h"
 #include "nsCSSRendering.h"
 #include <algorithm>
-//#include "nsIDOMHTMLCollection.h"
 #include "nsIContent.h"
 #include "nsIFrame.h"
 #include "nsISupports.h"
@@ -35,7 +31,7 @@ using namespace mozilla::layout;
 
 class nsLegendFrame;
 
-class nsFieldSetFrame : public nsContainerFrame {
+class nsFieldSetFrame MOZ_FINAL : public nsContainerFrame {
 public:
   NS_DECL_FRAMEARENA_HELPERS
 
@@ -55,6 +51,21 @@ public:
                              uint32_t aFlags) MOZ_OVERRIDE;
   virtual nscoord GetBaseline() const;
 
+  /**
+   * The area to paint box-shadows around.  It's the border rect except
+   * when there's a <legend> we offset the y-position to the center of it.
+   */
+  virtual nsRect VisualBorderRectRelativeToSelf() const MOZ_OVERRIDE {
+    nscoord topBorder = StyleBorder()->GetComputedBorderWidth(NS_SIDE_TOP);
+    nsRect r(nsPoint(0,0), GetSize());
+    if (topBorder < mLegendRect.height) {
+      nscoord yoff = (mLegendRect.height - topBorder) / 2;
+      r.y += yoff;
+      r.height -= yoff;
+    }
+    return r;
+  }
+
   NS_IMETHOD Reflow(nsPresContext*           aPresContext,
                     nsHTMLReflowMetrics&     aDesiredSize,
                     const nsHTMLReflowState& aReflowState,
@@ -229,20 +240,14 @@ void
 nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     nsPoint aPt, const nsRect& aDirtyRect, uint32_t aBGFlags)
 {
-  const nsStyleBorder* borderStyle = StyleBorder();
-       
-  nscoord topBorder = borderStyle->GetComputedBorderWidth(NS_SIDE_TOP);
-  nscoord yoff = 0;
-  nsPresContext* presContext = PresContext();
-     
   // if the border is smaller than the legend. Move the border down
   // to be centered on the legend. 
   // FIXME: This means border-radius clamping is incorrect; we should
   // override nsIFrame::GetBorderRadii.
-  if (topBorder < mLegendRect.height)
-    yoff = (mLegendRect.height - topBorder)/2;
-      
-  nsRect rect(aPt.x, aPt.y + yoff, mRect.width, mRect.height - yoff);
+  nsRect rect = VisualBorderRectRelativeToSelf();
+  nscoord yoff = rect.y;
+  rect += aPt;
+  nsPresContext* presContext = PresContext();
 
   nsCSSRendering::PaintBackground(presContext, aRenderingContext, this,
                                   aDirtyRect, rect, aBGFlags);
@@ -251,6 +256,7 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
                                       this, rect, aDirtyRect);
 
    if (mLegendFrame) {
+     nscoord topBorder = StyleBorder()->GetComputedBorderWidth(NS_SIDE_TOP);
 
     // Use the rect of the legend frame, not mLegendRect, so we draw our
     // border under the legend's left and right margins.
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 9358fc0c3c1a..7a60a913e2d4 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -1008,6 +1008,14 @@ public:
   nsRect GetContentRect() const;
   nsRect GetContentRectRelativeToSelf() const;
 
+  /**
+   * The area to paint box-shadows around.  The default is the border rect.
+   * (nsFieldSetFrame overrides this).
+   */
+  virtual nsRect VisualBorderRectRelativeToSelf() const {
+    return nsRect(0, 0, mRect.width, mRect.height);
+  }
+
   /**
    * Get the size, in app units, of the border radii. It returns FALSE iff all
    * returned radii == 0 (so no border radii), TRUE otherwise.
diff --git a/layout/reftests/box-shadow/fieldset-ref.html b/layout/reftests/box-shadow/fieldset-ref.html
new file mode 100644
index 000000000000..9196d5063604
--- /dev/null
+++ b/layout/reftests/box-shadow/fieldset-ref.html
@@ -0,0 +1,95 @@
+<!DOCTYPE HTML>
+<html><head>
+    <meta charset="utf-8">
+    <title>Testcase for bug 485149</title>
+    <style type="text/css">
+
+        html,body {
+            color:black; background-color:white; font-size:16px; padding:0; margin:0;
+        }
+	
+
+body {padding:20px;}
+
+field {
+  display:block;
+  overflow:hidden;
+  background:yellow;
+
+  box-shadow:0 0 5px 5px #cccccc; 
+  border:1px solid #000000;
+  border-radius:7px;
+  width:200px;
+  height:50px;
+  margin-left:5px;
+  margin-right:2px;
+  padding:10px;
+  border-box;
+}
+
+.with-legend {
+  margin-top:8px;
+  height:42px;
+}
+
+p { height:40px; margin:0; }
+
+#mask1 {
+ position:absolute;
+ left:0;
+ top:0;
+ background:black;
+ z-index:1;
+ width:150px;
+ height:700px;
+}
+
+#mask2 {
+ position:absolute;
+ left:170px;
+ top:330px;
+ background:black;
+ z-index:1;
+ width:150px;
+ height:300px;
+}
+
+#mask3 {
+ position:absolute;
+ left:0;
+ top:380px;
+ background:black;
+ z-index:1;
+ width:300px;
+ height:300px;
+}
+
+</style>
+</head>
+<body>
+
+<field class="with-legend">
+1
+</field>
+
+<p></p>
+<field class="with-legend" style="position:relative">
+2
+</field>
+
+<p></p>
+<field>
+3
+</field>
+
+<p></p>
+<field class="with-legend" style="border-color:transparent">
+4
+</field>
+
+<div id="mask1"></div>
+<div id="mask2"></div>
+<div id="mask3"></div>
+
+</body>
+</html>
diff --git a/layout/reftests/box-shadow/fieldset.html b/layout/reftests/box-shadow/fieldset.html
new file mode 100644
index 000000000000..581633f54b11
--- /dev/null
+++ b/layout/reftests/box-shadow/fieldset.html
@@ -0,0 +1,90 @@
+<!DOCTYPE HTML>
+<html><head>
+    <meta charset="utf-8">
+    <title>Testcase for bug 485149</title>
+    <style type="text/css">
+
+        html,body {
+            color:black; background-color:white; font-size:16px; padding:0; margin:0;
+        }
+	
+
+body {padding:20px;}
+
+fieldset {
+  overflow:hidden;
+  background:yellow;
+
+  box-shadow:0 0 5px 5px #cccccc; 
+  border:1px solid #000000;
+  border-radius:7px;
+  width:200px;
+  height:50px;
+  margin-left:5px;
+  margin-right:2px;
+  padding:10px;
+}
+
+legend { height:16px; }
+
+p { height:40px; margin:0; }
+
+#mask1 {
+ position:absolute;
+ left:0;
+ top:0;
+ background:black;
+ z-index:1;
+ width:150px;
+ height:700px;
+}
+
+#mask2 {
+ position:absolute;
+ left:170px;
+ top:330px;
+ background:black;
+ z-index:1;
+ width:150px;
+ height:300px;
+}
+
+#mask3 {
+ position:absolute;
+ left:0;
+ top:380px;
+ background:black;
+ z-index:1;
+ width:300px;
+ height:300px;
+}
+
+</style>
+</head>
+<body>
+
+<fieldset><legend>Legend</legend>
+1
+</fieldset>
+
+<p></p>
+<fieldset style="position:relative;"><legend>Legend</legend>
+2
+</fieldset>
+
+<p></p>
+<fieldset>
+3
+</fieldset>
+
+<p></p>
+<fieldset><legend style="width:150px;"></legend>
+4
+</fieldset>
+
+<div id="mask1"></div>
+<div id="mask2"></div>
+<div id="mask3"></div>
+
+</body>
+</html>
diff --git a/layout/reftests/box-shadow/reftest.list b/layout/reftests/box-shadow/reftest.list
index 5289bf29cd54..fdee43264f69 100644
--- a/layout/reftests/box-shadow/reftest.list
+++ b/layout/reftests/box-shadow/reftest.list
@@ -25,3 +25,4 @@ random-if(d2d) == boxshadow-threecorners.html boxshadow-threecorners-ref.html
 == overflow-not-scrollable-2.html overflow-not-scrollable-2-ref.html
 fails-if(Android) == 611574-1.html 611574-1-ref.html
 fails-if(Android) == 611574-2.html 611574-2-ref.html
+fuzzy-if(winWidget,5,30) == fieldset.html fieldset-ref.html # minor anti-aliasing problem on Windows

From fece0273648838a05bef4e59b07896336ad99d9a Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Wed, 17 Apr 2013 22:16:14 +0200
Subject: [PATCH 200/438] Bug 859088 - Left/Right Arrow key after selection
 should move to the beginning/end of selection respectively (on all
 platforms).  r=ehsan

---
 layout/generic/nsSelection.cpp                    |  8 +++-----
 modules/libpref/src/init/all.js                   |  7 ++++---
 toolkit/content/tests/chrome/bug451540_window.xul | 15 +++++++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index 1f28f6d13ea6..15c6004e8436 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -784,13 +784,11 @@ nsFrameSelection::MoveCaret(uint32_t          aKeycode,
     SetDesiredX(desiredX);
   }
 
-  int32_t caretStyle =
-    Preferences::GetInt("layout.selection.caret_style", 0);
-#ifdef XP_MACOSX
+  int32_t caretStyle = Preferences::GetInt("layout.selection.caret_style", 0);
   if (caretStyle == 0) {
-    caretStyle = 2; // put caret at the selection edge in the |aKeycode| direction
+    // Put caret at the selection edge in the |aKeycode| direction.
+    caretStyle = 2;
   }
-#endif
 
   if (!isCollapsed && !aContinueSelection && caretStyle == 2) {
     switch (aKeycode){
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 6f5b9fa4d0fd..bdd1883f5821 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1683,11 +1683,12 @@ pref("layout.word_select.stop_at_punctuation", true);
 // controls caret style and word-delete during text selection
 // 0 = use platform default
 // 1 = caret moves and blinks as when there is no selection; word
-//     delete deselects the selection and then deletes word (Windows default)
+//     delete deselects the selection and then deletes word
 // 2 = caret moves to selection edge and is not visible during selection; 
-//     word delete deletes the selection (Mac default)
+//     word delete deletes the selection (Mac and Linux default)
 // 3 = caret moves and blinks as when there is no selection; word delete
-//     deletes the selection (Unix default)
+//     deletes the selection
+// Windows default is 1 for word delete behavior, the rest as for 2.
 pref("layout.selection.caret_style", 0);
 
 // pref to control whether or not to replace backslashes with Yen signs
diff --git a/toolkit/content/tests/chrome/bug451540_window.xul b/toolkit/content/tests/chrome/bug451540_window.xul
index 936412e97962..c1b5f0aefd5c 100644
--- a/toolkit/content/tests/chrome/bug451540_window.xul
+++ b/toolkit/content/tests/chrome/bug451540_window.xul
@@ -48,6 +48,16 @@
       gBrowser.loadURI(data);
     }
 
+    function goToStartOfLine(aElement) {
+      if (navigator.platform.indexOf("Mac") >= 0) {
+        synthesizeKey(aElement, true, KeyEvent.DOM_VK_LEFT,
+                      false, false, true);
+      } else {
+        synthesizeKey(aElement, true, KeyEvent.DOM_VK_HOME,
+                      false, false, false);
+      }
+    }
+
     function resetForNextTest(aElement, aText) {
       if (!aText)
         aText = SEARCH_TEXT;
@@ -67,10 +77,7 @@
 
       // Move caret to start of element
       aElement.focus();
-      synthesizeKey(aElement, true, KeyEvent.DOM_VK_UP,
-                    sendCtrl, false, sendMeta);
-      synthesizeKey(aElement, true, KeyEvent.DOM_VK_LEFT,
-                    sendCtrl, false, sendMeta);
+      goToStartOfLine(aElement);
     }
 
     function synthesizeKey(target, isKeyCode, key, ctlKey, shiftKey, metaKey) {

From 7cc2021f5c875151e5a6db39a042d2c5090a288a Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Wed, 17 Apr 2013 22:16:14 +0200
Subject: [PATCH 201/438] Bug 862185 - Make nsFieldSetFrame reflow and paint
 overflow container children.  r=roc

---
 layout/forms/nsFieldSetFrame.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 6ba523262aa1..5bf47fac326e 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -87,6 +87,11 @@ public:
                          nsIFrame*      aOldFrame);
 
   virtual nsIAtom* GetType() const;
+  virtual bool IsFrameOfType(uint32_t aFlags) const
+  {
+    return nsContainerFrame::IsFrameOfType(aFlags &
+             ~nsIFrame::eCanContainOverflowContainers);
+  }
 
 #ifdef ACCESSIBILITY  
   virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
@@ -196,7 +201,8 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   // REVIEW: We don't really need to check frame emptiness here; if it's empty,
   // the background/border display item won't do anything, and if it isn't empty,
   // we need to paint the outline
-  if (IsVisibleForPainting(aBuilder)) {
+  if (!(GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER) &&
+      IsVisibleForPainting(aBuilder)) {
     if (StyleBorder()->mBoxShadow) {
       aLists.BorderBackground()->AppendNewToTop(new (aBuilder)
         nsDisplayBoxShadowOuter(aBuilder, this));
@@ -212,6 +218,10 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
     DO_GLOBAL_REFLOW_COUNT_DSP("nsFieldSetFrame");
   }
 
+  if (GetPrevInFlow()) {
+    DisplayOverflowContainers(aBuilder, aDirtyRect, aLists);
+  }
+
   nsDisplayListCollection contentDisplayItems;
   if (mContentFrame) {
     // Collect mContentFrame's display items into their own collection. We need
@@ -392,6 +402,13 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
   // Initialize OUT parameter
   aStatus = NS_FRAME_COMPLETE;
 
+  nsOverflowAreas ocBounds;
+  nsReflowStatus ocStatus = NS_FRAME_COMPLETE;
+  if (GetPrevInFlow()) {
+    ReflowOverflowContainerChildren(aPresContext, aReflowState, ocBounds, 0,
+                                    ocStatus);
+  }
+
   //------------ Handle Incremental Reflow -----------------
   bool reflowContent;
   bool reflowLegend;
@@ -571,6 +588,11 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
     ConsiderChildOverflow(aDesiredSize.mOverflowAreas, mLegendFrame);
   if (mContentFrame)
     ConsiderChildOverflow(aDesiredSize.mOverflowAreas, mContentFrame);
+
+  // Merge overflow container bounds and status.
+  aDesiredSize.mOverflowAreas.UnionWith(ocBounds);
+  NS_MergeReflowStatusInto(&aStatus, ocStatus);
+
   FinishReflowWithAbsoluteFrames(aPresContext, aDesiredSize, aReflowState, aStatus);
 
   InvalidateFrame();

From 1c5df355669ec20eac2b9016de179dfc3d0bfd19 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Wed, 17 Apr 2013 22:16:14 +0200
Subject: [PATCH 202/438] Bug 862185 - Remove child frame members which may
 become stale and add accessors to get them from the child list instead. 
 r=roc

---
 layout/forms/nsFieldSetFrame.cpp | 201 +++++++++++++++++--------------
 1 file changed, 111 insertions(+), 90 deletions(-)

diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 5bf47fac326e..79e4f9d8d910 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -3,6 +3,7 @@
  * 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 "nsCSSAnonBoxes.h"
 #include "nsContainerFrame.h"
 #include "nsLegendFrame.h"
 #include "nsIDOMNode.h"
@@ -37,9 +38,6 @@ public:
 
   nsFieldSetFrame(nsStyleContext* aContext);
 
-  NS_IMETHOD SetInitialChildList(ChildListID    aListID,
-                                 nsFrameList&   aChildList);
-
   NS_HIDDEN_(nscoord)
     GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
                       nsLayoutUtils::IntrinsicWidthType);
@@ -98,6 +96,9 @@ public:
 #endif
 
 #ifdef DEBUG
+  NS_IMETHOD SetInitialChildList(ChildListID    aListID,
+                                 nsFrameList&   aChildList);
+
   NS_IMETHOD GetFrameName(nsAString& aResult) const {
     return MakeFrameName(NS_LITERAL_STRING("FieldSet"), aResult);
   }
@@ -107,10 +108,40 @@ protected:
 
   void ReparentFrameList(const nsFrameList& aFrameList);
 
-  // mLegendFrame is a nsLegendFrame or a nsHTMLScrollFrame with the
-  // nsLegendFrame as the scrolled frame (aka content insertion frame).
-  nsIFrame* mLegendFrame;
-  nsIFrame* mContentFrame;
+  /**
+   * Return the anonymous frame that contains all descendants except
+   * the legend frame.  This is currently always a block frame with
+   * pseudo nsCSSAnonBoxes::fieldsetContent -- this may change in the
+   * future when we add support for CSS overflow for <fieldset>.
+   */
+  nsIFrame* GetInner() const
+  {
+    nsIFrame* last = mFrames.LastChild();
+    if (last &&
+        last->StyleContext()->GetPseudo() == nsCSSAnonBoxes::fieldsetContent) {
+      return last;
+    }
+    MOZ_ASSERT(mFrames.LastChild() == mFrames.FirstChild());
+    return nullptr;
+  }
+
+  /**
+   * Return the frame that represents the legend if any.  This may be
+   * a nsLegendFrame or a nsHTMLScrollFrame with the nsLegendFrame as the
+   * scrolled frame (aka content insertion frame).
+   */
+  nsIFrame* GetLegend() const
+  {
+    if (mFrames.FirstChild() == GetInner()) {
+      MOZ_ASSERT(mFrames.LastChild() == mFrames.FirstChild());
+      return nullptr;
+    }
+    MOZ_ASSERT(mFrames.FirstChild() &&
+               mFrames.FirstChild()->GetContentInsertionFrame()->GetType() ==
+                 nsGkAtoms::legendFrame);
+    return mFrames.FirstChild();
+  }
+
   nsRect    mLegendRect;
   nscoord   mLegendSpace;
 };
@@ -126,8 +157,6 @@ NS_IMPL_FRAMEARENA_HELPERS(nsFieldSetFrame)
 nsFieldSetFrame::nsFieldSetFrame(nsStyleContext* aContext)
   : nsContainerFrame(aContext)
 {
-  mContentFrame = nullptr;
-  mLegendFrame  = nullptr;
   mLegendSpace  = 0;
 }
 
@@ -137,23 +166,16 @@ nsFieldSetFrame::GetType() const
   return nsGkAtoms::fieldSetFrame;
 }
 
+#ifdef DEBUG
 NS_IMETHODIMP
 nsFieldSetFrame::SetInitialChildList(ChildListID    aListID,
                                      nsFrameList&   aChildList)
 {
-  // Get the content and legend frames.
-  if (!aChildList.OnlyChild()) {
-    NS_ASSERTION(aChildList.GetLength() == 2, "Unexpected child list");
-    mContentFrame = aChildList.LastChild();
-    mLegendFrame  = aChildList.FirstChild();
-  } else {
-    mContentFrame = aChildList.FirstChild();
-    mLegendFrame  = nullptr;
-  }
-
-  // Queue up the frames for the content frame
-  return nsContainerFrame::SetInitialChildList(kPrincipalList, aChildList);
+  nsresult rv = nsContainerFrame::SetInitialChildList(kPrincipalList, aChildList);
+  MOZ_ASSERT(GetInner());
+  return rv;
 }
+#endif
 
 class nsDisplayFieldSetBorderBackground : public nsDisplayItem {
 public:
@@ -223,26 +245,25 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   }
 
   nsDisplayListCollection contentDisplayItems;
-  if (mContentFrame) {
-    // Collect mContentFrame's display items into their own collection. We need
-    // to be calling BuildDisplayList on mContentFrame before mLegendFrame in
-    // case it contains out-of-flow frames whose placeholders are under
-    // mLegendFrame. However, we want mContentFrame's display items to be
-    // after mLegendFrame's display items in z-order, so we need to save them
+  if (nsIFrame* inner = GetInner()) {
+    // Collect the inner frame's display items into their own collection.
+    // We need to be calling BuildDisplayList on it before the legend in
+    // case it contains out-of-flow frames whose placeholders are in the
+    // legend. However, we want the inner frame's display items to be
+    // after the legend's display items in z-order, so we need to save them
     // and append them later.
-    BuildDisplayListForChild(aBuilder, mContentFrame, aDirtyRect,
-                             contentDisplayItems);
+    BuildDisplayListForChild(aBuilder, inner, aDirtyRect, contentDisplayItems);
   }
-  if (mLegendFrame) {
+  if (nsIFrame* legend = GetLegend()) {
     // The legend's background goes on our BlockBorderBackgrounds list because
     // it's a block child.
     nsDisplayListSet set(aLists, aLists.BlockBorderBackgrounds());
-    BuildDisplayListForChild(aBuilder, mLegendFrame, aDirtyRect, set);
+    BuildDisplayListForChild(aBuilder, legend, aDirtyRect, set);
   }
-  // Put mContentFrame's display items on the master list. Note that
-  // this moves mContentFrame's border/background display items to our
-  // BorderBackground() list, which isn't really correct, but it's OK because
-  // mContentFrame is anonymous and can't have its own border and background.
+  // Put the inner frame's display items on the master list. Note that this
+  // moves its border/background display items to our BorderBackground() list,
+  // which isn't really correct, but it's OK because the inner frame is
+  // anonymous and can't have its own border and background.
   contentDisplayItems.MoveTo(aLists);
 }
 
@@ -265,12 +286,12 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
   nsCSSRendering::PaintBoxShadowInner(presContext, aRenderingContext,
                                       this, rect, aDirtyRect);
 
-   if (mLegendFrame) {
+   if (nsIFrame* legend = GetLegend()) {
      nscoord topBorder = StyleBorder()->GetComputedBorderWidth(NS_SIDE_TOP);
 
     // Use the rect of the legend frame, not mLegendRect, so we draw our
     // border under the legend's left and right margins.
-    nsRect legendRect = mLegendFrame->GetRect() + aPt;
+    nsRect legendRect = legend->GetRect() + aPt;
     
     // we should probably use PaintBorderEdges to do this but for now just use clipping
     // to achieve the same effect.
@@ -328,16 +349,14 @@ nsFieldSetFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
 {
   nscoord legendWidth = 0;
   nscoord contentWidth = 0;
-  if (mLegendFrame) {
+  if (nsIFrame* legend = GetLegend()) {
     legendWidth =
-      nsLayoutUtils::IntrinsicForContainer(aRenderingContext, mLegendFrame,
-                                           aType);
+      nsLayoutUtils::IntrinsicForContainer(aRenderingContext, legend, aType);
   }
 
-  if (mContentFrame) {
+  if (nsIFrame* inner = GetInner()) {
     contentWidth =
-      nsLayoutUtils::IntrinsicForContainer(aRenderingContext, mContentFrame,
-                                           aType);
+      nsLayoutUtils::IntrinsicForContainer(aRenderingContext, inner, aType);
   }
       
   return std::max(legendWidth, contentWidth);
@@ -410,29 +429,30 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
   }
 
   //------------ Handle Incremental Reflow -----------------
-  bool reflowContent;
+  bool reflowInner;
   bool reflowLegend;
-
+  nsIFrame* legend = GetLegend();
+  nsIFrame* inner = GetInner();
   if (aReflowState.ShouldReflowAllKids()) {
-    reflowContent = mContentFrame != nullptr;
-    reflowLegend = mLegendFrame != nullptr;
+    reflowInner = inner != nullptr;
+    reflowLegend = legend != nullptr;
   } else {
-    reflowContent = mContentFrame && NS_SUBTREE_DIRTY(mContentFrame);
-    reflowLegend = mLegendFrame && NS_SUBTREE_DIRTY(mLegendFrame);
+    reflowInner = inner && NS_SUBTREE_DIRTY(inner);
+    reflowLegend = legend && NS_SUBTREE_DIRTY(legend);
   }
 
   // We don't allow fieldsets to break vertically. If we did, we'd
   // need logic here to push and pull overflow frames.
   nsSize availSize(aReflowState.ComputedWidth(), NS_UNCONSTRAINEDSIZE);
-  NS_ASSERTION(!mContentFrame ||
+  NS_ASSERTION(!inner ||
       nsLayoutUtils::IntrinsicForContainer(aReflowState.rendContext,
-                                           mContentFrame,
+                                           inner,
                                            nsLayoutUtils::MIN_WIDTH) <=
                availSize.width,
                "Bogus availSize.width; should be bigger");
-  NS_ASSERTION(!mLegendFrame ||
+  NS_ASSERTION(!legend ||
       nsLayoutUtils::IntrinsicForContainer(aReflowState.rendContext,
-                                           mLegendFrame,
+                                           legend,
                                            nsLayoutUtils::MIN_WIDTH) <=
                availSize.width,
                "Bogus availSize.width; should be bigger");
@@ -447,17 +467,17 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
   // reflow the legend only if needed
   if (reflowLegend) {
     nsHTMLReflowState legendReflowState(aPresContext, aReflowState,
-                                        mLegendFrame, availSize);
+                                        legend, availSize);
 
     nsHTMLReflowMetrics legendDesiredSize;
 
-    ReflowChild(mLegendFrame, aPresContext, legendDesiredSize, legendReflowState,
+    ReflowChild(legend, aPresContext, legendDesiredSize, legendReflowState,
                 0, 0, NS_FRAME_NO_MOVE_FRAME, aStatus);
 #ifdef NOISY_REFLOW
     printf("  returned (%d, %d)\n", legendDesiredSize.width, legendDesiredSize.height);
 #endif
     // figure out the legend's rectangle
-    legendMargin = mLegendFrame->GetUsedMargin();
+    legendMargin = legend->GetUsedMargin();
     mLegendRect.width  = legendDesiredSize.width + legendMargin.left + legendMargin.right;
     mLegendRect.height = legendDesiredSize.height + legendMargin.top + legendMargin.bottom;
     mLegendRect.x = borderPadding.left;
@@ -474,24 +494,24 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
 
     // if the legend space changes then we need to reflow the 
     // content area as well.
-    if (mLegendSpace != oldSpace && mContentFrame) {
-      reflowContent = true;
+    if (mLegendSpace != oldSpace && inner) {
+      reflowInner = true;
     }
 
-    FinishReflowChild(mLegendFrame, aPresContext, &legendReflowState, 
+    FinishReflowChild(legend, aPresContext, &legendReflowState, 
                       legendDesiredSize, 0, 0, NS_FRAME_NO_MOVE_FRAME);    
-  } else if (!mLegendFrame) {
+  } else if (!legend) {
     mLegendRect.SetEmpty();
     mLegendSpace = 0;
   } else {
     // mLegendSpace and mLegendRect haven't changed, but we need
     // the used margin when placing the legend.
-    legendMargin = mLegendFrame->GetUsedMargin();
+    legendMargin = legend->GetUsedMargin();
   }
 
   // reflow the content frame only if needed
-  if (reflowContent) {
-    nsHTMLReflowState kidReflowState(aPresContext, aReflowState, mContentFrame,
+  if (reflowInner) {
+    nsHTMLReflowState kidReflowState(aPresContext, aReflowState, inner,
                                      availSize);
     // Our child is "height:100%" but we actually want its height to be reduced
     // by the amount of content-height the legend is eating up, unless our
@@ -513,19 +533,19 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
     NS_ASSERTION(kidReflowState.mComputedMargin == nsMargin(0,0,0,0),
                  "Margins on anonymous fieldset child not supported!");
     nsPoint pt(borderPadding.left, borderPadding.top + mLegendSpace);
-    ReflowChild(mContentFrame, aPresContext, kidDesiredSize, kidReflowState,
+    ReflowChild(inner, aPresContext, kidDesiredSize, kidReflowState,
                 pt.x, pt.y, 0, aStatus);
 
-    FinishReflowChild(mContentFrame, aPresContext, &kidReflowState, 
+    FinishReflowChild(inner, aPresContext, &kidReflowState, 
                       kidDesiredSize, pt.x, pt.y, 0);
     NS_FRAME_TRACE_REFLOW_OUT("FieldSet::Reflow", aStatus);
   }
 
   nsRect contentRect(0,0,0,0);
-  if (mContentFrame) {
-    // We don't support margins on mContentFrame, so our "content rect" is just
+  if (inner) {
+    // We don't support margins on inner, so our "content rect" is just
     // its rect.
-    contentRect = mContentFrame->GetRect();
+    contentRect = inner->GetRect();
   }
 
   // use the computed width if the inner content does not fill it
@@ -533,11 +553,11 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
     contentRect.width = aReflowState.ComputedWidth();
   }
 
-  if (mLegendFrame) {
+  if (legend) {
     // if the content rect is larger then the  legend we can align the legend
     if (contentRect.width > mLegendRect.width) {
       int32_t align = static_cast<nsLegendFrame*>
-        (mLegendFrame->GetContentInsertionFrame())->GetAlign();
+        (legend->GetContentInsertionFrame())->GetAlign();
 
       switch(align) {
         case NS_STYLE_TEXT_ALIGN_RIGHT:
@@ -557,16 +577,16 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
     nsRect actualLegendRect(mLegendRect);
     actualLegendRect.Deflate(legendMargin);
 
-    nsPoint curOrigin = mLegendFrame->GetPosition();
+    nsPoint curOrigin = legend->GetPosition();
 
     // only if the origin changed
     if ((curOrigin.x != mLegendRect.x) || (curOrigin.y != mLegendRect.y)) {
-      mLegendFrame->SetPosition(nsPoint(actualLegendRect.x , actualLegendRect.y));
-      nsContainerFrame::PositionFrameView(mLegendFrame);
+      legend->SetPosition(nsPoint(actualLegendRect.x , actualLegendRect.y));
+      nsContainerFrame::PositionFrameView(legend);
 
       // We need to recursively process the legend frame's
       // children since we're moving the frame after Reflow.
-      nsContainerFrame::PositionChildViews(mLegendFrame);
+      nsContainerFrame::PositionChildViews(legend);
     }
   }
 
@@ -584,10 +604,10 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
   }
   aDesiredSize.width = contentRect.width + borderPadding.LeftRight();
   aDesiredSize.SetOverflowAreasToDesiredBounds();
-  if (mLegendFrame)
-    ConsiderChildOverflow(aDesiredSize.mOverflowAreas, mLegendFrame);
-  if (mContentFrame)
-    ConsiderChildOverflow(aDesiredSize.mOverflowAreas, mContentFrame);
+  if (legend)
+    ConsiderChildOverflow(aDesiredSize.mOverflowAreas, legend);
+  if (inner)
+    ConsiderChildOverflow(aDesiredSize.mOverflowAreas, inner);
 
   // Merge overflow container bounds and status.
   aDesiredSize.mOverflowAreas.UnionWith(ocBounds);
@@ -607,7 +627,7 @@ nsFieldSetFrame::AppendFrames(ChildListID    aListID,
 {
   // aFrameList is not allowed to contain "the legend" for this fieldset
   ReparentFrameList(aFrameList);
-  return mContentFrame->AppendFrames(aListID, aFrameList);
+  return GetInner()->AppendFrames(aListID, aFrameList);
 }
 
 NS_IMETHODIMP
@@ -616,15 +636,15 @@ nsFieldSetFrame::InsertFrames(ChildListID    aListID,
                               nsFrameList&   aFrameList)
 {
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this ||
-               aPrevFrame->GetParent() == mContentFrame,
+               aPrevFrame->GetParent() == GetInner(),
                "inserting after sibling frame with different parent");
 
   // aFrameList is not allowed to contain "the legend" for this fieldset
   ReparentFrameList(aFrameList);
-  if (MOZ_UNLIKELY(aPrevFrame == mLegendFrame)) {
+  if (MOZ_UNLIKELY(aPrevFrame == GetLegend())) {
     aPrevFrame = nullptr;
   }
-  return mContentFrame->InsertFrames(aListID, aPrevFrame, aFrameList);
+  return GetInner()->InsertFrames(aListID, aPrevFrame, aFrameList);
 }
 
 NS_IMETHODIMP
@@ -632,8 +652,8 @@ nsFieldSetFrame::RemoveFrame(ChildListID    aListID,
                              nsIFrame*      aOldFrame)
 {
   // For reference, see bug 70648, bug 276104 and bug 236071.
-  NS_ASSERTION(aOldFrame != mLegendFrame, "Cannot remove mLegendFrame here");
-  return mContentFrame->RemoveFrame(aListID, aOldFrame);
+  NS_ASSERTION(aOldFrame != GetLegend(), "Cannot remove legend here");
+  return GetInner()->RemoveFrame(aListID, aOldFrame);
 }
 
 #ifdef ACCESSIBILITY
@@ -648,10 +668,11 @@ void
 nsFieldSetFrame::ReparentFrameList(const nsFrameList& aFrameList)
 {
   nsFrameManager* frameManager = PresContext()->FrameManager();
+  nsIFrame* inner = GetInner();
   for (nsFrameList::Enumerator e(aFrameList); !e.AtEnd(); e.Next()) {
-    NS_ASSERTION(mLegendFrame || e.get()->GetType() != nsGkAtoms::legendFrame,
+    NS_ASSERTION(GetLegend() || e.get()->GetType() != nsGkAtoms::legendFrame,
                  "The fieldset's legend is not allowed in this list");
-    e.get()->SetParent(mContentFrame);
+    e.get()->SetParent(inner);
     frameManager->ReparentStyleContext(e.get());
   }
 }
@@ -659,9 +680,9 @@ nsFieldSetFrame::ReparentFrameList(const nsFrameList& aFrameList)
 nscoord
 nsFieldSetFrame::GetBaseline() const
 {
-  // We know mContentFrame is a block, so calling GetBaseline() on it will do
+  // We know inner is a block, so calling GetBaseline() on it will do
   // the right thing (that being to return the baseline of the last line).
-  NS_ASSERTION(nsLayoutUtils::GetAsBlock(mContentFrame),
-               "Unexpected mContentFrame");
-  return mContentFrame->GetPosition().y + mContentFrame->GetBaseline();
+  nsIFrame* inner = GetInner();
+  NS_ASSERTION(nsLayoutUtils::GetAsBlock(inner), "Unexpected inner");
+  return inner->GetPosition().y + inner->GetBaseline();
 }

From 6bda3b5219b74d05117a23784a4f6e40e08dd498 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Wed, 17 Apr 2013 22:16:15 +0200
Subject: [PATCH 203/438] Bug 762332 - Make the "EnsureTextRun should have set
 font size inflation" assertion non-fatal for now so it doesn't block fuzzing.
  r=sjohnson

---
 layout/generic/crashtests/crashtests.list            | 1 +
 layout/generic/crashtests/font-inflation-762332.html | 2 ++
 layout/generic/nsTextFrameThebes.cpp                 | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 layout/generic/crashtests/font-inflation-762332.html

diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index 642a81656bbe..ed4908107a5b 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -433,6 +433,7 @@ load 734777.html
 test-pref(layout.css.flexbox.enabled,true) load 737313-1.html
 test-pref(layout.css.flexbox.enabled,true) load 737313-2.html
 test-pref(layout.css.flexbox.enabled,true) load 737313-3.html
+test-pref(font.size.inflation.emPerLine,15) asserts(1-100) load font-inflation-762332.html # bug 762332
 load 762902.html
 load 762764-1.html
 load 786740-1.html
diff --git a/layout/generic/crashtests/font-inflation-762332.html b/layout/generic/crashtests/font-inflation-762332.html
new file mode 100644
index 000000000000..e733a56d1f34
--- /dev/null
+++ b/layout/generic/crashtests/font-inflation-762332.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div style="-moz-column-width: 1px; font-family: monospace; width: 2ch;"><div style="position: relative;"><div style="position: absolute;">xxxxxxxxxxxxxx x xxxxxxx x xxxxxxxxxxxxxxxxxx x xxxxxxx x</div></div></div>
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index e6d1d04ba27a..cf7b8702d128 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -7659,8 +7659,8 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
     EnsureTextRun(nsTextFrame::eInflated, ctx,
                   lineContainer, aLineLayout.GetLine(), &flowEndInTextRun);
 
-  NS_ABORT_IF_FALSE(IsCurrentFontInflation(fontSizeInflation),
-                    "EnsureTextRun should have set font size inflation");
+  NS_ASSERTION(IsCurrentFontInflation(fontSizeInflation),
+               "EnsureTextRun should have set font size inflation");
 
   if (mTextRun && iter.GetOriginalEnd() < offset + length) {
     // The textrun does not map enough text for this frame. This can happen

From 590c7a70a03373b0006b88cca7313a8209e9e4a6 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Wed, 17 Apr 2013 13:18:06 -0700
Subject: [PATCH 204/438] Bug 862988 - Uplift Addon SDK to Firefox

---
 .../doc/module-source/sdk/lang/functional.md  | 292 ++++++++++++++++++
 .../source/doc/module-source/sdk/panel.md     |  84 ++++-
 .../doc/module-source/sdk/platform/xpcom.md   |   2 +-
 .../doc/module-source/sdk/window/utils.md     |  16 +
 addon-sdk/source/lib/sdk/content/worker.js    |   5 +-
 addon-sdk/source/lib/sdk/core/promise.js      |  20 +-
 .../source/lib/sdk/deprecated/api-utils.js    |  20 +-
 addon-sdk/source/lib/sdk/lang/type.js         |  15 +
 addon-sdk/source/lib/sdk/panel.js             |  51 ++-
 addon-sdk/source/lib/sdk/panel/utils.js       |  95 ++++--
 addon-sdk/source/lib/sdk/view/core.js         |   3 +
 addon-sdk/source/lib/sdk/widget.js            |   2 +-
 addon-sdk/source/lib/sdk/window/helpers.js    |  19 +-
 addon-sdk/source/lib/sdk/window/utils.js      |  19 ++
 .../test-global-private-browsing.js           |   2 +-
 .../source/test/private-browsing/helper.js    |  19 +-
 .../source/test/tabs/test-firefox-tabs.js     |  64 ++--
 addon-sdk/source/test/test-panel.js           |  13 +-
 ...st-window-utils-global-private-browsing.js |   2 +-
 addon-sdk/source/test/test-window-utils2.js   |  17 +-
 addon-sdk/source/test/test-windows-common.js  |   2 +-
 .../test/windows/test-firefox-windows.js      |   2 -
 22 files changed, 651 insertions(+), 113 deletions(-)
 create mode 100644 addon-sdk/source/doc/module-source/sdk/lang/functional.md

diff --git a/addon-sdk/source/doc/module-source/sdk/lang/functional.md b/addon-sdk/source/doc/module-source/sdk/lang/functional.md
new file mode 100644
index 000000000000..9b63948aab44
--- /dev/null
+++ b/addon-sdk/source/doc/module-source/sdk/lang/functional.md
@@ -0,0 +1,292 @@
+<!-- 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/. -->
+
+The `lang/functional` module provides functional helper methods. A lot of these
+functions implement APIs from Jeremy Ashkenas's [underscore.js](http://underscorejs.org)
+and all credits go to him and his contributors.
+
+<api name="method">
+@function
+Takes a function and returns a method associated with an object.
+When the method is invoked on an instance of the object, the original
+function is called. It is passed the object instance (i.e. `this`) as
+the first parameter, followed by any parameters passed into the method.
+
+    let { method } = require("sdk/lang/functional");
+    let myNumber = {
+      times: method(times),
+      add: method(add),
+      number: 0
+    };
+
+    function times (target, x) { return target.number *= x; }
+    function add (target, x) { return target.number += x; }
+
+    console.log(myNumber.number); // 0
+    myNumber.add(10);      // 10
+    myNumber.times(2);     // 20
+    myNumber.add(3);       // 23
+
+@param lambda {function}
+  The function to be wrapped and returned.
+
+@returns {function}
+  The wrapped `lambda`.
+</api>
+
+<api name="defer">
+@function
+Takes a function and returns a wrapped version of the function. Calling the
+wrapped version will call the original function during the next event loop.
+This is similar to calling [setTimeout](modules/sdk/timers.html#setTimeout(callback%2C ms)) with no
+wait (i.e. `setTimeout(function () { ... }, 0)`), except that the wrapped function
+may be reused and does not need to be repeated each time. This also enables you
+to use these functions as event listeners.
+
+    let { defer } = require("sdk/lang/functional");
+    let fn = defer(function myEvent (event, value) {
+      console.log(event + " : " + value);
+    });
+
+    fn("click", "#home");
+    console.log("done");
+
+    // This will print 'done' before 'click : #home' since
+    // we deferred the execution of the wrapped `myEvent`
+    // function, making it non-blocking and executing on the
+    // next event loop
+
+@param fn {function}
+  The function to be deferred.
+
+@returns {function}
+  The new, deferred function.
+</api>
+
+<api name="remit">
+@function
+An alias for [defer](modules/sdk/lang/functional.html#defer(fn)).
+</api>
+
+<api name="invoke">
+@function
+Invokes `callee`, passing `params` as an argument and `self` as `this`.
+Returns the value that is returned by `callee`.
+
+    let { invoke } = require("sdk/lang/functional");
+
+    invoke(sum, [1,2,3,4,5], null); // 15
+
+    function sum () {
+      return Array.slice(arguments).reduce(function (a, b) {
+        return a + b;
+      });
+    }
+
+@param callee {function}
+  Function to invoke.
+@param params {Array}
+  Parameters to be passed into `callee`.
+@param self {mixed}
+  Object to be passed as the `this` context to `callee`.
+@returns {mixed}
+  Returns the return value of `callee`.
+</api>
+
+<api name="curry">
+@function
+[Curries](http://en.wikipedia.org/wiki/Currying) the given function with the arguments given.
+
+    let { curry } = require("sdk/lang/functional");
+    let add = function add (x, y) { return x + y; }
+    let addOne = curry(add, 1);
+
+    addOne(5); // 6
+    addOne(10); // 11
+    curry(add, addOne(20))(2); // 23
+
+@param fn {function}
+  Function to be curried.
+
+@param arguments... {mixed}
+  Additional arguments
+
+@returns {function}
+  The curried function.
+</api>
+
+<api name="compose">
+@function
+Returns the [composition](http://en.wikipedia.org/wiki/Function_composition_(computer_science)) of a list of functions, where each function consumes the
+return value of the function that follows. In math terms, composing the functions
+`f()`, `g()`, and `h()` produces `f(g(h()))`.
+
+    let { compose } = require("sdk/lang/functional");
+
+    let welcome = compose(exclaim, greet);
+
+    welcome('moe'); // "hi: moe!";
+
+    function greet (name) { return "hi: " + name; }
+    function exclaim (statement) { return statement + "!"; }
+
+@param fn... {function}
+  Takes a variable number of functions as arguments and composes them from right to left.
+
+@returns {function}
+  The composed function.
+</api>
+
+<api name="wrap">
+@function
+Returns the first function passed as an argument to the second,
+allowing you to adjust arguments, run code before and after, and
+conditionally execute the original function.
+
+    let { wrap } = require("sdk/lang/functional");
+
+    let wrappedHello = wrap(hello, function (fn, name) {
+      return "before, " + fn(name) + "after";
+    });
+
+    wrappedHello("moe"); // "before, hello: moe, after"
+
+    function hello (name) { return "hello: " + name; }
+
+@param fn {function}
+  The function to be passed into the `wrapper` function.
+
+@param wrapper {function}
+  The function that is called when the return function is executed,
+  taking the wrapped `fn` as the first parameter.
+
+@returns {function}
+  A function which, when called, executes `wrapper` with `fn` as the first parameter,
+  and passes in any additional parameters to the `wrapper` function.
+</api>
+
+<api name="identity">
+@function
+Returns the same value that is used as the argument. In math: f(x) = x.
+
+    let { identity } = require("sdk/lang/functional");
+    let x = 5;
+    identity(x); // 5
+
+@param value {mixed}
+  The value to be returned.
+
+@returns {mixed}
+  The value that was originally passed in.
+</api>
+
+<api name="memoize">
+@function
+[Memoizes](http://en.wikipedia.org/wiki/Memoization) a given function by caching
+the computed result. Useful for speeding up slow-running computations. If
+passed an optional `hashFunction`, it will be used to compute the hash key for
+storing the result, based on the arguments to the original function. The
+default `hashFunction` just uses the first argument to the memoized function as
+the key.
+
+    let { memoize } = require("sdk/lang/functional");
+
+    let memoizedFn = memoize(primeFactorization);
+
+    memoizedFn(50); // Returns [2, 5, 5], had to compute
+    memoizedFn(100); // Returns [2, 2, 5, 5], had to compute
+    memoizedFn(50); // Returns [2, 5, 5] again, but pulled from cache
+
+    function primeFactorization (x) {
+      // Some tricky stuff
+    }
+
+    // We can also use a hash function to compute a different
+    // hash value. In this example, we'll fabricate a function
+    // that takes a string of first and last names that
+    // somehow computes the lineage of that name. Our hash
+    // function will just parse the last name, as our naive
+    // implementation assumes that they will share the same lineage
+
+    let getLineage = memoize(function (name) {
+      // computes lineage
+      return data;
+    }, hasher);
+
+    // Hashing function takes a string of first and last name
+    // and returns the last name.
+    function hasher (input) {
+      return input.split(" ")[1];
+    }
+
+    getLineage("homer simpson"); // Computes and returns information for "simpson"
+    getLineage("lisa simpson"); // Returns cached for "simpson"
+
+@param fn {function}
+  The function that becomes memoized.
+
+@param hasher {function}
+  An optional function that takes the memoized function's parameter and returns
+  a hash key for storing the result.
+
+@returns {function}
+  The memoized version of `fn`.
+</api>
+
+<api name="delay">
+@function
+Much like `setTimeout`, `delay` invokes a function after waiting a set number of
+milliseconds. If you pass additional, optional, arguments, they will be forwarded
+on to the function when it is invoked.
+
+    let { delay } = require("sdk/lang/functional");
+
+    delay(printAdd, 2000, 5, 10);
+
+    // Prints "5+10=15" in two seconds (2000ms)
+    function printAdd (a, b) { console.log(a + "+" + b + "=" + (a+b)); }
+
+@param fn {function}
+  A function to be delayed.
+
+@param ms {number}
+  Number of milliseconds to delay the execution of `fn`.
+
+@param arguments {mixed}
+  Additional arguments to pass to `fn` upon execution
+</api>
+
+<api name="once">
+@function
+Creates a version of the input function that can only be called one time.
+Repeated calls to the modified function will have no effect, returning
+the value from the original call. Useful for initialization functions, instead
+of having to set a boolean flag and checking it later.
+
+    let { once } = require("sdk/lang/functional");
+    let setup = once(function (env) {
+      // initializing important things
+      console.log("successfully initialized " + env);
+      return 1; // Assume success and return 1
+    });
+
+    setup('dev'); // returns 1
+    // prints "successfully initialized dev"
+    
+    // Future attempts to call this function just return the cached
+    // value that was returned previously
+    setup('production'); // Returns 1
+    // No print message is displayed since the function isn't executed
+
+@param fn {function}
+  The function that will be executed only once inside the once wrapper.
+
+@returns {function}
+  The wrapped `fn` that can only be executed once.
+</api>
+
+<api name="cache">
+@function
+An alias for [once](modules/sdk/lang/functional.html#once(fn)).
+</api>
diff --git a/addon-sdk/source/doc/module-source/sdk/panel.md b/addon-sdk/source/doc/module-source/sdk/panel.md
index c4fecb2f82f7..ed410703eb02 100644
--- a/addon-sdk/source/doc/module-source/sdk/panel.md
+++ b/addon-sdk/source/doc/module-source/sdk/panel.md
@@ -421,7 +421,73 @@ Creates a panel.
     The width of the panel in pixels. Optional.
   @prop [height] {number}
     The height of the panel in pixels. Optional.
-  @prop [focus] {boolean}
+  @prop [position] {object}
+    The position of the panel.
+    Ignored if the panel is opened by a widget.
+
+    You can set as value an object that has one or more of the following
+    properites: `top`, `right`, `bottom` and `left`. Their values are expressed
+    in pixels. Any other properties will be ignored.
+
+    The default alignment is centered, so for example panel can be displayed in
+    the center of the bottom corner by leaving off vertical axis:
+
+        // Show the panel to the centered horizontally and aligned to the bottom
+        // of the content area
+        require("sdk/panel").Panel({
+          position: {
+           bottom: 0
+          }
+        }).show();
+
+        // Show the panel to the centered vertically and aligned to the left o
+        // the content area
+        require("sdk/panel").Panel({
+          position: {
+            left: 0
+          }
+        }).show();
+
+        // Centered panel, default behavior
+        require("sdk/panel").Panel({}).show();
+
+    In the same way of their CSS counterpart, setting both `top` and `bottom`,
+    or `left` and `right`, will results in calculated the `height` and `width`:
+
+        // Show the panel centered horizontally, that is distant 40px
+        // from the top and 100px from the bottom.
+        require("sdk/panel").Panel({
+          position: {
+            top: 40,
+            bottom: 100
+          }
+        }).show();
+
+    Set implicitly `height` in this example, will makes the panel ignore the
+    `bottom` property, as the CSS homonym properties does:
+
+        // Show the panel centered horizontally, that is distant 40px from the top
+        // and has 400px as height
+        require("sdk/panel").Panel({
+          position: {
+            top: 40,
+            bottom: 100,
+          },
+          height: 400
+        }).show();
+
+        // This is equivalent to:
+
+        require("panel").Panel({
+          position {
+            top: 40
+          },
+          height: 400
+        }).show();
+
+    The same principle is applied for `width`, `left` and `right`.
+
+  @prop [focus=true] {boolean}
     Set to `false` to prevent taking the focus away when the panel is shown.
     Only turn this off if necessary, to prevent accessibility issue.
     Optional, default to `true`.
@@ -575,6 +641,22 @@ The message to send.  Must be stringifiable to JSON.
 <api name="show">
 @method
 Displays the panel.
+
+If the `options` argument is given, it will be shallow merged with the options
+provided in the constructor: the `options` passed in the `show` method takes
+the precedence.
+It's useful for temporary changes, without touching the default values.
+
+@param options {object}
+  Showing options for the panel, with the following keys:
+  @prop [width] {number}
+    The width of the panel in pixels. Optional.
+  @prop [height] {number}
+    The height of the panel in pixels. Optional.
+  @prop [position] {object}
+    The position of the panel. Optional. See [Panel's options](./modules/sdk/panel.html#Panel%28options%29) for further details.
+  @prop [focus=true] {boolean}
+    Set to `false` to prevent taking the focus away when the panel is shown.
 </api>
 
 <api name="hide">
diff --git a/addon-sdk/source/doc/module-source/sdk/platform/xpcom.md b/addon-sdk/source/doc/module-source/sdk/platform/xpcom.md
index 96797cb11287..fa0a414e2f7e 100644
--- a/addon-sdk/source/doc/module-source/sdk/platform/xpcom.md
+++ b/addon-sdk/source/doc/module-source/sdk/platform/xpcom.md
@@ -48,7 +48,7 @@ interface to listen for and log all topic notifications:
         observerService.addObserver(this, this.topic, false);
       },
       unregister: function() {
-        addObserver.removeObserver(this, this.topic);
+        observerService.removeObserver(this, this.topic);
       },
       observe: function observe(subject, topic, data) {
         console.log('star observer:', subject, topic, data);
diff --git a/addon-sdk/source/doc/module-source/sdk/window/utils.md b/addon-sdk/source/doc/module-source/sdk/window/utils.md
index d0def80b23ff..22135da28b5e 100644
--- a/addon-sdk/source/doc/module-source/sdk/window/utils.md
+++ b/addon-sdk/source/doc/module-source/sdk/window/utils.md
@@ -79,6 +79,22 @@ to support private browsing, refer to the
   @returns {nsIBaseWindow}
 </api>
 
+<api name="getToplevelWindow">
+  @function
+  Returns the toplevel
+  [`nsIDOMWindow`](https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIDOMWindow)
+  for the given child [`nsIDOMWindow`](https://developer.mozilla.org/en/nsIDOMWindow):
+
+      var { Ci } = require('chrome');
+      var utils = require('sdk/window/utils');
+      var browserWindow = utils.getMostRecentBrowserWindow();
+      var window = browserWindow.content; // `window` object for the current webpage
+      utils.getToplevelWindw(window) == browserWindow // => true
+
+  @param window {nsIDOMWindow}
+  @returns {nsIDOMWindow}
+</api>
+
 <api name="getWindowDocShell">
   @function
   Returns the
diff --git a/addon-sdk/source/lib/sdk/content/worker.js b/addon-sdk/source/lib/sdk/content/worker.js
index ef1cd4fe955d..51d79fbc9055 100644
--- a/addon-sdk/source/lib/sdk/content/worker.js
+++ b/addon-sdk/source/lib/sdk/content/worker.js
@@ -130,7 +130,7 @@ const WorkerSandbox = EventEmitter.compose({
 
     // Instantiate trusted code in another Sandbox in order to prevent content
     // script from messing with standard classes used by proxy and API code.
-    let apiSandbox = sandbox(window, { wantXrays: true });
+    let apiSandbox = sandbox(window, { wantXrays: true, sameZoneAs: window });
     apiSandbox.console = console;
 
     // Build content proxies only if the document has a non-system principal
@@ -148,7 +148,8 @@ const WorkerSandbox = EventEmitter.compose({
     // have access to all standard globals (window, document, ...)
     let content = this._sandbox = sandbox(window, {
       sandboxPrototype: proto,
-      wantXrays: true
+      wantXrays: true,
+      sameZoneAs: window
     });
     // We have to ensure that window.top and window.parent are the exact same
     // object than window object, i.e. the sandbox global object. But not
diff --git a/addon-sdk/source/lib/sdk/core/promise.js b/addon-sdk/source/lib/sdk/core/promise.js
index 808127af015c..599b62654342 100644
--- a/addon-sdk/source/lib/sdk/core/promise.js
+++ b/addon-sdk/source/lib/sdk/core/promise.js
@@ -105,7 +105,7 @@ function defer(prototype) {
   // `null` promise is not resolved yet.
   var result = null;
 
-  prototype = (prototype || prototype === null) ? prototype : Object.prototype
+  prototype = (prototype || prototype === null) ? prototype : Object.prototype;
 
   // Create an object implementing promise API.
   var promise = Object.create(prototype, {
@@ -137,7 +137,7 @@ function defer(prototype) {
         }
         catch(error) {
           if (exports._reportErrors && typeof(console) === 'object')
-            console.error(error)
+            console.error(error);
           deferred.resolve(rejected(error));
         }
       }
@@ -244,8 +244,8 @@ var promised = (function() {
   // slower property accesses and unnecessary closure creations on each
   // call of this popular function.
 
-  var call = Function.call
-  var concat = Array.prototype.concat
+  var call = Function.call;
+  var concat = Array.prototype.concat;
 
   // Utility function that does following:
   // execute([ f, self, args...]) => f.apply(self, args)
@@ -256,9 +256,9 @@ var promised = (function() {
   function promisedConcat(promises, unknown) {
     return promises.then(function(values) {
       return resolve(unknown).then(function(value) {
-        return values.concat([ value ])
-      })
-    })
+        return values.concat([ value ]);
+      });
+    });
   }
 
   return function promised(f, prototype) {
@@ -280,10 +280,10 @@ var promised = (function() {
         // reduce it via `promisedConcat` to get promised array of fulfillments
         reduce(promisedConcat, resolve([], prototype)).
         // finally map that to promise of `f.apply(this, args...)`
-        then(execute)
-    }
+        then(execute);
+    };
   }
-})()
+})();
 exports.promised = promised;
 
 var all = promised(Array);
diff --git a/addon-sdk/source/lib/sdk/deprecated/api-utils.js b/addon-sdk/source/lib/sdk/deprecated/api-utils.js
index 521ad6ea5010..0b59dc56c6cb 100644
--- a/addon-sdk/source/lib/sdk/deprecated/api-utils.js
+++ b/addon-sdk/source/lib/sdk/deprecated/api-utils.js
@@ -96,6 +96,9 @@ exports.validateOptions = function validateOptions(options, requirements) {
         optsVal = req.map(optsVal);
       }
       catch (err) {
+        if (err instanceof RequirementError)
+          throw err;
+
         mapThrew = true;
       }
     }
@@ -108,12 +111,12 @@ exports.validateOptions = function validateOptions(options, requirements) {
         }
       });
       if (req.is.indexOf(getTypeOf(optsVal)) < 0)
-        throw requirementError(key, req);
+        throw new RequirementError(key, req);
     }
     if (req.ok && !req.ok(optsVal))
-      throw requirementError(key, req);
+      throw new RequirementError(key, req);
 
-    if (keyInOpts || (req.map && !mapThrew))
+    if (keyInOpts || (req.map && !mapThrew && optsVal !== undefined))
       validatedOptions[key] = optsVal;
   }
 
@@ -145,8 +148,11 @@ let getTypeOf = exports.getTypeOf = function getTypeOf(val) {
   return typ;
 }
 
-// Returns a new Error with a nice message.
-function requirementError(key, requirement) {
+function RequirementError(key, requirement) {
+  Error.call(this);
+
+  this.name = "RequirementError";
+
   let msg = requirement.msg;
   if (!msg) {
     msg = 'The option "' + key + '" ';
@@ -154,5 +160,7 @@ function requirementError(key, requirement) {
            "must be one of the following types: " + requirement.is.join(", ") :
            "is invalid.";
   }
-  return new Error(msg);
+
+  this.message = msg;
 }
+RequirementError.prototype = Object.create(Error.prototype);
diff --git a/addon-sdk/source/lib/sdk/lang/type.js b/addon-sdk/source/lib/sdk/lang/type.js
index a184edf9b75e..4f221ed099d8 100644
--- a/addon-sdk/source/lib/sdk/lang/type.js
+++ b/addon-sdk/source/lib/sdk/lang/type.js
@@ -31,6 +31,21 @@ function isNull(value) {
 }
 exports.isNull = isNull;
 
+/**
+ * Returns `true` if value is `null` or `undefined`.
+ * It's equivalent to `== null`, but resolve the ambiguity of the writer
+ * intention, makes clear that he's clearly checking both `null` and `undefined`
+ * values, and it's not a typo for `=== null`.
+ */
+function isNil(value) {
+  return value === null || value === undefined;
+}
+exports.isNil = isNil;
+
+function isBoolean(value) {
+  return typeof value === "boolean";
+}
+exports.isBoolean = isBoolean;
 /**
  * Returns `true` if value is a string.
  * @examples
diff --git a/addon-sdk/source/lib/sdk/panel.js b/addon-sdk/source/lib/sdk/panel.js
index 1eb3ebb71ba7..c60bbce95e2f 100644
--- a/addon-sdk/source/lib/sdk/panel.js
+++ b/addon-sdk/source/lib/sdk/panel.js
@@ -29,7 +29,8 @@ const domPanel = require("./panel/utils");
 const { events } = require("./panel/events");
 const systemEvents = require("./system/events");
 const { filter, pipe } = require("./event/utils");
-const { getNodeView } = require("./view/core");
+const { getNodeView, getActiveView } = require("./view/core");
+const { isNil, isObject } = require("./lang/type");
 
 if (isPrivateBrowsingSupported && isWindowPBSupported)
   throw Error('The panel module cannot be used with per-window private browsing at the moment, see Bug 816257');
@@ -65,11 +66,26 @@ function getAttachEventType(model) {
 let number = { is: ['number', 'undefined', 'null'] };
 let boolean = { is: ['boolean', 'undefined', 'null'] };
 
-let panelContract = contract(merge({
+let rectContract = contract({
+  top: number,
+  right: number,
+  bottom: number,
+  left: number
+});
+
+let rect = {
+  is: ['object', 'undefined', 'null'],
+  map: function(v) isNil(v) || !isObject(v) ? v : rectContract(v)
+}
+
+let displayContract = contract({
   width: number,
   height: number,
   focus: boolean,
-}, loaderContract.rules));
+  position: rect
+});
+
+let panelContract = contract(merge({}, displayContract.rules, loaderContract.rules));
 
 
 function isDisposed(panel) !views.has(panel);
@@ -80,12 +96,12 @@ let views = new WeakMap();
 let workers = new WeakMap();
 
 function viewFor(panel) views.get(panel)
-exports.viewFor = viewFor;
-
 function modelFor(panel) models.get(panel)
 function panelFor(view) panels.get(view)
 function workerFor(panel) workers.get(panel)
 
+getActiveView.define(Panel, viewFor);
+
 // Utility function takes `panel` instance and makes sure it will be
 // automatically hidden as soon as other panel is shown.
 let setupAutoHide = new function() {
@@ -124,9 +140,10 @@ const Panel = Class({
   extends: WorkerHost(workerFor),
   setup: function setup(options) {
     let model = merge({
-      width: 320,
-      height: 240,
+      defaultWidth: 320,
+      defaultHeight: 240,
       focus: true,
+      position: Object.freeze({}),
     }, panelContract(options));
     models.set(this, model);
 
@@ -172,6 +189,9 @@ const Panel = Class({
   /* Public API: Panel.focus */
   get focus() modelFor(this).focus,
 
+  /* Public API: Panel.position */
+  get position() modelFor(this).position,
+
   get contentURL() modelFor(this).contentURL,
   set contentURL(value) {
     let model = modelFor(this);
@@ -183,13 +203,22 @@ const Panel = Class({
   get isShowing() !isDisposed(this) && domPanel.isOpen(viewFor(this)),
 
   /* Public API: Panel.show */
-  show: function show(anchor) {
+  show: function show(options, anchor) {
     let model = modelFor(this);
     let view = viewFor(this);
     let anchorView = getNodeView(anchor);
 
+    options = merge({
+      position: model.position,
+      width: model.width,
+      height: model.height,
+      defaultWidth: model.defaultWidth,
+      defaultHeight: model.defaultHeight,
+      focus: model.focus
+    }, displayContract(options));
+
     if (!isDisposed(this))
-      domPanel.show(view, model.width, model.height, model.focus, anchorView);
+      domPanel.show(view, options, anchorView);
 
     return this;
   },
@@ -207,8 +236,8 @@ const Panel = Class({
     let model = modelFor(this);
     let view = viewFor(this);
     let change = panelContract({
-      width: width || model.width,
-      height: height || model.height
+      width: width || model.width || model.defaultWidth,
+      height: height || model.height || model.defaultHeight
     });
 
     model.width = change.width
diff --git a/addon-sdk/source/lib/sdk/panel/utils.js b/addon-sdk/source/lib/sdk/panel/utils.js
index 63029cce38d4..827559f21cfb 100644
--- a/addon-sdk/source/lib/sdk/panel/utils.js
+++ b/addon-sdk/source/lib/sdk/panel/utils.js
@@ -12,18 +12,67 @@ const { Cc, Ci } = require("chrome");
 const { setTimeout } = require("../timers");
 const { platform } = require("../system");
 const { getMostRecentBrowserWindow, getOwnerBrowserWindow,
-        getHiddenWindow } = require("../window/utils");
+        getHiddenWindow, getScreenPixelsPerCSSPixel } = require("../window/utils");
+
 const { create: createFrame, swapFrameLoaders } = require("../frame/utils");
 const { window: addonWindow } = require("../addon/window");
+const { isNil } = require("../lang/type");
 const events = require("../system/events");
 
 
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-function open(panel, width, height, anchor) {
+function calculateRegion({ position, width, height, defaultWidth, defaultHeight }, rect) {
+  let x, y;
+
+  let hasTop = !isNil(position.top);
+  let hasRight = !isNil(position.right);
+  let hasBottom = !isNil(position.bottom);
+  let hasLeft = !isNil(position.left);
+  let hasWidth = !isNil(width);
+  let hasHeight = !isNil(height);
+
+  // if width is not specified by constructor or show's options, then get
+  // the default width
+  if (!hasWidth)
+    width = defaultWidth;
+
+  // if height is not specified by constructor or show's options, then get
+  // the default height
+  if (!hasHeight)
+    height = defaultHeight;
+
+  // default position is centered
+  x = (rect.right - width) / 2;
+  y = (rect.top + rect.bottom - height) / 2;
+
+  if (hasTop) {
+    y = rect.top + position.top;
+
+    if (hasBottom && !hasHeight)
+      height = rect.bottom - position.bottom - y;
+  }
+  else if (hasBottom) {
+    y = rect.bottom - position.bottom - height;
+  }
+
+  if (hasLeft) {
+    x = position.left;
+
+    if (hasRight && !hasWidth)
+      width = rect.right - position.right - x;
+  }
+  else if (hasRight) {
+    x = rect.right - width - position.right;
+  }
+
+  return {x: x, y: y, width: width, height: height};
+}
+
+function open(panel, options, anchor) {
   // Wait for the XBL binding to be constructed
-  if (!panel.openPopup) setTimeout(open, 50, panel, width, height, anchor);
-  else display(panel, width, height, anchor);
+  if (!panel.openPopup) setTimeout(open, 50, panel, options, anchor);
+  else display(panel, options, anchor);
 }
 exports.open = open;
 
@@ -52,29 +101,37 @@ function resize(panel, width, height) {
 }
 exports.resize = resize
 
-function display(panel, width, height, anchor) {
+function display(panel, options, anchor) {
   let document = panel.ownerDocument;
-  let x = null;
-  let y = null;
-  let position = null;
+
+  let x, y;
+  let { width, height, defaultWidth, defaultHeight } = options;
+
+  let popupPosition = null;
 
   // Panel XBL has some SDK incompatible styling decisions. We shim panel
   // instances until proper fix for Bug 859504 is shipped.
   shimDefaultStyle(panel);
 
   if (!anchor) {
-    // Open the popup in the middle of the window.
-    x = document.documentElement.clientWidth / 2 - width / 2;
-    y = document.documentElement.clientHeight / 2 - height / 2;
-    position = null;
+    // The XUL Panel doesn't have an arrow, so the margin needs to be reset
+    // in order to, be positioned properly
+    panel.style.margin = "0";
+
+    let viewportRect = document.defaultView.gBrowser.getBoundingClientRect();
+
+    ({x, y, width, height}) = calculateRegion(options, viewportRect);
   }
   else {
+    width = width || defaultWidth;
+    height = height || defaultHeight;
+
     // Open the popup by the anchor.
     let rect = anchor.getBoundingClientRect();
 
     let window = anchor.ownerDocument.defaultView;
 
-    let zoom = window.mozScreenPixelsPerCSSPixel;
+    let zoom = getScreenPixelsPerCSSPixel(window);
     let screenX = rect.left + window.mozInnerScreenX * zoom;
     let screenY = rect.top + window.mozInnerScreenY * zoom;
 
@@ -92,7 +149,7 @@ function display(panel, width, height, anchor) {
       horizontal = "right";
 
     let verticalInverse = vertical == "top" ? "bottom" : "top";
-    position = vertical + "center " + verticalInverse + horizontal;
+    popupPosition = vertical + "center " + verticalInverse + horizontal;
 
     // Allow panel to flip itself if the panel can't be displayed at the
     // specified position (useful if we compute a bad position or if the
@@ -105,7 +162,7 @@ function display(panel, width, height, anchor) {
   panel.firstChild.style.width = width + "px";
   panel.firstChild.style.height = height + "px";
 
-  panel.openPopup(anchor, position, x, y);
+  panel.openPopup(anchor, popupPosition, x, y);
 }
 exports.display = display;
 
@@ -124,16 +181,16 @@ function shimDefaultStyle(panel) {
   });
 }
 
-function show(panel, width, height, focus, anchor) {
+function show(panel, options, anchor) {
   // Prevent the panel from getting focus when showing up
   // if focus is set to false
-  panel.setAttribute("noautofocus", !focus);
-
+  panel.setAttribute("noautofocus", !options.focus);
 
   let window = anchor && getOwnerBrowserWindow(anchor);
   let { document } = window ? window : getMostRecentBrowserWindow();
   attach(panel, document);
-  open(panel, width, height, anchor);
+
+  open(panel, options, anchor);
 }
 exports.show = show
 
diff --git a/addon-sdk/source/lib/sdk/view/core.js b/addon-sdk/source/lib/sdk/view/core.js
index f5cb109134aa..76738cba526c 100644
--- a/addon-sdk/source/lib/sdk/view/core.js
+++ b/addon-sdk/source/lib/sdk/view/core.js
@@ -24,3 +24,6 @@ getNodeView.define(function(value) {
 });
 
 exports.getNodeView = getNodeView;
+
+let getActiveView = method("getActiveView");
+exports.getActiveView = getActiveView;
diff --git a/addon-sdk/source/lib/sdk/widget.js b/addon-sdk/source/lib/sdk/widget.js
index e872f45ac756..1011dd0822f6 100644
--- a/addon-sdk/source/lib/sdk/widget.js
+++ b/addon-sdk/source/lib/sdk/widget.js
@@ -435,7 +435,7 @@ const WidgetViewTrait = LightTrait.compose(EventEmitterTrait, LightTrait({
       // This kind of ugly workaround, instead we should implement
       // `getNodeView` for the `Widget` class itself, but that's kind of
       // hard without cleaning things up.
-      this.panel.show(getNodeView.implement({}, function() domNode));
+      this.panel.show(null, getNodeView.implement({}, function() domNode));
   },
 
   _isInWindow: function WidgetView__isInWindow(window) {
diff --git a/addon-sdk/source/lib/sdk/window/helpers.js b/addon-sdk/source/lib/sdk/window/helpers.js
index ae95efd4927f..43a11b14b406 100644
--- a/addon-sdk/source/lib/sdk/window/helpers.js
+++ b/addon-sdk/source/lib/sdk/window/helpers.js
@@ -4,7 +4,8 @@
 'use strict';
 
 const { defer } = require('../core/promise');
-const { open: openWindow, onFocus } = require('./utils');
+const events = require('../system/events');
+const { open: openWindow, onFocus, getToplevelWindow } = require('./utils');
 
 function open(uri, options) {
   return promise(openWindow.apply(null, arguments), 'load');
@@ -12,11 +13,19 @@ function open(uri, options) {
 exports.open = open;
 
 function close(window) {
-  // unload event could happen so fast that it is not resolved
-  // if we listen to unload after calling close()
-  let p = promise(window, 'unload');
+  // We shouldn't wait for unload, as it is dispatched
+  // before the window is actually closed.
+  // `domwindowclosed` is a better match.
+  let deferred = defer();
+  let toplevelWindow = getToplevelWindow(window);
+  events.on("domwindowclosed", function onclose({subject}) {
+    if (subject == toplevelWindow) {
+      events.off("domwindowclosed", onclose);
+      deferred.resolve(window);
+    }
+  }, true);
   window.close();
-  return p;
+  return deferred.promise;
 }
 exports.close = close;
 
diff --git a/addon-sdk/source/lib/sdk/window/utils.js b/addon-sdk/source/lib/sdk/window/utils.js
index 8eb383f5fcd4..0375ca4527be 100644
--- a/addon-sdk/source/lib/sdk/window/utils.js
+++ b/addon-sdk/source/lib/sdk/window/utils.js
@@ -113,6 +113,19 @@ function getBaseWindow(window) {
 }
 exports.getBaseWindow = getBaseWindow;
 
+/**
+ * Returns the `nsIDOMWindow` toplevel window for any child/inner window
+ */
+function getToplevelWindow(window) {
+  return window.QueryInterface(Ci.nsIInterfaceRequestor)
+               .getInterface(Ci.nsIWebNavigation)
+               .QueryInterface(Ci.nsIDocShellTreeItem)
+               .rootTreeItem
+               .QueryInterface(Ci.nsIInterfaceRequestor)
+               .getInterface(Ci.nsIDOMWindow);
+}
+exports.getToplevelWindow = getToplevelWindow;
+
 function getWindowDocShell(window) window.gBrowser.docShell;
 exports.getWindowDocShell = getWindowDocShell;
 
@@ -341,6 +354,12 @@ function getFrames(window) {
 }
 exports.getFrames = getFrames;
 
+function getScreenPixelsPerCSSPixel(window) {
+  return window.QueryInterface(Ci.nsIInterfaceRequestor).
+                getInterface(Ci.nsIDOMWindowUtils).screenPixelsPerCSSPixel;
+}
+exports.getScreenPixelsPerCSSPixel = getScreenPixelsPerCSSPixel;
+
 function getOwnerBrowserWindow(node) {
   /**
   Takes DOM node and returns browser window that contains it.
diff --git a/addon-sdk/source/test/addons/private-browsing-supported/test-global-private-browsing.js b/addon-sdk/source/test/addons/private-browsing-supported/test-global-private-browsing.js
index 86bf9dad9ba1..dc1b33899f8c 100644
--- a/addon-sdk/source/test/addons/private-browsing-supported/test-global-private-browsing.js
+++ b/addon-sdk/source/test/addons/private-browsing-supported/test-global-private-browsing.js
@@ -70,7 +70,7 @@ exports.testShowPanelAndWidgetOnPrivateWindow = function(assert, done) {
                 }
               });
             }
-          }).show(window.gBrowser);
+          }).show(null, window.gBrowser);
         },
         onUntrack: function(window) {
           if (window === myPrivateWindow) {
diff --git a/addon-sdk/source/test/private-browsing/helper.js b/addon-sdk/source/test/private-browsing/helper.js
index efac72df41ef..71f0d30d103e 100644
--- a/addon-sdk/source/test/private-browsing/helper.js
+++ b/addon-sdk/source/test/private-browsing/helper.js
@@ -14,6 +14,7 @@ const { openDialog, getMostRecentBrowserWindow } = require('sdk/window/utils');
 const { openTab, getTabContentWindow, getActiveTab, setTabURL, closeTab } = require('sdk/tabs/utils');
 const promise = require("sdk/core/promise");
 const windowHelpers = require('sdk/window/helpers');
+const events = require("sdk/system/events");
 
 function LoaderWithHookedConsole(module) {
   let globals = {};
@@ -71,13 +72,19 @@ exports.openWebpage = function openWebpage(url, enablePrivate) {
       private: enablePrivate
     });
     let deferred = promise.defer();
-    win.addEventListener("load", function onLoad() {
-      win.removeEventListener("load", onLoad, false);
 
-      let rawTab = getActiveTab(win);
-      setTabURL(rawTab, url);
-      deferred.resolve(getTabContentWindow(rawTab));
-    });
+    // Wait for delayed startup code to be executed, in order to ensure
+    // that the window is really ready
+    events.on("browser-delayed-startup-finished", function onReady({subject}) {
+      if (subject == win) {
+        events.off("browser-delayed-startup-finished", onReady, true);
+
+        let rawTab = getActiveTab(win);
+        setTabURL(rawTab, url);
+        deferred.resolve(getTabContentWindow(rawTab));
+      }
+    }, true);
+
     return {
       ready: deferred.promise,
       close: function () {
diff --git a/addon-sdk/source/test/tabs/test-firefox-tabs.js b/addon-sdk/source/test/tabs/test-firefox-tabs.js
index 191a68184f73..607952399ac1 100644
--- a/addon-sdk/source/test/tabs/test-firefox-tabs.js
+++ b/addon-sdk/source/test/tabs/test-firefox-tabs.js
@@ -937,49 +937,37 @@ exports['test ready event on new window tab'] = function(test) {
 };
 
 exports['test unique tab ids'] = function(test) {
-  test.waitUntilDone();
+  var windows = require('sdk/windows').browserWindows;
+  var { all, defer } = require('sdk/core/promise');
 
-  var windows = require('sdk/windows').browserWindows,
-    tabIds = {}, win1, win2;
+  function openWindow() {
+    // console.log('in openWindow');
+    let deferred = defer();
+    let win = windows.open({
+      url: "data:text/html;charset=utf-8,<html>foo</html>",
+    });
 
-  let steps = [
-    function (index) {
-      win1 = windows.open({
-          url: "data:text/html;charset=utf-8,foo",
-          onOpen: function(window) {
-            tabIds['tab1'] = window.tabs.activeTab.id;
-            next(index);
-          }
+    win.on('open', function(window) {
+      test.assert(window.tabs.length);
+      test.assert(window.tabs.activeTab);
+      test.assert(window.tabs.activeTab.id);
+      deferred.resolve({
+        id: window.tabs.activeTab.id,
+        win: win
       });
-    },
-    function (index) {
-      win2 = windows.open({
-          url: "data:text/html;charset=utf-8,foo",
-          onOpen: function(window) {
-            tabIds['tab2'] = window.tabs.activeTab.id;
-            next(index);
-          }
-      });
-    },
-    function (index) {
-      test.assertNotEqual(tabIds.tab1, tabIds.tab2, "Tab ids should be unique.");
-      win1.close();
-      win2.close();
-      test.done();
-    }
-  ];
-
-  function next(index) {
-    if (index === steps.length) {
-      return;
-    }
-    let fn = steps[index];
-    index++
-    fn(index);
+    });
+   
+    return deferred.promise;
   }
 
-  // run!
-  next(0);
+  test.waitUntilDone();
+  var one = openWindow(), two = openWindow();
+  all([one, two]).then(function(results) {
+    test.assertNotEqual(results[0].id, results[1].id, "tab Ids should not be equal.");
+    results[0].win.close();
+    results[1].win.close();
+    test.done();
+  });  
 }
 
 // related to Bug 671305
diff --git a/addon-sdk/source/test/test-panel.js b/addon-sdk/source/test/test-panel.js
index 80e0d26d4937..3809e1cc48f7 100644
--- a/addon-sdk/source/test/test-panel.js
+++ b/addon-sdk/source/test/test-panel.js
@@ -318,7 +318,7 @@ exports["test Anchor And Arrow"] = function(assert, done) {
       return;
     }
     let { panel, anchor } = queue.shift();
-    panel.show(anchor);
+    panel.show(null, anchor);
   }
 
   let tabs= require("sdk/tabs");
@@ -462,6 +462,7 @@ exports["test Change Content URL"] = function(assert, done) {
     contentURL: "about:blank",
     contentScript: "self.port.emit('ready', document.location.href);"
   });
+
   let count = 0;
   panel.port.on("ready", function (location) {
     count++;
@@ -651,7 +652,7 @@ if (isWindowPBSupported) {
         showTries++;
         panel.show();
         showTries++;
-        panel.show(browserWindow.gBrowser);
+        panel.show(null, browserWindow.gBrowser);
 
         return promise;
       }).
@@ -703,9 +704,9 @@ if (isWindowPBSupported) {
           }
         });
         showTries++;
-        panel.show(window.gBrowser);
+        panel.show(null, window.gBrowser);
         showTries++;
-        panel.show(browserWindow.gBrowser);
+        panel.show(null, browserWindow.gBrowser);
 
         return promise;
       }).
@@ -753,7 +754,7 @@ exports['test Style Applied Only Once'] = function (assert, done) {
       'self.port.on("check",function() { self.port.emit("count", document.getElementsByTagName("style").length); });' +
       'self.port.on("ping", function (count) { self.port.emit("pong", count); });'
   });
-  
+
   panel.port.on('count', function (styleCount) {
     assert.equal(styleCount, 1, 'should only have one style');
     done();
@@ -836,7 +837,7 @@ else if (isGlobalPBSupported) {
         assert.ok(isPrivate(window), 'window is private');
         assert.equal(getWindow(window.gBrowser), window, 'private window elements returns window');
         assert.equal(getWindow(activeWindow.gBrowser), activeWindow, 'active window elements returns window');
-        
+
         pb.once('stop', done);
         pb.deactivate();
       })
diff --git a/addon-sdk/source/test/test-window-utils-global-private-browsing.js b/addon-sdk/source/test/test-window-utils-global-private-browsing.js
index 39d7aa61ddb2..26cdfabf8779 100644
--- a/addon-sdk/source/test/test-window-utils-global-private-browsing.js
+++ b/addon-sdk/source/test/test-window-utils-global-private-browsing.js
@@ -61,7 +61,7 @@ exports.testShowPanelAndWidgetOnPrivateWindow = function(assert, done) {
                 }
               });
             }
-          }).show(window.gBrowser);
+          }).show(null, window.gBrowser);
         },
         onUntrack: function(window) {
           if (window === myPrivateWindow) {
diff --git a/addon-sdk/source/test/test-window-utils2.js b/addon-sdk/source/test/test-window-utils2.js
index 080ad072c626..758120393f27 100644
--- a/addon-sdk/source/test/test-window-utils2.js
+++ b/addon-sdk/source/test/test-window-utils2.js
@@ -5,7 +5,7 @@
 
 const { Ci } = require('chrome');
 const { open, backgroundify, windows, isBrowser,
-        getXULWindow, getBaseWindow, getMostRecentWindow,
+        getXULWindow, getBaseWindow, getToplevelWindow, getMostRecentWindow,
         getMostRecentBrowserWindow } = require('sdk/window/utils');
 const { close } = require('sdk/window/helpers');
 const windowUtils = require('sdk/deprecated/window-utils');
@@ -28,6 +28,16 @@ exports['test get nsIXULWindow from nsIDomWindow'] = function(assert) {
             'base returns nsIXULWindow');
 };
 
+exports['test getToplevelWindow'] = function(assert) {
+  let active = windowUtils.activeBrowserWindow;
+  assert.equal(getToplevelWindow(active), active,
+               'getToplevelWindow of toplevel window returns the same window');
+  assert.equal(getToplevelWindow(active.content), active,
+               'getToplevelWindow of tab window returns the browser window');
+  assert.ok(getToplevelWindow(active) instanceof Ci.nsIDOMWindow,
+            'getToplevelWindow returns nsIDOMWindow');
+};
+
 exports['test top window creation'] = function(assert, done) {
   let window = open('data:text/html;charset=utf-8,Hello top window');
   assert.ok(~windows().indexOf(window), 'window was opened');
@@ -61,7 +71,10 @@ exports.testBackgroundify = function(assert, done) {
             'backgroundifyied window is in the list of windows');
 
   // Wait for the window unload before ending test
-  close(window).then(done);
+  // backgroundified windows doesn't dispatch domwindowclosed event
+  // so that we have to manually wait for unload event
+  window.onunload = done;
+  window.close();
 };
 
 exports.testIsBrowser = function(assert) {
diff --git a/addon-sdk/source/test/test-windows-common.js b/addon-sdk/source/test/test-windows-common.js
index 05cd8bf5dcce..b77229403f2f 100644
--- a/addon-sdk/source/test/test-windows-common.js
+++ b/addon-sdk/source/test/test-windows-common.js
@@ -39,7 +39,7 @@ exports.testWindowTabsObject_alt = function(test) {
       test.assertNotEqual(window.tabs.activeTab, tab, "Correct active tab");
 
       // end test
-      tab.close(test.done());
+      tab.close(test.done.bind(test));
     }
   });
 };
diff --git a/addon-sdk/source/test/windows/test-firefox-windows.js b/addon-sdk/source/test/windows/test-firefox-windows.js
index 551ec4865566..e6ab606952a0 100644
--- a/addon-sdk/source/test/windows/test-firefox-windows.js
+++ b/addon-sdk/source/test/windows/test-firefox-windows.js
@@ -356,8 +356,6 @@ exports.testWindowOpenPrivateDefault = function(test) {
     url: 'about:mozilla',
     isPrivate: true,
     onOpen: function(window) {
-      test.assertEqual();
-
       let tab = window.tabs[0];
       tab.once('ready', function() {
         test.assertEqual(tab.url, 'about:mozilla', 'opened correct tab');

From 026959e36f838bdf33f59f4799cd74943c52610a Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Tue, 16 Apr 2013 15:53:00 -0700
Subject: [PATCH 205/438] Bug 862586 - Update webvtt parser to v0.4. r=cpearce

Update media/webvtt to the v0.4 tag of
https://github.com/mozilla/webvtt.git master
---
 media/webvtt/README_MOZILLA          |    2 +-
 media/webvtt/alloc.c                 |    2 +
 media/webvtt/cue.c                   |    8 +
 media/webvtt/cue_internal.h          |    5 +-
 media/webvtt/cuetext.c               |  216 +++--
 media/webvtt/include/webvtt/cue.h    |    1 +
 media/webvtt/include/webvtt/node.h   |   19 +-
 media/webvtt/include/webvtt/string.h |    9 +-
 media/webvtt/lexer.c                 |  110 ++-
 media/webvtt/node.c                  |    3 +-
 media/webvtt/parser.c                | 1221 +++++++++++++-------------
 media/webvtt/parser_internal.h       |   58 +-
 media/webvtt/string.c                |   44 +-
 media/webvtt/string_internal.h       |   54 +-
 14 files changed, 905 insertions(+), 847 deletions(-)

diff --git a/media/webvtt/README_MOZILLA b/media/webvtt/README_MOZILLA
index 492341477ab3..257f36aec2e1 100644
--- a/media/webvtt/README_MOZILLA
+++ b/media/webvtt/README_MOZILLA
@@ -1,5 +1,5 @@
 These files are from the WebVTT library, and are extracted from rev
-6b637c9f30911433e6d5a5be5d8512317a0d8a14 of the git repository at
+c93accafb2087df7c678748e25bca21f1173979f of the git repository at
 https://github.com/mozilla/webvtt.
 
 The following CPPFLAGS are used in order to build and link in Mozilla
diff --git a/media/webvtt/alloc.c b/media/webvtt/alloc.c
index 41e1879d24da..a8d111c320ad 100644
--- a/media/webvtt/alloc.c
+++ b/media/webvtt/alloc.c
@@ -46,12 +46,14 @@ struct {
 static void *WEBVTT_CALLBACK
 default_alloc( void *unused, webvtt_uint nb )
 {
+  (void)unused;
   return malloc( nb );
 }
 
 static void WEBVTT_CALLBACK
 default_free( void *unused, void *ptr )
 {
+  (void)unused;
   free( ptr );
 }
 
diff --git a/media/webvtt/cue.c b/media/webvtt/cue.c
index ec37883858c2..03d356048e8e 100644
--- a/media/webvtt/cue.c
+++ b/media/webvtt/cue.c
@@ -54,6 +54,7 @@ webvtt_create_cue( webvtt_cue **pcue )
    */
   webvtt_ref( &cue->refs );
   webvtt_init_string( &cue->id );
+  webvtt_init_string( &cue->body );
   cue->from = 0xFFFFFFFFFFFFFFFF;
   cue->until = 0xFFFFFFFFFFFFFFFF;
   cue->snap_to_lines = 1;
@@ -83,6 +84,7 @@ webvtt_release_cue( webvtt_cue **pcue )
     *pcue = 0;
     if( webvtt_deref( &cue->refs ) == 0 ) {
       webvtt_release_string( &cue->id );
+      webvtt_release_string( &cue->body );
       webvtt_release_node( &cue->node_head );
       webvtt_free( cue );
     }
@@ -115,3 +117,9 @@ webvtt_validate_cue( webvtt_cue *cue )
 error:
   return 0;
 }
+
+WEBVTT_INTERN webvtt_bool
+cue_is_incomplete( const webvtt_cue *cue ) {
+  return !cue || ( cue->flags & CUE_HEADER_MASK ) == CUE_HAVE_ID;
+}
+
diff --git a/media/webvtt/cue_internal.h b/media/webvtt/cue_internal.h
index 7f634eba0468..142af0867371 100644
--- a/media/webvtt/cue_internal.h
+++ b/media/webvtt/cue_internal.h
@@ -47,9 +47,6 @@ enum {
   CUE_HEADER_MASK = CUE_HAVE_CUEPARAMS|CUE_HAVE_ID,
 };
 
-static webvtt_bool
-cue_is_incomplete( const webvtt_cue *cue ) {
-  return !cue || ( cue->flags & CUE_HEADER_MASK ) == CUE_HAVE_ID;
-}
+WEBVTT_INTERN webvtt_bool cue_is_incomplete( const webvtt_cue *cue );
 
 #endif
diff --git a/media/webvtt/cuetext.c b/media/webvtt/cuetext.c
index 705fb66f69b4..c1f11f24b710 100644
--- a/media/webvtt/cuetext.c
+++ b/media/webvtt/cuetext.c
@@ -29,11 +29,10 @@
 #include <string.h>
 #include "parser_internal.h"
 #include "cuetext_internal.h"
+#include "node_internal.h"
 #include "cue_internal.h"
 #include "string_internal.h"
 
-static void webvtt_skipwhite( webvtt_byte **position );
-
 #ifdef min
 # undef min
 #endif
@@ -67,19 +66,6 @@ do \
     goto dealloc; \
   } \
 
-/**
- * This will only work on null-terminated strings, remember that!
- */
-static void
-webvtt_skipwhite( webvtt_byte **position )
-{
-  webvtt_byte *p = *position;
-  while( *p && webvtt_iswhite(*p) ) {
-    ++p;
-  }
-  *position = p;
-}
-
 WEBVTT_INTERN webvtt_status
 webvtt_create_token( webvtt_cuetext_token **token, webvtt_token_type token_type )
 {
@@ -175,19 +161,15 @@ webvtt_delete_token( webvtt_cuetext_token **token )
    * Note that time stamp tokens do not need to free any internal data because 
    * they do not allocate anything. 
    */
-  switch( t->token_type ) {
-    case START_TOKEN:
-      data = t->start_token_data;
-      webvtt_release_stringlist( &data.css_classes );
-      webvtt_release_string( &data.annotations );
-      webvtt_release_string( &t->tag_name );
-      break;
-    case END_TOKEN:
-      webvtt_release_string( &t->tag_name );
-      break;
-    case TEXT_TOKEN:
-      webvtt_release_string( &t->text );
-      break;
+  if( t->token_type == START_TOKEN ) {
+    data = t->start_token_data;
+    webvtt_release_stringlist( &data.css_classes );
+    webvtt_release_string( &data.annotations );
+    webvtt_release_string( &t->tag_name );
+  } else if( t->token_type == END_TOKEN ) {
+    webvtt_release_string( &t->tag_name );
+  } else if( t->token_type == TEXT_TOKEN ) {
+    webvtt_release_string( &t->text );
   }
   webvtt_free( t );
   *token = 0;
@@ -196,7 +178,7 @@ webvtt_delete_token( webvtt_cuetext_token **token )
 WEBVTT_INTERN int
 tag_accepts_annotation( webvtt_string *tag_name )
 {
-  return webvtt_string_is_equal( tag_name, "v", 1 );
+  return webvtt_string_is_equal( tag_name, ( webvtt_byte * )"v", 1 );
 }
 
 WEBVTT_INTERN webvtt_status
@@ -208,25 +190,25 @@ webvtt_node_kind_from_tag_name( webvtt_string *tag_name, webvtt_node_kind *kind
 
   if( webvtt_string_length(tag_name) == 1 ) {
     switch( webvtt_string_text(tag_name)[0] ) {
-      case( UTF8_B ):
+      case( 'b' ):
         *kind = WEBVTT_BOLD;
         break;
-      case( UTF8_I ):
+      case( 'i' ):
         *kind = WEBVTT_ITALIC;
         break;
-      case( UTF8_U ):
+      case( 'u' ):
         *kind = WEBVTT_UNDERLINE;
         break;
-      case( UTF8_C ):
+      case( 'c' ):
         *kind = WEBVTT_CLASS;
         break;
-      case( UTF8_V ):
+      case( 'v' ):
         *kind = WEBVTT_VOICE;
         break;
     }
-  } else if( webvtt_string_is_equal( tag_name, "ruby", 4 ) ) {
+  } else if( webvtt_string_is_equal( tag_name, ( webvtt_byte * )"ruby", 4 ) ) {
     *kind = WEBVTT_RUBY;
-  } else if( webvtt_string_is_equal( tag_name, "rt", 2 ) ) {
+  } else if( webvtt_string_is_equal( tag_name, ( webvtt_byte * )"rt", 2 ) ) {
     *kind = WEBVTT_RUBY_TEXT;
   } else {
     return WEBVTT_INVALID_TAG_NAME;
@@ -279,17 +261,17 @@ webvtt_data_state( webvtt_byte **position, webvtt_token_state *token_state,
 {
   for ( ; *token_state == DATA; (*position)++ ) {
     switch( **position ) {
-      case UTF8_AMPERSAND:
+      case '&':
         *token_state = ESCAPE;
         break;
-      case UTF8_LESS_THAN:
+      case '<':
         if( webvtt_string_length(result) == 0 ) {
           *token_state = TAG;
         } else {
           return WEBVTT_SUCCESS;
         }
         break;
-      case UTF8_NULL_BYTE:
+      case '\0':
         return WEBVTT_SUCCESS;
         break;
       default:
@@ -328,14 +310,14 @@ webvtt_escape_state( webvtt_byte **position, webvtt_token_state *token_state,
    * Append ampersand here because the algorithm is not able to add it to the
    * buffer when it reads it in the DATA state tokenizer.
    */
-  CHECK_MEMORY_OP_JUMP( status, webvtt_string_putc( &buffer, UTF8_AMPERSAND ) );
+  CHECK_MEMORY_OP_JUMP( status, webvtt_string_putc( &buffer, '&' ) );
 
   for( ; *token_state == ESCAPE; (*position)++ ) {
     /**
      * We have encountered a token termination point.
      * Append buffer to result and return success.
      */
-    if( **position == UTF8_NULL_BYTE || **position == UTF8_LESS_THAN ) {
+    if( **position == '\0' || **position == '<' ) {
       CHECK_MEMORY_OP_JUMP( status, webvtt_string_append_string( result, &buffer ) );
       goto dealloc;
     }
@@ -344,7 +326,7 @@ webvtt_escape_state( webvtt_byte **position, webvtt_token_state *token_state,
      * This means that we need to add that malformed text to the result and
      * recreate the buffer to prepare for a new escape sequence.
      */
-    else if( **position == UTF8_AMPERSAND ) {
+    else if( **position == '&' ) {
       CHECK_MEMORY_OP_JUMP( status, webvtt_string_append_string( result, &buffer ) );
       webvtt_release_string( &buffer );
       CHECK_MEMORY_OP_JUMP( status, webvtt_create_string( 1, &buffer ) );
@@ -355,18 +337,18 @@ webvtt_escape_state( webvtt_byte **position, webvtt_token_state *token_state,
      * Check if buffer contains a valid escape sequence and if it does append
      * the interpretation to result and change the state to DATA.
      */
-    else if( **position == UTF8_SEMI_COLON ) {
-      if( webvtt_string_is_equal( &buffer, "&amp", 4 ) ) {
+    else if( **position == ';' ) {
+      if( webvtt_string_is_equal( &buffer, ( webvtt_byte * )"&amp", 4 ) ) {
         CHECK_MEMORY_OP_JUMP( status, webvtt_string_putc( result, '&' ) );
-      } else if( webvtt_string_is_equal( &buffer, "&lt", 3 ) ) {
+      } else if( webvtt_string_is_equal( &buffer, ( webvtt_byte * )"&lt", 3 ) ) {
         CHECK_MEMORY_OP_JUMP( status, webvtt_string_putc( result, '<' ) );
-      } else if( webvtt_string_is_equal( &buffer, "&gt", 3 ) ) {
+      } else if( webvtt_string_is_equal( &buffer, ( webvtt_byte * )"&gt", 3 ) ) {
         CHECK_MEMORY_OP_JUMP( status, webvtt_string_putc( result, '>' ) );
-      } else if( webvtt_string_is_equal( &buffer, "&rlm", 4 ) ) {
+      } else if( webvtt_string_is_equal( &buffer, ( webvtt_byte * )"&rlm", 4 ) ) {
         CHECK_MEMORY_OP_JUMP( status, webvtt_string_append( result, rlm_replace, RLM_REPLACE_LENGTH ) );
-      } else if( webvtt_string_is_equal( &buffer, "&lrm", 4 ) ) {
+      } else if( webvtt_string_is_equal( &buffer, ( webvtt_byte * )"&lrm", 4 ) ) {
         CHECK_MEMORY_OP_JUMP( status, webvtt_string_append( result, lrm_replace, LRM_REPLACE_LENGTH ) );
-      } else if( webvtt_string_is_equal( &buffer, "&nbsp", 5 ) ) {
+      } else if( webvtt_string_is_equal( &buffer, ( webvtt_byte * )"&nbsp", 5 ) ) {
         CHECK_MEMORY_OP_JUMP( status, webvtt_string_append( result, nbsp_replace, NBSP_REPLACE_LENGTH ) );
       } else {
         CHECK_MEMORY_OP_JUMP( status, webvtt_string_append_string( result, &buffer ) );
@@ -407,25 +389,25 @@ webvtt_tag_state( webvtt_byte **position, webvtt_token_state *token_state,
                   webvtt_string *result )
 {
   for( ; *token_state == TAG; (*position)++ ) {
-    if( **position == UTF8_TAB || **position == UTF8_LINE_FEED ||
-        **position == UTF8_CARRIAGE_RETURN || **position == UTF8_FORM_FEED ||
-        **position == UTF8_SPACE ) {
+    if( **position == '\t' || **position == '\n' ||
+        **position == '\r' || **position == '\f' ||
+        **position == ' ' ) {
       *token_state = START_TAG_ANNOTATION;
     } else if( webvtt_isdigit( **position )  ) {
       CHECK_MEMORY_OP( webvtt_string_putc( result, **position ) );
       *token_state = TIME_STAMP_TAG;
     } else {
       switch( **position ) {
-        case UTF8_FULL_STOP:
+        case '.':
           *token_state = START_TAG_CLASS;
           break;
-        case UTF8_SOLIDUS:
+        case '/':
           *token_state = END_TAG;
           break;
-        case UTF8_GREATER_THAN:
+        case '>':
           return WEBVTT_SUCCESS;
           break;
-        case UTF8_NULL_BYTE:
+        case '\0':
           return WEBVTT_SUCCESS;
           break;
         default:
@@ -443,19 +425,19 @@ webvtt_start_tag_state( webvtt_byte **position, webvtt_token_state *token_state,
                         webvtt_string *result )
 {
   for( ; *token_state == START_TAG; (*position)++ ) {
-    if( **position == UTF8_TAB || **position == UTF8_FORM_FEED ||
-        **position == UTF8_SPACE || **position == UTF8_LINE_FEED ||
-        **position == UTF8_CARRIAGE_RETURN ) {
+    if( **position == '\t' || **position == '\f' ||
+        **position == ' ' || **position == '\n' ||
+        **position == '\r' ) {
       *token_state = START_TAG_ANNOTATION;
     } else {
       switch( **position ) {
-        case UTF8_TAB:
+        case '\t':
           *token_state = START_TAG_ANNOTATION;
           break;
-        case UTF8_FULL_STOP:
+        case '.':
           *token_state = START_TAG_CLASS;
           break;
-        case UTF8_GREATER_THAN:
+        case '>':
           return WEBVTT_SUCCESS;
           break;
         default:
@@ -478,17 +460,17 @@ webvtt_class_state( webvtt_byte **position, webvtt_token_state *token_state,
   CHECK_MEMORY_OP( webvtt_create_string( 1, &buffer ) );
 
   for( ; *token_state == START_TAG_CLASS; (*position)++ ) {
-    if( **position == UTF8_TAB || **position == UTF8_FORM_FEED ||
-        **position == UTF8_SPACE || **position == UTF8_LINE_FEED ||
-        **position == UTF8_CARRIAGE_RETURN) {
+    if( **position == '\t' || **position == '\f' ||
+        **position == ' ' || **position == '\n' ||
+        **position == '\r') {
       CHECK_MEMORY_OP_JUMP( status, webvtt_stringlist_push( css_classes, &buffer ) );
       *token_state = START_TAG_ANNOTATION;
       return WEBVTT_SUCCESS;
-    } else if( **position == UTF8_GREATER_THAN || **position == UTF8_NULL_BYTE ) {
+    } else if( **position == '>' || **position == '\0' ) {
       CHECK_MEMORY_OP_JUMP( status, webvtt_stringlist_push( css_classes, &buffer ) );
       webvtt_release_string( &buffer );
       return WEBVTT_SUCCESS;
-    } else if( **position == UTF8_FULL_STOP ) {
+    } else if( **position == '.' ) {
       CHECK_MEMORY_OP_JUMP( status, webvtt_stringlist_push( css_classes, &buffer ) );
       webvtt_release_string( &buffer );
       CHECK_MEMORY_OP( webvtt_create_string( 1, &buffer ) );
@@ -508,7 +490,7 @@ webvtt_annotation_state( webvtt_byte **position, webvtt_token_state *token_state
                          webvtt_string *annotation )
 {
   for( ; *token_state == START_TAG_ANNOTATION; (*position)++ ) {
-    if( **position == UTF8_NULL_BYTE || **position == UTF8_GREATER_THAN ) {
+    if( **position == '\0' || **position == '>' ) {
       return WEBVTT_SUCCESS;
     }
     CHECK_MEMORY_OP( webvtt_string_putc( annotation, **position ) );
@@ -522,7 +504,7 @@ webvtt_end_tag_state( webvtt_byte **position, webvtt_token_state *token_state,
                       webvtt_string *result )
 {
   for( ; *token_state == END_TAG; (*position)++ ) {
-    if( **position == UTF8_GREATER_THAN || **position == UTF8_NULL_BYTE ) {
+    if( **position == '>' || **position == '\0' ) {
       return WEBVTT_SUCCESS;
     }
     CHECK_MEMORY_OP( webvtt_string_putc( result, **position ) );
@@ -536,7 +518,7 @@ webvtt_timestamp_state( webvtt_byte **position, webvtt_token_state *token_state,
                         webvtt_string *result )
 {
   for( ; *token_state == TIME_STAMP_TAG; (*position)++ ) {
-    if( **position == UTF8_GREATER_THAN || **position == UTF8_NULL_BYTE ) {
+    if( **position == '>' || **position == '\0' ) {
       return WEBVTT_SUCCESS;
     }
     CHECK_MEMORY_OP( webvtt_string_putc( result, **position ) );
@@ -599,13 +581,9 @@ webvtt_cuetext_tokenizer( webvtt_byte **position, webvtt_cuetext_token **token )
         status = webvtt_timestamp_state( position, &token_state, &result );
         break;
     }
-
-    if( token_state == START_TAG_ANNOTATION ) {
-      webvtt_skipwhite( position );
-    }
   }
 
-  if( **position == UTF8_GREATER_THAN )
+  if( **position == '>' )
   { (*position)++; }
   
   if( status == WEBVTT_SUCCESS ) {
@@ -661,6 +639,16 @@ webvtt_parse_cuetext( webvtt_parser self, webvtt_cue *cue, webvtt_string *payloa
   webvtt_cuetext_token *token;
   webvtt_node_kind kind;
 
+  /**
+   *  TODO: Use these parameters! 'finished' isn't really important
+   * here, but 'self' certainly is as it lets us report syntax errors.
+   *
+   * However, for the time being we can trick the compiler into not
+   * warning us about unused variables by doing this.
+   */
+  ( void )self;
+  ( void )finished;
+
   if( !cue ) {
     return WEBVTT_INVALID_PARAM;
   }
@@ -685,74 +673,68 @@ webvtt_parse_cuetext( webvtt_parser self, webvtt_cue *cue, webvtt_string *payloa
    * Routine taken from the W3C specification
    * http://dev.w3.org/html5/webvtt/#webvtt-cue-text-parsing-rules
    */
-  while( *position != UTF8_NULL_BYTE ) {
-    
+  while( *position != '\0' ) {
+    webvtt_status status = WEBVTT_SUCCESS; 
     webvtt_delete_token( &token );
 
     /* Step 7. */
-    switch( webvtt_cuetext_tokenizer( &position, &token ) ) {
-      case( WEBVTT_UNFINISHED ):
-        /* Error here. */
-        break;
-        /* Step 8. */
-      case( WEBVTT_SUCCESS ):
-
+    if( WEBVTT_FAILED( status = webvtt_cuetext_tokenizer( &position, 
+                                                          &token ) ) ) {
+      /* Error here. */
+    } else {
+      /* Succeeded... Process token */
+      if( token->token_type == END_TOKEN ) {
         /**
          * If we've found an end token which has a valid end token tag name and
          * a tag name that is equal to the current node then set current to the
          * parent of current.
          */
-        if( token->token_type == END_TOKEN ) {
+       if( current_node->kind == WEBVTT_HEAD_NODE ) {
           /**
            * We have encountered an end token but we are at the top of the list
            * and thus have not encountered any start tokens yet, throw away the
            * token.
            */
-          if( current_node->kind == WEBVTT_HEAD_NODE ) {
-            continue;
-          }
+          continue;
+        }
 
+        if( webvtt_node_kind_from_tag_name( &token->tag_name, &kind ) == WEBVTT_INVALID_TAG_NAME ) {
           /**
            * We have encountered an end token but it is not in a format that is
            * supported, throw away the token.
            */
-          if( webvtt_node_kind_from_tag_name( &token->tag_name, &kind ) == WEBVTT_INVALID_TAG_NAME ) {
-            continue;
-          }
+          continue;
+        }
 
+        if( current_node->kind == kind ) {
           /**
            * We have encountered an end token and it matches the start token of
            * the node that we are currently on. Move back up the list of nodes
            * and continue parsing.
            */
-          if( current_node->kind == kind ) {
-            current_node = current_node->parent;
-          }
-        } else {
-
-          /**
-           * Attempt to create a valid node from the token.
-           * If successful then attach the node to the current nodes list and
-           * also set current to the newly created node if it is an internal
-           * node type.
-           */
-          if( webvtt_create_node_from_token( token, &temp_node, current_node ) != WEBVTT_SUCCESS ) { 
-            /* Do something here? */ 
-          }
-          else {
-            webvtt_attach_node( current_node, temp_node );
-            
-            if( WEBVTT_IS_VALID_INTERNAL_NODE( temp_node->kind ) ) { 
-              current_node = temp_node; 
-            }
-            
-            /* Release the node as attach internal node increases the count. */
-            webvtt_release_node( &temp_node );
-          }
+          current_node = current_node->parent;
         }
-        break;
+      } else {
+        /**
+         * Attempt to create a valid node from the token.
+         * If successful then attach the node to the current nodes list and
+         * also set current to the newly created node if it is an internal
+         * node type.
+         */
+        if( webvtt_create_node_from_token( token, &temp_node, current_node ) != WEBVTT_SUCCESS ) { 
+          /* Do something here? */ 
+        } else {
+          webvtt_attach_node( current_node, temp_node );
+
+          if( WEBVTT_IS_VALID_INTERNAL_NODE( temp_node->kind ) ) { 
+            current_node = temp_node; 
+          }
+            
+          /* Release the node as attach internal node increases the count. */
+          webvtt_release_node( &temp_node );
+        }
+      }
     }
-    webvtt_skipwhite( &position );
   }
   
   webvtt_delete_token( &token );
diff --git a/media/webvtt/include/webvtt/cue.h b/media/webvtt/include/webvtt/cue.h
index edcfbbd7fdc1..bd7dae3be3b4 100644
--- a/media/webvtt/include/webvtt/cue.h
+++ b/media/webvtt/include/webvtt/cue.h
@@ -81,6 +81,7 @@ webvtt_cue_t {
   webvtt_cue_settings settings;
   webvtt_bool snap_to_lines;
   webvtt_string id;
+  webvtt_string body;
 
   /**
     * Parsed cue-text (NULL if has not been parsed)
diff --git a/media/webvtt/include/webvtt/node.h b/media/webvtt/include/webvtt/node.h
index 250e8f26eee7..70bc9431ba78 100644
--- a/media/webvtt/include/webvtt/node.h
+++ b/media/webvtt/include/webvtt/node.h
@@ -71,11 +71,20 @@ webvtt_node_kind_t {
   WEBVTT_EMPTY_NODE = 258
 } webvtt_node_kind;
 
-#define WEBVTT_IS_LEAF(Kind) ( ((Kind) & WEBVTT_NODE_LEAF) != 0 )
-#define WEBVTT_NODE_INDEX(Kind) ( (Kind) & ~WEBVTT_NODE_LEAF )
-#define WEBVTT_IS_VALID_LEAF_NODE(Kind) ( WEBVTT_IS_LEAF(Kind) && (WEBVTT_NODE_INDEX(Kind) >= WEBVTT_NODE_LEAF_START && WEBVTT_NODE_INDEX(Kind) <= WEBVTT_NODE_LEAF_END ) )
-#define WEBVTT_IS_VALID_INTERNAL_NODE(Kind) ( (!WEBVTT_IS_LEAF(Kind)) && (WEBVTT_NODE_INDEX(Kind) >= WEBVTT_NODE_INTERNAL_START && WEBVTT_NODE_INDEX(Kind) <= WEBVTT_NODE_INTERNAL_END) )
-#define WEBVTT_IS_VALID_NODE_KIND(Kind) ( WEBVTT_IS_VALID_INTERNAL_NODE(Kind) || WEBVTT_IS_VALID_LEAF_NODE(Kind) )
+#define WEBVTT_IS_LEAF( Kind ) ( ( ( Kind ) & WEBVTT_NODE_LEAF) != 0 )
+#define WEBVTT_NODE_INDEX( Kind ) ( ( Kind ) & ~WEBVTT_NODE_LEAF )
+
+#define WEBVTT_IS_VALID_LEAF_NODE( Kind ) \
+  ( WEBVTT_IS_LEAF( Kind ) && \
+  ( WEBVTT_NODE_INDEX( Kind ) >= WEBVTT_NODE_LEAF_START && \
+    WEBVTT_NODE_INDEX( Kind ) <= WEBVTT_NODE_LEAF_END ) )
+
+#define WEBVTT_IS_VALID_INTERNAL_NODE( Kind ) \
+  ( ( !WEBVTT_IS_LEAF( Kind ) ) && \
+    (  WEBVTT_NODE_INDEX( Kind ) <= WEBVTT_NODE_INTERNAL_END ) )
+
+#define WEBVTT_IS_VALID_NODE_KIND( Kind ) \
+  ( WEBVTT_IS_VALID_INTERNAL_NODE( Kind ) || WEBVTT_IS_VALID_LEAF_NODE( Kind ) )
 
 struct webvtt_internal_node_data_t;
 
diff --git a/media/webvtt/include/webvtt/string.h b/media/webvtt/include/webvtt/string.h
index 96e1f2f6fb2e..560ad6dd47b9 100644
--- a/media/webvtt/include/webvtt/string.h
+++ b/media/webvtt/include/webvtt/string.h
@@ -126,14 +126,14 @@ WEBVTT_EXPORT const webvtt_byte *webvtt_string_text( const webvtt_string *str );
  *
  * return the length of a strings text
  */
-WEBVTT_EXPORT const webvtt_uint32 webvtt_string_length( const webvtt_string *str );
+WEBVTT_EXPORT webvtt_uint32 webvtt_string_length( const webvtt_string *str );
 
 /**
  * webvtt_string_capacity
  *
  * return the current capacity of a string
  */
-WEBVTT_EXPORT const webvtt_uint32 webvtt_string_capacity( const webvtt_string *str );
+WEBVTT_EXPORT webvtt_uint32 webvtt_string_capacity( const webvtt_string *str );
 
 /**
  * webvtt_string_getline
@@ -142,7 +142,7 @@ WEBVTT_EXPORT const webvtt_uint32 webvtt_string_capacity( const webvtt_string *s
  * including the terminating character(s)
  */
 WEBVTT_EXPORT int webvtt_string_getline( webvtt_string *str, const webvtt_byte *buffer,
-    webvtt_uint *pos, webvtt_uint len, int *truncate, webvtt_bool finish, webvtt_bool retain_new_line );
+    webvtt_uint *pos, int len, int *truncate, webvtt_bool finish );
 
 /**
  * webvtt_string_putc
@@ -158,7 +158,8 @@ WEBVTT_EXPORT webvtt_status webvtt_string_putc( webvtt_string *str, webvtt_byte
  * compare a string's text to a byte array
  *
  */
-WEBVTT_EXPORT webvtt_bool webvtt_string_is_equal( webvtt_string *str, webvtt_byte *to_compare, webvtt_uint len );
+WEBVTT_EXPORT webvtt_bool webvtt_string_is_equal( const webvtt_string *str, 
+    const webvtt_byte *to_compare, int len );
 
 /**
  * webvtt_string_append
diff --git a/media/webvtt/lexer.c b/media/webvtt/lexer.c
index 5105686cd47d..e48d1eefcefd 100644
--- a/media/webvtt/lexer.c
+++ b/media/webvtt/lexer.c
@@ -125,7 +125,7 @@
 #define OR
 #define AND
 
-#define OVERFLOW(X) \
+#define IF_OVERFLOW(X) \
   if( self->token_pos >= (sizeof(self->token) - 1 ) ) \
   { \
     RETURN(X) \
@@ -156,7 +156,6 @@ webvtt_lex_word( webvtt_parser self, webvtt_string *str, const webvtt_byte *buff
 {
   webvtt_status status = WEBVTT_SUCCESS;
   webvtt_uint pos = *ppos;
-  int d = 0;
   if( !str ) {
     return WEBVTT_INVALID_PARAM;
   }
@@ -193,6 +192,83 @@ _finished:
   return status;
 }
 
+/**
+ * webvtt_lex_newline
+ *
+ * Get newline sequence in re-entrant fashion. self->tstate must be
+ * L_START or L_NEWLINE0 for this function to behave correctly.
+ */
+WEBVTT_INTERN webvtt_token
+webvtt_lex_newline( webvtt_parser self, const
+  webvtt_byte *buffer, webvtt_uint *pos, webvtt_uint length,
+  webvtt_bool finish )
+{
+  webvtt_uint p = *pos;
+
+  /* Ensure that we've got a valid token-state for this use-case. */
+  DIE_IF( self->tstate != L_START && self->tstate != L_NEWLINE0 );
+
+  while( p < length ) {
+    webvtt_byte c = buffer[ p++ ];
+    self->token[ self->token_pos++ ] = c;
+    self->token[ self->token_pos ] = 0;
+    self->bytes++;
+
+    switch( self->tstate ) {
+      case L_START:
+        if( c == '\n' ) {
+          *pos = p;
+          return NEWLINE;
+        } else if( c == '\r' ) {
+          self->tstate = L_NEWLINE0;
+        } else {
+          goto backup;
+        }
+        break;
+      case L_NEWLINE0:
+        if( c == '\n' ) {
+          *pos = p;
+          self->tstate = L_START;
+          return NEWLINE;
+        } else {
+          goto backup;
+        }
+        break;
+
+      default:
+        /**
+         * This should never happen if the function is called correctly
+         * (EG immediately following a successful call to webvtt_string_getline)
+         */
+       goto backup;
+    }
+  }
+
+  *pos = p;
+  if( finish && ( p >= length ) ) {
+    /* If pos >= length, it's and 'finish' is set, it's an automatic EOL */
+    self->tstate = L_START;
+    return NEWLINE;
+  }
+
+  if( self->tstate == L_NEWLINE0 ) {
+    return UNFINISHED;
+  } else {
+    /* This branch should never occur, if the function is used properly. */
+    *pos = --p;
+    return BADTOKEN;
+  }
+backup:
+  self->token[ --self->token_pos ] = 0;
+  --self->bytes;
+  *pos = --p;
+  if( self->tstate == L_NEWLINE0 ) {
+    self->tstate = L_START;
+    return NEWLINE;
+  }
+  return BADTOKEN;
+}
+
 WEBVTT_INTERN webvtt_token
 webvtt_lex( webvtt_parser self, const webvtt_byte *buffer, webvtt_uint *pos, webvtt_uint length, webvtt_bool finish )
 {
@@ -269,10 +345,17 @@ webvtt_lex( webvtt_parser self, const webvtt_byte *buffer, webvtt_uint *pos, web
 
         BEGIN_STATE(L_DIGIT0)
           U_DIGIT {
-            OVERFLOW(INTEGER)
+            IF_OVERFLOW(INTEGER)
             SET_STATE(L_DIGIT0)
           }
-          U_COLON { SET_STATE(L_TIMESTAMP1) }
+          U_COLON {
+            /* Don't return a TIMESTAMP if we start with '-' */
+            if( self->token[0] == '-' ) {
+              RETURN(INTEGER);
+            } else {
+              SET_STATE(L_TIMESTAMP1)
+            }
+          }
           U_PERCENT { RETURN(PERCENTAGE) }
         DEFAULT { BACKUP AND RETURN(INTEGER) }
         END_STATE_EX
@@ -283,7 +366,7 @@ webvtt_lex( webvtt_parser self, const webvtt_byte *buffer, webvtt_uint *pos, web
         END_STATE_EX
 
         BEGIN_STATE(L_WHITESPACE)
-          U_SPACE OR U_TAB { OVERFLOW(WHITESPACE) SET_STATE(L_WHITESPACE) }
+          U_SPACE OR U_TAB { IF_OVERFLOW(WHITESPACE) SET_STATE(L_WHITESPACE) }
         DEFAULT { BACKUP RETURN(WHITESPACE) }
         END_STATE_EX
 
@@ -453,37 +536,42 @@ webvtt_lex( webvtt_parser self, const webvtt_byte *buffer, webvtt_uint *pos, web
 
         BEGIN_STATE(L_TIMESTAMP1)
           U_DIGIT {
-          OVERFLOW(BADTOKEN)
+          IF_OVERFLOW(BADTOKEN)
           SET_STATE(L_TIMESTAMP1)
         }
           U_COLON {
-          OVERFLOW(BADTOKEN)
+          IF_OVERFLOW(BADTOKEN)
           SET_STATE(L_TIMESTAMP2)
         }
           U_PERIOD {
-          OVERFLOW(BADTOKEN)
+          IF_OVERFLOW(BADTOKEN)
           SET_STATE(L_TIMESTAMP3)
         }
         END_STATE
 
         BEGIN_STATE(L_TIMESTAMP2)
           U_DIGIT {
-          OVERFLOW(BADTOKEN)
+          IF_OVERFLOW(BADTOKEN)
           SET_STATE(L_TIMESTAMP2)
         }
           U_PERIOD {
-          OVERFLOW(BADTOKEN)
+          IF_OVERFLOW(BADTOKEN)
           SET_STATE(L_TIMESTAMP3)
         }
         END_STATE
 
         BEGIN_STATE(L_TIMESTAMP3)
           U_DIGIT {
-          OVERFLOW(TIMESTAMP)
+          IF_OVERFLOW(TIMESTAMP)
           BREAK
         }
         DEFAULT {
           BACKUP
+		  /* Don't return a TIMESTAMP if we don't have at least one
+		     millisecond */
+          if( !webvtt_isdigit( self->token[ self->token_pos - 1 ] ) ) {
+            RETURN(BADTOKEN);
+          }
           RETURN(TIMESTAMP)
           BREAK
         }
diff --git a/media/webvtt/node.c b/media/webvtt/node.c
index bae4d263fb92..659a58642b15 100644
--- a/media/webvtt/node.c
+++ b/media/webvtt/node.c
@@ -32,7 +32,8 @@
  static webvtt_node empty_node = {
   { 1 }, /* init ref count */
   0, /* parent */
-  WEBVTT_EMPTY_NODE /* node kind */
+  WEBVTT_EMPTY_NODE, /* node kind */
+  { { 0 } } /* value */
 };
 
 WEBVTT_EXPORT void
diff --git a/media/webvtt/parser.c b/media/webvtt/parser.c
index 17282f7b0d28..5af6e5e65ac6 100644
--- a/media/webvtt/parser.c
+++ b/media/webvtt/parser.c
@@ -33,7 +33,7 @@
 #define _ERROR(X) do { if( skip_error == 0 ) { ERROR(X); } } while(0)
 
 static const webvtt_byte separator[] = {
-  UTF8_HYPHEN_MINUS, UTF8_HYPHEN_MINUS, UTF8_GREATER_THAN
+  '-', '-', '>'
 };
 
 #define MSECS_PER_HOUR (3600000)
@@ -43,7 +43,6 @@ static const webvtt_byte separator[] = {
 #define MALFORMED_TIME ((webvtt_timestamp_t)-1.0)
 
 static webvtt_status find_bytes( const webvtt_byte *buffer, webvtt_uint len, const webvtt_byte *sbytes, webvtt_uint slen );
-static webvtt_status webvtt_skipwhite( const webvtt_byte *buffer, webvtt_uint *pos, webvtt_uint len );
 static webvtt_int64 parse_int( const webvtt_byte **pb, int *pdigits );
 static void skip_spacetab( const webvtt_byte *text, webvtt_uint *pos,
   webvtt_uint len, webvtt_uint *column );
@@ -129,6 +128,8 @@ cleanup_stack( webvtt_parser self )
          * Eventually the cuetext parser will probably be making use
          * of this stack, and will need to manage it well also.
          */
+      default:
+        break;
     }
     st->type = V_NONE;
     st->line = st->column = st->token = 0;
@@ -155,34 +156,63 @@ cleanup_stack( webvtt_parser self )
 /**
  *
  */
-WEBVTT_EXPORT webvtt_status 
-webvtt_finish_parsing( webvtt_parser self ) 
+WEBVTT_EXPORT webvtt_status
+webvtt_finish_parsing( webvtt_parser self )
 {
   webvtt_status status = WEBVTT_SUCCESS;
-  
+  const webvtt_byte buffer[] = "\0";
+  const webvtt_uint len = 0;
+  webvtt_uint pos = 0;
+
   if( !self->finished ) {
     self->finished = 1;
-    
+
+retry:
     switch( self->mode ) {
       /**
        * We've left off parsing cue settings and are not in the empty state,
        * return WEBVTT_CUE_INCOMPLETE.
        */
       case M_WEBVTT:
-        if( self->top->type != V_NONE ) {
-          ERROR( WEBVTT_CUE_INCOMPLETE );
+        if( self->top->state == T_CUEREAD ) {
+          SAFE_ASSERT( self->top != self->stack );
+          --self->top;
+          self->popped = 1;
+        }
+
+        if( self->top->state == T_CUE ) {
+          webvtt_string text;
+          webvtt_cue *cue;
+          if( self->top->type == V_NONE ) {
+            webvtt_create_cue( &self->top->v.cue );
+            self->top->type = V_CUE;
+          }
+          cue = self->top->v.cue;
+          SAFE_ASSERT( self->popped && (self->top+1)->state == T_CUEREAD );
+          SAFE_ASSERT( cue != 0 );
+          text.d = (self->top+1)->v.text.d;
+          (self->top+1)->v.text.d = 0;
+          (self->top+1)->type = V_NONE;
+          (self->top+1)->state = 0;
+          self->column = 1;
+          status = webvtt_proc_cueline( self, cue, &text );
+          if( cue_is_incomplete( cue ) ) {
+            ERROR( WEBVTT_CUE_INCOMPLETE );
+          }
+          ++self->line;
+          self->column = 1;
+          if( self->mode == M_CUETEXT ) {
+            goto retry;
+          }
         }
         break;
-      /** 
+      /**
        * We've left off on trying to read in a cue text.
-       * Parse the partial cue text read and pass the cue back to the 
+       * Parse the partial cue text read and pass the cue back to the
        * application if possible.
        */
       case M_CUETEXT:
-        status = webvtt_parse_cuetext( self, self->top->v.cue, 
-                                       &self->line_buffer, self->finished );
-        webvtt_release_string( &self->line_buffer );
-        finish_cue( self, &self->top->v.cue );
+        status = webvtt_proc_cuetext( self, buffer, &pos, len, self->finished );
         break;
       case M_SKIP_CUE:
         /* Nothing to do here. */
@@ -193,7 +223,7 @@ webvtt_finish_parsing( webvtt_parser self )
     }
     cleanup_stack( self );
   }
-  
+
   return status;
 }
 
@@ -224,7 +254,7 @@ static int
 find_newline( const webvtt_byte *buffer, webvtt_uint *pos, webvtt_uint len )
 {
   while( *pos < len ) {
-    if( buffer[ *pos ] == UTF8_CARRIAGE_RETURN || buffer[ *pos ] == UTF8_LINE_FEED ) {
+    if( buffer[ *pos ] == '\r' || buffer[ *pos ] == '\n' ) {
       return 1;
     } else {
       ( *pos )++;
@@ -243,7 +273,7 @@ skip_spacetab( const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len,
   }
   while( *pos < len ) {
     webvtt_byte ch = text[ *pos ];
-    if( ch == 0x20 || ch == 0x09 ) {
+    if( ch == ' ' || ch == '\t' ) {
       ++( *pos );
       ++( *column );
     } else {
@@ -262,7 +292,7 @@ skip_until_white( const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len,
   }
   while( *pos < len ) {
     webvtt_byte ch = text[ *pos ];
-    if( ch == 0x20 || ch == 0x09 || ch == 0x0A || ch == 0x0D ) {
+    if( ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' ) {
       break;
     } else {
       int length = webvtt_utf8_length( text + *pos );
@@ -272,33 +302,6 @@ skip_until_white( const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len,
   }
 }
 
-static webvtt_status
-webvtt_skipwhite( const webvtt_byte *buffer, webvtt_uint *pos, webvtt_uint len )
-{
-  if( !buffer || !pos ) {
-    return WEBVTT_INVALID_PARAM;
-  }
-
-  for( ; *pos < len && webvtt_iswhite( buffer[ *pos ] ); (*pos)++ );
-
-  return WEBVTT_SUCCESS;
-}
-
-static void
-find_next_whitespace( const webvtt_byte *buffer, webvtt_uint *ppos, webvtt_uint len )
-{
-  webvtt_uint pos = *ppos;
-  while( pos < len ) {
-    webvtt_byte c = buffer[pos];
-    if( c == UTF8_CARRIAGE_RETURN || c == UTF8_LINE_FEED || c == UTF8_SPACE || c == UTF8_TAB ) {
-      break;
-    }
-
-    ++pos;
-  }
-  *ppos = pos;
-}
-
 /**
  * basic strnstr-ish routine
  */
@@ -337,7 +340,7 @@ find_bytes( const webvtt_byte *buffer, webvtt_uint len,
 /**
  * More state stack helpers
  */
-static webvtt_status
+WEBVTT_INTERN webvtt_status
 do_push( webvtt_parser self, webvtt_uint token, webvtt_uint back, webvtt_uint state, void *data, webvtt_state_value_type type, webvtt_uint line, webvtt_uint column )
 {
   if( STACK_SIZE + 1 >= self->stack_alloc ) {
@@ -356,6 +359,7 @@ do_push( webvtt_parser self, webvtt_uint token, webvtt_uint back, webvtt_uint st
   }
   ++self->top;
   self->top->state = state;
+  self->top->flags = 0;
   self->top->type = type;
   self->top->token = ( webvtt_token )token;
   self->top->line = line;
@@ -443,13 +447,13 @@ webvtt_parse_cuesetting( webvtt_parser self, const webvtt_byte *text,
             if( *pos < len ) {
               webvtt_uint column = last_column;
               webvtt_byte ch = text[ *pos ];
-              if( ch != 0x3A ) {
+              if( ch != ':' ) {
                 webvtt_error e = WEBVTT_INVALID_CUESETTING;
-                if( ch == 0x20 || ch == 0x09 ) {
+                if( ch == ' ' || ch == '\t' ) {
                   column = self->column;
                   e = WEBVTT_UNEXPECTED_WHITESPACE;
                   skip_spacetab( text, pos, len, &self->column );
-                  if( text[ *pos ] == 0x3A ) {
+                  if( text[ *pos ] == ':' ) {
                     skip_until_white( text, pos, len, &self->column );
                   }
                 } else {
@@ -461,7 +465,7 @@ webvtt_parse_cuesetting( webvtt_parser self, const webvtt_byte *text,
                 keyword_column = last_column;
               }
             } else {
-              ERROR_AT_COLUMN( WEBVTT_INVALID_CUESETTING, last_column );     
+              ERROR_AT_COLUMN( WEBVTT_INVALID_CUESETTING, last_column );
             }
             break;
           case WHITESPACE:
@@ -473,10 +477,8 @@ webvtt_parse_cuesetting( webvtt_parser self, const webvtt_byte *text,
             ERROR_AT( WEBVTT_INVALID_CUESETTING, last_line,
               last_column );
             *pos = *pos + tp + 1;
- skip_param:
-            while( *pos < len && text[ *pos ] != 0x20
-              && text[ *pos ] != 0x09 ) {
-              if( text[ *pos ] == 0x0A || text[ *pos ] == 0x0D ) {
+            while( *pos < len && text[ *pos ] != ' ' && text[ *pos ] != '\t' ) {
+              if( text[ *pos ] == '\n' || text[ *pos ] == '\r' ) {
                 return WEBVTT_SUCCESS;
               }
               ++( *pos );
@@ -518,8 +520,7 @@ get_value:
           *value_column = last_column;
           if( *pos < len ) {
             webvtt_byte ch = text[ *pos ];
-            if( ch != 0x20 && ch != 0x09
-              && ch != 0x0D && ch != 0x0A ) {
+            if( ch != ' ' && ch != '\t' && ch != '\r' && ch != '\n' ) {
               goto bad_value;
             }
           }
@@ -528,21 +529,23 @@ get_value:
             case PERCENTAGE:
               if( ( flags & TF_SIGN_MASK ) != TF_SIGN_MASK ) {
                 const webvtt_byte p = self->token[ 0 ];
-                if( ( ( flags & TF_NEGATIVE ) && p != UTF8_HYPHEN_MINUS )
-                  || ( ( flags & TF_POSITIVE ) && p == UTF8_HYPHEN_MINUS
-) ) {
+                if( ( ( flags & TF_NEGATIVE ) && p != '-' )
+                  || ( ( flags & TF_POSITIVE ) && p == '-' ) ) {
                   goto bad_value;
                 }
               }
+              break;
+
+            default: /* Currently, other types don't need these checks */
+              break;
           }
           return i + 1;
         } else {
 bad_value:
           ERROR_AT( bv, last_line, last_column );
 bad_value_eol:
-          while( *pos < len && text[ *pos ] != 0x20
-            && text[ *pos ] != 0x09 ) {
-            if( text[ *pos ] == 0x0A || text[ *pos ] == 0x0D ) {
+          while( *pos < len && text[ *pos ] != ' ' && text[ *pos ] != '\t' ) {
+            if( text[ *pos ] == '\n' || text[ *pos ] == '\r' ) {
               return WEBVTT_SUCCESS;
             }
             ++( *pos );
@@ -563,36 +566,32 @@ bad_value_eol:
 }
 
 WEBVTT_INTERN webvtt_status
-webvtt_parse_align( webvtt_parser self, webvtt_cue *cue, const
-webvtt_byte *text,
-  webvtt_uint *pos, webvtt_uint len )
+webvtt_parse_align( webvtt_parser self, webvtt_cue *cue,
+                    const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len )
 {
   webvtt_uint last_line = self->line;
   webvtt_uint last_column = self->column;
   webvtt_status v;
   webvtt_uint vc;
-  webvtt_token values[] = { START, MIDDLE, END, LEFT, RIGHT, 0 };
+  webvtt_token tokens[] = { START, MIDDLE, END, LEFT, RIGHT, 0 };
+  webvtt_align_type values[] = {
+    WEBVTT_ALIGN_START, WEBVTT_ALIGN_MIDDLE, WEBVTT_ALIGN_END,
+    WEBVTT_ALIGN_LEFT, WEBVTT_ALIGN_RIGHT
+  };
   if( ( v = webvtt_parse_cuesetting( self, text, pos, len,
-    WEBVTT_ALIGN_BAD_VALUE, ALIGN, values, &vc ) ) > 0 ) {
+    WEBVTT_ALIGN_BAD_VALUE, ALIGN, tokens, &vc ) ) > 0 ) {
     if( cue->flags & CUE_HAVE_ALIGN ) {
       ERROR_AT( WEBVTT_ALIGN_ALREADY_SET, last_line, last_column );
     }
     cue->flags |= CUE_HAVE_ALIGN;
-    switch( values[ v - 1 ] ) {
-      case START: cue->settings.align = WEBVTT_ALIGN_START; break;
-      case MIDDLE: cue->settings.align = WEBVTT_ALIGN_MIDDLE; break;
-      case END: cue->settings.align = WEBVTT_ALIGN_END; break;
-      case LEFT: cue->settings.align = WEBVTT_ALIGN_LEFT; break;
-      case RIGHT: cue->settings.align = WEBVTT_ALIGN_RIGHT; break;
-    }
+    cue->settings.align = values[ v - 1 ];
   }
   return v >= 0 ? WEBVTT_SUCCESS : v;
 }
 
 WEBVTT_INTERN webvtt_status
-webvtt_parse_line( webvtt_parser self, webvtt_cue *cue, const
-webvtt_byte *text,
-  webvtt_uint *pos, webvtt_uint len )
+webvtt_parse_line( webvtt_parser self, webvtt_cue *cue, const webvtt_byte *text,
+                   webvtt_uint *pos, webvtt_uint len )
 {
   webvtt_uint last_line = self->line;
   webvtt_uint last_column = self->column;
@@ -602,7 +601,7 @@ webvtt_byte *text,
   webvtt_token values[] = { INTEGER, PERCENTAGE|TF_POSITIVE, 0 };
   if( ( v = webvtt_parse_cuesetting( self, text, pos, len,
     WEBVTT_LINE_BAD_VALUE, LINE, values, &vc ) ) > 0 ) {
-    webvtt_uint digits;
+    int digits;
     webvtt_int64 value;
     const webvtt_byte *t = self->token;
     if( cue->flags & CUE_HAVE_LINE ) {
@@ -635,180 +634,329 @@ webvtt_byte *text,
   return v >= 0 ? WEBVTT_SUCCESS : v;
 }
 
+WEBVTT_INTERN webvtt_status
+webvtt_parse_position( webvtt_parser self, webvtt_cue *cue,
+                       const webvtt_byte *text, webvtt_uint *pos,
+                       webvtt_uint len )
+{
+  webvtt_uint last_line = self->line;
+  webvtt_uint last_column = self->column;
+  webvtt_status v;
+  webvtt_uint vc;
+  webvtt_bool first_flag = 0;
+  webvtt_token values[] = { PERCENTAGE|TF_POSITIVE, 0 };
+  if( ( v = webvtt_parse_cuesetting( self, text, pos, len,
+    WEBVTT_POSITION_BAD_VALUE, POSITION, values, &vc ) ) > 0 ) {
+    int digits;
+    webvtt_int64 value;
+    const webvtt_byte *t = self->token;
+    if( cue->flags & CUE_HAVE_LINE ) {
+      ERROR_AT( WEBVTT_POSITION_ALREADY_SET, last_line, last_column );
+    } else {
+      first_flag = 1;
+    }
+    cue->flags |= CUE_HAVE_POSITION;
+    value = parse_int( &t, &digits );
+    if( value < 0 || value > 100 ) {
+      if( first_flag ) {
+        cue->flags &= ~CUE_HAVE_POSITION;
+      }
+      ERROR_AT_COLUMN( WEBVTT_POSITION_BAD_VALUE, vc );
+      return WEBVTT_SUCCESS;
+    }
+    cue->settings.position = ( int )value;
+  }
+  return v >= 0 ? WEBVTT_SUCCESS : v;
+}
+
+WEBVTT_INTERN webvtt_status
+webvtt_parse_size( webvtt_parser self, webvtt_cue *cue, const webvtt_byte *text,
+                   webvtt_uint *pos, webvtt_uint len )
+{
+  webvtt_uint last_line = self->line;
+  webvtt_uint last_column = self->column;
+  webvtt_status v;
+  webvtt_uint vc;
+  webvtt_token tokens[] = { PERCENTAGE|TF_POSITIVE, 0 };
+  if( ( v = webvtt_parse_cuesetting( self, text, pos, len,
+    WEBVTT_SIZE_BAD_VALUE, SIZE, tokens, &vc ) ) > 0 ) {
+    if( cue->flags & CUE_HAVE_SIZE ) {
+      ERROR_AT( WEBVTT_SIZE_ALREADY_SET, last_line, last_column );
+    }
+    cue->flags |= CUE_HAVE_SIZE;
+    if( tokens[ v - 1 ] ) {
+      int digits;
+      const webvtt_byte *t = self->token;
+      webvtt_int64 value;
+      self->token_pos = 0;
+      value = parse_int( &t, &digits );
+      if( value < 0 || value > 100 ) {
+        ERROR_AT_COLUMN( WEBVTT_SIZE_BAD_VALUE, vc );
+      } else {
+        cue->settings.size = ( int )value;
+      }
+    }
+  }
+  return v >= 0 ? WEBVTT_SUCCESS : v;
+}
+
+WEBVTT_INTERN webvtt_status
+webvtt_parse_vertical( webvtt_parser self, webvtt_cue *cue,
+                       const webvtt_byte *text, webvtt_uint *pos,
+                       webvtt_uint len )
+{
+  webvtt_uint last_line = self->line;
+  webvtt_uint last_column = self->column;
+  webvtt_status v;
+  webvtt_uint vc;
+  webvtt_token tokens[] = { RL, LR, 0 };
+  webvtt_vertical_type values[] = { WEBVTT_VERTICAL_RL, WEBVTT_VERTICAL_LR };
+  if( ( v = webvtt_parse_cuesetting( self, text, pos, len,
+        WEBVTT_VERTICAL_BAD_VALUE, VERTICAL, tokens, &vc ) ) > 0 ) {
+    if( cue->flags & CUE_HAVE_VERTICAL ) {
+      ERROR_AT( WEBVTT_VERTICAL_ALREADY_SET, last_line, last_column );
+    }
+    cue->flags |= CUE_HAVE_VERTICAL;
+    cue->settings.vertical = values[ v - 1 ];
+  }
+  return v >= 0 ? WEBVTT_SUCCESS : v;
+}
+/**
+ * Read a timestamp into 'result' field, following the rules of the cue-times
+ * section of the draft:
+ * http://dev.w3.org/html5/webvtt/#collect-webvtt-cue-timings-and-settings
+ *
+ * - Ignore whitespace
+ * - Return immediately after having parsed a timestamp
+ * - Return error if timestamp invalid.
+ */
+WEBVTT_INTERN webvtt_status
+webvtt_get_timestamp( webvtt_parser self, webvtt_timestamp *result,
+                      const webvtt_byte *text, webvtt_uint *pos,
+                      webvtt_uint len, const char *accepted )
+{
+  webvtt_uint last_column = self->column;
+  webvtt_uint last_line = self->line;
+  webvtt_token token;
+  while( *pos < len ) {
+    last_column = self->column;
+    last_line = self->line;
+    token = webvtt_lex( self, text, pos, len, 1 );
+    self->token_pos = 0;
+
+    if( token == TIMESTAMP ) {
+      if( *pos < len && text[ *pos ] != '\r' && text[ *pos ] != '\n' &&
+          text[ *pos ] != ' ' &&  text[ *pos ] != '\t' ) {
+        if( accepted == 0 || !strchr( accepted, text[ *pos ] ) ) {
+          ERROR_AT( WEBVTT_EXPECTED_TIMESTAMP, last_line, last_column );
+          return WEBVTT_PARSE_ERROR;
+        }
+      }
+
+      if( !parse_timestamp( self->token, result ) ) {
+        /* Read a bad timestamp, throw away and abort cue */
+        ERROR_AT( WEBVTT_MALFORMED_TIMESTAMP, last_line, last_column );
+        if( BAD_TIMESTAMP( *result ) ) {
+          return WEBVTT_PARSE_ERROR;
+        }
+      }
+      return WEBVTT_SUCCESS;
+    }
+    else if( token == WHITESPACE ) {
+      /* Ignore whitespace */
+    } else {
+      /* Not a timestamp, this is an error. */
+      ERROR_AT( WEBVTT_EXPECTED_TIMESTAMP, last_line, last_column );
+      return WEBVTT_PARSE_ERROR;
+    }
+  }
+
+  /* If we finish entire line without reading a timestamp,
+     this is not a proper cue header and should be discarded. */
+  ERROR_AT( WEBVTT_EXPECTED_TIMESTAMP, last_line, last_column );
+  return WEBVTT_PARSE_ERROR;
+}
+
+WEBVTT_INTERN webvtt_status
+webvtt_proc_cueline( webvtt_parser self, webvtt_cue *cue,
+                     webvtt_string *line )
+{
+  const webvtt_byte *text;
+  webvtt_uint length;
+  DIE_IF( line == NULL );
+  length = webvtt_string_length( line );
+  text = webvtt_string_text( line );
+  /* backup the column */
+  self->column = 1;
+  if( find_bytes( text, length, separator, sizeof( separator ) )
+      == WEBVTT_SUCCESS) {
+    /* It's not a cue id, we found '-->'. It can't be a second
+       cueparams line, because if we had it, we would be in
+       a different state. */
+    int v;
+    self->cuetext_line = self->line + 1;
+    if( ( v = parse_cueparams( self, text, length, cue ) ) < 0 ) {
+        if( v == WEBVTT_PARSE_ERROR ) {
+          return WEBVTT_PARSE_ERROR;
+        }
+        self->mode = M_SKIP_CUE;
+      } else {
+        cue->flags |= CUE_HAVE_CUEPARAMS;
+        self->mode = M_CUETEXT;
+      }
+  } else {
+    /* It is a cue-id */
+    if( cue && cue->flags & CUE_HAVE_ID ) {
+      /**
+       * This isn't actually a cue-id, because we already
+       * have one. It seems to be cuetext, which is occurring
+       * before cue-params
+       */
+      webvtt_release_string( line );
+      ERROR( WEBVTT_CUE_INCOMPLETE );
+      self->mode = M_SKIP_CUE;
+      return WEBVTT_SUCCESS;
+    } else {
+      webvtt_uint last_column = self->column;
+      webvtt_uint last_line = self->line;
+      webvtt_token token = UNFINISHED;
+      self->column += length;
+      self->cuetext_line = self->line;
+      if( WEBVTT_FAILED( webvtt_string_append( &cue->id, text,
+                                               length ) ) ) {
+        webvtt_release_string( line );
+        ERROR( WEBVTT_ALLOCATION_FAILED );
+        return WEBVTT_OUT_OF_MEMORY;
+      }
+      cue->flags |= CUE_HAVE_ID;
+
+      /* Read cue-params line */
+      PUSH0( T_CUEREAD, 0, V_NONE );
+      webvtt_init_string( &SP->v.text );
+      SP->type = V_TEXT;
+    }
+  }
+
+  webvtt_release_string( line );
+  return WEBVTT_SUCCESS;
+}
+
 WEBVTT_INTERN int
 parse_cueparams( webvtt_parser self, const webvtt_byte *buffer,
                  webvtt_uint len, webvtt_cue *cue )
 {
-  int digits;
-  int have_ws = 0;
-  int unexpected_whitespace = 0;
-  webvtt_uint baddelim = 0;
   webvtt_uint pos = 0;
-  webvtt_token last_token = 0;
-  webvtt_uint last_line = self->line;
 
   enum cp_state {
-    CP_T1, CP_T2, CP_T3, CP_T4, CP_T5, /* 'start' cuetime, whitespace1,
-                   'separator', whitespace2, 'end' cuetime */
-    CP_CS0, /* pre-cuesetting */
+    CP_STARTTIME = 0, /* Start timestamp */
+    CP_SEPARATOR, /* --> */
+    CP_ENDTIME, /* End timestamp */
 
-    CP_SD, /* cuesettings delimiter here */
-
-    CP_V1, /* 'vertical' cuesetting */
-    CP_P1, /* 'position' cuesetting */
-    CP_A1, /* 'align' cuesetting */
-    CP_S1, /* 'size' cuesetting */
-    CP_L1, /* 'line' cuesetting */
-
-    CP_SV, /* cuesettings value here */
-
-    CP_V2,
-    CP_P2,
-    CP_A2,
-    CP_S2,
-    CP_L2,
+    CP_SETTING, /* Cuesetting */
   };
 
-  enum cp_state last_state = CP_T1;
-  enum cp_state state = CP_T1;
+  enum cp_state state = CP_STARTTIME;
 
-#define SETST(X) do { baddelim = 0; last_state = state; state = (X); } while( 0 )
+#define SETST(X) do { baddelim = 0; state = (X); } while( 0 )
 
   self->token_pos = 0;
   while( pos < len ) {
-    webvtt_uint last_column = self->column;
-    webvtt_token token = webvtt_lex( self, buffer, &pos, len, 1 );
-    webvtt_uint tlen = self->token_pos;
-    self->token_pos = 0;
-_recheck:
+    webvtt_uint last_column;
+    webvtt_uint last_line;
+    webvtt_token token;
+    webvtt_uint token_len;
+
     switch( state ) {
-        /* start timestamp */
-      case CP_T1:
-        if( token == WHITESPACE && !unexpected_whitespace ) {
-          ERROR_AT_COLUMN( WEBVTT_UNEXPECTED_WHITESPACE, self->column );
-          unexpected_whitespace = 1;
-        } else if( token == TIMESTAMP )
-          if( !parse_timestamp( self->token, &cue->from ) ) {
-            ERROR_AT_COLUMN(
-              ( BAD_TIMESTAMP( cue->from )
-                ? WEBVTT_EXPECTED_TIMESTAMP
-                : WEBVTT_MALFORMED_TIMESTAMP ), last_column  );
-            if( self->token_pos && !webvtt_isdigit( self->token[self->token_pos - 1] ) ) {
-              while( pos < len && buffer[pos] != 0x09 && buffer[pos] != 0x20 ) { ++pos; }
-            }
-            if( BAD_TIMESTAMP( cue->from ) )
-            { return -1; }
-            SETST( CP_T2 );
-          } else {
-            SETST( CP_T2 );
-          }
-        else {
-          ERROR_AT_COLUMN( WEBVTT_EXPECTED_TIMESTAMP, last_column );
+      /* start timestamp */
+      case CP_STARTTIME:
+        if( WEBVTT_FAILED( webvtt_get_timestamp( self, &cue->from, buffer, &pos,
+                                                 len, "-" ) ) ) {
+          /* abort cue */
           return -1;
         }
+
+        state = CP_SEPARATOR;
         break;
-        /* end timestamp */
-      case CP_T5:
-        if( token == WHITESPACE ) {
-          /* no problem, just ignore it and continue */
-        } else if( token == TIMESTAMP )
-          if( !parse_timestamp( self->token, &cue->until ) ) {
-            ERROR_AT_COLUMN(
-              ( BAD_TIMESTAMP( cue->until )
-                ? WEBVTT_EXPECTED_TIMESTAMP
-                : WEBVTT_MALFORMED_TIMESTAMP ), last_column  );
-            if( !webvtt_isdigit( self->token[self->token_pos - 1] ) ) {
-              while( pos < len && buffer[pos] != 0x09 && buffer[pos] != 0x20 ) { ++pos; }
-            }
-            if( BAD_TIMESTAMP( cue->until ) )
-            { return -1; }
-            SETST( CP_CS0 );
-          } else {
-            SETST( CP_CS0 );
-          }
-        else {
-          ERROR_AT_COLUMN( WEBVTT_EXPECTED_TIMESTAMP, last_column );
+
+      /* '-->' separator */
+      case CP_SEPARATOR:
+        last_column = self->column;
+        last_line = self->line;
+        token = webvtt_lex( self, buffer, &pos, len, 1 );
+        self->token_pos = 0;
+        if( token == SEPARATOR ) {
+          /* Expect end timestamp */
+          state = CP_ENDTIME;
+        } else if( token == WHITESPACE ) {
+          /* ignore whitespace */
+        } else {
+          /* Unexpected token. Abort cue. */
+          ERROR_AT( WEBVTT_EXPECTED_CUETIME_SEPARATOR, last_line, last_column );
           return -1;
         }
         break;
 
-        /* whitespace 1 */
-      case CP_T2:
-        switch( token ) {
-          case SEPARATOR:
-            ERROR_AT_COLUMN( WEBVTT_EXPECTED_WHITESPACE, last_column );
-            SETST( CP_T4 );
-            break;
-          case WHITESPACE:
-            SETST( CP_T3 );
-            break;
+      /* end timestamp */
+      case CP_ENDTIME:
+	if( WEBVTT_FAILED( webvtt_get_timestamp( self, &cue->until, buffer,
+                                                 &pos, len, 0 ) ) ) {
+          /* abort cue */
+          return -1;
         }
+
+        /* Expect cuesetting */
+        state = CP_SETTING;
         break;
-      case CP_T3:
-        switch( token ) {
-          case WHITESPACE: /* ignore this whitespace */
-            break;
 
-          case SEPARATOR:
-            SETST( CP_T4 );
-            break;
-
-          case TIMESTAMP:
-            ERROR( WEBVTT_MISSING_CUETIME_SEPARATOR );
-            SETST( CP_T5 );
-            goto _recheck;
-
-          default: /* some garbage */
-            ERROR_AT_COLUMN( WEBVTT_EXPECTED_CUETIME_SEPARATOR, last_column );
-            return -1;
-        }
-        break;
-      case CP_T4:
-        switch( token ) {
-          case WHITESPACE:
-            SETST( CP_T5 );
-            break;
-          case TIMESTAMP:
-            ERROR_AT_COLUMN( WEBVTT_EXPECTED_WHITESPACE, last_column );
-            goto _recheck;
-          default:
-            ERROR_AT_COLUMN( WEBVTT_EXPECTED_WHITESPACE, last_column );
-            goto _recheck;
-        }
-        break;
-#define CHKDELIM \
-if( baddelim ) \
-  ERROR_AT_COLUMN(WEBVTT_INVALID_CUESETTING_DELIMITER,baddelim); \
-else if( !have_ws ) \
-  ERROR_AT_COLUMN(WEBVTT_EXPECTED_WHITESPACE,last_column);
 
+      default:
         /**
-         * This section is "pre-cuesetting". We are expecting whitespace,
-         * followed by a cuesetting keyword
+         * Most of these branches need to read a token for the time
+         * being, so they're grouped together here.
          *
-         * If we don't see a keyword, but have our whitespace, it is considered
-         * a bad keyword (invalid cuesetting)
-         *
-         * Otherwise, if we don't have whitespace and have a bad token, it's an
-         * invalid delimiter
+         * TODO: Remove need to call lexer at all here.
          */
-      case CP_CS0:
+        last_column = self->column;
+        last_line = self->line;
+        token = webvtt_lex( self, buffer, &pos, len, 1 );
+        token_len = self->token_pos;
+        self->token_pos = 0;
+
         switch( token ) {
+          case NEWLINE:
+            return 0;
           case WHITESPACE:
-            have_ws = last_column;
-            break;
+            continue;
+
           case VERTICAL:
-            CHKDELIM have_ws = 0;
-            SETST( CP_V1 );
-            break;
+          {
+            webvtt_status status;
+            pos -= token_len; /* Required for parse_vertical() */
+            self->column = last_column; /* Reset for parse_vertical() */
+            status = webvtt_parse_vertical( self, cue, buffer, &pos, len );
+            if( status == WEBVTT_PARSE_ERROR ) {
+              return WEBVTT_PARSE_ERROR;
+            }
+          }
+          break;
+
+
           case POSITION:
-            CHKDELIM have_ws = 0;
-            SETST( CP_P1 );
-            break;
+          {
+            webvtt_status status;
+            pos -= token_len; /* Required for parse_position() */
+            self->column = last_column; /* Reset for parse_position() */
+            status = webvtt_parse_position( self, cue, buffer, &pos, len );
+            if( status == WEBVTT_PARSE_ERROR ) {
+              return WEBVTT_PARSE_ERROR;
+            }
+          }
+          break;
+
           case ALIGN:
           {
             webvtt_status status;
-            pos -= tlen; /* Required for parse_align() */
+            pos -= token_len; /* Required for parse_align() */
             self->column = last_column; /* Reset for parse_align() */
             status = webvtt_parse_align( self, cue, buffer, &pos, len );
             if( status == WEBVTT_PARSE_ERROR ) {
@@ -818,14 +966,22 @@ else if( !have_ws ) \
           break;
 
           case SIZE:
-            CHKDELIM have_ws = 0;
-            SETST( CP_S1 );
-            break;
+          {
+            webvtt_status status;
+            pos -= token_len; /* Required for parse_size() */
+            self->column = last_column; /* Reset for parse_size() */
+            status = webvtt_parse_size( self, cue, buffer, &pos, len );
+            if( status == WEBVTT_PARSE_ERROR ) {
+              return WEBVTT_PARSE_ERROR;
+            }
+          }
+          break;
+
           case LINE:
           {
             webvtt_status status;
-            pos -= tlen; /* Required for parse_align() */
-            self->column = last_column; /* Reset for parse_align() */
+            pos -= token_len; /* Required for parse_line() */
+            self->column = last_column; /* Reset for parse_line() */
             status = webvtt_parse_line( self, cue, buffer, &pos, len );
             if( status == WEBVTT_PARSE_ERROR ) {
               return WEBVTT_PARSE_ERROR;
@@ -833,267 +989,28 @@ else if( !have_ws ) \
           }
           break;
           default:
-            if( have_ws ) {
-              ERROR_AT_COLUMN( WEBVTT_INVALID_CUESETTING, last_column );
-            } else if( token == BADTOKEN ) {
-              /* it was a bad delimiter... */
-              if( !baddelim ) {
-                baddelim = last_column;
-              }
-              ++pos;
-            }
-            while( pos < len && buffer[pos] != 0x09 && buffer[pos] != 0x20 ) {
+            ERROR_AT_COLUMN( WEBVTT_INVALID_CUESETTING, last_column );
+            while( pos < len && buffer[pos] != '\t' && buffer[pos] != ' ' ) {
               ++pos;
             }
         }
         break;
-#define CS1(S) \
-  if( token == COLON ) \
-  { if(have_ws) { ERROR_AT_COLUMN(WEBVTT_UNEXPECTED_WHITESPACE,have_ws); } SETST((S)); have_ws = 0; } \
-  else if( token == WHITESPACE && !have_ws ) \
-  { \
-    have_ws = last_column; \
-  } \
-  else \
-  { \
-    switch(token) \
-    { \
-    case LR: case RL: case INTEGER: case PERCENTAGE: case START: case MIDDLE: case END: case LEFT: case RIGHT: \
-       ERROR_AT_COLUMN(WEBVTT_MISSING_CUESETTING_DELIMITER,have_ws ? have_ws : last_column); break; \
-    default: \
-      ERROR_AT_COLUMN(WEBVTT_INVALID_CUESETTING_DELIMITER,last_column); \
-      while( pos < len && buffer[pos] != 0x20 && buffer[pos] != 0x09 ) ++pos; \
-      break; \
-    } \
-    have_ws = 0; \
-  }
-
-        /**
-         * If we get a COLON, we advance to the next state.
-         * If we encounter whitespace first, fire an "unexpected whitespace"
-         * error and continue. If we encounter a cue-setting value, fire a
-         * "missing cuesetting delimiter" error otherwise (eg vertical;rl), fire
-         * "invalid cuesetting delimiter" error
-         *
-         * this logic is performed by the CS1 macro, defined above
-         */
-      case CP_V1:
-        CS1( CP_V2 );
-        break;
-      case CP_P1:
-        CS1( CP_P2 );
-        break;
-      case CP_A1:
-        CS1( CP_A2 );
-        break;
-      case CP_S1:
-        CS1( CP_S2 );
-        break;
-      case CP_L1:
-        CS1( CP_L2 );
-        break;
-#undef CS1
-
-/* BV: emit the BAD_VALUE error for the appropriate setting, when required */
-#define BV(T) \
-ERROR_AT_COLUMN(WEBVTT_##T##_BAD_VALUE,last_column); \
-while( pos < len && buffer[pos] != 0x20 && buffer[pos] != 0x09 ) ++pos; \
-SETST(CP_CS0);
-
-/* HV: emit the ALREADY_SET (have value) error for the appropriate setting, when required */
-#define HV(T) \
-if( cue->flags & CUE_HAVE_##T ) \
-{ \
-  ERROR_AT_COLUMN(WEBVTT_##T##_ALREADY_SET,last_column); \
-}
-/* WS: emit the WEBVTT_UNEXPECTED_WHITESPACE error when required. */
-#define WS \
-case WHITESPACE: \
-  if( !have_ws ) \
-  { \
-    ERROR_AT_COLUMN(WEBVTT_UNEXPECTED_WHITESPACE,last_column); \
-    have_ws = last_column; \
-  } \
-break
-
-/* set that the cue already has a value for this */
-#define SV(T) cue->flags |= CUE_HAVE_##T
-      case CP_V2:
-        HV( VERTICAL );
-        switch( token ) {
-            WS;
-          case LR:
-            cue->settings.vertical = WEBVTT_VERTICAL_LR;
-            have_ws = 0;
-            SETST( CP_CS0 );
-            SV( VERTICAL );
-            break;
-          case RL:
-            cue->settings.vertical = WEBVTT_VERTICAL_RL;
-            have_ws = 0;
-            SETST( CP_CS0 );
-            SV( VERTICAL );
-            break;
-          default:
-            BV( VERTICAL );
-        }
-        break;
-
-      case CP_P2:
-        HV( POSITION );
-        switch( token ) {
-            WS;
-          case PERCENTAGE: {
-            int digits;
-            const webvtt_byte *t = self->token;
-            webvtt_int64 v = parse_int( &t, &digits );
-            if( v < 0 ) {
-              BV( POSITION );
-            }
-            cue->settings.position = ( webvtt_uint )v;
-            SETST( CP_CS0 );
-            SV( POSITION );
-          }
-          break;
-          default:
-            BV( POSITION );
-            break;
-        }
-        break;
-
-      case CP_A2:
-        HV( ALIGN );
-        switch( token ) {
-            WS;
-          case START:
-            cue->settings.align = WEBVTT_ALIGN_START;
-            have_ws = 0;
-            SETST( CP_CS0 );
-            SV( ALIGN );
-            break;
-          case MIDDLE:
-            cue->settings.align = WEBVTT_ALIGN_MIDDLE;
-            have_ws = 0;
-            SETST( CP_CS0 );
-            SV( ALIGN );
-            break;
-          case END:
-            cue->settings.align = WEBVTT_ALIGN_END;
-            have_ws = 0;
-            SETST( CP_CS0 );
-            SV( ALIGN );
-            break;
-          case LEFT:
-            cue->settings.align = WEBVTT_ALIGN_LEFT;
-            have_ws = 0;
-            SETST( CP_CS0 );
-            SV( ALIGN );
-            break;
-          case RIGHT:
-            cue->settings.align = WEBVTT_ALIGN_RIGHT;
-            have_ws = 0;
-            SETST( CP_CS0 );
-            SV( ALIGN );
-            break;
-          default:
-            BV( ALIGN );
-            break;
-        }
-        break;
-
-      case CP_S2:
-        HV( SIZE );
-        switch( token ) {
-            WS;
-          case PERCENTAGE: {
-            int digits;
-            const webvtt_byte *t = self->token;
-            webvtt_int64 v = parse_int( &t, &digits );
-            if( v < 0 ) {
-              BV( SIZE );
-            }
-            cue->settings.size = ( webvtt_uint )v;
-            SETST( CP_CS0 );
-            SV( SIZE );
-          }
-          break;
-          default:
-            BV( SIZE );
-            break;
-        }
-        break;
-
-      case CP_L2:
-        HV( LINE );
-        switch( token ) {
-            WS;
-          case INTEGER: {
-            const webvtt_byte *t = self->token;
-            webvtt_int64 v = parse_int( &t, &digits );
-            cue->snap_to_lines = 1;
-            cue->settings.line = ( int )v;
-            SETST( CP_CS0 );
-            SV( LINE );
-          }
-          break;
-          case PERCENTAGE: {
-            const webvtt_byte *t = self->token;
-            webvtt_int64 v = parse_int( &t, &digits );
-            if( v < 0 ) {
-              BV( POSITION );
-            }
-            cue->snap_to_lines = 0;
-            cue->settings.line = ( int )v;
-            SETST( CP_CS0 );
-            SV( LINE );
-          }
-          break;
-          default:
-            BV( LINE );
-            break;
-        }
-#undef BV
-#undef HV
-#undef SV
-#undef WS
     }
     self->token_pos = 0;
-    last_token = token;
   }
   /**
    * If we didn't finish in a good state...
    */
-  if( state != CP_CS0 ) {
+  if( state != CP_SETTING ) {
     /* if we never made it to the cuesettings, we didn't finish the cuetimes */
-    if( state < CP_CS0 ) {
+    if( state < CP_SETTING ) {
       ERROR( WEBVTT_UNFINISHED_CUETIMES );
       return -1;
     } else {
       /* if we did, we should report an error but continue parsing. */
       webvtt_error e = WEBVTT_INVALID_CUESETTING;
-      switch( state ) {
-        case CP_V2:
-          e = WEBVTT_VERTICAL_BAD_VALUE;
-          break;
-        case CP_P2:
-          e = WEBVTT_POSITION_BAD_VALUE;
-          break;
-        case CP_A2:
-          e = WEBVTT_ALIGN_BAD_VALUE;
-          break;
-        case CP_S2:
-          e = WEBVTT_SIZE_BAD_VALUE;
-          break;
-        case CP_L2:
-          e = WEBVTT_LINE_BAD_VALUE;
-          break;
-      }
       ERROR( e );
     }
-  } else {
-    if( baddelim ) {
-      ERROR_AT_COLUMN( WEBVTT_INVALID_CUESETTING_DELIMITER, baddelim );
-    }
   }
 #undef SETST
   return 0;
@@ -1101,42 +1018,47 @@ break
 
 static webvtt_status
 parse_webvtt( webvtt_parser self, const webvtt_byte *buffer, webvtt_uint *ppos,
-              webvtt_uint len, webvtt_parse_mode *mode, int finish )
+              webvtt_uint len, int finish )
 {
   webvtt_status status = WEBVTT_SUCCESS;
-  webvtt_token token;
+  webvtt_token token = 0;
   webvtt_uint pos = *ppos;
-  int settings_delimiter = 0;
   int skip_error = 0;
-  int settings_whitespace = 0;
 
   while( pos < len ) {
-    webvtt_uint last_column, last_line, last_pos;
+    webvtt_uint last_column, last_line;
     skip_error = 0;
-_next:
     last_column = self->column;
     last_line = self->line;
-    last_pos = pos;
 
     /**
      * If we're in certain states, we don't want to get a token and just
      * want to read text instead.
      */
     if( SP->state == T_CUEREAD ) {
-      int v;
-      webvtt_uint old_pos = pos;
-      if( v = webvtt_string_getline( &SP->v.text, buffer, &pos,
-                                        len, 0, finish, 0 ) ) {
-        if( v < 0 ) {
-          webvtt_release_string( &SP->v.text );
-          SP->type = V_NONE;
-          POP();
-          ERROR( WEBVTT_ALLOCATION_FAILED );
-          status = WEBVTT_OUT_OF_MEMORY;
-          goto _finish;
+      DIE_IF( SP->type != V_TEXT );
+      if( SP->flags == 0 ) {
+        int v;
+        if( ( v = webvtt_string_getline( &SP->v.text, buffer, &pos, len, 0,
+                                         finish ) ) ) {
+          if( v < 0 ) {
+            webvtt_release_string( &SP->v.text );
+            SP->type = V_NONE;
+            POP();
+            ERROR( WEBVTT_ALLOCATION_FAILED );
+            status = WEBVTT_OUT_OF_MEMORY;
+            goto _finish;
+          }
+          SP->flags = 1;
+        }
+      }
+      if( SP->flags ) {
+        webvtt_token token = webvtt_lex_newline( self, buffer, &pos, len,
+                                                 self->finished );
+        if( token == NEWLINE ) {
+          POP();
+          continue;
         }
-        /* POP the stack and let the previous frame deal with it */
-        POP();
       }
     }
 
@@ -1164,6 +1086,10 @@ _next:
     }
 _recheck:
     switch( SP->state ) {
+      default:
+        /* Should never happen */
+        break;
+
       case T_INITIAL:
         /**
          * In the initial state:
@@ -1180,15 +1106,10 @@ _recheck:
         if( token == WEBVTT ) {
           PUSH0( T_TAG, 0, V_NONE );
           break;
-        } else {
-          if( pos != len ) {
-            if( !skip_error ) {
-              ERROR_AT_COLUMN( WEBVTT_MALFORMED_TAG, last_column );
-              skip_error = 1;
-            }
-            status = WEBVTT_PARSE_ERROR;
-            goto _finish;
-          }
+        } else if( token != UNFINISHED ) {
+          ERROR_AT( WEBVTT_MALFORMED_TAG, 1, 1 );
+          status = WEBVTT_PARSE_ERROR;
+          goto _finish;
         }
         break;
 
@@ -1256,6 +1177,9 @@ _recheck:
           case NEWLINE:
             SP->state = T_FROM;
             break;
+
+          default:
+            break;
         }
 
         /**
@@ -1307,94 +1231,37 @@ _recheck:
 
 
       case T_CUE:
-        if( self->popped && FRAMEUP( 1 )->state == T_CUEREAD ) {
-          /**
-           * We're expecting either cue-id (contains '-->') or cue
-           * params
-           */
-          webvtt_cue *cue = SP->v.cue;
-          webvtt_state *st = FRAMEUP( 1 );
-          webvtt_string text = st->v.text;
+      {
+        webvtt_cue *cue;
+        webvtt_state *st;
+        webvtt_string text;
+        SAFE_ASSERT( self->popped && FRAMEUP( 1 )->state == T_CUEREAD );
+        /**
+         * We're expecting either cue-id (contains '-->') or cue
+         * params
+         */
+        cue = SP->v.cue;
+        st = FRAMEUP( 1 );
+        text.d = st->v.text.d;
 
-          /* FIXME: guard inconsistent state */
-          if (!cue) {
-            ERROR( WEBVTT_PARSE_ERROR );
-            status = WEBVTT_PARSE_ERROR;
-            goto _finish;
-          }
+        st->type = V_NONE;
+        st->v.cue = NULL;
 
-          st->type = V_NONE;
-          st->v.cue = NULL;
-
-          /**
-           * The type should be V_TEXT. If it's not, somethings wrong.
-           *
-           * TODO: Add debug assertion
-           */
-          if( find_bytes( webvtt_string_text( &text ), webvtt_string_length( &text ), separator,
-                          sizeof( separator ) ) == WEBVTT_SUCCESS) {
-            /* It's not a cue id, we found '-->'. It can't be a second
-               cueparams line, because if we had it, we would be in
-               a different state. */
-            int v;
-            /* backup the column */
-            self->column = 1;
-            if( ( v = parse_cueparams( self, webvtt_string_text( &text ),
-                                       webvtt_string_length( &text ), cue ) ) < 0 ) {
-              if( v == WEBVTT_PARSE_ERROR ) {
-                status = WEBVTT_PARSE_ERROR;
-                goto _finish;
-              }
-              webvtt_release_string( &text );
-              *mode = M_SKIP_CUE;
-              goto _finish;
-            } else {
-              webvtt_release_string( &text );
-              cue->flags |= CUE_HAVE_CUEPARAMS;
-              *mode = M_CUETEXT;
-              goto _finish;
-            }
-          } else {
-            /* It is a cue-id */
-            if( cue && cue->flags & CUE_HAVE_ID ) {
-              /**
-               * This isn't actually a cue-id, because we already
-               * have one. It seems to be cuetext, which is occurring
-               * before cue-params
-               */
-              webvtt_release_string( &text );
-              ERROR( WEBVTT_CUE_INCOMPLETE );
-              *mode = M_SKIP_CUE;
-              goto _finish;
-            } else {
-              self->column += webvtt_string_length( &text );
-              if( WEBVTT_FAILED( status = webvtt_string_append(
-                                            &cue->id, webvtt_string_text( &text ), webvtt_string_length( &text ) ) ) ) {
-                webvtt_release_string( &text );
-                ERROR( WEBVTT_ALLOCATION_FAILED );
-              }
-
-              cue->flags |= CUE_HAVE_ID;
-            }
-          }
-          webvtt_release_string( &text );
-          self->popped = 0;
-        } else {
-          webvtt_cue *cue = SP->v.cue;
-          /* If we have a newline, it might be the end of the cue. */
-          if( token == NEWLINE ) {
-            if( cue->flags & CUE_HAVE_CUEPARAMS ) {
-              *mode = M_CUETEXT;
-            } else if( cue->flags & CUE_HAVE_ID ) {
-              PUSH0( T_CUEREAD, 0, V_NONE );
-            } else {
-              /* I don't think this should ever happen? */
-              POPBACK();
-            }
-          }
+        /* FIXME: guard inconsistent state */
+        if (!cue) {
+          ERROR( WEBVTT_PARSE_ERROR );
+          status = WEBVTT_PARSE_ERROR;
+          goto _finish;
         }
-        break;
 
+        status = webvtt_proc_cueline( self, cue, &text );
+        ++self->line;
+        if( self->mode != M_WEBVTT ) {
+          goto _finish;
+        }
+        self->popped = 0;
+      }
+      break;
     }
 
     /**
@@ -1412,46 +1279,158 @@ _finish:
   return status;
 }
 
-static webvtt_status
-read_cuetext( webvtt_parser self, const webvtt_byte *b, webvtt_uint
-*ppos, webvtt_uint len, webvtt_parse_mode *mode, webvtt_bool finish )
+WEBVTT_INTERN webvtt_status
+webvtt_read_cuetext( webvtt_parser self, const webvtt_byte *b,
+                     webvtt_uint *ppos, webvtt_uint len, webvtt_bool finish )
 {
   webvtt_status status = WEBVTT_SUCCESS;
   webvtt_uint pos = *ppos;
   int finished = 0;
-  do {
-    int v;
-    if( ( v = webvtt_string_getline( &self->line_buffer, b, &pos, len, &self->truncate, finish, 1 ) ) ) {
-      if( v < 0 ) {
-        status = WEBVTT_OUT_OF_MEMORY;
-        goto _finish;
-      }
+  int flags = 0;
+  webvtt_cue *cue;
 
-      /**
-       * We've encountered a line without any cuetext on it, i.e. there is no
-       * newline character and len is 0 or there is and len is 1, therefore,
-       * the cue text is finished.
-       */
-      if( self->line_buffer.d->length <= 1 ) {
-        /**
-         * finished
+  /* Ensure that we have a cue to work with */
+  SAFE_ASSERT( self->top->type = V_CUE );
+  cue = self->top->v.cue;
+
+  /**
+   * Hack to support lines spanning multiple buffers.
+   *
+   * TODO: Do this some better way. This is not good!
+   */
+  if( self->line_buffer.d != 0 && self->line_buffer.d->text[
+      self->line_buffer.d->length - 1 ] == '\n' ) {
+    flags = 1;
+  }
+
+  do {
+    if( !flags ) {
+      int v;
+      if( ( v = webvtt_string_getline( &self->line_buffer, b, &pos, len,
+                                       &self->truncate, finish ) ) ) {
+        if( v < 0 || WEBVTT_FAILED( webvtt_string_putc( &self->line_buffer,
+                                                        '\n' ) ) ) {
+          status = WEBVTT_OUT_OF_MEMORY;
+          goto _finish;
+        }
+        flags = 1;
+      }
+    }
+    if( flags ) {
+      webvtt_token token = webvtt_lex_newline( self, b, &pos, len, finish );
+      if( token == NEWLINE ) {
+        self->token_pos = 0;
+        self->line++;
+
+        /* Remove the '\n' that we appended to determine that we're in state 1
          */
-        finished = 1;
+        self->line_buffer.d->text[ --self->line_buffer.d->length ] = 0;
+        /**
+         * We've encountered a line without any cuetext on it, i.e. there is no
+         * newline character and len is 0 or there is and len is 1, therefore,
+         * the cue text is finished.
+         */
+        if( self->line_buffer.d->length == 0 ) {
+          webvtt_release_string( &self->line_buffer );
+          finished = 1;
+        } else if( find_bytes( webvtt_string_text( &self->line_buffer ),
+                   webvtt_string_length( &self->line_buffer ), separator,
+                   sizeof( separator ) ) == WEBVTT_SUCCESS ) {
+          /**
+           * Line contains cue-times separator, and thus we treat it as a
+           * separate cue. Trick program into thinking that T_CUEREAD had read
+           * this line.
+           */
+          do_push( self, 0, 0, T_CUEREAD, 0, V_NONE, self->line, self->column );
+          webvtt_copy_string( &SP->v.text, &self->line_buffer );
+          webvtt_release_string( &self->line_buffer );
+          SP->type = V_TEXT;
+          POP();
+          finished = 1;
+        } else {
+          /**
+           * If it's not the end of a cue, simply append it to the cue's payload
+           * text.
+           */
+          if( webvtt_string_length( &cue->body ) &&
+              WEBVTT_FAILED( webvtt_string_putc( &cue->body, '\n' ) ) ) {
+            status = WEBVTT_OUT_OF_MEMORY;
+            goto _finish;
+          }
+          webvtt_string_append_string( &cue->body, &self->line_buffer );
+          webvtt_release_string( &self->line_buffer );
+          flags = 0;
+        }
       }
     }
   } while( pos < len && !finished );
 _finish:
   *ppos = pos;
+  if( finish ) {
+    finished = 1;
+  }
+
   /**
    * If we didn't encounter 2 successive EOLs, and it's not the final buffer in
    * the file, notify the caller.
    */
-  if( pos >= len && !WEBVTT_FAILED( status ) && !finished ) {
+  if( !finish && pos >= len && !WEBVTT_FAILED( status ) && !finished ) {
     status = WEBVTT_UNFINISHED;
   }
   return status;
 }
 
+WEBVTT_INTERN webvtt_status
+webvtt_proc_cuetext( webvtt_parser self, const webvtt_byte *b,
+                     webvtt_uint *ppos, webvtt_uint len, webvtt_bool finish )
+{
+  webvtt_status status;
+  webvtt_cue *cue;
+  SAFE_ASSERT( ( self->mode == M_CUETEXT || self->mode == M_SKIP_CUE )
+               && self->top->type == V_CUE );
+  cue = self->top->v.cue;
+  SAFE_ASSERT( cue != 0 );
+  status  = webvtt_read_cuetext( self, b, ppos, len, finish );
+
+  if( status == WEBVTT_SUCCESS ) {
+    if( self->mode != M_SKIP_CUE ) {
+      /**
+       * Once we've successfully read the cuetext into line_buffer, call the
+       * cuetext parser from cuetext.c
+       */
+      status = webvtt_parse_cuetext( self, cue, &cue->body,
+                                     self->finished );
+
+      /**
+       * return the cue to the user, if possible.
+       */
+      finish_cue( self, &cue );
+    } else {
+      webvtt_release_cue( &cue );
+    }
+
+    self->top->type = V_NONE;
+    self->top->state = 0;
+    self->top->v.cue = 0;
+
+    if( (self->top+1)->type == V_NONE ) {
+      (self->top+1)->state = 0;
+      /* Pop from T_CUE state */
+      POP();
+    } else {
+      /**
+       * If we found '-->', we need to create another cue and remain
+       * in T_CUE state
+       */
+      webvtt_create_cue( &self->top->v.cue );
+      self->top->type = V_CUE;
+      self->top->state = T_CUE;
+    }
+    self->mode = M_WEBVTT;
+  }
+  return status;
+}
+
 WEBVTT_EXPORT webvtt_status
 webvtt_parse_chunk( webvtt_parser self, const void *buffer, webvtt_uint len )
 {
@@ -1462,7 +1441,7 @@ webvtt_parse_chunk( webvtt_parser self, const void *buffer, webvtt_uint len )
   while( pos < len ) {
     switch( self->mode ) {
       case M_WEBVTT:
-        if( WEBVTT_FAILED( status = parse_webvtt( self, b, &pos, len, &self->mode, self->finished ) ) ) {
+        if( WEBVTT_FAILED( status = parse_webvtt( self, b, &pos, len, self->finished ) ) ) {
           return status;
         }
         break;
@@ -1471,30 +1450,14 @@ webvtt_parse_chunk( webvtt_parser self, const void *buffer, webvtt_uint len )
         /**
          * read in cuetext
          */
-        if( WEBVTT_FAILED( status = read_cuetext( self, b, &pos, len, &self->mode, self->finished ) ) ) {
+        if( WEBVTT_FAILED( status = webvtt_proc_cuetext( self, b, &pos, len,
+                                                  self->finished ) ) ) {
           if( status == WEBVTT_UNFINISHED ) {
             /* Make an exception here, because this isn't really a failure. */
             return WEBVTT_SUCCESS;
           }
           return status;
         }
-        /**
-         * Once we've successfully read the cuetext into line_buffer, call the
-         * cuetext parser from cuetext.c
-         */
-        status = webvtt_parse_cuetext( self, SP->v.cue, &self->line_buffer, self->finished );
-
-        /**
-         * return the cue to the user, if possible.
-         */
-        finish_cue( self, &SP->v.cue );
-
-        /**
-         * return to our typical parsing mode now.
-         */
-        SP->type = V_NONE;
-        webvtt_release_string( &self->line_buffer );
-        self->mode = M_WEBVTT;
 
         /* If we failed to parse cuetext, return the error */
         if( WEBVTT_FAILED( status ) ) {
@@ -1503,11 +1466,10 @@ webvtt_parse_chunk( webvtt_parser self, const void *buffer, webvtt_uint len )
         break;
 
       case M_SKIP_CUE:
-        if( WEBVTT_FAILED( status = read_cuetext( self, b, &pos, len, &self->mode, self->finished ) ) ) {
+        if( WEBVTT_FAILED( status = webvtt_proc_cuetext( self, b, &pos, len,
+                                                  self->finished ) ) ) {
           return status;
         }
-        webvtt_release_string( &self->line_buffer );
-        self->mode = M_WEBVTT;
         break;
 
       case M_READ_LINE: {
@@ -1516,7 +1478,9 @@ webvtt_parse_chunk( webvtt_parser self, const void *buffer, webvtt_uint len )
          * we will and depending on our state, do something with it.
          */
         int ret;
-        if( ( ret = webvtt_string_getline( &self->line_buffer, b, &pos, len, &self->truncate, self->finished, 0 ) ) ) {
+        if( ( ret = webvtt_string_getline( &self->line_buffer, b, &pos, len,
+                                           &self->truncate,
+                                           self->finished ) ) ) {
           if( ret < 0 ) {
             ERROR( WEBVTT_ALLOCATION_FAILED );
             return WEBVTT_OUT_OF_MEMORY;
@@ -1526,9 +1490,6 @@ webvtt_parse_chunk( webvtt_parser self, const void *buffer, webvtt_uint len )
         break;
       }
     }
-    if( WEBVTT_FAILED( status = webvtt_skipwhite( b, &pos, len ) ) ) {
-      return status;
-    }
   }
 
   return WEBVTT_SUCCESS;
@@ -1558,9 +1519,9 @@ parse_int( const webvtt_byte **pb, int *pdigits )
       /**
        * Digit character, carry on
        */
-      result = result * 10 + ( ch - UTF8_DIGIT_ZERO );
+      result = result * 10 + ( ch - '0' );
       ++digits;
-    } else if( mul == 1 && digits == 0 && ch == UTF8_HYPHEN_MINUS ) {
+    } else if( mul == 1 && digits == 0 && ch == '-' ) {
       mul = -1;
     } else {
       break;
@@ -1602,7 +1563,7 @@ parse_timestamp( const webvtt_byte *b, webvtt_timestamp *result )
   }
 
   /* fail if missing colon ':' character */
-  if ( !*b || *b++ != UTF8_COLON ) {
+  if ( !*b || *b++ != ':' ) {
     malformed = 1;
   }
 
@@ -1617,10 +1578,10 @@ parse_timestamp( const webvtt_byte *b, webvtt_timestamp *result )
     malformed = 1;
   }
 
-  /* if we already know there's an hour component, or if the next byte is a 
+  /* if we already know there's an hour component, or if the next byte is a
      colon ':', read the next value */
-  if ( have_hours || ( *b == UTF8_COLON ) ) {
-    if( *b++ != UTF8_COLON ) {
+  if ( have_hours || ( *b == ':' ) ) {
+    if( *b++ != ':' ) {
       goto _malformed;
     }
     if( !*b || !webvtt_isdigit( *b ) ) {
@@ -1639,7 +1600,7 @@ parse_timestamp( const webvtt_byte *b, webvtt_timestamp *result )
 
   /* collect the manditory seconds-frac component. fail if there is no FULL_STOP
      '.' or if there is no ascii digit following it */
-  if( *b++ != UTF8_FULL_STOP || !webvtt_isdigit( *b ) ) {
+  if( *b++ != '.' || !webvtt_isdigit( *b ) ) {
     goto _malformed;
   }
   v[3] = parse_int( &b, &digits );
diff --git a/media/webvtt/parser_internal.h b/media/webvtt/parser_internal.h
index 4675601e8ddd..0085d2c8c6d9 100644
--- a/media/webvtt/parser_internal.h
+++ b/media/webvtt/parser_internal.h
@@ -144,18 +144,21 @@ webvtt_parse_state_t {
  */
 typedef enum
 webvtt_lexer_state_t {
-  L_START = 0, L_BOM0, L_BOM1, L_WEBVTT0, L_WEBVTT1, L_WEBVTT2, L_WEBVTT3, L_WEBVTT4, L_WEBVTT5, L_DASH0, L_SEP1,
-  L_DIGIT0, L_NEWLINE0, L_WHITESPACE, L_POSITION0, L_POSITION1, L_POSITION2, L_POSITION3, L_POSITION4, L_POSITION5,
-  L_POSITION6, L_ALIGN0, L_ALIGN1, L_ALIGN2, L_ALIGN3, L_L0, L_LINE1, L_LINE2, L_LINE3,
-  L_VERTICAL0, L_VERTICAL1, L_VERTICAL2, L_VERTICAL3, L_VERTICAL4, L_VERTICAL5, L_VERTICAL6, L_RL0,
-  L_S0, L_SIZE1, L_SIZE2, L_START1, L_START2, L_START3, L_MIDDLE0, L_MIDDLE1, L_MIDDLE2, L_MIDDLE3,
-  L_MIDDLE4, L_END0, L_END1, L_TIMESTAMP1, L_TIMESTAMP2, L_TIMESTAMP3, L_RIGHT1, L_RIGHT2,
-  L_RIGHT3, L_NOTE1, L_NOTE2, L_NOTE3, L_LEFT1, L_LEFT2,
+  L_START = 0, L_BOM0, L_BOM1, L_WEBVTT0, L_WEBVTT1, L_WEBVTT2, L_WEBVTT3,
+  L_WEBVTT4, L_DASH0, L_SEP1, L_DIGIT0, L_NEWLINE0, L_WHITESPACE, L_POSITION0,
+  L_POSITION1, L_POSITION2, L_POSITION3, L_POSITION4, L_POSITION5, L_POSITION6,
+  L_ALIGN0, L_ALIGN1, L_ALIGN2, L_ALIGN3, L_L0, L_LINE1, L_LINE2, L_VERTICAL0,
+  L_VERTICAL1, L_VERTICAL2, L_VERTICAL3, L_VERTICAL4, L_VERTICAL5, L_VERTICAL6,
+  L_RL0, L_S0, L_SIZE1, L_SIZE2, L_START1, L_START2, L_START3, L_MIDDLE0,
+  L_MIDDLE1, L_MIDDLE2, L_MIDDLE3, L_MIDDLE4, L_END0, L_END1, L_TIMESTAMP1,
+  L_TIMESTAMP2, L_TIMESTAMP3, L_RIGHT1, L_RIGHT2, L_RIGHT3, L_NOTE1, L_NOTE2,
+  L_NOTE3, L_LEFT1, L_LEFT2,
 } webvtt_lexer_state;
 
 typedef struct
 webvtt_state {
   webvtt_parse_state state;
+  webvtt_uint flags; /* Defaults to 0 when pushed */
   webvtt_token token;
   webvtt_state_value_type type;
   webvtt_uint back;
@@ -199,6 +202,8 @@ webvtt_parser_t {
   void *userdata;
   webvtt_bool finished;
   
+  webvtt_uint cuetext_line; /* start line of cuetext */
+
   /**
    * 'mode' can have several states, it is not boolean.
    */
@@ -227,8 +232,47 @@ webvtt_parser_t {
 
 WEBVTT_INTERN webvtt_token webvtt_lex( webvtt_parser self, const webvtt_byte *buffer, webvtt_uint *pos, webvtt_uint length, webvtt_bool finish );
 WEBVTT_INTERN webvtt_status webvtt_lex_word( webvtt_parser self, webvtt_string *pba, const webvtt_byte *buffer, webvtt_uint *pos, webvtt_uint length, webvtt_bool finish );
+
+/* Tokenize newline sequence, without incrementing 'self->line'. Returns
+ * BAD_TOKEN when a newline sequence is not found. */
+WEBVTT_INTERN webvtt_token webvtt_lex_newline( webvtt_parser self, const
+  webvtt_byte *buffer, webvtt_uint *pos, webvtt_uint length, webvtt_bool finish );
+
+WEBVTT_INTERN webvtt_status webvtt_proc_cueline( webvtt_parser self,
+  webvtt_cue *cue, webvtt_string *line );
+
+WEBVTT_INTERN webvtt_status webvtt_parse_align( webvtt_parser self,
+  webvtt_cue *cue, const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len );
+
+WEBVTT_INTERN webvtt_status webvtt_parse_line( webvtt_parser self,
+  webvtt_cue *cue, const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len );
+
+WEBVTT_INTERN webvtt_status webvtt_parse_position( webvtt_parser self,
+  webvtt_cue *cue, const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len );
+
+WEBVTT_INTERN webvtt_status webvtt_parse_size( webvtt_parser self,
+  webvtt_cue *cue, const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len );
+
+WEBVTT_INTERN webvtt_status webvtt_parse_vertical( webvtt_parser self,
+  webvtt_cue *cue, const webvtt_byte *text, webvtt_uint *pos, webvtt_uint len );
+
 WEBVTT_INTERN int parse_timestamp( const webvtt_byte *b, webvtt_timestamp *result );
 
+WEBVTT_INTERN webvtt_status do_push( webvtt_parser self, webvtt_uint token,
+  webvtt_uint back, webvtt_uint state, void *data, webvtt_state_value_type type,
+  webvtt_uint line, webvtt_uint column );
+
+WEBVTT_INTERN webvtt_status webvtt_read_cuetext( webvtt_parser self,
+  const webvtt_byte *b, webvtt_uint *ppos, webvtt_uint len,
+  webvtt_bool finish );
+
+WEBVTT_INTERN webvtt_status webvtt_proc_cuetext( webvtt_parser self,
+  const webvtt_byte *b, webvtt_uint *ppos, webvtt_uint len,
+  webvtt_bool finish );
+
+WEBVTT_INTERN int parse_cueparams( webvtt_parser self, const webvtt_byte *text,
+  webvtt_uint len, webvtt_cue *cue );
+
 /** 
  * Flags which can apply additional meaning to a token. find_token() will
  * test for only the actual token and ignore the additional flags.
diff --git a/media/webvtt/string.c b/media/webvtt/string.c
index 708107b91ec4..1a4f7105d7c1 100644
--- a/media/webvtt/string.c
+++ b/media/webvtt/string.c
@@ -84,8 +84,6 @@ webvtt_create_string( webvtt_uint32 alloc, webvtt_string *result )
 WEBVTT_EXPORT webvtt_status
 webvtt_create_string_with_text( webvtt_string *result, const webvtt_byte *init_text, int len )
 {
-  webvtt_uint pos = 0;
-
   if( !result ) {
     return WEBVTT_INVALID_PARAM;
   }
@@ -200,7 +198,7 @@ webvtt_string_text(const webvtt_string *str)
   return str->d->text;
 }
 
-WEBVTT_EXPORT const webvtt_uint32
+WEBVTT_EXPORT webvtt_uint32
 webvtt_string_length(const webvtt_string *str)
 {
   if( !str || !str->d )
@@ -211,7 +209,7 @@ webvtt_string_length(const webvtt_string *str)
   return str->d->length;
 }
 
-WEBVTT_EXPORT const webvtt_uint32
+WEBVTT_EXPORT webvtt_uint32
 webvtt_string_capacity(const webvtt_string *str)
 {
   if( !str || !str->d )
@@ -287,14 +285,15 @@ grow( webvtt_string *str, webvtt_uint need )
 
 WEBVTT_EXPORT int
 webvtt_string_getline( webvtt_string *src, const webvtt_byte *buffer,
-    webvtt_uint *pos, webvtt_uint len, int *truncate, webvtt_bool finish, webvtt_bool retain_new_line )
+                       webvtt_uint *pos, int len, int *truncate,
+                       webvtt_bool finish )
 {
   int ret = 0;
   webvtt_string *str = src;
   webvtt_string_data *d = 0;
   const webvtt_byte *s = buffer + *pos;
   const webvtt_byte *p = s;
-  const webvtt_byte *n = buffer + len;
+  const webvtt_byte *n;
 
   /**
    *if this is public now, maybe we should return webvtt_status so we can
@@ -312,13 +311,13 @@ webvtt_string_getline( webvtt_string *src, const webvtt_byte *buffer,
     }
     d = str->d;
   }
-
-  while( p < n && *p != UTF8_CARRIAGE_RETURN && *p != UTF8_LINE_FEED ) {
-    ++p;
+  if( len < 0 ) {
+    len = strlen( (const char *)buffer );
   }
-  /* Retain the new line character. */
-  if( p < n && retain_new_line ) {
-    p++;
+  n = buffer + len;
+
+  while( p < n && *p != '\r' && *p != '\n' ) {
+    ++p;
   }
 
   if( p < n || finish ) {
@@ -371,11 +370,21 @@ webvtt_string_putc( webvtt_string *str, webvtt_byte to_append )
 }
 
 WEBVTT_EXPORT webvtt_bool
-webvtt_string_is_equal( webvtt_string *str, webvtt_byte *to_compare, webvtt_uint len )
+webvtt_string_is_equal( const webvtt_string *str, const webvtt_byte *to_compare,
+                        int len )
 {
-  if( !str || !to_compare || webvtt_string_length( str ) != len ) {
+  if( !str || !to_compare ) {
     return 0;
   }
+
+  if( len < 0 ) {
+    len = strlen( (const char *)to_compare );
+  }
+
+  if( str->d->length != (unsigned)len ) {
+    return 0;
+  }
+
   return memcmp( webvtt_string_text( str ), to_compare, len ) == 0;
 }
 
@@ -584,8 +593,8 @@ WEBVTT_EXPORT webvtt_uint16
 webvtt_utf8_to_utf16( const webvtt_byte *utf8, const webvtt_byte *end,
   webvtt_uint16 *high_surrogate )
 {
-  int need = 0, min = 0;
-  webvtt_uint32 uc = 0;
+  int need = 0;
+  webvtt_uint32 uc = 0, min = 0;
   
   /* We're missing our pointers */
   if( !utf8 ) {
@@ -625,7 +634,8 @@ webvtt_utf8_to_utf16( const webvtt_byte *utf8, const webvtt_byte *end,
               *high_surrogate = UTF_HIGH_SURROGATE( uc );
             }
             return UTF_LOW_SURROGATE( uc );
-          } else if ( ( uc < min ) || ( uc >= 0xD800 && uc <= 0xDFFF ) || nc || uc >= 0x110000) {
+          } else if ( ( uc < min ) || ( uc >= 0xD800 && uc <= 0xDFFF ) || nc
+                      || uc >= 0x110000) {
             /* Non-character, overlong sequence, or utf16 surrogate */
             return 0xFFFD;  
           } else {
diff --git a/media/webvtt/string_internal.h b/media/webvtt/string_internal.h
index d699a14540b1..0dd649f03162 100644
--- a/media/webvtt/string_internal.h
+++ b/media/webvtt/string_internal.h
@@ -29,10 +29,6 @@
 # define __INTERN_STRING_H__
 # include <webvtt/string.h>
 
-# define UTF8_AMPERSAND         (0x26)
-# define UTF8_LESS_THAN         (0x3C)
-# define UTF8_GREATER_THAN      (0x3E)
-# define UTF8_HYPHEN_MINUS      (0x2D)
 # define UTF8_LEFT_TO_RIGHT_1   (0xE2)
 # define UTF8_LEFT_TO_RIGHT_2   (0x80)
 # define UTF8_LEFT_TO_RIGHT_3   (0x8E)
@@ -41,48 +37,6 @@
 # define UTF8_RIGHT_TO_LEFT_3   (0x8F)
 # define UTF8_NO_BREAK_SPACE_1  (0xC2)
 # define UTF8_NO_BREAK_SPACE_2  (0xA0)
-# define UTF8_NULL_BYTE         (0x00)
-# define UTF8_COLON             (0x3A)
-# define UTF8_SEMI_COLON        (0x3B)
-# define UTF8_TAB               (0x09)
-# define UTF8_FORM_FEED         (0x0C)
-# define UTF8_LINE_FEED         (0x0A)
-# define UTF8_CARRIAGE_RETURN   (0x0D)
-# define UTF8_FULL_STOP         (0x2E)
-# define UTF8_SOLIDUS           (0x2F)
-# define UTF8_SPACE             (0x20)
-# define UTF8_DIGIT_ZERO        (0x30)
-# define UTF8_DIGIT_NINE        (0x39)
-
-# define UTF8_CAPITAL_A         (0x41)
-# define UTF8_CAPITAL_Z         (0x5A)
-
-# define UTF8_A                 (0x61)
-# define UTF8_B                 (0x62)
-# define UTF8_C                 (0x63)
-# define UTF8_D                 (0x64)
-# define UTF8_E                 (0x65)
-# define UTF8_F                 (0x66)
-# define UTF8_G                 (0x67)
-# define UTF8_H                 (0x68)
-# define UTF8_I                 (0x69)
-# define UTF8_J                 (0x6A)
-# define UTF8_K                 (0x6B)
-# define UTF8_L                 (0x6C)
-# define UTF8_M                 (0x6D)
-# define UTF8_N                 (0x6E)
-# define UTF8_O                 (0x6F)
-# define UTF8_P                 (0x70)
-# define UTF8_Q                 (0x71)
-# define UTF8_R                 (0x72)
-# define UTF8_S                 (0x73)
-# define UTF8_T                 (0x74)
-# define UTF8_U                 (0x75)
-# define UTF8_V                 (0x76)
-# define UTF8_W                 (0x77)
-# define UTF8_X                 (0x78)
-# define UTF8_Y                 (0x79)
-# define UTF8_Z                 (0x7A)
 
 /**
  * Taken from ICU
@@ -118,12 +72,12 @@ webvtt_string_data_t {
 static __WEBVTT_STRING_INLINE  int
 webvtt_isalpha( webvtt_byte ch )
 {
-  return ( ( ( ch >= UTF8_CAPITAL_A ) && ( ch <= UTF8_CAPITAL_Z ) ) || ( ( ch >= UTF8_A ) && ( ch <= UTF8_Z ) ) );
+  return ( ( ( ch >= 'A' ) && ( ch <= 'Z' ) ) || ( ( ch >= 'a' ) && ( ch <= 'z' ) ) );
 }
 static __WEBVTT_STRING_INLINE int
 webvtt_isdigit( webvtt_byte ch )
 {
-  return ( ( ch >= UTF8_DIGIT_ZERO ) && ( ch <= UTF8_DIGIT_NINE ) );
+  return ( ( ch >= '0' ) && ( ch <= '9' ) );
 }
 
 static __WEBVTT_STRING_INLINE int
@@ -135,8 +89,8 @@ webvtt_isalphanum( webvtt_byte ch )
 static __WEBVTT_STRING_INLINE int
 webvtt_iswhite( webvtt_byte ch )
 {
-  return ( ( ch == UTF8_CARRIAGE_RETURN ) || ( ch == UTF8_LINE_FEED ) || ( ch == UTF8_FORM_FEED )
-           || ( ch == UTF8_TAB ) || ( ch == UTF8_SPACE ) ) ;
+  return ( ( ch == '\r' ) || ( ch == '\n' ) || ( ch == '\f' )
+           || ( ch == '\t' ) || ( ch == ' ' ) ) ;
 }
 
 # undef __WEBVTT_STRING_INLINE

From df55253a6e54fec86e476c41d97d0e6be1306766 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Wed, 17 Apr 2013 21:28:59 +0100
Subject: [PATCH 206/438] Bug 862817 - Fix animateMotion on foreignObject
 elements. r=dholbert

---
 layout/reftests/svg/smil/motion/animateMotion-by-1.svg | 6 +++++-
 layout/svg/nsSVGForeignObjectFrame.cpp                 | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/layout/reftests/svg/smil/motion/animateMotion-by-1.svg b/layout/reftests/svg/smil/motion/animateMotion-by-1.svg
index fdb31efef607..8340603f4066 100644
--- a/layout/reftests/svg/smil/motion/animateMotion-by-1.svg
+++ b/layout/reftests/svg/smil/motion/animateMotion-by-1.svg
@@ -16,9 +16,13 @@
 
   <!-- FIRST ROW -->
   <!-- Check that 'by' works at all -->
-  <rect fill="lime" x="0" y="0" width="50" height="50">
+  <rect fill="lime" x="0" y="0" width="50" height="25">
     <animateMotion by="100, 100" begin="100" dur="1" fill="freeze"/>
   </rect>
+  <foreignObject id="fo" x="0" y="25" width="50" height="25">
+    <div xmlns="http://www.w3.org/1999/xhtml" style="width:100%;height:100%;background-color:lime"/>
+  </foreignObject>
+  <animateMotion xlink:href="#fo" by="100, 100" begin="100" dur="1" fill="freeze"/>
 
   <!-- Check that 'by' is additive w/ 'by' -->
   <rect fill="lime" x="50" y="50" width="50" height="50">
diff --git a/layout/svg/nsSVGForeignObjectFrame.cpp b/layout/svg/nsSVGForeignObjectFrame.cpp
index bf247c46880b..5d3572eb6b47 100644
--- a/layout/svg/nsSVGForeignObjectFrame.cpp
+++ b/layout/svg/nsSVGForeignObjectFrame.cpp
@@ -179,7 +179,7 @@ nsSVGForeignObjectFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 
 bool
 nsSVGForeignObjectFrame::IsSVGTransformed(gfxMatrix *aOwnTransform,
-                                         gfxMatrix *aFromParentTransform) const
+                                          gfxMatrix *aFromParentTransform) const
 {
   bool foundTransform = false;
 
@@ -194,7 +194,8 @@ nsSVGForeignObjectFrame::IsSVGTransformed(gfxMatrix *aOwnTransform,
   nsSVGElement *content = static_cast<nsSVGElement*>(mContent);
   nsSVGAnimatedTransformList* transformList =
     content->GetAnimatedTransformList();
-  if (transformList && transformList->HasTransform()) {
+  if ((transformList && transformList->HasTransform()) ||
+      content->GetAnimateMotionTransform()) {
     if (aOwnTransform) {
       *aOwnTransform = content->PrependLocalTransformsTo(gfxMatrix(),
                                   nsSVGElement::eUserSpaceToParent);

From a3cc058a5a5e7c473b74019d87513824c4def9ef Mon Sep 17 00:00:00 2001
From: Allison Naaktgeboren <ally@mozilla.com>
Date: Wed, 17 Apr 2013 13:34:42 -0700
Subject: [PATCH 207/438] Bug 830505 - Re theme the autocomplete screen in
 snapped view.r=sfoster

---
 .../base/content/bindings/autocomplete.xml    |  4 ++--
 browser/metro/base/content/browser-ui.js      |  5 +++++
 browser/metro/base/content/browser.xul        |  2 +-
 browser/metro/theme/browser.css               | 19 +++++++++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/browser/metro/base/content/bindings/autocomplete.xml b/browser/metro/base/content/bindings/autocomplete.xml
index dbe2dfe6e7a8..ce731e78719f 100644
--- a/browser/metro/base/content/bindings/autocomplete.xml
+++ b/browser/metro/base/content/bindings/autocomplete.xml
@@ -68,12 +68,12 @@
 
   <binding id="autocomplete-popup">
     <content orient="horizontal">
-      <xul:vbox id="results-vbox" class="meta-section viewable-height">
+      <xul:vbox id="results-vbox" class="meta-section viewable-height" flex="1">
         <xul:label class="meta-section-title" value="&autocompleteResultsHeader.label;"/>
         <richgrid id="results-richgrid" anonid="results" seltype="single" flex="1"/>
       </xul:vbox>
 
-      <xul:vbox id="searches-vbox" class="meta-section viewable-height">
+      <xul:vbox id="searches-vbox" class="meta-section viewable-height" flex="1">
         <xul:label class="meta-section-title" value="&autocompleteSearchesHeader.label;"/>
         <richgrid id="searches-richgrid" anonid="searches" seltype="single" flex="1"/>
       </xul:vbox>
diff --git a/browser/metro/base/content/browser-ui.js b/browser/metro/base/content/browser-ui.js
index 7614892947e8..caa15188ae1d 100644
--- a/browser/metro/base/content/browser-ui.js
+++ b/browser/metro/base/content/browser-ui.js
@@ -569,11 +569,16 @@ var BrowserUI = {
         break;
       case "metro_viewstate_changed":
         this._adjustDOMforViewState();
+        let autocomplete = document.getElementById("start-autocomplete");
         if (aData == "snapped") {
           FlyoutPanelsUI.hide();
           // Order matters (need grids to get dimensions, etc), now
           // let snapped grid know to refresh/redraw
           Services.obs.notifyObservers(null, "metro_viewstate_dom_snapped", null);
+          autocomplete.setAttribute("orient", "vertical");
+        }
+        else {
+          autocomplete.setAttribute("orient", "horizontal");
         }
         break;
     }
diff --git a/browser/metro/base/content/browser.xul b/browser/metro/base/content/browser.xul
index 25fedd3611f9..5449a42cdb3a 100644
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -294,7 +294,7 @@
             </scrollbox>
           </vbox>
           <!-- Autocompletion interface -->
-          <box id="start-autocomplete"/>
+          <box id="start-autocomplete" observes="bcast_windowState"/>
         </hbox>
       </vbox> <!-- end tray -->
 
diff --git a/browser/metro/theme/browser.css b/browser/metro/theme/browser.css
index 5797334552b1..b563d4c87d0e 100644
--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -875,6 +875,25 @@ setting[type="radio"] > vbox {
   visibility: collapse;
 }
 
+/*Formatting for the limited horizontal space of snapped*/
+#start-autocomplete[viewstate="snapped"] .richgrid-item-content {
+  -moz-box-orient: horizontal;
+}
+
+#start-autocomplete[viewstate="snapped"] {
+  padding-left: 0px;
+  padding-right: 0px;
+}
+
+#start-container[viewstate="snapped"] {
+  padding-left: 0px;
+  padding-right: 0px;
+}
+
+#start-container[viewstate="snapped"] .meta-section {
+  margin: 0px;
+}
+
 /* Browser Content Areas ----------------------------------------------------- */
 
 /* Hide the browser while the start UI is visible */

From a4a21f27beecc92be7f60ff12a9a823ee0627935 Mon Sep 17 00:00:00 2001
From: Jeff Hammel <jhammel@mozilla.com>
Date: Wed, 17 Apr 2013 11:08:02 -0700
Subject: [PATCH 208/438] Bug 860091 - mirror test.py and mozdevice and
 mozprofile to m-c;r=jgriffin

--HG--
extra : rebase_source : 16b0b4bb8b49b0a70e0a2160c3ca6370737b0fab
---
 .../mozdevice/mozdevice/devicemanager.py      |  39 +-
 .../mozdevice/mozdevice/devicemanagerADB.py   |  23 +-
 .../mozdevice/mozdevice/devicemanagerSUT.py   | 108 +++---
 testing/mozbase/mozdevice/mozdevice/dmcli.py  | 342 +++++++++---------
 testing/mozbase/mozdevice/mozdevice/droid.py  |  12 +-
 testing/mozbase/mozdevice/setup.py            |   4 +-
 .../mozdevice/tests/droidsut_launch.py        |  35 ++
 testing/mozbase/mozdevice/tests/manifest.ini  |   4 +
 testing/mozbase/mozdevice/tests/sut_basic.py  |  13 +-
 testing/mozbase/mozdevice/tests/sut_mkdir.py  |   9 +-
 testing/mozbase/mozdevice/tests/sut_pull.py   |   8 +-
 testing/mozbase/mozdevice/tests/sut_push.py   |   5 +-
 .../mozbase/mozprofile/mozprofile/addons.py   |  14 +-
 .../mozprofile/mozprofile/permissions.py      |  61 ++--
 .../mozbase/mozprofile/mozprofile/prefs.py    |  24 +-
 .../mozbase/mozprofile/mozprofile/profile.py  |  21 +-
 testing/mozbase/mozprofile/setup.py           |   2 +-
 testing/mozbase/mozprofile/tests/addonid.py   |  15 +-
 .../tests/{ => addons}/empty/install.rdf      |   2 +-
 testing/mozbase/mozprofile/tests/bug758250.py |   4 +-
 testing/mozbase/mozprofile/tests/bug785146.py |   4 +-
 .../mozbase/mozprofile/tests/permissions.py   |  77 +++-
 .../mozprofile/tests/server_locations.py      |   2 +-
 testing/mozbase/test.py                       |  23 +-
 24 files changed, 517 insertions(+), 334 deletions(-)
 create mode 100644 testing/mozbase/mozdevice/tests/droidsut_launch.py
 rename testing/mozbase/mozprofile/tests/{ => addons}/empty/install.rdf (97%)

diff --git a/testing/mozbase/mozdevice/mozdevice/devicemanager.py b/testing/mozbase/mozdevice/mozdevice/devicemanager.py
index 4231dd673c9a..4aad2c3fb70b 100644
--- a/testing/mozbase/mozdevice/mozdevice/devicemanager.py
+++ b/testing/mozbase/mozdevice/mozdevice/devicemanager.py
@@ -3,6 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import hashlib
+import mozlog
 import socket
 import os
 import re
@@ -46,6 +47,35 @@ class DeviceManager(object):
 
     _logcatNeedsRoot = True
 
+    def __init__(self, logLevel=mozlog.ERROR):
+        self._logger = mozlog.getLogger("DeviceManager")
+        self._logLevel = logLevel
+        self._logger.setLevel(logLevel)
+
+    @property
+    def logLevel(self):
+        return self._logLevel
+
+    @logLevel.setter
+    def logLevel_setter(self, newLogLevel):
+        self._logLevel = newLogLevel
+        self._logger.setLevel(self._logLevel)
+
+    @property
+    def debug(self):
+        self._logger.warn("dm.debug is deprecated. Use logLevel.")
+        levels = {mozlog.DEBUG: 5, mozlog.INFO: 3, mozlog.WARNING: 2,
+                  mozlog.ERROR: 1, mozlog.CRITICAL: 0}
+        return levels[self.logLevel]
+
+    @debug.setter
+    def debug_setter(self, newDebug):
+        self._logger.warn("dm.debug is deprecated. Use logLevel.")
+        newDebug = 5 if newDebug > 5 else newDebug # truncate >=5 to 5
+        levels = {5: mozlog.DEBUG, 3: mozlog.INFO, 2: mozlog.WARNING,
+                  1: mozlog.ERROR, 0: mozlog.CRITICAL}
+        self.logLevel = levels[newDebug]
+
     @abstractmethod
     def getInfo(self, directive=None):
         """
@@ -178,8 +208,7 @@ class DeviceManager(object):
         Returns True if remoteDirname on device is same as localDirname on host.
         """
 
-        if (self.debug >= 2):
-            print "validating directory: " + localDirname + " to " + remoteDirname
+        self._logger.info("validating directory: %s to %s" % (localDirname, remoteDirname))
         for root, dirs, files in os.walk(localDirname):
             parts = root.split(localDirname)
             for f in files:
@@ -566,11 +595,11 @@ class NetworkTools:
                     break
                 except:
                     if seed > maxportnum:
-                        print "Automation Error: Could not find open port after checking 5000 ports"
+                        self._logger.error("Automation Error: Could not find open port after checking 5000 ports")
                         raise
                 seed += 1
         except:
-            print "Automation Error: Socket error trying to find open port"
+            self._logger.error("Automation Error: Socket error trying to find open port")
 
         return seed
 
@@ -629,7 +658,7 @@ class ZeroconfListener(object):
             return
 
         ip = m.group(1).replace("_", ".")
-        
+
         if self.hwid == hwid:
             self.ip = ip
             self.evt.set()
diff --git a/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py b/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
index c870d03a607b..f1821e93d76d 100644
--- a/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
+++ b/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
@@ -2,6 +2,7 @@
 # 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/.
 
+import mozlog
 import subprocess
 from devicemanager import DeviceManager, DMError, _pop_last_line
 import re
@@ -29,7 +30,9 @@ class DeviceManagerADB(DeviceManager):
     default_timeout = 300
 
     def __init__(self, host=None, port=5555, retryLimit=5, packageName='fennec',
-                 adbPath='adb', deviceSerial=None, deviceRoot=None, **kwargs):
+                 adbPath='adb', deviceSerial=None, deviceRoot=None,
+                 logLevel=mozlog.ERROR, **kwargs):
+        DeviceManager.__init__(self, logLevel)
         self.host = host
         self.port = port
         self.retryLimit = retryLimit
@@ -206,7 +209,7 @@ class DeviceManagerADB(DeviceManager):
                 if re.search("unzip: exiting", data) or re.search("Operation not permitted", data):
                     raise Exception("unzip failed, or permissions error")
             except:
-                print "zip/unzip failure: falling back to normal push"
+                self._logger.info("zip/unzip failure: falling back to normal push")
                 self._useZip = False
                 self.pushDir(localDir, remoteDir, retryLimit=retryLimit)
         else:
@@ -335,7 +338,7 @@ class DeviceManagerADB(DeviceManager):
         if uri != "":
             acmd.append("-d")
             acmd.append(''.join(['\'',uri, '\'']));
-        print acmd
+        self._logger.info(acmd)
         self._checkCmd(acmd)
         return outputFile
 
@@ -429,7 +432,7 @@ class DeviceManagerADB(DeviceManager):
                 try:
                     self.mkDir(self.deviceRoot)
                 except:
-                    print "Unable to create device root %s" % self.deviceRoot
+                    self._logger.error("Unable to create device root %s" % self.deviceRoot)
                     raise
             return
 
@@ -512,7 +515,7 @@ class DeviceManagerADB(DeviceManager):
             ret["process"] = self._runCmd(["shell", "ps"]).stdout.read()
         if (directive == "systime" or directive == "all"):
             ret["systime"] = self._runCmd(["shell", "date"]).stdout.read()
-        print ret
+        self._logger.info(ret)
         return ret
 
     def uninstallApp(self, appName, installPath=None):
@@ -619,12 +622,12 @@ class DeviceManagerADB(DeviceManager):
                     self.chmodDir(remoteEntry)
                 else:
                     self._checkCmdAs(["shell", "chmod", mask, remoteEntry])
-                    print "chmod " + remoteEntry
+                    self._logger.info("chmod %s" % remoteEntry)
             self._checkCmdAs(["shell", "chmod", mask, remoteDir])
-            print "chmod " + remoteDir
+            self._logger.info("chmod %s" % remoteDir)
         else:
             self._checkCmdAs(["shell", "chmod", mask, remoteDir.strip()])
-            print "chmod " + remoteDir.strip()
+            self._logger.info("chmod %s" % remoteDir.strip())
 
     def _verifyADB(self):
         """
@@ -690,7 +693,7 @@ class DeviceManagerADB(DeviceManager):
             self._checkCmd(["push", tmpfile.name, tmpDir + "/tmpfile"])
             self._checkCmd(["shell", "run-as", self._packageName, "dd", "if=" + tmpDir + "/tmpfile", "of=" + devroot + "/sanity/tmpfile"])
             if (self.fileExists(devroot + "/sanity/tmpfile")):
-                print "will execute commands via run-as " + self._packageName
+                self._logger.info("will execute commands via run-as %s" % self._packageName)
                 self._useRunAs = True
             self._checkCmd(["shell", "rm", devroot + "/tmp/tmpfile"])
             self._checkCmd(["shell", "run-as", self._packageName, "rm", "-r", devroot + "/sanity"])
@@ -743,7 +746,7 @@ class DeviceManagerADB(DeviceManager):
         # optimization for large directories.
         self._useZip = False
         if (self._isUnzipAvailable() and self._isLocalZipAvailable()):
-            print "will use zip to push directories"
+            self._logger.info("will use zip to push directories")
             self._useZip = True
         else:
             raise DMError("zip not available")
diff --git a/testing/mozbase/mozdevice/mozdevice/devicemanagerSUT.py b/testing/mozbase/mozdevice/mozdevice/devicemanagerSUT.py
index e2cc8d4326c9..a683c70767fc 100644
--- a/testing/mozbase/mozdevice/mozdevice/devicemanagerSUT.py
+++ b/testing/mozbase/mozdevice/mozdevice/devicemanagerSUT.py
@@ -2,6 +2,7 @@
 # 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/.
 
+import mozlog
 import select
 import socket
 import time
@@ -22,7 +23,6 @@ class DeviceManagerSUT(DeviceManager):
     app must be present and listening for connections for this to work.
     """
 
-    debug = 2
     _base_prompt = '$>'
     _base_prompt_re = '\$\>'
     _prompt_sep = '\x00'
@@ -33,7 +33,9 @@ class DeviceManagerSUT(DeviceManager):
     reboot_timeout = 600
     reboot_settling_time = 60
 
-    def __init__(self, host, port = 20701, retryLimit = 5, deviceRoot = None, **kwargs):
+    def __init__(self, host, port = 20701, retryLimit = 5,
+            deviceRoot = None, logLevel = mozlog.ERROR, **kwargs):
+        DeviceManager.__init__(self, logLevel)
         self.host = host
         self.port = port
         self.retryLimit = retryLimit
@@ -130,13 +132,12 @@ class DeviceManagerSUT(DeviceManager):
                 # couldn't execute it). retry otherwise
                 if err.fatal:
                     raise err
-                if self.debug >= 4:
-                    print err
+                self._logger.debug(err)
                 retries += 1
                 # if we lost the connection or failed to establish one, wait a bit
                 if retries < retryLimit and not self._sock:
                     sleep_time = 5 * retries
-                    print 'Could not connect; sleeping for %d seconds.' % sleep_time
+                    self._logger.info('Could not connect; sleeping for %d seconds.' % sleep_time)
                     time.sleep(sleep_time)
 
         raise DMError("Remote Device Error: unable to connect to %s after %s attempts" % (self.host, retryLimit))
@@ -162,8 +163,8 @@ class DeviceManagerSUT(DeviceManager):
 
         if not self._sock:
             try:
-                if self.debug >= 1 and self._everConnected:
-                    print "reconnecting socket"
+                if self._everConnected:
+                    self._logger.info("reconnecting socket")
                 self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             except socket.error, msg:
                 self._sock = None
@@ -202,13 +203,12 @@ class DeviceManagerSUT(DeviceManager):
                         raise DMError("Remote Device Error: we had %s bytes of data to send, but "
                                       "only sent %s" % (len(cmd['data']), sent))
 
-                if self.debug >= 4:
-                    print "sent cmd: " + str(cmd['cmd'])
+                self._logger.debug("sent cmd: %s" % cmd['cmd'])
             except socket.error, msg:
                 self._sock.close()
                 self._sock = None
-                if self.debug >= 1:
-                    print "Remote Device Error: Error sending data to socket. cmd="+str(cmd['cmd'])+"; err="+str(msg)
+                self._logger.error("Remote Device Error: Error sending data"\
+                        " to socket. cmd=%s; err=%s" % (cmd['cmd'], msg))
                 return False
 
             # Check if the command should close the socket
@@ -226,16 +226,14 @@ class DeviceManagerSUT(DeviceManager):
                     socketClosed = False
                     errStr = ''
                     temp = ''
-                    if self.debug >= 4:
-                        print "recv'ing..."
+                    self._logger.debug("recv'ing...")
 
                     # Get our response
                     try:
                           # Wait up to a second for socket to become ready for reading...
                         if select.select([self._sock], [], [], select_timeout)[0]:
                             temp = self._sock.recv(1024)
-                            if self.debug >= 4:
-                                print "response: " + str(temp)
+                            self._logger.debug("response: %s" % temp)
                             timer = 0
                             if not temp:
                                 socketClosed = True
@@ -352,8 +350,7 @@ class DeviceManagerSUT(DeviceManager):
         except OSError:
             raise DMError("DeviceManager: Error reading file to push")
 
-        if (self.debug >= 3):
-            print "push returned: %s" % remoteHash
+        self._logger.debug("push returned: %s" % remoteHash)
 
         localHash = self._getLocalHash(localname)
 
@@ -367,8 +364,7 @@ class DeviceManagerSUT(DeviceManager):
 
     def pushDir(self, localDir, remoteDir, retryLimit = None):
         retryLimit = retryLimit or self.retryLimit
-        if (self.debug >= 2):
-            print "pushing directory: %s to %s" % (localDir, remoteDir)
+        self._logger.info("pushing directory: %s to %s" % (localDir, remoteDir))
 
         existentDirectories = []
         for root, dirs, files in os.walk(localDir, followlinks=True):
@@ -418,8 +414,7 @@ class DeviceManagerSUT(DeviceManager):
         return files
 
     def removeFile(self, filename):
-        if (self.debug>= 2):
-            print "removing file: " + filename
+        self._logger.info("removing file: " + filename)
         if self.fileExists(filename):
             self._runCmds([{ 'cmd': 'rm ' + filename }])
 
@@ -444,8 +439,8 @@ class DeviceManagerSUT(DeviceManager):
                         # unexpected format
                         raise ValueError
                 except ValueError:
-                    print "ERROR: Unable to parse process list (bug 805969)"
-                    print "Line: %s\nFull output of process list:\n%s" % (line, data)
+                    self._logger.error("Unable to parse process list (bug 805969)")
+                    self._logger.error("Line: %s\nFull output of process list:\n%s" % (line, data))
                     raise DMError("Invalid process line: %s" % line)
 
         return processTuples
@@ -461,11 +456,10 @@ class DeviceManagerSUT(DeviceManager):
         if not appname:
             raise DMError("Automation Error: fireProcess called with no command to run")
 
-        if (self.debug >= 2):
-            print "FIRE PROC: '" + appname + "'"
+        self._logger.info("FIRE PROC: '%s'" % appname)
 
         if (self.processExist(appname) != None):
-            print "WARNING: process %s appears to be running already\n" % appname
+            self._logger.warn("process %s appears to be running already\n" % appname)
             if (failIfRunning):
                 raise DMError("Automation Error: Process is already running")
 
@@ -484,8 +478,7 @@ class DeviceManagerSUT(DeviceManager):
             time.sleep(1)
             waited += 1
 
-        if (self.debug >= 4):
-            print "got pid: %s for process: %s" % (pid, appname)
+        self._logger.debug("got pid: %s for process: %s" % (pid, appname))
         return pid
 
     def launchProcess(self, cmd, outputFile = "process.txt", cwd = '', env = '', failIfRunning=False):
@@ -500,8 +493,7 @@ class DeviceManagerSUT(DeviceManager):
         DEPRECATED: Use shell() or launchApplication() for new code
         """
         if not cmd:
-            if (self.debug >= 1):
-                print "WARNING: launchProcess called without command to run"
+            self._logger.warn("launchProcess called without command to run")
             return None
 
         cmdline = subprocess.list2cmdline(cmd)
@@ -521,7 +513,7 @@ class DeviceManagerSUT(DeviceManager):
 
     def killProcess(self, appname, forceKill=False):
         if forceKill:
-            print "WARNING: killProcess(): forceKill parameter unsupported on SUT"
+            self._logger.warn("killProcess(): forceKill parameter unsupported on SUT")
         retries = 0
         while retries < self.retryLimit:
             try:
@@ -530,10 +522,9 @@ class DeviceManagerSUT(DeviceManager):
                 return
             except DMError, err:
                 retries +=1
-                print ("WARNING: try %d of %d failed to kill %s" %
+                self._logger.warn("try %d of %d failed to kill %s" %
                        (retries, self.retryLimit, appname))
-                if self.debug >= 4:
-                    print err
+                self._logger.debug(err)
                 if retries >= self.retryLimit:
                     raise err
 
@@ -549,7 +540,7 @@ class DeviceManagerSUT(DeviceManager):
 
         def err(error_msg):
             err_str = 'DeviceManager: pull unsuccessful: %s' % error_msg
-            print err_str
+            self._logger.error(err_str)
             self._sock = None
             raise DMError(err_str)
 
@@ -608,8 +599,7 @@ class DeviceManagerSUT(DeviceManager):
         metadata, sep, buf = read_until_char('\n', buf, 'could not find metadata')
         if not metadata:
             return None
-        if self.debug >= 3:
-            print 'metadata: %s' % metadata
+        self._logger.debug('metadata: %s' % metadata)
 
         filename, sep, filesizestr = metadata.partition(',')
         if sep == '':
@@ -648,15 +638,13 @@ class DeviceManagerSUT(DeviceManager):
                           remoteFile)
 
     def getDirectory(self, remoteDir, localDir, checkDir=True):
-        if (self.debug >= 2):
-            print "getting files in '" + remoteDir + "'"
+        self._logger.info("getting files in '%s'" % remoteDir)
         if checkDir and not self.dirExists(remoteDir):
             raise DMError("Automation Error: Error getting directory: %s not a directory" %
                           remoteDir)
 
         filelist = self.listFiles(remoteDir)
-        if (self.debug >= 3):
-            print filelist
+        self._logger.debug(filelist)
         if not os.path.exists(localDir):
             os.makedirs(localDir)
 
@@ -684,8 +672,7 @@ class DeviceManagerSUT(DeviceManager):
 
     def _getRemoteHash(self, filename):
         data = self._runCmds([{ 'cmd': 'hash ' + filename }]).strip()
-        if self.debug >= 3:
-            print "remote hash returned: '%s'" % data
+        self._logger.debug("remote hash returned: '%s'" % data)
         return data
 
     def getDeviceRoot(self):
@@ -723,8 +710,7 @@ class DeviceManagerSUT(DeviceManager):
         self._runCmds([{ 'cmd': 'unzp %s %s' % (filePath, destDir)}])
 
     def _wait_for_reboot(self, host, port):
-        if self.debug >= 3:
-            print 'Creating server with %s:%d' % (host, port)
+        self._logger.debug('Creating server with %s:%d' % (host, port))
         timeout_expires = time.time() + self.reboot_timeout
         conn = None
         data = ''
@@ -752,15 +738,14 @@ class DeviceManagerSUT(DeviceManager):
             # also up.
             time.sleep(self.reboot_settling_time)
         else:
-            print 'Automation Error: Timed out waiting for reboot callback.'
+            self._logger.error('Timed out waiting for reboot callback.')
         s.close()
         return data
 
     def reboot(self, ipAddr=None, port=30000):
         cmd = 'rebt'
 
-        if self.debug > 3:
-            print "INFO: sending rebt command"
+        self._logger.info("sending rebt command")
 
         if ipAddr is not None:
             # The update.info command tells the SUTAgent to send a TCP message
@@ -778,8 +763,7 @@ class DeviceManagerSUT(DeviceManager):
         if ipAddr is not None:
             status = self._wait_for_reboot(ipAddr, port)
 
-        if self.debug > 3:
-            print "INFO: rebt- got status back: " + str(status)
+        self._logger.info("rebt- got status back: %s" % status)
 
     def getInfo(self, directive=None):
         data = None
@@ -810,8 +794,7 @@ class DeviceManagerSUT(DeviceManager):
                     proclist.append(l.split('\t'))
             result['process'] = proclist
 
-        if (self.debug >= 3):
-            print "results: " + str(result)
+        self._logger.debug("results: %s" % result)
         return result
 
     def installApp(self, appBundlePath, destPath=None):
@@ -833,8 +816,7 @@ class DeviceManagerSUT(DeviceManager):
         data = self._runCmds([{ 'cmd': cmd }])
 
         status = data.split('\n')[0].strip()
-        if self.debug > 3:
-            print "uninstallApp: '%s'" % status
+        self._logger.debug("uninstallApp: '%s'" % status)
         if status == 'Success':
             return
         raise DMError("Remote Device Error: uninstall failed for %s" % appName)
@@ -845,8 +827,7 @@ class DeviceManagerSUT(DeviceManager):
             cmd += ' ' + installPath
         data = self._runCmds([{ 'cmd': cmd }])
 
-        if (self.debug > 3):
-            print "uninstallAppAndReboot: " + str(data)
+        self._logger.debug("uninstallAppAndReboot: %s" % data)
         return
 
     def updateApp(self, appBundlePath, processName=None, destPath=None, ipAddr=None, port=30000):
@@ -865,16 +846,14 @@ class DeviceManagerSUT(DeviceManager):
             ip, port = self._getCallbackIpAndPort(ipAddr, port)
             cmd += " %s %s" % (ip, port)
 
-        if self.debug >= 3:
-            print "INFO: updateApp using command: " + str(cmd)
+        self._logger.debug("updateApp using command: " % cmd)
 
         status = self._runCmds([{'cmd': cmd}])
 
         if ipAddr is not None:
             status = self._wait_for_reboot(ip, port)
 
-        if self.debug >= 3:
-            print "INFO: updateApp: got status back: %s" + str(status)
+        self._logger.debug("updateApp: got status back: %s" % status)
 
     def getCurrentTime(self):
         return self._runCmds([{ 'cmd': 'clok' }]).strip()
@@ -922,14 +901,12 @@ class DeviceManagerSUT(DeviceManager):
         supported resolutions: 640x480, 800x600, 1024x768, 1152x864, 1200x1024, 1440x900, 1680x1050, 1920x1080
         """
         if self.getInfo('os')['os'][0].split()[0] != 'harmony-eng':
-            if (self.debug >= 2):
-                print "WARNING: unable to adjust screen resolution on non Tegra device"
+            self._logger.warn("unable to adjust screen resolution on non Tegra device")
             return False
 
         results = self.getInfo('screen')
         parts = results['screen'][0].split(':')
-        if (self.debug >= 3):
-            print "INFO: we have a current resolution of %s, %s" % (parts[1].split()[0], parts[2].split()[0])
+        self._logger.debug("we have a current resolution of %s, %s" % (parts[1].split()[0], parts[2].split()[0]))
 
         #verify screen type is valid, and set it to the proper value (https://bugzilla.mozilla.org/show_bug.cgi?id=632895#c4)
         screentype = -1
@@ -950,8 +927,7 @@ class DeviceManagerSUT(DeviceManager):
         if (height < 100 or height > 9999):
             return False
 
-        if (self.debug >= 3):
-            print "INFO: adjusting screen resolution to %s, %s and rebooting" % (width, height)
+        self._logger.debug("adjusting screen resolution to %s, %s and rebooting" % (width, height))
 
         self._runCmds([{ 'cmd': "exec setprop persist.tegra.dpy%s.mode.width %s" % (screentype, width) }])
         self._runCmds([{ 'cmd': "exec setprop persist.tegra.dpy%s.mode.height %s" % (screentype, height) }])
diff --git a/testing/mozbase/mozdevice/mozdevice/dmcli.py b/testing/mozbase/mozdevice/mozdevice/dmcli.py
index 980ef36fbee6..ada6e418e647 100644
--- a/testing/mozbase/mozdevice/mozdevice/dmcli.py
+++ b/testing/mozbase/mozdevice/mozdevice/dmcli.py
@@ -11,211 +11,191 @@ import os
 import posixpath
 import StringIO
 import sys
-import textwrap
 import mozdevice
-from optparse import OptionParser
+import mozlog
+import argparse
 
 class DMCli(object):
 
     def __init__(self):
-        # a value of None for 'max_args' means there is no limit to the number
-        # of arguments.  'min_args' should always have an integer value >= 0.
         self.commands = { 'install': { 'function': self.install,
-                                       'min_args': 1,
-                                       'max_args': 1,
-                                       'help_args': '<file>',
+                                       'args': [ { 'name': 'file', 'nargs': None } ],
                                        'help': 'push this package file to the device and install it' },
-                          'uninstall': { 'function': lambda a: self.dm.uninstallApp(a),
-                                         'min_args': 1,
-                                         'max_args': 1,
-                                         'help_args': '<packagename>',
+                          'uninstall': { 'function': self.uninstall,
+                                         'args': [ { 'name': 'packagename', 'nargs': None } ],
                                          'help': 'uninstall the named app from the device' },
-                          'killapp': { 'function': self.killapp,
-                                       'min_args': 1,
-                                       'max_args': 1,
-                                       'help_args': '<process name>',
-                                       'help': 'kills any processes with a particular name on device' },
+                          'killapp': { 'function': self.kill,
+                                       'args': [ { 'name': 'process_name', 'nargs': '*' } ],
+                                       'help': 'kills any processes with name(s) on device' },
                           'launchapp': { 'function': self.launchapp,
-                                         'min_args': 4,
-                                         'max_args': 4,
-                                         'help_args': '<appname> <activity name> <intent> <URL>',
-                                         'help': 'launches application on device' },
+                                         'args': [ { 'name': 'appname', 'nargs': None },
+                                                   { 'name': 'activity_name',
+                                                     'nargs': None },
+                                                   { 'name': '--intent',
+                                                     'action': 'store',
+                                                     'default': 'android.intent.action.VIEW' },
+                                                   { 'name': '--url',
+                                                     'action': 'store' }
+                                                ],
+                                      'help': 'launches application on device' },
                           'push': { 'function': self.push,
-                                    'min_args': 2,
-                                    'max_args': 2,
-                                    'help_args': '<local> <remote>',
+                                    'args': [ { 'name': 'local_file', 'nargs': None },
+                                              { 'name': 'remote_file', 'nargs': None }
+                                              ],
                                     'help': 'copy file/dir to device' },
                           'pull': { 'function': self.pull,
-                                    'min_args': 1,
-                                    'max_args': 2,
-                                    'help_args': '<local> [remote]',
+                                    'args': [ { 'name': 'local_file', 'nargs': None },
+                                              { 'name': 'remote_file', 'nargs': '?' } ],
                                     'help': 'copy file/dir from device' },
                           'shell': { 'function': self.shell,
-                                     'min_args': 1,
-                                     'max_args': None,
-                                     'help_args': '<command>',
-                                     'help': 'run shell command on device' },
+                                    'args': [ { 'name': 'command', 'nargs': argparse.REMAINDER } ],
+                                    'help': 'run shell command on device' },
                           'info': { 'function': self.getinfo,
-                                    'min_args': 0,
-                                    'max_args': 1,
-                                    'help_args': '[os|id|uptime|systime|screen|memory|processes]',
-                                    'help': 'get information on a specified '
+                                    'args': [ { 'name': 'directive', 'nargs': '?' } ],
+                                    'help': 'get information on specified '
                                     'aspect of the device (if no argument '
                                     'given, print all available information)'
                                     },
                           'ps': { 'function': self.processlist,
-                                    'min_args': 0,
-                                    'max_args': 0,
-                                    'help_args': '',
-                                    'help': 'get information on running processes on device'
+                                  'help': 'get information on running processes on device'
                                 },
                           'logcat' : { 'function': self.logcat,
-                                       'min_args': 0,
-                                       'max_args': 0,
-                                       'help_args': '',
                                        'help': 'get logcat from device'
                                 },
                           'ls': { 'function': self.listfiles,
-                                  'min_args': 1,
-                                  'max_args': 1,
-                                  'help_args': '<remote>',
+                                  'args': [ { 'name': 'remote_dir', 'nargs': None } ],
                                   'help': 'list files on device'
                                 },
-                          'rm': { 'function': lambda f: self.dm.removeFile(f),
-                                    'min_args': 1,
-                                    'max_args': 1,
-                                    'help_args': '<remote>',
-                                    'help': 'remove file from device'
+                          'rm': { 'function': self.removefile,
+                                  'args': [ { 'name': 'remote_file', 'nargs': None } ],
+                                  'help': 'remove file from device'
                                 },
                           'isdir': { 'function': self.isdir,
-                                     'min_args': 1,
-                                     'max_args': 1,
-                                     'help_args': '<remote>',
+                                     'args': [ { 'name': 'remote_dir', 'nargs': None } ],
                                      'help': 'print if remote file is a directory'
                                 },
-                          'mkdir': { 'function': lambda d: self.dm.mkDir(d),
-                                     'min_args': 1,
-                                     'max_args': 1,
-                                     'help_args': '<remote>',
+                          'mkdir': { 'function': self.mkdir,
+                                     'args': [ { 'name': 'remote_dir', 'nargs': None } ],
                                      'help': 'makes a directory on device'
                                 },
-                          'rmdir': { 'function': lambda d: self.dm.removeDir(d),
-                                    'min_args': 1,
-                                    'max_args': 1,
-                                    'help_args': '<remote>',
-                                    'help': 'recursively remove directory from device'
+                          'rmdir': { 'function': self.rmdir,
+                                     'args': [ { 'name': 'remote_dir', 'nargs': None } ],
+                                     'help': 'recursively remove directory from device'
                                 },
-                          'screencap': { 'function': lambda f: self.dm.saveScreenshot(f),
-                                          'min_args': 1,
-                                          'max_args': 1,
-                                          'help_args': '<png file>',
-                                          'help': 'capture screenshot of device in action'
-                                          },
+                          'screencap': { 'function': self.screencap,
+                                         'args': [ { 'name': 'png_file', 'nargs': None } ],
+                                         'help': 'capture screenshot of device in action'
+                                         },
                           'sutver': { 'function': self.sutver,
-                                      'min_args': 0,
-                                      'max_args': 0,
-                                      'help_args': '',
                                       'help': 'SUTAgent\'s product name and version (SUT only)'
                                    },
-
+                          'clearlogcat': { 'function': self.clearlogcat,
+                                           'help': 'clear the logcat'
+                                         },
+                          'reboot': { 'function': self.reboot,
+                                      'help': 'reboot the device'
+                                   },
+                          'isfile': { 'function': self.isfile,
+                                      'args': [ { 'name': 'remote_file', 'nargs': None } ],
+                                      'help': 'check whether a file exists on the device'
+                                   },
+                          'launchfennec': { 'function': self.launchfennec,
+                                            'args': [ { 'name': 'appname', 'nargs': None },
+                                                      { 'name': '--intent', 'action': 'store',
+                                                        'default': 'android.intent.action.VIEW' },
+                                                      { 'name': '--url', 'action': 'store' },
+                                                      { 'name': '--extra-args', 'action': 'store' },
+                                                      { 'name': '--mozenv', 'action': 'store' } ],
+                                            'help': 'launch fennec'
+                                            },
+                          'getip': { 'function': self.getip,
+                                     'args': [ { 'name': 'interface', 'nargs': '*' } ],
+                                     'help': 'get the ip address of the device'
+                                   }
                           }
 
-        usage = "usage: %prog [options] <command> [<args>]\n\ndevice commands:\n"
-        usage += "\n".join([textwrap.fill("%s %s - %s" %
-                                          (cmdname, cmd['help_args'],
-                                           cmd['help']),
-                                          initial_indent="  ",
-                                          subsequent_indent="      ")
-                            for (cmdname, cmd) in 
-                            sorted(self.commands.iteritems())])
-
-        self.parser = OptionParser(usage)
+        self.parser = argparse.ArgumentParser()
         self.add_options(self.parser)
-
+        self.add_commands(self.parser)
 
     def run(self, args=sys.argv[1:]):
-        (self.options, self.args) = self.parser.parse_args(args)
+        args = self.parser.parse_args()
 
-        if len(self.args) < 1:
-            self.parser.error("must specify command")
-
-        if self.options.dmtype == "sut" and not self.options.host and \
-                not self.options.hwid:
+        if args.dmtype == "sut" and not args.host and not args.hwid:
             self.parser.error("Must specify device ip in TEST_DEVICE or "
                               "with --host option with SUT")
 
-        (command_name, command_args) = (self.args[0], self.args[1:])
-        if command_name not in self.commands:
-            self.parser.error("Invalid command. Valid commands: %s" %
-                              " ".join(self.commands.keys()))
+        self.dm = self.getDevice(dmtype=args.dmtype, hwid=args.hwid,
+                                 host=args.host, port=args.port,
+                                 verbose=args.verbose)
 
-        command = self.commands[command_name]
-        if (len(command_args) < command['min_args'] or
-            (command['max_args'] is not None and len(command_args) > 
-             command['max_args'])):
-            self.parser.error("Wrong number of arguments")
-
-        self.dm = self.getDevice(dmtype=self.options.dmtype,
-                                 hwid=self.options.hwid,
-                                 host=self.options.host,
-                                 port=self.options.port)
-        ret = command['function'](*command_args)
+        ret = args.func(args)
         if ret is None:
             ret = 0
 
         sys.exit(ret)
 
     def add_options(self, parser):
-        parser.add_option("-v", "--verbose", action="store_true",
-                          dest="verbose",
-                          help="Verbose output from DeviceManager",
-                          default=False)
-        parser.add_option("--host", action="store",
-                          type="string", dest="host",
-                          help="Device hostname (only if using TCP/IP)",
-                          default=os.environ.get('TEST_DEVICE'))
-        parser.add_option("-p", "--port", action="store",
-                          type="int", dest="port",
-                          help="Custom device port (if using SUTAgent or "
-                          "adb-over-tcp)", default=None)
-        parser.add_option("-m", "--dmtype", action="store",
-                          type="string", dest="dmtype",
-                          help="DeviceManager type (adb or sut, defaults " \
-                              "to adb)", default=os.environ.get('DM_TRANS',
-                                                                'adb'))
-        parser.add_option("-d", "--hwid", action="store",
-                          type="string", dest="hwid",
-                          help="HWID", default=None)
-        parser.add_option("--package-name", action="store",
-                          type="string", dest="packagename",
-                          help="Packagename (if using DeviceManagerADB)",
-                          default=None)
+        parser.add_argument("-v", "--verbose", action="store_true",
+                            help="Verbose output from DeviceManager",
+                            default=False)
+        parser.add_argument("--host", action="store",
+                            help="Device hostname (only if using TCP/IP)",
+                            default=os.environ.get('TEST_DEVICE'))
+        parser.add_argument("-p", "--port", action="store",
+                            type=int,
+                            help="Custom device port (if using SUTAgent or "
+                            "adb-over-tcp)", default=None)
+        parser.add_argument("-m", "--dmtype", action="store",
+                            help="DeviceManager type (adb or sut, defaults " \
+                                "to adb)", default=os.environ.get('DM_TRANS',
+                                                                  'adb'))
+        parser.add_argument("-d", "--hwid", action="store",
+                            help="HWID", default=None)
+        parser.add_argument("--package-name", action="store",
+                            help="Packagename (if using DeviceManagerADB)",
+                            default=None)
 
-    def getDevice(self, dmtype="adb", hwid=None, host=None, port=None):
+    def add_commands(self, parser):
+        subparsers = parser.add_subparsers(title="Commands", metavar="<command>")
+        for (commandname, commandprops) in sorted(self.commands.iteritems()):
+            subparser = subparsers.add_parser(commandname, help=commandprops['help'])
+            if commandprops.get('args'):
+                for arg in commandprops['args']:
+                    subparser.add_argument(arg['name'], nargs=arg.get('nargs'),
+                                           action=arg.get('action'))
+            subparser.set_defaults(func=commandprops['function'])
+
+    def getDevice(self, dmtype="adb", hwid=None, host=None, port=None,
+                  packagename=None, verbose=False):
         '''
         Returns a device with the specified parameters
         '''
-        if self.options.verbose:
-            mozdevice.DroidSUT.debug = 4
+        logLevel = mozlog.ERROR
+        if verbose:
+            logLevel = mozlog.DEBUG
 
         if hwid:
-            return mozdevice.DroidConnectByHWID(hwid)
+            return mozdevice.DroidConnectByHWID(hwid, logLevel=logLevel)
 
         if dmtype == "adb":
             if host and not port:
                 port = 5555
-            return mozdevice.DroidADB(packageName=self.options.packagename,
-                                      host=host, port=port)
+            return mozdevice.DroidADB(packageName=packagename,
+                                      host=host, port=port,
+                                      logLevel=logLevel)
         elif dmtype == "sut":
             if not host:
                 self.parser.error("Must specify host with SUT!")
             if not port:
                 port = 20701
-            return mozdevice.DroidSUT(host=host, port=port)
+            return mozdevice.DroidSUT(host=host, port=port,
+                                      logLevel=logLevel)
         else:
             self.parser.error("Unknown device manager type: %s" % type)
 
-    def push(self, src, dest):
+    def push(self, args):
+        (src, dest) = (args.local_file, args.remote_file)
         if os.path.isdir(src):
             self.dm.pushDir(src, dest)
         else:
@@ -225,7 +205,8 @@ class DMCli(object):
                 dest = posixpath.join(dest, os.path.basename(src))
             self.dm.pushFile(src, dest)
 
-    def pull(self, src, dest=None):
+    def pull(self, args):
+        (src, dest) = (args.local_file, args.remote_file)
         if not self.dm.fileExists(src):
             print 'No such file or directory'
             return
@@ -236,69 +217,106 @@ class DMCli(object):
         else:
             self.dm.getFile(src, dest)
 
-    def install(self, apkfile):
-        basename = os.path.basename(apkfile)
+    def install(self, args):
+        basename = os.path.basename(args.file)
         app_path_on_device = posixpath.join(self.dm.getDeviceRoot(),
                                             basename)
-        self.dm.pushFile(apkfile, app_path_on_device)
+        self.dm.pushFile(args.file, app_path_on_device)
         self.dm.installApp(app_path_on_device)
 
-    def launchapp(self, appname, activity, intent, url):
-        self.dm.launchApplication(appname, activity, intent, url)
+    def uninstall(self, args):
+        self.dm.uninstallApp(args.packagename)
 
-    def killapp(self, *args):
-        for appname in args:
-            self.dm.killProcess(appname)
+    def launchapp(self, args):
+        self.dm.launchApplication(args.appname, args.activity_name,
+                                  args.intent, args.url)
 
-    def shell(self, *args):
+    def kill(self, args):
+        for name in args.process_name:
+            self.dm.killProcess(name)
+
+    def shell(self, args, root=False):
         buf = StringIO.StringIO()
-        self.dm.shell(args, buf)
+        self.dm.shell(args.command, buf, root=root)
         print str(buf.getvalue()[0:-1]).rstrip()
 
-    def getinfo(self, *args):
-        directive=None
-        if args:
-            directive=args[0]
-        info = self.dm.getInfo(directive=directive)
+    def getinfo(self, args):
+        info = self.dm.getInfo(directive=args.directive)
         for (infokey, infoitem) in sorted(info.iteritems()):
             if infokey == "process":
                 pass # skip process list: get that through ps
-            elif not directive and not infoitem:
+            elif not args.directive and not infoitem:
                 print "%s:" % infokey.upper()
-            elif not directive:
+            elif not args.directive:
                 for line in infoitem:
                     print "%s: %s" % (infokey.upper(), line)
             else:
                 print "%s" % "\n".join(infoitem)
 
-    def logcat(self):
+    def logcat(self, args):
         print ''.join(self.dm.getLogcat())
 
-    def processlist(self):
+    def clearlogcat(self, args):
+        self.dm.recordLogcat()
+
+    def reboot(self, args):
+        self.dm.reboot()
+
+    def processlist(self, args):
         pslist = self.dm.getProcessList()
         for ps in pslist:
             print " ".join(str(i) for i in ps)
 
-    def listfiles(self, dir):
-        filelist = self.dm.listFiles(dir)
+    def listfiles(self, args):
+        filelist = self.dm.listFiles(args.remote_dir)
         for file in filelist:
             print file
 
-    def isdir(self, file):
-        if self.dm.dirExists(file):
+    def removefile(self, args):
+        self.dm.removeFile(args.remote_file)
+
+    def isdir(self, args):
+        if self.dm.dirExists(args.remote_dir):
             print "TRUE"
-            return 0
+            return
 
         print "FALSE"
         return errno.ENOTDIR
 
-    def sutver(self):
-        if self.options.dmtype == 'sut':
+    def mkdir(self, args):
+        self.dm.mkDir(args.remote_dir)
+
+    def rmdir(self, args):
+        self.dm.removeDir(args.remote_dir)
+
+    def screencap(self, args):
+        self.dm.saveScreenshot(args.png_file)
+
+    def sutver(self, args):
+        if args.dmtype == 'sut':
             print '%s Version %s' % (self.dm.agentProductName,
                                      self.dm.agentVersion)
         else:
             print 'Must use SUT transport to get SUT version.'
 
+    def isfile(self, args):
+        if self.dm.fileExists(args.remote_file):
+            print "TRUE"
+            return
+        print "FALSE"
+        return errno.ENOENT
+
+    def launchfennec(self, args):
+        self.dm.launchFennec(args.appname, intent=args.intent,
+                             mozEnv=args.mozenv,
+                             extraArgs=args.extra_args, url=args.url)
+
+    def getip(self, args):
+        if args.interface:
+            print(self.dm.getIP(args.interface))
+        else:
+            print(self.dm.getIP())
+
 def cli(args=sys.argv[1:]):
     # process the command line
     cli = DMCli()
diff --git a/testing/mozbase/mozdevice/mozdevice/droid.py b/testing/mozbase/mozdevice/mozdevice/droid.py
index 4dee62f7c56c..a1b86c23b003 100644
--- a/testing/mozbase/mozdevice/mozdevice/droid.py
+++ b/testing/mozbase/mozdevice/mozdevice/droid.py
@@ -100,7 +100,7 @@ class DroidSUT(DeviceManagerSUT, DroidMixin):
         # a different process than the one that started the app. In this case,
         # we need to get back the original user serial number and then pass
         # that to the 'am start' command line
-        if not hasattr(self, 'userSerial'):
+        if not hasattr(self, '_userSerial'):
             infoDict = self.getInfo(directive="sutuserinfo")
             if infoDict.get('sutuserinfo') and \
                     len(infoDict['sutuserinfo']) > 0:
@@ -108,12 +108,14 @@ class DroidSUT(DeviceManagerSUT, DroidMixin):
                # user serial always an integer, see: http://developer.android.com/reference/android/os/UserManager.html#getSerialNumberForUser%28android.os.UserHandle%29
                m = re.match('User Serial:([0-9]+)', userSerialString)
                if m:
-                   self.userSerial = m.group(1)
+                   self._userSerial = m.group(1)
                else:
-                   self.userSerial = None
+                   self._userSerial = None
+            else:
+                self._userSerial = None
 
-        if self.userSerial is not None:
-            return [ "--user", self.userSerial ]
+        if self._userSerial is not None:
+            return [ "--user", self._userSerial ]
 
         return []
 
diff --git a/testing/mozbase/mozdevice/setup.py b/testing/mozbase/mozdevice/setup.py
index 6006d25e2005..4462b2ee0917 100644
--- a/testing/mozbase/mozdevice/setup.py
+++ b/testing/mozbase/mozdevice/setup.py
@@ -4,7 +4,7 @@
 
 from setuptools import setup
 
-PACKAGE_VERSION = '0.21'
+PACKAGE_VERSION = '0.22'
 
 setup(name='mozdevice',
       version=PACKAGE_VERSION,
@@ -19,7 +19,7 @@ setup(name='mozdevice',
       packages=['mozdevice'],
       include_package_data=True,
       zip_safe=False,
-      install_requires=[],
+      install_requires=['mozlog'],
       entry_points="""
       # -*- Entry points: -*-
       [console_scripts]
diff --git a/testing/mozbase/mozdevice/tests/droidsut_launch.py b/testing/mozbase/mozdevice/tests/droidsut_launch.py
new file mode 100644
index 000000000000..522c2fafa570
--- /dev/null
+++ b/testing/mozbase/mozdevice/tests/droidsut_launch.py
@@ -0,0 +1,35 @@
+from sut import MockAgent
+import mozdevice
+import mozlog
+import unittest
+
+class LaunchTest(unittest.TestCase):
+
+    def test_nouserserial(self):
+        a = MockAgent(self, commands = [("ps",
+                                         "10029	549	com.android.launcher\n"
+                                         "10066	1198	com.twitter.android"),
+                                        ("info sutuserinfo", ""),
+                                        ("exec am start -W -n "
+                                         "org.mozilla.fennec/.App -a "
+                                         "android.intent.action.VIEW",
+                                         "OK\nreturn code [0]")])
+        d = mozdevice.DroidSUT("127.0.0.1", port=a.port, logLevel=mozlog.DEBUG)
+        d.launchFennec("org.mozilla.fennec")
+        a.wait()
+
+    def test_userserial(self):
+        a = MockAgent(self, commands = [("ps",
+                                         "10029	549	com.android.launcher\n"
+                                         "10066	1198	com.twitter.android"),
+                                        ("info sutuserinfo", "User Serial:0"),
+                                        ("exec am start --user 0 -W -n "
+                                         "org.mozilla.fennec/.App -a "
+                                         "android.intent.action.VIEW",
+                                         "OK\nreturn code [0]")])
+        d = mozdevice.DroidSUT("127.0.0.1", port=a.port, logLevel=mozlog.DEBUG)
+        d.launchFennec("org.mozilla.fennec")
+        a.wait()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/testing/mozbase/mozdevice/tests/manifest.ini b/testing/mozbase/mozdevice/tests/manifest.ini
index 69486ce8320b..d9682256b9cf 100644
--- a/testing/mozbase/mozdevice/tests/manifest.ini
+++ b/testing/mozbase/mozdevice/tests/manifest.ini
@@ -1,5 +1,9 @@
+[DEFAULT]
+skip-if = os == 'win'
+
 [sut_basic.py]
 [sut_mkdir.py]
 [sut_push.py]
 [sut_pull.py]
 [sut_ps.py]
+[droidsut_launch.py]
\ No newline at end of file
diff --git a/testing/mozbase/mozdevice/tests/sut_basic.py b/testing/mozbase/mozdevice/tests/sut_basic.py
index 3cec0af48ec7..5b03cd0a0b70 100644
--- a/testing/mozbase/mozdevice/tests/sut_basic.py
+++ b/testing/mozbase/mozdevice/tests/sut_basic.py
@@ -1,5 +1,6 @@
 from sut import MockAgent
 import mozdevice
+import mozlog
 import unittest
 
 class BasicTest(unittest.TestCase):
@@ -8,8 +9,7 @@ class BasicTest(unittest.TestCase):
         """Tests DeviceManager initialization."""
         a = MockAgent(self)
 
-        mozdevice.DroidSUT.debug = 4
-        d = mozdevice.DroidSUT("127.0.0.1", port=a.port)
+        d = mozdevice.DroidSUT("127.0.0.1", port=a.port, logLevel=mozlog.DEBUG)
         # all testing done in device's constructor
         a.wait()
 
@@ -21,8 +21,7 @@ class BasicTest(unittest.TestCase):
                 ("mkdr /mnt/sdcard/tests", "/mnt/sdcard/tests successfully created"),
                 ("ver", "SUTAgentAndroid Version 1.14")]
         a = MockAgent(self, start_commands = cmds)
-        mozdevice.DroidSUT.debug = 4
-        dm = mozdevice.DroidSUT("127.0.0.1", port=a.port)
+        dm = mozdevice.DroidSUT("127.0.0.1", port=a.port, logLevel=mozlog.DEBUG)
         a.wait()
 
     def test_timeout_normal(self):
@@ -32,8 +31,7 @@ class BasicTest(unittest.TestCase):
                                         ("ls", "test.txt"),
                                         ("rm /mnt/sdcard/tests/test.txt",
                                          "Removed the file")])
-        mozdevice.DroidSUT.debug = 4
-        d = mozdevice.DroidSUT("127.0.0.1", port=a.port)
+        d = mozdevice.DroidSUT("127.0.0.1", port=a.port, logLevel=mozlog.DEBUG)
         ret = d.removeFile('/mnt/sdcard/tests/test.txt')
         self.assertEqual(ret, None) # if we didn't throw an exception, we're ok
         a.wait()
@@ -44,8 +42,7 @@ class BasicTest(unittest.TestCase):
                                         ("cd /mnt/sdcard/tests", ""),
                                         ("ls", "test.txt"),
                                         ("rm /mnt/sdcard/tests/test.txt", 0)])
-        mozdevice.DroidSUT.debug = 4
-        d = mozdevice.DroidSUT("127.0.0.1", port=a.port)
+        d = mozdevice.DroidSUT("127.0.0.1", port=a.port, logLevel=mozlog.DEBUG)
         d.default_timeout = 1
         exceptionThrown = False
         try:
diff --git a/testing/mozbase/mozdevice/tests/sut_mkdir.py b/testing/mozbase/mozdevice/tests/sut_mkdir.py
index 188746a4390c..14cc658474f9 100644
--- a/testing/mozbase/mozdevice/tests/sut_mkdir.py
+++ b/testing/mozbase/mozdevice/tests/sut_mkdir.py
@@ -2,6 +2,7 @@
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 import mozdevice
+import mozlog
 import unittest
 from sut import MockAgent
 
@@ -31,8 +32,8 @@ class MkDirsTest(unittest.TestCase):
 
             exceptionThrown = False
             try:
-                mozdevice.DroidSUT.debug = 4
-                d = mozdevice.DroidSUT('127.0.0.1', port=a.port)
+                d = mozdevice.DroidSUT('127.0.0.1', port=a.port,
+                                       logLevel=mozlog.DEBUG)
                 d.mkDirs('/mnt/sdcard/baz/boop/bip')
             except mozdevice.DMError:
                 exceptionThrown = True
@@ -53,8 +54,8 @@ class MkDirsTest(unittest.TestCase):
                 ('mkdr /mnt/sdcard/foo',
                  '/mnt/sdcard/foo successfully created')]
         a = MockAgent(self, commands=cmds)
-        mozdevice.DroidSUT.debug = 4
-        d = mozdevice.DroidSUT('127.0.0.1', port=a.port)
+        d = mozdevice.DroidSUT('127.0.0.1', port=a.port,
+                               logLevel=mozlog.DEBUG)
         d.mkDirs('/mnt/sdcard/foo/foo')
         a.wait()
 
diff --git a/testing/mozbase/mozdevice/tests/sut_pull.py b/testing/mozbase/mozdevice/tests/sut_pull.py
index 6e8e98f2df75..6eaeddfcd3ef 100644
--- a/testing/mozbase/mozdevice/tests/sut_pull.py
+++ b/testing/mozbase/mozdevice/tests/sut_pull.py
@@ -1,5 +1,6 @@
 from sut import MockAgent
 import mozdevice
+import mozlog
 import unittest
 import hashlib
 import tempfile
@@ -15,14 +16,14 @@ class PullTest(unittest.TestCase):
 
             # pull file is kind of gross, make sure we can still execute commands after it's done
             remoteName = "/mnt/sdcard/cheeseburgers"
-            mozdevice.DroidSUT.debug = 4
             a = MockAgent(self, commands = [("pull %s" % remoteName,
                                              "%s,%s\n%s" % (remoteName,
                                                             len(cheeseburgers),
                                                             cheeseburgers)),
                                             ("isdir /mnt/sdcard", "TRUE")])
 
-            d = mozdevice.DroidSUT("127.0.0.1", port=a.port)
+            d = mozdevice.DroidSUT("127.0.0.1", port=a.port,
+                                   logLevel=mozlog.DEBUG)
             pulledData = d.pullFile("/mnt/sdcard/cheeseburgers")
             self.assertEqual(pulledData, cheeseburgers)
             d.dirExists('/mnt/sdcard')
@@ -35,7 +36,8 @@ class PullTest(unittest.TestCase):
         a = MockAgent(self, commands = [("pull %s" % remoteName,
                                          "%s,15\n%s" % (remoteName,
                                                         "cheeseburgh"))])
-        d = mozdevice.DroidSUT("127.0.0.1", port=a.port)
+        d = mozdevice.DroidSUT("127.0.0.1", port=a.port,
+                               logLevel=mozlog.DEBUG)
         exceptionThrown = False
         try:
             d.pullFile("/mnt/sdcard/cheeseburgers")
diff --git a/testing/mozbase/mozdevice/tests/sut_push.py b/testing/mozbase/mozdevice/tests/sut_push.py
index 3d02a3a9f5a2..37d51f7daf74 100644
--- a/testing/mozbase/mozdevice/tests/sut_push.py
+++ b/testing/mozbase/mozdevice/tests/sut_push.py
@@ -1,5 +1,6 @@
 from sut import MockAgent
 import mozdevice
+import mozlog
 import unittest
 import hashlib
 import tempfile
@@ -68,8 +69,8 @@ class PushTest(unittest.TestCase):
 
             exceptionThrown = False
             try:
-                mozdevice.DroidSUT.debug = 4
-                d = mozdevice.DroidSUT("127.0.0.1", port=a.port)
+                d = mozdevice.DroidSUT("127.0.0.1", port=a.port,
+                                       logLevel=mozlog.DEBUG)
                 d.pushDir(tempdir, "/mnt/sdcard")
             except mozdevice.DMError, e:
                 exceptionThrown = True
diff --git a/testing/mozbase/mozprofile/mozprofile/addons.py b/testing/mozbase/mozprofile/mozprofile/addons.py
index 14f44acd6aa3..dcd5df33e70e 100644
--- a/testing/mozbase/mozprofile/mozprofile/addons.py
+++ b/testing/mozbase/mozprofile/mozprofile/addons.py
@@ -103,14 +103,14 @@ class AddonManager(object):
         """
         Returns a dictionary of details about the addon.
 
-        :param addon_path: path to the addon directory
+        :param addon_path: path to the add-on directory or XPI
 
         Returns::
 
             {'id':      u'rainbow@colors.org', # id of the addon
              'version': u'1.4',                # version of the addon
              'name':    u'Rainbow',            # name of the addon
-             'unpack':  False } # whether to unpack the addon
+             'unpack':  False }                # whether to unpack the addon
         """
 
         # TODO: We don't use the unpack variable yet, but we should: bug 662683
@@ -140,7 +140,15 @@ class AddonManager(object):
                     rc.append(node.data)
             return ''.join(rc).strip()
 
-        doc = minidom.parse(os.path.join(addon_path, 'install.rdf'))
+        if zipfile.is_zipfile(addon_path):
+            compressed_file = zipfile.ZipFile(addon_path, 'r')
+            try:
+                parseable = compressed_file.read('install.rdf')
+                doc = minidom.parseString(parseable)
+            finally:
+                compressed_file.close()
+        else:
+            doc = minidom.parse(os.path.join(addon_path, 'install.rdf'))
 
         # Get the namespaces abbreviations
         em = get_namespace_id(doc, "http://www.mozilla.org/2004/em-rdf#")
diff --git a/testing/mozbase/mozprofile/mozprofile/permissions.py b/testing/mozbase/mozprofile/mozprofile/permissions.py
index e031ee505e15..31b241d3c2b4 100644
--- a/testing/mozbase/mozprofile/mozprofile/permissions.py
+++ b/testing/mozbase/mozprofile/mozprofile/permissions.py
@@ -21,6 +21,11 @@ except ImportError:
     from pysqlite2 import dbapi2 as sqlite3
 import urlparse
 
+# http://hg.mozilla.org/mozilla-central/file/b871dfb2186f/build/automation.py.in#l28
+_DEFAULT_PORTS = { 'http': '8888',
+                   'https': '4443',
+                   'ws': '9988',
+                   'wss': '4443' }
 
 class LocationError(Exception):
     """Signifies an improperly formed location."""
@@ -58,7 +63,7 @@ class BadPortLocationError(LocationError):
 
     def __init__(self, given_port):
         LocationError.__init__(self, "bad value for port: %s" % given_port)
-        
+
 
 class LocationsSyntaxError(Exception):
     """Signifies a syntax error on a particular line in server-locations.txt."""
@@ -182,11 +187,7 @@ class ServerLocations(object):
                 host, port = netloc.rsplit(':', 1)
             except ValueError:
                 host = netloc
-                default_ports = {'http': '80',
-                                 'https': '443',
-                                 'ws': '443',
-                                 'wss': '443'}
-                port = default_ports.get(scheme, '80')
+                port = _DEFAULT_PORTS.get(scheme, '80')
 
             try:
                 location = Location(scheme, host, port, options)
@@ -232,7 +233,7 @@ class Permissions(object):
         # Open database and create table
         permDB = sqlite3.connect(os.path.join(self._profileDir, "permissions.sqlite"))
         cursor = permDB.cursor();
-        cursor.execute("PRAGMA schema_version = 3;")
+
         # SQL copied from
         # http://mxr.mozilla.org/mozilla-central/source/extensions/cookie/nsPermissionManager.cpp
         cursor.execute("""CREATE TABLE IF NOT EXISTS moz_hosts (
@@ -252,15 +253,27 @@ class Permissions(object):
                     permission_type = 1
                 else:
                     permission_type = 2
-                cursor.execute("INSERT INTO moz_hosts values(?, ?, ?, ?, 0, 0)",
+
+                rows = cursor.execute("PRAGMA table_info(moz_hosts)")
+                count = len(rows.fetchall())
+
+                # if the db contains 8 columns, we're using user_version 3
+                if count == 8:
+                    statement = "INSERT INTO moz_hosts values(?, ?, ?, ?, 0, 0, 0, 0)"
+                    cursor.execute("PRAGMA user_version=3;")
+                else:
+                    statement = "INSERT INTO moz_hosts values(?, ?, ?, ?, 0, 0)"
+                    cursor.execute("PRAGMA user_version=2;")
+
+                cursor.execute(statement,
                                (self._num_permissions, location.host, perm,
-                                permission_type))
+                               permission_type))
 
         # Commit and close
         permDB.commit()
         cursor.close()
 
-    def network_prefs(self, proxy=False):
+    def network_prefs(self, proxy=None):
         """
         take known locations and generate preferences to handle permissions and proxy
         returns a tuple of prefs, user_prefs
@@ -277,30 +290,33 @@ class Permissions(object):
             prefs.append(("capability.principal.codebase.p%s.subjectName" % i, ""))
 
         if proxy:
-            user_prefs = self.pac_prefs()
+            user_prefs = self.pac_prefs(proxy)
         else:
             user_prefs = []
 
         return prefs, user_prefs
 
-    def pac_prefs(self):
+    def pac_prefs(self, user_proxy=None):
         """
         return preferences for Proxy Auto Config. originally taken from
         http://mxr.mozilla.org/mozilla-central/source/build/automation.py.in
         """
-
-        prefs = []
+        proxy = _DEFAULT_PORTS
 
         # We need to proxy every server but the primary one.
         origins = ["'%s'" % l.url()
                    for l in self._locations]
-
         origins = ", ".join(origins)
+        proxy["origins"] = origins
 
         for l in self._locations:
             if "primary" in l.options:
-                webServer = l.host
-                port = l.port
+                proxy["remote"] = l.host
+                proxy[l.scheme] = l.port
+
+        # overwrite defaults with user specified proxy
+        if isinstance(user_proxy, dict):
+            proxy.update(user_proxy)
 
         # TODO: this should live in a template!
         # TODO: So changing the 5th line of the regex below from (\\\\\\\\d+)
@@ -335,14 +351,15 @@ function FindProxyForURL(url, host)
   var origin = matches[1] + '://' + matches[2] + ':' + matches[3];
   if (origins.indexOf(origin) < 0)
     return 'DIRECT';
-  if (isHttp || isHttps || isWebSocket || isWebSocketSSL)
-    return 'PROXY %(remote)s:%(port)s';
+  if (isHttp) return 'PROXY %(remote)s:%(http)s';
+  if (isHttps) return 'PROXY %(remote)s:%(https)s';
+  if (isWebSocket) return 'PROXY %(remote)s:%(ws)s';
+  if (isWebSocketSSL) return 'PROXY %(remote)s:%(wss)s';
   return 'DIRECT';
-}""" % { "origins": origins,
-         "remote":  webServer,
-         "port": port }
+}""" % proxy
         pacURL = "".join(pacURL.splitlines())
 
+        prefs = []
         prefs.append(("network.proxy.type", 2))
         prefs.append(("network.proxy.autoconfig_url", pacURL))
 
diff --git a/testing/mozbase/mozprofile/mozprofile/prefs.py b/testing/mozbase/mozprofile/mozprofile/prefs.py
index b701afbd6238..81cd3b41d7da 100644
--- a/testing/mozbase/mozprofile/mozprofile/prefs.py
+++ b/testing/mozbase/mozprofile/mozprofile/prefs.py
@@ -45,7 +45,7 @@ class Preferences(object):
 
     def add_file(self, path):
         """a preferences from a file
-        
+
         :param path:
         """
         self.add(self.read(path))
@@ -203,26 +203,26 @@ class Preferences(object):
         return retval
 
     @classmethod
-    def write(cls, _file, prefs, pref_string='user_pref("%s", %s);'):
+    def write(cls, _file, prefs, pref_string='user_pref(%s, %s);'):
         """write preferences to a file"""
 
         if isinstance(_file, basestring):
-            f = file(_file, 'w')
+            f = file(_file, 'a')
         else:
             f = _file
 
         if isinstance(prefs, dict):
+            # order doesn't matter
             prefs = prefs.items()
 
-        for key, value in prefs:
-            if value is True:
-                print >> f, pref_string % (key, 'true')
-            elif value is False:
-                print >> f, pref_string % (key, 'false')
-            elif isinstance(value, basestring):
-                print >> f, pref_string % (key, repr(str(value)))
-            else:
-                print >> f, pref_string % (key, value) # should be numeric!
+        # serialize -> JSON
+        _prefs = [(json.dumps(k), json.dumps(v) )
+                  for k, v in prefs]
 
+        # write the preferences
+        for _pref in _prefs:
+            print >> f, pref_string % _pref
+
+        # close the file if opened internally
         if isinstance(_file, basestring):
             f.close()
diff --git a/testing/mozbase/mozprofile/mozprofile/profile.py b/testing/mozbase/mozprofile/mozprofile/profile.py
index 26e7f828e451..95f0aaa9f222 100644
--- a/testing/mozbase/mozprofile/mozprofile/profile.py
+++ b/testing/mozbase/mozprofile/mozprofile/profile.py
@@ -11,6 +11,7 @@ import types
 import uuid
 from addons import AddonManager
 from permissions import Permissions
+from prefs import Preferences
 from shutil import copytree, rmtree
 from webapps import WebappCollection
 
@@ -134,9 +135,8 @@ class Profile(object):
         return c
 
     def create_new_profile(self):
-        """Create a new clean profile in tmp which is a simple empty folder"""
-        profile = tempfile.mkdtemp(suffix='.mozrunner')
-        return profile
+        """Create a new clean temporary profile which is a simple empty folder"""
+        return tempfile.mkdtemp(suffix='.mozrunner')
 
 
     ### methods for preferences
@@ -153,18 +153,15 @@ class Profile(object):
             # note what files we've touched
             self.written_prefs.add(filename)
 
-
-            if isinstance(preferences, dict):
-                # order doesn't matter
-                preferences = preferences.items()
+            # opening delimeter
+            f.write('\n%s\n' % self.delimeters[0])
 
             # write the preferences
-            f.write('\n%s\n' % self.delimeters[0])
-            _prefs = [(json.dumps(k), json.dumps(v) )
-                      for k, v in preferences]
-            for _pref in _prefs:
-                f.write('user_pref(%s, %s);\n' % _pref)
+            Preferences.write(f, preferences)
+
+            # closing delimeter
             f.write('%s\n' % self.delimeters[1])
+
         f.close()
 
     def pop_preferences(self, filename):
diff --git a/testing/mozbase/mozprofile/setup.py b/testing/mozbase/mozprofile/setup.py
index a0b68f3cad49..01e37fd10ba2 100644
--- a/testing/mozbase/mozprofile/setup.py
+++ b/testing/mozbase/mozprofile/setup.py
@@ -5,7 +5,7 @@
 import sys
 from setuptools import setup
 
-PACKAGE_VERSION = '0.5'
+PACKAGE_VERSION = '0.7'
 
 # we only support python 2 right now
 assert sys.version_info[0] == 2
diff --git a/testing/mozbase/mozprofile/tests/addonid.py b/testing/mozbase/mozprofile/tests/addonid.py
index 6f71d92f2501..8b463f207a10 100755
--- a/testing/mozbase/mozprofile/tests/addonid.py
+++ b/testing/mozbase/mozprofile/tests/addonid.py
@@ -6,16 +6,20 @@ import unittest
 import shutil
 from mozprofile import addons
 
+
+here = os.path.dirname(os.path.abspath(__file__))
+
+
 class AddonIDTest(unittest.TestCase):
     """ Test finding the addon id in a variety of install.rdf styles """
-    
+
     def make_install_rdf(self, filecontents):
         path = tempfile.mkdtemp()
         f = open(os.path.join(path, "install.rdf"), "w")
         f.write(filecontents)
         f.close()
         return path
- 
+
     def test_addonID(self):
         testlist = self.get_test_list()
         for t in testlist:
@@ -23,10 +27,15 @@ class AddonIDTest(unittest.TestCase):
                 p = self.make_install_rdf(t)
                 a = addons.AddonManager(os.path.join(p, "profile"))
                 addon_id = a.addon_details(p)['id']
-                self.assertTrue(addon_id == "winning", "We got the addon id")
+                self.assertEqual(addon_id, "winning", "We got the addon id")
             finally:
                 shutil.rmtree(p)
 
+    def test_addonID_xpi(self):
+        a = addons.AddonManager("profile")
+        addon = a.addon_details(os.path.join(here, "addons", "empty.xpi"))
+        self.assertEqual(addon['id'], "test-empty@quality.mozilla.org", "We got the addon id")
+
     def get_test_list(self):
         """ This just returns a hardcoded list of install.rdf snippets for testing.
             When adding snippets for testing, remember that the id we're looking for
diff --git a/testing/mozbase/mozprofile/tests/empty/install.rdf b/testing/mozbase/mozprofile/tests/addons/empty/install.rdf
similarity index 97%
rename from testing/mozbase/mozprofile/tests/empty/install.rdf
rename to testing/mozbase/mozprofile/tests/addons/empty/install.rdf
index 4531a3820b83..70b9e13e44bf 100644
--- a/testing/mozbase/mozprofile/tests/empty/install.rdf
+++ b/testing/mozbase/mozprofile/tests/addons/empty/install.rdf
@@ -16,5 +16,5 @@
 				<em:maxVersion>*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
-	</Description>  
+	</Description>
 </RDF>
diff --git a/testing/mozbase/mozprofile/tests/bug758250.py b/testing/mozbase/mozprofile/tests/bug758250.py
index 7f385bcea85c..61bc85fae555 100755
--- a/testing/mozbase/mozprofile/tests/bug758250.py
+++ b/testing/mozbase/mozprofile/tests/bug758250.py
@@ -6,8 +6,10 @@ import shutil
 import tempfile
 import unittest
 
+
 here = os.path.dirname(os.path.abspath(__file__))
 
+
 class Bug758250(unittest.TestCase):
     """
     use of --profile in mozrunner just blows away addon sources:
@@ -17,7 +19,7 @@ class Bug758250(unittest.TestCase):
     def test_profile_addon_cleanup(self):
 
         # sanity check: the empty addon should be here
-        empty = os.path.join(here, 'empty')
+        empty = os.path.join(here, 'addons', 'empty')
         self.assertTrue(os.path.exists(empty))
         self.assertTrue(os.path.isdir(empty))
         self.assertTrue(os.path.exists(os.path.join(empty, 'install.rdf')))
diff --git a/testing/mozbase/mozprofile/tests/bug785146.py b/testing/mozbase/mozprofile/tests/bug785146.py
index c0762e3791cf..29376d8d17fd 100644
--- a/testing/mozbase/mozprofile/tests/bug785146.py
+++ b/testing/mozbase/mozprofile/tests/bug785146.py
@@ -41,7 +41,7 @@ http://127.0.0.1:8888           privileged
         perms_db_filename = os.path.join(self.profile_dir, 'permissions.sqlite')
         perms.write_db(self.locations_file)
 
-        stmt = 'PRAGMA schema_version;'
+        stmt = 'PRAGMA user_version;'
 
         con = sqlite3.connect(perms_db_filename)
         cur = con.cursor()
@@ -49,7 +49,7 @@ http://127.0.0.1:8888           privileged
         entries = cur.fetchall()
 
         schema_version = entries[0][0]
-        self.assertEqual(schema_version, 3)
+        self.assertEqual(schema_version, 2)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/testing/mozbase/mozprofile/tests/permissions.py b/testing/mozbase/mozprofile/tests/permissions.py
index 2bb904531625..5f2798c036f9 100644
--- a/testing/mozbase/mozprofile/tests/permissions.py
+++ b/testing/mozbase/mozprofile/tests/permissions.py
@@ -36,7 +36,37 @@ http://127.0.0.1:8888           privileged
         if self.locations_file:
             self.locations_file.close()
 
-    def test_permissions_db(self):
+    def write_perm_db(self, version=3):
+        permDB = sqlite3.connect(os.path.join(self.profile_dir, "permissions.sqlite"))
+        cursor = permDB.cursor()
+
+        cursor.execute("PRAGMA user_version=%d;" % version)
+
+        if version == 3:
+            cursor.execute("""CREATE TABLE IF NOT EXISTS moz_hosts (
+               id INTEGER PRIMARY KEY,
+               host TEXT,
+               type TEXT,
+               permission INTEGER,
+               expireType INTEGER,
+               expireTime INTEGER,
+               appId INTEGER,
+               isInBrowserElement INTEGER)""")
+        elif version == 2:
+            cursor.execute("""CREATE TABLE IF NOT EXISTS moz_hosts (
+               id INTEGER PRIMARY KEY,
+               host TEXT,
+               type TEXT,
+               permission INTEGER,
+               expireType INTEGER,
+               expireTime INTEGER)""")
+        else:
+            raise Exception("version must be 2 or 3")
+
+        permDB.commit()
+        cursor.close()
+
+    def test_create_permissions_db(self):
         perms = Permissions(self.profile_dir, self.locations_file.name)
         perms_db_filename = os.path.join(self.profile_dir, 'permissions.sqlite')
 
@@ -48,7 +78,7 @@ http://127.0.0.1:8888           privileged
         entries = cur.fetchall()
 
         self.assertEqual(len(entries), 3)
-        
+
         self.assertEqual(entries[0][0], 'mochi.test')
         self.assertEqual(entries[0][1], 'allowXULXBL')
         self.assertEqual(entries[0][2], 1)
@@ -71,12 +101,17 @@ http://127.0.0.1:8888           privileged
         self.assertEqual(entries[3][1], 'allowXULXBL')
         self.assertEqual(entries[3][2], 2)
 
+        # when creating a DB we should default to user_version==2
+        cur.execute('PRAGMA user_version')
+        entries = cur.fetchall()
+        self.assertEqual(entries[0][0], 2)
+
         perms.clean_db()
         # table should be removed
         cur.execute("select * from sqlite_master where type='table'")
         entries = cur.fetchall()
         self.assertEqual(len(entries), 0)
-        
+
     def test_nw_prefs(self):
         perms = Permissions(self.profile_dir, self.locations_file.name)
 
@@ -97,7 +132,6 @@ http://127.0.0.1:8888           privileged
                                     'http://127.0.0.1:8888'))
         self.assertEqual(prefs[5], ('capability.principal.codebase.p2.subjectName', ''))
 
-
         prefs, user_prefs = perms.network_prefs(True)
         self.assertEqual(len(user_prefs), 2)
         self.assertEqual(user_prefs[0], ('network.proxy.type', 2))
@@ -106,8 +140,39 @@ http://127.0.0.1:8888           privileged
         origins_decl = "var origins = ['http://mochi.test:8888', 'http://127.0.0.1:80', 'http://127.0.0.1:8888'];"
         self.assertTrue(origins_decl in user_prefs[1][1])
 
-        proxy_check = "if (isHttp || isHttps || isWebSocket || isWebSocketSSL)    return 'PROXY mochi.test:8888';"
-        self.assertTrue(proxy_check in user_prefs[1][1])
+        proxy_check = ("if (isHttp) return 'PROXY mochi.test:8888';",
+                       "if (isHttps) return 'PROXY mochi.test:4443';",
+                       "if (isWebSocket) return 'PROXY mochi.test:9988';",
+                       "if (isWebSocketSSL) return 'PROXY mochi.test:4443';")
+        self.assertTrue(all(c in user_prefs[1][1] for c in proxy_check))
+
+    def verify_user_version(self, version):
+        """Verifies that we call INSERT statements using the correct number
+        of columns for existing databases.
+        """
+        self.write_perm_db(version=version)
+        Permissions(self.profile_dir, self.locations_file.name)
+        perms_db_filename = os.path.join(self.profile_dir, 'permissions.sqlite')
+
+        select_stmt = 'select * from moz_hosts'
+
+        con = sqlite3.connect(perms_db_filename)
+        cur = con.cursor()
+        cur.execute(select_stmt)
+        entries = cur.fetchall()
+
+        self.assertEqual(len(entries), 3)
+
+        columns = 8 if version == 3 else 6
+        self.assertEqual(len(entries[0]), columns)
+        for x in range(4, columns):
+            self.assertEqual(entries[0][x], 0)
+
+    def test_existing_permissions_db_v2(self):
+        self.verify_user_version(2)
+
+    def test_existing_permissions_db_v3(self):
+        self.verify_user_version(3)
 
 
 if __name__ == '__main__':
diff --git a/testing/mozbase/mozprofile/tests/server_locations.py b/testing/mozbase/mozprofile/tests/server_locations.py
index 2f3dc8bc600d..0c860bd79524 100644
--- a/testing/mozbase/mozprofile/tests/server_locations.py
+++ b/testing/mozbase/mozprofile/tests/server_locations.py
@@ -70,7 +70,7 @@ http://example.org:80           privileged
         self.compare_location(i.next(), 'https', 'test', '80', ['privileged'])
         self.compare_location(i.next(), 'http', 'example.org', '80',
                               ['privileged'])
-        self.compare_location(i.next(), 'http', 'test1.example.org', '80',
+        self.compare_location(i.next(), 'http', 'test1.example.org', '8888',
                               ['privileged'])
 
         locations.add_host('mozilla.org')
diff --git a/testing/mozbase/test.py b/testing/mozbase/test.py
index 97f35613721a..c0f62b1beb09 100755
--- a/testing/mozbase/test.py
+++ b/testing/mozbase/test.py
@@ -11,6 +11,8 @@ by default https://github.com/mozilla/mozbase/blob/master/test-manifest.ini
 
 import imp
 import manifestparser
+import mozinfo
+import optparse
 import os
 import sys
 import unittest
@@ -38,6 +40,14 @@ def unittests(path):
 
 def main(args=sys.argv[1:]):
 
+    # parse command line options
+    usage = '%prog [options] manifest.ini <manifest.ini> <...>'
+    parser = optparse.OptionParser(usage=usage, description=__doc__)
+    parser.add_option('--list', dest='list_tests',
+                      action='store_true', default=False,
+                      help="list paths of tests to be run")
+    options, args = parser.parse_args(args)
+
     # read the manifest
     if args:
         manifests = args
@@ -48,14 +58,21 @@ def main(args=sys.argv[1:]):
         # ensure manifests exist
         if not os.path.exists(manifest):
             missing.append(manifest)
-    assert not missing, 'manifest%s not found: %s' % ((len(manifests) == 1 and '' or 's'), ', '.join(missing))
+    assert not missing, 'manifest(s) not found: %s' % ', '.join(missing)
     manifest = manifestparser.TestManifest(manifests=manifests)
 
     # gather the tests
-    tests = manifest.active_tests()
+    tests = manifest.active_tests(disabled=False, **mozinfo.info)
+    tests = [test['path'] for test in tests]
+    if options.list_tests:
+        # print test paths
+        print '\n'.join(tests)
+        sys.exit(0)
+
+    # create unittests
     unittestlist = []
     for test in tests:
-        unittestlist.extend(unittests(test['path']))
+        unittestlist.extend(unittests(test))
 
     # run the tests
     suite = unittest.TestSuite(unittestlist)

From 906276315aa83bfc48b97ae77918d13a82872dc0 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Wed, 17 Apr 2013 16:56:03 -0400
Subject: [PATCH 209/438] Bug 860441 - Camera preview update is not smooth on
 gonk - r=nsilva

---
 gfx/gl/GLContext.h                   |  1 +
 gfx/gl/GLContextProviderEGL.cpp      | 22 +++++++++++++++++
 gfx/layers/client/ImageClient.cpp    | 15 +++++++++++
 gfx/layers/composite/ImageHost.cpp   |  1 -
 gfx/layers/opengl/TextureHostOGL.cpp | 37 ++++++++++++++++------------
 gfx/layers/opengl/TextureHostOGL.h   |  6 +++++
 6 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 44a27192c9be..de6f0af14df8 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -359,6 +359,7 @@ public:
 #ifdef MOZ_WIDGET_GONK
     virtual EGLImage CreateEGLImageForNativeBuffer(void* buffer) = 0;
     virtual void DestroyEGLImage(EGLImage image) = 0;
+    virtual EGLImage GetNullEGLImage() = 0;
 #endif
 
     virtual already_AddRefed<TextureImage>
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index eeb3725b927f..7866bb57b698 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -441,6 +441,26 @@ public:
     {
         sEGLLibrary.fDestroyImage(EGL_DISPLAY(), image);
     }
+
+    EGLImage GetNullEGLImage() MOZ_OVERRIDE
+    {
+        if (!mNullGraphicBuffer.get()) {
+            mNullGraphicBuffer
+              = new android::GraphicBuffer(
+                  1, 1,
+                  PIXEL_FORMAT_RGB_565,
+                  GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_NEVER);
+            EGLint attrs[] = {
+                LOCAL_EGL_NONE, LOCAL_EGL_NONE
+            };
+            mNullEGLImage = sEGLLibrary.fCreateImage(EGL_DISPLAY(),
+                                                     EGL_NO_CONTEXT,
+                                                     LOCAL_EGL_NATIVE_BUFFER_ANDROID,
+                                                     mNullGraphicBuffer->getNativeBuffer(),
+                                                     attrs);
+        }
+        return mNullEGLImage;
+    }
 #endif
 
 
@@ -695,6 +715,8 @@ protected:
     bool mShareWithEGLImage;
 #ifdef MOZ_WIDGET_GONK
     nsRefPtr<HwcComposer2D> mHwc;
+    EGLImage mNullEGLImage;
+    android::sp<android::GraphicBuffer> mNullGraphicBuffer;
 #endif
 
     // A dummy texture ID that can be used when we need a texture object whose
diff --git a/gfx/layers/client/ImageClient.cpp b/gfx/layers/client/ImageClient.cpp
index e0d661d0edf1..02f907e9f3be 100644
--- a/gfx/layers/client/ImageClient.cpp
+++ b/gfx/layers/client/ImageClient.cpp
@@ -159,6 +159,21 @@ ImageClientSingle::UpdateImage(ImageContainer* aContainer,
       return false;
     }
     mTextureClient->SetDescriptor(desc);
+  } else if (image->GetFormat() == GONK_IO_SURFACE) {
+    EnsureTextureClient(TEXTURE_SHARED_GL_EXTERNAL);
+
+    nsIntRect rect(0, 0,
+                   image->GetSize().width,
+                   image->GetSize().height);
+    UpdatePictureRect(rect);
+
+    AutoLockTextureClient lock(mTextureClient);
+
+    SurfaceDescriptor desc = static_cast<GonkIOSurfaceImage*>(image)->GetSurfaceDescriptor();
+    if (!IsSurfaceDescriptorValid(desc)) {
+      return false;
+    }
+    mTextureClient->SetDescriptor(desc);
   } else {
     nsRefPtr<gfxASurface> surface = image->GetAsSurface();
     MOZ_ASSERT(surface);
diff --git a/gfx/layers/composite/ImageHost.cpp b/gfx/layers/composite/ImageHost.cpp
index 93fd20667afd..a0de015afb51 100644
--- a/gfx/layers/composite/ImageHost.cpp
+++ b/gfx/layers/composite/ImageHost.cpp
@@ -161,7 +161,6 @@ ImageHostBuffered::EnsureTextureHost(TextureIdentifier aTextureId,
                                                    aTextureInfo);
   if (result) {
     mTextureHost->SetBuffer(new SurfaceDescriptor(null_t()), aAllocator);
-    mPictureRect = nsIntRect(0, 0, -1, -1);
   }
 
   return result;
diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp
index d4b70734fc3f..a1bae77d39f6 100644
--- a/gfx/layers/opengl/TextureHostOGL.cpp
+++ b/gfx/layers/opengl/TextureHostOGL.cpp
@@ -593,9 +593,22 @@ SurfaceFormatForAndroidPixelFormat(android::PixelFormat aFormat)
     return FORMAT_R5G6B5;
   case android::PIXEL_FORMAT_A_8:
     return FORMAT_A8;
+  case 17: // NV21 YUV format, see http://developer.android.com/reference/android/graphics/ImageFormat.html#NV21
+    return FORMAT_B8G8R8A8; // yup, use FORMAT_B8G8R8A8 even though it's a YUV texture. This is an external texture.
   default:
     MOZ_NOT_REACHED("Unknown Android pixel format");
-    return FORMAT_B8G8R8A8;
+    return FORMAT_UNKNOWN;
+  }
+}
+
+static GLenum
+TextureTargetForAndroidPixelFormat(android::PixelFormat aFormat)
+{
+  switch (aFormat) {
+  case 17: // NV21 YUV format, see http://developer.android.com/reference/android/graphics/ImageFormat.html#NV21
+    return LOCAL_GL_TEXTURE_EXTERNAL;
+  default:
+    return LOCAL_GL_TEXTURE_2D;
   }
 }
 
@@ -615,7 +628,7 @@ GrallocTextureHostOGL::DeleteTextures()
     mGL->MakeCurrent();
     if (mGLTexture) {
       mGL->fDeleteTextures(1, &mGLTexture);
-      mGLTexture= 0;
+      mGLTexture = 0;
     }
     if (mEGLImage) {
       mGL->DestroyEGLImage(mEGLImage);
@@ -641,6 +654,7 @@ GrallocTextureHostOGL::SwapTexturesImpl(const SurfaceDescriptor& aImage,
   const SurfaceDescriptorGralloc& desc = aImage.get_SurfaceDescriptorGralloc();
   mGraphicBuffer = GrallocBufferActor::GetFrom(desc);
   mFormat = SurfaceFormatForAndroidPixelFormat(mGraphicBuffer->getPixelFormat());
+  mTextureTarget = TextureTargetForAndroidPixelFormat(mGraphicBuffer->getPixelFormat());
 
   DeleteTextures();
 }
@@ -651,7 +665,7 @@ void GrallocTextureHostOGL::BindTexture(GLenum aTextureUnit)
 
   mGL->MakeCurrent();
   mGL->fActiveTexture(aTextureUnit);
-  mGL->fBindTexture(LOCAL_GL_TEXTURE_2D, mGLTexture);
+  mGL->fBindTexture(mTextureTarget, mGLTexture);
   mGL->fActiveTexture(LOCAL_GL_TEXTURE0);
 }
 
@@ -688,11 +702,11 @@ GrallocTextureHostOGL::Lock()
     mGL->fGenTextures(1, &mGLTexture);
   }
   mGL->fActiveTexture(LOCAL_GL_TEXTURE0);
-  mGL->fBindTexture(LOCAL_GL_TEXTURE_2D, mGLTexture);
+  mGL->fBindTexture(mTextureTarget, mGLTexture);
   if (!mEGLImage) {
     mEGLImage = mGL->CreateEGLImageForNativeBuffer(mGraphicBuffer->getNativeBuffer());
   }
-  mGL->fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, mEGLImage);
+  mGL->fEGLImageTargetTexture2D(mTextureTarget, mEGLImage);
   return true;
 }
 
@@ -707,20 +721,11 @@ GrallocTextureHostOGL::Unlock()
    * the GL may place read locks on it. We must ensure that we release them early enough,
    * i.e. before the next time that we will try to acquire a write lock on the same buffer,
    * because read and write locks on gralloc buffers are mutually exclusive.
-   *
-   * Unfortunately there does not seem to exist an EGL function to dissociate a gralloc
-   * buffer from a texture that it was tied to. Failing that, we achieve the same result
-   * by uploading a 1x1 dummy texture image to the same texture, replacing the existing
-   * gralloc buffer attachment.
    */
   mGL->MakeCurrent();
   mGL->fActiveTexture(LOCAL_GL_TEXTURE0);
-  mGL->fBindTexture(LOCAL_GL_TEXTURE_2D, mGLTexture);
-  mGL->fTexImage2D(LOCAL_GL_TEXTURE_2D, 0,
-                   LOCAL_GL_RGBA,
-                   1, 1, 0,
-                   LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE,
-                   nullptr);
+  mGL->fBindTexture(mTextureTarget, mGLTexture);
+  mGL->fEGLImageTargetTexture2D(mTextureTarget, mGL->GetNullEGLImage());
 }
 
 gfx::SurfaceFormat
diff --git a/gfx/layers/opengl/TextureHostOGL.h b/gfx/layers/opengl/TextureHostOGL.h
index ee7c19840ce8..cbcb2cc7309f 100644
--- a/gfx/layers/opengl/TextureHostOGL.h
+++ b/gfx/layers/opengl/TextureHostOGL.h
@@ -547,6 +547,7 @@ class GrallocTextureHostOGL
 public:
   GrallocTextureHostOGL()
     : mGL(nullptr)
+    , mTextureTarget(0)
     , mGLTexture(0)
     , mEGLImage(0)
   {
@@ -575,6 +576,10 @@ public:
 
   gl::ShaderProgramType GetShaderProgram() const MOZ_OVERRIDE
   {
+    if (mTextureTarget == LOCAL_GL_TEXTURE_EXTERNAL) {
+      return gl::RGBAExternalLayerProgramType;
+    }
+    MOZ_ASSERT(mTextureTarget == LOCAL_GL_TEXTURE_2D);
     return mFormat == gfx::FORMAT_B8G8R8A8 || mFormat == gfx::FORMAT_B8G8R8X8
            ? gl::BGRALayerProgramType
            : gl::RGBALayerProgramType;
@@ -605,6 +610,7 @@ private:
 
   RefPtr<gl::GLContext> mGL;
   android::sp<android::GraphicBuffer> mGraphicBuffer;
+  GLenum mTextureTarget;
   GLuint mGLTexture;
   EGLImage mEGLImage;
 };

From c5a96730b5b47896cf2fc64c3bed146c94ede616 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Wed, 17 Apr 2013 16:56:05 -0400
Subject: [PATCH 210/438] Bug 862523 - Android: blocklist the STAGEFRIGHT
 feature on the following Hardware's: antares, endeavoru, harmony, picasso,
 picasso_e, ventana - r=joe,doublec

---
 widget/android/GfxInfo.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp
index 503b16454858..7bcbd4a754fe 100644
--- a/widget/android/GfxInfo.cpp
+++ b/widget/android/GfxInfo.cpp
@@ -348,6 +348,19 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
     if (aFeature == FEATURE_STAGEFRIGHT) {
       NS_LossyConvertUTF16toASCII cManufacturer(mManufacturer);
       NS_LossyConvertUTF16toASCII cModel(mModel);
+      NS_LossyConvertUTF16toASCII cHardware(mHardware);
+
+      if (cHardware.Equals("antares") ||
+          cHardware.Equals("endeavoru") ||
+          cHardware.Equals("harmony") ||
+          cHardware.Equals("picasso") ||
+          cHardware.Equals("picasso_e") ||
+          cHardware.Equals("ventana"))
+      {
+        *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
+        return NS_OK;
+      }
+
       if (CompareVersions(mOSVersion.get(), "2.2.0") >= 0 &&
           CompareVersions(mOSVersion.get(), "2.3.0") < 0)
       {

From 0249969fdc0820a838a560876d9eb5657ef49e04 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Wed, 17 Apr 2013 23:17:44 +0300
Subject: [PATCH 211/438] Bug 862987 - Include nsAutoPtr.h in
 BindingDeclarations.h, r=bz

--HG--
extra : rebase_source : b3059811b16fa5a2bec070176a276ece18178baf
---
 dom/bindings/BindingDeclarations.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom/bindings/BindingDeclarations.h b/dom/bindings/BindingDeclarations.h
index 0acaef30597e..212b878a9b22 100644
--- a/dom/bindings/BindingDeclarations.h
+++ b/dom/bindings/BindingDeclarations.h
@@ -20,6 +20,7 @@
 #include "nsDOMString.h"
 #include "nsStringBuffer.h"
 #include "nsTArray.h"
+#include "nsAutoPtr.h" // for nsRefPtr member variables
 
 class nsWrapperCache;
 

From baa392919d402f273d39252f48b3d7451249d787 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Wed, 17 Apr 2013 23:29:09 +0300
Subject: [PATCH 212/438] Bug 862983 - HeaderFile annotation for WebIDL
 interfaces, r=bz

--HG--
extra : rebase_source : f096c032342b71aeb42999f80241697c79037b7c
---
 dom/bindings/Bindings.conf            | 4 ----
 dom/bindings/Configuration.py         | 2 ++
 dom/bindings/parser/WebIDL.py         | 3 ++-
 dom/webidl/DesktopNotification.webidl | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 447ae15f5418..30d6c3b07dad 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -228,10 +228,6 @@ DOMInterfaces = {
     'resultNotAddRefed': [ 'delayTime' ],
 }],
 
-'DesktopNotificationCenter': {
-    'headerFile': 'mozilla/dom/DesktopNotification.h',
-},
-
 'DeviceMotionEvent': {
     'nativeType': 'nsDOMDeviceMotionEvent',
 },
diff --git a/dom/bindings/Configuration.py b/dom/bindings/Configuration.py
index 1d5d03f95868..4ecd958dc986 100644
--- a/dom/bindings/Configuration.py
+++ b/dom/bindings/Configuration.py
@@ -226,6 +226,8 @@ class Descriptor(DescriptorProvider):
         else:
             if self.workers:
                 headerDefault = "mozilla/dom/workers/bindings/%s.h" % ifaceName
+            elif not self.interface.isExternal() and self.interface.getExtendedAttribute("HeaderFile"):
+                headerDefault = self.interface.getExtendedAttribute("HeaderFile")[0]
             else:
                 headerDefault = self.nativeType
                 headerDefault = headerDefault.replace("::", "/") + ".h"
diff --git a/dom/bindings/parser/WebIDL.py b/dom/bindings/parser/WebIDL.py
index 3450ee83f19e..902e4bce8041 100644
--- a/dom/bindings/parser/WebIDL.py
+++ b/dom/bindings/parser/WebIDL.py
@@ -897,7 +897,8 @@ class IDLInterface(IDLObjectWithScope):
             elif (identifier == "PrefControlled" or
                   identifier == "Pref" or
                   identifier == "NeedNewResolve" or
-                  identifier == "JSImplementation"):
+                  identifier == "JSImplementation" or
+                  identifier == "HeaderFile"):
                 # Known attributes that we don't need to do anything with here
                 pass
             else:
diff --git a/dom/webidl/DesktopNotification.webidl b/dom/webidl/DesktopNotification.webidl
index ebe4554023d5..9763adc5fd81 100644
--- a/dom/webidl/DesktopNotification.webidl
+++ b/dom/webidl/DesktopNotification.webidl
@@ -6,6 +6,7 @@
 
 interface MozObserver;
 
+[HeaderFile="mozilla/dom/DesktopNotification.h"]
 interface DesktopNotificationCenter
 {
   [Creator]

From 238dddc9f62a4677a9b7383e430adf60a275b90c Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Wed, 17 Apr 2013 23:40:54 +0300
Subject: [PATCH 213/438] Bug 862991 - If dictionary member needs cx, so should
 dictionary itself, r=bz

--HG--
extra : rebase_source : a495d79df021e896d3b7695a7d11da8d52559c28
---
 dom/bindings/Codegen.py               |  6 ++++++
 dom/bindings/test/TestBindingHeader.h | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index aca253ae9aea..245fbce9431c 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -3720,12 +3720,18 @@ def typeNeedsCx(type, descriptorProvider, retVal=False):
     if type.isUnion():
         return any(typeNeedsCx(t, descriptorProvider) for t in
                    type.unroll().flatMemberTypes)
+    if type.isDictionary():
+        return dictionaryNeedsCx(type.inner, descriptorProvider)
     if retVal and type.isSpiderMonkeyInterface():
         return True
     if type.isCallback():
         return descriptorProvider.workers
     return type.isAny() or type.isObject()
 
+def dictionaryNeedsCx(dictionary, descriptorProvider):
+    return (any(typeNeedsCx(m.type, descriptorProvider) for m in dictionary.members) or
+        (dictionary.parent and dictionaryNeedsCx(dictionary.parent, descriptorProvider)))
+
 # Returns a tuple consisting of a CGThing containing the type of the return
 # value, or None if there is no need for a return value, and a boolean signaling
 # whether the return value is passed in an out parameter.
diff --git a/dom/bindings/test/TestBindingHeader.h b/dom/bindings/test/TestBindingHeader.h
index 9252661562fb..fcfb7a04e50a 100644
--- a/dom/bindings/test/TestBindingHeader.h
+++ b/dom/bindings/test/TestBindingHeader.h
@@ -442,13 +442,13 @@ public:
   void SetAttributeRenamedTo(int8_t);
 
   // Dictionary tests
-  void PassDictionary(const Dict&);
-  void ReceiveDictionary(Dict&);
+  void PassDictionary(JSContext*, const Dict&);
+  void ReceiveDictionary(JSContext*, Dict&);
   void PassOtherDictionary(const GrandparentDict&);
-  void PassSequenceOfDictionaries(const Sequence<Dict>&);
-  void PassDictionaryOrLong(const Dict&);
+  void PassSequenceOfDictionaries(JSContext*, const Sequence<Dict>&);
+  void PassDictionaryOrLong(JSContext*, const Dict&);
   void PassDictionaryOrLong(int32_t);
-  void PassDictContainingDict(const DictContainingDict&);
+  void PassDictContainingDict(JSContext*, const DictContainingDict&);
   void PassDictContainingSequence(const DictContainingSequence&);
   void ReceiveDictContainingSequence(DictContainingSequence&);
 
@@ -468,7 +468,7 @@ public:
   bool Overload1(TestInterface&);
   TestInterface* Overload1(const nsAString&, TestInterface&);
   void Overload2(TestInterface&);
-  void Overload2(const Dict&);
+  void Overload2(JSContext*, const Dict&);
   void Overload2(const nsAString&);
   void Overload3(TestInterface&);
   void Overload3(const TestCallback&);

From 3919709af46eb0025f62cc49045b9138b19cca8a Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Wed, 17 Apr 2013 17:18:15 -0400
Subject: [PATCH 214/438] Bug 860441 - trivial compile fix on non-gonk - no
 review, CLOSED TREE

---
 gfx/layers/client/ImageClient.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gfx/layers/client/ImageClient.cpp b/gfx/layers/client/ImageClient.cpp
index 02f907e9f3be..f905097b40bf 100644
--- a/gfx/layers/client/ImageClient.cpp
+++ b/gfx/layers/client/ImageClient.cpp
@@ -159,6 +159,7 @@ ImageClientSingle::UpdateImage(ImageContainer* aContainer,
       return false;
     }
     mTextureClient->SetDescriptor(desc);
+#ifdef MOZ_WIDGET_GONK
   } else if (image->GetFormat() == GONK_IO_SURFACE) {
     EnsureTextureClient(TEXTURE_SHARED_GL_EXTERNAL);
 
@@ -174,6 +175,7 @@ ImageClientSingle::UpdateImage(ImageContainer* aContainer,
       return false;
     }
     mTextureClient->SetDescriptor(desc);
+#endif
   } else {
     nsRefPtr<gfxASurface> surface = image->GetAsSurface();
     MOZ_ASSERT(surface);

From eaa5b3fc8455ca400518afaff1875ca25f00f5a3 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 17 Apr 2013 17:39:10 -0400
Subject: [PATCH 215/438] Bug 859951 - Refactor the code to convert
 MOTION_EVENT GeckoEvents to nsTouchEvent instances. r=wesj

---
 mobile/android/base/GeckoEvent.java    |  2 +-
 widget/android/AndroidJavaWrappers.cpp | 61 +++++++++++++++++++
 widget/android/AndroidJavaWrappers.h   |  2 +
 widget/android/nsWindow.cpp            | 84 ++++----------------------
 widget/android/nsWindow.h              |  2 -
 5 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/mobile/android/base/GeckoEvent.java b/mobile/android/base/GeckoEvent.java
index 490b6d363110..1a4e53e2423a 100644
--- a/mobile/android/base/GeckoEvent.java
+++ b/mobile/android/base/GeckoEvent.java
@@ -374,7 +374,7 @@ public class GeckoEvent {
         }
     }
 
-    public void addMotionPoint(int index, int eventIndex, MotionEvent event) {
+    private void addMotionPoint(int index, int eventIndex, MotionEvent event) {
         try {
             PointF geckoPoint = new PointF(event.getX(eventIndex), event.getY(eventIndex));
             geckoPoint = GeckoApp.mAppContext.getLayerView().convertViewPointToLayerPoint(geckoPoint);
diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp
index 773010db8dbf..ae8a599ab040 100644
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -690,6 +690,67 @@ AndroidGeckoEvent::Init(AndroidGeckoEvent *aResizeEvent)
     mPoints = aResizeEvent->mPoints; // x,y coordinates
 }
 
+nsTouchEvent
+AndroidGeckoEvent::MakeTouchEvent(nsIWidget* widget)
+{
+    int type = NS_EVENT_NULL;
+    int startIndex = 0;
+    int endIndex = Count();
+
+    int action = Action() & AndroidMotionEvent::ACTION_MASK;
+    switch (action) {
+        case AndroidMotionEvent::ACTION_DOWN:
+        case AndroidMotionEvent::ACTION_POINTER_DOWN: {
+            type = NS_TOUCH_START;
+            break;
+        }
+        case AndroidMotionEvent::ACTION_MOVE: {
+            type = NS_TOUCH_MOVE;
+            break;
+        }
+        case AndroidMotionEvent::ACTION_UP:
+        case AndroidMotionEvent::ACTION_POINTER_UP: {
+            type = NS_TOUCH_END;
+            // for pointer-up events we only want the data from
+            // the one pointer that went up
+            startIndex = PointerIndex();
+            endIndex = startIndex + 1;
+            break;
+        }
+        case AndroidMotionEvent::ACTION_OUTSIDE:
+        case AndroidMotionEvent::ACTION_CANCEL: {
+            type = NS_TOUCH_CANCEL;
+            break;
+        }
+    }
+
+    nsTouchEvent event(true, type, widget);
+    if (type == NS_EVENT_NULL) {
+        // An event we don't know about
+        return event;
+    }
+
+    event.modifiers = 0;
+    event.time = Time();
+    event.InitBasicModifiers(IsCtrlPressed(),
+                             IsAltPressed(),
+                             IsShiftPressed(),
+                             IsMetaPressed());
+
+    const nsIntPoint& offset = widget->WidgetToScreenOffset();
+    event.touches.SetCapacity(endIndex - startIndex);
+    for (int i = startIndex; i < endIndex; i++) {
+        nsCOMPtr<nsIDOMTouch> t(new dom::Touch(PointIndicies()[i],
+                                               Points()[i] - offset,
+                                               PointRadii()[i],
+                                               Orientations()[i],
+                                               Pressures()[i]));
+        event.touches.AppendElement(t);
+    }
+
+    return event;
+}
+
 void
 AndroidPoint::Init(JNIEnv *jenv, jobject jobj)
 {
diff --git a/widget/android/AndroidJavaWrappers.h b/widget/android/AndroidJavaWrappers.h
index 24353be3d692..a94b28df27ca 100644
--- a/widget/android/AndroidJavaWrappers.h
+++ b/widget/android/AndroidJavaWrappers.h
@@ -15,6 +15,7 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/gfx/Rect.h"
+#include "mozilla/dom/Touch.h"
 
 //#define FORCE_ALOG 1
 
@@ -660,6 +661,7 @@ public:
     RefCountedJavaObject* ByteBuffer() { return mByteBuffer; }
     int Width() { return mWidth; }
     int Height() { return mHeight; }
+    nsTouchEvent MakeTouchEvent(nsIWidget* widget);
 
 protected:
     int mAction;
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 08e374db93a2..9fda5dcdb34f 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -28,7 +28,6 @@ using mozilla::unused;
 
 #include "nsRenderingContext.h"
 #include "nsIDOMSimpleGestureEvent.h"
-#include "mozilla/dom/Touch.h"
 
 #include "nsGkAtoms.h"
 #include "nsWidgetsCID.h"
@@ -1202,31 +1201,18 @@ bool nsWindow::OnMultitouchEvent(AndroidGeckoEvent *ae)
 
     bool preventDefaultActions = false;
     bool isDownEvent = false;
-    switch (ae->Action() & AndroidMotionEvent::ACTION_MASK) {
-        case AndroidMotionEvent::ACTION_DOWN:
-        case AndroidMotionEvent::ACTION_POINTER_DOWN: {
-            nsTouchEvent event(true, NS_TOUCH_START, this);
-            preventDefaultActions = DispatchMultitouchEvent(event, ae);
-            isDownEvent = true;
-            break;
-        }
-        case AndroidMotionEvent::ACTION_MOVE: {
-            nsTouchEvent event(true, NS_TOUCH_MOVE, this);
-            preventDefaultActions = DispatchMultitouchEvent(event, ae);
-            break;
-        }
-        case AndroidMotionEvent::ACTION_UP:
-        case AndroidMotionEvent::ACTION_POINTER_UP: {
-            nsTouchEvent event(true, NS_TOUCH_END, this);
-            preventDefaultActions = DispatchMultitouchEvent(event, ae);
-            break;
-        }
-        case AndroidMotionEvent::ACTION_OUTSIDE:
-        case AndroidMotionEvent::ACTION_CANCEL: {
-            nsTouchEvent event(true, NS_TOUCH_CANCEL, this);
-            preventDefaultActions = DispatchMultitouchEvent(event, ae);
-            break;
-        }
+
+    nsTouchEvent event = ae->MakeTouchEvent(this);
+    if (event.message != NS_EVENT_NULL) {
+        nsEventStatus status;
+        DispatchEvent(&event, status);
+        // We check mMultipleActionsPrevented because that's what <input type=range>
+        // sets when someone starts dragging the thumb. It doesn't set the status
+        // because it doesn't want to prevent the code that gives the input focus
+        // from running.
+        preventDefaultActions = (status == nsEventStatus_eConsumeNoDefault ||
+                                event.mFlags.mMultipleActionsPrevented);
+        isDownEvent = (event.message == NS_TOUCH_START);
     }
 
     // if the last event we got was a down event, then by now we know for sure whether
@@ -1256,52 +1242,6 @@ bool nsWindow::OnMultitouchEvent(AndroidGeckoEvent *ae)
     return preventDefaultActions;
 }
 
-bool
-nsWindow::DispatchMultitouchEvent(nsTouchEvent &event, AndroidGeckoEvent *ae)
-{
-    nsIntPoint offset = WidgetToScreenOffset();
-
-    event.modifiers = 0;
-    event.time = ae->Time();
-    event.InitBasicModifiers(ae->IsCtrlPressed(),
-                             ae->IsAltPressed(),
-                             ae->IsShiftPressed(),
-                             ae->IsMetaPressed());
-
-    int action = ae->Action() & AndroidMotionEvent::ACTION_MASK;
-    if (action == AndroidMotionEvent::ACTION_UP ||
-        action == AndroidMotionEvent::ACTION_POINTER_UP) {
-        event.touches.SetCapacity(1);
-        int pointerIndex = ae->PointerIndex();
-        nsCOMPtr<nsIDOMTouch> t(new Touch(ae->PointIndicies()[pointerIndex],
-                                          ae->Points()[pointerIndex] - offset,
-                                          ae->PointRadii()[pointerIndex],
-                                          ae->Orientations()[pointerIndex],
-                                          ae->Pressures()[pointerIndex]));
-        event.touches.AppendElement(t);
-    } else {
-        int count = ae->Count();
-        event.touches.SetCapacity(count);
-        for (int i = 0; i < count; i++) {
-            nsCOMPtr<nsIDOMTouch> t(new Touch(ae->PointIndicies()[i],
-                                              ae->Points()[i] - offset,
-                                              ae->PointRadii()[i],
-                                              ae->Orientations()[i],
-                                              ae->Pressures()[i]));
-            event.touches.AppendElement(t);
-        }
-    }
-
-    nsEventStatus status;
-    DispatchEvent(&event, status);
-    // We check mMultipleActionsPrevented because that's what <input type=range>
-    // sets when someone starts dragging the thumb. It doesn't set the status
-    // because it doesn't want to prevent the code that gives the input focus
-    // from running.
-    return (status == nsEventStatus_eConsumeNoDefault ||
-            event.mFlags.mMultipleActionsPrevented);
-}
-
 void
 nsWindow::OnNativeGestureEvent(AndroidGeckoEvent *ae)
 {
diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h
index 35fe96ddc221..32559dd252d7 100644
--- a/widget/android/nsWindow.h
+++ b/widget/android/nsWindow.h
@@ -215,8 +215,6 @@ protected:
 private:
     void InitKeyEvent(nsKeyEvent& event, mozilla::AndroidGeckoEvent& key,
                       ANPEvent* pluginEvent);
-    bool DispatchMultitouchEvent(nsTouchEvent &event,
-                             mozilla::AndroidGeckoEvent *ae);
     void DispatchMotionEvent(nsInputEvent &event,
                              mozilla::AndroidGeckoEvent *ae,
                              const nsIntPoint &refPoint);

From 332865f4e6e29f575bf6028deee387a04f60cb12 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 17 Apr 2013 17:39:11 -0400
Subject: [PATCH 216/438] Bug 859951 - Split MotionEvent's action into mask and
 index in Java rather than in JNI code. r=wesj

---
 mobile/android/base/GeckoEvent.java    | 6 +++---
 widget/android/AndroidJavaWrappers.cpp | 3 +--
 widget/android/AndroidJavaWrappers.h   | 3 ---
 widget/android/nsWindow.cpp            | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/mobile/android/base/GeckoEvent.java b/mobile/android/base/GeckoEvent.java
index 1a4e53e2423a..4dff62ec1906 100644
--- a/mobile/android/base/GeckoEvent.java
+++ b/mobile/android/base/GeckoEvent.java
@@ -336,11 +336,11 @@ public class GeckoEvent {
     }
 
     private void initMotionEvent(MotionEvent m) {
-        mAction = m.getAction();
+        mAction = m.getActionMasked();
         mTime = (System.currentTimeMillis() - SystemClock.elapsedRealtime()) + m.getEventTime();
         mMetaState = m.getMetaState();
 
-        switch (mAction & MotionEvent.ACTION_MASK) {
+        switch (mAction) {
             case MotionEvent.ACTION_CANCEL:
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_POINTER_UP:
@@ -356,7 +356,7 @@ public class GeckoEvent {
                 mOrientations = new float[mCount];
                 mPressures = new float[mCount];
                 mPointRadii = new Point[mCount];
-                mPointerIndex = (mAction & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+                mPointerIndex = m.getActionIndex();
                 for (int i = 0; i < mCount; i++) {
                     addMotionPoint(i, i, m);
                 }
diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp
index ae8a599ab040..380be2781554 100644
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -697,8 +697,7 @@ AndroidGeckoEvent::MakeTouchEvent(nsIWidget* widget)
     int startIndex = 0;
     int endIndex = Count();
 
-    int action = Action() & AndroidMotionEvent::ACTION_MASK;
-    switch (action) {
+    switch (Action()) {
         case AndroidMotionEvent::ACTION_DOWN:
         case AndroidMotionEvent::ACTION_POINTER_DOWN: {
             type = NS_TOUCH_START;
diff --git a/widget/android/AndroidJavaWrappers.h b/widget/android/AndroidJavaWrappers.h
index a94b28df27ca..f7251bfc3436 100644
--- a/widget/android/AndroidJavaWrappers.h
+++ b/widget/android/AndroidJavaWrappers.h
@@ -546,7 +546,6 @@ class AndroidMotionEvent
 {
 public:
     enum {
-        ACTION_MASK = 0xff,
         ACTION_DOWN = 0,
         ACTION_UP = 1,
         ACTION_MOVE = 2,
@@ -560,8 +559,6 @@ public:
         ACTION_MAGNIFY_START = 11,
         ACTION_MAGNIFY = 12,
         ACTION_MAGNIFY_END = 13,
-        ACTION_POINTER_ID_MASK = 0xff00,
-        ACTION_POINTER_ID_SHIFT = 8,
         EDGE_TOP = 0x00000001,
         EDGE_BOTTOM = 0x00000002,
         EDGE_LEFT = 0x00000004,
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 9fda5dcdb34f..c99200c4dc1f 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -1128,7 +1128,7 @@ void
 nsWindow::OnMouseEvent(AndroidGeckoEvent *ae)
 {
     uint32_t msg;
-    switch (ae->Action() & AndroidMotionEvent::ACTION_MASK) {
+    switch (ae->Action()) {
 #ifndef MOZ_ONLY_TOUCH_EVENTS
         case AndroidMotionEvent::ACTION_DOWN:
             msg = NS_MOUSE_BUTTON_DOWN;
@@ -1250,7 +1250,7 @@ nsWindow::OnNativeGestureEvent(AndroidGeckoEvent *ae)
   double delta = ae->X();
   int msg = 0;
 
-  switch (ae->Action() & AndroidMotionEvent::ACTION_MASK) {
+  switch (ae->Action()) {
       case AndroidMotionEvent::ACTION_MAGNIFY_START:
           msg = NS_SIMPLE_GESTURE_MAGNIFY_START;
           mStartDist = delta;

From 6294aa50b5db5e1d0b1412df7c5658c72cb306fc Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 17 Apr 2013 17:39:11 -0400
Subject: [PATCH 217/438] Bug 859962 - Guard against
 LayerView.getPanZoomController() returning null in BrowserApp. r=Cwiiis

---
 mobile/android/base/BrowserApp.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index c5f0d5b0052e..447f3823d329 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -10,6 +10,7 @@ import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.gfx.BitmapUtils;
 import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
 import org.mozilla.gecko.gfx.LayerView;
+import org.mozilla.gecko.gfx.PanZoomController;
 import org.mozilla.gecko.util.FloatUtils;
 import org.mozilla.gecko.util.GamepadUtils;
 import org.mozilla.gecko.util.HardwareUtils;
@@ -338,9 +339,10 @@ abstract public class BrowserApp extends GeckoApp
                    action == MotionEvent.ACTION_CANCEL) {
             // Animate the toolbar to fully on or off, depending on how much
             // of it is hidden and the current swipe velocity.
+            PanZoomController pzc = mLayerView.getPanZoomController();
+            float yVelocity = (pzc == null ? 0.0f : pzc.getVelocityVector().y);
             mBrowserToolbar.animateVisibilityWithVelocityBias(
-                toolbarY > toolbarHeight / 2 ? false : true,
-                mLayerView.getPanZoomController().getVelocityVector().y);
+                toolbarY > toolbarHeight / 2 ? false : true, yVelocity);
         }
 
         // Update the last recorded position.

From 418439dffede9e54771dc5267844c1c317199f7f Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 17 Apr 2013 17:39:12 -0400
Subject: [PATCH 218/438] Bug 860940 - Add static factory-style methods to
 create AndroidGeckoEvent instances in widget code. r=cpeterson

---
 widget/android/AndroidJNI.cpp          |  2 +-
 widget/android/AndroidJavaWrappers.cpp | 14 +------
 widget/android/AndroidJavaWrappers.h   | 57 +++++++++++++++++---------
 widget/android/nsAppShell.cpp          |  8 ++--
 widget/android/nsWindow.cpp            |  9 ++--
 5 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/widget/android/AndroidJNI.cpp b/widget/android/AndroidJNI.cpp
index b73dc5a8dc7e..cf239d3e9ef2 100644
--- a/widget/android/AndroidJNI.cpp
+++ b/widget/android/AndroidJNI.cpp
@@ -61,7 +61,7 @@ Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoOfEvent(JNIEnv *jenv, jclass jc,
 {
     // poke the appshell
     if (nsAppShell::gAppShell)
-        nsAppShell::gAppShell->PostEvent(new AndroidGeckoEvent(jenv, event));
+        nsAppShell::gAppShell->PostEvent(AndroidGeckoEvent::MakeFromJavaObject(jenv, event));
 }
 
 NS_EXPORT void JNICALL
diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp
index 380be2781554..3bbb46c00e37 100644
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -498,11 +498,9 @@ AndroidGeckoEvent::ReadCharactersExtraField(JNIEnv *jenv)
 }
 
 void
-AndroidGeckoEvent::Init(int aType, nsIntRect const& aRect)
+AndroidGeckoEvent::UnionRect(nsIntRect const& aRect)
 {
-    mType = aType;
-    mAckNeeded = false;
-    mRect = aRect;
+    mRect = aRect.Union(mRect);
 }
 
 uint32_t
@@ -671,14 +669,6 @@ AndroidGeckoEvent::Init(int aType)
     mAckNeeded = false;
 }
 
-void
-AndroidGeckoEvent::Init(int aType, int aAction)
-{
-    mType = aType;
-    mAckNeeded = false;
-    mAction = aAction;
-}
-
 void
 AndroidGeckoEvent::Init(AndroidGeckoEvent *aResizeEvent)
 {
diff --git a/widget/android/AndroidJavaWrappers.h b/widget/android/AndroidJavaWrappers.h
index f7251bfc3436..8548ea8738c9 100644
--- a/widget/android/AndroidJavaWrappers.h
+++ b/widget/android/AndroidJavaWrappers.h
@@ -589,31 +589,49 @@ public:
 
 class AndroidGeckoEvent : public WrappedJavaObject
 {
-public:
-    static void InitGeckoEventClass(JNIEnv *jEnv);
-
-    AndroidGeckoEvent(int aType) {
-        Init(aType);
-    }
-    AndroidGeckoEvent(int aType, int aAction) {
-        Init(aType, aAction);
-    }
-    AndroidGeckoEvent(int aType, const nsIntRect &aRect) {
-        Init(aType, aRect);
-    }
-    AndroidGeckoEvent(JNIEnv *jenv, jobject jobj) {
-        Init(jenv, jobj);
-    }
-    AndroidGeckoEvent(AndroidGeckoEvent *aResizeEvent) {
-        Init(aResizeEvent);
+private:
+    AndroidGeckoEvent() {
     }
 
     void Init(JNIEnv *jenv, jobject jobj);
     void Init(int aType);
-    void Init(int aType, int aAction);
-    void Init(int aType, const nsIntRect &aRect);
     void Init(AndroidGeckoEvent *aResizeEvent);
 
+public:
+    static void InitGeckoEventClass(JNIEnv *jEnv);
+
+    static AndroidGeckoEvent* MakeNativePoke() {
+        AndroidGeckoEvent *event = new AndroidGeckoEvent();
+        event->Init(NATIVE_POKE);
+        return event;
+    }
+
+    static AndroidGeckoEvent* MakeIMEEvent(int aAction) {
+        AndroidGeckoEvent *event = new AndroidGeckoEvent();
+        event->Init(IME_EVENT);
+        event->mAction = aAction;
+        return event;
+    }
+
+    static AndroidGeckoEvent* MakeDrawEvent(const nsIntRect& aRect) {
+        AndroidGeckoEvent *event = new AndroidGeckoEvent();
+        event->Init(DRAW);
+        event->mRect = aRect;
+        return event;
+    }
+
+    static AndroidGeckoEvent* MakeFromJavaObject(JNIEnv *jenv, jobject jobj) {
+        AndroidGeckoEvent *event = new AndroidGeckoEvent();
+        event->Init(jenv, jobj);
+        return event;
+    }
+
+    static AndroidGeckoEvent* CopyResizeEvent(AndroidGeckoEvent *aResizeEvent) {
+        AndroidGeckoEvent *event = new AndroidGeckoEvent();
+        event->Init(aResizeEvent);
+        return event;
+    }
+
     int Action() { return mAction; }
     int Type() { return mType; }
     bool AckNeeded() { return mAckNeeded; }
@@ -659,6 +677,7 @@ public:
     int Width() { return mWidth; }
     int Height() { return mHeight; }
     nsTouchEvent MakeTouchEvent(nsIWidget* widget);
+    void UnionRect(nsIntRect const& aRect);
 
 protected:
     int mAction;
diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp
index d0a27ee857a8..eac90d841673 100644
--- a/widget/android/nsAppShell.cpp
+++ b/widget/android/nsAppShell.cpp
@@ -269,7 +269,7 @@ nsAppShell::ScheduleNativeEventCallback()
     EVLOG("nsAppShell::ScheduleNativeEventCallback pth: %p thread: %p main: %d", (void*) pthread_self(), (void*) NS_GetCurrentThread(), NS_IsMainThread());
 
     // this is valid to be called from any thread, so do so.
-    PostEvent(new AndroidGeckoEvent(AndroidGeckoEvent::NATIVE_POKE));
+    PostEvent(AndroidGeckoEvent::MakeNativePoke());
 }
 
 bool
@@ -467,7 +467,7 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait)
     case AndroidGeckoEvent::SIZE_CHANGED: {
         // store the last resize event to dispatch it to new windows with a FORCED_RESIZE event
         if (curEvent != gLastSizeChange) {
-            gLastSizeChange = new AndroidGeckoEvent(curEvent);
+            gLastSizeChange = AndroidGeckoEvent::CopyResizeEvent(curEvent);
         }
         nsWindow::OnGlobalAndroidEvent(curEvent);
         break;
@@ -603,12 +603,12 @@ nsAppShell::PostEvent(AndroidGeckoEvent *ae)
 
         case AndroidGeckoEvent::DRAW:
             if (mQueuedDrawEvent) {
+#if defined(DEBUG) || defined(FORCE_ALOG)
                 // coalesce this new draw event with the one already in the queue
                 const nsIntRect& oldRect = mQueuedDrawEvent->Rect();
                 const nsIntRect& newRect = ae->Rect();
                 nsIntRect combinedRect = oldRect.Union(newRect);
 
-#if defined(DEBUG) || defined(FORCE_ALOG)
                 // XXX We may want to consider using regions instead of rectangles.
                 //     Print an error if we're upload a lot more than we would
                 //     if we handled this as two separate events.
@@ -623,7 +623,7 @@ nsAppShell::PostEvent(AndroidGeckoEvent *ae)
                 // coalesce into the new draw event rather than the queued one because
                 // it is not always safe to move draws earlier in the queue; there may
                 // be events between the two draws that affect scroll position or something.
-                ae->Init(AndroidGeckoEvent::DRAW, combinedRect);
+                ae->UnionRect(mQueuedDrawEvent->Rect());
 
                 EVLOG("nsAppShell: Coalescing previous DRAW event at %p into new DRAW event %p", mQueuedDrawEvent, ae);
                 mEventQueue.RemoveElement(mQueuedDrawEvent);
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index c99200c4dc1f..b5a25e282df6 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -514,7 +514,7 @@ nsWindow::IsEnabled() const
 NS_IMETHODIMP
 nsWindow::Invalidate(const nsIntRect &aRect)
 {
-    AndroidGeckoEvent *event = new AndroidGeckoEvent(AndroidGeckoEvent::DRAW, aRect);
+    AndroidGeckoEvent *event = AndroidGeckoEvent::MakeDrawEvent(aRect);
     nsAppShell::gAppShell->PostEvent(event);
     return NS_OK;
 }
@@ -2038,8 +2038,7 @@ nsWindow::SetInputContext(const InputContext& aContext,
     if (mIMEUpdatingContext) {
         return;
     }
-    AndroidGeckoEvent *event = new AndroidGeckoEvent(
-            AndroidGeckoEvent::IME_EVENT,
+    AndroidGeckoEvent *event = AndroidGeckoEvent::MakeIMEEvent(
             AndroidGeckoEvent::IME_UPDATE_CONTEXT);
     nsAppShell::gAppShell->PostEvent(event);
     mIMEUpdatingContext = true;
@@ -2068,8 +2067,8 @@ nsWindow::PostFlushIMEChanges()
         // Already posted
         return;
     }
-    AndroidGeckoEvent *event = new AndroidGeckoEvent(
-            AndroidGeckoEvent::IME_EVENT, AndroidGeckoEvent::IME_FLUSH_CHANGES);
+    AndroidGeckoEvent *event = AndroidGeckoEvent::MakeIMEEvent(
+            AndroidGeckoEvent::IME_FLUSH_CHANGES);
     nsAppShell::gAppShell->PostEvent(event);
 }
 

From 07c6f3a6d841f3243222da2e3bfd3fee9183cc85 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 17 Apr 2013 17:39:12 -0400
Subject: [PATCH 219/438] Bug 860613 - Remove
 CompositorParent::GetDefaultPanZoomController (patch from romaxa/tatiana).
 r=BenWa

---
 gfx/layers/ipc/CompositorParent.cpp | 3 ---
 gfx/layers/ipc/CompositorParent.h   | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp
index d77fabf682e1..56cbc87cd546 100644
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -859,9 +859,6 @@ CompositorParent::ApplyAsyncContentTransformToTree(TimeStamp aCurrentFrame,
   // Check if an AsyncPanZoomController is attached to this layer.
   if (LayerUserData* data = aLayer->GetUserData(&sPanZoomUserDataKey)) {
     controller = static_cast<PanZoomUserData*>(data)->mController;
-  } else {
-    // Check if a derived implementation provides a default AsyncPanZoomController.
-    controller = GetDefaultPanZoomController();
   }
 
   if (controller) {
diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h
index 28935e0d600c..373da54b3544 100644
--- a/gfx/layers/ipc/CompositorParent.h
+++ b/gfx/layers/ipc/CompositorParent.h
@@ -181,10 +181,6 @@ protected:
                                 nsIntPoint& aScrollOffset, float& aScaleX, float& aScaleY,
                                 gfx::Margin& aFixedLayerMargins);
   void SetEGLSurfaceSize(int width, int height);
-  // If SetPanZoomControllerForLayerTree is not set, Compositor will use
-  // derived class AsyncPanZoomController transformations.
-  // Compositor will not own AsyncPanZoomController here.
-  virtual AsyncPanZoomController* GetDefaultPanZoomController() { return nullptr; }
 
 private:
   void PauseComposition();

From df9cf426fc58c2c7b6d829fde958c4bf8426e8d2 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 17 Apr 2013 17:39:13 -0400
Subject: [PATCH 220/438] Bug 860613 - Add an API to bind an APZC instance to a
 Layer. r=BenWa

---
 gfx/layers/Layers.cpp               | 32 +++++++++++++++++++++++++++++
 gfx/layers/Layers.h                 |  6 ++++++
 gfx/layers/ipc/CompositorParent.cpp | 25 +++-------------------
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
index 7a2e0bac0b61..73da2b330dad 100644
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -398,6 +398,38 @@ Layer::SetAnimations(const AnimationArray& aAnimations)
   Mutated();
 }
 
+static uint8_t sPanZoomUserDataKey;
+struct PanZoomUserData : public LayerUserData {
+  PanZoomUserData(AsyncPanZoomController* aController)
+    : mController(aController)
+  { }
+
+  // We don't keep a strong ref here because PanZoomUserData is only
+  // set transiently, and APZC is thread-safe refcounted so
+  // AddRef/Release is expensive.
+  AsyncPanZoomController* mController;
+};
+
+void
+Layer::SetAsyncPanZoomController(AsyncPanZoomController *controller)
+{
+  if (controller) {
+    SetUserData(&sPanZoomUserDataKey, new PanZoomUserData(controller));
+  } else {
+    RemoveUserData(&sPanZoomUserDataKey);
+  }
+}
+
+AsyncPanZoomController*
+Layer::GetAsyncPanZoomController()
+{
+  LayerUserData* data = GetUserData(&sPanZoomUserDataKey);
+  if (!data) {
+    return nullptr;
+  }
+  return static_cast<PanZoomUserData*>(data)->mController;
+}
+
 void
 Layer::ApplyPendingUpdatesToSubtree()
 {
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index 4d8d589acb39..0d3cd5178ff9 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -48,6 +48,7 @@ namespace layers {
 
 class Animation;
 class AnimationData;
+class AsyncPanZoomController;
 class CommonLayerAttributes;
 class Layer;
 class ThebesLayer;
@@ -896,6 +897,11 @@ public:
   const gfx::Margin& GetFixedPositionMargins() { return mMargins; }
   Layer* GetMaskLayer() { return mMaskLayer; }
 
+  // These functions allow attaching an AsyncPanZoomController to this layer,
+  // and can be used anytime.
+  void SetAsyncPanZoomController(AsyncPanZoomController *controller);
+  AsyncPanZoomController* GetAsyncPanZoomController();
+
   // Note that all lengths in animation data are either in CSS pixels or app
   // units and must be converted to device pixels by the compositor.
   AnimationArray& GetAnimations() { return mAnimations; }
diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp
index 56cbc87cd546..b18c383bac1e 100644
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -67,18 +67,6 @@ struct LayerTreeState {
   TargetConfig mTargetConfig;
 };
 
-static uint8_t sPanZoomUserDataKey;
-struct PanZoomUserData : public LayerUserData {
-  PanZoomUserData(AsyncPanZoomController* aController)
-    : mController(aController)
-  { }
-
-  // We don't keep a strong ref here because PanZoomUserData is only
-  // set transiently, and APZC is thread-safe refcounted so
-  // AddRef/Release is expensive.
-  AsyncPanZoomController* mController;
-};
-
 /**
  * Lookup the indirect shadow tree for |aId| and return it if it
  * exists.  Otherwise null is returned.  This must only be called on
@@ -504,12 +492,11 @@ private:
           if (OP == Resolve) {
             ref->ConnectReferentLayer(referent);
             if (AsyncPanZoomController* apzc = state->mController) {
-              referent->SetUserData(&sPanZoomUserDataKey,
-                                    new PanZoomUserData(apzc));
+              referent->SetAsyncPanZoomController(apzc);
             }
           } else {
             ref->DetachReferentLayer(referent);
-            referent->RemoveUserData(&sPanZoomUserDataKey);
+            referent->SetAsyncPanZoomController(nullptr);
           }
         }
       }
@@ -855,13 +842,7 @@ CompositorParent::ApplyAsyncContentTransformToTree(TimeStamp aCurrentFrame,
     return appliedTransform;
   }
 
-  AsyncPanZoomController* controller = nullptr;
-  // Check if an AsyncPanZoomController is attached to this layer.
-  if (LayerUserData* data = aLayer->GetUserData(&sPanZoomUserDataKey)) {
-    controller = static_cast<PanZoomUserData*>(data)->mController;
-  }
-
-  if (controller) {
+  if (AsyncPanZoomController* controller = aLayer->GetAsyncPanZoomController()) {
     ShadowLayer* shadow = aLayer->AsShadowLayer();
 
     ViewTransform treeTransform;

From ff617de66bb6c0f3cd89399e88ca42f41d001cef Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 17 Apr 2013 17:39:13 -0400
Subject: [PATCH 221/438] Bug 860613 - Create an android-specific subclass of
 CompositorParent to be able to pick the target layer for APZC. r=BenWa

---
 widget/android/nsWindow.cpp       | 52 +++++++++++++++++++++++++++++++
 widget/android/nsWindow.h         |  6 ++++
 widget/xpwidgets/nsBaseWidget.cpp | 13 ++++----
 widget/xpwidgets/nsBaseWidget.h   |  1 +
 4 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index b5a25e282df6..bf6f0878c423 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -62,8 +62,10 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
 static gfxIntSize gAndroidBounds = gfxIntSize(0, 0);
 static gfxIntSize gAndroidScreenBounds;
 
+#include "mozilla/layers/AsyncPanZoomController.h"
 #include "mozilla/layers/CompositorChild.h"
 #include "mozilla/layers/CompositorParent.h"
+#include "mozilla/layers/ShadowLayersParent.h"
 #include "mozilla/Mutex.h"
 #include "nsThreadUtils.h"
 
@@ -2241,6 +2243,7 @@ nsRefPtr<mozilla::layers::LayerManager> nsWindow::sLayerManager = 0;
 nsRefPtr<mozilla::layers::CompositorParent> nsWindow::sCompositorParent = 0;
 nsRefPtr<mozilla::layers::CompositorChild> nsWindow::sCompositorChild = 0;
 bool nsWindow::sCompositorPaused = true;
+nsRefPtr<mozilla::layers::AsyncPanZoomController> nsWindow::sApzc = 0;
 
 void
 nsWindow::SetCompositor(mozilla::layers::LayerManager* aLayerManager,
@@ -2315,4 +2318,53 @@ nsWindow::NeedsPaint()
   return nsIWidget::NeedsPaint();
 }
 
+class AndroidCompositorParent : public mozilla::layers::CompositorParent {
+public:
+    AndroidCompositorParent(nsIWidget* aWidget, bool aRenderToEGLSurface,
+                            int aSurfaceWidth, int aSurfaceHeight)
+        : CompositorParent(aWidget, aRenderToEGLSurface, aSurfaceHeight, aSurfaceHeight)
+    {
+        if (nsWindow::GetPanZoomController()) {
+            nsWindow::GetPanZoomController()->SetCompositorParent(this);
+        }
+    }
+
+    virtual void ShadowLayersUpdated(mozilla::layers::ShadowLayersParent* aLayerTree,
+                                     const mozilla::layers::TargetConfig& aTargetConfig,
+                                     bool isFirstPaint) MOZ_OVERRIDE
+    {
+        CompositorParent::ShadowLayersUpdated(aLayerTree, aTargetConfig, isFirstPaint);
+        mozilla::layers::Layer* targetLayer = GetLayerManager()->GetPrimaryScrollableLayer();
+        mozilla::layers::AsyncPanZoomController* controller = nsWindow::GetPanZoomController();
+        if (targetLayer && targetLayer->AsContainerLayer() && controller) {
+            targetLayer->SetAsyncPanZoomController(controller);
+            controller->NotifyLayersUpdated(targetLayer->AsContainerLayer()->GetFrameMetrics(), isFirstPaint);
+        }
+    }
+};
+
+mozilla::layers::CompositorParent*
+nsWindow::NewCompositorParent(int aSurfaceWidth, int aSurfaceHeight)
+{
+    return new AndroidCompositorParent(this, true, aSurfaceWidth, aSurfaceHeight);
+}
+
+void
+nsWindow::SetPanZoomController(mozilla::layers::AsyncPanZoomController* apzc)
+{
+    if (sApzc) {
+        sApzc->SetCompositorParent(nullptr);
+        sApzc = nullptr;
+    }
+    if (apzc) {
+        sApzc = apzc;
+        sApzc->SetCompositorParent(sCompositorParent);
+    }
+}
+
+mozilla::layers::AsyncPanZoomController*
+nsWindow::GetPanZoomController()
+{
+    return sApzc;
+}
 
diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h
index 32559dd252d7..f379cc5043ef 100644
--- a/widget/android/nsWindow.h
+++ b/widget/android/nsWindow.h
@@ -24,6 +24,7 @@ namespace mozilla {
         class CompositorParent;
         class CompositorChild;
         class LayerManager;
+        class AsyncPanZoomController;
     }
 }
 
@@ -145,6 +146,8 @@ public:
     virtual void DrawWindowUnderlay(LayerManager* aManager, nsIntRect aRect);
     virtual void DrawWindowOverlay(LayerManager* aManager, nsIntRect aRect);
 
+    virtual mozilla::layers::CompositorParent* NewCompositorParent(int aSurfaceWidth, int aSurfaceHeight) MOZ_OVERRIDE;
+
     static void SetCompositor(mozilla::layers::LayerManager* aLayerManager,
                               mozilla::layers::CompositorParent* aCompositorParent,
                               mozilla::layers::CompositorChild* aCompositorChild);
@@ -152,6 +155,8 @@ public:
     static void ScheduleResumeComposition(int width, int height);
     static void ForceIsFirstPaint();
     static float ComputeRenderIntegrity();
+    static void SetPanZoomController(mozilla::layers::AsyncPanZoomController* apzc);
+    static mozilla::layers::AsyncPanZoomController* GetPanZoomController();
 
     virtual bool WidgetPaintsBackground();
 
@@ -230,6 +235,7 @@ private:
     static nsRefPtr<mozilla::layers::CompositorParent> sCompositorParent;
     static nsRefPtr<mozilla::layers::CompositorChild> sCompositorChild;
     static bool sCompositorPaused;
+    static nsRefPtr<mozilla::layers::AsyncPanZoomController> sApzc;
 };
 
 #endif /* NSWINDOW_H_ */
diff --git a/widget/xpwidgets/nsBaseWidget.cpp b/widget/xpwidgets/nsBaseWidget.cpp
index c300373e7a5f..043aaab81ea4 100644
--- a/widget/xpwidgets/nsBaseWidget.cpp
+++ b/widget/xpwidgets/nsBaseWidget.cpp
@@ -872,6 +872,12 @@ nsBaseWidget::ComputeShouldAccelerate(bool aDefault)
   return aDefault;
 }
 
+CompositorParent* nsBaseWidget::NewCompositorParent(int aSurfaceWidth,
+                                                    int aSurfaceHeight)
+{
+    return new CompositorParent(this, false, aSurfaceWidth, aSurfaceHeight);
+}
+
 void nsBaseWidget::CreateCompositor()
 {
   nsIntRect rect;
@@ -881,12 +887,7 @@ void nsBaseWidget::CreateCompositor()
 
 void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
 {
-  bool renderToEGLSurface = false;
-#ifdef MOZ_ANDROID_OMTC
-  renderToEGLSurface = true;
-#endif
-  mCompositorParent =
-    new CompositorParent(this, renderToEGLSurface, aWidth, aHeight);
+  mCompositorParent = NewCompositorParent(aWidth, aHeight);
   AsyncChannel *parentChannel = mCompositorParent->GetIPCChannel();
   LayerManager* lm = CreateBasicLayerManager();
   MessageLoop *childMessageLoop = CompositorParent::CompositorLoop();
diff --git a/widget/xpwidgets/nsBaseWidget.h b/widget/xpwidgets/nsBaseWidget.h
index 9e11c7bcda83..b99440dd6c9a 100644
--- a/widget/xpwidgets/nsBaseWidget.h
+++ b/widget/xpwidgets/nsBaseWidget.h
@@ -110,6 +110,7 @@ public:
                                           LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                           bool* aAllowRetaining = nullptr);
 
+  virtual CompositorParent* NewCompositorParent(int aSurfaceWidth, int aSurfaceHeight);
   virtual void            CreateCompositor();
   virtual void            CreateCompositor(int aWidth, int aHeight);
   virtual void            DrawWindowUnderlay(LayerManager* aManager, nsIntRect aRect) {}

From 980a377da58a1d9e18d6beadb5aab47f6020d2e6 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Thu, 18 Apr 2013 00:27:24 +0300
Subject: [PATCH 222/438] Try to fix intermittent test_dbgsocket.js (bug
 775924); r=me

---
 toolkit/devtools/debugger/tests/unit/test_dbgsocket.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/devtools/debugger/tests/unit/test_dbgsocket.js b/toolkit/devtools/debugger/tests/unit/test_dbgsocket.js
index 0c67efdf2937..2ba8c5365da4 100644
--- a/toolkit/devtools/debugger/tests/unit/test_dbgsocket.js
+++ b/toolkit/devtools/debugger/tests/unit/test_dbgsocket.js
@@ -77,7 +77,7 @@ function test_socket_shutdown()
     },
 
     onClosed: function(aStatus) {
-      do_check_eq(aStatus, Cr.NS_ERROR_CONNECTION_REFUSED);
+      do_check_eq(aStatus, Components.results.NS_ERROR_CONNECTION_REFUSED);
       run_next_test();
     }
   };

From aa5209f6943a6fad43f31e95a82a4632ff19785d Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Wed, 17 Apr 2013 14:51:53 -0700
Subject: [PATCH 223/438] Bug 862049 - Run setAccessibilityEnabled() on the UI
 thread. r=Cwiiis

---
 mobile/android/base/GeckoAccessibility.java | 25 ++++++++++++---------
 mobile/android/base/GeckoApp.java           |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/mobile/android/base/GeckoAccessibility.java b/mobile/android/base/GeckoAccessibility.java
index 5e4685b3893b..92d51f487aa4 100644
--- a/mobile/android/base/GeckoAccessibility.java
+++ b/mobile/android/base/GeckoAccessibility.java
@@ -7,6 +7,7 @@ package org.mozilla.gecko;
 
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.util.ThreadUtils;
+import org.mozilla.gecko.util.UiAsyncTask;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -47,17 +48,17 @@ public class GeckoAccessibility {
                     "es.codefactory.android.app.ma.MAAccessibilityService" // Codefactory Mobile Accessibility screen reader
                 }));
 
-    public static void updateAccessibilitySettings () {
-        ThreadUtils.postToBackgroundThread(new Runnable() {
+    public static void updateAccessibilitySettings (final GeckoApp app) {
+        new UiAsyncTask<Void, Void, Void>(ThreadUtils.getBackgroundHandler()) {
                 @Override
-                public void run() {
+                public Void doInBackground(Void... args) {
                     JSONObject ret = new JSONObject();
                     sEnabled = false;
                     AccessibilityManager accessibilityManager =
-                        (AccessibilityManager) GeckoApp.mAppContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
+                        (AccessibilityManager) app.getSystemService(Context.ACCESSIBILITY_SERVICE);
                     if (accessibilityManager.isEnabled()) {
                         ActivityManager activityManager =
-                            (ActivityManager) GeckoApp.mAppContext.getSystemService(Context.ACTIVITY_SERVICE);
+                            (ActivityManager) app.getSystemService(Context.ACTIVITY_SERVICE);
                         List<RunningServiceInfo> runningServices = activityManager.getRunningServices(Integer.MAX_VALUE);
 
                         for (RunningServiceInfo runningServiceInfo : runningServices) {
@@ -67,10 +68,6 @@ public class GeckoAccessibility {
                         }
                     }
 
-                    // Disable the dynamic toolbar when enabling accessibility.
-                    // These features tend not to interact well.
-                    GeckoApp.mAppContext.setAccessibilityEnabled(sEnabled);
-
                     try {
                         ret.put("enabled", sEnabled);
                     } catch (Exception ex) {
@@ -79,8 +76,16 @@ public class GeckoAccessibility {
 
                     GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Accessibility:Settings",
                                                                                    ret.toString()));
+                    return null;
                 }
-            });
+
+                @Override
+                public void onPostExecute(Void args) {
+                    // Disable the dynamic toolbar when enabling accessibility.
+                    // These features tend not to interact well.
+                    app.setAccessibilityEnabled(sEnabled);
+                }
+            }.execute();
     }
 
     private static void populateEventFromJSON (AccessibilityEvent event, JSONObject message) {
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index aa3669279d1c..73be8862be55 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -791,7 +791,7 @@ abstract public class GeckoApp
             } else if (event.equals("Accessibility:Event")) {
                 GeckoAccessibility.sendAccessibilityEvent(message);
             } else if (event.equals("Accessibility:Ready")) {
-                GeckoAccessibility.updateAccessibilitySettings();
+                GeckoAccessibility.updateAccessibilitySettings(this);
             } else if (event.equals("Shortcut:Remove")) {
                 final String url = message.getString("url");
                 final String origin = message.getString("origin");
@@ -1903,7 +1903,7 @@ abstract public class GeckoApp
         GeckoScreenOrientationListener.getInstance().start();
 
         // User may have enabled/disabled accessibility.
-        GeckoAccessibility.updateAccessibilitySettings();
+        GeckoAccessibility.updateAccessibilitySettings(this);
 
         ThreadUtils.postToBackgroundThread(new Runnable() {
             @Override

From 94262c1579a2241cb97cbc710b270ac3b2799601 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 17 Apr 2013 18:00:14 -0400
Subject: [PATCH 224/438] Bug 840012 - Fix test name. r=luke

--HG--
rename : js/src/jit-test/tests/basic/testBug0012.js => js/src/jit-test/tests/basic/testBug840012.js
---
 js/src/jit-test/tests/basic/{testBug0012.js => testBug840012.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename js/src/jit-test/tests/basic/{testBug0012.js => testBug840012.js} (100%)

diff --git a/js/src/jit-test/tests/basic/testBug0012.js b/js/src/jit-test/tests/basic/testBug840012.js
similarity index 100%
rename from js/src/jit-test/tests/basic/testBug0012.js
rename to js/src/jit-test/tests/basic/testBug840012.js

From 2c6dd08daf62efb15716b807e038cbb4300ea34b Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Wed, 17 Apr 2013 18:00:14 -0400
Subject: [PATCH 225/438] Bug 847279 - Fix incorrect relativesrcdir in other
 mochitest makefiles. r=mbrubeck

---
 dom/imptests/Makefile.in                                        | 2 +-
 dom/permission/tests/Makefile.in                                | 2 +-
 dom/plugins/test/mochitest/Makefile.in                          | 2 +-
 dom/tests/mochitest/crypto/Makefile.in                          | 2 +-
 layout/base/tests/chrome/Makefile.in                            | 2 +-
 security/manager/ssl/tests/mochitest/bugs/Makefile.in           | 2 +-
 security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in   | 2 +-
 .../ssl/tests/mochitest/stricttransportsecurity/Makefile.in     | 2 +-
 .../components/places/tests/mochitest/bug_411966/Makefile.in    | 2 +-
 .../components/places/tests/mochitest/bug_461710/Makefile.in    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dom/imptests/Makefile.in b/dom/imptests/Makefile.in
index ee1693503333..332c8967f760 100644
--- a/dom/imptests/Makefile.in
+++ b/dom/imptests/Makefile.in
@@ -6,7 +6,7 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imported-tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/permission/tests/Makefile.in b/dom/permission/tests/Makefile.in
index 9f8a8bdec7d9..af97961cd4de 100644
--- a/dom/permission/tests/Makefile.in
+++ b/dom/permission/tests/Makefile.in
@@ -7,7 +7,7 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/permission/tests
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in
index 51e95374ae26..b9c4d65cb0cb 100644
--- a/dom/plugins/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = dom/plugins/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/crypto/Makefile.in b/dom/tests/mochitest/crypto/Makefile.in
index 494c85ab3805..ce2e344a677d 100644
--- a/dom/tests/mochitest/crypto/Makefile.in
+++ b/dom/tests/mochitest/crypto/Makefile.in
@@ -6,7 +6,7 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/crypto
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/layout/base/tests/chrome/Makefile.in b/layout/base/tests/chrome/Makefile.in
index 591358eef435..b7f155c51d7c 100644
--- a/layout/base/tests/chrome/Makefile.in
+++ b/layout/base/tests/chrome/Makefile.in
@@ -6,7 +6,7 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = layout/base/test/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index 8981ea47a8d9..d08b4551b44e 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= security/ssl/bugs
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
index 6c89bba737a6..582ff18ba911 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= security/ssl/mixedcontent
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
index e431550c2bc7..1dde9f22d25f 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
@@ -6,7 +6,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= security/ssl/stricttransportsecurity
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
index 8d4991e3e04f..69bdc35452f3 100644
--- a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/places/tests/bug_411966
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
index 090b499b7228..aac587d78a81 100644
--- a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/places/tests/bug_461710
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 

From 1f13fb9ca7c50a129cbdd72946e986b5cae03ce4 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Wed, 17 Apr 2013 18:00:14 -0400
Subject: [PATCH 226/438] Bug 847279 - Fix hardcoded path names in mochitests
 to match relativesrcdir. r=mbrubeck

---
 dom/plugins/test/mochitest/307-xo-redirect.sjs            | 2 +-
 dom/plugins/test/mochitest/test_busy_hang.xul             | 2 +-
 dom/plugins/test/mochitest/test_idle_hang.xul             | 2 +-
 .../test/mochitest/test_privatemode_perwindowpb.xul       | 4 +++-
 dom/plugins/test/mochitest/test_redirect_handling.html    | 2 +-
 .../test/mochitest/xulbrowser_plugin_visibility.xul       | 2 +-
 layout/base/tests/chrome/test_bug551434.html              | 2 +-
 .../ssl/tests/mochitest/mixedcontent/bug383369step2.html  | 2 +-
 .../manager/ssl/tests/mochitest/mixedcontent/iframe2.html | 2 +-
 .../tests/mochitest/mixedcontent/iframeMetaRedirect.html  | 2 +-
 .../tests/mochitest/mixedcontent/iframesecredirect.sjs    | 2 +-
 .../tests/mochitest/mixedcontent/iframeunsecredirect.sjs  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs   | 2 +-
 .../ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs | 2 +-
 .../ssl/tests/mochitest/mixedcontent/mixedContentTest.js  | 4 ++--
 .../tests/mochitest/mixedcontent/redirecttoemptyimage.sjs | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug329869.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug455367.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug472986.html  | 4 ++--
 .../ssl/tests/mochitest/mixedcontent/test_bug521461.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_cssBefore1.html | 2 +-
 .../tests/mochitest/mixedcontent/test_cssContent1.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_cssContent2.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_documentWrite1.html | 2 +-
 .../tests/mochitest/mixedcontent/test_documentWrite2.html | 2 +-
 .../mixedcontent/test_dynDelayedUnsecurePicture.html      | 6 +++---
 .../mixedcontent/test_dynDelayedUnsecureXHR.html          | 2 +-
 .../mixedcontent/test_dynUnsecureBackground.html          | 6 +++---
 .../mixedcontent/test_dynUnsecureIframeRedirect.html      | 4 ++--
 .../mochitest/mixedcontent/test_dynUnsecurePicture.html   | 6 +++---
 .../mixedcontent/test_dynUnsecurePicturePreload.html      | 2 +-
 .../mochitest/mixedcontent/test_dynUnsecureRedirect.html  | 6 +++---
 .../test_innerHtmlDelayedUnsecurePicture.html             | 2 +-
 .../mixedcontent/test_innerHtmlUnsecurePicture.html       | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_secureAll.html  | 8 ++++----
 .../tests/mochitest/mixedcontent/test_securePicture.html  | 2 +-
 .../mochitest/mixedcontent/test_unsecureBackground.html   | 2 +-
 .../tests/mochitest/mixedcontent/test_unsecureCSS.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_unsecureIframe.html | 2 +-
 .../mochitest/mixedcontent/test_unsecureIframe2.html      | 2 +-
 .../mixedcontent/test_unsecureIframeMetaRedirect.html     | 2 +-
 .../mixedcontent/test_unsecureIframeRedirect.html         | 2 +-
 .../mochitest/mixedcontent/test_unsecurePicture.html      | 2 +-
 .../mixedcontent/test_unsecurePictureInIframe.html        | 2 +-
 .../mochitest/mixedcontent/test_unsecureRedirect.html     | 2 +-
 .../ssl/tests/mochitest/mixedcontent/unsecureIframe.html  | 2 +-
 .../tests/mochitest/mixedcontent/unsecurePictureDup.html  | 2 +-
 .../test_stricttransportsecurity.html                     | 2 +-
 .../test_sts_privatebrowsing_perwindowpb.html             | 4 ++--
 .../places/tests/mochitest/bug_411966/redirect.js         | 8 ++++----
 .../places/tests/mochitest/test_bug_411966.html           | 2 +-
 .../tests/mochitest/test_bug_461710_perwindowpb.html      | 4 ++--
 52 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/dom/plugins/test/mochitest/307-xo-redirect.sjs b/dom/plugins/test/mochitest/307-xo-redirect.sjs
index 639623c140c5..b880978cea80 100644
--- a/dom/plugins/test/mochitest/307-xo-redirect.sjs
+++ b/dom/plugins/test/mochitest/307-xo-redirect.sjs
@@ -1,6 +1,6 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarily");
-  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/loremipsum.txt");
+  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt");
   response.setHeader("Content-Type", "text/html");
 }
diff --git a/dom/plugins/test/mochitest/test_busy_hang.xul b/dom/plugins/test/mochitest/test_busy_hang.xul
index c93623810524..f4842c07e921 100644
--- a/dom/plugins/test/mochitest/test_busy_hang.xul
+++ b/dom/plugins/test/mochitest/test_busy_hang.xul
@@ -9,7 +9,7 @@
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
+          src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
   <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
     <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
   </body>
diff --git a/dom/plugins/test/mochitest/test_idle_hang.xul b/dom/plugins/test/mochitest/test_idle_hang.xul
index 57c1953b1f4d..e56412ef944f 100644
--- a/dom/plugins/test/mochitest/test_idle_hang.xul
+++ b/dom/plugins/test/mochitest/test_idle_hang.xul
@@ -9,7 +9,7 @@
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
+          src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
index 89f6eee9006a..780bdde8e487 100644
--- a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
+++ b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
@@ -8,6 +8,8 @@
   <title>NPAPI Private Mode Tests</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript"
+          src="chrome://mochikit/content/chrome-harness.js" />
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 <embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
@@ -52,7 +54,7 @@ function runTestsCallback() {
                     .rootTreeItem
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIDOMWindow);
-  var contentPage = "chrome://mochitests/content/chrome/dom/plugins/test/privatemode_perwindowpb.xul";
+  var contentPage = getRootDirectory(window.location.href) + "privatemode_perwindowpb.xul";
 
   function testOnWindow(aIsPrivate, aCallback) {
     var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});
diff --git a/dom/plugins/test/mochitest/test_redirect_handling.html b/dom/plugins/test/mochitest/test_redirect_handling.html
index 3eee5bdac215..e947d22a7366 100644
--- a/dom/plugins/test/mochitest/test_redirect_handling.html
+++ b/dom/plugins/test/mochitest/test_redirect_handling.html
@@ -12,7 +12,7 @@
     var p = document.getElementById("plugin1");
 
     var redirectingURL = "307-xo-redirect.sjs";
-    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/loremipsum.txt";
+    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt";
 
     var expectedWriteURL = "";
     var expectedNotifyStatus = -1;
diff --git a/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
index 0b4a3a35618d..a0e3fc4e107d 100644
--- a/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
+++ b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
@@ -24,7 +24,7 @@
     const nsIWebProgress = Components.interfaces.nsIWebProgress;
     const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
 
-    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/plugin_visibility_loader.html';
+    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/mochitest/plugin_visibility_loader.html';
 
     function ProgressListener() {
     }
diff --git a/layout/base/tests/chrome/test_bug551434.html b/layout/base/tests/chrome/test_bug551434.html
index e2d45c7dea7c..4118a2136cc6 100644
--- a/layout/base/tests/chrome/test_bug551434.html
+++ b/layout/base/tests/chrome/test_bug551434.html
@@ -15,7 +15,7 @@
 
 <input id="i3" onkeydown="gKeyDown3++; frames[0].document.getElementById('i4').focus();"
        onkeypress="gKeyPress3++;" onkeyup="gKeyUp3++;"/>
-<iframe id="iframe" src="http://example.org/chrome/layout/base/test/chrome/bug551434_childframe.html"></iframe>
+<iframe id="iframe" src="http://example.org/chrome/layout/base/tests/chrome/bug551434_childframe.html"></iframe>
 
 <script class="testbody" type="text/javascript">
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html b/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
index 8992b7467c09..be8925e98f24 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
@@ -13,7 +13,7 @@
     window.setTimeout(function () 
     {
       window.location = 
-        "https://example.com/tests/security/ssl/mixedcontent/bug383369step3.html?runtest";
+        "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html?runtest";
     }, 0);
   }
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html b/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
index efe92e346f85..0b6356934907 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
@@ -8,6 +8,6 @@
   <script>
     document.write(location.href);
   </script>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
index ccc3bddef131..d033f5b00be0 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <META http-equiv="Refresh"
-      Content="0; URL=http://example.com/tests/security/ssl/mixedcontent/iframe.html">
+      Content="0; URL=http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html">
 <html>
   <body>
     Redirecting by meta tag...
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
index ab58786d9240..ea93b80b7d58 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/iframe.html");
+  response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
index 5cb51671e1a4..937e29954f3f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/iframe.html");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
index 1a5bcc62d1b6..7af6116e1018 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
+  response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
index ba15359c1bad..a8eb26642ae8 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
index 73c3495a0c55..26142541affe 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
@@ -128,8 +128,8 @@ function finish()
     window.setTimeout(function()
     {
       window.location.assign(navigateToInsecure ?
-        "http://example.com/tests/security/ssl/mixedcontent/backward.html" :
-        "https://example.com/tests/security/ssl/mixedcontent/backward.html");
+        "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html" :
+        "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html");
     }, 0);
   }
   else
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
index 1f9a520f5162..4d85e1658171 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/emptyimage.sjs");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
index 889b84c130e1..49d5c41c633d 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
@@ -16,7 +16,7 @@
     window.setTimeout(function() 
     {
       var newElement = document.createElement("script");
-      newElement.src= "http://example.org/tests/security/ssl/mixedcontent/bug329869.js";
+      newElement.src= "http://example.org/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js";
       document.body.appendChild(newElement);
     }, 0);
   }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
index 3b57e92a8e80..c0b6e3ebbe60 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/redirecttoemptyimage.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
index 176c4725af0b..427e0fd70f42 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
@@ -21,7 +21,7 @@
   {
     var img1 = document.getElementById("img1");
     img1.addEventListener("load", onLoadFunction, false);
-    img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+    img1.src = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
   }
 
   function runTest()
@@ -40,6 +40,6 @@
 </head>
 
 <body>
-  <img id="img1" src="https://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
+  <img id="img1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
index 9b06e08e3f52..9d9d4de09fe6 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
@@ -16,7 +16,7 @@
 
   function runTest()
   {
-    window.location = "https://example.com/tests/security/ssl/mixedcontent/nocontent.sjs";
+    window.location = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs";
     window.setTimeout(function() {
       isSecurityState("insecure", "location.href doesn't effect the security state");
       is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content");
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
index a4a24167877a..59d2fa7a9dbb 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
@@ -12,7 +12,7 @@
   <style type="text/css">
     p:before
     {
-      content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
+      content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
     }
   </style>
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
index 1b347d435c9c..347382000a0d 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
@@ -13,7 +13,7 @@
   <style type="text/css">
     p
     {
-      content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
+      content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
     }
   </style>
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
index aa5e813bc451..dfcd7dd76199 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
@@ -20,7 +20,7 @@
   {
     isSecurityState("secure");
     document.getElementById("para").style.content =
-      "url('http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg')";
+      "url('http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg')";
 
     waitForSecurityState("broken", function()
     {
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
index 7e2356b009f1..b95a5caca349 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
@@ -30,7 +30,7 @@
 <body>
   <script class="testbody" type="text/javascript">
   document.write(
-    "<img src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />");
+    "<img src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />");
   </script>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
index 61fec12dcef1..a92288b7acdd 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
@@ -32,7 +32,7 @@
 <body>
   <script class="testbody" type="text/javascript">
   document.write(
-    "<iframe src='http://example.com/tests/security/ssl/mixedcontent/iframe.html'></iframe>");
+    "<iframe src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html'></iframe>");
   </script>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
index a441b1045fb2..c0684718faae 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
@@ -18,7 +18,7 @@
     window.setTimeout(function() {
       // Don't do this synchronously from onload handler
       document.getElementById("image1").src =
-        "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+        "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
     }, 0);
 
     waitForSecurityState("broken", function()
@@ -31,7 +31,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -41,6 +41,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
index c77053b6a8b5..d566a35947f7 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
@@ -22,7 +22,7 @@
       try
       {
         var req = new XMLHttpRequest();
-        req.open("GET", "http://example.com/tests/security/ssl/mixedcontent/alloworigin.sjs", false);
+        req.open("GET", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs", false);
         req.send(null);
 
         // Change should be immediate, the request was sent synchronously
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
index 4ab5cc3df776..352ae52efc66 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
@@ -18,7 +18,7 @@
   {
     isSecurityState("secure");
     document.body.background =
-      "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+      "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
     waitForSecurityState("broken", function() 
     {
@@ -30,7 +30,7 @@
   function afterNavigationTest()
   {
     is(document.body.background,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "document backround secure again");
     isSecurityState("secure", "secure after re-navigation");
     finish();
@@ -39,6 +39,6 @@
   </script>
 </head>
 
-<body background="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
+<body background="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
index 9dfb31a2244c..a9967228b4c5 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
@@ -25,7 +25,7 @@
     }
     
     iframe.src =
-      "https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs";
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs";
   }
 
   function afterNavigationTest()
@@ -38,6 +38,6 @@
 </head>
 
 <body>
-  <iframe id="iframe1" src="https://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe id="iframe1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
index b11189693910..aca7be9d1195 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
@@ -18,7 +18,7 @@
   {
     isSecurityState("secure");
     document.getElementById("image1").src =
-      "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+      "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
     window.setTimeout(function() {
       isSecurityState("broken", "src='http://...' changed to broken");
@@ -29,7 +29,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -39,6 +39,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
index e379730faacc..916245c303bd 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
@@ -13,7 +13,7 @@
   <script class="testbody" type="text/javascript">
 
   (new Image()).src =
-    "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+    "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
   function runTest()
   {
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
index 792500d3ef1e..86fd17e8dc2f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
@@ -12,7 +12,7 @@
   {
     isSecurityState("secure");
     document.getElementById("image1").src =
-      "https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs";
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs";
 
     window.setTimeout(function() {
       isSecurityState("broken", "src='redirect to unsecure' changed to broken");
@@ -23,7 +23,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -33,6 +33,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
index e09406375f4b..e226fd16be0b 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
@@ -19,7 +19,7 @@
     window.setTimeout(function() 
     {
       document.getElementById("buddy").innerHTML =
-        "<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
+        "<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
     }, 1);
 
     waitForSecurityState("broken", function() 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
index 63b907d902f9..43e27d414bee 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
@@ -17,7 +17,7 @@
     isSecurityState("secure");
     
     document.getElementById("buddy").innerHTML =
-      "<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
+      "<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
 
     window.setTimeout(function() {
       isSecurityState("broken", "innerHTML loading insecure changed to broken");
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
index 8e1942d54afc..087a31383521 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <link rel="stylesheet" type="text/css" 
-    href="https://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
+    href="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
 
   <script class="testbody" type="text/javascript">
 
@@ -34,8 +34,8 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
-  <img src="https://example.com/tests/security/ssl/mixedcontent/imgsecredirect.sjs" />
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframesecredirect.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs" />
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
index e31c3b21dc7f..d774f3bfdb08 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
index bf3453d8a572..6b1d88a4b100 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
@@ -29,6 +29,6 @@
   </script>
 </head>
 
-<body background="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
+<body background="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
index d868ce34cb40..8985fc7d85d2 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   
   <link rel="stylesheet" type="text/css" 
-    href="http://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
+    href="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
 
   <script class="testbody" type="text/javascript">
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
index 43a79084f926..717de60583b9 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
index 3410b982fdaf..bea0ebc1702f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframe2.html"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
index e35df266f2ec..a31090a4a208 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
@@ -30,7 +30,7 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeMetaRedirect.html"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html"></iframe>
 </body>
 </html>
  
\ No newline at end of file
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
index d3d3a7f28e1f..acdbe5fb1e68 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
@@ -30,7 +30,7 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs"></iframe>
 </body>
 </html>
  
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
index 09cb6f7c5e13..fb66957d912c 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
index ad464e9649ee..fc336558e7ba 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/unsecureIframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
index 9b512b1761e0..b2b1477c162f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
index 6fec95b04de3..2282677418e4 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
@@ -4,6 +4,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html b/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
index e73b5e6e7860..770505ea11ed 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
index 803d9a23d6dc..d2468c8d66a5 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
@@ -12,7 +12,7 @@
   <script class="testbody" type="text/javascript">
   SimpleTest.waitForExplicitFinish();
 
-  const STSPATH = "/tests/security/ssl/stricttransportsecurity";
+  const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
 
   // initialized manually here
   var testsleft = {'plain': 4, 'subdom': 4};
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
index ef8a21ceb64d..2a847eeae0de 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
@@ -14,10 +14,10 @@
 
   const Cc = Components.classes;
   const Ci = Components.interfaces;
-  const STSPATH = "/tests/security/ssl/stricttransportsecurity";
+  const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
   const NUM_TEST_FRAMES = 4;
   const CONTENT_PAGE =
-    "http://mochi.test:8888/chrome/security/ssl/stricttransportsecurity/page_blank.html";
+    "http://mochi.test:8888/chrome/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html";
 
   // This is how many sub-tests (testframes) in each round.
   // When the round begins, this will be initialized.
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/redirect.js b/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
index da30e5629b38..f7aa720e44a9 100644
--- a/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
+++ b/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
@@ -33,10 +33,10 @@ function uri(URIString) {
   return ios.newURI(URIString, null, null);
 }
 
-var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TypedPage.htm");
-var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/ClickedPage.htm");
-var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TempRedirectPage.htm");
-var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/PermRedirectPage.htm");
+var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TypedPage.htm");
+var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/ClickedPage.htm");
+var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TempRedirectPage.htm");
+var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/PermRedirectPage.htm");
 
 // Stream Listener
 function StreamListener(aChannel, aCallbackFunc) {
diff --git a/toolkit/components/places/tests/mochitest/test_bug_411966.html b/toolkit/components/places/tests/mochitest/test_bug_411966.html
index cd855187579b..dce9fbb07522 100644
--- a/toolkit/components/places/tests/mochitest/test_bug_411966.html
+++ b/toolkit/components/places/tests/mochitest/test_bug_411966.html
@@ -6,7 +6,7 @@
   <head>
     <title>Test for Bug 411966</title>
     <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="bug_411966/redirect.js"></script>
+    <script type="text/javascript" src="mochitest/bug_411966/redirect.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   </head>
   <body>
diff --git a/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html b/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
index 48f5b9cc31c0..58d2b215d122 100644
--- a/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
+++ b/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
@@ -60,7 +60,7 @@ function waitForTrue(fn, onWaitComplete) {
 const kRed = "rgb(255, 0, 0)";
 const kBlue = "rgb(0, 0, 255)";
 
-var testpath = "/tests/toolkit/components/places/tests/mochitest/../bug_461710/";
+var testpath = "/tests/toolkit/components/places/tests/mochitest/bug_461710/";
 var prefix = "http://mochi.test:8888" + testpath;
 var subtests = [
                    "visited_page.html",   // 1
@@ -163,7 +163,7 @@ var mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
                     .rootTreeItem
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIDOMWindow);
-var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/../bug_461710/iframe.html";
+var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/bug_461710/iframe.html";
 
 function testOnWindow(aIsPrivate, aCallback) {
   var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});

From 05b690b216a86a209773cf8626af7b282722624f Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 17 Apr 2013 15:34:26 -0700
Subject: [PATCH 227/438] Bug 863043: Move CompositorOGL::Initialize's
 helper-nsRunnable from function-scope to class-scope to fix build warning
 about ignored visibility attribute. r=Bas

---
 gfx/layers/opengl/CompositorOGL.cpp | 20 +++++++++++---------
 gfx/layers/opengl/CompositorOGL.h   |  6 ++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
index bbccca900d6f..082001c4944c 100644
--- a/gfx/layers/opengl/CompositorOGL.cpp
+++ b/gfx/layers/opengl/CompositorOGL.cpp
@@ -311,6 +311,16 @@ CompositorOGL::CleanupResources()
   mGLContext = nullptr;
 }
 
+// Impl of a a helper-runnable's "Run" method, used in Initialize()
+NS_IMETHODIMP
+CompositorOGL::ReadDrawFPSPref::Run()
+{
+  // NOTE: This must match the code in Initialize()'s NS_IsMainThread check.
+  Preferences::AddBoolVarCache(&sDrawFPS, "layers.acceleration.draw-fps");
+  Preferences::AddBoolVarCache(&sFrameCounter, "layers.acceleration.frame-counter");
+  return NS_OK;
+}
+
 bool
 CompositorOGL::Initialize()
 {
@@ -481,19 +491,11 @@ CompositorOGL::Initialize()
   }
 
   if (NS_IsMainThread()) {
+    // NOTE: This must match the code in ReadDrawFPSPref::Run().
     Preferences::AddBoolVarCache(&sDrawFPS, "layers.acceleration.draw-fps");
     Preferences::AddBoolVarCache(&sFrameCounter, "layers.acceleration.frame-counter");
   } else {
     // We have to dispatch an event to the main thread to read the pref.
-    class ReadDrawFPSPref : public nsRunnable {
-    public:
-      NS_IMETHOD Run()
-      {
-        Preferences::AddBoolVarCache(&sDrawFPS, "layers.acceleration.draw-fps");
-        Preferences::AddBoolVarCache(&sFrameCounter, "layers.acceleration.frame-counter");
-        return NS_OK;
-      }
-    };
     NS_DispatchToMainThread(new ReadDrawFPSPref());
   }
 
diff --git a/gfx/layers/opengl/CompositorOGL.h b/gfx/layers/opengl/CompositorOGL.h
index 43c965d15289..5959d57354f4 100644
--- a/gfx/layers/opengl/CompositorOGL.h
+++ b/gfx/layers/opengl/CompositorOGL.h
@@ -141,6 +141,12 @@ private:
   /** The size of the surface we are rendering to */
   nsIntSize mSurfaceSize;
 
+  /** Helper-class used by Initialize **/
+  class ReadDrawFPSPref MOZ_FINAL : public nsRunnable {
+  public:
+    NS_IMETHOD Run() MOZ_OVERRIDE;
+  };
+
   already_AddRefed<mozilla::gl::GLContext> CreateContext();
 
   /** Shader Programs */

From 69fb03370e9b3c5ae0ff458140691f1fa0d06b2e Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Wed, 10 Apr 2013 15:03:50 +1200
Subject: [PATCH 228/438] Bug 846122 - Handle split multi-track Cues in
 nestegg.  r=padenot

---
 media/libnestegg/README_MOZILLA |  2 +-
 media/libnestegg/src/nestegg.c  | 71 ++++++++++++++++++---------------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/media/libnestegg/README_MOZILLA b/media/libnestegg/README_MOZILLA
index 49ac6a10434d..d58c4d8c06ba 100644
--- a/media/libnestegg/README_MOZILLA
+++ b/media/libnestegg/README_MOZILLA
@@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
 
 The nestegg git repository is: git://github.com/kinetiknz/nestegg.git
 
-The git commit ID used was ebdbb688fb13dd315fc9d16e6897adb5ee42b7bb.
+The git commit ID used was 7d0f6d22b5a332ce47b95bc19dc259f204d339e1.
diff --git a/media/libnestegg/src/nestegg.c b/media/libnestegg/src/nestegg.c
index 59a1a4734c77..c6d685f2db97 100644
--- a/media/libnestegg/src/nestegg.c
+++ b/media/libnestegg/src/nestegg.c
@@ -1406,8 +1406,34 @@ ne_find_seek_for_id(struct ebml_list_node * seek_head, uint64_t id)
   return NULL;
 }
 
+static struct cue_track_positions *
+ne_find_cue_position_for_track(nestegg * ctx, struct ebml_list_node * node, unsigned int track)
+{
+  struct cue_track_positions * pos = NULL;
+  uint64_t track_number;
+  unsigned int t;
+
+  while (node) {
+    assert(node->id == ID_CUE_TRACK_POSITIONS);
+    pos = node->data;
+    if (ne_get_uint(pos->track, &track_number) != 0)
+      return NULL;
+
+    if (ne_map_track_number_to_index(ctx, track_number, &t) != 0)
+      return NULL;
+
+    if (t == track) {
+      return pos;
+    }
+
+    node = node->next;
+  }
+
+  return NULL;
+}
+
 static struct cue_point *
-ne_find_cue_point_for_tstamp(struct ebml_list_node * cue_point, uint64_t scale, uint64_t tstamp)
+ne_find_cue_point_for_tstamp(nestegg * ctx, struct ebml_list_node * cue_point, unsigned int track, uint64_t scale, uint64_t tstamp)
 {
   uint64_t time;
   struct cue_point * c, * prev = NULL;
@@ -1422,7 +1448,9 @@ ne_find_cue_point_for_tstamp(struct ebml_list_node * cue_point, uint64_t scale,
     if (ne_get_uint(c->time, &time) == 0 && time * scale > tstamp)
       break;
 
-    prev = cue_point->data;
+    if (ne_find_cue_position_for_track(ctx, c->cue_track_positions.head, track) != NULL)
+      prev = c;
+
     cue_point = cue_point->next;
   }
 
@@ -1506,7 +1534,6 @@ ne_init_cue_points(nestegg * ctx, int64_t max_offset)
   return 0;
 }
 
-
 /* Three functions that implement the nestegg_io interface, operating on a
  * sniff_buffer. */
 struct sniff_buffer {
@@ -1831,49 +1858,29 @@ nestegg_track_seek(nestegg * ctx, unsigned int track, uint64_t tstamp)
   int r;
   struct cue_point * cue_point;
   struct cue_track_positions * pos;
-  uint64_t seek_pos, tc_scale, track_number;
-  unsigned int t;
-  struct ebml_list_node * node = ctx->segment.cues.cue_point.head;
+  uint64_t seek_pos, tc_scale;
 
   /* If there are no cues loaded, check for cues element in the seek head
      and load it. */
-  if (!node) {
+  if (!ctx->segment.cues.cue_point.head) {
     r = ne_init_cue_points(ctx, -1);
     if (r != 0)
       return -1;
-
-    /* Check cues were loaded. */
-    node = ctx->segment.cues.cue_point.head;
-    if (!node)
-      return -1;
   }
 
   tc_scale = ne_get_timecode_scale(ctx);
 
-  cue_point = ne_find_cue_point_for_tstamp(ctx->segment.cues.cue_point.head, tc_scale, tstamp);
+  cue_point = ne_find_cue_point_for_tstamp(ctx, ctx->segment.cues.cue_point.head,
+                                           track, tc_scale, tstamp);
   if (!cue_point)
     return -1;
 
-  node = cue_point->cue_track_positions.head;
+  pos = ne_find_cue_position_for_track(ctx, cue_point->cue_track_positions.head, track);
+  if (pos == NULL)
+    return -1;
 
-  seek_pos = 0;
-
-  while (node) {
-    assert(node->id == ID_CUE_TRACK_POSITIONS);
-    pos = node->data;
-    if (ne_get_uint(pos->track, &track_number) != 0)
-      return -1;
-
-    if (ne_map_track_number_to_index(ctx, track_number, &t) != 0)
-      return -1;
-
-    if (t == track) {
-      if (ne_get_uint(pos->cluster_position, &seek_pos) != 0)
-        return -1;
-      break;
-    }
-    node = node->next;
-  }
+  if (ne_get_uint(pos->cluster_position, &seek_pos) != 0)
+    return -1;
 
   /* Seek and set up parser state for segment-level element (Cluster). */
   r = nestegg_offset_seek(ctx, ctx->segment_offset + seek_pos);

From ece74ec63fa41d52114a526ecf63b2486850596a Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 18 Apr 2013 09:15:09 +1000
Subject: [PATCH 229/438] Bug 862673 - ensure assertions in
 test_mousecapture_area are attributed to that test rather than the following
 test.  r=gavin

---
 toolkit/content/tests/widgets/test_mousecapture_area.html | 6 +++++-
 toolkit/content/tests/widgets/test_videocontrols.html     | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolkit/content/tests/widgets/test_mousecapture_area.html b/toolkit/content/tests/widgets/test_mousecapture_area.html
index b91748329240..660cbb2bcfae 100644
--- a/toolkit/content/tests/widgets/test_mousecapture_area.html
+++ b/toolkit/content/tests/widgets/test_mousecapture_area.html
@@ -52,7 +52,7 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-SimpleTest.expectAssertions(1);
+SimpleTest.expectAssertions(3);
 
 SimpleTest.waitForExplicitFinish();
 
@@ -94,6 +94,10 @@ function runTests()
                              sharedarea, "mousemove", "setCapture works on areas with multiple images");
   synthesizeMouse(img2, 5, 5, { type: "mouseup" });
 
+  // Bug 862673 - nuke all content so assertions in this test are attributed to
+  // this test rather than the one which happens to follow.
+  var content = document.getElementById("content");
+  content.parentNode.removeChild(content);
   SimpleTest.finish();
 }
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols.html b/toolkit/content/tests/widgets/test_videocontrols.html
index b9d232eb728e..c1114e7a6fe1 100644
--- a/toolkit/content/tests/widgets/test_videocontrols.html
+++ b/toolkit/content/tests/widgets/test_videocontrols.html
@@ -17,8 +17,6 @@
 <script type="text/javascript" src="use_large_cache.js"></script>
 <script class="testbody" type="text/javascript">
 
-SimpleTest.expectAssertions(2);
-
 /*
  * Positions of the  UI elements, relative to the upper-left corner of the
  * <video> box.

From a81da22f9cfcb19e9e74f1dd57d5e75d962930dc Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Wed, 17 Apr 2013 16:24:02 -0700
Subject: [PATCH 230/438] Bug 860523 - Add namespace wrapper for WebApps.
 r=wesj

--HG--
rename : mobile/android/base/WebApps.java.in => mobile/android/base/WebApp.java.in
rename : mobile/android/base/WebApp.java => mobile/android/base/WebAppImpl.java
---
 mobile/android/base/AndroidManifest.xml.in        |  2 +-
 mobile/android/base/GeckoAppShell.java            |  2 +-
 mobile/android/base/Makefile.in                   |  3 ++-
 mobile/android/base/WebApp.java.in                | 15 +++++++++++++++
 .../android/base/{WebApp.java => WebAppImpl.java} |  4 ++--
 .../android/base/WebAppManifestFragment.xml.frag  |  2 +-
 mobile/android/base/WebApps.java.in               |  3 +--
 7 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 mobile/android/base/WebApp.java.in
 rename mobile/android/base/{WebApp.java => WebAppImpl.java} (98%)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 19fce07c2840..8d1af5e420f4 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -146,7 +146,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="org.mozilla.gecko.WebApp"
+        <activity android:name=".WebApp"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"
diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java
index 4241c2613b94..b091b67fba93 100644
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -584,7 +584,7 @@ public class GeckoAppShell
         intent.setAction(GeckoApp.ACTION_WEBAPP_PREFIX + aIndex);
         intent.setData(Uri.parse(aURI));
         intent.setClassName(AppConstants.ANDROID_PACKAGE_NAME,
-                            "org.mozilla.gecko.WebApps$WebApp" + aIndex);
+                            AppConstants.ANDROID_PACKAGE_NAME + ".WebApps$WebApp" + aIndex);
         return intent;
     }
 
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 78fe406b18d3..9e4af4b57251 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -161,8 +161,8 @@ FENNEC_JAVA_FILES = \
   TouchEventInterceptor.java \
   UpdateServiceHelper.java \
   VideoPlayer.java \
-  WebApp.java \
   WebAppAllocator.java \
+  WebAppImpl.java \
   ZoomConstraints.java \
   db/BrowserContract.java \
   db/BrowserProvider.java \
@@ -261,6 +261,7 @@ FENNEC_PP_JAVA_VIEW_FILES = \
 FENNEC_PP_JAVA_FILES = \
   App.java \
   AppConstants.java \
+  WebApp.java \
   WebApps.java \
   $(NULL)
 
diff --git a/mobile/android/base/WebApp.java.in b/mobile/android/base/WebApp.java.in
new file mode 100644
index 000000000000..392257f4696b
--- /dev/null
+++ b/mobile/android/base/WebApp.java.in
@@ -0,0 +1,15 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+#filter substitution
+package @ANDROID_PACKAGE_NAME@;
+
+import org.mozilla.gecko.WebAppImpl;
+
+/**
+ * This class serves only as a namespace wrapper for WebAppImpl.
+ */
+public class WebApp extends WebAppImpl {}
+
diff --git a/mobile/android/base/WebApp.java b/mobile/android/base/WebAppImpl.java
similarity index 98%
rename from mobile/android/base/WebApp.java
rename to mobile/android/base/WebAppImpl.java
index 0656f6e11c1a..ee7b9979f4f7 100644
--- a/mobile/android/base/WebApp.java
+++ b/mobile/android/base/WebAppImpl.java
@@ -26,8 +26,8 @@ import android.view.Display;
 import java.net.URL;
 import java.io.File;
 
-public class WebApp extends GeckoApp {
-    private static final String LOGTAG = "WebApp";
+public class WebAppImpl extends GeckoApp {
+    private static final String LOGTAG = "GeckoWebAppImpl";
 
     private URL mOrigin;
     private TextView mTitlebarText = null;
diff --git a/mobile/android/base/WebAppManifestFragment.xml.frag b/mobile/android/base/WebAppManifestFragment.xml.frag
index f0aa170d3295..3dc2390e632d 100644
--- a/mobile/android/base/WebAppManifestFragment.xml.frag
+++ b/mobile/android/base/WebAppManifestFragment.xml.frag
@@ -1,4 +1,4 @@
-        <activity android:name="org.mozilla.gecko.WebApps$WebApp@APPNUM@"
+        <activity android:name=".WebApps$WebApp@APPNUM@"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"
diff --git a/mobile/android/base/WebApps.java.in b/mobile/android/base/WebApps.java.in
index 622a44ed8e04..37b1bfb3b019 100644
--- a/mobile/android/base/WebApps.java.in
+++ b/mobile/android/base/WebApps.java.in
@@ -4,8 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #filter substitution
-
-package org.mozilla.gecko;
+package @ANDROID_PACKAGE_NAME@;
 
 public final class WebApps {
 

From 68b09f83ef57e3a5c2a46aeadbb1575c4989ddf1 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 18 Apr 2013 12:03:29 +1200
Subject: [PATCH 231/438] b=767710 move current motion calculation into
 InitSmoothScroll() r=roc

--HG--
extra : transplant_source : %E2%DCQu%13RdE%E9%3A%B3%B5L%21%8A3%3C%5D4%3F
---
 layout/generic/nsGfxScrollFrame.cpp | 36 +++++++++++++----------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index f0496996c222..adfd498519dd 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1131,8 +1131,9 @@ public:
   typedef mozilla::TimeStamp TimeStamp;
   typedef mozilla::TimeDuration TimeDuration;
 
-  AsyncScroll()
+  AsyncScroll(nsPoint aStartPos)
     : mIsFirstIteration(true)
+    , mStartPos(aStartPos)
     , mCallee(nullptr)
   {}
 
@@ -1143,8 +1144,7 @@ public:
   nsPoint PositionAt(TimeStamp aTime);
   nsSize VelocityAt(TimeStamp aTime); // In nscoords per second
 
-  void InitSmoothScroll(TimeStamp aTime, nsPoint aCurrentPos,
-                        nsSize aCurrentVelocity, nsPoint aDestination,
+  void InitSmoothScroll(TimeStamp aTime, nsPoint aDestination,
                         nsIAtom *aOrigin, const nsRect& aRange);
   void Init(const nsRect& aRange) {
     mRange = aRange;
@@ -1314,7 +1314,6 @@ nsGfxScrollFrameInner::AsyncScroll::InitDuration(nsIAtom *aOrigin) {
     if (mIsFirstIteration) {
       // Starting a new scroll (i.e. not when extending an existing scroll animation),
       //   create imaginary prev timestamps with maximum relevant intervals between them.
-      mIsFirstIteration = false;
 
       // Longest relevant interval (which results in maximum duration)
       TimeDuration maxDelta = TimeDuration::FromMilliseconds(mOriginMaxMS / mIntervalRatio);
@@ -1342,18 +1341,23 @@ nsGfxScrollFrameInner::AsyncScroll::InitDuration(nsIAtom *aOrigin) {
 
 void
 nsGfxScrollFrameInner::AsyncScroll::InitSmoothScroll(TimeStamp aTime,
-                                                     nsPoint aCurrentPos,
-                                                     nsSize aCurrentVelocity,
                                                      nsPoint aDestination,
                                                      nsIAtom *aOrigin,
                                                      const nsRect& aRange) {
+  nsSize currentVelocity(0, 0);
+  if (!mIsFirstIteration) {
+    currentVelocity = VelocityAt(aTime);
+    mStartPos = PositionAt(aTime);
+  }
   mStartTime = aTime;
-  mStartPos = aCurrentPos;
   mDestination = aDestination;
   mRange = aRange;
   InitDuration(aOrigin);
-  InitTimingFunction(mTimingFunctionX, mStartPos.x, aCurrentVelocity.width, aDestination.x);
-  InitTimingFunction(mTimingFunctionY, mStartPos.y, aCurrentVelocity.height, aDestination.y);
+  InitTimingFunction(mTimingFunctionX, mStartPos.x, currentVelocity.width,
+                     aDestination.x);
+  InitTimingFunction(mTimingFunctionY, mStartPos.y, currentVelocity.height,
+                     aDestination.y);
+  mIsFirstIteration = false;
 }
 
 
@@ -1590,18 +1594,11 @@ nsGfxScrollFrameInner::ScrollToWithOrigin(nsPoint aScrollPosition,
   }
 
   TimeStamp now = TimeStamp::Now();
-  nsPoint currentPosition = GetScrollPosition();
-  nsSize currentVelocity(0, 0);
   bool isSmoothScroll = (aMode == nsIScrollableFrame::SMOOTH) &&
                           IsSmoothScrollingEnabled();
 
-  if (mAsyncScroll) {
-    if (mAsyncScroll->mIsSmoothScroll) {
-      currentPosition = mAsyncScroll->PositionAt(now);
-      currentVelocity = mAsyncScroll->VelocityAt(now);
-    }
-  } else {
-    mAsyncScroll = new AsyncScroll;
+  if (!mAsyncScroll) {
+    mAsyncScroll = new AsyncScroll(GetScrollPosition());
     if (!mAsyncScroll->SetRefreshObserver(this)) {
       mAsyncScroll = nullptr;
       // Observer setup failed. Scroll the normal way.
@@ -1616,8 +1613,7 @@ nsGfxScrollFrameInner::ScrollToWithOrigin(nsPoint aScrollPosition,
   mAsyncScroll->mIsSmoothScroll = isSmoothScroll;
 
   if (isSmoothScroll) {
-    mAsyncScroll->InitSmoothScroll(now, currentPosition, currentVelocity,
-                                   mDestination, aOrigin, range);
+    mAsyncScroll->InitSmoothScroll(now, mDestination, aOrigin, range);
   } else {
     mAsyncScroll->Init(range);
   }

From 61fd583b4054352360840f13f9f61a5cde47ac0e Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 18 Apr 2013 12:03:51 +1200
Subject: [PATCH 232/438] b=767710 refactor AsyncScroll duration API so
 duration can be evaluated before resetting r=roc

--HG--
extra : transplant_source : %17Wc%17%5B%CF%A9n%C6%0BE%3Ez%21%CD%C6Q%20%10%26
---
 layout/generic/nsGfxScrollFrame.cpp | 33 +++++++++++++++--------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index adfd498519dd..9526dfa0362e 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1156,12 +1156,12 @@ public:
 
   TimeStamp mStartTime;
 
-  // mPrevStartTime holds previous 3 timestamps for intervals averaging (to
+  // mPrevEventTime holds previous 3 timestamps for intervals averaging (to
   // reduce duration fluctuations). When AsyncScroll is constructed and no
   // previous timestamps are available (indicated with mIsFirstIteration),
-  // initialize mPrevStartTime using imaginary previous timestamps with maximum
+  // initialize mPrevEventTime using imaginary previous timestamps with maximum
   // relevant intervals between them.
-  TimeStamp mPrevStartTime[3];
+  TimeStamp mPrevEventTime[3];
   bool mIsFirstIteration;
 
   // Cached Preferences values to avoid re-reading them when extending an existing
@@ -1200,7 +1200,7 @@ protected:
                           nscoord aCurrentPos, nscoord aCurrentVelocity,
                           nscoord aDestination);
 
-  void InitDuration(nsIAtom *aOrigin);
+  TimeDuration CalcDurationForEventTime(TimeStamp aTime, nsIAtom *aOrigin);
 
 // The next section is observer/callback management
 // Bodies of WillRefresh and RefreshDriver contain nsGfxScrollFrameInner specific code.
@@ -1266,11 +1266,12 @@ nsGfxScrollFrameInner::AsyncScroll::VelocityAt(TimeStamp aTime) {
 }
 
 /*
- * Calculate/update mDuration, possibly dynamically according to events rate and event origin.
+ * Calculate duration, possibly dynamically according to events rate and event origin.
  * (also maintain previous timestamps - which are only used here).
  */
-void
-nsGfxScrollFrameInner::AsyncScroll::InitDuration(nsIAtom *aOrigin) {
+TimeDuration
+nsGfxScrollFrameInner::
+AsyncScroll::CalcDurationForEventTime(TimeStamp aTime, nsIAtom *aOrigin) {
   if (!aOrigin){
     aOrigin = nsGkAtoms::other;
   }
@@ -1317,17 +1318,17 @@ nsGfxScrollFrameInner::AsyncScroll::InitDuration(nsIAtom *aOrigin) {
 
       // Longest relevant interval (which results in maximum duration)
       TimeDuration maxDelta = TimeDuration::FromMilliseconds(mOriginMaxMS / mIntervalRatio);
-      mPrevStartTime[0] = mStartTime         - maxDelta;
-      mPrevStartTime[1] = mPrevStartTime[0]  - maxDelta;
-      mPrevStartTime[2] = mPrevStartTime[1]  - maxDelta;
+      mPrevEventTime[0] = aTime              - maxDelta;
+      mPrevEventTime[1] = mPrevEventTime[0]  - maxDelta;
+      mPrevEventTime[2] = mPrevEventTime[1]  - maxDelta;
     }
   }
 
   // Average last 3 delta durations (rounding errors up to 2ms are negligible for us)
-  int32_t eventsDeltaMs = (mStartTime - mPrevStartTime[2]).ToMilliseconds() / 3;
-  mPrevStartTime[2] = mPrevStartTime[1];
-  mPrevStartTime[1] = mPrevStartTime[0];
-  mPrevStartTime[0] = mStartTime;
+  int32_t eventsDeltaMs = (aTime - mPrevEventTime[2]).ToMilliseconds() / 3;
+  mPrevEventTime[2] = mPrevEventTime[1];
+  mPrevEventTime[1] = mPrevEventTime[0];
+  mPrevEventTime[0] = aTime;
 
   // Modulate duration according to events rate (quicker events -> shorter durations).
   // The desired effect is to use longer duration when scrolling slowly, such that
@@ -1336,7 +1337,7 @@ nsGfxScrollFrameInner::AsyncScroll::InitDuration(nsIAtom *aOrigin) {
   // intervals using the recent 4 timestamps (now + three prev -> 3 intervals).
   int32_t durationMS = clamped<int32_t>(eventsDeltaMs * mIntervalRatio, mOriginMinMS, mOriginMaxMS);
 
-  mDuration = TimeDuration::FromMilliseconds(durationMS);
+  return TimeDuration::FromMilliseconds(durationMS);
 }
 
 void
@@ -1350,9 +1351,9 @@ nsGfxScrollFrameInner::AsyncScroll::InitSmoothScroll(TimeStamp aTime,
     mStartPos = PositionAt(aTime);
   }
   mStartTime = aTime;
+  mDuration = CalcDurationForEventTime(aTime, aOrigin);
   mDestination = aDestination;
   mRange = aRange;
-  InitDuration(aOrigin);
   InitTimingFunction(mTimingFunctionX, mStartPos.x, currentVelocity.width,
                      aDestination.x);
   InitTimingFunction(mTimingFunctionY, mStartPos.y, currentVelocity.height,

From 0b5112e4943f27c558ea696fdf2f2bcf4b41aa78 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 18 Apr 2013 12:05:10 +1200
Subject: [PATCH 233/438] b=767710 don't let additional events with the same
 destination restart smooth scrolling r=mstange

--HG--
extra : transplant_source : _%BA%CE%F1A%B7%40N%14VMZ%1D%2C%98Lg%40%F7%AF
---
 layout/generic/nsGfxScrollFrame.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 9526dfa0362e..3240177c637d 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1345,15 +1345,23 @@ nsGfxScrollFrameInner::AsyncScroll::InitSmoothScroll(TimeStamp aTime,
                                                      nsPoint aDestination,
                                                      nsIAtom *aOrigin,
                                                      const nsRect& aRange) {
+  mRange = aRange;
+  TimeDuration duration = CalcDurationForEventTime(aTime, aOrigin);
   nsSize currentVelocity(0, 0);
   if (!mIsFirstIteration) {
+    // If an additional event has not changed the destination, then do not let
+    // another minimum duration reset slow things down.  If it would then
+    // instead continue with the existing timing function.
+    if (aDestination == mDestination &&
+        aTime + duration > mStartTime + mDuration)
+      return;
+
     currentVelocity = VelocityAt(aTime);
     mStartPos = PositionAt(aTime);
   }
   mStartTime = aTime;
-  mDuration = CalcDurationForEventTime(aTime, aOrigin);
+  mDuration = duration;
   mDestination = aDestination;
-  mRange = aRange;
   InitTimingFunction(mTimingFunctionX, mStartPos.x, currentVelocity.width,
                      aDestination.x);
   InitTimingFunction(mTimingFunctionY, mStartPos.y, currentVelocity.height,

From cd07755f43f39cb7f28bea3914612b74271165c5 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 17 Apr 2013 17:12:10 -0700
Subject: [PATCH 234/438] backout b1096811620f (Bug 847279) for android M-8
 orange

---
 dom/plugins/test/mochitest/307-xo-redirect.sjs            | 2 +-
 dom/plugins/test/mochitest/test_busy_hang.xul             | 2 +-
 dom/plugins/test/mochitest/test_idle_hang.xul             | 2 +-
 .../test/mochitest/test_privatemode_perwindowpb.xul       | 4 +---
 dom/plugins/test/mochitest/test_redirect_handling.html    | 2 +-
 .../test/mochitest/xulbrowser_plugin_visibility.xul       | 2 +-
 layout/base/tests/chrome/test_bug551434.html              | 2 +-
 .../ssl/tests/mochitest/mixedcontent/bug383369step2.html  | 2 +-
 .../manager/ssl/tests/mochitest/mixedcontent/iframe2.html | 2 +-
 .../tests/mochitest/mixedcontent/iframeMetaRedirect.html  | 2 +-
 .../tests/mochitest/mixedcontent/iframesecredirect.sjs    | 2 +-
 .../tests/mochitest/mixedcontent/iframeunsecredirect.sjs  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs   | 2 +-
 .../ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs | 2 +-
 .../ssl/tests/mochitest/mixedcontent/mixedContentTest.js  | 4 ++--
 .../tests/mochitest/mixedcontent/redirecttoemptyimage.sjs | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug329869.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug455367.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug472986.html  | 4 ++--
 .../ssl/tests/mochitest/mixedcontent/test_bug521461.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_cssBefore1.html | 2 +-
 .../tests/mochitest/mixedcontent/test_cssContent1.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_cssContent2.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_documentWrite1.html | 2 +-
 .../tests/mochitest/mixedcontent/test_documentWrite2.html | 2 +-
 .../mixedcontent/test_dynDelayedUnsecurePicture.html      | 6 +++---
 .../mixedcontent/test_dynDelayedUnsecureXHR.html          | 2 +-
 .../mixedcontent/test_dynUnsecureBackground.html          | 6 +++---
 .../mixedcontent/test_dynUnsecureIframeRedirect.html      | 4 ++--
 .../mochitest/mixedcontent/test_dynUnsecurePicture.html   | 6 +++---
 .../mixedcontent/test_dynUnsecurePicturePreload.html      | 2 +-
 .../mochitest/mixedcontent/test_dynUnsecureRedirect.html  | 6 +++---
 .../test_innerHtmlDelayedUnsecurePicture.html             | 2 +-
 .../mixedcontent/test_innerHtmlUnsecurePicture.html       | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_secureAll.html  | 8 ++++----
 .../tests/mochitest/mixedcontent/test_securePicture.html  | 2 +-
 .../mochitest/mixedcontent/test_unsecureBackground.html   | 2 +-
 .../tests/mochitest/mixedcontent/test_unsecureCSS.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_unsecureIframe.html | 2 +-
 .../mochitest/mixedcontent/test_unsecureIframe2.html      | 2 +-
 .../mixedcontent/test_unsecureIframeMetaRedirect.html     | 2 +-
 .../mixedcontent/test_unsecureIframeRedirect.html         | 2 +-
 .../mochitest/mixedcontent/test_unsecurePicture.html      | 2 +-
 .../mixedcontent/test_unsecurePictureInIframe.html        | 2 +-
 .../mochitest/mixedcontent/test_unsecureRedirect.html     | 2 +-
 .../ssl/tests/mochitest/mixedcontent/unsecureIframe.html  | 2 +-
 .../tests/mochitest/mixedcontent/unsecurePictureDup.html  | 2 +-
 .../test_stricttransportsecurity.html                     | 2 +-
 .../test_sts_privatebrowsing_perwindowpb.html             | 4 ++--
 .../places/tests/mochitest/bug_411966/redirect.js         | 8 ++++----
 .../places/tests/mochitest/test_bug_411966.html           | 2 +-
 .../tests/mochitest/test_bug_461710_perwindowpb.html      | 4 ++--
 52 files changed, 71 insertions(+), 73 deletions(-)

diff --git a/dom/plugins/test/mochitest/307-xo-redirect.sjs b/dom/plugins/test/mochitest/307-xo-redirect.sjs
index b880978cea80..639623c140c5 100644
--- a/dom/plugins/test/mochitest/307-xo-redirect.sjs
+++ b/dom/plugins/test/mochitest/307-xo-redirect.sjs
@@ -1,6 +1,6 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarily");
-  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt");
+  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/loremipsum.txt");
   response.setHeader("Content-Type", "text/html");
 }
diff --git a/dom/plugins/test/mochitest/test_busy_hang.xul b/dom/plugins/test/mochitest/test_busy_hang.xul
index f4842c07e921..c93623810524 100644
--- a/dom/plugins/test/mochitest/test_busy_hang.xul
+++ b/dom/plugins/test/mochitest/test_busy_hang.xul
@@ -9,7 +9,7 @@
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
+          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
   <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
     <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
   </body>
diff --git a/dom/plugins/test/mochitest/test_idle_hang.xul b/dom/plugins/test/mochitest/test_idle_hang.xul
index e56412ef944f..57c1953b1f4d 100644
--- a/dom/plugins/test/mochitest/test_idle_hang.xul
+++ b/dom/plugins/test/mochitest/test_idle_hang.xul
@@ -9,7 +9,7 @@
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
+          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
index 780bdde8e487..89f6eee9006a 100644
--- a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
+++ b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
@@ -8,8 +8,6 @@
   <title>NPAPI Private Mode Tests</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/chrome-harness.js" />
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 <embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
@@ -54,7 +52,7 @@ function runTestsCallback() {
                     .rootTreeItem
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIDOMWindow);
-  var contentPage = getRootDirectory(window.location.href) + "privatemode_perwindowpb.xul";
+  var contentPage = "chrome://mochitests/content/chrome/dom/plugins/test/privatemode_perwindowpb.xul";
 
   function testOnWindow(aIsPrivate, aCallback) {
     var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});
diff --git a/dom/plugins/test/mochitest/test_redirect_handling.html b/dom/plugins/test/mochitest/test_redirect_handling.html
index e947d22a7366..3eee5bdac215 100644
--- a/dom/plugins/test/mochitest/test_redirect_handling.html
+++ b/dom/plugins/test/mochitest/test_redirect_handling.html
@@ -12,7 +12,7 @@
     var p = document.getElementById("plugin1");
 
     var redirectingURL = "307-xo-redirect.sjs";
-    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt";
+    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/loremipsum.txt";
 
     var expectedWriteURL = "";
     var expectedNotifyStatus = -1;
diff --git a/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
index a0e3fc4e107d..0b4a3a35618d 100644
--- a/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
+++ b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
@@ -24,7 +24,7 @@
     const nsIWebProgress = Components.interfaces.nsIWebProgress;
     const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
 
-    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/mochitest/plugin_visibility_loader.html';
+    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/plugin_visibility_loader.html';
 
     function ProgressListener() {
     }
diff --git a/layout/base/tests/chrome/test_bug551434.html b/layout/base/tests/chrome/test_bug551434.html
index 4118a2136cc6..e2d45c7dea7c 100644
--- a/layout/base/tests/chrome/test_bug551434.html
+++ b/layout/base/tests/chrome/test_bug551434.html
@@ -15,7 +15,7 @@
 
 <input id="i3" onkeydown="gKeyDown3++; frames[0].document.getElementById('i4').focus();"
        onkeypress="gKeyPress3++;" onkeyup="gKeyUp3++;"/>
-<iframe id="iframe" src="http://example.org/chrome/layout/base/tests/chrome/bug551434_childframe.html"></iframe>
+<iframe id="iframe" src="http://example.org/chrome/layout/base/test/chrome/bug551434_childframe.html"></iframe>
 
 <script class="testbody" type="text/javascript">
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html b/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
index be8925e98f24..8992b7467c09 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
@@ -13,7 +13,7 @@
     window.setTimeout(function () 
     {
       window.location = 
-        "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html?runtest";
+        "https://example.com/tests/security/ssl/mixedcontent/bug383369step3.html?runtest";
     }, 0);
   }
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html b/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
index 0b6356934907..efe92e346f85 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
@@ -8,6 +8,6 @@
   <script>
     document.write(location.href);
   </script>
-  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
index d033f5b00be0..ccc3bddef131 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <META http-equiv="Refresh"
-      Content="0; URL=http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html">
+      Content="0; URL=http://example.com/tests/security/ssl/mixedcontent/iframe.html">
 <html>
   <body>
     Redirecting by meta tag...
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
index ea93b80b7d58..ab58786d9240 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
+  response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/iframe.html");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
index 937e29954f3f..5cb51671e1a4 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
+  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/iframe.html");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
index 7af6116e1018..1a5bcc62d1b6 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
+  response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
index a8eb26642ae8..ba15359c1bad 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
+  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
index 26142541affe..73c3495a0c55 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
@@ -128,8 +128,8 @@ function finish()
     window.setTimeout(function()
     {
       window.location.assign(navigateToInsecure ?
-        "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html" :
-        "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html");
+        "http://example.com/tests/security/ssl/mixedcontent/backward.html" :
+        "https://example.com/tests/security/ssl/mixedcontent/backward.html");
     }, 0);
   }
   else
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
index 4d85e1658171..1f9a520f5162 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs");
+  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/emptyimage.sjs");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
index 49d5c41c633d..889b84c130e1 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
@@ -16,7 +16,7 @@
     window.setTimeout(function() 
     {
       var newElement = document.createElement("script");
-      newElement.src= "http://example.org/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js";
+      newElement.src= "http://example.org/tests/security/ssl/mixedcontent/bug329869.js";
       document.body.appendChild(newElement);
     }, 0);
   }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
index c0b6e3ebbe60..3b57e92a8e80 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs" />
+  <img src="https://example.com/tests/security/ssl/mixedcontent/redirecttoemptyimage.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
index 427e0fd70f42..176c4725af0b 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
@@ -21,7 +21,7 @@
   {
     var img1 = document.getElementById("img1");
     img1.addEventListener("load", onLoadFunction, false);
-    img1.src = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
+    img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
   }
 
   function runTest()
@@ -40,6 +40,6 @@
 </head>
 
 <body>
-  <img id="img1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
+  <img id="img1" src="https://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
index 9d9d4de09fe6..9b06e08e3f52 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
@@ -16,7 +16,7 @@
 
   function runTest()
   {
-    window.location = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs";
+    window.location = "https://example.com/tests/security/ssl/mixedcontent/nocontent.sjs";
     window.setTimeout(function() {
       isSecurityState("insecure", "location.href doesn't effect the security state");
       is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content");
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
index 59d2fa7a9dbb..a4a24167877a 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
@@ -12,7 +12,7 @@
   <style type="text/css">
     p:before
     {
-      content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
+      content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
     }
   </style>
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
index 347382000a0d..1b347d435c9c 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
@@ -13,7 +13,7 @@
   <style type="text/css">
     p
     {
-      content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
+      content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
     }
   </style>
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
index dfcd7dd76199..aa5e813bc451 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
@@ -20,7 +20,7 @@
   {
     isSecurityState("secure");
     document.getElementById("para").style.content =
-      "url('http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg')";
+      "url('http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg')";
 
     waitForSecurityState("broken", function()
     {
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
index b95a5caca349..7e2356b009f1 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
@@ -30,7 +30,7 @@
 <body>
   <script class="testbody" type="text/javascript">
   document.write(
-    "<img src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />");
+    "<img src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />");
   </script>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
index a92288b7acdd..61fec12dcef1 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
@@ -32,7 +32,7 @@
 <body>
   <script class="testbody" type="text/javascript">
   document.write(
-    "<iframe src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html'></iframe>");
+    "<iframe src='http://example.com/tests/security/ssl/mixedcontent/iframe.html'></iframe>");
   </script>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
index c0684718faae..a441b1045fb2 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
@@ -18,7 +18,7 @@
     window.setTimeout(function() {
       // Don't do this synchronously from onload handler
       document.getElementById("image1").src =
-        "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
+        "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
     }, 0);
 
     waitForSecurityState("broken", function()
@@ -31,7 +31,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -41,6 +41,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
index d566a35947f7..c77053b6a8b5 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
@@ -22,7 +22,7 @@
       try
       {
         var req = new XMLHttpRequest();
-        req.open("GET", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs", false);
+        req.open("GET", "http://example.com/tests/security/ssl/mixedcontent/alloworigin.sjs", false);
         req.send(null);
 
         // Change should be immediate, the request was sent synchronously
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
index 352ae52efc66..4ab5cc3df776 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
@@ -18,7 +18,7 @@
   {
     isSecurityState("secure");
     document.body.background =
-      "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
+      "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
 
     waitForSecurityState("broken", function() 
     {
@@ -30,7 +30,7 @@
   function afterNavigationTest()
   {
     is(document.body.background,
-      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
       "document backround secure again");
     isSecurityState("secure", "secure after re-navigation");
     finish();
@@ -39,6 +39,6 @@
   </script>
 </head>
 
-<body background="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
+<body background="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
index a9967228b4c5..9dfb31a2244c 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
@@ -25,7 +25,7 @@
     }
     
     iframe.src =
-      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs";
+      "https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs";
   }
 
   function afterNavigationTest()
@@ -38,6 +38,6 @@
 </head>
 
 <body>
-  <iframe id="iframe1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
+  <iframe id="iframe1" src="https://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
index aca7be9d1195..b11189693910 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
@@ -18,7 +18,7 @@
   {
     isSecurityState("secure");
     document.getElementById("image1").src =
-      "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
+      "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
 
     window.setTimeout(function() {
       isSecurityState("broken", "src='http://...' changed to broken");
@@ -29,7 +29,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -39,6 +39,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
index 916245c303bd..e379730faacc 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
@@ -13,7 +13,7 @@
   <script class="testbody" type="text/javascript">
 
   (new Image()).src =
-    "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
+    "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
 
   function runTest()
   {
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
index 86fd17e8dc2f..792500d3ef1e 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
@@ -12,7 +12,7 @@
   {
     isSecurityState("secure");
     document.getElementById("image1").src =
-      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs";
+      "https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs";
 
     window.setTimeout(function() {
       isSecurityState("broken", "src='redirect to unsecure' changed to broken");
@@ -23,7 +23,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -33,6 +33,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
index e226fd16be0b..e09406375f4b 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
@@ -19,7 +19,7 @@
     window.setTimeout(function() 
     {
       document.getElementById("buddy").innerHTML =
-        "<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
+        "<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
     }, 1);
 
     waitForSecurityState("broken", function() 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
index 43e27d414bee..63b907d902f9 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
@@ -17,7 +17,7 @@
     isSecurityState("secure");
     
     document.getElementById("buddy").innerHTML =
-      "<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
+      "<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
 
     window.setTimeout(function() {
       isSecurityState("broken", "innerHTML loading insecure changed to broken");
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
index 087a31383521..8e1942d54afc 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <link rel="stylesheet" type="text/css" 
-    href="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
+    href="https://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
 
   <script class="testbody" type="text/javascript">
 
@@ -34,8 +34,8 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
-  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs" />
-  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs" />
+  <img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="https://example.com/tests/security/ssl/mixedcontent/imgsecredirect.sjs" />
+  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframesecredirect.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
index d774f3bfdb08..e31c3b21dc7f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
index 6b1d88a4b100..bf3453d8a572 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
@@ -29,6 +29,6 @@
   </script>
 </head>
 
-<body background="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
+<body background="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
index 8985fc7d85d2..d868ce34cb40 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   
   <link rel="stylesheet" type="text/css" 
-    href="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
+    href="http://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
 
   <script class="testbody" type="text/javascript">
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
index 717de60583b9..43a79084f926 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
index bea0ebc1702f..3410b982fdaf 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html"></iframe>
+  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframe2.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
index a31090a4a208..e35df266f2ec 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
@@ -30,7 +30,7 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html"></iframe>
+  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeMetaRedirect.html"></iframe>
 </body>
 </html>
  
\ No newline at end of file
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
index acdbe5fb1e68..d3d3a7f28e1f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
@@ -30,7 +30,7 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs"></iframe>
+  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs"></iframe>
 </body>
 </html>
  
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
index fb66957d912c..09cb6f7c5e13 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
index fc336558e7ba..ad464e9649ee 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/ssl/mixedcontent/unsecureIframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
index b2b1477c162f..9b512b1761e0 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs" />
+  <img src="https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
index 2282677418e4..6fec95b04de3 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
@@ -4,6 +4,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html b/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
index 770505ea11ed..e73b5e6e7860 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
+  <img src="http://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
index d2468c8d66a5..803d9a23d6dc 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
@@ -12,7 +12,7 @@
   <script class="testbody" type="text/javascript">
   SimpleTest.waitForExplicitFinish();
 
-  const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
+  const STSPATH = "/tests/security/ssl/stricttransportsecurity";
 
   // initialized manually here
   var testsleft = {'plain': 4, 'subdom': 4};
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
index 2a847eeae0de..ef8a21ceb64d 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
@@ -14,10 +14,10 @@
 
   const Cc = Components.classes;
   const Ci = Components.interfaces;
-  const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
+  const STSPATH = "/tests/security/ssl/stricttransportsecurity";
   const NUM_TEST_FRAMES = 4;
   const CONTENT_PAGE =
-    "http://mochi.test:8888/chrome/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html";
+    "http://mochi.test:8888/chrome/security/ssl/stricttransportsecurity/page_blank.html";
 
   // This is how many sub-tests (testframes) in each round.
   // When the round begins, this will be initialized.
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/redirect.js b/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
index f7aa720e44a9..da30e5629b38 100644
--- a/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
+++ b/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
@@ -33,10 +33,10 @@ function uri(URIString) {
   return ios.newURI(URIString, null, null);
 }
 
-var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TypedPage.htm");
-var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/ClickedPage.htm");
-var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TempRedirectPage.htm");
-var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/PermRedirectPage.htm");
+var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TypedPage.htm");
+var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/ClickedPage.htm");
+var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TempRedirectPage.htm");
+var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/PermRedirectPage.htm");
 
 // Stream Listener
 function StreamListener(aChannel, aCallbackFunc) {
diff --git a/toolkit/components/places/tests/mochitest/test_bug_411966.html b/toolkit/components/places/tests/mochitest/test_bug_411966.html
index dce9fbb07522..cd855187579b 100644
--- a/toolkit/components/places/tests/mochitest/test_bug_411966.html
+++ b/toolkit/components/places/tests/mochitest/test_bug_411966.html
@@ -6,7 +6,7 @@
   <head>
     <title>Test for Bug 411966</title>
     <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="mochitest/bug_411966/redirect.js"></script>
+    <script type="text/javascript" src="bug_411966/redirect.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   </head>
   <body>
diff --git a/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html b/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
index 58d2b215d122..48f5b9cc31c0 100644
--- a/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
+++ b/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
@@ -60,7 +60,7 @@ function waitForTrue(fn, onWaitComplete) {
 const kRed = "rgb(255, 0, 0)";
 const kBlue = "rgb(0, 0, 255)";
 
-var testpath = "/tests/toolkit/components/places/tests/mochitest/bug_461710/";
+var testpath = "/tests/toolkit/components/places/tests/mochitest/../bug_461710/";
 var prefix = "http://mochi.test:8888" + testpath;
 var subtests = [
                    "visited_page.html",   // 1
@@ -163,7 +163,7 @@ var mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
                     .rootTreeItem
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIDOMWindow);
-var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/bug_461710/iframe.html";
+var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/../bug_461710/iframe.html";
 
 function testOnWindow(aIsPrivate, aCallback) {
   var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});

From d5c07891687283a34476dbac0376d1923de1e566 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 17 Apr 2013 17:13:02 -0700
Subject: [PATCH 235/438] backout 8e0af273404e (Bug 847279) for android M-8
 orange

---
 dom/imptests/Makefile.in                                        | 2 +-
 dom/permission/tests/Makefile.in                                | 2 +-
 dom/plugins/test/mochitest/Makefile.in                          | 2 +-
 dom/tests/mochitest/crypto/Makefile.in                          | 2 +-
 layout/base/tests/chrome/Makefile.in                            | 2 +-
 security/manager/ssl/tests/mochitest/bugs/Makefile.in           | 2 +-
 security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in   | 2 +-
 .../ssl/tests/mochitest/stricttransportsecurity/Makefile.in     | 2 +-
 .../components/places/tests/mochitest/bug_411966/Makefile.in    | 2 +-
 .../components/places/tests/mochitest/bug_461710/Makefile.in    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dom/imptests/Makefile.in b/dom/imptests/Makefile.in
index 332c8967f760..ee1693503333 100644
--- a/dom/imptests/Makefile.in
+++ b/dom/imptests/Makefile.in
@@ -6,7 +6,7 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
+relativesrcdir = dom/imported-tests
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/permission/tests/Makefile.in b/dom/permission/tests/Makefile.in
index af97961cd4de..9f8a8bdec7d9 100644
--- a/dom/permission/tests/Makefile.in
+++ b/dom/permission/tests/Makefile.in
@@ -7,7 +7,7 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = @relativesrcdir@
+relativesrcdir   = dom/permission/tests
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in
index b9c4d65cb0cb..51e95374ae26 100644
--- a/dom/plugins/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
+relativesrcdir  = dom/plugins/test
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/crypto/Makefile.in b/dom/tests/mochitest/crypto/Makefile.in
index ce2e344a677d..494c85ab3805 100644
--- a/dom/tests/mochitest/crypto/Makefile.in
+++ b/dom/tests/mochitest/crypto/Makefile.in
@@ -6,7 +6,7 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
+relativesrcdir	= dom/tests/mochitest/crypto
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/layout/base/tests/chrome/Makefile.in b/layout/base/tests/chrome/Makefile.in
index b7f155c51d7c..591358eef435 100644
--- a/layout/base/tests/chrome/Makefile.in
+++ b/layout/base/tests/chrome/Makefile.in
@@ -6,7 +6,7 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
+relativesrcdir  = layout/base/test/chrome
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index d08b4551b44e..8981ea47a8d9 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
+relativesrcdir	= security/ssl/bugs
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
index 582ff18ba911..6c89bba737a6 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
+relativesrcdir	= security/ssl/mixedcontent
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
index 1dde9f22d25f..e431550c2bc7 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
@@ -6,7 +6,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
+relativesrcdir	= security/ssl/stricttransportsecurity
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
index 69bdc35452f3..8d4991e3e04f 100644
--- a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
+relativesrcdir = toolkit/components/places/tests/bug_411966
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
index aac587d78a81..090b499b7228 100644
--- a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
+relativesrcdir = toolkit/components/places/tests/bug_461710
 
 include $(DEPTH)/config/autoconf.mk
 

From e0b70017ca397ff061bb66b370256f6dab23a1ea Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Wed, 17 Apr 2013 17:18:03 -0700
Subject: [PATCH 236/438] Bug 861658 - Make Android Sync styles use Gecko
 themes. r=nalexander

This avoids using "@android:style/TextAppearance" or
"@android:style/{TextView,Button,EditText}" and avoids a crash on
pre-Gingerbread devices.
---
 mobile/android/base/resources/values/sync_styles.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/android/base/resources/values/sync_styles.xml b/mobile/android/base/resources/values/sync_styles.xml
index 3f08a2bd77cf..db41525ad68e 100644
--- a/mobile/android/base/resources/values/sync_styles.xml
+++ b/mobile/android/base/resources/values/sync_styles.xml
@@ -16,14 +16,14 @@
   </style>
 
   <!-- TextView Styles -->
-  <style name="SyncTextFrame" parent="@android:style/TextAppearance">
+  <style name="SyncTextFrame" parent="@style/TextAppearance">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">fill_parent</item>
     <item name="android:layout_gravity">center</item>
     <item name="android:padding">@dimen/SyncSpace</item>
     <item name="android:orientation">vertical</item>
   </style>
-  <style name="SyncTextItem" parent="@android:style/TextAppearance.Medium">
+  <style name="SyncTextItem" parent="@style/TextAppearance.Medium">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:textSize">15dp</item>
@@ -43,7 +43,7 @@
     <item name="android:textSize">20dp</item>
   </style>
   <!-- EditView Styles -->
-  <style name="SyncEditItem" parent="@android:style/Widget.EditText">
+  <style name="SyncEditItem" parent="@style/Widget.EditText">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:singleLine">true</item>
@@ -66,7 +66,7 @@
 
   <!-- Top title bar: a text view with the Sync icon to the left. -->
   <style name="SyncTop">
-    <item name="android:textAppearance">@android:style/TextAppearance.Large</item>
+    <item name="android:textAppearance">@style/TextAppearance.Large</item>
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:gravity">center_vertical|left</item>
@@ -103,14 +103,14 @@
     <item name="android:orientation">vertical</item>
   </style>
 
-  <style name="SyncButton" parent="@android:style/Widget.Button">
+  <style name="SyncButton" parent="@style/Widget.Button">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_weight">1</item>
   </style>
 
   <!-- Text Display Styles -->
-  <style name="SyncPinText" parent="@android:style/Widget.TextView">
+  <style name="SyncPinText" parent="@style/Widget.TextView">
     <item name="android:layout_width">130sp</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_gravity">center</item>

From 24348e3ba24cf99c8594c55b19ec928c44cbef68 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 25 Mar 2013 13:42:27 -0400
Subject: [PATCH 237/438] Bug 852850 - Add the ability for the reftest
 framework to test whether an element is painted in invalidation tests. r=roc

---
 layout/tools/reftest/README.txt         |  8 ++++++++
 layout/tools/reftest/reftest-content.js | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/layout/tools/reftest/README.txt b/layout/tools/reftest/README.txt
index 9abdcba8c968..2ade610a24cd 100644
--- a/layout/tools/reftest/README.txt
+++ b/layout/tools/reftest/README.txt
@@ -442,6 +442,14 @@ function doTest() {
 }
 document.addEventListener("MozReftestInvalidate", doTest, false);
 
+Painting Tests
+==============
+
+If an element shouldn't be painted, set the class "reftest-no-paint" on it
+when doing an invalidation test. Causing a repaint in your
+MozReftestInvalidate handler (for example, by changing the body's background
+colour) will accurately test whether the element is painted.
+
 Zoom Tests
 ==========
 
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index 014dfcc1b1a3..659bb7ab0a67 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -234,6 +234,10 @@ function shouldWaitForReftestWaitRemoval(contentRootElement) {
                              .indexOf("reftest-wait") != -1;
 }
 
+function getNoPaintElements(contentRootElement) {
+  return contentRootElement.getElementsByClassName('reftest-no-paint');
+}
+
 // Initial state. When the document has loaded and all MozAfterPaint events and
 // all explicit paint waits are flushed, we can fire the MozReftestInvalidate
 // event and move to the next state.
@@ -360,6 +364,10 @@ function WaitForTestEnd(contentRootElement, inPrintMode) {
             // Notify the test document that now is a good time to test some invalidation
             LogInfo("MakeProgress: dispatching MozReftestInvalidate");
             if (contentRootElement) {
+                var elements = getNoPaintElements(contentRootElement);
+                for (var i = 0; i < elements.length; ++i) {
+                  windowUtils().checkAndClearPaintedState(elements[i]);
+                }
                 var notification = content.document.createEvent("Events");
                 notification.initEvent("MozReftestInvalidate", true, false);
                 contentRootElement.dispatchEvent(notification);
@@ -408,6 +416,14 @@ function WaitForTestEnd(contentRootElement, inPrintMode) {
                 }
                 return;
             }
+            if (contentRootElement) {
+              var elements = getNoPaintElements(contentRootElement);
+              for (var i = 0; i < elements.length; ++i) {
+                  if (windowUtils().checkAndClearPaintedState(elements[i])) {
+                      LogError("REFTEST TEST-UNEXPECTED-FAIL | element marked as reftest-no-paint got repainted!");
+                  }
+              }
+            }
             LogInfo("MakeProgress: Completed");
             state = STATE_COMPLETED;
             gFailureReason = "timed out while taking snapshot (bug in harness?)";

From 7c29d7a39ea9cdc1423e7c4814a65020f39dc07c Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 20 Mar 2013 14:52:43 +1300
Subject: [PATCH 238/438] Bug 852850 - Add a reftest to make sure images
 hoisted into their own layers aren't painted. r=joe

---
 .../invalidation/image_rgrg-256x256.png         | Bin 0 -> 131 bytes
 layout/reftests/invalidation/reftest.list       |   1 +
 .../invalidation/test-image-layers-ref.html     |   8 ++++++++
 .../invalidation/test-image-layers.html         |  16 ++++++++++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 layout/reftests/invalidation/image_rgrg-256x256.png
 create mode 100644 layout/reftests/invalidation/test-image-layers-ref.html
 create mode 100644 layout/reftests/invalidation/test-image-layers.html

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

literal 0
HcmV?d00001

diff --git a/layout/reftests/invalidation/reftest.list b/layout/reftests/invalidation/reftest.list
index b49bb8d075f7..035b133600af 100644
--- a/layout/reftests/invalidation/reftest.list
+++ b/layout/reftests/invalidation/reftest.list
@@ -12,3 +12,4 @@
 # to override the override. Ugh.
 pref(dom.use_xbl_scopes_for_remote_xul,false) == 540247-1.xul 540247-1-ref.xul
 == 543681-1.html 543681-1-ref.html
+== test-image-layers.html test-image-layers-ref.html
diff --git a/layout/reftests/invalidation/test-image-layers-ref.html b/layout/reftests/invalidation/test-image-layers-ref.html
new file mode 100644
index 000000000000..46af2e2a93fb
--- /dev/null
+++ b/layout/reftests/invalidation/test-image-layers-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:black">
+<div>
+<img id="image" src="./image_rgrg-256x256.png" style="-moz-transform: translatex(1px)"></img>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/invalidation/test-image-layers.html b/layout/reftests/invalidation/test-image-layers.html
new file mode 100644
index 000000000000..57acc99a7c03
--- /dev/null
+++ b/layout/reftests/invalidation/test-image-layers.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body>
+<div>
+<img id="image" class="reftest-no-paint" src="./image_rgrg-256x256.png" style="-moz-transform: translatex(1px)"></img>
+</div>
+<script type="application/javascript">
+
+function doTest() {
+  document.body.style.background = "black";
+  document.documentElement.removeAttribute("class");
+}
+document.addEventListener("MozReftestInvalidate", doTest, false);
+</script>
+</body>
+</html>

From f56bb56e9c73fc18bbf5feb55e65e2f23d77588b Mon Sep 17 00:00:00 2001
From: Jason Duell <jduell.mcbugs@gmail.com>
Date: Mon, 15 Apr 2013 13:14:20 -0700
Subject: [PATCH 239/438] Backed out changeset bfd7c7290cab (bug 851214) for
 bad comment

---
 netwerk/ipc/NeckoParent.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp
index ee620e7acbab..0bf17fd51d76 100644
--- a/netwerk/ipc/NeckoParent.cpp
+++ b/netwerk/ipc/NeckoParent.cpp
@@ -98,6 +98,13 @@ NeckoParent::GetValidatedAppInfo(const SerializedLoadContext& aSerialized,
       if (tabParent->HasOwnApp()) {
         return "TabParent reports NECKO_NO_APP_ID but also is an app";
       }
+      if (UsingNeckoIPCSecurity() && tabParent->IsBrowserElement()) {
+        // <iframe mozbrowser> which doesn't have an <iframe mozapp> above it.
+        // This is not supported now, and we'll need to do a code audit to make
+        // sure we can handle it (i.e don't short-circuit using separate
+        // namespace if just appID==0)
+        return "TabParent reports appId=NECKO_NO_APP_ID but is a mozbrowser";
+      }
     }
   } else {
     // Only trust appId/inBrowser from child-side loadcontext if we're in

From b8ea0ca67a09af0f78b34de32f57a4eb02b4af14 Mon Sep 17 00:00:00 2001
From: Simon Montagu <smontagu@smontagu.org>
Date: Mon, 15 Apr 2013 23:14:39 +0300
Subject: [PATCH 240/438] Add some assertions to DirectionalityUtils.cpp, Bug
 861606, r=ehsan

---
 content/base/src/DirectionalityUtils.cpp | 44 ++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/content/base/src/DirectionalityUtils.cpp b/content/base/src/DirectionalityUtils.cpp
index 9e642f78b8f7..27ad96119ba8 100644
--- a/content/base/src/DirectionalityUtils.cpp
+++ b/content/base/src/DirectionalityUtils.cpp
@@ -385,7 +385,9 @@ static nsINode*
 WalkDescendantsSetDirectionFromText(Element* aElement, bool aNotify = true,
                                     nsINode* aChangedNode = nullptr)
 {
-  MOZ_ASSERT(aElement, "aElement is null");
+  MOZ_ASSERT(aElement, "Must have an element");
+  MOZ_ASSERT(aElement->HasDirAuto(), "Element must have dir=auto");
+
   if (DoesNotParticipateInAutoDirection(aElement)) {
     return nullptr;
   }
@@ -428,6 +430,7 @@ class nsTextNodeDirectionalityMap
 
     nsTextNodeDirectionalityMap* map =
       reinterpret_cast<nsTextNodeDirectionalityMap * >(aPropertyValue);
+    map->EnsureMapIsClear(textNode);
     delete map;
   }
 
@@ -511,6 +514,14 @@ private:
     return PL_DHASH_REMOVE;
   }
 
+  static PLDHashOperator ClearEntry(nsPtrHashKey<Element>* aEntry, void* aData)
+  {
+    Element* rootNode = aEntry->GetKey();
+    rootNode->ClearHasDirAutoSet();
+    rootNode->UnsetProperty(nsGkAtoms::dirAutoSetBy);
+    return PL_DHASH_REMOVE;
+  }
+
 public:
   void UpdateAutoDirection(Directionality aDir)
   {
@@ -522,6 +533,13 @@ public:
     mElements.EnumerateEntries(ResetNodeDirection, aTextNode);
   }
 
+  void EnsureMapIsClear(nsINode* aTextNode)
+  {
+    uint32_t clearedEntries =
+      mElements.EnumerateEntries(ClearEntry, aTextNode);
+    MOZ_ASSERT(clearedEntries == 0, "Map should be empty already");
+  }
+
   static void RemoveElementFromMap(nsINode* aTextNode, Element* aElement)
   {
     if (aTextNode->HasTextNodeDirectionalityMap()) {
@@ -552,6 +570,13 @@ public:
                "Map missing in ResetTextNodeDirection");
     GetDirectionalityMap(aTextNode)->ResetAutoDirection(aTextNode);
   }
+
+  static void EnsureMapIsClearFor(nsINode* aTextNode)
+  {
+    if (aTextNode->HasTextNodeDirectionalityMap()) {
+      GetDirectionalityMap(aTextNode)->EnsureMapIsClear(aTextNode);
+    }
+  }
 };
 
 Directionality
@@ -655,6 +680,7 @@ WalkDescendantsResetAutoDirection(Element* aElement)
 
     if (child->HasTextNodeDirectionalityMap()) {
       nsTextNodeDirectionalityMap::ResetTextNodeDirection(child);
+      nsTextNodeDirectionalityMap::EnsureMapIsClearFor(child);
     }
     child = child->GetNextNode(aElement);
   }
@@ -731,9 +757,13 @@ void SetAncestorDirectionIfAuto(nsINode* aTextNode, Directionality aDir,
 
     if (parent->HasDirAuto()) {
       bool resetDirection = false;
+      nsINode* directionWasSetByTextNode =
+        static_cast<nsINode*>(parent->GetProperty(nsGkAtoms::dirAutoSetBy));
 
       if (!parent->HasDirAutoSet()) {
         // Fast path if parent's direction is not yet set by any descendant
+        MOZ_ASSERT(!directionWasSetByTextNode,
+                   "dirAutoSetBy property should be null");
         resetDirection = true;
       } else {
         // If parent's direction is already set, we need to know if
@@ -741,8 +771,6 @@ void SetAncestorDirectionIfAuto(nsINode* aTextNode, Directionality aDir,
         // We will walk parent's descendants in tree order starting from
         // aTextNode to optimize for the most common case where text nodes are
         // being appended to tree.
-        nsINode* directionWasSetByTextNode =
-          static_cast<nsINode*>(parent->GetProperty(nsGkAtoms::dirAutoSetBy));
         if (!directionWasSetByTextNode) {
           resetDirection = true;
         } else if (directionWasSetByTextNode != aTextNode) {
@@ -758,9 +786,6 @@ void SetAncestorDirectionIfAuto(nsINode* aTextNode, Directionality aDir,
               // we found the node that set the element's direction after our
               // text node, so we need to reset the direction
               resetDirection = true;
-              nsTextNodeDirectionalityMap::RemoveElementFromMap(
-                directionWasSetByTextNode, parent
-              );
               break;
             }
 
@@ -770,6 +795,11 @@ void SetAncestorDirectionIfAuto(nsINode* aTextNode, Directionality aDir,
       }
 
       if (resetDirection) {
+        if (directionWasSetByTextNode) {
+          nsTextNodeDirectionalityMap::RemoveElementFromMap(
+            directionWasSetByTextNode, parent
+          );
+        }
         parent->SetDirectionality(aDir, aNotify);
         nsTextNodeDirectionalityMap::AddEntryToMap(aTextNode, parent);
         SetDirectionalityOnDescendants(parent, aDir, aNotify);
@@ -790,6 +820,7 @@ SetDirectionFromChangedTextNode(nsIContent* aTextNode, uint32_t aOffset,
                                 bool aNotify)
 {
   if (!NodeAffectsDirAutoAncestor(aTextNode)) {
+    nsTextNodeDirectionalityMap::EnsureMapIsClearFor(aTextNode);
     return;
   }
 
@@ -846,6 +877,7 @@ void
 ResetDirectionSetByTextNode(nsTextNode* aTextNode)
 {
   if (!NodeAffectsDirAutoAncestor(aTextNode)) {
+    nsTextNodeDirectionalityMap::EnsureMapIsClearFor(aTextNode);
     return;
   }
 

From 644bc5ddde43e31d112daefe480ff6d7dffbc1d2 Mon Sep 17 00:00:00 2001
From: Simon Montagu <smontagu@smontagu.org>
Date: Mon, 15 Apr 2013 23:14:40 +0300
Subject: [PATCH 241/438] Remove unnecessary calls to ClearHasDirAutoSet in
 AfterSetAttr, Bug 861607, r=ehsan

---
 content/html/content/src/nsGenericHTMLElement.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 0d290bc153ef..80d987276543 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -800,7 +800,6 @@ nsGenericHTMLElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
           dir = dirValue;
           SetDirectionality(dir, aNotify);
           ClearHasDirAuto();
-          ClearHasDirAutoSet();
           SetHasFixedDir();
         }
       } else {
@@ -810,7 +809,6 @@ nsGenericHTMLElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
           SetHasDirAuto();
         } else {
           ClearHasDirAuto();
-          ClearHasDirAutoSet();
           dir = RecomputeDirectionality(this, aNotify);
         }
       }

From 95edc8417929ad05b38458f2b49663872856b6fc Mon Sep 17 00:00:00 2001
From: Simon Montagu <smontagu@smontagu.org>
Date: Mon, 15 Apr 2013 23:14:42 +0300
Subject: [PATCH 242/438] Remove elements from text node directionality map
 when they cease to have dir=auto, Bug 861610, r=ehsan

---
 content/base/src/DirectionalityUtils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/content/base/src/DirectionalityUtils.cpp b/content/base/src/DirectionalityUtils.cpp
index 27ad96119ba8..8dd99edc1111 100644
--- a/content/base/src/DirectionalityUtils.cpp
+++ b/content/base/src/DirectionalityUtils.cpp
@@ -942,6 +942,11 @@ OnSetDirAttr(Element* aElement, const nsAttrValue* aNewValue,
   if (aElement->HasDirAuto()) {
     WalkDescendantsSetDirAuto(aElement, aNotify);
   } else {
+    if (aElement->HasDirAutoSet()) {
+      nsINode* setByNode =
+        static_cast<nsINode*>(aElement->GetProperty(nsGkAtoms::dirAutoSetBy));
+      nsTextNodeDirectionalityMap::RemoveElementFromMap(setByNode, aElement);
+    }
     SetDirectionalityOnDescendants(aElement,
                                    RecomputeDirectionality(aElement, aNotify),
                                    aNotify);

From 3904cfc18962c419642c247c026993ebf8f25f9b Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Mon, 15 Apr 2013 13:21:42 -0700
Subject: [PATCH 243/438] Bug 846111 followup - Expand some stray tabs and fix
 typo in comment. (r=me) DONTBUILD

---
 js/src/ion/IonFrames.cpp | 6 +++---
 js/src/vm/Shape.h        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/src/ion/IonFrames.cpp b/js/src/ion/IonFrames.cpp
index 880a6396905d..cb6138e0905d 100644
--- a/js/src/ion/IonFrames.cpp
+++ b/js/src/ion/IonFrames.cpp
@@ -1127,11 +1127,11 @@ IonFrameIterator::ionScript() const
     switch (GetCalleeTokenTag(calleeToken())) {
       case CalleeToken_Function:
       case CalleeToken_Script:
-		return script()->ionScript();
+        return script()->ionScript();
       case CalleeToken_ParallelFunction:
-		return script()->parallelIonScript();
+        return script()->parallelIonScript();
       default:
-		JS_NOT_REACHED("unknown callee token type");
+        JS_NOT_REACHED("unknown callee token type");
     }
 }
 
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
index 46ed68612c14..53ab88e40db8 100644
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -1099,8 +1099,8 @@ Shape::search(JSContext *cx, Shape *start, jsid id, Shape ***pspp, bool adding)
 }
 
 /*
- * Keep this function in sync with search. It should return false whenever
- * search would transition to a ShapeTable.
+ * Keep this function in sync with search. It neither hashifies the start
+ * shape nor increments linear search count.
  */
 inline Shape *
 Shape::searchNoHashify(Shape *start, jsid id)

From 9de75f85fc32c9cafb7e78fcfb44527328e75b01 Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Mon, 15 Apr 2013 13:21:42 -0700
Subject: [PATCH 244/438] Bug 860997 - Record shapes instead of object
 identities to avoid stubbing duplicates in ParallelGetPropertyIC. (r=nbp)

---
 js/src/ion/IonCaches.cpp                      | 22 +++++------
 js/src/ion/IonCaches.h                        | 12 +++---
 .../parallelarray/parallel-getproperty-ic.js  | 37 +++++++++++++++++--
 js/src/jscntxt.h                              |  1 +
 4 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/js/src/ion/IonCaches.cpp b/js/src/ion/IonCaches.cpp
index 6cb2874769ef..d5be53c9fa12 100644
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -1306,24 +1306,24 @@ void
 ParallelGetPropertyIC::reset()
 {
     DispatchIonCache::reset();
-    if (stubbedObjects_)
-        stubbedObjects_->clear();
+    if (stubbedShapes_)
+        stubbedShapes_->clear();
 }
 
 void
 ParallelGetPropertyIC::destroy()
 {
-    if (stubbedObjects_)
-        js_delete(stubbedObjects_);
+    if (stubbedShapes_)
+        js_delete(stubbedShapes_);
 }
 
 bool
-ParallelGetPropertyIC::initStubbedObjects(JSContext *cx)
+ParallelGetPropertyIC::initStubbedShapes(JSContext *cx)
 {
     JS_ASSERT(isAllocated());
-    if (!stubbedObjects_) {
-        stubbedObjects_ = cx->new_<ObjectSet>(cx);
-        return stubbedObjects_ && stubbedObjects_->init();
+    if (!stubbedShapes_) {
+        stubbedShapes_ = cx->new_<ShapeSet>(cx);
+        return stubbedShapes_ && stubbedShapes_->init();
     }
     return true;
 }
@@ -1425,12 +1425,12 @@ ParallelGetPropertyIC::update(ForkJoinSlice *slice, size_t cacheIndex,
         if (cache.canAttachStub()) {
             // Check if we have already stubbed the current object to avoid
             // attaching a duplicate stub.
-            if (!cache.initStubbedObjects(cx))
+            if (!cache.initStubbedShapes(cx))
                 return TP_FATAL;
-            ObjectSet::AddPtr p = cache.stubbedObjects()->lookupForAdd(obj);
+            ShapeSet::AddPtr p = cache.stubbedShapes()->lookupForAdd(obj->lastProperty());
             if (p)
                 return TP_SUCCESS;
-            if (!cache.stubbedObjects()->add(p, obj))
+            if (!cache.stubbedShapes()->add(p, obj->lastProperty()))
                 return TP_FATAL;
 
             // See note about the stub limit in GetPropertyCache.
diff --git a/js/src/ion/IonCaches.h b/js/src/ion/IonCaches.h
index ec61d6a13604..855b7535236c 100644
--- a/js/src/ion/IonCaches.h
+++ b/js/src/ion/IonCaches.h
@@ -800,14 +800,14 @@ class ParallelGetPropertyIC : public DispatchIonCache
 
     // A set of all objects that are stubbed. Used to detect duplicates in
     // parallel execution.
-    ObjectSet *stubbedObjects_;
+    ShapeSet *stubbedShapes_;
 
    public:
     ParallelGetPropertyIC(Register object, PropertyName *name, TypedOrValueRegister output)
       : object_(object),
         name_(name),
         output_(output),
-        stubbedObjects_(NULL)
+        stubbedShapes_(NULL)
     {
     }
 
@@ -827,10 +827,10 @@ class ParallelGetPropertyIC : public DispatchIonCache
         return output_;
     }
 
-    bool initStubbedObjects(JSContext *cx);
-    ObjectSet *stubbedObjects() const {
-        JS_ASSERT_IF(stubbedObjects_, stubbedObjects_->initialized());
-        return stubbedObjects_;
+    bool initStubbedShapes(JSContext *cx);
+    ShapeSet *stubbedShapes() const {
+        JS_ASSERT_IF(stubbedShapes_, stubbedShapes_->initialized());
+        return stubbedShapes_;
     }
 
     bool canAttachReadSlot(LockedJSContext &cx, JSObject *obj, MutableHandleObject holder,
diff --git a/js/src/jit-test/tests/parallelarray/parallel-getproperty-ic.js b/js/src/jit-test/tests/parallelarray/parallel-getproperty-ic.js
index 6fffb45d6f81..c50d648007ab 100644
--- a/js/src/jit-test/tests/parallelarray/parallel-getproperty-ic.js
+++ b/js/src/jit-test/tests/parallelarray/parallel-getproperty-ic.js
@@ -1,6 +1,6 @@
 load(libdir + "parallelarray-helpers.js");
 
-function testIC() {
+function testICProto() {
   function C() {}
   C.prototype.foo = "foo";
   var c = new C;
@@ -11,5 +11,36 @@ function testIC() {
   });
 }
 
-if (getBuildConfiguration().parallelJS)
-  testIC();
+function f(o) {
+  return new ParallelArray(minItemsTestingThreshold, function (i) {
+    return o.foo;
+  }, { mode: "par", expect: "mixed" });
+}
+
+function testICMultiple() {
+  var o1 = { foo: 0 };
+  var o2 = { foo: 0, bar: '' };
+  var o3 = { foo: 0, bar: '', baz: function () { } };
+  var o4 = { foo: { } };
+  f(o1); f(o2); f(o3); f(o2); f(o1); f(o4);
+}
+
+function testICSameShapeDifferentProto() {
+  function A () { this.bar = 1; }
+  A.prototype.foo = "a";
+  A.prototype.a = true;
+  var x = new A;
+  function B () { this.bar = 2; }
+  B.prototype.foo = "b";
+  A.prototype.b = true;
+  var y = new B;
+
+  assertEq(f(x).get(0), "a");
+  assertEq(f(y).get(0), "b");
+}
+
+if (getBuildConfiguration().parallelJS) {
+  testICProto();
+  testICMultiple();
+  testICSameShapeDifferentProto();
+}
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index b3b0fad13626..fd90371f11b8 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -93,6 +93,7 @@ RawFunction CloneFunctionAtCallsite(JSContext *cx, HandleFunction fun,
                                     HandleScript script, jsbytecode *pc);
 
 typedef HashSet<JSObject *> ObjectSet;
+typedef HashSet<Shape *> ShapeSet;
 
 /* Detects cycles when traversing an object graph. */
 class AutoCycleDetector

From daca71582fad95707c47f5e9c08afe5da2e2fd33 Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Mon, 15 Apr 2013 13:21:42 -0700
Subject: [PATCH 245/438] Bug 860553 - Better spew for AliasAnalysis.
 (r=dvander)

---
 js/src/ion/AliasAnalysis.cpp | 41 ++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/js/src/ion/AliasAnalysis.cpp b/js/src/ion/AliasAnalysis.cpp
index f90fff43905d..f37c055a2a0d 100644
--- a/js/src/ion/AliasAnalysis.cpp
+++ b/js/src/ion/AliasAnalysis.cpp
@@ -77,6 +77,30 @@ BlockMightReach(MBasicBlock *src, MBasicBlock *dest)
     return false;
 }
 
+static void
+IonSpewDependency(MDefinition *load, MDefinition *store, const char *verb, const char *reason)
+{
+    if (!IonSpewEnabled(IonSpew_Alias))
+        return;
+
+    fprintf(IonSpewFile, "Load ");
+    load->printName(IonSpewFile);
+    fprintf(IonSpewFile, " %s on store ", verb);
+    store->printName(IonSpewFile);
+    fprintf(IonSpewFile, " (%s)\n", reason);
+}
+
+static void
+IonSpewAliasInfo(const char *pre, MDefinition *ins, const char *post)
+{
+    if (!IonSpewEnabled(IonSpew_Alias))
+        return;
+
+    fprintf(IonSpewFile, "%s ", pre);
+    ins->printName(IonSpewFile);
+    fprintf(IonSpewFile, " %s\n", post);
+}
+
 // This pass annotates every load instruction with the last store instruction
 // on which it depends. The algorithm is optimistic in that it ignores explicit
 // dependencies and only considers loads and stores.
@@ -130,7 +154,11 @@ AliasAnalysis::analyze()
                         return false;
                 }
 
-                IonSpew(IonSpew_Alias, "Processing store %d (flags %x)", def->id(), set.flags());
+                if (IonSpewEnabled(IonSpew_Alias)) {
+                    fprintf(IonSpewFile, "Processing store ");
+                    def->printName(IonSpewFile);
+                    fprintf(IonSpewFile, " (flags %x)\n", set.flags());
+                }
             } else {
                 // Find the most recent store on which this instruction depends.
                 MDefinition *lastStore = firstIns;
@@ -148,7 +176,7 @@ AliasAnalysis::analyze()
                 }
 
                 def->setDependency(lastStore);
-                IonSpew(IonSpew_Alias, "Load %d depends on store %d", def->id(), lastStore->id());
+                IonSpewDependency(*def, lastStore, "depends", "");
 
                 // If the last store was before the current loop, we assume this load
                 // is loop invariant. If a later instruction writes to the same location,
@@ -183,6 +211,7 @@ AliasAnalysis::analyze()
                             break;
                         if (ins->mightAlias(store)) {
                             hasAlias = true;
+                            IonSpewDependency(ins, store, "aliases", "store in loop body");
                             break;
                         }
                     }
@@ -195,15 +224,13 @@ AliasAnalysis::analyze()
                     // dependency on the last instruction of the loop header. The last instruction is a
                     // control instruction and these are never hoisted.
                     MControlInstruction *controlIns = loop_->loopHeader()->lastIns();
-                    IonSpew(IonSpew_Alias, "Load %d depends on %d (due to stores in loop body)",
-                            ins->id(), controlIns->id());
+                    IonSpewDependency(ins, controlIns, "depends", "due to stores in loop body");
                     ins->setDependency(controlIns);
                 } else {
-                    IonSpew(IonSpew_Alias, "Load %d does not depend on any stores in this loop",
-                            ins->id());
+                    IonSpewAliasInfo("Load", ins, "does not depend on any stores in this loop");
 
                     if (outerLoop && ins->dependency()->id() < outerLoop->firstInstruction()->id()) {
-                        IonSpew(IonSpew_Alias, "Load %d may be invariant in outer loop", ins->id());
+                        IonSpewAliasInfo("Load", ins, "may be invariant in outer loop");
                         if (!outerLoop->addInvariantLoad(ins))
                             return false;
                     }

From f1b0d118bc593d955b7718398ff30ea6fb1c7dc6 Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Mon, 15 Apr 2013 13:21:42 -0700
Subject: [PATCH 246/438] Bug 860667 - Pass $(DEFINES) and $(ACDEFINES) to
 embedjs.py. (r=till)

---
 js/src/Makefile.in | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 564c076d56f7..290613a002cd 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -986,16 +986,8 @@ selfhosted_out_h_deps := \
   $(srcdir)/builtin/embedjs.py \
   $(NULL)
 
-ifeq ($(MOZ_DEBUG),1)
-selfhosting_defines += -DDEBUG
-endif
-
-ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLAGS))
-selfhosting_defines += -DUSE_ZLIB
-endif
-
 selfhosted.out.h: $(selfhosted_out_h_deps)
-	$(PYTHON) $(srcdir)/builtin/embedjs.py $(selfhosting_defines) \
+	$(PYTHON) $(srcdir)/builtin/embedjs.py $(DEFINES) $(ACDEFINES) \
 	  -p '$(CPP)' -m $(srcdir)/js.msg -o $@ $(selfhosting_srcs)
 
 ###############################################

From 858b5c0c0c5f1b52dda6e9769f0371a0a996983e Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Mon, 25 Mar 2013 14:48:49 -0700
Subject: [PATCH 247/438] Bug 850841 - Fix marking of JSD2 state during minor
 GC; r=jorendorff

--HG--
extra : rebase_source : 1bd621f1ac979d2dcfca381f696aee47a726b2d1
---
 js/src/vm/Debugger.cpp | 43 ++++++++++++++++++++++++++++++++++++++++--
 js/src/vm/Debugger.h   |  8 +++++---
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index a2d6598cfb2d..1f822c2d3141 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -652,7 +652,7 @@ Debugger::wrapEnvironment(JSContext *cx, Handle<Env*> env, MutableHandleValue rv
     } else {
         /* Create a new Debugger.Environment for env. */
         JSObject *proto = &object->getReservedSlot(JSSLOT_DEBUG_ENV_PROTO).toObject();
-        envobj = NewObjectWithGivenProto(cx, &DebuggerEnv_class, proto, NULL);
+        envobj = NewObjectWithGivenProto(cx, &DebuggerEnv_class, proto, NULL, TenuredObject);
         if (!envobj)
             return false;
         envobj->setPrivateGCThing(env);
@@ -689,7 +689,7 @@ Debugger::wrapDebuggeeValue(JSContext *cx, MutableHandleValue vp)
             /* Create a new Debugger.Object for obj. */
             JSObject *proto = &object->getReservedSlot(JSSLOT_DEBUG_OBJECT_PROTO).toObject();
             JSObject *dobj =
-                NewObjectWithGivenProto(cx, &DebuggerObject_class, proto, NULL);
+                NewObjectWithGivenProto(cx, &DebuggerObject_class, proto, NULL, TenuredObject);
             if (!dobj)
                 return false;
             dobj->setPrivateGCThing(obj);
@@ -1507,6 +1507,45 @@ Debugger::markAllIteratively(GCMarker *trc)
     return markedAny;
 }
 
+/*
+ * Mark all debugger-owned GC things unconditionally. This is used by the minor
+ * GC: the minor GC cannot apply the weak constraints of the full GC because it
+ * visits only part of the heap.
+ */
+void
+Debugger::markAll(JSTracer *trc)
+{
+    JSRuntime *rt = trc->runtime;
+    for (CompartmentsIter c(rt); !c.done(); c.next()) {
+        GlobalObjectSet &debuggees = c->getDebuggees();
+        for (GlobalObjectSet::Enum e(debuggees); !e.empty(); e.popFront()) {
+            GlobalObject *global = e.front();
+
+            MarkObjectUnbarriered(trc, &global, "Global Object");
+            if (global != e.front())
+                e.rekeyFront(global);
+
+            const GlobalObject::DebuggerVector *debuggers = global->getDebuggers();
+            JS_ASSERT(debuggers);
+            for (Debugger * const *p = debuggers->begin(); p != debuggers->end(); p++) {
+                Debugger *dbg = *p;
+
+                HeapPtrObject &dbgobj = dbg->toJSObjectRef();
+                MarkObject(trc, &dbgobj, "Debugger Object");
+
+                dbg->scripts.trace(trc);
+                dbg->objects.trace(trc);
+                dbg->environments.trace(trc);
+
+                for (Breakpoint *bp = dbg->firstBreakpoint(); bp; bp = bp->nextInDebugger()) {
+                    MarkScriptUnbarriered(trc, &bp->site->script, "breakpoint script");
+                    MarkObject(trc, &bp->getHandlerRef(), "breakpoint handler");
+                }
+            }
+        }
+    }
+}
+
 void
 Debugger::traceObject(JSTracer *trc, RawObject obj)
 {
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index cda35fb0d7d8..48c759105f9e 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -388,6 +388,7 @@ class Debugger : private mozilla::LinkedListElement<Debugger>
      */
     static void markCrossCompartmentDebuggerObjectReferents(JSTracer *tracer);
     static bool markAllIteratively(GCMarker *trc);
+    static void markAll(JSTracer *trc);
     static void sweepAll(FreeOp *fop);
     static void detachAllDebuggersFromGlobal(FreeOp *fop, GlobalObject *global,
                                              GlobalObjectSet::Enum *compartmentEnum);
@@ -567,7 +568,8 @@ class Breakpoint {
     Debugger * const debugger;
     BreakpointSite * const site;
   private:
-    js::HeapPtrObject handler;
+    /* |handler| is marked unconditionally during minor GC. */
+    js::EncapsulatedPtrObject handler;
     JSCList debuggerLinks;
     JSCList siteLinks;
 
@@ -578,8 +580,8 @@ class Breakpoint {
     void destroy(FreeOp *fop);
     Breakpoint *nextInDebugger();
     Breakpoint *nextInSite();
-    const HeapPtrObject &getHandler() const { return handler; }
-    HeapPtrObject &getHandlerRef() { return handler; }
+    const EncapsulatedPtrObject &getHandler() const { return handler; }
+    EncapsulatedPtrObject &getHandlerRef() { return handler; }
 };
 
 Breakpoint *

From c94f5db02e2aa5fdf76ca935df2363dae7e3c9b6 Mon Sep 17 00:00:00 2001
From: Gregor Wagner <anygregor@gmail.com>
Date: Wed, 17 Apr 2013 07:51:51 -0400
Subject: [PATCH 248/438] Bug 861905 - Contacts API: Shortcut permission check
 in the child. r=mounir

---
 dom/contacts/ContactManager.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dom/contacts/ContactManager.js b/dom/contacts/ContactManager.js
index 830e7afd79ab..0ea900b82ae1 100644
--- a/dom/contacts/ContactManager.js
+++ b/dom/contacts/ContactManager.js
@@ -20,6 +20,10 @@ XPCOMUtils.defineLazyGetter(Services, "DOMRequest", function() {
   return Cc["@mozilla.org/dom/dom-request-service;1"].getService(Ci.nsIDOMRequestService);
 });
 
+XPCOMUtils.defineLazyServiceGetter(this, "pm",
+                                   "@mozilla.org/permissionmanager;1",
+                                   "nsIPermissionManager");
+
 XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
                                    "@mozilla.org/childprocessmessagemanager;1",
                                    "nsIMessageSender");
@@ -559,6 +563,15 @@ ContactManager.prototype = {
         access = "unknown";
       }
 
+    // Shortcut for ALLOW_ACTION so we avoid a parent roundtrip
+    let type = "contacts-" + access;
+    let permValue =
+      pm.testExactPermissionFromPrincipal(this._window.document.nodePrincipal, type);
+    if (permValue == Ci.nsIPermissionManager.ALLOW_ACTION) {
+      aAllowCallback();
+      return;
+    }
+
     let requestID = this.getRequestId({
       request: aRequest,
       allow: function() {

From 5b82a83d6b8727ae45b781b74c0006b6af6d2d82 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Wed, 27 Mar 2013 15:24:15 -0700
Subject: [PATCH 249/438] Bug 855015 - Send contacts to the child process less
 often. r=gwagner

--HG--
extra : rebase_source : e7efd60a6897811692806b06821f39864c9c91ef
---
 dom/contacts/ContactManager.js               |   5 +
 dom/contacts/fallback/ContactDB.jsm          | 112 +++++++++++++------
 dom/contacts/fallback/ContactService.jsm     |  10 +-
 dom/contacts/tests/test_contacts_getall.html |  56 ++++++----
 4 files changed, 129 insertions(+), 54 deletions(-)

diff --git a/dom/contacts/ContactManager.js b/dom/contacts/ContactManager.js
index 0ea900b82ae1..caf07bd33ce0 100644
--- a/dom/contacts/ContactManager.js
+++ b/dom/contacts/ContactManager.js
@@ -28,6 +28,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
                                    "@mozilla.org/childprocessmessagemanager;1",
                                    "nsIMessageSender");
 
+const CONTACTS_SENDMORE_MINIMUM = 5;
+
 function stringOrBust(aObj) {
   if (typeof aObj != "string") {
     if (DEBUG) debug("Field is not a string and was ignored.");
@@ -697,6 +699,9 @@ ContactManager.prototype = {
       if (DEBUG) debug("contact in cache");
       let contact = data.cachedContacts.shift();
       this.nextTick(this._fireSuccessOrDone.bind(this, data.cursor, contact));
+      if (data.cachedContacts.length < CONTACTS_SENDMORE_MINIMUM) {
+        cpmm.sendAsyncMessage("Contacts:GetAll:SendNow", { cursorId: aCursorId });
+      }
     } else {
       if (DEBUG) debug("waiting for contact");
       data.waitingForNext = true;
diff --git a/dom/contacts/fallback/ContactDB.jsm b/dom/contacts/fallback/ContactDB.jsm
index 636356b57da0..86517ebcd926 100644
--- a/dom/contacts/fallback/ContactDB.jsm
+++ b/dom/contacts/fallback/ContactDB.jsm
@@ -23,6 +23,64 @@ const DB_VERSION = 8;
 const STORE_NAME = "contacts";
 const SAVED_GETALL_STORE_NAME = "getallcache";
 const CHUNK_SIZE = 20;
+const CHUNK_INTERVAL = 500;
+
+function ContactDispatcher(aContacts, aFullContacts, aCallback, aNewTxn, aClearDispatcher) {
+  this.nextIndex = 0;
+
+  this.cancelTimeout = function() {
+    if (this.interval) {
+      clearTimeout(this.interval);
+      this.interval = null;
+    }
+  };
+
+  if (aFullContacts) {
+    this.sendChunk = function() {
+      if (aContacts.length > 0) {
+        aCallback(aContacts.splice(0, CHUNK_SIZE));
+        this.interval = setTimeout(this.sendChunk, CHUNK_INTERVAL);
+      } else {
+        aCallback(null);
+        this.cancelTimeout();
+        aClearDispatcher();
+      }
+    }.bind(this);
+  } else {
+    this.count = 0;
+    this.sendChunk = function() {
+      let chunk = [];
+      aNewTxn("readonly", STORE_NAME, function(txn, store) {
+        for (let i = this.nextIndex; i < Math.min(this.nextIndex+CHUNK_SIZE, aContacts.length); ++i) {
+          store.get(aContacts[i]).onsuccess = function(e) {
+            chunk.push(e.target.result);
+            this.count++;
+            if (this.count == aContacts.length) {
+              aCallback(chunk)
+              aCallback(null);
+              this.cancelTimeout();
+              aClearDispatcher();
+            } else if (chunk.length == CHUNK_SIZE) {
+              aCallback(chunk);
+              chunk.length = 0;
+              this.nextIndex += CHUNK_SIZE;
+              this.interval = setTimeout(this.sendChunk, CHUNK_INTERVAL);
+            }
+          }.bind(this);
+        }
+      }.bind(this));
+    }.bind(this);
+  }
+
+  this.sendChunk(0);
+}
+
+ContactDispatcher.prototype = {
+  sendNow: function() {
+    this.cancelTimeout();
+    this.interval = setTimeout(this.sendChunk, 0);
+  }
+};
 
 this.ContactDB = function ContactDB(aGlobal) {
   if (DEBUG) debug("Constructor");
@@ -32,6 +90,8 @@ this.ContactDB = function ContactDB(aGlobal) {
 ContactDB.prototype = {
   __proto__: IndexedDBHelper.prototype,
 
+  _dispatcher: {},
+
   upgradeSchema: function upgradeSchema(aTransaction, aDb, aOldVersion, aNewVersion) {
     if (DEBUG) debug("upgrade schema from: " + aOldVersion + " to " + aNewVersion + " called!");
     let db = aDb;
@@ -513,45 +573,31 @@ ContactDB.prototype = {
     }.bind(this));
   },
 
-  getAll: function CDB_getAll(aSuccessCb, aFailureCb, aOptions) {
+  sendNow: function CDB_sendNow(aCursorId) {
+    if (aCursorId in this._dispatcher) {
+      this._dispatcher[aCursorId].sendNow();
+    }
+  },
+
+  _clearDispatcher: function CDB_clearDispatcher(aCursorId) {
+    if (aCursorId in this._dispatcher) {
+      delete this._dispatcher[aCursorId];
+    }
+  },
+
+  getAll: function CDB_getAll(aSuccessCb, aFailureCb, aOptions, aCursorId) {
     if (DEBUG) debug("getAll")
     let optionStr = JSON.stringify(aOptions);
     this.getCacheForQuery(optionStr, function(aCachedResults, aFullContacts) {
       // aFullContacts is true if the cache didn't exist and had to be created.
       // In that case, we receive the full contacts since we already have them
-      // in memory to create the cache anyway. This allows us to avoid accessing
-      // the main object store again.
+      // in memory to create the cache. This allows us to avoid accessing the
+      // object store again.
       if (aCachedResults && aCachedResults.length > 0) {
-        if (DEBUG) debug("query returned " + aCachedResults.length + " contacts");
-        if (aFullContacts) {
-          if (DEBUG) debug("full contacts: " + aCachedResults.length);
-          while(aCachedResults.length) {
-            aSuccessCb(aCachedResults.splice(0, CHUNK_SIZE));
-          }
-          aSuccessCb(null);
-        } else {
-          let count = 0;
-          let sendChunk = function(start) {
-            let chunk = [];
-            this.newTxn("readonly", STORE_NAME, function(txn, store) {
-              for (let i = start; i < Math.min(start+CHUNK_SIZE, aCachedResults.length); ++i) {
-                store.get(aCachedResults[i]).onsuccess = function(e) {
-                  chunk.push(e.target.result);
-                  count++;
-                  if (count == aCachedResults.length) {
-                    aSuccessCb(chunk);
-                    aSuccessCb(null);
-                  } else if (chunk.length == CHUNK_SIZE) {
-                    aSuccessCb(chunk);
-                    chunk.length = 0;
-                    setTimeout(sendChunk.bind(this, start+CHUNK_SIZE), 0);
-                  }
-                };
-              }
-            });
-          }.bind(this);
-          sendChunk(0);
-        }
+        let newTxnFn = this.newTxn.bind(this);
+        let clearDispatcherFn = this._clearDispatcher.bind(this, aCursorId);
+        this._dispatcher[aCursorId] = new ContactDispatcher(aCachedResults, aFullContacts,
+                                                            aSuccessCb, newTxnFn, clearDispatcherFn);
       } else { // no contacts
         if (DEBUG) debug("query returned no contacts");
         aSuccessCb(null);
diff --git a/dom/contacts/fallback/ContactService.jsm b/dom/contacts/fallback/ContactService.jsm
index 14613fe83b2d..b67633d217b7 100644
--- a/dom/contacts/fallback/ContactService.jsm
+++ b/dom/contacts/fallback/ContactService.jsm
@@ -39,7 +39,8 @@ let myGlobal = this;
 let ContactService = {
   init: function() {
     if (DEBUG) debug("Init");
-    this._messages = ["Contacts:Find", "Contacts:GetAll", "Contacts:Clear", "Contact:Save",
+    this._messages = ["Contacts:Find", "Contacts:GetAll", "Contacts:GetAll:SendNow",
+                      "Contacts:Clear", "Contact:Save",
                       "Contact:Remove", "Contacts:GetSimContacts",
                       "Contacts:RegisterForMessages", "child-process-shutdown"];
     this._children = [];
@@ -116,7 +117,12 @@ let ContactService = {
             mm.sendAsyncMessage("Contacts:GetAll:Next", {cursorId: msg.cursorId, contacts: aContacts});
           },
           function(aErrorMsg) { mm.sendAsyncMessage("Contacts:Find:Return:KO", { errorMsg: aErrorMsg }); },
-          msg.findOptions);
+          msg.findOptions, msg.cursorId);
+        break;
+      case "Contacts:GetAll:SendNow":
+        // sendNow is a no op if there isn't an existing cursor in the DB, so we
+        // don't need to assert the permission again.
+        this._db.sendNow(msg.cursorId);
         break;
       case "Contact:Save":
         if (msg.options.reason === "create") {
diff --git a/dom/contacts/tests/test_contacts_getall.html b/dom/contacts/tests/test_contacts_getall.html
index 9b15d52cb901..89d7c8092ee1 100644
--- a/dom/contacts/tests/test_contacts_getall.html
+++ b/dom/contacts/tests/test_contacts_getall.html
@@ -59,8 +59,16 @@ function onFailure() {
 }
 
 function checkStr(str1, str2, msg) {
-  if (str1)
-    ok(typeof str1 == "string" ? [str1] : str1, (typeof str2 == "string") ? [str2] : str2, msg);
+  // comparing /[null(,null)+]/ and undefined should pass
+  function nonNull(e) {
+    return e != null;
+  }
+  if ((Array.isArray(str1) && str1.filter(nonNull).length == 0 && str2 == undefined)
+     ||(Array.isArray(str2) && str2.filter(nonNull).length == 0 && str1 == undefined)) {
+    ok(true, msg);
+  } else if (str1) {
+    is(JSON.stringify(typeof str1 == "string" ? [str1] : str1), JSON.stringify(typeof str2 == "string" ? [str2] : str2), msg);
+  }
 }
 
 function checkAddress(adr1, adr2) {
@@ -157,10 +165,11 @@ function clearDatabase() {
   req.onerror = onFailure;
 }
 
-function add20Contacts() {
-  ok(true, "Adding 20 contacts");
-  for (let i=0; i<19; i++) {
+function addContacts() {
+  ok(true, "Adding 40 contacts");
+  for (let i = 0; i < 39; ++i) {
     createResult1 = new mozContact();
+    properties1.familyName[0] = "Testname" + (i < 10 ? "0" + i : i);
     createResult1.init(properties1);
     req = mozContacts.save(createResult1);
     req.onsuccess = function() {
@@ -169,6 +178,7 @@ function add20Contacts() {
     req.onerror = onFailure;
   };
   createResult1 = new mozContact();
+  properties1.familyName[0] = "Testname39";
   createResult1.init(properties1);
   req = mozContacts.save(createResult1);
   req.onsuccess = function() {
@@ -216,19 +226,27 @@ let steps = [
   },
 
   clearDatabase,
-  add20Contacts,
+  addContacts,
 
   function() {
-    ok(true, "Retrieving 20 contacts with getAll");
-    req = mozContacts.getAll({});
+    ok(true, "Retrieving 40 contacts with getAll");
+    req = mozContacts.getAll({
+      sortBy: "familyName",
+      sortOrder: "ascending"
+    });
     let count = 0;
+    let result;
+    let props;
     req.onsuccess = function(event) {
       if (req.result) {
         ok(true, "result is valid");
+        result = req.result;
+        properties1.familyName[0] = "Testname" + (count < 10 ? "0" + count : count);
+        is(result.familyName[0], properties1.familyName[0], "Same familyName");
         count++;
         req.continue();
       } else {
-        is(count, 20, "last contact - 20 contacts returned");
+        is(count, 40, "last contact - 40 contacts returned");
         next();
       }
     };
@@ -253,7 +271,7 @@ let steps = [
         count++;
         req.continue();
       } else {
-        is(count, 19, "last contact - 19 contacts returned");
+        is(count, 39, "last contact - 39 contacts returned");
         next();
       }
     };
@@ -261,7 +279,7 @@ let steps = [
   },
 
   clearDatabase,
-  add20Contacts,
+  addContacts,
 
   function() {
     ok(true, "Test cache consistency when deleting contact during getAll");
@@ -288,7 +306,7 @@ let steps = [
             count++;
             req.continue();
           } else {
-            is(count, 20, "last contact - 20 contacts returned");
+            is(count, 40, "last contact - 40 contacts returned");
             next();
           }
         }
@@ -297,7 +315,7 @@ let steps = [
   },
 
   clearDatabase,
-  add20Contacts,
+  addContacts,
 
   function() {
     ok(true, "Delete the current contact while iterating");
@@ -318,14 +336,14 @@ let steps = [
           req.continue();
         };
       } else {
-        is(count, 20, "returned 20 contacts");
+        is(count, 40, "returned 40 contacts");
         next();
       }
     };
   },
 
   clearDatabase,
-  add20Contacts,
+  addContacts,
 
   function() {
     ok(true, "Iterating through the contact list inside a cursor callback");
@@ -341,7 +359,7 @@ let steps = [
             count2++;
             req2.continue();
           } else {
-            is(count2, 20, "inner cursor returned 20 contacts");
+            is(count2, 40, "inner cursor returned 40 contacts");
             req1.continue();
           }
         };
@@ -350,7 +368,7 @@ let steps = [
           count1++;
           req1.continue();
         } else {
-          is(count1, 20, "outer cursor returned 20 contacts");
+          is(count1, 40, "outer cursor returned 40 contacts");
           next();
         }
       }
@@ -358,7 +376,7 @@ let steps = [
   },
 
   clearDatabase,
-  add20Contacts,
+  addContacts,
 
   function() {
     ok(true, "20 concurrent cursors");
@@ -373,7 +391,7 @@ let steps = [
             count++;
             req.continue();
           } else {
-            is(count, 20, "cursor " + i + " returned 20 contacts");
+            is(count, 40, "cursor " + i + " returned 40 contacts");
             if (++completed == NUM_CURSORS) {
               next();
             }

From 64e918ba98014dc916f5fb81ee6cca7fd7dac818 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Fri, 29 Mar 2013 09:23:02 -0700
Subject: [PATCH 250/438] Bug 855604 - SearchCountMeasurement2 should wait for
 nsSearchService to initialize asynchronously. r=gps

---
 services/healthreport/providers.jsm           | 22 +++++++++---
 .../tests/xpcshell/test_provider_appinfo.js   |  4 ---
 services/metrics/dataprovider.jsm             | 35 ++++++++++++++-----
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/services/healthreport/providers.jsm b/services/healthreport/providers.jsm
index 70cc560ae80d..880c90136a94 100644
--- a/services/healthreport/providers.jsm
+++ b/services/healthreport/providers.jsm
@@ -189,11 +189,11 @@ AppInfoProvider.prototype = Object.freeze({
     xpcomabi: "XPCOMABI",
   },
 
-  onInit: function () {
-    return Task.spawn(this._onInit.bind(this));
+  postInit: function () {
+    return Task.spawn(this._postInit.bind(this));
   },
 
-  _onInit: function () {
+  _postInit: function () {
     let recordEmptyAppInfo = function () {
       this._setCurrentAppVersion("");
       this._setCurrentPlatformVersion("");
@@ -728,7 +728,7 @@ AddonsProvider.prototype = Object.freeze({
     AddonCountsMeasurement,
   ],
 
-  onInit: function () {
+  postInit: function () {
     let listener = {};
 
     for (let method of this.ADDON_LISTENER_CALLBACKS) {
@@ -1196,7 +1196,7 @@ SearchCountMeasurement2.prototype = Object.freeze({
    * data.
    */
   shouldIncludeField: function (name) {
-    return name.indexOf(".") != -1;
+    return name.contains(".");
   },
 
   /**
@@ -1328,6 +1328,18 @@ this.SearchesProvider.prototype = Object.freeze({
     SearchCountMeasurement2,
   ],
 
+  /**
+   * Initialize the search service before our measurements are touched.
+   */
+  preInit: function (storage) {
+    // Initialize search service.
+    let deferred = Promise.defer();
+    Services.search.init(function onInitComplete () {
+      deferred.resolve();
+    });
+    return deferred.promise;
+  },
+
   /**
    * Record that a search occurred.
    *
diff --git a/services/healthreport/tests/xpcshell/test_provider_appinfo.js b/services/healthreport/tests/xpcshell/test_provider_appinfo.js
index 5cdfe4b42ab9..ae9555f1415b 100644
--- a/services/healthreport/tests/xpcshell/test_provider_appinfo.js
+++ b/services/healthreport/tests/xpcshell/test_provider_appinfo.js
@@ -170,7 +170,6 @@ add_task(function test_record_telemetry() {
   setTelemetry(true);
   provider = new AppInfoProvider();
   yield provider.init(storage);
-  yield provider.onInit();
   yield provider.collectConstantData();
 
   let m = provider.getMeasurement("appinfo", 2);
@@ -182,7 +181,6 @@ add_task(function test_record_telemetry() {
   setTelemetry(false);
   provider = new AppInfoProvider();
   yield provider.init(storage);
-  yield provider.onInit();
   yield provider.collectConstantData();
 
   m = provider.getMeasurement("appinfo", 2);
@@ -202,7 +200,6 @@ add_task(function test_record_blocklist() {
   Services.prefs.setBoolPref("extensions.blocklist.enabled", true);
   let provider = new AppInfoProvider();
   yield provider.init(storage);
-  yield provider.onInit();
   yield provider.collectConstantData();
 
   let m = provider.getMeasurement("appinfo", 2);
@@ -214,7 +211,6 @@ add_task(function test_record_blocklist() {
   Services.prefs.setBoolPref("extensions.blocklist.enabled", false);
   provider = new AppInfoProvider();
   yield provider.init(storage);
-  yield provider.onInit();
   yield provider.collectConstantData();
 
   m = provider.getMeasurement("appinfo", 2);
diff --git a/services/metrics/dataprovider.jsm b/services/metrics/dataprovider.jsm
index 0d1e4afab2b5..645c7b535afa 100644
--- a/services/metrics/dataprovider.jsm
+++ b/services/metrics/dataprovider.jsm
@@ -556,6 +556,12 @@ Provider.prototype = Object.freeze({
 
     let self = this;
     return Task.spawn(function init() {
+      let pre = self.preInit();
+      if (!pre || typeof(pre.then) != "function") {
+        throw new Error("preInit() does not return a promise.");
+      }
+      yield pre;
+
       for (let measurementType of self.measurementTypes) {
         let measurement = new measurementType();
 
@@ -573,13 +579,11 @@ Provider.prototype = Object.freeze({
                               measurement);
       }
 
-      let promise = self.onInit();
-
-      if (!promise || typeof(promise.then) != "function") {
-        throw new Error("onInit() does not return a promise.");
+      let post = self.postInit();
+      if (!post || typeof(post.then) != "function") {
+        throw new Error("postInit() does not return a promise.");
       }
-
-      yield promise;
+      yield post;
     });
   },
 
@@ -594,7 +598,22 @@ Provider.prototype = Object.freeze({
   },
 
   /**
-   * Hook point for implementations to perform initialization activity.
+   * Hook point for implementations to perform pre-initialization activity.
+   *
+   * This method will be called before measurement registration.
+   *
+   * Implementations should return a promise which is resolved when
+   * initialization activities have completed.
+   */
+  preInit: function () {
+    return CommonUtils.laterTickResolvingPromise();
+  },
+
+  /**
+   * Hook point for implementations to perform post-initialization activity.
+   *
+   * This method will be called after `preInit` and measurement registration,
+   * but before initialization is finished.
    *
    * If a `Provider` instance needs to register observers, etc, it should
    * implement this function.
@@ -602,7 +621,7 @@ Provider.prototype = Object.freeze({
    * Implementations should return a promise which is resolved when
    * initialization activities have completed.
    */
-  onInit: function () {
+  postInit: function () {
     return CommonUtils.laterTickResolvingPromise();
   },
 

From f94ab98347e897948afa369c2565433af08779ce Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Fri, 29 Mar 2013 12:17:14 -0700
Subject: [PATCH 251/438] Bug 841554 - Follow-up: fix browser_aboutHome.js.
 r=gps

---
 browser/base/content/test/browser_aboutHome.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js
index 1020c1e8a5aa..589b151a2b7f 100644
--- a/browser/base/content/test/browser_aboutHome.js
+++ b/browser/base/content/test/browser_aboutHome.js
@@ -137,15 +137,16 @@ let gTests = [
         let provider = reporter.getProvider("org.mozilla.searches");
         ok(provider, "Searches provider is available.");
 
-        let engineName = doc.documentElement.getAttribute("searchEngineName").toLowerCase();
+        let engineName = doc.documentElement.getAttribute("searchEngineName");
+        let id = Services.search.getEngineByName(engineName).identifier;
 
-        let m = provider.getMeasurement("counts", 1);
+        let m = provider.getMeasurement("counts", 2);
         m.getValues().then(function onValues(data) {
           let now = new Date();
           ok(data.days.hasDay(now), "Have data for today.");
 
           let day = data.days.getDay(now);
-          let field = engineName + ".abouthome";
+          let field = id + ".abouthome";
           ok(day.has(field), "Have data for about home on this engine.");
 
           // Note the search from the previous test.

From ec2f166cebed8e88a41d374dd4b4708b1cf244e7 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Thu, 18 Apr 2013 12:42:08 +1200
Subject: [PATCH 252/438] Bug 837335 - Don't build an nsDisplayTransform for
 nsSVGPathGeometryFrame if the transform is only a translation. r=jwatt

---
 layout/svg/nsSVGPathGeometryFrame.cpp | 30 +++++++++++++++++++++++----
 layout/svg/nsSVGPathGeometryFrame.h   |  2 ++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/layout/svg/nsSVGPathGeometryFrame.cpp b/layout/svg/nsSVGPathGeometryFrame.cpp
index f85718e9128a..119f621ce3ce 100644
--- a/layout/svg/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/nsSVGPathGeometryFrame.cpp
@@ -156,15 +156,35 @@ nsSVGPathGeometryFrame::IsSVGTransformed(gfxMatrix *aOwnTransform,
     content->GetAnimatedTransformList();
   if ((transformList && transformList->HasTransform()) ||
       content->GetAnimateMotionTransform()) {
-    if (aOwnTransform) {
-      *aOwnTransform = content->PrependLocalTransformsTo(gfxMatrix(),
-                                  nsSVGElement::eUserSpaceToParent);
+    gfxMatrix temp = content->PrependLocalTransformsTo(gfxMatrix(),
+                       nsSVGElement::eUserSpaceToParent);
+    if (temp.HasNonTranslation()) {
+      if (aOwnTransform) {
+        *aOwnTransform = temp;
+      }
+      foundTransform = true;
     }
-    foundTransform = true;
   }
   return foundTransform;
 }
 
+gfxPoint
+nsSVGPathGeometryFrame::GetOwnTransformIfOnlyTranslation() const
+{
+  nsSVGElement *content = static_cast<nsSVGElement*>(mContent);
+  if (!content->GetAnimatedTransformList() &&
+      !content->GetAnimateMotionTransform()) {
+    return gfxPoint();
+  }
+
+  gfxMatrix temp = content->PrependLocalTransformsTo(gfxMatrix(),
+                    nsSVGElement::eUserSpaceToParent);
+  if (temp.HasNonTranslation()) {
+    return gfxPoint();
+  }
+  return temp.GetTranslation();
+}
+
 void
 nsSVGPathGeometryFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                                          const nsRect&           aDirtyRect,
@@ -614,6 +634,8 @@ nsSVGPathGeometryFrame::GeneratePath(gfxContext* aContext,
     aContext->SetLineCap(gfxContext::LINE_CAP_SQUARE);
   }
 
+  gfxContextMatrixAutoSaveRestore save(aContext);
+  aContext->Translate(GetOwnTransformIfOnlyTranslation());
   aContext->NewPath();
   static_cast<nsSVGPathGeometryElement*>(mContent)->ConstructPath(aContext);
 }
diff --git a/layout/svg/nsSVGPathGeometryFrame.h b/layout/svg/nsSVGPathGeometryFrame.h
index 3224a4e120ec..9ee4491a9fde 100644
--- a/layout/svg/nsSVGPathGeometryFrame.h
+++ b/layout/svg/nsSVGPathGeometryFrame.h
@@ -97,6 +97,8 @@ protected:
 protected:
   void GeneratePath(gfxContext *aContext, const gfxMatrix &aTransform);
 
+  gfxPoint GetOwnTransformIfOnlyTranslation() const;
+
 private:
   enum { eRenderFill = 1, eRenderStroke = 2 };
   void Render(nsRenderingContext *aContext, uint32_t aRenderComponents);

From 4b9c22e2f61e214c347bc3f9aef8ff5fa45c1071 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Thu, 18 Apr 2013 14:21:25 +1200
Subject: [PATCH 253/438] Backout d6b34be6fb4c for causing reftest failures on
 a CLOSED TREE

---
 layout/svg/nsSVGPathGeometryFrame.cpp | 30 ++++-----------------------
 layout/svg/nsSVGPathGeometryFrame.h   |  2 --
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/layout/svg/nsSVGPathGeometryFrame.cpp b/layout/svg/nsSVGPathGeometryFrame.cpp
index 119f621ce3ce..f85718e9128a 100644
--- a/layout/svg/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/nsSVGPathGeometryFrame.cpp
@@ -156,35 +156,15 @@ nsSVGPathGeometryFrame::IsSVGTransformed(gfxMatrix *aOwnTransform,
     content->GetAnimatedTransformList();
   if ((transformList && transformList->HasTransform()) ||
       content->GetAnimateMotionTransform()) {
-    gfxMatrix temp = content->PrependLocalTransformsTo(gfxMatrix(),
-                       nsSVGElement::eUserSpaceToParent);
-    if (temp.HasNonTranslation()) {
-      if (aOwnTransform) {
-        *aOwnTransform = temp;
-      }
-      foundTransform = true;
+    if (aOwnTransform) {
+      *aOwnTransform = content->PrependLocalTransformsTo(gfxMatrix(),
+                                  nsSVGElement::eUserSpaceToParent);
     }
+    foundTransform = true;
   }
   return foundTransform;
 }
 
-gfxPoint
-nsSVGPathGeometryFrame::GetOwnTransformIfOnlyTranslation() const
-{
-  nsSVGElement *content = static_cast<nsSVGElement*>(mContent);
-  if (!content->GetAnimatedTransformList() &&
-      !content->GetAnimateMotionTransform()) {
-    return gfxPoint();
-  }
-
-  gfxMatrix temp = content->PrependLocalTransformsTo(gfxMatrix(),
-                    nsSVGElement::eUserSpaceToParent);
-  if (temp.HasNonTranslation()) {
-    return gfxPoint();
-  }
-  return temp.GetTranslation();
-}
-
 void
 nsSVGPathGeometryFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                                          const nsRect&           aDirtyRect,
@@ -634,8 +614,6 @@ nsSVGPathGeometryFrame::GeneratePath(gfxContext* aContext,
     aContext->SetLineCap(gfxContext::LINE_CAP_SQUARE);
   }
 
-  gfxContextMatrixAutoSaveRestore save(aContext);
-  aContext->Translate(GetOwnTransformIfOnlyTranslation());
   aContext->NewPath();
   static_cast<nsSVGPathGeometryElement*>(mContent)->ConstructPath(aContext);
 }
diff --git a/layout/svg/nsSVGPathGeometryFrame.h b/layout/svg/nsSVGPathGeometryFrame.h
index 9ee4491a9fde..3224a4e120ec 100644
--- a/layout/svg/nsSVGPathGeometryFrame.h
+++ b/layout/svg/nsSVGPathGeometryFrame.h
@@ -97,8 +97,6 @@ protected:
 protected:
   void GeneratePath(gfxContext *aContext, const gfxMatrix &aTransform);
 
-  gfxPoint GetOwnTransformIfOnlyTranslation() const;
-
 private:
   enum { eRenderFill = 1, eRenderStroke = 2 };
   void Render(nsRenderingContext *aContext, uint32_t aRenderComponents);

From 144880157bc6f0dcb1407bd583d447424f7f30d2 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 17 Apr 2013 09:13:49 -0700
Subject: [PATCH 254/438] Bug 858340 - Domain autocompletion for Fennec.
 r=jchen

---
 mobile/android/base/AwesomeBar.java           | 113 +++++++++++++-----
 mobile/android/base/AwesomeBarTabs.java       |   6 +-
 .../android/base/awesomebar/AllPagesTab.java  |  65 +++++++++-
 mobile/android/base/util/StringUtils.java     |  22 ++++
 4 files changed, 172 insertions(+), 34 deletions(-)

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index ecebc736e617..79f5ef3b3463 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -46,7 +46,13 @@ import android.widget.Toast;
 
 import java.net.URLEncoder;
 
-public class AwesomeBar extends GeckoActivity {
+interface AutocompleteHandler {
+    void onAutocomplete(String res);
+}
+
+public class AwesomeBar extends GeckoActivity
+                        implements AutocompleteHandler,
+                                   TextWatcher {
     private static final String LOGTAG = "GeckoAwesomeBar";
 
     public static final String URL_KEY = "url";
@@ -65,6 +71,10 @@ public class AwesomeBar extends GeckoActivity {
     private ContextMenuSubject mContextMenuSubject;
     private boolean mIsUsingGestureKeyboard;
     private boolean mDelayRestartInput;
+    // The previous autocomplete result returned to us
+    private String mAutoCompleteResult = "";
+    // The user typed part of the autocomplete result
+    private String mAutoCompletePrefix = null;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -168,35 +178,7 @@ public class AwesomeBar extends GeckoActivity {
             }
         });
 
-        mText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable s) {
-                String text = s.toString();
-                mAwesomeTabs.filter(text);
-
-                // If the AwesomeBar has a composition string, don't call updateGoButton().
-                // That method resets IME and composition state will be broken.
-                if (!hasCompositionString(s)) {
-                    updateGoButton(text);
-                }
-
-                if (Build.VERSION.SDK_INT >= 11) {
-                    getActionBar().hide();
-                }
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count,
-                                          int after) {
-                // do nothing
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before,
-                                      int count) {
-                // do nothing
-            }
-        });
+        mText.addTextChangedListener(this);
 
         mText.setOnKeyListener(new View.OnKeyListener() {
             @Override
@@ -727,4 +709,75 @@ public class AwesomeBar extends GeckoActivity {
         }
         return false;
     }
+
+    // return early if we're backspacing through the string, or have no autocomplete results
+    public void onAutocomplete(final String result) {
+        final String text = mText.getText().toString();
+
+        if (result == null) {
+            mAutoCompleteResult = "";
+            return;
+        }
+
+        if (!result.startsWith(text) || text.equals(result)) {
+            return;
+        }
+
+        mAutoCompleteResult = result;
+        mText.getText().append(result.substring(text.length()));
+        mText.setSelection(text.length(), result.length());
+    }
+
+    @Override
+    public void afterTextChanged(final Editable s) {
+        final String text = s.toString();
+        boolean useHandler = false;
+        boolean reuseAutocomplete = false;
+        if (!hasCompositionString(s) && !StringUtils.isSearchQuery(text, false)) {
+            useHandler = true;
+
+            // If you're hitting backspace (the string is getting smaller
+            // or is unchanged), don't autocomplete.
+            if (mAutoCompletePrefix != null && (mAutoCompletePrefix.length() >= text.length())) {
+                useHandler = false;
+            } else if (mAutoCompleteResult != null && mAutoCompleteResult.startsWith(text)) {
+                // If this text already matches our autocomplete text, autocomplete likely
+                // won't change. Just reuse the old autocomplete value.
+                useHandler = false;
+                reuseAutocomplete = true;
+            }
+        }
+
+        // If this is the autocomplete text being set, don't run the filter.
+        if (mAutoCompleteResult == null || !mAutoCompleteResult.equals(text)) {
+            mAwesomeTabs.filter(text, useHandler ? this : null);
+            mAutoCompletePrefix = text;
+
+            if (reuseAutocomplete) {
+                onAutocomplete(mAutoCompleteResult);
+            }
+        }
+
+        // If the AwesomeBar has a composition string, don't call updateGoButton().
+        // That method resets IME and composition state will be broken.
+        if (!hasCompositionString(s)) {
+            updateGoButton(text);
+        }
+
+        if (Build.VERSION.SDK_INT >= 11) {
+            getActionBar().hide();
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count,
+                                  int after) {
+        // do nothing
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before,
+                              int count) {
+        // do nothing
+    }
 }
diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java
index 4dd8a7bcae7f..a7b6d1b7dbbb 100644
--- a/mobile/android/base/AwesomeBarTabs.java
+++ b/mobile/android/base/AwesomeBarTabs.java
@@ -173,7 +173,7 @@ public class AwesomeBarTabs extends TabHost
         }
 
         // Initialize "All Pages" list with no filter
-        filter("");
+        filter("", null);
     }
 
     @Override
@@ -308,7 +308,7 @@ public class AwesomeBarTabs extends TabHost
         return (HistoryTab)getAwesomeBarTabForTag("history");
     }
 
-    public void filter(String searchTerm) {
+    public void filter(String searchTerm, AutocompleteHandler handler) {
 
         // If searching, disable left / right tab swipes
         mSearching = searchTerm.length() != 0;
@@ -322,7 +322,7 @@ public class AwesomeBarTabs extends TabHost
         styleSelectedTab();
 
         // Perform the actual search
-        allPages.filter(searchTerm);
+        allPages.filter(searchTerm, handler);
 
         // If searching, hide the tabs bar
         findViewById(R.id.tab_widget_container).setVisibility(mSearching ? View.GONE : View.VISIBLE);
diff --git a/mobile/android/base/awesomebar/AllPagesTab.java b/mobile/android/base/awesomebar/AllPagesTab.java
index 3e49fb01c48d..c0ac2061e2ae 100644
--- a/mobile/android/base/awesomebar/AllPagesTab.java
+++ b/mobile/android/base/awesomebar/AllPagesTab.java
@@ -25,6 +25,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Message;
@@ -63,6 +64,8 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
     private static final int SUGGESTION_TIMEOUT = 3000;
     private static final int SUGGESTION_MAX = 3;
     private static final int ANIMATION_DURATION = 250;
+    // The maximum number of rows deep in a search we'll dig for an autocomplete result
+    private static final int MAX_AUTOCOMPLETE_SEARCH = 20;
 
     private String mSearchTerm;
     private ArrayList<SearchEngine> mSearchEngines;
@@ -76,6 +79,7 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
     private View mSuggestionsOptInPrompt;
     private Handler mHandler;
     private ListView mListView;
+    private volatile AutocompleteHandler mAutocompleteHandler = null;
 
     private static final int MESSAGE_LOAD_FAVICONS = 1;
     private static final int MESSAGE_UPDATE_FAVICONS = 2;
@@ -169,7 +173,9 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
         }
     }
 
-    public void filter(String searchTerm) {
+    public void filter(String searchTerm, AutocompleteHandler handler) {
+        mAutocompleteHandler = handler;
+
         AwesomeBarCursorAdapter adapter = getCursorAdapter();
         adapter.filter(searchTerm);
 
@@ -182,6 +188,61 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
         }
     }
 
+    private void findAutocompleteFor(String searchTerm, Cursor cursor) {
+        if (TextUtils.isEmpty(searchTerm) || cursor == null || mAutocompleteHandler == null)
+            return;
+
+        // avoid searching the path if we don't have to. Currently just decided by if there is
+        // a '/' character in the string
+        final String res = searchHosts(searchTerm, cursor, searchTerm.indexOf("/") > 0);
+
+        if (res != null) {
+            ThreadUtils.postToUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    // Its possible that mAutocompleteHandler has been destroyed
+                    if (mAutocompleteHandler != null) {
+                        mAutocompleteHandler.onAutocomplete(res);
+                        mAutocompleteHandler = null;
+                    }
+                }
+            });
+        }
+    }
+
+    private String searchHosts(String searchTerm, Cursor cursor, boolean searchPath) {
+        int i = 0;
+        if (cursor.moveToFirst()) {
+            int urlIndex = cursor.getColumnIndexOrThrow(URLColumns.URL);
+            do {
+                final Uri url = Uri.parse(cursor.getString(urlIndex));
+                String host = StringUtils.stripCommonSubdomains(url.getHost());
+                // host may be null for about pages
+                if (host == null)
+                    continue;
+
+                StringBuilder hostBuilder = new StringBuilder(host);
+               if (hostBuilder.indexOf(searchTerm) == 0) {
+                    return hostBuilder.append("/").toString();
+                }
+
+                if (searchPath) {
+                    List<String> path = url.getPathSegments();
+
+                    for (String seg : path) {
+                        hostBuilder.append("/").append(seg);
+                        if (hostBuilder.indexOf(searchTerm) == 0) {
+                            return hostBuilder.append("/").toString();
+                        }
+                    }
+                }
+
+                i++;
+            } while (i < MAX_AUTOCOMPLETE_SEARCH && cursor.moveToNext());
+        }
+        return null;
+    }
+
     /**
      * Query for suggestions, but don't show them yet.
      */
@@ -237,6 +298,8 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
                         Telemetry.HistogramAdd("FENNEC_AWESOMEBAR_ALLPAGES_EMPTY_TIME", time);
                         mTelemetrySent = true;
                     }
+
+                    findAutocompleteFor(constraint.toString(), c);
                     return c;
                 }
             });
diff --git a/mobile/android/base/util/StringUtils.java b/mobile/android/base/util/StringUtils.java
index 96b412121e07..1c2b1f3aaa9f 100644
--- a/mobile/android/base/util/StringUtils.java
+++ b/mobile/android/base/util/StringUtils.java
@@ -44,4 +44,26 @@ public class StringUtils {
         // Otherwise, text is ambiguous, and we keep its status unchanged
         return wasSearchQuery;
     }
+
+    public static String stripScheme(String url) {
+        if (url == null)
+            return url;
+
+        if (url.startsWith("http://")) {
+            return url.substring(7);
+        }
+        return url;
+    }
+
+    public static String stripCommonSubdomains(String host) {
+        if (host == null)
+            return host;
+        // In contrast to desktop, we also strip mobile subdomains,
+        // since its unlikely users are intentionally typing them
+        if (host.startsWith("www.")) return host.substring(4);
+        else if (host.startsWith("mobile.")) return host.substring(7);
+        else if (host.startsWith("m.")) return host.substring(2);
+        return host;
+    }
+
 }

From 3fa3e4a95c6bfcd44974e5df5e961f6c1fa5cdac Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Thu, 18 Apr 2013 16:38:14 +1200
Subject: [PATCH 255/438] Bug 852915 - Disable MP3 playback using WMF on
 Win7SP0 to prevent random crashes. r=bbondy

---
 content/media/wmf/WMFDecoder.cpp | 29 ++++++++++++++++++++++++---
 content/media/wmf/WMFDecoder.h   |  4 ++++
 content/media/wmf/WMFReader.cpp  | 34 ++++++++++++++++++++++++++------
 widget/windows/WinUtils.cpp      | 17 ++++++++++++++++
 widget/windows/WinUtils.h        |  4 ++++
 5 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/content/media/wmf/WMFDecoder.cpp b/content/media/wmf/WMFDecoder.cpp
index 2cc08433e253..9674b430cacc 100644
--- a/content/media/wmf/WMFDecoder.cpp
+++ b/content/media/wmf/WMFDecoder.cpp
@@ -21,6 +21,27 @@ MediaDecoderStateMachine* WMFDecoder::CreateStateMachine()
   return new MediaDecoderStateMachine(this, new WMFReader(this));
 }
 
+/* static */
+bool
+WMFDecoder::IsMP3Supported()
+{
+  if (!MediaDecoder::IsWMFEnabled()) {
+    return false;
+  }
+  if (WinUtils::GetWindowsVersion() != WinUtils::WIN7_VERSION) {
+    return true;
+  }
+  // We're on Windows 7. MP3 support is disabled if no service pack
+  // is installed, as it's crashy on Win7 SP0.
+  UINT spMajorVer = 0, spMinorVer = 0;
+  if (!WinUtils::GetWindowsServicePackVersion(spMajorVer, spMinorVer)) {
+    // Um... We can't determine the service pack version... Just block
+    // MP3 as a precaution...
+    return false;
+  }
+  return spMajorVer != 0;
+}
+
 bool
 WMFDecoder::GetSupportedCodecs(const nsACString& aType,
                                char const *const ** aCodecList)
@@ -30,13 +51,15 @@ WMFDecoder::GetSupportedCodecs(const nsACString& aType,
     return false;
 
   // Assume that if LoadDLLs() didn't fail, we can playback the types that
-  // we know should be supported on Windows 7+ using WMF.
+  // we know should be supported by Windows Media Foundation.
   static char const *const mp3AudioCodecs[] = {
     "mp3",
     nullptr
   };
-  if (aType.EqualsASCII("audio/mpeg") ||
-      aType.EqualsASCII("audio/mp3")) {
+  if ((aType.EqualsASCII("audio/mpeg") || aType.EqualsASCII("audio/mp3")) &&
+      IsMP3Supported()) {
+    // Note: We block MP3 playback on Window 7 SP0 since it seems to crash
+    // in some circumstances.
     if (aCodecList) {
       *aCodecList = mp3AudioCodecs;
     }
diff --git a/content/media/wmf/WMFDecoder.h b/content/media/wmf/WMFDecoder.h
index 87a3fb4ac462..3847b67b0ff0 100644
--- a/content/media/wmf/WMFDecoder.h
+++ b/content/media/wmf/WMFDecoder.h
@@ -42,6 +42,10 @@ public:
   // Returns true if the WMF backend is preffed on, and we're running on a
   // version of Windows which is likely to support WMF.
   static bool IsEnabled();
+
+  // Returns true if MP3 decoding is enabled on this system. We block
+  // MP3 playback on Windows 7 SP0, since it's crashy on that platform.
+  static bool IsMP3Supported();
 };
 
 } // namespace mozilla
diff --git a/content/media/wmf/WMFReader.cpp b/content/media/wmf/WMFReader.cpp
index b9317a2ea021..8b112ef5685e 100644
--- a/content/media/wmf/WMFReader.cpp
+++ b/content/media/wmf/WMFReader.cpp
@@ -388,6 +388,28 @@ WMFReader::ConfigureVideoDecoder()
   return S_OK;
 }
 
+static void
+GetSupportedAudioCodecs(const GUID** aCodecs, uint32_t* aNumCodecs)
+{
+  MOZ_ASSERT(aCodecs);
+  MOZ_ASSERT(aNumCodecs);
+
+  if (WMFDecoder::IsMP3Supported()) {
+    static const GUID codecs[] = {
+      MFAudioFormat_AAC,
+      MFAudioFormat_MP3
+    };
+    *aCodecs = codecs;
+    *aNumCodecs = NS_ARRAY_LENGTH(codecs);
+  } else {
+    static const GUID codecs[] = {
+      MFAudioFormat_AAC
+    };
+    *aCodecs = codecs;
+    *aNumCodecs = NS_ARRAY_LENGTH(codecs);
+  }
+}
+
 HRESULT
 WMFReader::ConfigureAudioDecoder()
 {
@@ -399,15 +421,15 @@ WMFReader::ConfigureAudioDecoder()
     return S_OK;
   }
 
-  static const GUID MP4AudioTypes[] = {
-    MFAudioFormat_AAC,
-    MFAudioFormat_MP3
-  };
+  const GUID* codecs;
+  uint32_t numCodecs = 0;
+  GetSupportedAudioCodecs(&codecs, &numCodecs);
+
   HRESULT hr = ConfigureSourceReaderStream(mSourceReader,
                                            MF_SOURCE_READER_FIRST_AUDIO_STREAM,
                                            MFAudioFormat_Float,
-                                           MP4AudioTypes,
-                                           NS_ARRAY_LENGTH(MP4AudioTypes));
+                                           codecs,
+                                           numCodecs);
   if (FAILED(hr)) {
     NS_WARNING("Failed to configure WMF Audio decoder for PCM output");
     return hr;
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index 98ac5009ae2d..42f83026cf47 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -73,6 +73,23 @@ WinUtils::GetWindowsVersion()
   return static_cast<WinVersion>(version);
 }
 
+/* static */
+bool
+WinUtils::GetWindowsServicePackVersion(UINT& aOutMajor, UINT& aOutMinor)
+{
+  OSVERSIONINFOEX osInfo;
+  osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+  // This cast is safe and supposed to be here, don't worry
+  if (!::GetVersionEx((OSVERSIONINFO*)&osInfo)) {
+    return false;
+  }
+  
+  aOutMajor = osInfo.wServicePackMajor;
+  aOutMinor = osInfo.wServicePackMinor;
+
+  return true;
+}
+
 /* static */
 bool
 WinUtils::PeekMessage(LPMSG aMsg, HWND aWnd, UINT aFirstMessage,
diff --git a/widget/windows/WinUtils.h b/widget/windows/WinUtils.h
index 27c9aec7dd5e..b244cfe7b9d2 100644
--- a/widget/windows/WinUtils.h
+++ b/widget/windows/WinUtils.h
@@ -49,6 +49,10 @@ public:
   };
   static WinVersion GetWindowsVersion();
 
+  // Retrieves the Service Pack version number.
+  // Returns true on success, false on failure.
+  static bool GetWindowsServicePackVersion(UINT& aOutMajor, UINT& aOutMinor);
+
   /**
    * PeekMessage() and GetMessage() are wrapper methods for PeekMessageW(),
    * GetMessageW(), ITfMessageMgr::PeekMessageW() and

From 4664b7f932e522121499fbd56476f07f60396b56 Mon Sep 17 00:00:00 2001
From: James Willcox <snorp@snorp.net>
Date: Fri, 29 Mar 2013 15:34:49 -0400
Subject: [PATCH 256/438] Bug 734691 - Add multi-thread support to profiler
 r=benwa

--HG--
extra : rebase_source : b9ecaa62430dc4f04a2d00a742c4b2d30e479bb5
---
 dom/workers/RuntimeService.cpp     |   5 ++
 ipc/chromium/src/base/thread.cc    |   5 ++
 tools/profiler/BreakpadSampler.cpp |  15 ++--
 tools/profiler/GeckoProfiler.h     |   3 +
 tools/profiler/GeckoProfilerFunc.h |   4 ++
 tools/profiler/GeckoProfilerImpl.h |  13 ++++
 tools/profiler/ProfileEntry.cpp    |  10 ++-
 tools/profiler/ProfileEntry.h      |  11 ++-
 tools/profiler/TableTicker.cpp     |  54 ++++++++------
 tools/profiler/TableTicker.h       |  62 ++++++++++++++--
 tools/profiler/platform-linux.cc   | 110 ++++++++++++++++++++++-------
 tools/profiler/platform-macos.cc   |  39 ++++++++--
 tools/profiler/platform-win32.cc   |  40 +++++++++--
 tools/profiler/platform.cpp        |  31 +++++++-
 tools/profiler/platform.h          |  66 ++++++++++++++++-
 15 files changed, 400 insertions(+), 68 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 070f739dce2d..fdfd21a2f0f2 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -42,6 +42,8 @@
 #include "OSFileConstants.h"
 #include <algorithm>
 
+#include "GeckoProfiler.h"
+
 using namespace mozilla;
 using namespace mozilla::dom;
 
@@ -515,6 +517,8 @@ public:
       return NS_ERROR_FAILURE;
     }
 
+    profiler_register_thread("WebWorker");
+
     {
       JSAutoRequest ar(cx);
       workerPrivate->DoRunLoop(cx);
@@ -543,6 +547,7 @@ public:
     JS_DestroyRuntime(rt);
 
     workerPrivate->ScheduleDeletion(false);
+    profiler_unregister_thread();
     return NS_OK;
   }
 };
diff --git a/ipc/chromium/src/base/thread.cc b/ipc/chromium/src/base/thread.cc
index f447fbb201eb..31ec62832ec3 100644
--- a/ipc/chromium/src/base/thread.cc
+++ b/ipc/chromium/src/base/thread.cc
@@ -8,6 +8,7 @@
 #include "base/string_util.h"
 #include "base/thread_local.h"
 #include "base/waitable_event.h"
+#include "GeckoProfiler.h"
 
 namespace base {
 
@@ -136,6 +137,8 @@ void Thread::StopSoon() {
 }
 
 void Thread::ThreadMain() {
+  profiler_register_thread(name_.c_str());
+
   // The message loop for this thread.
   MessageLoop message_loop(startup_data_->options.message_loop_type);
 
@@ -161,6 +164,8 @@ void Thread::ThreadMain() {
   // Assert that MessageLoop::Quit was called by ThreadQuitTask.
   DCHECK(GetThreadWasQuitProperly());
 
+  profiler_unregister_thread();
+
   // We can't receive messages anymore.
   message_loop_ = NULL;
   thread_id_ = 0;
diff --git a/tools/profiler/BreakpadSampler.cpp b/tools/profiler/BreakpadSampler.cpp
index bc804e3627f5..d30a55b6ea2f 100644
--- a/tools/profiler/BreakpadSampler.cpp
+++ b/tools/profiler/BreakpadSampler.cpp
@@ -158,6 +158,13 @@ void genPseudoBacktraceEntries(/*MODIFIED*/UnwinderThreadBuffer* utb,
 // RUNS IN SIGHANDLER CONTEXT
 void BreakpadSampler::Tick(TickSample* sample)
 {
+  if (!sample->threadProfile) {
+    // Platform doesn't support multithread, so use the main thread profile we created
+    sample->threadProfile = GetPrimaryThreadProfile();
+  }
+
+  ThreadProfile& currThreadProfile = *sample->threadProfile;
+
   /* Get hold of an empty inter-thread buffer into which to park
      the ProfileEntries for this sample. */
   UnwinderThreadBuffer* utb = uwt__acquire_empty_buffer();
@@ -172,7 +179,7 @@ void BreakpadSampler::Tick(TickSample* sample)
      thread, and park them in |utb|. */
 
   // Marker(s) come before the sample
-  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
+  PseudoStack* stack = currThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
     utb__addEntry( utb, ProfileEntry('m', stack->getMarker(i)) );
   }
@@ -186,7 +193,7 @@ void BreakpadSampler::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      mPrimaryThreadProfile.erase();
+      currThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -293,9 +300,9 @@ void BreakpadSampler::Tick(TickSample* sample)
 #   else
 #     error "Unsupported platform"
 #   endif
-    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, ucV);
+    uwt__release_full_buffer(&currThreadProfile, utb, ucV);
   } else {
-    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, NULL);
+    uwt__release_full_buffer(&currThreadProfile, utb, NULL);
   }
 }
 
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 4c8e2b5452c8..9105f0470ecb 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -135,6 +135,9 @@ static inline void profiler_lock() {}
 // Re-enable the profiler and notify 'profiler-unlocked'.
 static inline void profiler_unlock() {}
 
+static inline void profiler_register_thread(const char* name) {}
+static inline void profiler_unregister_thread() {}
+
 #else
 
 #include "GeckoProfilerImpl.h"
diff --git a/tools/profiler/GeckoProfilerFunc.h b/tools/profiler/GeckoProfilerFunc.h
index 2c26d8eb8a92..41134bfb5ce7 100644
--- a/tools/profiler/GeckoProfilerFunc.h
+++ b/tools/profiler/GeckoProfilerFunc.h
@@ -57,6 +57,10 @@ void mozilla_sampler_lock();
 // Unlock the profiler, leaving it stopped and fires profiler-unlocked.
 void mozilla_sampler_unlock();
 
+// Register/unregister threads with the profiler
+bool mozilla_sampler_register_thread(const char* name);
+void mozilla_sampler_unregister_thread();
+
 /* Returns true if env var SPS_NEW is set to anything, else false. */
 extern bool sps_version2();
 
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index 917bd04173f7..65a60e2db615 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -140,6 +140,18 @@ void profiler_unlock()
   return mozilla_sampler_unlock();
 }
 
+static inline
+void profiler_register_thread(const char* name)
+{
+  mozilla_sampler_register_thread(name);
+}
+
+static inline
+void profiler_unregister_thread()
+{
+  mozilla_sampler_unregister_thread();
+}
+
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
@@ -154,6 +166,7 @@ void profiler_unlock()
 #define PROFILER_MAIN_THREAD_LABEL_PRINTF(name_space, info, ...)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla::SamplerStackFramePrintfRAII SAMPLER_APPEND_LINE_NUMBER(sampler_raii)(name_space "::" info, __LINE__, __VA_ARGS__)
 #define PROFILER_MAIN_THREAD_MARKER(info)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla_sampler_add_marker(info)
 
+
 /* FIXME/bug 789667: memory constraints wouldn't much of a problem for
  * this small a sample buffer size, except that serializing the
  * profile data is extremely, unnecessarily memory intensive. */
diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
index d8c74b748217..4435ebf4e9a2 100644
--- a/tools/profiler/ProfileEntry.cpp
+++ b/tools/profiler/ProfileEntry.cpp
@@ -134,19 +134,23 @@ std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
 
 #define DYNAMIC_MAX_STRING 512
 
-ThreadProfile::ThreadProfile(int aEntrySize, PseudoStack *aStack)
+ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread)
   : mWritePos(0)
   , mLastFlushPos(0)
   , mReadPos(0)
   , mEntrySize(aEntrySize)
   , mPseudoStack(aStack)
   , mMutex("ThreadProfile::mMutex")
+  , mName(strdup(aName))
+  , mThreadId(aThreadId)
+  , mIsMainThread(aIsMainThread)
 {
   mEntries = new ProfileEntry[mEntrySize];
 }
 
 ThreadProfile::~ThreadProfile()
 {
+  free(mName);
   delete[] mEntries;
 }
 
@@ -299,6 +303,10 @@ JSCustomObject* ThreadProfile::ToJSObject(JSContext *aCx)
 }
 
 void ThreadProfile::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile) {
+  // Thread meta data
+  b.DefineProperty(profile, "name", mName);
+  b.DefineProperty(profile, "tid", mThreadId);
+
   JSCustomArray *samples = b.CreateArray();
   b.DefineProperty(profile, "samples", samples);
 
diff --git a/tools/profiler/ProfileEntry.h b/tools/profiler/ProfileEntry.h
index 897abb23c6ea..a5483b59f887 100644
--- a/tools/profiler/ProfileEntry.h
+++ b/tools/profiler/ProfileEntry.h
@@ -6,6 +6,7 @@
 #ifndef MOZ_PROFILE_ENTRY_H
 #define MOZ_PROFILE_ENTRY_H
 
+#include <ostream>
 #include "GeckoProfilerImpl.h"
 #include "JSAObjectBuilder.h"
 #include "platform.h"
@@ -56,7 +57,7 @@ typedef void (*IterateTagsCallback)(const ProfileEntry& entry, const char* tagSt
 class ThreadProfile
 {
 public:
-  ThreadProfile(int aEntrySize, PseudoStack *aStack);
+  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread);
   ~ThreadProfile();
   void addTag(ProfileEntry aTag);
   void flush();
@@ -70,6 +71,11 @@ public:
   PseudoStack* GetPseudoStack();
   mozilla::Mutex* GetMutex();
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
+
+  bool IsMainThread() const { return mIsMainThread; }
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
 private:
   // Circular buffer 'Keep One Slot Open' implementation
   // for simplicity
@@ -80,6 +86,9 @@ private:
   int            mEntrySize;
   PseudoStack*   mPseudoStack;
   mozilla::Mutex mMutex;
+  char*          mName;
+  int            mThreadId;
+  bool           mIsMainThread;
 };
 
 std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index c31d9d94e4fa..14a3350b1318 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -173,16 +173,22 @@ void TableTicker::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile)
   JSCustomArray *threads = b.CreateArray();
   b.DefineProperty(profile, "threads", threads);
 
-  // For now we only have one thread
   SetPaused(true);
-  ThreadProfile* prof = GetPrimaryThreadProfile();
-  prof->GetMutex()->Lock();
-  JSCustomObject* threadSamples = b.CreateObject();
-  prof->BuildJSObject(b, threadSamples);
-  b.ArrayPush(threads, threadSamples);
-  prof->GetMutex()->Unlock();
+
+  {
+    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+    for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
+      MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
+
+      JSCustomObject* threadSamples = b.CreateObject();
+      sRegisteredThreads->at(i)->Profile()->BuildJSObject(b, threadSamples);
+      b.ArrayPush(threads, threadSamples);
+    }
+  }
+
   SetPaused(false);
-}
+} 
 
 // END SaveProfileTask et al
 ////////////////////////////////////////////////////////////////////////
@@ -383,10 +389,17 @@ void doSampleStackTrace(PseudoStack *aStack, ThreadProfile &aProfile, TickSample
 
 void TableTicker::Tick(TickSample* sample)
 {
+  if (!sample->threadProfile) {
+    // Platform doesn't support multithread, so use the main thread profile we created
+    sample->threadProfile = GetPrimaryThreadProfile();
+  }
+
+  ThreadProfile& currThreadProfile = *sample->threadProfile;
+
   // Marker(s) come before the sample
-  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
+  PseudoStack* stack = currThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
-    addDynamicTag(mPrimaryThreadProfile, 'm', stack->getMarker(i));
+    addDynamicTag(currThreadProfile, 'm', stack->getMarker(i));
   }
   stack->mQueueClearMarker = true;
 
@@ -398,7 +411,7 @@ void TableTicker::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      mPrimaryThreadProfile.erase();
+      currThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -414,29 +427,29 @@ void TableTicker::Tick(TickSample* sample)
 
 #if defined(USE_BACKTRACE) || defined(USE_NS_STACKWALK)
   if (mUseStackWalk) {
-    doNativeBacktrace(mPrimaryThreadProfile, sample);
+    doNativeBacktrace(currThreadProfile, sample);
   } else {
-    doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
+    doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
   }
 #else
-  doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
+  doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
 #endif
 
   if (recordSample)
-    mPrimaryThreadProfile.flush();
+    currThreadProfile.flush();
 
-  if (!sLastTracerEvent.IsNull() && sample) {
+  if (!sLastTracerEvent.IsNull() && sample && currThreadProfile.IsMainThread()) {
     TimeDuration delta = sample->timestamp - sLastTracerEvent;
-    mPrimaryThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
+    currThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
   }
 
   if (sample) {
     TimeDuration delta = sample->timestamp - mStartTime;
-    mPrimaryThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
+    currThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
   }
 
   if (sLastFrameNumber != sFrameNumber) {
-    mPrimaryThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
+    currThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
     sLastFrameNumber = sFrameNumber;
   }
 }
@@ -460,7 +473,8 @@ void mozilla_sampler_print_location1()
     return;
   }
 
-  ThreadProfile threadProfile(1000, stack);
+  ThreadProfile threadProfile("Temp", PROFILE_DEFAULT_ENTRY, stack,
+                              0, false);
   doSampleStackTrace(stack, threadProfile, NULL);
 
   threadProfile.flush();
diff --git a/tools/profiler/TableTicker.h b/tools/profiler/TableTicker.h
index 6b00d1e1c6d5..edb91195430d 100644
--- a/tools/profiler/TableTicker.h
+++ b/tools/profiler/TableTicker.h
@@ -5,6 +5,7 @@
 
 #include "platform.h"
 #include "ProfileEntry.h"
+#include "mozilla/Mutex.h"
 
 static bool
 hasFeature(const char** aFeatures, uint32_t aFeatureCount, const char* aFeature) {
@@ -27,8 +28,8 @@ class TableTicker: public Sampler {
  public:
   TableTicker(int aInterval, int aEntrySize, PseudoStack *aStack,
               const char** aFeatures, uint32_t aFeatureCount)
-    : Sampler(aInterval, true)
-    , mPrimaryThreadProfile(aEntrySize, aStack)
+    : Sampler(aInterval, true, aEntrySize)
+    , mPrimaryThreadProfile(nullptr)
     , mStartTime(TimeStamp::Now())
     , mSaveRequested(false)
   {
@@ -38,10 +39,47 @@ class TableTicker: public Sampler {
     mJankOnly = hasFeature(aFeatures, aFeatureCount, "jank");
     mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
     mAddLeafAddresses = hasFeature(aFeatures, aFeatureCount, "leaf");
-    mPrimaryThreadProfile.addTag(ProfileEntry('m', "Start"));
+
+    {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      // Create ThreadProfile for each registered thread
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        ThreadProfile* profile = new ThreadProfile(info->Name(),
+                                                   aEntrySize,
+                                                   info->Stack(),
+                                                   info->ThreadId(),
+                                                   info->IsMainThread());
+        profile->addTag(ProfileEntry('m', "Start"));
+
+        info->SetProfile(profile);
+      }
+
+      SetActiveSampler(this);
+    }
   }
 
-  ~TableTicker() { if (IsActive()) Stop(); }
+  ~TableTicker() {
+    if (IsActive())
+      Stop();
+
+    SetActiveSampler(nullptr);
+
+    // Destroy ThreadProfile for all threads
+    {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        ThreadProfile* profile = info->Profile();
+        if (profile) {
+          delete profile;
+          info->SetProfile(nullptr);
+        }
+      }
+    }
+  }
 
   virtual void SampleStack(TickSample* sample) {}
 
@@ -58,7 +96,19 @@ class TableTicker: public Sampler {
 
   ThreadProfile* GetPrimaryThreadProfile()
   {
-    return &mPrimaryThreadProfile;
+    if (!mPrimaryThreadProfile) {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        if (info->IsMainThread()) {
+          mPrimaryThreadProfile = info->Profile();
+          break;
+        }
+      }
+    }
+
+    return mPrimaryThreadProfile;
   }
 
   void ToStreamAsJSON(std::ostream& stream);
@@ -76,7 +126,7 @@ protected:
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
 
   // This represent the application's main thread (SAMPLER_INIT)
-  ThreadProfile mPrimaryThreadProfile;
+  ThreadProfile* mPrimaryThreadProfile;
   TimeStamp mStartTime;
   bool mSaveRequested;
   bool mAddLeafAddresses;
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index b87ce4fba436..ed1c52d40a9c 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -39,6 +39,7 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <stdlib.h>
+#include <sched.h>
 #ifdef ANDROID
 #include <android/log.h>
 #else
@@ -60,9 +61,13 @@
 #include <stdarg.h>
 #include "platform.h"
 #include "GeckoProfilerImpl.h"
+#include "mozilla/Mutex.h"
+#include "ProfileEntry.h"
+#include "nsThreadUtils.h"
 
 #include <string.h>
 #include <stdio.h>
+#include <list>
 
 #define SIGNAL_SAVE_PROFILE SIGUSR2
 
@@ -75,9 +80,6 @@ pid_t gettid()
 }
 #endif
 
-static Sampler* sActiveSampler = NULL;
-
-
 #if !defined(ANDROID)
 // Keep track of when any of our threads calls fork(), so we can
 // temporarily disable signal delivery during the fork() call.  Not
@@ -96,9 +98,9 @@ static bool was_paused = false;
 // In the parent, just before the fork, record the pausedness state,
 // and then pause.
 static void paf_prepare(void) {
-  if (sActiveSampler) {
-    was_paused = sActiveSampler->IsPaused();
-    sActiveSampler->SetPaused(true);
+  if (Sampler::GetActiveSampler()) {
+    was_paused = Sampler::GetActiveSampler()->IsPaused();
+    Sampler::GetActiveSampler()->SetPaused(true);
   } else {
     was_paused = false;
   }
@@ -107,8 +109,8 @@ static void paf_prepare(void) {
 // In the parent, just after the fork, return pausedness to the
 // pre-fork state.
 static void paf_parent(void) {
-  if (sActiveSampler)
-    sActiveSampler->SetPaused(was_paused);
+  if (Sampler::GetActiveSampler())
+    Sampler::GetActiveSampler()->SetPaused(was_paused);
 }
 
 // Set up the fork handlers.  This is called just once, at the first
@@ -123,8 +125,10 @@ static void* setup_atfork() {
 #include "android-signal-defs.h"
 #endif
 
+static ThreadProfile* sCurrentThreadProfile = NULL;
+
 static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context) {
-  sActiveSampler->RequestSave();
+  Sampler::GetActiveSampler()->RequestSave();
 }
 
 #ifdef ANDROID
@@ -135,7 +139,7 @@ static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context
 #define V8_HOST_ARCH_X64 1
 #endif
 static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
-  if (!sActiveSampler)
+  if (!Sampler::GetActiveSampler())
     return;
 
   TickSample sample_obj;
@@ -144,7 +148,7 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 
 #ifdef ENABLE_SPS_LEAF_DATA
   // If profiling, we extract the current pc and sp.
-  if (sActiveSampler->IsProfiling()) {
+  if (Sampler::GetActiveSampler()->IsProfiling()) {
     // Extracting the sample from the context is extremely machine dependent.
     ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
     mcontext_t& mcontext = ucontext->uc_mcontext;
@@ -179,14 +183,17 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 #endif
   }
 #endif
+  sample->threadProfile = sCurrentThreadProfile;
   sample->timestamp = mozilla::TimeStamp::Now();
 
-  sActiveSampler->Tick(sample);
+  Sampler::GetActiveSampler()->Tick(sample);
+
+  sCurrentThreadProfile = NULL;
 }
 
 #ifndef XP_MACOSX
-void tgkill(pid_t tgid, pid_t tid, int signalno) {
-  syscall(SYS_tgkill, tgid, tid, signalno);
+int tgkill(pid_t tgid, pid_t tid, int signalno) {
+  return syscall(SYS_tgkill, tgid, tid, signalno);
 }
 #endif
 
@@ -214,8 +221,33 @@ class Sampler::PlatformData : public Malloced {
 #ifdef XP_MACOSX
         pthread_kill(signal_receiver_, SIGPROF);
 #else
-        // Glibc doesn't provide a wrapper for tgkill(2).
-        tgkill(vm_tgid_, vm_tid_, SIGPROF);
+
+        std::vector<ThreadInfo*> threads = GetRegisteredThreads();
+
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // We use sCurrentThreadProfile the ThreadProfile for the
+          // thread we're profiling to the signal handler
+          sCurrentThreadProfile = info->Profile();
+
+          int threadId = info->ThreadId();
+          if (threadId == 0) {
+            threadId = vm_tid_;
+          }
+
+          if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
+            printf_stderr("profiler failed to signal tid=%d\n", threadId);
+#ifdef DEBUG
+            abort();
+#endif
+            continue;
+          }
+
+          // Wait for the signal handler to run before moving on to the next one
+          while (sCurrentThreadProfile)
+            sched_yield();
+        }
 #endif
       }
 
@@ -258,11 +290,12 @@ static void* SenderEntry(void* arg) {
 }
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false) {
+      active_(false),
+      entrySize_(entrySize) {
   data_ = new PlatformData(this);
 }
 
@@ -274,7 +307,6 @@ Sampler::~Sampler() {
 
 void Sampler::Start() {
   LOG("Sampler started");
-  if (sActiveSampler != NULL) return;
 
   // Request profiling signals.
   LOG("Request signal");
@@ -308,9 +340,6 @@ void Sampler::Start() {
     data_->signal_sender_launched_ = true;
   }
   LOG("Profiler thread started");
-
-  // Set this sampler as the active sampler.
-  sActiveSampler = this;
 }
 
 
@@ -330,9 +359,41 @@ void Sampler::Stop() {
     sigaction(SIGPROF, &data_->old_sigprof_signal_handler_, 0);
     data_->signal_handler_installed_ = false;
   }
+}
 
-  // This sampler is no longer the active sampler.
-  sActiveSampler = NULL;
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  ThreadInfo* info = new ThreadInfo(aName, gettid(), aIsMainThread, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       aIsMainThread));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  int id = gettid();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
 }
 
 #ifdef ANDROID
@@ -356,3 +417,4 @@ void OS::RegisterStartHandler()
   }
 }
 #endif
+
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index 99392cc7ed61..50945dc34fcd 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -28,6 +28,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include "nsThreadUtils.h"
+
 #include "platform.h"
 #include "UnwinderThread2.h"  /* uwt__register_thread_for_profiling */
 
@@ -199,8 +201,8 @@ class Sampler::PlatformData : public Malloced {
 class SamplerThread : public Thread {
  public:
   explicit SamplerThread(int interval)
-      : Thread("SamplerThread"),
-        interval_(interval) {}
+      : Thread("SamplerThread")
+      , interval_(interval) {}
 
   static void AddActiveSampler(Sampler* sampler) {
     ScopedLock lock(mutex_);
@@ -279,6 +281,7 @@ class SamplerThread : public Thread {
       sample->sp = reinterpret_cast<Address>(state.REGISTER_FIELD(sp));
       sample->fp = reinterpret_cast<Address>(state.REGISTER_FIELD(bp));
       sample->timestamp = mozilla::TimeStamp::Now();
+      sample->threadProfile = NULL;
       sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
@@ -302,12 +305,13 @@ Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : // isolate_(isolate),
       interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false) /*,
+      active_(false),
+      entrySize_(entrySize) /*,
       samples_taken_(0)*/ {
   data_ = new PlatformData;
 }
@@ -337,3 +341,30 @@ Sampler::GetProfiledThread(Sampler::PlatformData* aData)
 {
   return aData->profiled_pthread();
 }
+
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  if (!aIsMainThread)
+    return false;
+
+  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       true));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  // We only have the main thread currently and that will never be unregistered
+}
\ No newline at end of file
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index af68f4c52354..818b536b68f3 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -28,9 +28,10 @@
 
 #include <windows.h>
 #include <mmsystem.h>
-#include "platform.h"
 #include <process.h>
+#include "platform.h"
 
+#include "ProfileEntry.h"
 
 class Sampler::PlatformData : public Malloced {
  public:
@@ -67,9 +68,9 @@ Sampler::GetThreadHandle(Sampler::PlatformData* aData)
 class SamplerThread : public Thread {
  public:
   SamplerThread(int interval, Sampler* sampler)
-      : Thread("SamplerThread"),
-        interval_(interval),
-        sampler_(sampler) {}
+      : Thread("SamplerThread")
+      , interval_(interval)
+      , sampler_(sampler) {}
 
   static void StartSampler(Sampler* sampler) {
     if (instance_ == NULL) {
@@ -120,6 +121,7 @@ class SamplerThread : public Thread {
 
     // Grab the timestamp before pausing the thread, to avoid deadlocks.
     sample->timestamp = mozilla::TimeStamp::Now();
+    sample->threadProfile = NULL;
 
     static const DWORD kSuspendFailed = static_cast<DWORD>(-1);
     if (SuspendThread(profiled_thread) == kSuspendFailed)
@@ -155,11 +157,12 @@ class SamplerThread : public Thread {
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
       active_(false),
+      entrySize_(entrySize),
       data_(new PlatformData) {
 }
 
@@ -238,3 +241,30 @@ void Thread::Join() {
 void OS::Sleep(int milliseconds) {
   ::Sleep(milliseconds);
 }
+
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  if (!aIsMainThread)
+    return false;
+
+  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       true));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  // We only have the main thread currently and that will never be unregistered
+}
\ No newline at end of file
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 653b681dd17c..27bbeb6df5b0 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -18,6 +18,7 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "mozilla/Services.h"
+#include "nsThreadUtils.h"
 
 mozilla::ThreadLocal<PseudoStack *> tlsPseudoStack;
 mozilla::ThreadLocal<TableTicker *> tlsTicker;
@@ -35,7 +36,7 @@ int       sLastFrameNumber = 0;
 unsigned int sLastSampledEventGeneration = 0;
 
 /* a counter that's incremented everytime we get responsiveness event
- * note: it might also be worth tracking everytime we go around
+ * note: it might also be worth trackplaing everytime we go around
  * the event loop */
 unsigned int sCurrentEventGeneration = 0;
 /* we don't need to worry about overflow because we only treat the
@@ -43,6 +44,18 @@ unsigned int sCurrentEventGeneration = 0;
  * a problem if 2^32 events happen between samples that we need
  * to know are associated with different events */
 
+std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = new std::vector<ThreadInfo*>();
+mozilla::Mutex* Sampler::sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+
+Sampler* Sampler::sActiveSampler;
+
+ThreadInfo::~ThreadInfo() {
+  free(mName);
+
+  if (mProfile)
+    delete mProfile;
+}
+
 bool sps_version2()
 {
   static int version = 0; // Raced on, potentially
@@ -293,6 +306,8 @@ void mozilla_sampler_shutdown()
     uwt__deinit();
   }
 
+  Sampler::FreeRegisteredThreads();
+
   profiler_stop();
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
@@ -487,6 +502,20 @@ void mozilla_sampler_unlock()
     os->NotifyObservers(nullptr, "profiler-unlocked", nullptr);
 }
 
+bool mozilla_sampler_register_thread(const char* aName)
+{
+  PseudoStack* stack = new PseudoStack();
+  tlsPseudoStack.set(stack);
+
+  return Sampler::RegisterCurrentThread(aName, stack, false);
+}
+
+void mozilla_sampler_unregister_thread()
+{
+  Sampler::UnregisterCurrentThread();
+}
+
 // END externally visible functions
 ////////////////////////////////////////////////////////////////////////
 
+
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index 22bc75afbe87..8371927aa9d2 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -232,6 +232,9 @@ extern int     sUnwindStackScan;  /* max # of dubious frames allowed */
 // (if used for profiling) the program counter and stack pointer for
 // the thread that created it.
 
+class PseudoStack;
+class ThreadProfile;
+
 // TickSample captures the information collected for each sample.
 class TickSample {
  public:
@@ -255,16 +258,44 @@ class TickSample {
   Address function;  // The last called JS function.
   void*   context;   // The context from the signal handler, if available. On
                      // Win32 this may contain the windows thread context.
+  ThreadProfile* threadProfile;
   static const int kMaxFramesCount = 64;
-  Address stack[kMaxFramesCount];  // Call stack.
   int frames_count;  // Number of captured frames.
   mozilla::TimeStamp timestamp;
 };
 
+class ThreadInfo {
+ public:
+  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
+    : mName(strdup(aName))
+    , mThreadId(aThreadId)
+    , mIsMainThread(aIsMainThread)
+    , mPseudoStack(aPseudoStack)
+    , mProfile(NULL) {}
+
+  virtual ~ThreadInfo();
+
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
+  bool IsMainThread() const { return mIsMainThread; }
+  PseudoStack* Stack() const { return mPseudoStack; }
+  
+  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
+  ThreadProfile* Profile() const { return mProfile; }
+
+ private:
+  char* mName;
+  int mThreadId;
+  const bool mIsMainThread;
+  PseudoStack* mPseudoStack;
+  ThreadProfile* mProfile;
+};
+
 class Sampler {
  public:
   // Initialize sampler.
-  explicit Sampler(int interval, bool profiling);
+  explicit Sampler(int interval, bool profiling, int entrySize);
   virtual ~Sampler();
 
   int interval() const { return interval_; }
@@ -295,6 +326,8 @@ class Sampler {
   bool IsPaused() const { return paused_; }
   void SetPaused(bool value) { NoBarrier_Store(&paused_, value); }
 
+  int EntrySize() { return entrySize_; }
+
   class PlatformData;
 
   PlatformData* platform_data() { return data_; }
@@ -308,6 +341,34 @@ class Sampler {
 #ifdef XP_MACOSX
   static pthread_t GetProfiledThread(PlatformData*);
 #endif
+
+  static std::vector<ThreadInfo*> GetRegisteredThreads() {
+    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+    return *sRegisteredThreads;
+  }
+
+  static bool RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread);
+  static void UnregisterCurrentThread();
+
+  // Should only be called on shutdown
+  static void FreeRegisteredThreads() {
+    while (sRegisteredThreads->size() > 0) {
+      sRegisteredThreads->pop_back();
+    }
+
+    delete sRegisteredThreadsMutex;
+    delete sRegisteredThreads;
+  }
+
+  static Sampler* GetActiveSampler() { return sActiveSampler; }
+  static void SetActiveSampler(Sampler* sampler) { sActiveSampler = sampler; }
+
+ protected:
+  static std::vector<ThreadInfo*>* sRegisteredThreads;
+  static mozilla::Mutex* sRegisteredThreadsMutex;
+  static Sampler* sActiveSampler;
+
  private:
   void SetActive(bool value) { NoBarrier_Store(&active_, value); }
 
@@ -315,6 +376,7 @@ class Sampler {
   const bool profiling_;
   Atomic32 paused_;
   Atomic32 active_;
+  const int entrySize_;
   PlatformData* data_;  // Platform specific data.
 };
 

From 67d9eda26a48c9024492de5931478fe14daa2cd1 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Thu, 18 Apr 2013 21:19:10 +0900
Subject: [PATCH 257/438] Bug 863025 - Fix nsUniversalDetector overlooking the
 UTF-16 BOM. r=smontagu

---
 .../src/base/nsUniversalDetector.cpp          | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/extensions/universalchardet/src/base/nsUniversalDetector.cpp b/extensions/universalchardet/src/base/nsUniversalDetector.cpp
index a06c2270c29a..20dd9d61b58f 100644
--- a/extensions/universalchardet/src/base/nsUniversalDetector.cpp
+++ b/extensions/universalchardet/src/base/nsUniversalDetector.cpp
@@ -77,31 +77,34 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, uint32_t aLen)
   if (mStart)
   {
     mStart = false;
-    if (aLen > 2)
-      switch (aBuf[0])
-        {
-        case '\xEF':
-          if (('\xBB' == aBuf[1]) && ('\xBF' == aBuf[2]))
-            // EF BB BF  UTF-8 encoded BOM
-            mDetectedCharset = "UTF-8";
+    if (aLen >= 2) {
+      switch (aBuf[0]) {
+      case '\xEF':
+        if ((aLen > 2) && ('\xBB' == aBuf[1]) && ('\xBF' == aBuf[2])) {
+          // EF BB BF  UTF-8 encoded BOM
+          mDetectedCharset = "UTF-8";
+        }
         break;
-        case '\xFE':
-          if ('\xFF' == aBuf[1])
-            // FE FF  UTF-16, big endian BOM
-            mDetectedCharset = "UTF-16BE";
+      case '\xFE':
+        if ('\xFF' == aBuf[1]) {
+          // FE FF  UTF-16, big endian BOM
+          mDetectedCharset = "UTF-16BE";
+        }
         break;
-        case '\xFF':
-          if ('\xFE' == aBuf[1])
-            // FF FE  UTF-16, little endian BOM
-            mDetectedCharset = "UTF-16LE";
+      case '\xFF':
+        if ('\xFE' == aBuf[1]) {
+          // FF FE  UTF-16, little endian BOM
+          mDetectedCharset = "UTF-16LE";
+        }
         break;
       }  // switch
+    }
 
-      if (mDetectedCharset)
-      {
-        mDone = true;
-        return NS_OK;
-      }
+    if (mDetectedCharset)
+    {
+      mDone = true;
+      return NS_OK;
+    }
   }
   
   uint32_t i;

From be88bc3e9fe5463269c35057f76db2a45b05b224 Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Thu, 18 Apr 2013 08:20:01 -0400
Subject: [PATCH 258/438] Bug 860827 - Add unit tests for ReadSysFile().
 r=dhylands, r=BenWa

---
 toolkit/library/Makefile.in              |   2 +-
 toolkit/toolkit.mozbuild                 |   1 +
 xpcom/glue/FileUtils.cpp                 |   7 +-
 xpcom/glue/FileUtils.h                   |   4 +-
 xpcom/glue/tests/gtest/Makefile.in       |  27 +++
 xpcom/glue/tests/gtest/TestFileUtils.cpp | 279 +++++++++++++++++++++++
 xpcom/glue/tests/gtest/moz.build         |   7 +
 7 files changed, 322 insertions(+), 5 deletions(-)
 create mode 100644 xpcom/glue/tests/gtest/Makefile.in
 create mode 100644 xpcom/glue/tests/gtest/TestFileUtils.cpp
 create mode 100644 xpcom/glue/tests/gtest/moz.build

diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 763db6c612b6..e961884e5093 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -297,7 +297,7 @@ endif
 STATIC_LIBS += thebes gl ycbcr
 
 ifdef MOZ_ENABLE_GTEST
-COMPONENT_LIBS += gtest
+COMPONENT_LIBS += gtest xpcom_glue_gtest
 endif
 
 ifdef MOZ_ENABLE_PROFILER_SPS
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index a8a55dd8c539..58f0c41ae224 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -130,6 +130,7 @@ if CONFIG['ENABLE_TESTS']:
 
 if CONFIG['MOZ_ENABLE_GTEST']:
     add_tier_dir('platform', 'testing/gtest')
+    add_tier_dir('platform', 'xpcom/glue/tests/gtest')
 
 add_tier_dir('platform', [
     'uriloader',
diff --git a/xpcom/glue/FileUtils.cpp b/xpcom/glue/FileUtils.cpp
index e37ec540d95d..db6648843f17 100644
--- a/xpcom/glue/FileUtils.cpp
+++ b/xpcom/glue/FileUtils.cpp
@@ -117,7 +117,10 @@ mozilla::fallocate(PRFileDesc *aFD, int64_t aLength)
   return false;
 }
 
-#ifdef MOZ_WIDGET_GONK
+/* Define ReadSysFile() only on GONK to avoid unnecessary lubxul bloat.
+Also define it in debug builds, so that unit tests for it can be written
+and run in non-GONK builds. */
+#if defined(MOZ_WIDGET_GONK) || defined(DEBUG)
 
 #undef TEMP_FAILURE_RETRY
 #define TEMP_FAILURE_RETRY(exp) (__extension__({ \
@@ -188,7 +191,7 @@ mozilla::ReadSysFile(
   return true;
 }
 
-#endif /* MOZ_WIDGET_GONK */
+#endif /* MOZ_WIDGET_GONK || DEBUG */
 
 void
 mozilla::ReadAheadLib(nsIFile* aFile)
diff --git a/xpcom/glue/FileUtils.h b/xpcom/glue/FileUtils.h
index 60cf65895b16..db7b0f6c1364 100644
--- a/xpcom/glue/FileUtils.h
+++ b/xpcom/glue/FileUtils.h
@@ -145,7 +145,7 @@ NS_COM_GLUE void ReadAhead(filedesc_t aFd, const size_t aOffset = 0,
                            const size_t aCount = SIZE_MAX);
 
 
-#ifdef MOZ_WIDGET_GONK
+#if defined(MOZ_WIDGET_GONK) || defined(DEBUG)
 
 /**
  * Read the contents of a file.
@@ -184,7 +184,7 @@ ReadSysFile(
   const char* aFilename,
   bool* aVal);
 
-#endif /* MOZ_WIDGET_GONK */
+#endif /* MOZ_WIDGET_GONK || DEBUG */
 
 } // namespace mozilla
 #endif
diff --git a/xpcom/glue/tests/gtest/Makefile.in b/xpcom/glue/tests/gtest/Makefile.in
new file mode 100644
index 000000000000..bc5dbd0ebbfe
--- /dev/null
+++ b/xpcom/glue/tests/gtest/Makefile.in
@@ -0,0 +1,27 @@
+# vim:set ts=8 sw=8 sts=8 noet:
+# 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/.
+
+DEPTH = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE_NAME = xpcom_glue_gtest
+LIBRARY_NAME = xpcom_glue_gtest
+EXPORT_LIBRARY = 1
+LIBXUL_LIBRARY = 1
+IS_COMPONENT = 1
+
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../.. \
+  $(NULL)
+
+CPPSRCS = \
+  TestFileUtils.cpp \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/glue/tests/gtest/TestFileUtils.cpp b/xpcom/glue/tests/gtest/TestFileUtils.cpp
new file mode 100644
index 000000000000..e218166559e8
--- /dev/null
+++ b/xpcom/glue/tests/gtest/TestFileUtils.cpp
@@ -0,0 +1,279 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/* Test ReadSysFile() */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "FileUtils.h"
+
+#include "gtest/gtest.h"
+
+namespace mozilla {
+
+/**
+ * Create a file with the specified contents.
+ */
+static bool
+WriteFile(
+  const char* aFilename,
+  const void* aContents,
+  size_t aContentsLen)
+{
+  int fd;
+  ssize_t ret;
+  size_t offt;
+
+  fd = TEMP_FAILURE_RETRY(
+    open(aFilename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR));
+  if (fd == -1) {
+    fprintf(stderr, "open(): %s: %s\n", aFilename, strerror(errno));
+    return false;
+  }
+
+  offt = 0;
+  do {
+    ret = TEMP_FAILURE_RETRY(write(fd, (char*)aContents + offt, aContentsLen - offt));
+    if (ret == -1) {
+      fprintf(stderr, "write(): %s: %s\n", aFilename, strerror(errno));
+      close(fd);
+      return false;
+    }
+    offt += ret;
+  } while (offt < aContentsLen);
+
+  ret = TEMP_FAILURE_RETRY(close(fd));
+  if (ret == -1) {
+    fprintf(stderr, "close(): %s: %s\n", aFilename, strerror(errno));
+    return false;
+  }
+  return true;
+}
+
+#if defined(MOZ_WIDGET_GONK) || defined(DEBUG)
+
+TEST(ReadSysFile, Nonexistent) {
+  bool ret;
+  int errno_saved;
+
+  ret = ReadSysFile("/nonexistent", NULL, 0);
+  errno_saved = errno;
+
+  ASSERT_FALSE(ret);
+  ASSERT_EQ(errno_saved, ENOENT);
+}
+
+TEST(ReadSysFile, Main) {
+  /* Use a different file name for each test since different tests could be
+  executed concurrently. */
+  static const char* fn = "TestReadSysFileMain";
+  /* If we have a file which contains "abcd" and we read it with ReadSysFile(),
+  providing a buffer of size 10 bytes, we would expect 5 bytes to be written
+  to that buffer: "abcd\0". */
+  struct {
+    /* input (file contents), e.g. "abcd" */
+    const char* input;
+    /* pretended output buffer size, e.g. 10; the actual buffer is larger
+    and we check if anything was written past the end of the allowed length */
+    size_t output_size;
+    /* expected number of bytes written to the output buffer, including the
+    terminating '\0', e.g. 5 */
+    size_t output_len;
+    /* expected output buffer contents, e.g. "abcd\0", the first output_len
+    bytes of the output buffer should match the first 'output_len' bytes from
+    'output', the rest of the output buffer should be untouched. */
+    const char* output;
+  } tests[] = {
+    /* No new lines */
+    {"", 0, 0, ""},
+    {"", 1, 1, "\0"}, /* \0 is redundant, but we write it for clarity */
+    {"", 9, 1, "\0"},
+
+    {"a", 0, 0, ""},
+    {"a", 1, 1, "\0"},
+    {"a", 2, 2, "a\0"},
+    {"a", 9, 2, "a\0"},
+
+    {"abcd", 0, 0, ""},
+    {"abcd", 1, 1, "\0"},
+    {"abcd", 2, 2, "a\0"},
+    {"abcd", 3, 3, "ab\0"},
+    {"abcd", 4, 4, "abc\0"},
+    {"abcd", 5, 5, "abcd\0"},
+    {"abcd", 9, 5, "abcd\0"},
+
+    /* A single trailing new line */
+    {"\n", 0, 0, ""},
+    {"\n", 1, 1, "\0"},
+    {"\n", 2, 1, "\0"},
+    {"\n", 9, 1, "\0"},
+
+    {"a\n", 0, 0, ""},
+    {"a\n", 1, 1, "\0"},
+    {"a\n", 2, 2, "a\0"},
+    {"a\n", 3, 2, "a\0"},
+    {"a\n", 9, 2, "a\0"},
+
+    {"abcd\n", 0, 0, ""},
+    {"abcd\n", 1, 1, "\0"},
+    {"abcd\n", 2, 2, "a\0"},
+    {"abcd\n", 3, 3, "ab\0"},
+    {"abcd\n", 4, 4, "abc\0"},
+    {"abcd\n", 5, 5, "abcd\0"},
+    {"abcd\n", 6, 5, "abcd\0"},
+    {"abcd\n", 9, 5, "abcd\0"},
+
+    /* Multiple trailing new lines */
+    {"\n\n", 0, 0, ""},
+    {"\n\n", 1, 1, "\0"},
+    {"\n\n", 2, 2, "\n\0"},
+    {"\n\n", 3, 2, "\n\0"},
+    {"\n\n", 9, 2, "\n\0"},
+
+    {"a\n\n", 0, 0, ""},
+    {"a\n\n", 1, 1, "\0"},
+    {"a\n\n", 2, 2, "a\0"},
+    {"a\n\n", 3, 3, "a\n\0"},
+    {"a\n\n", 4, 3, "a\n\0"},
+    {"a\n\n", 9, 3, "a\n\0"},
+
+    {"abcd\n\n", 0, 0, ""},
+    {"abcd\n\n", 1, 1, "\0"},
+    {"abcd\n\n", 2, 2, "a\0"},
+    {"abcd\n\n", 3, 3, "ab\0"},
+    {"abcd\n\n", 4, 4, "abc\0"},
+    {"abcd\n\n", 5, 5, "abcd\0"},
+    {"abcd\n\n", 6, 6, "abcd\n\0"},
+    {"abcd\n\n", 7, 6, "abcd\n\0"},
+    {"abcd\n\n", 9, 6, "abcd\n\0"},
+
+    /* New line in the middle */
+    {"ab\ncd", 9, 6, "ab\ncd\0"},
+  };
+
+  for (size_t i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
+    ASSERT_TRUE(WriteFile(fn, tests[i].input, strlen(tests[i].input)));
+    /* Leave the file to exist if some of the assertions fail. */
+
+    char buf[128];
+    static const char unmodified = 'X';
+
+    memset(buf, unmodified, sizeof(buf));
+
+    ASSERT_TRUE(ReadSysFile(fn, buf, tests[i].output_size));
+
+    if (tests[i].output_size == 0) {
+      /* The buffer must be unmodified. We check only the first byte. */
+      ASSERT_EQ(unmodified, buf[0]);
+    } else {
+      ASSERT_EQ(tests[i].output_len, strlen(buf) + 1);
+      ASSERT_STREQ(tests[i].output, buf);
+      /* Check that the first byte after the trailing '\0' has not been
+      modified. */
+      ASSERT_EQ(unmodified, buf[tests[i].output_len]);
+    }
+  }
+
+  unlink(fn);
+}
+
+TEST(ReadSysFile, Int) {
+  static const char* fn = "TestReadSysFileInt";
+  struct {
+    /* input (file contents), e.g. "5" */
+    const char* input;
+    /* expected return value, if false, then the output is not checked */
+    bool ret;
+    /* expected result */
+    int output;
+  } tests[] = {
+    {"0", true, 0},
+    {"00", true, 0},
+    {"1", true, 1},
+    {"5", true, 5},
+    {"55", true, 55},
+
+    {" 123", true, 123},
+    {"123 ", true, 123},
+    {" 123 ", true, 123},
+    {"123\n", true, 123},
+
+    {"", false, 0},
+    {" ", false, 0},
+    {"a", false, 0},
+
+    {"-1", true, -1},
+    {" -456 ", true, -456},
+    {" -78.9 ", true, -78},
+  };
+
+  for (size_t i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
+    ASSERT_TRUE(WriteFile(fn, tests[i].input, strlen(tests[i].input)));
+    /* Leave the file to exist if some of the assertions fail. */
+
+    bool ret;
+    int output = 424242;
+
+    ret = ReadSysFile(fn, &output);
+
+    ASSERT_EQ(tests[i].ret, ret);
+
+    if (ret) {
+      ASSERT_EQ(tests[i].output, output);
+    }
+  }
+
+  unlink(fn);
+}
+
+TEST(ReadSysFile, Bool) {
+  static const char* fn = "TestReadSysFileBool";
+  struct {
+    /* input (file contents), e.g. "1" */
+    const char* input;
+    /* expected return value */
+    bool ret;
+    /* expected result */
+    bool output;
+  } tests[] = {
+    {"0", true, false},
+    {"00", true, false},
+    {"1", true, true},
+    {"5", true, true},
+    {"23", true, true},
+    {"-1", true, true},
+
+    {"", false, true /* unused */},
+  };
+
+  for (size_t i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
+    ASSERT_TRUE(WriteFile(fn, tests[i].input, strlen(tests[i].input)));
+    /* Leave the file to exist if some of the assertions fail. */
+
+    bool ret;
+    bool output;
+
+    ret = ReadSysFile(fn, &output);
+
+    ASSERT_EQ(tests[i].ret, ret);
+
+    if (ret) {
+      ASSERT_EQ(tests[i].output, output);
+    }
+  }
+
+  unlink(fn);
+}
+
+#endif /* MOZ_WIDGET_GONK || DEBUG */
+
+}
diff --git a/xpcom/glue/tests/gtest/moz.build b/xpcom/glue/tests/gtest/moz.build
new file mode 100644
index 000000000000..7ab3078665b8
--- /dev/null
+++ b/xpcom/glue/tests/gtest/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+MODULE = 'xpcom_glue_gtest'

From 1ca44fd0f19e7450f3cea7ca2f5777eb8e35203b Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Apr 2013 09:09:00 -0400
Subject: [PATCH 259/438] Backed out changeset a945d76d4e4e (bug 860827) for
 Windows bustage on a CLOSED TREE.

---
 toolkit/library/Makefile.in              |   2 +-
 toolkit/toolkit.mozbuild                 |   1 -
 xpcom/glue/FileUtils.cpp                 |   7 +-
 xpcom/glue/FileUtils.h                   |   4 +-
 xpcom/glue/tests/gtest/Makefile.in       |  27 ---
 xpcom/glue/tests/gtest/TestFileUtils.cpp | 279 -----------------------
 xpcom/glue/tests/gtest/moz.build         |   7 -
 7 files changed, 5 insertions(+), 322 deletions(-)
 delete mode 100644 xpcom/glue/tests/gtest/Makefile.in
 delete mode 100644 xpcom/glue/tests/gtest/TestFileUtils.cpp
 delete mode 100644 xpcom/glue/tests/gtest/moz.build

diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index e961884e5093..763db6c612b6 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -297,7 +297,7 @@ endif
 STATIC_LIBS += thebes gl ycbcr
 
 ifdef MOZ_ENABLE_GTEST
-COMPONENT_LIBS += gtest xpcom_glue_gtest
+COMPONENT_LIBS += gtest
 endif
 
 ifdef MOZ_ENABLE_PROFILER_SPS
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 58f0c41ae224..a8a55dd8c539 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -130,7 +130,6 @@ if CONFIG['ENABLE_TESTS']:
 
 if CONFIG['MOZ_ENABLE_GTEST']:
     add_tier_dir('platform', 'testing/gtest')
-    add_tier_dir('platform', 'xpcom/glue/tests/gtest')
 
 add_tier_dir('platform', [
     'uriloader',
diff --git a/xpcom/glue/FileUtils.cpp b/xpcom/glue/FileUtils.cpp
index db6648843f17..e37ec540d95d 100644
--- a/xpcom/glue/FileUtils.cpp
+++ b/xpcom/glue/FileUtils.cpp
@@ -117,10 +117,7 @@ mozilla::fallocate(PRFileDesc *aFD, int64_t aLength)
   return false;
 }
 
-/* Define ReadSysFile() only on GONK to avoid unnecessary lubxul bloat.
-Also define it in debug builds, so that unit tests for it can be written
-and run in non-GONK builds. */
-#if defined(MOZ_WIDGET_GONK) || defined(DEBUG)
+#ifdef MOZ_WIDGET_GONK
 
 #undef TEMP_FAILURE_RETRY
 #define TEMP_FAILURE_RETRY(exp) (__extension__({ \
@@ -191,7 +188,7 @@ mozilla::ReadSysFile(
   return true;
 }
 
-#endif /* MOZ_WIDGET_GONK || DEBUG */
+#endif /* MOZ_WIDGET_GONK */
 
 void
 mozilla::ReadAheadLib(nsIFile* aFile)
diff --git a/xpcom/glue/FileUtils.h b/xpcom/glue/FileUtils.h
index db7b0f6c1364..60cf65895b16 100644
--- a/xpcom/glue/FileUtils.h
+++ b/xpcom/glue/FileUtils.h
@@ -145,7 +145,7 @@ NS_COM_GLUE void ReadAhead(filedesc_t aFd, const size_t aOffset = 0,
                            const size_t aCount = SIZE_MAX);
 
 
-#if defined(MOZ_WIDGET_GONK) || defined(DEBUG)
+#ifdef MOZ_WIDGET_GONK
 
 /**
  * Read the contents of a file.
@@ -184,7 +184,7 @@ ReadSysFile(
   const char* aFilename,
   bool* aVal);
 
-#endif /* MOZ_WIDGET_GONK || DEBUG */
+#endif /* MOZ_WIDGET_GONK */
 
 } // namespace mozilla
 #endif
diff --git a/xpcom/glue/tests/gtest/Makefile.in b/xpcom/glue/tests/gtest/Makefile.in
deleted file mode 100644
index bc5dbd0ebbfe..000000000000
--- a/xpcom/glue/tests/gtest/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 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/.
-
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE_NAME = xpcom_glue_gtest
-LIBRARY_NAME = xpcom_glue_gtest
-EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-IS_COMPONENT = 1
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../.. \
-  $(NULL)
-
-CPPSRCS = \
-  TestFileUtils.cpp \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/glue/tests/gtest/TestFileUtils.cpp b/xpcom/glue/tests/gtest/TestFileUtils.cpp
deleted file mode 100644
index e218166559e8..000000000000
--- a/xpcom/glue/tests/gtest/TestFileUtils.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/* Test ReadSysFile() */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "FileUtils.h"
-
-#include "gtest/gtest.h"
-
-namespace mozilla {
-
-/**
- * Create a file with the specified contents.
- */
-static bool
-WriteFile(
-  const char* aFilename,
-  const void* aContents,
-  size_t aContentsLen)
-{
-  int fd;
-  ssize_t ret;
-  size_t offt;
-
-  fd = TEMP_FAILURE_RETRY(
-    open(aFilename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR));
-  if (fd == -1) {
-    fprintf(stderr, "open(): %s: %s\n", aFilename, strerror(errno));
-    return false;
-  }
-
-  offt = 0;
-  do {
-    ret = TEMP_FAILURE_RETRY(write(fd, (char*)aContents + offt, aContentsLen - offt));
-    if (ret == -1) {
-      fprintf(stderr, "write(): %s: %s\n", aFilename, strerror(errno));
-      close(fd);
-      return false;
-    }
-    offt += ret;
-  } while (offt < aContentsLen);
-
-  ret = TEMP_FAILURE_RETRY(close(fd));
-  if (ret == -1) {
-    fprintf(stderr, "close(): %s: %s\n", aFilename, strerror(errno));
-    return false;
-  }
-  return true;
-}
-
-#if defined(MOZ_WIDGET_GONK) || defined(DEBUG)
-
-TEST(ReadSysFile, Nonexistent) {
-  bool ret;
-  int errno_saved;
-
-  ret = ReadSysFile("/nonexistent", NULL, 0);
-  errno_saved = errno;
-
-  ASSERT_FALSE(ret);
-  ASSERT_EQ(errno_saved, ENOENT);
-}
-
-TEST(ReadSysFile, Main) {
-  /* Use a different file name for each test since different tests could be
-  executed concurrently. */
-  static const char* fn = "TestReadSysFileMain";
-  /* If we have a file which contains "abcd" and we read it with ReadSysFile(),
-  providing a buffer of size 10 bytes, we would expect 5 bytes to be written
-  to that buffer: "abcd\0". */
-  struct {
-    /* input (file contents), e.g. "abcd" */
-    const char* input;
-    /* pretended output buffer size, e.g. 10; the actual buffer is larger
-    and we check if anything was written past the end of the allowed length */
-    size_t output_size;
-    /* expected number of bytes written to the output buffer, including the
-    terminating '\0', e.g. 5 */
-    size_t output_len;
-    /* expected output buffer contents, e.g. "abcd\0", the first output_len
-    bytes of the output buffer should match the first 'output_len' bytes from
-    'output', the rest of the output buffer should be untouched. */
-    const char* output;
-  } tests[] = {
-    /* No new lines */
-    {"", 0, 0, ""},
-    {"", 1, 1, "\0"}, /* \0 is redundant, but we write it for clarity */
-    {"", 9, 1, "\0"},
-
-    {"a", 0, 0, ""},
-    {"a", 1, 1, "\0"},
-    {"a", 2, 2, "a\0"},
-    {"a", 9, 2, "a\0"},
-
-    {"abcd", 0, 0, ""},
-    {"abcd", 1, 1, "\0"},
-    {"abcd", 2, 2, "a\0"},
-    {"abcd", 3, 3, "ab\0"},
-    {"abcd", 4, 4, "abc\0"},
-    {"abcd", 5, 5, "abcd\0"},
-    {"abcd", 9, 5, "abcd\0"},
-
-    /* A single trailing new line */
-    {"\n", 0, 0, ""},
-    {"\n", 1, 1, "\0"},
-    {"\n", 2, 1, "\0"},
-    {"\n", 9, 1, "\0"},
-
-    {"a\n", 0, 0, ""},
-    {"a\n", 1, 1, "\0"},
-    {"a\n", 2, 2, "a\0"},
-    {"a\n", 3, 2, "a\0"},
-    {"a\n", 9, 2, "a\0"},
-
-    {"abcd\n", 0, 0, ""},
-    {"abcd\n", 1, 1, "\0"},
-    {"abcd\n", 2, 2, "a\0"},
-    {"abcd\n", 3, 3, "ab\0"},
-    {"abcd\n", 4, 4, "abc\0"},
-    {"abcd\n", 5, 5, "abcd\0"},
-    {"abcd\n", 6, 5, "abcd\0"},
-    {"abcd\n", 9, 5, "abcd\0"},
-
-    /* Multiple trailing new lines */
-    {"\n\n", 0, 0, ""},
-    {"\n\n", 1, 1, "\0"},
-    {"\n\n", 2, 2, "\n\0"},
-    {"\n\n", 3, 2, "\n\0"},
-    {"\n\n", 9, 2, "\n\0"},
-
-    {"a\n\n", 0, 0, ""},
-    {"a\n\n", 1, 1, "\0"},
-    {"a\n\n", 2, 2, "a\0"},
-    {"a\n\n", 3, 3, "a\n\0"},
-    {"a\n\n", 4, 3, "a\n\0"},
-    {"a\n\n", 9, 3, "a\n\0"},
-
-    {"abcd\n\n", 0, 0, ""},
-    {"abcd\n\n", 1, 1, "\0"},
-    {"abcd\n\n", 2, 2, "a\0"},
-    {"abcd\n\n", 3, 3, "ab\0"},
-    {"abcd\n\n", 4, 4, "abc\0"},
-    {"abcd\n\n", 5, 5, "abcd\0"},
-    {"abcd\n\n", 6, 6, "abcd\n\0"},
-    {"abcd\n\n", 7, 6, "abcd\n\0"},
-    {"abcd\n\n", 9, 6, "abcd\n\0"},
-
-    /* New line in the middle */
-    {"ab\ncd", 9, 6, "ab\ncd\0"},
-  };
-
-  for (size_t i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
-    ASSERT_TRUE(WriteFile(fn, tests[i].input, strlen(tests[i].input)));
-    /* Leave the file to exist if some of the assertions fail. */
-
-    char buf[128];
-    static const char unmodified = 'X';
-
-    memset(buf, unmodified, sizeof(buf));
-
-    ASSERT_TRUE(ReadSysFile(fn, buf, tests[i].output_size));
-
-    if (tests[i].output_size == 0) {
-      /* The buffer must be unmodified. We check only the first byte. */
-      ASSERT_EQ(unmodified, buf[0]);
-    } else {
-      ASSERT_EQ(tests[i].output_len, strlen(buf) + 1);
-      ASSERT_STREQ(tests[i].output, buf);
-      /* Check that the first byte after the trailing '\0' has not been
-      modified. */
-      ASSERT_EQ(unmodified, buf[tests[i].output_len]);
-    }
-  }
-
-  unlink(fn);
-}
-
-TEST(ReadSysFile, Int) {
-  static const char* fn = "TestReadSysFileInt";
-  struct {
-    /* input (file contents), e.g. "5" */
-    const char* input;
-    /* expected return value, if false, then the output is not checked */
-    bool ret;
-    /* expected result */
-    int output;
-  } tests[] = {
-    {"0", true, 0},
-    {"00", true, 0},
-    {"1", true, 1},
-    {"5", true, 5},
-    {"55", true, 55},
-
-    {" 123", true, 123},
-    {"123 ", true, 123},
-    {" 123 ", true, 123},
-    {"123\n", true, 123},
-
-    {"", false, 0},
-    {" ", false, 0},
-    {"a", false, 0},
-
-    {"-1", true, -1},
-    {" -456 ", true, -456},
-    {" -78.9 ", true, -78},
-  };
-
-  for (size_t i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
-    ASSERT_TRUE(WriteFile(fn, tests[i].input, strlen(tests[i].input)));
-    /* Leave the file to exist if some of the assertions fail. */
-
-    bool ret;
-    int output = 424242;
-
-    ret = ReadSysFile(fn, &output);
-
-    ASSERT_EQ(tests[i].ret, ret);
-
-    if (ret) {
-      ASSERT_EQ(tests[i].output, output);
-    }
-  }
-
-  unlink(fn);
-}
-
-TEST(ReadSysFile, Bool) {
-  static const char* fn = "TestReadSysFileBool";
-  struct {
-    /* input (file contents), e.g. "1" */
-    const char* input;
-    /* expected return value */
-    bool ret;
-    /* expected result */
-    bool output;
-  } tests[] = {
-    {"0", true, false},
-    {"00", true, false},
-    {"1", true, true},
-    {"5", true, true},
-    {"23", true, true},
-    {"-1", true, true},
-
-    {"", false, true /* unused */},
-  };
-
-  for (size_t i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
-    ASSERT_TRUE(WriteFile(fn, tests[i].input, strlen(tests[i].input)));
-    /* Leave the file to exist if some of the assertions fail. */
-
-    bool ret;
-    bool output;
-
-    ret = ReadSysFile(fn, &output);
-
-    ASSERT_EQ(tests[i].ret, ret);
-
-    if (ret) {
-      ASSERT_EQ(tests[i].output, output);
-    }
-  }
-
-  unlink(fn);
-}
-
-#endif /* MOZ_WIDGET_GONK || DEBUG */
-
-}
diff --git a/xpcom/glue/tests/gtest/moz.build b/xpcom/glue/tests/gtest/moz.build
deleted file mode 100644
index 7ab3078665b8..000000000000
--- a/xpcom/glue/tests/gtest/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-MODULE = 'xpcom_glue_gtest'

From 77aa03df22b69c4a7e071775533fc889470c159d Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Thu, 18 Apr 2013 15:15:21 +0200
Subject: [PATCH 260/438] Bug 862777: Hook Odinmonkey up to the spewlogger,
 r=luke

---
 js/src/ion/AsmJS.cpp      |  4 ++++
 js/src/ion/C1Spewer.cpp   | 38 ++++++++++++++++++++++----------------
 js/src/ion/IonSpewer.cpp  | 10 ++++++++--
 js/src/ion/JSONSpewer.cpp |  8 +++++++-
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/js/src/ion/AsmJS.cpp b/js/src/ion/AsmJS.cpp
index 7aa7e2561c63..030e57503cde 100644
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -4446,6 +4446,8 @@ CheckFunctionBodiesSequential(ModuleCompiler &m)
         if (!mirGen)
             return false;
 
+        IonSpewNewFunction(&mirGen->graph(), NullPtr());
+
         if (!OptimizeMIR(mirGen))
             return m.fail("Internal compiler failure (probably out of memory)", func.fn());
 
@@ -4455,6 +4457,8 @@ CheckFunctionBodiesSequential(ModuleCompiler &m)
 
         if (!GenerateAsmJSCode(m, func, *mirGen, *lir))
             return false;
+
+        IonSpewEndFunction();
     }
 
     return true;
diff --git a/js/src/ion/C1Spewer.cpp b/js/src/ion/C1Spewer.cpp
index 8934dc09d28e..7df3bf31609d 100644
--- a/js/src/ion/C1Spewer.cpp
+++ b/js/src/ion/C1Spewer.cpp
@@ -35,8 +35,13 @@ C1Spewer::beginFunction(MIRGraph *graph, HandleScript script)
     this->script = script;
 
     fprintf(spewout_, "begin_compilation\n");
-    fprintf(spewout_, "  name \"%s:%d\"\n", script->filename(), script->lineno);
-    fprintf(spewout_, "  method \"%s:%d\"\n", script->filename(), script->lineno);
+    if (script) {
+        fprintf(spewout_, "  name \"%s:%d\"\n", script->filename(), script->lineno);
+        fprintf(spewout_, "  method \"%s:%d\"\n", script->filename(), script->lineno);
+    } else {
+        fprintf(spewout_, "  name \"asm.js compilation\"\n");
+        fprintf(spewout_, "  method \"asm.js compilation\"\n");
+    }
     fprintf(spewout_, "  date %d\n", (int)time(NULL));
     fprintf(spewout_, "end_compilation\n");
 }
@@ -176,21 +181,22 @@ C1Spewer::spewPass(FILE *fp, MBasicBlock *block)
 
     fprintf(fp, "    begin_states\n");
 
-    fprintf(fp, "      begin_locals\n");
-    fprintf(fp, "        size %d\n", (int)block->numEntrySlots());
-    fprintf(fp, "        method \"None\"\n");
-    for (uint32_t i = 0; i < block->numEntrySlots(); i++) {
-        MDefinition *ins = block->getEntrySlot(i);
-        fprintf(fp, "        ");
-        fprintf(fp, "%d ", i);
-        if (ins->isUnused())
-            fprintf(fp, "unused");
-        else
-            ins->printName(fp);
-        fprintf(fp, "\n");
+    if (block->entryResumePoint()) {
+        fprintf(fp, "      begin_locals\n");
+        fprintf(fp, "        size %d\n", (int)block->numEntrySlots());
+        fprintf(fp, "        method \"None\"\n");
+        for (uint32_t i = 0; i < block->numEntrySlots(); i++) {
+            MDefinition *ins = block->getEntrySlot(i);
+            fprintf(fp, "        ");
+            fprintf(fp, "%d ", i);
+            if (ins->isUnused())
+                fprintf(fp, "unused");
+            else
+                ins->printName(fp);
+            fprintf(fp, "\n");
+        }
+        fprintf(fp, "      end_locals\n");
     }
-    fprintf(fp, "      end_locals\n");
-
     fprintf(fp, "    end_states\n");
 
     fprintf(fp, "    begin_HIR\n");
diff --git a/js/src/ion/IonSpewer.cpp b/js/src/ion/IonSpewer.cpp
index c911955b57cf..0ac0453d6399 100644
--- a/js/src/ion/IonSpewer.cpp
+++ b/js/src/ion/IonSpewer.cpp
@@ -37,7 +37,7 @@ static const char *ChannelNames[] =
 };
 
 static bool
-FilterContainsLocation(const char *filename, const size_t line = size_t(-1))
+FilterContainsLocation(HandleScript function)
 {
     static const char *filter = getenv("IONFILTER");
 
@@ -45,6 +45,12 @@ FilterContainsLocation(const char *filename, const size_t line = size_t(-1))
     if (!filter || !filter[0])
         return true;
 
+    // Disable asm.js output when filter is set.
+    if (!function)
+        return false;
+
+    const char *filename = function->filename();
+    const size_t line = function->lineno;
     static size_t filelen = strlen(filename);
     const char *index = strstr(filter, filename);
     while (index) {
@@ -133,7 +139,7 @@ IonSpewer::beginFunction(MIRGraph *graph, HandleScript function)
     if (!inited_)
         return;
 
-    if (!FilterContainsLocation(function->filename(), function->lineno)) {
+    if (!FilterContainsLocation(function)) {
         JS_ASSERT(!this->graph);
         // filter out logs during the compilation.
         filteredOutCompilations++;
diff --git a/js/src/ion/JSONSpewer.cpp b/js/src/ion/JSONSpewer.cpp
index 466941ddd7a5..da90ac1c80e2 100644
--- a/js/src/ion/JSONSpewer.cpp
+++ b/js/src/ion/JSONSpewer.cpp
@@ -183,7 +183,10 @@ JSONSpewer::beginFunction(RawScript script)
         endFunction();
 
     beginObject();
-    stringProperty("name", "%s:%d", script->filename(), script->lineno);
+    if (script)
+        stringProperty("name", "%s:%d", script->filename(), script->lineno);
+    else
+        stringProperty("name", "asm.js compilation");
     beginListProperty("passes");
 
     inFunction_ = true;
@@ -199,6 +202,9 @@ JSONSpewer::beginPass(const char *pass)
 void
 JSONSpewer::spewMResumePoint(MResumePoint *rp)
 {
+    if (!rp)
+        return;
+
     beginObjectProperty("resumePoint");
 
     if (rp->caller())

From 993daff738a6e513d8a6d707db1b6a0e2dd0d78f Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Thu, 18 Apr 2013 15:24:30 +0200
Subject: [PATCH 261/438] Bug 863221 - Crash in
 nsBaseWidget::NotifyUIStateChanged when GetPresShell returns NULL. r=roc

---
 widget/xpwidgets/nsBaseWidget.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/widget/xpwidgets/nsBaseWidget.cpp b/widget/xpwidgets/nsBaseWidget.cpp
index 043aaab81ea4..7ec349b720be 100644
--- a/widget/xpwidgets/nsBaseWidget.cpp
+++ b/widget/xpwidgets/nsBaseWidget.cpp
@@ -1442,6 +1442,9 @@ nsBaseWidget::NotifyUIStateChanged(UIStateChangeType aShowAccelerators,
     return;
 
   nsIPresShell* presShell = mWidgetListener->GetPresShell();
+  if (!presShell)
+    return;
+
   nsIDocument* doc = presShell->GetDocument();
   if (doc) {
     nsPIDOMWindow* win = doc->GetWindow();

From 0c82d71858afcc9cae4d2cef1599568881e4a82c Mon Sep 17 00:00:00 2001
From: SimonJ <simon-mozilla@abominable.org.uk>
Date: Thu, 18 Apr 2013 09:00:00 -0400
Subject: [PATCH 262/438] bug 602814 - fix parsing of connection http response
 header r=mcmanus

--HG--
extra : rebase_source : 638e5d46b709e896e48bd4e9371876858e33980d
---
 netwerk/protocol/http/nsHttpConnection.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp
index 88cc877226e3..deaf179fd803 100644
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -728,10 +728,15 @@ nsHttpConnection::OnHeadersAvailable(nsAHttpTransaction *trans,
     // told us to do so.
 
     // inspect the connection headers for keep-alive info provided the
-    // transaction completed successfully.
-    const char *val = responseHead->PeekHeader(nsHttp::Connection);
-    if (!val)
-        val = responseHead->PeekHeader(nsHttp::Proxy_Connection);
+    // transaction completed successfully. In the case of a non-sensical close
+    // and keep-alive favor the close out of conservatism.
+
+    bool explicitKeepAlive = false;
+    bool explicitClose = responseHead->HasHeaderValue(nsHttp::Connection, "close") ||
+        responseHead->HasHeaderValue(nsHttp::Proxy_Connection, "close");
+    if (!explicitClose)
+        explicitKeepAlive = responseHead->HasHeaderValue(nsHttp::Connection, "keep-alive") ||
+            responseHead->HasHeaderValue(nsHttp::Proxy_Connection, "keep-alive");
 
     // reset to default (the server may have changed since we last checked)
     mSupportsPipelining = false;
@@ -739,7 +744,7 @@ nsHttpConnection::OnHeadersAvailable(nsAHttpTransaction *trans,
     if ((responseHead->Version() < NS_HTTP_VERSION_1_1) ||
         (requestHead->Version() < NS_HTTP_VERSION_1_1)) {
         // HTTP/1.0 connections are by default NOT persistent
-        if (val && !PL_strcasecmp(val, "keep-alive"))
+        if (explicitKeepAlive)
             mKeepAlive = true;
         else
             mKeepAlive = false;
@@ -750,7 +755,7 @@ nsHttpConnection::OnHeadersAvailable(nsAHttpTransaction *trans,
     }
     else {
         // HTTP/1.1 connections are by default persistent
-        if (val && !PL_strcasecmp(val, "close")) {
+        if (explicitClose) {
             mKeepAlive = false;
 
             // persistent connections are required for pipelining to work - if
@@ -808,7 +813,7 @@ nsHttpConnection::OnHeadersAvailable(nsAHttpTransaction *trans,
     // specified then we use our advertized timeout value.
     bool foundKeepAliveMax = false;
     if (mKeepAlive) {
-        val = responseHead->PeekHeader(nsHttp::Keep_Alive);
+        const char *val = responseHead->PeekHeader(nsHttp::Keep_Alive);
 
         if (!mUsingSpdyVersion) {
             const char *cp = PL_strcasestr(val, "timeout=");

From e551237688a77ba01b9febe3be1e537cead1e7e4 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 18 Apr 2013 10:32:25 -0400
Subject: [PATCH 263/438] Bug 847279 - Fix incorrect relativesrcdir in other
 mochitest makefiles. r=mbrubeck

---
 dom/imptests/Makefile.in                                        | 2 +-
 dom/permission/tests/Makefile.in                                | 2 +-
 dom/plugins/test/mochitest/Makefile.in                          | 2 +-
 dom/tests/mochitest/crypto/Makefile.in                          | 2 +-
 layout/base/tests/chrome/Makefile.in                            | 2 +-
 security/manager/ssl/tests/mochitest/bugs/Makefile.in           | 2 +-
 security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in   | 2 +-
 .../ssl/tests/mochitest/stricttransportsecurity/Makefile.in     | 2 +-
 .../components/places/tests/mochitest/bug_411966/Makefile.in    | 2 +-
 .../components/places/tests/mochitest/bug_461710/Makefile.in    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dom/imptests/Makefile.in b/dom/imptests/Makefile.in
index ee1693503333..332c8967f760 100644
--- a/dom/imptests/Makefile.in
+++ b/dom/imptests/Makefile.in
@@ -6,7 +6,7 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imported-tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/permission/tests/Makefile.in b/dom/permission/tests/Makefile.in
index 9f8a8bdec7d9..af97961cd4de 100644
--- a/dom/permission/tests/Makefile.in
+++ b/dom/permission/tests/Makefile.in
@@ -7,7 +7,7 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/permission/tests
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in
index 51e95374ae26..b9c4d65cb0cb 100644
--- a/dom/plugins/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = dom/plugins/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/crypto/Makefile.in b/dom/tests/mochitest/crypto/Makefile.in
index 494c85ab3805..ce2e344a677d 100644
--- a/dom/tests/mochitest/crypto/Makefile.in
+++ b/dom/tests/mochitest/crypto/Makefile.in
@@ -6,7 +6,7 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/crypto
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/layout/base/tests/chrome/Makefile.in b/layout/base/tests/chrome/Makefile.in
index 591358eef435..b7f155c51d7c 100644
--- a/layout/base/tests/chrome/Makefile.in
+++ b/layout/base/tests/chrome/Makefile.in
@@ -6,7 +6,7 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = layout/base/test/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index 8981ea47a8d9..d08b4551b44e 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= security/ssl/bugs
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
index 6c89bba737a6..582ff18ba911 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= security/ssl/mixedcontent
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
index e431550c2bc7..1dde9f22d25f 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
@@ -6,7 +6,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= security/ssl/stricttransportsecurity
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
index 8d4991e3e04f..69bdc35452f3 100644
--- a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/places/tests/bug_411966
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
index 090b499b7228..aac587d78a81 100644
--- a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
@@ -7,7 +7,7 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/places/tests/bug_461710
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 

From 608458ac11108580a02499598deeb4b8404031ae Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Thu, 18 Apr 2013 10:32:25 -0400
Subject: [PATCH 264/438] Bug 847279 - Fix hardcoded path names in mochitests
 to match relativesrcdir. r=mbrubeck

---
 dom/plugins/test/mochitest/307-xo-redirect.sjs            | 2 +-
 dom/plugins/test/mochitest/test_busy_hang.xul             | 2 +-
 dom/plugins/test/mochitest/test_idle_hang.xul             | 2 +-
 .../test/mochitest/test_privatemode_perwindowpb.xul       | 4 +++-
 dom/plugins/test/mochitest/test_redirect_handling.html    | 2 +-
 .../test/mochitest/xulbrowser_plugin_visibility.xul       | 2 +-
 layout/base/tests/chrome/test_bug551434.html              | 2 +-
 .../ssl/tests/mochitest/mixedcontent/bug383369step2.html  | 2 +-
 .../manager/ssl/tests/mochitest/mixedcontent/iframe2.html | 2 +-
 .../tests/mochitest/mixedcontent/iframeMetaRedirect.html  | 2 +-
 .../tests/mochitest/mixedcontent/iframesecredirect.sjs    | 2 +-
 .../tests/mochitest/mixedcontent/iframeunsecredirect.sjs  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs   | 2 +-
 .../ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs | 2 +-
 .../ssl/tests/mochitest/mixedcontent/mixedContentTest.js  | 4 ++--
 .../tests/mochitest/mixedcontent/redirecttoemptyimage.sjs | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug329869.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug455367.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug472986.html  | 4 ++--
 .../ssl/tests/mochitest/mixedcontent/test_bug521461.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_cssBefore1.html | 2 +-
 .../tests/mochitest/mixedcontent/test_cssContent1.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_cssContent2.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_documentWrite1.html | 2 +-
 .../tests/mochitest/mixedcontent/test_documentWrite2.html | 2 +-
 .../mixedcontent/test_dynDelayedUnsecurePicture.html      | 6 +++---
 .../mixedcontent/test_dynDelayedUnsecureXHR.html          | 2 +-
 .../mixedcontent/test_dynUnsecureBackground.html          | 6 +++---
 .../mixedcontent/test_dynUnsecureIframeRedirect.html      | 4 ++--
 .../mochitest/mixedcontent/test_dynUnsecurePicture.html   | 6 +++---
 .../mixedcontent/test_dynUnsecurePicturePreload.html      | 2 +-
 .../mochitest/mixedcontent/test_dynUnsecureRedirect.html  | 6 +++---
 .../test_innerHtmlDelayedUnsecurePicture.html             | 2 +-
 .../mixedcontent/test_innerHtmlUnsecurePicture.html       | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_secureAll.html  | 8 ++++----
 .../tests/mochitest/mixedcontent/test_securePicture.html  | 2 +-
 .../mochitest/mixedcontent/test_unsecureBackground.html   | 2 +-
 .../tests/mochitest/mixedcontent/test_unsecureCSS.html    | 2 +-
 .../tests/mochitest/mixedcontent/test_unsecureIframe.html | 2 +-
 .../mochitest/mixedcontent/test_unsecureIframe2.html      | 2 +-
 .../mixedcontent/test_unsecureIframeMetaRedirect.html     | 2 +-
 .../mixedcontent/test_unsecureIframeRedirect.html         | 2 +-
 .../mochitest/mixedcontent/test_unsecurePicture.html      | 2 +-
 .../mixedcontent/test_unsecurePictureInIframe.html        | 2 +-
 .../mochitest/mixedcontent/test_unsecureRedirect.html     | 2 +-
 .../ssl/tests/mochitest/mixedcontent/unsecureIframe.html  | 2 +-
 .../tests/mochitest/mixedcontent/unsecurePictureDup.html  | 2 +-
 .../test_stricttransportsecurity.html                     | 2 +-
 .../test_sts_privatebrowsing_perwindowpb.html             | 4 ++--
 .../places/tests/mochitest/bug_411966/redirect.js         | 8 ++++----
 .../places/tests/mochitest/test_bug_411966.html           | 2 +-
 .../tests/mochitest/test_bug_461710_perwindowpb.html      | 4 ++--
 52 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/dom/plugins/test/mochitest/307-xo-redirect.sjs b/dom/plugins/test/mochitest/307-xo-redirect.sjs
index 639623c140c5..b880978cea80 100644
--- a/dom/plugins/test/mochitest/307-xo-redirect.sjs
+++ b/dom/plugins/test/mochitest/307-xo-redirect.sjs
@@ -1,6 +1,6 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarily");
-  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/loremipsum.txt");
+  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt");
   response.setHeader("Content-Type", "text/html");
 }
diff --git a/dom/plugins/test/mochitest/test_busy_hang.xul b/dom/plugins/test/mochitest/test_busy_hang.xul
index c93623810524..f4842c07e921 100644
--- a/dom/plugins/test/mochitest/test_busy_hang.xul
+++ b/dom/plugins/test/mochitest/test_busy_hang.xul
@@ -9,7 +9,7 @@
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
+          src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
   <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
     <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
   </body>
diff --git a/dom/plugins/test/mochitest/test_idle_hang.xul b/dom/plugins/test/mochitest/test_idle_hang.xul
index 57c1953b1f4d..e56412ef944f 100644
--- a/dom/plugins/test/mochitest/test_idle_hang.xul
+++ b/dom/plugins/test/mochitest/test_idle_hang.xul
@@ -9,7 +9,7 @@
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
+          src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
index 89f6eee9006a..780bdde8e487 100644
--- a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
+++ b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
@@ -8,6 +8,8 @@
   <title>NPAPI Private Mode Tests</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript"
+          src="chrome://mochikit/content/chrome-harness.js" />
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 <embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
@@ -52,7 +54,7 @@ function runTestsCallback() {
                     .rootTreeItem
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIDOMWindow);
-  var contentPage = "chrome://mochitests/content/chrome/dom/plugins/test/privatemode_perwindowpb.xul";
+  var contentPage = getRootDirectory(window.location.href) + "privatemode_perwindowpb.xul";
 
   function testOnWindow(aIsPrivate, aCallback) {
     var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});
diff --git a/dom/plugins/test/mochitest/test_redirect_handling.html b/dom/plugins/test/mochitest/test_redirect_handling.html
index 3eee5bdac215..e947d22a7366 100644
--- a/dom/plugins/test/mochitest/test_redirect_handling.html
+++ b/dom/plugins/test/mochitest/test_redirect_handling.html
@@ -12,7 +12,7 @@
     var p = document.getElementById("plugin1");
 
     var redirectingURL = "307-xo-redirect.sjs";
-    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/loremipsum.txt";
+    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt";
 
     var expectedWriteURL = "";
     var expectedNotifyStatus = -1;
diff --git a/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
index 0b4a3a35618d..a0e3fc4e107d 100644
--- a/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
+++ b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
@@ -24,7 +24,7 @@
     const nsIWebProgress = Components.interfaces.nsIWebProgress;
     const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
 
-    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/plugin_visibility_loader.html';
+    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/mochitest/plugin_visibility_loader.html';
 
     function ProgressListener() {
     }
diff --git a/layout/base/tests/chrome/test_bug551434.html b/layout/base/tests/chrome/test_bug551434.html
index e2d45c7dea7c..4118a2136cc6 100644
--- a/layout/base/tests/chrome/test_bug551434.html
+++ b/layout/base/tests/chrome/test_bug551434.html
@@ -15,7 +15,7 @@
 
 <input id="i3" onkeydown="gKeyDown3++; frames[0].document.getElementById('i4').focus();"
        onkeypress="gKeyPress3++;" onkeyup="gKeyUp3++;"/>
-<iframe id="iframe" src="http://example.org/chrome/layout/base/test/chrome/bug551434_childframe.html"></iframe>
+<iframe id="iframe" src="http://example.org/chrome/layout/base/tests/chrome/bug551434_childframe.html"></iframe>
 
 <script class="testbody" type="text/javascript">
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html b/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
index 8992b7467c09..be8925e98f24 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
@@ -13,7 +13,7 @@
     window.setTimeout(function () 
     {
       window.location = 
-        "https://example.com/tests/security/ssl/mixedcontent/bug383369step3.html?runtest";
+        "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html?runtest";
     }, 0);
   }
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html b/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
index efe92e346f85..0b6356934907 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
@@ -8,6 +8,6 @@
   <script>
     document.write(location.href);
   </script>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
index ccc3bddef131..d033f5b00be0 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <META http-equiv="Refresh"
-      Content="0; URL=http://example.com/tests/security/ssl/mixedcontent/iframe.html">
+      Content="0; URL=http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html">
 <html>
   <body>
     Redirecting by meta tag...
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
index ab58786d9240..ea93b80b7d58 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/iframe.html");
+  response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
index 5cb51671e1a4..937e29954f3f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/iframe.html");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
index 1a5bcc62d1b6..7af6116e1018 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
+  response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
index ba15359c1bad..a8eb26642ae8 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
index 73c3495a0c55..26142541affe 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
@@ -128,8 +128,8 @@ function finish()
     window.setTimeout(function()
     {
       window.location.assign(navigateToInsecure ?
-        "http://example.com/tests/security/ssl/mixedcontent/backward.html" :
-        "https://example.com/tests/security/ssl/mixedcontent/backward.html");
+        "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html" :
+        "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html");
     }, 0);
   }
   else
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs b/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
index 1f9a520f5162..4d85e1658171 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/emptyimage.sjs");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs");
 }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
index 889b84c130e1..49d5c41c633d 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
@@ -16,7 +16,7 @@
     window.setTimeout(function() 
     {
       var newElement = document.createElement("script");
-      newElement.src= "http://example.org/tests/security/ssl/mixedcontent/bug329869.js";
+      newElement.src= "http://example.org/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js";
       document.body.appendChild(newElement);
     }, 0);
   }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
index 3b57e92a8e80..c0b6e3ebbe60 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/redirecttoemptyimage.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
index 176c4725af0b..427e0fd70f42 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
@@ -21,7 +21,7 @@
   {
     var img1 = document.getElementById("img1");
     img1.addEventListener("load", onLoadFunction, false);
-    img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+    img1.src = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
   }
 
   function runTest()
@@ -40,6 +40,6 @@
 </head>
 
 <body>
-  <img id="img1" src="https://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
+  <img id="img1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
index 9b06e08e3f52..9d9d4de09fe6 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
@@ -16,7 +16,7 @@
 
   function runTest()
   {
-    window.location = "https://example.com/tests/security/ssl/mixedcontent/nocontent.sjs";
+    window.location = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs";
     window.setTimeout(function() {
       isSecurityState("insecure", "location.href doesn't effect the security state");
       is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content");
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
index a4a24167877a..59d2fa7a9dbb 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
@@ -12,7 +12,7 @@
   <style type="text/css">
     p:before
     {
-      content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
+      content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
     }
   </style>
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
index 1b347d435c9c..347382000a0d 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
@@ -13,7 +13,7 @@
   <style type="text/css">
     p
     {
-      content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
+      content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
     }
   </style>
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
index aa5e813bc451..dfcd7dd76199 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
@@ -20,7 +20,7 @@
   {
     isSecurityState("secure");
     document.getElementById("para").style.content =
-      "url('http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg')";
+      "url('http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg')";
 
     waitForSecurityState("broken", function()
     {
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
index 7e2356b009f1..b95a5caca349 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
@@ -30,7 +30,7 @@
 <body>
   <script class="testbody" type="text/javascript">
   document.write(
-    "<img src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />");
+    "<img src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />");
   </script>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
index 61fec12dcef1..a92288b7acdd 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
@@ -32,7 +32,7 @@
 <body>
   <script class="testbody" type="text/javascript">
   document.write(
-    "<iframe src='http://example.com/tests/security/ssl/mixedcontent/iframe.html'></iframe>");
+    "<iframe src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html'></iframe>");
   </script>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
index a441b1045fb2..c0684718faae 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
@@ -18,7 +18,7 @@
     window.setTimeout(function() {
       // Don't do this synchronously from onload handler
       document.getElementById("image1").src =
-        "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+        "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
     }, 0);
 
     waitForSecurityState("broken", function()
@@ -31,7 +31,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -41,6 +41,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
index c77053b6a8b5..d566a35947f7 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
@@ -22,7 +22,7 @@
       try
       {
         var req = new XMLHttpRequest();
-        req.open("GET", "http://example.com/tests/security/ssl/mixedcontent/alloworigin.sjs", false);
+        req.open("GET", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs", false);
         req.send(null);
 
         // Change should be immediate, the request was sent synchronously
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
index 4ab5cc3df776..352ae52efc66 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
@@ -18,7 +18,7 @@
   {
     isSecurityState("secure");
     document.body.background =
-      "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+      "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
     waitForSecurityState("broken", function() 
     {
@@ -30,7 +30,7 @@
   function afterNavigationTest()
   {
     is(document.body.background,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "document backround secure again");
     isSecurityState("secure", "secure after re-navigation");
     finish();
@@ -39,6 +39,6 @@
   </script>
 </head>
 
-<body background="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
+<body background="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
index 9dfb31a2244c..a9967228b4c5 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
@@ -25,7 +25,7 @@
     }
     
     iframe.src =
-      "https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs";
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs";
   }
 
   function afterNavigationTest()
@@ -38,6 +38,6 @@
 </head>
 
 <body>
-  <iframe id="iframe1" src="https://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe id="iframe1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
index b11189693910..aca7be9d1195 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
@@ -18,7 +18,7 @@
   {
     isSecurityState("secure");
     document.getElementById("image1").src =
-      "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+      "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
     window.setTimeout(function() {
       isSecurityState("broken", "src='http://...' changed to broken");
@@ -29,7 +29,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -39,6 +39,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
index e379730faacc..916245c303bd 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
@@ -13,7 +13,7 @@
   <script class="testbody" type="text/javascript">
 
   (new Image()).src =
-    "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+    "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
   function runTest()
   {
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
index 792500d3ef1e..86fd17e8dc2f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
@@ -12,7 +12,7 @@
   {
     isSecurityState("secure");
     document.getElementById("image1").src =
-      "https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs";
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs";
 
     window.setTimeout(function() {
       isSecurityState("broken", "src='redirect to unsecure' changed to broken");
@@ -23,7 +23,7 @@
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
@@ -33,6 +33,6 @@
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
index e09406375f4b..e226fd16be0b 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
@@ -19,7 +19,7 @@
     window.setTimeout(function() 
     {
       document.getElementById("buddy").innerHTML =
-        "<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
+        "<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
     }, 1);
 
     waitForSecurityState("broken", function() 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
index 63b907d902f9..43e27d414bee 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
@@ -17,7 +17,7 @@
     isSecurityState("secure");
     
     document.getElementById("buddy").innerHTML =
-      "<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
+      "<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
 
     window.setTimeout(function() {
       isSecurityState("broken", "innerHTML loading insecure changed to broken");
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
index 8e1942d54afc..087a31383521 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <link rel="stylesheet" type="text/css" 
-    href="https://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
+    href="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
 
   <script class="testbody" type="text/javascript">
 
@@ -34,8 +34,8 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
-  <img src="https://example.com/tests/security/ssl/mixedcontent/imgsecredirect.sjs" />
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframesecredirect.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs" />
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
index e31c3b21dc7f..d774f3bfdb08 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
index bf3453d8a572..6b1d88a4b100 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
@@ -29,6 +29,6 @@
   </script>
 </head>
 
-<body background="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
+<body background="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
index d868ce34cb40..8985fc7d85d2 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   
   <link rel="stylesheet" type="text/css" 
-    href="http://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
+    href="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
 
   <script class="testbody" type="text/javascript">
 
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
index 43a79084f926..717de60583b9 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
index 3410b982fdaf..bea0ebc1702f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframe2.html"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
index e35df266f2ec..a31090a4a208 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
@@ -30,7 +30,7 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeMetaRedirect.html"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html"></iframe>
 </body>
 </html>
  
\ No newline at end of file
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
index d3d3a7f28e1f..acdbe5fb1e68 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
@@ -30,7 +30,7 @@
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs"></iframe>
 </body>
 </html>
  
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
index 09cb6f7c5e13..fb66957d912c 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
index ad464e9649ee..fc336558e7ba 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/unsecureIframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html"></iframe>
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
index 9b512b1761e0..b2b1477c162f 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
@@ -30,6 +30,6 @@
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html b/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
index 6fec95b04de3..2282677418e4 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
@@ -4,6 +4,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html b/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
index e73b5e6e7860..770505ea11ed 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
@@ -28,6 +28,6 @@
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
 </body>
 </html>
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
index 803d9a23d6dc..d2468c8d66a5 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
@@ -12,7 +12,7 @@
   <script class="testbody" type="text/javascript">
   SimpleTest.waitForExplicitFinish();
 
-  const STSPATH = "/tests/security/ssl/stricttransportsecurity";
+  const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
 
   // initialized manually here
   var testsleft = {'plain': 4, 'subdom': 4};
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
index ef8a21ceb64d..2a847eeae0de 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
@@ -14,10 +14,10 @@
 
   const Cc = Components.classes;
   const Ci = Components.interfaces;
-  const STSPATH = "/tests/security/ssl/stricttransportsecurity";
+  const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
   const NUM_TEST_FRAMES = 4;
   const CONTENT_PAGE =
-    "http://mochi.test:8888/chrome/security/ssl/stricttransportsecurity/page_blank.html";
+    "http://mochi.test:8888/chrome/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html";
 
   // This is how many sub-tests (testframes) in each round.
   // When the round begins, this will be initialized.
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/redirect.js b/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
index da30e5629b38..f7aa720e44a9 100644
--- a/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
+++ b/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
@@ -33,10 +33,10 @@ function uri(URIString) {
   return ios.newURI(URIString, null, null);
 }
 
-var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TypedPage.htm");
-var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/ClickedPage.htm");
-var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TempRedirectPage.htm");
-var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/PermRedirectPage.htm");
+var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TypedPage.htm");
+var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/ClickedPage.htm");
+var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TempRedirectPage.htm");
+var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/PermRedirectPage.htm");
 
 // Stream Listener
 function StreamListener(aChannel, aCallbackFunc) {
diff --git a/toolkit/components/places/tests/mochitest/test_bug_411966.html b/toolkit/components/places/tests/mochitest/test_bug_411966.html
index cd855187579b..dce9fbb07522 100644
--- a/toolkit/components/places/tests/mochitest/test_bug_411966.html
+++ b/toolkit/components/places/tests/mochitest/test_bug_411966.html
@@ -6,7 +6,7 @@
   <head>
     <title>Test for Bug 411966</title>
     <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="bug_411966/redirect.js"></script>
+    <script type="text/javascript" src="mochitest/bug_411966/redirect.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   </head>
   <body>
diff --git a/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html b/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
index 48f5b9cc31c0..58d2b215d122 100644
--- a/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
+++ b/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
@@ -60,7 +60,7 @@ function waitForTrue(fn, onWaitComplete) {
 const kRed = "rgb(255, 0, 0)";
 const kBlue = "rgb(0, 0, 255)";
 
-var testpath = "/tests/toolkit/components/places/tests/mochitest/../bug_461710/";
+var testpath = "/tests/toolkit/components/places/tests/mochitest/bug_461710/";
 var prefix = "http://mochi.test:8888" + testpath;
 var subtests = [
                    "visited_page.html",   // 1
@@ -163,7 +163,7 @@ var mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
                     .rootTreeItem
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIDOMWindow);
-var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/../bug_461710/iframe.html";
+var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/bug_461710/iframe.html";
 
 function testOnWindow(aIsPrivate, aCallback) {
   var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});

From dfbc7a12f914bd475d1e77e56d5222f75674a7a6 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Thu, 18 Apr 2013 10:32:25 -0400
Subject: [PATCH 265/438] Bug 847279 - Update the android.json test exclusions
 to make new relativesrcdir paths. r=mbrubeck

---
 testing/mochitest/android.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/testing/mochitest/android.json b/testing/mochitest/android.json
index 7bc47e773d3a..0f83f1aaa84f 100644
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -295,12 +295,12 @@
  "parser/htmlparser/tests/mochitest/test_html5_tree_construction.html": "TIMED_OUT",
  "parser/htmlparser/tests/mochitest/test_html5_tree_construction_part2.html": "TIMED_OUT",
  "robocop": "TIMED_OUT",
- "security/ssl/bugs/test_bug480509.html": "",
- "security/ssl/bugs/test_bug483440.html": "",
- "security/ssl/bugs/test_bug484111.html": "",
- "security/ssl/mixedcontent": "TIMED_OUT",
- "security/ssl/stricttransportsecurity/test_stricttransportsecurity.html": "TIMED_OUT",
- "security/ssl/stricttransportsecurity/test_sts_privatebrowsing.html": "TIMED_OUT",
+ "security/manager/ssl/tests/mochitest/bugs/test_bug480509.html": "",
+ "security/manager/ssl/tests/mochitest/bugs/test_bug483440.html": "",
+ "security/manager/ssl/tests/mochitest/bugs/test_bug484111.html": "",
+ "security/manager/ssl/tests/mochitest/mixedcontent": "TIMED_OUT",
+ "security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html": "TIMED_OUT",
+ "security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing.html": "TIMED_OUT",
  "toolkit/components/alerts/test/test_alerts.html": "",
  "toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html": "",
  "toolkit/components/passwordmgr/test/test_master_password.html": "TIMED_OUT",

From 09696472291f87f867637f6741a4c52d85fd3bfd Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Apr 2013 10:32:26 -0400
Subject: [PATCH 266/438] Backed out 4 changesets (bug 834835) for making bug
 786539 nearly perma-orange.

---
 content/media/AudioStreamTrack.cpp          |  20 ---
 content/media/AudioStreamTrack.h            |  30 ----
 content/media/DOMMediaStream.cpp            | 157 +-------------------
 content/media/DOMMediaStream.h              |  30 +---
 content/media/Makefile.in                   |  11 +-
 content/media/MediaStreamTrack.cpp          |  51 -------
 content/media/MediaStreamTrack.h            |  63 --------
 content/media/VideoStreamTrack.cpp          |  20 ---
 content/media/VideoStreamTrack.h            |  30 ----
 content/media/moz.build                     |   6 -
 content/media/test/Makefile.in              |   1 -
 content/media/test/manifest.js              |  13 +-
 content/media/test/test_mozHasAudio.html    |   4 +-
 content/media/test/test_streams_tracks.html |  54 -------
 dom/bindings/Bindings.conf                  |  20 +--
 dom/webidl/AudioStreamTrack.webidl          |  16 --
 dom/webidl/MediaStream.webidl               |   4 +-
 dom/webidl/MediaStreamTrack.webidl          |  33 ----
 dom/webidl/VideoStreamTrack.webidl          |  19 ---
 dom/webidl/WebIDL.mk                        |   3 -
 20 files changed, 26 insertions(+), 559 deletions(-)
 delete mode 100644 content/media/AudioStreamTrack.cpp
 delete mode 100644 content/media/AudioStreamTrack.h
 delete mode 100644 content/media/MediaStreamTrack.cpp
 delete mode 100644 content/media/MediaStreamTrack.h
 delete mode 100644 content/media/VideoStreamTrack.cpp
 delete mode 100644 content/media/VideoStreamTrack.h
 delete mode 100644 content/media/test/test_streams_tracks.html
 delete mode 100644 dom/webidl/AudioStreamTrack.webidl
 delete mode 100644 dom/webidl/MediaStreamTrack.webidl
 delete mode 100644 dom/webidl/VideoStreamTrack.webidl

diff --git a/content/media/AudioStreamTrack.cpp b/content/media/AudioStreamTrack.cpp
deleted file mode 100644
index 1aa07d5f2506..000000000000
--- a/content/media/AudioStreamTrack.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
-/* 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 "AudioStreamTrack.h"
-
-#include "mozilla/dom/AudioStreamTrackBinding.h"
-
-namespace mozilla {
-namespace dom {
-
-JSObject*
-AudioStreamTrack::WrapObject(JSContext* aCx, JSObject* aScope)
-{
-  return AudioStreamTrackBinding::Wrap(aCx, aScope, this);
-}
-
-}
-}
diff --git a/content/media/AudioStreamTrack.h b/content/media/AudioStreamTrack.h
deleted file mode 100644
index db99bcd92621..000000000000
--- a/content/media/AudioStreamTrack.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
-/* 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/. */
-
-#ifndef AUDIOSTREAMTRACK_H_
-#define AUDIOSTREAMTRACK_H_
-
-#include "MediaStreamTrack.h"
-
-namespace mozilla {
-namespace dom {
-
-class AudioStreamTrack : public MediaStreamTrack {
-public:
-  AudioStreamTrack(DOMMediaStream* aStream, TrackID aTrackID)
-    : MediaStreamTrack(aStream, aTrackID) {}
-
-  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope);
-
-  virtual AudioStreamTrack* AsAudioStreamTrack() { return this; }
-
-  // WebIDL
-  virtual void GetKind(nsAString& aKind) { aKind.AssignLiteral("audio"); }
-};
-
-}
-}
-
-#endif /* AUDIOSTREAMTRACK_H_ */
diff --git a/content/media/DOMMediaStream.cpp b/content/media/DOMMediaStream.cpp
index c69c1ce2dc6b..fe5bb77c0415 100644
--- a/content/media/DOMMediaStream.cpp
+++ b/content/media/DOMMediaStream.cpp
@@ -9,11 +9,8 @@
 #include "mozilla/dom/MediaStreamBinding.h"
 #include "mozilla/dom/LocalMediaStreamBinding.h"
 #include "MediaStreamGraph.h"
-#include "AudioStreamTrack.h"
-#include "VideoStreamTrack.h"
 
 using namespace mozilla;
-using namespace mozilla::dom;
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMMediaStream)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
@@ -23,95 +20,13 @@ NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMMediaStream)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMMediaStream)
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(DOMMediaStream, mWindow, mTracks)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMMediaStream, mWindow)
 
 NS_IMPL_ISUPPORTS_INHERITED1(DOMLocalMediaStream, DOMMediaStream,
                              nsIDOMLocalMediaStream)
 
-class DOMMediaStream::StreamListener : public MediaStreamListener {
-public:
-  StreamListener(DOMMediaStream* aStream)
-    : mStream(aStream)
-  {}
-
-  // Main thread only
-  void Forget() { mStream = nullptr; }
-  DOMMediaStream* GetStream() { return mStream; }
-
-  class TrackChange : public nsRunnable {
-  public:
-    TrackChange(StreamListener* aListener,
-                TrackID aID, TrackTicks aTrackOffset,
-                uint32_t aEvents, MediaSegment::Type aType)
-      : mListener(aListener), mID(aID), mEvents(aEvents), mType(aType)
-    {
-    }
-
-    NS_IMETHOD Run()
-    {
-      NS_ASSERTION(NS_IsMainThread(), "main thread only");
-
-      DOMMediaStream* stream = mListener->GetStream();
-      if (!stream) {
-        return NS_OK;
-      }
-
-      nsRefPtr<MediaStreamTrack> track;
-      if (mEvents & MediaStreamListener::TRACK_EVENT_CREATED) {
-        track = stream->CreateDOMTrack(mID, mType);
-      } else {
-        track = stream->GetDOMTrackFor(mID);
-      }
-      if (mEvents & MediaStreamListener::TRACK_EVENT_ENDED) {
-        track->NotifyEnded();
-      }
-      return NS_OK;
-    }
-
-    StreamTime mEndTime;
-    nsRefPtr<StreamListener> mListener;
-    TrackID mID;
-    uint32_t mEvents;
-    MediaSegment::Type mType;
-  };
-
-  /**
-   * Notify that changes to one of the stream tracks have been queued.
-   * aTrackEvents can be any combination of TRACK_EVENT_CREATED and
-   * TRACK_EVENT_ENDED. aQueuedMedia is the data being added to the track
-   * at aTrackOffset (relative to the start of the stream).
-   * aQueuedMedia can be null if there is no output.
-   */
-  virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                        TrackRate aTrackRate,
-                                        TrackTicks aTrackOffset,
-                                        uint32_t aTrackEvents,
-                                        const MediaSegment& aQueuedMedia)
-  {
-    if (aTrackEvents & (TRACK_EVENT_CREATED | TRACK_EVENT_ENDED)) {
-      nsRefPtr<TrackChange> runnable =
-        new TrackChange(this, aID, aTrackOffset, aTrackEvents,
-                        aQueuedMedia.GetType());
-      NS_DispatchToMainThread(runnable);
-    }
-  }
-
-private:
-  // These fields may only be accessed on the main thread
-  DOMMediaStream* mStream;
-};
-
-DOMMediaStream::DOMMediaStream()
-  : mStream(nullptr), mHintContents(0)
-{
-  SetIsDOMBinding();
-}
-
 DOMMediaStream::~DOMMediaStream()
 {
-  if (mListener) {
-    mListener->Forget();
-  }
   if (mStream) {
     mStream->Destroy();
   }
@@ -129,28 +44,6 @@ DOMMediaStream::CurrentTime()
   return mStream ? MediaTimeToSeconds(mStream->GetCurrentTime()) : 0.0;
 }
 
-void
-DOMMediaStream::GetAudioTracks(nsTArray<nsRefPtr<AudioStreamTrack> >& aTracks)
-{
-  for (uint32_t i = 0; i < mTracks.Length(); ++i) {
-    AudioStreamTrack* t = mTracks[i]->AsAudioStreamTrack();
-    if (t) {
-      aTracks.AppendElement(t);
-    }
-  }
-}
-
-void
-DOMMediaStream::GetVideoTracks(nsTArray<nsRefPtr<VideoStreamTrack> >& aTracks)
-{
-  for (uint32_t i = 0; i < mTracks.Length(); ++i) {
-    VideoStreamTrack* t = mTracks[i]->AsVideoStreamTrack();
-    if (t) {
-      aTracks.AppendElement(t);
-    }
-  }
-}
-
 bool
 DOMMediaStream::IsFinished()
 {
@@ -163,7 +56,7 @@ DOMMediaStream::InitSourceStream(nsIDOMWindow* aWindow, uint32_t aHintContents)
   mWindow = aWindow;
   SetHintContents(aHintContents);
   MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
-  InitStreamCommon(gm->CreateSourceStream(this));
+  mStream = gm->CreateSourceStream(this);
 }
 
 void
@@ -172,17 +65,7 @@ DOMMediaStream::InitTrackUnionStream(nsIDOMWindow* aWindow, uint32_t aHintConten
   mWindow = aWindow;
   SetHintContents(aHintContents);
   MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
-  InitStreamCommon(gm->CreateTrackUnionStream(this));
-}
-
-void
-DOMMediaStream::InitStreamCommon(MediaStream* aStream)
-{
-  mStream = aStream;
-
-  // Setup track listener
-  mListener = new StreamListener(this);
-  aStream->AddListener(mListener);
+  mStream = gm->CreateTrackUnionStream(this);
 }
 
 already_AddRefed<DOMMediaStream>
@@ -207,40 +90,6 @@ DOMMediaStream::CombineWithPrincipal(nsIPrincipal* aPrincipal)
   return nsContentUtils::CombineResourcePrincipals(&mPrincipal, aPrincipal);
 }
 
-MediaStreamTrack*
-DOMMediaStream::CreateDOMTrack(TrackID aTrackID, MediaSegment::Type aType)
-{
-  MediaStreamTrack* track;
-  switch (aType) {
-  case MediaSegment::AUDIO:
-    track = new AudioStreamTrack(this, aTrackID);
-    break;
-  case MediaSegment::VIDEO:
-    track = new VideoStreamTrack(this, aTrackID);
-    break;
-  default:
-    MOZ_NOT_REACHED("Unhandled track type");
-    return nullptr;
-  }
-
-  mTracks.AppendElement(track);
-  return track;
-}
-
-MediaStreamTrack*
-DOMMediaStream::GetDOMTrackFor(TrackID aTrackID)
-{
-  for (uint32_t i = 0; i < mTracks.Length(); ++i) {
-    MediaStreamTrack* t = mTracks[i];
-    // We may add streams to our track list that are actually owned by
-    // a different DOMMediaStream. Ignore those.
-    if (t->GetTrackID() == aTrackID && t->GetStream() == this) {
-      return t;
-    }
-  }
-  return nullptr;
-}
-
 DOMLocalMediaStream::~DOMLocalMediaStream()
 {
   if (mStream) {
diff --git a/content/media/DOMMediaStream.h b/content/media/DOMMediaStream.h
index 868481fb590d..ce2946cea31c 100644
--- a/content/media/DOMMediaStream.h
+++ b/content/media/DOMMediaStream.h
@@ -11,7 +11,6 @@
 #include "nsIPrincipal.h"
 #include "nsWrapperCache.h"
 #include "nsIDOMWindow.h"
-#include "StreamBuffer.h"
 
 class nsXPCClassInfo;
 
@@ -31,12 +30,6 @@ namespace mozilla {
 
 class MediaStream;
 
-namespace dom {
-class MediaStreamTrack;
-class AudioStreamTrack;
-class VideoStreamTrack;
-}
-
 /**
  * DOM wrapper for MediaStreams.
  */
@@ -44,12 +37,12 @@ class DOMMediaStream : public nsIDOMMediaStream,
                        public nsWrapperCache
 {
   friend class DOMLocalMediaStream;
-  typedef dom::MediaStreamTrack MediaStreamTrack;
-  typedef dom::AudioStreamTrack AudioStreamTrack;
-  typedef dom::VideoStreamTrack VideoStreamTrack;
 
 public:
-  DOMMediaStream();
+  DOMMediaStream() : mStream(nullptr), mHintContents(0)
+  {
+    SetIsDOMBinding();
+  }
   virtual ~DOMMediaStream();
 
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMMediaStream)
@@ -61,11 +54,7 @@ public:
   }
   virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
 
-  // WebIDL
   double CurrentTime();
-  void GetAudioTracks(nsTArray<nsRefPtr<AudioStreamTrack> >& aTracks);
-  void GetVideoTracks(nsTArray<nsRefPtr<VideoStreamTrack> >& aTracks);
-
   MediaStream* GetStream() { return mStream; }
   bool IsFinished();
   /**
@@ -103,17 +92,9 @@ public:
   static already_AddRefed<DOMMediaStream>
   CreateTrackUnionStream(nsIDOMWindow* aWindow, uint32_t aHintContents = 0);
 
-  // Notifications from StreamListener
-  MediaStreamTrack* CreateDOMTrack(TrackID aTrackID, MediaSegment::Type aType);
-  MediaStreamTrack* GetDOMTrackFor(TrackID aTrackID);
-
 protected:
   void InitSourceStream(nsIDOMWindow* aWindow, uint32_t aHintContents);
   void InitTrackUnionStream(nsIDOMWindow* aWindow, uint32_t aHintContents);
-  void InitStreamCommon(MediaStream* aStream);
-
-  class StreamListener;
-  friend class StreamListener;
 
   // We need this to track our parent object.
   nsCOMPtr<nsIDOMWindow> mWindow;
@@ -125,9 +106,6 @@ protected:
   // If null, this stream can be used by anyone because it has no content yet.
   nsCOMPtr<nsIPrincipal> mPrincipal;
 
-  nsAutoTArray<nsRefPtr<MediaStreamTrack>,2> mTracks;
-  nsRefPtr<StreamListener> mListener;
-
   // tells the SDP generator about whether this
   // MediaStream probably has audio and/or video
   uint32_t mHintContents;
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 763b1fc28e1a..71e88e1dae73 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -16,27 +16,24 @@ FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
 CPPSRCS = \
-  AudioAvailableEventManager.cpp \
   AudioChannelFormat.cpp \
   AudioNodeEngine.cpp \
   AudioNodeStream.cpp \
   AudioSegment.cpp \
   AudioStream.cpp \
-  AudioStreamTrack.cpp \
   DecoderTraits.cpp \
   DOMMediaStream.cpp \
   FileBlockCache.cpp \
-  MediaCache.cpp \
+  MediaResource.cpp \
+  MediaStreamGraph.cpp \
+  AudioAvailableEventManager.cpp \
   MediaDecoder.cpp \
   MediaDecoderStateMachine.cpp \
   MediaDecoderReader.cpp \
-  MediaResource.cpp \
-  MediaStreamGraph.cpp \
-  MediaStreamTrack.cpp \
+  MediaCache.cpp \
   StreamBuffer.cpp \
   VideoFrameContainer.cpp \
   VideoSegment.cpp \
-  VideoStreamTrack.cpp \
   VideoUtils.cpp \
   $(NULL)
 
diff --git a/content/media/MediaStreamTrack.cpp b/content/media/MediaStreamTrack.cpp
deleted file mode 100644
index 01b108f3bc40..000000000000
--- a/content/media/MediaStreamTrack.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
-/* 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 "MediaStreamTrack.h"
-
-#include "DOMMediaStream.h"
-#include "nsIUUIDGenerator.h"
-#include "nsServiceManagerUtils.h"
-
-namespace mozilla {
-namespace dom {
-
-MediaStreamTrack::MediaStreamTrack(DOMMediaStream* aStream, TrackID aTrackID)
-  : mStream(aStream), mTrackID(aTrackID), mEnded(false)
-{
-  SetIsDOMBinding();
-
-  memset(&mID, 0, sizeof(mID));
-
-  nsresult rv;
-  nsCOMPtr<nsIUUIDGenerator> uuidgen =
-    do_GetService("@mozilla.org/uuid-generator;1", &rv);
-  if (uuidgen) {
-    uuidgen->GenerateUUIDInPlace(&mID);
-  }
-}
-
-MediaStreamTrack::~MediaStreamTrack()
-{
-}
-
-NS_IMPL_CYCLE_COLLECTION_INHERITED_1(MediaStreamTrack, nsDOMEventTargetHelper,
-                                     mStream)
-
-NS_IMPL_ADDREF_INHERITED(MediaStreamTrack, nsDOMEventTargetHelper)
-NS_IMPL_RELEASE_INHERITED(MediaStreamTrack, nsDOMEventTargetHelper)
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaStreamTrack)
-NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
-
-void
-MediaStreamTrack::GetId(nsAString& aID)
-{
-  char chars[NSID_LENGTH];
-  mID.ToProvidedString(chars);
-  aID = NS_ConvertASCIItoUTF16(chars);
-}
-
-}
-}
diff --git a/content/media/MediaStreamTrack.h b/content/media/MediaStreamTrack.h
deleted file mode 100644
index 61416a988c74..000000000000
--- a/content/media/MediaStreamTrack.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
-/* 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/. */
-
-#ifndef MEDIASTREAMTRACK_H_
-#define MEDIASTREAMTRACK_H_
-
-#include "nsDOMEventTargetHelper.h"
-#include "nsID.h"
-#include "StreamBuffer.h"
-
-namespace mozilla {
-
-class DOMMediaStream;
-
-namespace dom {
-
-class AudioStreamTrack;
-class VideoStreamTrack;
-
-/**
- * Class representing a track in a DOMMediaStream.
- */
-class MediaStreamTrack : public nsDOMEventTargetHelper {
-public:
-  /**
-   * aTrackID is the MediaStreamGraph track ID for the track in the
-   * MediaStream owned by aStream.
-   */
-  MediaStreamTrack(DOMMediaStream* aStream, TrackID aTrackID);
-  virtual ~MediaStreamTrack();
-
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaStreamTrack, nsDOMEventTargetHelper)
-
-  DOMMediaStream* GetParentObject() const { return mStream; }
-  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope) = 0;
-
-  DOMMediaStream* GetStream() const { return mStream; }
-  TrackID GetTrackID() const { return mTrackID; }
-  virtual AudioStreamTrack* AsAudioStreamTrack() { return nullptr; }
-  virtual VideoStreamTrack* AsVideoStreamTrack() { return nullptr; }
-
-  // WebIDL
-  virtual void GetKind(nsAString& aKind) = 0;
-  void GetId(nsAString& aID);
-  void GetLabel(nsAString& aLabel) { aLabel.Truncate(); }
-
-  // Notifications from the MediaStreamGraph
-  void NotifyEnded() { mEnded = true; }
-
-protected:
-  nsRefPtr<DOMMediaStream> mStream;
-  TrackID mTrackID;
-  nsID mID;
-  bool mEnded;
-};
-
-}
-}
-
-#endif /* MEDIASTREAMTRACK_H_ */
diff --git a/content/media/VideoStreamTrack.cpp b/content/media/VideoStreamTrack.cpp
deleted file mode 100644
index bacbad1045a1..000000000000
--- a/content/media/VideoStreamTrack.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
-/* 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 "VideoStreamTrack.h"
-
-#include "mozilla/dom/VideoStreamTrackBinding.h"
-
-namespace mozilla {
-namespace dom {
-
-JSObject*
-VideoStreamTrack::WrapObject(JSContext* aCx, JSObject* aScope)
-{
-  return VideoStreamTrackBinding::Wrap(aCx, aScope, this);
-}
-
-}
-}
diff --git a/content/media/VideoStreamTrack.h b/content/media/VideoStreamTrack.h
deleted file mode 100644
index 9fcd4acad1dd..000000000000
--- a/content/media/VideoStreamTrack.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
-/* 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/. */
-
-#ifndef VIDEOSTREAMTRACK_H_
-#define VIDEOSTREAMTRACK_H_
-
-#include "MediaStreamTrack.h"
-
-namespace mozilla {
-namespace dom {
-
-class VideoStreamTrack : public MediaStreamTrack {
-public:
-  VideoStreamTrack(DOMMediaStream* aStream, TrackID aTrackID)
-    : MediaStreamTrack(aStream, aTrackID) {}
-
-  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope);
-
-  virtual VideoStreamTrack* AsVideoStreamTrack() { return this; }
-
-  // WebIDL
-  virtual void GetKind(nsAString& aKind) { aKind.AssignLiteral("video"); }
-};
-
-}
-}
-
-#endif /* VIDEOSTREAMTRACK_H_ */
diff --git a/content/media/moz.build b/content/media/moz.build
index 464766e849de..5f256159bd2a 100644
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -74,9 +74,3 @@ EXPORTS += [
     'VorbisUtils.h',
 ]
 
-EXPORTS.mozilla.dom += [
-    'AudioStreamTrack.h',
-    'MediaStreamTrack.h',
-    'VideoStreamTrack.h',
-]
-
diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index df2849053cba..dbf727d81bf1 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -135,7 +135,6 @@ MOCHITEST_FILES = \
 		test_streams_srcObject.html \
 		test_reset_src.html \
 		test_streams_gc.html \
-		test_streams_tracks.html \
 		test_streams_autoplay.html \
 		$(filter disabled-for-intermittent-failures--bug-608634, test_error_in_video_document.html) \
 		$(NULL)
diff --git a/content/media/test/manifest.js b/content/media/test/manifest.js
index 205bebd7c87a..e6cf4d88364b 100644
--- a/content/media/test/manifest.js
+++ b/content/media/test/manifest.js
@@ -62,13 +62,12 @@ var gPausedAfterEndedTests = gSmallTests.concat([
   { name:"small-shot.ogg", type:"video/ogg", duration:0.276 }
 ]);
 
-// Test the mozHasAudio property, and APIs that detect different kinds of
-// tracks
-var gTrackTests = [
-  { name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444, hasAudio:true, hasVideo:false },
-  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266, size:28942, hasAudio:false, hasVideo:true },
-  { name:"short-video.ogv", type:"video/ogg", duration:1.081, hasAudio:true, hasVideo:true },
-  { name:"seek.webm", type:"video/webm", duration:3.966, size:215529, hasAudio:false, hasVideo:true },
+// Test the mozHasAudio property
+var gMozHasAudioTests = [
+  { name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444, hasAudio:undefined },
+  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266, size:28942, hasAudio:false },
+  { name:"short-video.ogv", type:"video/ogg", duration:1.081, hasAudio:true },
+  { name:"seek.webm", type:"video/webm", duration:3.966, size:215529, hasAudio:false },
   { name:"bogus.duh", type:"bogus/duh" }
 ];
 
diff --git a/content/media/test/test_mozHasAudio.html b/content/media/test/test_mozHasAudio.html
index 2a0bb341fbec..fff84baaad44 100644
--- a/content/media/test/test_mozHasAudio.html
+++ b/content/media/test/test_mozHasAudio.html
@@ -27,13 +27,13 @@ function startTest(test, token) {
 
   element.src = test.name;
   element.name = test.name;
-  element.hasAudio = elemType == "video" ? test.hasAudio : undefined;
+  element.hasAudio = test.hasAudio;
   element.addEventListener("loadedmetadata", onloadedmetadata, false);
 
   element.load();
 }
 
-manager.runTests(gTrackTests, startTest);
+manager.runTests(gMozHasAudioTests, startTest);
 
 </script>
 </pre>
diff --git a/content/media/test/test_streams_tracks.html b/content/media/test/test_streams_tracks.html
deleted file mode 100644
index 3ece1d4f26ba..000000000000
--- a/content/media/test/test_streams_tracks.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test MediaStreamTrack interfaces</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <script type="text/javascript" src="manifest.js"></script>
-</head>
-<body>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-var manager = new MediaTestManager;
-
-function testTracks(tracks, hasTrack, kind, src) {
-  is(tracks.length, hasTrack ? 1 : 0, "Correct track count for " + src);
-  for (var i = 0; i < tracks.length; ++i) {
-    var track = tracks[i];
-    is(track.kind, kind, "Correct track kind for track " + i + " of " + src);
-    var id = track.id;
-    ok(/\{........-....-....-....-............\}/.test(track.id),
-       "id " + track.id + " for track " + i + " of " + src + " has correct form");
-  }
-}
-
-function onended(e) {
-  var t = e.target;
-  var audioTracks = t.stream.getAudioTracks();
-  var videoTracks = t.stream.getVideoTracks();
-
-  testTracks(audioTracks, t.test.hasAudio, "audio", t.src);
-  testTracks(videoTracks, t.test.hasVideo, "video", t.src);
-
-  manager.finished(t.token);
-}
-
-function startTest(test, token) {
-  var element = document.createElement("video");
-
-  element.token = token;
-  manager.started(token);
-
-  element.src = test.name;
-  element.test = test;
-  element.stream = element.mozCaptureStreamUntilEnded();
-  element.addEventListener("ended", onended, false);
-
-  element.play();
-}
-
-manager.runTests(gTrackTests, startTest);
-</script>
-</pre>
-</body>
-</html>
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 30d6c3b07dad..0fb4a3e8065f 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -126,9 +126,6 @@ DOMInterfaces = {
     'nativeType': 'nsDOMBeforeUnloadEvent',
 },
 
-'AudioStreamTrack': {
-},
-
 'BiquadFilterNode': {
     'resultNotAddRefed': [ 'frequency', 'q', 'gain' ],
 },
@@ -552,11 +549,6 @@ DOMInterfaces = {
     'workers': True,
 }],
 
-'LocalMediaStream': {
-    'headerFile': 'DOMMediaStream.h',
-    'nativeType': 'mozilla::DOMLocalMediaStream'
-},
-
 'Location': {
     # NOTE: Before you turn on codegen for Location, make sure all the
     # Unforgeable stuff is dealt with.
@@ -575,6 +567,11 @@ DOMInterfaces = {
     'skipGen': True
 }],
 
+'LocalMediaStream': {
+    'headerFile': 'DOMMediaStream.h',
+    'nativeType': 'mozilla::DOMLocalMediaStream'
+},
+
 'MediaStreamList': {
     'headerFile': 'MediaStreamList.h',
     'wrapperCache': False,
@@ -583,10 +580,6 @@ DOMInterfaces = {
     'binaryNames': { '__indexedGetter': 'IndexedGetter' }
 },
 
-'MediaStreamTrack': {
-    'concrete': False
-},
-
 'MessageEvent': {
     'nativeType': 'nsDOMMessageEvent',
 },
@@ -1025,9 +1018,6 @@ DOMInterfaces = {
     'workers': True,
 }],
 
-'VideoStreamTrack': {
-},
-
 'WebGLActiveInfo': {
    'nativeType': 'mozilla::WebGLActiveInfo',
    'headerFile': 'WebGLContext.h',
diff --git a/dom/webidl/AudioStreamTrack.webidl b/dom/webidl/AudioStreamTrack.webidl
deleted file mode 100644
index 9fff71cedc36..000000000000
--- a/dom/webidl/AudioStreamTrack.webidl
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/.
- *
- * The origin of this IDL file is
- * http://dev.w3.org/2011/webrtc/editor/getusermedia.html
- *
- * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-// [Constructor(optional MediaTrackConstraints audioConstraints)]
-interface AudioStreamTrack : MediaStreamTrack {
-//    static sequence<DOMString> getSourceIds ();
-};
diff --git a/dom/webidl/MediaStream.webidl b/dom/webidl/MediaStream.webidl
index 7c1cc6df8cdd..632bbf569ea7 100644
--- a/dom/webidl/MediaStream.webidl
+++ b/dom/webidl/MediaStream.webidl
@@ -12,8 +12,8 @@
 
 interface MediaStream {
     // readonly attribute DOMString    id;
-    sequence<AudioStreamTrack> getAudioTracks ();
-    sequence<VideoStreamTrack> getVideoTracks ();
+    // sequence<MediaStreamTrack> getAudioTracks ();
+    // sequence<MediaStreamTrack> getVideoTracks ();
     // MediaStreamTrack           getTrackById (DOMString trackId);
     // void                       addTrack (MediaStreamTrack track);
     // void                       removeTrack (MediaStreamTrack track);
diff --git a/dom/webidl/MediaStreamTrack.webidl b/dom/webidl/MediaStreamTrack.webidl
deleted file mode 100644
index 3daaa3827681..000000000000
--- a/dom/webidl/MediaStreamTrack.webidl
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/.
- *
- * The origin of this IDL file is
- * http://dev.w3.org/2011/webrtc/editor/getusermedia.html
- *
- * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-interface MediaStreamTrack {
-    readonly    attribute DOMString             kind;
-    readonly    attribute DOMString             id;
-    readonly    attribute DOMString             label;
-//                attribute boolean               enabled;
-//    readonly    attribute MediaStreamTrackState readyState;
-//    readonly    attribute SourceTypeEnum        sourceType;
-//    readonly    attribute DOMString             sourceId;
-//                attribute EventHandler          onstarted;
-//                attribute EventHandler          onmute;
-//                attribute EventHandler          onunmute;
-//                attribute EventHandler          onended;
-//    any                    getConstraint (DOMString constraintName, optional boolean mandatory = false);
-//    void                   setConstraint (DOMString constraintName, any constraintValue, optional boolean mandatory = false);
-//    MediaTrackConstraints? constraints ();
-//    void                   applyConstraints (MediaTrackConstraints constraints);
-//    void                   prependConstraint (DOMString constraintName, any constraintValue);
-//    void                   appendConstraint (DOMString constraintName, any constraintValue);
-//                attribute EventHandler          onoverconstrained;
-//    void                   stop ();
-};
diff --git a/dom/webidl/VideoStreamTrack.webidl b/dom/webidl/VideoStreamTrack.webidl
deleted file mode 100644
index b194d5c9fae1..000000000000
--- a/dom/webidl/VideoStreamTrack.webidl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/.
- *
- * The origin of this IDL file is
- * http://dev.w3.org/2011/webrtc/editor/getusermedia.html
- *
- * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-// [Constructor(optional MediaTrackConstraints videoConstraints)]
-interface VideoStreamTrack : MediaStreamTrack {
-//    static sequence<DOMString> getSourceIds ();
-//    void                       takePhoto ();
-//                attribute EventHandler onphoto;
-//                attribute EventHandler onphotoerror;
-};
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index ff086114c60e..e3be80f1894f 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -20,7 +20,6 @@ webidl_files = \
   AudioListener.webidl \
   AudioNode.webidl \
   AudioParam.webidl \
-  AudioStreamTrack.webidl \
   Attr.webidl \
   BatteryManager.webidl \
   BeforeUnloadEvent.webidl \
@@ -155,7 +154,6 @@ webidl_files = \
   Location.webidl \
   MediaError.webidl \
   MediaStream.webidl \
-  MediaStreamTrack.webidl \
   MessageEvent.webidl \
   MouseEvent.webidl \
   MouseScrollEvent.webidl \
@@ -300,7 +298,6 @@ webidl_files = \
   UndoManager.webidl \
   URLUtils.webidl \
   USSDReceivedEvent.webidl \
-  VideoStreamTrack.webidl \
   XMLDocument.webidl \
   XMLHttpRequest.webidl \
   XMLHttpRequestEventTarget.webidl \

From 6734d048dda81e7bdfa0bae7388d8b6bfe0a7bf2 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Thu, 18 Apr 2013 16:48:37 +0200
Subject: [PATCH 267/438] Bug 825739 - Add logging for intermittent
 browser_bookmark_titles.js failure

---
 browser/base/content/test/browser_bookmark_titles.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/test/browser_bookmark_titles.js b/browser/base/content/test/browser_bookmark_titles.js
index 709ce02d7514..5f7c11053501 100644
--- a/browser/base/content/test/browser_bookmark_titles.js
+++ b/browser/base/content/test/browser_bookmark_titles.js
@@ -24,7 +24,14 @@ function generatorTest() {
     let browser = gBrowser.selectedBrowser;
     browser.stop(); // stop the about:blank load.
 
-    browser.addEventListener("DOMContentLoaded", nextStep, true);
+    browser.addEventListener("DOMContentLoaded", event => {
+        if (event.originalTarget != browser.contentDocument ||
+            event.target.location.href == "about:blank") {
+            info("skipping spurious load event");
+            return;
+        }
+        nextStep();
+    }, true);
     registerCleanupFunction(function () {
         browser.removeEventListener("DOMContentLoaded", nextStep, true);
         gBrowser.removeCurrentTab();
@@ -66,6 +73,8 @@ function generatorTest() {
 // Bookmark the current page and confirm that the new bookmark has the expected
 // title. (Then delete the bookmark.)
 function checkBookmark(uri, expected_title) {
+    is(gBrowser.selectedBrowser.currentURI.spec, uri,
+       "Trying to bookmark the expected uri");
     PlacesCommandHook.bookmarkCurrentPage(false);
 
     let id = PlacesUtils.getMostRecentBookmarkForURI(PlacesUtils._uri(uri));

From 9a696d5e68448b8fbe2cb12d70f0ae01b15dfea2 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 18 Apr 2013 16:50:13 +0200
Subject: [PATCH 268/438] Fixup for bug 859705 - Add missing return. r=me.
 DONTBUILD

---
 testing/xpcshell/remotexpcshelltests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index e460b2e3ccf8..d4eb8f593825 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -155,6 +155,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
                         self.device.pushFile(os.path.join(dir, info.filename), remoteFile)
             finally:
                 shutil.rmtree(dir)
+            return
 
         for file in os.listdir(self.localLib):
             if (file.endswith(".so")):

From d2e3f9737a66d5aec4a4ea64f3390825ef602949 Mon Sep 17 00:00:00 2001
From: Yiming Yang <yiyang@mozilla.com>
Date: Wed, 10 Apr 2013 16:55:43 -0700
Subject: [PATCH 269/438] Bug 850819 - Send touch/mouse/click events in action
 chains, r=mdas

---
 .../client/marionette/marionette.py           |   4 +
 .../tests/unit/test_single_finger.py          |  58 +++++-
 .../client/marionette/tests/unit/test_tap.py  |  64 +++++++
 .../marionette/tests/unit/unit-tests.ini      |   4 +
 .../client/marionette/www/testAction.html     |  85 +++++++++
 testing/marionette/marionette-actors.js       |  18 ++
 testing/marionette/marionette-listener.js     | 176 ++++++++++++++++--
 7 files changed, 392 insertions(+), 17 deletions(-)
 create mode 100644 testing/marionette/client/marionette/tests/unit/test_tap.py

diff --git a/testing/marionette/client/marionette/marionette.py b/testing/marionette/client/marionette/marionette.py
index 49b9da3601df..e11986308a58 100644
--- a/testing/marionette/client/marionette/marionette.py
+++ b/testing/marionette/client/marionette/marionette.py
@@ -449,6 +449,10 @@ class Marionette(object):
         response = self._send_message('setSearchTimeout', 'ok', value=timeout)
         return response
 
+    def send_mouse_event(self, send):
+        response = self._send_message('sendMouseEvent', 'ok', value=send)
+        return response
+
     @property
     def current_window_handle(self):
         self.window = self._send_message('getWindow', 'value')
diff --git a/testing/marionette/client/marionette/tests/unit/test_single_finger.py b/testing/marionette/client/marionette/tests/unit/test_single_finger.py
index 3d2659999cd4..2971ba972faf 100644
--- a/testing/marionette/client/marionette/tests/unit/test_single_finger.py
+++ b/testing/marionette/client/marionette/tests/unit/test_single_finger.py
@@ -5,7 +5,7 @@
 import time
 from marionette_test import MarionetteTestCase
 from marionette import Actions
-from errors import NoSuchElementException
+from errors import NoSuchElementException, MarionetteException
 
 class testSingleFinger(MarionetteTestCase):
     def test_wait(self):
@@ -60,6 +60,56 @@ class testSingleFinger(MarionetteTestCase):
         action.release()
         self.assertRaises(NoSuchElementException, action.perform)
 
+    def test_mouse_wait(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(True)
+        action = Actions(self.marionette)
+        button = self.marionette.find_element("id", "mozMouse")
+        action.press(button).wait().release().perform()
+        time.sleep(15)
+        self.assertEqual("MouseClick", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_mouse_wait_more(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(True)
+        action = Actions(self.marionette)
+        button = self.marionette.find_element("id", "mozMouse")
+        action.press(button).wait(0.1).release().perform()
+        time.sleep(15)
+        self.assertEqual("MouseClick", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_mouse_no_wait(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(True)
+        action = Actions(self.marionette)
+        button = self.marionette.find_element("id", "mozMouse")
+        action.press(button).release().perform()
+        time.sleep(15)
+        self.assertEqual("MouseClick", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_no_mouse_wait(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(False)
+        action = Actions(self.marionette)
+        button = self.marionette.find_element("id", "mozMouse")
+        action.press(button).wait().release().perform()
+        time.sleep(15)
+        self.assertEqual("TouchEnd", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_no_mouse_no_wait(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(False)
+        action = Actions(self.marionette)
+        button = self.marionette.find_element("id", "mozMouse")
+        action.press(button).release().perform()
+        time.sleep(15)
+        self.assertEqual("TouchEnd", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
     def test_long_press(self):
         testTouch = self.marionette.absolute_url("testAction.html")
         self.marionette.navigate(testTouch)
@@ -71,3 +121,9 @@ class testSingleFinger(MarionetteTestCase):
         action.release().perform()
         time.sleep(10)
         self.assertEqual("End", self.marionette.execute_script("return document.getElementById('mozLinkCopy').innerHTML;"))
+
+    def test_wrong_value(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.assertRaises(MarionetteException, self.marionette.send_mouse_event, "boolean")
+
diff --git a/testing/marionette/client/marionette/tests/unit/test_tap.py b/testing/marionette/client/marionette/tests/unit/test_tap.py
new file mode 100644
index 000000000000..d4c25eb15b08
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/test_tap.py
@@ -0,0 +1,64 @@
+# 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/.
+
+import time
+from marionette_test import MarionetteTestCase
+from marionette import HTMLElement
+
+class testSingleFinger(MarionetteTestCase):
+    def test_mouse_single_tap(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(True)
+        button = self.marionette.find_element("id", "mozMouse")
+        button.single_tap()
+        time.sleep(15)
+        self.assertEqual("MouseClick", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_mouse_double_tap(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(True)
+        button = self.marionette.find_element("id", "mozMouse")
+        button.double_tap()
+        time.sleep(15)
+        self.assertEqual("MouseClick2", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_touch(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(False)
+        button = self.marionette.find_element("id", "mozMouse")
+        button.single_tap()
+        time.sleep(10)
+        self.assertEqual("TouchEnd", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_dbtouch(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(False)
+        button = self.marionette.find_element("id", "mozMouse")
+        button.double_tap()
+        time.sleep(10)
+        self.assertEqual("TouchEnd2", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_press_release(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(True)
+        button = self.marionette.find_element("id", "mozMouse")
+        button_id = button.press(0, 0)
+        button.release(button_id, 0, 0)
+        time.sleep(10)
+        self.assertEqual("MouseClick", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
+
+    def test_no_press_release(self):
+        testTouch = self.marionette.absolute_url("testAction.html")
+        self.marionette.navigate(testTouch)
+        self.marionette.send_mouse_event(False)
+        button = self.marionette.find_element("id", "mozMouse")
+        button_id = button.press()
+        button.release(button_id)
+        time.sleep(10)
+        self.assertEqual("TouchEnd", self.marionette.execute_script("return document.getElementById('mozMouse').innerHTML;"))
diff --git a/testing/marionette/client/marionette/tests/unit/unit-tests.ini b/testing/marionette/client/marionette/tests/unit/unit-tests.ini
index ab7567e215d9..c8f1dc275403 100644
--- a/testing/marionette/client/marionette/tests/unit/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit/unit-tests.ini
@@ -64,6 +64,10 @@ browser = false
 b2g = true
 browser = false
 
+[test_tap.py]
+b2g = true
+browser = false
+
 [test_simpletest_pass.js]
 [test_simpletest_sanity.py]
 [test_simpletest_chrome.js]
diff --git a/testing/marionette/client/marionette/www/testAction.html b/testing/marionette/client/marionette/www/testAction.html
index 1c0026058836..502925f1fb8c 100644
--- a/testing/marionette/client/marionette/www/testAction.html
+++ b/testing/marionette/client/marionette/www/testAction.html
@@ -22,6 +22,8 @@
   <button id="mozLinkCopy2" style="position:absolute;left:80px;top:455px;" type="button" allowevents=true>Button4</button>
   <!-- "mozLinkCancel" listens for a touchdown and touchcancel -->
   <button id="mozLinkCancel" style="position:absolute;left:0px;top:255px;" type="button" allowevents=true>Button5</button>
+  <!-- "mozMouse" listens for mouse events -->
+  <button id="mozMouse" style="position:absolute;left:0px;top:305px;" type="button" allowevents=true>Button7</button>
   <script type="text/javascript">
     window.ready = true;
     var press = document.getElementById("mozLink");
@@ -29,6 +31,7 @@
     var third = document.getElementById("mozLinkStart");
     var fourth = document.getElementById("mozLinkCopy2");
     var fifth = document.getElementById("mozLinkCancel");
+    var sixth = document.getElementById("mozMouse");
     // touchmove and touchend must be performed on the same element as touchstart
     // here is press for vertical move
     press.addEventListener("touchstart", function(){changePressText("mozLink")}, false);
@@ -49,6 +52,88 @@
     // here is fifth for a cancel
     fifth.addEventListener("touchstart", function(){changePressText("mozLinkCancel")}, false);
     fifth.addEventListener("touchcancel", function(){changeClickText("mozLinkCancel")}, false);
+    // here is sixth for mouse event
+    sixth.addEventListener("touchstart", function(){changeMouseText("TouchStart")}, false);
+    sixth.addEventListener("touchend", function(){changeMouseText("TouchEnd")}, false);
+    sixth.addEventListener("mousemove", function(){changeMouseText("MouseMove")}, false);
+    sixth.addEventListener("mousedown", function(){changeMouseText("MouseDown")}, false);
+    sixth.addEventListener("mouseup", function(){changeMouseText("MouseUp")}, false);
+    sixth.addEventListener("click", function(){changeMouseText("MouseClick")}, false);
+    function changeMouseText(strId) {
+      var mouse = document.getElementById("mozMouse");
+      switch(strId) {
+        case "TouchStart":
+          if (mouse.innerHTML == "MouseClick") {
+            mouse.innerHTML = "TouchStart2";
+          }
+          else if (mouse.innerHTML == "TouchEnd") {
+            mouse.innerHTML = "TouchStart2";
+          }
+          else {
+            mouse.innerHTML = strId;
+          }
+          break;
+        case "TouchEnd":
+          if (mouse.innerHTML == "TouchStart") {
+            mouse.innerHTML = strId;
+          }
+          else if (mouse.innerHTML == "TouchStart2") {
+            mouse.innerHTML = "TouchEnd2";
+          }
+          else {
+            mouse.innerHTML = "Error";
+          }
+          break;
+        case "MouseMove":
+          if (mouse.innerHTML == "TouchEnd") {
+            mouse.innerHTML = strId;
+          }
+          else if (mouse.innerHTML == "TouchEnd2") {
+            mouse.innerHTML = "MouseMove2";
+          }
+          else {
+            mouse.innerHTML = "Error";
+          }
+          break;
+        case "MouseDown":
+          if (mouse.innerHTML == "MouseMove") {
+            mouse.innerHTML = strId;
+          }
+          else if (mouse.innerHTML == "MouseMove2") {
+            mouse.innerHTML = "MouseDown2";
+          }
+          else {
+            mouse.innerHTML = "Error";
+          }
+          break;
+        case "MouseUp":
+          if (mouse.innerHTML == "MouseDown") {
+            mouse.innerHTML = strId;
+          }
+          else if (mouse.innerHTML == "MouseDown2") {
+            mouse.innerHTML = "MouseUp2";
+          }
+          else {
+            mouse.innerHTML = "Error";
+          }
+          break;
+        case "MouseClick":
+          if (mouse.innerHTML == "MouseUp") {
+            mouse.innerHTML = strId;
+          }
+          else if (mouse.innerHTML == "MouseUp2") {
+            mouse.innerHTML = "MouseClick2";
+          }
+          else {
+            mouse.innerHTML = "Error";
+          }
+          break;
+        default:
+          mouse.innerHTML = "Error";
+          break;
+      }
+    }
+
     function changePressText(strId) {
       var press = document.getElementById(strId);
       press.innerHTML = "Start";
diff --git a/testing/marionette/marionette-actors.js b/testing/marionette/marionette-actors.js
index 98572c732a92..33c9b83c34e3 100644
--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -1324,6 +1324,23 @@ MarionetteDriverActor.prototype = {
     }
   },
 
+/**
+ * Set a value to decide if sending mouse event
+ *
+ * @param object aRequest
+ *        'value' holds the boolean value
+ */
+ sendMouseEvent: function MDA_sendMouseEvent(aRequest) {
+   this.command_id = this.getCommandId();
+   if (this.context == "chrome") {
+     this.sendError("Not in Chrome", 500, null, this.command_id);
+    }
+    else {
+      this.sendAsync("sendMouseEvent", {value: aRequest.value,
+                                        command_id: this.command_id});
+    }
+ },
+
   /**
    * Set timeout for page loading, searching and scripts
    *
@@ -2308,6 +2325,7 @@ MarionetteDriverActor.prototype.requestTypes = {
   "executeAsyncScript": MarionetteDriverActor.prototype.executeWithCallback,
   "executeJSScript": MarionetteDriverActor.prototype.executeJSScript,
   "setSearchTimeout": MarionetteDriverActor.prototype.setSearchTimeout,
+  "sendMouseEvent": MarionetteDriverActor.prototype.sendMouseEvent,
   "findElement": MarionetteDriverActor.prototype.findElement,
   "findElements": MarionetteDriverActor.prototype.findElements,
   "clickElement": MarionetteDriverActor.prototype.clickElement,
diff --git a/testing/marionette/marionette-listener.js b/testing/marionette/marionette-listener.js
index 8181478a3ed8..9cf6946e3387 100644
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -68,6 +68,10 @@ let touchIds = {};
 let multiLast = {};
 // last touch for single finger
 let lastTouch = null;
+// last touch type
+let isTouchStart = false;
+// whether to send mouse event
+let mouseEvent = true;
 /**
  * Called when listener is first started up. 
  * The listener sends its unique window ID and its current URI to the actor.
@@ -113,6 +117,7 @@ function startListeners() {
   addMessageListenerId("Marionette:cancelTouch", cancelTouch);
   addMessageListenerId("Marionette:actionChain", actionChain);
   addMessageListenerId("Marionette:multiAction", multiAction);
+  addMessageListenerId("Marionette:sendMouseEvent", sendMouseEvent);
   addMessageListenerId("Marionette:setSearchTimeout", setSearchTimeout);
   addMessageListenerId("Marionette:goUrl", goUrl);
   addMessageListenerId("Marionette:getUrl", getUrl);
@@ -207,6 +212,7 @@ function deleteSession(msg) {
   removeMessageListenerId("Marionette:cancelTouch", cancelTouch);
   removeMessageListenerId("Marionette:actionChain", actionChain);
   removeMessageListenerId("Marionette:multiAction", multiAction);
+  removeMessageListenerId("Marionette:sendMouseEvent", sendMouseEvent);
   removeMessageListenerId("Marionette:setSearchTimeout", setSearchTimeout);
   removeMessageListenerId("Marionette:goUrl", goUrl);
   removeMessageListenerId("Marionette:getTitle", getTitle);
@@ -562,6 +568,20 @@ function executeWithCallback(msg, useFinish) {
   }
 }
 
+/**
+ * This function sets a value for mouseEvent to decide if we want to send mouse events
+ */
+function sendMouseEvent(msg) {
+  let command_id = msg.json.command_id;
+  if (typeof msg.json.value === 'boolean') {
+      mouseEvent = msg.json.value;
+      sendOk(msg.json.command_id);
+  }
+  else {
+    sendError("Json value is not boolean as expected", 500, null, command_id);
+  }
+}
+
 /**
  * This function creates a touch event given a touch type and a touch
  */
@@ -571,6 +591,75 @@ function emitTouchEvent(type, touch) {
   domWindowUtils.sendTouchEvent(type, [touch.identifier], [touch.screenX], [touch.screenY], [touch.radiusX], [touch.radiusY], [touch.rotationAngle], [touch.force], 1, 0);
 }
 
+/**
+ * This function emit mouse event
+ *   @param: doc is the current document
+ *           type is the type of event to dispatch
+ *           detail is the number of clicks, button notes the mouse button
+ *           elClientX and elClientY are the coordinates of the mouse relative to the viewport
+ */
+function emitMouseEvent(doc, type, detail, button, elClientX, elClientY) {
+  var win = doc.defaultView;
+  // Figure out the element the mouse would be over at (x, y)
+  var target = doc.elementFromPoint(elClientX, elClientY);
+  utils.synthesizeMouse(target, win.mozInnerScreenX, win.mozInnerScreenY, {type: type, button: button, clickCount: detail}, win);
+}
+
+/**
+ * This function create a mouse and emit mouse events
+ * @param 'xt' and 'yt' are functions of t that specify the mouse coordinates at time t
+ */
+function mouse(doc, duration, xt, yt, then, detail, button) {
+  detail = detail || 1;
+  button = button || 0;
+  var x = xt;
+  if (typeof xt !== 'function') {
+    x = function(t) {
+      return xt[0] + t / duration * (xt[1] - xt[0]);
+    }
+  }
+  var y = yt;
+  if (typeof yt !== 'function') {
+    y = function(t) {
+      return yt[0] + t / duration * (yt[1] - yt[0]);
+    }
+  }
+  // viewport coordinates
+  var clientX = Math.round(x(0)), clientY = Math.round(y(0));
+  // Remember the coordinates
+  var lastX = clientX, lastY = clientY;
+  emitMouseEvent(doc, 'mousedown', detail, button, clientX, clientY);
+  // now send a sequence of mousemove events followed by mouse up
+  let startTime = Date.now();
+  checkTimer.initWithCallback(nextEvent, EVENT_INTERVAL, Ci.nsITimer.TYPE_ONE_SHOT);
+  function nextEvent() {
+    // figure out if we've sent all the mousemove events
+    var time = Date.now();
+    var dt = time - startTime;
+    let last = dt + EVENT_INTERVAL / 2 > duration;
+    // New coordinates of the touch
+    clientX = Math.round(x(dt));
+    clientY = Math.round(y(dt));
+    // If we moved, send a move event
+    if (clientX !== lastX || clientY !== lastY) { // If we moved
+      lastX = clientX;
+      lastY = clientY;
+      emitMouseEvent(doc, 'mousemove', detail, button, clientX, clientY);
+    }
+    // If this was the last move, send a mouse up and call the callback
+    // Otherwise, schedule the next move event
+    if (last) {
+      emitMouseEvent(doc, 'mouseup', detail, button, lastX, lastY);
+      if (then) {
+        checkTimer.initWithCallback(then, 0, Ci.nsITimer.TYPE_ONE_SHOT);
+      }
+    }
+    else {
+      checkTimer.initWithCallback(nextEvent, EVENT_INTERVAL, Ci.nsITimer.TYPE_ONE_SHOT);
+    }
+  }
+}
+
 /**
  * This function creates a touch and emit touch events
  * @param 'xt' and 'yt' are two-element array [from, to] and then is a callback that will be invoked after touchend event is sent
@@ -775,7 +864,14 @@ function singleTap(msg) {
       y = '50%';
     }
     let c = coordinates(el, x, y);
-    touch(el, 3000, [c.x0, c.x0], [c.y0, c.y0], null);
+    if (mouseEvent) {
+      touch(el, 25, [c.x0, c.x0], [c.y0, c.y0], function() {
+        mousetap(el, 25, c.x0, c.y0, 1, 0, null);
+      });
+    }
+    else {
+      touch(el, 25, [c.x0, c.x0], [c.y0, c.y0], null);
+    }
     sendOk(msg.json.command_id);
   }
   catch (e) {
@@ -783,6 +879,17 @@ function singleTap(msg) {
   }
 }
 
+/**
+ * Function that perform a mouse tap
+ */
+function mousetap(target, duration, x, y, detail, button, then) {
+  var doc = target.ownerDocument;
+  detail = detail || 1;
+  button = button || 0;
+  emitMouseEvent(doc, 'mousemove', detail, button, x, y);
+  mouse(doc, duration, [x, x], [y, y], then, detail, button);
+}
+
 /**
  * Function that performs a double tap
  */
@@ -804,13 +911,36 @@ function doubleTap(msg) {
       y = '50%';
     }
     let c = coordinates(el, x, y);
-    touch(el, 25, [c.x0, c.x0], [c.y0, c.y0], function() {
-      // When the first tap is done, start a timer for interval ms
-      checkTimer.initWithCallback(function() {
-          //After interval ms, send the second tap
-          touch(el, 25, [c.x0, c.x0], [c.y0, c.y0], null);
-      }, 50, Ci.nsITimer.TYPE_ONE_SHOT);
-    });
+    if (mouseEvent) {
+      touch(el, 25, [c.x0, c.x0], [c.y0, c.y0], function() {
+        // When the first tap is done, start a timer for interval ms
+        checkTimer.initWithCallback(function() {
+          //After interval ms, send the first mouse tap
+          mousetap(el, 25, c.x0, c.y0, 1, 0, function() {
+            // when the first tap is done, start a timer for interval ms
+            checkTimer.initWithCallback(function() {
+              //After interval ms, send the second tap
+              touch(el, 25, [c.x0, c.x0], [c.y0, c.y0], function() {
+                // when the second tap is done, start a timer for interval ms
+                checkTimer.initWithCallback(function() {
+                  //After interval ms, send the mousetap
+                  mousetap(el, 25, c.x0, c.y0, 2, 0, null);
+                }, 50, Ci.nsITimer.TYPE_ONE_SHOT);
+              });
+            }, 50, Ci.nsITimer.TYPE_ONE_SHOT);
+          });
+        }, 50, Ci.nsITimer.TYPE_ONE_SHOT);
+      });
+    }
+    else {
+      touch(el, 25, [c.x0, c.x0], [c.y0, c.y0], function() {
+        // When the first tap is done, start a timer for interval ms
+        checkTimer.initWithCallback(function() {
+            //After interval ms, send the second tap
+            touch(el, 25, [c.x0, c.x0], [c.y0, c.y0], null);
+        }, 50, Ci.nsITimer.TYPE_ONE_SHOT);
+      });
+    }
     sendOk(msg.json.command_id);
   }
   catch (e) {
@@ -883,6 +1013,7 @@ function release(msg) {
       el = startTouch.target;
       let corx = msg.json.corx;
       let cory = msg.json.cory;
+      var isTap = true;
       if (!checkVisible(el, command_id)) {
         sendError("Element is not currently visible and may not be manipulated", 11, null, command_id);
         return;
@@ -891,8 +1022,12 @@ function release(msg) {
       if (touch.clientX != startTouch.clientX ||
           touch.clientY != startTouch.clientY) {
         emitTouchEvent('touchmove', touch);
+        isTap = false;
       }
       emitTouchEvent('touchend', touch);
+      if (isTap && mouseEvent) {
+        mousetap(el, 25, touch.clientX, touch.clientY, 1, 0, null);
+      }
       delete touchIds[id];
       sendOk(msg.json.command_id);
     }
@@ -946,6 +1081,7 @@ function actions(finger, touchId, command_id, i){
   let corx;
   let cory;
   let touch;
+  let contextmenu = false;
   i++;
   switch(command) {
     case 'press':
@@ -959,15 +1095,8 @@ function actions(finger, touchId, command_id, i){
       }
       touch = createATouch(el, corx, cory, touchId);
       lastTouch = touch;
+      isTouchStart = true;
       emitTouchEvent('touchstart', touch);
-      // check if it's a long press
-      // standard waiting time to fire contextmenu
-      let standard = Services.prefs.getIntPref("ui.click_hold_context_menus.delay");
-      // long press only happens when wait follows press
-      if (finger[i] != undefined && finger[i][0] == 'wait' && finger[i][1] != null && finger[i][1]*1000 >= standard) {
-        finger[i][1] = finger[i][1] - standard/1000;
-        finger.splice(i, 0, ['wait', standard/1000], ['longPress']);
-      }
       actions(finger,touchId, command_id, i);
       break;
     case 'release':
@@ -978,6 +1107,10 @@ function actions(finger, touchId, command_id, i){
       touch = lastTouch;
       lastTouch = null;
       emitTouchEvent('touchend', touch);
+      if (isTouchStart && mouseEvent) {
+        mousetap(touch.target, 25, touch.clientX, touch.clientY, 1, 0, null);
+      }
+      isTouchStart = false;
       actions(finger, touchId, command_id, i);
       break;
     case 'move':
@@ -993,6 +1126,7 @@ function actions(finger, touchId, command_id, i){
       cory = boxTarget.top - boxStart.top + boxTarget.height * 0.5;
       touch = createATouch(startElement, corx, cory, touchId);
       lastTouch = touch;
+      isTouchStart = false;
       emitTouchEvent('touchmove', touch);
       actions(finger, touchId, command_id, i);
       break;
@@ -1012,12 +1146,19 @@ function actions(finger, touchId, command_id, i){
           screenY = clientY + win.mozInnerScreenY;
       touch = doc.createTouch(win, el, touchId, pageX, pageY, screenX, screenY, clientX, clientY);
       lastTouch = touch;
+      isTouchStart = false;
       emitTouchEvent('touchmove', touch);
       actions(finger, touchId, command_id, i);
       break;
     case 'wait':
       if (pack[1] != null ) {
         let time = pack[1]*1000;
+        // standard waiting time to fire contextmenu
+        let standard = Services.prefs.getIntPref("ui.click_hold_context_menus.delay");
+        if (time >= standard && isTouchStart && !contextmenu) {
+            finger.splice(i, 0, ['longPress'], ['wait', (time-standard)/1000]);
+            time = standard;
+        }
         checkTimer.initWithCallback(function(){actions(finger, touchId, command_id, i);}, time, Ci.nsITimer.TYPE_ONE_SHOT);
       }
       else {
@@ -1028,9 +1169,12 @@ function actions(finger, touchId, command_id, i){
       touch = lastTouch;
       emitTouchEvent('touchcancel', touch);
       lastTouch = null;
+      isTouchStart = false;
       actions(finger, touchId, command_id, i);
       break;
     case 'longPress':
+      isTouchStart = false;
+      contextmenu = true;
       let event = curWindow.document.createEvent('HTMLEvents');
       event.initEvent('contextmenu',
                       true,

From b0b3600214070f0f34935e67fbd408b6cf747425 Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Wed, 17 Apr 2013 20:05:19 -0400
Subject: [PATCH 270/438] Bug 857367 - Remove DecodePool::mShuttingDown, which
 is unnecessary. r=seth

--HG--
extra : rebase_source : a323f90de5d1616f50a6d9aa717c7b423f230c92
---
 image/src/RasterImage.cpp | 9 +++------
 image/src/RasterImage.h   | 7 +++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index bcc2b5c0f2bc..966718bbb009 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -3514,8 +3514,7 @@ RasterImage::DecodePool::Singleton()
 }
 
 RasterImage::DecodePool::DecodePool()
-  : mThreadPoolMutex("Thread Pool")
-  , mShuttingDown(false)
+ : mThreadPoolMutex("Thread Pool")
 {
   if (gMultithreadedDecoding) {
     mThreadPool = do_CreateInstance(NS_THREADPOOL_CONTRACTID);
@@ -3552,7 +3551,6 @@ RasterImage::DecodePool::Observe(nsISupports *subject, const char *topic,
     MutexAutoLock threadPoolLock(mThreadPoolMutex);
     threadPool = mThreadPool;
     mThreadPool = nullptr;
-    mShuttingDown = true;
   }
 
   if (threadPool) {
@@ -3584,10 +3582,9 @@ RasterImage::DecodePool::RequestDecode(RasterImage* aImg)
 
     aImg->mDecodeRequest->mRequestStatus = DecodeRequest::REQUEST_PENDING;
     nsRefPtr<DecodeJob> job = new DecodeJob(aImg->mDecodeRequest, aImg);
+
     MutexAutoLock threadPoolLock(mThreadPoolMutex);
-    if (mShuttingDown) {
-      // Just drop the job on the floor; we won't need it.
-    } else if (!gMultithreadedDecoding || !mThreadPool) {
+    if (!gMultithreadedDecoding || !mThreadPool) {
       NS_DispatchToMainThread(job);
     } else {
       mThreadPool->Dispatch(job, nsIEventTarget::DISPATCH_NORMAL);
diff --git a/image/src/RasterImage.h b/image/src/RasterImage.h
index 5d85d988c4b2..3356522fb3ed 100644
--- a/image/src/RasterImage.h
+++ b/image/src/RasterImage.h
@@ -525,12 +525,11 @@ private:
 
   private: /* members */
 
-    // mThreadPoolMutex protects both mThreadPool and mShuttingDown. For all
-    // RasterImages R, R::mDecodingMutex must be acquired before
-    // mThreadPoolMutex if both are acquired; the other order may cause deadlock.
+    // mThreadPoolMutex protects mThreadPool. For all RasterImages R,
+    // R::mDecodingMutex must be acquired before mThreadPoolMutex if both are
+    // acquired; the other order may cause deadlock.
     mozilla::Mutex          mThreadPoolMutex;
     nsCOMPtr<nsIThreadPool> mThreadPool;
-    bool                    mShuttingDown;
   };
 
   class DecodeDoneWorker : public nsRunnable

From 027d6f3063f512cb0790c450e975d797e3a30938 Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Wed, 17 Apr 2013 20:05:49 -0400
Subject: [PATCH 271/438] Bug 860149 - Mark ourselves as doing synchronous
 decoding when writing directly to decoders in AddSourceData. r=seth

--HG--
extra : rebase_source : 1d48d2ba8bc880bb9a52fd1f9f6a95849f12992a
---
 image/src/RasterImage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index 966718bbb009..c5c0c4a7f5cf 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -1669,7 +1669,9 @@ RasterImage::AddSourceData(const char *aBuffer, uint32_t aCount)
   // write the data directly to the decoder. (If we haven't gotten the size,
   // we'll queue up the data and write it out when we do.)
   if (!StoringSourceData() && mHasSize) {
+    mDecoder->SetSynchronous(true);
     rv = WriteToDecoder(aBuffer, aCount);
+    mDecoder->SetSynchronous(false);
     CONTAINER_ENSURE_SUCCESS(rv);
 
     // We're not storing source data, so this data is probably coming straight

From e73c910d3239a3fa5217e91f60198e862b2ca413 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Thu, 18 Apr 2013 16:27:37 +0100
Subject: [PATCH 272/438] bug 857089 - add a device-pixel zoom level to image
 viewer. r=bz

---
 .../html/document/public/nsIImageDocument.idl |  18 +-
 content/html/document/src/ImageDocument.cpp   | 264 ++++++++++++++----
 .../html/document/test/test_bug369370.html    |  23 +-
 .../global/media/TopLevelImageDocument.css    |   3 +-
 .../global/media/TopLevelImageDocument.css    |   3 +-
 5 files changed, 249 insertions(+), 62 deletions(-)

diff --git a/content/html/document/public/nsIImageDocument.idl b/content/html/document/public/nsIImageDocument.idl
index 5c09f6ca8210..889acfdb9d6b 100644
--- a/content/html/document/public/nsIImageDocument.idl
+++ b/content/html/document/public/nsIImageDocument.idl
@@ -11,7 +11,7 @@
 
 interface imgIRequest;
 
-[scriptable, uuid(7b80eebc-c98e-4461-8bdb-6e3b6e828890)]
+[scriptable, uuid(0A70F5AF-2A78-4B52-9D96-11FF2A091E88)]
 interface nsIImageDocument : nsISupports {
 
   /* Whether the pref for image resizing has been set. */
@@ -23,20 +23,34 @@ interface nsIImageDocument : nsISupports {
   /* Whether the image has been resized to fit visible area. */
   readonly attribute boolean imageIsResized;
 
+  /* Whether the image has been scaled to device-pixel size. */
+  readonly attribute boolean imageIsScaledToDevicePixels;
+
   /* The image request being displayed in the content area */
   readonly attribute imgIRequest imageRequest;
 
   /* Resize the image to fit visible area. */
   void shrinkToFit();
 
-  /* Restore image original size. */
+  /* Restore image original size (1:1 image pixels : CSS px). */
   void restoreImage();
 
+  /* Set image to display at 1:1 image pixel : device-pixel size.
+   * If CSS px == device pixels, this is equivalent to restoreImage().
+   */
+  void scaleToDevicePixels();
+
   /* Restore the image, trying to keep a certain pixel in the same position.
    * The coordinate system is that of the shrunken image.
    */
   void restoreImageTo(in long x, in long y);
 
+  /* Scale to 1:1 device-pixel size, trying to keep a certain pixel
+   * in the same position.
+   * The coordinate system is that of the shrunken image.
+   */
+  void scaleToDevicePixelsTo(in long x, in long y);
+
   /* A helper method for switching between states.
    * The switching logic is as follows. If the image has been resized
    * restore image original size, otherwise if the image is overflowing
diff --git a/content/html/document/src/ImageDocument.cpp b/content/html/document/src/ImageDocument.cpp
index b95cf153f6ce..e3f88b2a3b28 100644
--- a/content/html/document/src/ImageDocument.cpp
+++ b/content/html/document/src/ImageDocument.cpp
@@ -41,6 +41,7 @@
 #include "nsIScrollableFrame.h"
 #include "nsContentUtils.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/HTMLImageElement.h"
 #include "mozilla/Preferences.h"
 #include <algorithm>
 
@@ -110,19 +111,37 @@ protected:
 
   void UpdateTitleAndCharset();
 
-  nsresult ScrollImageTo(int32_t aX, int32_t aY, bool restoreImage);
+  enum eScaleOptions {
+    eDevicePixelScale,
+    eCSSPixelScale
+  };
+  nsresult ScrollImageTo(int32_t aX, int32_t aY, eScaleOptions aScaleOption);
 
-  float GetRatio() {
+  float GetDevicePixelSizeInCSSPixels() {
+    nsIPresShell *shell = GetShell();
+    if (!shell) {
+      return 1.0f;
+    }
+    return shell->GetPresContext()->DevPixelsToFloatCSSPixels(1);
+  }
+
+  float GetShrinkToFitRatio() {
     return std::min(mVisibleWidth / mImageWidth,
                     mVisibleHeight / mImageHeight);
   }
 
+  float GetCurrentRatio() {
+    return mImageIsScaledToDevicePixels ? GetDevicePixelSizeInCSSPixels() :
+           mImageIsResized ? GetShrinkToFitRatio() : 1.0f;
+  }
+
   void ResetZoomLevel();
   float GetZoomLevel();
 
   enum eModeClasses {
     eNone,
     eShrinkToFit,
+    eScaleToDevicePixels,
     eOverflowing
   };
   void SetModeClass(eModeClasses mode);
@@ -140,8 +159,12 @@ protected:
   bool                          mResizeImageByDefault;
   bool                          mClickResizingEnabled;
   bool                          mImageIsOverflowing;
-  // mImageIsResized is true if the image is currently resized
+  // mImageIsResized is true if the image is resized to fit the window;
+  // mImageIsScaledToDevicePixels is true if the image is scaled to
+  // the 1:1 device-pixel size.
+  // These two flags cannot both be true at the same time.
   bool                          mImageIsResized;
+  bool                          mImageIsScaledToDevicePixels;
   // mShouldResize is true if the image should be resized when it doesn't fit
   // mImageIsResized cannot be true when this is false, but mImageIsResized
   // can be false when this is true
@@ -395,6 +418,13 @@ ImageDocument::GetImageIsResized(bool* aImageIsResized)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+ImageDocument::GetImageIsScaledToDevicePixels(bool* aImageIsScaledToDevPix)
+{
+  *aImageIsScaledToDevPix = mImageIsScaledToDevicePixels;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 ImageDocument::GetImageRequest(imgIRequest** aImageRequest)
 {
@@ -422,17 +452,13 @@ ImageDocument::ShrinkToFit()
   // Keep image content alive while changing the attributes.
   nsCOMPtr<nsIContent> imageContent = mImageContent;
   nsCOMPtr<nsIDOMHTMLImageElement> image = do_QueryInterface(mImageContent);
-  image->SetWidth(std::max(1, NSToCoordFloor(GetRatio() * mImageWidth)));
-  image->SetHeight(std::max(1, NSToCoordFloor(GetRatio() * mImageHeight)));
-  
-  // The view might have been scrolled when zooming in, scroll back to the
-  // origin now that we're showing a shrunk-to-window version.
-  (void) ScrollImageTo(0, 0, false);
+  image->SetWidth(std::max(1, NSToCoordFloor(GetShrinkToFitRatio() * mImageWidth)));
+  image->SetHeight(std::max(1, NSToCoordFloor(GetShrinkToFitRatio() * mImageHeight)));
 
   SetModeClass(eShrinkToFit);
-  
+
   mImageIsResized = true;
-  
+
   UpdateTitleAndCharset();
 
   return NS_OK;
@@ -441,31 +467,82 @@ ImageDocument::ShrinkToFit()
 NS_IMETHODIMP
 ImageDocument::RestoreImageTo(int32_t aX, int32_t aY)
 {
-  return ScrollImageTo(aX, aY, true);
+  return ScrollImageTo(aX, aY, eCSSPixelScale);
+}
+
+NS_IMETHODIMP
+ImageDocument::ScaleToDevicePixelsTo(int32_t aX, int32_t aY)
+{
+  return ScrollImageTo(aX, aY, eDevicePixelScale);
 }
 
 nsresult
-ImageDocument::ScrollImageTo(int32_t aX, int32_t aY, bool restoreImage)
+ImageDocument::ScrollImageTo(int32_t aX, int32_t aY,
+                             eScaleOptions aScaleOption)
 {
-  float ratio = GetRatio();
-
-  if (restoreImage) {
-    RestoreImage();
-    FlushPendingNotifications(Flush_Layout);
-  }
+  // Here, (aX, aY) is a position (in CSS pixels) within the displayed image
+  // (at its current scale) that we want to place as close as possible to the
+  // same position on screen after rescaling according to aScaleOption.
 
   nsIPresShell *shell = GetShell();
-  if (!shell)
+  if (!shell) {
     return NS_OK;
+  }
 
   nsIScrollableFrame* sf = shell->GetRootScrollFrameAsScrollable();
-  if (!sf)
+  if (!sf) {
     return NS_OK;
+  }
+
+  // To figure out the unscaled image pixel location of interest, we need to
+  // undo the scaling from image pixels to the current display.
+  float ratio = GetCurrentRatio();
+  float imageX = aX / ratio;
+  float imageY = aY / ratio;
+
+  // And to preserve its position on screen, we'll need to account for the
+  // original position of the client rect, before it is moved/resized by
+  // rescaling the image.
+  nsRefPtr<nsClientRect> clientRect =
+    mImageContent->AsElement()->GetBoundingClientRect();
+  float origLeft = clientRect->Left();
+  float origTop = clientRect->Top();
+
+  // Update scaling and flush layout, so that we can get the new client rect.
+  switch (aScaleOption) {
+  case eDevicePixelScale:
+    ScaleToDevicePixels();
+    break;
+  case eCSSPixelScale:
+    RestoreImage();
+    break;
+  }
+  FlushPendingNotifications(Flush_Layout);
+
+  nsPoint scroll = sf->GetScrollPosition();
+
+  // Now update scroll to put the desired image pixel (at the new scale) at
+  // its original position, adjusting for the possibly-moved client rect.
+  clientRect = mImageContent->AsElement()->GetBoundingClientRect();
+  float clientLeft = clientRect->Left();
+  float clientTop = clientRect->Top();
+  ratio = GetCurrentRatio();
+
+  // Here (client{Left,Top} + image{X,Y}*ratio) is the new viewport-relative
+  // position of the click point in CSS px, while (orig{Left,Top} + a{X,Y}) is
+  // its old viewport-relative position. Adjust scroll pos by the difference.
+  scroll.x +=
+    nsPresContext::CSSPixelsToAppUnits((clientLeft + imageX * ratio) -
+                                       (origLeft + aX));
+  scroll.y +=
+    nsPresContext::CSSPixelsToAppUnits((clientTop + imageY * ratio) -
+                                       (origTop + aY));
+
+  // Finally set the scroll position (note that scrolling will be pinned to
+  // the limits of the frame's scrollable range, so we don't need to check
+  // for negative or excessively large scroll values here).
+  sf->ScrollTo(scroll, nsIScrollableFrame::INSTANT);
 
-  nsRect portRect = sf->GetScrollPortRect();
-  sf->ScrollTo(nsPoint(nsPresContext::CSSPixelsToAppUnits(aX/ratio) - portRect.width/2,
-                       nsPresContext::CSSPixelsToAppUnits(aY/ratio) - portRect.height/2),
-               nsIScrollableFrame::INSTANT);
   return NS_OK;
 }
 
@@ -479,21 +556,53 @@ ImageDocument::RestoreImage()
   nsCOMPtr<nsIContent> imageContent = mImageContent;
   imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::width, true);
   imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::height, true);
-  
-  if (mImageIsOverflowing) {
+
+  // the "overflowing" mode really means "we could zoom out", so it applies
+  // if we are truly overflowing, OR if there's a device-pixel scale that
+  // would be smaller than the original (css-pixel) size
+  if (mImageIsOverflowing || GetDevicePixelSizeInCSSPixels() < 1.0f) {
     SetModeClass(eOverflowing);
   }
   else {
     SetModeClass(eNone);
   }
-  
+
   mImageIsResized = false;
-  
+  mImageIsScaledToDevicePixels = false;
+
   UpdateTitleAndCharset();
 
   return NS_OK;
 }
 
+NS_IMETHODIMP
+ImageDocument::ScaleToDevicePixels()
+{
+  if (!mImageContent) {
+    return NS_OK;
+  }
+
+  float ratio = GetDevicePixelSizeInCSSPixels();
+  if (ratio == 1.0f) {
+    // if CSS px == device pix, we don't treat this as a separate scale option
+    return RestoreImage();
+  }
+
+  nsCOMPtr<nsIDOMHTMLImageElement> image = do_QueryInterface(mImageContent);
+  image->SetWidth(std::max(1, NSToCoordFloor(ratio * mImageWidth)));
+  image->SetHeight(std::max(1, NSToCoordFloor(ratio * mImageHeight)));
+
+  SetModeClass(eScaleToDevicePixels);
+
+  mImageIsResized = false;
+  mImageIsScaledToDevicePixels = true;
+
+  UpdateTitleAndCharset();
+
+  return NS_OK;
+}
+
+// TODO: make this cycle through the new ScaleToDevicePixels size as well
 NS_IMETHODIMP
 ImageDocument::ToggleImageSize()
 {
@@ -502,8 +611,7 @@ ImageDocument::ToggleImageSize()
     mShouldResize = false;
     ResetZoomLevel();
     RestoreImage();
-  }
-  else if (mImageIsOverflowing) {
+  } else if (mImageIsOverflowing) {
     ResetZoomLevel();
     ShrinkToFit();
   }
@@ -564,6 +672,12 @@ ImageDocument::SetModeClass(eModeClasses mode)
     classList->Remove(NS_LITERAL_STRING("shrinkToFit"), rv);
   }
 
+  if (mode == eScaleToDevicePixels) {
+    classList->Add(NS_LITERAL_STRING("scaleToDevicePixels"), rv);
+  } else {
+    classList->Remove(NS_LITERAL_STRING("scaleToDevicePixels"), rv);
+  }
+
   if (mode == eOverflowing) {
     classList->Add(NS_LITERAL_STRING("overflowing"), rv);
   } else {
@@ -614,29 +728,75 @@ ImageDocument::HandleEvent(nsIDOMEvent* aEvent)
   aEvent->GetType(eventType);
   if (eventType.EqualsLiteral("resize")) {
     CheckOverflowing(false);
+    return NS_OK;
   }
-  else if (eventType.EqualsLiteral("click") && mClickResizingEnabled) {
+
+  if (eventType.EqualsLiteral("click") && mClickResizingEnabled) {
     ResetZoomLevel();
     mShouldResize = true;
-    if (mImageIsResized) {
-      int32_t x = 0, y = 0;
-      nsCOMPtr<nsIDOMMouseEvent> event(do_QueryInterface(aEvent));
-      if (event) {
-        event->GetClientX(&x);
-        event->GetClientY(&y);
-        int32_t left = 0, top = 0;
-        nsCOMPtr<nsIDOMHTMLElement> htmlElement =
-          do_QueryInterface(mImageContent);
-        htmlElement->GetOffsetLeft(&left);
-        htmlElement->GetOffsetTop(&top);
-        x -= left;
-        y -= top;
-      }
-      mShouldResize = false;
-      RestoreImageTo(x, y);
+
+    float devPixelRatio = GetDevicePixelSizeInCSSPixels();
+    float shrinkToFitRatio = GetShrinkToFitRatio();
+
+    // Figure out the target pixel to use if the image does not
+    // completely fit in the window after resizing.
+    int32_t x = 0, y = 0;
+    nsCOMPtr<nsIDOMMouseEvent> event(do_QueryInterface(aEvent));
+    if (event) {
+      event->GetClientX(&x);
+      event->GetClientY(&y);
+      // Adjust for any current scroll amount to get a location within
+      // the image as a whole (but still at its scaled size)
+      nsRefPtr<nsClientRect> clientRect =
+        mImageContent->AsElement()->GetBoundingClientRect();
+      x -= NSToIntRound(clientRect->Left());
+      y -= NSToIntRound(clientRect->Top());
     }
-    else if (mImageIsOverflowing) {
-      ShrinkToFit();
+
+    if (mImageIsResized || mImageIsScaledToDevicePixels) {
+      // if CSS px == dev pix, there's only one thing to do here
+      if (devPixelRatio == 1.0f) {
+        RestoreImageTo(x, y);
+        mShouldResize = false;
+        return NS_OK;
+      }
+
+      if (mImageIsResized) {
+        // currently at shrink-to-fit size;
+        // if scaling to device pixels would make it bigger, do that;
+        // else scale to original 1:1 size
+        if (devPixelRatio > shrinkToFitRatio) {
+          ScaleToDevicePixelsTo(x, y);
+        } else {
+          RestoreImageTo(x, y);
+        }
+        mShouldResize = false;
+      } else {
+        if (shrinkToFitRatio > devPixelRatio && shrinkToFitRatio < 1.0f) {
+          ShrinkToFit();
+        } else {
+          RestoreImageTo(x, y);
+          mShouldResize = false;
+        }
+      }
+      return NS_OK;
+    }
+
+    if (mImageIsOverflowing) {
+      // If the image is overflowing, we will shrink to the smaller
+      // of our possible sizes
+      if (devPixelRatio < shrinkToFitRatio) {
+        ScaleToDevicePixelsTo(x, y);
+        mShouldResize = false;
+      } else {
+        ShrinkToFit();
+      }
+      return NS_OK;
+    }
+
+    if (devPixelRatio != 1.0f) {
+      ScaleToDevicePixelsTo(x, y);
+      mShouldResize = false;
     }
   }
 
@@ -792,9 +952,9 @@ ImageDocument::UpdateTitleAndCharset()
   }
 
   nsXPIDLString status;
-  if (mImageIsResized) {
+  if (mImageIsResized || mImageIsScaledToDevicePixels) {
     nsAutoString ratioStr;
-    ratioStr.AppendInt(NSToCoordFloor(GetRatio() * 100));
+    ratioStr.AppendInt(NSToCoordFloor(GetCurrentRatio() * 100));
 
     const PRUnichar* formatString[1] = { ratioStr.get() };
     mStringBundle->FormatStringFromName(NS_LITERAL_STRING("ScaledImage").get(),
diff --git a/content/html/document/test/test_bug369370.html b/content/html/document/test/test_bug369370.html
index 52fd79ecd4eb..90e46018f4a2 100644
--- a/content/html/document/test/test_bug369370.html
+++ b/content/html/document/test/test_bug369370.html
@@ -46,18 +46,23 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=369370
 
         // ========== test 1 ==========
         // Click in the upper left to zoom in
-        var event = makeClickFor(25,25);
+        var event = makeClickFor(25, 25);
         img.dispatchEvent(event);
         ok(true, "----- click 1 -----");
 
         is(img.width,  800, "image width");
         is(img.height, 600, "image height");
-        is(kidDoc.body.scrollLeft,  0, "Checking scrollLeft");
-        is(kidDoc.body.scrollTop,   0, "Checking scrollTop");
+
+        // The image pixel at (25, 25) in the scaled image will be
+        // (50, 50) in the original image. To maintain its screen
+        // location, the image should have been scrolled up and left
+        // by (25, 25) px at its new size.
+        is(kidDoc.body.scrollLeft,  25, "Checking scrollLeft");
+        is(kidDoc.body.scrollTop,   25, "Checking scrollTop");
 
         // ========== test 2 ==========
         // Click there again to zoom out
-        event = makeClickFor(25,25);
+        event = makeClickFor(25, 25);
         img.dispatchEvent(event);
         ok(true, "----- click 2 -----");
 
@@ -74,8 +79,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=369370
 
         is(img.width,  800, "image width");
         is(img.height, 600, "image height");
-        is(kidDoc.body.scrollLeft,  400, "Checking scrollLeft");
-        is(kidDoc.body.scrollTop,   300, "Checking scrollTop");
+
+        // The image pixel at (350, 250) in the scaled image will be
+        // (700, 500) in the original image. To maintain its screen
+        // location, the image should have been scrolled up and left
+        // by (350, 250) px at its new size.
+
+        is(kidDoc.body.scrollLeft,  350, "Checking scrollLeft");
+        is(kidDoc.body.scrollTop,   250, "Checking scrollTop");
 
         // ========== test 4 ==========
         // Click there again to zoom out
diff --git a/toolkit/themes/osx/global/media/TopLevelImageDocument.css b/toolkit/themes/osx/global/media/TopLevelImageDocument.css
index 8b77873efdd4..8968166cf955 100644
--- a/toolkit/themes/osx/global/media/TopLevelImageDocument.css
+++ b/toolkit/themes/osx/global/media/TopLevelImageDocument.css
@@ -19,7 +19,8 @@
     cursor: -moz-zoom-out;
   }
 
-  .shrinkToFit {
+  .shrinkToFit,
+  .scaleToDevicePixels {
     cursor: -moz-zoom-in;
   }
 
diff --git a/toolkit/themes/windows/global/media/TopLevelImageDocument.css b/toolkit/themes/windows/global/media/TopLevelImageDocument.css
index 8b77873efdd4..79bfbdc1ec97 100644
--- a/toolkit/themes/windows/global/media/TopLevelImageDocument.css
+++ b/toolkit/themes/windows/global/media/TopLevelImageDocument.css
@@ -19,7 +19,8 @@
     cursor: -moz-zoom-out;
   }
 
-  .shrinkToFit {
+  .shrinkToFit,
+  .scaleTodevicePixels {
     cursor: -moz-zoom-in;
   }
 

From 4c7c6fe7b850b85e253adc35cc59caebd307b553 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Thu, 18 Apr 2013 16:35:49 +0100
Subject: [PATCH 273/438] bug 861270 - prefer to use precise scale factor from
 GetDefaultScale() rather than approximate factor based on appUnits per
 devpix. r=roc

---
 view/src/nsView.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 038c20c3e908..3036c74aa36e 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -261,7 +261,24 @@ void nsView::DoResetWidgetBounds(bool aMoveOnly,
   // (bug 814434).
   nsRefPtr<nsDeviceContext> dx;
   mViewManager->GetDeviceContext(*getter_AddRefs(dx));
-  double invScale = dx->UnscaledAppUnitsPerDevPixel() / 60.0;
+  double invScale;
+
+  // Bug 861270: for correct widget manipulation at arbitrary scale factors,
+  // prefer to base scaling on mWindow->GetDefaultScale(). But only do this if
+  // it matches the view manager's device context scale after allowing for the
+  // quantization to app units, because of OS X multiscreen issues (where the
+  // only two scales are 1.0 or 2.0, and so the quantization doesn't actually
+  // cause problems anyhow).
+  // In the case of a mismatch, fall back to scaling based on the dev context's
+  // unscaledAppUnitsPerDevPixel value. On platforms where the device-pixel
+  // scale is uniform across all displays (currently all except OS X), we'll
+  // always use the precise value from mWindow->GetDefaultScale here.
+  double scale = mWindow->GetDefaultScale();
+  if (NSToIntRound(60.0 / scale) == dx->UnscaledAppUnitsPerDevPixel()) {
+    invScale = 1.0 / scale;
+  } else {
+    invScale = dx->UnscaledAppUnitsPerDevPixel() / 60.0;
+  }
 
   if (changedPos) {
     if (changedSize && !aMoveOnly) {

From cfe137c733fc249a0ee615bb347c24da9cd4ead7 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Apr 2013 11:36:03 -0400
Subject: [PATCH 274/438] Bug 860438 - Straightforward cases. r=gabor

---
 .../src/html/HTMLFormControlAccessible.cpp    | 12 +---
 caps/src/nsScriptSecurityManager.cpp          | 26 +-------
 content/base/src/nsContentUtils.cpp           |  5 +-
 content/base/src/nsFrameMessageManager.cpp    | 13 ++--
 content/events/src/nsEventListenerService.cpp | 62 +++++++------------
 dom/base/nsDOMClassInfo.cpp                   |  8 +--
 dom/base/nsGlobalWindow.cpp                   | 35 +++--------
 dom/bindings/BindingUtils.cpp                 |  9 ++-
 dom/indexedDB/IDBFactory.cpp                  | 16 +----
 dom/indexedDB/IDBIndex.cpp                    |  1 -
 dom/indexedDB/IDBObjectStore.cpp              |  1 -
 dom/indexedDB/IDBRequest.cpp                  |  9 +--
 dom/plugins/base/nsJSNPRuntime.cpp            | 18 +-----
 dom/plugins/base/nsNPAPIPlugin.cpp            | 21 +------
 dom/plugins/ipc/PluginIdentifierParent.cpp    | 13 +---
 dom/src/geolocation/nsGeolocation.cpp         | 32 ++--------
 dom/src/jsurl/nsJSProtocolHandler.cpp         | 15 +----
 dom/system/gonk/AutoMounterSetting.cpp        | 14 +----
 dom/system/gonk/TimeZoneSettingObserver.cpp   | 13 +---
 dom/time/DateCacheCleaner.cpp                 | 12 +---
 dom/workers/DOMBindingBase.cpp                | 19 +-----
 dom/workers/DOMBindingBase.h                  | 11 +---
 dom/workers/WorkerPrivate.cpp                 | 23 +------
 security/manager/ssl/src/nsCrypto.cpp         |  9 +--
 toolkit/devtools/debugger/nsJSInspector.cpp   | 24 +++----
 toolkit/xre/nsNativeAppSupportOS2.cpp         | 44 -------------
 toolkit/xre/nsNativeAppSupportWin.cpp         | 45 --------------
 xpfe/appshell/src/nsContentTreeOwner.cpp      | 35 +----------
 xpfe/appshell/src/nsXULWindow.cpp             | 19 +++---
 29 files changed, 92 insertions(+), 472 deletions(-)

diff --git a/accessible/src/html/HTMLFormControlAccessible.cpp b/accessible/src/html/HTMLFormControlAccessible.cpp
index 0c9e5fcb77f1..223094783155 100644
--- a/accessible/src/html/HTMLFormControlAccessible.cpp
+++ b/accessible/src/html/HTMLFormControlAccessible.cpp
@@ -25,7 +25,6 @@
 #include "nsINameSpaceManager.h"
 #include "nsISelectionController.h"
 #include "jsapi.h"
-#include "nsIJSContextStack.h"
 #include "nsIServiceManager.h"
 #include "nsITextControlFrame.h"
 
@@ -472,19 +471,12 @@ HTMLTextFieldAccessible::GetEditor() const
   // nsGenericHTMLElement::GetEditor has a security check.
   // Make sure we're not restricted by the permissions of
   // whatever script is currently running.
-  nsCOMPtr<nsIJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-  bool pushed = stack && NS_SUCCEEDED(stack->Push(nullptr));
+  nsCxPusher pusher;
+  pusher.PushNull();
 
   nsCOMPtr<nsIEditor> editor;
   editableElt->GetEditor(getter_AddRefs(editor));
 
-  if (pushed) {
-    JSContext* cx;
-    stack->Pop(&cx);
-    NS_ASSERTION(!cx, "context should be null");
-  }
-
   return editor.forget();
 }
 
diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index d23ed55884d8..e2116aded746 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -260,28 +260,6 @@ private:
     bool mMustFreeName;
 };
 
-class AutoCxPusher {
-public:
-    AutoCxPusher(nsIJSContextStack *aStack, JSContext *cx)
-        : mStack(aStack), mContext(cx)
-    {
-        if (NS_FAILED(mStack->Push(mContext))) {
-            mStack = nullptr;
-        }
-    }
-
-    ~AutoCxPusher()
-    {
-        if (mStack) {
-            mStack->Pop(nullptr);
-        }
-    }
-
-private:
-    nsCOMPtr<nsIJSContextStack> mStack;
-    JSContext *mContext;
-};
-
 JSContext *
 nsScriptSecurityManager::GetCurrentJSContext()
 {
@@ -2612,9 +2590,7 @@ nsScriptSecurityManager::InitPolicies()
     }
 
     // Get a JS context - we need it to create internalized strings later.
-    JSContext* cx = GetSafeJSContext();
-    NS_ASSERTION(cx, "failed to get JS context");
-    AutoCxPusher autoPusher(sJSContextStack, cx);
+    SafeAutoJSContext cx;
     rv = InitDomainPolicy(cx, "default", mDefaultPolicy);
     NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 6bc0e3f6731b..fddd94e303d9 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -3197,10 +3197,7 @@ nsCxPusher::Pop()
   MOZ_ASSERT_IF(mPushedContext, mCompartmentDepthOnEntry ==
                                 js::GetEnterCompartmentDepth(mPushedContext));
 
-  JSContext *unused;
-  stack->Pop(&unused);
-
-  NS_ASSERTION(unused == mPushedContext, "Unexpected context popped");
+  stack->Pop(nullptr);
 
   if (!mScriptIsRunning && mScx) {
     // No JS is running in the context, but executing the event handler might have
diff --git a/content/base/src/nsFrameMessageManager.cpp b/content/base/src/nsFrameMessageManager.cpp
index 04d87b702a54..e0f9f3143d42 100644
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -1010,7 +1010,8 @@ nsFrameScriptExecutor::LoadFrameScriptInternal(const nsAString& aURL)
   }
 
   if (holder) {
-    nsContentUtils::ThreadJSContextStack()->Push(mCx);
+    nsCxPusher pusher;
+    pusher.Push(mCx);
     {
       // Need to scope JSAutoRequest to happen after Push but before Pop,
       // at least for now. See bug 584673.
@@ -1021,9 +1022,6 @@ nsFrameScriptExecutor::LoadFrameScriptInternal(const nsAString& aURL)
         (void) JS_ExecuteScript(mCx, global, holder->mScript, nullptr);
       }
     }
-    JSContext* unused;
-    nsContentUtils::ThreadJSContextStack()->Pop(&unused);
-    return;
   }
 }
 
@@ -1071,7 +1069,8 @@ nsFrameScriptExecutor::TryCacheLoadAndCompileScript(const nsAString& aURL,
   }
 
   if (!dataString.IsEmpty()) {
-    nsContentUtils::ThreadJSContextStack()->Push(mCx);
+    nsCxPusher pusher;
+    pusher.Push(mCx);
     {
       // Need to scope JSAutoRequest to happen after Push but before Pop,
       // at least for now. See bug 584673.
@@ -1104,9 +1103,7 @@ nsFrameScriptExecutor::TryCacheLoadAndCompileScript(const nsAString& aURL,
           }
         }
       }
-    } 
-    JSContext* unused;
-    nsContentUtils::ThreadJSContextStack()->Pop(&unused);
+    }
   }
 }
 
diff --git a/content/events/src/nsEventListenerService.cpp b/content/events/src/nsEventListenerService.cpp
index 27cea2f367fd..22b9f706879d 100644
--- a/content/events/src/nsEventListenerService.cpp
+++ b/content/events/src/nsEventListenerService.cpp
@@ -23,6 +23,7 @@
 #include "nsDOMClassInfoID.h"
 
 using namespace mozilla::dom;
+using mozilla::SafeAutoJSContext;
 
 NS_IMPL_CYCLE_COLLECTION_1(nsEventListenerInfo, mListener)
 
@@ -110,30 +111,22 @@ nsEventListenerInfo::ToSource(nsAString& aResult)
 {
   aResult.SetIsVoid(true);
 
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    nsContentUtils::ThreadJSContextStack();
-  if (stack) {
-    JSContext* cx = stack->GetSafeJSContext();
-    if (cx && NS_SUCCEEDED(stack->Push(cx))) {
-      {
-        // Extra block to finish the auto request before calling pop
-        JSAutoRequest ar(cx);
-        mozilla::Maybe<JSAutoCompartment> ac;
-        JS::Value v = JSVAL_NULL;
-        if (GetJSVal(cx, ac, &v)) {
-          JSString* str = JS_ValueToSource(cx, v);
-          if (str) {
-            nsDependentJSString depStr;
-            if (depStr.init(cx, str)) {
-              aResult.Assign(depStr);
-            }
-          }
+  SafeAutoJSContext cx;
+  {
+    // Extra block to finish the auto request before calling pop
+    JSAutoRequest ar(cx);
+    mozilla::Maybe<JSAutoCompartment> ac;
+    JS::Value v = JSVAL_NULL;
+    if (GetJSVal(cx, ac, &v)) {
+      JSString* str = JS_ValueToSource(cx, v);
+      if (str) {
+        nsDependentJSString depStr;
+        if (depStr.init(cx, str)) {
+          aResult.Assign(depStr);
         }
       }
-      stack->Pop(&cx);
     }
   }
-  
   return NS_OK;
 }
 
@@ -152,24 +145,17 @@ nsEventListenerInfo::GetDebugObject(nsISupports** aRetVal)
   jsd->GetIsOn(&isOn);
   NS_ENSURE_TRUE(isOn, NS_OK);
 
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    nsContentUtils::ThreadJSContextStack();
-  if (stack) {
-    JSContext* cx = stack->GetSafeJSContext();
-    if (cx && NS_SUCCEEDED(stack->Push(cx))) {
-      {
-        // Extra block to finish the auto request before calling pop
-        JSAutoRequest ar(cx);
-        mozilla::Maybe<JSAutoCompartment> ac;
-        JS::Value v = JSVAL_NULL;
-        if (GetJSVal(cx, ac, &v)) {
-          nsCOMPtr<jsdIValue> jsdValue;
-          rv = jsd->WrapValue(v, getter_AddRefs(jsdValue));
-          NS_ENSURE_SUCCESS(rv, rv);
-          jsdValue.forget(aRetVal);
-        }
-      }
-      stack->Pop(&cx);
+  SafeAutoJSContext cx;
+  {
+    // Extra block to finish the auto request before calling pop
+    JSAutoRequest ar(cx);
+    mozilla::Maybe<JSAutoCompartment> ac;
+    JS::Value v = JSVAL_NULL;
+    if (GetJSVal(cx, ac, &v)) {
+      nsCOMPtr<jsdIValue> jsdValue;
+      rv = jsd->WrapValue(v, getter_AddRefs(jsdValue));
+      NS_ENSURE_SUCCESS(rv, rv);
+      jsdValue.forget(aRetVal);
     }
   }
 #endif
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index ee9dfc7fa9d0..0091115b577a 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -39,7 +39,6 @@
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIXPConnect.h"
-#include "nsIJSContextStack.h"
 #include "nsIXPCSecurityManager.h"
 #include "nsIStringBundle.h"
 #include "nsIConsoleService.h"
@@ -1640,12 +1639,7 @@ nsDOMClassInfo::Init()
   sSecMan = sm;
   NS_ADDREF(sSecMan);
 
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  JSContext* cx = stack->GetSafeJSContext();
-  NS_ENSURE_TRUE(cx, NS_ERROR_FAILURE);
+  SafeAutoJSContext cx;
 
   DOM_CLASSINFO_MAP_BEGIN(Window, nsIDOMWindow)
     DOM_CLASSINFO_WINDOW_MAP_ENTRIES(nsGlobalWindow::HasIndexedDBSupport())
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index f925943d60e7..0c0f9039a22c 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -106,7 +106,6 @@
 #include "nsThreadUtils.h"
 #include "nsEventStateManager.h"
 #include "nsIHttpProtocolHandler.h"
-#include "nsIJSContextStack.h"
 #include "nsIJSRuntimeService.h"
 #include "nsILoadContext.h"
 #include "nsIMarkupDocumentViewer.h"
@@ -7097,15 +7096,7 @@ nsGlobalWindow::FinalClose()
   // Flag that we were closed.
   mIsClosed = true;
 
-  nsCOMPtr<nsIJSContextStack> stack =
-    do_GetService(sJSStackContractID);
-
-  JSContext *cx = nullptr;
-
-  if (stack) {
-    stack->Peek(&cx);
-  }
-
+  JSContext *cx = nsContentUtils::GetCurrentJSContext();
   if (cx) {
     nsIScriptContext *currentCX = nsJSUtils::GetDynamicScriptContext(cx);
 
@@ -7426,8 +7417,7 @@ public:
       JSObject* obj = currentInner->FastGetGlobalJSObject();
       // We only want to nuke wrappers for the chrome->content case
       if (obj && !js::IsSystemCompartment(js::GetObjectCompartment(obj))) {
-        JSContext* cx =
-          nsContentUtils::ThreadJSContextStack()->GetSafeJSContext();
+        JSContext* cx = nsContentUtils::GetSafeJSContext();
 
         JSAutoRequest ar(cx);
         js::NukeCrossCompartmentWrappers(cx, 
@@ -9930,27 +9920,22 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName,
       // up.  We do NOT want this case looking at the JS context on the stack
       // when searching.  Compare comments on
       // nsIDOMWindow::OpenWindow and nsIWindowWatcher::OpenWindow.
-      nsCOMPtr<nsIJSContextStack> stack;
 
+      // Note: Because nsWindowWatcher is so broken, it's actually important
+      // that we don't push a null cx here, because that screws it up when it
+      // tries to compute the caller principal to associate with dialog
+      // arguments. That whole setup just really needs to be rewritten. :-(
+      nsCxPusher pusher;
       if (!aContentModal) {
-        stack = do_GetService(sJSStackContractID);
+        pusher.PushNull();
       }
 
-      if (stack) {
-        rv = stack->Push(nullptr);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
 
       rv = pwwatch->OpenWindow2(this, url.get(), name_ptr, options_ptr,
                                 /* aCalledFromScript = */ false,
                                 aDialog, aNavigate, aExtraArgument,
                                 getter_AddRefs(domReturn));
 
-      if (stack) {
-        JSContext* cx;
-        stack->Pop(&cx);
-        NS_ASSERTION(!cx, "Unexpected JSContext popped!");
-      }
     }
   }
 
@@ -10871,9 +10856,7 @@ nsGlobalWindow::BuildURIfromBase(const char *aURL, nsIURI **aBuiltURI,
     cx = scx->GetNativeContext();
   } else {
     // get the JSContext from the call stack
-    nsCOMPtr<nsIThreadJSContextStack> stack(do_GetService(sJSStackContractID));
-    if (stack)
-      stack->Peek(&cx);
+    cx = nsContentUtils::GetCurrentJSContext();
   }
 
   /* resolve the URI, which could be relative to the calling window
diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index 85adf4ff3e3c..25fef7d1217a 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -1311,12 +1311,11 @@ MainThreadDictionaryBase::ParseJSON(const nsAString& aJSON,
                                     Maybe<JSAutoCompartment>& aAc,
                                     Maybe< JS::Rooted<JS::Value> >& aVal)
 {
-  JSContext* cx = nsContentUtils::ThreadJSContextStack()->GetSafeJSContext();
-  NS_ENSURE_TRUE(cx, nullptr);
+  SafeAutoJSContext cx;
   JSObject* global = JS_GetGlobalObject(cx);
-  aAr.construct(cx);
-  aAc.construct(cx, global);
-  aVal.construct(cx, JS::UndefinedValue());
+  aAr.construct(static_cast<JSContext*>(cx));
+  aAc.construct(static_cast<JSContext*>(cx), global);
+  aVal.construct(static_cast<JSContext*>(cx), JS::UndefinedValue());
   if (aJSON.IsEmpty()) {
     return cx;
   }
diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp
index fabcd69d45a9..3ae7a81f3382 100644
--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -8,7 +8,6 @@
 
 #include "IDBFactory.h"
 #include "nsIFile.h"
-#include "nsIJSContextStack.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptContext.h"
 #include "nsIXPConnect.h"
@@ -202,20 +201,7 @@ IDBFactory::Create(ContentParent* aContentParent,
   NS_ASSERTION(nsContentUtils::IsCallerChrome(), "Only for chrome!");
   NS_ASSERTION(aContentParent, "Null ContentParent!");
 
-#ifdef DEBUG
-  {
-    nsIThreadJSContextStack* cxStack = nsContentUtils::ThreadJSContextStack();
-    NS_ASSERTION(cxStack, "Couldn't get ThreadJSContextStack!");
-
-    JSContext* lastCx;
-    if (NS_SUCCEEDED(cxStack->Peek(&lastCx))) {
-      NS_ASSERTION(!lastCx, "We should only be called from C++!");
-    }
-    else {
-      NS_ERROR("nsIThreadJSContextStack::Peek should never fail!");
-    }
-  }
-#endif
+  NS_ASSERTION(!nsContentUtils::GetCurrentJSContext(), "Should be called from C++");
 
   nsCOMPtr<nsIPrincipal> principal =
     do_CreateInstance("@mozilla.org/nullprincipal;1");
diff --git a/dom/indexedDB/IDBIndex.cpp b/dom/indexedDB/IDBIndex.cpp
index 1a226ea6ab8a..b0735019c642 100644
--- a/dom/indexedDB/IDBIndex.cpp
+++ b/dom/indexedDB/IDBIndex.cpp
@@ -9,7 +9,6 @@
 #include "IDBIndex.h"
 
 #include "nsIIDBKeyRange.h"
-#include "nsIJSContextStack.h"
 
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index 2ab1060cd5d0..d7c5d8fcbce0 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -9,7 +9,6 @@
 #include "IDBObjectStore.h"
 
 #include "mozilla/dom/ipc/nsIRemoteBlob.h"
-#include "nsIJSContextStack.h"
 #include "nsIOutputStream.h"
 
 #include "jsfriendapi.h"
diff --git a/dom/indexedDB/IDBRequest.cpp b/dom/indexedDB/IDBRequest.cpp
index bd857ca19167..90b5368a720d 100644
--- a/dom/indexedDB/IDBRequest.cpp
+++ b/dom/indexedDB/IDBRequest.cpp
@@ -6,7 +6,6 @@
 
 #include "IDBRequest.h"
 
-#include "nsIJSContextStack.h"
 #include "nsIScriptContext.h"
 
 #include "nsComponentManagerUtils.h"
@@ -178,13 +177,7 @@ IDBRequest::GetJSContext()
   JSContext* cx;
 
   if (GetScriptOwner()) {
-    nsIThreadJSContextStack* cxStack = nsContentUtils::ThreadJSContextStack();
-    NS_ASSERTION(cxStack, "Failed to get thread context stack!");
-
-    cx = cxStack->GetSafeJSContext();
-    NS_ENSURE_TRUE(cx, nullptr);
-
-    return cx;
+    return nsContentUtils::GetSafeJSContext();
   }
 
   nsresult rv;
diff --git a/dom/plugins/base/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp
index 4f600ffe32e6..54f6b7a5af0e 100644
--- a/dom/plugins/base/nsJSNPRuntime.cpp
+++ b/dom/plugins/base/nsJSNPRuntime.cpp
@@ -16,6 +16,7 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptContext.h"
 #include "nsDOMJSUtils.h"
+#include "nsContentUtils.h"
 #include "nsIDocument.h"
 #include "nsIJSRuntimeService.h"
 #include "nsIJSContextStack.h"
@@ -1967,22 +1968,7 @@ nsJSNPRuntime::OnPluginDestroy(NPP npp)
 
   // Use the safe JSContext here as we're not always able to find the
   // JSContext associated with the NPP any more.
-
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-  if (!stack) {
-    NS_ERROR("No context stack available!");
-
-    return;
-  }
-
-  JSContext* cx = stack->GetSafeJSContext();
-  if (!cx) {
-    NS_ERROR("No safe JS context available!");
-
-    return;
-  }
-
+  SafeAutoJSContext cx;
   JSAutoRequest ar(cx);
 
   if (sNPObjWrappers.ops) {
diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp
index 89984675ae41..563a1a5fe393 100644
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -1264,16 +1264,7 @@ _getstringidentifier(const NPUTF8* name)
     NPN_PLUGIN_LOG(PLUGIN_LOG_ALWAYS,("NPN_getstringidentifier called from the wrong thread\n"));
   }
 
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-  if (!stack)
-    return NULL;
-
-  JSContext* cx = stack->GetSafeJSContext();
-  if (!cx) {
-    return NULL;
-  }
-
+  SafeAutoJSContext cx;
   JSAutoRequest ar(cx);
   return doGetIdentifier(cx, name);
 }
@@ -1285,16 +1276,8 @@ _getstringidentifiers(const NPUTF8** names, int32_t nameCount,
   if (!NS_IsMainThread()) {
     NPN_PLUGIN_LOG(PLUGIN_LOG_ALWAYS,("NPN_getstringidentifiers called from the wrong thread\n"));
   }
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-  if (!stack)
-    return;
-
-  JSContext* cx = stack->GetSafeJSContext();
-  if (!cx) {
-    return;
-  }
 
+  SafeAutoJSContext cx;
   JSAutoRequest ar(cx);
 
   for (int32_t i = 0; i < nameCount; ++i) {
diff --git a/dom/plugins/ipc/PluginIdentifierParent.cpp b/dom/plugins/ipc/PluginIdentifierParent.cpp
index c3c9ebe52400..e72870763846 100644
--- a/dom/plugins/ipc/PluginIdentifierParent.cpp
+++ b/dom/plugins/ipc/PluginIdentifierParent.cpp
@@ -8,7 +8,6 @@
 
 #include "nsServiceManagerUtils.h"
 #include "nsNPAPIPlugin.h"
-#include "nsIJSContextStack.h"
 #include "PluginScriptableObjectUtils.h"
 #include "mozilla/unused.h"
 
@@ -30,17 +29,7 @@ PluginIdentifierParent::RecvRetain()
 
   // The following is what nsNPAPIPlugin.cpp does. Gross, but the API doesn't
   // give you a NPP to play with.
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-  if (!stack) {
-    return false;
-  }
-
-  JSContext* cx = stack->GetSafeJSContext();
-  if (!cx) {
-    return false;
-  }
-
+  SafeAutoJSContext cx;
   JSAutoRequest ar(cx);
   JSString* str = JSID_TO_STRING(id);
   JSString* str2 = JS_InternJSString(cx, str);
diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp
index 92e37dab0f96..f80271b35581 100644
--- a/dom/src/geolocation/nsGeolocation.cpp
+++ b/dom/src/geolocation/nsGeolocation.cpp
@@ -36,7 +36,6 @@
 #include "nsIURI.h"
 #include "nsIPermissionManager.h"
 #include "nsIObserverService.h"
-#include "nsIJSContextStack.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Services.h"
 #include "mozilla/unused.h"
@@ -282,10 +281,8 @@ void
 PositionError::NotifyCallback(const GeoPositionErrorCallback& aCallback)
 {
   // Ensure that the proper context is on the stack (bug 452762)
-  nsCOMPtr<nsIJSContextStack> stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1"));
-  if (!stack || NS_FAILED(stack->Push(nullptr))) {
-    return;
-  }
+  nsCxPusher pusher;
+  pusher.PushNull();
 
   nsAutoMicroTask mt;
   if (aCallback.HasWebIDLCallback()) {
@@ -301,10 +298,6 @@ PositionError::NotifyCallback(const GeoPositionErrorCallback& aCallback)
       callback->HandleEvent(this);
     }
   }
-
-  // remove the stack
-  JSContext* cx;
-  stack->Pop(&cx);
 }
 ////////////////////////////////////////////////////
 // nsGeolocationRequest
@@ -558,11 +551,8 @@ nsGeolocationRequest::SendLocation(nsIDOMGeoPosition* aPosition, bool aCachePosi
   }
 
   // Ensure that the proper context is on the stack (bug 452762)
-  nsCOMPtr<nsIJSContextStack> stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1"));
-  if (!stack || NS_FAILED(stack->Push(nullptr))) {
-    return; // silently fail
-  }
-
+  nsCxPusher pusher;
+  pusher.PushNull();
   nsAutoMicroTask mt;
   if (mCallback.HasWebIDLCallback()) {
     ErrorResult err;
@@ -577,10 +567,6 @@ nsGeolocationRequest::SendLocation(nsIDOMGeoPosition* aPosition, bool aCachePosi
     callback->HandleEvent(aPosition);
   }
 
-  // remove the stack
-  JSContext* cx;
-  stack->Pop(&cx);
-
   if (mIsWatchPositionRequest) {
     SetTimeoutTimer();
   }
@@ -788,15 +774,7 @@ nsGeolocationService::HandleMozsettingChanged(const PRUnichar* aData)
     // The string that we're interested in will be a JSON string that looks like:
     //  {"key":"gelocation.enabled","value":true}
 
-    nsCOMPtr<nsIThreadJSContextStack> stack = do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-    if (!stack) {
-      return;
-    }
-
-    JSContext *cx = stack->GetSafeJSContext();
-    if (!cx) {
-      return;
-    }
+    SafeAutoJSContext cx;
 
     nsDependentString dataStr(aData);
     JS::Value val;
diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp
index 8fba94611fae..e1116b615cdd 100644
--- a/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -38,7 +38,6 @@
 #include "nsContentUtils.h"
 #include "nsJSUtils.h"
 #include "nsThreadUtils.h"
-#include "nsIJSContextStack.h"
 #include "nsIScriptChannel.h"
 #include "nsIDocument.h"
 #include "nsIObjectInputStream.h"
@@ -299,16 +298,8 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
 
         // Push our JSContext on the context stack so the JS_ValueToString call (and
         // JS_ReportPendingException, if relevant) will use the principal of cx.
-        // Note that we do this as late as possible to make popping simpler.
-        nsCOMPtr<nsIJSContextStack> stack =
-            do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
-        if (NS_SUCCEEDED(rv)) {
-            rv = stack->Push(cx);
-        }
-        if (NS_FAILED(rv)) {
-            return rv;
-        }
-
+        nsCxPusher pusher;
+        pusher.Push(cx);
         rv = xpc->EvalInSandboxObject(NS_ConvertUTF8toUTF16(script),
                                       /* filename = */ nullptr, cx,
                                       sandboxObj, true, &v);
@@ -318,8 +309,6 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
         if (JS_IsExceptionPending(cx)) {
             JS_ReportPendingException(cx);
         }
-
-        stack->Pop(nullptr);
     } else {
         // No need to use the sandbox, evaluate the script directly in
         // the given scope.
diff --git a/dom/system/gonk/AutoMounterSetting.cpp b/dom/system/gonk/AutoMounterSetting.cpp
index 59a9b8bf1951..7953c4b39e11 100644
--- a/dom/system/gonk/AutoMounterSetting.cpp
+++ b/dom/system/gonk/AutoMounterSetting.cpp
@@ -11,7 +11,7 @@
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
 #include "nsIObserverService.h"
-#include "nsIJSContextStack.h"
+#include "nsContentUtils.h"
 #include "nsISettingsService.h"
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
@@ -109,17 +109,7 @@ AutoMounterSetting::Observe(nsISupports* aSubject,
   // The string that we're interested in will be a JSON string that looks like:
   //  {"key":"ums.autoMount","value":true}
 
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-  if (!stack) {
-    ERR("Failed to get JSContextStack");
-    return NS_OK;
-  }
-  JSContext* cx = stack->GetSafeJSContext();
-  if (!cx) {
-    ERR("Failed to GetSafeJSContext");
-    return NS_OK;
-  }
+  mozilla::SafeAutoJSContext cx;
   nsDependentString dataStr(aData);
   JS::Value val;
   if (!JS_ParseJSON(cx, dataStr.get(), dataStr.Length(), &val) ||
diff --git a/dom/system/gonk/TimeZoneSettingObserver.cpp b/dom/system/gonk/TimeZoneSettingObserver.cpp
index 9c0b7c9cb99e..6f3026dd5916 100644
--- a/dom/system/gonk/TimeZoneSettingObserver.cpp
+++ b/dom/system/gonk/TimeZoneSettingObserver.cpp
@@ -169,18 +169,7 @@ TimeZoneSettingObserver::Observe(nsISupports *aSubject,
   // The string that we're interested in will be a JSON string that looks like:
   // {"key":"time.timezone","value":"America/Chicago"}
 
-  // Get the safe JS context.
-  nsCOMPtr<nsIThreadJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-  if (!stack) {
-    ERR("Failed to get JSContextStack");
-    return NS_OK;
-  }
-  JSContext *cx = stack->GetSafeJSContext();
-  if (!cx) {
-    ERR("Failed to GetSafeJSContext");
-    return NS_OK;
-  }
+  SafeAutoJSContext cx;
 
   // Parse the JSON value.
   nsDependentString dataStr(aData);
diff --git a/dom/time/DateCacheCleaner.cpp b/dom/time/DateCacheCleaner.cpp
index e5d066705e65..c99d5e9a23cc 100644
--- a/dom/time/DateCacheCleaner.cpp
+++ b/dom/time/DateCacheCleaner.cpp
@@ -7,7 +7,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "DateCacheCleaner.h"
 
-#include "nsIJSContextStack.h"
+#include "nsContentUtils.h"
 #include "mozilla/StaticPtr.h"
 
 using namespace mozilla::hal;
@@ -30,15 +30,7 @@ public:
   }
   void Notify(const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo)
   {
-    nsCOMPtr<nsIThreadJSContextStack> stack =
-      do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-    if (!stack) {
-      NS_WARNING("Failed to get JSContextStack");
-    }
-    JSContext *cx = stack->GetSafeJSContext();
-    if (!cx) {
-      NS_WARNING("Failed to GetSafeJSContext");
-    }
+    mozilla::SafeAutoJSContext cx;
     JSAutoRequest ar(cx);
     JS_ClearDateCaches(cx);
   }
diff --git a/dom/workers/DOMBindingBase.cpp b/dom/workers/DOMBindingBase.cpp
index a1aaf145f3f6..854bfe831bbd 100644
--- a/dom/workers/DOMBindingBase.cpp
+++ b/dom/workers/DOMBindingBase.cpp
@@ -55,23 +55,8 @@ DOMBindingBase::_finalize(JSFreeOp* aFop)
 }
 
 JSContext*
-DOMBindingBase::GetJSContextFromContextStack() const
-{
-  AssertIsOnMainThread();
-  MOZ_ASSERT(!mJSContext);
-
-  if (!mContextStack) {
-    mContextStack = nsContentUtils::ThreadJSContextStack();
-    MOZ_ASSERT(mContextStack);
-  }
-
-  JSContext* cx;
-  if (NS_FAILED(mContextStack->Peek(&cx))) {
-    MOZ_NOT_REACHED("This should never fail!");
-  }
-
-  MOZ_ASSERT(cx);
-  return cx;
+DOMBindingBase::GetJSContext() const {
+  return mJSContext ? mJSContext : nsContentUtils::GetCurrentJSContext();
 }
 
 #ifdef DEBUG
diff --git a/dom/workers/DOMBindingBase.h b/dom/workers/DOMBindingBase.h
index 3a40f0611ddb..256d5b6724af 100644
--- a/dom/workers/DOMBindingBase.h
+++ b/dom/workers/DOMBindingBase.h
@@ -11,8 +11,6 @@
 #include "nsISupportsImpl.h"
 #include "nsWrapperCache.h"
 
-class nsIThreadJSContextStack;
-
 BEGIN_WORKERS_NAMESPACE
 
 #define BINDING_ENSURE_TRUE(_cond, _result, _retval) \
@@ -31,7 +29,6 @@ class DOMBindingBase : public nsWrapperCache,
                        public nsISupports
 {
   JSContext* mJSContext;
-  mutable nsCOMPtr<nsIThreadJSContextStack> mContextStack;
 
 protected:
   DOMBindingBase(JSContext* aCx);
@@ -43,17 +40,11 @@ protected:
   virtual void
   _finalize(JSFreeOp* aFop);
 
-  JSContext*
-  GetJSContextFromContextStack() const;
-
 public:
   NS_DECL_ISUPPORTS
 
   JSContext*
-  GetJSContext() const
-  {
-    return mJSContext ? mJSContext : GetJSContextFromContextStack();
-  }
+  GetJSContext() const;
 
 #ifdef DEBUG
   JSObject*
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index bac8d8dfcc0e..e3acdcf290c3 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -1600,7 +1600,7 @@ WorkerRunnable::Run()
 {
   JSContext* cx;
   JSObject* targetCompartmentObject;
-  nsIThreadJSContextStack* contextStack = nullptr;
+  nsCxPusher pusher;
 
   nsRefPtr<WorkerPrivate> kungFuDeathGrip;
 
@@ -1616,14 +1616,7 @@ WorkerRunnable::Run()
 
     if (!mWorkerPrivate->GetParent()) {
       AssertIsOnMainThread();
-
-      contextStack = nsContentUtils::ThreadJSContextStack();
-      NS_ASSERTION(contextStack, "This should never be null!");
-
-      if (NS_FAILED(contextStack->Push(cx))) {
-        NS_WARNING("Failed to push context!");
-        contextStack = nullptr;
-      }
+      pusher.Push(cx);
     }
   }
 
@@ -1637,19 +1630,7 @@ WorkerRunnable::Run()
   }
 
   bool result = WorkerRun(cx, mWorkerPrivate);
-
   PostRun(cx, mWorkerPrivate, result);
-
-  if (contextStack) {
-    JSContext* otherCx;
-    if (NS_FAILED(contextStack->Pop(&otherCx))) {
-      NS_WARNING("Failed to pop context!");
-    }
-    else if (otherCx != cx) {
-      NS_WARNING("Popped a different context!");
-    }
-  }
-
   return result ? NS_OK : NS_ERROR_FAILURE;
 }
 
diff --git a/security/manager/ssl/src/nsCrypto.cpp b/security/manager/ssl/src/nsCrypto.cpp
index 6f61944f9c65..4a457c22344a 100644
--- a/security/manager/ssl/src/nsCrypto.cpp
+++ b/security/manager/ssl/src/nsCrypto.cpp
@@ -34,6 +34,7 @@
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptGlobalObject.h"
+#include "nsContentUtils.h"
 #include "nsDOMJSUtils.h"
 #include "nsIXPConnect.h"
 #include "nsIRunnable.h"
@@ -46,7 +47,6 @@
 #include "nsIGenKeypairInfoDlg.h"
 #include "nsIDOMCryptoDialogs.h"
 #include "nsIFormSigningDialog.h"
-#include "nsIJSContextStack.h"
 #include "jsapi.h"
 #include "jsdbgapi.h"
 #include <ctype.h>
@@ -2182,10 +2182,8 @@ nsCryptoRunnable::Run()
   JSAutoCompartment ac(cx, m_args->m_scope);
 
   // make sure the right context is on the stack. must not return w/out popping
-  nsCOMPtr<nsIJSContextStack> stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1"));
-  if (!stack || NS_FAILED(stack->Push(cx))) {
-    return NS_ERROR_FAILURE;
-  }
+  nsCxPusher pusher;
+  pusher.Push(cx);
 
   JSBool ok =
     JS_EvaluateScriptForPrincipals(cx, m_args->m_scope,
@@ -2193,7 +2191,6 @@ nsCryptoRunnable::Run()
                                    m_args->m_jsCallback, 
                                    strlen(m_args->m_jsCallback),
                                    nullptr, 0, nullptr);
-  stack->Pop(nullptr);
   return ok ? NS_OK : NS_ERROR_FAILURE;
 }
 
diff --git a/toolkit/devtools/debugger/nsJSInspector.cpp b/toolkit/devtools/debugger/nsJSInspector.cpp
index 48f481aa145c..aa6b2a044b2d 100644
--- a/toolkit/devtools/debugger/nsJSInspector.cpp
+++ b/toolkit/devtools/debugger/nsJSInspector.cpp
@@ -5,8 +5,8 @@
 
 #include "nsJSInspector.h"
 #include "nsIXPConnect.h"
-#include "nsIJSContextStack.h"
 #include "nsThreadUtils.h"
+#include "nsContentUtils.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "jsdbgapi.h"
@@ -42,26 +42,18 @@ nsJSInspector::~nsJSInspector()
 NS_IMETHODIMP
 nsJSInspector::EnterNestedEventLoop(const JS::Value& requestor, uint32_t *out)
 {
-  nsresult rv;
-  nsCOMPtr<nsIJSContextStack> stack =
-    do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsresult rv = NS_OK;
 
   mLastRequestor = requestor;
   mRequestors.AppendElement(requestor);
 
-  uint32_t nestLevel = ++mNestedLoopLevel;
-  if (NS_SUCCEEDED(stack->Push(nullptr))) {
-    while (NS_SUCCEEDED(rv) && mNestedLoopLevel >= nestLevel) {
-      if (!NS_ProcessNextEvent())
-        rv = NS_ERROR_UNEXPECTED;
-    }
+  nsCxPusher pusher;
+  pusher.PushNull();
 
-    JSContext *cx;
-    stack->Pop(&cx);
-    NS_ASSERTION(cx == nullptr, "JSContextStack mismatch");
-  } else {
-    rv = NS_ERROR_FAILURE;
+  uint32_t nestLevel = ++mNestedLoopLevel;
+  while (NS_SUCCEEDED(rv) && mNestedLoopLevel >= nestLevel) {
+    if (!NS_ProcessNextEvent())
+      rv = NS_ERROR_UNEXPECTED;
   }
 
   NS_ASSERTION(mNestedLoopLevel <= nestLevel,
diff --git a/toolkit/xre/nsNativeAppSupportOS2.cpp b/toolkit/xre/nsNativeAppSupportOS2.cpp
index 4a1c0a2d1012..b29a9de97042 100644
--- a/toolkit/xre/nsNativeAppSupportOS2.cpp
+++ b/toolkit/xre/nsNativeAppSupportOS2.cpp
@@ -1609,50 +1609,6 @@ HWND hwndForDOMWindow( nsISupports *window ) {
     return (HWND)( ppWidget->GetNativeData( NS_NATIVE_WIDGET ) );
 }
 
-static const char sJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1";
-
-class SafeJSContext {
-public:
-  SafeJSContext();
-  ~SafeJSContext();
-
-  nsresult   Push();
-  JSContext *get() { return mContext; }
-
-protected:
-  nsCOMPtr<nsIThreadJSContextStack>  mService;
-  JSContext                         *mContext;
-};
-
-SafeJSContext::SafeJSContext() : mContext(nullptr) {
-}
-
-SafeJSContext::~SafeJSContext() {
-  JSContext *cx;
-  nsresult   rv;
-
-  if(mContext) {
-    rv = mService->Pop(&cx);
-    NS_ASSERTION(NS_SUCCEEDED(rv) && cx == mContext, "JSContext push/pop mismatch");
-  }
-}
-
-nsresult SafeJSContext::Push() {
-  if (mContext) // only once
-    return NS_ERROR_FAILURE;
-
-  mService = do_GetService(sJSStackContractID);
-  if (mService) {
-    JSContext* cx = mService->GetSafeJSContext();
-    if (cx && NS_SUCCEEDED(mService->Push(cx))) {
-      // Save cx in mContext to indicate need to pop.
-      mContext = cx;
-    }
-  }
-  return mContext ? NS_OK : NS_ERROR_FAILURE;
-}
-
-
 // As of Jan, 2005, most of the code in this method is pointless and
 // will never be used.  It is only called by ActivateLastWindow() and
 // only when there is no existing window.  Consequently, the first test
diff --git a/toolkit/xre/nsNativeAppSupportWin.cpp b/toolkit/xre/nsNativeAppSupportWin.cpp
index a64049b6d501..b7bc985cb625 100644
--- a/toolkit/xre/nsNativeAppSupportWin.cpp
+++ b/toolkit/xre/nsNativeAppSupportWin.cpp
@@ -33,7 +33,6 @@
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsIDOMLocation.h"
-#include "nsIJSContextStack.h"
 #include "nsIWebNavigation.h"
 #include "nsIWindowMediator.h"
 #include "nsNativeCharsetUtils.h"
@@ -1454,50 +1453,6 @@ HWND hwndForDOMWindow( nsISupports *window ) {
     return (HWND)( ppWidget->GetNativeData( NS_NATIVE_WIDGET ) );
 }
 
-static const char sJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1";
-
-class SafeJSContext {
-public:
-  SafeJSContext();
-  ~SafeJSContext();
-
-  nsresult   Push();
-  JSContext *get() { return mContext; }
-
-protected:
-  nsCOMPtr<nsIThreadJSContextStack>  mService;
-  JSContext                         *mContext;
-};
-
-SafeJSContext::SafeJSContext() : mContext(nullptr) {
-}
-
-SafeJSContext::~SafeJSContext() {
-  JSContext *cx;
-  DebugOnly<nsresult> rv;
-
-  if(mContext) {
-    rv = mService->Pop(&cx);
-    NS_ASSERTION(NS_SUCCEEDED(rv) && cx == mContext, "JSContext push/pop mismatch");
-  }
-}
-
-nsresult SafeJSContext::Push() {
-  if (mContext) // only once
-    return NS_ERROR_FAILURE;
-
-  mService = do_GetService(sJSStackContractID);
-  if (mService) {
-    JSContext* cx = mService->GetSafeJSContext();
-    if (cx && NS_SUCCEEDED(mService->Push(cx))) {
-      // Save cx in mContext to indicate need to pop.
-      mContext = cx;
-    }
-  }
-  return mContext ? NS_OK : NS_ERROR_FAILURE;
-}
-
-
 nsresult
 nsNativeAppSupportWin::OpenBrowserWindow()
 {
diff --git a/xpfe/appshell/src/nsContentTreeOwner.cpp b/xpfe/appshell/src/nsContentTreeOwner.cpp
index 893e374bff1c..aed7dba50b10 100644
--- a/xpfe/appshell/src/nsContentTreeOwner.cpp
+++ b/xpfe/appshell/src/nsContentTreeOwner.cpp
@@ -12,6 +12,7 @@
 // Helper Classes
 #include "nsIServiceManager.h"
 #include "nsAutoPtr.h"
+#include "nsContentUtils.h"
 
 // Interfaces needed to be included
 #include "nsIDOMNode.h"
@@ -30,7 +31,6 @@
 #include "nsIURIFixup.h"
 #include "nsCDefaultURIFixup.h"
 #include "nsIWebNavigation.h"
-#include "nsIJSContextStack.h"
 #include "mozilla/BrowserElementParent.h"
 
 #include "nsIDOMDocument.h"
@@ -47,8 +47,6 @@ using namespace mozilla;
 // CIDs
 static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
 
-static const char *sJSStackContractID="@mozilla.org/js/xpc/ContextStack;1";
-
 //*****************************************************************************
 //*** nsSiteWindow declaration
 //*****************************************************************************
@@ -787,34 +785,6 @@ NS_IMETHODIMP nsContentTreeOwner::SetTitle(const PRUnichar* aTitle)
   return mXULWindow->SetTitle(title.get());
 }
 
-class MOZ_STACK_CLASS NullJSContextPusher {
-public:
-  NullJSContextPusher() {
-    mService = do_GetService(sJSStackContractID);
-    if (mService) {
-#ifdef DEBUG
-      nsresult rv =
-#endif
-        mService->Push(nullptr);
-      NS_ASSERTION(NS_SUCCEEDED(rv), "Mismatched push/pop");
-    }
-  }
-
-  ~NullJSContextPusher() {
-    if (mService) {
-      JSContext *cx;
-#ifdef DEBUG
-      nsresult rv =
-#endif
-        mService->Pop(&cx);
-      NS_ASSERTION(NS_SUCCEEDED(rv) && !cx, "Bad pop!");
-    }
-  }
-
-private:
-  nsCOMPtr<nsIThreadJSContextStack> mService;
-};
-
 //*****************************************************************************
 // nsContentTreeOwner: nsIWindowProvider
 //*****************************************************************************   
@@ -942,7 +912,8 @@ nsContentTreeOwner::ProvideWindow(nsIDOMWindow* aParent,
   *aWindowIsNew = (containerPref != nsIBrowserDOMWindow::OPEN_CURRENTWINDOW);
 
   {
-    NullJSContextPusher pusher;
+    nsCxPusher pusher;
+    pusher.PushNull();
 
     // Get a new rendering area from the browserDOMWin.  We don't want
     // to be starting any loads here, so get it with a null URI.
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 971b861b87c8..07584c4b44d8 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -37,7 +37,6 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIIOService.h"
-#include "nsIJSContextStack.h"
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIObserverService.h"
 #include "nsIWindowMediator.h"
@@ -360,16 +359,14 @@ NS_IMETHODIMP nsXULWindow::ShowModal()
   mContinueModalLoop = true;
   EnableParent(false);
 
-  nsCOMPtr<nsIJSContextStack> stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1"));
-  if (stack && NS_SUCCEEDED(stack->Push(nullptr))) {
+  {
+    nsCxPusher pusher;
+    pusher.PushNull();
     nsIThread *thread = NS_GetCurrentThread();
     while (mContinueModalLoop) {
       if (!NS_ProcessNextEvent(thread))
         break;
     }
-    JSContext* cx;
-    stack->Pop(&cx);
-    NS_ASSERTION(cx == nullptr, "JSContextStack mismatch");
   }
 
   mContinueModalLoop = false;
@@ -1815,17 +1812,15 @@ NS_IMETHODIMP nsXULWindow::CreateNewContentWindow(int32_t aChromeFlags,
   xulWin->LockUntilChromeLoad();
 
   // Push nullptr onto the JSContext stack before we dispatch a native event.
-  nsCOMPtr<nsIJSContextStack> stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1"));
-  if (stack && NS_SUCCEEDED(stack->Push(nullptr))) {
+  {
+    nsCxPusher pusher;
+    pusher.PushNull();
     nsIThread *thread = NS_GetCurrentThread();
     while (xulWin->IsLocked()) {
       if (!NS_ProcessNextEvent(thread))
         break;
     }
-    JSContext *cx;
-    stack->Pop(&cx);
-    NS_ASSERTION(cx == nullptr, "JSContextStack mismatch");
-  }
+ }
 
   NS_ENSURE_STATE(xulWin->mPrimaryContentShell);
 

From 84f44bb3d95c56b8b19657bff9e23f61b649b25f Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Apr 2013 11:36:04 -0400
Subject: [PATCH 275/438] Bug 860438 - Remove context stack craziness from
 nsWindowWatcher. r=gabor

This patch should not change any behavior.
---
 .../windowwatcher/src/nsWindowWatcher.cpp     | 116 +++---------------
 .../windowwatcher/src/nsWindowWatcher.h       |   1 -
 2 files changed, 20 insertions(+), 97 deletions(-)

diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index 678f508ce345..bd9b9ac79323 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -30,7 +30,6 @@
 #include "nsIScreen.h"
 #include "nsIScreenManager.h"
 #include "nsIScriptContext.h"
-#include "nsIJSContextStack.h"
 #include "nsIObserverService.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptSecurityManager.h"
@@ -66,8 +65,6 @@
 
 using namespace mozilla;
 
-static const char *sJSStackContractID="@mozilla.org/js/xpc/ContextStack;1";
-
 /****************************************************************
  ******************** nsWatcherWindowEntry **********************
  ****************************************************************/
@@ -235,60 +232,6 @@ void nsWatcherWindowEnumerator::WindowRemoved(nsWatcherWindowEntry *inInfo) {
                        inInfo->mYounger : 0;
 }
 
-/****************************************************************
- ********************** JSContextAutoPopper *********************
- ****************************************************************/
-
-class MOZ_STACK_CLASS JSContextAutoPopper {
-public:
-  JSContextAutoPopper();
-  ~JSContextAutoPopper();
-
-  nsresult   Push(JSContext *cx = nullptr);
-  JSContext *get() { return mContext; }
-
-protected:
-  nsCOMPtr<nsIThreadJSContextStack>  mService;
-  JSContext                         *mContext;
-  nsCOMPtr<nsIScriptContext>         mContextKungFuDeathGrip;
-};
-
-JSContextAutoPopper::JSContextAutoPopper() : mContext(nullptr)
-{
-}
-
-JSContextAutoPopper::~JSContextAutoPopper()
-{
-  JSContext *cx;
-  nsresult   rv;
-
-  if(mContext) {
-    rv = mService->Pop(&cx);
-    NS_ASSERTION(NS_SUCCEEDED(rv) && cx == mContext, "JSContext push/pop mismatch");
-  }
-}
-
-nsresult JSContextAutoPopper::Push(JSContext *cx)
-{
-  if (mContext) // only once
-    return NS_ERROR_FAILURE;
-
-  mService = do_GetService(sJSStackContractID);
-  if (mService) {
-    // Get the safe context if we're not provided one.
-    if (!cx) {
-      cx = mService->GetSafeJSContext();
-    }
-
-    // Save cx in mContext to indicate need to pop.
-    if (cx && NS_SUCCEEDED(mService->Push(cx))) {
-      mContext = cx;
-      mContextKungFuDeathGrip = nsJSUtils::GetDynamicScriptContext(cx);
-    }
-  }
-  return mContext ? NS_OK : NS_ERROR_FAILURE;
-}
-
 /****************************************************************
  *********************** nsWindowWatcher ************************
  ****************************************************************/
@@ -498,7 +441,7 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
   nsCOMPtr<nsIURI>                uriToLoad;        // from aUrl, if any
   nsCOMPtr<nsIDocShellTreeOwner>  parentTreeOwner;  // from the parent window, if any
   nsCOMPtr<nsIDocShellTreeItem>   newDocShellItem;  // from the new window
-  JSContextAutoPopper             callerContextGuard;
+  nsCxPusher                      callerContextGuard;
 
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = 0;
@@ -927,18 +870,23 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
 
   nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
   if (uriToLoad && aNavigate) { // get the script principal and pass it to docshell
-    JSContextAutoPopper contextGuard;
 
-    cx = GetJSContextFromCallStack();
-
-    // get the security manager
-    if (!cx)
-      cx = GetJSContextFromWindow(aParent);
+    // The historical ordering of attempts here is:
+    // (1) Stack-top cx.
+    // (2) cx associated with aParent.
+    // (3) Safe JSContext.
+    //
+    // We could just use an AutoJSContext here if it weren't for (2), which
+    // is probably nonsensical anyway. But we preserve the old semantics for
+    // now, because this is part of a large patch where we don't want to risk
+    // subtle behavioral modifications.
+    cx = nsContentUtils::GetCurrentJSContext();
+    nsCxPusher pusher;
     if (!cx) {
-      rv = contextGuard.Push();
-      if (NS_FAILED(rv))
-        return rv;
-      cx = contextGuard.get();
+      cx = GetJSContextFromWindow(aParent);
+      if (!cx)
+        cx = nsContentUtils::GetSafeJSContext();
+      pusher.Push(cx);
     }
 
     newDocShell->CreateLoadInfo(getter_AddRefs(loadInfo));
@@ -950,13 +898,9 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
 
     // Set the new window's referrer from the calling context's document:
 
-    // get the calling context off the JS context stack
-    nsCOMPtr<nsIJSContextStack> stack = do_GetService(sJSStackContractID);
-
-    JSContext* ccx = nullptr;
-
     // get its document, if any
-    if (stack && NS_SUCCEEDED(stack->Peek(&ccx)) && ccx) {
+    JSContext* ccx = nsContentUtils::GetCurrentJSContext();
+    if (ccx) {
       nsIScriptGlobalObject *sgo = nsJSUtils::GetDynamicScriptGlobal(ccx);
 
       nsCOMPtr<nsPIDOMWindow> w(do_QueryInterface(sgo));
@@ -1412,7 +1356,7 @@ nsWindowWatcher::URIfromURL(const char *aURL,
   /* build the URI relative to the calling JS Context, if any.
      (note this is the same context used to make the security check
      in nsGlobalWindow.cpp.) */
-  JSContext *cx = GetJSContextFromCallStack();
+  JSContext *cx = nsContentUtils::GetCurrentJSContext();
   if (cx) {
     nsIScriptContext *scriptcx = nsJSUtils::GetDynamicScriptContext(cx);
     if (scriptcx) {
@@ -1774,15 +1718,7 @@ nsWindowWatcher::FindItemWithName(const PRUnichar* aName,
 already_AddRefed<nsIDocShellTreeItem>
 nsWindowWatcher::GetCallerTreeItem(nsIDocShellTreeItem* aParentItem)
 {
-  nsCOMPtr<nsIJSContextStack> stack =
-    do_GetService(sJSStackContractID);
-
-  JSContext *cx = nullptr;
-
-  if (stack) {
-    stack->Peek(&cx);
-  }
-
+  JSContext *cx = nsContentUtils::GetCurrentJSContext();
   nsIDocShellTreeItem* callerItem = nullptr;
 
   if (cx) {
@@ -2160,18 +2096,6 @@ nsWindowWatcher::GetWindowTreeOwner(nsIDOMWindow *inWindow,
     treeItem->GetTreeOwner(outTreeOwner);
 }
 
-JSContext *
-nsWindowWatcher::GetJSContextFromCallStack()
-{
-  JSContext *cx = 0;
-
-  nsCOMPtr<nsIThreadJSContextStack> cxStack(do_GetService(sJSStackContractID));
-  if (cxStack)
-    cxStack->Peek(&cx);
-
-  return cx;
-}
-
 JSContext *
 nsWindowWatcher::GetJSContextFromWindow(nsIDOMWindow *aWindow)
 {
diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.h b/embedding/components/windowwatcher/src/nsWindowWatcher.h
index e62e17da9530..bc3f85516232 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.h
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.h
@@ -83,7 +83,6 @@ protected:
                               nsIDOMWindow **_retval);
 
   static JSContext *GetJSContextFromWindow(nsIDOMWindow *aWindow);
-  static JSContext *GetJSContextFromCallStack();
   static nsresult   URIfromURL(const char *aURL,
                                nsIDOMWindow *aParent,
                                nsIURI **aURI);

From 77c247ce12480b6278189345f7102361f58e9e6f Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Apr 2013 11:36:04 -0400
Subject: [PATCH 276/438] Bug 860438 - Simplify JSContext handling
 {Cancel,Suspend,Resume}WorkersForWindow. r=gabor

The only functional difference here is the removal of a bug in which we were
constructing a dom::workers::AutoSafeJSContext around aCx, but then continuing
to pass aCx to the callee. If aCx were to be null, we'd end up with a mismatch
between the stack and the active cx. But it looks likes stuff depends on cx
being non-null anyway, so that probably never happened.
---
 dom/base/nsGlobalWindow.cpp    | 12 +++++++++---
 dom/workers/RuntimeService.cpp |  3 ---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 0c0f9039a22c..bec6dd7fda96 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1423,8 +1423,10 @@ nsGlobalWindow::FreeInnerObjects()
   NotifyDOMWindowDestroyed(this);
 
   // Kill all of the workers for this window.
+  // We push a cx so that exceptions get reported in the right DOM Window.
   nsIScriptContext *scx = GetContextInternal();
-  AutoPushJSContext cx(scx ? scx->GetNativeContext() : nullptr);
+  AutoPushJSContext cx(scx ? scx->GetNativeContext() : nsContentUtils::GetSafeJSContext());
+  JSAutoRequest ar(cx);
   mozilla::dom::workers::CancelWorkersForWindow(cx, this);
 
   // Close all offline storages for this window.
@@ -11018,8 +11020,10 @@ nsGlobalWindow::SuspendTimeouts(uint32_t aIncrease,
     DisableGamepadUpdates();
 
     // Suspend all of the workers for this window.
+  // We push a cx so that exceptions get reported in the right DOM Window.
     nsIScriptContext *scx = GetContextInternal();
-    AutoPushJSContext cx(scx ? scx->GetNativeContext() : nullptr);
+    AutoPushJSContext cx(scx ? scx->GetNativeContext() : nsContentUtils::GetSafeJSContext());
+    JSAutoRequest ar(cx);
     mozilla::dom::workers::SuspendWorkersForWindow(cx, this);
 
     TimeStamp now = TimeStamp::Now();
@@ -11109,8 +11113,10 @@ nsGlobalWindow::ResumeTimeouts(bool aThawChildren)
     }
 
     // Resume all of the workers for this window.
+    // We push a cx so that exceptions get reported in the right DOM Window.
     nsIScriptContext *scx = GetContextInternal();
-    AutoPushJSContext cx(scx ? scx->GetNativeContext() : nullptr);
+    AutoPushJSContext cx(scx ? scx->GetNativeContext() : nsContentUtils::GetSafeJSContext());
+    JSAutoRequest ar(cx);
     mozilla::dom::workers::ResumeWorkersForWindow(cx, this);
 
     // Restore all of the timeouts, using the stored time remaining
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 070f739dce2d..30021bcf3caf 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -1284,7 +1284,6 @@ RuntimeService::CancelWorkersForWindow(JSContext* aCx,
   GetWorkersForWindow(aWindow, workers);
 
   if (!workers.IsEmpty()) {
-    AutoSafeJSContext cx(aCx);
     for (uint32_t index = 0; index < workers.Length(); index++) {
       if (!workers[index]->Cancel(aCx)) {
         NS_WARNING("Failed to cancel worker!");
@@ -1303,7 +1302,6 @@ RuntimeService::SuspendWorkersForWindow(JSContext* aCx,
   GetWorkersForWindow(aWindow, workers);
 
   if (!workers.IsEmpty()) {
-    AutoSafeJSContext cx(aCx);
     for (uint32_t index = 0; index < workers.Length(); index++) {
       if (!workers[index]->Suspend(aCx)) {
         NS_WARNING("Failed to cancel worker!");
@@ -1322,7 +1320,6 @@ RuntimeService::ResumeWorkersForWindow(JSContext* aCx,
   GetWorkersForWindow(aWindow, workers);
 
   if (!workers.IsEmpty()) {
-    AutoSafeJSContext cx(aCx);
     for (uint32_t index = 0; index < workers.Length(); index++) {
       if (!workers[index]->Resume(aCx)) {
         NS_WARNING("Failed to cancel worker!");

From 313b6e499b083302afb408a6bf87021287957a81 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Apr 2013 11:36:04 -0400
Subject: [PATCH 277/438] Bug 860438 - Convert workers to SafeAutoJSContext.
 r=gabor

The only functional difference here is that AutoSafeJSContext entered a request.
Really, we should always enter a request and a compartment at the same time. But
for now we just preserve the old behavior with a JSAutoRequest.
---
 dom/workers/RuntimeService.cpp | 66 +++-------------------------------
 dom/workers/RuntimeService.h   | 17 ---------
 dom/workers/WorkerPrivate.cpp  |  6 ++--
 dom/workers/XMLHttpRequest.cpp |  6 ++--
 4 files changed, 12 insertions(+), 83 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 30021bcf3caf..44c9187f0c6a 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -99,7 +99,8 @@ MOZ_STATIC_ASSERT(MAX_WORKERS_PER_DOMAIN >= 1,
     }                                                                          \
                                                                                \
     if (!workers.IsEmpty()) {                                                  \
-      AutoSafeJSContext cx;                                                    \
+      SafeAutoJSContext cx;                                                    \
+      JSAutoRequest ar(cx);                                                    \
       for (uint32_t index = 0; index < workers.Length(); index++) {            \
         workers[index]-> _func (cx, __VA_ARGS__);                              \
       }                                                                        \
@@ -1155,7 +1156,8 @@ RuntimeService::Cleanup()
         currentThread = NS_GetCurrentThread();
         NS_ASSERTION(currentThread, "This should never be null!");
 
-        AutoSafeJSContext cx;
+        SafeAutoJSContext cx;
+        JSAutoRequest ar(cx);
 
         for (uint32_t index = 0; index < workers.Length(); index++) {
           if (!workers[index]->Kill(cx)) {
@@ -1428,63 +1430,3 @@ RuntimeService::Observe(nsISupports* aSubject, const char* aTopic,
   NS_NOTREACHED("Unknown observer topic!");
   return NS_OK;
 }
-
-RuntimeService::AutoSafeJSContext::AutoSafeJSContext(JSContext* aCx)
-: mContext(aCx ? aCx : GetSafeContext())
-{
-  AssertIsOnMainThread();
-
-  if (mContext) {
-    nsIThreadJSContextStack* stack = nsContentUtils::ThreadJSContextStack();
-    NS_ASSERTION(stack, "This should never be null!");
-
-    if (NS_FAILED(stack->Push(mContext))) {
-      NS_ERROR("Couldn't push safe JSContext!");
-      mContext = nullptr;
-      return;
-    }
-
-    JS_BeginRequest(mContext);
-  }
-}
-
-RuntimeService::AutoSafeJSContext::~AutoSafeJSContext()
-{
-  AssertIsOnMainThread();
-
-  if (mContext) {
-    JS_ReportPendingException(mContext);
-
-    JS_EndRequest(mContext);
-
-    nsIThreadJSContextStack* stack = nsContentUtils::ThreadJSContextStack();
-    NS_ASSERTION(stack, "This should never be null!");
-
-    JSContext* cx;
-    if (NS_FAILED(stack->Pop(&cx))) {
-      NS_ERROR("Failed to pop safe context!");
-    }
-    if (cx != mContext) {
-      NS_ERROR("Mismatched context!");
-    }
-  }
-}
-
-// static
-JSContext*
-RuntimeService::AutoSafeJSContext::GetSafeContext()
-{
-  AssertIsOnMainThread();
-
-  nsIThreadJSContextStack* stack = nsContentUtils::ThreadJSContextStack();
-  NS_ASSERTION(stack, "This should never be null!");
-
-  JSContext* cx = stack->GetSafeJSContext();
-  if (!cx) {
-    NS_ERROR("Couldn't get safe JSContext!");
-    return nullptr;
-  }
-
-  NS_ASSERTION(!JS_IsExceptionPending(cx), "Already has an exception?!");
-  return cx;
-}
diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h
index 3ab53f9f68f3..8244d8889fe5 100644
--- a/dom/workers/RuntimeService.h
+++ b/dom/workers/RuntimeService.h
@@ -221,23 +221,6 @@ public:
   void
   GarbageCollectAllWorkers(bool aShrinking);
 
-  class AutoSafeJSContext
-  {
-    JSContext* mContext;
-
-  public:
-    AutoSafeJSContext(JSContext* aCx = nullptr);
-    ~AutoSafeJSContext();
-
-    operator JSContext*() const
-    {
-      return mContext;
-    }
-
-    static JSContext*
-    GetSafeContext();
-  };
-
 private:
   RuntimeService();
   ~RuntimeService();
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index e3acdcf290c3..a2f1bb26dfc2 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -77,6 +77,7 @@ using mozilla::MutexAutoLock;
 using mozilla::TimeDuration;
 using mozilla::TimeStamp;
 using mozilla::dom::workers::exceptions::ThrowDOMExceptionForNSResult;
+using mozilla::SafeAutoJSContext;
 
 USING_WORKERS_NAMESPACE
 using namespace mozilla::dom::workers::events;
@@ -627,7 +628,8 @@ public:
   {
     AssertIsOnMainThread();
 
-    RuntimeService::AutoSafeJSContext cx;
+    SafeAutoJSContext cx;
+    JSAutoRequest ar(cx);
 
     mFinishedWorker->Finish(cx);
 
@@ -2365,7 +2367,7 @@ WorkerPrivateParent<Derived>::ParentJSContext() const
 
     if (!mScriptContext) {
       NS_ASSERTION(!mParentJSContext, "Shouldn't have a parent context!");
-      return RuntimeService::AutoSafeJSContext::GetSafeContext();
+      return nsContentUtils::GetSafeJSContext();
     }
 
     NS_ASSERTION(mParentJSContext == mScriptContext->GetNativeContext(),
diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp
index 9a85fab197b9..363c62379048 100644
--- a/dom/workers/XMLHttpRequest.cpp
+++ b/dom/workers/XMLHttpRequest.cpp
@@ -1119,7 +1119,8 @@ public:
     nsCOMPtr<nsIVariant> variant;
 
     if (mBody.data()) {
-      RuntimeService::AutoSafeJSContext cx;
+      SafeAutoJSContext cx;
+      JSAutoRequest ar(cx);
       nsIXPConnect* xpc = nsContentUtils::XPConnect();
       NS_ASSERTION(xpc, "This should never be null!");
 
@@ -1375,7 +1376,8 @@ Proxy::HandleEvent(nsIDOMEvent* aEvent)
   }
 
   {
-    RuntimeService::AutoSafeJSContext cx;
+    SafeAutoJSContext cx;
+    JSAutoRequest ar(cx);
     runnable->Dispatch(cx);
   }
 

From a112392460c05b97d6b4d05af0b91402cff33f61 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Apr 2013 11:36:04 -0400
Subject: [PATCH 278/438] Bug 860438 - Remove plugin-specific cx pusher.
 r=bsmedberg

The old code does two little bits of special sauce that are worth mentioning:

1 - It calls OnWrapper{Created,Destroyed} to maintain the lifetime of the
    addref'd context stack pointer. But that whole thing is gone now.

2 - It calls ScriptEvaluated to potentially invoke termination functions in
    certain cases. nsCxPusher does this too, but with slightly different logic.
    In particular, nsCxPusher checks whether the given JSContext was already
    on the stack, whereas AutoCXPusher checked whether there was another cx on
    the stack above this one. As far as I can tell from my investigations of
    this stuff, this is all total voodoo, and I think it should probably be fine
    to just use an nsCxPusher here.

Also, termination functions are going away soon in bug 841312.
---
 dom/plugins/base/nsJSNPRuntime.cpp | 70 ++++++------------------------
 1 file changed, 14 insertions(+), 56 deletions(-)

diff --git a/dom/plugins/base/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp
index 54f6b7a5af0e..0ba19b07f658 100644
--- a/dom/plugins/base/nsJSNPRuntime.cpp
+++ b/dom/plugins/base/nsJSNPRuntime.cpp
@@ -19,7 +19,6 @@
 #include "nsContentUtils.h"
 #include "nsIDocument.h"
 #include "nsIJSRuntimeService.h"
-#include "nsIJSContextStack.h"
 #include "nsIXPConnect.h"
 #include "nsIDOMElement.h"
 #include "prmem.h"
@@ -58,10 +57,6 @@ static int32_t sWrapperCount;
 // reachable.
 static JSRuntime *sJSRuntime;
 
-// The JS context stack, we use this to push a plugin's JSContext onto
-// while executing JS on the context.
-static nsIJSContextStack *sContextStack;
-
 static nsTArray<NPObject*>* sDelayedReleases;
 
 namespace {
@@ -234,8 +229,6 @@ OnWrapperCreated()
     // Register our GC callback to perform delayed destruction of finalized
     // NPObjects. Leave this callback around and don't ever unregister it.
     rtsvc->RegisterGCCallback(DelayedReleaseGCCallback);
-
-    CallGetService("@mozilla.org/js/xpc/ContextStack;1", &sContextStack);
   }
 }
 
@@ -267,51 +260,9 @@ OnWrapperDestroyed()
 
     // No more need for this.
     sJSRuntime = nullptr;
-
-    NS_IF_RELEASE(sContextStack);
   }
 }
 
-struct AutoCXPusher
-{
-  AutoCXPusher(JSContext *cx)
-  {
-    // Precondition explaining why we don't need to worry about errors
-    // in OnWrapperCreated.
-    NS_PRECONDITION(sWrapperCount > 0,
-                    "must have live wrappers when using AutoCXPusher");
-
-    // Call OnWrapperCreated and OnWrapperDestroyed to ensure that the
-    // last OnWrapperDestroyed doesn't happen while we're on the stack
-    // and null out sContextStack.
-    OnWrapperCreated();
-
-    sContextStack->Push(cx);
-  }
-
-  ~AutoCXPusher()
-  {
-    JSContext *cx = nullptr;
-    sContextStack->Pop(&cx);
-
-    JSContext *currentCx = nullptr;
-    sContextStack->Peek(&currentCx);
-
-    if (!currentCx) {
-      // No JS is running, tell the context we're done executing
-      // script.
-
-      nsIScriptContext *scx = GetScriptContextFromJSContext(cx);
-
-      if (scx) {
-        scx->ScriptEvaluated(true);
-      }
-    }
-
-    OnWrapperDestroyed();
-  }
-};
-
 namespace mozilla {
 namespace plugins {
 namespace parent {
@@ -615,7 +566,8 @@ nsJSObjWrapper::NP_HasMethod(NPObject *npobj, NPIdentifier id)
 
   nsJSObjWrapper *npjsobj = (nsJSObjWrapper *)npobj;
 
-  AutoCXPusher pusher(cx);
+  nsCxPusher pusher;
+  pusher.Push(cx);
   JSAutoRequest ar(cx);
   JSAutoCompartment ac(cx, npjsobj->mJSObj);
 
@@ -651,7 +603,8 @@ doInvoke(NPObject *npobj, NPIdentifier method, const NPVariant *args,
   nsJSObjWrapper *npjsobj = (nsJSObjWrapper *)npobj;
   JS::Value fv;
 
-  AutoCXPusher pusher(cx);
+  nsCxPusher pusher;
+  pusher.Push(cx);
   JSAutoRequest ar(cx);
   JSAutoCompartment ac(cx, npjsobj->mJSObj);
 
@@ -762,7 +715,8 @@ nsJSObjWrapper::NP_HasProperty(NPObject *npobj, NPIdentifier id)
   nsJSObjWrapper *npjsobj = (nsJSObjWrapper *)npobj;
   JSBool found, ok = JS_FALSE;
 
-  AutoCXPusher pusher(cx);
+  nsCxPusher pusher;
+  pusher.Push(cx);
   JSAutoRequest ar(cx);
   AutoJSExceptionReporter reporter(cx);
   JSAutoCompartment ac(cx, npjsobj->mJSObj);
@@ -794,7 +748,8 @@ nsJSObjWrapper::NP_GetProperty(NPObject *npobj, NPIdentifier id,
 
   nsJSObjWrapper *npjsobj = (nsJSObjWrapper *)npobj;
 
-  AutoCXPusher pusher(cx);
+  nsCxPusher pusher;
+  pusher.Push(cx);
   JSAutoRequest ar(cx);
   AutoJSExceptionReporter reporter(cx);
   JSAutoCompartment ac(cx, npjsobj->mJSObj);
@@ -826,7 +781,8 @@ nsJSObjWrapper::NP_SetProperty(NPObject *npobj, NPIdentifier id,
   nsJSObjWrapper *npjsobj = (nsJSObjWrapper *)npobj;
   JSBool ok = JS_FALSE;
 
-  AutoCXPusher pusher(cx);
+  nsCxPusher pusher;
+  pusher.Push(cx);
   JSAutoRequest ar(cx);
   AutoJSExceptionReporter reporter(cx);
   JSAutoCompartment ac(cx, npjsobj->mJSObj);
@@ -864,7 +820,8 @@ nsJSObjWrapper::NP_RemoveProperty(NPObject *npobj, NPIdentifier id)
   nsJSObjWrapper *npjsobj = (nsJSObjWrapper *)npobj;
   JSBool ok = JS_FALSE;
 
-  AutoCXPusher pusher(cx);
+  nsCxPusher pusher;
+  pusher.Push(cx);
   JSAutoRequest ar(cx);
   AutoJSExceptionReporter reporter(cx);
   JS::Value deleted = JSVAL_FALSE;
@@ -917,7 +874,8 @@ nsJSObjWrapper::NP_Enumerate(NPObject *npobj, NPIdentifier **idarray,
 
   nsJSObjWrapper *npjsobj = (nsJSObjWrapper *)npobj;
 
-  AutoCXPusher pusher(cx);
+  nsCxPusher pusher;
+  pusher.Push(cx);
   JSAutoRequest ar(cx);
   AutoJSExceptionReporter reporter(cx);
   JSAutoCompartment ac(cx, npjsobj->mJSObj);

From 8dadeed02cec3b0dbd1c185943ebc8cdb624ea7f Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Apr 2013 11:36:05 -0400
Subject: [PATCH 279/438] Bug 860438 - Remove custom AutoPusher in ipc
 XPCShellEnvironment. r=gabor

Some of this existing code is little wacky in that it calls Environment(mCx)
in a non-static method, which I would think would be equivalent to |this|.
But I don't know this code well enough to be sure of that, so I'm just going
to do the careful thing.
---
 ipc/testshell/XPCShellEnvironment.cpp | 41 +++++----------------------
 ipc/testshell/XPCShellEnvironment.h   | 10 -------
 2 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/ipc/testshell/XPCShellEnvironment.cpp b/ipc/testshell/XPCShellEnvironment.cpp
index da439930b6c0..8bf71f36aed5 100644
--- a/ipc/testshell/XPCShellEnvironment.cpp
+++ b/ipc/testshell/XPCShellEnvironment.cpp
@@ -26,7 +26,6 @@
 #include "nsIChannel.h"
 #include "nsIClassInfo.h"
 #include "nsIDirectoryService.h"
-#include "nsIJSContextStack.h"
 #include "nsIJSRuntimeService.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptSecurityManager.h"
@@ -34,6 +33,7 @@
 #include "nsIXPConnect.h"
 #include "nsIXPCScriptable.h"
 
+#include "nsContentUtils.h"
 #include "nsJSUtils.h"
 #include "nsJSPrincipals.h"
 #include "nsThreadUtils.h"
@@ -529,7 +529,8 @@ ProcessFile(JSContext *cx,
             JSBool forceTTY)
 {
     XPCShellEnvironment* env = Environment(cx);
-    XPCShellEnvironment::AutoContextPusher pusher(env);
+    nsCxPusher pusher;
+    pusher.Push(env->GetContext());
 
     JSScript *script;
     JS::Value result;
@@ -882,26 +883,6 @@ XPCShellDirProvider::GetFile(const char *prop,
     return NS_ERROR_FAILURE;
 }
 
-XPCShellEnvironment::
-AutoContextPusher::AutoContextPusher(XPCShellEnvironment* aEnv)
-{
-    NS_ASSERTION(aEnv->mCx, "Null context?!");
-
-    if (NS_SUCCEEDED(aEnv->mCxStack->Push(aEnv->mCx))) {
-        mEnv = aEnv;
-    }
-}
-
-XPCShellEnvironment::
-AutoContextPusher::~AutoContextPusher()
-{
-    if (mEnv) {
-        JSContext* cx;
-        mEnv->mCxStack->Pop(&cx);
-        NS_ASSERTION(cx == mEnv->mCx, "Wrong context on the stack!");
-    }
-}
-
 // static
 XPCShellEnvironment*
 XPCShellEnvironment::CreateEnvironment()
@@ -938,8 +919,6 @@ XPCShellEnvironment::~XPCShellEnvironment()
         JSRuntime *rt = JS_GetRuntime(mCx);
         JS_GC(rt);
 
-        mCxStack = nullptr;
-
         if (mJSPrincipals) {
             JS_DropPrincipals(rt, mJSPrincipals);
         }
@@ -1027,15 +1006,8 @@ XPCShellEnvironment::Init()
         fprintf(stderr, "+++ Failed to get ScriptSecurityManager service, running without principals");
     }
 
-    nsCOMPtr<nsIJSContextStack> cxStack =
-        do_GetService("@mozilla.org/js/xpc/ContextStack;1");
-    if (!cxStack) {
-        NS_ERROR("failed to get the nsThreadJSContextStack service!");
-        return false;
-    }
-    mCxStack = cxStack;
-
-    AutoContextPusher pusher(this);
+    nsCxPusher pusher;
+    pusher.Push(mCx);
 
     nsRefPtr<BackstagePass> backstagePass;
     rv = NS_NewBackstagePass(getter_AddRefs(backstagePass));
@@ -1093,7 +1065,8 @@ XPCShellEnvironment::EvaluateString(const nsString& aString,
                                     nsString* aResult)
 {
   XPCShellEnvironment* env = Environment(mCx);
-  XPCShellEnvironment::AutoContextPusher pusher(env);
+  nsCxPusher pusher;
+  pusher.Push(env->GetContext());
 
   JSAutoRequest ar(mCx);
 
diff --git a/ipc/testshell/XPCShellEnvironment.h b/ipc/testshell/XPCShellEnvironment.h
index 9c5417fe2e2f..ab59d15ececc 100644
--- a/ipc/testshell/XPCShellEnvironment.h
+++ b/ipc/testshell/XPCShellEnvironment.h
@@ -73,15 +73,6 @@ public:
         return mCompileOnly;
     }
 
-    class AutoContextPusher
-    {
-    public:
-        AutoContextPusher(XPCShellEnvironment* aEnv);
-        ~AutoContextPusher();
-    private:
-        XPCShellEnvironment* mEnv;
-    };
-
 protected:
     XPCShellEnvironment();
     bool Init();
@@ -89,7 +80,6 @@ protected:
 private:
     JSContext* mCx;
     nsAutoJSValHolder mGlobalHolder;
-    nsCOMPtr<nsIJSContextStack> mCxStack;
     JSPrincipals* mJSPrincipals;
 
     int mExitCode;

From e27963c8e722a13fd269d1e88ef52e0283937f52 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Apr 2013 11:36:05 -0400
Subject: [PATCH 280/438] Bug 860438 - Use nsCxPusher in JSD. r=gabor

---
 js/jsd/jsd_xpc.cpp | 58 +++++++++++++---------------------------------
 1 file changed, 16 insertions(+), 42 deletions(-)

diff --git a/js/jsd/jsd_xpc.cpp b/js/jsd/jsd_xpc.cpp
index ea1ef4b837dd..575d3e01481f 100644
--- a/js/jsd/jsd_xpc.cpp
+++ b/js/jsd/jsd_xpc.cpp
@@ -30,9 +30,9 @@
 
 /* XXX DOM dependency */
 #include "nsIScriptContext.h"
-#include "nsIJSContextStack.h"
 #include "SandboxPrivate.h"
 #include "nsJSPrincipals.h"
+#include "nsContentUtils.h"
 
 /*
  * defining CAUTIOUS_SCRIPTHOOK makes jsds disable GC while calling out to the
@@ -2037,14 +2037,8 @@ jsdStackFrame::Eval (const nsAString &bytes, const nsACString &fileName,
     estate = JS_SaveExceptionState (cx);
     JS_ClearPendingException (cx);
 
-    nsresult rv;
-    nsCOMPtr<nsIJSContextStack> stack = do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
-    if (NS_SUCCEEDED(rv))
-        rv = stack->Push(cx);
-    if (NS_FAILED(rv)) {
-        JS_RestoreExceptionState (cx, estate);
-        return rv;
-    }
+    nsCxPusher pusher;
+    pusher.Push(cx);
 
     *_rval = JSD_AttemptUCScriptInStackFrame (mCx, mThreadState,
                                               mStackFrameInfo,
@@ -2060,14 +2054,6 @@ jsdStackFrame::Eval (const nsAString &bytes, const nsACString &fileName,
 
     JS_RestoreExceptionState (cx, estate);
 
-#ifdef DEBUG
-    JSContext* poppedCX;
-    rv = stack->Pop(&poppedCX);
-    NS_ASSERTION(NS_SUCCEEDED(rv) && poppedCX == cx, "bad pop");
-#else
-    (void) stack->Pop(nullptr);
-#endif
-
     JSDValue *jsdv = JSD_NewValue (mCx, jv);
     if (!jsdv)
         return NS_ERROR_FAILURE;
@@ -3021,35 +3007,23 @@ jsdService::EnterNestedEventLoop (jsdINestCallback *callback, uint32_t *_rval)
 {
     // Nesting event queues is a thing of the past.  Now, we just spin the
     // current event loop.
- 
-    nsresult rv;
-    nsCOMPtr<nsIJSContextStack> 
-        stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv));
-    if (NS_FAILED(rv))
-        return rv;
+    nsresult rv = NS_OK;
+    nsCxPusher pusher;
+    pusher.PushNull();
     uint32_t nestLevel = ++mNestedLoopLevel;
-    
     nsCOMPtr<nsIThread> thread = do_GetCurrentThread();
 
-    if (NS_SUCCEEDED(stack->Push(nullptr))) {
-        if (callback) {
-            DoPause(nullptr, true);
-            rv = callback->OnNest();
-            DoUnPause(nullptr, true);
-        }
-        
-        while (NS_SUCCEEDED(rv) && mNestedLoopLevel >= nestLevel) {
-            if (!NS_ProcessNextEvent(thread))
-                rv = NS_ERROR_UNEXPECTED;
-        }
-
-        JSContext* cx;
-        stack->Pop(&cx);
-        NS_ASSERTION(cx == nullptr, "JSContextStack mismatch");
+    if (callback) {
+        DoPause(nullptr, true);
+        rv = callback->OnNest();
+        DoUnPause(nullptr, true);
     }
-    else
-        rv = NS_ERROR_FAILURE;
-    
+
+    while (NS_SUCCEEDED(rv) && mNestedLoopLevel >= nestLevel) {
+        if (!NS_ProcessNextEvent(thread))
+            rv = NS_ERROR_UNEXPECTED;
+    }
+
     NS_ASSERTION (mNestedLoopLevel <= nestLevel,
                   "nested event didn't unwind properly");
     if (mNestedLoopLevel == nestLevel)

From d93de46ed5707092b657345b211cb4f79b724841 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Apr 2013 11:36:05 -0400
Subject: [PATCH 281/438] Bug 860438 - Add assertion back in. r=gabor

---
 content/base/src/nsContentUtils.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index fddd94e303d9..6e22edf6e798 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -3196,7 +3196,8 @@ nsCxPusher::Pop()
   // pop is the same as it was right after we pushed.
   MOZ_ASSERT_IF(mPushedContext, mCompartmentDepthOnEntry ==
                                 js::GetEnterCompartmentDepth(mPushedContext));
-
+  DebugOnly<JSContext*> stackTop;
+  MOZ_ASSERT(NS_SUCCEEDED(stack->Peek(&stackTop)) && mPushedContext == stackTop);
   stack->Pop(nullptr);
 
   if (!mScriptIsRunning && mScx) {

From 474a643a4e2e33ca8a10b45acf8d60c42bf0fe45 Mon Sep 17 00:00:00 2001
From: Kannan Vijayan <kvijayan@mozilla.com>
Date: Thu, 18 Apr 2013 12:20:45 -0400
Subject: [PATCH 282/438] Bug 862501 - Make baseline pass more accurate
 stack-pointer refeference for pushed SPS profiler frames. r=jandem

---
 js/src/ion/BaselineIC.cpp      | 1 +
 js/src/ion/IonMacroAssembler.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/src/ion/BaselineIC.cpp b/js/src/ion/BaselineIC.cpp
index 4403911b76a8..76cbc2db89fd 100644
--- a/js/src/ion/BaselineIC.cpp
+++ b/js/src/ion/BaselineIC.cpp
@@ -1016,6 +1016,7 @@ ICProfiler_PushFunction::Compiler::generateStubCode(MacroAssembler &masm)
     masm.spsPushFrame(&cx->runtime->spsProfiler,
                       Address(BaselineStubReg, ICProfiler_PushFunction::offsetOfStr()),
                       Address(BaselineStubReg, ICProfiler_PushFunction::offsetOfScript()),
+                      BaselineFrameReg,
                       scratch,
                       scratch2);
 
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index 6f0a583cf79c..492f7f05c272 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -779,7 +779,7 @@ class MacroAssembler : public MacroAssemblerSpecific
     }
 
     void spsPushFrame(SPSProfiler *p, const Address &str, const Address &script,
-                      Register temp, Register temp2)
+                      Register framePtr, Register temp, Register temp2)
     {
         Label stackFull;
         spsProfileEntryAddress(p, 0, temp, &stackFull);
@@ -790,7 +790,7 @@ class MacroAssembler : public MacroAssemblerSpecific
         loadPtr(script, temp2);
         storePtr(temp2, Address(temp, ProfileEntry::offsetOfScript()));
 
-        storePtr(ImmWord((void*) 0), Address(temp, ProfileEntry::offsetOfStackAddress()));
+        storePtr(framePtr, Address(temp, ProfileEntry::offsetOfStackAddress()));
 
         // Store 0 for PCIdx because that's what interpreter does.
         // (See Probes::enterScript, which calls spsProfiler.enter, which pushes an entry

From 1a3c359300ddffbe113ba2600caabda4d3fc0830 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Wed, 17 Apr 2013 17:33:54 -0700
Subject: [PATCH 283/438] Bug 858749 - OdinMonkey: fix join after break when
 block is empty (r=sstangl)

--HG--
extra : rebase_source : fef8266e5e5903443933bd84b149b904da3d3dee
---
 js/src/ion/AsmJS.cpp                          | 21 ++++++++++++-------
 .../jit-test/tests/asm.js/testControlFlow.js  |  4 ++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/js/src/ion/AsmJS.cpp b/js/src/ion/AsmJS.cpp
index 030e57503cde..de45a28ed718 100644
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -2088,17 +2088,19 @@ class FunctionCompiler
 
     bool bindContinues(ParseNode *pn, const LabelVector *maybeLabels)
     {
+        bool createdJoinBlock = false;
         if (UnlabeledBlockMap::Ptr p = unlabeledContinues_.lookup(pn)) {
-            if (!bindBreaksOrContinues(&p->value))
+            if (!bindBreaksOrContinues(&p->value, &createdJoinBlock))
                 return false;
             unlabeledContinues_.remove(p);
         }
-        return bindLabeledBreaksOrContinues(maybeLabels, &labeledContinues_);
+        return bindLabeledBreaksOrContinues(maybeLabels, &labeledContinues_, &createdJoinBlock);
     }
 
     bool bindLabeledBreaks(const LabelVector *maybeLabels)
     {
-        return bindLabeledBreaksOrContinues(maybeLabels, &labeledBreaks_);
+        bool createdJoinBlock = false;
+        return bindLabeledBreaksOrContinues(maybeLabels, &labeledBreaks_, &createdJoinBlock);
     }
 
     bool addBreak(PropertyName *maybeLabel) {
@@ -2200,11 +2202,11 @@ class FunctionCompiler
         return newBlockWithDepth(pred, loopStack_.length(), block);
     }
 
-    bool bindBreaksOrContinues(BlockVector *preds)
+    bool bindBreaksOrContinues(BlockVector *preds, bool *createdJoinBlock)
     {
         for (unsigned i = 0; i < preds->length(); i++) {
             MBasicBlock *pred = (*preds)[i];
-            if (curBlock_ && curBlock_->begin() == curBlock_->end()) {
+            if (*createdJoinBlock) {
                 pred->end(MGoto::New(curBlock_));
                 curBlock_->addPredecessor(pred);
             } else {
@@ -2217,6 +2219,7 @@ class FunctionCompiler
                     next->addPredecessor(curBlock_);
                 }
                 curBlock_ = next;
+                *createdJoinBlock = true;
             }
             JS_ASSERT(curBlock_->begin() == curBlock_->end());
         }
@@ -2224,14 +2227,15 @@ class FunctionCompiler
         return true;
     }
 
-    bool bindLabeledBreaksOrContinues(const LabelVector *maybeLabels, LabeledBlockMap *map)
+    bool bindLabeledBreaksOrContinues(const LabelVector *maybeLabels, LabeledBlockMap *map,
+                                      bool *createdJoinBlock)
     {
         if (!maybeLabels)
             return true;
         const LabelVector &labels = *maybeLabels;
         for (unsigned i = 0; i < labels.length(); i++) {
             if (LabeledBlockMap::Ptr p = map->lookup(labels[i])) {
-                if (!bindBreaksOrContinues(&p->value))
+                if (!bindBreaksOrContinues(&p->value, createdJoinBlock))
                     return false;
                 map->remove(p);
             }
@@ -2258,8 +2262,9 @@ class FunctionCompiler
 
     bool bindUnlabeledBreaks(ParseNode *pn)
     {
+        bool createdJoinBlock = false;
         if (UnlabeledBlockMap::Ptr p = unlabeledBreaks_.lookup(pn)) {
-            if (!bindBreaksOrContinues(&p->value))
+            if (!bindBreaksOrContinues(&p->value, &createdJoinBlock))
                 return false;
             unlabeledBreaks_.remove(p);
         }
diff --git a/js/src/jit-test/tests/asm.js/testControlFlow.js b/js/src/jit-test/tests/asm.js/testControlFlow.js
index aaad146e0e3c..4097759d7e00 100644
--- a/js/src/jit-test/tests/asm.js/testControlFlow.js
+++ b/js/src/jit-test/tests/asm.js/testControlFlow.js
@@ -99,6 +99,10 @@ assertEq(asmLink(asmCompile(USE_ASM + "function f(i) { i=i|0; while(1) { if (i)
 assertEq(asmLink(asmCompile(USE_ASM + "function f(i) { i=i|0; for(;;) { if (i) { return i|0 } else { return i|0 } i = 1 } return i|0 } return f"))(3), 3);
 assertEq(asmLink(asmCompile(USE_ASM + "function f(i) { i=i|0; do { if (i) { return i|0 } else { return i|0 } i = 1 } while (0); return i|0 } return f"))(3), 3);
 
+assertEq(asmLink(asmCompile(USE_ASM + "function f() {var j=1,i=0; while(j){ if(0) continue; j=i } return j|0 } return f"))(), 0);
+assertEq(asmLink(asmCompile(USE_ASM + "function f() {var j=1,i=0; for(;j;){ if(0) continue; j=i } return j|0 } return f"))(), 0);
+assertEq(asmLink(asmCompile(USE_ASM + "function f() {var j=1,i=0; do{ if(0) continue; j=i } while(j) return j|0 } return f"))(), 0);
+
 assertEq(asmLink(asmCompile(USE_ASM + "function f(i) { i=i|0; for(;;) { return i|0 } return 0 } return f"))(42), 42);
 assertEq(asmLink(asmCompile(USE_ASM + "function f(n) { n=n|0; var i=0,s=0; for(;;i=(i+1)|0) { if (~~i==~~n) return s|0; s=(s+i)|0 } return 0 } return f"))(8), 28);
 

From dc957f6c2e36db70df01782aa7b9e162dc1f1f1a Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Wed, 17 Apr 2013 17:34:29 -0700
Subject: [PATCH 284/438] Bug 863045 - OdinMonkey: fix duplicate-evaluation in
 double-to-int coercion (r=sstangl)

--HG--
extra : rebase_source : b6c832b6a2a5a1f25c137ca7e276316b85ff3650
---
 js/src/ion/AsmJS.cpp                          | 39 +++++++++++++------
 .../tests/asm.js/testFloatingPoint.js         |  4 ++
 .../jit-test/tests/asm.js/testHeapAccess.js   | 12 ++++++
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/js/src/ion/AsmJS.cpp b/js/src/ion/AsmJS.cpp
index de45a28ed718..eb553bd244ef 100644
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -3495,24 +3495,39 @@ CheckNeg(FunctionCompiler &f, ParseNode *expr, MDefinition **def, Type *type)
     return f.fail("Operand to unary - must be an int", operand);
 }
 
+static bool
+CheckCoerceToInt(FunctionCompiler &f, ParseNode *expr, MDefinition **def, Type *type)
+{
+    JS_ASSERT(expr->isKind(PNK_BITNOT));
+    ParseNode *operand = UnaryKid(expr);
+
+    MDefinition *operandDef;
+    Type operandType;
+    if (!CheckExpr(f, operand, Use::ToInt32, &operandDef, &operandType))
+        return false;
+
+    if (operandType.isDoublish()) {
+        *def = f.unary<MTruncateToInt32>(operandDef);
+        *type = Type::Signed;
+        return true;
+    }
+
+    if (!operandType.isIntish())
+        return f.fail("Operand to ~ must be intish or doublish", operand);
+
+    *def = operandDef;
+    *type = Type::Signed;
+    return true;
+}
+
 static bool
 CheckBitNot(FunctionCompiler &f, ParseNode *neg, MDefinition **def, Type *type)
 {
     JS_ASSERT(neg->isKind(PNK_BITNOT));
     ParseNode *operand = UnaryKid(neg);
 
-    if (operand->isKind(PNK_BITNOT)) {
-        MDefinition *operandDef;
-        Type operandType;
-        if (!CheckExpr(f, UnaryKid(operand), Use::NoCoercion, &operandDef, &operandType))
-            return false;
-
-        if (operandType.isDouble()) {
-            *def = f.unary<MTruncateToInt32>(operandDef);
-            *type = Type::Signed;
-            return true;
-        }
-    }
+    if (operand->isKind(PNK_BITNOT))
+        return CheckCoerceToInt(f, operand, def, type);
 
     MDefinition *operandDef;
     Type operandType;
diff --git a/js/src/jit-test/tests/asm.js/testFloatingPoint.js b/js/src/jit-test/tests/asm.js/testFloatingPoint.js
index 56c5b83f832e..b9a1fab188e3 100644
--- a/js/src/jit-test/tests/asm.js/testFloatingPoint.js
+++ b/js/src/jit-test/tests/asm.js/testFloatingPoint.js
@@ -8,6 +8,7 @@ assertEq(asmLink(asmCompile(USE_ASM + "function f(i,e) { i=i|0;e=+e; return +(+~
 assertEq(asmLink(asmCompile(USE_ASM + "function f(d,i) { d=+d;i=i|0; return +(d + +(i|0)) } return f"))(.1, 1), 1.1);
 assertEq(asmLink(asmCompile(USE_ASM + "function f(d,e) { d=+d;e=+e; return +(d-e) } return f"))(1.1, .8), (1.1-.8));
 assertEq(asmLink(asmCompile(USE_ASM + "function f(d,e) { d=+d;e=+e; return +(d*e) } return f"))(1.1, 2.2), (1.1*2.2));
+assertEq(asmLink(asmCompile(USE_ASM + "function g() { var i=2; return (~~(i=(i+1)|0))|0 } return g"))(), 3);
 
 var f = asmLink(asmCompile(USE_ASM + "function f(d,e) { d=+d;e=+e; return (d<e)|0 } return f"));
 assertEq(f(1.1, 2.2), 1);
@@ -109,6 +110,9 @@ function ffi(d) { str = String(d) }
 var g = asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + HEAP_IMPORTS + 'var ffi=imp.ffi; function g() { ffi(+f64[0]) } return g'), this, {ffi:ffi}, buf);
 var h = asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + HEAP_IMPORTS + 'function g() { return +(+f64[0] < 0.0 ? -+f64[0] : +f64[0]) } return g'), this, null, buf)
 
+function ffi1() { return 2.6 }
+assertEq(asmLink(asmCompile('glob', 'imp', USE_ASM + "var ffi1=imp.ffi1; function g() { var i=0,j=0.0; i=~~ffi1(); j=+ffi1(); return +(+(i|0)+j) } return g"), null, {ffi1:ffi1})(), 2+2.6);
+
 // that sounds dangerous!
 var a = [0,1,0xffff0000,0x7fff0000,0xfff80000,0x7ff80000,0xfffc0000,0x7ffc0000,0xffffffff,0x0000ffff,0x00008fff7];
 for (i of a) {
diff --git a/js/src/jit-test/tests/asm.js/testHeapAccess.js b/js/src/jit-test/tests/asm.js/testHeapAccess.js
index 22a4de271516..0f3c2860e4d5 100644
--- a/js/src/jit-test/tests/asm.js/testHeapAccess.js
+++ b/js/src/jit-test/tests/asm.js/testHeapAccess.js
@@ -82,6 +82,18 @@ assertEq(f(0x7f),0x7f);
 assertEq(f(0xff),0xff);
 assertEq(f(0x100),0);
 
+var code = asmCompile('glob', 'imp', 'b', USE_ASM + HEAP_IMPORTS + 'function f(i,j) {i=i|0;j=+j; f64[i>>3] = j; return (~~f64[i>>3])|0}; return f');
+var f = asmLink(code, this, null, new ArrayBuffer(4096));
+assertEq(f(0, 1.3), 1);
+assertEq(f(4088, 2.5), 2);
+assertEq(f(4096, 3.8), 0);
+
+var code = asmCompile('glob', 'imp', 'b', USE_ASM + HEAP_IMPORTS + 'function f(i,j) {i=i|0;j=+j; f64[i>>3] = j; return +f64[i>>3]}; return f');
+var f = asmLink(code, this, null, new ArrayBuffer(4096));
+assertEq(f(0, 1.3), 1.3);
+assertEq(f(4088, 2.5), 2.5);
+assertEq(f(4096, 3.8), NaN);
+
 var i32 = new Int32Array(4096/4);
 i32[0] = 13;
 i32[1] = 0xfffeeee;

From e695f9bdf4163c94915b75cc2ec941a2b42a8a73 Mon Sep 17 00:00:00 2001
From: Andre Reinald <areinald@mozilla.com>
Date: Thu, 18 Apr 2013 12:39:09 -0400
Subject: [PATCH 285/438] Bug 802776 - Update deprecated calls in NSOpenPanel
 and NSSavePanel and transform default directory paths strings to URIs so they
 work as expected. r=josh

---
 widget/cocoa/nsFilePicker.mm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/widget/cocoa/nsFilePicker.mm b/widget/cocoa/nsFilePicker.mm
index 8c6d45a0ad0f..ac6083e640e1 100644
--- a/widget/cocoa/nsFilePicker.mm
+++ b/widget/cocoa/nsFilePicker.mm
@@ -301,7 +301,7 @@ nsFilePicker::GetLocalFiles(const nsString& inTitle, bool inAllowMultiple, nsCOM
   [thePanel setCanSelectHiddenExtension:YES];
   [thePanel setCanChooseDirectories:NO];
   [thePanel setCanChooseFiles:YES];
-  [thePanel setResolvesAliases:YES];        //this is default - probably doesn't need to be set
+  [thePanel setResolvesAliases:YES]; //this is default - probably doesn't need to be set
   
   // Get filters
   // filters may be null, if we should allow all file types.
@@ -312,18 +312,20 @@ nsFilePicker::GetLocalFiles(const nsString& inTitle, bool inAllowMultiple, nsCOM
   
   // if this is the "Choose application..." dialog, and no other start
   // dir has been set, then use the Applications folder.
-  if (!theDir && filters && [filters count] == 1 && 
-      [(NSString *)[filters objectAtIndex:0] isEqualToString:@"app"]) {
-    theDir = @"/Applications/";
+  if (!theDir) {
+    if (filters && [filters count] == 1 &&
+        [(NSString *)[filters objectAtIndex:0] isEqualToString:@"app"])
+      theDir = @"/Applications/";
+    else
+      theDir = @"";
   }
 
+  [thePanel setDirectoryURL:[[NSURL alloc] initFileURLWithPath:theDir isDirectory:YES]];
+
   int result;
   nsCocoaUtils::PrepareForNativeAppModalDialog();
   if (mFilters.Length() > 1) {
     // [NSURL initWithString:] (below) throws an exception if URLString is nil.
-    if (!theDir) {
-      theDir = @"";
-    }
 
     NSPopUpButtonObserver* observer = [[NSPopUpButtonObserver alloc] init];
 
@@ -339,7 +341,6 @@ nsFilePicker::GetLocalFiles(const nsString& inTitle, bool inAllowMultiple, nsCOM
       selector:@selector(menuChangedItem:)
       name:NSMenuWillSendActionNotification object:nil];
 
-    [thePanel setDirectoryURL:[[NSURL alloc] initWithString:theDir]];
     UpdatePanelFileTypes(thePanel, filters);
     result = [thePanel runModal];
 
@@ -350,7 +351,8 @@ nsFilePicker::GetLocalFiles(const nsString& inTitle, bool inAllowMultiple, nsCOM
     if (!filters) {
       [thePanel setTreatsFilePackagesAsDirectories:YES];
     }
-    result = [thePanel runModalForDirectory:theDir file:nil types:filters];
+    [thePanel setAllowedFileTypes:filters];
+    result = [thePanel runModal];
   }
   nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
   
@@ -409,8 +411,9 @@ nsFilePicker::GetLocalFolder(const nsString& inTitle, nsIFile** outFile)
 
   // set up default directory
   NSString *theDir = PanelDefaultDirectory();
+  [thePanel setDirectoryURL:[[NSURL alloc] initFileURLWithPath:theDir isDirectory:YES]];
   nsCocoaUtils::PrepareForNativeAppModalDialog();
-  int result = [thePanel runModalForDirectory:theDir file:nil types:nil];  
+  int result = [thePanel runModal];
   nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
 
   if (result == NSFileHandlingPanelCancelButton)
@@ -457,10 +460,12 @@ nsFilePicker::PutLocalFile(const nsString& inTitle, const nsString& inDefaultNam
 
   // set up default directory
   NSString *theDir = PanelDefaultDirectory();
+  [thePanel setDirectoryURL:[[NSURL alloc] initFileURLWithPath:theDir isDirectory:YES]];
 
   // load the panel
   nsCocoaUtils::PrepareForNativeAppModalDialog();
-  int result = [thePanel runModalForDirectory:theDir file:defaultFilename];
+  [thePanel setNameFieldStringValue:defaultFilename];
+  int result = [thePanel runModal];
   nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
   if (result == NSFileHandlingPanelCancelButton)
     return retVal;

From c06b247230abc409485a297f7a7af2d85658b16e Mon Sep 17 00:00:00 2001
From: Jan-Ivar Bruaroey <jib@mozilla.com>
Date: Wed, 17 Apr 2013 19:03:39 -0400
Subject: [PATCH 286/438] Bug 857765 - Add try/catch to content-script
 window.onerror call. r=abr

---
 dom/media/PeerConnection.js                   | 28 ++++++++++++++-----
 .../test_peerConnection_throwInCallbacks.html |  3 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/dom/media/PeerConnection.js b/dom/media/PeerConnection.js
index fd9e95a562f2..4a3f39153e52 100644
--- a/dom/media/PeerConnection.js
+++ b/dom/media/PeerConnection.js
@@ -807,18 +807,32 @@ PeerConnectionObserver.prototype = {
         let file = stack[1];
         let line = parseInt(stack[3].split(" ")[1]);
 
-        let scriptError = Cc["@mozilla.org/scripterror;1"].
-            createInstance(Ci.nsIScriptError);
+        let scriptErrorClass = Cc["@mozilla.org/scripterror;1"];
+        let scriptError = scriptErrorClass.createInstance(Ci.nsIScriptError);
         scriptError.initWithWindowID(msg, file, null, line, 0,
                                      Ci.nsIScriptError.exceptionFlag,
                                      "content javascript",
                                      this._dompc._winID);
-        Cc["@mozilla.org/consoleservice;1"].
-            getService(Ci.nsIConsoleService).logMessage(scriptError);
+        let console = Cc["@mozilla.org/consoleservice;1"].
+            getService(Ci.nsIConsoleService);
+        console.logMessage(scriptError);
 
-        // Call onerror directly if present (necessary for testing)
-        if (typeof this._dompc._win.onerror === "function") {
-          this._dompc._win.onerror(msg, file, line);
+        // Safely call onerror directly if present (necessary for testing)
+        try {
+          if (typeof this._dompc._win.onerror === "function") {
+            this._dompc._win.onerror(msg, file, line);
+          }
+        } catch(e) {
+          // If onerror itself throws, service it.
+          try {
+            let scriptError = scriptErrorClass.createInstance(Ci.nsIScriptError);
+            scriptError.initWithWindowID(e.message, e.fileName, null,
+                                         e.lineNumber, 0,
+                                         Ci.nsIScriptError.exceptionFlag,
+                                         "content javascript",
+                                         this._dompc._winID);
+            console.logMessage(scriptError);
+          } catch(e) {}
         }
       }
     }
diff --git a/dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html b/dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html
index dcc22e55dfff..c5d2a8c2d0ab 100644
--- a/dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html
+++ b/dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html
@@ -25,6 +25,7 @@
     if (error_count == 7) {
       finish();
     }
+    throw new Error("window.onerror may throw");
     return false;
   }
 
@@ -67,7 +68,7 @@
 
   function finish() {
     window.onerror = oldOnError;
-    ok(error_count == 7, "Seven expected errors verified.");
+    is(error_count, 7, "Seven expected errors verified.");
     SimpleTest.finish();
   }
 

From 376fa9ff85c451a99037af721eba51431c2d144d Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Thu, 18 Apr 2013 12:39:09 -0400
Subject: [PATCH 287/438] Bug 859452 - Send characters as keys when using HTC
 Touch Input. r=cpeterson

---
 mobile/android/base/GeckoInputConnection.java | 18 ++++++++++++++----
 mobile/android/base/InputMethods.java         |  5 +++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java
index 3349c9c75e78..74e53acda43e 100644
--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -199,7 +199,7 @@ class GeckoInputConnection
     private boolean mBatchSelectionChanged;
     private boolean mBatchTextChanged;
     private long mLastRestartInputTime;
-    private final InputConnection mPluginInputConnection;
+    private final InputConnection mKeyInputConnection;
 
     public static GeckoEditableListener create(View targetView,
                                                GeckoEditableClient editable) {
@@ -214,8 +214,8 @@ class GeckoInputConnection
         super(targetView, true);
         mEditableClient = editable;
         mIMEState = IME_STATE_DISABLED;
-        // InputConnection for plugins, which don't have full editors
-        mPluginInputConnection = new BaseInputConnection(targetView, false);
+        // InputConnection that sends keys for plugins, which don't have full editors
+        mKeyInputConnection = new BaseInputConnection(targetView, false);
     }
 
     @Override
@@ -641,7 +641,7 @@ class GeckoInputConnection
             // Since we are using a temporary string as the editable, the selection is at 0
             outAttrs.initialSelStart = 0;
             outAttrs.initialSelEnd = 0;
-            return mPluginInputConnection;
+            return mKeyInputConnection;
         }
         Editable editable = getEditable();
         outAttrs.initialSelStart = Selection.getSelectionStart(editable);
@@ -649,6 +649,16 @@ class GeckoInputConnection
         return this;
     }
 
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        if (InputMethods.shouldCommitCharAsKey(mCurrentInputMethod) &&
+            text.length() == 1 && newCursorPosition > 0) {
+            // mKeyInputConnection is a BaseInputConnection that commits text as keys;
+            return mKeyInputConnection.commitText(text, newCursorPosition);
+        }
+        return super.commitText(text, newCursorPosition);
+    }
+
     @Override
     public boolean sendKeyEvent(KeyEvent event) {
         // BaseInputConnection.sendKeyEvent() dispatches the key event to the main thread.
diff --git a/mobile/android/base/InputMethods.java b/mobile/android/base/InputMethods.java
index 831c1c72443e..be20949ff35e 100644
--- a/mobile/android/base/InputMethods.java
+++ b/mobile/android/base/InputMethods.java
@@ -19,6 +19,7 @@ final class InputMethods {
     public static final String METHOD_ATOK = "com.justsystems.atokmobile.service/.AtokInputMethodService";
     public static final String METHOD_GOOGLE_JAPANESE_INPUT = "com.google.android.inputmethod.japanese/.MozcService";
     public static final String METHOD_GOOGLE_LATINIME = "com.google.android.inputmethod.latin/com.android.inputmethod.latin.LatinIME";
+    public static final String METHOD_HTC_TOUCH_INPUT = "com.htc.android.htcime/.HTCIMEService";
     public static final String METHOD_IWNN = "jp.co.omronsoft.iwnnime.ml/.standardcommon.IWnnLanguageSwitcher";
     public static final String METHOD_OPENWNN_PLUS = "com.owplus.ime.openwnnplus/.OpenWnnJAJP";
     public static final String METHOD_SAMSUNG = "com.sec.android.inputmethod/.SamsungKeypad";
@@ -56,6 +57,10 @@ final class InputMethods {
                                                METHOD_GOOGLE_LATINIME.equals(inputMethod));
     }
 
+    public static boolean shouldCommitCharAsKey(String inputMethod) {
+        return METHOD_HTC_TOUCH_INPUT.equals(inputMethod);
+    }
+
     public static boolean shouldDelayAwesomebarUpdate(Context context) {
         String inputMethod = getCurrentInputMethod(context);
         return METHOD_SAMSUNG.equals(inputMethod) ||

From 4848ce9bc2190b0552352f58c1c1964e903381d1 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 18 Apr 2013 09:51:18 -0700
Subject: [PATCH 288/438] Bug 858332: Make flex items pseudo-stacking contexts,
 per recent spec change. r=mats

---
 layout/generic/nsFlexContainerFrame.cpp       |  2 +-
 ...xbox-items-as-stacking-contexts-2-ref.html | 64 +++++++++++++++
 .../flexbox-items-as-stacking-contexts-2.html | 82 +++++++++++++++++++
 ...xbox-items-as-stacking-contexts-3-ref.html | 69 ++++++++++++++++
 .../flexbox-items-as-stacking-contexts-3.html | 73 +++++++++++++++++
 layout/reftests/flexbox/reftest.list          |  8 +-
 6 files changed, 294 insertions(+), 4 deletions(-)
 create mode 100644 layout/reftests/flexbox/flexbox-items-as-stacking-contexts-2-ref.html
 create mode 100644 layout/reftests/flexbox/flexbox-items-as-stacking-contexts-2.html
 create mode 100644 layout/reftests/flexbox/flexbox-items-as-stacking-contexts-3-ref.html
 create mode 100644 layout/reftests/flexbox/flexbox-items-as-stacking-contexts-3.html

diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
index f03b7cd37e0f..bc70b747da3f 100644
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -1061,7 +1061,7 @@ GetDisplayFlagsForFlexItem(nsIFrame* aFrame)
   if (pos->mZIndex.GetUnit() == eStyleUnit_Integer) {
     return nsIFrame::DISPLAY_CHILD_FORCE_STACKING_CONTEXT;
   }
-  return 0;
+  return nsIFrame::DISPLAY_CHILD_FORCE_PSEUDO_STACKING_CONTEXT;
 }
 
 void
diff --git a/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-2-ref.html b/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-2-ref.html
new file mode 100644
index 000000000000..c3f15958d97e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-2-ref.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <style>
+    body { font: 10px sans-serif }
+    .flexContainer {
+      background: orange;
+      width: 70px;
+      padding: 2px;
+      margin-bottom: 2px;
+    }
+
+    .flexContainer > div:first-child {
+      margin-right: 10px; /* the space between the flex items, in testcase */
+    }
+
+    .item1 {
+      display: inline-block;
+      background: lightblue;
+      width: 30px;
+    }
+    .item2 {
+      display: inline-block;
+      background: yellow;
+      width: 30px;
+    }
+  </style>
+</head>
+<body>
+  <div class="flexContainer"
+    ><div class="item1">ThisIsALongUnbrokenString</div
+    ><div class="item2">HereIsSomeMoreLongText</div
+  ></div>
+
+  <div class="flexContainer"
+    ><div class="item1" style="position:relative">ThisIsALongUnbrokenString</div
+    ><div class="item2">HereIsSomeMoreLongText</div
+  ></div>
+
+  <div class="flexContainer"
+    ><div class="item1" style="position:relative">ThisIsALongUnbrokenString</div
+    ><div class="item2">HereIsSomeMoreLongText</div
+  ></div>
+
+  <div class="flexContainer"
+    ><div class="item2">HereIsSomeMoreLongText</div
+    ><div class="item1">ThisIsALongUnbrokenString</div
+  ></div>
+
+  <div class="flexContainer"
+    ><div class="item2">HereIsSomeMoreLongText</div
+    ><div class="item1">ThisIsALongUnbrokenString</div
+  ></div>
+
+  <div class="flexContainer"
+    ><div class="item2" style="position:relative">HereIsSomeMoreLongText</div
+    ><div class="item1">ThisIsALongUnbrokenString</div
+  ></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-2.html b/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-2.html
new file mode 100644
index 000000000000..429497fd5f49
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-2.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- This testcase checks flex items are painted atomically. In particular,
+     if one item has content that overflows into the region of another item,
+     then one item is painted "behind" the other; there shouldn't normally
+     any interleaving of backgrounds and content between the two items.
+
+     This testcase also tests some special cases that will change the paint
+     ordering - specifically, the properties "position", "z-index", and
+     "order" on flex items.
+ -->
+<html>
+<head>
+  <style>
+    body { font: 10px sans-serif }
+    .flexContainer {
+      background: orange;
+      display: flex;
+      justify-content: space-between;
+      width: 70px;
+      padding: 2px;
+      margin-bottom: 2px;
+    }
+    .item1 {
+      background: lightblue;
+      width: 30px;
+    }
+    .item2 {
+      background: yellow;
+      width: 30px;
+    }
+  </style>
+</head>
+<body>
+  <!-- This container has two flex items, the first of which has content
+       sticking out & overlapping the second.  If they're painting atomically
+       (and in the right order), the second item's background should cover the
+       first item's overflowing content. -->
+  <div class="flexContainer"
+    ><div class="item1">ThisIsALongUnbrokenString</div
+    ><div class="item2">HereIsSomeMoreLongText</div
+  ></div>
+
+  <!-- Now, the first item is relatively positioned, which should make it paint
+       on top of everything. -->
+  <div class="flexContainer"
+    ><div class="item1" style="position:relative">ThisIsALongUnbrokenString</div
+    ><div class="item2">HereIsSomeMoreLongText</div
+  ></div>
+
+  <!-- Now, the first item is has "z-index" set, which should make it paint on
+       top of everything. -->
+  <div class="flexContainer"
+    ><div class="item1" style="z-index: 1">ThisIsALongUnbrokenString</div
+    ><div class="item2">HereIsSomeMoreLongText</div
+  ></div>
+
+  <!-- Now, the first item has "order" set to a higher value than default,
+       which should make it paint on top (and at the far right) -->
+  <div class="flexContainer"
+    ><div class="item1" style="order: 1">ThisIsALongUnbrokenString</div
+    ><div class="item2">HereIsSomeMoreLongText</div
+  ></div>
+
+  <!-- And for thoroughness, let's set "order" to a lower value than default,
+       on the second item. (Should render the same as previous example.)  -->
+  <div class="flexContainer"
+    ><div class="item1">ThisIsALongUnbrokenString</div
+    ><div class="item2" style="order: -1">HereIsSomeMoreLongText</div
+  ></div>
+
+  <!-- ...but if we relatively position that second item, it should paint
+       on top again, despite its low "order" value. -->
+  <div class="flexContainer"
+    ><div class="item1">ThisIsALongUnbrokenString</div
+    ><div class="item2" style="order: -1; position: relative">HereIsSomeMoreLongText</div
+  ></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-3-ref.html b/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-3-ref.html
new file mode 100644
index 000000000000..09eb9b8ac599
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-3-ref.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <style>
+    .flexContainer {
+      background: orange;
+      width: 70px;
+      height: 20px;
+      padding: 2px;
+      margin-bottom: 2px;
+    }
+    .item1 {
+      display: inline-block;
+      background: lightblue;
+      width: 30px;
+      height: 16px;
+      padding: 2px;
+      margin-right: 2px;
+      vertical-align: top;
+    }
+    .item2 {
+      display: inline-block;
+      background: yellow;
+      width: 30px;
+      height: 16px;
+      padding: 2px;
+      vertical-align: top;
+    }
+    .grandchildA {
+      background: purple;
+      width: 80px;
+      height: 6px;
+      position: relative;
+      z-index: 10;
+    }
+    .grandchildB {
+      background: teal;
+      width: 80px;
+      height: 6px;
+      position: relative;
+      z-index: 20;
+    }
+    .grandchildC {
+      background: lime;
+      width: 20px;
+      height: 16px;
+      position: relative;
+      /* This z-index should interleave this content
+         between grandchildA and grandchildB: */
+      z-index: 15;
+    }
+  </style>
+</head>
+<body>
+  <div class="flexContainer"
+    ><div class="item1"
+      ><div class="grandchildA"></div
+      ><div class="grandchildB"></div
+    ></div
+    ><div class="item2"
+      ><div class="grandchildC"></div
+    ></div
+  ></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-3.html b/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-3.html
new file mode 100644
index 000000000000..bce9efcc7792
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-items-as-stacking-contexts-3.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- This testcase checks that flex items are painted as pseudo-stacking
+     contexts, instead of full stacking contexts. In other words, content
+     inside of one flex item should be able to iterleave between pieces of
+     content in another flex item, if we set appropriately interleaving
+     "z-index" values. -->
+<html>
+<head>
+  <style>
+    .flexContainer {
+      background: orange;
+      display: flex;
+      justify-content: space-between;
+      width: 70px;
+      height: 20px;
+      padding: 2px;
+      margin-bottom: 2px;
+    }
+    .item1 {
+      background: lightblue;
+      width: 30px;
+      padding: 2px;
+    }
+    .item2 {
+      background: yellow;
+      width: 30px;
+      padding: 2px;
+    }
+    .grandchildA {
+      background: purple;
+      width: 80px;
+      height: 6px;
+      position: relative;
+      z-index: 10;
+    }
+    .grandchildB {
+      background: teal;
+      width: 80px;
+      height: 6px;
+      position: relative;
+      z-index: 20;
+    }
+    .grandchildC {
+      background: lime;
+      width: 20px;
+      height: 16px;
+      position: relative;
+      /* This z-index should interleave this content
+         between grandchildA and grandchildB: */
+      z-index: 15;
+    }
+  </style>
+</head>
+<body>
+  <!-- This flex container's first flex item has content that overflows
+       and overlap the second flex item.  The z-index values are set such
+       that this content should interleave; grandchildC should
+       paint on top of grandchildA, but underneath grandchildB. -->
+  <div class="flexContainer"
+    ><div class="item1"
+      ><div class="grandchildA"></div
+      ><div class="grandchildB"></div
+    ></div
+    ><div class="item2"
+      ><div class="grandchildC"></div
+    ></div
+  ></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/reftest.list b/layout/reftests/flexbox/reftest.list
index 4bd6fec821c5..b11d967caf64 100644
--- a/layout/reftests/flexbox/reftest.list
+++ b/layout/reftests/flexbox/reftest.list
@@ -126,8 +126,10 @@ fuzzy-if(d2d&&layersGPUAccelerated,24,14) == flexbox-dyn-insertAroundSpan-2.xhtm
 == flexbox-float-2a.xhtml  flexbox-float-2-ref.xhtml
 == flexbox-float-2b.xhtml  flexbox-float-2-ref.xhtml
 
-# Tests for flex items as stacking contexts
+# Tests for flex items as (pseudo) stacking contexts
 == flexbox-items-as-stacking-contexts-1.xhtml flexbox-items-as-stacking-contexts-1-ref.xhtml
+== flexbox-items-as-stacking-contexts-2.html flexbox-items-as-stacking-contexts-2-ref.html
+== flexbox-items-as-stacking-contexts-3.html flexbox-items-as-stacking-contexts-3-ref.html
 
 # Tests for "min-width" and "min-height" on flex items.
 == flexbox-minSize-horiz-1.xhtml flexbox-minSize-horiz-1-ref.xhtml
@@ -161,8 +163,8 @@ fails == flexbox-minSize-vert-1.xhtml  flexbox-minSize-vert-1-ref.xhtml # bug 85
 == flexbox-justify-content-vert-5.xhtml flexbox-justify-content-vert-5-ref.xhtml
 
 # Tests for inline content in a flexbox that gets wrapped in an anonymous block
-== flexbox-inlinecontent-horiz-1a.xhtml flexbox-inlinecontent-horiz-1-ref.xhtml
-== flexbox-inlinecontent-horiz-1b.xhtml flexbox-inlinecontent-horiz-1-ref.xhtml
+fails == flexbox-inlinecontent-horiz-1a.xhtml flexbox-inlinecontent-horiz-1-ref.xhtml # reference case rendering is incorrect; bug 858333
+fails == flexbox-inlinecontent-horiz-1b.xhtml flexbox-inlinecontent-horiz-1-ref.xhtml # reference case rendering is incorrect; bug 858333
 == flexbox-inlinecontent-horiz-2.xhtml  flexbox-inlinecontent-horiz-2-ref.xhtml
 == flexbox-inlinecontent-horiz-3a.xhtml flexbox-inlinecontent-horiz-3-ref.xhtml
 == flexbox-inlinecontent-horiz-3b.xhtml flexbox-inlinecontent-horiz-3-ref.xhtml

From 034fae0ccc8fc95aadc59d772bf0aeeb5ffb8f0e Mon Sep 17 00:00:00 2001
From: James Willcox <snorp@snorp.net>
Date: Fri, 29 Mar 2013 15:34:49 -0400
Subject: [PATCH 289/438] Bug 734691 - Add multi-thread support to profiler
 r=benwa

--HG--
extra : rebase_source : 04021da9d3d871f51f931b6e6f57a0bbbbaa6393
---
 dom/workers/RuntimeService.cpp     |   5 ++
 ipc/chromium/src/base/thread.cc    |   5 ++
 tools/profiler/BreakpadSampler.cpp |  15 ++--
 tools/profiler/GeckoProfiler.h     |   3 +
 tools/profiler/GeckoProfilerFunc.h |   4 ++
 tools/profiler/GeckoProfilerImpl.h |  13 ++++
 tools/profiler/ProfileEntry.cpp    |  10 ++-
 tools/profiler/ProfileEntry.h      |  11 ++-
 tools/profiler/TableTicker.cpp     |  54 ++++++++------
 tools/profiler/TableTicker.h       |  62 ++++++++++++++--
 tools/profiler/platform-linux.cc   | 110 ++++++++++++++++++++++-------
 tools/profiler/platform-macos.cc   |  39 ++++++++--
 tools/profiler/platform-win32.cc   |  40 +++++++++--
 tools/profiler/platform.cpp        |  31 +++++++-
 tools/profiler/platform.h          |  66 ++++++++++++++++-
 15 files changed, 400 insertions(+), 68 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 44c9187f0c6a..c04abb273f98 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -42,6 +42,8 @@
 #include "OSFileConstants.h"
 #include <algorithm>
 
+#include "GeckoProfiler.h"
+
 using namespace mozilla;
 using namespace mozilla::dom;
 
@@ -516,6 +518,8 @@ public:
       return NS_ERROR_FAILURE;
     }
 
+    profiler_register_thread("WebWorker");
+
     {
       JSAutoRequest ar(cx);
       workerPrivate->DoRunLoop(cx);
@@ -544,6 +548,7 @@ public:
     JS_DestroyRuntime(rt);
 
     workerPrivate->ScheduleDeletion(false);
+    profiler_unregister_thread();
     return NS_OK;
   }
 };
diff --git a/ipc/chromium/src/base/thread.cc b/ipc/chromium/src/base/thread.cc
index f447fbb201eb..31ec62832ec3 100644
--- a/ipc/chromium/src/base/thread.cc
+++ b/ipc/chromium/src/base/thread.cc
@@ -8,6 +8,7 @@
 #include "base/string_util.h"
 #include "base/thread_local.h"
 #include "base/waitable_event.h"
+#include "GeckoProfiler.h"
 
 namespace base {
 
@@ -136,6 +137,8 @@ void Thread::StopSoon() {
 }
 
 void Thread::ThreadMain() {
+  profiler_register_thread(name_.c_str());
+
   // The message loop for this thread.
   MessageLoop message_loop(startup_data_->options.message_loop_type);
 
@@ -161,6 +164,8 @@ void Thread::ThreadMain() {
   // Assert that MessageLoop::Quit was called by ThreadQuitTask.
   DCHECK(GetThreadWasQuitProperly());
 
+  profiler_unregister_thread();
+
   // We can't receive messages anymore.
   message_loop_ = NULL;
   thread_id_ = 0;
diff --git a/tools/profiler/BreakpadSampler.cpp b/tools/profiler/BreakpadSampler.cpp
index bc804e3627f5..d30a55b6ea2f 100644
--- a/tools/profiler/BreakpadSampler.cpp
+++ b/tools/profiler/BreakpadSampler.cpp
@@ -158,6 +158,13 @@ void genPseudoBacktraceEntries(/*MODIFIED*/UnwinderThreadBuffer* utb,
 // RUNS IN SIGHANDLER CONTEXT
 void BreakpadSampler::Tick(TickSample* sample)
 {
+  if (!sample->threadProfile) {
+    // Platform doesn't support multithread, so use the main thread profile we created
+    sample->threadProfile = GetPrimaryThreadProfile();
+  }
+
+  ThreadProfile& currThreadProfile = *sample->threadProfile;
+
   /* Get hold of an empty inter-thread buffer into which to park
      the ProfileEntries for this sample. */
   UnwinderThreadBuffer* utb = uwt__acquire_empty_buffer();
@@ -172,7 +179,7 @@ void BreakpadSampler::Tick(TickSample* sample)
      thread, and park them in |utb|. */
 
   // Marker(s) come before the sample
-  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
+  PseudoStack* stack = currThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
     utb__addEntry( utb, ProfileEntry('m', stack->getMarker(i)) );
   }
@@ -186,7 +193,7 @@ void BreakpadSampler::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      mPrimaryThreadProfile.erase();
+      currThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -293,9 +300,9 @@ void BreakpadSampler::Tick(TickSample* sample)
 #   else
 #     error "Unsupported platform"
 #   endif
-    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, ucV);
+    uwt__release_full_buffer(&currThreadProfile, utb, ucV);
   } else {
-    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, NULL);
+    uwt__release_full_buffer(&currThreadProfile, utb, NULL);
   }
 }
 
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 4c8e2b5452c8..9105f0470ecb 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -135,6 +135,9 @@ static inline void profiler_lock() {}
 // Re-enable the profiler and notify 'profiler-unlocked'.
 static inline void profiler_unlock() {}
 
+static inline void profiler_register_thread(const char* name) {}
+static inline void profiler_unregister_thread() {}
+
 #else
 
 #include "GeckoProfilerImpl.h"
diff --git a/tools/profiler/GeckoProfilerFunc.h b/tools/profiler/GeckoProfilerFunc.h
index 2c26d8eb8a92..41134bfb5ce7 100644
--- a/tools/profiler/GeckoProfilerFunc.h
+++ b/tools/profiler/GeckoProfilerFunc.h
@@ -57,6 +57,10 @@ void mozilla_sampler_lock();
 // Unlock the profiler, leaving it stopped and fires profiler-unlocked.
 void mozilla_sampler_unlock();
 
+// Register/unregister threads with the profiler
+bool mozilla_sampler_register_thread(const char* name);
+void mozilla_sampler_unregister_thread();
+
 /* Returns true if env var SPS_NEW is set to anything, else false. */
 extern bool sps_version2();
 
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index 917bd04173f7..65a60e2db615 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -140,6 +140,18 @@ void profiler_unlock()
   return mozilla_sampler_unlock();
 }
 
+static inline
+void profiler_register_thread(const char* name)
+{
+  mozilla_sampler_register_thread(name);
+}
+
+static inline
+void profiler_unregister_thread()
+{
+  mozilla_sampler_unregister_thread();
+}
+
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
@@ -154,6 +166,7 @@ void profiler_unlock()
 #define PROFILER_MAIN_THREAD_LABEL_PRINTF(name_space, info, ...)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla::SamplerStackFramePrintfRAII SAMPLER_APPEND_LINE_NUMBER(sampler_raii)(name_space "::" info, __LINE__, __VA_ARGS__)
 #define PROFILER_MAIN_THREAD_MARKER(info)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla_sampler_add_marker(info)
 
+
 /* FIXME/bug 789667: memory constraints wouldn't much of a problem for
  * this small a sample buffer size, except that serializing the
  * profile data is extremely, unnecessarily memory intensive. */
diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
index d8c74b748217..4435ebf4e9a2 100644
--- a/tools/profiler/ProfileEntry.cpp
+++ b/tools/profiler/ProfileEntry.cpp
@@ -134,19 +134,23 @@ std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
 
 #define DYNAMIC_MAX_STRING 512
 
-ThreadProfile::ThreadProfile(int aEntrySize, PseudoStack *aStack)
+ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread)
   : mWritePos(0)
   , mLastFlushPos(0)
   , mReadPos(0)
   , mEntrySize(aEntrySize)
   , mPseudoStack(aStack)
   , mMutex("ThreadProfile::mMutex")
+  , mName(strdup(aName))
+  , mThreadId(aThreadId)
+  , mIsMainThread(aIsMainThread)
 {
   mEntries = new ProfileEntry[mEntrySize];
 }
 
 ThreadProfile::~ThreadProfile()
 {
+  free(mName);
   delete[] mEntries;
 }
 
@@ -299,6 +303,10 @@ JSCustomObject* ThreadProfile::ToJSObject(JSContext *aCx)
 }
 
 void ThreadProfile::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile) {
+  // Thread meta data
+  b.DefineProperty(profile, "name", mName);
+  b.DefineProperty(profile, "tid", mThreadId);
+
   JSCustomArray *samples = b.CreateArray();
   b.DefineProperty(profile, "samples", samples);
 
diff --git a/tools/profiler/ProfileEntry.h b/tools/profiler/ProfileEntry.h
index 897abb23c6ea..a5483b59f887 100644
--- a/tools/profiler/ProfileEntry.h
+++ b/tools/profiler/ProfileEntry.h
@@ -6,6 +6,7 @@
 #ifndef MOZ_PROFILE_ENTRY_H
 #define MOZ_PROFILE_ENTRY_H
 
+#include <ostream>
 #include "GeckoProfilerImpl.h"
 #include "JSAObjectBuilder.h"
 #include "platform.h"
@@ -56,7 +57,7 @@ typedef void (*IterateTagsCallback)(const ProfileEntry& entry, const char* tagSt
 class ThreadProfile
 {
 public:
-  ThreadProfile(int aEntrySize, PseudoStack *aStack);
+  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread);
   ~ThreadProfile();
   void addTag(ProfileEntry aTag);
   void flush();
@@ -70,6 +71,11 @@ public:
   PseudoStack* GetPseudoStack();
   mozilla::Mutex* GetMutex();
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
+
+  bool IsMainThread() const { return mIsMainThread; }
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
 private:
   // Circular buffer 'Keep One Slot Open' implementation
   // for simplicity
@@ -80,6 +86,9 @@ private:
   int            mEntrySize;
   PseudoStack*   mPseudoStack;
   mozilla::Mutex mMutex;
+  char*          mName;
+  int            mThreadId;
+  bool           mIsMainThread;
 };
 
 std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index c31d9d94e4fa..14a3350b1318 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -173,16 +173,22 @@ void TableTicker::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile)
   JSCustomArray *threads = b.CreateArray();
   b.DefineProperty(profile, "threads", threads);
 
-  // For now we only have one thread
   SetPaused(true);
-  ThreadProfile* prof = GetPrimaryThreadProfile();
-  prof->GetMutex()->Lock();
-  JSCustomObject* threadSamples = b.CreateObject();
-  prof->BuildJSObject(b, threadSamples);
-  b.ArrayPush(threads, threadSamples);
-  prof->GetMutex()->Unlock();
+
+  {
+    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+    for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
+      MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
+
+      JSCustomObject* threadSamples = b.CreateObject();
+      sRegisteredThreads->at(i)->Profile()->BuildJSObject(b, threadSamples);
+      b.ArrayPush(threads, threadSamples);
+    }
+  }
+
   SetPaused(false);
-}
+} 
 
 // END SaveProfileTask et al
 ////////////////////////////////////////////////////////////////////////
@@ -383,10 +389,17 @@ void doSampleStackTrace(PseudoStack *aStack, ThreadProfile &aProfile, TickSample
 
 void TableTicker::Tick(TickSample* sample)
 {
+  if (!sample->threadProfile) {
+    // Platform doesn't support multithread, so use the main thread profile we created
+    sample->threadProfile = GetPrimaryThreadProfile();
+  }
+
+  ThreadProfile& currThreadProfile = *sample->threadProfile;
+
   // Marker(s) come before the sample
-  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
+  PseudoStack* stack = currThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
-    addDynamicTag(mPrimaryThreadProfile, 'm', stack->getMarker(i));
+    addDynamicTag(currThreadProfile, 'm', stack->getMarker(i));
   }
   stack->mQueueClearMarker = true;
 
@@ -398,7 +411,7 @@ void TableTicker::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      mPrimaryThreadProfile.erase();
+      currThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -414,29 +427,29 @@ void TableTicker::Tick(TickSample* sample)
 
 #if defined(USE_BACKTRACE) || defined(USE_NS_STACKWALK)
   if (mUseStackWalk) {
-    doNativeBacktrace(mPrimaryThreadProfile, sample);
+    doNativeBacktrace(currThreadProfile, sample);
   } else {
-    doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
+    doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
   }
 #else
-  doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
+  doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
 #endif
 
   if (recordSample)
-    mPrimaryThreadProfile.flush();
+    currThreadProfile.flush();
 
-  if (!sLastTracerEvent.IsNull() && sample) {
+  if (!sLastTracerEvent.IsNull() && sample && currThreadProfile.IsMainThread()) {
     TimeDuration delta = sample->timestamp - sLastTracerEvent;
-    mPrimaryThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
+    currThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
   }
 
   if (sample) {
     TimeDuration delta = sample->timestamp - mStartTime;
-    mPrimaryThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
+    currThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
   }
 
   if (sLastFrameNumber != sFrameNumber) {
-    mPrimaryThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
+    currThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
     sLastFrameNumber = sFrameNumber;
   }
 }
@@ -460,7 +473,8 @@ void mozilla_sampler_print_location1()
     return;
   }
 
-  ThreadProfile threadProfile(1000, stack);
+  ThreadProfile threadProfile("Temp", PROFILE_DEFAULT_ENTRY, stack,
+                              0, false);
   doSampleStackTrace(stack, threadProfile, NULL);
 
   threadProfile.flush();
diff --git a/tools/profiler/TableTicker.h b/tools/profiler/TableTicker.h
index 6b00d1e1c6d5..edb91195430d 100644
--- a/tools/profiler/TableTicker.h
+++ b/tools/profiler/TableTicker.h
@@ -5,6 +5,7 @@
 
 #include "platform.h"
 #include "ProfileEntry.h"
+#include "mozilla/Mutex.h"
 
 static bool
 hasFeature(const char** aFeatures, uint32_t aFeatureCount, const char* aFeature) {
@@ -27,8 +28,8 @@ class TableTicker: public Sampler {
  public:
   TableTicker(int aInterval, int aEntrySize, PseudoStack *aStack,
               const char** aFeatures, uint32_t aFeatureCount)
-    : Sampler(aInterval, true)
-    , mPrimaryThreadProfile(aEntrySize, aStack)
+    : Sampler(aInterval, true, aEntrySize)
+    , mPrimaryThreadProfile(nullptr)
     , mStartTime(TimeStamp::Now())
     , mSaveRequested(false)
   {
@@ -38,10 +39,47 @@ class TableTicker: public Sampler {
     mJankOnly = hasFeature(aFeatures, aFeatureCount, "jank");
     mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
     mAddLeafAddresses = hasFeature(aFeatures, aFeatureCount, "leaf");
-    mPrimaryThreadProfile.addTag(ProfileEntry('m', "Start"));
+
+    {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      // Create ThreadProfile for each registered thread
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        ThreadProfile* profile = new ThreadProfile(info->Name(),
+                                                   aEntrySize,
+                                                   info->Stack(),
+                                                   info->ThreadId(),
+                                                   info->IsMainThread());
+        profile->addTag(ProfileEntry('m', "Start"));
+
+        info->SetProfile(profile);
+      }
+
+      SetActiveSampler(this);
+    }
   }
 
-  ~TableTicker() { if (IsActive()) Stop(); }
+  ~TableTicker() {
+    if (IsActive())
+      Stop();
+
+    SetActiveSampler(nullptr);
+
+    // Destroy ThreadProfile for all threads
+    {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        ThreadProfile* profile = info->Profile();
+        if (profile) {
+          delete profile;
+          info->SetProfile(nullptr);
+        }
+      }
+    }
+  }
 
   virtual void SampleStack(TickSample* sample) {}
 
@@ -58,7 +96,19 @@ class TableTicker: public Sampler {
 
   ThreadProfile* GetPrimaryThreadProfile()
   {
-    return &mPrimaryThreadProfile;
+    if (!mPrimaryThreadProfile) {
+      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+        ThreadInfo* info = sRegisteredThreads->at(i);
+        if (info->IsMainThread()) {
+          mPrimaryThreadProfile = info->Profile();
+          break;
+        }
+      }
+    }
+
+    return mPrimaryThreadProfile;
   }
 
   void ToStreamAsJSON(std::ostream& stream);
@@ -76,7 +126,7 @@ protected:
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
 
   // This represent the application's main thread (SAMPLER_INIT)
-  ThreadProfile mPrimaryThreadProfile;
+  ThreadProfile* mPrimaryThreadProfile;
   TimeStamp mStartTime;
   bool mSaveRequested;
   bool mAddLeafAddresses;
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index b87ce4fba436..ed1c52d40a9c 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -39,6 +39,7 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <stdlib.h>
+#include <sched.h>
 #ifdef ANDROID
 #include <android/log.h>
 #else
@@ -60,9 +61,13 @@
 #include <stdarg.h>
 #include "platform.h"
 #include "GeckoProfilerImpl.h"
+#include "mozilla/Mutex.h"
+#include "ProfileEntry.h"
+#include "nsThreadUtils.h"
 
 #include <string.h>
 #include <stdio.h>
+#include <list>
 
 #define SIGNAL_SAVE_PROFILE SIGUSR2
 
@@ -75,9 +80,6 @@ pid_t gettid()
 }
 #endif
 
-static Sampler* sActiveSampler = NULL;
-
-
 #if !defined(ANDROID)
 // Keep track of when any of our threads calls fork(), so we can
 // temporarily disable signal delivery during the fork() call.  Not
@@ -96,9 +98,9 @@ static bool was_paused = false;
 // In the parent, just before the fork, record the pausedness state,
 // and then pause.
 static void paf_prepare(void) {
-  if (sActiveSampler) {
-    was_paused = sActiveSampler->IsPaused();
-    sActiveSampler->SetPaused(true);
+  if (Sampler::GetActiveSampler()) {
+    was_paused = Sampler::GetActiveSampler()->IsPaused();
+    Sampler::GetActiveSampler()->SetPaused(true);
   } else {
     was_paused = false;
   }
@@ -107,8 +109,8 @@ static void paf_prepare(void) {
 // In the parent, just after the fork, return pausedness to the
 // pre-fork state.
 static void paf_parent(void) {
-  if (sActiveSampler)
-    sActiveSampler->SetPaused(was_paused);
+  if (Sampler::GetActiveSampler())
+    Sampler::GetActiveSampler()->SetPaused(was_paused);
 }
 
 // Set up the fork handlers.  This is called just once, at the first
@@ -123,8 +125,10 @@ static void* setup_atfork() {
 #include "android-signal-defs.h"
 #endif
 
+static ThreadProfile* sCurrentThreadProfile = NULL;
+
 static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context) {
-  sActiveSampler->RequestSave();
+  Sampler::GetActiveSampler()->RequestSave();
 }
 
 #ifdef ANDROID
@@ -135,7 +139,7 @@ static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context
 #define V8_HOST_ARCH_X64 1
 #endif
 static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
-  if (!sActiveSampler)
+  if (!Sampler::GetActiveSampler())
     return;
 
   TickSample sample_obj;
@@ -144,7 +148,7 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 
 #ifdef ENABLE_SPS_LEAF_DATA
   // If profiling, we extract the current pc and sp.
-  if (sActiveSampler->IsProfiling()) {
+  if (Sampler::GetActiveSampler()->IsProfiling()) {
     // Extracting the sample from the context is extremely machine dependent.
     ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
     mcontext_t& mcontext = ucontext->uc_mcontext;
@@ -179,14 +183,17 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 #endif
   }
 #endif
+  sample->threadProfile = sCurrentThreadProfile;
   sample->timestamp = mozilla::TimeStamp::Now();
 
-  sActiveSampler->Tick(sample);
+  Sampler::GetActiveSampler()->Tick(sample);
+
+  sCurrentThreadProfile = NULL;
 }
 
 #ifndef XP_MACOSX
-void tgkill(pid_t tgid, pid_t tid, int signalno) {
-  syscall(SYS_tgkill, tgid, tid, signalno);
+int tgkill(pid_t tgid, pid_t tid, int signalno) {
+  return syscall(SYS_tgkill, tgid, tid, signalno);
 }
 #endif
 
@@ -214,8 +221,33 @@ class Sampler::PlatformData : public Malloced {
 #ifdef XP_MACOSX
         pthread_kill(signal_receiver_, SIGPROF);
 #else
-        // Glibc doesn't provide a wrapper for tgkill(2).
-        tgkill(vm_tgid_, vm_tid_, SIGPROF);
+
+        std::vector<ThreadInfo*> threads = GetRegisteredThreads();
+
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // We use sCurrentThreadProfile the ThreadProfile for the
+          // thread we're profiling to the signal handler
+          sCurrentThreadProfile = info->Profile();
+
+          int threadId = info->ThreadId();
+          if (threadId == 0) {
+            threadId = vm_tid_;
+          }
+
+          if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
+            printf_stderr("profiler failed to signal tid=%d\n", threadId);
+#ifdef DEBUG
+            abort();
+#endif
+            continue;
+          }
+
+          // Wait for the signal handler to run before moving on to the next one
+          while (sCurrentThreadProfile)
+            sched_yield();
+        }
 #endif
       }
 
@@ -258,11 +290,12 @@ static void* SenderEntry(void* arg) {
 }
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false) {
+      active_(false),
+      entrySize_(entrySize) {
   data_ = new PlatformData(this);
 }
 
@@ -274,7 +307,6 @@ Sampler::~Sampler() {
 
 void Sampler::Start() {
   LOG("Sampler started");
-  if (sActiveSampler != NULL) return;
 
   // Request profiling signals.
   LOG("Request signal");
@@ -308,9 +340,6 @@ void Sampler::Start() {
     data_->signal_sender_launched_ = true;
   }
   LOG("Profiler thread started");
-
-  // Set this sampler as the active sampler.
-  sActiveSampler = this;
 }
 
 
@@ -330,9 +359,41 @@ void Sampler::Stop() {
     sigaction(SIGPROF, &data_->old_sigprof_signal_handler_, 0);
     data_->signal_handler_installed_ = false;
   }
+}
 
-  // This sampler is no longer the active sampler.
-  sActiveSampler = NULL;
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  ThreadInfo* info = new ThreadInfo(aName, gettid(), aIsMainThread, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       aIsMainThread));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  int id = gettid();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
 }
 
 #ifdef ANDROID
@@ -356,3 +417,4 @@ void OS::RegisterStartHandler()
   }
 }
 #endif
+
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index 99392cc7ed61..50945dc34fcd 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -28,6 +28,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include "nsThreadUtils.h"
+
 #include "platform.h"
 #include "UnwinderThread2.h"  /* uwt__register_thread_for_profiling */
 
@@ -199,8 +201,8 @@ class Sampler::PlatformData : public Malloced {
 class SamplerThread : public Thread {
  public:
   explicit SamplerThread(int interval)
-      : Thread("SamplerThread"),
-        interval_(interval) {}
+      : Thread("SamplerThread")
+      , interval_(interval) {}
 
   static void AddActiveSampler(Sampler* sampler) {
     ScopedLock lock(mutex_);
@@ -279,6 +281,7 @@ class SamplerThread : public Thread {
       sample->sp = reinterpret_cast<Address>(state.REGISTER_FIELD(sp));
       sample->fp = reinterpret_cast<Address>(state.REGISTER_FIELD(bp));
       sample->timestamp = mozilla::TimeStamp::Now();
+      sample->threadProfile = NULL;
       sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
@@ -302,12 +305,13 @@ Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : // isolate_(isolate),
       interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false) /*,
+      active_(false),
+      entrySize_(entrySize) /*,
       samples_taken_(0)*/ {
   data_ = new PlatformData;
 }
@@ -337,3 +341,30 @@ Sampler::GetProfiledThread(Sampler::PlatformData* aData)
 {
   return aData->profiled_pthread();
 }
+
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  if (!aIsMainThread)
+    return false;
+
+  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       true));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  // We only have the main thread currently and that will never be unregistered
+}
\ No newline at end of file
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index af68f4c52354..818b536b68f3 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -28,9 +28,10 @@
 
 #include <windows.h>
 #include <mmsystem.h>
-#include "platform.h"
 #include <process.h>
+#include "platform.h"
 
+#include "ProfileEntry.h"
 
 class Sampler::PlatformData : public Malloced {
  public:
@@ -67,9 +68,9 @@ Sampler::GetThreadHandle(Sampler::PlatformData* aData)
 class SamplerThread : public Thread {
  public:
   SamplerThread(int interval, Sampler* sampler)
-      : Thread("SamplerThread"),
-        interval_(interval),
-        sampler_(sampler) {}
+      : Thread("SamplerThread")
+      , interval_(interval)
+      , sampler_(sampler) {}
 
   static void StartSampler(Sampler* sampler) {
     if (instance_ == NULL) {
@@ -120,6 +121,7 @@ class SamplerThread : public Thread {
 
     // Grab the timestamp before pausing the thread, to avoid deadlocks.
     sample->timestamp = mozilla::TimeStamp::Now();
+    sample->threadProfile = NULL;
 
     static const DWORD kSuspendFailed = static_cast<DWORD>(-1);
     if (SuspendThread(profiled_thread) == kSuspendFailed)
@@ -155,11 +157,12 @@ class SamplerThread : public Thread {
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
-Sampler::Sampler(int interval, bool profiling)
+Sampler::Sampler(int interval, bool profiling, int entrySize)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
       active_(false),
+      entrySize_(entrySize),
       data_(new PlatformData) {
 }
 
@@ -238,3 +241,30 @@ void Thread::Join() {
 void OS::Sleep(int milliseconds) {
   ::Sleep(milliseconds);
 }
+
+bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
+{
+  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+  if (!aIsMainThread)
+    return false;
+
+  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+
+  if (sActiveSampler) {
+    // We need to create the ThreadProfile now
+    info->SetProfile(new ThreadProfile(info->Name(),
+                                       sActiveSampler->EntrySize(),
+                                       info->Stack(),
+                                       info->ThreadId(),
+                                       true));
+  }
+
+  sRegisteredThreads->push_back(info);
+  return true;
+}
+
+void Sampler::UnregisterCurrentThread()
+{
+  // We only have the main thread currently and that will never be unregistered
+}
\ No newline at end of file
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 653b681dd17c..27bbeb6df5b0 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -18,6 +18,7 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "mozilla/Services.h"
+#include "nsThreadUtils.h"
 
 mozilla::ThreadLocal<PseudoStack *> tlsPseudoStack;
 mozilla::ThreadLocal<TableTicker *> tlsTicker;
@@ -35,7 +36,7 @@ int       sLastFrameNumber = 0;
 unsigned int sLastSampledEventGeneration = 0;
 
 /* a counter that's incremented everytime we get responsiveness event
- * note: it might also be worth tracking everytime we go around
+ * note: it might also be worth trackplaing everytime we go around
  * the event loop */
 unsigned int sCurrentEventGeneration = 0;
 /* we don't need to worry about overflow because we only treat the
@@ -43,6 +44,18 @@ unsigned int sCurrentEventGeneration = 0;
  * a problem if 2^32 events happen between samples that we need
  * to know are associated with different events */
 
+std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = new std::vector<ThreadInfo*>();
+mozilla::Mutex* Sampler::sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+
+Sampler* Sampler::sActiveSampler;
+
+ThreadInfo::~ThreadInfo() {
+  free(mName);
+
+  if (mProfile)
+    delete mProfile;
+}
+
 bool sps_version2()
 {
   static int version = 0; // Raced on, potentially
@@ -293,6 +306,8 @@ void mozilla_sampler_shutdown()
     uwt__deinit();
   }
 
+  Sampler::FreeRegisteredThreads();
+
   profiler_stop();
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
@@ -487,6 +502,20 @@ void mozilla_sampler_unlock()
     os->NotifyObservers(nullptr, "profiler-unlocked", nullptr);
 }
 
+bool mozilla_sampler_register_thread(const char* aName)
+{
+  PseudoStack* stack = new PseudoStack();
+  tlsPseudoStack.set(stack);
+
+  return Sampler::RegisterCurrentThread(aName, stack, false);
+}
+
+void mozilla_sampler_unregister_thread()
+{
+  Sampler::UnregisterCurrentThread();
+}
+
 // END externally visible functions
 ////////////////////////////////////////////////////////////////////////
 
+
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index 22bc75afbe87..8371927aa9d2 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -232,6 +232,9 @@ extern int     sUnwindStackScan;  /* max # of dubious frames allowed */
 // (if used for profiling) the program counter and stack pointer for
 // the thread that created it.
 
+class PseudoStack;
+class ThreadProfile;
+
 // TickSample captures the information collected for each sample.
 class TickSample {
  public:
@@ -255,16 +258,44 @@ class TickSample {
   Address function;  // The last called JS function.
   void*   context;   // The context from the signal handler, if available. On
                      // Win32 this may contain the windows thread context.
+  ThreadProfile* threadProfile;
   static const int kMaxFramesCount = 64;
-  Address stack[kMaxFramesCount];  // Call stack.
   int frames_count;  // Number of captured frames.
   mozilla::TimeStamp timestamp;
 };
 
+class ThreadInfo {
+ public:
+  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
+    : mName(strdup(aName))
+    , mThreadId(aThreadId)
+    , mIsMainThread(aIsMainThread)
+    , mPseudoStack(aPseudoStack)
+    , mProfile(NULL) {}
+
+  virtual ~ThreadInfo();
+
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
+  bool IsMainThread() const { return mIsMainThread; }
+  PseudoStack* Stack() const { return mPseudoStack; }
+  
+  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
+  ThreadProfile* Profile() const { return mProfile; }
+
+ private:
+  char* mName;
+  int mThreadId;
+  const bool mIsMainThread;
+  PseudoStack* mPseudoStack;
+  ThreadProfile* mProfile;
+};
+
 class Sampler {
  public:
   // Initialize sampler.
-  explicit Sampler(int interval, bool profiling);
+  explicit Sampler(int interval, bool profiling, int entrySize);
   virtual ~Sampler();
 
   int interval() const { return interval_; }
@@ -295,6 +326,8 @@ class Sampler {
   bool IsPaused() const { return paused_; }
   void SetPaused(bool value) { NoBarrier_Store(&paused_, value); }
 
+  int EntrySize() { return entrySize_; }
+
   class PlatformData;
 
   PlatformData* platform_data() { return data_; }
@@ -308,6 +341,34 @@ class Sampler {
 #ifdef XP_MACOSX
   static pthread_t GetProfiledThread(PlatformData*);
 #endif
+
+  static std::vector<ThreadInfo*> GetRegisteredThreads() {
+    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+
+    return *sRegisteredThreads;
+  }
+
+  static bool RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread);
+  static void UnregisterCurrentThread();
+
+  // Should only be called on shutdown
+  static void FreeRegisteredThreads() {
+    while (sRegisteredThreads->size() > 0) {
+      sRegisteredThreads->pop_back();
+    }
+
+    delete sRegisteredThreadsMutex;
+    delete sRegisteredThreads;
+  }
+
+  static Sampler* GetActiveSampler() { return sActiveSampler; }
+  static void SetActiveSampler(Sampler* sampler) { sActiveSampler = sampler; }
+
+ protected:
+  static std::vector<ThreadInfo*>* sRegisteredThreads;
+  static mozilla::Mutex* sRegisteredThreadsMutex;
+  static Sampler* sActiveSampler;
+
  private:
   void SetActive(bool value) { NoBarrier_Store(&active_, value); }
 
@@ -315,6 +376,7 @@ class Sampler {
   const bool profiling_;
   Atomic32 paused_;
   Atomic32 active_;
+  const int entrySize_;
   PlatformData* data_;  // Platform specific data.
 };
 

From 0e77f10fe51430927af3aef2f55ae1f62c0c40a0 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Fri, 29 Mar 2013 13:29:19 -0700
Subject: [PATCH 290/438] Bug 841554 - Part 3: follow-up fix for another test
 failure. r=trivial, a=bustage.

---
 browser/components/search/test/browser_healthreport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/search/test/browser_healthreport.js b/browser/components/search/test/browser_healthreport.js
index b98321db720f..90460ffda241 100644
--- a/browser/components/search/test/browser_healthreport.js
+++ b/browser/components/search/test/browser_healthreport.js
@@ -26,7 +26,7 @@ function test() {
     ok(reporter, "Health Reporter available.");
     reporter.onInit().then(function onInit() {
       let provider = reporter.getProvider("org.mozilla.searches");
-      let m = provider.getMeasurement("counts", 1);
+      let m = provider.getMeasurement("counts", 2);
 
       m.getValues().then(function onData(data) {
         let now = new Date();

From be183f7e801455f9daf2d44dfd57c4d036c26e91 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Fri, 29 Mar 2013 14:40:54 -0700
Subject: [PATCH 291/438] Bug 841554 - Part 3: follow-up fix for another test
 failure. r=trivial, a=bustage

---
 browser/base/content/test/browser_contextSearchTabPosition.js | 4 ++--
 .../base/content/test/browser_urlbar_search_healthreport.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/test/browser_contextSearchTabPosition.js b/browser/base/content/test/browser_contextSearchTabPosition.js
index 90a211bb5d05..8cd456d6728d 100644
--- a/browser/base/content/test/browser_contextSearchTabPosition.js
+++ b/browser/base/content/test/browser_contextSearchTabPosition.js
@@ -47,13 +47,13 @@ function test() {
     let provider = reporter.getProvider("org.mozilla.searches");
     ok(provider, "Searches provider is available.");
 
-    let m = provider.getMeasurement("counts", 1);
+    let m = provider.getMeasurement("counts", 2);
     m.getValues().then(function onValues(data) {
       let now = new Date();
       ok(data.days.hasDay(now), "Have data for today.");
       let day = data.days.getDay(now);
 
-      // Will need changed if Google isn't the default search engine.
+      // Will need to be changed if Google isn't the default search engine.
       let field = "google.contextmenu";
       ok(day.has(field), "Have search recorded for context menu.");
 
diff --git a/browser/base/content/test/browser_urlbar_search_healthreport.js b/browser/base/content/test/browser_urlbar_search_healthreport.js
index 12a0c0a6596c..fef76cf139b5 100644
--- a/browser/base/content/test/browser_urlbar_search_healthreport.js
+++ b/browser/base/content/test/browser_urlbar_search_healthreport.js
@@ -23,13 +23,13 @@ function test() {
   reporter.onInit().then(function onInit() {
     let provider = reporter.getProvider("org.mozilla.searches");
     ok(provider, "Searches provider is available.");
-    let m = provider.getMeasurement("counts", 1);
+    let m = provider.getMeasurement("counts", 2);
 
     m.getValues().then(function onData(data) {
       let now = new Date();
       let oldCount = 0;
 
-      // This will need changed if default search engine is not Google.
+      // This will to be need changed if default search engine is not Google.
       let field = "google.urlbar";
 
       if (data.days.hasDay(now)) {

From 84e2de4a5dc2fd2f6f90c5de4fc4384278ae40e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Thu, 18 Apr 2013 03:18:30 -0700
Subject: [PATCH 292/438] Bug 854849 - Sanitize displayable fields in manifests
 r=vingtetun

---
 dom/apps/src/AppsUtils.jsm                    | 50 +++++++++++++++
 dom/apps/tests/Makefile.in                    |  2 +
 .../tests/file_hosted_app.template.webapp     |  2 +-
 dom/apps/tests/test_app_update.html           |  2 +
 dom/apps/tests/unit/test_manifestSanitizer.js | 63 +++++++++++++++++++
 dom/apps/tests/unit/xpcshell.ini              |  5 ++
 testing/xpcshell/xpcshell.ini                 |  1 +
 7 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 dom/apps/tests/unit/test_manifestSanitizer.js
 create mode 100644 dom/apps/tests/unit/xpcshell.ini

diff --git a/dom/apps/src/AppsUtils.jsm b/dom/apps/src/AppsUtils.jsm
index 7c92be6550f8..b14480433795 100644
--- a/dom/apps/src/AppsUtils.jsm
+++ b/dom/apps/src/AppsUtils.jsm
@@ -205,6 +205,54 @@ this.AppsUtils = {
              "isCoreApp": isCoreApp };
   },
 
+  /**
+    * Remove potential HTML tags from displayable fields in the manifest.
+    * We check name, description, developer name, and permission description
+    */
+  sanitizeManifest: function(aManifest) {
+    let sanitizer = Cc["@mozilla.org/parserutils;1"]
+                      .getService(Ci.nsIParserUtils);
+    if (!sanitizer) {
+      return;
+    }
+
+    function sanitize(aStr) {
+      return sanitizer.convertToPlainText(aStr,
+               Ci.nsIDocumentEncoder.OutputSelectionOnly |
+               Ci.nsIDocumentEncoder.OutputAbsoluteLinks, 0);
+    }
+
+    function sanitizeEntryPoint(aRoot) {
+      aRoot.name = sanitize(aRoot.name);
+
+      if (aRoot.description) {
+        aRoot.description = sanitize(aRoot.description);
+      }
+
+      if (aRoot.developer && aRoot.developer.name) {
+        aRoot.developer.name = sanitize(aRoot.developer.name);
+      }
+
+      if (aRoot.permissions) {
+        for (let permission in aRoot.permissions) {
+          if (aRoot.permissions[permission].description) {
+            aRoot.permissions[permission].description =
+             sanitize(aRoot.permissions[permission].description);
+          }
+        }
+      }
+    }
+
+    // First process the main section, then the entry points.
+    sanitizeEntryPoint(aManifest);
+
+    if (aManifest.entry_points) {
+      for (let entry in aManifest.entry_points) {
+        sanitizeEntryPoint(aManifest.entry_points[entry]);
+      }
+    }
+  },
+
   /**
    * From https://developer.mozilla.org/en/OpenWebApps/The_Manifest
    * Only the name property is mandatory.
@@ -213,6 +261,8 @@ this.AppsUtils = {
     if (aManifest.name == undefined)
       return false;
 
+    this.sanitizeManifest(aManifest);
+
     // launch_path, entry_points launch paths, message hrefs, and activity hrefs can't be absolute
     if (aManifest.launch_path && isAbsoluteURI(aManifest.launch_path))
       return false;
diff --git a/dom/apps/tests/Makefile.in b/dom/apps/tests/Makefile.in
index e1a16c831fac..b00f28d85df4 100644
--- a/dom/apps/tests/Makefile.in
+++ b/dom/apps/tests/Makefile.in
@@ -24,4 +24,6 @@ MOCHITEST_CHROME_FILES = \
   test_apps_service.xul \
   $(NULL)
 
+XPCSHELL_TESTS = unit
+
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/apps/tests/file_hosted_app.template.webapp b/dom/apps/tests/file_hosted_app.template.webapp
index 13c7223c081e..938761988254 100644
--- a/dom/apps/tests/file_hosted_app.template.webapp
+++ b/dom/apps/tests/file_hosted_app.template.webapp
@@ -1,5 +1,5 @@
 {
   "name": "Really Rapid Release (hosted)",
-  "description": "Updated even faster than Firefox, just to annoy slashdotters.",
+  "description": "Updated even faster than <a href='http://mozilla.org'>Firefox</a>, just to annoy slashdotters.",
   "launch_path": "/tests/dom/apps/tests/file_app.sjs?apptype=hosted"
 }
diff --git a/dom/apps/tests/test_app_update.html b/dom/apps/tests/test_app_update.html
index 1fe5ef77646a..23d02d6b139f 100644
--- a/dom/apps/tests/test_app_update.html
+++ b/dom/apps/tests/test_app_update.html
@@ -69,6 +69,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
     yield;
     var app = request.result;
     ok(app, "App is non-null");
+    ok(app.manifest.description == "Updated even faster than Firefox, just to annoy slashdotters.",
+       "Manifest is HTML-sanitized");
 
     // Check the app a few times.
     checkAppState(app, true, 2, continueTest);
diff --git a/dom/apps/tests/unit/test_manifestSanitizer.js b/dom/apps/tests/unit/test_manifestSanitizer.js
new file mode 100644
index 000000000000..4b0c999a73f8
--- /dev/null
+++ b/dom/apps/tests/unit/test_manifestSanitizer.js
@@ -0,0 +1,63 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function testEntryPoint(aRoot) {
+  do_check_true(aRoot.name == "hello world");
+  do_check_true(aRoot.description == "A bold name");
+  do_check_true(aRoot.developer.name == "Blink Inc.");
+
+  let permissions = aRoot.permissions;
+  do_check_true(permissions.contacts.description == "Required for autocompletion in the share screen");
+  do_check_true(permissions.alarms.description == "Required to schedule notifications");
+}
+
+function run_test() {
+  Components.utils.import("resource:///modules/AppsUtils.jsm");
+
+  do_check_true(!!AppsUtils);
+
+  // Test manifest, with one entry point.
+  let manifest = {
+    name: "hello <b>world</b>",
+    description: "A bold name",
+    developer: {
+      name: "<blink>Blink</blink> Inc.",
+      url: "http://blink.org"
+    },
+    permissions : {
+      "contacts": {
+        "description": "Required for autocompletion in the <a href='http://shareme.com'>share</a> screen",
+        "access": "readcreate"
+        },
+      "alarms": {
+        "description": "Required to schedule notifications"
+      }
+    },
+
+    entry_points: {
+      "subapp": {
+        name: "hello <b>world</b>",
+        description: "A bold name",
+        developer: {
+          name: "<blink>Blink</blink> Inc.",
+          url: "http://blink.org"
+        },
+        permissions : {
+          "contacts": {
+            "description": "Required for autocompletion in the <a href='http://shareme.com'>share</a> screen",
+            "access": "readcreate"
+            },
+          "alarms": {
+            "description": "Required to schedule notifications"
+          }
+        }
+      }
+    }
+  }
+
+  AppsUtils.sanitizeManifest(manifest);
+
+  // Check the main section and the subapp entry point.
+  testEntryPoint(manifest);
+  testEntryPoint(manifest.entry_points.subapp);
+}
diff --git a/dom/apps/tests/unit/xpcshell.ini b/dom/apps/tests/unit/xpcshell.ini
new file mode 100644
index 000000000000..bacd1de945e9
--- /dev/null
+++ b/dom/apps/tests/unit/xpcshell.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+head =
+tail =
+
+[test_manifestSanitizer.js]
diff --git a/testing/xpcshell/xpcshell.ini b/testing/xpcshell/xpcshell.ini
index 3d1906172647..5ad1c817a0b7 100644
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -10,6 +10,7 @@
 [include:parser/xml/test/unit/xpcshell.ini]
 [include:image/test/unit/xpcshell.ini]
 [include:dom/activities/tests/unit/xpcshell.ini]
+[include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/encoding/test/unit/xpcshell.ini]
 [include:dom/plugins/test/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]

From 282ec3c583888ec44ca5d7a74f7b97e486dcfa8f Mon Sep 17 00:00:00 2001
From: Mike Habicher <mikeh@mozilla.com>
Date: Wed, 17 Apr 2013 16:30:44 +0200
Subject: [PATCH 293/438] Bug 862256 - don't (re)reference CameraControl object
 during/after destructor, r=sotaro, a=tef+

---
 dom/camera/CameraControlImpl.cpp | 35 +++++++++++++++++++++++++-------
 dom/camera/GonkCameraHwMgr.cpp   |  4 ++++
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/dom/camera/CameraControlImpl.cpp b/dom/camera/CameraControlImpl.cpp
index b1f518eb832d..9edb2efe65eb 100644
--- a/dom/camera/CameraControlImpl.cpp
+++ b/dom/camera/CameraControlImpl.cpp
@@ -275,19 +275,40 @@ CameraControlImpl::OnShutter()
   }
 }
 
-void
-CameraControlImpl::OnClosedInternal()
+class OnClosedTask : public nsRunnable
 {
-  DOM_CAMERA_LOGI("Camera hardware was closed\n");
-  if (mOnClosedCb.get()) {
-    mOnClosedCb->HandleEvent();
+public:
+  OnClosedTask(nsMainThreadPtrHandle<nsICameraClosedCallback> onClosed, uint64_t aWindowId)
+    : mOnClosedCb(onClosed)
+    , mWindowId(aWindowId)
+  {
+    DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
   }
-}
+
+  virtual ~OnClosedTask()
+  {
+    DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
+  }
+
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    if (mOnClosedCb.get() && nsDOMCameraManager::IsWindowStillActive(mWindowId)) {
+      mOnClosedCb->HandleEvent();
+    }
+    return NS_OK;
+  }
+
+protected:
+  nsMainThreadPtrHandle<nsICameraClosedCallback> mOnClosedCb;
+  uint64_t mWindowId;
+};
 
 void
 CameraControlImpl::OnClosed()
 {
-  nsCOMPtr<nsIRunnable> onClosed = NS_NewRunnableMethod(this, &CameraControlImpl::OnClosedInternal);
+  nsCOMPtr<nsIRunnable> onClosed = new OnClosedTask(mOnClosedCb, mWindowId);
   nsresult rv = NS_DispatchToMainThread(onClosed);
   if (NS_FAILED(rv)) {
     DOM_CAMERA_LOGW("Failed to dispatch onClosed event to main thread (%d)\n", rv);
diff --git a/dom/camera/GonkCameraHwMgr.cpp b/dom/camera/GonkCameraHwMgr.cpp
index 4f9836c42ea1..5613a2b160f5 100644
--- a/dom/camera/GonkCameraHwMgr.cpp
+++ b/dom/camera/GonkCameraHwMgr.cpp
@@ -218,6 +218,10 @@ GonkCameraHardware::~GonkCameraHardware()
   mCamera.clear();
   mNativeWindow.clear();
 
+  if (mClosing) {
+    return;
+  }
+
   /**
    * Trigger the OnClosed event; the upper layers can't do anything
    * with the hardware layer once they receive this event.

From 5b037f5922f09fa83978fb9278d6133531eacc28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Thu, 18 Apr 2013 04:30:05 -0700
Subject: [PATCH 294/438] backout a19cc9af881e for Moth failure.

---
 dom/apps/src/AppsUtils.jsm                    | 50 ---------------
 dom/apps/tests/Makefile.in                    |  2 -
 .../tests/file_hosted_app.template.webapp     |  2 +-
 dom/apps/tests/test_app_update.html           |  2 -
 dom/apps/tests/unit/test_manifestSanitizer.js | 63 -------------------
 dom/apps/tests/unit/xpcshell.ini              |  5 --
 testing/xpcshell/xpcshell.ini                 |  1 -
 7 files changed, 1 insertion(+), 124 deletions(-)
 delete mode 100644 dom/apps/tests/unit/test_manifestSanitizer.js
 delete mode 100644 dom/apps/tests/unit/xpcshell.ini

diff --git a/dom/apps/src/AppsUtils.jsm b/dom/apps/src/AppsUtils.jsm
index b14480433795..7c92be6550f8 100644
--- a/dom/apps/src/AppsUtils.jsm
+++ b/dom/apps/src/AppsUtils.jsm
@@ -205,54 +205,6 @@ this.AppsUtils = {
              "isCoreApp": isCoreApp };
   },
 
-  /**
-    * Remove potential HTML tags from displayable fields in the manifest.
-    * We check name, description, developer name, and permission description
-    */
-  sanitizeManifest: function(aManifest) {
-    let sanitizer = Cc["@mozilla.org/parserutils;1"]
-                      .getService(Ci.nsIParserUtils);
-    if (!sanitizer) {
-      return;
-    }
-
-    function sanitize(aStr) {
-      return sanitizer.convertToPlainText(aStr,
-               Ci.nsIDocumentEncoder.OutputSelectionOnly |
-               Ci.nsIDocumentEncoder.OutputAbsoluteLinks, 0);
-    }
-
-    function sanitizeEntryPoint(aRoot) {
-      aRoot.name = sanitize(aRoot.name);
-
-      if (aRoot.description) {
-        aRoot.description = sanitize(aRoot.description);
-      }
-
-      if (aRoot.developer && aRoot.developer.name) {
-        aRoot.developer.name = sanitize(aRoot.developer.name);
-      }
-
-      if (aRoot.permissions) {
-        for (let permission in aRoot.permissions) {
-          if (aRoot.permissions[permission].description) {
-            aRoot.permissions[permission].description =
-             sanitize(aRoot.permissions[permission].description);
-          }
-        }
-      }
-    }
-
-    // First process the main section, then the entry points.
-    sanitizeEntryPoint(aManifest);
-
-    if (aManifest.entry_points) {
-      for (let entry in aManifest.entry_points) {
-        sanitizeEntryPoint(aManifest.entry_points[entry]);
-      }
-    }
-  },
-
   /**
    * From https://developer.mozilla.org/en/OpenWebApps/The_Manifest
    * Only the name property is mandatory.
@@ -261,8 +213,6 @@ this.AppsUtils = {
     if (aManifest.name == undefined)
       return false;
 
-    this.sanitizeManifest(aManifest);
-
     // launch_path, entry_points launch paths, message hrefs, and activity hrefs can't be absolute
     if (aManifest.launch_path && isAbsoluteURI(aManifest.launch_path))
       return false;
diff --git a/dom/apps/tests/Makefile.in b/dom/apps/tests/Makefile.in
index b00f28d85df4..e1a16c831fac 100644
--- a/dom/apps/tests/Makefile.in
+++ b/dom/apps/tests/Makefile.in
@@ -24,6 +24,4 @@ MOCHITEST_CHROME_FILES = \
   test_apps_service.xul \
   $(NULL)
 
-XPCSHELL_TESTS = unit
-
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/apps/tests/file_hosted_app.template.webapp b/dom/apps/tests/file_hosted_app.template.webapp
index 938761988254..13c7223c081e 100644
--- a/dom/apps/tests/file_hosted_app.template.webapp
+++ b/dom/apps/tests/file_hosted_app.template.webapp
@@ -1,5 +1,5 @@
 {
   "name": "Really Rapid Release (hosted)",
-  "description": "Updated even faster than <a href='http://mozilla.org'>Firefox</a>, just to annoy slashdotters.",
+  "description": "Updated even faster than Firefox, just to annoy slashdotters.",
   "launch_path": "/tests/dom/apps/tests/file_app.sjs?apptype=hosted"
 }
diff --git a/dom/apps/tests/test_app_update.html b/dom/apps/tests/test_app_update.html
index 23d02d6b139f..1fe5ef77646a 100644
--- a/dom/apps/tests/test_app_update.html
+++ b/dom/apps/tests/test_app_update.html
@@ -69,8 +69,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
     yield;
     var app = request.result;
     ok(app, "App is non-null");
-    ok(app.manifest.description == "Updated even faster than Firefox, just to annoy slashdotters.",
-       "Manifest is HTML-sanitized");
 
     // Check the app a few times.
     checkAppState(app, true, 2, continueTest);
diff --git a/dom/apps/tests/unit/test_manifestSanitizer.js b/dom/apps/tests/unit/test_manifestSanitizer.js
deleted file mode 100644
index 4b0c999a73f8..000000000000
--- a/dom/apps/tests/unit/test_manifestSanitizer.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function testEntryPoint(aRoot) {
-  do_check_true(aRoot.name == "hello world");
-  do_check_true(aRoot.description == "A bold name");
-  do_check_true(aRoot.developer.name == "Blink Inc.");
-
-  let permissions = aRoot.permissions;
-  do_check_true(permissions.contacts.description == "Required for autocompletion in the share screen");
-  do_check_true(permissions.alarms.description == "Required to schedule notifications");
-}
-
-function run_test() {
-  Components.utils.import("resource:///modules/AppsUtils.jsm");
-
-  do_check_true(!!AppsUtils);
-
-  // Test manifest, with one entry point.
-  let manifest = {
-    name: "hello <b>world</b>",
-    description: "A bold name",
-    developer: {
-      name: "<blink>Blink</blink> Inc.",
-      url: "http://blink.org"
-    },
-    permissions : {
-      "contacts": {
-        "description": "Required for autocompletion in the <a href='http://shareme.com'>share</a> screen",
-        "access": "readcreate"
-        },
-      "alarms": {
-        "description": "Required to schedule notifications"
-      }
-    },
-
-    entry_points: {
-      "subapp": {
-        name: "hello <b>world</b>",
-        description: "A bold name",
-        developer: {
-          name: "<blink>Blink</blink> Inc.",
-          url: "http://blink.org"
-        },
-        permissions : {
-          "contacts": {
-            "description": "Required for autocompletion in the <a href='http://shareme.com'>share</a> screen",
-            "access": "readcreate"
-            },
-          "alarms": {
-            "description": "Required to schedule notifications"
-          }
-        }
-      }
-    }
-  }
-
-  AppsUtils.sanitizeManifest(manifest);
-
-  // Check the main section and the subapp entry point.
-  testEntryPoint(manifest);
-  testEntryPoint(manifest.entry_points.subapp);
-}
diff --git a/dom/apps/tests/unit/xpcshell.ini b/dom/apps/tests/unit/xpcshell.ini
deleted file mode 100644
index bacd1de945e9..000000000000
--- a/dom/apps/tests/unit/xpcshell.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-head =
-tail =
-
-[test_manifestSanitizer.js]
diff --git a/testing/xpcshell/xpcshell.ini b/testing/xpcshell/xpcshell.ini
index 5ad1c817a0b7..3d1906172647 100644
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -10,7 +10,6 @@
 [include:parser/xml/test/unit/xpcshell.ini]
 [include:image/test/unit/xpcshell.ini]
 [include:dom/activities/tests/unit/xpcshell.ini]
-[include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/encoding/test/unit/xpcshell.ini]
 [include:dom/plugins/test/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]

From 3fe5d5095e8c33e68ac5e44163e7592a5e433a1e Mon Sep 17 00:00:00 2001
From: "janjongboom@gmail.com" <janjongboom@gmail.com>
Date: Thu, 18 Apr 2013 07:42:39 -0400
Subject: [PATCH 295/438] Bug 862232 - [OPEN_][SMS]when we send a message to a
 contact whose number contains 0, the 0 will be deleted. r=gwagner

---
 dom/phonenumberutils/PhoneNumber.jsm            | 4 ++--
 dom/phonenumberutils/tests/test_phonenumber.xul | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dom/phonenumberutils/PhoneNumber.jsm b/dom/phonenumberutils/PhoneNumber.jsm
index f1a574cc6aeb..29686e49250f 100644
--- a/dom/phonenumberutils/PhoneNumber.jsm
+++ b/dom/phonenumberutils/PhoneNumber.jsm
@@ -28,9 +28,9 @@ this.PhoneNumber = (function (dataBase) {
   // we will generate a regular expression from the value, with those special
   // characters as prefix/suffix.
   const META_DATA_ENCODING = ["region",
-                              "^internationalPrefix",
+                              "^(?:internationalPrefix)",
                               "nationalPrefix",
-                              "^nationalPrefixForParsing",
+                              "^(?:nationalPrefixForParsing)",
                               "nationalPrefixTransformRule",
                               "nationalPrefixFormattingRule",
                               "^possiblePattern$",
diff --git a/dom/phonenumberutils/tests/test_phonenumber.xul b/dom/phonenumberutils/tests/test_phonenumber.xul
index f089826eb0c0..5ca4aa390b4f 100644
--- a/dom/phonenumberutils/tests/test_phonenumber.xul
+++ b/dom/phonenumberutils/tests/test_phonenumber.xul
@@ -289,6 +289,9 @@ Format("5712234567", "CO", "12234567", "CO", "(1) 2234567", "+57 1 2234567");
 // Dialing 911 in the US. This is not a national number.
 CantParse("911", "US");
 
+// China mobile number with a 0 in it
+Format("15955042864", "CN", "15955042864", "CN", "0159 5504 2864", "+86 159 5504 2864");
+
 // Test normalizing numbers. Only 0-9,#* are valid in a phone number.
 Normalize("+ABC # * , 9 _ 1 _0", "+222#*,910");
 Normalize("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "22233344455566677778889999");

From 3aef51e08f8a5eb025d6e16cfa3199cf283cea97 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Wed, 3 Apr 2013 15:54:00 +0200
Subject: [PATCH 296/438] Bug 857152 - Make IPC channels more robust against
 use after being closed. r=bent

---
 ipc/chromium/src/base/message_loop.cc |  5 ++++-
 ipc/chromium/src/base/message_loop.h  |  4 ++++
 ipc/glue/AsyncChannel.cpp             | 28 ++++++++++++++++-----------
 ipc/glue/AsyncChannel.h               | 15 ++++++++++----
 ipc/glue/RPCChannel.h                 |  2 +-
 ipc/glue/SyncChannel.cpp              |  4 ++--
 6 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/ipc/chromium/src/base/message_loop.cc b/ipc/chromium/src/base/message_loop.cc
index b5e88ec53f88..f715ce582a62 100644
--- a/ipc/chromium/src/base/message_loop.cc
+++ b/ipc/chromium/src/base/message_loop.cc
@@ -86,6 +86,8 @@ MessageLoop* MessageLoop::current() {
   return lazy_tls_ptr.Pointer()->Get();
 }
 
+PRInt32 message_loop_id_seq = 0;
+
 MessageLoop::MessageLoop(Type type)
     : type_(type),
       nestable_tasks_allowed_(true),
@@ -95,7 +97,8 @@ MessageLoop::MessageLoop(Type type)
 #ifdef OS_WIN
       os_modal_loop_(false),
 #endif  // OS_WIN
-      next_sequence_num_(0) {
+      next_sequence_num_(0),
+      id_(PR_ATOMIC_INCREMENT(&message_loop_id_seq)) {
   DCHECK(!current()) << "should only have one message loop per thread";
   lazy_tls_ptr.Pointer()->Set(this);
   if (type_ == TYPE_MOZILLA_UI) {
diff --git a/ipc/chromium/src/base/message_loop.h b/ipc/chromium/src/base/message_loop.h
index a7c48fefcc3e..c936779fca67 100644
--- a/ipc/chromium/src/base/message_loop.h
+++ b/ipc/chromium/src/base/message_loop.h
@@ -219,6 +219,9 @@ public:
   // Returns the type passed to the constructor.
   Type type() const { return type_; }
 
+  // Unique, non-repeating ID for this message loop.
+  PRInt32 id() const { return id_; }
+
   // Optional call to connect the thread name with this loop.
   void set_thread_name(const std::string& thread_name) {
     DCHECK(thread_name_.empty()) << "Should not rename this thread!";
@@ -374,6 +377,7 @@ public:
   virtual bool DoIdleWork();
 
   Type type_;
+  PRInt32 id_;
 
   // A list of tasks that need to be processed by this instance.  Note that
   // this queue is only accessed (push/pop) by our current thread.
diff --git a/ipc/glue/AsyncChannel.cpp b/ipc/glue/AsyncChannel.cpp
index c025c17834d1..82d2a6dc96a7 100644
--- a/ipc/glue/AsyncChannel.cpp
+++ b/ipc/glue/AsyncChannel.cpp
@@ -271,12 +271,13 @@ AsyncChannel::ThreadLink::SendClose()
 }
 
 AsyncChannel::AsyncChannel(AsyncListener* aListener)
-  : mListener(aListener),
+  : mListener(aListener->asWeakPtr()),
     mChannelState(ChannelClosed),
     mWorkerLoop(),
     mChild(false),
     mChannelErrorTask(NULL),
-    mLink(NULL)
+    mLink(NULL),
+    mWorkerLoopID(-1)
 {
     MOZ_COUNT_CTOR(AsyncChannel);
 }
@@ -296,6 +297,7 @@ AsyncChannel::Open(Transport* aTransport,
     NS_PRECONDITION(!mLink, "Open() called > once");
     mMonitor = new RefCountedMonitor();
     mWorkerLoop = MessageLoop::current();
+    mWorkerLoopID = mWorkerLoop->id();
     mLink = link = new ProcessLink(this);
     link->Open(aTransport, aIOLoop, aSide); // n.b.: sets mChild
     return true;
@@ -353,6 +355,7 @@ void
 AsyncChannel::CommonThreadOpenInit(AsyncChannel *aTargetChan, Side aSide)
 {
     mWorkerLoop = MessageLoop::current();
+    mWorkerLoopID = mWorkerLoop->id();
     mLink = new ThreadLink(this, aTargetChan);
     mChild = (aSide == Child); 
 }
@@ -383,12 +386,7 @@ AsyncChannel::Close()
     AssertWorkerThread();
 
     {
-        // n.b.: We increase the ref count of monitor temporarily
-        //       for the duration of this block.  Otherwise, the
-        //       function NotifyMaybeChannelError() will call
-        //       ::Clear() which can free the monitor.
-        nsRefPtr<RefCountedMonitor> monitor(mMonitor);
-        MonitorAutoLock lock(*monitor);
+        MonitorAutoLock lock(*mMonitor);
 
         if (ChannelError == mChannelState ||
             ChannelTimeout == mChannelState) {
@@ -398,7 +396,7 @@ AsyncChannel::Close()
             // also be deleted and the listener will never be notified
             // of the channel error.
             if (mListener) {
-                MonitorAutoUnlock unlock(*monitor);
+                MonitorAutoUnlock unlock(*mMonitor);
                 NotifyMaybeChannelError();
             }
             return;
@@ -575,12 +573,20 @@ AsyncChannel::NotifyMaybeChannelError()
 void
 AsyncChannel::Clear()
 {
-    mListener = 0;
+    // Don't clear mWorkerLoopID; we use it in AssertLinkThread() and
+    // AssertWorkerThread().
+    //
+    // Also don't clear mListener.  If we clear it, then sending a message
+    // through this channel after it's Clear()'ed can cause this process to
+    // crash.
+    //
+    // In practice, mListener owns the channel, so the channel gets deleted
+    // before mListener.  But just to be safe, mListener is a weak pointer.
+
     mWorkerLoop = 0;
 
     delete mLink;
     mLink = 0;
-    mMonitor = 0;
 
     if (mChannelErrorTask) {
         mChannelErrorTask->Cancel();
diff --git a/ipc/glue/AsyncChannel.h b/ipc/glue/AsyncChannel.h
index e07c899ff18f..5b69e717ba69 100644
--- a/ipc/glue/AsyncChannel.h
+++ b/ipc/glue/AsyncChannel.h
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 
+#include "mozilla/WeakPtr.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/ipc/Transport.h"
 
@@ -62,7 +63,9 @@ public:
     typedef IPC::Message Message;
     typedef mozilla::ipc::Transport Transport;
 
-    class /*NS_INTERFACE_CLASS*/ AsyncListener: protected HasResultCodes
+    class /*NS_INTERFACE_CLASS*/ AsyncListener
+        : protected HasResultCodes
+        , public mozilla::SupportsWeakPtr<AsyncListener>
     {
     public:
         virtual ~AsyncListener() { }
@@ -199,14 +202,14 @@ protected:
     // NOT our worker thread.
     void AssertLinkThread() const
     {
-        NS_ABORT_IF_FALSE(mWorkerLoop != MessageLoop::current(),
+        NS_ABORT_IF_FALSE(mWorkerLoopID != MessageLoop::current()->id(),
                           "on worker thread but should not be!");
     }
 
     // Can be run on either thread
     void AssertWorkerThread() const
     {
-        NS_ABORT_IF_FALSE(mWorkerLoop == MessageLoop::current(),
+        NS_ABORT_IF_FALSE(mWorkerLoopID == MessageLoop::current()->id(),
                           "not on worker thread!");
     }
 
@@ -258,13 +261,17 @@ protected:
 
     virtual void Clear();
 
-    AsyncListener* mListener;
+    mozilla::WeakPtr<AsyncListener> mListener;
     ChannelState mChannelState;
     nsRefPtr<RefCountedMonitor> mMonitor;
     MessageLoop* mWorkerLoop;   // thread where work is done
     bool mChild;                // am I the child or parent?
     CancelableTask* mChannelErrorTask; // NotifyMaybeChannelError runnable
     Link *mLink;                // link to other thread/process
+
+    // id() of mWorkerLoop.  This persists even after mWorkerLoop is cleared
+    // during channel shutdown.
+    int mWorkerLoopID;
 };
 
 } // namespace ipc
diff --git a/ipc/glue/RPCChannel.h b/ipc/glue/RPCChannel.h
index 1dfd3a34117f..893e4b68575f 100644
--- a/ipc/glue/RPCChannel.h
+++ b/ipc/glue/RPCChannel.h
@@ -152,7 +152,7 @@ private:
     // Called on worker thread only
 
     RPCListener* Listener() const {
-        return static_cast<RPCListener*>(mListener);
+        return static_cast<RPCListener*>(mListener.get());
     }
 
     virtual bool ShouldDeferNotifyMaybeError() const MOZ_OVERRIDE {
diff --git a/ipc/glue/SyncChannel.cpp b/ipc/glue/SyncChannel.cpp
index 2eedc57716cc..09279d319a6b 100644
--- a/ipc/glue/SyncChannel.cpp
+++ b/ipc/glue/SyncChannel.cpp
@@ -142,7 +142,7 @@ SyncChannel::OnDispatchMessage(const Message& msg)
 
     mProcessingSyncMessage = true;
     Result rv =
-        static_cast<SyncListener*>(mListener)->OnMessageReceived(msg, reply);
+        static_cast<SyncListener*>(mListener.get())->OnMessageReceived(msg, reply);
     mProcessingSyncMessage = false;
 
     if (!MaybeHandleError(rv, "SyncChannel")) {
@@ -231,7 +231,7 @@ SyncChannel::ShouldContinueFromTimeout()
     bool cont;
     {
         MonitorAutoUnlock unlock(*mMonitor);
-        cont = static_cast<SyncListener*>(mListener)->OnReplyTimeout();
+        cont = static_cast<SyncListener*>(mListener.get())->OnReplyTimeout();
     }
 
     if (!cont) {

From 9977ad48b2c5cd107d52407fca83e585530654ce Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Wed, 3 Apr 2013 18:59:17 -0400
Subject: [PATCH 297/438] Bug 734691 - Port multi-thread support to win/mac.
 r=snorp,smaug

--HG--
extra : rebase_source : 4e7e1681355146e32fbc5ff2aa9891470e241347
---
 dom/workers/RuntimeService.cpp     |  16 ++-
 tools/profiler/GeckoProfiler.h     |   4 +
 tools/profiler/GeckoProfilerImpl.h |  11 ++
 tools/profiler/Makefile.in         |   3 +
 tools/profiler/ProfileEntry.cpp    |   6 +-
 tools/profiler/ProfileEntry.h      |   7 +-
 tools/profiler/PseudoStack.h       |   4 +
 tools/profiler/TableTicker.cpp     |  15 +--
 tools/profiler/TableTicker.h       |  18 ++-
 tools/profiler/platform-linux.cc   | 203 +++++++++++++++--------------
 tools/profiler/platform-macos.cc   | 121 ++++++++++-------
 tools/profiler/platform-win32.cc   | 109 ++++++++++------
 tools/profiler/platform.cpp        |  73 ++++++++---
 tools/profiler/platform.h          | 124 ++++++++++--------
 14 files changed, 438 insertions(+), 276 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index fdfd21a2f0f2..c5744cae3ea2 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -265,6 +265,10 @@ JSBool
 OperationCallback(JSContext* aCx)
 {
   WorkerPrivate* worker = GetWorkerPrivateFromContext(aCx);
+
+  // Now is a good time to turn on profiling if it's pending.
+  profiler_js_operation_callback();
+
   return worker->OperationCallback(aCx);
 }
 
@@ -517,15 +521,19 @@ public:
       return NS_ERROR_FAILURE;
     }
 
+    JSRuntime* rt = JS_GetRuntime(cx);
+
     profiler_register_thread("WebWorker");
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    if (PseudoStack* stack = mozilla_get_pseudo_stack())
+      stack->sampleRuntime(rt);
+#endif
 
     {
       JSAutoRequest ar(cx);
       workerPrivate->DoRunLoop(cx);
     }
 
-    JSRuntime* rt = JS_GetRuntime(cx);
-
     // XXX Bug 666963 - CTypes can create another JSContext for use with
     // closures, and then it holds that context in a reserved slot on the CType
     // prototype object. We have to destroy that context before we can destroy
@@ -544,6 +552,10 @@ public:
       JS_DestroyContext(cx);
     }
 
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    if (PseudoStack* stack = mozilla_get_pseudo_stack())
+      stack->sampleRuntime(nullptr);
+#endif
     JS_DestroyRuntime(rt);
 
     workerPrivate->ScheduleDeletion(false);
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 9105f0470ecb..9c2507a71dad 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -138,6 +138,10 @@ static inline void profiler_unlock() {}
 static inline void profiler_register_thread(const char* name) {}
 static inline void profiler_unregister_thread() {}
 
+// Call by the JSRuntime's operation callback. This is used to enable
+// profiling on auxilerary threads.
+static inline void profiler_js_operation_callback() {}
+
 #else
 
 #include "GeckoProfilerImpl.h"
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index 65a60e2db615..b5c20626c610 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -152,6 +152,17 @@ void profiler_unregister_thread()
   mozilla_sampler_unregister_thread();
 }
 
+static inline
+void profiler_js_operation_callback()
+{
+  PseudoStack *stack = tlsPseudoStack.get();
+  if (!stack) {
+    return;
+  }
+
+  stack->jsOperationCallback();
+}
+
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index 64b394444d73..d7e1b9bfbe4a 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -34,6 +34,9 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
+# Uncomment for better debugging in opt builds
+#MOZ_OPTIMIZE_FLAGS += -O0 -g
+
 CPPSRCS		= \
   platform.cpp \
   nsProfilerFactory.cpp \
diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
index 4435ebf4e9a2..d3608cace5fc 100644
--- a/tools/profiler/ProfileEntry.cpp
+++ b/tools/profiler/ProfileEntry.cpp
@@ -134,7 +134,10 @@ std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
 
 #define DYNAMIC_MAX_STRING 512
 
-ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread)
+ThreadProfile::ThreadProfile(const char* aName, int aEntrySize,
+                             PseudoStack *aStack, int aThreadId,
+                             PlatformData* aPlatform,
+                             bool aIsMainThread)
   : mWritePos(0)
   , mLastFlushPos(0)
   , mReadPos(0)
@@ -144,6 +147,7 @@ ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aSt
   , mName(strdup(aName))
   , mThreadId(aThreadId)
   , mIsMainThread(aIsMainThread)
+  , mPlatformData(aPlatform)
 {
   mEntries = new ProfileEntry[mEntrySize];
 }
diff --git a/tools/profiler/ProfileEntry.h b/tools/profiler/ProfileEntry.h
index a5483b59f887..378dc42481c2 100644
--- a/tools/profiler/ProfileEntry.h
+++ b/tools/profiler/ProfileEntry.h
@@ -12,7 +12,6 @@
 #include "platform.h"
 #include "mozilla/Mutex.h"
 
-class ThreadProfile;
 class ThreadProfile;
 
 class ProfileEntry
@@ -57,7 +56,9 @@ typedef void (*IterateTagsCallback)(const ProfileEntry& entry, const char* tagSt
 class ThreadProfile
 {
 public:
-  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread);
+  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack,
+                int aThreadId, PlatformData* aPlatformData,
+                bool aIsMainThread);
   ~ThreadProfile();
   void addTag(ProfileEntry aTag);
   void flush();
@@ -76,6 +77,7 @@ public:
   const char* Name() const { return mName; }
   int ThreadId() const { return mThreadId; }
 
+  PlatformData* GetPlatformData() { return mPlatformData; }
 private:
   // Circular buffer 'Keep One Slot Open' implementation
   // for simplicity
@@ -89,6 +91,7 @@ private:
   char*          mName;
   int            mThreadId;
   bool           mIsMainThread;
+  PlatformData*  mPlatformData;  // Platform specific data.
 };
 
 std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
diff --git a/tools/profiler/PseudoStack.h b/tools/profiler/PseudoStack.h
index 9079ffbfc3a8..b12bb226dae5 100644
--- a/tools/profiler/PseudoStack.h
+++ b/tools/profiler/PseudoStack.h
@@ -220,6 +220,10 @@ public:
       mStartJSSampling = true;
     }
   }
+  void jsOperationCallback() {
+    if (mStartJSSampling)
+      enableJSSampling();
+  }
   void disableJSSampling() {
     mStartJSSampling = false;
     if (mRuntime)
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index 14a3350b1318..349f7e794338 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -179,6 +179,10 @@ void TableTicker::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile)
     mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
 
     for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
+      // Thread not being profiled, skip it
+      if (!sRegisteredThreads->at(i)->Profile())
+        continue;
+
       MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
 
       JSCustomObject* threadSamples = b.CreateObject();
@@ -291,7 +295,7 @@ void StackWalkCallback(void* aPC, void* aSP, void* aClosure)
 void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample)
 {
 #ifndef XP_MACOSX
-  uintptr_t thread = GetThreadHandle(platform_data());
+  uintptr_t thread = GetThreadHandle(aSample->threadProfile->GetPlatformData());
   MOZ_ASSERT(thread);
 #endif
   void* pc_array[1000];
@@ -308,7 +312,7 @@ void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample
 
   uint32_t maxFrames = uint32_t(array.size - array.count);
 #ifdef XP_MACOSX
-  pthread_t pt = GetProfiledThread(platform_data());
+  pthread_t pt = GetProfiledThread(aSample->threadProfile->GetPlatformData());
   void *stackEnd = reinterpret_cast<void*>(-1);
   if (pt)
     stackEnd = static_cast<char*>(pthread_get_stackaddr_np(pt));
@@ -389,11 +393,6 @@ void doSampleStackTrace(PseudoStack *aStack, ThreadProfile &aProfile, TickSample
 
 void TableTicker::Tick(TickSample* sample)
 {
-  if (!sample->threadProfile) {
-    // Platform doesn't support multithread, so use the main thread profile we created
-    sample->threadProfile = GetPrimaryThreadProfile();
-  }
-
   ThreadProfile& currThreadProfile = *sample->threadProfile;
 
   // Marker(s) come before the sample
@@ -474,7 +473,7 @@ void mozilla_sampler_print_location1()
   }
 
   ThreadProfile threadProfile("Temp", PROFILE_DEFAULT_ENTRY, stack,
-                              0, false);
+                              0, Sampler::AllocPlatformData(0), false);
   doSampleStackTrace(stack, threadProfile, NULL);
 
   threadProfile.flush();
diff --git a/tools/profiler/TableTicker.h b/tools/profiler/TableTicker.h
index edb91195430d..274f1aac05c0 100644
--- a/tools/profiler/TableTicker.h
+++ b/tools/profiler/TableTicker.h
@@ -26,7 +26,7 @@ class BreakpadSampler;
 
 class TableTicker: public Sampler {
  public:
-  TableTicker(int aInterval, int aEntrySize, PseudoStack *aStack,
+  TableTicker(int aInterval, int aEntrySize,
               const char** aFeatures, uint32_t aFeatureCount)
     : Sampler(aInterval, true, aEntrySize)
     , mPrimaryThreadProfile(nullptr)
@@ -38,6 +38,7 @@ class TableTicker: public Sampler {
     //XXX: It's probably worth splitting the jank profiler out from the regular profiler at some point
     mJankOnly = hasFeature(aFeatures, aFeatureCount, "jank");
     mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
+    mProfileThreads = true || hasFeature(aFeatures, aFeatureCount, "threads");
     mAddLeafAddresses = hasFeature(aFeatures, aFeatureCount, "leaf");
 
     {
@@ -46,10 +47,15 @@ class TableTicker: public Sampler {
       // Create ThreadProfile for each registered thread
       for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
         ThreadInfo* info = sRegisteredThreads->at(i);
+
+        if (!info->IsMainThread() && !mProfileThreads)
+          continue;
+
         ThreadProfile* profile = new ThreadProfile(info->Name(),
                                                    aEntrySize,
                                                    info->Stack(),
                                                    info->ThreadId(),
+                                                   info->GetPlatformData(),
                                                    info->IsMainThread());
         profile->addTag(ProfileEntry('m', "Start"));
 
@@ -81,8 +87,6 @@ class TableTicker: public Sampler {
     }
   }
 
-  virtual void SampleStack(TickSample* sample) {}
-
   // Called within a signal. This function must be reentrant
   virtual void Tick(TickSample* sample);
 
@@ -115,7 +119,8 @@ class TableTicker: public Sampler {
   virtual JSObject *ToJSObject(JSContext *aCx);
   JSCustomObject *GetMetaJSCustomObject(JSAObjectBuilder& b);
 
-  const bool ProfileJS() { return mProfileJS; }
+  bool ProfileJS() const { return mProfileJS; }
+  bool ProfileThreads() const { return mProfileThreads; }
 
   virtual BreakpadSampler* AsBreakpadSampler() { return nullptr; }
 
@@ -133,13 +138,14 @@ protected:
   bool mUseStackWalk;
   bool mJankOnly;
   bool mProfileJS;
+  bool mProfileThreads;
 };
 
 class BreakpadSampler: public TableTicker {
  public:
-  BreakpadSampler(int aInterval, int aEntrySize, PseudoStack *aStack,
+  BreakpadSampler(int aInterval, int aEntrySize,
               const char** aFeatures, uint32_t aFeatureCount)
-    : TableTicker(aInterval, aEntrySize, aStack, aFeatures, aFeatureCount)
+    : TableTicker(aInterval, aEntrySize, aFeatures, aFeatureCount)
   {}
 
   // Called within a signal. This function must be reentrant
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index ed1c52d40a9c..8570e1e60158 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -64,6 +64,7 @@
 #include "mozilla/Mutex.h"
 #include "ProfileEntry.h"
 #include "nsThreadUtils.h"
+#include "TableTicker.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -125,6 +126,19 @@ static void* setup_atfork() {
 #include "android-signal-defs.h"
 #endif
 
+struct SamplerRegistry {
+  static void AddActiveSampler(Sampler *sampler) {
+    ASSERT(!SamplerRegistry::sampler);
+    SamplerRegistry::sampler = sampler;
+  }
+  static void RemoveActiveSampler(Sampler *sampler) {
+    SamplerRegistry::sampler = NULL;
+  }
+  static Sampler *sampler;
+};
+
+Sampler *SamplerRegistry::sampler = NULL;
+
 static ThreadProfile* sCurrentThreadProfile = NULL;
 
 static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context) {
@@ -191,90 +205,29 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
   sCurrentThreadProfile = NULL;
 }
 
-#ifndef XP_MACOSX
 int tgkill(pid_t tgid, pid_t tid, int signalno) {
   return syscall(SYS_tgkill, tgid, tid, signalno);
 }
-#endif
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
-  explicit PlatformData(Sampler* sampler)
-      : sampler_(sampler),
-        signal_handler_installed_(false),
-        vm_tgid_(getpid()),
-#ifndef XP_MACOSX
-        vm_tid_(gettid()),
-#endif
-        signal_sender_launched_(false)
-#ifdef XP_MACOSX
-        , signal_receiver_(pthread_self())
-#endif
-  {
-  }
-
-  void SignalSender() {
-    while (sampler_->IsActive()) {
-      sampler_->HandleSaveRequest();
-
-      if (!sampler_->IsPaused()) {
-#ifdef XP_MACOSX
-        pthread_kill(signal_receiver_, SIGPROF);
-#else
-
-        std::vector<ThreadInfo*> threads = GetRegisteredThreads();
-
-        for (uint32_t i = 0; i < threads.size(); i++) {
-          ThreadInfo* info = threads[i];
-
-          // We use sCurrentThreadProfile the ThreadProfile for the
-          // thread we're profiling to the signal handler
-          sCurrentThreadProfile = info->Profile();
-
-          int threadId = info->ThreadId();
-          if (threadId == 0) {
-            threadId = vm_tid_;
-          }
-
-          if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
-            printf_stderr("profiler failed to signal tid=%d\n", threadId);
-#ifdef DEBUG
-            abort();
-#endif
-            continue;
-          }
-
-          // Wait for the signal handler to run before moving on to the next one
-          while (sCurrentThreadProfile)
-            sched_yield();
-        }
-#endif
-      }
-
-      // Convert ms to us and subtract 100 us to compensate delays
-      // occuring during signal delivery.
-      // TODO measure and confirm this.
-      const useconds_t interval = sampler_->interval_ * 1000 - 100;
-      //int result = usleep(interval);
-      usleep(interval);
-    }
-  }
-
-  Sampler* sampler_;
-  bool signal_handler_installed_;
-  struct sigaction old_sigprof_signal_handler_;
-  struct sigaction old_sigsave_signal_handler_;
-  pid_t vm_tgid_;
-  pid_t vm_tid_;
-  bool signal_sender_launched_;
-  pthread_t signal_sender_thread_;
-#ifdef XP_MACOSX
-  pthread_t signal_receiver_;
-#endif
+  PlatformData()
+  {}
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData;
+}
 
-static void* SenderEntry(void* arg) {
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
+
+static void* SignalSender(void* arg) {
 # if defined(ANDROID)
   // pthread_atfork isn't available on Android.
   void* initialize_atfork = NULL;
@@ -283,38 +236,80 @@ static void* SenderEntry(void* arg) {
   // It returns NULL.
   static void* initialize_atfork = setup_atfork();
 # endif
-  Sampler::PlatformData* data =
-      reinterpret_cast<Sampler::PlatformData*>(arg);
-  data->SignalSender();
+
+  int vm_tgid_ = getpid();
+
+  while (SamplerRegistry::sampler->IsActive()) {
+    SamplerRegistry::sampler->HandleSaveRequest();
+
+    if (!SamplerRegistry::sampler->IsPaused()) {
+      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+      std::vector<ThreadInfo*> threads =
+        SamplerRegistry::sampler->GetRegisteredThreads();
+
+      for (uint32_t i = 0; i < threads.size(); i++) {
+        ThreadInfo* info = threads[i];
+
+        // This will be null if we're not interested in profiling this thread.
+        if (!info->Profile())
+          continue;
+
+        // We use sCurrentThreadProfile the ThreadProfile for the
+        // thread we're profiling to the signal handler
+        sCurrentThreadProfile = info->Profile();
+
+        int threadId = info->ThreadId();
+
+        if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
+          printf_stderr("profiler failed to signal tid=%d\n", threadId);
+#ifdef DEBUG
+          abort();
+#endif
+          continue;
+        }
+
+        // Wait for the signal handler to run before moving on to the next one
+        while (sCurrentThreadProfile)
+          sched_yield();
+      }
+    }
+
+    // Convert ms to us and subtract 100 us to compensate delays
+    // occuring during signal delivery.
+    // TODO measure and confirm this.
+    const useconds_t interval =
+      SamplerRegistry::sampler->interval() * 1000 - 100;
+    //int result = usleep(interval);
+    usleep(interval);
+  }
   return initialize_atfork; // which is guaranteed to be NULL
 }
 
-
 Sampler::Sampler(int interval, bool profiling, int entrySize)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
       active_(false),
       entrySize_(entrySize) {
-  data_ = new PlatformData(this);
 }
 
 Sampler::~Sampler() {
-  ASSERT(!data_->signal_sender_launched_);
-  delete data_;
+  ASSERT(!signal_sender_launched_);
 }
 
 
 void Sampler::Start() {
   LOG("Sampler started");
 
+  SamplerRegistry::AddActiveSampler(this);
+
   // Request profiling signals.
   LOG("Request signal");
   struct sigaction sa;
   sa.sa_sigaction = ProfilerSignalHandler;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGPROF, &sa, &data_->old_sigprof_signal_handler_) != 0) {
+  if (sigaction(SIGPROF, &sa, &old_sigprof_signal_handler_) != 0) {
     LOG("Error installing signal");
     return;
   }
@@ -324,20 +319,20 @@ void Sampler::Start() {
   sa2.sa_sigaction = ProfilerSaveSignalHandler;
   sigemptyset(&sa2.sa_mask);
   sa2.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &data_->old_sigsave_signal_handler_) != 0) {
+  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &old_sigsave_signal_handler_) != 0) {
     LOG("Error installing start signal");
     return;
   }
   LOG("Signal installed");
-  data_->signal_handler_installed_ = true;
+  signal_handler_installed_ = true;
 
   // Start a thread that sends SIGPROF signal to VM thread.
   // Sending the signal ourselves instead of relying on itimer provides
   // much better accuracy.
   SetActive(true);
   if (pthread_create(
-          &data_->signal_sender_thread_, NULL, SenderEntry, data_) == 0) {
-    data_->signal_sender_launched_ = true;
+        &signal_sender_thread_, NULL, SignalSender, NULL) == 0) {
+    signal_sender_launched_ = true;
   }
   LOG("Profiler thread started");
 }
@@ -348,32 +343,42 @@ void Sampler::Stop() {
 
   // Wait for signal sender termination (it will exit after setting
   // active_ to false).
-  if (data_->signal_sender_launched_) {
-    pthread_join(data_->signal_sender_thread_, NULL);
-    data_->signal_sender_launched_ = false;
+  if (signal_sender_launched_) {
+    pthread_join(signal_sender_thread_, NULL);
+    signal_sender_launched_ = false;
   }
 
+  SamplerRegistry::RemoveActiveSampler(this);
+
   // Restore old signal handler
-  if (data_->signal_handler_installed_) {
-    sigaction(SIGNAL_SAVE_PROFILE, &data_->old_sigsave_signal_handler_, 0);
-    sigaction(SIGPROF, &data_->old_sigprof_signal_handler_, 0);
-    data_->signal_handler_installed_ = false;
+  if (signal_handler_installed_) {
+    sigaction(SIGNAL_SAVE_PROFILE, &old_sigsave_signal_handler_, 0);
+    sigaction(SIGPROF, &old_sigprof_signal_handler_, 0);
+    signal_handler_installed_ = false;
   }
 }
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  ThreadInfo* info = new ThreadInfo(aName, gettid(), aIsMainThread, aPseudoStack);
+  ThreadInfo* info = new ThreadInfo(aName, gettid(),
+    aIsMainThread, aPseudoStack);
 
-  if (sActiveSampler) {
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
+
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
                                        info->ThreadId(),
+                                       info->GetPlatformData(),
                                        aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -382,7 +387,7 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = gettid();
 
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index 50945dc34fcd..ac338808da1a 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -31,6 +31,7 @@
 #include "nsThreadUtils.h"
 
 #include "platform.h"
+#include "TableTicker.h"
 #include "UnwinderThread2.h"  /* uwt__register_thread_for_profiling */
 
 // this port is based off of v8 svn revision 9837
@@ -91,21 +92,13 @@ void OS::Sleep(int milliseconds) {
   usleep(1000 * milliseconds);
 }
 
-class Thread::PlatformData : public Malloced {
- public:
-  PlatformData() : thread_(kNoThread) {}
-  pthread_t thread_;  // Thread handle for pthread.
-};
-
 Thread::Thread(const char* name)
-    : data_(new PlatformData),
-      stack_size_(0) {
+    : stack_size_(0) {
   set_name(name);
 }
 
 
 Thread::~Thread() {
-  delete data_;
 }
 
 
@@ -141,9 +134,9 @@ static void* ThreadEntry(void* arg) {
   }
   // END temp hack for SPS v1-vs-v2
 
-  thread->data()->thread_ = pthread_self();
+  thread->thread_ = pthread_self();
   SetThreadName(thread->name());
-  ASSERT(thread->data()->thread_ != kNoThread);
+  ASSERT(thread->thread_ != kNoThread);
   thread->Run();
   return NULL;
 }
@@ -163,15 +156,15 @@ void Thread::Start() {
     pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_));
     attr_ptr = &attr;
   }
-  pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this);
-  ASSERT(data_->thread_ != kNoThread);
+  pthread_create(&thread_, attr_ptr, ThreadEntry, this);
+  ASSERT(thread_ != kNoThread);
 }
 
 void Thread::Join() {
-  pthread_join(data_->thread_, NULL);
+  pthread_join(thread_, NULL);
 }
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
   PlatformData() : profiled_thread_(mach_thread_self())
   {
@@ -197,6 +190,17 @@ class Sampler::PlatformData : public Malloced {
   pthread_t profiled_pthread_;
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData;
+}
+
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
 
 class SamplerThread : public Thread {
  public:
@@ -205,7 +209,7 @@ class SamplerThread : public Thread {
       , interval_(interval) {}
 
   static void AddActiveSampler(Sampler* sampler) {
-    ScopedLock lock(mutex_);
+    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
     SamplerRegistry::AddActiveSampler(sampler);
     if (instance_ == NULL) {
       instance_ = new SamplerThread(sampler->interval());
@@ -216,37 +220,45 @@ class SamplerThread : public Thread {
   }
 
   static void RemoveActiveSampler(Sampler* sampler) {
-    ScopedLock lock(mutex_);
+    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
     instance_->Join();
     //XXX: unlike v8 we need to remove the active sampler after doing the Join
     // because we drop the sampler immediately
     SamplerRegistry::RemoveActiveSampler(sampler);
     delete instance_;
     instance_ = NULL;
-    /*
-    if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) {
-      RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_);
-      delete instance_;
-      instance_ = NULL;
-    }
-    */
   }
 
   // Implement Thread::Run().
   virtual void Run() {
     while (SamplerRegistry::sampler->IsActive()) {
-      if (!SamplerRegistry::sampler->IsPaused())
-        SampleContext(SamplerRegistry::sampler);
+      {
+        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+        std::vector<ThreadInfo*> threads =
+          SamplerRegistry::sampler->GetRegisteredThreads();
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // This will be null if we're not interested in profiling this thread.
+          if (!info->Profile())
+            continue;
+
+          ThreadProfile* thread_profile = info->Profile();
+
+          if (!SamplerRegistry::sampler->IsPaused())
+            SampleContext(SamplerRegistry::sampler, thread_profile);
+        }
+      }
       OS::Sleep(interval_);
     }
   }
 
-  void SampleContext(Sampler* sampler) {
-    thread_act_t profiled_thread = sampler->platform_data()->profiled_thread();
+  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
+    thread_act_t profiled_thread =
+      thread_profile->GetPlatformData()->profiled_thread();
+
     TickSample sample_obj;
     TickSample* sample = &sample_obj;
-    //TickSample* sample = CpuProfiler::TickSampleEvent(sampler->isolate());
-    //if (sample == NULL) sample = &sample_obj;
 
     if (KERN_SUCCESS != thread_suspend(profiled_thread)) return;
 
@@ -276,13 +288,11 @@ class SamplerThread : public Thread {
                          flavor,
                          reinterpret_cast<natural_t*>(&state),
                          &count) == KERN_SUCCESS) {
-      //sample->state = sampler->isolate()->current_vm_state();
       sample->pc = reinterpret_cast<Address>(state.REGISTER_FIELD(ip));
       sample->sp = reinterpret_cast<Address>(state.REGISTER_FIELD(sp));
       sample->fp = reinterpret_cast<Address>(state.REGISTER_FIELD(bp));
       sample->timestamp = mozilla::TimeStamp::Now();
-      sample->threadProfile = NULL;
-      sampler->SampleStack(sample);
+      sample->threadProfile = thread_profile;
       sampler->Tick(sample);
     }
     thread_resume(profiled_thread);
@@ -300,11 +310,8 @@ class SamplerThread : public Thread {
 
 #undef REGISTER_FIELD
 
-
-Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
-
 Sampler::Sampler(int interval, bool profiling, int entrySize)
     : // isolate_(isolate),
       interval_(interval),
@@ -313,13 +320,11 @@ Sampler::Sampler(int interval, bool profiling, int entrySize)
       active_(false),
       entrySize_(entrySize) /*,
       samples_taken_(0)*/ {
-  data_ = new PlatformData;
 }
 
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
-  delete data_;
 }
 
 
@@ -337,27 +342,38 @@ void Sampler::Stop() {
 }
 
 pthread_t
-Sampler::GetProfiledThread(Sampler::PlatformData* aData)
+Sampler::GetProfiledThread(PlatformData* aData)
 {
   return aData->profiled_pthread();
 }
 
+#include <sys/syscall.h>
+pid_t gettid()
+{
+  return (pid_t) syscall(SYS_thread_selfid);
+}
+
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  if (!aIsMainThread)
-    return false;
+  ThreadInfo* info = new ThreadInfo(aName, gettid(),
+    aIsMainThread, aPseudoStack);
 
-  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
 
-  if (sActiveSampler) {
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
                                        info->ThreadId(),
-                                       true));
+                                       info->GetPlatformData(),
+                                       aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -366,5 +382,16 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  // We only have the main thread currently and that will never be unregistered
-}
\ No newline at end of file
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+
+  int id = gettid();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
+}
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index 818b536b68f3..c63fc32cccba 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -30,21 +30,21 @@
 #include <mmsystem.h>
 #include <process.h>
 #include "platform.h"
-
+#include "TableTicker.h"
 #include "ProfileEntry.h"
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
   // Get a handle to the calling thread. This is the thread that we are
   // going to profile. We need to make a copy of the handle because we are
   // going to use it in the sampler thread. Using GetThreadHandle() will
   // not work in this case. We're using OpenThread because DuplicateHandle
   // for some reason doesn't work in Chrome's sandbox.
-  PlatformData() : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
+  PlatformData(int aThreadId) : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
                                                THREAD_SUSPEND_RESUME |
                                                THREAD_QUERY_INFORMATION,
                                                false,
-                                               GetCurrentThreadId())) {}
+                                               aThreadId)) {}
 
   ~PlatformData() {
     if (profiled_thread_ != NULL) {
@@ -59,8 +59,20 @@ class Sampler::PlatformData : public Malloced {
   HANDLE profiled_thread_;
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData(aThreadId);
+}
+
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
+
 uintptr_t
-Sampler::GetThreadHandle(Sampler::PlatformData* aData)
+Sampler::GetThreadHandle(PlatformData* aData)
 {
   return (uintptr_t) aData->profiled_thread();
 }
@@ -97,8 +109,24 @@ class SamplerThread : public Thread {
         ::timeBeginPeriod(interval_);
 
     while (sampler_->IsActive()) {
-      if (!sampler_->IsPaused())
-        SampleContext(sampler_);
+      {
+        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+        std::vector<ThreadInfo*> threads =
+          sampler_->GetRegisteredThreads();
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // This will be null if we're not interested in profiling this thread.
+          if (!info->Profile())
+            continue;
+
+          ThreadProfile* thread_profile = info->Profile();
+
+          if (!sampler_->IsPaused()) {
+            SampleContext(sampler_, thread_profile);
+          }
+        }
+      }
       OS::Sleep(interval_);
     }
 
@@ -107,8 +135,10 @@ class SamplerThread : public Thread {
         ::timeEndPeriod(interval_);
   }
 
-  void SampleContext(Sampler* sampler) {
-    HANDLE profiled_thread = sampler->platform_data()->profiled_thread();
+  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
+    uintptr_t thread = Sampler::GetThreadHandle(
+                               thread_profile->GetPlatformData());
+    HANDLE profiled_thread = reinterpret_cast<HANDLE>(thread);
     if (profiled_thread == NULL)
       return;
 
@@ -121,7 +151,7 @@ class SamplerThread : public Thread {
 
     // Grab the timestamp before pausing the thread, to avoid deadlocks.
     sample->timestamp = mozilla::TimeStamp::Now();
-    sample->threadProfile = NULL;
+    sample->threadProfile = thread_profile;
 
     static const DWORD kSuspendFailed = static_cast<DWORD>(-1);
     if (SuspendThread(profiled_thread) == kSuspendFailed)
@@ -139,7 +169,6 @@ class SamplerThread : public Thread {
       sample->fp = reinterpret_cast<Address>(context.Ebp);
 #endif
       sample->context = &context;
-      sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
     ResumeThread(profiled_thread);
@@ -162,13 +191,11 @@ Sampler::Sampler(int interval, bool profiling, int entrySize)
       profiling_(profiling),
       paused_(false),
       active_(false),
-      entrySize_(entrySize),
-      data_(new PlatformData) {
+      entrySize_(entrySize) {
 }
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
-  delete data_;
 }
 
 void Sampler::Start() {
@@ -192,18 +219,11 @@ static unsigned int __stdcall ThreadEntry(void* arg) {
   return 0;
 }
 
-class Thread::PlatformData : public Malloced {
- public:
-  explicit PlatformData(HANDLE thread) : thread_(thread) {}
-  HANDLE thread_;
-  unsigned thread_id_;
-};
-
 // Initialize a Win32 thread object. The thread has an invalid thread
 // handle until it is started.
 Thread::Thread(const char* name)
     : stack_size_(0) {
-  data_ = new PlatformData(kNoThread);
+  thread_ = kNoThread;
   set_name(name);
 }
 
@@ -214,27 +234,26 @@ void Thread::set_name(const char* name) {
 
 // Close our own handle for the thread.
 Thread::~Thread() {
-  if (data_->thread_ != kNoThread) CloseHandle(data_->thread_);
-  delete data_;
+  if (thread_ != kNoThread) CloseHandle(thread_);
 }
 
 // Create a new thread. It is important to use _beginthreadex() instead of
 // the Win32 function CreateThread(), because the CreateThread() does not
 // initialize thread specific structures in the C runtime library.
 void Thread::Start() {
-  data_->thread_ = reinterpret_cast<HANDLE>(
+  thread_ = reinterpret_cast<HANDLE>(
       _beginthreadex(NULL,
                      static_cast<unsigned>(stack_size_),
                      ThreadEntry,
                      this,
                      0,
-                     &data_->thread_id_));
+                     &thread_id_));
 }
 
 // Wait for thread to terminate.
 void Thread::Join() {
-  if (data_->thread_id_ != GetCurrentThreadId()) {
-    WaitForSingleObject(data_->thread_, INFINITE);
+  if (thread_id_ != GetCurrentThreadId()) {
+    WaitForSingleObject(thread_, INFINITE);
   }
 }
 
@@ -244,20 +263,25 @@ void OS::Sleep(int milliseconds) {
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  if (!aIsMainThread)
-    return false;
+  ThreadInfo* info = new ThreadInfo(aName, GetCurrentThreadId(),
+    aIsMainThread, aPseudoStack);
 
-  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
 
-  if (sActiveSampler) {
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
-                                       info->ThreadId(),
-                                       true));
+                                       GetCurrentThreadId(),
+                                       info->GetPlatformData(),
+                                       aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -266,5 +290,16 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  // We only have the main thread currently and that will never be unregistered
-}
\ No newline at end of file
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+
+  int id = GetCurrentThreadId();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
+}
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 27bbeb6df5b0..80a317365be2 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -28,9 +28,10 @@ mozilla::ThreadLocal<TableTicker *> tlsTicker;
 // it as the flag itself.
 bool stack_key_initialized;
 
-TimeStamp sLastTracerEvent; // is raced on
-int       sFrameNumber = 0;
-int       sLastFrameNumber = 0;
+TimeStamp   sLastTracerEvent; // is raced on
+int         sFrameNumber = 0;
+int         sLastFrameNumber = 0;
+static bool sIsProfiling = false; // is raced on
 
 /* used to keep track of the last event that we sampled during */
 unsigned int sLastSampledEventGeneration = 0;
@@ -44,16 +45,33 @@ unsigned int sCurrentEventGeneration = 0;
  * a problem if 2^32 events happen between samples that we need
  * to know are associated with different events */
 
-std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = new std::vector<ThreadInfo*>();
-mozilla::Mutex* Sampler::sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = nullptr;
+mozilla::Mutex* Sampler::sRegisteredThreadsMutex = nullptr;
 
-Sampler* Sampler::sActiveSampler;
+TableTicker* Sampler::sActiveSampler;
+
+void Sampler::Startup() {
+  sRegisteredThreads = new std::vector<ThreadInfo*>();
+  sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+}
+
+void Sampler::Shutdown() {
+  while (sRegisteredThreads->size() > 0) {
+    delete sRegisteredThreads->back();
+    sRegisteredThreads->pop_back();
+  }
+
+  delete sRegisteredThreadsMutex;
+  delete sRegisteredThreads;
+}
 
 ThreadInfo::~ThreadInfo() {
   free(mName);
 
   if (mProfile)
     delete mProfile;
+
+  Sampler::FreePlatformData(mPlatformData);
 }
 
 bool sps_version2()
@@ -235,9 +253,13 @@ void mozilla_sampler_init()
   }
   stack_key_initialized = true;
 
+  Sampler::Startup();
+
   PseudoStack *stack = new PseudoStack();
   tlsPseudoStack.set(stack);
 
+  Sampler::RegisterCurrentThread("Gecko", stack, true);
+
   if (sps_version2()) {
     // Read mode settings from MOZ_PROFILER_MODE and interval
     // settings from MOZ_PROFILER_INTERVAL and stack-scan threshhold
@@ -306,9 +328,10 @@ void mozilla_sampler_shutdown()
     uwt__deinit();
   }
 
-  Sampler::FreeRegisteredThreads();
-
   profiler_stop();
+
+  Sampler::Shutdown();
+
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
   // TODO Need to find a safe time to delete Stack
@@ -367,6 +390,7 @@ const char** mozilla_sampler_get_features()
 #endif
     "jank",
     "js",
+    "threads",
     NULL
   };
 
@@ -398,16 +422,29 @@ void mozilla_sampler_start(int aProfileEntries, int aInterval,
   if (sps_version2()) {
     t = new BreakpadSampler(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                            aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                           stack, aFeatures, aFeatureCount);
+                           aFeatures, aFeatureCount);
   } else {
     t = new TableTicker(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                         aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                        stack, aFeatures, aFeatureCount);
+                        aFeatures, aFeatureCount);
   }
   tlsTicker.set(t);
   t->Start();
-  if (t->ProfileJS())
-      stack->enableJSSampling();
+  if (t->ProfileJS()) {
+      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+      std::vector<ThreadInfo*> threads = t->GetRegisteredThreads();
+
+      for (uint32_t i = 0; i < threads.size(); i++) {
+        ThreadInfo* info = threads[i];
+        ThreadProfile* thread_profile = info->Profile();
+        if (!thread_profile) {
+          continue;
+        }
+        thread_profile->GetPseudoStack()->enableJSSampling();
+      }
+  }
+
+  sIsProfiling = true;
 
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
@@ -435,6 +472,8 @@ void mozilla_sampler_stop()
   if (disableJS)
     stack->disableJSSampling();
 
+  sIsProfiling = false;
+
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
     os->NotifyObservers(nullptr, "profiler-stopped", nullptr);
@@ -442,15 +481,7 @@ void mozilla_sampler_stop()
 
 bool mozilla_sampler_is_active()
 {
-  if (!stack_key_initialized)
-    profiler_init();
-
-  TableTicker *t = tlsTicker.get();
-  if (!t) {
-    return false;
-  }
-
-  return t->IsActive();
+  return sIsProfiling;
 }
 
 static double sResponsivenessTimes[100];
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index 8371927aa9d2..f78c6911f9d4 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -35,14 +35,23 @@
 #define __android_log_print(a, ...)
 #endif
 
+#ifdef XP_UNIX
+#include <pthread.h>
+#endif
+
 #include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 #include "mozilla/unused.h"
 #include "mozilla/TimeStamp.h"
+#include "mozilla/Mutex.h"
 #include "PlatformMacros.h"
 #include "v8-support.h"
 #include <vector>
 
+#ifdef XP_WIN
+#include <windows.h>
+#endif
+
 #define ASSERT(a) MOZ_ASSERT(a)
 
 #ifdef ANDROID
@@ -183,14 +192,17 @@ class Thread {
   // prctl().
   static const int kMaxThreadNameLength = 16;
 
-  class PlatformData;
-  PlatformData* data() { return data_; }
+#ifdef XP_WIN
+  HANDLE thread_;
+  unsigned thread_id_;
+#endif
+#if defined(XP_MACOSX)
+  pthread_t thread_;
+#endif
 
  private:
   void set_name(const char *name);
 
-  PlatformData* data_;
-
   char name_[kMaxThreadNameLength];
   int stack_size_;
 
@@ -264,34 +276,9 @@ class TickSample {
   mozilla::TimeStamp timestamp;
 };
 
-class ThreadInfo {
- public:
-  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
-    : mName(strdup(aName))
-    , mThreadId(aThreadId)
-    , mIsMainThread(aIsMainThread)
-    , mPseudoStack(aPseudoStack)
-    , mProfile(NULL) {}
-
-  virtual ~ThreadInfo();
-
-  const char* Name() const { return mName; }
-  int ThreadId() const { return mThreadId; }
-
-  bool IsMainThread() const { return mIsMainThread; }
-  PseudoStack* Stack() const { return mPseudoStack; }
-  
-  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
-  ThreadProfile* Profile() const { return mProfile; }
-
- private:
-  char* mName;
-  int mThreadId;
-  const bool mIsMainThread;
-  PseudoStack* mPseudoStack;
-  ThreadProfile* mProfile;
-};
-
+class ThreadInfo;
+class PlatformData;
+class TableTicker;
 class Sampler {
  public:
   // Initialize sampler.
@@ -300,9 +287,6 @@ class Sampler {
 
   int interval() const { return interval_; }
 
-  // Performs stack sampling.
-  virtual void SampleStack(TickSample* sample) = 0;
-
   // This method is called for each sampling period with the current
   // program counter.
   virtual void Tick(TickSample* sample) = 0;
@@ -326,11 +310,14 @@ class Sampler {
   bool IsPaused() const { return paused_; }
   void SetPaused(bool value) { NoBarrier_Store(&paused_, value); }
 
+  virtual bool ProfileThreads() const = 0;
+
   int EntrySize() { return entrySize_; }
 
-  class PlatformData;
-
-  PlatformData* platform_data() { return data_; }
+  // We can't new/delete the type safely without defining it
+  // (-Wdelete-incomplete). Use these Alloc/Free functions instead.
+  static PlatformData* AllocPlatformData(int aThreadId);
+  static void FreePlatformData(PlatformData*);
 
   // If we move the backtracing code into the platform files we won't
   // need to have these hacks
@@ -343,31 +330,23 @@ class Sampler {
 #endif
 
   static std::vector<ThreadInfo*> GetRegisteredThreads() {
-    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
     return *sRegisteredThreads;
   }
 
   static bool RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread);
   static void UnregisterCurrentThread();
 
+  static void Startup();
   // Should only be called on shutdown
-  static void FreeRegisteredThreads() {
-    while (sRegisteredThreads->size() > 0) {
-      sRegisteredThreads->pop_back();
-    }
+  static void Shutdown();
 
-    delete sRegisteredThreadsMutex;
-    delete sRegisteredThreads;
-  }
-
-  static Sampler* GetActiveSampler() { return sActiveSampler; }
-  static void SetActiveSampler(Sampler* sampler) { sActiveSampler = sampler; }
+  static TableTicker* GetActiveSampler() { return sActiveSampler; }
+  static void SetActiveSampler(TableTicker* sampler) { sActiveSampler = sampler; }
 
+  static mozilla::Mutex* sRegisteredThreadsMutex;
  protected:
   static std::vector<ThreadInfo*>* sRegisteredThreads;
-  static mozilla::Mutex* sRegisteredThreadsMutex;
-  static Sampler* sActiveSampler;
+  static TableTicker* sActiveSampler;
 
  private:
   void SetActive(bool value) { NoBarrier_Store(&active_, value); }
@@ -377,7 +356,46 @@ class Sampler {
   Atomic32 paused_;
   Atomic32 active_;
   const int entrySize_;
-  PlatformData* data_;  // Platform specific data.
+
+  // Refactor me!
+#if defined(SPS_OS_linux) || defined(SPS_OS_android)
+  bool signal_handler_installed_;
+  struct sigaction old_sigprof_signal_handler_;
+  struct sigaction old_sigsave_signal_handler_;
+  bool signal_sender_launched_;
+  pthread_t signal_sender_thread_;
+#endif
+};
+
+class ThreadInfo {
+ public:
+  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
+    : mName(strdup(aName))
+    , mThreadId(aThreadId)
+    , mIsMainThread(aIsMainThread)
+    , mPseudoStack(aPseudoStack)
+    , mPlatformData(Sampler::AllocPlatformData(aThreadId))
+    , mProfile(NULL) {}
+
+  virtual ~ThreadInfo();
+
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
+  bool IsMainThread() const { return mIsMainThread; }
+  PseudoStack* Stack() const { return mPseudoStack; }
+  
+  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
+  ThreadProfile* Profile() const { return mProfile; }
+
+  PlatformData* GetPlatformData() const { return mPlatformData; }
+ private:
+  char* mName;
+  int mThreadId;
+  const bool mIsMainThread;
+  PseudoStack* mPseudoStack;
+  PlatformData* mPlatformData;
+  ThreadProfile* mProfile;
 };
 
 #endif /* ndef TOOLS_PLATFORM_H_ */

From c01c3468e2e74c6e70b305e342a2d0a3300fa596 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Wed, 3 Apr 2013 18:59:17 -0400
Subject: [PATCH 298/438] Bug 734691 - Port multi-thread support to win/mac.
 r=snorp,smaug

--HG--
extra : rebase_source : ce0d9f94d2b4deb249e09198f9315f69ad6ee7d4
---
 dom/workers/RuntimeService.cpp     |  16 ++-
 tools/profiler/GeckoProfiler.h     |   4 +
 tools/profiler/GeckoProfilerImpl.h |  11 ++
 tools/profiler/Makefile.in         |   3 +
 tools/profiler/ProfileEntry.cpp    |   6 +-
 tools/profiler/ProfileEntry.h      |   7 +-
 tools/profiler/PseudoStack.h       |   4 +
 tools/profiler/TableTicker.cpp     |  15 +--
 tools/profiler/TableTicker.h       |  18 ++-
 tools/profiler/platform-linux.cc   | 203 +++++++++++++++--------------
 tools/profiler/platform-macos.cc   | 121 ++++++++++-------
 tools/profiler/platform-win32.cc   | 109 ++++++++++------
 tools/profiler/platform.cpp        |  73 ++++++++---
 tools/profiler/platform.h          | 124 ++++++++++--------
 14 files changed, 438 insertions(+), 276 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index c04abb273f98..a2729dbec352 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -266,6 +266,10 @@ JSBool
 OperationCallback(JSContext* aCx)
 {
   WorkerPrivate* worker = GetWorkerPrivateFromContext(aCx);
+
+  // Now is a good time to turn on profiling if it's pending.
+  profiler_js_operation_callback();
+
   return worker->OperationCallback(aCx);
 }
 
@@ -518,15 +522,19 @@ public:
       return NS_ERROR_FAILURE;
     }
 
+    JSRuntime* rt = JS_GetRuntime(cx);
+
     profiler_register_thread("WebWorker");
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    if (PseudoStack* stack = mozilla_get_pseudo_stack())
+      stack->sampleRuntime(rt);
+#endif
 
     {
       JSAutoRequest ar(cx);
       workerPrivate->DoRunLoop(cx);
     }
 
-    JSRuntime* rt = JS_GetRuntime(cx);
-
     // XXX Bug 666963 - CTypes can create another JSContext for use with
     // closures, and then it holds that context in a reserved slot on the CType
     // prototype object. We have to destroy that context before we can destroy
@@ -545,6 +553,10 @@ public:
       JS_DestroyContext(cx);
     }
 
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    if (PseudoStack* stack = mozilla_get_pseudo_stack())
+      stack->sampleRuntime(nullptr);
+#endif
     JS_DestroyRuntime(rt);
 
     workerPrivate->ScheduleDeletion(false);
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 9105f0470ecb..9c2507a71dad 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -138,6 +138,10 @@ static inline void profiler_unlock() {}
 static inline void profiler_register_thread(const char* name) {}
 static inline void profiler_unregister_thread() {}
 
+// Call by the JSRuntime's operation callback. This is used to enable
+// profiling on auxilerary threads.
+static inline void profiler_js_operation_callback() {}
+
 #else
 
 #include "GeckoProfilerImpl.h"
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index 65a60e2db615..b5c20626c610 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -152,6 +152,17 @@ void profiler_unregister_thread()
   mozilla_sampler_unregister_thread();
 }
 
+static inline
+void profiler_js_operation_callback()
+{
+  PseudoStack *stack = tlsPseudoStack.get();
+  if (!stack) {
+    return;
+  }
+
+  stack->jsOperationCallback();
+}
+
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index 64b394444d73..d7e1b9bfbe4a 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -34,6 +34,9 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
+# Uncomment for better debugging in opt builds
+#MOZ_OPTIMIZE_FLAGS += -O0 -g
+
 CPPSRCS		= \
   platform.cpp \
   nsProfilerFactory.cpp \
diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
index 4435ebf4e9a2..d3608cace5fc 100644
--- a/tools/profiler/ProfileEntry.cpp
+++ b/tools/profiler/ProfileEntry.cpp
@@ -134,7 +134,10 @@ std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
 
 #define DYNAMIC_MAX_STRING 512
 
-ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread)
+ThreadProfile::ThreadProfile(const char* aName, int aEntrySize,
+                             PseudoStack *aStack, int aThreadId,
+                             PlatformData* aPlatform,
+                             bool aIsMainThread)
   : mWritePos(0)
   , mLastFlushPos(0)
   , mReadPos(0)
@@ -144,6 +147,7 @@ ThreadProfile::ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aSt
   , mName(strdup(aName))
   , mThreadId(aThreadId)
   , mIsMainThread(aIsMainThread)
+  , mPlatformData(aPlatform)
 {
   mEntries = new ProfileEntry[mEntrySize];
 }
diff --git a/tools/profiler/ProfileEntry.h b/tools/profiler/ProfileEntry.h
index a5483b59f887..378dc42481c2 100644
--- a/tools/profiler/ProfileEntry.h
+++ b/tools/profiler/ProfileEntry.h
@@ -12,7 +12,6 @@
 #include "platform.h"
 #include "mozilla/Mutex.h"
 
-class ThreadProfile;
 class ThreadProfile;
 
 class ProfileEntry
@@ -57,7 +56,9 @@ typedef void (*IterateTagsCallback)(const ProfileEntry& entry, const char* tagSt
 class ThreadProfile
 {
 public:
-  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack, int aThreadId, bool aIsMainThread);
+  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack,
+                int aThreadId, PlatformData* aPlatformData,
+                bool aIsMainThread);
   ~ThreadProfile();
   void addTag(ProfileEntry aTag);
   void flush();
@@ -76,6 +77,7 @@ public:
   const char* Name() const { return mName; }
   int ThreadId() const { return mThreadId; }
 
+  PlatformData* GetPlatformData() { return mPlatformData; }
 private:
   // Circular buffer 'Keep One Slot Open' implementation
   // for simplicity
@@ -89,6 +91,7 @@ private:
   char*          mName;
   int            mThreadId;
   bool           mIsMainThread;
+  PlatformData*  mPlatformData;  // Platform specific data.
 };
 
 std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
diff --git a/tools/profiler/PseudoStack.h b/tools/profiler/PseudoStack.h
index 9079ffbfc3a8..b12bb226dae5 100644
--- a/tools/profiler/PseudoStack.h
+++ b/tools/profiler/PseudoStack.h
@@ -220,6 +220,10 @@ public:
       mStartJSSampling = true;
     }
   }
+  void jsOperationCallback() {
+    if (mStartJSSampling)
+      enableJSSampling();
+  }
   void disableJSSampling() {
     mStartJSSampling = false;
     if (mRuntime)
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index 14a3350b1318..349f7e794338 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -179,6 +179,10 @@ void TableTicker::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile)
     mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
 
     for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
+      // Thread not being profiled, skip it
+      if (!sRegisteredThreads->at(i)->Profile())
+        continue;
+
       MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
 
       JSCustomObject* threadSamples = b.CreateObject();
@@ -291,7 +295,7 @@ void StackWalkCallback(void* aPC, void* aSP, void* aClosure)
 void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample)
 {
 #ifndef XP_MACOSX
-  uintptr_t thread = GetThreadHandle(platform_data());
+  uintptr_t thread = GetThreadHandle(aSample->threadProfile->GetPlatformData());
   MOZ_ASSERT(thread);
 #endif
   void* pc_array[1000];
@@ -308,7 +312,7 @@ void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample
 
   uint32_t maxFrames = uint32_t(array.size - array.count);
 #ifdef XP_MACOSX
-  pthread_t pt = GetProfiledThread(platform_data());
+  pthread_t pt = GetProfiledThread(aSample->threadProfile->GetPlatformData());
   void *stackEnd = reinterpret_cast<void*>(-1);
   if (pt)
     stackEnd = static_cast<char*>(pthread_get_stackaddr_np(pt));
@@ -389,11 +393,6 @@ void doSampleStackTrace(PseudoStack *aStack, ThreadProfile &aProfile, TickSample
 
 void TableTicker::Tick(TickSample* sample)
 {
-  if (!sample->threadProfile) {
-    // Platform doesn't support multithread, so use the main thread profile we created
-    sample->threadProfile = GetPrimaryThreadProfile();
-  }
-
   ThreadProfile& currThreadProfile = *sample->threadProfile;
 
   // Marker(s) come before the sample
@@ -474,7 +473,7 @@ void mozilla_sampler_print_location1()
   }
 
   ThreadProfile threadProfile("Temp", PROFILE_DEFAULT_ENTRY, stack,
-                              0, false);
+                              0, Sampler::AllocPlatformData(0), false);
   doSampleStackTrace(stack, threadProfile, NULL);
 
   threadProfile.flush();
diff --git a/tools/profiler/TableTicker.h b/tools/profiler/TableTicker.h
index edb91195430d..274f1aac05c0 100644
--- a/tools/profiler/TableTicker.h
+++ b/tools/profiler/TableTicker.h
@@ -26,7 +26,7 @@ class BreakpadSampler;
 
 class TableTicker: public Sampler {
  public:
-  TableTicker(int aInterval, int aEntrySize, PseudoStack *aStack,
+  TableTicker(int aInterval, int aEntrySize,
               const char** aFeatures, uint32_t aFeatureCount)
     : Sampler(aInterval, true, aEntrySize)
     , mPrimaryThreadProfile(nullptr)
@@ -38,6 +38,7 @@ class TableTicker: public Sampler {
     //XXX: It's probably worth splitting the jank profiler out from the regular profiler at some point
     mJankOnly = hasFeature(aFeatures, aFeatureCount, "jank");
     mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
+    mProfileThreads = true || hasFeature(aFeatures, aFeatureCount, "threads");
     mAddLeafAddresses = hasFeature(aFeatures, aFeatureCount, "leaf");
 
     {
@@ -46,10 +47,15 @@ class TableTicker: public Sampler {
       // Create ThreadProfile for each registered thread
       for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
         ThreadInfo* info = sRegisteredThreads->at(i);
+
+        if (!info->IsMainThread() && !mProfileThreads)
+          continue;
+
         ThreadProfile* profile = new ThreadProfile(info->Name(),
                                                    aEntrySize,
                                                    info->Stack(),
                                                    info->ThreadId(),
+                                                   info->GetPlatformData(),
                                                    info->IsMainThread());
         profile->addTag(ProfileEntry('m', "Start"));
 
@@ -81,8 +87,6 @@ class TableTicker: public Sampler {
     }
   }
 
-  virtual void SampleStack(TickSample* sample) {}
-
   // Called within a signal. This function must be reentrant
   virtual void Tick(TickSample* sample);
 
@@ -115,7 +119,8 @@ class TableTicker: public Sampler {
   virtual JSObject *ToJSObject(JSContext *aCx);
   JSCustomObject *GetMetaJSCustomObject(JSAObjectBuilder& b);
 
-  const bool ProfileJS() { return mProfileJS; }
+  bool ProfileJS() const { return mProfileJS; }
+  bool ProfileThreads() const { return mProfileThreads; }
 
   virtual BreakpadSampler* AsBreakpadSampler() { return nullptr; }
 
@@ -133,13 +138,14 @@ protected:
   bool mUseStackWalk;
   bool mJankOnly;
   bool mProfileJS;
+  bool mProfileThreads;
 };
 
 class BreakpadSampler: public TableTicker {
  public:
-  BreakpadSampler(int aInterval, int aEntrySize, PseudoStack *aStack,
+  BreakpadSampler(int aInterval, int aEntrySize,
               const char** aFeatures, uint32_t aFeatureCount)
-    : TableTicker(aInterval, aEntrySize, aStack, aFeatures, aFeatureCount)
+    : TableTicker(aInterval, aEntrySize, aFeatures, aFeatureCount)
   {}
 
   // Called within a signal. This function must be reentrant
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index ed1c52d40a9c..8570e1e60158 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -64,6 +64,7 @@
 #include "mozilla/Mutex.h"
 #include "ProfileEntry.h"
 #include "nsThreadUtils.h"
+#include "TableTicker.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -125,6 +126,19 @@ static void* setup_atfork() {
 #include "android-signal-defs.h"
 #endif
 
+struct SamplerRegistry {
+  static void AddActiveSampler(Sampler *sampler) {
+    ASSERT(!SamplerRegistry::sampler);
+    SamplerRegistry::sampler = sampler;
+  }
+  static void RemoveActiveSampler(Sampler *sampler) {
+    SamplerRegistry::sampler = NULL;
+  }
+  static Sampler *sampler;
+};
+
+Sampler *SamplerRegistry::sampler = NULL;
+
 static ThreadProfile* sCurrentThreadProfile = NULL;
 
 static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context) {
@@ -191,90 +205,29 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
   sCurrentThreadProfile = NULL;
 }
 
-#ifndef XP_MACOSX
 int tgkill(pid_t tgid, pid_t tid, int signalno) {
   return syscall(SYS_tgkill, tgid, tid, signalno);
 }
-#endif
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
-  explicit PlatformData(Sampler* sampler)
-      : sampler_(sampler),
-        signal_handler_installed_(false),
-        vm_tgid_(getpid()),
-#ifndef XP_MACOSX
-        vm_tid_(gettid()),
-#endif
-        signal_sender_launched_(false)
-#ifdef XP_MACOSX
-        , signal_receiver_(pthread_self())
-#endif
-  {
-  }
-
-  void SignalSender() {
-    while (sampler_->IsActive()) {
-      sampler_->HandleSaveRequest();
-
-      if (!sampler_->IsPaused()) {
-#ifdef XP_MACOSX
-        pthread_kill(signal_receiver_, SIGPROF);
-#else
-
-        std::vector<ThreadInfo*> threads = GetRegisteredThreads();
-
-        for (uint32_t i = 0; i < threads.size(); i++) {
-          ThreadInfo* info = threads[i];
-
-          // We use sCurrentThreadProfile the ThreadProfile for the
-          // thread we're profiling to the signal handler
-          sCurrentThreadProfile = info->Profile();
-
-          int threadId = info->ThreadId();
-          if (threadId == 0) {
-            threadId = vm_tid_;
-          }
-
-          if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
-            printf_stderr("profiler failed to signal tid=%d\n", threadId);
-#ifdef DEBUG
-            abort();
-#endif
-            continue;
-          }
-
-          // Wait for the signal handler to run before moving on to the next one
-          while (sCurrentThreadProfile)
-            sched_yield();
-        }
-#endif
-      }
-
-      // Convert ms to us and subtract 100 us to compensate delays
-      // occuring during signal delivery.
-      // TODO measure and confirm this.
-      const useconds_t interval = sampler_->interval_ * 1000 - 100;
-      //int result = usleep(interval);
-      usleep(interval);
-    }
-  }
-
-  Sampler* sampler_;
-  bool signal_handler_installed_;
-  struct sigaction old_sigprof_signal_handler_;
-  struct sigaction old_sigsave_signal_handler_;
-  pid_t vm_tgid_;
-  pid_t vm_tid_;
-  bool signal_sender_launched_;
-  pthread_t signal_sender_thread_;
-#ifdef XP_MACOSX
-  pthread_t signal_receiver_;
-#endif
+  PlatformData()
+  {}
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData;
+}
 
-static void* SenderEntry(void* arg) {
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
+
+static void* SignalSender(void* arg) {
 # if defined(ANDROID)
   // pthread_atfork isn't available on Android.
   void* initialize_atfork = NULL;
@@ -283,38 +236,80 @@ static void* SenderEntry(void* arg) {
   // It returns NULL.
   static void* initialize_atfork = setup_atfork();
 # endif
-  Sampler::PlatformData* data =
-      reinterpret_cast<Sampler::PlatformData*>(arg);
-  data->SignalSender();
+
+  int vm_tgid_ = getpid();
+
+  while (SamplerRegistry::sampler->IsActive()) {
+    SamplerRegistry::sampler->HandleSaveRequest();
+
+    if (!SamplerRegistry::sampler->IsPaused()) {
+      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+      std::vector<ThreadInfo*> threads =
+        SamplerRegistry::sampler->GetRegisteredThreads();
+
+      for (uint32_t i = 0; i < threads.size(); i++) {
+        ThreadInfo* info = threads[i];
+
+        // This will be null if we're not interested in profiling this thread.
+        if (!info->Profile())
+          continue;
+
+        // We use sCurrentThreadProfile the ThreadProfile for the
+        // thread we're profiling to the signal handler
+        sCurrentThreadProfile = info->Profile();
+
+        int threadId = info->ThreadId();
+
+        if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
+          printf_stderr("profiler failed to signal tid=%d\n", threadId);
+#ifdef DEBUG
+          abort();
+#endif
+          continue;
+        }
+
+        // Wait for the signal handler to run before moving on to the next one
+        while (sCurrentThreadProfile)
+          sched_yield();
+      }
+    }
+
+    // Convert ms to us and subtract 100 us to compensate delays
+    // occuring during signal delivery.
+    // TODO measure and confirm this.
+    const useconds_t interval =
+      SamplerRegistry::sampler->interval() * 1000 - 100;
+    //int result = usleep(interval);
+    usleep(interval);
+  }
   return initialize_atfork; // which is guaranteed to be NULL
 }
 
-
 Sampler::Sampler(int interval, bool profiling, int entrySize)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
       active_(false),
       entrySize_(entrySize) {
-  data_ = new PlatformData(this);
 }
 
 Sampler::~Sampler() {
-  ASSERT(!data_->signal_sender_launched_);
-  delete data_;
+  ASSERT(!signal_sender_launched_);
 }
 
 
 void Sampler::Start() {
   LOG("Sampler started");
 
+  SamplerRegistry::AddActiveSampler(this);
+
   // Request profiling signals.
   LOG("Request signal");
   struct sigaction sa;
   sa.sa_sigaction = ProfilerSignalHandler;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGPROF, &sa, &data_->old_sigprof_signal_handler_) != 0) {
+  if (sigaction(SIGPROF, &sa, &old_sigprof_signal_handler_) != 0) {
     LOG("Error installing signal");
     return;
   }
@@ -324,20 +319,20 @@ void Sampler::Start() {
   sa2.sa_sigaction = ProfilerSaveSignalHandler;
   sigemptyset(&sa2.sa_mask);
   sa2.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &data_->old_sigsave_signal_handler_) != 0) {
+  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &old_sigsave_signal_handler_) != 0) {
     LOG("Error installing start signal");
     return;
   }
   LOG("Signal installed");
-  data_->signal_handler_installed_ = true;
+  signal_handler_installed_ = true;
 
   // Start a thread that sends SIGPROF signal to VM thread.
   // Sending the signal ourselves instead of relying on itimer provides
   // much better accuracy.
   SetActive(true);
   if (pthread_create(
-          &data_->signal_sender_thread_, NULL, SenderEntry, data_) == 0) {
-    data_->signal_sender_launched_ = true;
+        &signal_sender_thread_, NULL, SignalSender, NULL) == 0) {
+    signal_sender_launched_ = true;
   }
   LOG("Profiler thread started");
 }
@@ -348,32 +343,42 @@ void Sampler::Stop() {
 
   // Wait for signal sender termination (it will exit after setting
   // active_ to false).
-  if (data_->signal_sender_launched_) {
-    pthread_join(data_->signal_sender_thread_, NULL);
-    data_->signal_sender_launched_ = false;
+  if (signal_sender_launched_) {
+    pthread_join(signal_sender_thread_, NULL);
+    signal_sender_launched_ = false;
   }
 
+  SamplerRegistry::RemoveActiveSampler(this);
+
   // Restore old signal handler
-  if (data_->signal_handler_installed_) {
-    sigaction(SIGNAL_SAVE_PROFILE, &data_->old_sigsave_signal_handler_, 0);
-    sigaction(SIGPROF, &data_->old_sigprof_signal_handler_, 0);
-    data_->signal_handler_installed_ = false;
+  if (signal_handler_installed_) {
+    sigaction(SIGNAL_SAVE_PROFILE, &old_sigsave_signal_handler_, 0);
+    sigaction(SIGPROF, &old_sigprof_signal_handler_, 0);
+    signal_handler_installed_ = false;
   }
 }
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  ThreadInfo* info = new ThreadInfo(aName, gettid(), aIsMainThread, aPseudoStack);
+  ThreadInfo* info = new ThreadInfo(aName, gettid(),
+    aIsMainThread, aPseudoStack);
 
-  if (sActiveSampler) {
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
+
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
                                        info->ThreadId(),
+                                       info->GetPlatformData(),
                                        aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -382,7 +387,7 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = gettid();
 
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index 50945dc34fcd..ac338808da1a 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -31,6 +31,7 @@
 #include "nsThreadUtils.h"
 
 #include "platform.h"
+#include "TableTicker.h"
 #include "UnwinderThread2.h"  /* uwt__register_thread_for_profiling */
 
 // this port is based off of v8 svn revision 9837
@@ -91,21 +92,13 @@ void OS::Sleep(int milliseconds) {
   usleep(1000 * milliseconds);
 }
 
-class Thread::PlatformData : public Malloced {
- public:
-  PlatformData() : thread_(kNoThread) {}
-  pthread_t thread_;  // Thread handle for pthread.
-};
-
 Thread::Thread(const char* name)
-    : data_(new PlatformData),
-      stack_size_(0) {
+    : stack_size_(0) {
   set_name(name);
 }
 
 
 Thread::~Thread() {
-  delete data_;
 }
 
 
@@ -141,9 +134,9 @@ static void* ThreadEntry(void* arg) {
   }
   // END temp hack for SPS v1-vs-v2
 
-  thread->data()->thread_ = pthread_self();
+  thread->thread_ = pthread_self();
   SetThreadName(thread->name());
-  ASSERT(thread->data()->thread_ != kNoThread);
+  ASSERT(thread->thread_ != kNoThread);
   thread->Run();
   return NULL;
 }
@@ -163,15 +156,15 @@ void Thread::Start() {
     pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_));
     attr_ptr = &attr;
   }
-  pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this);
-  ASSERT(data_->thread_ != kNoThread);
+  pthread_create(&thread_, attr_ptr, ThreadEntry, this);
+  ASSERT(thread_ != kNoThread);
 }
 
 void Thread::Join() {
-  pthread_join(data_->thread_, NULL);
+  pthread_join(thread_, NULL);
 }
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
   PlatformData() : profiled_thread_(mach_thread_self())
   {
@@ -197,6 +190,17 @@ class Sampler::PlatformData : public Malloced {
   pthread_t profiled_pthread_;
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData;
+}
+
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
 
 class SamplerThread : public Thread {
  public:
@@ -205,7 +209,7 @@ class SamplerThread : public Thread {
       , interval_(interval) {}
 
   static void AddActiveSampler(Sampler* sampler) {
-    ScopedLock lock(mutex_);
+    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
     SamplerRegistry::AddActiveSampler(sampler);
     if (instance_ == NULL) {
       instance_ = new SamplerThread(sampler->interval());
@@ -216,37 +220,45 @@ class SamplerThread : public Thread {
   }
 
   static void RemoveActiveSampler(Sampler* sampler) {
-    ScopedLock lock(mutex_);
+    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
     instance_->Join();
     //XXX: unlike v8 we need to remove the active sampler after doing the Join
     // because we drop the sampler immediately
     SamplerRegistry::RemoveActiveSampler(sampler);
     delete instance_;
     instance_ = NULL;
-    /*
-    if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) {
-      RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_);
-      delete instance_;
-      instance_ = NULL;
-    }
-    */
   }
 
   // Implement Thread::Run().
   virtual void Run() {
     while (SamplerRegistry::sampler->IsActive()) {
-      if (!SamplerRegistry::sampler->IsPaused())
-        SampleContext(SamplerRegistry::sampler);
+      {
+        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+        std::vector<ThreadInfo*> threads =
+          SamplerRegistry::sampler->GetRegisteredThreads();
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // This will be null if we're not interested in profiling this thread.
+          if (!info->Profile())
+            continue;
+
+          ThreadProfile* thread_profile = info->Profile();
+
+          if (!SamplerRegistry::sampler->IsPaused())
+            SampleContext(SamplerRegistry::sampler, thread_profile);
+        }
+      }
       OS::Sleep(interval_);
     }
   }
 
-  void SampleContext(Sampler* sampler) {
-    thread_act_t profiled_thread = sampler->platform_data()->profiled_thread();
+  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
+    thread_act_t profiled_thread =
+      thread_profile->GetPlatformData()->profiled_thread();
+
     TickSample sample_obj;
     TickSample* sample = &sample_obj;
-    //TickSample* sample = CpuProfiler::TickSampleEvent(sampler->isolate());
-    //if (sample == NULL) sample = &sample_obj;
 
     if (KERN_SUCCESS != thread_suspend(profiled_thread)) return;
 
@@ -276,13 +288,11 @@ class SamplerThread : public Thread {
                          flavor,
                          reinterpret_cast<natural_t*>(&state),
                          &count) == KERN_SUCCESS) {
-      //sample->state = sampler->isolate()->current_vm_state();
       sample->pc = reinterpret_cast<Address>(state.REGISTER_FIELD(ip));
       sample->sp = reinterpret_cast<Address>(state.REGISTER_FIELD(sp));
       sample->fp = reinterpret_cast<Address>(state.REGISTER_FIELD(bp));
       sample->timestamp = mozilla::TimeStamp::Now();
-      sample->threadProfile = NULL;
-      sampler->SampleStack(sample);
+      sample->threadProfile = thread_profile;
       sampler->Tick(sample);
     }
     thread_resume(profiled_thread);
@@ -300,11 +310,8 @@ class SamplerThread : public Thread {
 
 #undef REGISTER_FIELD
 
-
-Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
-
 Sampler::Sampler(int interval, bool profiling, int entrySize)
     : // isolate_(isolate),
       interval_(interval),
@@ -313,13 +320,11 @@ Sampler::Sampler(int interval, bool profiling, int entrySize)
       active_(false),
       entrySize_(entrySize) /*,
       samples_taken_(0)*/ {
-  data_ = new PlatformData;
 }
 
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
-  delete data_;
 }
 
 
@@ -337,27 +342,38 @@ void Sampler::Stop() {
 }
 
 pthread_t
-Sampler::GetProfiledThread(Sampler::PlatformData* aData)
+Sampler::GetProfiledThread(PlatformData* aData)
 {
   return aData->profiled_pthread();
 }
 
+#include <sys/syscall.h>
+pid_t gettid()
+{
+  return (pid_t) syscall(SYS_thread_selfid);
+}
+
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  if (!aIsMainThread)
-    return false;
+  ThreadInfo* info = new ThreadInfo(aName, gettid(),
+    aIsMainThread, aPseudoStack);
 
-  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
 
-  if (sActiveSampler) {
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
                                        info->ThreadId(),
-                                       true));
+                                       info->GetPlatformData(),
+                                       aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -366,5 +382,16 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  // We only have the main thread currently and that will never be unregistered
-}
\ No newline at end of file
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+
+  int id = gettid();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
+}
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index 818b536b68f3..c63fc32cccba 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -30,21 +30,21 @@
 #include <mmsystem.h>
 #include <process.h>
 #include "platform.h"
-
+#include "TableTicker.h"
 #include "ProfileEntry.h"
 
-class Sampler::PlatformData : public Malloced {
+class PlatformData : public Malloced {
  public:
   // Get a handle to the calling thread. This is the thread that we are
   // going to profile. We need to make a copy of the handle because we are
   // going to use it in the sampler thread. Using GetThreadHandle() will
   // not work in this case. We're using OpenThread because DuplicateHandle
   // for some reason doesn't work in Chrome's sandbox.
-  PlatformData() : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
+  PlatformData(int aThreadId) : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
                                                THREAD_SUSPEND_RESUME |
                                                THREAD_QUERY_INFORMATION,
                                                false,
-                                               GetCurrentThreadId())) {}
+                                               aThreadId)) {}
 
   ~PlatformData() {
     if (profiled_thread_ != NULL) {
@@ -59,8 +59,20 @@ class Sampler::PlatformData : public Malloced {
   HANDLE profiled_thread_;
 };
 
+/* static */ PlatformData*
+Sampler::AllocPlatformData(int aThreadId)
+{
+  return new PlatformData(aThreadId);
+}
+
+/* static */ void
+Sampler::FreePlatformData(PlatformData* aData)
+{
+  delete aData;
+}
+
 uintptr_t
-Sampler::GetThreadHandle(Sampler::PlatformData* aData)
+Sampler::GetThreadHandle(PlatformData* aData)
 {
   return (uintptr_t) aData->profiled_thread();
 }
@@ -97,8 +109,24 @@ class SamplerThread : public Thread {
         ::timeBeginPeriod(interval_);
 
     while (sampler_->IsActive()) {
-      if (!sampler_->IsPaused())
-        SampleContext(sampler_);
+      {
+        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+        std::vector<ThreadInfo*> threads =
+          sampler_->GetRegisteredThreads();
+        for (uint32_t i = 0; i < threads.size(); i++) {
+          ThreadInfo* info = threads[i];
+
+          // This will be null if we're not interested in profiling this thread.
+          if (!info->Profile())
+            continue;
+
+          ThreadProfile* thread_profile = info->Profile();
+
+          if (!sampler_->IsPaused()) {
+            SampleContext(sampler_, thread_profile);
+          }
+        }
+      }
       OS::Sleep(interval_);
     }
 
@@ -107,8 +135,10 @@ class SamplerThread : public Thread {
         ::timeEndPeriod(interval_);
   }
 
-  void SampleContext(Sampler* sampler) {
-    HANDLE profiled_thread = sampler->platform_data()->profiled_thread();
+  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
+    uintptr_t thread = Sampler::GetThreadHandle(
+                               thread_profile->GetPlatformData());
+    HANDLE profiled_thread = reinterpret_cast<HANDLE>(thread);
     if (profiled_thread == NULL)
       return;
 
@@ -121,7 +151,7 @@ class SamplerThread : public Thread {
 
     // Grab the timestamp before pausing the thread, to avoid deadlocks.
     sample->timestamp = mozilla::TimeStamp::Now();
-    sample->threadProfile = NULL;
+    sample->threadProfile = thread_profile;
 
     static const DWORD kSuspendFailed = static_cast<DWORD>(-1);
     if (SuspendThread(profiled_thread) == kSuspendFailed)
@@ -139,7 +169,6 @@ class SamplerThread : public Thread {
       sample->fp = reinterpret_cast<Address>(context.Ebp);
 #endif
       sample->context = &context;
-      sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
     ResumeThread(profiled_thread);
@@ -162,13 +191,11 @@ Sampler::Sampler(int interval, bool profiling, int entrySize)
       profiling_(profiling),
       paused_(false),
       active_(false),
-      entrySize_(entrySize),
-      data_(new PlatformData) {
+      entrySize_(entrySize) {
 }
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
-  delete data_;
 }
 
 void Sampler::Start() {
@@ -192,18 +219,11 @@ static unsigned int __stdcall ThreadEntry(void* arg) {
   return 0;
 }
 
-class Thread::PlatformData : public Malloced {
- public:
-  explicit PlatformData(HANDLE thread) : thread_(thread) {}
-  HANDLE thread_;
-  unsigned thread_id_;
-};
-
 // Initialize a Win32 thread object. The thread has an invalid thread
 // handle until it is started.
 Thread::Thread(const char* name)
     : stack_size_(0) {
-  data_ = new PlatformData(kNoThread);
+  thread_ = kNoThread;
   set_name(name);
 }
 
@@ -214,27 +234,26 @@ void Thread::set_name(const char* name) {
 
 // Close our own handle for the thread.
 Thread::~Thread() {
-  if (data_->thread_ != kNoThread) CloseHandle(data_->thread_);
-  delete data_;
+  if (thread_ != kNoThread) CloseHandle(thread_);
 }
 
 // Create a new thread. It is important to use _beginthreadex() instead of
 // the Win32 function CreateThread(), because the CreateThread() does not
 // initialize thread specific structures in the C runtime library.
 void Thread::Start() {
-  data_->thread_ = reinterpret_cast<HANDLE>(
+  thread_ = reinterpret_cast<HANDLE>(
       _beginthreadex(NULL,
                      static_cast<unsigned>(stack_size_),
                      ThreadEntry,
                      this,
                      0,
-                     &data_->thread_id_));
+                     &thread_id_));
 }
 
 // Wait for thread to terminate.
 void Thread::Join() {
-  if (data_->thread_id_ != GetCurrentThreadId()) {
-    WaitForSingleObject(data_->thread_, INFINITE);
+  if (thread_id_ != GetCurrentThreadId()) {
+    WaitForSingleObject(thread_, INFINITE);
   }
 }
 
@@ -244,20 +263,25 @@ void OS::Sleep(int milliseconds) {
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
-  mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
-  if (!aIsMainThread)
-    return false;
+  ThreadInfo* info = new ThreadInfo(aName, GetCurrentThreadId(),
+    aIsMainThread, aPseudoStack);
 
-  ThreadInfo* info = new ThreadInfo(aName, 0, true, aPseudoStack);
+  bool profileThread = sActiveSampler &&
+    (aIsMainThread || sActiveSampler->ProfileThreads());
 
-  if (sActiveSampler) {
+  if (profileThread) {
     // We need to create the ThreadProfile now
     info->SetProfile(new ThreadProfile(info->Name(),
                                        sActiveSampler->EntrySize(),
                                        info->Stack(),
-                                       info->ThreadId(),
-                                       true));
+                                       GetCurrentThreadId(),
+                                       info->GetPlatformData(),
+                                       aIsMainThread));
+    if (sActiveSampler->ProfileJS()) {
+      info->Profile()->GetPseudoStack()->enableJSSampling();
+    }
   }
 
   sRegisteredThreads->push_back(info);
@@ -266,5 +290,16 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
-  // We only have the main thread currently and that will never be unregistered
-}
\ No newline at end of file
+  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+
+  int id = GetCurrentThreadId();
+
+  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
+    ThreadInfo* info = sRegisteredThreads->at(i);
+    if (info->ThreadId() == id) {
+      delete info;
+      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
+      break;
+    }
+  }
+}
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 27bbeb6df5b0..80a317365be2 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -28,9 +28,10 @@ mozilla::ThreadLocal<TableTicker *> tlsTicker;
 // it as the flag itself.
 bool stack_key_initialized;
 
-TimeStamp sLastTracerEvent; // is raced on
-int       sFrameNumber = 0;
-int       sLastFrameNumber = 0;
+TimeStamp   sLastTracerEvent; // is raced on
+int         sFrameNumber = 0;
+int         sLastFrameNumber = 0;
+static bool sIsProfiling = false; // is raced on
 
 /* used to keep track of the last event that we sampled during */
 unsigned int sLastSampledEventGeneration = 0;
@@ -44,16 +45,33 @@ unsigned int sCurrentEventGeneration = 0;
  * a problem if 2^32 events happen between samples that we need
  * to know are associated with different events */
 
-std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = new std::vector<ThreadInfo*>();
-mozilla::Mutex* Sampler::sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = nullptr;
+mozilla::Mutex* Sampler::sRegisteredThreadsMutex = nullptr;
 
-Sampler* Sampler::sActiveSampler;
+TableTicker* Sampler::sActiveSampler;
+
+void Sampler::Startup() {
+  sRegisteredThreads = new std::vector<ThreadInfo*>();
+  sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
+}
+
+void Sampler::Shutdown() {
+  while (sRegisteredThreads->size() > 0) {
+    delete sRegisteredThreads->back();
+    sRegisteredThreads->pop_back();
+  }
+
+  delete sRegisteredThreadsMutex;
+  delete sRegisteredThreads;
+}
 
 ThreadInfo::~ThreadInfo() {
   free(mName);
 
   if (mProfile)
     delete mProfile;
+
+  Sampler::FreePlatformData(mPlatformData);
 }
 
 bool sps_version2()
@@ -235,9 +253,13 @@ void mozilla_sampler_init()
   }
   stack_key_initialized = true;
 
+  Sampler::Startup();
+
   PseudoStack *stack = new PseudoStack();
   tlsPseudoStack.set(stack);
 
+  Sampler::RegisterCurrentThread("Gecko", stack, true);
+
   if (sps_version2()) {
     // Read mode settings from MOZ_PROFILER_MODE and interval
     // settings from MOZ_PROFILER_INTERVAL and stack-scan threshhold
@@ -306,9 +328,10 @@ void mozilla_sampler_shutdown()
     uwt__deinit();
   }
 
-  Sampler::FreeRegisteredThreads();
-
   profiler_stop();
+
+  Sampler::Shutdown();
+
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
   // TODO Need to find a safe time to delete Stack
@@ -367,6 +390,7 @@ const char** mozilla_sampler_get_features()
 #endif
     "jank",
     "js",
+    "threads",
     NULL
   };
 
@@ -398,16 +422,29 @@ void mozilla_sampler_start(int aProfileEntries, int aInterval,
   if (sps_version2()) {
     t = new BreakpadSampler(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                            aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                           stack, aFeatures, aFeatureCount);
+                           aFeatures, aFeatureCount);
   } else {
     t = new TableTicker(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                         aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                        stack, aFeatures, aFeatureCount);
+                        aFeatures, aFeatureCount);
   }
   tlsTicker.set(t);
   t->Start();
-  if (t->ProfileJS())
-      stack->enableJSSampling();
+  if (t->ProfileJS()) {
+      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+      std::vector<ThreadInfo*> threads = t->GetRegisteredThreads();
+
+      for (uint32_t i = 0; i < threads.size(); i++) {
+        ThreadInfo* info = threads[i];
+        ThreadProfile* thread_profile = info->Profile();
+        if (!thread_profile) {
+          continue;
+        }
+        thread_profile->GetPseudoStack()->enableJSSampling();
+      }
+  }
+
+  sIsProfiling = true;
 
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
@@ -435,6 +472,8 @@ void mozilla_sampler_stop()
   if (disableJS)
     stack->disableJSSampling();
 
+  sIsProfiling = false;
+
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
     os->NotifyObservers(nullptr, "profiler-stopped", nullptr);
@@ -442,15 +481,7 @@ void mozilla_sampler_stop()
 
 bool mozilla_sampler_is_active()
 {
-  if (!stack_key_initialized)
-    profiler_init();
-
-  TableTicker *t = tlsTicker.get();
-  if (!t) {
-    return false;
-  }
-
-  return t->IsActive();
+  return sIsProfiling;
 }
 
 static double sResponsivenessTimes[100];
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index 8371927aa9d2..f78c6911f9d4 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -35,14 +35,23 @@
 #define __android_log_print(a, ...)
 #endif
 
+#ifdef XP_UNIX
+#include <pthread.h>
+#endif
+
 #include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 #include "mozilla/unused.h"
 #include "mozilla/TimeStamp.h"
+#include "mozilla/Mutex.h"
 #include "PlatformMacros.h"
 #include "v8-support.h"
 #include <vector>
 
+#ifdef XP_WIN
+#include <windows.h>
+#endif
+
 #define ASSERT(a) MOZ_ASSERT(a)
 
 #ifdef ANDROID
@@ -183,14 +192,17 @@ class Thread {
   // prctl().
   static const int kMaxThreadNameLength = 16;
 
-  class PlatformData;
-  PlatformData* data() { return data_; }
+#ifdef XP_WIN
+  HANDLE thread_;
+  unsigned thread_id_;
+#endif
+#if defined(XP_MACOSX)
+  pthread_t thread_;
+#endif
 
  private:
   void set_name(const char *name);
 
-  PlatformData* data_;
-
   char name_[kMaxThreadNameLength];
   int stack_size_;
 
@@ -264,34 +276,9 @@ class TickSample {
   mozilla::TimeStamp timestamp;
 };
 
-class ThreadInfo {
- public:
-  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
-    : mName(strdup(aName))
-    , mThreadId(aThreadId)
-    , mIsMainThread(aIsMainThread)
-    , mPseudoStack(aPseudoStack)
-    , mProfile(NULL) {}
-
-  virtual ~ThreadInfo();
-
-  const char* Name() const { return mName; }
-  int ThreadId() const { return mThreadId; }
-
-  bool IsMainThread() const { return mIsMainThread; }
-  PseudoStack* Stack() const { return mPseudoStack; }
-  
-  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
-  ThreadProfile* Profile() const { return mProfile; }
-
- private:
-  char* mName;
-  int mThreadId;
-  const bool mIsMainThread;
-  PseudoStack* mPseudoStack;
-  ThreadProfile* mProfile;
-};
-
+class ThreadInfo;
+class PlatformData;
+class TableTicker;
 class Sampler {
  public:
   // Initialize sampler.
@@ -300,9 +287,6 @@ class Sampler {
 
   int interval() const { return interval_; }
 
-  // Performs stack sampling.
-  virtual void SampleStack(TickSample* sample) = 0;
-
   // This method is called for each sampling period with the current
   // program counter.
   virtual void Tick(TickSample* sample) = 0;
@@ -326,11 +310,14 @@ class Sampler {
   bool IsPaused() const { return paused_; }
   void SetPaused(bool value) { NoBarrier_Store(&paused_, value); }
 
+  virtual bool ProfileThreads() const = 0;
+
   int EntrySize() { return entrySize_; }
 
-  class PlatformData;
-
-  PlatformData* platform_data() { return data_; }
+  // We can't new/delete the type safely without defining it
+  // (-Wdelete-incomplete). Use these Alloc/Free functions instead.
+  static PlatformData* AllocPlatformData(int aThreadId);
+  static void FreePlatformData(PlatformData*);
 
   // If we move the backtracing code into the platform files we won't
   // need to have these hacks
@@ -343,31 +330,23 @@ class Sampler {
 #endif
 
   static std::vector<ThreadInfo*> GetRegisteredThreads() {
-    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
     return *sRegisteredThreads;
   }
 
   static bool RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread);
   static void UnregisterCurrentThread();
 
+  static void Startup();
   // Should only be called on shutdown
-  static void FreeRegisteredThreads() {
-    while (sRegisteredThreads->size() > 0) {
-      sRegisteredThreads->pop_back();
-    }
+  static void Shutdown();
 
-    delete sRegisteredThreadsMutex;
-    delete sRegisteredThreads;
-  }
-
-  static Sampler* GetActiveSampler() { return sActiveSampler; }
-  static void SetActiveSampler(Sampler* sampler) { sActiveSampler = sampler; }
+  static TableTicker* GetActiveSampler() { return sActiveSampler; }
+  static void SetActiveSampler(TableTicker* sampler) { sActiveSampler = sampler; }
 
+  static mozilla::Mutex* sRegisteredThreadsMutex;
  protected:
   static std::vector<ThreadInfo*>* sRegisteredThreads;
-  static mozilla::Mutex* sRegisteredThreadsMutex;
-  static Sampler* sActiveSampler;
+  static TableTicker* sActiveSampler;
 
  private:
   void SetActive(bool value) { NoBarrier_Store(&active_, value); }
@@ -377,7 +356,46 @@ class Sampler {
   Atomic32 paused_;
   Atomic32 active_;
   const int entrySize_;
-  PlatformData* data_;  // Platform specific data.
+
+  // Refactor me!
+#if defined(SPS_OS_linux) || defined(SPS_OS_android)
+  bool signal_handler_installed_;
+  struct sigaction old_sigprof_signal_handler_;
+  struct sigaction old_sigsave_signal_handler_;
+  bool signal_sender_launched_;
+  pthread_t signal_sender_thread_;
+#endif
+};
+
+class ThreadInfo {
+ public:
+  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
+    : mName(strdup(aName))
+    , mThreadId(aThreadId)
+    , mIsMainThread(aIsMainThread)
+    , mPseudoStack(aPseudoStack)
+    , mPlatformData(Sampler::AllocPlatformData(aThreadId))
+    , mProfile(NULL) {}
+
+  virtual ~ThreadInfo();
+
+  const char* Name() const { return mName; }
+  int ThreadId() const { return mThreadId; }
+
+  bool IsMainThread() const { return mIsMainThread; }
+  PseudoStack* Stack() const { return mPseudoStack; }
+  
+  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
+  ThreadProfile* Profile() const { return mProfile; }
+
+  PlatformData* GetPlatformData() const { return mPlatformData; }
+ private:
+  char* mName;
+  int mThreadId;
+  const bool mIsMainThread;
+  PseudoStack* mPseudoStack;
+  PlatformData* mPlatformData;
+  ThreadProfile* mProfile;
 };
 
 #endif /* ndef TOOLS_PLATFORM_H_ */

From d07efded203757af4d13de22584c7a077f61ed22 Mon Sep 17 00:00:00 2001
From: Sachin Hosmani <sachinhosmani2@gmail.com>
Date: Mon, 15 Apr 2013 10:11:24 +1200
Subject: [PATCH 299/438] Bug 628785 - Firefox should define a value for
 extensions.getAddons.recommended.url so
 AddonRepoistory.retrieveRecommendedAddons() works. r=Unfocused

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

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index ae2642280ce0..3dc3ef227516 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -42,6 +42,7 @@ pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.moz
 pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
 pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
 
 // Blocklist preferences
 pref("extensions.blocklist.enabled", true);

From c9572f520df3ad1c3c2ebc7ca95c0c525fcc8ede Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Thu, 11 Apr 2013 10:22:50 +0300
Subject: [PATCH 300/438] Bug 860101 - payload._navPayload is a Window in
 'will-navigate' event handler; r=harth

---
 browser/devtools/framework/Target.jsm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/browser/devtools/framework/Target.jsm b/browser/devtools/framework/Target.jsm
index 94b8c0988f88..d3b685726adc 100644
--- a/browser/devtools/framework/Target.jsm
+++ b/browser/devtools/framework/Target.jsm
@@ -322,13 +322,15 @@ TabTarget.prototype = {
       event.title = aPacket.title;
       // Send any stored event payload (DOMWindow or nsIRequest) for backwards
       // compatibility with non-remotable tools.
-      event._navPayload = this._navPayload;
       if (aPacket.state == "start") {
+        event._navPayload = this._navRequest;
         this.emit("will-navigate", event);
+        this._navRequest = null;
       } else {
+        event._navPayload = this._navWindow;
         this.emit("navigate", event);
+        this._navWindow = null;
       }
-      this._navPayload = null;
     }.bind(this);
     this.client.addListener("tabNavigated", this._onTabNavigated);
   },
@@ -467,7 +469,7 @@ TabWebProgressListener.prototype = {
       // Emit the event if the target is not remoted or store the payload for
       // later emission otherwise.
       if (this.target._client) {
-        this.target._navPayload = request;
+        this.target._navRequest = request;
       } else {
         this.target.emit("will-navigate", request);
       }
@@ -485,7 +487,7 @@ TabWebProgressListener.prototype = {
       // Emit the event if the target is not remoted or store the payload for
       // later emission otherwise.
       if (this.target._client) {
-        this.target._navPayload = window;
+        this.target._navWindow = window;
       } else {
         this.target.emit("navigate", window);
       }
@@ -500,6 +502,8 @@ TabWebProgressListener.prototype = {
       this.target.tab.linkedBrowser.removeProgressListener(this);
     }
     this.target._webProgressListener = null;
+    this.target._navRequest = null;
+    this.target._navWindow = null;
     this.target = null;
   }
 };

From 9088c15af5a153f890e0f4e330a3f593abf50667 Mon Sep 17 00:00:00 2001
From: Girish Sharma <scrapmachines@gmail.com>
Date: Fri, 5 Apr 2013 00:00:24 +0530
Subject: [PATCH 301/438] Bug 851546 - Options panel for DevTools Toolbox,
 r=jwalker

---
 browser/app/profile/firefox.js                |   1 +
 browser/devtools/framework/Toolbox.jsm        |  65 ++++++--
 browser/devtools/framework/gDevTools.jsm      |  20 ++-
 browser/devtools/framework/test/Makefile.in   |   1 +
 .../framework/test/browser_toolbox_options.js | 142 ++++++++++++++++++
 browser/devtools/framework/test/head.js       |  26 ++++
 browser/devtools/framework/toolbox-options.js | 105 +++++++++++++
 .../devtools/framework/toolbox-options.xul    |  44 ++++++
 browser/devtools/framework/toolbox.css        |  14 ++
 browser/devtools/framework/toolbox.xul        |  18 +++
 browser/devtools/jar.mn                       |   2 +
 browser/devtools/shared/theme-switching.js    |  66 +++++++-
 .../shared/widgets/SideMenuWidget.jsm         |   4 +-
 .../en-US/chrome/browser/devtools/toolbox.dtd |  17 ++-
 browser/themes/linux/devtools/toolbox.css     |  38 +++++
 browser/themes/osx/devtools/toolbox.css       |  38 +++++
 browser/themes/windows/devtools/toolbox.css   |  38 +++++
 17 files changed, 614 insertions(+), 25 deletions(-)
 create mode 100644 browser/devtools/framework/test/browser_toolbox_options.js
 create mode 100644 browser/devtools/framework/toolbox-options.js
 create mode 100644 browser/devtools/framework/toolbox-options.xul

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 3dc3ef227516..271d8cd0b42d 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1038,6 +1038,7 @@ pref("devtools.toolbox.host", "bottom");
 pref("devtools.toolbox.selectedTool", "webconsole");
 pref("devtools.toolbox.toolbarSpec", '["paintflashing toggle","tilt toggle","scratchpad","resize toggle"]');
 pref("devtools.toolbox.sideEnabled", true);
+pref("devtools.toolbox.disabledTools", "[]");
 
 // Enable the Inspector
 pref("devtools.inspector.enabled", true);
diff --git a/browser/devtools/framework/Toolbox.jsm b/browser/devtools/framework/Toolbox.jsm
index 0d2209b3ff20..d31b8e3e7bb9 100644
--- a/browser/devtools/framework/Toolbox.jsm
+++ b/browser/devtools/framework/Toolbox.jsm
@@ -135,7 +135,7 @@ this.Toolbox = function Toolbox(target, selectedTool, hostType) {
     selectedTool = Services.prefs.getCharPref(this._prefs.LAST_TOOL);
   }
   let definitions = gDevTools.getToolDefinitionMap();
-  if (!definitions.get(selectedTool)) {
+  if (!definitions.get(selectedTool) && selectedTool != "options") {
     selectedTool = "webconsole";
   }
   this._defaultToolId = selectedTool;
@@ -263,6 +263,7 @@ Toolbox.prototype = {
         closeButton.addEventListener("command", this.destroy, true);
 
         this._buildDockButtons();
+        this._buildOptions();
         this._buildTabs();
         this._buildButtons();
         this._addKeysToWindow();
@@ -280,6 +281,21 @@ Toolbox.prototype = {
     return deferred.promise;
   },
 
+  _buildOptions: function TBOX__buildOptions() {
+    this.optionsButton = this.doc.getElementById("toolbox-tab-options");
+    this.optionsButton.addEventListener("command", function() {
+      this.selectTool("options");
+    }.bind(this), false);
+
+    let iframe = this.doc.getElementById("toolbox-panel-iframe-options");
+    this._toolPanels.set("options", iframe);
+
+    let key = this.doc.getElementById("toolbox-options-key");
+    key.addEventListener("command", function(toolId) {
+      this.selectTool(toolId);
+    }.bind(this, "options"), true);
+  },
+
   /**
    * Adds the keys and commands to the Toolbox Window in window mode.
    */
@@ -288,7 +304,7 @@ Toolbox.prototype = {
       return;
     }
     let doc = this.doc.defaultView.parent.document;
-    for (let [id, toolDefinition] of gDevTools._tools) {
+    for (let [id, toolDefinition] of gDevTools.getToolDefinitionMap()) {
       if (toolDefinition.key) {
         // Prevent multiple entries for the same tool.
         if (doc.getElementById("key_" + id)) {
@@ -475,16 +491,30 @@ Toolbox.prototype = {
         break;
       }
     }
-    tabstrip.selectedIndex = index;
+    tabstrip.selectedItem = tab;
 
     // and select the right iframe
     let deck = this.doc.getElementById("toolbox-deck");
-    deck.selectedIndex = index;
+    // offset by 1 due to options panel
+    if (id == "options") {
+      deck.selectedIndex = 0;
+      this.optionsButton.setAttribute("checked", true);
+    }
+    else {
+      deck.selectedIndex = index != -1 ? index + 1: -1;
+      this.optionsButton.removeAttribute("checked");
+    }
 
     let definition = gDevTools.getToolDefinitionMap().get(id);
 
     this._currentToolId = id;
 
+    let resolveSelected = panel => {
+      this.emit("select", id);
+      this.emit(id + "-selected", panel);
+      deferred.resolve(panel);
+    };
+
     let iframe = this.doc.getElementById("toolbox-panel-iframe-" + id);
     if (!iframe) {
       iframe = this.doc.createElement("iframe");
@@ -505,11 +535,9 @@ Toolbox.prototype = {
           this._toolPanels.set(id, panel);
 
           this.emit(id + "-ready", panel);
-          this.emit("select", id);
-          this.emit(id + "-selected", panel);
           gDevTools.emit(id + "-ready", this, panel);
 
-          deferred.resolve(panel);
+          resolveSelected(panel);
         }.bind(this));
       }.bind(this);
 
@@ -518,14 +546,22 @@ Toolbox.prototype = {
     } else {
       let panel = this._toolPanels.get(id);
       // only emit 'select' event if the iframe has been loaded
-      if (panel) {
-        this.emit("select", id);
-        this.emit(id + "-selected", panel);
-        deferred.resolve(panel);
+      if (panel && (!panel.contentDocument ||
+                    panel.contentDocument.readyState == "complete")) {
+        resolveSelected(panel);
+      }
+      else if (panel) {
+        let boundLoad = function() {
+          panel.removeEventListener("DOMContentLoaded", boundLoad, true);
+          resolveSelected(panel);
+        };
+        panel.addEventListener("DOMContentLoaded", boundLoad, true);
       }
     }
 
-    Services.prefs.setCharPref(this._prefs.LAST_TOOL, id);
+    if (id != "options") {
+      Services.prefs.setCharPref(this._prefs.LAST_TOOL, id);
+    }
 
     return deferred.promise;
   },
@@ -543,8 +579,8 @@ Toolbox.prototype = {
   _refreshHostTitle: function TBOX_refreshHostTitle() {
     let toolName;
     let toolId = this.currentToolId;
-    if (toolId) {
-      let toolDef = gDevTools.getToolDefinitionMap().get(toolId);
+    let toolDef = gDevTools.getToolDefinitionMap().get(toolId);
+    if (toolDef) {
       toolName = toolDef.label;
     } else {
       // no tool is selected
@@ -710,6 +746,7 @@ Toolbox.prototype = {
 
     let outstanding = [];
 
+    this._toolPanels.delete("options");
     for (let [id, panel] of this._toolPanels) {
       outstanding.push(panel.destroy());
     }
diff --git a/browser/devtools/framework/gDevTools.jsm b/browser/devtools/framework/gDevTools.jsm
index c5820d7431aa..7bc6f659d0bb 100644
--- a/browser/devtools/framework/gDevTools.jsm
+++ b/browser/devtools/framework/gDevTools.jsm
@@ -97,6 +97,20 @@ DevTools.prototype = {
     }
   },
 
+  getDefaultTools: function DT_getDefaultTools() {
+    return defaultTools;
+  },
+
+  getAdditionalTools: function DT_getAdditionalTools() {
+    let tools = [];
+    for (let [key, value] of this._tools) {
+      if (defaultTools.indexOf(value) == -1) {
+        tools.push(value);
+      }
+    }
+    return tools;
+  },
+
   /**
    * Allow ToolBoxes to get at the list of tools that they should populate
    * themselves with.
@@ -106,6 +120,10 @@ DevTools.prototype = {
    */
   getToolDefinitionMap: function DT_getToolDefinitionMap() {
     let tools = new Map();
+    let disabledTools = [];
+    try {
+      disabledTools = JSON.parse(Services.prefs.getCharPref("devtools.toolbox.disabledTools"));
+    } catch(ex) {}
 
     for (let [key, value] of this._tools) {
       let enabled;
@@ -116,7 +134,7 @@ DevTools.prototype = {
         enabled = true;
       }
 
-      if (enabled) {
+      if (enabled && disabledTools.indexOf(key) == -1) {
         tools.set(key, value);
       }
     }
diff --git a/browser/devtools/framework/test/Makefile.in b/browser/devtools/framework/test/Makefile.in
index 5cc458519284..d4c667541d54 100644
--- a/browser/devtools/framework/test/Makefile.in
+++ b/browser/devtools/framework/test/Makefile.in
@@ -23,6 +23,7 @@ MOCHITEST_BROWSER_FILES = \
 		browser_toolbox_sidebar.js \
 		browser_toolbox_window_shortcuts.js \
 		browser_toolbox_window_title_changes.js \
+		browser_toolbox_options.js \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/framework/test/browser_toolbox_options.js b/browser/devtools/framework/test/browser_toolbox_options.js
new file mode 100644
index 000000000000..7fbd4efdf71f
--- /dev/null
+++ b/browser/devtools/framework/test/browser_toolbox_options.js
@@ -0,0 +1,142 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+let doc = null, toolbox = null, panelWin = null, index = 0, prefValues = [], prefNodes = [];
+
+function test() {
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    gDevTools.showToolbox(target).then(testSelectTool);
+  }, true);
+
+  content.location = "data:text/html,test for dynamically registering and unregistering tools";
+}
+
+function testSelectTool(aToolbox) {
+  toolbox = aToolbox;
+  doc = toolbox.doc;
+  toolbox.once("options-selected", testOptionsShortcut);
+  toolbox.selectTool("options");
+}
+
+function testOptionsShortcut() {
+  ok(true, "Toolbox selected via selectTool method");
+  toolbox.once("options-selected", testOptionsButtonClick);
+  toolbox.selectTool("webconsole")
+         .then(() => synthesizeKeyFromKeyTag("toolbox-options-key", doc));
+}
+
+function testOptionsButtonClick() {
+  ok(true, "Toolbox selected via shortcut");
+  toolbox.once("options-selected", testOptions);
+  toolbox.selectTool("webconsole")
+         .then(() => doc.getElementById("toolbox-tab-options").click());
+}
+
+function testOptions(event, iframe) {
+  ok(true, "Toolbox selected via button click");
+  panelWin = iframe.contentWindow;
+  let panelDoc = iframe.contentDocument;
+  // Testing pref changes
+  let prefCheckboxes = panelDoc.querySelectorAll("checkbox[data-pref]");
+  for (let checkbox of prefCheckboxes) {
+    prefNodes.push(checkbox);
+    prefValues.push(Services.prefs.getBoolPref(checkbox.getAttribute("data-pref")));
+  }
+  // Do again with opposite values to reset prefs
+  for (let checkbox of prefCheckboxes) {
+    prefNodes.push(checkbox);
+    prefValues.push(!Services.prefs.getBoolPref(checkbox.getAttribute("data-pref")));
+  }
+  testMouseClicks();
+}
+
+function testMouseClicks() {
+  if (index == prefValues.length) {
+    checkTools();
+    return;
+  }
+  gDevTools.once("pref-changed", prefChanged);
+  info("Click event synthesized for index " + index);
+  EventUtils.synthesizeMouse(prefNodes[index], 10, 10, {}, panelWin);
+}
+
+function prefChanged(event, data) {
+  if (data.pref == prefNodes[index].getAttribute("data-pref")) {
+    ok(true, "Correct pref was changed");
+    is(data.oldValue, prefValues[index], "Previous value is correct");
+    is(data.newValue, !prefValues[index], "New value is correct");
+    index++;
+    testMouseClicks();
+    return;
+  }
+  ok(false, "Pref was not changed correctly");
+  cleanup();
+}
+
+function checkTools() {
+  let toolsPref = panelWin.document.querySelectorAll("#default-tools-box > checkbox");
+  prefNodes = [];
+  index = 0;
+  for (let tool of toolsPref) {
+    prefNodes.push(tool);
+  }
+  toggleTools();
+}
+
+function toggleTools() {
+  if (index < prefNodes.length) {
+    gDevTools.once("tool-unregistered", checkUnregistered);
+    EventUtils.synthesizeMouse(prefNodes[index], 10, 10, {}, panelWin);
+  }
+  else if (index < 2*prefNodes.length) {
+    gDevTools.once("tool-registered", checkRegistered);
+    EventUtils.synthesizeMouse(prefNodes[index - prefNodes.length], 10, 10, {}, panelWin);
+  }
+  else {
+    cleanup();
+    return;
+  }
+}
+
+function checkUnregistered(event, data) {
+  if (data == prefNodes[index].getAttribute("id")) {
+    ok(true, "Correct tool removed");
+    // checking tab on the toolbox
+    ok(!doc.getElementById("toolbox-tab-" + data), "Tab removed for " + data);
+    index++;
+    toggleTools();
+    return;
+  }
+  ok(false, "Something went wrong, " + data + " was not unregistered");
+  cleanup();
+}
+
+function checkRegistered(event, data) {
+  if (data == prefNodes[index - prefNodes.length].getAttribute("id")) {
+    ok(true, "Correct tool added back");
+    // checking tab on the toolbox
+    ok(doc.getElementById("toolbox-tab-" + data), "Tab added back for " + data);
+    index++;
+    toggleTools();
+    return;
+  }
+  ok(false, "Something went wrong, " + data + " was not registered back");
+  cleanup();
+}
+
+function cleanup() {
+  toolbox.destroy().then(function() {
+    gBrowser.removeCurrentTab();
+    toolbox = doc = prefNodes = prefValues = panelWin = null;
+    finish();
+  });
+}
diff --git a/browser/devtools/framework/test/head.js b/browser/devtools/framework/test/head.js
index 66df4ab8f0e1..144a9ed5d484 100644
--- a/browser/devtools/framework/test/head.js
+++ b/browser/devtools/framework/test/head.js
@@ -47,3 +47,29 @@ registerCleanupFunction(function tearDown() {
     gBrowser.removeCurrentTab();
   }
 });
+
+function synthesizeKeyFromKeyTag(aKeyId, document) {
+  let key = document.getElementById(aKeyId);
+  isnot(key, null, "Successfully retrieved the <key> node");
+
+  let modifiersAttr = key.getAttribute("modifiers");
+
+  let name = null;
+
+  if (key.getAttribute("keycode"))
+    name = key.getAttribute("keycode");
+  else if (key.getAttribute("key"))
+    name = key.getAttribute("key");
+
+  isnot(name, null, "Successfully retrieved keycode/key");
+
+  let modifiers = {
+    shiftKey: modifiersAttr.match("shift"),
+    ctrlKey: modifiersAttr.match("ctrl"),
+    altKey: modifiersAttr.match("alt"),
+    metaKey: modifiersAttr.match("meta"),
+    accelKey: modifiersAttr.match("accel")
+  }
+
+  EventUtils.synthesizeKey(name, modifiers);
+}
diff --git a/browser/devtools/framework/toolbox-options.js b/browser/devtools/framework/toolbox-options.js
new file mode 100644
index 000000000000..fc4525529989
--- /dev/null
+++ b/browser/devtools/framework/toolbox-options.js
@@ -0,0 +1,105 @@
+
+const { utils: Cu } = Components;
+const DISABLED_TOOLS = "devtools.toolbox.disabledTools";
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
+
+window.addEventListener("load", function onLoad() {
+  window.removeEventListener("load", onLoad);
+  setupToolsList();
+  populatePreferences();
+});
+
+function setupToolsList() {
+  let disabledTools = [];
+  try {
+    disabledTools = JSON.parse(Services.prefs.getCharPref(DISABLED_TOOLS));
+  } catch(ex) {
+    Cu.reportError("Error parsing pref " + DISABLED_TOOLS + " as JSON.");
+  }
+  let defaultToolsBox = document.getElementById("default-tools-box");
+  let additionalToolsBox = document.getElementById("additional-tools-box");
+
+  defaultToolsBox.textContent = "";
+  additionalToolsBox.textContent = "";
+
+  let onCheckboxClick = function(id) {
+    if (disabledTools.indexOf(id) > -1) {
+      disabledTools.splice(disabledTools.indexOf(id), 1);
+      Services.prefs.setCharPref(DISABLED_TOOLS, JSON.stringify(disabledTools));
+      gDevTools.emit("tool-registered", id);
+    }
+    else {
+      disabledTools.push(id);
+      Services.prefs.setCharPref(DISABLED_TOOLS, JSON.stringify(disabledTools));
+      gDevTools.emit("tool-unregistered", id);
+    }
+  };
+
+  // Populating the default tools lists
+  for (let tool of gDevTools.getDefaultTools()) {
+    let checkbox = document.createElement("checkbox");
+    checkbox.setAttribute("id", tool.id);
+    checkbox.setAttribute("label", tool.label);
+    checkbox.setAttribute("tooltiptext", tool.tooltip || "");
+    checkbox.setAttribute("checked", disabledTools.indexOf(tool.id) == -1);
+    checkbox.addEventListener("command", onCheckboxClick.bind(null, tool.id));
+    defaultToolsBox.appendChild(checkbox);
+  }
+
+  // Populating the additional tools list that came from add-ons.
+  let atleastOneAddon = false;
+  for (let tool of gDevTools.getAdditionalTools()) {
+    atleastOneAddon = true;
+    let checkbox = document.createElement("checkbox");
+    checkbox.setAttribute("id", tool.id);
+    checkbox.setAttribute("label", tool.label);
+    checkbox.setAttribute("tooltiptext", tool.tooltip || "");
+    checkbox.setAttribute("checked", disabledTools.indexOf(tool.id) == -1);
+    checkbox.addEventListener("command", onCheckboxClick.bind(null, tool.id));
+    additionalToolsBox.appendChild(checkbox);
+  }
+
+  if (!atleastOneAddon) {
+    additionalToolsBox.style.display = "none";
+    additionalToolsBox.previousSibling.style.display = "none";
+  }
+
+  window.focus();
+}
+
+function populatePreferences() {
+  let prefCheckboxes = document.querySelectorAll("checkbox[data-pref]");
+  for (let checkbox of prefCheckboxes) {
+    checkbox.checked = Services.prefs.getBoolPref(checkbox.getAttribute("data-pref"));
+    checkbox.addEventListener("command", function() {
+      let data = {
+        pref: this.getAttribute("data-pref"),
+        newValue: this.checked
+      };
+      data.oldValue = Services.prefs.getBoolPref(data.pref);
+      Services.prefs.setBoolPref(data.pref, data.newValue);
+      gDevTools.emit("pref-changed", data);
+    }.bind(checkbox));
+  }
+  let prefRadiogroups = document.querySelectorAll("radiogroup[data-pref]");
+  for (let radiogroup of prefRadiogroups) {
+    let selectedValue = Services.prefs.getCharPref(radiogroup.getAttribute("data-pref"));
+    for (let radio of radiogroup.childNodes) {
+      radiogroup.selectedIndex = -1;
+      if (radio.getAttribute("value") == selectedValue) {
+        radiogroup.selectedItem = radio;
+        break;
+      }
+    }
+    radiogroup.addEventListener("select", function() {
+      let data = {
+        pref: this.getAttribute("data-pref"),
+        newValue: this.selectedItem.getAttribute("value")
+      };
+      data.oldValue = Services.prefs.getCharPref(data.pref);
+      Services.prefs.setCharPref(data.pref, data.newValue);
+      gDevTools.emit("pref-changed", data);
+    }.bind(radiogroup));
+  }
+}
diff --git a/browser/devtools/framework/toolbox-options.xul b/browser/devtools/framework/toolbox-options.xul
new file mode 100644
index 000000000000..dbd4e8357614
--- /dev/null
+++ b/browser/devtools/framework/toolbox-options.xul
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+<!DOCTYPE window [
+<!ENTITY % toolboxDTD SYSTEM "chrome://browser/locale/devtools/toolbox.dtd" >
+ %toolboxDTD;
+]>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+<?xml-stylesheet rel="stylesheet" href="chrome://browser/content/devtools/framework/toolbox.css" type="text/css"?>
+<?xml-stylesheet rel="stylesheet" href="chrome://browser/skin/devtools/toolbox.css" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript;version=1.8" src="toolbox-options.js"></script>
+  <hbox flex="1" style="overflow: auto">
+    <hbox id="options-panel" flex="1">
+      <vbox id="tools-box" class="options-vertical-pane" flex="1">
+        <label value="&options.selectDefaultTools.label;"/>
+        <vbox id="default-tools-box" class="options-groupbox"/>
+        <label value="&options.selectAdditionalTools.label;"/>
+        <vbox id="additional-tools-box" class="options-groupbox"/>
+      </vbox>
+      <vbox class="options-vertical-pane" flex="1">
+        <label value="&options.selectDevToolsTheme.label;"/>
+        <radiogroup id="devtools-theme-box"
+                    class="options-groupbox"
+                    data-pref="devtools.theme"
+                    orient="horizontal">
+          <radio value="light" label="&options.lightTheme.label;"/>
+          <radio value="dark" label="&options.darkTheme.label;"/>
+        </radiogroup>
+        <label value="&options.context.label;"/>
+        <vbox id="context-options" class="options-groupbox">
+          <checkbox label="&options.enableChrome.label;"
+                    tooltiptext="&options.enableChrome.tooltip;"
+                    data-pref="devtools.chrome.enabled"/>
+          <checkbox label="&options.enableRemote.label;"
+                    tooltiptext="&options.enableRemote.tooltip;"
+                    data-pref="devtools.debugger.remote-enabled"/>
+        </vbox>
+      </vbox>
+    </hbox>
+  </hbox>
+</window>
diff --git a/browser/devtools/framework/toolbox.css b/browser/devtools/framework/toolbox.css
index 03a48c9aaab4..efd054db508b 100644
--- a/browser/devtools/framework/toolbox.css
+++ b/browser/devtools/framework/toolbox.css
@@ -13,3 +13,17 @@
 .command-button > .toolbarbutton-text {
   display: none;
 }
+
+#options-panel {
+  overflow-y: auto;
+  display: block;
+}
+
+.options-vertical-pane {
+  display: inline;
+  float: left;
+}
+
+.options-vertical-pane > label {
+  display: block;
+}
diff --git a/browser/devtools/framework/toolbox.xul b/browser/devtools/framework/toolbox.xul
index 297e0c296ad6..16c269615920 100644
--- a/browser/devtools/framework/toolbox.xul
+++ b/browser/devtools/framework/toolbox.xul
@@ -18,6 +18,12 @@
 
   <commandset id="editMenuCommands"/>
   <keyset id="editMenuKeys"/>
+  <keyset id="toolbox-keyset">
+    <key id="toolbox-options-key"
+         key="&toolboxOptionsButton.key;"
+         oncommand="void(0);"
+         modifiers="shift, accel"/>
+  </keyset>
 
   <notificationbox id="toolbox-notificationbox" flex="1">
     <toolbar class="devtools-tabbar">
@@ -28,6 +34,10 @@
         <hbox id="toolbox-dock-buttons"/>
       </hbox>
 #endif
+      <toolbarbutton id="toolbox-tab-options"
+                     autocheck="false"
+                     class="command-button toolbox-tab devtools-tab"
+                     tooltiptext="&toolboxOptionsButton.tooltip;"/>
       <hbox id="toolbox-tabs" flex="1">
       </hbox>
       <hbox id="toolbox-buttons" pack="end"/>
@@ -41,6 +51,14 @@
 #endif
     </toolbar>
     <deck id="toolbox-deck" flex="1">
+      <vbox id="toolbox-panel-options"
+            class="toolbox-panel">
+        <iframe id="toolbox-panel-iframe-options"
+                class="toolbox-panel-iframe"
+                flex="1" forceOwnRefreshDriver=""
+                src="chrome://browser/content/devtools/framework/toolbox-options.xul">
+        </iframe>
+      </vbox>
     </deck>
   </notificationbox>
 </window>
diff --git a/browser/devtools/jar.mn b/browser/devtools/jar.mn
index dbed935bab48..8c49610729e4 100644
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -57,6 +57,8 @@ browser.jar:
     content/browser/devtools/commandlineoutput.xhtml  (commandline/commandlineoutput.xhtml)
     content/browser/devtools/commandlinetooltip.xhtml  (commandline/commandlinetooltip.xhtml)
     content/browser/devtools/framework/toolbox-window.xul    (framework/toolbox-window.xul)
+    content/browser/devtools/framework/toolbox-options.xul   (framework/toolbox-options.xul)
+    content/browser/devtools/framework/toolbox-options.js    (framework/toolbox-options.js)
 *   content/browser/devtools/framework/toolbox.xul           (framework/toolbox.xul)
     content/browser/devtools/framework/toolbox.css           (framework/toolbox.css)
     content/browser/devtools/inspector/inspector.xul         (inspector/inspector.xul)
diff --git a/browser/devtools/shared/theme-switching.js b/browser/devtools/shared/theme-switching.js
index 044ae9bde168..ce25a8217906 100644
--- a/browser/devtools/shared/theme-switching.js
+++ b/browser/devtools/shared/theme-switching.js
@@ -3,15 +3,65 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 (function() {
+  const DEVTOOLS_SKIN_URL = "chrome://browser/skin/devtools/";
+
+  function forceStyle() {
+    let computedStyle = window.getComputedStyle(document.documentElement);
+    if (!computedStyle) {
+      // Null when documentElement is not ready. This method is anyways not
+      // required then as scrollbars would be in their state without flushing.
+      return;
+    }
+    let display = computedStyle.display; // Save display value
+    document.documentElement.style.display = "none";
+    window.getComputedStyle(document.documentElement).display; // Flush
+    document.documentElement.style.display = display; // Restore
+  }
+
+  function switchTheme(theme, oldTheme) {
+    let winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                         .getInterface(Ci.nsIDOMWindowUtils);
+    if (oldTheme && theme != oldTheme) {
+      let old_theme_url = Services.io.newURI(DEVTOOLS_SKIN_URL + oldTheme +
+                                             "-theme.css", null, null);
+      try {
+        winUtils.removeSheet(old_theme_url, window.AUTHOR_SHEET);
+      } catch(ex) {}
+    }
+    let theme_url = Services.io.newURI( +
+                                       theme + "-theme.css", null, null);
+    winUtils.loadSheet(theme_url, window.AUTHOR_SHEET);
+    let scrollbar_url =
+      Services.io.newURI(DEVTOOLS_SKIN_URL + "floating-scrollbars-light.css",
+                         null, null);
+    if (theme == "dark") {
+      winUtils.loadSheet(scrollbar_url, window.AGENT_SHEET);
+      forceStyle();
+    }
+    else if (oldTheme == "dark") {
+      try {
+        winUtils.removeSheet(scrollbar_url, window.AGENT_SHEET);
+      } catch(ex) {}
+      forceStyle();
+    }
+    document.documentElement.classList.remove("theme-" + oldTheme);
+    document.documentElement.classList.add("theme-" + theme);
+  }
+
+  function handlePrefChange(event, data) {
+    switch(data.pref) {
+      case "devtools.theme":
+        switchTheme(data.newValue, data.oldValue);
+    }
+  }
+
   const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
   Cu.import("resource://gre/modules/Services.jsm");
+  Cu.import("resource:///modules/devtools/gDevTools.jsm");
   let theme = Services.prefs.getCharPref("devtools.theme");
-  let theme_url = Services.io.newURI("chrome://browser/skin/devtools/" + theme + "-theme.css", null, null);
-  let winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-  winUtils.loadSheet(theme_url, window.AUTHOR_SHEET);
-  if (theme == "dark") {
-    let scrollbar_url = Services.io.newURI("chrome://browser/skin/devtools/floating-scrollbars-light.css", null, null);
-    winUtils.loadSheet(scrollbar_url, window.AGENT_SHEET);
-  }
-  document.documentElement.classList.add("theme-" + theme);
+  switchTheme(theme);
+  gDevTools.on("pref-changed", handlePrefChange);
+  window.addEventListener("unload", function() {
+    gDevTools.off("pref-changed", handlePrefChange);
+  });
 })()
diff --git a/browser/devtools/shared/widgets/SideMenuWidget.jsm b/browser/devtools/shared/widgets/SideMenuWidget.jsm
index d11c898f23b6..5e98ee6a88a5 100644
--- a/browser/devtools/shared/widgets/SideMenuWidget.jsm
+++ b/browser/devtools/shared/widgets/SideMenuWidget.jsm
@@ -117,7 +117,9 @@ SideMenuWidget.prototype = {
    *        The element associated with the displayed item.
    */
   removeChild: function SMW_removeChild(aChild) {
-    aChild.parentNode.removeChild(aChild);
+    // Remove the item itself, not the contents.
+    let item = aChild.parentNode;
+    item.parentNode.removeChild(item);
     this._orderedMenuElementsArray.splice(
       this._orderedMenuElementsArray.indexOf(aChild), 1);
 
diff --git a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
index 57efe9e36dfa..86339ba8713b 100644
--- a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
@@ -4,4 +4,19 @@
 
 <!ENTITY closeCmd.key  "W">
 
-<!ENTITY toolboxCloseButton.tooltip  "Close Developer Tools">
+<!ENTITY toolboxCloseButton.tooltip    "Close Developer Tools">
+<!ENTITY toolboxOptionsButton.tooltip  "Toggle Options Panel">
+<!ENTITY toolboxOptionsButton.key      "O">
+
+<!ENTITY options.context.label         "Advanced settings. (Requires a browser restart)">
+<!ENTITY options.enableChrome.label    "Enable Chrome debugging.">
+<!ENTITY options.enableChrome.tooltip  "Turning this option on will allow you to use various developer tools in browser context.">
+<!ENTITY options.enableRemote.label    "Enable Remote Debugging.">
+<!ENTITY options.enableRemote.tooltip  "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS.">
+
+<!ENTITY options.selectDefaultTools.label     "Default Firefox Developer Tools">
+<!ENTITY options.selectAdditionalTools.label  "Developer Tools installed by add-ons">
+
+<!ENTITY options.selectDevToolsTheme.label   "Choose DevTools theme:">
+<!ENTITY options.darkTheme.label             "Dark Theme">
+<!ENTITY options.lightTheme.label            "Light Theme">
diff --git a/browser/themes/linux/devtools/toolbox.css b/browser/themes/linux/devtools/toolbox.css
index ed42d821296e..42807bb0aef8 100644
--- a/browser/themes/linux/devtools/toolbox.css
+++ b/browser/themes/linux/devtools/toolbox.css
@@ -128,6 +128,19 @@
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
+#toolbox-tab-options {
+  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#toolbox-tab-options[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#toolbox-tab-options > image {
+  opacity: 1;
+  -moz-margin-start: 0;
+}
 
 /* Tabs */
 
@@ -224,3 +237,28 @@
   background-position: top right, top left, left, right;
   box-shadow: 1px -1px 0 hsla(206,37%,4%,.2) inset;
 }
+
+#options-panel {
+  background-image: url("chrome://browser/skin/newtab/noise.png");
+}
+
+.options-vertical-pane {
+  margin: 15px;
+  width: calc(50% - 30px);
+  min-width: 400px;
+  -moz-padding-start: 5px;
+}
+
+.options-vertical-pane > label {
+  padding: 5px 0;
+  font-size: 1.4rem;
+}
+
+.options-groupbox {
+  -moz-margin-start: 15px;
+  padding: 4px;
+}
+
+.options-groupbox > * {
+  padding: 2px;
+}
diff --git a/browser/themes/osx/devtools/toolbox.css b/browser/themes/osx/devtools/toolbox.css
index cca78b2264b0..4866fcc45923 100644
--- a/browser/themes/osx/devtools/toolbox.css
+++ b/browser/themes/osx/devtools/toolbox.css
@@ -116,6 +116,19 @@
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
+#toolbox-tab-options {
+  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#toolbox-tab-options[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#toolbox-tab-options > image {
+  opacity: 1;
+  -moz-margin-start: 0;
+}
 
 /* Tabs */
 
@@ -211,3 +224,28 @@
   background-position: top right, top left, left, right;
   box-shadow: 1px -1px 0 hsla(206,37%,4%,.2) inset;
 }
+
+#options-panel {
+  background-image: url("chrome://browser/skin/newtab/noise.png");
+}
+
+.options-vertical-pane {
+  margin: 15px;
+  width: calc(50% - 30px);
+  min-width: 400px;
+  -moz-padding-start: 5px;
+}
+
+.options-vertical-pane > label {
+  padding: 5px 0;
+  font-size: 1.4rem;
+}
+
+.options-groupbox {
+  -moz-margin-start: 15px;
+  padding: 4px;
+}
+
+.options-groupbox > * {
+  padding: 2px;
+}
diff --git a/browser/themes/windows/devtools/toolbox.css b/browser/themes/windows/devtools/toolbox.css
index 2361d5f196e6..4540653bf553 100644
--- a/browser/themes/windows/devtools/toolbox.css
+++ b/browser/themes/windows/devtools/toolbox.css
@@ -131,6 +131,19 @@
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
+#toolbox-tab-options {
+  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#toolbox-tab-options[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#toolbox-tab-options > image {
+  opacity: 1;
+  -moz-margin-start: 0;
+}
 
 /* Tabs */
 
@@ -220,3 +233,28 @@
   background-position: top right, top left, left, right;
   box-shadow: 1px -1px 0 hsla(206,37%,4%,.2) inset;
 }
+
+#options-panel {
+  background-image: url("chrome://browser/skin/newtab/noise.png");
+}
+
+.options-vertical-pane {
+  margin: 15px;
+  width: calc(50% - 30px);
+  min-width: 400px;
+  -moz-padding-start: 5px;
+}
+
+.options-vertical-pane > label {
+  padding: 5px 0;
+  font-size: 1.4rem;
+}
+
+.options-groupbox {
+  -moz-margin-start: 15px;
+  padding: 4px;
+}
+
+.options-groupbox > * {
+  padding: 2px;
+}

From 8742b77656979a2de91ec19f5feda23b8d4ae12d Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Mon, 8 Apr 2013 10:54:20 -0700
Subject: [PATCH 302/438] Bug 855371 - @MOZ_UPDATE_CHANNEL@ in health report
 prefs. r=gps

---
 services/healthreport/healthreport-prefs.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/healthreport/healthreport-prefs.js b/services/healthreport/healthreport-prefs.js
index 7ae5f0164d49..b38439d5821b 100644
--- a/services/healthreport/healthreport-prefs.js
+++ b/services/healthreport/healthreport-prefs.js
@@ -1,3 +1,4 @@
+#filter substitution
 /* 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/. */
@@ -26,6 +27,8 @@ pref("datareporting.healthreport.service.loadDelayFirstRunMsec", 60000);
 pref("datareporting.healthreport.service.providerCategories",
 #if MOZ_UPDATE_CHANNEL == release
     "healthreport-js-provider-default"
+#elif MOZ_UPDATE_CHANNEL == default
+    "healthreport-js-provider-default"
 #else
     "healthreport-js-provider-default,healthreport-js-provider-@MOZ_UPDATE_CHANNEL@"
 #endif

From 184851d10fcd12a406d921f62c9a30894080549a Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Mon, 8 Apr 2013 20:26:23 -0700
Subject: [PATCH 303/438] Bug 853138 - Follow-up: change category name in
 tests. r=gps

---
 browser/base/content/test/browser_aboutHome.js                  | 2 +-
 browser/base/content/test/browser_contextSearchTabPosition.js   | 2 +-
 browser/base/content/test/browser_urlbar_search_healthreport.js | 2 +-
 browser/components/search/test/browser_healthreport.js          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js
index 589b151a2b7f..ab0033a9fed7 100644
--- a/browser/base/content/test/browser_aboutHome.js
+++ b/browser/base/content/test/browser_aboutHome.js
@@ -114,7 +114,7 @@ let gTests = [
   run: function () {
     try {
       let cm = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
-      cm.getCategoryEntry("healthreport-js-provider", "SearchesProvider");
+      cm.getCategoryEntry("healthreport-js-provider-default", "SearchesProvider");
     } catch (ex) {
       // Health Report disabled, or no SearchesProvider.
       return Promise.resolve();
diff --git a/browser/base/content/test/browser_contextSearchTabPosition.js b/browser/base/content/test/browser_contextSearchTabPosition.js
index 8cd456d6728d..38dbc2adf18b 100644
--- a/browser/base/content/test/browser_contextSearchTabPosition.js
+++ b/browser/base/content/test/browser_contextSearchTabPosition.js
@@ -29,7 +29,7 @@ function test() {
   try {
     let cm = Components.classes["@mozilla.org/categorymanager;1"]
                        .getService(Components.interfaces.nsICategoryManager);
-    cm.getCategoryEntry("healthreport-js-provider", "SearchesProvider");
+    cm.getCategoryEntry("healthreport-js-provider-default", "SearchesProvider");
   } catch (ex) {
     // Health Report disabled, or no SearchesProvider.
     finish();
diff --git a/browser/base/content/test/browser_urlbar_search_healthreport.js b/browser/base/content/test/browser_urlbar_search_healthreport.js
index fef76cf139b5..215aa63141bc 100644
--- a/browser/base/content/test/browser_urlbar_search_healthreport.js
+++ b/browser/base/content/test/browser_urlbar_search_healthreport.js
@@ -7,7 +7,7 @@ function test() {
   waitForExplicitFinish();
   try {
     let cm = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
-    cm.getCategoryEntry("healthreport-js-provider", "SearchesProvider");
+    cm.getCategoryEntry("healthreport-js-provider-default", "SearchesProvider");
   } catch (ex) {
     // Health Report disabled, or no SearchesProvider.
     ok(true, "Firefox Health Report is not enabled.");
diff --git a/browser/components/search/test/browser_healthreport.js b/browser/components/search/test/browser_healthreport.js
index 90460ffda241..d70191560df0 100644
--- a/browser/components/search/test/browser_healthreport.js
+++ b/browser/components/search/test/browser_healthreport.js
@@ -9,7 +9,7 @@ function test() {
   try {
     let cm = Components.classes["@mozilla.org/categorymanager;1"]
                        .getService(Components.interfaces.nsICategoryManager);
-    cm.getCategoryEntry("healthreport-js-provider", "SearchesProvider");
+    cm.getCategoryEntry("healthreport-js-provider-default", "SearchesProvider");
   } catch (ex) {
     // Health Report disabled, or no SearchesProvider.
     // We need a test or else we'll be marked as failure.

From 868d22199f836fe42c961c9611804d4e86c835c2 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Mon, 15 Apr 2013 11:51:19 +0300
Subject: [PATCH 304/438] Backed out changeset 371ecfa8df92 (bug 851546) for
 breakage

---
 browser/app/profile/firefox.js                |   1 -
 browser/devtools/framework/Toolbox.jsm        |  65 ++------
 browser/devtools/framework/gDevTools.jsm      |  20 +--
 browser/devtools/framework/test/Makefile.in   |   1 -
 .../framework/test/browser_toolbox_options.js | 142 ------------------
 browser/devtools/framework/test/head.js       |  26 ----
 browser/devtools/framework/toolbox-options.js | 105 -------------
 .../devtools/framework/toolbox-options.xul    |  44 ------
 browser/devtools/framework/toolbox.css        |  14 --
 browser/devtools/framework/toolbox.xul        |  18 ---
 browser/devtools/jar.mn                       |   2 -
 browser/devtools/shared/theme-switching.js    |  66 +-------
 .../shared/widgets/SideMenuWidget.jsm         |   4 +-
 .../en-US/chrome/browser/devtools/toolbox.dtd |  17 +--
 browser/themes/linux/devtools/toolbox.css     |  38 -----
 browser/themes/osx/devtools/toolbox.css       |  38 -----
 browser/themes/windows/devtools/toolbox.css   |  38 -----
 17 files changed, 25 insertions(+), 614 deletions(-)
 delete mode 100644 browser/devtools/framework/test/browser_toolbox_options.js
 delete mode 100644 browser/devtools/framework/toolbox-options.js
 delete mode 100644 browser/devtools/framework/toolbox-options.xul

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 271d8cd0b42d..3dc3ef227516 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1038,7 +1038,6 @@ pref("devtools.toolbox.host", "bottom");
 pref("devtools.toolbox.selectedTool", "webconsole");
 pref("devtools.toolbox.toolbarSpec", '["paintflashing toggle","tilt toggle","scratchpad","resize toggle"]');
 pref("devtools.toolbox.sideEnabled", true);
-pref("devtools.toolbox.disabledTools", "[]");
 
 // Enable the Inspector
 pref("devtools.inspector.enabled", true);
diff --git a/browser/devtools/framework/Toolbox.jsm b/browser/devtools/framework/Toolbox.jsm
index d31b8e3e7bb9..0d2209b3ff20 100644
--- a/browser/devtools/framework/Toolbox.jsm
+++ b/browser/devtools/framework/Toolbox.jsm
@@ -135,7 +135,7 @@ this.Toolbox = function Toolbox(target, selectedTool, hostType) {
     selectedTool = Services.prefs.getCharPref(this._prefs.LAST_TOOL);
   }
   let definitions = gDevTools.getToolDefinitionMap();
-  if (!definitions.get(selectedTool) && selectedTool != "options") {
+  if (!definitions.get(selectedTool)) {
     selectedTool = "webconsole";
   }
   this._defaultToolId = selectedTool;
@@ -263,7 +263,6 @@ Toolbox.prototype = {
         closeButton.addEventListener("command", this.destroy, true);
 
         this._buildDockButtons();
-        this._buildOptions();
         this._buildTabs();
         this._buildButtons();
         this._addKeysToWindow();
@@ -281,21 +280,6 @@ Toolbox.prototype = {
     return deferred.promise;
   },
 
-  _buildOptions: function TBOX__buildOptions() {
-    this.optionsButton = this.doc.getElementById("toolbox-tab-options");
-    this.optionsButton.addEventListener("command", function() {
-      this.selectTool("options");
-    }.bind(this), false);
-
-    let iframe = this.doc.getElementById("toolbox-panel-iframe-options");
-    this._toolPanels.set("options", iframe);
-
-    let key = this.doc.getElementById("toolbox-options-key");
-    key.addEventListener("command", function(toolId) {
-      this.selectTool(toolId);
-    }.bind(this, "options"), true);
-  },
-
   /**
    * Adds the keys and commands to the Toolbox Window in window mode.
    */
@@ -304,7 +288,7 @@ Toolbox.prototype = {
       return;
     }
     let doc = this.doc.defaultView.parent.document;
-    for (let [id, toolDefinition] of gDevTools.getToolDefinitionMap()) {
+    for (let [id, toolDefinition] of gDevTools._tools) {
       if (toolDefinition.key) {
         // Prevent multiple entries for the same tool.
         if (doc.getElementById("key_" + id)) {
@@ -491,30 +475,16 @@ Toolbox.prototype = {
         break;
       }
     }
-    tabstrip.selectedItem = tab;
+    tabstrip.selectedIndex = index;
 
     // and select the right iframe
     let deck = this.doc.getElementById("toolbox-deck");
-    // offset by 1 due to options panel
-    if (id == "options") {
-      deck.selectedIndex = 0;
-      this.optionsButton.setAttribute("checked", true);
-    }
-    else {
-      deck.selectedIndex = index != -1 ? index + 1: -1;
-      this.optionsButton.removeAttribute("checked");
-    }
+    deck.selectedIndex = index;
 
     let definition = gDevTools.getToolDefinitionMap().get(id);
 
     this._currentToolId = id;
 
-    let resolveSelected = panel => {
-      this.emit("select", id);
-      this.emit(id + "-selected", panel);
-      deferred.resolve(panel);
-    };
-
     let iframe = this.doc.getElementById("toolbox-panel-iframe-" + id);
     if (!iframe) {
       iframe = this.doc.createElement("iframe");
@@ -535,9 +505,11 @@ Toolbox.prototype = {
           this._toolPanels.set(id, panel);
 
           this.emit(id + "-ready", panel);
+          this.emit("select", id);
+          this.emit(id + "-selected", panel);
           gDevTools.emit(id + "-ready", this, panel);
 
-          resolveSelected(panel);
+          deferred.resolve(panel);
         }.bind(this));
       }.bind(this);
 
@@ -546,22 +518,14 @@ Toolbox.prototype = {
     } else {
       let panel = this._toolPanels.get(id);
       // only emit 'select' event if the iframe has been loaded
-      if (panel && (!panel.contentDocument ||
-                    panel.contentDocument.readyState == "complete")) {
-        resolveSelected(panel);
-      }
-      else if (panel) {
-        let boundLoad = function() {
-          panel.removeEventListener("DOMContentLoaded", boundLoad, true);
-          resolveSelected(panel);
-        };
-        panel.addEventListener("DOMContentLoaded", boundLoad, true);
+      if (panel) {
+        this.emit("select", id);
+        this.emit(id + "-selected", panel);
+        deferred.resolve(panel);
       }
     }
 
-    if (id != "options") {
-      Services.prefs.setCharPref(this._prefs.LAST_TOOL, id);
-    }
+    Services.prefs.setCharPref(this._prefs.LAST_TOOL, id);
 
     return deferred.promise;
   },
@@ -579,8 +543,8 @@ Toolbox.prototype = {
   _refreshHostTitle: function TBOX_refreshHostTitle() {
     let toolName;
     let toolId = this.currentToolId;
-    let toolDef = gDevTools.getToolDefinitionMap().get(toolId);
-    if (toolDef) {
+    if (toolId) {
+      let toolDef = gDevTools.getToolDefinitionMap().get(toolId);
       toolName = toolDef.label;
     } else {
       // no tool is selected
@@ -746,7 +710,6 @@ Toolbox.prototype = {
 
     let outstanding = [];
 
-    this._toolPanels.delete("options");
     for (let [id, panel] of this._toolPanels) {
       outstanding.push(panel.destroy());
     }
diff --git a/browser/devtools/framework/gDevTools.jsm b/browser/devtools/framework/gDevTools.jsm
index 7bc6f659d0bb..c5820d7431aa 100644
--- a/browser/devtools/framework/gDevTools.jsm
+++ b/browser/devtools/framework/gDevTools.jsm
@@ -97,20 +97,6 @@ DevTools.prototype = {
     }
   },
 
-  getDefaultTools: function DT_getDefaultTools() {
-    return defaultTools;
-  },
-
-  getAdditionalTools: function DT_getAdditionalTools() {
-    let tools = [];
-    for (let [key, value] of this._tools) {
-      if (defaultTools.indexOf(value) == -1) {
-        tools.push(value);
-      }
-    }
-    return tools;
-  },
-
   /**
    * Allow ToolBoxes to get at the list of tools that they should populate
    * themselves with.
@@ -120,10 +106,6 @@ DevTools.prototype = {
    */
   getToolDefinitionMap: function DT_getToolDefinitionMap() {
     let tools = new Map();
-    let disabledTools = [];
-    try {
-      disabledTools = JSON.parse(Services.prefs.getCharPref("devtools.toolbox.disabledTools"));
-    } catch(ex) {}
 
     for (let [key, value] of this._tools) {
       let enabled;
@@ -134,7 +116,7 @@ DevTools.prototype = {
         enabled = true;
       }
 
-      if (enabled && disabledTools.indexOf(key) == -1) {
+      if (enabled) {
         tools.set(key, value);
       }
     }
diff --git a/browser/devtools/framework/test/Makefile.in b/browser/devtools/framework/test/Makefile.in
index d4c667541d54..5cc458519284 100644
--- a/browser/devtools/framework/test/Makefile.in
+++ b/browser/devtools/framework/test/Makefile.in
@@ -23,7 +23,6 @@ MOCHITEST_BROWSER_FILES = \
 		browser_toolbox_sidebar.js \
 		browser_toolbox_window_shortcuts.js \
 		browser_toolbox_window_title_changes.js \
-		browser_toolbox_options.js \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/framework/test/browser_toolbox_options.js b/browser/devtools/framework/test/browser_toolbox_options.js
deleted file mode 100644
index 7fbd4efdf71f..000000000000
--- a/browser/devtools/framework/test/browser_toolbox_options.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-let doc = null, toolbox = null, panelWin = null, index = 0, prefValues = [], prefNodes = [];
-
-function test() {
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-    gDevTools.showToolbox(target).then(testSelectTool);
-  }, true);
-
-  content.location = "data:text/html,test for dynamically registering and unregistering tools";
-}
-
-function testSelectTool(aToolbox) {
-  toolbox = aToolbox;
-  doc = toolbox.doc;
-  toolbox.once("options-selected", testOptionsShortcut);
-  toolbox.selectTool("options");
-}
-
-function testOptionsShortcut() {
-  ok(true, "Toolbox selected via selectTool method");
-  toolbox.once("options-selected", testOptionsButtonClick);
-  toolbox.selectTool("webconsole")
-         .then(() => synthesizeKeyFromKeyTag("toolbox-options-key", doc));
-}
-
-function testOptionsButtonClick() {
-  ok(true, "Toolbox selected via shortcut");
-  toolbox.once("options-selected", testOptions);
-  toolbox.selectTool("webconsole")
-         .then(() => doc.getElementById("toolbox-tab-options").click());
-}
-
-function testOptions(event, iframe) {
-  ok(true, "Toolbox selected via button click");
-  panelWin = iframe.contentWindow;
-  let panelDoc = iframe.contentDocument;
-  // Testing pref changes
-  let prefCheckboxes = panelDoc.querySelectorAll("checkbox[data-pref]");
-  for (let checkbox of prefCheckboxes) {
-    prefNodes.push(checkbox);
-    prefValues.push(Services.prefs.getBoolPref(checkbox.getAttribute("data-pref")));
-  }
-  // Do again with opposite values to reset prefs
-  for (let checkbox of prefCheckboxes) {
-    prefNodes.push(checkbox);
-    prefValues.push(!Services.prefs.getBoolPref(checkbox.getAttribute("data-pref")));
-  }
-  testMouseClicks();
-}
-
-function testMouseClicks() {
-  if (index == prefValues.length) {
-    checkTools();
-    return;
-  }
-  gDevTools.once("pref-changed", prefChanged);
-  info("Click event synthesized for index " + index);
-  EventUtils.synthesizeMouse(prefNodes[index], 10, 10, {}, panelWin);
-}
-
-function prefChanged(event, data) {
-  if (data.pref == prefNodes[index].getAttribute("data-pref")) {
-    ok(true, "Correct pref was changed");
-    is(data.oldValue, prefValues[index], "Previous value is correct");
-    is(data.newValue, !prefValues[index], "New value is correct");
-    index++;
-    testMouseClicks();
-    return;
-  }
-  ok(false, "Pref was not changed correctly");
-  cleanup();
-}
-
-function checkTools() {
-  let toolsPref = panelWin.document.querySelectorAll("#default-tools-box > checkbox");
-  prefNodes = [];
-  index = 0;
-  for (let tool of toolsPref) {
-    prefNodes.push(tool);
-  }
-  toggleTools();
-}
-
-function toggleTools() {
-  if (index < prefNodes.length) {
-    gDevTools.once("tool-unregistered", checkUnregistered);
-    EventUtils.synthesizeMouse(prefNodes[index], 10, 10, {}, panelWin);
-  }
-  else if (index < 2*prefNodes.length) {
-    gDevTools.once("tool-registered", checkRegistered);
-    EventUtils.synthesizeMouse(prefNodes[index - prefNodes.length], 10, 10, {}, panelWin);
-  }
-  else {
-    cleanup();
-    return;
-  }
-}
-
-function checkUnregistered(event, data) {
-  if (data == prefNodes[index].getAttribute("id")) {
-    ok(true, "Correct tool removed");
-    // checking tab on the toolbox
-    ok(!doc.getElementById("toolbox-tab-" + data), "Tab removed for " + data);
-    index++;
-    toggleTools();
-    return;
-  }
-  ok(false, "Something went wrong, " + data + " was not unregistered");
-  cleanup();
-}
-
-function checkRegistered(event, data) {
-  if (data == prefNodes[index - prefNodes.length].getAttribute("id")) {
-    ok(true, "Correct tool added back");
-    // checking tab on the toolbox
-    ok(doc.getElementById("toolbox-tab-" + data), "Tab added back for " + data);
-    index++;
-    toggleTools();
-    return;
-  }
-  ok(false, "Something went wrong, " + data + " was not registered back");
-  cleanup();
-}
-
-function cleanup() {
-  toolbox.destroy().then(function() {
-    gBrowser.removeCurrentTab();
-    toolbox = doc = prefNodes = prefValues = panelWin = null;
-    finish();
-  });
-}
diff --git a/browser/devtools/framework/test/head.js b/browser/devtools/framework/test/head.js
index 144a9ed5d484..66df4ab8f0e1 100644
--- a/browser/devtools/framework/test/head.js
+++ b/browser/devtools/framework/test/head.js
@@ -47,29 +47,3 @@ registerCleanupFunction(function tearDown() {
     gBrowser.removeCurrentTab();
   }
 });
-
-function synthesizeKeyFromKeyTag(aKeyId, document) {
-  let key = document.getElementById(aKeyId);
-  isnot(key, null, "Successfully retrieved the <key> node");
-
-  let modifiersAttr = key.getAttribute("modifiers");
-
-  let name = null;
-
-  if (key.getAttribute("keycode"))
-    name = key.getAttribute("keycode");
-  else if (key.getAttribute("key"))
-    name = key.getAttribute("key");
-
-  isnot(name, null, "Successfully retrieved keycode/key");
-
-  let modifiers = {
-    shiftKey: modifiersAttr.match("shift"),
-    ctrlKey: modifiersAttr.match("ctrl"),
-    altKey: modifiersAttr.match("alt"),
-    metaKey: modifiersAttr.match("meta"),
-    accelKey: modifiersAttr.match("accel")
-  }
-
-  EventUtils.synthesizeKey(name, modifiers);
-}
diff --git a/browser/devtools/framework/toolbox-options.js b/browser/devtools/framework/toolbox-options.js
deleted file mode 100644
index fc4525529989..000000000000
--- a/browser/devtools/framework/toolbox-options.js
+++ /dev/null
@@ -1,105 +0,0 @@
-
-const { utils: Cu } = Components;
-const DISABLED_TOOLS = "devtools.toolbox.disabledTools";
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
-
-window.addEventListener("load", function onLoad() {
-  window.removeEventListener("load", onLoad);
-  setupToolsList();
-  populatePreferences();
-});
-
-function setupToolsList() {
-  let disabledTools = [];
-  try {
-    disabledTools = JSON.parse(Services.prefs.getCharPref(DISABLED_TOOLS));
-  } catch(ex) {
-    Cu.reportError("Error parsing pref " + DISABLED_TOOLS + " as JSON.");
-  }
-  let defaultToolsBox = document.getElementById("default-tools-box");
-  let additionalToolsBox = document.getElementById("additional-tools-box");
-
-  defaultToolsBox.textContent = "";
-  additionalToolsBox.textContent = "";
-
-  let onCheckboxClick = function(id) {
-    if (disabledTools.indexOf(id) > -1) {
-      disabledTools.splice(disabledTools.indexOf(id), 1);
-      Services.prefs.setCharPref(DISABLED_TOOLS, JSON.stringify(disabledTools));
-      gDevTools.emit("tool-registered", id);
-    }
-    else {
-      disabledTools.push(id);
-      Services.prefs.setCharPref(DISABLED_TOOLS, JSON.stringify(disabledTools));
-      gDevTools.emit("tool-unregistered", id);
-    }
-  };
-
-  // Populating the default tools lists
-  for (let tool of gDevTools.getDefaultTools()) {
-    let checkbox = document.createElement("checkbox");
-    checkbox.setAttribute("id", tool.id);
-    checkbox.setAttribute("label", tool.label);
-    checkbox.setAttribute("tooltiptext", tool.tooltip || "");
-    checkbox.setAttribute("checked", disabledTools.indexOf(tool.id) == -1);
-    checkbox.addEventListener("command", onCheckboxClick.bind(null, tool.id));
-    defaultToolsBox.appendChild(checkbox);
-  }
-
-  // Populating the additional tools list that came from add-ons.
-  let atleastOneAddon = false;
-  for (let tool of gDevTools.getAdditionalTools()) {
-    atleastOneAddon = true;
-    let checkbox = document.createElement("checkbox");
-    checkbox.setAttribute("id", tool.id);
-    checkbox.setAttribute("label", tool.label);
-    checkbox.setAttribute("tooltiptext", tool.tooltip || "");
-    checkbox.setAttribute("checked", disabledTools.indexOf(tool.id) == -1);
-    checkbox.addEventListener("command", onCheckboxClick.bind(null, tool.id));
-    additionalToolsBox.appendChild(checkbox);
-  }
-
-  if (!atleastOneAddon) {
-    additionalToolsBox.style.display = "none";
-    additionalToolsBox.previousSibling.style.display = "none";
-  }
-
-  window.focus();
-}
-
-function populatePreferences() {
-  let prefCheckboxes = document.querySelectorAll("checkbox[data-pref]");
-  for (let checkbox of prefCheckboxes) {
-    checkbox.checked = Services.prefs.getBoolPref(checkbox.getAttribute("data-pref"));
-    checkbox.addEventListener("command", function() {
-      let data = {
-        pref: this.getAttribute("data-pref"),
-        newValue: this.checked
-      };
-      data.oldValue = Services.prefs.getBoolPref(data.pref);
-      Services.prefs.setBoolPref(data.pref, data.newValue);
-      gDevTools.emit("pref-changed", data);
-    }.bind(checkbox));
-  }
-  let prefRadiogroups = document.querySelectorAll("radiogroup[data-pref]");
-  for (let radiogroup of prefRadiogroups) {
-    let selectedValue = Services.prefs.getCharPref(radiogroup.getAttribute("data-pref"));
-    for (let radio of radiogroup.childNodes) {
-      radiogroup.selectedIndex = -1;
-      if (radio.getAttribute("value") == selectedValue) {
-        radiogroup.selectedItem = radio;
-        break;
-      }
-    }
-    radiogroup.addEventListener("select", function() {
-      let data = {
-        pref: this.getAttribute("data-pref"),
-        newValue: this.selectedItem.getAttribute("value")
-      };
-      data.oldValue = Services.prefs.getCharPref(data.pref);
-      Services.prefs.setCharPref(data.pref, data.newValue);
-      gDevTools.emit("pref-changed", data);
-    }.bind(radiogroup));
-  }
-}
diff --git a/browser/devtools/framework/toolbox-options.xul b/browser/devtools/framework/toolbox-options.xul
deleted file mode 100644
index dbd4e8357614..000000000000
--- a/browser/devtools/framework/toolbox-options.xul
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-<!DOCTYPE window [
-<!ENTITY % toolboxDTD SYSTEM "chrome://browser/locale/devtools/toolbox.dtd" >
- %toolboxDTD;
-]>
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet rel="stylesheet" href="chrome://browser/content/devtools/framework/toolbox.css" type="text/css"?>
-<?xml-stylesheet rel="stylesheet" href="chrome://browser/skin/devtools/toolbox.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript;version=1.8" src="toolbox-options.js"></script>
-  <hbox flex="1" style="overflow: auto">
-    <hbox id="options-panel" flex="1">
-      <vbox id="tools-box" class="options-vertical-pane" flex="1">
-        <label value="&options.selectDefaultTools.label;"/>
-        <vbox id="default-tools-box" class="options-groupbox"/>
-        <label value="&options.selectAdditionalTools.label;"/>
-        <vbox id="additional-tools-box" class="options-groupbox"/>
-      </vbox>
-      <vbox class="options-vertical-pane" flex="1">
-        <label value="&options.selectDevToolsTheme.label;"/>
-        <radiogroup id="devtools-theme-box"
-                    class="options-groupbox"
-                    data-pref="devtools.theme"
-                    orient="horizontal">
-          <radio value="light" label="&options.lightTheme.label;"/>
-          <radio value="dark" label="&options.darkTheme.label;"/>
-        </radiogroup>
-        <label value="&options.context.label;"/>
-        <vbox id="context-options" class="options-groupbox">
-          <checkbox label="&options.enableChrome.label;"
-                    tooltiptext="&options.enableChrome.tooltip;"
-                    data-pref="devtools.chrome.enabled"/>
-          <checkbox label="&options.enableRemote.label;"
-                    tooltiptext="&options.enableRemote.tooltip;"
-                    data-pref="devtools.debugger.remote-enabled"/>
-        </vbox>
-      </vbox>
-    </hbox>
-  </hbox>
-</window>
diff --git a/browser/devtools/framework/toolbox.css b/browser/devtools/framework/toolbox.css
index efd054db508b..03a48c9aaab4 100644
--- a/browser/devtools/framework/toolbox.css
+++ b/browser/devtools/framework/toolbox.css
@@ -13,17 +13,3 @@
 .command-button > .toolbarbutton-text {
   display: none;
 }
-
-#options-panel {
-  overflow-y: auto;
-  display: block;
-}
-
-.options-vertical-pane {
-  display: inline;
-  float: left;
-}
-
-.options-vertical-pane > label {
-  display: block;
-}
diff --git a/browser/devtools/framework/toolbox.xul b/browser/devtools/framework/toolbox.xul
index 16c269615920..297e0c296ad6 100644
--- a/browser/devtools/framework/toolbox.xul
+++ b/browser/devtools/framework/toolbox.xul
@@ -18,12 +18,6 @@
 
   <commandset id="editMenuCommands"/>
   <keyset id="editMenuKeys"/>
-  <keyset id="toolbox-keyset">
-    <key id="toolbox-options-key"
-         key="&toolboxOptionsButton.key;"
-         oncommand="void(0);"
-         modifiers="shift, accel"/>
-  </keyset>
 
   <notificationbox id="toolbox-notificationbox" flex="1">
     <toolbar class="devtools-tabbar">
@@ -34,10 +28,6 @@
         <hbox id="toolbox-dock-buttons"/>
       </hbox>
 #endif
-      <toolbarbutton id="toolbox-tab-options"
-                     autocheck="false"
-                     class="command-button toolbox-tab devtools-tab"
-                     tooltiptext="&toolboxOptionsButton.tooltip;"/>
       <hbox id="toolbox-tabs" flex="1">
       </hbox>
       <hbox id="toolbox-buttons" pack="end"/>
@@ -51,14 +41,6 @@
 #endif
     </toolbar>
     <deck id="toolbox-deck" flex="1">
-      <vbox id="toolbox-panel-options"
-            class="toolbox-panel">
-        <iframe id="toolbox-panel-iframe-options"
-                class="toolbox-panel-iframe"
-                flex="1" forceOwnRefreshDriver=""
-                src="chrome://browser/content/devtools/framework/toolbox-options.xul">
-        </iframe>
-      </vbox>
     </deck>
   </notificationbox>
 </window>
diff --git a/browser/devtools/jar.mn b/browser/devtools/jar.mn
index 8c49610729e4..dbed935bab48 100644
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -57,8 +57,6 @@ browser.jar:
     content/browser/devtools/commandlineoutput.xhtml  (commandline/commandlineoutput.xhtml)
     content/browser/devtools/commandlinetooltip.xhtml  (commandline/commandlinetooltip.xhtml)
     content/browser/devtools/framework/toolbox-window.xul    (framework/toolbox-window.xul)
-    content/browser/devtools/framework/toolbox-options.xul   (framework/toolbox-options.xul)
-    content/browser/devtools/framework/toolbox-options.js    (framework/toolbox-options.js)
 *   content/browser/devtools/framework/toolbox.xul           (framework/toolbox.xul)
     content/browser/devtools/framework/toolbox.css           (framework/toolbox.css)
     content/browser/devtools/inspector/inspector.xul         (inspector/inspector.xul)
diff --git a/browser/devtools/shared/theme-switching.js b/browser/devtools/shared/theme-switching.js
index ce25a8217906..044ae9bde168 100644
--- a/browser/devtools/shared/theme-switching.js
+++ b/browser/devtools/shared/theme-switching.js
@@ -3,65 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 (function() {
-  const DEVTOOLS_SKIN_URL = "chrome://browser/skin/devtools/";
-
-  function forceStyle() {
-    let computedStyle = window.getComputedStyle(document.documentElement);
-    if (!computedStyle) {
-      // Null when documentElement is not ready. This method is anyways not
-      // required then as scrollbars would be in their state without flushing.
-      return;
-    }
-    let display = computedStyle.display; // Save display value
-    document.documentElement.style.display = "none";
-    window.getComputedStyle(document.documentElement).display; // Flush
-    document.documentElement.style.display = display; // Restore
-  }
-
-  function switchTheme(theme, oldTheme) {
-    let winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                         .getInterface(Ci.nsIDOMWindowUtils);
-    if (oldTheme && theme != oldTheme) {
-      let old_theme_url = Services.io.newURI(DEVTOOLS_SKIN_URL + oldTheme +
-                                             "-theme.css", null, null);
-      try {
-        winUtils.removeSheet(old_theme_url, window.AUTHOR_SHEET);
-      } catch(ex) {}
-    }
-    let theme_url = Services.io.newURI( +
-                                       theme + "-theme.css", null, null);
-    winUtils.loadSheet(theme_url, window.AUTHOR_SHEET);
-    let scrollbar_url =
-      Services.io.newURI(DEVTOOLS_SKIN_URL + "floating-scrollbars-light.css",
-                         null, null);
-    if (theme == "dark") {
-      winUtils.loadSheet(scrollbar_url, window.AGENT_SHEET);
-      forceStyle();
-    }
-    else if (oldTheme == "dark") {
-      try {
-        winUtils.removeSheet(scrollbar_url, window.AGENT_SHEET);
-      } catch(ex) {}
-      forceStyle();
-    }
-    document.documentElement.classList.remove("theme-" + oldTheme);
-    document.documentElement.classList.add("theme-" + theme);
-  }
-
-  function handlePrefChange(event, data) {
-    switch(data.pref) {
-      case "devtools.theme":
-        switchTheme(data.newValue, data.oldValue);
-    }
-  }
-
   const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
   Cu.import("resource://gre/modules/Services.jsm");
-  Cu.import("resource:///modules/devtools/gDevTools.jsm");
   let theme = Services.prefs.getCharPref("devtools.theme");
-  switchTheme(theme);
-  gDevTools.on("pref-changed", handlePrefChange);
-  window.addEventListener("unload", function() {
-    gDevTools.off("pref-changed", handlePrefChange);
-  });
+  let theme_url = Services.io.newURI("chrome://browser/skin/devtools/" + theme + "-theme.css", null, null);
+  let winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
+  winUtils.loadSheet(theme_url, window.AUTHOR_SHEET);
+  if (theme == "dark") {
+    let scrollbar_url = Services.io.newURI("chrome://browser/skin/devtools/floating-scrollbars-light.css", null, null);
+    winUtils.loadSheet(scrollbar_url, window.AGENT_SHEET);
+  }
+  document.documentElement.classList.add("theme-" + theme);
 })()
diff --git a/browser/devtools/shared/widgets/SideMenuWidget.jsm b/browser/devtools/shared/widgets/SideMenuWidget.jsm
index 5e98ee6a88a5..d11c898f23b6 100644
--- a/browser/devtools/shared/widgets/SideMenuWidget.jsm
+++ b/browser/devtools/shared/widgets/SideMenuWidget.jsm
@@ -117,9 +117,7 @@ SideMenuWidget.prototype = {
    *        The element associated with the displayed item.
    */
   removeChild: function SMW_removeChild(aChild) {
-    // Remove the item itself, not the contents.
-    let item = aChild.parentNode;
-    item.parentNode.removeChild(item);
+    aChild.parentNode.removeChild(aChild);
     this._orderedMenuElementsArray.splice(
       this._orderedMenuElementsArray.indexOf(aChild), 1);
 
diff --git a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
index 86339ba8713b..57efe9e36dfa 100644
--- a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
@@ -4,19 +4,4 @@
 
 <!ENTITY closeCmd.key  "W">
 
-<!ENTITY toolboxCloseButton.tooltip    "Close Developer Tools">
-<!ENTITY toolboxOptionsButton.tooltip  "Toggle Options Panel">
-<!ENTITY toolboxOptionsButton.key      "O">
-
-<!ENTITY options.context.label         "Advanced settings. (Requires a browser restart)">
-<!ENTITY options.enableChrome.label    "Enable Chrome debugging.">
-<!ENTITY options.enableChrome.tooltip  "Turning this option on will allow you to use various developer tools in browser context.">
-<!ENTITY options.enableRemote.label    "Enable Remote Debugging.">
-<!ENTITY options.enableRemote.tooltip  "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS.">
-
-<!ENTITY options.selectDefaultTools.label     "Default Firefox Developer Tools">
-<!ENTITY options.selectAdditionalTools.label  "Developer Tools installed by add-ons">
-
-<!ENTITY options.selectDevToolsTheme.label   "Choose DevTools theme:">
-<!ENTITY options.darkTheme.label             "Dark Theme">
-<!ENTITY options.lightTheme.label            "Light Theme">
+<!ENTITY toolboxCloseButton.tooltip  "Close Developer Tools">
diff --git a/browser/themes/linux/devtools/toolbox.css b/browser/themes/linux/devtools/toolbox.css
index 42807bb0aef8..ed42d821296e 100644
--- a/browser/themes/linux/devtools/toolbox.css
+++ b/browser/themes/linux/devtools/toolbox.css
@@ -128,19 +128,6 @@
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
-#toolbox-tab-options {
-  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#toolbox-tab-options[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#toolbox-tab-options > image {
-  opacity: 1;
-  -moz-margin-start: 0;
-}
 
 /* Tabs */
 
@@ -237,28 +224,3 @@
   background-position: top right, top left, left, right;
   box-shadow: 1px -1px 0 hsla(206,37%,4%,.2) inset;
 }
-
-#options-panel {
-  background-image: url("chrome://browser/skin/newtab/noise.png");
-}
-
-.options-vertical-pane {
-  margin: 15px;
-  width: calc(50% - 30px);
-  min-width: 400px;
-  -moz-padding-start: 5px;
-}
-
-.options-vertical-pane > label {
-  padding: 5px 0;
-  font-size: 1.4rem;
-}
-
-.options-groupbox {
-  -moz-margin-start: 15px;
-  padding: 4px;
-}
-
-.options-groupbox > * {
-  padding: 2px;
-}
diff --git a/browser/themes/osx/devtools/toolbox.css b/browser/themes/osx/devtools/toolbox.css
index 4866fcc45923..cca78b2264b0 100644
--- a/browser/themes/osx/devtools/toolbox.css
+++ b/browser/themes/osx/devtools/toolbox.css
@@ -116,19 +116,6 @@
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
-#toolbox-tab-options {
-  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#toolbox-tab-options[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#toolbox-tab-options > image {
-  opacity: 1;
-  -moz-margin-start: 0;
-}
 
 /* Tabs */
 
@@ -224,28 +211,3 @@
   background-position: top right, top left, left, right;
   box-shadow: 1px -1px 0 hsla(206,37%,4%,.2) inset;
 }
-
-#options-panel {
-  background-image: url("chrome://browser/skin/newtab/noise.png");
-}
-
-.options-vertical-pane {
-  margin: 15px;
-  width: calc(50% - 30px);
-  min-width: 400px;
-  -moz-padding-start: 5px;
-}
-
-.options-vertical-pane > label {
-  padding: 5px 0;
-  font-size: 1.4rem;
-}
-
-.options-groupbox {
-  -moz-margin-start: 15px;
-  padding: 4px;
-}
-
-.options-groupbox > * {
-  padding: 2px;
-}
diff --git a/browser/themes/windows/devtools/toolbox.css b/browser/themes/windows/devtools/toolbox.css
index 4540653bf553..2361d5f196e6 100644
--- a/browser/themes/windows/devtools/toolbox.css
+++ b/browser/themes/windows/devtools/toolbox.css
@@ -131,19 +131,6 @@
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
-#toolbox-tab-options {
-  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#toolbox-tab-options[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#toolbox-tab-options > image {
-  opacity: 1;
-  -moz-margin-start: 0;
-}
 
 /* Tabs */
 
@@ -233,28 +220,3 @@
   background-position: top right, top left, left, right;
   box-shadow: 1px -1px 0 hsla(206,37%,4%,.2) inset;
 }
-
-#options-panel {
-  background-image: url("chrome://browser/skin/newtab/noise.png");
-}
-
-.options-vertical-pane {
-  margin: 15px;
-  width: calc(50% - 30px);
-  min-width: 400px;
-  -moz-padding-start: 5px;
-}
-
-.options-vertical-pane > label {
-  padding: 5px 0;
-  font-size: 1.4rem;
-}
-
-.options-groupbox {
-  -moz-margin-start: 15px;
-  padding: 4px;
-}
-
-.options-groupbox > * {
-  padding: 2px;
-}

From 1be192843a36da22929c905a70ef61132bf8f4f5 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Mon, 15 Apr 2013 19:10:04 +0300
Subject: [PATCH 305/438] Bug 851231 - Output Console.jsm API calls to the
 browser console; r=jwalker

---
 browser/devtools/webconsole/test/Makefile.in  |   1 +
 .../test/browser_console_consolejsm_output.js | 118 +++++++++
 .../test/browser_longstring_hang.js           |  19 +-
 browser/devtools/webconsole/test/head.js      | 241 ++++++++++++++++--
 toolkit/devtools/Console.jsm                  | 170 ++++++++++--
 5 files changed, 490 insertions(+), 59 deletions(-)
 create mode 100644 browser/devtools/webconsole/test/browser_console_consolejsm_output.js

diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in
index bea96298e458..caa8fa267f0f 100644
--- a/browser/devtools/webconsole/test/Makefile.in
+++ b/browser/devtools/webconsole/test/Makefile.in
@@ -121,6 +121,7 @@ MOCHITEST_BROWSER_FILES = \
 	browser_console_variables_view_while_debugging.js \
 	browser_console.js \
 	browser_longstring_hang.js \
+	browser_console_consolejsm_output.js \
 	head.js \
 	$(NULL)
 
diff --git a/browser/devtools/webconsole/test/browser_console_consolejsm_output.js b/browser/devtools/webconsole/test/browser_console_consolejsm_output.js
new file mode 100644
index 000000000000..9bd8b10c192f
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_console_consolejsm_output.js
@@ -0,0 +1,118 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Test that Console.jsm outputs messages to the Browser Console, bug 851231.
+
+function test()
+{
+  HUDConsoleUI.toggleBrowserConsole().then(consoleOpened);
+  let hud = null;
+
+  function consoleOpened(aHud)
+  {
+    hud = aHud;
+    hud.jsterm.clearOutput(true);
+
+    let console = Cu.import("resource://gre/modules/devtools/Console.jsm", {}).console;
+
+    console.time("foobarTimer");
+    let foobar = { bug851231prop: "bug851231value" };
+
+    console.log("bug851231-log");
+    console.info("bug851231-info");
+    console.warn("bug851231-warn");
+    console.error("bug851231-error", foobar);
+    console.debug("bug851231-debug");
+    console.trace();
+    console.dir(document);
+    console.timeEnd("foobarTimer");
+
+    info("wait for the Console.jsm messages");
+
+    waitForMessages({
+      webconsole: hud,
+      messages: [
+        {
+          name: "console.log output",
+          text: "bug851231-log",
+          category: CATEGORY_WEBDEV,
+          severity: SEVERITY_LOG,
+        },
+        {
+          name: "console.info output",
+          text: "bug851231-info",
+          category: CATEGORY_WEBDEV,
+          severity: SEVERITY_INFO,
+        },
+        {
+          name: "console.warn output",
+          text: "bug851231-warn",
+          category: CATEGORY_WEBDEV,
+          severity: SEVERITY_WARNING,
+        },
+        {
+          name: "console.error output",
+          text: /\bbug851231-error\b.+\[object Object\]/,
+          category: CATEGORY_WEBDEV,
+          severity: SEVERITY_ERROR,
+          objects: true,
+        },
+        {
+          name: "console.debug output",
+          text: "bug851231-debug",
+          category: CATEGORY_WEBDEV,
+          severity: SEVERITY_LOG,
+        },
+        {
+          name: "console.trace output",
+          consoleTrace: {
+            file: "browser_console_consolejsm_output.js",
+            fn: "consoleOpened",
+          },
+        },
+        {
+          name: "console.dir output",
+          consoleDir: "[object XULDocument]",
+        },
+        {
+          name: "console.time output",
+          consoleTime: "foobarTimer",
+        },
+        {
+          name: "console.timeEnd output",
+          consoleTimeEnd: "foobarTimer",
+        },
+      ],
+    }).then((aResults) => {
+      let consoleErrorMsg = aResults[3];
+      ok(consoleErrorMsg, "console.error message element found");
+      let clickable = consoleErrorMsg.clickableElements[0];
+      ok(clickable, "clickable object found for console.error");
+
+      let onFetch = (aEvent, aVar) => {
+        // Skip the notification from console.dir variablesview-fetched.
+        if (aVar._variablesView != hud.jsterm._variablesView) {
+          return;
+        }
+        hud.jsterm.off("variablesview-fetched", onFetch);
+
+        ok(aVar, "object inspector opened on click");
+
+        findVariableViewProperties(aVar, [{
+          name: "bug851231prop",
+          value: "bug851231value",
+        }], { webconsole: hud }).then(finishTest);
+      };
+
+      hud.jsterm.on("variablesview-fetched", onFetch);
+
+      scrollOutputToNode(clickable);
+
+      info("wait for variablesview-fetched");
+      executeSoon(() =>
+        EventUtils.synthesizeMouse(clickable, 2, 2, {}, hud.iframeWindow));
+    });
+  }
+}
diff --git a/browser/devtools/webconsole/test/browser_longstring_hang.js b/browser/devtools/webconsole/test/browser_longstring_hang.js
index 4ec5b2070be5..0a36006801e6 100644
--- a/browser/devtools/webconsole/test/browser_longstring_hang.js
+++ b/browser/devtools/webconsole/test/browser_longstring_hang.js
@@ -42,13 +42,10 @@ function test()
 
   function onInitialString(aResults)
   {
-    let msg = [...aResults[0].matched][0];
-    ok(msg, "console.log result message element");
-
-    let clickable = msg.querySelector(".longStringEllipsis");
+    let clickable = aResults[0].longStrings[0];
     ok(clickable, "long string ellipsis is shown");
 
-    scrollToVisible(clickable);
+    scrollOutputToNode(clickable);
 
     executeSoon(() => {
       EventUtils.synthesizeMouse(clickable, 2, 2, {}, hud.iframeWindow);
@@ -73,16 +70,4 @@ function test()
       }).then(finishTest);
     });
   }
-
-  function scrollToVisible(aNode)
-  {
-    let richListBoxNode = aNode.parentNode;
-    while (richListBoxNode.tagName != "richlistbox") {
-      richListBoxNode = richListBoxNode.parentNode;
-    }
-
-    let boxObject = richListBoxNode.scrollBoxObject;
-    let nsIScrollBoxObject = boxObject.QueryInterface(Ci.nsIScrollBoxObject);
-    nsIScrollBoxObject.ensureElementIsVisible(aNode);
-  }
 }
diff --git a/browser/devtools/webconsole/test/head.js b/browser/devtools/webconsole/test/head.js
index 97e84c9a0cbc..4f15d19d4a55 100644
--- a/browser/devtools/webconsole/test/head.js
+++ b/browser/devtools/webconsole/test/head.js
@@ -252,7 +252,7 @@ function waitForOpenContextMenu(aContextMenu, aOptions) {
 function dumpConsoles()
 {
   if (gPendingOutputTest) {
-    console.log("dumpConsoles");
+    console.log("dumpConsoles start");
     for each (let hud in HUDService.hudReferences) {
       if (!hud.outputNode) {
         console.debug("no output content for", hud.hudId);
@@ -261,25 +261,38 @@ function dumpConsoles()
 
       console.debug("output content for", hud.hudId);
       for (let elem of hud.outputNode.childNodes) {
-        let text = getMessageElementText(elem);
-        let repeats = elem.querySelector(".webconsole-msg-repeat");
-        if (repeats) {
-          repeats = repeats.getAttribute("value");
-        }
-        console.debug("date", elem.timestamp,
-                      "class", elem.className,
-                      "category", elem.category,
-                      "severity", elem.severity,
-                      "repeats", repeats,
-                      "clipboardText", elem.clipboardText,
-                      "text", text);
+        dumpMessageElement(elem);
       }
     }
+    console.log("dumpConsoles end");
 
     gPendingOutputTest = 0;
   }
 }
 
+/**
+ * Dump to output debug information for the given webconsole message.
+ *
+ * @param nsIDOMNode aMessage
+ *        The message element you want to display.
+ */
+function dumpMessageElement(aMessage)
+{
+  let text = getMessageElementText(aMessage);
+  let repeats = aMessage.querySelector(".webconsole-msg-repeat");
+  if (repeats) {
+    repeats = repeats.getAttribute("value");
+  }
+  console.debug("id", aMessage.getAttribute("id"),
+                "date", aMessage.timestamp,
+                "class", aMessage.className,
+                "category", aMessage.category,
+                "severity", aMessage.severity,
+                "repeats", repeats,
+                "clipboardText", aMessage.clipboardText,
+                "text", text);
+}
+
 function finishTest()
 {
   browser = hudId = hud = filterBox = outputNode = cs = null;
@@ -888,6 +901,104 @@ function waitForMessages(aOptions)
     return result;
   }
 
+  function checkConsoleTrace(aRule, aElement)
+  {
+    let elemText = getMessageElementText(aElement);
+    let trace = aRule.consoleTrace;
+
+    if (!checkText("Stack trace from ", elemText)) {
+      return false;
+    }
+
+    let clickable = aElement.querySelector(".hud-clickable");
+    if (!clickable) {
+      ok(false, "console.trace() message is missing .hud-clickable");
+      displayErrorContext(aRule, aElement);
+      return false;
+    }
+    aRule.clickableElements = [clickable];
+
+    if (trace.file &&
+        !checkText("from " + trace.file + ", ", elemText)) {
+      ok(false, "console.trace() message is missing the file name: " +
+                trace.file);
+      displayErrorContext(aRule, aElement);
+      return false;
+    }
+
+    if (trace.fn &&
+        !checkText(", function " + trace.fn + ", ", elemText)) {
+      ok(false, "console.trace() message is missing the function name: " +
+                trace.fn);
+      displayErrorContext(aRule, aElement);
+      return false;
+    }
+
+    if (trace.line &&
+        !checkText(", line " + trace.line + ".", elemText)) {
+      ok(false, "console.trace() message is missing the line number: " +
+                trace.line);
+      displayErrorContext(aRule, aElement);
+      return false;
+    }
+
+    aRule.category = CATEGORY_WEBDEV;
+    aRule.severity = SEVERITY_LOG;
+
+    return true;
+  }
+
+  function checkConsoleTime(aRule, aElement)
+  {
+    let elemText = getMessageElementText(aElement);
+    let time = aRule.consoleTime;
+
+    if (!checkText(time + ": timer started", elemText)) {
+      return false;
+    }
+
+    aRule.category = CATEGORY_WEBDEV;
+    aRule.severity = SEVERITY_LOG;
+
+    return true;
+  }
+
+  function checkConsoleTimeEnd(aRule, aElement)
+  {
+    let elemText = getMessageElementText(aElement);
+    let time = aRule.consoleTimeEnd;
+    let regex = new RegExp(time + ": \\d+ms");
+
+    if (!checkText(regex, elemText)) {
+      return false;
+    }
+
+    aRule.category = CATEGORY_WEBDEV;
+    aRule.severity = SEVERITY_LOG;
+
+    return true;
+  }
+
+  function checkConsoleDir(aRule, aElement)
+  {
+    if (!aElement.classList.contains("webconsole-msg-inspector")) {
+      return false;
+    }
+
+    let elemText = getMessageElementText(aElement);
+    if (!checkText(aRule.consoleDir, elemText)) {
+      return false;
+    }
+
+    let iframe = aElement.querySelector("iframe");
+    if (!iframe) {
+      ok(false, "console.dir message has no iframe");
+      return false;
+    }
+
+    return true;
+  }
+
   function checkMessage(aRule, aElement)
   {
     let elemText = getMessageElementText(aElement);
@@ -900,16 +1011,41 @@ function waitForMessages(aOptions)
       return false;
     }
 
-    if (aRule.category) {
-      if (aElement.category != aRule.category) {
-        return false;
-      }
+    if (aRule.consoleTrace && !checkConsoleTrace(aRule, aElement)) {
+      return false;
     }
 
-    if (aRule.severity) {
-      if (aElement.severity != aRule.severity) {
-        return false;
+    if (aRule.consoleTime && !checkConsoleTime(aRule, aElement)) {
+      return false;
+    }
+
+    if (aRule.consoleTimeEnd && !checkConsoleTimeEnd(aRule, aElement)) {
+      return false;
+    }
+
+    if (aRule.consoleDir && !checkConsoleDir(aRule, aElement)) {
+      return false;
+    }
+
+    let partialMatch = !!(aRule.consoleTrace || aRule.consoleTime ||
+                          aRule.consoleTimeEnd);
+
+    if (aRule.category && aElement.category != aRule.category) {
+      if (partialMatch) {
+        is(aElement.category, aRule.category,
+           "message category for rule: " + displayRule(aRule));
+        displayErrorContext(aRule, aElement);
       }
+      return false;
+    }
+
+    if (aRule.severity && aElement.severity != aRule.severity) {
+      if (partialMatch) {
+        is(aElement.severity, aRule.severity,
+           "message severity for rule: " + displayRule(aRule));
+        displayErrorContext(aRule, aElement);
+      }
+      return false;
     }
 
     if (aRule.repeats) {
@@ -919,9 +1055,32 @@ function waitForMessages(aOptions)
       }
     }
 
-    let longString = !!aElement.querySelector(".longStringEllipsis");
-    if ("longString" in aRule && aRule.longString != longString) {
-      return false;
+    if ("longString" in aRule) {
+      let longStrings = aElement.querySelectorAll(".longStringEllipsis");
+      if (aRule.longString != !!longStrings[0]) {
+        if (partialMatch) {
+          is(!!longStrings[0], aRule.longString,
+             "long string existence check failed for message rule: " +
+             displayRule(aRule));
+          displayErrorContext(aRule, aElement);
+        }
+        return false;
+      }
+      aRule.longStrings = longStrings;
+    }
+
+    if ("objects" in aRule) {
+      let clickables = aElement.querySelectorAll(".hud-clickable");
+      if (aRule.objects != !!clickables[0]) {
+        if (partialMatch) {
+          is(!!clickables[0], aRule.objects,
+             "objects existence check failed for message rule: " +
+             displayRule(aRule));
+          displayErrorContext(aRule, aElement);
+        }
+        return false;
+      }
+      aRule.clickableElements = clickables;
     }
 
     let count = aRule.count || 1;
@@ -936,6 +1095,16 @@ function waitForMessages(aOptions)
   function onMessagesAdded(aEvent, aNewElements)
   {
     for (let elem of aNewElements) {
+      let location = elem.querySelector(".webconsole-location");
+      if (location) {
+        let url = location.getAttribute("title");
+        // Prevent recursion with the browser console and any potential
+        // messages coming from head.js.
+        if (url.indexOf("browser/devtools/webconsole/test/head.js") != -1) {
+          continue;
+        }
+      }
+
       for (let rule of rules) {
         if (rule._ruleMatched) {
           continue;
@@ -989,6 +1158,13 @@ function waitForMessages(aOptions)
     return aRule.name || aRule.text;
   }
 
+  function displayErrorContext(aRule, aElement)
+  {
+    console.log("error occured during rule " + displayRule(aRule));
+    console.log("while checking the following message");
+    dumpMessageElement(aElement);
+  }
+
   executeSoon(() => {
     onMessagesAdded("messages-added", webconsole.outputNode.childNodes);
     if (rulesMatched != rules.length) {
@@ -1001,3 +1177,22 @@ function waitForMessages(aOptions)
 
   return deferred.promise;
 }
+
+
+/**
+ * Scroll the Web Console output to the given node.
+ *
+ * @param nsIDOMNode aNode
+ *        The node to scroll to.
+ */
+function scrollOutputToNode(aNode)
+{
+  let richListBoxNode = aNode.parentNode;
+  while (richListBoxNode.tagName != "richlistbox") {
+    richListBoxNode = richListBoxNode.parentNode;
+  }
+
+  let boxObject = richListBoxNode.scrollBoxObject;
+  let nsIScrollBoxObject = boxObject.QueryInterface(Ci.nsIScrollBoxObject);
+  nsIScrollBoxObject.ensureElementIsVisible(aNode);
+}
diff --git a/toolkit/devtools/Console.jsm b/toolkit/devtools/Console.jsm
index 8d78dfabd21a..6a90d079ceb5 100644
--- a/toolkit/devtools/Console.jsm
+++ b/toolkit/devtools/Console.jsm
@@ -24,6 +24,11 @@ this.EXPORTED_SYMBOLS = [ "console" ];
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+                                  "resource://gre/modules/Services.jsm");
+
+let gTimerRegistry = new Map();
+
 /**
  * String utility to ensure that strings are a specified length. Strings
  * that are too long are truncated to the max length and the last char is
@@ -250,7 +255,7 @@ function logProperty(aProp, aValue) {
 
 /**
  * Parse a stack trace, returning an array of stack frame objects, where
- * each has file/line/call members
+ * each has filename/lineNumber/functionName members
  *
  * @param {string} aStack
  *        The serialized stack trace
@@ -266,35 +271,42 @@ function parseStack(aStack) {
     let at = line.lastIndexOf("@");
     let posn = line.substring(at + 1);
     trace.push({
-      file: posn.split(":")[0],
-      line: posn.split(":")[1],
-      call: line.substring(0, at)
+      filename: posn.split(":")[0],
+      lineNumber: posn.split(":")[1],
+      functionName: line.substring(0, at)
     });
   });
   return trace;
 }
 
 /**
- * parseStack() takes output from an exception from which it creates the an
- * array of stack frame objects, this has the same output but using data from
- * Components.stack
+ * Format a frame coming from Components.stack such that it can be used by the
+ * Browser Console, via console-api-log-event notifications.
  *
- * @param {string} aFrame
- *        The stack frame from which to begin the walk
+ * @param {object} aFrame
+ *        The stack frame from which to begin the walk.
+ * @param {number=0} aMaxDepth
+ *        Maximum stack trace depth. Default is 0 - no depth limit.
  * @return {object[]}
- *        Array of { file: "...", line: NNN, call: "..." } objects
+ *         An array of {filename, lineNumber, functionName, language} objects.
+ *         These objects follow the same format as other console-api-log-event
+ *         messages.
  */
-function getStack(aFrame) {
+function getStack(aFrame, aMaxDepth = 0) {
   if (!aFrame) {
     aFrame = Components.stack.caller;
   }
   let trace = [];
   while (aFrame) {
     trace.push({
-      file: aFrame.filename,
-      line: aFrame.lineNumber,
-      call: aFrame.name
+      filename: aFrame.filename,
+      lineNumber: aFrame.lineNumber,
+      functionName: aFrame.name,
+      language: aFrame.language,
     });
+    if (aMaxDepth == trace.length) {
+      break;
+    }
     aFrame = aFrame.caller;
   }
   return trace;
@@ -311,13 +323,52 @@ function getStack(aFrame) {
 function formatTrace(aTrace) {
   let reply = "";
   aTrace.forEach(function(frame) {
-    reply += fmt(frame.file, 20, 20, { truncate: "start" }) + " " +
-             fmt(frame.line, 5, 5) + " " +
-             fmt(frame.call, 75, 75) + "\n";
+    reply += fmt(frame.filename, 20, 20, { truncate: "start" }) + " " +
+             fmt(frame.lineNumber, 5, 5) + " " +
+             fmt(frame.functionName, 75, 75) + "\n";
   });
   return reply;
 }
 
+/**
+ * Create a new timer by recording the current time under the specified name.
+ *
+ * @param {string} aName
+ *        The name of the timer.
+ * @param {number} [aTimestamp=Date.now()]
+ *        Optional timestamp that tells when the timer was originally started.
+ * @return {object}
+ *         The name property holds the timer name and the started property
+ *         holds the time the timer was started. In case of error, it returns
+ *         an object with the single property "error" that contains the key
+ *         for retrieving the localized error message.
+ */
+function startTimer(aName, aTimestamp) {
+  let key = aName.toString();
+  if (!gTimerRegistry.has(key)) {
+    gTimerRegistry.set(key, aTimestamp || Date.now());
+  }
+  return { name: aName, started: gTimerRegistry.get(key) };
+}
+
+/**
+ * Stop the timer with the specified name and retrieve the elapsed time.
+ *
+ * @param {string} aName
+ *        The name of the timer.
+ * @param {number} [aTimestamp=Date.now()]
+ *        Optional timestamp that tells when the timer was originally stopped.
+ * @return {object}
+ *         The name property holds the timer name and the duration property
+ *         holds the number of milliseconds since the timer was started.
+ */
+function stopTimer(aName, aTimestamp) {
+  let key = aName.toString();
+  let duration = (aTimestamp || Date.now()) - gTimerRegistry.get(key);
+  gTimerRegistry.delete(key);
+  return { name: aName, duration: duration };
+}
+
 /**
  * Create a function which will output a concise level of output when used
  * as a logging function
@@ -332,6 +383,8 @@ function formatTrace(aTrace) {
 function createDumper(aLevel) {
   return function() {
     let args = Array.prototype.slice.call(arguments, 0);
+    let frame = getStack(Components.stack.caller, 1)[0];
+    sendConsoleAPIMessage(aLevel, frame, args);
     let data = args.map(function(arg) {
       return stringify(arg);
     });
@@ -354,12 +407,72 @@ function createMultiLineDumper(aLevel) {
   return function() {
     dump("console." + aLevel + ": \n");
     let args = Array.prototype.slice.call(arguments, 0);
+    let frame = getStack(Components.stack.caller, 1)[0];
+    sendConsoleAPIMessage(aLevel, frame, args);
     args.forEach(function(arg) {
       dump(log(arg));
     });
   };
 }
 
+/**
+ * Send a Console API message. This function will send a console-api-log-event
+ * notification through the nsIObserverService.
+ *
+ * @param {string} aLevel
+ *        Message severity level. This is usually the name of the console method
+ *        that was called.
+ * @param {object} aFrame
+ *        The youngest stack frame coming from Components.stack, as formatted by
+ *        getStack().
+ * @param {array} aArgs
+ *        The arguments given to the console method.
+ * @param {object} aOptions
+ *        Object properties depend on the console method that was invoked:
+ *        - timer: for time() and timeEnd(). Holds the timer information.
+ *        - groupName: for group(), groupCollapsed() and groupEnd().
+ *        - stacktrace: for trace(). Holds the array of stack frames as given by
+ *        getStack().
+ */
+function sendConsoleAPIMessage(aLevel, aFrame, aArgs, aOptions = {})
+{
+  let consoleEvent = {
+    ID: aFrame.filename,
+    level: aLevel,
+    filename: aFrame.filename,
+    lineNumber: aFrame.lineNumber,
+    functionName: aFrame.functionName,
+    timeStamp: Date.now(),
+    arguments: aArgs,
+  };
+
+  consoleEvent.wrappedJSObject = consoleEvent;
+
+  switch (aLevel) {
+    case "trace":
+      consoleEvent.stacktrace = aOptions.stacktrace;
+      break;
+    case "time":
+    case "timeEnd":
+      consoleEvent.timer = aOptions.timer;
+      break;
+    case "group":
+    case "groupCollapsed":
+    case "groupEnd":
+      try {
+        consoleEvent.groupName = Array.prototype.join.call(aArgs, " ");
+      }
+      catch (ex) {
+        Cu.reportError(ex);
+        Cu.reportError(ex.stack);
+        return;
+      }
+      break;
+  }
+
+  Services.obs.notifyObservers(consoleEvent, "console-api-log-event", null);
+}
+
 /**
  * This creates a console object that somewhat replicates Firebug's console
  * object. It currently writes to dump(), but should write to the web
@@ -373,13 +486,32 @@ this.console = {
   error: createMultiLineDumper("error"),
 
   trace: function Console_trace() {
+    let args = Array.prototype.slice.call(arguments, 0);
     let trace = getStack(Components.stack.caller);
-    dump(formatTrace(trace) + "\n");
+    sendConsoleAPIMessage("trace", trace[0], args,
+                          { stacktrace: trace });
+    dump("console.trace:\n" + formatTrace(trace) + "\n");
   },
   clear: function Console_clear() {},
 
   dir: createMultiLineDumper("dir"),
   dirxml: createMultiLineDumper("dirxml"),
   group: createDumper("group"),
-  groupEnd: createDumper("groupEnd")
+  groupEnd: createDumper("groupEnd"),
+
+  time: function Console_time() {
+    let args = Array.prototype.slice.call(arguments, 0);
+    let frame = getStack(Components.stack.caller, 1)[0];
+    let timer = startTimer(args[0]);
+    sendConsoleAPIMessage("time", frame, args, { timer: timer });
+    dump("console.time: '" + timer.name + "' @ " + (new Date()) + "\n");
+  },
+
+  timeEnd: function Console_timeEnd() {
+    let args = Array.prototype.slice.call(arguments, 0);
+    let frame = getStack(Components.stack.caller, 1)[0];
+    let timer = stopTimer(args[0]);
+    sendConsoleAPIMessage("timeEnd", frame, args, { timer: timer });
+    dump("console.timeEnd: '" + timer.name + "' " + timer.duration + "ms\n");
+  },
 };

From fd614541960c6090fc6b2adc72f7dda83d6c96d9 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Tue, 16 Apr 2013 08:52:55 +0300
Subject: [PATCH 306/438] Bug 861852 - Telemetry data from the remote protocol
 always appear in the remote buckets; r=rcampbell

---
 toolkit/devtools/debugger/dbg-client.jsm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/toolkit/devtools/debugger/dbg-client.jsm b/toolkit/devtools/debugger/dbg-client.jsm
index f1c037aa3af8..bd1db6e50a73 100644
--- a/toolkit/devtools/debugger/dbg-client.jsm
+++ b/toolkit/devtools/debugger/dbg-client.jsm
@@ -245,7 +245,7 @@ DebuggerClient.requester = function DC_requester(aPacketSkeleton, { telemetry,
   return function (...args) {
     let histogram, startTime;
     if (telemetry) {
-      let transportType = this._transport instanceof LocalDebuggerTransport
+      let transportType = this._transport.onOutputStreamReady === undefined
         ? "LOCAL_"
         : "REMOTE_";
       let histogramId = "DEVTOOLS_DEBUGGER_RDP_"
@@ -253,7 +253,6 @@ DebuggerClient.requester = function DC_requester(aPacketSkeleton, { telemetry,
       histogram = Services.telemetry.getHistogramById(histogramId);
       startTime = +new Date;
     }
-
     let outgoingPacket = {
       to: aPacketSkeleton.to || this.actor
     };
@@ -831,6 +830,7 @@ function TabClient(aClient, aActor) {
 
 TabClient.prototype = {
   get actor() { return this._actor },
+  get _transport() { return this._client._transport; },
 
   /**
    * Detach the client from the tab actor.
@@ -885,6 +885,7 @@ ThreadClient.prototype = {
   get actor() { return this._actor; },
 
   get compat() { return this._client.compat; },
+  get _transport() { return this._client._transport; },
 
   _assertPaused: function TC_assertPaused(aCommand) {
     if (!this.paused) {
@@ -1410,6 +1411,7 @@ function GripClient(aClient, aGrip)
 
 GripClient.prototype = {
   get actor() { return this._grip.actor },
+  get _transport() { return this._client._transport; },
 
   valid: true,
 
@@ -1500,6 +1502,7 @@ LongStringClient.prototype = {
   get actor() { return this._grip.actor; },
   get length() { return this._grip.length; },
   get initial() { return this._grip.initial; },
+  get _transport() { return this._client._transport; },
 
   valid: true,
 
@@ -1536,6 +1539,8 @@ function SourceClient(aClient, aForm) {
 }
 
 SourceClient.prototype = {
+  get _transport() { return this._client._transport; },
+
   /**
    * Get a long string grip for this SourceClient's source.
    */
@@ -1593,6 +1598,7 @@ BreakpointClient.prototype = {
 
   _actor: null,
   get actor() { return this._actor; },
+  get _transport() { return this._client._transport; },
 
   /**
    * Remove the breakpoint from the server.

From 0c7a23a850d0f83e43d9f3427aa8525789e3c9e0 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Tue, 16 Apr 2013 00:07:00 +0300
Subject: [PATCH 307/438] Bug 772119 - expose source mapped sources over the
 remote debugging protocol; r=past

---
 browser/app/profile/firefox.js                |   1 +
 .../devtools/debugger/debugger-controller.js  |   4 +-
 browser/devtools/debugger/test/Makefile.in    |   5 +
 .../debugger/test/binary_search.coffee        |  18 +
 .../devtools/debugger/test/binary_search.html |  12 +
 .../devtools/debugger/test/binary_search.js   |  30 +
 .../devtools/debugger/test/binary_search.map  |   9 +
 ...rowser_dbg_bug731394_editor-contextmenu.js |  19 +-
 .../test/browser_dbg_source_maps-01.js        | 156 ++++
 toolkit/devtools/debugger/dbg-client.jsm      | 104 +--
 .../debugger/server/dbg-script-actors.js      | 678 ++++++++++++------
 .../devtools/debugger/server/dbg-server.js    |  53 +-
 .../devtools/debugger/tests/unit/head_dbg.js  |   4 +-
 .../debugger/tests/unit/test_breakpoint-04.js |   4 +-
 .../debugger/tests/unit/test_dbgactor.js      |   1 +
 .../tests/unit/test_listsources-02.js         |   2 +-
 .../tests/unit/test_listsources-03.js         |  52 ++
 .../tests/unit/test_profiler_actor.js         |  20 +-
 .../debugger/tests/unit/test_sourcemaps-01.js |  64 ++
 .../debugger/tests/unit/test_sourcemaps-02.js |  73 ++
 .../debugger/tests/unit/test_sourcemaps-03.js | 149 ++++
 .../debugger/tests/unit/testcompatactors.js   |  38 +-
 .../devtools/debugger/tests/unit/xpcshell.ini |   4 +
 toolkit/devtools/sourcemap/SourceMap.jsm      | 476 ++++++++++--
 .../devtools/sourcemap/tests/unit/Utils.jsm   | 133 +++-
 .../tests/unit/test_source_map_consumer.js    | 111 +++
 .../tests/unit/test_source_map_generator.js   | 106 ++-
 .../sourcemap/tests/unit/test_source_node.js  | 121 +++-
 28 files changed, 2046 insertions(+), 401 deletions(-)
 create mode 100644 browser/devtools/debugger/test/binary_search.coffee
 create mode 100644 browser/devtools/debugger/test/binary_search.html
 create mode 100644 browser/devtools/debugger/test/binary_search.js
 create mode 100644 browser/devtools/debugger/test/binary_search.map
 create mode 100644 browser/devtools/debugger/test/browser_dbg_source_maps-01.js
 create mode 100644 toolkit/devtools/debugger/tests/unit/test_listsources-03.js
 create mode 100644 toolkit/devtools/debugger/tests/unit/test_sourcemaps-01.js
 create mode 100644 toolkit/devtools/debugger/tests/unit/test_sourcemaps-02.js
 create mode 100644 toolkit/devtools/debugger/tests/unit/test_sourcemaps-03.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 3dc3ef227516..90dac6abad64 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1060,6 +1060,7 @@ pref("devtools.debugger.remote-host", "localhost");
 pref("devtools.debugger.remote-autoconnect", false);
 pref("devtools.debugger.remote-connection-retries", 3);
 pref("devtools.debugger.remote-timeout", 20000);
+pref("devtools.debugger.source-maps-enabled", false);
 
 // The default Debugger UI settings
 pref("devtools.debugger.ui.win-x", 0);
diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index fc2f51a50879..9df4b43e1269 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -253,6 +253,8 @@ let DebuggerController = {
       if (aCallback) {
         aCallback();
       }
+    }, {
+      useSourceMaps: Services.prefs.getBoolPref("devtools.debugger.source-maps-enabled")
     });
   },
 
@@ -1102,7 +1104,7 @@ SourceScripts.prototype = {
    */
   _onSourcesAdded: function SS__onSourcesAdded(aResponse) {
     if (aResponse.error) {
-      Cu.reportError("Error getting sources: " + aResponse.message);
+      Cu.reportError(new Error("Error getting sources: " + aResponse.message));
       return;
     }
 
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index 7f01762ad840..07eeed6da264 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -96,6 +96,7 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_bfcache.js \
 	browser_dbg_progress-listener-bug.js \
 	browser_dbg_chrome-debugging.js \
+	browser_dbg_source_maps-01.js \
 	head.js \
 	helpers.js \
 	$(NULL)
@@ -127,6 +128,10 @@ MOCHITEST_BROWSER_PAGES = \
 	test-function-search-01.js \
 	test-function-search-02.js \
 	test-function-search-03.js \
+	binary_search.html \
+	binary_search.coffee \
+	binary_search.js \
+	binary_search.map \
 	$(NULL)
 
 MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES
diff --git a/browser/devtools/debugger/test/binary_search.coffee b/browser/devtools/debugger/test/binary_search.coffee
new file mode 100644
index 000000000000..e3dacdaaab50
--- /dev/null
+++ b/browser/devtools/debugger/test/binary_search.coffee
@@ -0,0 +1,18 @@
+# Uses a binary search algorithm to locate a value in the specified array.
+window.binary_search = (items, value) ->
+
+  start = 0
+  stop  = items.length - 1
+  pivot = Math.floor (start + stop) / 2
+
+  while items[pivot] isnt value and start < stop
+
+    # Adjust the search area.
+    stop  = pivot - 1 if value < items[pivot]
+    start = pivot + 1 if value > items[pivot]
+
+    # Recalculate the pivot.
+    pivot = Math.floor (stop + start) / 2
+
+  # Make sure we've found the correct value.
+  if items[pivot] is value then pivot else -1
\ No newline at end of file
diff --git a/browser/devtools/debugger/test/binary_search.html b/browser/devtools/debugger/test/binary_search.html
new file mode 100644
index 000000000000..f9615da7c40d
--- /dev/null
+++ b/browser/devtools/debugger/test/binary_search.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <meta charset='utf-8'/>
+    <title>Browser Debugger Source Map Test</title>
+    <!-- Any copyright is dedicated to the Public Domain.
+         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <script type="text/javascript" src="binary_search.js"></script>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/browser/devtools/debugger/test/binary_search.js b/browser/devtools/debugger/test/binary_search.js
new file mode 100644
index 000000000000..ce77903e1b07
--- /dev/null
+++ b/browser/devtools/debugger/test/binary_search.js
@@ -0,0 +1,30 @@
+// Generated by CoffeeScript 1.6.1
+(function() {
+
+  window.binary_search = function(items, value) {
+    var pivot, start, stop;
+    start = 0;
+    stop = items.length - 1;
+    pivot = Math.floor((start + stop) / 2);
+    while (items[pivot] !== value && start < stop) {
+      if (value < items[pivot]) {
+        stop = pivot - 1;
+      }
+      if (value > items[pivot]) {
+        start = pivot + 1;
+      }
+      pivot = Math.floor((stop + start) / 2);
+    }
+    if (items[pivot] === value) {
+      return pivot;
+    } else {
+      return -1;
+    }
+  };
+
+}).call(this);
+
+// TODO bug 849069: this should just be "binary_search.map", not a full path.
+/*
+//@ sourceMappingURL=http://example.com/browser/browser/devtools/debugger/test/binary_search.map
+*/
diff --git a/browser/devtools/debugger/test/binary_search.map b/browser/devtools/debugger/test/binary_search.map
new file mode 100644
index 000000000000..a86e74783f11
--- /dev/null
+++ b/browser/devtools/debugger/test/binary_search.map
@@ -0,0 +1,9 @@
+{
+  "version": 3,
+  "file": "binary_search.js",
+  "sources": [
+    "http://example.com/browser/browser/devtools/debugger/test/binary_search.coffee"
+  ],
+  "names": [],
+  "mappings": ";AACA;CAAA;CAAA,CAAA,CAAuB,EAAA,CAAjB,GAAkB,IAAxB;CAEE,OAAA,UAAA;CAAA,EAAQ,CAAR,CAAA;CAAA,EACQ,CAAR,CAAa,CAAL;CADR,EAEQ,CAAR,CAAA;CAEA,EAA0C,CAAR,CAAtB,MAAN;CAGJ,EAA6B,CAAR,CAAA,CAArB;CAAA,EAAQ,CAAR,CAAQ,GAAR;QAAA;CACA,EAA6B,CAAR,CAAA,CAArB;CAAA,EAAQ,EAAR,GAAA;QADA;CAAA,EAIQ,CAAI,CAAZ,CAAA;CAXF,IAIA;CAUA,GAAA,CAAS;CAAT,YAA8B;MAA9B;AAA0C,CAAD,YAAA;MAhBpB;CAAvB,EAAuB;CAAvB"
+}
\ No newline at end of file
diff --git a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
index 93ae5ff0e492..fc3b2efb54b4 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
@@ -27,19 +27,22 @@ function test()
     gDebugger = gPane.panelWin;
     resumed = true;
 
-    gDebugger.addEventListener("Debugger:SourceShown", onScriptShown);
+    gDebugger.addEventListener("Debugger:SourceShown", onSourceShown);
 
-    gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
-      framesAdded = true;
-      executeSoon(startTest);
-    });
+    gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded",
+                                                                 onFramesAdded);
 
     executeSoon(function() {
       gDebuggee.firstCall();
     });
   });
 
-  function onScriptShown(aEvent) {
+  function onFramesAdded(aEvent) {
+    framesAdded = true;
+    executeSoon(startTest);
+  }
+
+  function onSourceShown(aEvent) {
     scriptShown = aEvent.detail.url.indexOf("-02.js") != -1;
     executeSoon(startTest);
   }
@@ -48,8 +51,8 @@ function test()
   {
     if (scriptShown && framesAdded && resumed && !testStarted) {
       testStarted = true;
-      gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown);
-      Services.tm.currentThread.dispatch({ run: performTest }, 0);
+      gDebugger.removeEventListener("Debugger:SourceShown", onSourceShown);
+      executeSoon(performTest);
     }
   }
 
diff --git a/browser/devtools/debugger/test/browser_dbg_source_maps-01.js b/browser/devtools/debugger/test/browser_dbg_source_maps-01.js
new file mode 100644
index 000000000000..c8ff8aae95f0
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_source_maps-01.js
@@ -0,0 +1,156 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that we can set breakpoints and step through source mapped coffee
+ * script.
+ */
+
+const TAB_URL = EXAMPLE_URL + "binary_search.html";
+
+var gPane = null;
+var gTab = null;
+var gDebuggee = null;
+var gDebugger = null;
+
+function test()
+{
+  let scriptShown = false;
+  let framesAdded = false;
+  let resumed = false;
+  let testStarted = false;
+
+  Services.prefs.setBoolPref("devtools.debugger.source-maps-enabled", true);
+
+  debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
+    resumed = true;
+    gTab = aTab;
+    gDebuggee = aDebuggee;
+    gPane = aPane;
+    gDebugger = gPane.panelWin;
+
+    gDebugger.addEventListener("Debugger:SourceShown", function _onSourceShown(aEvent) {
+      gDebugger.removeEventListener("Debugger:SourceShown", _onSourceShown);
+      ok(aEvent.detail.url.indexOf(".coffee") != -1,
+         "The debugger should show the source mapped coffee script file.");
+      ok(gDebugger.editor.getText().search(/isnt/) != -1,
+         "The debugger's editor should have the coffee script source displayed.");
+
+      testSetBreakpoint();
+    });
+  });
+}
+
+function testSetBreakpoint() {
+  let { activeThread } = gDebugger.DebuggerController;
+  activeThread.interrupt(function (aResponse) {
+    activeThread.setBreakpoint({
+      url: EXAMPLE_URL + "binary_search.coffee",
+      line: 5
+    }, function (aResponse, bpClient) {
+      ok(!aResponse.error,
+         "Should be able to set a breakpoint in a coffee script file.");
+      testSetBreakpointBlankLine();
+    });
+  });
+}
+
+function testSetBreakpointBlankLine() {
+  let { activeThread } = gDebugger.DebuggerController;
+  activeThread.setBreakpoint({
+      url: EXAMPLE_URL + "binary_search.coffee",
+      line: 3
+  }, function (aResponse, bpClient) {
+    ok(aResponse.actualLocation,
+       "Because 3 is empty, we should have an actualLocation");
+    is(aResponse.actualLocation.url, EXAMPLE_URL + "binary_search.coffee",
+       "actualLocation.url should be source mapped to the coffee file");
+    is(aResponse.actualLocation.line, 2,
+       "actualLocation.line should be source mapped back to 2");
+    testHitBreakpoint();
+  });
+}
+
+function testHitBreakpoint() {
+  let { activeThread } = gDebugger.DebuggerController;
+  activeThread.resume(function (aResponse) {
+    ok(!aResponse.error, "Shouldn't get an error resuming");
+    is(aResponse.type, "resumed", "Type should be 'resumed'");
+
+    activeThread.addOneTimeListener("paused", function (aEvent, aPacket) {
+      is(aPacket.type, "paused",
+         "We should now be paused again");
+      is(aPacket.why.type, "breakpoint",
+         "and the reason we should be paused is because we hit a breakpoint");
+
+      // Check that we stopped at the right place, by making sure that the
+      // environment is in the state that we expect.
+      is(aPacket.frame.environment.bindings.variables.start.value, 0,
+         "'start' is 0");
+      is(aPacket.frame.environment.bindings.variables.stop.value.type, "undefined",
+         "'stop' hasn't been assigned to yet");
+      is(aPacket.frame.environment.bindings.variables.pivot.value.type, "undefined",
+         "'pivot' hasn't been assigned to yet");
+
+      waitForCaretPos(4, testStepping);
+    });
+
+    // This will cause the breakpoint to be hit, and put us back in the paused
+    // state.
+    executeSoon(function() {
+      gDebuggee.binary_search([0, 2, 3, 5, 7, 10], 5);
+    });
+  });
+}
+
+function testStepping() {
+  let { activeThread } = gDebugger.DebuggerController;
+  activeThread.stepIn(function (aResponse) {
+    ok(!aResponse.error, "Shouldn't get an error resuming");
+    is(aResponse.type, "resumed", "Type should be 'resumed'");
+
+    // After stepping, we will pause again, so listen for that.
+    activeThread.addOneTimeListener("paused", function (aEvent, aPacket) {
+
+      // Check that we stopped at the right place, by making sure that the
+      // environment is in the state that we expect.
+      is(aPacket.frame.environment.bindings.variables.start.value, 0,
+         "'start' is 0");
+      is(aPacket.frame.environment.bindings.variables.stop.value, 5,
+         "'stop' hasn't been assigned to yet");
+      is(aPacket.frame.environment.bindings.variables.pivot.value.type, "undefined",
+         "'pivot' hasn't been assigned to yet");
+
+      waitForCaretPos(5, closeDebuggerAndFinish);
+    });
+  });
+}
+
+function waitForCaretPos(number, callback)
+{
+  // Poll every few milliseconds until the source editor line is active.
+  let count = 0;
+  let intervalID = window.setInterval(function() {
+    info("count: " + count + " ");
+    if (++count > 50) {
+      ok(false, "Timed out while polling for the line.");
+      window.clearInterval(intervalID);
+      return closeDebuggerAndFinish();
+    }
+    if (gDebugger.DebuggerView.editor.getCaretPosition().line != number) {
+      return;
+    }
+    // We got the source editor at the expected line, it's safe to callback.
+    window.clearInterval(intervalID);
+    callback();
+  }, 100);
+}
+
+registerCleanupFunction(function() {
+  Services.prefs.setBoolPref("devtools.debugger.source-maps-enabled", false);
+  removeTab(gTab);
+  gPane = null;
+  gTab = null;
+  gDebuggee = null;
+  gDebugger = null;
+});
diff --git a/toolkit/devtools/debugger/dbg-client.jsm b/toolkit/devtools/debugger/dbg-client.jsm
index bd1db6e50a73..03f47948351d 100644
--- a/toolkit/devtools/debugger/dbg-client.jsm
+++ b/toolkit/devtools/debugger/dbg-client.jsm
@@ -412,7 +412,10 @@ DebuggerClient.prototype = {
    */
   attachTab: function DC_attachTab(aTabActor, aOnResponse) {
     let self = this;
-    let packet = { to: aTabActor, type: "attach" };
+    let packet = {
+      to: aTabActor,
+      type: "attach"
+    };
     this.request(packet, function(aResponse) {
       let tabClient;
       if (!aResponse.error) {
@@ -462,10 +465,17 @@ DebuggerClient.prototype = {
    * @param function aOnResponse
    *        Called with the response packet and a ThreadClient
    *        (which will be undefined on error).
+   * @param object aOptions
+   *        Configuration options.
+   *        - useSourceMaps: whether to use source maps or not.
    */
-  attachThread: function DC_attachThread(aThreadActor, aOnResponse) {
+  attachThread: function DC_attachThread(aThreadActor, aOnResponse, aOptions={}) {
     let self = this;
-    let packet = { to: aThreadActor, type: "attach" };
+    let packet = {
+      to: aThreadActor,
+      type: "attach",
+      options: aOptions
+    };
     this.request(packet, function(aResponse) {
       if (!aResponse.error) {
         var threadClient = new ThreadClient(self, aThreadActor);
@@ -522,7 +532,7 @@ DebuggerClient.prototype = {
    */
   _sendRequests: function DC_sendRequests() {
     let self = this;
-    this._pendingRequests = this._pendingRequests.filter(function(request) {
+    this._pendingRequests = this._pendingRequests.filter(function (request) {
       if (request.to in self._activeRequests) {
         return true;
       }
@@ -549,7 +559,7 @@ DebuggerClient.prototype = {
       ? aPacket
       : this.compat.onPacket(aPacket);
 
-    resolve(packet).then(function (aPacket) {
+    resolve(packet).then((aPacket) => {
       if (!this._connected) {
         // Hello packet.
         this._connected = true;
@@ -559,55 +569,53 @@ DebuggerClient.prototype = {
         return;
       }
 
-      try {
-        if (!aPacket.from) {
-          let msg = "Server did not specify an actor, dropping packet: " +
-                    JSON.stringify(aPacket);
-          Cu.reportError(msg);
-          dumpn(msg);
-          return;
-        }
+      if (!aPacket.from) {
+        let msg = "Server did not specify an actor, dropping packet: " +
+                  JSON.stringify(aPacket);
+        Cu.reportError(msg);
+        dumpn(msg);
+        return;
+      }
 
-        let onResponse;
-        // Don't count unsolicited notifications or pauses as responses.
-        if (aPacket.from in this._activeRequests &&
-            !(aPacket.type in UnsolicitedNotifications) &&
-            !(aPacket.type == ThreadStateTypes.paused &&
-              aPacket.why.type in UnsolicitedPauses)) {
-          onResponse = this._activeRequests[aPacket.from].onResponse;
-          delete this._activeRequests[aPacket.from];
-        }
+      let onResponse;
+      // Don't count unsolicited notifications or pauses as responses.
+      if (aPacket.from in this._activeRequests &&
+          !(aPacket.type in UnsolicitedNotifications) &&
+          !(aPacket.type == ThreadStateTypes.paused &&
+            aPacket.why.type in UnsolicitedPauses)) {
+        onResponse = this._activeRequests[aPacket.from].onResponse;
+        delete this._activeRequests[aPacket.from];
+      }
 
-        // Packets that indicate thread state changes get special treatment.
-        if (aPacket.type in ThreadStateTypes &&
-            aPacket.from in this._threadClients) {
-          this._threadClients[aPacket.from]._onThreadState(aPacket);
-        }
-        // On navigation the server resumes, so the client must resume as well.
-        // We achieve that by generating a fake resumption packet that triggers
-        // the client's thread state change listeners.
-        if (this.activeThread &&
-            aPacket.type == UnsolicitedNotifications.tabNavigated &&
-            aPacket.from in this._tabClients) {
-          let resumption = { from: this.activeThread._actor, type: "resumed" };
-          this.activeThread._onThreadState(resumption);
-        }
-        // Only try to notify listeners on events, not responses to requests
-        // that lack a packet type.
-        if (aPacket.type) {
-          this.notify(aPacket.type, aPacket);
-        }
+      // Packets that indicate thread state changes get special treatment.
+      if (aPacket.type in ThreadStateTypes &&
+          aPacket.from in this._threadClients) {
+        this._threadClients[aPacket.from]._onThreadState(aPacket);
+      }
+      // On navigation the server resumes, so the client must resume as well.
+      // We achieve that by generating a fake resumption packet that triggers
+      // the client's thread state change listeners.
+      if (this.activeThread &&
+          aPacket.type == UnsolicitedNotifications.tabNavigated &&
+          aPacket.from in this._tabClients) {
+        let resumption = { from: this.activeThread._actor, type: "resumed" };
+        this.activeThread._onThreadState(resumption);
+      }
+      // Only try to notify listeners on events, not responses to requests
+      // that lack a packet type.
+      if (aPacket.type) {
+        this.notify(aPacket.type, aPacket);
+      }
 
-        if (onResponse) {
-          onResponse(aPacket);
-        }
-      } catch(ex) {
-        dumpn("Error handling response: " + ex + " - stack:\n" + ex.stack);
-        Cu.reportError(ex + "\n" + ex.stack);
+      if (onResponse) {
+        onResponse(aPacket);
       }
 
       this._sendRequests();
-    }.bind(this));
+    }, function (ex) {
+      dumpn("Error handling response: " + ex + " - stack:\n" + ex.stack);
+      Cu.reportError(ex.message + "\n" + ex.stack);
+    });
   },
 
   /**
diff --git a/toolkit/devtools/debugger/server/dbg-script-actors.js b/toolkit/devtools/debugger/server/dbg-script-actors.js
index a5875e1e3a8b..d7fd8a061a9c 100644
--- a/toolkit/devtools/debugger/server/dbg-script-actors.js
+++ b/toolkit/devtools/debugger/server/dbg-script-actors.js
@@ -30,7 +30,6 @@ function ThreadActor(aHooks, aGlobal)
   this._frameActors = [];
   this._environmentActors = [];
   this._hooks = aHooks;
-  this._sources = {};
   this.global = aGlobal;
 
   // A cache of prototype chains for objects that have received a
@@ -46,6 +45,11 @@ function ThreadActor(aHooks, aGlobal)
 
   this.findGlobals = this.globalManager.findGlobals.bind(this);
   this.onNewGlobal = this.globalManager.onNewGlobal.bind(this);
+  this.onNewSource = this.onNewSource.bind(this);
+
+  this._options = {
+    useSourceMaps: false
+  };
 }
 
 /**
@@ -73,13 +77,21 @@ ThreadActor.prototype = {
     return this._threadLifetimePool;
   },
 
+  get sources() {
+    if (!this._sources) {
+      this._sources = new ThreadSources(this, this._options.useSourceMaps,
+                                        this._allowSource, this.onNewSource);
+    }
+    return this._sources;
+  },
+
   clearDebuggees: function TA_clearDebuggees() {
     if (this.dbg) {
       this.dbg.removeAllDebuggees();
     }
     this.conn.removeActorPool(this._threadLifetimePool || undefined);
     this._threadLifetimePool = null;
-    this._sources = {};
+    this._sources = null;
   },
 
   /**
@@ -202,6 +214,8 @@ ThreadActor.prototype = {
 
     this._state = "attached";
 
+    update(this._options, aRequest.options || {});
+
     if (!this.dbg) {
       this._initDebugger();
     }
@@ -226,15 +240,17 @@ ThreadActor.prototype = {
       // We already sent a response to this request, don't send one
       // now.
       return null;
-    } catch(e) {
-      Cu.reportError(e);
+    } catch (e) {
+      reportError(e);
       return { error: "notAttached", message: e.toString() };
     }
   },
 
   onDetach: function TA_onDetach(aRequest) {
     this.disconnect();
-    return { type: "detached" };
+    return {
+      type: "detached"
+    };
   },
 
   /**
@@ -245,15 +261,19 @@ ThreadActor.prototype = {
    *        The newest debuggee frame in the stack.
    * @param object aReason
    *        An object with a 'type' property containing the reason for the pause.
+   * @param function onPacket
+   *        Hook to modify the packet before it is sent. Feel free to return a
+   *        promise.
    */
-  _pauseAndRespond: function TA__pauseAndRespond(aFrame, aReason) {
+  _pauseAndRespond: function TA__pauseAndRespond(aFrame, aReason,
+                                                 onPacket=function (k) k) {
     try {
       let packet = this._paused(aFrame);
       if (!packet) {
         return undefined;
       }
       packet.why = aReason;
-      this.conn.send(packet);
+      resolve(onPacket(packet)).then(this.conn.send.bind(this.conn));
       return this._nest();
     } catch(e) {
       let msg = "Got an exception during TA__pauseAndRespond: " + e +
@@ -268,6 +288,14 @@ ThreadActor.prototype = {
    * Handle a protocol request to resume execution of the debuggee.
    */
   onResume: function TA_onResume(aRequest) {
+    if (this._state !== "paused") {
+      return {
+        error: "wrongState",
+        message: "Can't resume when debuggee isn't paused. Current state is '"
+          + this._state + "'"
+      };
+    }
+
     // In case of multiple nested event loops (due to multiple debuggers open in
     // different tabs or multiple debugger clients connected to the same tab)
     // only allow resumption in a LIFO order.
@@ -439,14 +467,23 @@ ThreadActor.prototype = {
     // Return request.count frames, or all remaining
     // frames if count is not defined.
     let frames = [];
-    for (; frame && (!count || i < (start + count)); i++) {
+    let promises = [];
+    for (; frame && (!count || i < (start + count)); i++, frame=frame.older) {
       let form = this._createFrameActor(frame).form();
       form.depth = i;
       frames.push(form);
-      frame = frame.older;
+
+      let promise = this.sources.getOriginalLocation(form.where.url,
+                                                     form.where.line)
+        .then(function (aOrigLocation) {
+          form.where = aOrigLocation;
+        });
+      promises.push(promise);
     }
 
-    return { frames: frames };
+    return resolveAll(promises).then(function () {
+      return { frames: frames };
+    });
   },
 
   onReleaseMany: function TA_onReleaseMany(aRequest) {
@@ -479,25 +516,58 @@ ThreadActor.prototype = {
                message: "Breakpoints can only be set while the debuggee is paused."};
     }
 
-    let location = aRequest.location;
-    let line = location.line;
-    if (this.dbg.findScripts({ url: location.url }).length == 0 || line < 0) {
-      return { error: "noScript" };
-    }
+    // XXX: `originalColumn` is never used. See bug 827639.
+    let { url: originalSource,
+          line: originalLine,
+          column: originalColumn } = aRequest.location;
 
-    // Add the breakpoint to the store for later reuse, in case it belongs to a
-    // script that hasn't appeared yet.
-    if (!this._breakpointStore[location.url]) {
-      this._breakpointStore[location.url] = [];
-    }
-    let scriptBreakpoints = this._breakpointStore[location.url];
-    scriptBreakpoints[line] = {
-      url: location.url,
-      line: line,
-      column: location.column
-    };
+    let locationPromise = this.sources.getGeneratedLocation(originalSource,
+                                                            originalLine)
+    return locationPromise.then((aLocation) => {
+      let line = aLocation.line;
+      if (this.dbg.findScripts({ url: aLocation.url }).length == 0 || line < 0) {
+        return { error: "noScript" };
+      }
 
-    return this._setBreakpoint(location);
+      // Add the breakpoint to the store for later reuse, in case it belongs to a
+      // script that hasn't appeared yet.
+      if (!this._breakpointStore[aLocation.url]) {
+        this._breakpointStore[aLocation.url] = [];
+      }
+      let scriptBreakpoints = this._breakpointStore[aLocation.url];
+      scriptBreakpoints[line] = {
+        url: aLocation.url,
+        line: line,
+        column: aLocation.column
+      };
+
+      let response = this._setBreakpoint(aLocation);
+      // If the original location of our generated location is different from
+      // the original location we attempted to set the breakpoint on, we will
+      // need to know so that we can set actualLocation on the response.
+      let originalLocation = this.sources.getOriginalLocation(aLocation.url,
+                                                              aLocation.line);
+
+      return resolveAll([response, originalLocation])
+        .then(([aResponse, {url, line}]) => {
+          if (aResponse.actualLocation) {
+            let actualOrigLocation = this.sources.getOriginalLocation(
+              aResponse.actualLocation.url, aResponse.actualLocation.line);
+            return actualOrigLocation.then(function ({ url, line }) {
+              if (url !== originalSource || line !== originalLine) {
+                aResponse.actualLocation = { url: url, line: line };
+              }
+              return aResponse;
+            });
+          }
+
+          if (url !== originalSource || line !== originalLine) {
+            aResponse.actualLocation = { url: url, line: line };
+          }
+
+          return aResponse;
+        });
+    });
   },
 
   /**
@@ -608,17 +678,16 @@ ThreadActor.prototype = {
    * Get the script and source lists from the debugger.
    */
   _discoverScriptsAndSources: function TA__discoverScriptsAndSources() {
-    for (let s of this.dbg.findScripts()) {
-      this._addScript(s);
-    }
+    return resolveAll([this._addScript(s)
+                       for (s of this.dbg.findScripts())]);
   },
 
   onSources: function TA_onSources(aRequest) {
-    this._discoverScriptsAndSources();
-    let urls = Object.getOwnPropertyNames(this._sources);
-    return {
-      sources: [this._getSource(url).form() for (url of urls)]
-    };
+    return this._discoverScriptsAndSources().then(() => {
+      return {
+        sources: [s.form() for (s of this.sources.iter())]
+      };
+    });
   },
 
   /**
@@ -655,8 +724,8 @@ ThreadActor.prototype = {
       // We already sent a response to this request, don't send one
       // now.
       return null;
-    } catch(e) {
-      Cu.reportError(e);
+    } catch (e) {
+      reportError(e);
       return { error: "notInterrupted", message: e.toString() };
     }
   },
@@ -1029,26 +1098,6 @@ ThreadActor.prototype = {
     return aString.length >= DebuggerServer.LONG_STRING_LENGTH;
   },
 
-  /**
-   * Create a source grip for the given script.
-   */
-  sourceGrip: function TA_sourceGrip(aScript) {
-    // TODO: Once we have Debugger.Source, this should be replaced with a
-    // weakmap mapping Debugger.Source instances to SourceActor instances.
-    if (!this.threadLifetimePool.sourceActors) {
-      this.threadLifetimePool.sourceActors = {};
-    }
-
-    if (this.threadLifetimePool.sourceActors[aScript.url]) {
-      return this.threadLifetimePool.sourceActors[aScript.url].grip();
-    }
-
-    let actor = new SourceActor(aScript.url, this);
-    this.threadLifetimePool.addActor(actor);
-    this.threadLifetimePool.sourceActors[aScript.url] = actor;
-    return actor.form();
-  },
-
   // JS Debugger API hooks.
 
   /**
@@ -1114,6 +1163,14 @@ ThreadActor.prototype = {
     this._addScript(aScript);
   },
 
+  onNewSource: function TA_onNewSource(aSource) {
+    this.conn.send({
+      from: this.actorID,
+      type: "newSource",
+      source: aSource.form()
+    });
+  },
+
   /**
    * Check if scripts from the provided source URL are allowed to be stored in
    * the cache.
@@ -1122,7 +1179,7 @@ ThreadActor.prototype = {
    *        The url of the script's source that will be stored.
    * @returns true, if the script can be added, false otherwise.
    */
-  _allowSource: function TA__allowScript(aSourceUrl) {
+  _allowSource: function TA__allowSource(aSourceUrl) {
     // Ignore anything we don't have a URL for (eval scripts, for example).
     if (!aSourceUrl)
       return false;
@@ -1146,28 +1203,30 @@ ThreadActor.prototype = {
    */
   _addScript: function TA__addScript(aScript) {
     if (!this._allowSource(aScript.url)) {
-      return false;
+      return resolve(false);
     }
 
     // TODO bug 637572: we should be dealing with sources directly, not
     // inferring them through scripts.
-    this._addSource(aScript.url);
+    return this.sources.sourcesForScript(aScript).then(() => {
 
-    // Set any stored breakpoints.
-    let existing = this._breakpointStore[aScript.url];
-    if (existing) {
-      let endLine = aScript.startLine + aScript.lineCount - 1;
-      // Iterate over the lines backwards, so that sliding breakpoints don't
-      // affect the loop.
-      for (let line = existing.length - 1; line >= 0; line--) {
-        let bp = existing[line];
-        // Limit search to the line numbers contained in the new script.
-        if (bp && line >= aScript.startLine && line <= endLine) {
-          this._setBreakpoint(bp);
+      // Set any stored breakpoints.
+      let existing = this._breakpointStore[aScript.url];
+      if (existing) {
+        let endLine = aScript.startLine + aScript.lineCount - 1;
+        // Iterate over the lines backwards, so that sliding breakpoints don't
+        // affect the loop.
+        for (let line = existing.length - 1; line >= 0; line--) {
+          let bp = existing[line];
+          // Limit search to the line numbers contained in the new script.
+          if (bp && line >= aScript.startLine && line <= endLine) {
+            this._setBreakpoint(bp);
+          }
         }
       }
-    }
-    return true;
+
+      return true;
+    });
   },
 
   /**
@@ -1215,48 +1274,6 @@ ThreadActor.prototype = {
     return retval;
   },
 
-  /**
-   * Add a source to the current set of sources.
-   *
-   * Right now this takes an url, but in the future it should
-   * take a Debugger.Source.
-   *
-   * @param string the source URL.
-   * @returns a SourceActor representing the source.
-   */
-  _addSource: function TA__addSource(aURL) {
-    if (!this._allowSource(aURL)) {
-      return false;
-    }
-
-    if (aURL in this._sources) {
-      return true;
-    }
-
-    let actor = new SourceActor(aURL, this);
-    this.threadLifetimePool.addActor(actor);
-    this._sources[aURL] = actor;
-
-    this.conn.send({
-      from: this.actorID,
-      type: "newSource",
-      source: actor.form()
-    });
-
-    return true;
-  },
-
-  /**
-   * Get the source actor for the given URL.
-   */
-  _getSource: function TA__getSource(aUrl) {
-    let source = this._sources[aUrl];
-    if (!source) {
-      throw new Error("No source for '" + aUrl + "'");
-    }
-    return source;
-  },
-
 };
 
 ThreadActor.prototype.requestTypes = {
@@ -1340,7 +1357,7 @@ PauseScopedActor.prototype = {
       error: "wrongState",
       message: this.constructor.name +
         " actors can only be accessed while the thread is paused."
-    }
+    };
   }
 };
 
@@ -1362,7 +1379,8 @@ SourceActor.prototype = {
   constructor: SourceActor,
   actorPrefix: "source",
 
-  get threadActor() { return this._threadActor; },
+  get threadActor() this._threadActor,
+  get url() this._url,
 
   form: function SA_form() {
     return {
@@ -1382,10 +1400,9 @@ SourceActor.prototype = {
    * Handler for the "source" packet.
    */
   onSource: function SA_onSource(aRequest) {
-    return this
-      ._loadSource()
+    return fetch(this._url)
       .then(function(aSource) {
-        return this._threadActor.createValueGrip(
+        return this.threadActor.createValueGrip(
           aSource, this.threadActor.threadLifetimePool);
       }.bind(this))
       .then(function (aSourceGrip) {
@@ -1394,121 +1411,17 @@ SourceActor.prototype = {
           source: aSourceGrip
         };
       }.bind(this), function (aError) {
+        let msg = "Got an exception during SA_onSource: " + aError +
+          "\n" + aError.stack;
+        Cu.reportError(msg);
+        dumpn(msg);
         return {
           "from": this.actorID,
           "error": "loadSourceError",
           "message": "Could not load the source for " + this._url + "."
         };
       }.bind(this));
-  },
-
-  /**
-   * Convert a given string, encoded in a given character set, to unicode.
-   * @param string aString
-   *        A string.
-   * @param string aCharset
-   *        A character set.
-   * @return string
-   *         A unicode string.
-   */
-  _convertToUnicode: function SS__convertToUnicode(aString, aCharset) {
-    // Decoding primitives.
-    let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-        .createInstance(Ci.nsIScriptableUnicodeConverter);
-
-    try {
-      converter.charset = aCharset || "UTF-8";
-      return converter.ConvertToUnicode(aString);
-    } catch(e) {
-      return aString;
-    }
-  },
-
-  /**
-   * Performs a request to load the desired URL and returns a promise.
-   *
-   * @param aURL String
-   *        The URL we will request.
-   * @returns Promise
-   *
-   * XXX: It may be better to use nsITraceableChannel to get to the sources
-   * without relying on caching when we can (not for eval, etc.):
-   * http://www.softwareishard.com/blog/firebug/nsitraceablechannel-intercept-http-traffic/
-   */
-  _loadSource: function SA__loadSource() {
-    let deferred = defer();
-    let scheme;
-    let url = this._url.split(" -> ").pop();
-
-    try {
-      scheme = Services.io.extractScheme(url);
-    } catch (e) {
-      // In the xpcshell tests, the script url is the absolute path of the test
-      // file, which will make a malformed URI error be thrown. Add the file
-      // scheme prefix ourselves.
-      url = "file://" + url;
-      scheme = Services.io.extractScheme(url);
-    }
-
-    switch (scheme) {
-      case "file":
-      case "chrome":
-      case "resource":
-        try {
-          NetUtil.asyncFetch(url, function onFetch(aStream, aStatus) {
-            if (!Components.isSuccessCode(aStatus)) {
-              deferred.reject(new Error("Request failed"));
-              return;
-            }
-
-            let source = NetUtil.readInputStreamToString(aStream, aStream.available());
-            deferred.resolve(this._convertToUnicode(source));
-            aStream.close();
-          }.bind(this));
-        } catch (ex) {
-          deferred.reject(new Error("Request failed"));
-        }
-        break;
-
-      default:
-        let channel;
-        try {
-          channel = Services.io.newChannel(url, null, null);
-        } catch (e if e.name == "NS_ERROR_UNKNOWN_PROTOCOL") {
-          // On Windows xpcshell tests, c:/foo/bar can pass as a valid URL, but
-          // newChannel won't be able to handle it.
-          url = "file:///" + url;
-          channel = Services.io.newChannel(url, null, null);
-        }
-        let chunks = [];
-        let streamListener = {
-          onStartRequest: function(aRequest, aContext, aStatusCode) {
-            if (!Components.isSuccessCode(aStatusCode)) {
-              deferred.reject("Request failed");
-            }
-          },
-          onDataAvailable: function(aRequest, aContext, aStream, aOffset, aCount) {
-            chunks.push(NetUtil.readInputStreamToString(aStream, aCount));
-          },
-          onStopRequest: function(aRequest, aContext, aStatusCode) {
-            if (!Components.isSuccessCode(aStatusCode)) {
-              deferred.reject("Request failed");
-              return;
-            }
-
-            deferred.resolve(this._convertToUnicode(chunks.join(""),
-                                                    channel.contentCharset));
-          }.bind(this)
-        };
-
-        channel.loadFlags = channel.LOAD_FROM_CACHE;
-        channel.asyncOpen(streamListener, null);
-        break;
-    }
-
-    return deferred.promise;
   }
-
 };
 
 SourceActor.prototype.requestTypes = {
@@ -2095,7 +2008,14 @@ BreakpointActor.prototype = {
   hit: function BA_hit(aFrame) {
     // TODO: add the rest of the breakpoints on that line (bug 676602).
     let reason = { type: "breakpoint", actors: [ this.actorID ] };
-    return this.threadActor._pauseAndRespond(aFrame, reason);
+    return this.threadActor._pauseAndRespond(aFrame, reason, (aPacket) => {
+      let { url, line } = aPacket.frame.where;
+      return this.threadActor.sources.getOriginalLocation(url, line)
+        .then(function (aOrigPosition) {
+          aPacket.frame.where = aOrigPosition;
+          return aPacket;
+        });
+    });
   },
 
   /**
@@ -2417,6 +2337,183 @@ update(ChromeDebuggerActor.prototype, {
 });
 
 
+/**
+ * Manages the sources for a thread. Handles source maps, locations in the
+ * sources, etc for ThreadActors.
+ */
+function ThreadSources(aThreadActor, aUseSourceMaps,
+                       aAllowPredicate, aOnNewSource) {
+  this._thread = aThreadActor;
+  this._useSourceMaps = aUseSourceMaps;
+  this._allow = aAllowPredicate;
+  this._onNewSource = aOnNewSource;
+
+  // source map URL --> promise of SourceMapConsumer
+  this._sourceMaps = Object.create(null);
+  // generated source url --> promise of SourceMapConsumer
+  this._sourceMapsByGeneratedSource = Object.create(null);
+  // original source url --> promise of SourceMapConsumer
+  this._sourceMapsByOriginalSource = Object.create(null);
+  // source url --> SourceActor
+  this._sourceActors = Object.create(null);
+  // original url --> generated url
+  this._generatedUrlsByOriginalUrl = Object.create(null);
+}
+
+ThreadSources.prototype = {
+  /**
+   * Add a source to the current set of sources.
+   *
+   * Right now this takes a URL, but in the future it should
+   * take a Debugger.Source. See bug 637572.
+   *
+   * @param string the source URL.
+   * @returns a SourceActor representing the source or null.
+   */
+  source: function TS_source(aURL) {
+    if (!this._allow(aURL)) {
+      return null;
+    }
+
+    if (aURL in this._sourceActors) {
+      return this._sourceActors[aURL];
+    }
+
+    let actor = new SourceActor(aURL, this._thread);
+    this._thread.threadLifetimePool.addActor(actor);
+    this._sourceActors[aURL] = actor;
+    try {
+      this._onNewSource(actor);
+    } catch (e) {
+      reportError(e);
+    }
+    return actor;
+  },
+
+  /**
+   * Add all of the sources associated with the given script.
+   */
+  sourcesForScript: function TS_sourcesForScript(aScript) {
+    if (!this._useSourceMaps || !aScript.sourceMapURL) {
+      return resolve([this.source(aScript.url)].filter(isNotNull));
+    }
+
+    return this.sourceMap(aScript)
+      .then((aSourceMap) => {
+        return [
+          this.source(s) for (s of aSourceMap.sources)
+        ];
+      }, (e) => {
+        reportError(e);
+        delete this._sourceMaps[aScript.sourceMapURL];
+        delete this._sourceMapsByGeneratedSource[aScript.url];
+        return [this.source(aScript.url)];
+      })
+      .then(function (aSources) {
+        return aSources.filter(isNotNull);
+      });
+  },
+
+  /**
+   * Add the source map for the given script.
+   */
+  sourceMap: function TS_sourceMap(aScript) {
+    if (aScript.url in this._sourceMapsByGeneratedSource) {
+      return this._sourceMapsByGeneratedSource[aScript.url];
+    }
+    dbg_assert(aScript.sourceMapURL);
+    let map = this._fetchSourceMap(aScript.sourceMapURL)
+      .then((aSourceMap) => {
+        for (let s of aSourceMap.sources) {
+          this._generatedUrlsByOriginalUrl[s] = aScript.url;
+          this._sourceMapsByOriginalSource[s] = resolve(aSourceMap);
+        }
+        return aSourceMap;
+      });
+    this._sourceMapsByGeneratedSource[aScript.url] = map;
+    return map;
+  },
+
+  /**
+   * Fetch the source map located at the given url.
+   */
+  _fetchSourceMap: function TS__featchSourceMap(aSourceMapURL) {
+    if (aSourceMapURL in this._sourceMaps) {
+      return this._sourceMaps[aSourceMapURL];
+    } else {
+      let promise = fetch(aSourceMapURL).then(function (rawSourceMap) {
+        return new SourceMapConsumer(rawSourceMap);
+      });
+      this._sourceMaps[aSourceMapURL] = promise;
+      return promise;
+    }
+  },
+
+  /**
+   * Returns a promise for the location in the original source if the source is
+   * source mapped, otherwise a promise of the same location.
+   *
+   * TODO bug 637572: take/return a column
+   */
+  getOriginalLocation: function TS_getOriginalLocation(aSourceUrl, aLine) {
+    if (aSourceUrl in this._sourceMapsByGeneratedSource) {
+      return this._sourceMapsByGeneratedSource[aSourceUrl]
+        .then(function (aSourceMap) {
+          let { source, line } = aSourceMap.originalPositionFor({
+            source: aSourceUrl,
+            line: aLine,
+            column: Infinity
+          });
+          return {
+            url: source,
+            line: line
+          };
+        });
+    }
+
+    // No source map
+    return resolve({
+      url: aSourceUrl,
+      line: aLine
+    });
+  },
+
+  /**
+   * Returns a promise of the location in the generated source corresponding to
+   * the original source and line given.
+   *
+   * TODO bug 637572: take/return a column
+   */
+  getGeneratedLocation: function TS_getGeneratedLocation(aSourceUrl, aLine) {
+    if (aSourceUrl in this._sourceMapsByOriginalSource) {
+      return this._sourceMapsByOriginalSource[aSourceUrl]
+        .then((aSourceMap) => {
+          let { line } = aSourceMap.generatedPositionFor({
+            source: aSourceUrl,
+            line: aLine,
+            column: Infinity
+          });
+          return {
+            url: this._generatedUrlsByOriginalUrl[aSourceUrl],
+            line: line
+          };
+        });
+    }
+
+    // No source map
+    return resolve({
+      url: aSourceUrl,
+      line: aLine
+    });
+  },
+
+  iter: function TS_iter() {
+    for (let url in this._sourceActors) {
+      yield this._sourceActors[url];
+    }
+  }
+};
+
 // Utility functions.
 
 /**
@@ -2437,3 +2534,126 @@ function update(aTarget, aNewAttrs) {
     }
   }
 }
+
+/**
+ * Returns true if its argument is not null.
+ */
+function isNotNull(aThing) {
+  return aThing !== null;
+}
+
+/**
+ * Performs a request to load the desired URL and returns a promise.
+ *
+ * @param aURL String
+ *        The URL we will request.
+ * @returns Promise
+ *
+ * XXX: It may be better to use nsITraceableChannel to get to the sources
+ * without relying on caching when we can (not for eval, etc.):
+ * http://www.softwareishard.com/blog/firebug/nsitraceablechannel-intercept-http-traffic/
+ */
+function fetch(aURL) {
+  let deferred = defer();
+  let scheme;
+  let url = aURL.split(" -> ").pop();
+  let charset;
+
+  try {
+    scheme = Services.io.extractScheme(url);
+  } catch (e) {
+    // In the xpcshell tests, the script url is the absolute path of the test
+    // file, which will make a malformed URI error be thrown. Add the file
+    // scheme prefix ourselves.
+    url = "file://" + url;
+    scheme = Services.io.extractScheme(url);
+  }
+
+  switch (scheme) {
+    case "file":
+    case "chrome":
+    case "resource":
+      try {
+        NetUtil.asyncFetch(url, function onFetch(aStream, aStatus) {
+          if (!Components.isSuccessCode(aStatus)) {
+            deferred.reject("Request failed: " + url);
+            return;
+          }
+
+          let source = NetUtil.readInputStreamToString(aStream, aStream.available());
+          deferred.resolve(source);
+          aStream.close();
+        });
+      } catch (ex) {
+        deferred.reject("Request failed: " + url);
+      }
+      break;
+
+    default:
+      let channel;
+      try {
+        channel = Services.io.newChannel(url, null, null);
+      } catch (e if e.name == "NS_ERROR_UNKNOWN_PROTOCOL") {
+        // On Windows xpcshell tests, c:/foo/bar can pass as a valid URL, but
+        // newChannel won't be able to handle it.
+        url = "file:///" + url;
+        channel = Services.io.newChannel(url, null, null);
+      }
+      let chunks = [];
+      let streamListener = {
+        onStartRequest: function(aRequest, aContext, aStatusCode) {
+          if (!Components.isSuccessCode(aStatusCode)) {
+            deferred.reject("Request failed: " + url);
+          }
+        },
+        onDataAvailable: function(aRequest, aContext, aStream, aOffset, aCount) {
+          chunks.push(NetUtil.readInputStreamToString(aStream, aCount));
+        },
+        onStopRequest: function(aRequest, aContext, aStatusCode) {
+          if (!Components.isSuccessCode(aStatusCode)) {
+            deferred.reject("Request failed: " + url);
+            return;
+          }
+
+          charset = channel.contentCharset;
+          deferred.resolve(chunks.join(""));
+        }
+      };
+
+      channel.loadFlags = channel.LOAD_FROM_CACHE;
+      channel.asyncOpen(streamListener, null);
+      break;
+  }
+
+  return deferred.promise.then(function (source) {
+    return convertToUnicode(source, charset);
+  });
+}
+
+/**
+ * Convert a given string, encoded in a given character set, to unicode.
+ *
+ * @param string aString
+ *        A string.
+ * @param string aCharset
+ *        A character set.
+ */
+function convertToUnicode(aString, aCharset=null) {
+  // Decoding primitives.
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+    .createInstance(Ci.nsIScriptableUnicodeConverter);
+  try {
+    converter.charset = aCharset || "UTF-8";
+    return converter.ConvertToUnicode(aString);
+  } catch(e) {
+    return aString;
+  }
+}
+
+/**
+ * Report the given error in the error console and to stdout.
+ */
+function reportError(aError) {
+  Cu.reportError(aError);
+  dumpn(aError.message + ":\n" + aError.stack);
+}
diff --git a/toolkit/devtools/debugger/server/dbg-server.js b/toolkit/devtools/debugger/server/dbg-server.js
index d7a89b8202a4..74c3fd1500eb 100644
--- a/toolkit/devtools/debugger/server/dbg-server.js
+++ b/toolkit/devtools/debugger/server/dbg-server.js
@@ -26,6 +26,12 @@ addDebuggerToGlobal(this);
 
 Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
 const { defer, resolve, reject } = Promise;
+let promisedArray = Promise.promised(Array);
+function resolveAll(aPromises) {
+  return promisedArray.apply(null, aPromises);
+};
+
+Cu.import("resource://gre/modules/devtools/SourceMap.jsm");
 
 function dumpn(str) {
   if (wantLogging) {
@@ -600,6 +606,17 @@ DebuggerServerConnection.prototype = {
     return null;
   },
 
+  _unknownError: function DSC__unknownError(aPrefix, aError) {
+    let errorString = safeErrorString(aError);
+    errorString += "\n" + aError.stack;
+    Cu.reportError(errorString);
+    dumpn(errorString);
+    return {
+      error: "unknownError",
+      message: (aPrefix + "': " + errorString)
+    };
+  },
+
   // Transport hooks.
 
   /**
@@ -622,12 +639,9 @@ DebuggerServerConnection.prototype = {
       try {
         instance = new actor();
       } catch (e) {
-        Cu.reportError(e);
-        this.transport.send({
-          error: "unknownError",
-          message: ("error occurred while creating actor '" + actor.name +
-                    "': " + safeErrorString(e))
-        });
+        this.transport.send(this._unknownError(
+          "Error occurred while creating actor '" + actor.name,
+          e));
       }
       instance.parentID = actor.parentID;
       // We want the newly-constructed actor to completely replace the factory
@@ -639,16 +653,14 @@ DebuggerServerConnection.prototype = {
     }
 
     var ret = null;
-
     // Dispatch the request to the actor.
     if (actor.requestTypes && actor.requestTypes[aPacket.type]) {
       try {
         ret = actor.requestTypes[aPacket.type].bind(actor)(aPacket);
       } catch(e) {
-        Cu.reportError(e);
-        ret = { error: "unknownError",
-                message: ("error occurred while processing '" + aPacket.type +
-                          "' request: " + safeErrorString(e)) };
+        this.transport.send(this._unknownError(
+          "error occurred while processing '" + aPacket.type,
+          e));
       }
     } else {
       ret = { error: "unrecognizedPacketType",
@@ -663,12 +675,19 @@ DebuggerServerConnection.prototype = {
       return;
     }
 
-    resolve(ret).then(function(returnPacket) {
-      if (!returnPacket.from) {
-        returnPacket.from = aPacket.to;
-      }
-      this.transport.send(returnPacket);
-    }.bind(this));
+    resolve(ret)
+      .then(null, (e) => {
+        return this._unknownError(
+          "error occurred while processing '" + aPacket.type,
+          e);
+      })
+      .then(function (aResponse) {
+        if (!aResponse.from) {
+          aResponse.from = aPacket.to;
+        }
+        return aResponse;
+      })
+      .then(this.transport.send.bind(this.transport));
   },
 
   /**
diff --git a/toolkit/devtools/debugger/tests/unit/head_dbg.js b/toolkit/devtools/debugger/tests/unit/head_dbg.js
index 1e13cf8b8168..525ae7e46552 100644
--- a/toolkit/devtools/debugger/tests/unit/head_dbg.js
+++ b/toolkit/devtools/debugger/tests/unit/head_dbg.js
@@ -111,7 +111,7 @@ function getTestGlobalContext(aClient, aName, aCallback) {
 
 function attachTestGlobalClient(aClient, aName, aCallback) {
   getTestGlobalContext(aClient, aName, function(aContext) {
-    aClient.attachThread(aContext.actor, aCallback);
+    aClient.attachThread(aContext.actor, aCallback, { useSourceMaps: true });
   });
 }
 
@@ -147,7 +147,7 @@ function attachTestTabAndResume(aClient, aName, aCallback) {
       aThreadClient.resume(function (aResponse) {
         aCallback(aResponse, aTabClient, aThreadClient);
       });
-    });
+    }, { useSourceMaps: true });
   });
 }
 
diff --git a/toolkit/devtools/debugger/tests/unit/test_breakpoint-04.js b/toolkit/devtools/debugger/tests/unit/test_breakpoint-04.js
index 6c91aa956ef7..c83c26c445aa 100644
--- a/toolkit/devtools/debugger/tests/unit/test_breakpoint-04.js
+++ b/toolkit/devtools/debugger/tests/unit/test_breakpoint-04.js
@@ -61,8 +61,8 @@ function test_child_breakpoint()
 
   gDebuggee.eval("var line0 = Error().lineNumber;\n" +
                  "function foo() {\n" + // line0 + 1
-                 "  this.a = 1;\n" +     // line0 + 2
-                 "  this.b = 2;\n" +     // line0 + 3
+                 "  this.a = 1;\n" +    // line0 + 2
+                 "  this.b = 2;\n" +    // line0 + 3
                  "}\n" +                // line0 + 4
                  "debugger;\n" +        // line0 + 5
                  "foo();\n");           // line0 + 6
diff --git a/toolkit/devtools/debugger/tests/unit/test_dbgactor.js b/toolkit/devtools/debugger/tests/unit/test_dbgactor.js
index 9802638048e2..131acda9fb23 100644
--- a/toolkit/devtools/debugger/tests/unit/test_dbgactor.js
+++ b/toolkit/devtools/debugger/tests/unit/test_dbgactor.js
@@ -38,6 +38,7 @@ function run_test()
 function test_attach(aContext)
 {
   gClient.request({ to: aContext.actor, type: "attach" }, function(aResponse) {
+    do_check_true(!aResponse.error);
     do_check_eq(aResponse.type, "paused");
 
     // Resume the thread and test the debugger statement.
diff --git a/toolkit/devtools/debugger/tests/unit/test_listsources-02.js b/toolkit/devtools/debugger/tests/unit/test_listsources-02.js
index 044f5eaba267..91eabf3df6bb 100644
--- a/toolkit/devtools/debugger/tests/unit/test_listsources-02.js
+++ b/toolkit/devtools/debugger/tests/unit/test_listsources-02.js
@@ -47,6 +47,6 @@ function test_listing_zero_sources()
                   "Should only send one sources request at most, even though we"
                   + " might have had to send one to determine feature support.");
 
-   finishClient(gClient);
+    finishClient(gClient);
   });
 }
diff --git a/toolkit/devtools/debugger/tests/unit/test_listsources-03.js b/toolkit/devtools/debugger/tests/unit/test_listsources-03.js
new file mode 100644
index 000000000000..7325f4a887e5
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/test_listsources-03.js
@@ -0,0 +1,52 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Check getSources functionality when there are lots of sources.
+ */
+
+var gDebuggee;
+var gClient;
+var gThreadClient;
+
+function run_test()
+{
+  initTestDebuggerServer();
+  gDebuggee = addTestGlobal("test-sources");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function () {
+    attachTestGlobalClientAndResume(gClient, "test-sources", function (aResponse, aThreadClient) {
+      gThreadClient = aThreadClient;
+      test_simple_listsources();
+    });
+  });
+  do_test_pending();
+}
+
+function test_simple_listsources()
+{
+  gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
+    gThreadClient.getSources(function (aResponse) {
+      do_check_true(
+        !aResponse.error,
+        "There shouldn't be an error fetching large amounts of sources.");
+
+      do_check_true(aResponse.sources.some(function (s) {
+        return s.url.match(/foo-999.js$/);
+      }));
+
+      gThreadClient.resume(function () {
+        finishClient(gClient);
+      });
+    });
+  });
+
+  for (let i = 0; i < 1000; i++) {
+    Cu.evalInSandbox("function foo###() {return ###;}".replace(/###/g, i),
+                     gDebuggee,
+                     "1.8",
+                     "http://example.com/foo-" + i + ".js",
+                     1);
+  }
+  gDebuggee.eval("debugger;");
+}
diff --git a/toolkit/devtools/debugger/tests/unit/test_profiler_actor.js b/toolkit/devtools/debugger/tests/unit/test_profiler_actor.js
index ef38552ccbe4..64d11bcea9ad 100644
--- a/toolkit/devtools/debugger/tests/unit/test_profiler_actor.js
+++ b/toolkit/devtools/debugger/tests/unit/test_profiler_actor.js
@@ -114,21 +114,15 @@ function test_profile(aClient, aProfiler)
     do_check_eq(typeof aResponse.profile.threads[0].samples, "object");
     do_check_neq(aResponse.profile.threads[0].samples.length, 0);
 
-    function some(array, cb) {
-      for (var i = array.length; i; i--) {
-        if (cb(array[i - 1]))
-          return true;
-      }
-      return false;
-    }
+    let location = stack.name + " (" + stack.filename + ":" + funcLine + ")";
     // At least one sample is expected to have been in the busy wait above.
-    do_check_true(some(aResponse.profile.threads[0].samples, function(sample) {
+    do_check_true(aResponse.profile.threads[0].samples.some(function(sample) {
       return sample.name == "(root)" &&
              typeof sample.frames == "object" &&
              sample.frames.length != 0 &&
              sample.frames.some(function(f) {
                return (f.line == stack.lineNumber) &&
-                      (f.location == stack.name + " (" + stack.filename + ":" + funcLine + ")");
+                      (f.location == location);
              });
     }));
 
@@ -161,9 +155,13 @@ function test_profiler_status()
 
       var profiler = aResponse.profilerActor;
       do_check_false(Profiler.IsActive());
-      client.request({ to: profiler, type: "startProfiler", features: [] }, (aResponse) => {
+      client.request({
+        to: profiler,
+        type: "startProfiler",
+        features: []
+      }, function (aResponse) {
         do_check_true(Profiler.IsActive());
-        client.close(function () {});
+        client.close();
       });
     });
   });
diff --git a/toolkit/devtools/debugger/tests/unit/test_sourcemaps-01.js b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-01.js
new file mode 100644
index 000000000000..3c00183ccd63
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-01.js
@@ -0,0 +1,64 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Check basic source map integration with the "newSource" packet in the RDP.
+ */
+
+var gDebuggee;
+var gClient;
+var gThreadClient;
+
+Components.utils.import('resource:///modules/devtools/SourceMap.jsm');
+
+function run_test()
+{
+  initTestDebuggerServer();
+  gDebuggee = addTestGlobal("test-source-map");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function() {
+    attachTestGlobalClientAndResume(gClient, "test-source-map", function(aResponse, aThreadClient) {
+      gThreadClient = aThreadClient;
+      test_simple_source_map();
+    });
+  });
+  do_test_pending();
+}
+
+function test_simple_source_map()
+{
+  // Because we are source mapping, we should be notified of a.js, b.js, and
+  // c.js as sources, and shouldn't receive abc.js or test_sourcemaps-01.js.
+  let expectedSources = new Set(["http://example.com/www/js/a.js",
+                                 "http://example.com/www/js/b.js",
+                                 "http://example.com/www/js/c.js"]);
+
+  gClient.addListener("newSource", function _onNewSource(aEvent, aPacket) {
+    do_check_eq(aEvent, "newSource");
+    do_check_eq(aPacket.type, "newSource");
+    do_check_true(!!aPacket.source);
+
+    do_check_true(expectedSources.has(aPacket.source.url),
+                  "The source url should be one of our original sources.");
+    expectedSources.delete(aPacket.source.url);
+
+    if (expectedSources.size === 0) {
+      gClient.removeListener("newSource", _onNewSource);
+      finishClient(gClient);
+    }
+  });
+
+  let { code, map } = (new SourceNode(null, null, null, [
+    new SourceNode(1, 0, "a.js", "function a() { return 'a'; }\n"),
+    new SourceNode(1, 0, "b.js", "function b() { return 'b'; }\n"),
+    new SourceNode(1, 0, "c.js", "function c() { return 'c'; }\n"),
+  ])).toStringWithSourceMap({
+    file: "abc.js",
+    sourceRoot: "http://example.com/www/js/"
+  });
+
+  code += "//@ sourceMappingURL=data:text/json;base64," + btoa(map.toString());
+
+  Components.utils.evalInSandbox(code, gDebuggee, "1.8",
+                                 "http://example.com/www/js/abc.js", 1);
+}
diff --git a/toolkit/devtools/debugger/tests/unit/test_sourcemaps-02.js b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-02.js
new file mode 100644
index 000000000000..4310884a08bd
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-02.js
@@ -0,0 +1,73 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Check basic source map integration with the "sources" packet in the RDP.
+ */
+
+var gDebuggee;
+var gClient;
+var gThreadClient;
+
+Components.utils.import("resource:///modules/devtools/SourceMap.jsm");
+
+function run_test()
+{
+  initTestDebuggerServer();
+  gDebuggee = addTestGlobal("test-source-map");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function() {
+    attachTestGlobalClientAndResume(gClient, "test-source-map", function(aResponse, aThreadClient) {
+      gThreadClient = aThreadClient;
+      test_simple_source_map();
+    });
+  });
+  do_test_pending();
+}
+
+function test_simple_source_map()
+{
+  // Because we are source mapping, we should be notified of a.js, b.js, and
+  // c.js as sources, and shouldn"t receive abc.js or test_sourcemaps-01.js.
+  let expectedSources = new Set(["http://example.com/www/js/a.js",
+                                 "http://example.com/www/js/b.js",
+                                 "http://example.com/www/js/c.js"]);
+
+  let numNewSources = 0;
+
+  gClient.addListener("newSource", function _onNewSource(aEvent, aPacket) {
+    if (++numNewSources !== 3) {
+      return;
+    }
+    gClient.removeListener("newSource", _onNewSource);
+
+    gThreadClient.getSources(function (aResponse) {
+      do_check_true(!aResponse.error, "Should not get an error");
+
+      for (let s of aResponse.sources) {
+        do_check_true(expectedSources.has(s.url),
+                      "The source's url should be one of our original sources");
+        expectedSources.delete(s.url);
+      }
+
+      do_check_eq(expectedSources.size, 0,
+                  "Shouldn't be expecting any more sources");
+
+      finishClient(gClient);
+    });
+  });
+
+  let { code, map } = (new SourceNode(null, null, null, [
+    new SourceNode(1, 0, "a.js", "function a() { return 'a'; }\n"),
+    new SourceNode(1, 0, "b.js", "function b() { return 'b'; }\n"),
+    new SourceNode(1, 0, "c.js", "function c() { return 'c'; }\n"),
+  ])).toStringWithSourceMap({
+    file: "abc.js",
+    sourceRoot: "http://example.com/www/js/"
+  });
+
+  code += "//@ sourceMappingURL=data:text/json;base64," + btoa(map.toString());
+
+  Components.utils.evalInSandbox(code, gDebuggee, "1.8",
+                                 "http://example.com/www/js/abc.js", 1);
+}
diff --git a/toolkit/devtools/debugger/tests/unit/test_sourcemaps-03.js b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-03.js
new file mode 100644
index 000000000000..802277861c9b
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-03.js
@@ -0,0 +1,149 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Check setting breakpoints in source mapped sources.
+ */
+
+var gDebuggee;
+var gClient;
+var gThreadClient;
+
+Components.utils.import('resource:///modules/devtools/SourceMap.jsm');
+
+function run_test()
+{
+  initTestDebuggerServer();
+  gDebuggee = addTestGlobal("test-source-map");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function() {
+    attachTestGlobalClientAndResume(gClient, "test-source-map", function(aResponse, aThreadClient) {
+      gThreadClient = aThreadClient;
+      test_simple_source_map();
+    });
+  });
+  do_test_pending();
+}
+
+function testBreakpointMapping(aName, aCallback)
+{
+  // Pause so we can set a breakpoint.
+  gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
+    do_check_true(!aPacket.error);
+    do_check_eq(aPacket.why.type, "debuggerStatement");
+
+    gThreadClient.setBreakpoint({
+      url: "http://example.com/www/js/" + aName + ".js",
+      // Setting the breakpoint on an empty line so that it is pushed down one
+      // line and we can check the source mapped actualLocation later.
+      line: 3,
+      column: 0
+    }, function (aResponse) {
+      do_check_true(!aResponse.error);
+
+      // Actual location should come back source mapped still so that
+      // breakpoints are displayed in the UI correctly, etc.
+      do_check_eq(aResponse.actualLocation.line, 4);
+      do_check_eq(aResponse.actualLocation.url,
+                  "http://example.com/www/js/" + aName + ".js");
+
+      // The eval will cause us to resume, then we get an unsolicited pause
+      // because of our breakpoint, we resume again to finish the eval, and
+      // finally receive our last pause which has the result of the client
+      // evaluation.
+      gThreadClient.eval(null, aName + "()", function (aResponse) {
+        do_check_true(!aResponse.error, "Shouldn't be an error resuming to eval");
+        do_check_eq(aResponse.type, "resumed");
+
+        gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
+          do_check_eq(aPacket.why.type, "breakpoint");
+          // Assert that we paused because of the breakpoint at the correct
+          // location in the code by testing that the value of `ret` is still
+          // undefined.
+          do_check_eq(aPacket.frame.environment.bindings.variables.ret.value.type,
+                      "undefined");
+
+          gThreadClient.resume(function (aResponse) {
+            do_check_true(!aResponse.error);
+
+            gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
+              do_check_eq(aPacket.why.type, "clientEvaluated");
+              do_check_eq(aPacket.why.frameFinished.return, aName);
+
+              gThreadClient.resume(function (aResponse) {
+                do_check_true(!aResponse.error);
+                aCallback();
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+
+  gDebuggee.eval("(" + function () {
+    debugger;
+  } + "());");
+}
+
+function test_simple_source_map()
+{
+  let expectedSources = new Set([
+    "http://example.com/www/js/a.js",
+    "http://example.com/www/js/b.js",
+    "http://example.com/www/js/c.js"
+  ]);
+
+  gClient.addListener("newSource", function _onNewSource(aEvent, aPacket) {
+    expectedSources.delete(aPacket.source.url);
+    if (expectedSources.size > 0) {
+      return;
+    }
+    gClient.removeListener("newSource", _onNewSource);
+
+    testBreakpointMapping("a", function () {
+      testBreakpointMapping("b", function () {
+        testBreakpointMapping("c", function () {
+          finishClient(gClient);
+        });
+      });
+    });
+  });
+
+  let a = new SourceNode(null, null, null, [
+    new SourceNode(1, 0, "a.js", "function a() {\n"),
+    new SourceNode(2, 0, "a.js", "  var ret;\n"),
+    new SourceNode(3, 0, "a.js", "  // Empty line\n"),
+    new SourceNode(4, 0, "a.js", "  ret = 'a';\n"),
+    new SourceNode(5, 0, "a.js", "  return ret;\n"),
+    new SourceNode(6, 0, "a.js", "}\n")
+  ]);
+  let b = new SourceNode(null, null, null, [
+    new SourceNode(1, 0, "b.js", "function b() {\n"),
+    new SourceNode(2, 0, "b.js", "  var ret;\n"),
+    new SourceNode(3, 0, "b.js", "  // Empty line\n"),
+    new SourceNode(4, 0, "b.js", "  ret = 'b';\n"),
+    new SourceNode(5, 0, "b.js", "  return ret;\n"),
+    new SourceNode(6, 0, "b.js", "}\n")
+  ]);
+  let c = new SourceNode(null, null, null, [
+    new SourceNode(1, 0, "c.js", "function c() {\n"),
+    new SourceNode(2, 0, "c.js", "  var ret;\n"),
+    new SourceNode(3, 0, "c.js", "  // Empty line\n"),
+    new SourceNode(4, 0, "c.js", "  ret = 'c';\n"),
+    new SourceNode(5, 0, "c.js", "  return ret;\n"),
+    new SourceNode(6, 0, "c.js", "}\n")
+  ]);
+
+  let { code, map } = (new SourceNode(null, null, null, [
+    a, b, c
+  ])).toStringWithSourceMap({
+    file: "http://example.com/www/js/abc.js",
+    sourceRoot: "http://example.com/www/js/"
+  });
+
+  code += "//@ sourceMappingURL=data:text/json;base64," + btoa(map.toString());
+
+  Components.utils.evalInSandbox(code, gDebuggee, "1.8",
+                                 "http://example.com/www/js/abc.js", 1);
+}
diff --git a/toolkit/devtools/debugger/tests/unit/testcompatactors.js b/toolkit/devtools/debugger/tests/unit/testcompatactors.js
index 7eb44846ff2f..0b778e51e1b3 100644
--- a/toolkit/devtools/debugger/tests/unit/testcompatactors.js
+++ b/toolkit/devtools/debugger/tests/unit/testcompatactors.js
@@ -30,26 +30,26 @@ function createRootActor()
         };
 
         actor.thread.requestTypes["scripts"] = function (aRequest) {
-          this._discoverScriptsAndSources();
-
-          let scripts = [];
-          for (let s of this.dbg.findScripts()) {
-            if (!s.url) {
-              continue;
+          return this._discoverScriptsAndSources().then(function () {
+            let scripts = [];
+            for (let s of this.dbg.findScripts()) {
+              if (!s.url) {
+                continue;
+              }
+              let script = {
+                url: s.url,
+                startLine: s.startLine,
+                lineCount: s.lineCount,
+                source: this.sources.source(s.url).form()
+              };
+              scripts.push(script);
             }
-            let script = {
-              url: s.url,
-              startLine: s.startLine,
-              lineCount: s.lineCount,
-              source: this._getSource(s.url).form()
-            };
-            scripts.push(script);
-          }
 
-          return {
-            from: this.actorID,
-            scripts: scripts
-          };
+            return {
+              from: this.actorID,
+              scripts: scripts
+            };
+          }.bind(this));
         };
 
         // Pretend that we do not know about the "sources" packet to force the
@@ -70,7 +70,7 @@ function createRootActor()
               url: aScript.url,
               startLine: aScript.startLine,
               lineCount: aScript.lineCount,
-              source: actor.thread._getSource(aScript.url).form()
+              source: actor.thread.sources.source(aScript.url).form()
             });
           };
         }(actor.thread.onNewScript));
diff --git a/toolkit/devtools/debugger/tests/unit/xpcshell.ini b/toolkit/devtools/debugger/tests/unit/xpcshell.ini
index 21b3aaa6be10..bdf4d89ad351 100644
--- a/toolkit/devtools/debugger/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/debugger/tests/unit/xpcshell.ini
@@ -74,9 +74,13 @@ skip-if = toolkit == "gonk"
 reason = bug 820380
 [test_listsources-01.js]
 [test_listsources-02.js]
+[test_listsources-03.js]
 [test_new_source-01.js]
 [test_sources_backwards_compat-01.js]
 [test_sources_backwards_compat-02.js]
+[test_sourcemaps-01.js]
+[test_sourcemaps-02.js]
+[test_sourcemaps-03.js]
 [test_objectgrips-01.js]
 [test_objectgrips-02.js]
 [test_objectgrips-03.js]
diff --git a/toolkit/devtools/sourcemap/SourceMap.jsm b/toolkit/devtools/sourcemap/SourceMap.jsm
index 0dc4063c10cf..b8f9bd4258a3 100644
--- a/toolkit/devtools/sourcemap/SourceMap.jsm
+++ b/toolkit/devtools/sourcemap/SourceMap.jsm
@@ -44,6 +44,7 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
    *   - sources: An array of URLs to the original source files.
    *   - names: An array of identifiers which can be referrenced by individual mappings.
    *   - sourceRoot: Optional. The URL root from which all sources are relative.
+   *   - sourcesContent: Optional. An array of contents of the original source files.
    *   - mappings: A string of base64 VLQs which contain the actual mappings.
    *   - file: The generated file this source map is associated with.
    *
@@ -70,6 +71,7 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
     var sources = util.getArg(sourceMap, 'sources');
     var names = util.getArg(sourceMap, 'names');
     var sourceRoot = util.getArg(sourceMap, 'sourceRoot', null);
+    var sourcesContent = util.getArg(sourceMap, 'sourcesContent', null);
     var mappings = util.getArg(sourceMap, 'mappings');
     var file = util.getArg(sourceMap, 'file');
 
@@ -79,7 +81,8 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
 
     this._names = ArraySet.fromArray(names);
     this._sources = ArraySet.fromArray(sources);
-    this._sourceRoot = sourceRoot;
+    this.sourceRoot = sourceRoot;
+    this.sourcesContent = sourcesContent;
     this.file = file;
 
     // `this._generatedMappings` and `this._originalMappings` hold the parsed
@@ -121,7 +124,7 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
   Object.defineProperty(SourceMapConsumer.prototype, 'sources', {
     get: function () {
       return this._sources.toArray().map(function (s) {
-        return this._sourceRoot ? util.join(this._sourceRoot, s) : s;
+        return this.sourceRoot ? util.join(this.sourceRoot, s) : s;
       }, this);
     }
   });
@@ -165,12 +168,7 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
           if (str.length > 0 && !mappingSeparator.test(str.charAt(0))) {
             // Original source.
             temp = base64VLQ.decode(str);
-            if (aSourceRoot) {
-              mapping.source = util.join(aSourceRoot, this._sources.at(previousSource + temp.value));
-            }
-            else {
-              mapping.source = this._sources.at(previousSource + temp.value);
-            }
+            mapping.source = this._sources.at(previousSource + temp.value);
             previousSource += temp.value;
             str = temp.rest;
             if (str.length === 0 || mappingSeparator.test(str.charAt(0))) {
@@ -204,7 +202,9 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
           }
 
           this._generatedMappings.push(mapping);
-          this._originalMappings.push(mapping);
+          if (typeof mapping.originalLine === 'number') {
+            this._originalMappings.push(mapping);
+          }
         }
       }
 
@@ -291,11 +291,15 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
                                       this._generatedMappings,
                                       "generatedLine",
                                       "generatedColumn",
-                                      this._compareGeneratedPositions)
+                                      this._compareGeneratedPositions);
 
       if (mapping) {
+        var source = util.getArg(mapping, 'source', null);
+        if (source && this.sourceRoot) {
+          source = util.join(this.sourceRoot, source);
+        }
         return {
-          source: util.getArg(mapping, 'source', null),
+          source: source,
           line: util.getArg(mapping, 'originalLine', null),
           column: util.getArg(mapping, 'originalColumn', null),
           name: util.getArg(mapping, 'name', null)
@@ -310,6 +314,32 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
       };
     };
 
+  /**
+   * Returns the original source content. The only argument is
+   * the url of the original source file. Returns null if no
+   * original source content is availible.
+   */
+  SourceMapConsumer.prototype.sourceContentFor =
+    function SourceMapConsumer_sourceContentFor(aSource) {
+      if (!this.sourcesContent) {
+        return null;
+      }
+
+      if (this.sourceRoot) {
+        // Try to remove the sourceRoot
+        var relativeUrl = util.relative(this.sourceRoot, aSource);
+        if (this._sources.has(relativeUrl)) {
+          return this.sourcesContent[this._sources.indexOf(relativeUrl)];
+        }
+      }
+
+      if (this._sources.has(aSource)) {
+        return this.sourcesContent[this._sources.indexOf(aSource)];
+      }
+
+      throw new Error('"' + aSource + '" is not in the SourceMap.');
+    };
+
   /**
    * Returns the generated line and column information for the original source,
    * line, and column positions provided. The only argument is an object with
@@ -332,11 +362,15 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
         originalColumn: util.getArg(aArgs, 'column')
       };
 
+      if (this.sourceRoot) {
+        needle.source = util.relative(this.sourceRoot, needle.source);
+      }
+
       var mapping = this._findMapping(needle,
                                       this._originalMappings,
                                       "originalLine",
                                       "originalColumn",
-                                      this._compareOriginalPositions)
+                                      this._compareOriginalPositions);
 
       if (mapping) {
         return {
@@ -359,8 +393,7 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
    * generated line/column in this source map.
    *
    * @param Function aCallback
-   *        The function that is called with each mapping. This function should
-   *        not mutate the mapping.
+   *        The function that is called with each mapping.
    * @param Object aContext
    *        Optional. If specified, this object will be the value of `this` every
    *        time that `aCallback` is called.
@@ -388,7 +421,21 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
         throw new Error("Unknown order of iteration.");
       }
 
-      mappings.forEach(aCallback, context);
+      var sourceRoot = this.sourceRoot;
+      mappings.map(function (mapping) {
+        var source = mapping.source;
+        if (source && sourceRoot) {
+          source = util.join(sourceRoot, source);
+        }
+        return {
+          source: source,
+          generatedLine: mapping.generatedLine,
+          generatedColumn: mapping.generatedColumn,
+          originalLine: mapping.originalLine,
+          originalColumn: mapping.originalColumn,
+          name: mapping.name
+        };
+      }).forEach(aCallback, context);
     };
 
   exports.SourceMapConsumer = SourceMapConsumer;
@@ -426,10 +473,37 @@ define('source-map/util', ['require', 'exports', 'module' , ], function(require,
   function join(aRoot, aPath) {
     return aPath.charAt(0) === '/'
       ? aPath
-      : aRoot.replace(/\/*$/, '') + '/' + aPath;
+      : aRoot.replace(/\/$/, '') + '/' + aPath;
   }
   exports.join = join;
 
+  /**
+   * Because behavior goes wacky when you set `__proto__` on objects, we
+   * have to prefix all the strings in our set with an arbitrary character.
+   *
+   * See https://github.com/mozilla/source-map/pull/31 and
+   * https://github.com/mozilla/source-map/issues/30
+   *
+   * @param String aStr
+   */
+  function toSetString(aStr) {
+    return '$' + aStr;
+  }
+  exports.toSetString = toSetString;
+
+  function fromSetString(aStr) {
+    return aStr.substr(1);
+  }
+  exports.fromSetString = fromSetString;
+
+  function relative(aRoot, aPath) {
+    aRoot = aRoot.replace(/\/$/, '');
+    return aPath.indexOf(aRoot + '/') === 0
+      ? aPath.substr(aRoot.length + 1)
+      : aPath;
+  }
+  exports.relative = relative;
+
 });
 /* -*- Mode: js; js-indent-level: 2; -*- */
 /*
@@ -515,7 +589,9 @@ define('source-map/binary-search', ['require', 'exports', 'module' , ], function
  * Licensed under the New BSD license. See LICENSE or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
-define('source-map/array-set', ['require', 'exports', 'module' , ], function(require, exports, module) {
+define('source-map/array-set', ['require', 'exports', 'module' ,  'source-map/util'], function(require, exports, module) {
+
+  var util = require('source-map/util');
 
   /**
    * A data structure which is a combination of an array and a set. Adding a new
@@ -539,19 +615,6 @@ define('source-map/array-set', ['require', 'exports', 'module' , ], function(req
     return set;
   };
 
-  /**
-   * Because behavior goes wacky when you set `__proto__` on `this._set`, we
-   * have to prefix all the strings in our set with an arbitrary character.
-   *
-   * See https://github.com/mozilla/source-map/pull/31 and
-   * https://github.com/mozilla/source-map/issues/30
-   *
-   * @param String aStr
-   */
-  ArraySet.prototype._toSetString = function ArraySet__toSetString (aStr) {
-    return "$" + aStr;
-  };
-
   /**
    * Add the given string to this set.
    *
@@ -564,7 +627,7 @@ define('source-map/array-set', ['require', 'exports', 'module' , ], function(req
     }
     var idx = this._array.length;
     this._array.push(aStr);
-    this._set[this._toSetString(aStr)] = idx;
+    this._set[util.toSetString(aStr)] = idx;
   };
 
   /**
@@ -574,7 +637,7 @@ define('source-map/array-set', ['require', 'exports', 'module' , ], function(req
    */
   ArraySet.prototype.has = function ArraySet_has(aStr) {
     return Object.prototype.hasOwnProperty.call(this._set,
-                                                this._toSetString(aStr));
+                                                util.toSetString(aStr));
   };
 
   /**
@@ -584,7 +647,7 @@ define('source-map/array-set', ['require', 'exports', 'module' , ], function(req
    */
   ArraySet.prototype.indexOf = function ArraySet_indexOf(aStr) {
     if (this.has(aStr)) {
-      return this._set[this._toSetString(aStr)];
+      return this._set[util.toSetString(aStr)];
     }
     throw new Error('"' + aStr + '" is not in the set.');
   };
@@ -819,10 +882,58 @@ define('source-map/source-map-generator', ['require', 'exports', 'module' ,  'so
     this._sources = new ArraySet();
     this._names = new ArraySet();
     this._mappings = [];
+    this._sourcesContents = null;
   }
 
   SourceMapGenerator.prototype._version = 3;
 
+  /**
+   * Creates a new SourceMapGenerator based on a SourceMapConsumer
+   *
+   * @param aSourceMapConsumer The SourceMap.
+   */
+  SourceMapGenerator.fromSourceMap =
+    function SourceMapGenerator_fromSourceMap(aSourceMapConsumer) {
+      var sourceRoot = aSourceMapConsumer.sourceRoot;
+      var generator = new SourceMapGenerator({
+        file: aSourceMapConsumer.file,
+        sourceRoot: sourceRoot
+      });
+      aSourceMapConsumer.eachMapping(function (mapping) {
+        var newMapping = {
+          generated: {
+            line: mapping.generatedLine,
+            column: mapping.generatedColumn
+          }
+        };
+
+        if (mapping.source) {
+          newMapping.source = mapping.source;
+          if (sourceRoot) {
+            newMapping.source = util.relative(sourceRoot, newMapping.source);
+          }
+
+          newMapping.original = {
+            line: mapping.originalLine,
+            column: mapping.originalColumn
+          };
+
+          if (mapping.name) {
+            newMapping.name = mapping.name;
+          }
+        }
+
+        generator.addMapping(newMapping);
+      });
+      aSourceMapConsumer.sources.forEach(function (sourceFile) {
+        var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+        if (content) {
+          generator.setSourceContent(sourceFile, content);
+        }
+      });
+      return generator;
+    };
+
   /**
    * Add a single mapping from original source line and column to the generated
    * source's line and column for this source map being created. The mapping
@@ -858,6 +969,110 @@ define('source-map/source-map-generator', ['require', 'exports', 'module' ,  'so
       });
     };
 
+  /**
+   * Set the source content for a source file.
+   */
+  SourceMapGenerator.prototype.setSourceContent =
+    function SourceMapGenerator_setSourceContent(aSourceFile, aSourceContent) {
+      var source = aSourceFile;
+      if (this._sourceRoot) {
+        source = util.relative(this._sourceRoot, source);
+      }
+
+      if (aSourceContent !== null) {
+        // Add the source content to the _sourcesContents map.
+        // Create a new _sourcesContents map if the property is null.
+        if (!this._sourcesContents) {
+          this._sourcesContents = {};
+        }
+        this._sourcesContents[util.toSetString(source)] = aSourceContent;
+      } else {
+        // Remove the source file from the _sourcesContents map.
+        // If the _sourcesContents map is empty, set the property to null.
+        delete this._sourcesContents[util.toSetString(source)];
+        if (Object.keys(this._sourcesContents).length === 0) {
+          this._sourcesContents = null;
+        }
+      }
+    };
+
+  /**
+   * Applies the mappings of a sub-source-map for a specific source file to the
+   * source map being generated. Each mapping to the supplied source file is
+   * rewritten using the supplied source map. Note: The resolution for the
+   * resulting mappings is the minimium of this map and the supplied map.
+   *
+   * @param aSourceMapConsumer The source map to be applied.
+   * @param aSourceFile Optional. The filename of the source file.
+   *        If omitted, SourceMapConsumer's file property will be used.
+   */
+  SourceMapGenerator.prototype.applySourceMap =
+    function SourceMapGenerator_applySourceMap(aSourceMapConsumer, aSourceFile) {
+      // If aSourceFile is omitted, we will use the file property of the SourceMap
+      if (!aSourceFile) {
+        aSourceFile = aSourceMapConsumer.file;
+      }
+      var sourceRoot = this._sourceRoot;
+      // Make "aSourceFile" relative if an absolute Url is passed.
+      if (sourceRoot) {
+        aSourceFile = util.relative(sourceRoot, aSourceFile);
+      }
+      // Applying the SourceMap can add and remove items from the sources and
+      // the names array.
+      var newSources = new ArraySet();
+      var newNames = new ArraySet();
+
+      // Find mappings for the "aSourceFile"
+      this._mappings.forEach(function (mapping) {
+        if (mapping.source === aSourceFile && mapping.original) {
+          // Check if it can be mapped by the source map, then update the mapping.
+          var original = aSourceMapConsumer.originalPositionFor({
+            line: mapping.original.line,
+            column: mapping.original.column
+          });
+          if (original.source !== null) {
+            // Copy mapping
+            if (sourceRoot) {
+              mapping.source = util.relative(sourceRoot, original.source);
+            } else {
+              mapping.source = original.source;
+            }
+            mapping.original.line = original.line;
+            mapping.original.column = original.column;
+            if (original.name !== null && mapping.name !== null) {
+              // Only use the identifier name if it's an identifier
+              // in both SourceMaps
+              mapping.name = original.name;
+            }
+          }
+        }
+
+        var source = mapping.source;
+        if (source && !newSources.has(source)) {
+          newSources.add(source);
+        }
+
+        var name = mapping.name;
+        if (name && !newNames.has(name)) {
+          newNames.add(name);
+        }
+
+      }, this);
+      this._sources = newSources;
+      this._names = newNames;
+
+      // Copy sourcesContents of applied map.
+      aSourceMapConsumer.sources.forEach(function (sourceFile) {
+        var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+        if (content) {
+          if (sourceRoot) {
+            sourceFile = util.relative(sourceRoot, sourceFile);
+          }
+          this.setSourceContent(sourceFile, content);
+        }
+      }, this);
+    };
+
   /**
    * A mapping can have one of the three levels of data:
    *
@@ -978,6 +1193,17 @@ define('source-map/source-map-generator', ['require', 'exports', 'module' ,  'so
       if (this._sourceRoot) {
         map.sourceRoot = this._sourceRoot;
       }
+      if (this._sourcesContents) {
+        map.sourcesContent = map.sources.map(function (source) {
+          if (map.sourceRoot) {
+            source = util.relative(map.sourceRoot, source);
+          }
+          return Object.prototype.hasOwnProperty.call(
+            this._sourcesContents, util.toSetString(source))
+            ? this._sourcesContents[util.toSetString(source)]
+            : null;
+        }, this);
+      }
       return map;
     };
 
@@ -998,9 +1224,10 @@ define('source-map/source-map-generator', ['require', 'exports', 'module' ,  'so
  * Licensed under the New BSD license. See LICENSE or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
-define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/source-map-generator'], function(require, exports, module) {
+define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/source-map-generator', 'source-map/util'], function(require, exports, module) {
 
   var SourceMapGenerator = require('source-map/source-map-generator').SourceMapGenerator;
+  var util = require('source-map/util');
 
   /**
    * SourceNodes provide a way to abstract over interpolating/concatenating
@@ -1012,15 +1239,121 @@ define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/
    * @param aSource The original source's filename.
    * @param aChunks Optional. An array of strings which are snippets of
    *        generated JS, or other SourceNodes.
+   * @param aName The original identifier.
    */
-  function SourceNode(aLine, aColumn, aSource, aChunks) {
+  function SourceNode(aLine, aColumn, aSource, aChunks, aName) {
     this.children = [];
-    this.line = aLine;
-    this.column = aColumn;
-    this.source = aSource;
+    this.sourceContents = {};
+    this.line = aLine === undefined ? null : aLine;
+    this.column = aColumn === undefined ? null : aColumn;
+    this.source = aSource === undefined ? null : aSource;
+    this.name = aName === undefined ? null : aName;
     if (aChunks != null) this.add(aChunks);
   }
 
+  /**
+   * Creates a SourceNode from generated code and a SourceMapConsumer.
+   *
+   * @param aGeneratedCode The generated code
+   * @param aSourceMapConsumer The SourceMap for the generated code
+   */
+  SourceNode.fromStringWithSourceMap =
+    function SourceNode_fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer) {
+      // The SourceNode we want to fill with the generated code
+      // and the SourceMap
+      var node = new SourceNode();
+
+      // The generated code
+      // Processed fragments are removed from this array.
+      var remainingLines = aGeneratedCode.split('\n');
+
+      // We need to remember the position of "remainingLines"
+      var lastGeneratedLine = 1, lastGeneratedColumn = 0;
+
+      // The generate SourceNodes we need a code range.
+      // To extract it current and last mapping is used.
+      // Here we store the last mapping.
+      var lastMapping = null;
+
+      aSourceMapConsumer.eachMapping(function (mapping) {
+        if (lastMapping === null) {
+          // We add the generated code until the first mapping
+          // to the SourceNode without any mapping.
+          // Each line is added as separate string.
+          while (lastGeneratedLine < mapping.generatedLine) {
+            node.add(remainingLines.shift() + "\n");
+            lastGeneratedLine++;
+          }
+          if (lastGeneratedColumn < mapping.generatedColumn) {
+            var nextLine = remainingLines[0];
+            node.add(nextLine.substr(0, mapping.generatedColumn));
+            remainingLines[0] = nextLine.substr(mapping.generatedColumn);
+            lastGeneratedColumn = mapping.generatedColumn;
+          }
+        } else {
+          // We add the code from "lastMapping" to "mapping":
+          // First check if there is a new line in between.
+          if (lastGeneratedLine < mapping.generatedLine) {
+            var code = "";
+            // Associate full lines with "lastMapping"
+            do {
+              code += remainingLines.shift() + "\n";
+              lastGeneratedLine++;
+              lastGeneratedColumn = 0;
+            } while (lastGeneratedLine < mapping.generatedLine);
+            // When we reached the correct line, we add code until we
+            // reach the correct column too.
+            if (lastGeneratedColumn < mapping.generatedColumn) {
+              var nextLine = remainingLines[0];
+              code += nextLine.substr(0, mapping.generatedColumn);
+              remainingLines[0] = nextLine.substr(mapping.generatedColumn);
+              lastGeneratedColumn = mapping.generatedColumn;
+            }
+            // Create the SourceNode.
+            addMappingWithCode(lastMapping, code);
+          } else {
+            // There is no new line in between.
+            // Associate the code between "lastGeneratedColumn" and
+            // "mapping.generatedColumn" with "lastMapping"
+            var nextLine = remainingLines[0];
+            var code = nextLine.substr(0, mapping.generatedColumn -
+                                          lastGeneratedColumn);
+            remainingLines[0] = nextLine.substr(mapping.generatedColumn -
+                                                lastGeneratedColumn);
+            lastGeneratedColumn = mapping.generatedColumn;
+            addMappingWithCode(lastMapping, code);
+          }
+        }
+        lastMapping = mapping;
+      }, this);
+      // We have processed all mappings.
+      // Associate the remaining code in the current line with "lastMapping"
+      // and add the remaining lines without any mapping
+      addMappingWithCode(lastMapping, remainingLines.join("\n"));
+
+      // Copy sourcesContent into SourceNode
+      aSourceMapConsumer.sources.forEach(function (sourceFile) {
+        var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+        if (content) {
+          node.setSourceContent(sourceFile, content);
+        }
+      });
+
+      return node;
+
+      function addMappingWithCode(mapping, code) {
+        if (mapping.source === undefined) {
+          node.add(code);
+        } else {
+          node.add(new SourceNode(mapping.originalLine,
+                                  mapping.originalColumn,
+                                  mapping.source,
+                                  code,
+                                  mapping.name));
+        }
+      }
+    };
+
   /**
    * Add a chunk of generated JS to this source node.
    *
@@ -1083,7 +1416,10 @@ define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/
       }
       else {
         if (chunk !== '') {
-          aFn(chunk, { source: this.source, line: this.line, column: this.column });
+          aFn(chunk, { source: this.source,
+                       line: this.line,
+                       column: this.column,
+                       name: this.name });
         }
       }
     }, this);
@@ -1098,7 +1434,7 @@ define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/
   SourceNode.prototype.join = function SourceNode_join(aSep) {
     var newChildren;
     var i;
-    var len = this.children.length
+    var len = this.children.length;
     if (len > 0) {
       newChildren = [];
       for (i = 0; i < len-1; i++) {
@@ -1132,6 +1468,36 @@ define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/
     return this;
   };
 
+  /**
+   * Set the source content for a source file. This will be added to the SourceMapGenerator
+   * in the sourcesContent field.
+   *
+   * @param aSourceFile The filename of the source file
+   * @param aSourceContent The content of the source file
+   */
+  SourceNode.prototype.setSourceContent =
+    function SourceNode_setSourceContent(aSourceFile, aSourceContent) {
+      this.sourceContents[util.toSetString(aSourceFile)] = aSourceContent;
+    };
+
+  /**
+   * Walk over the tree of SourceNodes. The walking function is called for each
+   * source file content and is passed the filename and source content.
+   *
+   * @param aFn The traversal function.
+   */
+  SourceNode.prototype.walkSourceContents =
+    function SourceNode_walkSourceContents(aFn) {
+      this.children.forEach(function (chunk) {
+        if (chunk instanceof SourceNode) {
+          chunk.walkSourceContents(aFn);
+        }
+      }, this);
+      Object.keys(this.sourceContents).forEach(function (sourceFileKey) {
+        aFn(util.fromSetString(sourceFileKey), this.sourceContents[sourceFileKey]);
+      }, this);
+    };
+
   /**
    * Return the string representation of this source node. Walks over the tree
    * and concatenates all the various snippets together to one string.
@@ -1155,25 +1521,36 @@ define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/
       column: 0
     };
     var map = new SourceMapGenerator(aArgs);
+    var sourceMappingActive = false;
     this.walk(function (chunk, original) {
       generated.code += chunk;
-      if (original.source != null
-          && original.line != null
-          && original.column != null) {
+      if (original.source !== null
+          && original.line !== null
+          && original.column !== null) {
         map.addMapping({
           source: original.source,
           original: {
             line: original.line,
             column: original.column
           },
+          generated: {
+            line: generated.line,
+            column: generated.column
+          },
+          name: original.name
+        });
+        sourceMappingActive = true;
+      } else if (sourceMappingActive) {
+        map.addMapping({
           generated: {
             line: generated.line,
             column: generated.column
           }
         });
+        sourceMappingActive = false;
       }
-      chunk.split('').forEach(function (char) {
-        if (char === '\n') {
+      chunk.split('').forEach(function (ch) {
+        if (ch === '\n') {
           generated.line++;
           generated.column = 0;
         } else {
@@ -1181,6 +1558,9 @@ define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/
         }
       });
     });
+    this.walkSourceContents(function (sourceFile, sourceContent) {
+      map.setSourceContent(sourceFile, sourceContent);
+    });
 
     return { code: generated.code, map: map };
   };
@@ -1191,6 +1571,6 @@ define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/
 /* -*- Mode: js; js-indent-level: 2; -*- */
 ///////////////////////////////////////////////////////////////////////////////
 
-let SourceMapConsumer = require('source-map/source-map-consumer').SourceMapConsumer;
-let SourceMapGenerator = require('source-map/source-map-generator').SourceMapGenerator;
-let SourceNode = require('source-map/source-node').SourceNode;
+this.SourceMapConsumer = require('source-map/source-map-consumer').SourceMapConsumer;
+this.SourceMapGenerator = require('source-map/source-map-generator').SourceMapGenerator;
+this.SourceNode = require('source-map/source-node').SourceNode;
diff --git a/toolkit/devtools/sourcemap/tests/unit/Utils.jsm b/toolkit/devtools/sourcemap/tests/unit/Utils.jsm
index 5f7c81d529f2..ceb12e0141d3 100644
--- a/toolkit/devtools/sourcemap/tests/unit/Utils.jsm
+++ b/toolkit/devtools/sourcemap/tests/unit/Utils.jsm
@@ -15,7 +15,7 @@
 Components.utils.import('resource://gre/modules/devtools/Require.jsm');
 Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm');
 
-let EXPORTED_SYMBOLS = [ "define", "runSourceMapTests" ];
+this.EXPORTED_SYMBOLS = [ "define", "runSourceMapTests" ];
 /* -*- Mode: js; js-indent-level: 2; -*- */
 /*
  * Copyright 2011 Mozilla Foundation and contributors
@@ -78,7 +78,9 @@ define('test/source-map/assert', ['exports'], function (exports) {
  * Licensed under the New BSD license. See LICENSE or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
-define('test/source-map/util', ['require', 'exports', 'module' , ], function(require, exports, module) {
+define('test/source-map/util', ['require', 'exports', 'module' ,  'lib/source-map/util'], function(require, exports, module) {
+
+  var util = require('source-map/util');
 
   // This is a test mapping which maps functions from two different files
   // (one.js and two.js) to a minified generated source.
@@ -99,6 +101,8 @@ define('test/source-map/util', ['require', 'exports', 'module' , ], function(req
   //
   //   ONE.foo=function(a){return baz(a);};
   //   TWO.inc=function(a){return a+1;};
+  exports.testGeneratedCode = " ONE.foo=function(a){return baz(a);};\n"+
+                              " TWO.inc=function(a){return a+1;};";
   exports.testMap = {
     version: 3,
     file: 'min.js',
@@ -107,6 +111,22 @@ define('test/source-map/util', ['require', 'exports', 'module' , ], function(req
     sourceRoot: '/the/root',
     mappings: 'CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOC,IAAID;CCDb,IAAI,IAAM,SAAUE,GAClB,OAAOA'
   };
+  exports.testMapWithSourcesContent = {
+    version: 3,
+    file: 'min.js',
+    names: ['bar', 'baz', 'n'],
+    sources: ['one.js', 'two.js'],
+    sourcesContent: [
+      ' ONE.foo = function (bar) {\n' +
+      '   return baz(bar);\n' +
+      ' };',
+      ' TWO.inc = function (n) {\n' +
+      '   return n + 1;\n' +
+      ' };'
+    ],
+    sourceRoot: '/the/root',
+    mappings: 'CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOC,IAAID;CCDb,IAAI,IAAM,SAAUE,GAClB,OAAOA'
+  };
 
   function assertMapping(generatedLine, generatedColumn, originalSource,
                          originalLine, originalColumn, name, map, assert,
@@ -125,7 +145,8 @@ define('test/source-map/util', ['require', 'exports', 'module' , ], function(req
       assert.equal(origMapping.column, originalColumn,
                    'Incorrect column, expected ' + JSON.stringify(originalColumn)
                    + ', got ' + JSON.stringify(origMapping.column));
-      assert.equal(origMapping.source, originalSource,
+      assert.equal(origMapping.source,
+                   originalSource ? util.join(map._sourceRoot, originalSource) : null,
                    'Incorrect source, expected ' + JSON.stringify(originalSource)
                    + ', got ' + JSON.stringify(origMapping.source));
     }
@@ -146,6 +167,111 @@ define('test/source-map/util', ['require', 'exports', 'module' , ], function(req
   }
   exports.assertMapping = assertMapping;
 
+  function assertEqualMaps(assert, actualMap, expectedMap) {
+    assert.equal(actualMap.version, expectedMap.version, "version mismatch");
+    assert.equal(actualMap.file, expectedMap.file, "file mismatch");
+    assert.equal(actualMap.names.length,
+                 expectedMap.names.length,
+                 "names length mismatch: " +
+                   actualMap.names.join(", ") + " != " + expectedMap.names.join(", "));
+    for (var i = 0; i < actualMap.names.length; i++) {
+      assert.equal(actualMap.names[i],
+                   expectedMap.names[i],
+                   "names[" + i + "] mismatch: " +
+                     actualMap.names.join(", ") + " != " + expectedMap.names.join(", "));
+    }
+    assert.equal(actualMap.sources.length,
+                 expectedMap.sources.length,
+                 "sources length mismatch: " +
+                   actualMap.sources.join(", ") + " != " + expectedMap.sources.join(", "));
+    for (var i = 0; i < actualMap.sources.length; i++) {
+      assert.equal(actualMap.sources[i],
+                   expectedMap.sources[i],
+                   "sources[" + i + "] length mismatch: " +
+                   actualMap.sources.join(", ") + " != " + expectedMap.sources.join(", "));
+    }
+    assert.equal(actualMap.sourceRoot,
+                 expectedMap.sourceRoot,
+                 "sourceRoot mismatch: " +
+                   actualMap.sourceRoot + " != " + expectedMap.sourceRoot);
+    assert.equal(actualMap.mappings, expectedMap.mappings, "mappings mismatch");
+    if (actualMap.sourcesContent) {
+      assert.equal(actualMap.sourcesContent.length,
+                   expectedMap.sourcesContent.length,
+                   "sourcesContent length mismatch");
+      for (var i = 0; i < actualMap.sourcesContent.length; i++) {
+        assert.equal(actualMap.sourcesContent[i],
+                     expectedMap.sourcesContent[i],
+                     "sourcesContent[" + i + "] mismatch");
+      }
+    }
+  }
+  exports.assertEqualMaps = assertEqualMaps;
+
+});
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+define('lib/source-map/util', ['require', 'exports', 'module' , ], function(require, exports, module) {
+
+  /**
+   * This is a helper function for getting values from parameter/options
+   * objects.
+   *
+   * @param args The object we are extracting values from
+   * @param name The name of the property we are getting.
+   * @param defaultValue An optional value to return if the property is missing
+   * from the object. If this is not specified and the property is missing, an
+   * error will be thrown.
+   */
+  function getArg(aArgs, aName, aDefaultValue) {
+    if (aName in aArgs) {
+      return aArgs[aName];
+    } else if (arguments.length === 3) {
+      return aDefaultValue;
+    } else {
+      throw new Error('"' + aName + '" is a required argument.');
+    }
+  }
+  exports.getArg = getArg;
+
+  function join(aRoot, aPath) {
+    return aPath.charAt(0) === '/'
+      ? aPath
+      : aRoot.replace(/\/$/, '') + '/' + aPath;
+  }
+  exports.join = join;
+
+  /**
+   * Because behavior goes wacky when you set `__proto__` on objects, we
+   * have to prefix all the strings in our set with an arbitrary character.
+   *
+   * See https://github.com/mozilla/source-map/pull/31 and
+   * https://github.com/mozilla/source-map/issues/30
+   *
+   * @param String aStr
+   */
+  function toSetString(aStr) {
+    return '$' + aStr;
+  }
+  exports.toSetString = toSetString;
+
+  function fromSetString(aStr) {
+    return aStr.substr(1);
+  }
+  exports.fromSetString = fromSetString;
+
+  function relative(aRoot, aPath) {
+    aRoot = aRoot.replace(/\/$/, '');
+    return aPath.indexOf(aRoot + '/') === 0
+      ? aPath.substr(aRoot.length + 1)
+      : aPath;
+  }
+  exports.relative = relative;
+
 });
 /* -*- Mode: js; js-indent-level: 2; -*- */
 /*
@@ -167,3 +293,4 @@ function runSourceMapTests(modName, do_throw) {
   }
 
 }
+this.runSourceMapTests = runSourceMapTests;
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js b/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js
index e3438fc87f6a..3b7a59e7e11d 100644
--- a/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js
+++ b/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js
@@ -15,6 +15,7 @@ Components.utils.import('resource://test/Utils.jsm');
 define("test/source-map/test-source-map-consumer", ["require", "exports", "module"], function (require, exports, module) {
 
   var SourceMapConsumer = require('source-map/source-map-consumer').SourceMapConsumer;
+  var SourceMapGenerator = require('source-map/source-map-generator').SourceMapGenerator;
 
   exports['test that we can instantiate with a string or an objects'] = function (assert, util) {
     assert.doesNotThrow(function () {
@@ -97,6 +98,10 @@ define("test/source-map/test-source-map-consumer", ["require", "exports", "modul
     map.eachMapping(function (mapping) {
       assert.ok(mapping.generatedLine >= previousLine);
 
+      if (mapping.source) {
+        assert.equal(mapping.source.indexOf(util.testMap.sourceRoot), 0);
+      }
+
       if (mapping.generatedLine === previousLine) {
         assert.ok(mapping.generatedColumn >= previousColumn);
         previousColumn = mapping.generatedColumn;
@@ -144,6 +149,112 @@ define("test/source-map/test-source-map-consumer", ["require", "exports", "modul
     }, context);
   };
 
+  exports['test that the `sourcesContent` field has the original sources'] = function (assert, util) {
+    var map = new SourceMapConsumer(util.testMapWithSourcesContent);
+    var sourcesContent = map.sourcesContent;
+
+    assert.equal(sourcesContent[0], ' ONE.foo = function (bar) {\n   return baz(bar);\n };');
+    assert.equal(sourcesContent[1], ' TWO.inc = function (n) {\n   return n + 1;\n };');
+    assert.equal(sourcesContent.length, 2);
+  };
+
+  exports['test that we can get the original sources for the sources'] = function (assert, util) {
+    var map = new SourceMapConsumer(util.testMapWithSourcesContent);
+    var sources = map.sources;
+
+    assert.equal(map.sourceContentFor(sources[0]), ' ONE.foo = function (bar) {\n   return baz(bar);\n };');
+    assert.equal(map.sourceContentFor(sources[1]), ' TWO.inc = function (n) {\n   return n + 1;\n };');
+    assert.equal(map.sourceContentFor("one.js"), ' ONE.foo = function (bar) {\n   return baz(bar);\n };');
+    assert.equal(map.sourceContentFor("two.js"), ' TWO.inc = function (n) {\n   return n + 1;\n };');
+    assert.throws(function () {
+      map.sourceContentFor("");
+    }, Error);
+    assert.throws(function () {
+      map.sourceContentFor("/the/root/three.js");
+    }, Error);
+    assert.throws(function () {
+      map.sourceContentFor("three.js");
+    }, Error);
+  };
+
+  exports['test sourceRoot + generatedPositionFor'] = function (assert, util) {
+    var map = new SourceMapGenerator({
+      sourceRoot: 'foo/bar',
+      file: 'baz.js'
+    });
+    map.addMapping({
+      original: { line: 1, column: 1 },
+      generated: { line: 2, column: 2 },
+      source: 'bang.coffee'
+    });
+    map.addMapping({
+      original: { line: 5, column: 5 },
+      generated: { line: 6, column: 6 },
+      source: 'bang.coffee'
+    });
+    map = new SourceMapConsumer(map.toString());
+
+    // Should handle without sourceRoot.
+    var pos = map.generatedPositionFor({
+      line: 1,
+      column: 1,
+      source: 'bang.coffee'
+    });
+
+    assert.equal(pos.line, 2);
+    assert.equal(pos.column, 2);
+
+    // Should handle with sourceRoot.
+    var pos = map.generatedPositionFor({
+      line: 1,
+      column: 1,
+      source: 'foo/bar/bang.coffee'
+    });
+
+    assert.equal(pos.line, 2);
+    assert.equal(pos.column, 2);
+  };
+
+  exports['test sourceRoot + originalPositionFor'] = function (assert, util) {
+    var map = new SourceMapGenerator({
+      sourceRoot: 'foo/bar',
+      file: 'baz.js'
+    });
+    map.addMapping({
+      original: { line: 1, column: 1 },
+      generated: { line: 2, column: 2 },
+      source: 'bang.coffee'
+    });
+    map = new SourceMapConsumer(map.toString());
+
+    var pos = map.originalPositionFor({
+      line: 2,
+      column: 2,
+    });
+
+    // Should always have the prepended source root
+    assert.equal(pos.source, 'foo/bar/bang.coffee');
+    assert.equal(pos.line, 1);
+    assert.equal(pos.column, 1);
+  };
+
+  exports['test github issue #56'] = function (assert, util) {
+    var map = new SourceMapGenerator({
+      sourceRoot: 'http://',
+      file: 'www.example.com/foo.js'
+    });
+    map.addMapping({
+      original: { line: 1, column: 1 },
+      generated: { line: 2, column: 2 },
+      source: 'www.example.com/original.js'
+    });
+    map = new SourceMapConsumer(map.toString());
+
+    var sources = map.sources;
+    assert.equal(map.sources.length, 1);
+    assert.equal(map.sources[0], 'http://www.example.com/original.js');
+  };
+
 });
 function run_test() {
   runSourceMapTests('test/source-map/test-source-map-consumer', do_throw);
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_source_map_generator.js b/toolkit/devtools/sourcemap/tests/unit/test_source_map_generator.js
index e585755e22d2..4811438935dc 100644
--- a/toolkit/devtools/sourcemap/tests/unit/test_source_map_generator.js
+++ b/toolkit/devtools/sourcemap/tests/unit/test_source_map_generator.js
@@ -15,6 +15,9 @@ Components.utils.import('resource://test/Utils.jsm');
 define("test/source-map/test-source-map-generator", ["require", "exports", "module"], function (require, exports, module) {
 
   var SourceMapGenerator = require('source-map/source-map-generator').SourceMapGenerator;
+  var SourceMapConsumer = require('source-map/source-map-consumer').SourceMapConsumer;
+  var SourceNode = require('source-map/source-node').SourceNode;
+  var util = require('source-map/util');
 
   exports['test some simple stuff'] = function (assert, util) {
     var map = new SourceMapGenerator({
@@ -176,19 +179,100 @@ define("test/source-map/test-source-map-generator", ["require", "exports", "modu
 
     map = JSON.parse(map.toString());
 
-    assert.equal(map.version, 3);
-    assert.equal(map.file, 'min.js');
-    assert.equal(map.names.length, 3);
-    assert.equal(map.names[0], 'bar');
-    assert.equal(map.names[1], 'baz');
-    assert.equal(map.names[2], 'n');
-    assert.equal(map.sources.length, 2);
-    assert.equal(map.sources[0], 'one.js');
-    assert.equal(map.sources[1], 'two.js');
-    assert.equal(map.sourceRoot, '/the/root');
-    assert.equal(map.mappings, 'CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOC,IAAID;CCDb,IAAI,IAAM,SAAUE,GAClB,OAAOA');
+    util.assertEqualMaps(assert, map, util.testMap);
   };
 
+  exports['test that source content can be set'] = function (assert, util) {
+    var map = new SourceMapGenerator({
+      file: 'min.js',
+      sourceRoot: '/the/root'
+    });
+    map.addMapping({
+      generated: { line: 1, column: 1 },
+      original: { line: 1, column: 1 },
+      source: 'one.js'
+    });
+    map.addMapping({
+      generated: { line: 2, column: 1 },
+      original: { line: 1, column: 1 },
+      source: 'two.js'
+    });
+    map.setSourceContent('one.js', 'one file content');
+
+    map = JSON.parse(map.toString());
+    assert.equal(map.sources[0], 'one.js');
+    assert.equal(map.sources[1], 'two.js');
+    assert.equal(map.sourcesContent[0], 'one file content');
+    assert.equal(map.sourcesContent[1], null);
+  };
+
+  exports['test .fromSourceMap'] = function (assert, util) {
+    var map = SourceMapGenerator.fromSourceMap(new SourceMapConsumer(util.testMap));
+    util.assertEqualMaps(assert, map.toJSON(), util.testMap);
+  };
+
+  exports['test .fromSourceMap with sourcesContent'] = function (assert, util) {
+    var map = SourceMapGenerator.fromSourceMap(
+      new SourceMapConsumer(util.testMapWithSourcesContent));
+    util.assertEqualMaps(assert, map.toJSON(), util.testMapWithSourcesContent);
+  };
+
+  exports['test applySourceMap'] = function (assert, util) {
+    var node = new SourceNode(null, null, null, [
+      new SourceNode(2, 0, 'fileX', 'lineX2\n'),
+      'genA1\n',
+      new SourceNode(2, 0, 'fileY', 'lineY2\n'),
+      'genA2\n',
+      new SourceNode(1, 0, 'fileX', 'lineX1\n'),
+      'genA3\n',
+      new SourceNode(1, 0, 'fileY', 'lineY1\n')
+    ]);
+    var mapStep1 = node.toStringWithSourceMap({
+      file: 'fileA'
+    }).map;
+    mapStep1.setSourceContent('fileX', 'lineX1\nlineX2\n');
+    mapStep1 = mapStep1.toJSON();
+
+    node = new SourceNode(null, null, null, [
+      'gen1\n',
+      new SourceNode(1, 0, 'fileA', 'lineA1\n'),
+      new SourceNode(2, 0, 'fileA', 'lineA2\n'),
+      new SourceNode(3, 0, 'fileA', 'lineA3\n'),
+      new SourceNode(4, 0, 'fileA', 'lineA4\n'),
+      new SourceNode(1, 0, 'fileB', 'lineB1\n'),
+      new SourceNode(2, 0, 'fileB', 'lineB2\n'),
+      'gen2\n'
+    ]);
+    var mapStep2 = node.toStringWithSourceMap({
+      file: 'fileGen'
+    }).map;
+    mapStep2.setSourceContent('fileB', 'lineB1\nlineB2\n');
+    mapStep2 = mapStep2.toJSON();
+
+    node = new SourceNode(null, null, null, [
+      'gen1\n',
+      new SourceNode(2, 0, 'fileX', 'lineA1\n'),
+      new SourceNode(2, 0, 'fileA', 'lineA2\n'),
+      new SourceNode(2, 0, 'fileY', 'lineA3\n'),
+      new SourceNode(4, 0, 'fileA', 'lineA4\n'),
+      new SourceNode(1, 0, 'fileB', 'lineB1\n'),
+      new SourceNode(2, 0, 'fileB', 'lineB2\n'),
+      'gen2\n'
+    ]);
+    var expectedMap = node.toStringWithSourceMap({
+      file: 'fileGen'
+    }).map;
+    expectedMap.setSourceContent('fileX', 'lineX1\nlineX2\n');
+    expectedMap.setSourceContent('fileB', 'lineB1\nlineB2\n');
+    expectedMap = expectedMap.toJSON();
+
+    // apply source map "mapStep1" to "mapStep2"
+    var generator = SourceMapGenerator.fromSourceMap(new SourceMapConsumer(mapStep2));
+    generator.applySourceMap(new SourceMapConsumer(mapStep1));
+    var actualMap = generator.toJSON();
+
+    util.assertEqualMaps(assert, actualMap, expectedMap);
+  };
 });
 function run_test() {
   runSourceMapTests('test/source-map/test-source-map-generator', do_throw);
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_source_node.js b/toolkit/devtools/sourcemap/tests/unit/test_source_node.js
index afdbc781d9d4..5b0163282a05 100644
--- a/toolkit/devtools/sourcemap/tests/unit/test_source_node.js
+++ b/toolkit/devtools/sourcemap/tests/unit/test_source_node.js
@@ -136,7 +136,10 @@ define("test/source-map/test-source-node", ["require", "exports", "module"], fun
   exports['test .toStringWithSourceMap()'] = function (assert, util) {
     var node = new SourceNode(null, null, null,
                               ['(function () {\n',
-                               '  ', new SourceNode(1, 0, 'a.js', ['someCall()']), ';\n',
+                               '  ',
+                                 new SourceNode(1, 0, 'a.js', 'someCall', 'originalCall'),
+                                 new SourceNode(1, 8, 'a.js', '()'),
+                                 ';\n',
                                '  ', new SourceNode(2, 0, 'b.js', ['if (foo) bar()']), ';\n',
                                '}());']);
     var map = node.toStringWithSourceMap({
@@ -148,6 +151,14 @@ define("test/source-map/test-source-node", ["require", "exports", "module"], fun
 
     var actual;
 
+    actual = map.originalPositionFor({
+      line: 1,
+      column: 4
+    });
+    assert.equal(actual.source, null);
+    assert.equal(actual.line, null);
+    assert.equal(actual.column, null);
+
     actual = map.originalPositionFor({
       line: 2,
       column: 2
@@ -155,6 +166,7 @@ define("test/source-map/test-source-node", ["require", "exports", "module"], fun
     assert.equal(actual.source, 'a.js');
     assert.equal(actual.line, 1);
     assert.equal(actual.column, 0);
+    assert.equal(actual.name, 'originalCall');
 
     actual = map.originalPositionFor({
       line: 3,
@@ -163,8 +175,115 @@ define("test/source-map/test-source-node", ["require", "exports", "module"], fun
     assert.equal(actual.source, 'b.js');
     assert.equal(actual.line, 2);
     assert.equal(actual.column, 0);
+
+    actual = map.originalPositionFor({
+      line: 3,
+      column: 16
+    });
+    assert.equal(actual.source, null);
+    assert.equal(actual.line, null);
+    assert.equal(actual.column, null);
+
+    actual = map.originalPositionFor({
+      line: 4,
+      column: 2
+    });
+    assert.equal(actual.source, null);
+    assert.equal(actual.line, null);
+    assert.equal(actual.column, null);
   };
 
+  exports['test .fromStringWithSourceMap()'] = function (assert, util) {
+    var node = SourceNode.fromStringWithSourceMap(
+                              util.testGeneratedCode,
+                              new SourceMapConsumer(util.testMap));
+
+    var result = node.toStringWithSourceMap({
+      file: 'min.js'
+    });
+    var map = result.map;
+    var code = result.code;
+
+    assert.equal(code, util.testGeneratedCode);
+    assert.ok(map instanceof SourceMapGenerator, 'map instanceof SourceMapGenerator');
+    map = map.toJSON();
+    assert.equal(map.version, util.testMap.version);
+    assert.equal(map.file, util.testMap.file);
+    assert.equal(map.mappings, util.testMap.mappings);
+  };
+
+  exports['test .fromStringWithSourceMap() complex version'] = function (assert, util) {
+    var input = new SourceNode(null, null, null, [
+      "(function() {\n",
+        "  var Test = {};\n",
+        "  ", new SourceNode(1, 0, "a.js", "Test.A = { value: 1234 };\n"),
+        "  ", new SourceNode(2, 0, "a.js", "Test.A.x = 'xyz';"), "\n",
+        "}());\n",
+        "/* Generated Source */"]);
+    input = input.toStringWithSourceMap({
+      file: 'foo.js'
+    });
+
+    var node = SourceNode.fromStringWithSourceMap(
+                              input.code,
+                              new SourceMapConsumer(input.map.toString()));
+
+    var result = node.toStringWithSourceMap({
+      file: 'foo.js'
+    });
+    var map = result.map;
+    var code = result.code;
+
+    assert.equal(code, input.code);
+    assert.ok(map instanceof SourceMapGenerator, 'map instanceof SourceMapGenerator');
+    map = map.toJSON();
+    var inputMap = input.map.toJSON();
+    util.assertEqualMaps(assert, map, inputMap);
+  };
+
+  exports['test setSourceContent with toStringWithSourceMap'] = function (assert, util) {
+    var aNode = new SourceNode(1, 1, 'a.js', 'a');
+    aNode.setSourceContent('a.js', 'someContent');
+    var node = new SourceNode(null, null, null,
+                              ['(function () {\n',
+                               '  ', aNode,
+                               '  ', new SourceNode(1, 1, 'b.js', 'b'),
+                               '}());']);
+    node.setSourceContent('b.js', 'otherContent');
+    var map = node.toStringWithSourceMap({
+      file: 'foo.js'
+    }).map;
+
+    assert.ok(map instanceof SourceMapGenerator, 'map instanceof SourceMapGenerator');
+    map = new SourceMapConsumer(map.toString());
+
+    assert.equal(map.sources.length, 2);
+    assert.equal(map.sources[0], 'a.js');
+    assert.equal(map.sources[1], 'b.js');
+    assert.equal(map.sourcesContent.length, 2);
+    assert.equal(map.sourcesContent[0], 'someContent');
+    assert.equal(map.sourcesContent[1], 'otherContent');
+  };
+
+  exports['test walkSourceContents'] = function (assert, util) {
+    var aNode = new SourceNode(1, 1, 'a.js', 'a');
+    aNode.setSourceContent('a.js', 'someContent');
+    var node = new SourceNode(null, null, null,
+                              ['(function () {\n',
+                               '  ', aNode,
+                               '  ', new SourceNode(1, 1, 'b.js', 'b'),
+                               '}());']);
+    node.setSourceContent('b.js', 'otherContent');
+    var results = [];
+    node.walkSourceContents(function (sourceFile, sourceContent) {
+      results.push([sourceFile, sourceContent]);
+    });
+    assert.equal(results.length, 2);
+    assert.equal(results[0][0], 'a.js');
+    assert.equal(results[0][1], 'someContent');
+    assert.equal(results[1][0], 'b.js');
+    assert.equal(results[1][1], 'otherContent');
+  };
 });
 function run_test() {
   runSourceMapTests('test/source-map/test-source-node', do_throw);

From 02353a9c27c8089353fcc8863ce68ceae63fa7b6 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Tue, 9 Apr 2013 11:40:00 +0300
Subject: [PATCH 308/438] Bug 849069 - relative source map URLs should be
 resolved according to the spec's rules; r=past

---
 .../devtools/debugger/test/binary_search.js   |  3 +-
 .../devtools/debugger/test/binary_search.map  |  3 +-
 .../debugger/server/dbg-script-actors.js      | 42 ++++++++++++----
 .../devtools/debugger/tests/unit/head_dbg.js  | 25 ++++++++++
 .../unit/source-map-data/sourcemapped.coffee  |  6 +++
 .../unit/source-map-data/sourcemapped.map     | 10 ++++
 .../debugger/tests/unit/sourcemapped.js       | 16 +++++++
 .../debugger/tests/unit/test_source-01.js     | 10 +---
 .../debugger/tests/unit/test_sourcemaps-04.js | 48 +++++++++++++++++++
 .../debugger/tests/unit/test_sourcemaps-05.js | 48 +++++++++++++++++++
 .../devtools/debugger/tests/unit/xpcshell.ini |  6 +++
 toolkit/devtools/sourcemap/SourceMap.jsm      | 30 ++++++++++--
 .../devtools/sourcemap/tests/unit/Utils.jsm   | 48 ++++++++++++++++---
 .../tests/unit/test_source_map_consumer.js    | 42 +++++++++++++++-
 14 files changed, 305 insertions(+), 32 deletions(-)
 create mode 100644 toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.coffee
 create mode 100644 toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.map
 create mode 100644 toolkit/devtools/debugger/tests/unit/sourcemapped.js
 create mode 100644 toolkit/devtools/debugger/tests/unit/test_sourcemaps-04.js
 create mode 100644 toolkit/devtools/debugger/tests/unit/test_sourcemaps-05.js

diff --git a/browser/devtools/debugger/test/binary_search.js b/browser/devtools/debugger/test/binary_search.js
index ce77903e1b07..aa3dff3bc827 100644
--- a/browser/devtools/debugger/test/binary_search.js
+++ b/browser/devtools/debugger/test/binary_search.js
@@ -24,7 +24,6 @@
 
 }).call(this);
 
-// TODO bug 849069: this should just be "binary_search.map", not a full path.
 /*
-//@ sourceMappingURL=http://example.com/browser/browser/devtools/debugger/test/binary_search.map
+//@ sourceMappingURL=binary_search.map
 */
diff --git a/browser/devtools/debugger/test/binary_search.map b/browser/devtools/debugger/test/binary_search.map
index a86e74783f11..c5aaeab2f011 100644
--- a/browser/devtools/debugger/test/binary_search.map
+++ b/browser/devtools/debugger/test/binary_search.map
@@ -1,8 +1,9 @@
 {
   "version": 3,
   "file": "binary_search.js",
+  "sourceRoot": "",
   "sources": [
-    "http://example.com/browser/browser/devtools/debugger/test/binary_search.coffee"
+    "binary_search.coffee"
   ],
   "names": [],
   "mappings": ";AACA;CAAA;CAAA,CAAA,CAAuB,EAAA,CAAjB,GAAkB,IAAxB;CAEE,OAAA,UAAA;CAAA,EAAQ,CAAR,CAAA;CAAA,EACQ,CAAR,CAAa,CAAL;CADR,EAEQ,CAAR,CAAA;CAEA,EAA0C,CAAR,CAAtB,MAAN;CAGJ,EAA6B,CAAR,CAAA,CAArB;CAAA,EAAQ,CAAR,CAAQ,GAAR;QAAA;CACA,EAA6B,CAAR,CAAA,CAArB;CAAA,EAAQ,EAAR,GAAA;QADA;CAAA,EAIQ,CAAI,CAAZ,CAAA;CAXF,IAIA;CAUA,GAAA,CAAS;CAAT,YAA8B;MAA9B;AAA0C,CAAD,YAAA;MAhBpB;CAAvB,EAAuB;CAAvB"
diff --git a/toolkit/devtools/debugger/server/dbg-script-actors.js b/toolkit/devtools/debugger/server/dbg-script-actors.js
index d7fd8a061a9c..efb59d4f1fb5 100644
--- a/toolkit/devtools/debugger/server/dbg-script-actors.js
+++ b/toolkit/devtools/debugger/server/dbg-script-actors.js
@@ -525,7 +525,9 @@ ThreadActor.prototype = {
                                                             originalLine)
     return locationPromise.then((aLocation) => {
       let line = aLocation.line;
-      if (this.dbg.findScripts({ url: aLocation.url }).length == 0 || line < 0) {
+      if (this.dbg.findScripts({ url: aLocation.url }).length == 0 ||
+          line < 0 ||
+          line == null) {
         return { error: "noScript" };
       }
 
@@ -2405,7 +2407,7 @@ ThreadSources.prototype = {
         ];
       }, (e) => {
         reportError(e);
-        delete this._sourceMaps[aScript.sourceMapURL];
+        delete this._sourceMaps[this._normalize(aScript.sourceMapURL, aScript.url)];
         delete this._sourceMapsByGeneratedSource[aScript.url];
         return [this.source(aScript.url)];
       })
@@ -2422,7 +2424,9 @@ ThreadSources.prototype = {
       return this._sourceMapsByGeneratedSource[aScript.url];
     }
     dbg_assert(aScript.sourceMapURL);
-    let map = this._fetchSourceMap(aScript.sourceMapURL)
+    let sourceMapURL = this._normalize(aScript.sourceMapURL,
+                                       aScript.url);
+    let map = this._fetchSourceMap(sourceMapURL)
       .then((aSourceMap) => {
         for (let s of aSourceMap.sources) {
           this._generatedUrlsByOriginalUrl[s] = aScript.url;
@@ -2437,14 +2441,21 @@ ThreadSources.prototype = {
   /**
    * Fetch the source map located at the given url.
    */
-  _fetchSourceMap: function TS__featchSourceMap(aSourceMapURL) {
-    if (aSourceMapURL in this._sourceMaps) {
-      return this._sourceMaps[aSourceMapURL];
+  _fetchSourceMap: function TS__fetchSourceMap(aAbsSourceMapURL) {
+    if (aAbsSourceMapURL in this._sourceMaps) {
+      return this._sourceMaps[aAbsSourceMapURL];
     } else {
-      let promise = fetch(aSourceMapURL).then(function (rawSourceMap) {
-        return new SourceMapConsumer(rawSourceMap);
+      let promise = fetch(aAbsSourceMapURL).then((rawSourceMap) => {
+        let map =  new SourceMapConsumer(rawSourceMap);
+        let base = aAbsSourceMapURL.replace(/\/[^\/]+$/, '/');
+        if (base.indexOf("data:") !== 0) {
+          map.sourceRoot = map.sourceRoot
+            ? this._normalize(map.sourceRoot, base)
+            : base;
+        }
+        return map;
       });
-      this._sourceMaps[aSourceMapURL] = promise;
+      this._sourceMaps[aAbsSourceMapURL] = promise;
       return promise;
     }
   },
@@ -2507,6 +2518,19 @@ ThreadSources.prototype = {
     });
   },
 
+  /**
+   * Normalize multiple relative paths towards the base paths on the right.
+   */
+  _normalize: function TS__normalize(...aURLs) {
+    dbg_assert(aURLs.length > 1);
+    let base = Services.io.newURI(aURLs.pop(), null, null);
+    let url;
+    while ((url = aURLs.pop())) {
+      base = Services.io.newURI(url, null, base);
+    }
+    return base.spec;
+  },
+
   iter: function TS_iter() {
     for (let url in this._sourceActors) {
       yield this._sourceActors[url];
diff --git a/toolkit/devtools/debugger/tests/unit/head_dbg.js b/toolkit/devtools/debugger/tests/unit/head_dbg.js
index 525ae7e46552..69207ed93589 100644
--- a/toolkit/devtools/debugger/tests/unit/head_dbg.js
+++ b/toolkit/devtools/debugger/tests/unit/head_dbg.js
@@ -175,6 +175,14 @@ function finishClient(aClient)
   });
 }
 
+/**
+ * Takes a relative file path and returns the absolute file url for it.
+ */
+function getFileUrl(aName) {
+  let file = do_get_file(aName);
+  return Services.io.newFileURI(file).spec;
+}
+
 /**
  * Returns the full path of the file with the specified name in a
  * platform-independent and URL-like form.
@@ -190,3 +198,20 @@ function getFilePath(aName)
   }
   return path.slice(filePrePath.length);
 }
+
+Cu.import("resource://gre/modules/NetUtil.jsm");
+
+/**
+ * Returns the full text contents of the given file.
+ */
+function readFile(aFileName) {
+  let f = do_get_file(aFileName);
+  let s = Cc["@mozilla.org/network/file-input-stream;1"]
+    .createInstance(Ci.nsIFileInputStream);
+  s.init(f, -1, -1, false);
+  try {
+    return NetUtil.readInputStreamToString(s, s.available());
+  } finally {
+    s.close();
+  }
+}
diff --git a/toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.coffee b/toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.coffee
new file mode 100644
index 000000000000..73a400a219d9
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.coffee
@@ -0,0 +1,6 @@
+foo = (n) ->
+  return "foo" + i for i in [0...n]
+
+[first, second, third] = foo(3)
+
+debugger
\ No newline at end of file
diff --git a/toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.map b/toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.map
new file mode 100644
index 000000000000..dcee3c33c393
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.map
@@ -0,0 +1,10 @@
+{
+  "version": 3,
+  "file": "sourcemapped.js",
+  "sourceRoot": "",
+  "sources": [
+    "sourcemapped.coffee"
+  ],
+  "names": [],
+  "mappings": ";AAAA;CAAA,KAAA,yBAAA;CAAA;CAAA,CAAA,CAAA,MAAO;CACL,IAAA,GAAA;AAAA,CAAA,EAAA,MAA0B,qDAA1B;CAAA,EAAe,EAAR,QAAA;CAAP,IADI;CAAN,EAAM;;CAAN,CAGA,CAAyB,IAAA;;CAEzB,UALA;CAAA"
+}
\ No newline at end of file
diff --git a/toolkit/devtools/debugger/tests/unit/sourcemapped.js b/toolkit/devtools/debugger/tests/unit/sourcemapped.js
new file mode 100644
index 000000000000..7dbcb2d14939
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/sourcemapped.js
@@ -0,0 +1,16 @@
+// Generated by CoffeeScript 1.6.1
+(function() {
+  var first, foo, second, third, _ref;
+
+  foo = function(n) {
+    var i, _i;
+    for (i = _i = 0; 0 <= n ? _i < n : _i > n; i = 0 <= n ? ++_i : --_i) {
+      return "foo" + i;
+    }
+  };
+
+  _ref = foo(3), first = _ref[0], second = _ref[1], third = _ref[2];
+
+  debugger;
+
+}).call(this);
diff --git a/toolkit/devtools/debugger/tests/unit/test_source-01.js b/toolkit/devtools/debugger/tests/unit/test_source-01.js
index a1fd94e4c484..684e38f44d85 100644
--- a/toolkit/devtools/debugger/tests/unit/test_source-01.js
+++ b/toolkit/devtools/debugger/tests/unit/test_source-01.js
@@ -10,8 +10,6 @@ var gThreadClient;
 // and that they can communicate over the protocol to fetch the source text for
 // a given script.
 
-Cu.import("resource://gre/modules/NetUtil.jsm");
-
 function run_test()
 {
   initTestDebuggerServer();
@@ -60,15 +58,9 @@ function test_source()
         do_check_true(!aResponse.error);
         do_check_true(!!aResponse.source);
 
-        let f = do_get_file("test_source-01.js", false);
-        let s = Cc["@mozilla.org/network/file-input-stream;1"]
-          .createInstance(Ci.nsIFileInputStream);
-        s.init(f, -1, -1, false);
-
-        do_check_eq(NetUtil.readInputStreamToString(s, s.available()),
+        do_check_eq(readFile("test_source-01.js"),
                     aResponse.source);
 
-        s.close();
         gThreadClient.resume(function () {
           finishClient(gClient);
         });
diff --git a/toolkit/devtools/debugger/tests/unit/test_sourcemaps-04.js b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-04.js
new file mode 100644
index 000000000000..af61f6c48962
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-04.js
@@ -0,0 +1,48 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Check that absolute source map urls work.
+ */
+
+var gDebuggee;
+var gClient;
+var gThreadClient;
+
+Components.utils.import('resource:///modules/devtools/SourceMap.jsm');
+
+function run_test()
+{
+  initTestDebuggerServer();
+  gDebuggee = addTestGlobal("test-source-map");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function() {
+    attachTestGlobalClientAndResume(gClient, "test-source-map", function(aResponse, aThreadClient) {
+      gThreadClient = aThreadClient;
+      test_absolute_source_map();
+    });
+  });
+  do_test_pending();
+}
+
+function test_absolute_source_map()
+{
+  gClient.addOneTimeListener("newSource", function _onNewSource(aEvent, aPacket) {
+    do_check_eq(aEvent, "newSource");
+    do_check_eq(aPacket.type, "newSource");
+    do_check_true(!!aPacket.source);
+
+    do_check_true(aPacket.source.url.indexOf("sourcemapped.coffee") !== -1,
+                  "The new source should be a coffee file.");
+    do_check_eq(aPacket.source.url.indexOf("sourcemapped.js"), -1,
+                "The new source should not be a js file.");
+
+    finishClient(gClient);
+  });
+
+  code = readFile("sourcemapped.js")
+    + "\n//@ sourceMappingURL=" + getFileUrl("source-map-data/sourcemapped.map");
+
+  Components.utils.evalInSandbox(code, gDebuggee, "1.8",
+                                 getFileUrl("sourcemapped.js"), 1);
+}
diff --git a/toolkit/devtools/debugger/tests/unit/test_sourcemaps-05.js b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-05.js
new file mode 100644
index 000000000000..352fab415435
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/test_sourcemaps-05.js
@@ -0,0 +1,48 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Check that relative source map urls work.
+ */
+
+var gDebuggee;
+var gClient;
+var gThreadClient;
+
+Components.utils.import('resource:///modules/devtools/SourceMap.jsm');
+
+function run_test()
+{
+  initTestDebuggerServer();
+  gDebuggee = addTestGlobal("test-source-map");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function() {
+    attachTestGlobalClientAndResume(gClient, "test-source-map", function(aResponse, aThreadClient) {
+      gThreadClient = aThreadClient;
+      test_relative_source_map();
+    });
+  });
+  do_test_pending();
+}
+
+function test_relative_source_map()
+{
+  gClient.addOneTimeListener("newSource", function _onNewSource(aEvent, aPacket) {
+    do_check_eq(aEvent, "newSource");
+    do_check_eq(aPacket.type, "newSource");
+    do_check_true(!!aPacket.source);
+
+    do_check_true(aPacket.source.url.indexOf("sourcemapped.coffee") !== -1,
+                  "The new source should be a coffee file.");
+    do_check_eq(aPacket.source.url.indexOf("sourcemapped.js"), -1,
+                "The new source should not be a js file.");
+
+    finishClient(gClient);
+  });
+
+  code = readFile("sourcemapped.js")
+    + "\n//@ sourceMappingURL=source-map-data/sourcemapped.map";
+
+  Components.utils.evalInSandbox(code, gDebuggee, "1.8",
+                                 getFileUrl("sourcemapped.js"), 1);
+}
diff --git a/toolkit/devtools/debugger/tests/unit/xpcshell.ini b/toolkit/devtools/debugger/tests/unit/xpcshell.ini
index bdf4d89ad351..a273cdff5944 100644
--- a/toolkit/devtools/debugger/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/debugger/tests/unit/xpcshell.ini
@@ -81,6 +81,12 @@ reason = bug 820380
 [test_sourcemaps-01.js]
 [test_sourcemaps-02.js]
 [test_sourcemaps-03.js]
+[test_sourcemaps-04.js]
+skip-if = toolkit == "gonk"
+reason = bug 820380
+[test_sourcemaps-05.js]
+skip-if = toolkit == "gonk"
+reason = bug 820380
 [test_objectgrips-01.js]
 [test_objectgrips-02.js]
 [test_objectgrips-03.js]
diff --git a/toolkit/devtools/sourcemap/SourceMap.jsm b/toolkit/devtools/sourcemap/SourceMap.jsm
index b8f9bd4258a3..05139f7969d9 100644
--- a/toolkit/devtools/sourcemap/SourceMap.jsm
+++ b/toolkit/devtools/sourcemap/SourceMap.jsm
@@ -470,10 +470,34 @@ define('source-map/util', ['require', 'exports', 'module' , ], function(require,
   }
   exports.getArg = getArg;
 
+  var urlRegexp = /([\w+\-.]+):\/\/((\w+:\w+)@)?([\w.]+)?(:(\d+))?(\S+)?/;
+
+  function urlParse(aUrl) {
+    var match = aUrl.match(urlRegexp);
+    if (!match) {
+      return null;
+    }
+    return {
+      scheme: match[1],
+      auth: match[3],
+      host: match[4],
+      port: match[6],
+      path: match[7]
+    };
+  }
+
   function join(aRoot, aPath) {
-    return aPath.charAt(0) === '/'
-      ? aPath
-      : aRoot.replace(/\/$/, '') + '/' + aPath;
+    var url;
+
+    if (aPath.match(urlRegexp)) {
+      return aPath;
+    }
+
+    if (aPath.charAt(0) === '/' && (url = urlParse(aRoot))) {
+      return aRoot.replace(url.path, '') + aPath;
+    }
+
+    return aRoot.replace(/\/$/, '') + '/' + aPath;
   }
   exports.join = join;
 
diff --git a/toolkit/devtools/sourcemap/tests/unit/Utils.jsm b/toolkit/devtools/sourcemap/tests/unit/Utils.jsm
index ceb12e0141d3..d78371f3757b 100644
--- a/toolkit/devtools/sourcemap/tests/unit/Utils.jsm
+++ b/toolkit/devtools/sourcemap/tests/unit/Utils.jsm
@@ -145,9 +145,21 @@ define('test/source-map/util', ['require', 'exports', 'module' ,  'lib/source-ma
       assert.equal(origMapping.column, originalColumn,
                    'Incorrect column, expected ' + JSON.stringify(originalColumn)
                    + ', got ' + JSON.stringify(origMapping.column));
-      assert.equal(origMapping.source,
-                   originalSource ? util.join(map._sourceRoot, originalSource) : null,
-                   'Incorrect source, expected ' + JSON.stringify(originalSource)
+
+      var expectedSource;
+
+      if (originalSource && map.sourceRoot && originalSource.indexOf(map.sourceRoot) === 0) {
+        expectedSource = originalSource;
+      } else if (originalSource) {
+        expectedSource = map.sourceRoot
+          ? util.join(map.sourceRoot, originalSource)
+          : originalSource;
+      } else {
+        expectedSource = null;
+      }
+
+      assert.equal(origMapping.source, expectedSource,
+                   'Incorrect source, expected ' + JSON.stringify(expectedSource)
                    + ', got ' + JSON.stringify(origMapping.source));
     }
 
@@ -238,10 +250,34 @@ define('lib/source-map/util', ['require', 'exports', 'module' , ], function(requ
   }
   exports.getArg = getArg;
 
+  var urlRegexp = /([\w+\-.]+):\/\/((\w+:\w+)@)?([\w.]+)?(:(\d+))?(\S+)?/;
+
+  function urlParse(aUrl) {
+    var match = aUrl.match(urlRegexp);
+    if (!match) {
+      return null;
+    }
+    return {
+      scheme: match[1],
+      auth: match[3],
+      host: match[4],
+      port: match[6],
+      path: match[7]
+    };
+  }
+
   function join(aRoot, aPath) {
-    return aPath.charAt(0) === '/'
-      ? aPath
-      : aRoot.replace(/\/$/, '') + '/' + aPath;
+    var url;
+
+    if (aPath.match(urlRegexp)) {
+      return aPath;
+    }
+
+    if (aPath.charAt(0) === '/' && (url = urlParse(aRoot))) {
+      return aRoot.replace(url.path, '') + aPath;
+    }
+
+    return aRoot.replace(/\/$/, '') + '/' + aPath;
   }
   exports.join = join;
 
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js b/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js
index 3b7a59e7e11d..515287004df1 100644
--- a/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js
+++ b/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js
@@ -251,8 +251,46 @@ define("test/source-map/test-source-map-consumer", ["require", "exports", "modul
     map = new SourceMapConsumer(map.toString());
 
     var sources = map.sources;
-    assert.equal(map.sources.length, 1);
-    assert.equal(map.sources[0], 'http://www.example.com/original.js');
+    assert.equal(sources.length, 1);
+    assert.equal(sources[0], 'http://www.example.com/original.js');
+  };
+
+  exports['test github issue #43'] = function (assert, util) {
+    var map = new SourceMapGenerator({
+      sourceRoot: 'http://example.com',
+      file: 'foo.js'
+    });
+    map.addMapping({
+      original: { line: 1, column: 1 },
+      generated: { line: 2, column: 2 },
+      source: 'http://cdn.example.com/original.js'
+    });
+    map = new SourceMapConsumer(map.toString());
+
+    var sources = map.sources;
+    assert.equal(sources.length, 1,
+                 'Should only be one source.');
+    assert.equal(sources[0], 'http://cdn.example.com/original.js',
+                 'Should not be joined with the sourceRoot.');
+  };
+
+  exports['test absolute path, but same host sources'] = function (assert, util) {
+    var map = new SourceMapGenerator({
+      sourceRoot: 'http://example.com/foo/bar',
+      file: 'foo.js'
+    });
+    map.addMapping({
+      original: { line: 1, column: 1 },
+      generated: { line: 2, column: 2 },
+      source: '/original.js'
+    });
+    map = new SourceMapConsumer(map.toString());
+
+    var sources = map.sources;
+    assert.equal(sources.length, 1,
+                 'Should only be one source.');
+    assert.equal(sources[0], 'http://example.com/original.js',
+                 'Source should be relative the host of the source root.');
   };
 
 });

From ef5fbc29f79f9053eba16becad5ff44e1086e9ae Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Tue, 9 Apr 2013 12:26:11 -0700
Subject: [PATCH 309/438] Bug 859920 - Some TPS tests failed due to removed
 autoHide pref. r=trivial, a=test-only

---
 services/sync/tests/tps/test_bug530717.js   | 4 ++--
 services/sync/tests/tps/test_client_wipe.js | 4 ++--
 services/sync/tests/tps/test_prefs.js       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/sync/tests/tps/test_bug530717.js b/services/sync/tests/tps/test_bug530717.js
index a9b25209e225..4df756eed411 100644
--- a/services/sync/tests/tps/test_bug530717.js
+++ b/services/sync/tests/tps/test_bug530717.js
@@ -23,7 +23,7 @@ var prefs1 = [
   { name: "browser.urlbar.maxRichResults",
     value: 20
   },
-  { name: "browser.tabs.autoHide",
+  { name: "browser.link.open_newwindow",
     value: true
   }
 ];
@@ -35,7 +35,7 @@ var prefs2 = [
   { name: "browser.urlbar.maxRichResults",
     value: 18
   },
-  { name: "browser.tabs.autoHide",
+  { name: "browser.link.open_newwindow",
     value: false
   }
 ];
diff --git a/services/sync/tests/tps/test_client_wipe.js b/services/sync/tests/tps/test_client_wipe.js
index c5e05d095e99..13265d13b553 100644
--- a/services/sync/tests/tps/test_client_wipe.js
+++ b/services/sync/tests/tps/test_client_wipe.js
@@ -108,7 +108,7 @@ var prefs1 = [
   { name: "browser.urlbar.maxRichResults",
     value: 20
   },
-  { name: "browser.tabs.autoHide",
+  { name: "browser.link.open_newwindow",
     value: true
   }
 ];
@@ -120,7 +120,7 @@ var prefs2 = [
   { name: "browser.urlbar.maxRichResults",
     value: 18
   },
-  { name: "browser.tabs.autoHide",
+  { name: "browser.link.open_newwindow",
     value: false
   }
 ];
diff --git a/services/sync/tests/tps/test_prefs.js b/services/sync/tests/tps/test_prefs.js
index a8447d6e4e54..3771a2118b98 100644
--- a/services/sync/tests/tps/test_prefs.js
+++ b/services/sync/tests/tps/test_prefs.js
@@ -19,7 +19,7 @@ var prefs1 = [
   { name: "browser.urlbar.maxRichResults",
     value: 20
   },
-  { name: "browser.tabs.autoHide",
+  { name: "browser.link.open_newwindow",
     value: true
   }
 ];
@@ -31,7 +31,7 @@ var prefs2 = [
   { name: "browser.urlbar.maxRichResults",
     value: 18
   },
-  { name: "browser.tabs.autoHide",
+  { name: "browser.link.open_newwindow",
     value: false
   }
 ];

From 105a94f13b43f851b65b72e4bcfd0cf8a38375ac Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 15 Apr 2013 13:31:24 -0700
Subject: [PATCH 310/438] Back out ecd327272240 (bug 733712) for Linux oth
 assertions CLOSED TREE

---
 accessible/src/atk/AccessibleWrap.cpp | 44 ++++++---------------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/accessible/src/atk/AccessibleWrap.cpp b/accessible/src/atk/AccessibleWrap.cpp
index 2d28a2d022da..916c739d0f9e 100644
--- a/accessible/src/atk/AccessibleWrap.cpp
+++ b/accessible/src/atk/AccessibleWrap.cpp
@@ -141,8 +141,6 @@ struct MaiAtkObjectClass
 
 static guint mai_atk_object_signals [LAST_SIGNAL] = { 0, };
 
-static void MaybeFireNameChange(AtkObject* aAtkObj, const nsString& aNewName);
-
 G_BEGIN_DECLS
 /* callbacks for MaiAtkObject */
 static void classInitCB(AtkObjectClass *aClass);
@@ -602,41 +600,16 @@ getNameCB(AtkObject* aAtkObj)
   if (!accWrap)
     return nullptr;
 
-  nsAutoString name;
-  accWrap->Name(name);
+  nsAutoString uniName;
+  accWrap->Name(uniName);
 
-  // XXX Firing an event from here does not seem right
-  MaybeFireNameChange(aAtkObj, name);
+  NS_ConvertUTF8toUTF16 objName(aAtkObj->name);
+  if (!uniName.Equals(objName))
+    atk_object_set_name(aAtkObj, NS_ConvertUTF16toUTF8(uniName).get());
 
   return aAtkObj->name;
 }
 
-static void
-MaybeFireNameChange(AtkObject* aAtkObj, const nsString& aNewName)
-{
-  NS_ConvertUTF16toUTF8 newNameUTF8(aNewName);
-  if (newNameUTF8.Equals(aAtkObj->name))
-    return;
-
-  // Below we duplicate the functionality of atk_object_set_name(),
-  // but without calling atk_object_get_name(). Instead of
-  // atk_object_get_name() we directly access aAtkObj->name. This is because
-  // atk_object_get_name() would call getNameCB() which would call
-  // MaybeFireNameChange() (or atk_object_set_name() before this problem was
-  // fixed) and we would get an infinite recursion.
-  // See http://bugzilla.mozilla.org/733712
-
-  // Do not notify for initial name setting.
-  // See bug http://bugzilla.gnome.org/665870
-  bool notify = !!aAtkObj->name;
-
-  free(aAtkObj->name);
-  aAtkObj->name = strdup(newNameUTF8.get());
-
-  if (notify)
-    g_object_notify(G_OBJECT(aAtkObj), "accessible-name");
-}
-
 const gchar *
 getDescriptionCB(AtkObject *aAtkObj)
 {
@@ -644,7 +617,7 @@ getDescriptionCB(AtkObject *aAtkObj)
     if (!accWrap || accWrap->IsDefunct())
         return nullptr;
 
-    /* nsIAccessible is responsible for the nonnull description */
+    /* nsIAccessible is responsible for the non-nullptr description */
     nsAutoString uniDesc;
     accWrap->Description(uniDesc);
 
@@ -1002,8 +975,9 @@ AccessibleWrap::FirePlatformEvent(AccEvent* aEvent)
       {
         nsAutoString newName;
         accessible->Name(newName);
-
-        MaybeFireNameChange(atkObj, newName);
+        NS_ConvertUTF16toUTF8 utf8Name(newName);
+        if (!atkObj->name || !utf8Name.Equals(atkObj->name))
+          atk_object_set_name(atkObj, utf8Name.get());
 
         break;
       }

From 6d424caaff8b46e43e6fd3f712778e0a1130ffd7 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Wed, 10 Apr 2013 15:45:05 -0700
Subject: [PATCH 311/438] Bug 859512 - Do not use StackFrame.exec.fun after it
 may be relocated; r=luke

--HG--
extra : rebase_source : c756c53b78ee456f3d71009d5030c1061802af74
---
 js/src/vm/Stack.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 5780e66b656c..c38bbc188ea6 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1209,7 +1209,6 @@ ContextStack::popGeneratorFrame(const GeneratorFrameGuard &gfg)
 {
     JSGenerator *gen = gfg.gen_;
     HeapValue *genvp = gen->stackSnapshot;
-    JS_ASSERT(genvp == HeapValueify(gen->fp->generatorArgsSnapshotBegin()));
 
     const FrameRegs &stackRegs = gfg.regs_;
     StackFrame *stackfp = stackRegs.fp();

From 9836e4b371e97b10381d76c01b0726d7efda63e8 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Wed, 10 Apr 2013 17:57:42 -0700
Subject: [PATCH 312/438] Bug 856925 - Sqlite.jsm tests to demonstrate errors.
 r=gps

---
 toolkit/modules/tests/xpcshell/test_sqlite.js | 84 ++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

diff --git a/toolkit/modules/tests/xpcshell/test_sqlite.js b/toolkit/modules/tests/xpcshell/test_sqlite.js
index 6c503e3f16d2..bf33150a1e4c 100644
--- a/toolkit/modules/tests/xpcshell/test_sqlite.js
+++ b/toolkit/modules/tests/xpcshell/test_sqlite.js
@@ -9,8 +9,11 @@ do_get_profile();
 
 Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
 Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Sqlite.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // To spin the event loop in test.
 Cu.import("resource://services-common/async.js");
@@ -516,7 +519,7 @@ add_task(function test_in_progress_counts() {
     outer();
   });
 
-  // … and wait for both queries to have finished before we go on and 
+  // … and wait for both queries to have finished before we go on and
   // test postconditions.
   outer.wait();
 
@@ -572,3 +575,82 @@ add_task(function test_discard_cached() {
   yield c.close();
 });
 
+/**
+ * Test that direct binding of params and execution through mozStorage doesn't
+ * error when we manually create a transaction. See Bug 856925.
+ */
+add_task(function test_direct() {
+  let file = FileUtils.getFile("TmpD", ["test_direct.sqlite"]);
+  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  print("Opening " + file.path);
+
+  let db = Services.storage.openDatabase(file);
+  print("Opened " + db);
+
+  db.executeSimpleSQL("CREATE TABLE types (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, UNIQUE (name))");
+  print("Executed setup.");
+
+  let statement = db.createAsyncStatement("INSERT INTO types (name) VALUES (:name)");
+  let params = statement.newBindingParamsArray();
+  let one = params.newBindingParams();
+  one.bindByName("name", null);
+  params.addParams(one);
+  let two = params.newBindingParams();
+  two.bindByName("name", "bar");
+  params.addParams(two);
+
+  print("Beginning transaction.");
+  let begin = db.createAsyncStatement("BEGIN DEFERRED TRANSACTION");
+  let end = db.createAsyncStatement("COMMIT TRANSACTION");
+
+  let deferred = Promise.defer();
+  begin.executeAsync({
+    handleCompletion: function (reason) {
+      deferred.resolve();
+    }
+  });
+  yield deferred.promise;
+
+  statement.bindParameters(params);
+
+  deferred = Promise.defer();
+  print("Executing async.");
+  statement.executeAsync({
+    handleResult: function (resultSet) {
+    },
+
+    handleError:  function (error) {
+      print("Error when executing SQL (" + error.result + "): " +
+            error.message);
+      print("Original error: " + error.error);
+      errors.push(error);
+      deferred.reject();
+    },
+
+    handleCompletion: function (reason) {
+      print("Completed.");
+      deferred.resolve();
+    }
+  });
+
+  yield deferred.promise;
+
+  deferred = Promise.defer();
+  end.executeAsync({
+    handleCompletion: function (reason) {
+      deferred.resolve();
+    }
+  });
+  yield deferred.promise;
+
+  statement.finalize();
+  begin.finalize();
+  end.finalize();
+
+  deferred = Promise.defer();
+  db.asyncClose(function () {
+    deferred.resolve()
+  });
+  yield deferred.promise;
+});
+

From 74a6f95698d0d8cc0990633ed17e65c5f8d9a40b Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Wed, 10 Apr 2013 17:57:42 -0700
Subject: [PATCH 313/438] Bug 833965 - Sqlite.jsm should support an array of
 binding parameters. r=gps

---
 toolkit/modules/Sqlite.jsm                    |  57 +++++++--
 toolkit/modules/tests/xpcshell/test_sqlite.js | 112 ++++++++++++++++++
 2 files changed, 157 insertions(+), 12 deletions(-)

diff --git a/toolkit/modules/Sqlite.jsm b/toolkit/modules/Sqlite.jsm
index b9b8afd690e9..6d392ff863f5 100644
--- a/toolkit/modules/Sqlite.jsm
+++ b/toolkit/modules/Sqlite.jsm
@@ -689,6 +689,50 @@ OpenedConnection.prototype = Object.freeze({
     return count;
   },
 
+  /**
+   * Helper method to bind parameters of various kinds through
+   * reflection.
+   */
+  _bindParameters: function (statement, params) {
+    if (!params) {
+      return;
+    }
+
+    if (Array.isArray(params)) {
+      // It's an array of separate params.
+      if (params.length && (typeof(params[0]) == "object")) {
+        let paramsArray = statement.newBindingParamsArray();
+        for (let p of params) {
+          let bindings = paramsArray.newBindingParams();
+          for (let [key, value] of Iterator(p)) {
+            bindings.bindByName(key, value);
+          }
+          paramsArray.addParams(bindings);
+        }
+
+        statement.bindParameters(paramsArray);
+        return;
+      }
+
+      // Indexed params.
+      for (let i = 0; i < params.length; i++) {
+        statement.bindByIndex(i, params[i]);
+      }
+      return;
+    }
+
+    // Named params.
+    if (params && typeof(params) == "object") {
+      for (let k in params) {
+        statement.bindByName(k, params[k]);
+      }
+      return;
+    }
+
+    throw new Error("Invalid type for bound parameters. Expected Array or " +
+                    "object. Got: " + params);
+  },
+
   _executeStatement: function (sql, statement, params, onRow) {
     if (statement.state != statement.MOZ_STORAGE_STATEMENT_READY) {
       throw new Error("Statement is not ready for execution.");
@@ -698,18 +742,7 @@ OpenedConnection.prototype = Object.freeze({
       throw new Error("onRow must be a function. Got: " + onRow);
     }
 
-    if (Array.isArray(params)) {
-      for (let i = 0; i < params.length; i++) {
-        statement.bindByIndex(i, params[i]);
-      }
-    } else if (params && typeof(params) == "object") {
-      for (let k in params) {
-        statement.bindByName(k, params[k]);
-      }
-    } else if (params) {
-      throw new Error("Invalid type for bound parameters. Expected Array or " +
-                      "object. Got: " + params);
-    }
+    this._bindParameters(statement, params);
 
     let index = this._statementCounter++;
 
diff --git a/toolkit/modules/tests/xpcshell/test_sqlite.js b/toolkit/modules/tests/xpcshell/test_sqlite.js
index bf33150a1e4c..3d41800cffbc 100644
--- a/toolkit/modules/tests/xpcshell/test_sqlite.js
+++ b/toolkit/modules/tests/xpcshell/test_sqlite.js
@@ -575,6 +575,118 @@ add_task(function test_discard_cached() {
   yield c.close();
 });
 
+add_task(function test_programmatic_binding() {
+  let c = yield getDummyDatabase("programmatic_binding");
+
+  let bindings = [
+    {id: 1,    path: "foobar"},
+    {id: null, path: "baznoo"},
+    {id: 5,    path: "toofoo"},
+  ];
+
+  let sql = "INSERT INTO dirs VALUES (:id, :path)";
+  let result = yield c.execute(sql, bindings);
+  do_check_eq(result.length, 0);
+
+  let rows = yield c.executeCached("SELECT * from dirs");
+  do_check_eq(rows.length, 3);
+  yield c.close();
+});
+
+add_task(function test_programmatic_binding_transaction() {
+  let c = yield getDummyDatabase("programmatic_binding_transaction");
+
+  let bindings = [
+    {id: 1,    path: "foobar"},
+    {id: null, path: "baznoo"},
+    {id: 5,    path: "toofoo"},
+  ];
+
+  let sql = "INSERT INTO dirs VALUES (:id, :path)";
+  yield c.executeTransaction(function transaction() {
+    let result = yield c.execute(sql, bindings);
+    do_check_eq(result.length, 0);
+
+    let rows = yield c.executeCached("SELECT * from dirs");
+    do_check_eq(rows.length, 3);
+  });
+
+  // Transaction committed.
+  let rows = yield c.executeCached("SELECT * from dirs");
+  do_check_eq(rows.length, 3);
+  yield c.close();
+});
+
+add_task(function test_programmatic_binding_transaction_partial_rollback() {
+  let c = yield getDummyDatabase("programmatic_binding_transaction_partial_rollback");
+
+  let bindings = [
+    {id: 2, path: "foobar"},
+    {id: 3, path: "toofoo"},
+  ];
+
+  let sql = "INSERT INTO dirs VALUES (:id, :path)";
+
+  // Add some data in an implicit transaction before beginning the batch insert.
+  yield c.execute(sql, {id: 1, path: "works"});
+
+  let secondSucceeded = false;
+  try {
+    yield c.executeTransaction(function transaction() {
+      // Insert one row. This won't implicitly start a transaction.
+      let result = yield c.execute(sql, bindings[0]);
+
+      // Insert multiple rows. mozStorage will want to start a transaction.
+      // One of the inserts will fail, so the transaction should be rolled back.
+      let result = yield c.execute(sql, bindings);
+      secondSucceeded = true;
+    });
+  } catch (ex) {
+    print("Caught expected exception: " + ex);
+  }
+
+  // We did not get to the end of our in-transaction block.
+  do_check_false(secondSucceeded);
+
+  // Everything that happened in *our* transaction, not mozStorage's, got
+  // rolled back, but the first row still exists.
+  let rows = yield c.executeCached("SELECT * from dirs");
+  do_check_eq(rows.length, 1);
+  do_check_eq(rows[0].getResultByName("path"), "works");
+  yield c.close();
+});
+
+/**
+ * Just like the previous test, but relying on the implicit
+ * transaction established by mozStorage.
+ */
+add_task(function test_programmatic_binding_implicit_transaction() {
+  let c = yield getDummyDatabase("programmatic_binding_implicit_transaction");
+
+  let bindings = [
+    {id: 2, path: "foobar"},
+    {id: 1, path: "toofoo"},
+  ];
+
+  let sql = "INSERT INTO dirs VALUES (:id, :path)";
+  let secondSucceeded = false;
+  yield c.execute(sql, {id: 1, path: "works"});
+  try {
+    let result = yield c.execute(sql, bindings);
+    secondSucceeded = true;
+  } catch (ex) {
+    print("Caught expected exception: " + ex);
+  }
+
+  do_check_false(secondSucceeded);
+
+  // The entire batch failed.
+  let rows = yield c.executeCached("SELECT * from dirs");
+  do_check_eq(rows.length, 1);
+  do_check_eq(rows[0].getResultByName("path"), "works");
+  yield c.close();
+});
+
 /**
  * Test that direct binding of params and execution through mozStorage doesn't
  * error when we manually create a transaction. See Bug 856925.

From eab1b226e32fce60f7072b8130ef0b3a3f1bcb38 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Tue, 16 Apr 2013 14:01:13 +0200
Subject: [PATCH 314/438] Bug 862247 - Fix Contacts/Settings tests not running
 individually. r=gwagner

--HG--
extra : rebase_source : c9048a4680383576f329c4dcfb139a8e05633076
---
 dom/contacts/tests/test_contacts_basics.html     |  6 +++---
 dom/contacts/tests/test_contacts_blobs.html      | 16 ++++++++++------
 dom/contacts/tests/test_contacts_getall.html     |  9 +++++----
 .../tests/test_contacts_international.html       | 15 ++++++++++-----
 dom/settings/tests/test_settings_blobs.html      |  7 ++++++-
 .../tests/test_settings_onsettingchange.html     | 13 +++++++++----
 6 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/dom/contacts/tests/test_contacts_basics.html b/dom/contacts/tests/test_contacts_basics.html
index 2e3fd21dec64..8393efda2732 100644
--- a/dom/contacts/tests/test_contacts_basics.html
+++ b/dom/contacts/tests/test_contacts_basics.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 <!--
-https://bugzilla.mozilla.org/show_bug.cgi?id={674720}
+https://bugzilla.mozilla.org/show_bug.cgi?id=674720
 -->
 <head>
-  <title>Test for Bug {674720} WebContacts</title>
+  <title>Test for Bug 674720 WebContacts</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id={674720}">Mozilla Bug {674720}</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=674720">Mozilla Bug 674720</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
diff --git a/dom/contacts/tests/test_contacts_blobs.html b/dom/contacts/tests/test_contacts_blobs.html
index 3031d48785c0..8047a0965518 100644
--- a/dom/contacts/tests/test_contacts_blobs.html
+++ b/dom/contacts/tests/test_contacts_blobs.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 <!--
-https://bugzilla.mozilla.org/show_bug.cgi?id={674720}
+https://bugzilla.mozilla.org/show_bug.cgi?id=674720
 -->
 <head>
-  <title>Test for Bug {674720} WebContacts</title>
+  <title>Test for Bug 674720 WebContacts</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id={674720}">Mozilla Bug {674720}</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=674720">Mozilla Bug 674720</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
@@ -35,6 +35,8 @@ SpecialPowers.addPermission("contacts-create", true, document);
 
 var utils = SpecialPowers.getDOMWindowUtils(window);
 
+function tests() {
+
 function getView(size)
 {
  var buffer = new ArrayBuffer(size);
@@ -130,7 +132,7 @@ function verifyBlob(blob1, blob2, isLast)
       verifyBuffers(buffer1, buffer2, isLast);
     }
   }
-  
+
   var reader2 = new FileReader();
   reader2.readAsArrayBuffer(blob1);
   reader2.onload = function(event) {
@@ -155,7 +157,6 @@ function verifyBlobArray(blobs1, blobs2)
     verifyBlob(blobs1[i], blobs2[i], i == blobs1.length - 1);
 }
 
-
 var req;
 var index = 0;
 
@@ -314,9 +315,12 @@ function permissionTest() {
   }
 }
 
+permissionTest();
+}
+
 var gContactsEnabled = SpecialPowers.getBoolPref("dom.mozContacts.enabled");
+addLoadEvent(tests);
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(permissionTest);
 
 ok(true, "test passed");
 </script>
diff --git a/dom/contacts/tests/test_contacts_getall.html b/dom/contacts/tests/test_contacts_getall.html
index 5f132e69033f..9b15d52cb901 100644
--- a/dom/contacts/tests/test_contacts_getall.html
+++ b/dom/contacts/tests/test_contacts_getall.html
@@ -52,9 +52,7 @@ let properties1 = {
   email: [{type: ["work"], value: "x@y.com"}]
 };
 
-function onUnwantedSuccess() {
-  ok(false, "onUnwantedSuccess: shouldn't get here");
-}
+function tests() {
 
 function onFailure() {
   ok(false, "in on Failure!");
@@ -415,9 +413,12 @@ function permissionTest() {
   }
 }
 
+permissionTest();
+}
+
 let gContactsEnabled = SpecialPowers.getBoolPref("dom.mozContacts.enabled");
+addLoadEvent(tests);
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(permissionTest);
 </script>
 </pre>
 </body>
diff --git a/dom/contacts/tests/test_contacts_international.html b/dom/contacts/tests/test_contacts_international.html
index c9edcc58d996..f3ed923d51aa 100644
--- a/dom/contacts/tests/test_contacts_international.html
+++ b/dom/contacts/tests/test_contacts_international.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 <!--
-https://bugzilla.mozilla.org/show_bug.cgi?id={815833}
+https://bugzilla.mozilla.org/show_bug.cgi?id=815833
 -->
 <head>
-  <title>Test for Bug {815833} WebContacts</title>
+  <title>Test for Bug 815833 WebContacts</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id={815833}">Mozilla Bug {815833}</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=815833">Mozilla Bug 815833</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
@@ -28,7 +28,7 @@ if (!SpecialPowers.getBoolPref("dom.mozContacts.enabled")) {
   comp.utils.import("resource://gre/modules/PermissionPromptHelper.jsm");
   SpecialPowers.setBoolPref("dom.mozContacts.enabled", true);
 }
-    
+
 SpecialPowers.addPermission("contacts-write", true, document);
 SpecialPowers.addPermission("contacts-read", true, document);
 SpecialPowers.addPermission("contacts-create", true, document);
@@ -58,6 +58,8 @@ var properties2 = {
   tel: [{type: ["work"], value: shortNumber, carrier: "testCarrier"}]
 };
 
+function tests() {
+
 var req;
 var index = 0;
 var createResult1;
@@ -254,9 +256,12 @@ function permissionTest() {
   }
 }
 
+permissionTest();
+}
+
 var gContactsEnabled = SpecialPowers.getBoolPref("dom.mozContacts.enabled");
+addLoadEvent(tests);
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(permissionTest);
 
 ok(true, "test passed");
 </script>
diff --git a/dom/settings/tests/test_settings_blobs.html b/dom/settings/tests/test_settings_blobs.html
index ffb6a27f71f1..9f1b415680d7 100644
--- a/dom/settings/tests/test_settings_blobs.html
+++ b/dom/settings/tests/test_settings_blobs.html
@@ -43,6 +43,8 @@ function onFailure() {
   }
 }
 
+function tests() {
+
 let mozSettings = window.navigator.mozSettings;
 let req;
 
@@ -154,9 +156,12 @@ function permissionTest() {
   }
 }
 
+permissionTest();
+}
+
 let gSettingsEnabled = SpecialPowers.getBoolPref("dom.mozSettings.enabled");
+addLoadEvent(tests);
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(permissionTest);
 </script>
 </pre>
 </body>
diff --git a/dom/settings/tests/test_settings_onsettingchange.html b/dom/settings/tests/test_settings_onsettingchange.html
index 909c3697d6ba..741264b3fcc3 100644
--- a/dom/settings/tests/test_settings_onsettingchange.html
+++ b/dom/settings/tests/test_settings_onsettingchange.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 <!--
-https://bugzilla.mozilla.org/show_bug.cgi?id={678695}
+https://bugzilla.mozilla.org/show_bug.cgi?id=678695
 -->
 <head>
-  <title>Test for Bug {678695} Settings API</title>
+  <title>Test for Bug 678695 Settings API</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id={678695}">Mozilla Bug {678695}</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=678695">Mozilla Bug 678695</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
@@ -29,6 +29,8 @@ if (!SpecialPowers.getBoolPref("dom.mozSettings.enabled")) {
 SpecialPowers.addPermission("settings-write", true, document);
 SpecialPowers.addPermission("settings-read", true, document);
 
+function tests() {
+
 var screenBright = {"screen.brightness": 0.7};
 
 function onFailure() {
@@ -280,9 +282,12 @@ function permissionTest() {
   }
 }
 
+permissionTest();
+}
+
 var gSettingsEnabled = SpecialPowers.getBoolPref("dom.mozSettings.enabled");
+addLoadEvent(tests);
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(permissionTest);
 
 ok(true, "test passed");
 </script>

From ce61af61ac7b7eca2320333819966b7102345b9f Mon Sep 17 00:00:00 2001
From: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Date: Tue, 16 Apr 2013 22:20:20 +0800
Subject: [PATCH 315/438] Bug 861896 - [b2g-ril] Call waiting feature is not
 working on Geeksphone Peak devices. r=vicamo

---
 dom/system/gonk/ril_worker.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index ff48bbb3aa7e..be0b4c1c40ec 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -74,6 +74,8 @@ let RILQUIRKS_V5_LEGACY = libcutils.property_get("ro.moz.ril.v5_legacy", "true")
 let RILQUIRKS_REQUEST_USE_DIAL_EMERGENCY_CALL = libcutils.property_get("ro.moz.ril.dial_emergency_call", "false") === "true";
 let RILQUIRKS_MODEM_DEFAULTS_TO_EMERGENCY_MODE = libcutils.property_get("ro.moz.ril.emergency_by_default", "false") === "true";
 let RILQUIRKS_SIM_APP_STATE_EXTRA_FIELDS = libcutils.property_get("ro.moz.ril.simstate_extra_field", "false") === "true";
+// Needed for call-waiting on Peak device
+let RILQUIRKS_EXTRA_UINT32_2ND_CALL = libcutils.property_get("ro.moz.ril.extra_int_2nd_call", "false") == "true";
 
 // Marker object.
 let PENDING_NETWORK_TYPE = {};
@@ -4366,6 +4368,13 @@ RIL[REQUEST_GET_CURRENT_CALLS] = function REQUEST_GET_CURRENT_CALLS(length, opti
   let calls = {};
   for (let i = 0; i < calls_length; i++) {
     let call = {};
+
+    // Extra uint32 field to get correct callIndex and rest of call data for
+    // call waiting feature.
+    if (RILQUIRKS_EXTRA_UINT32_2ND_CALL && i > 0) {
+      Buf.readUint32();
+    }
+
     call.state          = Buf.readUint32(); // CALL_STATE_*
     call.callIndex      = Buf.readUint32(); // GSM index (1-based)
     call.toa            = Buf.readUint32();

From 79140f1897f3b537e0f49d593c792ef5a6301c78 Mon Sep 17 00:00:00 2001
From: Chia-hung Tai <ctai@mozilla.com>
Date: Tue, 16 Apr 2013 21:50:15 +0800
Subject: [PATCH 316/438] Bug 862050 : When mms apn is the same as default apn,
 the cellphone can't get data call connection. r=vyang

---
 dom/mms/src/ril/MmsService.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dom/mms/src/ril/MmsService.js b/dom/mms/src/ril/MmsService.js
index 277f0a854112..c8efa87b3e35 100644
--- a/dom/mms/src/ril/MmsService.js
+++ b/dom/mms/src/ril/MmsService.js
@@ -159,6 +159,8 @@ XPCOMUtils.defineLazyGetter(this, "gMmsConnection", function () {
               "available later.");
         this.clearMmsProxySettings();
       }
+      this.connected = gRIL.getDataCallStateByType("mms") ==
+        Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED;
     },
 
     /**

From 58425f0da2314cbf81038d275b90264aa4a15492 Mon Sep 17 00:00:00 2001
From: Patrick Wang <kk1fff@patrickz.net>
Date: Tue, 16 Apr 2013 16:52:16 +0800
Subject: [PATCH 317/438] Bug 860604 - Use receiving time to store received sms
 message. r=vicamo

---
 .../tests/marionette/test_message_classes.js  | 19 +++++++++++++++----
 dom/system/gonk/RadioInterfaceLayer.js        |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dom/mobilemessage/tests/marionette/test_message_classes.js b/dom/mobilemessage/tests/marionette/test_message_classes.js
index 374ee3ff21d0..b1663b688d68 100644
--- a/dom/mobilemessage/tests/marionette/test_message_classes.js
+++ b/dom/mobilemessage/tests/marionette/test_message_classes.js
@@ -30,7 +30,6 @@ function sendSmsPduToEmulator(pdu) {
   });
 }
 
-const TIMESTAMP = Date.UTC(2000, 0, 1);
 function checkMessage(message, id, threadId, messageClass) {
   ok(message instanceof MozSmsMessage,
      "message is instanceof " + message.constructor);
@@ -51,7 +50,6 @@ function checkMessage(message, id, threadId, messageClass) {
   is(message.messageClass, messageClass, "message.messageClass");
   ok(message.timestamp instanceof Date,
      "message.timestamp is instanceof " + message.timestamp.constructor);
-  is(message.timestamp.getTime(), TIMESTAMP, "message.timestamp");
   is(message.read, false, "message.read");
 }
 
@@ -68,6 +66,10 @@ function test_message_class_0() {
 
       let message = event.message;
       checkMessage(message, -1, 0, "class-0");
+      ok(event.message.timestamp.getTime() >= timeBeforeSend,
+         "Message's timestamp should be greater then the timetamp of sending");
+      ok(event.message.timestamp.getTime() <= Date.now(),
+         "Message's timestamp should be lesser than the timestamp of now");
 
       // Make sure the message is not stored.
       let cursor = sms.getMessages(null, false);
@@ -97,7 +99,7 @@ function test_message_class_0() {
     log("  Testing DCS " + dcs);
     let pdu = PDU_SMSC + PDU_FIRST_OCTET + PDU_SENDER + PDU_PID_NORMAL +
               dcs + PDU_TIMESTAMP + PDU_UDL + PDU_UD;
-
+    let timeBeforeSend = Date.now();
     sendSmsPduToEmulator(pdu);
   }
 
@@ -112,6 +114,10 @@ function doTestMessageClassGeneric(allDCSs, messageClass, next) {
 
       // Make sure we can correctly receive the message
       checkMessage(event.message, null, null, messageClass);
+      ok(event.message.timestamp.getTime() >= timeBeforeSend,
+         "Message's timestamp should be greater then the timetamp of sending");
+      ok(event.message.timestamp.getTime() <= Date.now(),
+         "Message's timestamp should be lesser than the timestamp of now");
 
       ++dcsIndex;
       if (dcsIndex >= allDCSs.length) {
@@ -126,6 +132,7 @@ function doTestMessageClassGeneric(allDCSs, messageClass, next) {
     let pdu = PDU_SMSC + PDU_FIRST_OCTET + PDU_SENDER + PDU_PID_NORMAL +
               dcs + PDU_TIMESTAMP + PDU_UDL + PDU_UD;
 
+    let timeBeforeSend = Date.now();
     sendSmsPduToEmulator(pdu);
   }
 
@@ -162,6 +169,10 @@ function test_message_class_2() {
         if (pidIndex == 0) {
           // Make sure we can correctly receive the message
           checkMessage(event.message, null, null, "class-2");
+          ok(event.message.timestamp.getTime() >= timeBeforeSend,
+             "Message's timestamp should be greater then the timetamp of sending");
+          ok(event.message.timestamp.getTime() <= Date.now(),
+             "Message's timestamp should be lesser than the timestamp of now");
 
           next();
           return;
@@ -203,7 +214,7 @@ function test_message_class_2() {
 
       let pdu = PDU_SMSC + PDU_FIRST_OCTET + PDU_SENDER + pid + dcs +
                 PDU_TIMESTAMP + PDU_UDL + PDU_UD;
-
+      let timeBeforeSend = Date.now();
       sendSmsPduToEmulator(pdu);
     }
 
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index a00166ad8913..f1689ab9fa95 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -1552,6 +1552,7 @@ RadioInterfaceLayer.prototype = {
     message.sender = message.sender || null;
     message.receiver = message.receiver || null;
     message.body = message.fullBody = message.fullBody || null;
+    message.timestamp = Date.now();
 
     // TODO: Bug #768441
     // For now we don't store indicators persistently. When the mwi.discard

From 26436acb5c93ef85797a7b250ee7b0ddc795e39e Mon Sep 17 00:00:00 2001
From: Jon Hylands <jhylands@mozilla.com>
Date: Tue, 16 Apr 2013 15:34:11 +0200
Subject: [PATCH 318/438] Bug 853632 - Cache own and containing apps in
 TabContext. r=jlebar

---
 dom/ipc/TabContext.cpp | 26 ++++++++++++++++++++++++++
 dom/ipc/TabContext.h   | 20 +++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/dom/ipc/TabContext.cpp b/dom/ipc/TabContext.cpp
index f0975f5bf87b..4f5e44f5aa31 100644
--- a/dom/ipc/TabContext.cpp
+++ b/dom/ipc/TabContext.cpp
@@ -294,6 +294,32 @@ TabContext::GetAppForId(uint32_t aAppId) const
     return nullptr;
   }
 
+  // This application caching is needed to avoid numerous unecessary application clones.
+  // See Bug 853632 for details.
+
+  if (aAppId == mOwnAppId) {
+    if (!mOwnApp) {
+      mOwnApp = GetAppForIdNoCache(aAppId);
+    }
+    nsCOMPtr<mozIApplication> ownApp = mOwnApp;
+    return ownApp.forget();
+  }
+
+  if (aAppId == mContainingAppId) {
+    if (!mContainingApp) {
+      mContainingApp = GetAppForIdNoCache(mContainingAppId);
+    }
+    nsCOMPtr<mozIApplication> containingApp = mContainingApp;
+    return containingApp.forget();
+  }
+  // We need the fallthrough here because mOwnAppId/mContainingAppId aren't always
+  // set before calling GetAppForId().
+  return GetAppForIdNoCache(aAppId);
+}
+
+already_AddRefed<mozIApplication>
+TabContext::GetAppForIdNoCache(uint32_t aAppId) const
+{
   nsCOMPtr<nsIAppsService> appsService = do_GetService(APPS_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(appsService, nullptr);
 
diff --git a/dom/ipc/TabContext.h b/dom/ipc/TabContext.h
index b9ecd44865c6..cf45018f51e9 100644
--- a/dom/ipc/TabContext.h
+++ b/dom/ipc/TabContext.h
@@ -159,10 +159,15 @@ protected:
 
 private:
   /**
-   * Translate an appId into a mozIApplication.
+   * Translate an appId into a mozIApplication, using lazy caching.
    */
   already_AddRefed<mozIApplication> GetAppForId(uint32_t aAppId) const;
 
+  /**
+   * Translate an appId into a mozIApplication.
+   */
+  already_AddRefed<mozIApplication> GetAppForIdNoCache(uint32_t aAppId) const;
+
   /**
    * Has this TabContext been initialized?  If so, mutator methods will fail.
    */
@@ -174,6 +179,12 @@ private:
    */
   uint32_t mOwnAppId;
 
+  /**
+   * Cache of this TabContext's own app.  If mOwnAppId is NO_APP_ID, this is
+   * guaranteed to be nullptr.  Otherwise, it may or may not be null.
+   */
+  mutable nsCOMPtr<mozIApplication> mOwnApp;
+
   /**
    * The id of the app which contains this TabContext's frame.  If mIsBrowser,
    * this corresponds to the ID of the app which contains the browser frame;
@@ -182,6 +193,13 @@ private:
    */
   uint32_t mContainingAppId;
 
+  /**
+   * Cache of the app that contains this TabContext's frame.  If mContainingAppId
+   * is NO_APP_ID, this is guaranteed to be nullptr.  Otherwise, it may or may not
+   * be null.
+   */
+  mutable nsCOMPtr<mozIApplication> mContainingApp;
+
   /**
    * The requested scrolling behavior for this frame.
    */

From 2d313efb2c91d93d28b61d5664b571203c735b34 Mon Sep 17 00:00:00 2001
From: Diego Wilson <dwilson@codeaurora.org>
Date: Wed, 10 Apr 2013 17:58:25 -0700
Subject: [PATCH 319/438] Bug 860760 - Pause OMX media sources when playback is
 paused. r=sotaro, r=cdouble

OMXCodec needs to now when the stream is paused. Otherwise it will
prevent the device from lowering its power state when idle.
---
 content/media/omx/MediaOmxReader.cpp | 13 ++++++++++++
 content/media/omx/MediaOmxReader.h   |  4 ++++
 content/media/omx/OmxDecoder.cpp     | 30 ++++++++++++++++++++++++++++
 content/media/omx/OmxDecoder.h       | 10 ++++++++++
 4 files changed, 57 insertions(+)

diff --git a/content/media/omx/MediaOmxReader.cpp b/content/media/omx/MediaOmxReader.cpp
index a5fd8200dadd..311673f21370 100644
--- a/content/media/omx/MediaOmxReader.cpp
+++ b/content/media/omx/MediaOmxReader.cpp
@@ -331,5 +331,18 @@ nsresult MediaOmxReader::GetBuffered(mozilla::dom::TimeRanges* aBuffered, int64_
   return NS_OK;
 }
 
+void MediaOmxReader::OnDecodeThreadFinish() {
+  if (mOmxDecoder.get()) {
+    mOmxDecoder->Pause();
+  }
+}
+
+void MediaOmxReader::OnDecodeThreadStart() {
+  if (mOmxDecoder.get()) {
+    nsresult result = mOmxDecoder->Play();
+    NS_ASSERTION(result == NS_OK, "OmxDecoder should be in play state to continue decoding");
+  }
+}
+
 } // namespace mozilla
 
diff --git a/content/media/omx/MediaOmxReader.h b/content/media/omx/MediaOmxReader.h
index 0079b8ef1073..4ced74430ead 100644
--- a/content/media/omx/MediaOmxReader.h
+++ b/content/media/omx/MediaOmxReader.h
@@ -57,6 +57,10 @@ public:
                                 MetadataTags** aTags);
   virtual nsresult Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime);
   virtual nsresult GetBuffered(mozilla::dom::TimeRanges* aBuffered, int64_t aStartTime);
+
+  virtual void OnDecodeThreadStart() MOZ_OVERRIDE;
+
+  virtual void OnDecodeThreadFinish() MOZ_OVERRIDE;
 };
 
 } // namespace mozilla
diff --git a/content/media/omx/OmxDecoder.cpp b/content/media/omx/OmxDecoder.cpp
index 31ad1e7c0236..8b0ad58d53a6 100644
--- a/content/media/omx/OmxDecoder.cpp
+++ b/content/media/omx/OmxDecoder.cpp
@@ -141,6 +141,7 @@ OmxDecoder::OmxDecoder(MediaResource *aResource,
   mVideoBuffer(nullptr),
   mAudioBuffer(nullptr),
   mIsVideoSeeking(false),
+  mPaused(false),
   mAudioMetadataRead(false)
 {
 }
@@ -666,3 +667,32 @@ void OmxDecoder::ReleaseAllPendingVideoBuffersLocked()
   }
   mPendingVideoBuffers.clear();
 }
+
+nsresult OmxDecoder::Play() {
+  if (!mPaused) {
+    return NS_OK;
+  }
+  if (mVideoSource.get() && mVideoSource->start() != OK) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  if (mAudioSource.get()&& mAudioSource->start() != OK) {
+    return NS_ERROR_UNEXPECTED;
+  }
+  mPaused = false;
+  return NS_OK;
+}
+
+void OmxDecoder::Pause() {
+  if (mPaused) {
+    return;
+  }
+  if (mVideoSource.get()) {
+    mVideoSource->pause();
+  }
+
+  if (mAudioSource.get()) {
+    mAudioSource->pause();
+  }
+  mPaused = true;
+}
diff --git a/content/media/omx/OmxDecoder.h b/content/media/omx/OmxDecoder.h
index 3d6ed639effc..d5842cded995 100644
--- a/content/media/omx/OmxDecoder.h
+++ b/content/media/omx/OmxDecoder.h
@@ -132,6 +132,10 @@ class OmxDecoder : public RefBase {
   bool ToVideoFrame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame);
   bool ToAudioFrame(AudioFrame *aFrame, int64_t aTimeUs, void *aData, size_t aDataOffset, size_t aSize,
                     int32_t aAudioChannels, int32_t aAudioSampleRate);
+
+  //True if decoder is in a paused state
+  bool mPaused;
+
 public:
   OmxDecoder(MediaResource *aResource, AbstractMediaDecoder *aDecoder);
   ~OmxDecoder();
@@ -172,6 +176,12 @@ public:
   }
 
   bool ReleaseVideoBuffer(MediaBuffer *aBuffer);
+
+  //Change decoder into a playing state
+  nsresult Play();
+
+  //Change decoder into a paused state
+  void Pause();
 };
 
 }

From ea0064bedca334099b9813224003d9bf096895be Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Mon, 15 Apr 2013 22:35:51 +0200
Subject: [PATCH 320/438] Bug 768288: IonMonkey: Enable inlining of functions
 with loops, r=djvj

---
 js/src/ion/IonBuilder.cpp | 95 ++++++++++++++++++++++++++++-----------
 js/src/ion/TypeOracle.cpp |  6 ---
 js/src/jsanalyze.cpp      |  2 +-
 js/src/jsscript.cpp       |  1 +
 js/src/jsscript.h         | 28 ++++++++++--
 5 files changed, 96 insertions(+), 36 deletions(-)

diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index e41193c06496..ef11dca01b66 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -203,7 +203,8 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     RootedScript inlineScript(cx, target->nonLazyScript());
     ExecutionMode executionMode = info().executionMode();
     if (!CanIonCompile(inlineScript, executionMode)) {
-        IonSpew(IonSpew_Inlining, "Cannot inline due to disable Ion compilation");
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to disable Ion compilation",
+                                  inlineScript->filename(), inlineScript->lineno);
         return false;
     }
 
@@ -212,7 +213,8 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         ion::IsBaselineEnabled(cx) &&
         !inlineScript->hasBaselineScript())
     {
-        IonSpew(IonSpew_Inlining, "Cannot inline target with no baseline jitcode");
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline target with no baseline jitcode",
+                                  inlineScript->filename(), inlineScript->lineno);
         return false;
     }
 
@@ -220,7 +222,8 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     IonBuilder *builder = callerBuilder_;
     while (builder) {
         if (builder->script() == inlineScript) {
-            IonSpew(IonSpew_Inlining, "Not inlining recursive call");
+            IonSpew(IonSpew_Inlining, "%s:%d Not inlining recursive call",
+                                       inlineScript->filename(), inlineScript->lineno);
             return false;
         }
         builder = builder->callerBuilder_;
@@ -229,12 +232,15 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
     RootedScript callerScript(cx, script());
 
     if (!oracle->canEnterInlinedFunction(target)) {
-        IonSpew(IonSpew_Inlining, "Cannot inline due to oracle veto %d", script()->lineno);
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to oracle veto %d",
+                                  inlineScript->filename(), inlineScript->lineno,
+                                  script()->lineno);
         return false;
     }
 
     if (!oracle->callReturnTypeSetMatches(callerScript, pc, target)) {
-        IonSpew(IonSpew_Inlining, "Cannot inline due to return typeset mismatch");
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to return typeset mismatch",
+                                  inlineScript->filename(), inlineScript->lineno);
         return false;
     }
 
@@ -243,7 +249,8 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         // For constructing calls the typeset of caller should intersect the callee's typeset.
         // Except for the |this| type, because that is created during execution depending on target.
         if (!oracle->callArgsTypeSetIntersects(NULL, callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
+            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
+                                      inlineScript->filename(), inlineScript->lineno);
             return false;
         }
     } else if (JSOp(*pc) == JSOP_FUNAPPLY) {
@@ -252,18 +259,25 @@ IonBuilder::canInlineTarget(JSFunction *target, CallInfo &callInfo)
         // of fun.apply. Seeing a new type will only be noticed in the inlined call and
         // result in missed types in TI.
         if (!oracle->callArgsTypeSetMatches(callInfo.thisType(), callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
+            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
+                                       inlineScript->filename(), inlineScript->lineno);
             return false;
         }
     } else {
         // For normal calls the typeset of caller should intersect the callee's typeset.
         if (!oracle->callArgsTypeSetIntersects(callInfo.thisType(), callInfo.argvType(), target)) {
-            IonSpew(IonSpew_Inlining, "Cannot inline due to arguments typeset mismatch");
+            IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to arguments typeset mismatch",
+                                      inlineScript->filename(), inlineScript->lineno);
             return false;
         }
     }
 
-    IonSpew(IonSpew_Inlining, "Inlining good to go!");
+    if (inlineScript->hasIonScript() && inlineScript->ionScript()->bailoutExpected()) {
+        IonSpew(IonSpew_Inlining, "%s:%d Cannot inline due to known bailing script",
+                                  inlineScript->filename(), inlineScript->lineno);
+        return false;
+    }
+
     return true;
 }
 
@@ -3046,6 +3060,12 @@ IonBuilder::inlineScriptedCall(CallInfo &callInfo, JSFunction *target)
 
     // Accumulate return values.
     MIRGraphExits &exits = *inlineBuilder.graph().exitAccumulator();
+    if (exits.length() == 0) {
+        // Inlining of functions that have no exit is not supported.
+        calleeScript->analysis()->setIonUninlineable();
+        abortReason_ = AbortReason_Inlining;
+        return false;
+    }
     MDefinition *retvalDefn = patchInlinedReturns(thisCall, exits, returnBlock);
     if (!retvalDefn)
         return false;
@@ -3226,24 +3246,17 @@ IonBuilder::makeInliningDecision(JSFunction *target, CallInfo &callInfo)
 
     // Heuristics!
 
-    // Cap the inlining depth.
-    if (IsSmallFunction(targetScript)) {
-        if (inliningDepth_ >= js_IonOptions.smallFunctionMaxInlineDepth) {
-            IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding allowed inline depth",
-                                      targetScript->filename(), targetScript->lineno);
-            return false;
-        }
-    } else {
-        if (inliningDepth_ >= js_IonOptions.maxInlineDepth) {
-            IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding allowed inline depth",
-                                      targetScript->filename(), targetScript->lineno);
-            return false;
-        }
-     }
+    IonBuilder *baseBuilder = this;
+    while (baseBuilder->callerBuilder_)
+        baseBuilder = baseBuilder->callerBuilder_;
 
-    // Always inline the empty script up to the inlining depth.
-    if (targetScript->length == 1)
-        return true;
+    // When caller is excessively large only inline small functions.
+    if (script()->length > js_IonOptions.inlineMaxTotalBytecodeLength &&
+        !IsSmallFunction(targetScript)) {
+        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: caller excessively large.",
+                                  targetScript->filename(), targetScript->lineno);
+        return false;
+    }
 
     // Callee must not be excessively large.
     // This heuristic also applies to the callsite as a whole.
@@ -3268,6 +3281,36 @@ IonBuilder::makeInliningDecision(JSFunction *target, CallInfo &callInfo)
         return false;
     }
 
+    // Cap the inlining depth.
+    uint32_t scriptMaxInlineDepth = targetScript->maxInlineDepth();
+    uint32_t globalMaxInlineDepth = js_IonOptions.maxInlineDepth;
+    if (IsSmallFunction(targetScript))
+        globalMaxInlineDepth = js_IonOptions.smallFunctionMaxInlineDepth;
+
+    // Cap the global inline depth.
+    if (inliningDepth_ >= globalMaxInlineDepth) {
+        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding global inline depth",
+                targetScript->filename(), targetScript->lineno);
+        baseBuilder->script()->disableInlineDepthCheck();
+        return false;
+    }
+
+    // Cap on scripts inline depth.
+    if (inliningDepth_ >= scriptMaxInlineDepth)
+    {
+        IonSpew(IonSpew_Inlining, "%s:%d - Vetoed: exceeding script inline depth.",
+                targetScript->filename(), targetScript->lineno);
+        return false;
+    }
+
+    // Update scripts max inline depth
+    // I.e. make sure that all known scripts that get inlined by this script still get inlined.
+    if (!baseBuilder->script()->isInlineDepthCheckDisabled()) {
+        uint32_t updatedInlineDepth = globalMaxInlineDepth - inliningDepth_ - 1;
+        if (updatedInlineDepth < baseBuilder->script()->maxInlineDepth())
+            baseBuilder->script()->setMaxInlineDepth(updatedInlineDepth);
+    }
+
     return true;
 }
 
diff --git a/js/src/ion/TypeOracle.cpp b/js/src/ion/TypeOracle.cpp
index 6e67e7956079..35aa88e63e26 100644
--- a/js/src/ion/TypeOracle.cpp
+++ b/js/src/ion/TypeOracle.cpp
@@ -703,12 +703,6 @@ TypeInferenceOracle::canEnterInlinedFunction(RawFunction target)
 {
     RootedScript targetScript(cx, target->nonLazyScript());
 
-    // Make sure empty script has type information, to allow inlining in more cases.
-    if (targetScript->length == 1) {
-        if (!targetScript->ensureRanInference(cx))
-            return false;
-    }
-
     if (!targetScript->hasAnalysis() ||
         !targetScript->analysis()->ranInference() ||
         !targetScript->analysis()->ranSSA())
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index 0e5312f58ce2..64eec6de4443 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -77,7 +77,7 @@ ScriptAnalysis::addJump(JSContext *cx, unsigned offset,
 
     if (offset < *currentOffset) {
         /* Scripts containing loops are never inlined. */
-        isJaegerInlineable = isIonInlineable = false;
+        isJaegerInlineable = false;
         hasLoops_ = true;
 
         if (code->analyzed) {
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index ed61d59d663b..c978f3d2c967 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1688,6 +1688,7 @@ JSScript::Create(JSContext *cx, HandleObject enclosingScope, bool savedCallerFun
     script->sourceStart = bufStart;
     script->sourceEnd = bufEnd;
     script->userBit = options.userBit;
+    script->maxInlineDepth_ = uint8_t(-1);
 
     return script;
 }
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 595287a6b12b..34cd5055602b 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -427,9 +427,6 @@ class JSScript : public js::gc::Cell
 
     // 16-bit fields.
 
-  private:
-    uint16_t        PADDING16;
-
     uint16_t        version;    /* JS version under which script was compiled */
 
   public:
@@ -445,6 +442,11 @@ class JSScript : public js::gc::Cell
     uint16_t        staticLevel;/* static level for display maintenance */
 
     // 8-bit fields.
+  private:
+    uint8_t        maxInlineDepth_; /* script max inline depth (IonMonkey)
+                                       uint8_t(-1): unitialized
+                                       uint8_t(-2): disabled */
+    uint8_t        PADDING8;
 
   public:
     // The kinds of the optional arrays.
@@ -808,6 +810,26 @@ class JSScript : public js::gc::Cell
         return maxLoopCount;
     }
 
+    void setMaxInlineDepth(uint32_t maxInlineDepth) {
+        if (maxInlineDepth >= uint8_t(-2)) {
+            disableInlineDepthCheck();
+            return;
+        }
+        maxInlineDepth_ = maxInlineDepth;
+    }
+
+    uint8_t maxInlineDepth() const {
+        return maxInlineDepth_;
+    }
+
+    void disableInlineDepthCheck() {
+        maxInlineDepth_ = uint8_t(-2);
+    }
+
+    bool isInlineDepthCheckDisabled() {
+        return maxInlineDepth_ == uint8_t(-2);
+    }
+
     /*
      * Size of the JITScript and all sections.  If |mallocSizeOf| is NULL, the
      * size is computed analytically.  (This method is implemented in

From f3649affbc7994f5923432a9b24b79a7770949c3 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Mon, 15 Apr 2013 23:27:37 +0300
Subject: [PATCH 321/438] Bug 847598 - Paris binding for NotifyPaintEvent,
 r=peterv

--HG--
extra : rebase_source : dcd7cc75cfc42ab5cb636093b67da057019269cb
---
 content/events/src/nsDOMNotifyPaintEvent.cpp | 21 ++++++++++++++++----
 content/events/src/nsDOMNotifyPaintEvent.h   | 13 +++++++++++-
 dom/bindings/Bindings.conf                   |  4 ++++
 dom/webidl/NotifyPaintEvent.webidl           | 16 +++++++++++++++
 dom/webidl/WebIDL.mk                         |  1 +
 js/xpconnect/src/dom_quickstubs.qsconf       |  1 -
 6 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 dom/webidl/NotifyPaintEvent.webidl

diff --git a/content/events/src/nsDOMNotifyPaintEvent.cpp b/content/events/src/nsDOMNotifyPaintEvent.cpp
index 79d8ff1759ce..2ae6cdcdca8b 100644
--- a/content/events/src/nsDOMNotifyPaintEvent.cpp
+++ b/content/events/src/nsDOMNotifyPaintEvent.cpp
@@ -25,6 +25,7 @@ nsDOMNotifyPaintEvent::nsDOMNotifyPaintEvent(mozilla::dom::EventTarget* aOwner,
   if (aInvalidateRequests) {
     mInvalidateRequests.MoveElementsFrom(aInvalidateRequests->mRequests);
   }
+  SetIsDOMBinding();
 }
 
 DOMCI_DATA(NotifyPaintEvent, nsDOMNotifyPaintEvent)
@@ -53,6 +54,13 @@ nsDOMNotifyPaintEvent::GetRegion()
 
 NS_IMETHODIMP
 nsDOMNotifyPaintEvent::GetBoundingClientRect(nsIDOMClientRect** aResult)
+{
+  *aResult = BoundingClientRect().get();
+  return NS_OK;
+}
+
+already_AddRefed<nsClientRect>
+nsDOMNotifyPaintEvent::BoundingClientRect()
 {
   nsRefPtr<nsClientRect> rect = new nsClientRect(ToSupports(this));
 
@@ -60,12 +68,18 @@ nsDOMNotifyPaintEvent::GetBoundingClientRect(nsIDOMClientRect** aResult)
     rect->SetLayoutRect(GetRegion().GetBounds());
   }
 
-  rect.forget(aResult);
-  return NS_OK;
+  return rect.forget();
 }
 
 NS_IMETHODIMP
 nsDOMNotifyPaintEvent::GetClientRects(nsIDOMClientRectList** aResult)
+{
+  *aResult = ClientRects().get();
+  return NS_OK;
+}
+
+already_AddRefed<nsClientRectList>
+nsDOMNotifyPaintEvent::ClientRects()
 {
   nsISupports* parent = ToSupports(this);
   nsRefPtr<nsClientRectList> rectList = new nsClientRectList(parent);
@@ -79,8 +93,7 @@ nsDOMNotifyPaintEvent::GetClientRects(nsIDOMClientRectList** aResult)
     rectList->Append(rect);
   }
 
-  rectList.forget(aResult);
-  return NS_OK;
+  return rectList.forget();
 }
 
 NS_IMETHODIMP
diff --git a/content/events/src/nsDOMNotifyPaintEvent.h b/content/events/src/nsDOMNotifyPaintEvent.h
index ac71d525b1a0..315f2c29e025 100644
--- a/content/events/src/nsDOMNotifyPaintEvent.h
+++ b/content/events/src/nsDOMNotifyPaintEvent.h
@@ -9,8 +9,11 @@
 #include "nsIDOMNotifyPaintEvent.h"
 #include "nsDOMEvent.h"
 #include "nsPresContext.h"
+#include "mozilla/dom/NotifyPaintEventBinding.h"
 
 class nsPaintRequestList;
+class nsClientRectList;
+class nsClientRect;
 
 class nsDOMNotifyPaintEvent : public nsDOMEvent,
                               public nsIDOMNotifyPaintEvent
@@ -35,8 +38,16 @@ public:
   NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType);
   NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter);
 
-  already_AddRefed<nsPaintRequestList> PaintRequests();
+  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope)
+  {
+    return mozilla::dom::NotifyPaintEventBinding::Wrap(aCx, aScope, this);
+  }
 
+  already_AddRefed<nsClientRectList> ClientRects();
+
+  already_AddRefed<nsClientRect> BoundingClientRect();
+
+  already_AddRefed<nsPaintRequestList> PaintRequests();
 private:
   nsRegion GetRegion();
 
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index b4d09d3eabe1..451b4947815a 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -634,6 +634,10 @@ DOMInterfaces = {
     'resultNotAddRefed': [ 'item' ]
 },
 
+'NotifyPaintEvent': {
+    'nativeType': 'nsDOMNotifyPaintEvent',
+},
+
 'PaintRequest': {
     'nativeType': 'nsPaintRequest',
 },
diff --git a/dom/webidl/NotifyPaintEvent.webidl b/dom/webidl/NotifyPaintEvent.webidl
new file mode 100644
index 000000000000..c1eb5a826369
--- /dev/null
+++ b/dom/webidl/NotifyPaintEvent.webidl
@@ -0,0 +1,16 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/.
+ *
+ * For more information about this interface see nsIDOMNotifyPaintEvent.idl
+ */
+
+interface NotifyPaintEvent : Event
+{
+  readonly attribute ClientRectList clientRects;
+
+  readonly attribute ClientRect boundingClientRect;
+
+  readonly attribute PaintRequestList paintRequests;
+};
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index 2223107f176c..bab55ab229b5 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -164,6 +164,7 @@ webidl_files = \
   NodeIterator.webidl \
   NodeList.webidl \
   Notification.webidl \
+  NotifyPaintEvent.webidl \
   PaintRequest.webidl \
   PaintRequestList.webidl \
   PannerNode.webidl \
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index 84d44122b8a7..47e61672268a 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -64,7 +64,6 @@ members = [
 
     'nsIDOMKeyEvent.*',
     'nsIDOMDragEvent.*',
-    'nsIDOMNotifyPaintEvent.*',
     'nsIDOMMouseScrollEvent.*',
     'nsIDOMProgressEvent.lengthComputable',
     'nsIDOMProgressEvent.loaded',

From 190ea4a8ff982819cf94aa36e63d80acdb987131 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Mon, 15 Apr 2013 23:33:46 +0300
Subject: [PATCH 322/438] Bug 856363 - Paris binding for TouchEvent, r=peterv

--HG--
extra : rebase_source : 09fc86b555febd5adfaeebdffeb685e37c1d0823
---
 content/events/src/nsDOMTouchEvent.cpp |  9 ++--
 content/events/src/nsDOMTouchEvent.h   | 66 ++++++++++++++++++++++++++
 dom/bindings/Bindings.conf             |  4 ++
 dom/webidl/TouchEvent.webidl           | 34 +++++++++++++
 dom/webidl/WebIDL.mk                   |  1 +
 js/xpconnect/src/dom_quickstubs.qsconf |  1 -
 6 files changed, 110 insertions(+), 5 deletions(-)
 create mode 100644 dom/webidl/TouchEvent.webidl

diff --git a/content/events/src/nsDOMTouchEvent.cpp b/content/events/src/nsDOMTouchEvent.cpp
index d28853d94716..fba1ffab1ace 100644
--- a/content/events/src/nsDOMTouchEvent.cpp
+++ b/content/events/src/nsDOMTouchEvent.cpp
@@ -85,6 +85,7 @@ nsDOMTouchEvent::nsDOMTouchEvent(mozilla::dom::EventTarget* aOwner,
     mEventIsInternal = true;
     mEvent->time = PR_Now();
   }
+  SetIsDOMBinding();
 }
 
 nsDOMTouchEvent::~nsDOMTouchEvent()
@@ -229,28 +230,28 @@ nsDOMTouchEvent::GetChangedTouches(nsIDOMTouchList** aChangedTouches)
 NS_IMETHODIMP
 nsDOMTouchEvent::GetAltKey(bool* aAltKey)
 {
-  *aAltKey = static_cast<nsInputEvent*>(mEvent)->IsAlt();
+  *aAltKey = AltKey();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDOMTouchEvent::GetMetaKey(bool* aMetaKey)
 {
-  *aMetaKey = static_cast<nsInputEvent*>(mEvent)->IsMeta();
+  *aMetaKey = MetaKey();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDOMTouchEvent::GetCtrlKey(bool* aCtrlKey)
 {
-  *aCtrlKey = static_cast<nsInputEvent*>(mEvent)->IsControl();
+  *aCtrlKey = CtrlKey();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDOMTouchEvent::GetShiftKey(bool* aShiftKey)
 {
-  *aShiftKey = static_cast<nsInputEvent*>(mEvent)->IsShift();
+  *aShiftKey = ShiftKey();
   return NS_OK;
 }
 
diff --git a/content/events/src/nsDOMTouchEvent.h b/content/events/src/nsDOMTouchEvent.h
index 34320e9a3cc8..f3b84266e398 100644
--- a/content/events/src/nsDOMTouchEvent.h
+++ b/content/events/src/nsDOMTouchEvent.h
@@ -11,6 +11,7 @@
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
 #include "nsJSEnvironment.h"
+#include "mozilla/dom/TouchEventBinding.h"
 
 class nsDOMTouchList MOZ_FINAL : public nsIDOMTouchList
 {
@@ -53,6 +54,71 @@ public:
 
   NS_FORWARD_TO_NSDOMUIEVENT
 
+  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope)
+  {
+    return mozilla::dom::TouchEventBinding::Wrap(aCx, aScope, this);
+  }
+
+  already_AddRefed<nsIDOMTouchList> GetTouches()
+  {
+    nsCOMPtr<nsIDOMTouchList> t;
+    GetTouches(getter_AddRefs(t));
+    return t.forget();
+  }
+
+  already_AddRefed<nsIDOMTouchList> GetTargetTouches()
+  {
+    nsCOMPtr<nsIDOMTouchList> t;
+    GetTargetTouches(getter_AddRefs(t));
+    return t.forget();
+  }
+
+  already_AddRefed<nsIDOMTouchList> GetChangedTouches()
+  {
+    nsCOMPtr<nsIDOMTouchList> t;
+    GetChangedTouches(getter_AddRefs(t));
+    return t.forget();
+  }
+
+  bool AltKey()
+  {
+    return static_cast<nsInputEvent*>(mEvent)->IsAlt();
+  }
+
+  bool MetaKey()
+  {
+    return static_cast<nsInputEvent*>(mEvent)->IsMeta();
+  }
+
+  bool CtrlKey()
+  {
+    return static_cast<nsInputEvent*>(mEvent)->IsControl();
+  }
+
+  bool ShiftKey()
+  {
+    return static_cast<nsInputEvent*>(mEvent)->IsShift();
+  }
+
+  void InitTouchEvent(const nsAString& aType,
+                      bool aCanBubble,
+                      bool aCancelable,
+                      nsIDOMWindow* aView,
+                      int32_t aDetail,
+                      bool aCtrlKey,
+                      bool aAltKey,
+                      bool aShiftKey,
+                      bool aMetaKey,
+                      nsIDOMTouchList* aTouches,
+                      nsIDOMTouchList* aTargetTouches,
+                      nsIDOMTouchList* aChangedTouches,
+                      mozilla::ErrorResult& aRv)
+  {
+    aRv = InitTouchEvent(aType, aCanBubble, aCancelable, aView, aDetail,
+                         aCtrlKey, aAltKey, aShiftKey, aMetaKey,
+                         aTouches, aTargetTouches, aChangedTouches);
+  }
+
   static bool PrefEnabled();
 protected:
   nsCOMPtr<nsIDOMTouchList> mTouches;
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 451b4947815a..9f064299f9b8 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -987,6 +987,10 @@ DOMInterfaces = {
     'wrapperCache': False
 },
 
+'TouchEvent': {
+    'nativeType': 'nsDOMTouchEvent',
+},
+
 'TransitionEvent': {
     'nativeType': 'nsDOMTransitionEvent',
 },
diff --git a/dom/webidl/TouchEvent.webidl b/dom/webidl/TouchEvent.webidl
new file mode 100644
index 000000000000..20cdec767e90
--- /dev/null
+++ b/dom/webidl/TouchEvent.webidl
@@ -0,0 +1,34 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/.
+ */
+
+interface TouchList;
+interface WindowProxy;
+
+[PrefControlled]
+interface TouchEvent : UIEvent {
+  readonly attribute TouchList? touches;
+  readonly attribute TouchList? targetTouches;
+  readonly attribute TouchList? changedTouches;
+
+  readonly attribute boolean altKey;
+  readonly attribute boolean metaKey;
+  readonly attribute boolean ctrlKey;
+  readonly attribute boolean shiftKey;
+
+  [Throws]
+  void initTouchEvent(DOMString type,
+                      boolean canBubble,
+                      boolean cancelable,
+                      WindowProxy? view,
+                      long detail,
+                      boolean ctrlKey,
+                      boolean altKey,
+                      boolean shiftKey,
+                      boolean metaKey,
+                      TouchList? touches,
+                      TouchList? targetTouches,
+                      TouchList? changedTouches);
+};
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index bab55ab229b5..e95a6306094a 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -284,6 +284,7 @@ webidl_files = \
   TextDecoder.webidl \
   TextEncoder.webidl \
   TimeRanges.webidl \
+  TouchEvent.webidl \
   TransitionEvent.webidl \
   TreeWalker.webidl \
   UIEvent.webidl \
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index 47e61672268a..af6a5698769b 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -72,7 +72,6 @@ members = [
 
     'nsIDOMTouch.*',
     'nsIDOMTouchList.*',
-    'nsIDOMTouchEvent.*',
 
     # dom/interfaces/html
     'nsIDOMHTMLFormElement.elements',

From 29a9aafd3c1fc3c3187d5453f21b9e489b0fd94d Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Mon, 15 Apr 2013 23:37:52 +0300
Subject: [PATCH 323/438] Bug 856303 - Paris binding for MouseScrollEvent,
 r=peterv

--HG--
extra : rebase_source : 26aec7e5472d213615918f20168e3fd2277b0591
---
 content/events/src/nsDOMMouseScrollEvent.cpp | 21 ++++++++-----
 content/events/src/nsDOMMouseScrollEvent.h   | 23 ++++++++++++++
 dom/bindings/Bindings.conf                   |  5 +++
 dom/webidl/MouseScrollEvent.webidl           | 33 ++++++++++++++++++++
 dom/webidl/WebIDL.mk                         |  1 +
 js/xpconnect/src/dom_quickstubs.qsconf       |  1 -
 6 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 dom/webidl/MouseScrollEvent.webidl

diff --git a/content/events/src/nsDOMMouseScrollEvent.cpp b/content/events/src/nsDOMMouseScrollEvent.cpp
index 39c8e7f3170f..33f46c1e28ec 100644
--- a/content/events/src/nsDOMMouseScrollEvent.cpp
+++ b/content/events/src/nsDOMMouseScrollEvent.cpp
@@ -24,6 +24,7 @@ nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
   if(mEvent->eventStructType == NS_MOUSE_SCROLL_EVENT) {
     mDetail = static_cast<nsMouseScrollEvent*>(mEvent)->delta;
   }
+  SetIsDOMBinding();
 }
 
 nsDOMMouseScrollEvent::~nsDOMMouseScrollEvent()
@@ -78,17 +79,21 @@ NS_IMETHODIMP
 nsDOMMouseScrollEvent::GetAxis(int32_t* aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
-
-  if (mEvent->eventStructType == NS_MOUSE_SCROLL_EVENT) {
-    *aResult = static_cast<nsMouseScrollEvent*>(mEvent)->isHorizontal ?
-                 static_cast<int32_t>(HORIZONTAL_AXIS) :
-                 static_cast<int32_t>(VERTICAL_AXIS);
-  } else {
-    *aResult = 0;
-  }
+  *aResult = Axis();
   return NS_OK;
 }
 
+int32_t
+nsDOMMouseScrollEvent::Axis()
+{
+  if (mEvent->eventStructType == NS_MOUSE_SCROLL_EVENT) {
+    return static_cast<nsMouseScrollEvent*>(mEvent)->isHorizontal ?
+             static_cast<int32_t>(HORIZONTAL_AXIS) :
+             static_cast<int32_t>(VERTICAL_AXIS);
+  }
+  return 0;
+}
+
 nsresult NS_NewDOMMouseScrollEvent(nsIDOMEvent** aInstancePtrResult,
                                    mozilla::dom::EventTarget* aOwner,
                                    nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMMouseScrollEvent.h b/content/events/src/nsDOMMouseScrollEvent.h
index 92c01df5f463..e76ee4f0637c 100644
--- a/content/events/src/nsDOMMouseScrollEvent.h
+++ b/content/events/src/nsDOMMouseScrollEvent.h
@@ -8,6 +8,7 @@
 
 #include "nsIDOMMouseScrollEvent.h"
 #include "nsDOMMouseEvent.h"
+#include "mozilla/dom/MouseScrollEventBinding.h"
 
 class nsDOMMouseScrollEvent : public nsDOMMouseEvent,
                               public nsIDOMMouseScrollEvent
@@ -24,6 +25,28 @@ public:
   
   // Forward to base class
   NS_FORWARD_TO_NSDOMMOUSEEVENT
+
+  virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope)
+  {
+    return mozilla::dom::MouseScrollEventBinding::Wrap(aCx, aScope, this);
+  }
+
+  int32_t Axis();
+
+  void InitMouseScrollEvent(const nsAString& aType, bool aCanBubble,
+                            bool aCancelable, nsIDOMWindow* aView,
+                            int32_t aDetail, int32_t aScreenX, int32_t aScreenY,
+                            int32_t aClientX, int32_t aClientY,
+                            bool aCtrlKey, bool aAltKey, bool aShiftKey,
+                            bool aMetaKey, uint16_t aButton,
+                            nsIDOMEventTarget* aRelatedTarget, int32_t aAxis,
+                            mozilla::ErrorResult& aRv)
+  {
+    aRv = InitMouseScrollEvent(aType, aCanBubble, aCancelable, aView,
+                               aDetail, aScreenX, aScreenY, aClientX, aClientY,
+                               aCtrlKey, aAltKey, aShiftKey, aMetaKey, aButton,
+                               aRelatedTarget, aAxis);
+  }
 };
 
 #endif // nsDOMMouseScrollEvent_h__
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 9f064299f9b8..2d3081bb3bc2 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -589,6 +589,11 @@ DOMInterfaces = {
     'hasXPConnectImpls': True,
 },
 
+'MouseScrollEvent': {
+    'nativeType': 'nsDOMMouseScrollEvent',
+},
+
+
 'MozChannel': [
 {
     'nativeType': 'nsIChannel',
diff --git a/dom/webidl/MouseScrollEvent.webidl b/dom/webidl/MouseScrollEvent.webidl
new file mode 100644
index 000000000000..3846dcaa300f
--- /dev/null
+++ b/dom/webidl/MouseScrollEvent.webidl
@@ -0,0 +1,33 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/.
+ */
+
+interface WindowProxy;
+
+interface MouseScrollEvent : MouseEvent
+{
+  const long HORIZONTAL_AXIS = 1;
+  const long VERTICAL_AXIS = 2;
+
+  readonly attribute long axis;
+
+  [Throws]
+  void initMouseScrollEvent(DOMString type,
+                            boolean canBubble,
+                            boolean cancelable,
+                            WindowProxy? view,
+                            long detail,
+                            long screenX,
+                            long screenY,
+                            long clientX,
+                            long clientY,
+                            boolean ctrlKey,
+                            boolean altKey,
+                            boolean shiftKey,
+                            boolean metaKey,
+                            unsigned short button,
+                            EventTarget? relatedTarget,
+                            long axis);
+};
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index e95a6306094a..785b44caf262 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -155,6 +155,7 @@ webidl_files = \
   MediaStream.webidl \
   MessageEvent.webidl \
   MouseEvent.webidl \
+  MouseScrollEvent.webidl \
   MozActivity.webidl \
   MutationEvent.webidl \
   MutationObserver.webidl \
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index af6a5698769b..48552d2acd60 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -64,7 +64,6 @@ members = [
 
     'nsIDOMKeyEvent.*',
     'nsIDOMDragEvent.*',
-    'nsIDOMMouseScrollEvent.*',
     'nsIDOMProgressEvent.lengthComputable',
     'nsIDOMProgressEvent.loaded',
     'nsIDOMProgressEvent.total',

From 9875169564ab8221852ea3cdc7d89c887f973b2a Mon Sep 17 00:00:00 2001
From: Rodrigo Silveira <rsilveira@mozilla.com>
Date: Wed, 10 Apr 2013 23:06:19 -0700
Subject: [PATCH 324/438] Bug 860994 - Fixup intermittent context menu failing
 tests

--HG--
extra : rebase_source : f577ee38b6e22398b4a8a160cd18dcfcfd3d3169
---
 browser/metro/base/content/helperui/MenuUI.js            | 7 ++++---
 .../base/tests/mochitest/browser_context_menu_tests.js   | 9 ++++++---
 browser/metro/base/tests/mochitest/head.js               | 6 ++++--
 browser/metro/theme/platform.css                         | 8 ++++++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/browser/metro/base/content/helperui/MenuUI.js b/browser/metro/base/content/helperui/MenuUI.js
index d9a2c4317942..3c5f59bce33e 100644
--- a/browser/metro/base/content/helperui/MenuUI.js
+++ b/browser/metro/base/content/helperui/MenuUI.js
@@ -382,14 +382,16 @@ MenuPopup.prototype = {
     let self = this;
     this._panel.addEventListener("transitionend", function () {
       self._panel.removeEventListener("transitionend", arguments.callee);
+      self._panel.removeAttribute("hiding");
       self._panel.hidden = true;
-      self._popupState = null;
+
       let event = document.createEvent("Events");
       event.initEvent("popuphidden", true, false);
       document.dispatchEvent(event);
     });
 
-    this._panel.removeAttribute("showing");
+    this._panel.setAttribute("hiding", "true");
+    setTimeout(()=>this._panel.removeAttribute("showing"), 0);
   },
 
   _position: function _position(aPositionOptions) {
@@ -408,7 +410,6 @@ MenuPopup.prototype = {
     let width = this._popup.boxObject.width;
     let height = this._popup.boxObject.height;
     let halfWidth = width / 2;
-    let halfHeight = height / 2;
     let screenWidth = ContentAreaObserver.width;
     let screenHeight = ContentAreaObserver.height;
 
diff --git a/browser/metro/base/tests/mochitest/browser_context_menu_tests.js b/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
index e599eee97411..1b43d9a5658f 100644
--- a/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
+++ b/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
@@ -30,7 +30,7 @@ function checkContextMenuPositionRange(aElement, aMinLeft, aMaxLeft, aMinTop, aM
   ok(aElement.left > aMinLeft && aElement.left < aMaxLeft,
     "Left position is " + aElement.left + ", expected between " + aMinLeft + " and " + aMaxLeft);
 
-  ok(aElement.top > aMinTop && aElement.top < aMaxTop, 
+  ok(aElement.top > aMinTop && aElement.top < aMaxTop,
     "Top position is " + aElement.top + ", expected between " + aMinTop + " and " + aMaxTop);
 }
 
@@ -347,7 +347,9 @@ gTests.push({
 
     checkContextMenuPositionRange(ContextMenuUI._panel, 65, 80, notificationHeight +  155, notificationHeight + 180);
 
-    ContextMenuUI._menuPopup.hide();
+    promise = waitForEvent(document, "popuphidden");
+    ContextMenuUI.hide();
+    yield promise;
 
     Browser.closeTab(Browser.selectedTab);
   }
@@ -497,6 +499,7 @@ gTests.push({
     ok(imagetab != null, "tab created");
 
     Browser.closeTab(imagetab);
+    yield waitForEvent(imagetab.chromeTab.parentNode, "TabRemove");
   }
 });
 
@@ -511,7 +514,7 @@ gTests.push({
     // Sometimes the context ui is visible, sometimes it isn't.
     try {
       yield waitForCondition(function () {
-        return ContextUI.isVisible;  
+        return ContextUI.isVisible;
       }, 500, 50);
     } catch (ex) {}
 
diff --git a/browser/metro/base/tests/mochitest/head.js b/browser/metro/base/tests/mochitest/head.js
index 6fdab8a303ec..b66c44810344 100644
--- a/browser/metro/base/tests/mochitest/head.js
+++ b/browser/metro/base/tests/mochitest/head.js
@@ -474,19 +474,21 @@ function runTests() {
   waitForExplicitFinish();
   Task.spawn(function() {
     while((gCurrentTest = gTests.shift())){
-      info(gCurrentTest.desc);
+      info("START " + gCurrentTest.desc);
       try {
         if ('function' == typeof gCurrentTest.setUp) {
+          info("SETUP " + gCurrentTest.desc);
           yield Task.spawn(gCurrentTest.setUp.bind(gCurrentTest));
         }
         yield Task.spawn(gCurrentTest.run.bind(gCurrentTest));
         if ('function' == typeof gCurrentTest.tearDown) {
+          info("TEARDOWN " + gCurrentTest.desc);
           yield Task.spawn(gCurrentTest.tearDown.bind(gCurrentTest));
         }
       } catch (ex) {
         ok(false, "runTests: Task failed - " + ex);
       } finally {
-        info("END "+gCurrentTest.desc);
+        info("END " + gCurrentTest.desc);
       }
     }
     finish();
diff --git a/browser/metro/theme/platform.css b/browser/metro/theme/platform.css
index e2a9a45957d1..8600fd00451a 100644
--- a/browser/metro/theme/platform.css
+++ b/browser/metro/theme/platform.css
@@ -160,7 +160,6 @@ menulist {
 .menu-container {
   position: absolute;
   opacity: 0;
-  transition: opacity ease-out 0.2s;
 }
 
 .menu-container[showingfrom="below"] {
@@ -171,10 +170,15 @@ menulist {
   transform: translateY(-@metro_spacing_normal@);
 }
 
+.menu-container[hiding],
+.menu-container[showing] {
+  transition: opacity ease-out 0.2s,
+              transform ease-out 0.2s;
+}
+
 .menu-container[showing] {
   opacity: 1;
   transform: none;
-  transition: all ease-out 0.2s;
 }
 
 .menu-popup > richlistbox {

From 31dac9cb1ff3c849356f54b8579d0ed7a96abd03 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 11 Apr 2013 11:01:52 -0700
Subject: [PATCH 325/438] Bug 858828 - Avoid missing URI host member when
 special-casing user agent string for Youtube domains. r=mfinkle

---
 mobile/android/chrome/content/browser.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 7a6e02f01348..c6d5010971e2 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2092,7 +2092,7 @@ var LightWeightThemeWebInstaller = {
 
 var UserAgent = {
   DESKTOP_UA: null,
-  YOUTUBE_DOMAIN: /\.?youtube\.com$/,
+  YOUTUBE_DOMAIN: /(^|\.)youtube\.com$/,
 
   init: function ua_init() {
     Services.obs.addObserver(this, "DesktopMode:Change", false);
@@ -2130,10 +2130,13 @@ var UserAgent = {
   },
 
   getUserAgentForUriAndTab: function ua_getUserAgentForUriAndTab(aUri, aTab, defaultUA) {
-    if (this.YOUTUBE_DOMAIN.test(aUri.host)) {
-      // Send the phone UA to youtube if this is a tablet
-      if (defaultUA.indexOf("Android; Mobile;") === -1)
-        return defaultUA.replace("Android;", "Android; Mobile;");
+    // Not all schemes have a host member.
+    if (aUri.schemeIs("http") || aUri.schemeIs("https")) {
+      if (this.YOUTUBE_DOMAIN.test(aUri.host)) {
+        // Send the phone UA to Youtube if this is a tablet.
+        if (defaultUA.indexOf("Android; Mobile;") === -1)
+          return defaultUA.replace("Android;", "Android; Mobile;");
+      }
     }
 
     // Send desktop UA if "Request Desktop Site" is enabled

From 02abb420aa1c1c427631d448e923601f0aac7b5d Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 11 Apr 2013 11:01:52 -0700
Subject: [PATCH 326/438] Bug 858828 - Always return desktop user agent if
 requested, even for Youtube domains. r=mfinkle

---
 mobile/android/chrome/content/browser.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index c6d5010971e2..5e782bbba24d 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2130,6 +2130,10 @@ var UserAgent = {
   },
 
   getUserAgentForUriAndTab: function ua_getUserAgentForUriAndTab(aUri, aTab, defaultUA) {
+    // Send desktop UA if "Request Desktop Site" is enabled.
+    if (aTab.desktopMode)
+      return this.DESKTOP_UA;
+
     // Not all schemes have a host member.
     if (aUri.schemeIs("http") || aUri.schemeIs("https")) {
       if (this.YOUTUBE_DOMAIN.test(aUri.host)) {
@@ -2139,10 +2143,6 @@ var UserAgent = {
       }
     }
 
-    // Send desktop UA if "Request Desktop Site" is enabled
-    if (aTab.desktopMode)
-      return this.DESKTOP_UA;
-
     return defaultUA;
   },
 

From 835366eae5aee52de384100d30627eadd59f8502 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 11 Apr 2013 11:01:52 -0700
Subject: [PATCH 327/438] Bug 860513 - QI fallback service to nsIPromptFactory
 in getPrompt. r=mfinkle

---
 mobile/android/components/PromptService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/components/PromptService.js b/mobile/android/components/PromptService.js
index 14757a1b8070..83957b4e2247 100644
--- a/mobile/android/components/PromptService.js
+++ b/mobile/android/components/PromptService.js
@@ -38,7 +38,7 @@ PromptService.prototype = {
     let doc = this.getDocument();
     if (!doc) {
       let fallback = this._getFallbackService();
-      return fallback.getPrompt(domWin, iid);
+      return fallback.QueryInterface(Ci.nsIPromptFactory).getPrompt(domWin, iid);
     }
 
     let p = new Prompt(domWin, doc);

From bae018aace028c8914e3dcc0e3b887315189be99 Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Mon, 15 Apr 2013 02:53:57 -0700
Subject: [PATCH 328/438] Bug 840315 - Emulator update for font support, r=mwu

---
 b2g/test/emulator.manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/test/emulator.manifest b/b2g/test/emulator.manifest
index 45a95731c514..82e4d344b78e 100644
--- a/b2g/test/emulator.manifest
+++ b/b2g/test/emulator.manifest
@@ -1,6 +1,6 @@
 [{
-"size": 621007059,
-"digest": "7ab61ca7a6c25297bbe3ec8328b2a8b4298cb0656747292e86a8caeef08500f2c68c00b5be02f2d83afaa2ae2fb7240e4d8a321c786fd1b0d57aeaa6e257dad5",
+"size": 634920651,
+"digest": "731237d9fcd51637e1fdb7240f57d11f1bda18770025186c06ff72e960551c764bada3c43bae2347f716acd36492c2f4e6bb8eddd9ced7198cbcd8c994ea0705",
 "algorithm": "sha512",
 "filename": "emulator.zip"
 }]

From ab6b29d8ba1c6fa8333e3b7d4ebf9cf39ad6504b Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Mon, 15 Apr 2013 02:53:57 -0700
Subject: [PATCH 329/438] Bug 840315 - Emulator update for font support, r=mwu

---
 b2g/test/emulator.manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/test/emulator.manifest b/b2g/test/emulator.manifest
index 45a95731c514..82e4d344b78e 100644
--- a/b2g/test/emulator.manifest
+++ b/b2g/test/emulator.manifest
@@ -1,6 +1,6 @@
 [{
-"size": 621007059,
-"digest": "7ab61ca7a6c25297bbe3ec8328b2a8b4298cb0656747292e86a8caeef08500f2c68c00b5be02f2d83afaa2ae2fb7240e4d8a321c786fd1b0d57aeaa6e257dad5",
+"size": 634920651,
+"digest": "731237d9fcd51637e1fdb7240f57d11f1bda18770025186c06ff72e960551c764bada3c43bae2347f716acd36492c2f4e6bb8eddd9ced7198cbcd8c994ea0705",
 "algorithm": "sha512",
 "filename": "emulator.zip"
 }]

From 176463fa179d01b9178f8539b49ae65e11e70c5f Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Mon, 15 Apr 2013 15:14:39 +0200
Subject: [PATCH 330/438] Bug 840315 - Change default serif and sans serif
 fonts on gonk, r=jfkthame a=blocking-leo

---
 modules/libpref/src/init/all.js | 116 +++++++++++++++-----------------
 1 file changed, 55 insertions(+), 61 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index f20a542c0988..41c4abcc5137 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3170,89 +3170,83 @@ pref("print.print_extra_margin", 0); // twips
 
 pref("font.alias-list", "sans,sans-serif,serif,monospace");
 
-// As we ship bundled Open Sans and Charis SIL Compact fonts on Android,
-// but not on B2G/Gonk, we give them separate default font preferences.
+// Gonk and Android ship different sets of fonts
 
 #ifdef MOZ_WIDGET_GONK
 
-// TODO: this block is initially a copy of the ANDROID prefs as they were
-// prior to the switch to Open Sans and Charis SIL Compact (bug 831354).
-// We should review these in the light of what's actually present on the Gonk platform;
-// some entries could probably be cleaned up.
+// TODO: some entries could probably be cleaned up.
 
 // ar
 
 pref("font.name.serif.el", "Droid Serif");
-pref("font.name.sans-serif.el", "Droid Sans");
-pref("font.name.monospace.el", "Droid Sans Mono");
-pref("font.name-list.sans-serif.el", "Roboto, Droid Sans");
+pref("font.name.sans-serif.el", "Roboto");
+pref("font.name.monospace.el", "Source Code Pro");
 
-pref("font.name.serif.he", "Droid Serif");
-pref("font.name.sans-serif.he", "Droid Sans");
-pref("font.name.monospace.he", "Droid Sans Mono");
-pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Droid Sans");
+pref("font.name.serif.he", "Charis SIL Compact");
+pref("font.name.sans-serif.he", "Feura Sans");
+pref("font.name.monospace.he", "Source Code Pro");
+pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Feura Sans");
 
-pref("font.name.serif.ja", "Droid Serif");
-pref("font.name.sans-serif.ja", "Droid Sans");
+pref("font.name.serif.ja", "Charis SIL Compact");
+pref("font.name.sans-serif.ja", "Feura Sans");
 pref("font.name.monospace.ja", "MotoyaLMaru");
-pref("font.name-list.sans-serif.ja", "Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
-pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono");
+pref("font.name-list.sans-serif.ja", "Feura Sans, Roboto, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
+pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Source Code Pro");
 
-pref("font.name.serif.ko", "Droid Serif");
-pref("font.name.sans-serif.ko", "Droid Sans");
-pref("font.name.monospace.ko", "Droid Sans Mono");
+pref("font.name.serif.ko", "Charis SIL Compact");
+pref("font.name.sans-serif.ko", "Feura Sans");
+pref("font.name.monospace.ko", "Source Code Pro");
 
-pref("font.name.serif.th", "Droid Serif");
-pref("font.name.sans-serif.th", "Droid Sans");
-pref("font.name.monospace.th", "Droid Sans Mono");
-pref("font.name-list.sans-serif.th", "Droid Sans Thai, Droid Sans");
+pref("font.name.serif.th", "Charis SIL Compact");
+pref("font.name.sans-serif.th", "Feura Sans");
+pref("font.name.monospace.th", "Source Code Pro");
+pref("font.name-list.sans-serif.th", "Feura Sans, Droid Sans Thai");
 
-pref("font.name.serif.tr", "Droid Serif");
-pref("font.name.sans-serif.tr", "Droid Sans");
-pref("font.name.monospace.tr", "Droid Sans Mono");
-pref("font.name-list.sans-serif.tr", "Roboto, Droid Sans");
+pref("font.name.serif.tr", "Charis SIL Compact");
+pref("font.name.sans-serif.tr", "Feura Sans");
+pref("font.name.monospace.tr", "Source Code Pro");
+pref("font.name-list.sans-serif.tr", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-baltic", "Droid Serif");
-pref("font.name.sans-serif.x-baltic", "Droid Sans");
-pref("font.name.monospace.x-baltic", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-baltic", "Roboto, Droid Sans");
+pref("font.name.serif.x-baltic", "Charis SIL Compact");
+pref("font.name.sans-serif.x-baltic", "Feura Sans");
+pref("font.name.monospace.x-baltic", "Source Code Pro");
+pref("font.name-list.sans-serif.x-baltic", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-central-euro", "Droid Serif");
-pref("font.name.sans-serif.x-central-euro", "Droid Sans");
-pref("font.name.monospace.x-central-euro", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-central-euro", "Roboto, Droid Sans");
+pref("font.name.serif.x-central-euro", "Charis SIL Compact");
+pref("font.name.sans-serif.x-central-euro", "Feura Sans");
+pref("font.name.monospace.x-central-euro", "Source Code Pro");
+pref("font.name-list.sans-serif.x-central-euro", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-cyrillic", "Droid Serif");
-pref("font.name.sans-serif.x-cyrillic", "Droid Sans");
-pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-cyrillic", "Roboto, Droid Sans");
+pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
+pref("font.name.sans-serif.x-cyrillic", "Roboto");
+pref("font.name.monospace.x-cyrillic", "Source Code Pro");
 
-pref("font.name.serif.x-unicode", "Droid Serif");
-pref("font.name.sans-serif.x-unicode", "Droid Sans");
-pref("font.name.monospace.x-unicode", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-unicode", "Roboto, Droid Sans");
+pref("font.name.serif.x-unicode", "Charis SIL Compact");
+pref("font.name.sans-serif.x-unicode", "Feura Sans");
+pref("font.name.monospace.x-unicode", "Source Code Pro");
+pref("font.name-list.sans-serif.x-unicode", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-user-def", "Droid Serif");
-pref("font.name.sans-serif.x-user-def", "Droid Sans");
-pref("font.name.monospace.x-user-def", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-user-def", "Roboto, Droid Sans");
+pref("font.name.serif.x-user-def", "Charis SIL Compact");
+pref("font.name.sans-serif.x-user-def", "Feura Sans");
+pref("font.name.monospace.x-user-def", "Source Code Pro");
+pref("font.name-list.sans-serif.x-user-def", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-western", "Droid Serif");
-pref("font.name.sans-serif.x-western", "Droid Sans");
-pref("font.name.monospace.x-western", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-western", "Roboto, Droid Sans");
+pref("font.name.serif.x-western", "Charis SIL Compact");
+pref("font.name.sans-serif.x-western", "Feura Sans");
+pref("font.name.monospace.x-western", "Source Code Pro");
+pref("font.name-list.sans-serif.x-western", "Feura Sans, Roboto");
 
-pref("font.name.serif.zh-CN", "Droid Serif");
-pref("font.name.sans-serif.zh-CN", "Droid Sans");
-pref("font.name.monospace.zh-CN", "Droid Sans Mono");
+pref("font.name.serif.zh-CN", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-CN", "Feura Sans");
+pref("font.name.monospace.zh-CN", "Source Code Pro");
 
-pref("font.name.serif.zh-HK", "Droid Serif");
-pref("font.name.sans-serif.zh-HK", "Droid Sans");
-pref("font.name.monospace.zh-HK", "Droid Sans Mono");
+pref("font.name.serif.zh-HK", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-HK", "Feura Sans");
+pref("font.name.monospace.zh-HK", "Source Code Pro");
 
-pref("font.name.serif.zh-TW", "Droid Serif");
-pref("font.name.sans-serif.zh-TW", "Droid Sans");
-pref("font.name.monospace.zh-TW", "Droid Sans Mono");
+pref("font.name.serif.zh-TW", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-TW", "Feura Sans");
+pref("font.name.monospace.zh-TW", "Source Code Pro");
 
 #else
 

From d2a020879287a64db8da167a6055d532499a02d3 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 15 Apr 2013 11:38:35 -0400
Subject: [PATCH 331/438] Backed out changesets e06db531baaa and 0f1658d37a86
 (bug 840315) for B2G reftest failures. a=backout

---
 b2g/test/emulator.manifest      |   4 +-
 modules/libpref/src/init/all.js | 116 +++++++++++++++++---------------
 2 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/b2g/test/emulator.manifest b/b2g/test/emulator.manifest
index 82e4d344b78e..45a95731c514 100644
--- a/b2g/test/emulator.manifest
+++ b/b2g/test/emulator.manifest
@@ -1,6 +1,6 @@
 [{
-"size": 634920651,
-"digest": "731237d9fcd51637e1fdb7240f57d11f1bda18770025186c06ff72e960551c764bada3c43bae2347f716acd36492c2f4e6bb8eddd9ced7198cbcd8c994ea0705",
+"size": 621007059,
+"digest": "7ab61ca7a6c25297bbe3ec8328b2a8b4298cb0656747292e86a8caeef08500f2c68c00b5be02f2d83afaa2ae2fb7240e4d8a321c786fd1b0d57aeaa6e257dad5",
 "algorithm": "sha512",
 "filename": "emulator.zip"
 }]
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 41c4abcc5137..f20a542c0988 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3170,83 +3170,89 @@ pref("print.print_extra_margin", 0); // twips
 
 pref("font.alias-list", "sans,sans-serif,serif,monospace");
 
-// Gonk and Android ship different sets of fonts
+// As we ship bundled Open Sans and Charis SIL Compact fonts on Android,
+// but not on B2G/Gonk, we give them separate default font preferences.
 
 #ifdef MOZ_WIDGET_GONK
 
-// TODO: some entries could probably be cleaned up.
+// TODO: this block is initially a copy of the ANDROID prefs as they were
+// prior to the switch to Open Sans and Charis SIL Compact (bug 831354).
+// We should review these in the light of what's actually present on the Gonk platform;
+// some entries could probably be cleaned up.
 
 // ar
 
 pref("font.name.serif.el", "Droid Serif");
-pref("font.name.sans-serif.el", "Roboto");
-pref("font.name.monospace.el", "Source Code Pro");
+pref("font.name.sans-serif.el", "Droid Sans");
+pref("font.name.monospace.el", "Droid Sans Mono");
+pref("font.name-list.sans-serif.el", "Roboto, Droid Sans");
 
-pref("font.name.serif.he", "Charis SIL Compact");
-pref("font.name.sans-serif.he", "Feura Sans");
-pref("font.name.monospace.he", "Source Code Pro");
-pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Feura Sans");
+pref("font.name.serif.he", "Droid Serif");
+pref("font.name.sans-serif.he", "Droid Sans");
+pref("font.name.monospace.he", "Droid Sans Mono");
+pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Droid Sans");
 
-pref("font.name.serif.ja", "Charis SIL Compact");
-pref("font.name.sans-serif.ja", "Feura Sans");
+pref("font.name.serif.ja", "Droid Serif");
+pref("font.name.sans-serif.ja", "Droid Sans");
 pref("font.name.monospace.ja", "MotoyaLMaru");
-pref("font.name-list.sans-serif.ja", "Feura Sans, Roboto, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
-pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Source Code Pro");
+pref("font.name-list.sans-serif.ja", "Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
+pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono");
 
-pref("font.name.serif.ko", "Charis SIL Compact");
-pref("font.name.sans-serif.ko", "Feura Sans");
-pref("font.name.monospace.ko", "Source Code Pro");
+pref("font.name.serif.ko", "Droid Serif");
+pref("font.name.sans-serif.ko", "Droid Sans");
+pref("font.name.monospace.ko", "Droid Sans Mono");
 
-pref("font.name.serif.th", "Charis SIL Compact");
-pref("font.name.sans-serif.th", "Feura Sans");
-pref("font.name.monospace.th", "Source Code Pro");
-pref("font.name-list.sans-serif.th", "Feura Sans, Droid Sans Thai");
+pref("font.name.serif.th", "Droid Serif");
+pref("font.name.sans-serif.th", "Droid Sans");
+pref("font.name.monospace.th", "Droid Sans Mono");
+pref("font.name-list.sans-serif.th", "Droid Sans Thai, Droid Sans");
 
-pref("font.name.serif.tr", "Charis SIL Compact");
-pref("font.name.sans-serif.tr", "Feura Sans");
-pref("font.name.monospace.tr", "Source Code Pro");
-pref("font.name-list.sans-serif.tr", "Feura Sans, Roboto");
+pref("font.name.serif.tr", "Droid Serif");
+pref("font.name.sans-serif.tr", "Droid Sans");
+pref("font.name.monospace.tr", "Droid Sans Mono");
+pref("font.name-list.sans-serif.tr", "Roboto, Droid Sans");
 
-pref("font.name.serif.x-baltic", "Charis SIL Compact");
-pref("font.name.sans-serif.x-baltic", "Feura Sans");
-pref("font.name.monospace.x-baltic", "Source Code Pro");
-pref("font.name-list.sans-serif.x-baltic", "Feura Sans, Roboto");
+pref("font.name.serif.x-baltic", "Droid Serif");
+pref("font.name.sans-serif.x-baltic", "Droid Sans");
+pref("font.name.monospace.x-baltic", "Droid Sans Mono");
+pref("font.name-list.sans-serif.x-baltic", "Roboto, Droid Sans");
 
-pref("font.name.serif.x-central-euro", "Charis SIL Compact");
-pref("font.name.sans-serif.x-central-euro", "Feura Sans");
-pref("font.name.monospace.x-central-euro", "Source Code Pro");
-pref("font.name-list.sans-serif.x-central-euro", "Feura Sans, Roboto");
+pref("font.name.serif.x-central-euro", "Droid Serif");
+pref("font.name.sans-serif.x-central-euro", "Droid Sans");
+pref("font.name.monospace.x-central-euro", "Droid Sans Mono");
+pref("font.name-list.sans-serif.x-central-euro", "Roboto, Droid Sans");
 
-pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
-pref("font.name.sans-serif.x-cyrillic", "Roboto");
-pref("font.name.monospace.x-cyrillic", "Source Code Pro");
+pref("font.name.serif.x-cyrillic", "Droid Serif");
+pref("font.name.sans-serif.x-cyrillic", "Droid Sans");
+pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
+pref("font.name-list.sans-serif.x-cyrillic", "Roboto, Droid Sans");
 
-pref("font.name.serif.x-unicode", "Charis SIL Compact");
-pref("font.name.sans-serif.x-unicode", "Feura Sans");
-pref("font.name.monospace.x-unicode", "Source Code Pro");
-pref("font.name-list.sans-serif.x-unicode", "Feura Sans, Roboto");
+pref("font.name.serif.x-unicode", "Droid Serif");
+pref("font.name.sans-serif.x-unicode", "Droid Sans");
+pref("font.name.monospace.x-unicode", "Droid Sans Mono");
+pref("font.name-list.sans-serif.x-unicode", "Roboto, Droid Sans");
 
-pref("font.name.serif.x-user-def", "Charis SIL Compact");
-pref("font.name.sans-serif.x-user-def", "Feura Sans");
-pref("font.name.monospace.x-user-def", "Source Code Pro");
-pref("font.name-list.sans-serif.x-user-def", "Feura Sans, Roboto");
+pref("font.name.serif.x-user-def", "Droid Serif");
+pref("font.name.sans-serif.x-user-def", "Droid Sans");
+pref("font.name.monospace.x-user-def", "Droid Sans Mono");
+pref("font.name-list.sans-serif.x-user-def", "Roboto, Droid Sans");
 
-pref("font.name.serif.x-western", "Charis SIL Compact");
-pref("font.name.sans-serif.x-western", "Feura Sans");
-pref("font.name.monospace.x-western", "Source Code Pro");
-pref("font.name-list.sans-serif.x-western", "Feura Sans, Roboto");
+pref("font.name.serif.x-western", "Droid Serif");
+pref("font.name.sans-serif.x-western", "Droid Sans");
+pref("font.name.monospace.x-western", "Droid Sans Mono");
+pref("font.name-list.sans-serif.x-western", "Roboto, Droid Sans");
 
-pref("font.name.serif.zh-CN", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-CN", "Feura Sans");
-pref("font.name.monospace.zh-CN", "Source Code Pro");
+pref("font.name.serif.zh-CN", "Droid Serif");
+pref("font.name.sans-serif.zh-CN", "Droid Sans");
+pref("font.name.monospace.zh-CN", "Droid Sans Mono");
 
-pref("font.name.serif.zh-HK", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-HK", "Feura Sans");
-pref("font.name.monospace.zh-HK", "Source Code Pro");
+pref("font.name.serif.zh-HK", "Droid Serif");
+pref("font.name.sans-serif.zh-HK", "Droid Sans");
+pref("font.name.monospace.zh-HK", "Droid Sans Mono");
 
-pref("font.name.serif.zh-TW", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-TW", "Feura Sans");
-pref("font.name.monospace.zh-TW", "Source Code Pro");
+pref("font.name.serif.zh-TW", "Droid Serif");
+pref("font.name.sans-serif.zh-TW", "Droid Sans");
+pref("font.name.monospace.zh-TW", "Droid Sans Mono");
 
 #else
 

From 51794edb79135b55ed6b844cb0cb59c40876bc67 Mon Sep 17 00:00:00 2001
From: Marco Chen <mchen@mozilla.com>
Date: Mon, 15 Apr 2013 23:02:12 +0800
Subject: [PATCH 332/438] Bug 836201 - [FM Radio] Music is not playing while FM
 is playing in background. r=jlebar, a=leo+

---
 dom/fm/FMRadio.cpp | 9 +++++++++
 dom/fm/FMRadio.h   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dom/fm/FMRadio.cpp b/dom/fm/FMRadio.cpp
index 263d83194aea..49a61acae91d 100644
--- a/dom/fm/FMRadio.cpp
+++ b/dom/fm/FMRadio.cpp
@@ -251,14 +251,23 @@ NS_IMETHODIMP FMRadio::CanPlayChanged(bool canPlay)
   nsCOMPtr<nsIAudioManager> audioManager =
     do_GetService(NS_AUDIOMANAGER_CONTRACTID);
   NS_ENSURE_TRUE(audioManager, NS_OK);
+
+  bool AudioEnabled;
+  audioManager->GetFmRadioAudioEnabled(&AudioEnabled);
+  if (AudioEnabled == canPlay) {
+    return NS_OK;
+  }
+
   /* mute fm first, it should be better to stop&resume fm */
   if (canPlay) {
+    audioManager->SetFmRadioAudioEnabled(true);
     int32_t volIdx = 0;
     // Restore fm volume, that value is sync as music type
     audioManager->GetStreamVolumeIndex(nsIAudioManager::STREAM_TYPE_MUSIC, &volIdx);
     audioManager->SetStreamVolumeIndex(nsIAudioManager::STREAM_TYPE_FM, volIdx);
   } else {
     audioManager->SetStreamVolumeIndex(nsIAudioManager::STREAM_TYPE_FM, 0);
+    audioManager->SetFmRadioAudioEnabled(false);
   }
   return NS_OK;
 }
diff --git a/dom/fm/FMRadio.h b/dom/fm/FMRadio.h
index af3828d67ef3..e1800590cbcc 100644
--- a/dom/fm/FMRadio.h
+++ b/dom/fm/FMRadio.h
@@ -42,10 +42,10 @@ public:
 private:
   ~FMRadio();
 
+  nsCOMPtr<nsIAudioChannelAgent> mAudioChannelAgent;
   hal::SwitchState mHeadphoneState;
   bool mHasInternalAntenna;
   bool mHidden;
-  nsCOMPtr<nsIAudioChannelAgent> mAudioChannelAgent;
 };
 
 } // namespace fm

From ef862b301622a1097c7bebc8eee939b2e0e35fa9 Mon Sep 17 00:00:00 2001
From: Martijn Wargers <mwargers@mozilla.com>
Date: Mon, 15 Apr 2013 20:00:16 +0200
Subject: [PATCH 333/438] Bug 860748 - Cleanup exclude list for b2g mochitests
 on the emulator. r=jgriffin

---
 testing/mochitest/b2g.json | 921 ++++++++++++++++---------------------
 1 file changed, 400 insertions(+), 521 deletions(-)

diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json
index bd8e2915f094..b733d56018bc 100644
--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -4,537 +4,416 @@
     "content": "",
     "docshell": "",
     "dom": "",
-    "dom/apps": "",
     "layout": ""
   },
 "excludetests": {
-	"caps/tests/mochitest/test_app_principal_equality.html": " should not be able to access the other frames - got true, expected false",
-	"content/xbl/":"",
-	"content/xul" : "",
-        "content/html/content/test/" : "",
-        "content/media/" : "",
+    "content/xbl/":"",
+    "content/xul":"",
+    "content/media/":"",
 
-        "content/base/test/test_object.html":"",
-        "content/base/test/test_bug282547.html":"",
-        "content/base/test/test_bug282547.html":"",
-        "content/events/test/test_focus_disabled.html":"",
-	"content/base/test/test_xbl_userdata.xhtml":"",
-	"content/base/test/test_CSP_evalscript.html":"",
-	"content/base/test/test_CSP_frameancestors.html":"",
-	"content/base/test/test_CSP_inlinescript.html":"",
-	"content/svg/content/test/test_text_selection.html":"",
-	"content/base/test/test_CSP.html" : "",
-	"content/base/test/test_CrossSiteXHR_origin.html" : "",
-        "content/base/test/test_CrossSiteXHR.html": "",
-	"content/base/test/test_XHRSendData.html" : "",
-	"content/base/test/test_XHR_parameters.html" : "",
-	"content/base/test/test_XHR_system.html" : "",
-	"content/base/test/test_base.xhtml" : "",
-	"content/base/test/test_bug166235.html" : "",
-	"content/base/test/test_bug326337.html" : "",
-	"content/base/test/test_bug330925.xhtml" : "",
-	"content/base/test/test_bug331959.html" : "",
-	"content/base/test/test_bug333198.html" : "",
-	"content/base/test/test_bug338583.html" : "",
-	"content/base/test/test_bug338583.html" : "",
-	"content/base/test/test_bug372086.html" : "",
-	"content/base/test/test_bug403852.html" : "",
-	"content/base/test/test_bug416317-2.html" : "",
-	"content/base/test/test_bug416383.html" : "",
-	"content/base/test/test_bug417384.html" : "",
-	"content/base/test/test_bug418214.html" : "",
-	"content/base/test/test_bug419132.html" : "",
-	"content/base/test/test_bug419527.xhtml": "",
-	"content/base/test/test_CrossSiteXHR_cache.html" : "",
-	"content/base/test/test_bug416317-1.html" : "",
-	"content/base/test/test_bug417255.html" : "",
-	"content/base/test/test_bug420609.xhtml" : "",
-	"content/base/test/test_bug420700.html" : "",
-	"content/base/test/test_bug421602.html" : "",
-	"content/base/test/test_bug422403-1.html" : "",
-	"content/base/test/test_bug422537.html" : "",
-	"content/base/test/test_bug426646.html" : "",
-	"content/base/test/test_bug431701.html" : "",
-        "content/base/test/test_bug564863.xhtml" : "",
-        "content/base/test/test_bug578096.html" : "",
-	"content/base/test/test_bug560780.html" : "",
-	"content/base/test/test_bug548193.html" : "",
-	"content/base/test/test_bug500937.html" : "",
-	"content/base/test/test_bug499656.html" : "",
-	"content/base/test/test_bug498897.html" : "",
-	"content/base/test/test_plugin_freezing.html" : "",
-	"content/base/test/test_bug444030.xhtml":"",
-	"content/base/test/test_bug466080.html":"",
-	"content/base/test/test_bug466409.html":"",
-	"content/base/test/test_bug466751.xhtml":"",
-	"content/base/test/test_bug475156.html":"",
-	"content/base/test/test_bug482935.html":"",
-	"content/base/test/test_bug484396.html":"",
-	"content/base/test/test_bug493881.html":"",
-	"content/base/test/test_bug498240.html":"",
-	"content/base/test/test_bug498433.html":"",
-	"content/base/test/test_bug499656.xhtml":"",
-	"content/base/test/test_bug503481.html":"",
-	"content/base/test/test_bug503481b.html":"",
-	"content/base/test/test_bug505783.html":"",
-	"content/base/test/test_bug557892.html":"",
-	"content/base/test/test_bug590870.html":"",
-	"content/base/test/test_bug622117.html":"",
-	"content/base/test/test_bug622246.html":"",
-	"content/base/test/test_bug650386_redirect_301.html":"",
-	"content/base/test/test_bug650386_redirect_302.html":"",
-	"content/base/test/test_bug650386_redirect_303.html":"",
-	"content/base/test/test_bug650386_redirect_307.html":"",
-	"content/base/test/test_bug666604.html":"",
-	"content/base/test/test_bug717511.html":"",
-	"content/base/test/test_child_process_shutdown_message.html":"",
-	"content/base/test/test_classList.html":"",
-	"content/base/test/test_copypaste.html":"",
-	"content/base/test/test_csp_redirects.html":"",
-	"content/base/test/test_fileapi.html":"",
-	"content/base/test/test_fileapi_slice.html":"",
-	"content/base/test/test_messagemanager_assertpermission.html":"",
-	"content/base/test/test_mixed_content_blocker.html":"",
-	"content/base/test/test_mixed_content_blocker_bug803225.html": "",
-	"content/base/test/test_mixed_content_blocker_frameNavigation.html": "",
-	"content/base/test/test_mozfiledataurl.html":"",
-	"content/base/test/test_mutationobservers.html":"",
-	"content/base/test/test_range_bounds.html":"",
-	"content/base/test/test_title.html":"",
-	"content/base/test/test_websocket.html":"",
-	"content/base/test/test_websocket_basic.html":"",
-	"content/base/test/test_websocket_hello.html":"",
-	"content/base/test/test_x-frame-options.html":"",
-	"content/base/test/websocket_hybi/test_receive-arraybuffer.html":"",
-	"content/base/test/websocket_hybi/test_receive-blob.html":"",
-	"content/base/test/websocket_hybi/test_send-arraybuffer.html":"",
-	"content/base/test/websocket_hybi/test_send-blob.html":"",
-	"content/canvas/test/crossorigin/test_video_crossorigin.html":"",
-	"content/canvas/test/webgl/test_webgl_conformance_test_suite.html":"",
-	"content/events/test/test_bug226361.xhtml":"",
-	"content/events/test/test_bug238987.html":"",
-	"content/events/test/test_bug322588.html":"",
-	"content/events/test/test_bug391568.xhtml":"",
-	"content/events/test/test_bug409604.html":"",
-	"content/events/test/test_bug422132.html":"",
-	"content/events/test/test_bug426082.html":"",
-	"content/events/test/test_bug432698.html":"",
-	"content/events/test/test_bug450876.html":"",
-	"content/events/test/test_bug457672.html":"",
-	"content/events/test/test_bug493251.html":"",
-	"content/events/test/test_bug508479.html":"",
-	"content/events/test/test_bug534833.html":"",
-	"content/events/test/test_bug545268.html":"",
-	"content/events/test/test_bug547996-2.xhtml":"",
-	"content/events/test/test_bug574663.html":"",
-	"content/events/test/test_bug607464.html":"",
-	"content/events/test/test_bug624127.html":"",
-	"content/events/test/test_bug635465.html":"",
-	"content/events/test/test_bug641477.html":"",
-	"content/events/test/test_bug648573.html":"",
-	"content/events/test/test_bug650493.html":"",
-	"content/events/test/test_bug656379-1.html":"",
-	"content/events/test/test_bug656379-2.html":"",
-	"content/events/test/test_bug659071.html":"",
-	"content/events/test/test_bug667919-1.html":"",
-	"content/events/test/test_bug667919-2.html":"",
-	"content/events/test/test_bug689564.html":"",
-	"content/events/test/test_bug698929.html":"",
-	"content/events/test/test_bug716822.html":"",
-	"content/events/test/test_bug741666.html":"",
-	"content/events/test/test_bug742376.html":"",
-	"content/events/test/test_clickevent_on_input.html":"",
-	"content/events/test/test_continuous_wheel_events.html":"",
-	"content/events/test/test_dom_keyboard_event.html":"",
-	"content/events/test/test_dom_mouse_event.html":"",
-	"content/events/test/test_dom_wheel_event.html":"",
-	"content/events/test/test_dragstart.html":"",
-	"content/events/test/test_moz_mouse_pixel_scroll_event.html":"",
-	"content/events/test/test_wheel_default_action.html":"",
-	"content/base/test/test_bug682592.html":"",
-	"content/base/test/test_reentrant_flush.html":"",
-	"content/events/test/test_bug656954.html":"",
-	"content/events/test/test_bug659350.html":"",
-	"content/events/test/test_bug662678.html":"",
-	"content/events/test/test_bug667612.html":"",
-	"content/events/test/test_draggableprop.html":"",
-	"content/events/test/test_eventctors.html":"",
-	"content/base/test/test_sync_xhr_timer.xhtml":"",
-        "content/base/test/test_text_wholeText.html":"",
-        "content/base/test/test_text_wholeText.html":"",
-	"content/base/test/test_treewalker_nextsibling.xml":"",
-	"content/events/test/test_bug615597.html":"",
-        "content/base/test/test_text_wholeText.html":"",
-	"content/base/test/test_treewalker_nextsibling.xml":"",
-	"content/events/test/test_bug615597.html":"",
+    "dom/imptests/editing/selecttest/test_addRange.html": "oom?, bug 775227",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-insertNode.html":"oom?, bug 775227",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-cloneContents.html":"",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-deleteContents.html":"",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-extractContents.html":"",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-set.html":"",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-surroundContents.html":"",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-mutations.html":"Test timed out.",
+    "dom/encoding/test/test_stringencoding.html":"Test timed out on b2g board",
 
-	"content/base/test/test_viewport_scroll.html":"",
+    "content/events/test/test_bug615597.html":"", 
+    "content/html/content/test/forms/test_input_sanitization.html":"",
+    "dom/tests/mochitest/ajax/jquery/test_jQuery.html":"",
+ 
+    "content/base/test/test_CSP_inlinescript.html":"",
+    "content/base/test/test_XHRSendData.html":"",
+    "content/base/test/test_XHR_parameters.html":"",
+    "content/base/test/test_XHR_system.html":"",
+    "content/base/test/test_base.xhtml":"",
+    "content/base/test/test_bug338583.html":"",
+    "content/base/test/test_bug372086.html":"",
+    "content/base/test/test_bug466080.html":"",
+    "content/base/test/test_bug475156.html":"",
+    "content/base/test/test_bug590870.html":"",
+    "content/base/test/test_bug666604.html":"",
+    "content/base/test/test_bug675121.html":"",
+    "content/base/test/test_classList.html":"",
+    "content/base/test/test_mutationobservers.html":"",
+    "content/base/test/test_title.html":"",
+    "content/canvas/test/crossorigin/test_video_crossorigin.html":"",
+    "content/events/test/test_bug422132.html":"",
+    "content/events/test/test_bug426082.html":"",
+    "content/events/test/test_bug534833.html":"",
+    "content/events/test/test_bug603008.html":"",
+    "content/events/test/test_bug659071.html":"",
+    "content/events/test/test_bug667919-1.html":"",
+    "content/events/test/test_bug667919-2.html":"",
+    "content/events/test/test_continuous_wheel_events.html":"",
+    "content/events/test/test_dom_wheel_event.html":"",
+    "content/html/content/test/forms/test_input_file_picker.html":"",
+    "content/html/content/test/forms/test_max_attribute.html":"",
+    "content/html/content/test/forms/test_min_attribute.html":"",
+    "content/html/content/test/forms/test_required_attribute.html":"",
+    "content/html/content/test/forms/test_step_attribute.html":"",
+    "content/html/content/test/forms/test_validation.html":"",
+    "content/html/content/test/test_bug209275.xhtml":"",
+    "content/html/content/test/test_bug430351.html":"",
+    "content/html/content/test/test_bug458037.xhtml":"",
+    "content/html/content/test/test_bug481335.xhtml":"",
+    "content/html/content/test/test_bug523771.html":"",
+    "content/html/content/test/test_bug561636.html":"",
+    "content/html/content/test/test_bug590353-2.html":"",
+    "content/html/content/test/test_bug598643.html":"",
+    "content/html/content/test/test_bug612730.html":"",
+    "content/html/content/test/test_bug613113.html":"",
+    "content/html/content/test/test_bug615833.html":"",
+    "content/html/content/test/test_bug618948.html":"",
+    "content/html/content/test/test_bug619278.html":"",
+    "content/html/content/test/test_bug622597.html":"",
+    "content/html/content/test/test_fullscreen-api.html":"",
+    "content/html/content/test/test_iframe_sandbox_inheritance.html":"",
+    "content/html/content/test/test_iframe_sandbox_navigation.html":"",
+    "content/html/content/test/test_formSubmission.html":"",
+    "content/html/content/test/test_iframe_sandbox_plugins.html":"",
+    "content/html/content/test/test_object_plugin_nav.html":"",
+    "content/html/document/test/test_bug199692.html":"",
+    "content/html/document/test/test_bug741266.html":"",
+    "docshell/test/navigation/test_popup-navigates-children.html":"",
+    "docshell/test/test_bug590573.html":"",
+    "dom/devicestorage/ipc/test_ipc.html":"",
+    "dom/file/test/test_progress_events.html":"",
+    "dom/file/test/test_request_readyState.html":"",
+    "dom/file/test/test_stream_tracking.html":"",
+    "dom/indexedDB/ipc/test_ipc.html":"",
+    "dom/tests/mochitest/ajax/offline/test_noManifest.html":"",
+    "dom/tests/mochitest/bugs/test_bug437361.html":"",
+    "dom/tests/mochitest/general/test_bug629535.html":"",
+    "content/base/test/test_object.html":"",
+    "content/base/test/test_xbl_userdata.xhtml":"",
+    "content/base/test/test_CSP_evalscript.html":"",
+    "content/base/test/test_CSP_frameancestors.html":"",
+    "content/svg/content/test/test_text_selection.html":"",
+    "content/base/test/test_CSP.html":"",
+    "content/base/test/test_CrossSiteXHR_origin.html":"",
+    "content/base/test/test_bug166235.html":"",
+    "content/base/test/test_bug326337.html":"",
+    "content/base/test/test_bug330925.xhtml":"",
+    "content/base/test/test_bug403852.html":"",
+    "content/base/test/test_bug419527.xhtml":"",
+    "content/base/test/test_bug422403-1.html":"",
+    "content/base/test/test_bug422537.html":"",
+    "content/base/test/test_bug431701.html":"",
+    "content/base/test/test_bug564863.xhtml":"",
+    "content/base/test/test_bug548193.html":"",
+    "content/base/test/test_plugin_freezing.html":"",
+    "content/base/test/test_bug444030.xhtml":"",
+    "content/base/test/test_bug466409.html":"",
+    "content/base/test/test_bug482935.html":"",
+    "content/base/test/test_bug498433.html":"",
+    "content/base/test/test_bug650386_redirect_301.html":"",
+    "content/base/test/test_bug650386_redirect_302.html":"",
+    "content/base/test/test_bug650386_redirect_303.html":"",
+    "content/base/test/test_bug650386_redirect_307.html":"",
+    "content/base/test/test_bug717511.html":"",
+    "content/base/test/test_child_process_shutdown_message.html":"",
+    "content/base/test/test_copypaste.html":"",
+    "content/base/test/test_csp_redirects.html":"",
+    "content/base/test/test_fileapi.html":"",
+    "content/base/test/test_fileapi_slice.html":"",
+    "content/base/test/test_messagemanager_assertpermission.html":"",
+    "content/base/test/test_mixed_content_blocker.html":"",
+    "content/base/test/test_mixed_content_blocker_bug803225.html":"",
+    "content/base/test/test_mixed_content_blocker_frameNavigation.html":"",
+    "content/base/test/test_mozfiledataurl.html":"",
+    "content/base/test/test_websocket.html":"",
+    "content/base/test/test_websocket_basic.html":"",
+    "content/base/test/test_websocket_hello.html":"",
+    "content/base/test/test_x-frame-options.html":"",
+    "content/base/test/websocket_hybi/test_receive-arraybuffer.html":"",
+    "content/base/test/websocket_hybi/test_receive-blob.html":"",
+    "content/base/test/websocket_hybi/test_send-arraybuffer.html":"",
+    "content/base/test/websocket_hybi/test_send-blob.html":"",
+    "content/canvas/test/webgl/test_webgl_conformance_test_suite.html":"",
+    "content/events/test/test_bug226361.xhtml":"",
+    "content/events/test/test_bug238987.html":"",
+    "content/events/test/test_bug391568.xhtml":"",
+    "content/events/test/test_bug409604.html":"",
+    "content/events/test/test_bug457672.html":"",
+    "content/events/test/test_bug508479.html":"",
+    "content/events/test/test_bug547996-2.xhtml":"",
+    "content/events/test/test_bug574663.html":"",
+    "content/events/test/test_bug607464.html":"",
+    "content/events/test/test_dragstart.html":"",
+    "content/events/test/test_wheel_default_action.html":"",
+    "content/base/test/test_bug682592.html":"",	
+    "content/html/document/test/test_bug369370.html":"",
+    "content/html/document/test/test_bug391777.html":"",
+    "content/svg/content/test/test_SVGAnimatedImageSMILDisabled.html":"",
+    "content/svg/content/test/test_switch.xhtml":"",
+    "content/xml/document/test/test_bug392338.html":"",
+    "content/xslt/tests/mochitest/test_bug319374.xhtml":"",
+    "content/base/test/test_bothCSPheaders.html":"",
+    "content/base/test/test_bug383430.html":"",
+    "content/base/test/test_bug422403-2.xhtml":"",
+    "content/base/test/test_bug424359-1.html":"",
+    "content/base/test/test_bug424359-2.html":"",
+    "content/base/test/test_bug426308.html":"",
+    "content/base/test/test_bug804395.html":"",
+    "content/base/test/test_mixed_content_blocker_bug803225.html":"",
+    "content/html/document/test/test_non-ascii-cookie.html":"",
 
+    "docshell/test/navigation/test_bug13871.html":"",
+    "docshell/test/navigation/test_bug270414.html":"",
+    "docshell/test/navigation/test_bug344861.html":"",
+    "docshell/test/navigation/test_bug386782.html":"",
+    "docshell/test/navigation/test_not-opener.html":"",
+    "docshell/test/navigation/test_reserved.html":"",
+    "docshell/test/test_bug369814.html":"",
+    "docshell/test/test_bug413310.html":"",
+    "docshell/test/test_bug94514.html":"",
 
-        "content/base/test/test_text_wholeText.html":"",
+    "dom/imptests/html/webgl":"",        
+    "dom/battery/test/test_battery_basics.html":"",
+    "dom/browser-element/mochitest/test_browserElement_inproc_Alert.html":"",
+    "dom/browser-element/mochitest/test_browserElement_inproc_AppFramePermission.html":"",
+    "dom/browser-element/mochitest/test_browserElement_inproc_AppWindowNamespace.html":"",
+    "dom/browser-element/mochitest/test_browserElement_inproc_Auth.html":"",
+    "dom/browser-element/mochitest/test_browserElement_inproc_BrowserWindowNamespace.html":"",
+    "dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html":"",
+    "dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html":"",
+    "dom/browser-element/":"",
+    "dom/contacts/":"",
 
-	"content/base/test/test_treewalker_nextsibling.xml":"",
-	"content/events/test/test_bug615597.html":"",
+    "dom/devicestorage/test/test_basic.html":"",
+    "dom/devicestorage/test/test_lastModificationFilter.html":"",
+    "dom/devicestorage/test/test_overwrite.html":"",
+    "dom/devicestorage/test/test_stat.html":"",
+    "dom/file/test/test_append_read_data.html":"",
+    "dom/file/test/test_archivereader.html":"",
+    "dom/file/test/test_archivereader_nonUnicode.html":"",
+    "dom/file/test/test_archivereader_zip_in_zip.html":"",
+    "dom/file/test/test_location.html":"",
+    "dom/file/test/test_lockedfile_lifetimes.html":"",
+    "dom/file/test/test_lockedfile_lifetimes_nested.html":"",
+    "dom/file/test/test_lockedfile_ordering.html":"",
+    "dom/file/test/test_overlapping_lockedfiles.html":"",
+    "dom/file/test/test_readonly_lockedfiles.html":"",
+    "dom/file/test/test_success_events_after_abort.html":"",
+    "dom/file/test/test_truncate.html":"",
+    "dom/file/test/test_workers.html":"",
+    "dom/file/test/test_write_read_data.html":"",
+    "dom/imptests/editing/conformancetest/test_event.html":"",
+    "dom/imptests/editing/conformancetest/test_runtest.html":"",
+    "dom/mobilemessage/tests/test_sms_basics.html":"",
+    "dom/network/tests/test_networkstats_basics.html":"",
+    "dom/permission/tests/test_permission_basics.html":"",
+ 
+    "dom/tests/mochitest/ajax/offline/test_badManifestMagic.html":"",
+    "dom/tests/mochitest/ajax/offline/test_badManifestMime.html":"",
+    "dom/tests/mochitest/ajax/offline/test_bug445544.html":"",
+    "dom/tests/mochitest/ajax/offline/test_bug460353.html":"",
+    "dom/tests/mochitest/ajax/offline/test_bug474696.html":"",
+    "dom/tests/mochitest/ajax/offline/test_bug544462.html":"",
+    "dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html":"",
+    "dom/tests/mochitest/ajax/offline/test_bug744719.html":"",
+    "dom/tests/mochitest/ajax/offline/test_bug765203.html":"",
+    "dom/tests/mochitest/ajax/offline/test_bypass.html":"",
+    "dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html":"",
+    "dom/tests/mochitest/ajax/offline/test_changingManifest.html":"",
+    "dom/tests/mochitest/ajax/offline/test_fallback.html":"",
+    "dom/tests/mochitest/ajax/offline/test_foreign.html":"",
+    "dom/tests/mochitest/ajax/offline/test_identicalManifest.html":"",
+    "dom/tests/mochitest/ajax/offline/test_missingFile.html":"",
+    "dom/tests/mochitest/ajax/offline/test_missingManifest.html":"",
+    "dom/tests/mochitest/ajax/offline/test_obsolete.html":"",
+    "dom/tests/mochitest/ajax/offline/test_offlineIFrame.html":"",
+    "dom/tests/mochitest/ajax/offline/test_overlap.html":"",
+    "dom/tests/mochitest/ajax/offline/test_redirectManifest.html":"",
+    "dom/tests/mochitest/ajax/offline/test_redirectUpdateItem.html":"",
+    "dom/tests/mochitest/ajax/offline/test_refetchManifest.html":"",
+    "dom/tests/mochitest/ajax/offline/test_simpleManifest.html":"",
+    "dom/tests/mochitest/ajax/offline/test_updateCheck.html":"",
+    "dom/tests/mochitest/ajax/offline/test_updatingManifest.html":"",
+    "dom/tests/mochitest/ajax/offline/test_xhtmlManifest.xhtml":"",
 
-	"content/base/test/test_viewport_scroll.html":"",
-	"content/base/test/test_w3element_traversal.html":"",
+    "dom/tests/mochitest/bugs/test_bug260264.html":"",
+    "dom/tests/mochitest/bugs/test_bug260264_nested.html":"",
+    "dom/tests/mochitest/bugs/test_bug265203.html":"",
+    "dom/tests/mochitest/bugs/test_bug291653.html":"",
+    "dom/tests/mochitest/bugs/test_bug335976.xhtml":"",
+    "dom/tests/mochitest/bugs/test_bug369306.html":"",
+    "dom/tests/mochitest/bugs/test_bug396843.html":"",
+    "dom/tests/mochitest/bugs/test_bug406375.html":"",
+    "dom/tests/mochitest/bugs/test_bug414291.html":"",
+    "dom/tests/mochitest/bugs/test_bug427744.html":"",
+    "dom/tests/mochitest/bugs/test_bug479143.html":"",
+    "dom/tests/mochitest/bugs/test_bug504862.html":"",
+    "dom/tests/mochitest/bugs/test_bug61098.html":"",
+    "dom/tests/mochitest/bugs/test_bug641552.html":"",
+    "dom/tests/mochitest/bugs/test_sizetocontent_clamp.html": "Windows can't change size on B2G",
+    "dom/tests/mochitest/bugs/test_resize_move_windows.html": "Windows can't change size and position on B2G",
+    "dom/tests/mochitest/bugs/test_window_bar.html":"",
 
+    "dom/tests/mochitest/general/test_clipboard_events.html":"",
+    "dom/tests/mochitest/general/test_focusrings.xul":"",
+    "dom/tests/mochitest/general/test_windowedhistoryframes.html":"",
+    "dom/tests/mochitest/general/test_idleapi_permissions.html":"",
+    "dom/tests/mochitest/general/test_interfaces.html":"",
+    "dom/tests/mochitest/geolocation/test_allowCurrent.html":"",
+    "dom/tests/mochitest/geolocation/test_allowWatch.html":"",
+    "dom/tests/mochitest/geolocation/test_cachedPosition.html":"",
+    "dom/tests/mochitest/geolocation/test_cancelCurrent.html":"",
+    "dom/tests/mochitest/geolocation/test_cancelWatch.html":"",
+    "dom/tests/mochitest/geolocation/test_clearWatch.html":"",
+    "dom/tests/mochitest/geolocation/test_clearWatch_invalid.html":"",
+    "dom/tests/mochitest/geolocation/test_manyCurrentConcurrent.html":"",
+    "dom/tests/mochitest/geolocation/test_manyCurrentSerial.html":"",
+    "dom/tests/mochitest/geolocation/test_manyWatchConcurrent.html":"",
+    "dom/tests/mochitest/geolocation/test_manyWatchSerial.html":"",
+    "dom/tests/mochitest/geolocation/test_manyWindows.html":"",
+    "dom/tests/mochitest/geolocation/test_mozsettings.html":"",
+    "dom/tests/mochitest/geolocation/test_mozsettingsWatch.html":"",
+    "dom/tests/mochitest/geolocation/test_optional_api_params.html":"",
+    "dom/tests/mochitest/geolocation/test_shutdown.html":"",
+    "dom/tests/mochitest/geolocation/test_timerRestartWatch.html":"",
+    "dom/tests/mochitest/geolocation/test_windowClose.html":"",
+    "dom/tests/mochitest/geolocation/test_worseAccuracyDoesNotBlockCallback.html":"",
+    "dom/tests/mochitest/localstorage/test_appIsolation.html":"",
+    "dom/tests/mochitest/localstorage/test_cookieBlock.html":"",
+    "dom/tests/mochitest/localstorage/test_cookieSession-phase1.html":"",
+    "dom/tests/mochitest/localstorage/test_cookieSession-phase2.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageBase.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageBaseSessionOnly.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageCookieSettings.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageEnablePref.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageOriginsSchemaDiffs.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageQuota.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html":"",
+    "dom/tests/mochitest/localstorage/test_localStorageReplace.html":"",
+    "dom/tests/mochitest/pointerlock/test_pointerlock-api.html":"",
+    "dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html":"",
+    "dom/tests/mochitest/sessionstorage/test_sessionStorageClone.html":"",
+    "dom/tests/mochitest/sessionstorage/test_sessionStorageHttpHttps.html":"",
+    "dom/tests/mochitest/sessionstorage/test_sessionStorageReplace.html":"",
+    "dom/tests/mochitest/webapps/test_bug_779982.html":"",
+    "dom/tests/mochitest/whatwg/test_postMessage_closed.html":"",
+    "dom/devicestorage/test/test_available.html":"",
+    "dom/devicestorage/test/test_freeSpace.html":"",
+    "dom/devicestorage/test/test_usedSpace.html":"",
+    "dom/workers/test/test_suspend.html":"",
+    "dom/workers/test/test_csp.html":"",
+    "dom/workers/test/test_workersDisabled.html":"",
+    "dom/workers/test/test_xhr_parameters.html":"",
+    "dom/workers/test/test_xhr_system.html":"",
+    "dom/workers/test/test_closeOnGC.html": "Stack scanner keeps things alive",
+    "dom/workers/test/test_errorPropagation.html":"",
+    "dom/workers/test/test_errorwarning.html":"",
+    "dom/workers/test/test_fibonacci.html":"",
+    "dom/workers/test/test_importScripts.html":"",
+    "dom/workers/test/test_instanceof.html":"",
+    "dom/workers/test/test_relativeLoad.html":"",
+    "dom/workers/test/test_resolveWorker-assignment.html":"",
+    "dom/workers/test/test_simpleThread.html":"",
+    "dom/workers/test/test_xhr_timeout.html":"",
 
-	"content/html/document/test/test_bug196523.html":"",
-	"content/html/document/test/test_bug199692.html":"",
-	"content/html/document/test/test_bug369370.html":"",
-	"content/html/document/test/test_bug391777.html":"",
-	"content/html/document/test/test_bug741266.html":"",
-
-	"content/svg/content/test/test_SVGAnimatedImageSMILDisabled.html":"",
-	"content/svg/content/test/test_pointer-events.xhtml":"",
-	"content/svg/content/test/test_scientific.html":"",
-	"content/svg/content/test/test_switch.xhtml":"",
-
-	"content/xml/document/test/test_bug392338.html":"",
-	"content/xml/document/test/test_bug691215.html":"",
-	"content/xslt/tests/mochitest/test_bug319374.xhtml":"",
-
-        "content/svg/content/test/test_pathAnimInterpolation.xhtml":"",
-
-        "content/base/test/test_bothCSPheaders.html":"",
-	"content/base/test/test_bug383430.html":"",
-	"content/base/test/test_bug422403-2.xhtml":"",
-	"content/base/test/test_bug424359-1.html":"",
-	"content/base/test/test_bug424359-2.html":"",
-	"content/base/test/test_bug426308.html":"",
-	"content/base/test/test_bug804395.html":"",
-	"content/base/test/test_mixed_content_blocker_bug803225.html":"",
-	"content/events/test/test_bug603008.html":"",
-
-	"content/html/document/test/test_non-ascii-cookie.html":"",
-
-    "docshell/test/navigation/test_bug13871.html": " uncaught exception - TypeError: window0 is null at http://mochi.test:8888/tests/docshell/test/navigation/test_bug13871.html:13",
-    "docshell/test/navigation/test_bug270414.html": " [SimpleTest.finish()] this test already called finish!",
-    "docshell/test/navigation/test_bug278916.html": " /tests/docshell/test/navigation/test_bug270414.html finished in a non-clean fashion, probably because it didn't call SimpleTest.finish()",
-    "docshell/test/navigation/test_bug279495.html": " /tests/docshell/test/navigation/test_bug270414.html finished in a non-clean fashion, probably because it didn't call SimpleTest.finish()",
-    "docshell/test/navigation/test_bug344861.html": " uncaught exception - TypeError: newwindow is null at http://mochi.test:8888/tests/docshell/test/navigation/test_bug344861.html:24",
-    "docshell/test/navigation/test_bug386782.html": " /tests/docshell/test/navigation/test_bug270414.html finished in a non-clean fashion, probably because it didn't call SimpleTest.finish()",
-    "docshell/test/navigation/test_bug430624.html": " [SimpleTest.finish()] waitForFocus() was called a different number of times from the number of callbacks run. Maybe the test terminated prematurely -- be sure to use SimpleTest.waitForExplicitFinish(). - got 1, expected 0",
-    "docshell/test/navigation/test_bug430723.html": " Test timed out.",
-    "docshell/test/navigation/test_not-opener.html": " Test timed out.",
-    "docshell/test/navigation/test_opener.html": " Test timed out.",
-    "docshell/test/navigation/test_popup-navigates-children.html": " Test timed out.",
-    "docshell/test/navigation/test_reserved.html": " Test timed out.",
-    "docshell/test/navigation/test_sessionhistory.html": " uncaught exception - TypeError: testWindow is null at http://mochi.test:8888/tests/docshell/test/navigation/test_sessionhistory.html:40",
-    "docshell/test/navigation/test_sibling-off-domain.html": " Test timed out.",
-    "docshell/test/test_bfcache_plus_hash.html": " Test timed out.",
-    "docshell/test/test_bug369814.html": " uncaught exception - NS_ERROR_NOT_AVAILABLE: Component returned failure code: 0x80040111 (NS_ERROR_NOT_AVAILABLE) [nsIPrefBranch.setBoolPref] at chrome://specialpowers/content/specialpowersAPI.js:114",
-    "docshell/test/test_bug402210.html": " Test timed out.",
-    "docshell/test/test_bug404548.html": " /tests/docshell/test/test_bug402210.html finished in a non-clean fashion, probably because it didn't call SimpleTest.finish()",
-    "docshell/test/test_bug413310.html": " Did a load when going back? - got POST 1360080273992, expected POST 1360080274393",
-    "docshell/test/test_bug509055.html": " uncaught exception - TypeError: popup is null at http://mochi.test:8888/tests/docshell/test/test_bug509055.html:47",
-    "docshell/test/test_bug529119-1.html": " Test timed out.",
-    "docshell/test/test_bug529119-2.html": " Test timed out.",
-    "docshell/test/test_bug540462.html": " Test timed out.",
-    "docshell/test/test_bug590573.html": " Test timed out.",
-    "docshell/test/test_bug598895.html": " uncaught exception - TypeError: win1 is null at http://mochi.test:8888/tests/docshell/test/test_bug598895.html:26",
-    "docshell/test/test_bug637644.html": " uncaught exception - TypeError: win1 is null at http://mochi.test:8888/tests/docshell/test/test_bug637644.html:26",
-    "docshell/test/test_bug680257.html": " Test timed out.",
-    "docshell/test/test_bug728939.html": " Test timed out.",
-    "docshell/test/test_bug94514.html": " uncaught exception - TypeError: Cc['@mozilla.org/browser/global-history;2'] is undefined at http://mochi.test:8888/tests/docshell/test/test_bug94514.html:38",
-    "docshell/test/test_windowedhistoryframes.html": " Test timed out.",
-    "docshell/test/test_bug640387_1.html": " Test timed out.",
-    "docshell/test/test_bug660404.html": " Test timed out.",
-    "docshell/test/test_bug669671.html": " Test timed out.",
-
-        "dom/bindings/test/test_InstanceOf.html":"",
-  "dom/imptests/editing/conformancetest/test_event.html": "",
-  "dom/imptests/editing/conformancetest/test_runtest.html": "",
-  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
-  "dom/imptests/html/webgl": "WebGL",
-        "dom/imptests/webapps/DOMCore/tests/approved/test_interfaces.html":"",
-        "dom/tests/mochitest/crypto/test_getRandomValues.html": "",
-	"dom/tests/mochitest/dom-level0/test_innerWidthHeight_script.html": "",
-	"dom/alarm/test/test_alarm_permitted_app.html":"",
-	"dom/battery/test/test_battery_basics.html":"",
-	"dom/browser-element/mochitest/test_browserElement_inproc_Alert.html":"",
-	"dom/browser-element/mochitest/test_browserElement_inproc_AppFramePermission.html":"",
-	"dom/browser-element/mochitest/test_browserElement_inproc_AppWindowNamespace.html":"",
-	"dom/browser-element/mochitest/test_browserElement_inproc_Auth.html":"",
-	"dom/browser-element/mochitest/test_browserElement_inproc_BrowserWindowNamespace.html":"",
-	"dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html":"",
-	"dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html":"",
-	"dom/browser-element/" : "",
-	"dom/contacts/" : "",
-
-	"dom/devicestorage/ipc/test_ipc.html":"",
-	"dom/devicestorage/test/test_basic.html":"",
-	"dom/devicestorage/test/test_823965.html" : "",
-	"dom/devicestorage/test/test_enumerate.html":"",
-	"dom/devicestorage/test/test_enumerateMultipleContinue.html":"",
-	"dom/devicestorage/test/test_enumerateOptions.html":"",
-	"dom/devicestorage/test/test_lastModificationFilter.html":"",
-	"dom/devicestorage/test/test_overwrite.html":"",
-	"dom/devicestorage/test/test_sanity.html":"",
-	"dom/devicestorage/test/test_stat.html":"",
-	"dom/devicestorage/test/test_watch.html":"",
-	"dom/devicestorage/test/test_watchOther.html":"",
-	"dom/encoding/test/test_stringencoding.html":"",
-	"dom/file/test/test_append_read_data.html":"",
-	"dom/file/test/test_archivereader.html":"",
-	"dom/file/test/test_archivereader_nonUnicode.html":"",
-	"dom/file/test/test_archivereader_zip_in_zip.html":"",
-	"dom/file/test/test_location.html":"",
-	"dom/file/test/test_lockedfile_lifetimes.html":"",
-	"dom/file/test/test_lockedfile_lifetimes_nested.html":"",
-	"dom/file/test/test_lockedfile_ordering.html":"",
-	"dom/file/test/test_overlapping_lockedfiles.html":"",
-	"dom/file/test/test_progress_events.html":"",
-	"dom/file/test/test_readonly_lockedfiles.html":"",
-	"dom/file/test/test_request_readyState.html":"",
-	"dom/file/test/test_stream_tracking.html":"",
-	"dom/file/test/test_success_events_after_abort.html":"",
-	"dom/file/test/test_truncate.html":"",
-	"dom/file/test/test_workers.html":"",
-	"dom/file/test/test_write_read_data.html":"",
-	"dom/imptests/editing/conformancetest/test_event.html":"",
-	"dom/imptests/editing/conformancetest/test_runtest.html":"",
-	"dom/imptests/editing/selecttest/test_Document-open.html":"",
-	"dom/imptests/webapps/DOMCore/tests/approved/test_Range-cloneContents.html":"",
-	"dom/imptests/webapps/DOMCore/tests/approved/test_Range-compareBoundaryPoints.html":"",
-	"dom/imptests/webapps/DOMCore/tests/approved/test_Range-deleteContents.html":"",
-	"dom/imptests/webapps/DOMCore/tests/approved/test_Range-extractContents.html":"",
-	"dom/imptests/webapps/DOMCore/tests/approved/test_Range-insertNode.html":"",
-	"dom/imptests/webapps/DOMCore/tests/approved/test_Range-set.html":"",
-	"dom/imptests/webapps/DOMCore/tests/approved/test_Range-surroundContents.html":"",
-	"dom/imptests/webapps/DOMCore/tests/approved/test_Range-mutations.html":" Test timed out.",
-	"dom/indexedDB/": "",
-	"dom/mobilemessage/tests/test_sms_basics.html": "",
-	"dom/media/tests/mochitest/test_getUserMedia_exceptions.html":"",
-	"dom/network/tests/test_networkstats_basics.html":"",
-	"dom/permission/tests/test_permission_basics.html":"",
-	"dom/tests/mochitest/ajax/jquery/test_jQuery.html":"",
-	"dom/tests/mochitest/ajax/offline/test_badManifestMagic.html":"",
-	"dom/tests/mochitest/ajax/offline/test_badManifestMime.html":"",
-	"dom/tests/mochitest/ajax/offline/test_bug445544.html":"",
-	"dom/tests/mochitest/ajax/offline/test_bug460353.html":"",
-	"dom/tests/mochitest/ajax/offline/test_bug474696.html":"",
-	"dom/tests/mochitest/ajax/offline/test_bug544462.html":"",
-	"dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html":"",
-	"dom/tests/mochitest/ajax/offline/test_bug744719.html":"",
-	"dom/tests/mochitest/ajax/offline/test_bug765203.html":"",
-	"dom/tests/mochitest/ajax/offline/test_bypass.html":"",
-	"dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html" : "",
-	"dom/tests/mochitest/ajax/offline/test_changingManifest.html":"",
-	"dom/tests/mochitest/ajax/offline/test_fallback.html":"",
-	"dom/tests/mochitest/ajax/offline/test_foreign.html":"",
-	"dom/tests/mochitest/ajax/offline/test_identicalManifest.html":"",
-	"dom/tests/mochitest/ajax/offline/test_missingFile.html":"",
-	"dom/tests/mochitest/ajax/offline/test_missingManifest.html":"",
-	"dom/tests/mochitest/ajax/offline/test_noManifest.html":"",
-	"dom/tests/mochitest/ajax/offline/test_obsolete.html":"",
-	"dom/tests/mochitest/ajax/offline/test_offlineIFrame.html":"",
-	"dom/tests/mochitest/ajax/offline/test_overlap.html":"",
-	"dom/tests/mochitest/ajax/offline/test_redirectManifest.html":"",
-	"dom/tests/mochitest/ajax/offline/test_redirectUpdateItem.html":"",
-	"dom/tests/mochitest/ajax/offline/test_refetchManifest.html":"",
-	"dom/tests/mochitest/ajax/offline/test_simpleManifest.html":"",
-	"dom/tests/mochitest/ajax/offline/test_updateCheck.html":"",
-	"dom/tests/mochitest/ajax/offline/test_updatingManifest.html":"",
-	"dom/tests/mochitest/ajax/offline/test_xhtmlManifest.xhtml":"",
-	"dom/tests/mochitest/ajax/scriptaculous/test_Scriptaculous.html":"",
-
-	"dom/tests/mochitest/bugs/test_bug260264.html":"",
-	"dom/tests/mochitest/bugs/test_bug260264_nested.html":"",
-	"dom/tests/mochitest/bugs/test_bug265203.html":"",
-	"dom/tests/mochitest/bugs/test_bug291653.html":"",
-	"dom/tests/mochitest/bugs/test_bug335976.xhtml":"",
-	"dom/tests/mochitest/bugs/test_bug346659.html":"",
-	"dom/tests/mochitest/bugs/test_bug369306.html":"",
-	"dom/tests/mochitest/bugs/test_bug38959.html":"",
-	"dom/tests/mochitest/bugs/test_bug396843.html":"",
-	"dom/tests/mochitest/bugs/test_bug406375.html":"",
-	"dom/tests/mochitest/bugs/test_bug414291.html":"",
-	"dom/tests/mochitest/bugs/test_bug427744.html":"",
-	"dom/tests/mochitest/bugs/test_bug437361.html":"",
-	"dom/tests/mochitest/bugs/test_bug458091.html":"",
-	"dom/tests/mochitest/bugs/test_bug479143.html":"",
-	"dom/tests/mochitest/bugs/test_bug49312.html":"",
-	"dom/tests/mochitest/bugs/test_bug504862.html":"",
-	"dom/tests/mochitest/bugs/test_bug562433.html":"",
-	"dom/tests/mochitest/bugs/test_bug593174.html":"",
-	"dom/tests/mochitest/bugs/test_bug61098.html":"",
-	"dom/tests/mochitest/bugs/test_bug622361.html":"",
-	"dom/tests/mochitest/bugs/test_bug641552.html":"",
-	"dom/tests/mochitest/bugs/test_bug642026.html":"",
-	"dom/tests/mochitest/bugs/test_bug648465.html":"",
-  "dom/tests/mochitest/bugs/test_sizetocontent_clamp.html": "Windows can't change size on B2G",
-  "dom/tests/mochitest/bugs/test_resize_move_windows.html": "Windows can't change size and position on B2G",
-	"dom/tests/mochitest/bugs/test_window_bar.html":"",
-	"dom/tests/mochitest/general/test_497898.html":"",
-	"dom/tests/mochitest/general/test_bug628069_1.html":"",
-	"dom/tests/mochitest/general/test_bug629535.html":"",
-	"dom/tests/mochitest/general/test_bug631440.html":"",
-	"dom/tests/mochitest/general/test_clipboard_events.html":"",
-	"dom/tests/mochitest/general/test_focus_legend_noparent.html":"",
-	"dom/tests/mochitest/general/test_focusrings.xul" : "",
-	"dom/tests/mochitest/general/test_windowedhistoryframes.html" : "",
-	"dom/tests/mochitest/general/test_idleapi_permissions.html":"",
-	"dom/tests/mochitest/general/test_interfaces.html":"",
-	"dom/tests/mochitest/geolocation/test_allowCurrent.html":"",
-	"dom/tests/mochitest/geolocation/test_allowWatch.html":"",
-	"dom/tests/mochitest/geolocation/test_cachedPosition.html":"",
-	"dom/tests/mochitest/geolocation/test_cancelCurrent.html":"",
-	"dom/tests/mochitest/geolocation/test_cancelWatch.html":"",
-	"dom/tests/mochitest/geolocation/test_clearWatch.html":"",
-	"dom/tests/mochitest/geolocation/test_clearWatch_invalid.html":"",
-	"dom/tests/mochitest/geolocation/test_manyCurrentConcurrent.html":"",
-	"dom/tests/mochitest/geolocation/test_manyCurrentSerial.html":"",
-	"dom/tests/mochitest/geolocation/test_manyWatchConcurrent.html":"",
-	"dom/tests/mochitest/geolocation/test_manyWatchSerial.html":"",
-	"dom/tests/mochitest/geolocation/test_manyWindows.html":"",
-	"dom/tests/mochitest/geolocation/test_mozsettings.html":"",
-	"dom/tests/mochitest/geolocation/test_mozsettingsWatch.html":"",
-	"dom/tests/mochitest/geolocation/test_optional_api_params.html":"",
-	"dom/tests/mochitest/geolocation/test_shutdown.html":"",
-	"dom/tests/mochitest/geolocation/test_timerRestartWatch.html":"",
-	"dom/tests/mochitest/geolocation/test_windowClose.html":"",
-	"dom/tests/mochitest/geolocation/test_worseAccuracyDoesNotBlockCallback.html":"",
-	"dom/tests/mochitest/localstorage/test_appIsolation.html":"",
-	"dom/tests/mochitest/localstorage/test_cookieBlock.html":"",
-	"dom/tests/mochitest/localstorage/test_cookieSession-phase1.html":"",
-	"dom/tests/mochitest/localstorage/test_cookieSession-phase2.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageBase.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageBaseSessionOnly.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageCookieSettings.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageEnablePref.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageOriginsSchemaDiffs.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageQuota.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html":"",
-	"dom/tests/mochitest/localstorage/test_localStorageReplace.html":"",
-
-        "dom/tests/mochitest/pointerlock/test_pointerlock-api.html":"",
-	"dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html":"",
-	"dom/tests/mochitest/sessionstorage/test_sessionStorageClone.html":"",
-	"dom/tests/mochitest/sessionstorage/test_sessionStorageHttpHttps.html":"",
-	"dom/tests/mochitest/sessionstorage/test_sessionStorageReplace.html":"",
-	"dom/tests/mochitest/webapps/test_bug_779982.html":"",
-	"dom/tests/mochitest/whatwg/test_postMessage_closed.html":"",
-	"dom/workers/test/test_suspend.html":"",
-	"dom/workers/test/test_csp.html" : "",
-	"dom/workers/test/test_workersDisabled.html":"",
-	"dom/workers/test/test_xhr_parameters.html":"",
-	"dom/workers/test/test_xhr_system.html":"",
-	"dom/workers/test/test_closeOnGC.html": "Stack scanner keeps things alive",
-
-	"dom/devicestorage/test/test_available.html":"",
-	"dom/devicestorage/test/test_freeSpace.html":"",
-	"dom/devicestorage/test/test_usedSpace.html":"",
-	"dom/tests/mochitest/ajax/prototype/test_Prototype.html":"",
-	"dom/workers/test/test_errorPropagation.html":"",
-	"dom/workers/test/test_errorwarning.html":"",
-	"dom/workers/test/test_fibonacci.html":"",
-	"dom/workers/test/test_importScripts.html":"",
-	"dom/workers/test/test_instanceof.html":"",
-	"dom/workers/test/test_relativeLoad.html":"",
-	"dom/workers/test/test_resolveWorker-assignment.html":"",
-	"dom/workers/test/test_simpleThread.html":"",
-	"dom/workers/test/test_xhr_timeout.html":"",
-
-	"layout/base/tests/test_bug450930.xhtml" : "",
-	"layout/base/tests/test_bug465448.xul" : "",
-	"layout/base/tests/test_bug465448.xul": "",
-	"layout/base/tests/test_bug394057.html" : "",
-	"layout/base/tests/test_bug423523.html" : "",
-	"layout/base/tests/test_bug458898.html" : "",
-	"layout/base/tests/test_bug603550.html" : "",
-	"layout/base/tests/test_bug607529.html" : "",
-	"layout/base/tests/test_bug629838.html" : "",
-	"layout/base/tests/test_bug696020.html" : "",
-	"layout/base/tests/test_bug696020.html" : "",
-	"layout/base/tests/test_event_target_radius.html" : "",
-	"layout/base/tests/test_mozPaintCount.html" : "",
-	"layout/base/tests/test_scroll_selection_into_view.html" : "",
-	"layout/base/tests/test_bug761572.html" : "",
-	"layout/base/tests/test_reftests_with_caret.html": "",
-	"layout/base/tests/test_scroll_event_ordering.html": "",
-	"layout/forms/test/test_bug287446.html" : "",
-	"layout/forms/test/test_bug348236.html" : "",
-	"layout/forms/test/test_bug36619.html" : "",
-	"layout/forms/test/test_bug411236.html" : "",
-	"layout/forms/test/test_bug446663.html and more" : "",
-	"layout/forms/test/test_bug478219.xhtml" : "",
-	"layout/forms/test/test_bug564115.html" : "",
-	"layout/forms/test/test_bug571352.html" : "",
-	"layout/forms/test/test_textarea_resize.html" : "",
-	"layout/forms/test/test_bug365410.html" : "",
-	"layout/forms/test/test_bug446663.html" : "",
-	"layout/forms/test/test_bug477700.html" : "",
-	"layout/forms/test/test_bug534785.html" : "",
-	"layout/forms/test/test_bug549170.html": "",
-	"layout/forms/test/test_bug563642.html" : "",
-	"layout/forms/test/test_bug572649.html" : "",
-	"layout/forms/test/test_bug644542.html" : "",
-	"layout/forms/test/test_bug672810.html" : "",
-	"layout/forms/test/test_bug704049.html" : "",
-  "layout/forms/test/test_listcontrol_search.html" : "select elements don't use an in-page popup in B2G",
-	"layout/generic/test/test_bug240933.html" : "",
-	"layout/generic/test/test_bug263683.html" : "",
-	"layout/generic/test/test_bug290397.html" : "",
-	"layout/generic/test/test_bug392746.html" : "",
-	"layout/generic/test/test_bug424627.html" : "",
-	"layout/generic/test/test_bug438840.html" : "",
-	"layout/generic/test/test_bug468167.html" : "",
-	"layout/generic/test/test_bug470212.html" : "",
-	"layout/generic/test/test_bug496275.html" : "",
-	"layout/generic/test/test_bug514732.html" : "",
-	"layout/generic/test/test_bug597333.html" : "",
-	"layout/generic/test/test_bug633762.html" : "",
-	"layout/generic/test/test_bug666225.html" : "",
-	"layout/generic/test/test_bug735641.html" : "",
-	"layout/generic/test/test_bug784410.html" : "",
-	"layout/generic/test/test_bug791616.html" : "",
-	"layout/generic/test/test_image_selection_2.html" : "",
-	"layout/generic/test/test_invalidate_during_plugin_paint.html" : "",
-	"layout/generic/test/test_movement_by_characters.html" : "",
-	"layout/generic/test/test_movement_by_words.html" : "",
-	"layout/generic/test/test_page_scroll_with_fixed_pos.html" : "",
-	"layout/generic/test/test_plugin_clipping.xhtml" : "",
-	"layout/generic/test/test_plugin_clipping2.xhtml" : "",
-	"layout/generic/test/test_plugin_clipping_table.xhtml" : "",
-	"layout/generic/test/test_plugin_clipping_transformed.xhtml" : "",
-	"layout/generic/test/test_plugin_focus.html" : "",
-	"layout/generic/test/test_plugin_mouse_coords.html" : "",
-	"layout/generic/test/test_plugin_position.xhtml" : "",
-	"layout/generic/test/test_selection_expanding.html" : "",
-	"layout/inspector/tests/test_bug522601.xhtml" : "",
-	"layout/inspector/tests/test_bug609549.xhtml" : "",
-	"layout/mathml/tests/test_bug706406.html" : "",
-	"layout/style/test/test_compute_data_with_start_struct.html" : "",
-	"layout/style/test/test_dont_use_document_colors.html" : "",
-	"layout/style/test/test_inherit_computation.html" : "",
-	"layout/style/test/test_media_queries.html" : "",
-	"layout/style/test/test_media_queries_dynamic_xbl.html" : "",
-	"layout/style/test/test_rule_insertion.html": "",
-	"layout/style/test/test_pixel_lengths.html" : "",
-	"layout/style/test/test_selectors.html" : "",
-	"layout/style/test/test_compute_data_with_start_struct.html" : "",
-	"layout/style/test/test_selectors_on_anonymous_content.html" : "",
-	"layout/style/test/test_transitions_per_property.html" : "",
-	"layout/style/test/test_units_angle.html" : "",
-	"layout/style/test/test_transitions_step_functions.html" : "",
-	"layout/style/test/test_units_frequency.html" : "",
-	"layout/style/test/test_units_length.html" : "",
-	"layout/style/test/test_units_time.html" : "",
-	"layout/style/test/test_value_cloning.html" : "",
-	"layout/style/test/test_value_computation.html" : "",
-	"layout/style/test/test_value_storage.html" : "",
-	"layout/style/test/test_viewport_units.html" : "",
-	"layout/style/test/test_viewport_units.html" : "",
-	"layout/style/test/test_visited_image_loading.html" : "",
-	"layout/style/test/test_visited_image_loading_empty.html" : "timed out",
-	"layout/style/test/test_visited_lying.html" : "timed out",
-	"layout/style/test/test_visited_pref.html" : "timed out",
-	"layout/style/test/test_visited_reftests.html" : "",
-	"layout/tables/test/test_bug541668_table_event_delivery.html" : "",
-	"layout/xul" : "xml doesn't work in b2g"
+    "layout/base/tests/test_bug450930.xhtml":"",
+    "layout/base/tests/test_bug465448.xul":"",
+    "layout/base/tests/test_bug465448.xul":"",
+    "layout/base/tests/test_bug394057.html":"",
+    "layout/base/tests/test_bug423523.html":"",
+    "layout/base/tests/test_bug458898.html":"",
+    "layout/base/tests/test_bug603550.html":"",
+    "layout/base/tests/test_bug607529.html":"",
+    "layout/base/tests/test_bug629838.html":"",
+    "layout/base/tests/test_bug696020.html":"",
+    "layout/base/tests/test_bug696020.html":"",
+    "layout/base/tests/test_event_target_radius.html":"",
+    "layout/base/tests/test_mozPaintCount.html":"",
+    "layout/base/tests/test_scroll_selection_into_view.html":"",
+    "layout/base/tests/test_bug761572.html":"",
+    "layout/base/tests/test_reftests_with_caret.html":"",
+    "layout/base/tests/test_scroll_event_ordering.html":"",
+    "layout/forms/test/test_bug287446.html":"",
+    "layout/forms/test/test_bug348236.html":"",
+    "layout/forms/test/test_bug36619.html":"",
+    "layout/forms/test/test_bug411236.html":"",
+    "layout/forms/test/test_bug446663.html and more":"",
+    "layout/forms/test/test_bug478219.xhtml":"",
+    "layout/forms/test/test_bug564115.html":"",
+    "layout/forms/test/test_bug571352.html":"",
+    "layout/forms/test/test_textarea_resize.html":"",
+    "layout/forms/test/test_bug365410.html":"",
+    "layout/forms/test/test_bug446663.html":"",
+    "layout/forms/test/test_bug477700.html":"",
+    "layout/forms/test/test_bug534785.html":"",
+    "layout/forms/test/test_bug549170.html":"",
+    "layout/forms/test/test_bug563642.html":"",
+    "layout/forms/test/test_bug572649.html":"",
+    "layout/forms/test/test_bug644542.html":"",
+    "layout/forms/test/test_bug672810.html":"",
+    "layout/forms/test/test_bug704049.html":"",
+    "layout/forms/test/test_listcontrol_search.html" : "select elements don't use an in-page popup in B2G",
+    "layout/generic/test/test_bug240933.html":"",
+    "layout/generic/test/test_bug263683.html":"",
+    "layout/generic/test/test_bug290397.html":"",
+    "layout/generic/test/test_bug392746.html":"",
+    "layout/generic/test/test_bug424627.html":"",
+    "layout/generic/test/test_bug438840.html":"",
+    "layout/generic/test/test_bug468167.html":"",
+    "layout/generic/test/test_bug470212.html":"",
+    "layout/generic/test/test_bug496275.html":"",
+    "layout/generic/test/test_bug514732.html":"",
+    "layout/generic/test/test_bug597333.html":"",
+    "layout/generic/test/test_bug633762.html":"",
+    "layout/generic/test/test_bug666225.html":"",
+    "layout/generic/test/test_bug735641.html":"",
+    "layout/generic/test/test_bug784410.html":"",
+    "layout/generic/test/test_bug791616.html":"",
+    "layout/generic/test/test_image_selection_2.html":"",
+    "layout/generic/test/test_invalidate_during_plugin_paint.html":"",
+    "layout/generic/test/test_movement_by_characters.html":"",
+    "layout/generic/test/test_movement_by_words.html":"",
+    "layout/generic/test/test_page_scroll_with_fixed_pos.html":"",
+    "layout/generic/test/test_plugin_clipping.xhtml":"",
+    "layout/generic/test/test_plugin_clipping2.xhtml":"",
+    "layout/generic/test/test_plugin_clipping_table.xhtml":"",
+    "layout/generic/test/test_plugin_clipping_transformed.xhtml":"",
+    "layout/generic/test/test_plugin_focus.html":"",
+    "layout/generic/test/test_plugin_mouse_coords.html":"",
+    "layout/generic/test/test_plugin_position.xhtml":"",
+    "layout/generic/test/test_selection_expanding.html":"",
+    "layout/inspector/tests/test_bug522601.xhtml":"",
+    "layout/inspector/tests/test_bug609549.xhtml":"",
+    "layout/mathml/tests/test_bug706406.html":"",
+    "layout/style/test/test_compute_data_with_start_struct.html":"",
+    "layout/style/test/test_dont_use_document_colors.html":"",
+    "layout/style/test/test_inherit_computation.html":"",
+    "layout/style/test/test_media_queries.html":"",
+    "layout/style/test/test_media_queries_dynamic_xbl.html":"",
+    "layout/style/test/test_rule_insertion.html":"",
+    "layout/style/test/test_pixel_lengths.html":"",
+    "layout/style/test/test_selectors.html":"",
+    "layout/style/test/test_compute_data_with_start_struct.html":"",
+    "layout/style/test/test_selectors_on_anonymous_content.html":"",
+    "layout/style/test/test_transitions_per_property.html":"",
+    "layout/style/test/test_units_angle.html":"",
+    "layout/style/test/test_transitions_step_functions.html":"",
+    "layout/style/test/test_units_frequency.html":"",
+    "layout/style/test/test_units_length.html":"",
+    "layout/style/test/test_units_time.html":"",
+    "layout/style/test/test_value_cloning.html":"",
+    "layout/style/test/test_value_computation.html":"",
+    "layout/style/test/test_value_storage.html":"",
+    "layout/style/test/test_viewport_units.html":"",
+    "layout/style/test/test_viewport_units.html":"",
+    "layout/style/test/test_visited_image_loading.html":"",
+    "layout/style/test/test_visited_image_loading_empty.html":"",
+    "layout/style/test/test_visited_lying.html" : "timed out",
+    "layout/style/test/test_visited_pref.html" : "timed out",
+    "layout/style/test/test_visited_reftests.html":"",
+    "layout/tables/test/test_bug541668_table_event_delivery.html":"",
+    "layout/xul" : "xml doesn't work in b2g"
   }
 }

From 01ffcc1bab15dab99f4815a9ff5375c2e4d001b6 Mon Sep 17 00:00:00 2001
From: Martijn Wargers <mwargers@mozilla.com>
Date: Mon, 15 Apr 2013 19:50:45 +0200
Subject: [PATCH 334/438] Bug 861674 - Change some content mochitests from
 enablePrivilege to use SpecialPowers. r=jgriffin

---
 content/base/test/test_bug466409.html         |  8 ++----
 content/events/test/bug299673.js              | 15 +++--------
 content/events/test/test_bug226361.xhtml      | 11 ++------
 content/events/test/test_bug238987.html       | 13 +++-------
 content/events/test/test_bug409604.html       | 14 +++--------
 content/events/test/test_bug457672.html       |  9 ++-----
 content/events/test/test_bug563329.html       | 17 +++----------
 content/events/test/test_bug574663.html       | 25 ++++++-------------
 content/events/test/test_bug607464.html       | 22 +++++-----------
 .../events/test/test_clickevent_on_input.html |  6 +----
 content/html/content/test/test_bug583533.html | 10 +++-----
 .../html/document/test/test_bug369370.html    |  8 ++----
 12 files changed, 39 insertions(+), 119 deletions(-)

diff --git a/content/base/test/test_bug466409.html b/content/base/test/test_bug466409.html
index 2ed44498f15e..04279b75d83c 100644
--- a/content/base/test/test_bug466409.html
+++ b/content/base/test/test_bug466409.html
@@ -21,12 +21,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=466409
 
 function setUniversalDetector(detector)
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                       .getService(Components.interfaces.nsIPrefBranch);
-
-  var olddetector = pref.getCharPref("intl.charset.detector");
-  pref.setCharPref("intl.charset.detector", detector);
+  var olddetector = SpecialPowers.getCharPref("intl.charset.detector");
+  SpecialPowers.setCharPref("intl.charset.detector", detector);
   return olddetector;
 }
 
diff --git a/content/events/test/bug299673.js b/content/events/test/bug299673.js
index 265e2a4a5f4a..cd32fdcc728f 100644
--- a/content/events/test/bug299673.js
+++ b/content/events/test/bug299673.js
@@ -2,7 +2,6 @@ var popup;
 
 function OpenWindow()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 log({},">>> OpenWindow");
 	popup = window.open("","Test");
 
@@ -50,7 +49,6 @@ document.onblur=function (event) { log(event,"top-doc") };
 document.onchange=function (event) { log(event,"top-doc") };
 
 function doTest1_rest2(expectedEventLog,focusAfterCloseId) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   try {
     is(document.activeElement, document.getElementById(focusAfterCloseId), "wrong element is focused after popup was closed");
     is(result, expectedEventLog, "unexpected events");
@@ -62,7 +60,6 @@ function doTest1_rest2(expectedEventLog,focusAfterCloseId) {
   }
 }
 function doTest1_rest1(expectedEventLog,focusAfterCloseId) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   try {
     synthesizeKey("V", {}, popup);
     synthesizeKey("A", {}, popup);
@@ -82,13 +79,10 @@ function doTest1_rest1(expectedEventLog,focusAfterCloseId) {
 }
 
 function doTest1(expectedEventLog,focusAfterCloseId) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   try {
     var select1 = document.getElementById('Select1');
     select1.focus();
     is(document.activeElement, select1, "select element should be focused");
-    var wu =  window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                  .getInterface(Components.interfaces.nsIDOMWindowUtils);
     synthesizeKey("VK_DOWN",{});
     synthesizeKey("VK_TAB", {});
     SimpleTest.waitForFocus(function () { doTest1_rest1(expectedEventLog,focusAfterCloseId); }, popup);
@@ -101,18 +95,15 @@ function doTest1(expectedEventLog,focusAfterCloseId) {
 }
 
 function setPrefAndDoTest(expectedEventLog,focusAfterCloseId,prefValue) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-              .getService(Components.interfaces.nsIPrefBranch);
-  var origPrefValue =  prefs.getIntPref("browser.link.open_newwindow");
+  var origPrefValue = SpecialPowers.getIntPref("browser.link.open_newwindow");
   var select1 = document.getElementById('Select1');
   select1.blur();
   result = "";
   log({},"Test with browser.link.open_newwindow = "+prefValue);
   try {
-    prefs.setIntPref("browser.link.open_newwindow", prefValue);
+    SpecialPowers.setIntPref("browser.link.open_newwindow", prefValue);
     doTest1(expectedEventLog,focusAfterCloseId);
   } finally {
-    prefs.setIntPref("browser.link.open_newwindow", origPrefValue);
+    SpecialPowers.setIntPref("browser.link.open_newwindow", origPrefValue);
   }
 }
diff --git a/content/events/test/test_bug226361.xhtml b/content/events/test/test_bug226361.xhtml
index 1d368164769e..65364cd30e17 100644
--- a/content/events/test/test_bug226361.xhtml
+++ b/content/events/test/test_bug226361.xhtml
@@ -30,17 +30,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=226361
 // accessibility.tabfocus must be set to value 7 before running test also
 // on a mac.
 function setOrRestoreTabFocus(newValue) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  const prefSvcContractID = "@mozilla.org/preferences-service;1";
-  const prefSvcIID = Components.interfaces.nsIPrefService;
-  var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
-                                                   .getBranch("accessibility.");
   if (!newValue) {
-    if (prefs.prefHasUserValue("tabfocus")) {
-      prefs.clearUserPref("tabfocus");
-    }
+      SpecialPowers.clearUserPref("accessibility.tabfocus");
   } else {
-    prefs.setIntPref("tabfocus", newValue);
+    SpecialPowers.setIntPref("accessibility.tabfocus", newValue);
   }
 }
 
diff --git a/content/events/test/test_bug238987.html b/content/events/test/test_bug238987.html
index 4903aa364573..ec20f57b264b 100644
--- a/content/events/test/test_bug238987.html
+++ b/content/events/test/test_bug238987.html
@@ -34,15 +34,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=238987
   // accessibility.tabfocus must be set to value 7 before running test also
   // on a mac.
   function setOrRestoreTabFocus(newValue) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    const prefSvcContractID = "@mozilla.org/preferences-service;1";
-    const prefSvcIID = Components.interfaces.nsIPrefService;
-    var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
-                                                     .getBranch("accessibility.");
     if (!newValue) {
-      prefs.clearUserPref("tabfocus");
+      SpecialPowers.clearUserPref("accessibility.tabfocus");
     } else {
-      prefs.setIntPref("tabfocus", newValue);
+      SpecialPowers.setIntPref("accessibility.tabfocus", newValue);
     }
   }
 
@@ -105,9 +100,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=238987
   }
 
   function tab() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                       getInterface(Components.interfaces.nsIDOMWindowUtils);
+    var utils = SpecialPowers.DOMWindowUtils;
     // Send tab key events.
     var key = Components.interfaces.nsIDOMKeyEvent.DOM_VK_TAB;
     utils.sendKeyEvent("keydown", key, 0, modifier);
diff --git a/content/events/test/test_bug409604.html b/content/events/test/test_bug409604.html
index d3e419aa78d5..6b416af51be4 100644
--- a/content/events/test/test_bug409604.html
+++ b/content/events/test/test_bug409604.html
@@ -92,15 +92,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=409604
 
   // ui.key.contentAccess must be set to value 5 before running the test.
   function setOrRestoreContentAccess(newValue) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    const prefSvcContractID = "@mozilla.org/preferences-service;1";
-    const prefSvcIID = Components.interfaces.nsIPrefService;
-    var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
-                                                     .getBranch("ui.key.");
     if (!newValue) {
-      prefs.clearUserPref("contentAccess");
+      SpecialPowers.clearUserPref("ui.key.contentAccess");
     } else {
-      prefs.setIntPref("contentAccess", newValue);
+      SpecialPowers.setIntPref("ui.key.contentAccess", newValue);
     }
   }
 
@@ -134,10 +129,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=409604
   }
 
   function pressAccessKey(key) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    // Send key events.
-    var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                       getInterface(Components.interfaces.nsIDOMWindowUtils);
+    var utils = SpecialPowers.DOMWindowUtils;
     utils.sendKeyEvent("keydown", key, key, modifier);
     utils.sendKeyEvent("keypress", key, key, modifier);
     utils.sendKeyEvent("keyup", key, key, modifier);
diff --git a/content/events/test/test_bug457672.html b/content/events/test/test_bug457672.html
index 074e61e75ce1..6d1b32d611a5 100644
--- a/content/events/test/test_bug457672.html
+++ b/content/events/test/test_bug457672.html
@@ -24,15 +24,10 @@ SimpleTest.expectAssertions(1);
 var windowBlurCount = 0;
 
 function setUserPref(reset) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  const prefSvcContractID = "@mozilla.org/preferences-service;1";
-  const prefSvcIID = Components.interfaces.nsIPrefService;
-  var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
-                                                   .getBranch("browser.link.");
   if (reset) {
-    prefs.clearUserPref("open_newwindow");
+    SpecialPowers.clearUserPref("browser.link.open_newwindow");
   } else {
-    prefs.setIntPref("open_newwindow", 3);
+    SpecialPowers.setIntPref("browser.link.open_newwindow", 3);
   }
 }
 
diff --git a/content/events/test/test_bug563329.html b/content/events/test/test_bug563329.html
index ce32f73dba87..79af82f8711f 100644
--- a/content/events/test/test_bug563329.html
+++ b/content/events/test/test_bug563329.html
@@ -39,10 +39,7 @@ function getTests() {
 
 function doTest() {
   // Enable context menus
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-              getService(Components.interfaces.nsIPrefBranch);
-  prefs.setBoolPref("ui.click_hold_context_menus", true);
+  SpecialPowers.setBoolPref("ui.click_hold_context_menus", true);
 
   target = document.getElementById("testTarget");
 
@@ -69,26 +66,20 @@ function doCheckDuration() {
   var duration = 50;
 
   // Change click hold delay
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-              getService(Components.interfaces.nsIPrefBranch);
-  prefs.setIntPref("ui.click_hold_context_menus.delay", duration);
+  SpecialPowers.setIntPref("ui.click_hold_context_menus.delay", duration);
 
   synthesizeMouse(target, 0, 0, {type: "mousedown"});
 }
 
 function finishTest() {
   synthesizeKey("VK_ESCAPE", {}, window);
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-              getService(Components.interfaces.nsIPrefBranch);
   try {
-    prefs.clearUserPref("ui.click_hold_context_menus");
+    SpecialPowers.clearUserPref("ui.click_hold_context_menus");
   }
   catch(e) {}
 
   try {
-    prefs.clearUserPref("ui.click_hold_context_menus.delay");
+    SpecialPowers.clearUserPref("ui.click_hold_context_menus.delay");
   }
   catch(e) {}
 
diff --git a/content/events/test/test_bug574663.html b/content/events/test/test_bug574663.html
index 0cc5cf7607ce..1edc3f8819c6 100644
--- a/content/events/test/test_bug574663.html
+++ b/content/events/test/test_bug574663.html
@@ -57,7 +57,6 @@ function runTest() {
     winUtils.advanceTimeAndRefresh(1000);
 
     function nextTest() {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
       if (!outstandingTests.length) {
         winUtils.restoreNormalRefresh();
         win.close();
@@ -74,7 +73,6 @@ function runTest() {
       winUtils.advanceTimeAndRefresh(1000); // force scrolling to happen
 
       setTimeout(function () {
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
         if (!ctrlKey) {
           let postfix = isMomentum ? ", even after releasing the touchpad" : "";
           // Normal scroll: scroll
@@ -102,27 +100,20 @@ function runTest() {
 
 function initPrefs()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
-                  getService(Components.interfaces.nsIPrefBranch);
-  prefSvc.setBoolPref("general.smoothScroll", false);
+  SpecialPowers.setBoolPref("general.smoothScroll", false);
   // Disables the app level scroll acceleration
-  prefSvc.setIntPref("mousewheel.acceleration.start", -1);
-  prefSvc.setBoolPref("mousewheel.system_scroll_override_on_root_content.enabled", false);
+  SpecialPowers.setIntPref("mousewheel.acceleration.start", -1);
+  SpecialPowers.setBoolPref("mousewheel.system_scroll_override_on_root_content.enabled", false);
   // Enable zooming for ctrl-scrolling
-  prefSvc.setIntPref("mousewheel.with_control.action", 3);
+  SpecialPowers.setIntPref("mousewheel.with_control.action", 3);
 }
 
 function clearPrefs()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
-                  getService(Components.interfaces.nsIPrefBranch);
-
-  prefSvc.clearUserPref("general.smoothScroll");
-  prefSvc.clearUserPref("mousewheel.acceleration.start");
-  prefSvc.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
-  prefSvc.clearUserPref("mousewheel.with_control.action");
+  SpecialPowers.clearUserPref("general.smoothScroll");
+  SpecialPowers.clearUserPref("mousewheel.acceleration.start");
+  SpecialPowers.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
+  SpecialPowers.clearUserPref("mousewheel.with_control.action");
 }
 
 window.onload = function () {
diff --git a/content/events/test/test_bug607464.html b/content/events/test/test_bug607464.html
index e02edf3b50e8..945e35c739ab 100644
--- a/content/events/test/test_bug607464.html
+++ b/content/events/test/test_bug607464.html
@@ -72,29 +72,19 @@ function runTest() {
 
 function initPrefs()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
-                  getService(Components.interfaces.nsIPrefBranch);
   // Disables the app level scroll acceleration
-  prefSvc.setIntPref("mousewheel.acceleration.start", -1);
-  prefSvc.setBoolPref("mousewheel.system_scroll_override_on_root_content.enabled", false);
+  SpecialPowers.setIntPref("mousewheel.acceleration.start", -1);
+  SpecialPowers.setBoolPref("mousewheel.system_scroll_override_on_root_content.enabled", false);
 
   // Enables smooth scrolling
-  prefSvc.setBoolPref("general.smoothScroll", true);
+  SpecialPowers.setBoolPref("general.smoothScroll", true);
 }
 
 function clearPrefs()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
-                  getService(Components.interfaces.nsIPrefBranch);
-
-  if (prefSvc.prefHasUserValue("mousewheel.acceleration.start"))
-    prefSvc.clearUserPref("mousewheel.acceleration.start");
-  if (prefSvc.prefHasUserValue("mousewheel.system_scroll_override_on_root_content.enabled"))
-    prefSvc.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
-  if (prefSvc.prefHasUserValue("general.smoothScroll"))
-    prefSvc.clearUserPref("general.smoothScroll");
+  SpecialPowers.clearUserPref("mousewheel.acceleration.start");
+  SpecialPowers.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
+  SpecialPowers.clearUserPref("general.smoothScroll");
 }
 
 window.onload = function () {
diff --git a/content/events/test/test_clickevent_on_input.html b/content/events/test/test_clickevent_on_input.html
index e7da1e3c14f5..21838b48684f 100644
--- a/content/events/test/test_clickevent_on_input.html
+++ b/content/events/test/test_clickevent_on_input.html
@@ -42,12 +42,8 @@ function runTests()
 
 function isEnabledMiddleClickPaste()
 {
-  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-                         getService(Components.interfaces.nsIPrefBranch);
   try {
-    return prefs.getBoolPref("middlemouse.paste");
+    return SpecialPowers.getBoolPref("middlemouse.paste");
   } catch (e) {
     return false;
   }
diff --git a/content/html/content/test/test_bug583533.html b/content/html/content/test/test_bug583533.html
index 9fd6ce2a4a54..1042b6f09fff 100644
--- a/content/html/content/test/test_bug583533.html
+++ b/content/html/content/test/test_bug583533.html
@@ -20,10 +20,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=583533
 
     /** Test for Bug 583533 **/
 
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"].
-    getService(Components.interfaces.nsIStringBundleService);
+    var sbs = SpecialPowers.Cc['@mozilla.org/intl/stringbundle;1'].
+       getService(SpecialPowers.Ci.nsIStringBundleService);
     var bundle = sbs.createBundle("chrome://global-platform/locale/platformKeys.properties");
     
     var shiftText = bundle.GetStringFromName("VK_SHIFT");
@@ -32,9 +30,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=583533
     var metaText = bundle.GetStringFromName("VK_META");
     var separatorText = bundle.GetStringFromName("MODIFIER_SEPARATOR");
 
-    var modifier = Components.classes["@mozilla.org/preferences-service;1"]
-                                      .getService(Components.interfaces.nsIPrefBranch)
-                                      .getIntPref("ui.key.contentAccess");
+    var modifier = SpecialPowers.getIntPref("ui.key.contentAccess");
 
     var isShift;
     var isAlt;
diff --git a/content/html/document/test/test_bug369370.html b/content/html/document/test/test_bug369370.html
index cafbcbace879..52fd79ecd4eb 100644
--- a/content/html/document/test/test_bug369370.html
+++ b/content/html/document/test/test_bug369370.html
@@ -89,16 +89,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=369370
         is(kidDoc.body.scrollTop,   0, "Checking scrollTop");
 
         kidWin.close();
-        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-        prefs.clearUserPref("browser.enable_automatic_image_resizing");
+        SpecialPowers.clearUserPref("browser.enable_automatic_image_resizing");
         SimpleTest.finish();
     }
 
     SimpleTest.waitForExplicitFinish();
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                          .getService(Components.interfaces.nsIPrefBranch);
-    prefs.setBoolPref("browser.enable_automatic_image_resizing", true);
+    SpecialPowers.setBoolPref("browser.enable_automatic_image_resizing", true);
 
     var kidWin = window.open("bug369370-popup.png", "bug369370", "width=400,height=300");
     var kidDoc; // will init onload

From 78ce2302973f7697035a0b713412b9fc75dbc9ef Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Mon, 15 Apr 2013 23:00:08 +0200
Subject: [PATCH 335/438] Bug 840315 - Change default serif and sans serif
 fonts on gonk, r=jfkthame a=blocking-leo

---
 layout/reftests/bugs/reftest.list   |   4 +-
 layout/reftests/canvas/reftest.list |   2 +-
 layout/reftests/text/reftest.list   |   2 +-
 modules/libpref/src/init/all.js     | 116 +++++++++++++---------------
 4 files changed, 59 insertions(+), 65 deletions(-)

diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 92192d7f219a..748e405c2e20 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -594,7 +594,7 @@ skip-if(B2G) == 367247-l-scroll.html 367247-l-auto.html
 == 367612-1e.html 367612-1-ref.html
 == 367612-1f.html 367612-1-ref.html
 != 367612-1g.html 367612-1-ref.html
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == 368020-1.html 368020-1-ref.html
+skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == 368020-1.html 368020-1-ref.html
 == 368020-2.html 368020-2-ref.html
 fails == 368020-3.html 368020-3-ref.html # bug 368085
 fails == 368020-4.html 368020-4-ref.html # bug 368085
@@ -1189,7 +1189,7 @@ test-pref(dom.use_xbl_scopes_for_remote_xul,false) != 449149-1b.html about:blank
 == 455171-5.html 455171-5-ref.html
 == 455280-1.xhtml 455280-1-ref.xhtml
 skip-if(B2G) == 455826-1.html 455826-1-ref.html
-fails-if(cocoaWidget) == 456147.xul 456147-ref.html # bug 458047
+skip-if(B2G) fails-if(cocoaWidget) == 456147.xul 456147-ref.html # bug 458047
 skip-if(B2G) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) == 456219-1a.html 456219-1-ref.html # bug 853273
 skip-if(B2G) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) == 456219-1b.html 456219-1-ref.html # bug 853273
 skip-if(B2G) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) == 456219-1c.html 456219-1-ref.html # bug 853273
diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list
index 897ea6780373..7bd2b6e50cbd 100644
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -43,7 +43,7 @@ skip-if(B2G) asserts-if(cocoaWidget,0-2) == size-change-1.html size-change-1-ref
 != text-bidi-ltr-test.html text-bidi-ltr-notref.html # for bug 698185
 == text-bidi-rtl-test.html text-bidi-rtl-ref.html
 
-fails-if(B2G) != text-font-lang.html text-font-lang-notref.html
+!= text-font-lang.html text-font-lang-notref.html
 
 == text-measure.html text-measure-ref.html
 
diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index 0938b7f5d9fe..fa6813fb54b7 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -50,7 +50,7 @@ skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixe
 skip-if(B2G) HTTP(..) == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html
 # No platforms do subpixel positioning vertically
 == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
-fuzzy-if(Android,231,603) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
+fuzzy-if((Android||B2G),231,603) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
 == swash-1.html swash-1-ref.html
 HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html
 HTTP(..) == synthetic-bold-papyrus-01.html synthetic-bold-papyrus-01-ref.html
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index f20a542c0988..41c4abcc5137 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3170,89 +3170,83 @@ pref("print.print_extra_margin", 0); // twips
 
 pref("font.alias-list", "sans,sans-serif,serif,monospace");
 
-// As we ship bundled Open Sans and Charis SIL Compact fonts on Android,
-// but not on B2G/Gonk, we give them separate default font preferences.
+// Gonk and Android ship different sets of fonts
 
 #ifdef MOZ_WIDGET_GONK
 
-// TODO: this block is initially a copy of the ANDROID prefs as they were
-// prior to the switch to Open Sans and Charis SIL Compact (bug 831354).
-// We should review these in the light of what's actually present on the Gonk platform;
-// some entries could probably be cleaned up.
+// TODO: some entries could probably be cleaned up.
 
 // ar
 
 pref("font.name.serif.el", "Droid Serif");
-pref("font.name.sans-serif.el", "Droid Sans");
-pref("font.name.monospace.el", "Droid Sans Mono");
-pref("font.name-list.sans-serif.el", "Roboto, Droid Sans");
+pref("font.name.sans-serif.el", "Roboto");
+pref("font.name.monospace.el", "Source Code Pro");
 
-pref("font.name.serif.he", "Droid Serif");
-pref("font.name.sans-serif.he", "Droid Sans");
-pref("font.name.monospace.he", "Droid Sans Mono");
-pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Droid Sans");
+pref("font.name.serif.he", "Charis SIL Compact");
+pref("font.name.sans-serif.he", "Feura Sans");
+pref("font.name.monospace.he", "Source Code Pro");
+pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Feura Sans");
 
-pref("font.name.serif.ja", "Droid Serif");
-pref("font.name.sans-serif.ja", "Droid Sans");
+pref("font.name.serif.ja", "Charis SIL Compact");
+pref("font.name.sans-serif.ja", "Feura Sans");
 pref("font.name.monospace.ja", "MotoyaLMaru");
-pref("font.name-list.sans-serif.ja", "Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
-pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono");
+pref("font.name-list.sans-serif.ja", "Feura Sans, Roboto, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
+pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Source Code Pro");
 
-pref("font.name.serif.ko", "Droid Serif");
-pref("font.name.sans-serif.ko", "Droid Sans");
-pref("font.name.monospace.ko", "Droid Sans Mono");
+pref("font.name.serif.ko", "Charis SIL Compact");
+pref("font.name.sans-serif.ko", "Feura Sans");
+pref("font.name.monospace.ko", "Source Code Pro");
 
-pref("font.name.serif.th", "Droid Serif");
-pref("font.name.sans-serif.th", "Droid Sans");
-pref("font.name.monospace.th", "Droid Sans Mono");
-pref("font.name-list.sans-serif.th", "Droid Sans Thai, Droid Sans");
+pref("font.name.serif.th", "Charis SIL Compact");
+pref("font.name.sans-serif.th", "Feura Sans");
+pref("font.name.monospace.th", "Source Code Pro");
+pref("font.name-list.sans-serif.th", "Feura Sans, Droid Sans Thai");
 
-pref("font.name.serif.tr", "Droid Serif");
-pref("font.name.sans-serif.tr", "Droid Sans");
-pref("font.name.monospace.tr", "Droid Sans Mono");
-pref("font.name-list.sans-serif.tr", "Roboto, Droid Sans");
+pref("font.name.serif.tr", "Charis SIL Compact");
+pref("font.name.sans-serif.tr", "Feura Sans");
+pref("font.name.monospace.tr", "Source Code Pro");
+pref("font.name-list.sans-serif.tr", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-baltic", "Droid Serif");
-pref("font.name.sans-serif.x-baltic", "Droid Sans");
-pref("font.name.monospace.x-baltic", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-baltic", "Roboto, Droid Sans");
+pref("font.name.serif.x-baltic", "Charis SIL Compact");
+pref("font.name.sans-serif.x-baltic", "Feura Sans");
+pref("font.name.monospace.x-baltic", "Source Code Pro");
+pref("font.name-list.sans-serif.x-baltic", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-central-euro", "Droid Serif");
-pref("font.name.sans-serif.x-central-euro", "Droid Sans");
-pref("font.name.monospace.x-central-euro", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-central-euro", "Roboto, Droid Sans");
+pref("font.name.serif.x-central-euro", "Charis SIL Compact");
+pref("font.name.sans-serif.x-central-euro", "Feura Sans");
+pref("font.name.monospace.x-central-euro", "Source Code Pro");
+pref("font.name-list.sans-serif.x-central-euro", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-cyrillic", "Droid Serif");
-pref("font.name.sans-serif.x-cyrillic", "Droid Sans");
-pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-cyrillic", "Roboto, Droid Sans");
+pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
+pref("font.name.sans-serif.x-cyrillic", "Roboto");
+pref("font.name.monospace.x-cyrillic", "Source Code Pro");
 
-pref("font.name.serif.x-unicode", "Droid Serif");
-pref("font.name.sans-serif.x-unicode", "Droid Sans");
-pref("font.name.monospace.x-unicode", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-unicode", "Roboto, Droid Sans");
+pref("font.name.serif.x-unicode", "Charis SIL Compact");
+pref("font.name.sans-serif.x-unicode", "Feura Sans");
+pref("font.name.monospace.x-unicode", "Source Code Pro");
+pref("font.name-list.sans-serif.x-unicode", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-user-def", "Droid Serif");
-pref("font.name.sans-serif.x-user-def", "Droid Sans");
-pref("font.name.monospace.x-user-def", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-user-def", "Roboto, Droid Sans");
+pref("font.name.serif.x-user-def", "Charis SIL Compact");
+pref("font.name.sans-serif.x-user-def", "Feura Sans");
+pref("font.name.monospace.x-user-def", "Source Code Pro");
+pref("font.name-list.sans-serif.x-user-def", "Feura Sans, Roboto");
 
-pref("font.name.serif.x-western", "Droid Serif");
-pref("font.name.sans-serif.x-western", "Droid Sans");
-pref("font.name.monospace.x-western", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-western", "Roboto, Droid Sans");
+pref("font.name.serif.x-western", "Charis SIL Compact");
+pref("font.name.sans-serif.x-western", "Feura Sans");
+pref("font.name.monospace.x-western", "Source Code Pro");
+pref("font.name-list.sans-serif.x-western", "Feura Sans, Roboto");
 
-pref("font.name.serif.zh-CN", "Droid Serif");
-pref("font.name.sans-serif.zh-CN", "Droid Sans");
-pref("font.name.monospace.zh-CN", "Droid Sans Mono");
+pref("font.name.serif.zh-CN", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-CN", "Feura Sans");
+pref("font.name.monospace.zh-CN", "Source Code Pro");
 
-pref("font.name.serif.zh-HK", "Droid Serif");
-pref("font.name.sans-serif.zh-HK", "Droid Sans");
-pref("font.name.monospace.zh-HK", "Droid Sans Mono");
+pref("font.name.serif.zh-HK", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-HK", "Feura Sans");
+pref("font.name.monospace.zh-HK", "Source Code Pro");
 
-pref("font.name.serif.zh-TW", "Droid Serif");
-pref("font.name.sans-serif.zh-TW", "Droid Sans");
-pref("font.name.monospace.zh-TW", "Droid Sans Mono");
+pref("font.name.serif.zh-TW", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-TW", "Feura Sans");
+pref("font.name.monospace.zh-TW", "Source Code Pro");
 
 #else
 

From 06ae07c12b3d6b4453e8447e9549a8bef95413ee Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Mon, 15 Apr 2013 15:31:05 -0700
Subject: [PATCH 336/438] Bug 859584 - Fix about:home thumbnail issues.
 r=lucasr

---
 mobile/android/base/widget/TopSitesView.java | 34 +++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/mobile/android/base/widget/TopSitesView.java b/mobile/android/base/widget/TopSitesView.java
index 6da9dd1bde07..606a1923b971 100644
--- a/mobile/android/base/widget/TopSitesView.java
+++ b/mobile/android/base/widget/TopSitesView.java
@@ -73,6 +73,7 @@ public class TopSitesView extends GridView {
 
     private static Drawable sPinDrawable = null;
     private int mThumbnailBackground;
+    private Map<String, Bitmap> mPendingThumbnails;
 
     public TopSitesView(Context context) {
         super(context);
@@ -229,6 +230,17 @@ public class TopSitesView extends GridView {
         });
     }
 
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+
+        if (mPendingThumbnails != null) {
+            updateTopSitesThumbnails(mPendingThumbnails);
+            mPendingThumbnails = null;
+        }
+    }
+
+
     private List<String> getTopSitesUrls() {
         List<String> urls = new ArrayList<String>();
 
@@ -248,18 +260,18 @@ public class TopSitesView extends GridView {
         ImageView thumbnailView = (ImageView) view.findViewById(R.id.thumbnail);
 
         if (thumbnail == null) {
+            thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER);
             thumbnailView.setImageResource(R.drawable.abouthome_thumbnail_bg);
             thumbnailView.setBackgroundColor(mThumbnailBackground);
-            thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER);
         } else {
             try {
+                thumbnailView.setScaleType(ImageView.ScaleType.CENTER_CROP);
                 thumbnailView.setImageBitmap(thumbnail);
                 thumbnailView.setBackgroundColor(0x0);
-                thumbnailView.setScaleType(ImageView.ScaleType.CENTER_CROP);
             } catch (OutOfMemoryError oom) {
                 Log.e(LOGTAG, "Unable to load thumbnail bitmap", oom);
-                thumbnailView.setImageResource(R.drawable.abouthome_thumbnail_bg);
                 thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                thumbnailView.setImageResource(R.drawable.abouthome_thumbnail_bg);
             }
         }
     }
@@ -276,14 +288,13 @@ public class TopSitesView extends GridView {
             TopSitesViewHolder holder = (TopSitesViewHolder)view.getTag();
             final String url = holder.getUrl();
             if (TextUtils.isEmpty(url)) {
-                holder.thumbnailView.setImageResource(R.drawable.abouthome_thumbnail_add);
                 holder.thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                holder.thumbnailView.setImageResource(R.drawable.abouthome_thumbnail_add);
+                holder.thumbnailView.setBackgroundColor(mThumbnailBackground);
             } else {
                 displayThumbnail(view, thumbnails.get(url));
             }
         }
-
-        invalidate();
     }
 
     public Map<String, Bitmap> getThumbnailsFromCursor(Cursor c) {
@@ -326,7 +337,14 @@ public class TopSitesView extends GridView {
 
             @Override
             public void onPostExecute(Map<String, Bitmap> thumbnails) {
-                updateTopSitesThumbnails(thumbnails);
+                // If we're waiting for a layout to happen, the GridView may be
+                // stale, so store the pending thumbnails here. They will be
+                // shown on the next layout pass.
+                if (isLayoutRequested()) {
+                    mPendingThumbnails = thumbnails;
+                } else {
+                    updateTopSitesThumbnails(thumbnails);
+                }
             }
         }).execute();
     }
@@ -490,9 +508,9 @@ public class TopSitesView extends GridView {
     private void clearThumbnail(TopSitesViewHolder holder) {
         holder.setTitle("");
         holder.setUrl("");
+        holder.thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER);
         holder.thumbnailView.setImageResource(R.drawable.abouthome_thumbnail_add);
         holder.thumbnailView.setBackgroundColor(mThumbnailBackground);
-        holder.thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER);
         holder.setPinned(false);
     }
 

From c9b084301f1797c183cbba77b63d02e85100c118 Mon Sep 17 00:00:00 2001
From: Eric Chou <echou@mozilla.com>
Date: Tue, 16 Apr 2013 11:02:23 +0800
Subject: [PATCH 337/438] Bug 861085 - Enable/Disable Bluetooth based on
 mozSettings value at startup, r=gyeh, r=qdot

---
 dom/bluetooth/BluetoothService.cpp            | 15 ++-----------
 dom/bluetooth/BluetoothService.h              | 11 +++++++++-
 dom/bluetooth/gonk/BluetoothGonkService.cpp   | 17 ++++++++++++--
 dom/bluetooth/gonk/BluetoothGonkService.h     | 22 +++++++++++--------
 .../ipc/BluetoothServiceChildProcess.cpp      |  7 ++++++
 .../ipc/BluetoothServiceChildProcess.h        |  4 ++++
 dom/bluetooth/linux/BluetoothDBusService.cpp  | 10 ++++++++-
 dom/bluetooth/linux/BluetoothDBusService.h    |  2 ++
 8 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/dom/bluetooth/BluetoothService.cpp b/dom/bluetooth/BluetoothService.cpp
index 8ca4f7fe4be9..0013fbd8485b 100644
--- a/dom/bluetooth/BluetoothService.cpp
+++ b/dom/bluetooth/BluetoothService.cpp
@@ -184,7 +184,7 @@ public:
      * When two values are the same, we don't switch on/off bluetooth,
      * but we still do ToggleBtAck task.
      */
-    if (mEnabled == gBluetoothService->IsEnabled()) {
+    if (mEnabled == gBluetoothService->IsEnabledInternal()) {
       NS_WARNING("Bluetooth has already been enabled/disabled before.");
     } else {
       // Switch on/off bluetooth
@@ -529,18 +529,7 @@ nsresult
 BluetoothService::HandleStartupSettingsCheck(bool aEnable)
 {
   MOZ_ASSERT(NS_IsMainThread());
-
-  if (aEnable) {
-    return StartStopBluetooth(true);
-  }
-
-  /*
-   * Since BLUETOOTH_ENABLED_SETTING is false, we don't have to turn on
-   * bluetooth here, and set gToggleInProgress back to false.
-   */
-  gToggleInProgress = false;
-
-  return NS_OK;
+  return StartStopBluetooth(aEnable);
 }
 
 nsresult
diff --git a/dom/bluetooth/BluetoothService.h b/dom/bluetooth/BluetoothService.h
index 7754113e776d..3a1694b9ebbc 100644
--- a/dom/bluetooth/BluetoothService.h
+++ b/dom/bluetooth/BluetoothService.h
@@ -292,7 +292,7 @@ protected:
   virtual nsresult
   StartInternal() = 0;
 
-  /** 
+  /**
    * Platform specific startup functions go here. Usually deals with member
    * variables, so not static. Guaranteed to be called outside of main thread.
    *
@@ -301,6 +301,15 @@ protected:
   virtual nsresult
   StopInternal() = 0;
 
+  /**
+   * Platform specific startup functions go here. Usually deals with member
+   * variables, so not static. Guaranteed to be called outside of main thread.
+   *
+   * @return true if Bluetooth is enabled, false otherwise
+   */
+  virtual bool
+  IsEnabledInternal() = 0;
+
   /**
    * Called when XPCOM first creates this service.
    */
diff --git a/dom/bluetooth/gonk/BluetoothGonkService.cpp b/dom/bluetooth/gonk/BluetoothGonkService.cpp
index 1519431b8187..8e90c2f94db6 100644
--- a/dom/bluetooth/gonk/BluetoothGonkService.cpp
+++ b/dom/bluetooth/gonk/BluetoothGonkService.cpp
@@ -120,7 +120,7 @@ StartStopGonkBluetooth(bool aShouldEnable)
 nsresult
 BluetoothGonkService::StartInternal()
 {
-  NS_ASSERTION(!NS_IsMainThread(), "This should not run on the main thread!");
+  MOZ_ASSERT(!NS_IsMainThread());
 
   nsresult ret;
 
@@ -136,7 +136,7 @@ BluetoothGonkService::StartInternal()
 nsresult
 BluetoothGonkService::StopInternal()
 {
-  NS_ASSERTION(!NS_IsMainThread(), "This should not run on the main thread!");
+  MOZ_ASSERT(!NS_IsMainThread());
 
   nsresult ret;
 
@@ -149,3 +149,16 @@ BluetoothGonkService::StopInternal()
   return StartStopGonkBluetooth(false);
 }
 
+bool
+BluetoothGonkService::IsEnabledInternal()
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  if (!EnsureBluetoothInit()) {
+    NS_ERROR("Failed to load bluedroid library.\n");
+    return false;
+  }
+
+  return (sBluedroidFunctions.bt_is_enabled() == 1);
+}
+
diff --git a/dom/bluetooth/gonk/BluetoothGonkService.h b/dom/bluetooth/gonk/BluetoothGonkService.h
index 997792c02661..b9fff9c9a482 100644
--- a/dom/bluetooth/gonk/BluetoothGonkService.h
+++ b/dom/bluetooth/gonk/BluetoothGonkService.h
@@ -35,23 +35,27 @@ BEGIN_BLUETOOTH_NAMESPACE
 class BluetoothGonkService : public BluetoothDBusService
 {
 public:
-  /** 
+  /**
    * Set up variables and start the platform specific connection. Must
-   * be called from main thread.
+   * be called from non-main thread.
    *
-   * @return NS_OK if connection starts successfully, NS_ERROR_FAILURE
-   * otherwise
+   * @return NS_OK if connection starts successfully, NS_ERROR_FAILURE otherwise
    */
   virtual nsresult StartInternal();
 
-  /** 
-   * Stop the platform specific connection. Must be called from main
-   * thread.
+  /**
+   * Stop the platform specific connection. Must be called from non-main thread.
    *
-   * @return NS_OK if connection starts successfully, NS_ERROR_FAILURE
-   * otherwise
+   * @return NS_OK if connection starts successfully, NS_ERROR_FAILURE otherwise
    */
   virtual nsresult StopInternal();
+
+  /**
+   * Get status of Bluetooth. Must be called from non-main thread.
+   *
+   * @return true if Bluetooth is enabled, false otherwise
+   */
+  virtual bool IsEnabledInternal();
 };
 
 END_BLUETOOTH_NAMESPACE
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
index ea71d37fc334..0be3ca71b312 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
@@ -361,6 +361,13 @@ BluetoothServiceChildProcess::StopInternal()
   return NS_ERROR_FAILURE;
 }
 
+bool
+BluetoothServiceChildProcess::IsEnabledInternal()
+{
+  MOZ_NOT_REACHED("This should never be called!");
+  return false;
+}
+
 bool
 BluetoothServiceChildProcess::IsConnected(uint16_t aProfileId)
 {
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
index d29336109122..4ae83c53e3e8 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
@@ -163,6 +163,10 @@ private:
   virtual nsresult
   StopInternal() MOZ_OVERRIDE;
 
+  // This method should never be called.
+  virtual bool
+  IsEnabledInternal() MOZ_OVERRIDE;
+
   // Should never be called from the child
   virtual nsresult
   GetDevicePropertiesInternal(const BluetoothSignal& aSignal) MOZ_OVERRIDE;
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index 2bcb6f331c09..be4b362d5ec6 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -1708,7 +1708,9 @@ BluetoothDBusService::StopInternal()
   // If Bluetooth is turned off while connections exist, in order not to only
   // disconnect with profile connections with low level ACL connections alive,
   // we disconnect ACLs directly instead of closing each socket.
-  DisconnectAllAcls(sAdapterPath);
+  if (!sAdapterPath.IsEmpty()) {
+    DisconnectAllAcls(sAdapterPath);
+  }
 
   if (!mConnection) {
     StopDBus();
@@ -1756,6 +1758,12 @@ BluetoothDBusService::StopInternal()
   return NS_OK;
 }
 
+bool
+BluetoothDBusService::IsEnabledInternal()
+{
+  return mEnabled;
+}
+
 class DefaultAdapterPropertiesRunnable : public nsRunnable
 {
 public:
diff --git a/dom/bluetooth/linux/BluetoothDBusService.h b/dom/bluetooth/linux/BluetoothDBusService.h
index e31f41050803..697991571f95 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.h
+++ b/dom/bluetooth/linux/BluetoothDBusService.h
@@ -30,6 +30,8 @@ public:
 
   virtual nsresult StopInternal();
 
+  virtual bool IsEnabledInternal();
+
   virtual nsresult GetDefaultAdapterPathInternal(BluetoothReplyRunnable* aRunnable);
 
   virtual nsresult GetPairedDevicePropertiesInternal(const nsTArray<nsString>& aDeviceAddresses,

From 74abc178d6c12121be474770979f4e96ec5d057f Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 15 Apr 2013 23:06:12 -0700
Subject: [PATCH 338/438] Bug 845555 - Fix statistics menu item, r=jaws

---
 browser/base/content/nsContextMenu.js     | 12 ++++--------
 toolkit/content/widgets/videocontrols.xml |  7 ++++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 655c258a7224..12d0be34d013 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -396,7 +396,7 @@ nsContextMenu.prototype = {
     this.showItem("context-media-showcontrols", onMedia && !this.target.controls);
     this.showItem("context-media-hidecontrols", onMedia && this.target.controls);
     this.showItem("context-video-fullscreen", this.onVideo && this.target.ownerDocument.mozFullScreenElement == null);
-    var statsShowing = this.onVideo && this.target.wrappedJSObject.mozMediaStatisticsShowing;
+    var statsShowing = this.onVideo && XPCNativeWrapper.unwrap(this.target).mozMediaStatisticsShowing;
     this.showItem("context-video-showstats", this.onVideo && this.target.controls && !statsShowing);
     this.showItem("context-video-hidestats", this.onVideo && this.target.controls && statsShowing);
 
@@ -1505,14 +1505,10 @@ nsContextMenu.prototype = {
       case "showcontrols":
         media.setAttribute("controls", "true");
         break;
-      case "showstats":
-        var event = document.createEvent("CustomEvent");
-        event.initCustomEvent("media-showStatistics", false, true, true);
-        media.dispatchEvent(event);
-        break;
       case "hidestats":
-        var event = document.createEvent("CustomEvent");
-        event.initCustomEvent("media-showStatistics", false, true, false);
+      case "showstats":
+        var event = media.ownerDocument.createEvent("CustomEvent");
+        event.initCustomEvent("media-showStatistics", false, true, command == "showstats");
         media.dispatchEvent(event);
         break;
     }
diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index 37fe0ff5555e..1bb851f7e556 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -456,7 +456,7 @@
                     this.adjustControlSize();
 
                     // Preserve Statistics when toggling fullscreen mode due to bug 714071.
-                    if (this.video.mozMediaStatisticsShowing)
+                    if (XPCNativeWrapper.unwrap(this.video).mozMediaStatisticsShowing)
                         this.showStatistics(true);
 
                     this._handleCustomEventsBound = this.handleCustomEvents.bind(this);
@@ -1094,14 +1094,15 @@
                         this.statsInterval = null;
                     }
 
+                    let unwrappedVideo = XPCNativeWrapper.unwrap(this.video);
                     if (shouldShow) {
-                        this.video.mozMediaStatisticsShowing = true;
+                        unwrappedVideo.mozMediaStatisticsShowing = true;
 
                         this.statsOverlay.hidden = false;
                         this.statsInterval = setInterval(this.updateStats.bind(this), this.STATS_INTERVAL_MS);
                         this.updateStats();
                     } else {
-                        delete this.video.mozMediaStatisticsShowing;
+                        delete unwrappedVideo.mozMediaStatisticsShowing;
                         this.statsOverlay.hidden = true;
                     }
                 },

From d64a195ccbea04c553ed193d5a862f1809d48919 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 16 Apr 2013 08:23:18 +0200
Subject: [PATCH 339/438] Bug 861453 - Restore empty substs after bug 857557,
 but put them in a separate file, unlisted as a dependency for everything.
 r=gps

---
 config/autoconf.mk.in                                    | 1 +
 config/emptyvars.mk.in                                   | 1 +
 config/moz.build                                         | 1 +
 js/src/config/autoconf.mk.in                             | 1 +
 js/src/config/emptyvars.mk.in                            | 1 +
 js/src/configure.in                                      | 2 +-
 python/mozbuild/mozbuild/backend/configenvironment.py    | 6 +++++-
 .../mozbuild/test/backend/test_configenvironment.py      | 9 ++++++---
 8 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 config/emptyvars.mk.in
 create mode 100644 js/src/config/emptyvars.mk.in

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 3a1f0d8f49e1..41f7854eeef7 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -1,2 +1,3 @@
+include $(DEPTH)/config/emptyvars.mk
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
diff --git a/config/emptyvars.mk.in b/config/emptyvars.mk.in
new file mode 100644
index 000000000000..388cf2a35986
--- /dev/null
+++ b/config/emptyvars.mk.in
@@ -0,0 +1 @@
+@ALLEMPTYSUBSTS@
diff --git a/config/moz.build b/config/moz.build
index 8c98eb6c345c..422455a99600 100644
--- a/config/moz.build
+++ b/config/moz.build
@@ -6,6 +6,7 @@
 
 CONFIGURE_SUBST_FILES += [
     'autoconf.mk',
+    'emptyvars.mk',
     'doxygen.cfg',
     'makefiles/test/Makefile',
     'tests/makefiles/autodeps/Makefile',
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 3a1f0d8f49e1..41f7854eeef7 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -1,2 +1,3 @@
+include $(DEPTH)/config/emptyvars.mk
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
diff --git a/js/src/config/emptyvars.mk.in b/js/src/config/emptyvars.mk.in
new file mode 100644
index 000000000000..388cf2a35986
--- /dev/null
+++ b/js/src/config/emptyvars.mk.in
@@ -0,0 +1 @@
+@ALLEMPTYSUBSTS@
diff --git a/js/src/configure.in b/js/src/configure.in
index 1e6636dc0fe5..3ec29c04489a 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4384,7 +4384,7 @@ AC_SUBST(ac_configure_args)
 dnl Spit out some output
 dnl ========================================================
 
-AC_OUTPUT([js-confdefs.h Makefile config/autoconf.mk])
+AC_OUTPUT([js-confdefs.h Makefile config/autoconf.mk config/emptyvars.mk])
 
 # Produce the js-config script at configure time; see the comments for
 # 'js-config' in Makefile.in.
diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
index 89d8a5684296..dc63edcf4ea5 100644
--- a/python/mozbuild/mozbuild/backend/configenvironment.py
+++ b/python/mozbuild/mozbuild/backend/configenvironment.py
@@ -86,13 +86,15 @@ class ConfigEnvironment(object):
       - ALLDEFINES contains the defines in the form #define NAME VALUE, in
         sorted order, for use in config files, for an automatic listing of
         defines.
-    and another additional subst variable from all the other substs:
+    and two other additional subst variables from all the other substs:
       - ALLSUBSTS contains the substs in the form NAME = VALUE, in sorted
         order, for use in autoconf.mk. It includes ACDEFINES, but doesn't
         include ALLDEFINES. Only substs with a VALUE are included, such that
         the resulting file doesn't change when new empty substs are added.
         This results in less invalidation of build dependencies in the case
         of autoconf.mk..
+      - ALLEMPTYSUBSTS contains the substs with an empty value, in the form
+        NAME =.
 
     ConfigEnvironment expects a "top_srcdir" subst to be set with the top
     source directory, in msys format on windows. It is used to derive a
@@ -113,6 +115,8 @@ class ConfigEnvironment(object):
             shell_escape(self.defines[name])) for name in global_defines])
         self.substs['ALLSUBSTS'] = '\n'.join(sorted(['%s = %s' % (name,
             self.substs[name]) for name in self.substs if self.substs[name]]))
+        self.substs['ALLEMPTYSUBSTS'] = '\n'.join(sorted(['%s =' % name
+            for name in self.substs if not self.substs[name]]))
         self.substs['ALLDEFINES'] = '\n'.join(sorted(['#define %s %s' % (name,
             self.defines[name]) for name in global_defines]))
 
diff --git a/python/mozbuild/mozbuild/test/backend/test_configenvironment.py b/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
index a93ac9495cc7..dd202a3b2907 100644
--- a/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
+++ b/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
@@ -22,14 +22,14 @@ class ConfigEnvironment(ConfigStatus.ConfigEnvironment):
 
 class TestEnvironment(unittest.TestCase):
     def test_auto_substs(self):
-        '''Test the automatically set values of ACDEFINES, ALLDEFINES
-        and ALLSUBSTS.
+        '''Test the automatically set values of ACDEFINES, ALLDEFINES,
+        ALLSUBSTS and ALLEMPTYSUBSTS.
         '''
         env = ConfigEnvironment('.', '.',
                   defines = [ ('foo', 'bar'), ('baz', 'qux 42'),
                               ('abc', 'def'), ('extra', 'foobar') ],
                   non_global_defines = ['extra', 'ignore'],
-                  substs = [ ('FOO', 'bar'), ('ABC', 'def'),
+                  substs = [ ('FOO', 'bar'), ('FOOBAR', ''), ('ABC', 'def'),
                              ('bar', 'baz qux'), ('zzz', '"abc def"'),
                              ('qux', '') ])
         # non_global_defines should be filtered out in ACDEFINES and
@@ -47,6 +47,9 @@ ACDEFINES = -Dfoo=bar -Dbaz=qux\ 42 -Dabc=def
 FOO = bar
 bar = baz qux
 zzz = "abc def"''')
+        # ALLEMPTYSUBSTS contains all substs with no value.
+        self.assertEqual(env.substs['ALLEMPTYSUBSTS'], '''FOOBAR =
+qux =''')
 
     def test_config_file(self):
         '''Test the creation of config files.

From e60f7ec363bd34aa28aaa427394a433bc388e532 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 16 Apr 2013 16:43:28 +1000
Subject: [PATCH 340/438] Bug 862158 - Propagate implied SVG text rotate=""
 values over the top of inherited implied values. r=longsonr

---
 layout/reftests/svg/reftest.list            |  1 +
 layout/reftests/svg/tspan-rotate-07-ref.svg |  8 ++++++++
 layout/reftests/svg/tspan-rotate-07.svg     |  8 ++++++++
 layout/svg/nsSVGTextFrame2.cpp              | 11 +++++------
 layout/svg/nsSVGTextFrame2.h                | 10 ++++++++--
 5 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 layout/reftests/svg/tspan-rotate-07-ref.svg
 create mode 100644 layout/reftests/svg/tspan-rotate-07.svg

diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 893ff82de179..91ba4b22a298 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -324,6 +324,7 @@ skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotat
 skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-04.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
 random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-05.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP
 skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-06.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
+== tspan-rotate-07.svg tspan-rotate-07-ref.svg
 == tspan-rotate-textPath-01.svg tspan-rotate-textPath-01-ref.svg
 skip-if(B2G) == tspan-xy-01.svg tspan-xy-ref.svg # bug 773482
 skip-if(B2G) == tspan-xy-02.svg tspan-xy-ref.svg # bug 773482
diff --git a/layout/reftests/svg/tspan-rotate-07-ref.svg b/layout/reftests/svg/tspan-rotate-07-ref.svg
new file mode 100644
index 000000000000..5494cda6c2c3
--- /dev/null
+++ b/layout/reftests/svg/tspan-rotate-07-ref.svg
@@ -0,0 +1,8 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=862158 -->
+  <text x="100" y="100" style="font: 32px sans-serif" rotate="45 0">A B</text>
+</svg>
diff --git a/layout/reftests/svg/tspan-rotate-07.svg b/layout/reftests/svg/tspan-rotate-07.svg
new file mode 100644
index 000000000000..83b1dbdde1eb
--- /dev/null
+++ b/layout/reftests/svg/tspan-rotate-07.svg
@@ -0,0 +1,8 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=862158 -->
+  <text x="100" y="100" style="font: 32px sans-serif"><tspan rotate="45">A </tspan>B</text>
+</svg>
diff --git a/layout/svg/nsSVGTextFrame2.cpp b/layout/svg/nsSVGTextFrame2.cpp
index 0c6e55e7d0e4..2ff45be5ab57 100644
--- a/layout/svg/nsSVGTextFrame2.cpp
+++ b/layout/svg/nsSVGTextFrame2.cpp
@@ -4128,8 +4128,11 @@ nsSVGTextFrame2::ResolvePositions(nsIContent* aContent,
         j++;
       }
       // Propagate final rotate="" value to the end of this element.
-      while (j < count) {
+      while (j < count &&
+             (!mPositions[aIndex + j].IsAngleSpecified() ||
+              mPositions[aIndex + j].mAngleImplied)) {
         mPositions[aIndex + j].mAngle = mPositions[aIndex + j - 1].mAngle;
+        mPositions[aIndex + j].mAngleImplied = true;
         j++;
       }
     }
@@ -4661,11 +4664,7 @@ nsSVGTextFrame2::DoGlyphPositioning()
     }
     // Fill in unspecified rotation values.
     if (!mPositions[i].IsAngleSpecified()) {
-      mPositions[i].mAngle = mPositions[i - 1].mAngle;
-      if (mPositions[i].mAngle != 0.0f) {
-        // Any non-zero rotation must begin a run boundary.
-        mPositions[i].mRunBoundary = true;
-      }
+      mPositions[i].mAngle = 0.0f;
     }
   }
 
diff --git a/layout/svg/nsSVGTextFrame2.h b/layout/svg/nsSVGTextFrame2.h
index c0d3cc3107c9..49e2b31e47b6 100644
--- a/layout/svg/nsSVGTextFrame2.h
+++ b/layout/svg/nsSVGTextFrame2.h
@@ -47,7 +47,8 @@ struct CharPosition
       mUnaddressable(false),
       mClusterOrLigatureGroupMiddle(false),
       mRunBoundary(false),
-      mStartOfChunk(false)
+      mStartOfChunk(false),
+      mAngleImplied(false)
   {
   }
 
@@ -58,7 +59,8 @@ struct CharPosition
       mUnaddressable(false),
       mClusterOrLigatureGroupMiddle(false),
       mRunBoundary(false),
-      mStartOfChunk(false)
+      mStartOfChunk(false),
+      mAngleImplied(false)
   {
   }
 
@@ -102,6 +104,10 @@ struct CharPosition
   // an anchored chunk begins here
   bool mStartOfChunk;
 
+  // whether the angle value was implied due to the repetition of the final
+  // value in a rotate="" attribute
+  bool mAngleImplied;
+
 private:
   static gfxFloat UnspecifiedCoord()
   {

From a5e8302d09a1cec9ecaeeb6673b9dbef89c013dc Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 16 Apr 2013 16:43:29 +1000
Subject: [PATCH 341/438] Bug 862154 - Fix paint-order-02.svg to work with
 svg.text.css-frames.enabled=true. r=longsonr

---
 layout/reftests/svg/paint-order-02-ref.svg | 36 +++++++++++++---------
 layout/reftests/svg/paint-order-02.svg     | 12 ++++++--
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/layout/reftests/svg/paint-order-02-ref.svg b/layout/reftests/svg/paint-order-02-ref.svg
index a0c3bb4f560e..46731a5bff77 100644
--- a/layout/reftests/svg/paint-order-02-ref.svg
+++ b/layout/reftests/svg/paint-order-02-ref.svg
@@ -4,25 +4,33 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg">
   <title>Reference for paint-order-02.svg</title>
-  <!-- https://bugzilla.mozilla.org/show_bug.cgi?id=XXXXXX -->
+  <!-- https://bugzilla.mozilla.org/show_bug.cgi?id=828805 -->
 
-  <g fill="gold" stroke="black" stroke-width="8" paint-order="stroke">
-    <ellipse cx="50" cy="50" rx="40" ry="20" fill-opacity="0" stroke-opacity="1"/>
-    <ellipse cx="50" cy="50" rx="40" ry="20" fill-opacity="1" stroke-opacity="0"/>
+  <linearGradient id="gold">
+    <stop stop-color="gold"/>
+  </linearGradient>
 
-    <path d="M 50,100 h 40 v 30 z" fill-opacity="0" stroke-opacity="1"/>
-    <path d="M 50,100 h 40 v 30 z" fill-opacity="1" stroke-opacity="0"/>
+  <linearGradient id="black">
+    <stop stop-color="black"/>
+  </linearGradient>
 
-    <polygon points="50,150 90,150 90,180" fill-opacity="0" stroke-opacity="1"/>
-    <polygon points="50,150 90,150 90,180" fill-opacity="1" stroke-opacity="0"/>
+  <g fill="url(#gold)" stroke="url(#black)" stroke-width="8" paint-order="stroke">
+    <ellipse cx="50" cy="50" rx="40" ry="20" fill="none"/>
+    <ellipse cx="50" cy="50" rx="40" ry="20" stroke="none"/>
 
-    <polyline points="50,200 90,200 90,230" fill-opacity="0" stroke-opacity="1"/>
-    <polyline points="50,200 90,200 90,230" fill-opacity="1" stroke-opacity="0"/>
+    <path d="M 50,100 h 40 v 30 z" fill="none"/>
+    <path d="M 50,100 h 40 v 30 z" stroke="none"/>
 
-    <rect x="50" y="250" width="80" height="30" r="16" fill-opacity="0" stroke-opacity="1"/>
-    <rect x="50" y="250" width="80" height="30" r="16" fill-opacity="1" stroke-opacity="0"/>
+    <polygon points="50,150 90,150 90,180" fill="none"/>
+    <polygon points="50,150 90,150 90,180" stroke="none"/>
 
-    <text x="50" y="350" font-size="80" stroke-width="4" fill-opacity="0" stroke-opacity="1">hello <tspan fill-opacity="1" stroke-opacity="0">there</tspan></text>
-    <text x="50" y="350" font-size="80" stroke-width="4" fill-opacity="1" stroke-opacity="0">hello <tspan fill-opacity="0" stroke-opacity="1">there</tspan></text>
+    <polyline points="50,200 90,200 90,230" fill="none"/>
+    <polyline points="50,200 90,200 90,230" stroke="none"/>
+
+    <rect x="50" y="250" width="80" height="30" r="16" fill="none"/>
+    <rect x="50" y="250" width="80" height="30" r="16" stroke="none"/>
+
+    <text x="50" y="350" font-size="80" stroke-width="4"><tspan fill="none">hello</tspan> <tspan stroke="none">there</tspan></text>
+    <text x="50" y="350" font-size="80" stroke-width="4"><tspan stroke="none">hello</tspan> <tspan fill="none">there</tspan></text>
   </g>
 </svg>
diff --git a/layout/reftests/svg/paint-order-02.svg b/layout/reftests/svg/paint-order-02.svg
index aad9d694d397..52e7ac2dd91e 100644
--- a/layout/reftests/svg/paint-order-02.svg
+++ b/layout/reftests/svg/paint-order-02.svg
@@ -4,9 +4,17 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg">
   <title>Test that the paint-order property works</title>
-  <!-- https://bugzilla.mozilla.org/show_bug.cgi?id=XXXXXX -->
+  <!-- https://bugzilla.mozilla.org/show_bug.cgi?id=828805 -->
 
-  <g fill="gold" stroke="black" stroke-width="8" paint-order="stroke">
+  <linearGradient id="gold">
+    <stop stop-color="gold"/>
+  </linearGradient>
+
+  <linearGradient id="black">
+    <stop stop-color="black"/>
+  </linearGradient>
+
+  <g fill="url(#gold)" stroke="url(#black)" stroke-width="8" paint-order="stroke">
     <ellipse cx="50" cy="50" rx="40" ry="20"/>
     <path d="M 50,100 h 40 v 30 z"/>
     <polygon points="50,150 90,150 90,180"/>

From d9bc5e130401df19b002d07d8e6d12284b8f87c9 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 16 Apr 2013 09:18:06 +0200
Subject: [PATCH 342/438] Backout changeset 0ff383d4a899 (bug 861453) for
 universal builds bustage

---
 config/autoconf.mk.in                                    | 1 -
 config/emptyvars.mk.in                                   | 1 -
 config/moz.build                                         | 1 -
 js/src/config/autoconf.mk.in                             | 1 -
 js/src/config/emptyvars.mk.in                            | 1 -
 js/src/configure.in                                      | 2 +-
 python/mozbuild/mozbuild/backend/configenvironment.py    | 6 +-----
 .../mozbuild/test/backend/test_configenvironment.py      | 9 +++------
 8 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 config/emptyvars.mk.in
 delete mode 100644 js/src/config/emptyvars.mk.in

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 41f7854eeef7..3a1f0d8f49e1 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -1,3 +1,2 @@
-include $(DEPTH)/config/emptyvars.mk
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
diff --git a/config/emptyvars.mk.in b/config/emptyvars.mk.in
deleted file mode 100644
index 388cf2a35986..000000000000
--- a/config/emptyvars.mk.in
+++ /dev/null
@@ -1 +0,0 @@
-@ALLEMPTYSUBSTS@
diff --git a/config/moz.build b/config/moz.build
index 422455a99600..8c98eb6c345c 100644
--- a/config/moz.build
+++ b/config/moz.build
@@ -6,7 +6,6 @@
 
 CONFIGURE_SUBST_FILES += [
     'autoconf.mk',
-    'emptyvars.mk',
     'doxygen.cfg',
     'makefiles/test/Makefile',
     'tests/makefiles/autodeps/Makefile',
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 41f7854eeef7..3a1f0d8f49e1 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -1,3 +1,2 @@
-include $(DEPTH)/config/emptyvars.mk
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
diff --git a/js/src/config/emptyvars.mk.in b/js/src/config/emptyvars.mk.in
deleted file mode 100644
index 388cf2a35986..000000000000
--- a/js/src/config/emptyvars.mk.in
+++ /dev/null
@@ -1 +0,0 @@
-@ALLEMPTYSUBSTS@
diff --git a/js/src/configure.in b/js/src/configure.in
index 3ec29c04489a..1e6636dc0fe5 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4384,7 +4384,7 @@ AC_SUBST(ac_configure_args)
 dnl Spit out some output
 dnl ========================================================
 
-AC_OUTPUT([js-confdefs.h Makefile config/autoconf.mk config/emptyvars.mk])
+AC_OUTPUT([js-confdefs.h Makefile config/autoconf.mk])
 
 # Produce the js-config script at configure time; see the comments for
 # 'js-config' in Makefile.in.
diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
index dc63edcf4ea5..89d8a5684296 100644
--- a/python/mozbuild/mozbuild/backend/configenvironment.py
+++ b/python/mozbuild/mozbuild/backend/configenvironment.py
@@ -86,15 +86,13 @@ class ConfigEnvironment(object):
       - ALLDEFINES contains the defines in the form #define NAME VALUE, in
         sorted order, for use in config files, for an automatic listing of
         defines.
-    and two other additional subst variables from all the other substs:
+    and another additional subst variable from all the other substs:
       - ALLSUBSTS contains the substs in the form NAME = VALUE, in sorted
         order, for use in autoconf.mk. It includes ACDEFINES, but doesn't
         include ALLDEFINES. Only substs with a VALUE are included, such that
         the resulting file doesn't change when new empty substs are added.
         This results in less invalidation of build dependencies in the case
         of autoconf.mk..
-      - ALLEMPTYSUBSTS contains the substs with an empty value, in the form
-        NAME =.
 
     ConfigEnvironment expects a "top_srcdir" subst to be set with the top
     source directory, in msys format on windows. It is used to derive a
@@ -115,8 +113,6 @@ class ConfigEnvironment(object):
             shell_escape(self.defines[name])) for name in global_defines])
         self.substs['ALLSUBSTS'] = '\n'.join(sorted(['%s = %s' % (name,
             self.substs[name]) for name in self.substs if self.substs[name]]))
-        self.substs['ALLEMPTYSUBSTS'] = '\n'.join(sorted(['%s =' % name
-            for name in self.substs if not self.substs[name]]))
         self.substs['ALLDEFINES'] = '\n'.join(sorted(['#define %s %s' % (name,
             self.defines[name]) for name in global_defines]))
 
diff --git a/python/mozbuild/mozbuild/test/backend/test_configenvironment.py b/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
index dd202a3b2907..a93ac9495cc7 100644
--- a/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
+++ b/python/mozbuild/mozbuild/test/backend/test_configenvironment.py
@@ -22,14 +22,14 @@ class ConfigEnvironment(ConfigStatus.ConfigEnvironment):
 
 class TestEnvironment(unittest.TestCase):
     def test_auto_substs(self):
-        '''Test the automatically set values of ACDEFINES, ALLDEFINES,
-        ALLSUBSTS and ALLEMPTYSUBSTS.
+        '''Test the automatically set values of ACDEFINES, ALLDEFINES
+        and ALLSUBSTS.
         '''
         env = ConfigEnvironment('.', '.',
                   defines = [ ('foo', 'bar'), ('baz', 'qux 42'),
                               ('abc', 'def'), ('extra', 'foobar') ],
                   non_global_defines = ['extra', 'ignore'],
-                  substs = [ ('FOO', 'bar'), ('FOOBAR', ''), ('ABC', 'def'),
+                  substs = [ ('FOO', 'bar'), ('ABC', 'def'),
                              ('bar', 'baz qux'), ('zzz', '"abc def"'),
                              ('qux', '') ])
         # non_global_defines should be filtered out in ACDEFINES and
@@ -47,9 +47,6 @@ ACDEFINES = -Dfoo=bar -Dbaz=qux\ 42 -Dabc=def
 FOO = bar
 bar = baz qux
 zzz = "abc def"''')
-        # ALLEMPTYSUBSTS contains all substs with no value.
-        self.assertEqual(env.substs['ALLEMPTYSUBSTS'], '''FOOBAR =
-qux =''')
 
     def test_config_file(self):
         '''Test the creation of config files.

From d4a09264199925887b52a7836c7575cf53ea3d47 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 16 Apr 2013 17:23:46 +1000
Subject: [PATCH 343/438] Backout 64abee9b00f1 (bug 841363) for suspected
 test_bug375003-1.html failure. (CLOSED TREE)

---
 content/base/src/Element.cpp            |  9 ++--
 layout/generic/test/Makefile.in         |  1 -
 layout/generic/test/test_bug841361.html | 56 -------------------------
 3 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 layout/generic/test/test_bug841361.html

diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp
index 68480ceb10ab..eb77095fc392 100644
--- a/content/base/src/Element.cpp
+++ b/content/base/src/Element.cpp
@@ -589,14 +589,11 @@ static nsSize GetScrollRectSizeForOverflowVisibleFrame(nsIFrame* aFrame)
     return nsSize(0,0);
   }
 
-  nsOverflowAreas overflowAreas;
-  nsLayoutUtils::UnionChildOverflow(aFrame, overflowAreas);
-  // Make sure that an empty padding-rect's edges are included
   nsRect paddingRect = aFrame->GetPaddingRectRelativeToSelf();
-  nsRect overflowRect =
-    overflowAreas.ScrollableOverflow().UnionEdges(paddingRect);
+  nsOverflowAreas overflowAreas(paddingRect, paddingRect);
+  nsLayoutUtils::UnionChildOverflow(aFrame, overflowAreas);
   return nsLayoutUtils::GetScrolledRect(aFrame,
-      overflowRect, paddingRect.Size(),
+      overflowAreas.ScrollableOverflow(), paddingRect.Size(),
       aFrame->StyleVisibility()->mDirection).Size();
 }
 
diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in
index e9659287b3aa..7f1a70ba81d0 100644
--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -105,7 +105,6 @@ MOCHITEST_FILES = \
   test_bug785324.html \
   test_bug791616.html \
   test_bug831780.html \
-  test_bug841361.html \
   $(NULL)
 
 MOCHITEST_CHROME_FILES = \
diff --git a/layout/generic/test/test_bug841361.html b/layout/generic/test/test_bug841361.html
deleted file mode 100644
index cc7a23dbf457..000000000000
--- a/layout/generic/test/test_bug841361.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=841361
--->
-<head>
-  <title>Test for Bug 841361</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=841361">Mozilla Bug 841361</a>
-<p id="display">
-
-<div style="width:500px; height:0;" id="a"></div>
-
-<div style="width:0; height:500px;" id="b"></div>
-
-<div style="width:500px;" id="c">
-  <div style="width:50px; height:50px; float:left; background:yellow"></div>
-  <div style="width:200px; height:50px; float:left; background:green"></div>
-</div>
-
-<div style="width:500px; height:0; overflow:hidden" id="d"></div>
-
-<div style="width:0; height:500px; overflow:hidden" id="e"></div>
-
-<div style="width:500px; overflow:hidden" id="f">
-  <div style="width:50px; height:50px; float:left; background:yellow"></div>
-  <div style="width:200px; height:50px; float:left; background:green"></div>
-</div>
-
-</p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-function doTest(id, w, h) {
-  var e = document.getElementById(id);
-  is(e.scrollWidth, w, "scrollWidth for element '" + id + "'");
-  is(e.scrollHeight, h, "scrollHeight for element '" + id + "'");
-}
-
-doTest("a", 500, 0);
-doTest("b", 0, 500);
-doTest("c", 500, 50);
-doTest("d", 500, 0);
-doTest("e", 0, 500);
-doTest("f", 500, 50);
-
-</script>
-</pre>
-</body>
-</html>

From 15a1a5b1e0e0be8839305260f17f200ebc351462 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 16 Apr 2013 18:28:21 +1000
Subject: [PATCH 344/438] Backout 66c01cdf30d2 (bug 862158) for
 text-layout-08.svg failure. (CLOSED TREE)

---
 layout/reftests/svg/reftest.list            |  1 -
 layout/reftests/svg/tspan-rotate-07-ref.svg |  8 --------
 layout/reftests/svg/tspan-rotate-07.svg     |  8 --------
 layout/svg/nsSVGTextFrame2.cpp              | 11 ++++++-----
 layout/svg/nsSVGTextFrame2.h                | 10 ++--------
 5 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 layout/reftests/svg/tspan-rotate-07-ref.svg
 delete mode 100644 layout/reftests/svg/tspan-rotate-07.svg

diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 91ba4b22a298..893ff82de179 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -324,7 +324,6 @@ skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotat
 skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-04.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
 random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-05.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP
 skip-if(B2G) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-06.svg tspan-rotate-ref.svg # Bug 629718 for random failure on WinXP # bug 773482
-== tspan-rotate-07.svg tspan-rotate-07-ref.svg
 == tspan-rotate-textPath-01.svg tspan-rotate-textPath-01-ref.svg
 skip-if(B2G) == tspan-xy-01.svg tspan-xy-ref.svg # bug 773482
 skip-if(B2G) == tspan-xy-02.svg tspan-xy-ref.svg # bug 773482
diff --git a/layout/reftests/svg/tspan-rotate-07-ref.svg b/layout/reftests/svg/tspan-rotate-07-ref.svg
deleted file mode 100644
index 5494cda6c2c3..000000000000
--- a/layout/reftests/svg/tspan-rotate-07-ref.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<svg xmlns="http://www.w3.org/2000/svg">
-  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=862158 -->
-  <text x="100" y="100" style="font: 32px sans-serif" rotate="45 0">A B</text>
-</svg>
diff --git a/layout/reftests/svg/tspan-rotate-07.svg b/layout/reftests/svg/tspan-rotate-07.svg
deleted file mode 100644
index 83b1dbdde1eb..000000000000
--- a/layout/reftests/svg/tspan-rotate-07.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<svg xmlns="http://www.w3.org/2000/svg">
-  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=862158 -->
-  <text x="100" y="100" style="font: 32px sans-serif"><tspan rotate="45">A </tspan>B</text>
-</svg>
diff --git a/layout/svg/nsSVGTextFrame2.cpp b/layout/svg/nsSVGTextFrame2.cpp
index 2ff45be5ab57..0c6e55e7d0e4 100644
--- a/layout/svg/nsSVGTextFrame2.cpp
+++ b/layout/svg/nsSVGTextFrame2.cpp
@@ -4128,11 +4128,8 @@ nsSVGTextFrame2::ResolvePositions(nsIContent* aContent,
         j++;
       }
       // Propagate final rotate="" value to the end of this element.
-      while (j < count &&
-             (!mPositions[aIndex + j].IsAngleSpecified() ||
-              mPositions[aIndex + j].mAngleImplied)) {
+      while (j < count) {
         mPositions[aIndex + j].mAngle = mPositions[aIndex + j - 1].mAngle;
-        mPositions[aIndex + j].mAngleImplied = true;
         j++;
       }
     }
@@ -4664,7 +4661,11 @@ nsSVGTextFrame2::DoGlyphPositioning()
     }
     // Fill in unspecified rotation values.
     if (!mPositions[i].IsAngleSpecified()) {
-      mPositions[i].mAngle = 0.0f;
+      mPositions[i].mAngle = mPositions[i - 1].mAngle;
+      if (mPositions[i].mAngle != 0.0f) {
+        // Any non-zero rotation must begin a run boundary.
+        mPositions[i].mRunBoundary = true;
+      }
     }
   }
 
diff --git a/layout/svg/nsSVGTextFrame2.h b/layout/svg/nsSVGTextFrame2.h
index 49e2b31e47b6..c0d3cc3107c9 100644
--- a/layout/svg/nsSVGTextFrame2.h
+++ b/layout/svg/nsSVGTextFrame2.h
@@ -47,8 +47,7 @@ struct CharPosition
       mUnaddressable(false),
       mClusterOrLigatureGroupMiddle(false),
       mRunBoundary(false),
-      mStartOfChunk(false),
-      mAngleImplied(false)
+      mStartOfChunk(false)
   {
   }
 
@@ -59,8 +58,7 @@ struct CharPosition
       mUnaddressable(false),
       mClusterOrLigatureGroupMiddle(false),
       mRunBoundary(false),
-      mStartOfChunk(false),
-      mAngleImplied(false)
+      mStartOfChunk(false)
   {
   }
 
@@ -104,10 +102,6 @@ struct CharPosition
   // an anchored chunk begins here
   bool mStartOfChunk;
 
-  // whether the angle value was implied due to the repetition of the final
-  // value in a rotate="" attribute
-  bool mAngleImplied;
-
 private:
   static gfxFloat UnspecifiedCoord()
   {

From e5f7a77bc332722145c52f1a11b548cdd30c5db6 Mon Sep 17 00:00:00 2001
From: Gina Yeh <gyeh@mozilla.com>
Date: Tue, 16 Apr 2013 11:10:29 +0200
Subject: [PATCH 345/438] Bug 857896 - Convert device property "Connected" into
 a boolean if bluez returns a two-byte array, r=echou,qdot

---
 dom/bluetooth/linux/BluetoothDBusService.cpp | 98 +++++++-------------
 1 file changed, 33 insertions(+), 65 deletions(-)

diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index be4b362d5ec6..3ab16deacca1 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -82,7 +82,7 @@ static Properties sDeviceProperties[] = {
   {"Class", DBUS_TYPE_UINT32},
   {"UUIDs", DBUS_TYPE_ARRAY},
   {"Paired", DBUS_TYPE_BOOLEAN},
-  {"Connected", DBUS_TYPE_ARRAY},
+  {"Connected", DBUS_TYPE_BOOLEAN},
   {"Trusted", DBUS_TYPE_BOOLEAN},
   {"Blocked", DBUS_TYPE_BOOLEAN},
   {"Alias", DBUS_TYPE_STRING},
@@ -1030,7 +1030,7 @@ GetProperty(DBusMessageIter aIter, Properties* aPropertyTypes,
   DBusMessageIter prop_val, array_val_iter;
   char* property = NULL;
   uint32_t array_type;
-  int i, type;
+  int i, expectedType, receivedType;
 
   if (dbus_message_iter_get_arg_type(&aIter) != DBUS_TYPE_STRING) {
     return false;
@@ -1058,23 +1058,35 @@ GetProperty(DBusMessageIter aIter, Properties* aPropertyTypes,
   *aPropIndex = i;
 
   dbus_message_iter_recurse(&aIter, &prop_val);
-  type = aPropertyTypes[*aPropIndex].type;
+  expectedType = aPropertyTypes[*aPropIndex].type;
+  receivedType = dbus_message_iter_get_arg_type(&prop_val);
 
-  if (dbus_message_iter_get_arg_type(&prop_val) != type) {
+  /**
+   * Bug 857896. Since device property "Connected" could be a boolean value or
+   * an 2-byte array, we need to check the value type here and convert the
+   * first byte into a boolean manually.
+   */
+  bool convert = false;
+  if (propertyName.EqualsLiteral("Connected") &&
+      receivedType == DBUS_TYPE_ARRAY) {
+    convert = true;
+  }
+
+  if ((receivedType != expectedType) && !convert) {
     NS_WARNING("Iterator not type we expect!");
-    nsAutoCString str;
-    str += "Property Name: ;";
-    str += NS_ConvertUTF16toUTF8(propertyName);
-    str += " Property Type Expected: ;";
-    str += type;
-    str += " Property Type Received: ";
-    str += dbus_message_iter_get_arg_type(&prop_val);
+    nsCString str;
+    str.AppendLiteral("Property Name: ");
+    str.Append(NS_ConvertUTF16toUTF8(propertyName));
+    str.AppendLiteral(", Property Type Expected: ");
+    str.AppendInt(expectedType);
+    str.AppendLiteral(", Property Type Received: ");
+    str.AppendInt(receivedType);
     NS_WARNING(str.get());
     return false;
   }
 
   BluetoothValue propertyValue;
-  switch (type) {
+  switch (receivedType) {
     case DBUS_TYPE_STRING:
     case DBUS_TYPE_OBJECT_PATH:
       const char* c;
@@ -1124,6 +1136,14 @@ GetProperty(DBusMessageIter aIter, Properties* aPropertyTypes,
     default:
       NS_NOTREACHED("Cannot find dbus message type!");
   }
+
+  if (convert) {
+    MOZ_ASSERT(propertyValue.type() == BluetoothValue::TArrayOfuint8_t);
+
+    bool b = propertyValue.get_ArrayOfuint8_t()[0];
+    propertyValue = BluetoothValue(b);
+  }
+
   aProperties.AppendElement(BluetoothNamedValue(propertyName, propertyValue));
   return true;
 }
@@ -1187,48 +1207,14 @@ UnpackAdapterPropertiesMessage(DBusMessage* aMsg, DBusError* aErr,
                           ArrayLength(sAdapterProperties));
 }
 
-bool
-ReplaceConnectedType(Properties* sourceProperties,
-                     Properties** destProperties,
-                     int aPropertyTypeLen)
-{
-  if (!IsDeviceConnectedTypeBoolean()) {
-    return false;
-  }
-  *destProperties = (Properties*)malloc(sizeof(Properties) * aPropertyTypeLen);
-  if (*destProperties) {
-    CopyProperties(sourceProperties, *destProperties, aPropertyTypeLen);
-    int index = GetPropertyIndex(*destProperties,
-                                 "Connected",
-                                 aPropertyTypeLen);
-    if (index >= 0) {
-      (*destProperties)[index].type = DBUS_TYPE_BOOLEAN;
-      return true;
-    } else {
-      free(*destProperties);
-    }
-  }
-  return false;
-}
-
 void
 UnpackDevicePropertiesMessage(DBusMessage* aMsg, DBusError* aErr,
                               BluetoothValue& aValue,
                               nsAString& aErrorStr)
 {
-  Properties* props = sDeviceProperties;
-  Properties* newProps;
-  bool replaced = ReplaceConnectedType(sDeviceProperties, &newProps,
-                                       ArrayLength(sDeviceProperties));
-  if (replaced) {
-     props = newProps;
-  }
   UnpackPropertiesMessage(aMsg, aErr, aValue, aErrorStr,
-                          props,
+                          sDeviceProperties,
                           ArrayLength(sDeviceProperties));
-  if (replaced) {
-     free(newProps);
-  }
 }
 
 void
@@ -1400,20 +1386,11 @@ EventFilter(DBusConnection* aConn, DBusMessage* aMsg, void* aData)
 
     if (dbus_message_iter_next(&iter)) {
       Properties* props = sDeviceProperties;
-      Properties* newProps;
-      bool replaced = ReplaceConnectedType(sDeviceProperties, &newProps,
-                                           ArrayLength(sDeviceProperties));
-      if (replaced) {
-        props = newProps;
-      }
       ParseProperties(&iter,
                       v,
                       errorStr,
                       props,
                       ArrayLength(sDeviceProperties));
-      if (replaced) {
-        free(newProps);
-      }
       if (v.type() == BluetoothValue::TArrayOfBluetoothNamedValue)
       {
         // The DBus DeviceFound message actually passes back a key value object
@@ -1511,20 +1488,11 @@ EventFilter(DBusConnection* aConn, DBusMessage* aMsg, void* aData)
   } else if (dbus_message_is_signal(aMsg, DBUS_DEVICE_IFACE,
                                     "PropertyChanged")) {
     Properties* props = sDeviceProperties;
-    Properties* newProps;
-    bool replaced = ReplaceConnectedType(sDeviceProperties, &newProps,
-                                         ArrayLength(sDeviceProperties));
-    if (replaced) {
-      props = newProps;
-    }
     ParsePropertyChange(aMsg,
                         v,
                         errorStr,
                         props,
                         ArrayLength(sDeviceProperties));
-    if (replaced) {
-      free(newProps);
-    }
 
     BluetoothNamedValue& property = v.get_ArrayOfBluetoothNamedValue()[0];
     if (property.name().EqualsLiteral("Paired")) {

From cf13d9cc314e51cf68627a086503ffe0a8818f23 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Tue, 16 Apr 2013 11:40:41 +0200
Subject: [PATCH 346/438] Backout changesets 3581b3d60886, cff9eab960e3,
 d390c8c21882 for Android foreignObject-fixedpos-01.html failures on a CLOSED
 TREE.

---
 layout/base/crashtests/860579-1.html    | 21 --------------
 layout/base/crashtests/crashtests.list  |  1 -
 layout/base/nsCSSFrameConstructor.cpp   | 37 ++++++++++---------------
 layout/base/nsCSSFrameConstructor.h     |  5 +---
 layout/base/nsDisplayList.cpp           | 27 +++++++++++++-----
 layout/generic/nsSimplePageSequence.cpp | 18 ++++--------
 layout/reftests/bugs/849996-1-ref.html  | 23 ---------------
 layout/reftests/bugs/849996-1.html      | 27 ------------------
 layout/reftests/bugs/reftest.list       |  1 -
 9 files changed, 40 insertions(+), 120 deletions(-)
 delete mode 100644 layout/base/crashtests/860579-1.html
 delete mode 100644 layout/reftests/bugs/849996-1-ref.html
 delete mode 100644 layout/reftests/bugs/849996-1.html

diff --git a/layout/base/crashtests/860579-1.html b/layout/base/crashtests/860579-1.html
deleted file mode 100644
index 3f7ef558b2e2..000000000000
--- a/layout/base/crashtests/860579-1.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-function addFrame(contents)
-{
-  var frame = document.createElement("iframe");
-  frame.src = "data:text/html," + contents;
-  document.body.appendChild(frame);
-}
-function boom()
-{
-  addFrame("1");
-  document.documentElement.offsetHeight;
-  addFrame("2");
-  document.body.style.display = "table-caption";
-}
-</script>
-</head>
-<body onload="boom();"></body>
-</html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 392fac8a084b..b3deafebf51e 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -391,6 +391,5 @@ load 770381-1.html
 load 795646.html
 load 813372-1.html
 load 836990-1.html
-load 860579-1.html
 pref(layers.force-active,true) load 859526-1.html
 pref(layers.force-active,true) load 859630-1.html
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 6922d96963bf..deab4aed4a7e 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -791,12 +791,7 @@ public:
   // logic in GetAbsoluteContainingBlock.
   // Also makes aNewAbsoluteContainingBlock the containing block for
   // fixed-pos elements if necessary.
-  // aPositionedFrame is the frame whose style actually makes
-  // aNewAbsoluteContainingBlock a containing block. E.g. for a scrollable element
-  // aPositionedFrame is the element's primary frame and
-  // aNewAbsoluteContainingBlock is the scrolled frame.
   void PushAbsoluteContainingBlock(nsIFrame* aNewAbsoluteContainingBlock,
-                                   nsIFrame* aPositionedFrame,
                                    nsFrameConstructorSaveState& aSaveState);
 
   // Function to push the existing float containing block state and
@@ -1034,7 +1029,6 @@ AdjustAbsoluteContainingBlock(nsIFrame* aContainingBlockIn)
 
 void
 nsFrameConstructorState::PushAbsoluteContainingBlock(nsIFrame* aNewAbsoluteContainingBlock,
-                                                     nsIFrame* aPositionedFrame,
                                                      nsFrameConstructorSaveState& aSaveState)
 {
   aSaveState.mItems = &mAbsoluteItems;
@@ -1050,14 +1044,14 @@ nsFrameConstructorState::PushAbsoluteContainingBlock(nsIFrame* aNewAbsoluteConta
     mFixedItems = mAbsoluteItems;
   }
 
-  mAbsoluteItems =
+  mAbsoluteItems = 
     nsAbsoluteItems(AdjustAbsoluteContainingBlock(aNewAbsoluteContainingBlock));
 
   /* See if we're wiring the fixed-pos and abs-pos lists together.  This happens iff
    * we're a transformed element.
    */
-  mFixedPosIsAbsPos = aPositionedFrame &&
-      aPositionedFrame->StyleDisplay()->HasTransform(aPositionedFrame);
+  mFixedPosIsAbsPos = aNewAbsoluteContainingBlock &&
+    aNewAbsoluteContainingBlock->StyleDisplay()->HasTransform(aNewAbsoluteContainingBlock);
 
   if (aNewAbsoluteContainingBlock) {
     aNewAbsoluteContainingBlock->MarkAsAbsoluteContainingBlock();
@@ -1961,7 +1955,7 @@ nsCSSFrameConstructor::ConstructTable(nsFrameConstructorState& aState,
        (display->HasTransformStyle() &&
         aParentFrame->IsFrameOfType(nsIFrame::eSupportsCSSTransforms))) &&
       !aParentFrame->IsSVGText()) {
-    aState.PushAbsoluteContainingBlock(newFrame, newFrame, absoluteSaveState);
+    aState.PushAbsoluteContainingBlock(newFrame, absoluteSaveState);
   }
   if (aItem.mFCData->mBits & FCDATA_USE_CHILD_ITEMS) {
     ConstructFramesFromItemList(aState, aItem.mChildItems,
@@ -2363,7 +2357,6 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element*                 aDocEle
     // the root element
     mDocElementContainingBlock->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
     state.PushAbsoluteContainingBlock(mDocElementContainingBlock,
-                                      mDocElementContainingBlock,
                                       absoluteSaveState);
   }
 
@@ -2450,8 +2443,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element*                 aDocEle
                                               mDocElementContainingBlock),
                      mDocElementContainingBlock, styleContext,
                      &contentFrame, frameItems,
-                     display->IsPositioned(contentFrame) ? contentFrame : nullptr,
-                     nullptr);
+                     display->IsPositioned(contentFrame), nullptr);
       newFrame = frameItems.FirstChild();
       NS_ASSERTION(frameItems.OnlyChild(), "multiple root element frames");
     }
@@ -3072,7 +3064,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsFrameConstructorState& aState,
 
   newFrame->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
   if (newFrame->IsPositioned()) {
-    aState.PushAbsoluteContainingBlock(newFrame, newFrame, absoluteSaveState);
+    aState.PushAbsoluteContainingBlock(newFrame, absoluteSaveState);
   }
 
   ProcessChildren(aState, content, styleContext, blockFrame, true,
@@ -3623,7 +3615,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
     nsFrameConstructorSaveState absoluteSaveState;
 
     if (bits & FCDATA_FORCE_NULL_ABSPOS_CONTAINER) {
-      aState.PushAbsoluteContainingBlock(nullptr, nullptr, absoluteSaveState);
+      aState.PushAbsoluteContainingBlock(nullptr, absoluteSaveState);
     } else if (!(bits & FCDATA_SKIP_ABSPOS_PUSH)) {
       nsIFrame* cb = maybeAbsoluteContainingBlock;
       cb->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
@@ -3632,7 +3624,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
            (maybeAbsoluteContainingBlockDisplay->HasTransformStyle() &&
             cb->IsFrameOfType(nsIFrame::eSupportsCSSTransforms))) &&
           !cb->IsSVGText()) {
-        aState.PushAbsoluteContainingBlock(cb, primaryFrame, absoluteSaveState);
+        aState.PushAbsoluteContainingBlock(cb, absoluteSaveState);
       }
     }
 
@@ -4367,7 +4359,7 @@ nsCSSFrameConstructor::ConstructScrollableBlock(nsFrameConstructorState& aState,
   ConstructBlock(aState, scrolledContentStyle->StyleDisplay(), content,
                  newFrame, newFrame, scrolledContentStyle,
                  &scrolledFrame, blockItem,
-                 aDisplay->IsPositioned(newFrame) ? newFrame : nullptr,
+                 aDisplay->IsPositioned(scrolledFrame),
                  aItem.mPendingBinding);
 
   NS_ASSERTION(blockItem.FirstChild() == scrolledFrame,
@@ -4410,8 +4402,7 @@ nsCSSFrameConstructor::ConstructNonScrollableBlock(nsFrameConstructorState& aSta
   ConstructBlock(aState, aDisplay, aItem.mContent,
                  aState.GetGeometricParent(aDisplay, aParentFrame),
                  aParentFrame, styleContext, &newFrame,
-                 aFrameItems,
-                 aDisplay->IsPositioned(newFrame) ? newFrame : nullptr,
+                 aFrameItems, aDisplay->IsPositioned(newFrame),
                  aItem.mPendingBinding);
   return newFrame;
 }
@@ -10901,7 +10892,7 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
                                       nsStyleContext*          aStyleContext,
                                       nsIFrame**               aNewFrame,
                                       nsFrameItems&            aFrameItems,
-                                      nsIFrame*                aPositionedFrameForAbsPosContainer,
+                                      bool                     aAbsPosContainer,
                                       PendingBinding*          aPendingBinding)
 {
   // Create column wrapper if necessary
@@ -10946,9 +10937,9 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
   // in nsBlockFrame::CalculateContainingBlockSizeForAbsolutes.
   nsFrameConstructorSaveState absoluteSaveState;
   (*aNewFrame)->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
-  if (aPositionedFrameForAbsPosContainer) {
+  if (aAbsPosContainer) {
     //    NS_ASSERTION(aRelPos, "should have made area frame for this");
-    aState.PushAbsoluteContainingBlock(*aNewFrame, aPositionedFrameForAbsPosContainer, absoluteSaveState);
+    aState.PushAbsoluteContainingBlock(*aNewFrame, absoluteSaveState);
   }
 
   // Process the child content
@@ -11047,7 +11038,7 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
   if (positioned) {
     // Relatively positioned frames becomes a container for child
     // frames that are positioned
-    aState.PushAbsoluteContainingBlock(newFrame, newFrame, absoluteSaveState);
+    aState.PushAbsoluteContainingBlock(newFrame, absoluteSaveState);
   }
 
   // Process the child content
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 68594ee848b6..7a8db6e22858 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -1582,9 +1582,6 @@ private:
   // block
   // @param aContentParent is the parent the block would have if it
   // were in-flow
-  // @param aPositionedFrameForAbsPosContainer if non-null, then the new
-  // block should be an abs-pos container and aPositionedFrameForAbsPosContainer
-  // is the frame whose style is making this block an abs-pos container.
   // @param aPendingBinding the pending binding  from this block's frame
   // construction item.
   void ConstructBlock(nsFrameConstructorState& aState,
@@ -1595,7 +1592,7 @@ private:
                       nsStyleContext*          aStyleContext,
                       nsIFrame**               aNewFrame,
                       nsFrameItems&            aFrameItems,
-                      nsIFrame*                aPositionedFrameForAbsPosContainer,
+                      bool                     aAbsPosContainer,
                       PendingBinding*          aPendingBinding);
 
   nsIFrame* ConstructInline(nsFrameConstructorState& aState,
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index a87409917665..a01878d57b0e 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1396,15 +1396,28 @@ static void Sort(nsDisplayList* aList, int32_t aCount, nsDisplayList::SortLEQ aC
 }
 
 static nsIContent* FindContentInDocument(nsDisplayItem* aItem, nsIDocument* aDoc) {
-  nsIFrame* f = aItem->GetUnderlyingFrame();
-  while (f) {
-    nsPresContext* pc = f->PresContext();
-    if (pc->Document() == aDoc) {
-      return f->GetContent();
+  nsIFrame* frame = aItem->GetUnderlyingFrame();
+  nsIContent* c = frame->GetContent();
+  for (;;) {
+    nsIDocument* d;
+    if (c) {
+      d = c->OwnerDoc();
+    } else {
+      d = frame->PresContext()->Document();
+    }
+    if (d == aDoc) {
+      return c;
+    }
+    nsIDocument* parentDoc = d->GetParentDocument();
+    if (!parentDoc) {
+      return nullptr;
+    }
+    c = parentDoc->FindContentForSubDocument(d);
+    if (!c) {
+      NS_ERROR("No content for subdocument?");
+      return nullptr;
     }
-    f = nsLayoutUtils::GetCrossDocParentFrame(pc->PresShell()->GetRootFrame());
   }
-  return nullptr;
 }
 
 static bool IsContentLEQ(nsDisplayItem* aItem1, nsDisplayItem* aItem2,
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index 6ff5f6808e67..0e73b688bf05 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -807,19 +807,11 @@ nsSimplePageSequenceFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
   nsDisplayList content;
-
-  {
-    // Clear clip state while we construct the children of the
-    // nsDisplayTransform, since they'll be in a different coordinate system.
-    DisplayListClipState::AutoSaveRestore clipState(aBuilder);
-    clipState.Clear();
-
-    nsIFrame* child = GetFirstPrincipalChild();
-    while (child) {
-      child->BuildDisplayListForStackingContext(aBuilder,
-          child->GetVisualOverflowRectRelativeToSelf(), &content);
-      child = child->GetNextSibling();
-    }
+  nsIFrame* child = GetFirstPrincipalChild();
+  while (child) {
+    child->BuildDisplayListForStackingContext(aBuilder,
+        child->GetVisualOverflowRectRelativeToSelf(), &content);
+    child = child->GetNextSibling();
   }
 
   content.AppendNewToTop(new (aBuilder)
diff --git a/layout/reftests/bugs/849996-1-ref.html b/layout/reftests/bugs/849996-1-ref.html
deleted file mode 100644
index 7b149f1ac807..000000000000
--- a/layout/reftests/bugs/849996-1-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#parent {
-  width: 200px;
-  height: 200px;
-  margin-left: 10px;
-  background: green;
-}
-#child {
-  width: 90px;
-  height: 90px;
-  background: red;
-}
-</style>
-</head>
-<body>
-<div id="parent">
-  <div id="child"></div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/bugs/849996-1.html b/layout/reftests/bugs/849996-1.html
deleted file mode 100644
index b6cef62c2dd2..000000000000
--- a/layout/reftests/bugs/849996-1.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#parent {
-  width: 200px;
-  height: 200px;
-  overflow: hidden;
-  transform: translateX(10px);
-  background: green;
-}
-#child {
-  position: fixed;
-  top: -10px;
-  left: -10px;
-  width: 100px;
-  height: 100px;
-  background: red;
-}
-</style>
-</head>
-<body>
-<div id="parent">
-  <div id="child"></div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 64b30cf6d44a..92192d7f219a 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1753,6 +1753,5 @@ skip-if(B2G) == 818276-1.html 818276-1-ref.html
 == 847850-1.html 847850-1-ref.html
 == 848421-1.html 848421-1-ref.html
 test-pref(layout.css.flexbox.enabled,true) == 849407-1.html 849407-1-ref.html
-== 849996-1.html 849996-1-ref.html
 == 858803-1.html 858803-1-ref.html
 != 860370.html 860370-notref.html

From cb1e6f251e78877595099394a46a27f6f0852e38 Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Wed, 17 Apr 2013 10:03:28 -0400
Subject: [PATCH 347/438] Bug 858723 - Fixing _fdmsg test in async OS.File.
 r=froydnj

---
 .../components/osfile/osfile_async_front.jsm  |  5 +-
 .../components/osfile/osfile_async_worker.js  |  4 +-
 .../tests/xpcshell/test_osfile_closed.js      | 48 +++++++++++++++++++
 .../osfile/tests/xpcshell/xpcshell.ini        |  1 +
 4 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js

diff --git a/toolkit/components/osfile/osfile_async_front.jsm b/toolkit/components/osfile/osfile_async_front.jsm
index 3b559d8e90a1..d70642adb9c7 100644
--- a/toolkit/components/osfile/osfile_async_front.jsm
+++ b/toolkit/components/osfile/osfile_async_front.jsm
@@ -237,7 +237,7 @@ File.prototype = {
    * @rejects {OS.File.Error}
    */
   close: function close() {
-    if (this._fdmsg) {
+    if (this._fdmsg != null) {
       let msg = this._fdmsg;
       this._fdmsg = null;
       return this._closeResult =
@@ -254,9 +254,6 @@ File.prototype = {
    * @rejects {OS.File.Error}
    */
   stat: function stat() {
-    if (!this._fdmsg) {
-      return Promise.reject(OSError.closed("accessing file"));
-    }
     return Scheduler.post("File_prototype_stat", [this._fdmsg], this).then(
       File.Info.fromMsg
     );
diff --git a/toolkit/components/osfile/osfile_async_worker.js b/toolkit/components/osfile/osfile_async_worker.js
index 7bb79e1acb0c..2abbbbb7a849 100644
--- a/toolkit/components/osfile/osfile_async_worker.js
+++ b/toolkit/components/osfile/osfile_async_worker.js
@@ -165,7 +165,7 @@ if (this.Components) {
      let withFile = function withFile(id, f) {
        let file = OpenedFiles.get(id);
        if (file == null) {
-         throw new Error("Could not find File");
+         throw OS.File.Error.closed("accessing file");
        }
        return f.call(file);
      };
@@ -175,7 +175,7 @@ if (this.Components) {
        let file = OpenedDirectoryIterators.get(fd);
        if (file == null) {
          if (!ignoreAbsent) {
-           throw new Error("Could not find Directory");
+           throw OS.File.Error.closed("accessing directory");
          }
          return;
        }
diff --git a/toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js b/toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js
new file mode 100644
index 000000000000..a428f4f4dd35
--- /dev/null
+++ b/toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js
@@ -0,0 +1,48 @@
+"use strict";
+
+Components.utils.import("resource://gre/modules/osfile.jsm");
+Components.utils.import("resource://gre/modules/Task.jsm");
+
+function run_test() {
+  do_test_pending();
+  run_next_test();
+}
+
+add_task(function test_closed() {
+  OS.Shared.DEBUG = true;
+  let currentDir = yield OS.File.getCurrentDirectory();
+  do_print("Open a file, ensure that we can call stat()");
+  let path = OS.Path.join(currentDir, "test_osfile_closed.js");
+  let file = yield OS.File.open(path);
+  yield file.stat();
+  do_check_true(true);
+
+  yield file.close();
+
+  do_print("Ensure that we cannot stat() on closed file");
+  let exn;
+  try {
+    yield file.stat();
+  } catch (ex) {
+    exn = ex;
+  }
+  do_print("Ensure that this raises the correct error");
+  do_check_true(!!exn);
+  do_check_true(exn instanceof OS.File.Error);
+  do_check_true(exn.becauseClosed);
+
+  do_print("Ensure that we cannot read() on closed file");
+  exn = null;
+  try {
+    yield file.read();
+  } catch (ex) {
+    exn = ex;
+  }
+  do_print("Ensure that this raises the correct error");
+  do_check_true(!!exn);
+  do_check_true(exn instanceof OS.File.Error);
+  do_check_true(exn.becauseClosed);
+
+});
+
+add_task(do_test_finished);
\ No newline at end of file
diff --git a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
index ab01e16f5f47..ad1d10d60a7d 100644
--- a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
@@ -2,6 +2,7 @@
 head =
 tail =
 
+[test_osfile_closed.js]
 [test_path.js]
 [test_osfile_async.js]
 [test_profiledir.js]

From 28f950d2e00c1750a2137f3edaa081506662ca43 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Wed, 17 Apr 2013 10:03:29 -0400
Subject: [PATCH 348/438] Bug 862666 - Handle mozSettings async creation using
 addLoadEvent(). r=jdm

---
 .../geolocation/geolocation_common.js          | 18 ++++++++++++++++++
 .../geolocation/test_mozsettings.html          | 13 -------------
 .../geolocation/test_mozsettingsWatch.html     | 13 -------------
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/dom/tests/mochitest/geolocation/geolocation_common.js b/dom/tests/mochitest/geolocation/geolocation_common.js
index bd97c6d6e6e3..e16439408432 100644
--- a/dom/tests/mochitest/geolocation/geolocation_common.js
+++ b/dom/tests/mochitest/geolocation/geolocation_common.js
@@ -96,3 +96,21 @@ function check_geolocation(location) {
   // optional  ok(location.coords.altitude == 42, "alt matches known value");
   // optional  ok(location.coords.altitudeAccuracy == 42, "alt acc matches known value");
 }
+
+function toggleGeolocationSetting(value, callback) {
+  var mozSettings = window.navigator.mozSettings;
+  if (!mozSettings) {
+    addLoadEvent(toggleGeolocationSetting.bind(null, value, callback));
+    return;
+  }
+
+  var lock = mozSettings.createLock();
+
+  var geoenabled = {"geolocation.enabled": value};
+
+  req = lock.set(geoenabled);
+  req.onsuccess = function () {
+    ok(true, "set done");
+    callback();
+  }
+}
diff --git a/dom/tests/mochitest/geolocation/test_mozsettings.html b/dom/tests/mochitest/geolocation/test_mozsettings.html
index f3fa33963359..6b9ea42d69fa 100644
--- a/dom/tests/mochitest/geolocation/test_mozsettings.html
+++ b/dom/tests/mochitest/geolocation/test_mozsettings.html
@@ -19,19 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-function toggleGeolocationSetting(value, callback) {
-  var mozSettings = window.navigator.mozSettings;
-  var lock = mozSettings.createLock();
-
-  var geoenabled = {"geolocation.enabled": value};
-
-  req = lock.set(geoenabled);
-  req.onsuccess = function () {
-    ok(true, "set done");
-    callback();
-  }
-}
-
 SimpleTest.waitForExplicitFinish();
 resume_geolocationProvider();
 force_prompt(true);
diff --git a/dom/tests/mochitest/geolocation/test_mozsettingsWatch.html b/dom/tests/mochitest/geolocation/test_mozsettingsWatch.html
index c143aea36e8f..f30c836712c4 100644
--- a/dom/tests/mochitest/geolocation/test_mozsettingsWatch.html
+++ b/dom/tests/mochitest/geolocation/test_mozsettingsWatch.html
@@ -19,19 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-function toggleGeolocationSetting(value, callback) {
-  var mozSettings = window.navigator.mozSettings;
-  var lock = mozSettings.createLock();
-
-  var geoenabled = {"geolocation.enabled": value};
-
-  req = lock.set(geoenabled);
-  req.onsuccess = function () {
-    ok(true, "set done");
-    callback();
-  }
-}
-
 SimpleTest.waitForExplicitFinish();
 resume_geolocationProvider();
 force_prompt(true);

From 0e69d13800b13fc3f1d21f93cbdf8d459b5fffe9 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 17 Apr 2013 16:16:09 +0200
Subject: [PATCH 349/438] Bug 851519 - Keyboard commands may executed on the
 wrong download in the panel r=Mano

---
 .../components/downloads/content/downloads.js | 37 +++++++++++++++++--
 .../downloads/content/downloadsOverlay.xul    |  2 +
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js
index 695ae02faebf..f81b43c8c5fc 100644
--- a/browser/components/downloads/content/downloads.js
+++ b/browser/components/downloads/content/downloads.js
@@ -322,9 +322,9 @@ const DownloadsPanel = {
     // Since at most one popup is open at any given time, we can set globally.
     DownloadsCommon.getIndicatorData(window).attentionSuppressed = true;
 
-    // Ensure that an item is selected when the panel is focused.
+    // Ensure that the first item is selected when the panel is focused.
     if (DownloadsView.richListBox.itemCount > 0 &&
-        !DownloadsView.richListBox.selectedItem) {
+        DownloadsView.richListBox.selectedIndex == -1) {
       DownloadsView.richListBox.selectedIndex = 0;
     }
 
@@ -417,6 +417,10 @@ const DownloadsPanel = {
         aEvent.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_DOWN) &&
         !this.keyFocusing) {
       this.keyFocusing = true;
+      // Ensure there's a selection, we will show the focus ring around it and
+      // prevent the richlistbox from changing the selection.
+      if (DownloadsView.richListBox.selectedIndex == -1)
+        DownloadsView.richListBox.selectedIndex = 0;
       aEvent.preventDefault();
       return;
     }
@@ -904,8 +908,10 @@ const DownloadsView = {
     let element = this.getViewItem(aDataItem)._element;
     let previousSelectedIndex = this.richListBox.selectedIndex;
     this.richListBox.removeChild(element);
-    this.richListBox.selectedIndex = Math.min(previousSelectedIndex,
-                                              this.richListBox.itemCount - 1);
+    if (previousSelectedIndex != -1) {
+      this.richListBox.selectedIndex = Math.min(previousSelectedIndex,
+                                                this.richListBox.itemCount - 1);
+    }
     delete this._viewItems[aDataItem.downloadGuid];
   },
 
@@ -963,6 +969,29 @@ const DownloadsView = {
     }
   },
 
+
+  /**
+   * Mouse listeners to handle selection on hover.
+   */
+  onDownloadMouseOver: function DV_onDownloadMouseOver(aEvent)
+  {
+    if (aEvent.originalTarget.parentNode == this.richListBox)
+      this.richListBox.selectedItem = aEvent.originalTarget;
+  },
+  onDownloadMouseOut: function DV_onDownloadMouseOut(aEvent)
+  {
+    if (aEvent.originalTarget.parentNode == this.richListBox) {
+      // If the destination element is outside of the richlistitem, clear the
+      // selection.
+      let element = aEvent.relatedTarget;
+      while (element && element != aEvent.originalTarget) {
+        element = element.parentNode;
+      }
+      if (!element)
+        this.richListBox.selectedIndex = -1;
+    }
+  },
+
   onDownloadContextMenu: function DV_onDownloadContextMenu(aEvent)
   {
     let element = this.richListBox.selectedItem;
diff --git a/browser/components/downloads/content/downloadsOverlay.xul b/browser/components/downloads/content/downloadsOverlay.xul
index 569cadc4899d..971124d3b3d1 100644
--- a/browser/components/downloads/content/downloadsOverlay.xul
+++ b/browser/components/downloads/content/downloadsOverlay.xul
@@ -101,6 +101,8 @@
                    class="plain"
                    flex="1"
                    context="downloadsContextMenu"
+                   onmouseover="DownloadsView.onDownloadMouseOver(event);"
+                   onmouseout="DownloadsView.onDownloadMouseOut(event);"
                    oncontextmenu="DownloadsView.onDownloadContextMenu(event);"
                    ondragstart="DownloadsView.onDownloadDragStart(event);"/>
 

From 95b3000df961a2e33597ed38f5c91856ac4445ca Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 16 Apr 2013 11:13:50 -0400
Subject: [PATCH 350/438] Bug 837618 - teach expandlibs_exec.py about OS X's
 -filelist linker option; r=glandium

---
 build/autoconf/expandlibs.m4        | 8 +++++++-
 config/expandlibs_exec.py           | 3 +++
 js/src/build/autoconf/expandlibs.m4 | 8 +++++++-
 js/src/config/expandlibs_exec.py    | 3 +++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/build/autoconf/expandlibs.m4 b/build/autoconf/expandlibs.m4
index bfe6a63006ca..898e5ce01206 100644
--- a/build/autoconf/expandlibs.m4
+++ b/build/autoconf/expandlibs.m4
@@ -20,7 +20,13 @@ AC_CACHE_CHECK(what kind of list files are supported by the linker,
              EXPAND_LIBS_LIST_STYLE=linkerscript
          else
              echo "conftest.${OBJ_SUFFIX}" > conftest.list
-             if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5) && test -s conftest${ac_exeext}; then
+             dnl -filelist is for the OS X linker.  We need to try -filelist
+             dnl first because clang understands @file, but may pass an
+             dnl oversized argument list to the linker depending on the
+             dnl contents of @file.
+             if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS [-Wl,-filelist,conftest.list] $LIBS 1>&5) && test -s conftest${ac_exeext}; then
+                 EXPAND_LIBS_LIST_STYLE=filelist
+             elif AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5) && test -s conftest${ac_exeext}; then
                  EXPAND_LIBS_LIST_STYLE=list
              else
                  EXPAND_LIBS_LIST_STYLE=none
diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py
index 2a3274d54301..770dce4b58f7 100644
--- a/config/expandlibs_exec.py
+++ b/config/expandlibs_exec.py
@@ -98,6 +98,9 @@ class ExpandArgsMore(ExpandArgs):
         if conf.EXPAND_LIBS_LIST_STYLE == "linkerscript":
             content = ['INPUT("%s")\n' % obj for obj in objs]
             ref = tmp
+        elif conf.EXPAND_LIBS_LIST_STYLE == "filelist":
+            content = ["%s\n" % obj for obj in objs]
+            ref = "-Wl,-filelist," + tmp
         elif conf.EXPAND_LIBS_LIST_STYLE == "list":
             content = ["%s\n" % obj for obj in objs]
             ref = "@" + tmp
diff --git a/js/src/build/autoconf/expandlibs.m4 b/js/src/build/autoconf/expandlibs.m4
index bfe6a63006ca..898e5ce01206 100644
--- a/js/src/build/autoconf/expandlibs.m4
+++ b/js/src/build/autoconf/expandlibs.m4
@@ -20,7 +20,13 @@ AC_CACHE_CHECK(what kind of list files are supported by the linker,
              EXPAND_LIBS_LIST_STYLE=linkerscript
          else
              echo "conftest.${OBJ_SUFFIX}" > conftest.list
-             if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5) && test -s conftest${ac_exeext}; then
+             dnl -filelist is for the OS X linker.  We need to try -filelist
+             dnl first because clang understands @file, but may pass an
+             dnl oversized argument list to the linker depending on the
+             dnl contents of @file.
+             if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS [-Wl,-filelist,conftest.list] $LIBS 1>&5) && test -s conftest${ac_exeext}; then
+                 EXPAND_LIBS_LIST_STYLE=filelist
+             elif AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5) && test -s conftest${ac_exeext}; then
                  EXPAND_LIBS_LIST_STYLE=list
              else
                  EXPAND_LIBS_LIST_STYLE=none
diff --git a/js/src/config/expandlibs_exec.py b/js/src/config/expandlibs_exec.py
index 2a3274d54301..770dce4b58f7 100644
--- a/js/src/config/expandlibs_exec.py
+++ b/js/src/config/expandlibs_exec.py
@@ -98,6 +98,9 @@ class ExpandArgsMore(ExpandArgs):
         if conf.EXPAND_LIBS_LIST_STYLE == "linkerscript":
             content = ['INPUT("%s")\n' % obj for obj in objs]
             ref = tmp
+        elif conf.EXPAND_LIBS_LIST_STYLE == "filelist":
+            content = ["%s\n" % obj for obj in objs]
+            ref = "-Wl,-filelist," + tmp
         elif conf.EXPAND_LIBS_LIST_STYLE == "list":
             content = ["%s\n" % obj for obj in objs]
             ref = "@" + tmp

From aeb6ee172318480c4b274a3d412ca692d491b6fe Mon Sep 17 00:00:00 2001
From: Edgar Chen <echen@mozilla.com>
Date: Tue, 16 Apr 2013 09:18:53 -0700
Subject: [PATCH 351/438] Bug 861486 - Update the emulator. r=jgriffin

---
 b2g/test/emulator.manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/test/emulator.manifest b/b2g/test/emulator.manifest
index 82e4d344b78e..f955eb3fb594 100644
--- a/b2g/test/emulator.manifest
+++ b/b2g/test/emulator.manifest
@@ -1,6 +1,6 @@
 [{
-"size": 634920651,
-"digest": "731237d9fcd51637e1fdb7240f57d11f1bda18770025186c06ff72e960551c764bada3c43bae2347f716acd36492c2f4e6bb8eddd9ced7198cbcd8c994ea0705",
+"size": 647503948,
+"digest": "9ba4f195052e0d5eaae734375aed52f52b7b3337fa8caf01a61830529266e282be19697095c88135379c984d7242ec36b384cf81155176bb6527e6621f32eed3",
 "algorithm": "sha512",
 "filename": "emulator.zip"
 }]

From 6aa392694e2f29a45363ca0727c2f0d74fb1afd6 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 16 Apr 2013 13:34:43 -0400
Subject: [PATCH 352/438] Bug 861399 - Update pdf.js to version 0.8.47. r=bdahl

---
 browser/extensions/pdfjs/README.mozilla       |    2 +-
 .../pdfjs/components/PdfStreamConverter.js    |   34 +-
 browser/extensions/pdfjs/content/PdfJs.jsm    |   46 +-
 browser/extensions/pdfjs/content/build/pdf.js | 1805 +++++++----------
 .../extensions/pdfjs/content/web/debugger.js  |    2 +-
 .../extensions/pdfjs/content/web/viewer.css   |   24 +-
 .../extensions/pdfjs/content/web/viewer.js    |   44 +-
 .../locales/en-US/pdfviewer/viewer.properties |    4 +-
 8 files changed, 782 insertions(+), 1179 deletions(-)

diff --git a/browser/extensions/pdfjs/README.mozilla b/browser/extensions/pdfjs/README.mozilla
index 86a35faafa9d..5203bfa80470 100644
--- a/browser/extensions/pdfjs/README.mozilla
+++ b/browser/extensions/pdfjs/README.mozilla
@@ -1,4 +1,4 @@
 This is the pdf.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 0.7.423
+Current extension version is: 0.8.47
 
diff --git a/browser/extensions/pdfjs/components/PdfStreamConverter.js b/browser/extensions/pdfjs/components/PdfStreamConverter.js
index 7db9dd37fe59..e5d71e936887 100644
--- a/browser/extensions/pdfjs/components/PdfStreamConverter.js
+++ b/browser/extensions/pdfjs/components/PdfStreamConverter.js
@@ -101,23 +101,6 @@ function getDOMWindow(aChannel) {
   return win;
 }
 
-function isEnabled() {
-  if (MOZ_CENTRAL) {
-    var disabled = getBoolPref(PREF_PREFIX + '.disabled', false);
-    if (disabled)
-      return false;
-    // To also be considered enabled the "Preview in Firefox" option must be
-    // selected in the Application preferences.
-    var handlerInfo = Svc.mime
-                         .getFromTypeAndExtension('application/pdf', 'pdf');
-    return !handlerInfo.alwaysAskBeforeHandling &&
-           handlerInfo.preferredAction == Ci.nsIHandlerInfo.handleInternally;
-  }
-  // Always returns true for the extension since enabling/disabling is handled
-  // by the add-on manager.
-  return true;
-}
-
 function getLocalizedStrings(path) {
   var stringBundle = Cc['@mozilla.org/intl/stringbundle;1'].
       getService(Ci.nsIStringBundleService).
@@ -268,10 +251,13 @@ ChromeActions.prototype = {
       var channel = Cc['@mozilla.org/network/input-stream-channel;1'].
                        createInstance(Ci.nsIInputStreamChannel);
       channel.QueryInterface(Ci.nsIChannel);
-      channel.contentDisposition = Ci.nsIChannel.DISPOSITION_ATTACHMENT;
-      if (self.contentDispositionFilename) {
-        channel.contentDispositionFilename = self.contentDispositionFilename;
-      }
+      try {
+        // contentDisposition/contentDispositionFilename is readonly before FF18
+        channel.contentDisposition = Ci.nsIChannel.DISPOSITION_ATTACHMENT;
+        if (self.contentDispositionFilename) {
+           channel.contentDispositionFilename = self.contentDispositionFilename;
+        }
+      } catch (e) {}
       channel.setURI(originalUri);
       channel.contentStream = aInputStream;
       if ('nsIPrivateBrowsingChannel' in Ci &&
@@ -380,6 +366,9 @@ ChromeActions.prototype = {
     var prefGfx = getBoolPref('gfx.downloadable_fonts.enabled', true);
     return (!!prefBrowser && prefGfx);
   },
+  supportsDocumentColors: function() {
+    return getBoolPref('browser.display.use_document_colors', true);
+  },
   fallback: function(url, sendResponse) {
     var self = this;
     var domWindow = this.domWindow;
@@ -577,9 +566,6 @@ PdfStreamConverter.prototype = {
 
   // nsIStreamConverter::asyncConvertData
   asyncConvertData: function(aFromType, aToType, aListener, aCtxt) {
-    if (!isEnabled())
-      throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-
     // Store the listener passed to us
     this.listener = aListener;
   },
diff --git a/browser/extensions/pdfjs/content/PdfJs.jsm b/browser/extensions/pdfjs/content/PdfJs.jsm
index d360cda692a0..01947da72fe0 100644
--- a/browser/extensions/pdfjs/content/PdfJs.jsm
+++ b/browser/extensions/pdfjs/content/PdfJs.jsm
@@ -28,6 +28,8 @@ const PREF_PREVIOUS_ACTION = PREF_PREFIX + '.previousHandler.preferredAction';
 const PREF_PREVIOUS_ASK = PREF_PREFIX + '.previousHandler.alwaysAskBeforeHandling';
 const PREF_DISABLED_PLUGIN_TYPES = 'plugin.disable_full_page_plugin_for_types';
 const TOPIC_PDFJS_HANDLER_CHANGED = 'pdfjs:handlerChanged';
+const TOPIC_PLUGINS_LIST_UPDATED = "plugins-list-updated";
+const TOPIC_PLUGIN_INFO_UPDATED = "plugin-info-updated";
 const PDF_CONTENT_TYPE = 'application/pdf';
 
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
@@ -112,7 +114,10 @@ let PdfJs = {
     // Listen for when pdf.js is completely disabled or a different pdf handler
     // is chosen.
     Services.prefs.addObserver(PREF_DISABLED, this, false);
+    Services.prefs.addObserver(PREF_DISABLED_PLUGIN_TYPES, this, false);
     Services.obs.addObserver(this, TOPIC_PDFJS_HANDLER_CHANGED, false);
+    Services.obs.addObserver(this, TOPIC_PLUGINS_LIST_UPDATED, false);
+    Services.obs.addObserver(this, TOPIC_PLUGIN_INFO_UPDATED, false);
   },
 
   _migrate: function migrate() {
@@ -186,14 +191,39 @@ let PdfJs = {
    */
   get enabled() {
     var disabled = getBoolPref(PREF_DISABLED, true);
-    if (disabled)
+    if (disabled) {
       return false;
+    }
 
-    var handlerInfo = Svc.mime.
-                        getFromTypeAndExtension('application/pdf', 'pdf');
-    return handlerInfo.alwaysAskBeforeHandling == false &&
-           handlerInfo.plugin == null &&
-           handlerInfo.preferredAction == Ci.nsIHandlerInfo.handleInternally;
+    // the 'application/pdf' handler is selected as internal?
+    var handlerInfo = Svc.mime
+                         .getFromTypeAndExtension(PDF_CONTENT_TYPE, 'pdf');
+    if (handlerInfo.alwaysAskBeforeHandling ||
+        handlerInfo.preferredAction !== Ci.nsIHandlerInfo.handleInternally) {
+      return false;
+    }
+
+    // we also need to check if pdf plugin is not present or disabled...
+    let tags = Cc["@mozilla.org/plugin/host;1"].
+                  getService(Ci.nsIPluginHost).
+                  getPluginTags();
+    let enabledPluginFound = tags.some(function(tag) {
+      if (tag.disabled) {
+        return false;
+      }
+      let mimeTypes = tag.getMimeTypes();
+      return mimeTypes.some(function(mimeType) {
+        return mimeType.type === PDF_CONTENT_TYPE;
+      });
+    });
+    if (!enabledPluginFound) {
+      return true; // no plugins for this type, it's good
+    }
+    // ... and full page plugins list must have 'application/pdf' type,
+    // in case when enabled pdf plugin exists.
+    return Services.prefs.prefHasUserValue(PREF_DISABLED_PLUGIN_TYPES) ?
+      (Services.prefs.getCharPref(PREF_DISABLED_PLUGIN_TYPES).split(',').
+      indexOf(PDF_CONTENT_TYPE) >= 0) : false;
   },
 
   _ensureRegistered: function _ensureRegistered() {
@@ -205,7 +235,7 @@ let PdfJs = {
 
     this._pdfRedirectorFactory = new Factory();
     this._pdfRedirectorFactory.register(PdfRedirector);
-    Svc.pluginHost.registerPlayPreviewMimeType('application/pdf', true,
+    Svc.pluginHost.registerPlayPreviewMimeType(PDF_CONTENT_TYPE, true,
       'data:application/x-moz-playpreview-pdfjs;,');
 
     this._registered = true;
@@ -220,7 +250,7 @@ let PdfJs = {
 
     this._pdfRedirectorFactory.unregister;
     delete this._pdfRedirectorFactory;
-    Svc.pluginHost.unregisterPlayPreviewMimeType('application/pdf');
+    Svc.pluginHost.unregisterPlayPreviewMimeType(PDF_CONTENT_TYPE);
 
     this._registered = false;
   }
diff --git a/browser/extensions/pdfjs/content/build/pdf.js b/browser/extensions/pdfjs/content/build/pdf.js
index 49d2b59e7495..d7773bc03d5d 100644
--- a/browser/extensions/pdfjs/content/build/pdf.js
+++ b/browser/extensions/pdfjs/content/build/pdf.js
@@ -16,8 +16,8 @@
  */
 
 var PDFJS = {};
-PDFJS.version = '0.7.423';
-PDFJS.build = 'aa22bef';
+PDFJS.version = '0.8.47';
+PDFJS.build = 'added3d';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -121,14 +121,33 @@ function getPdf(arg, callback) {
 globalScope.PDFJS.getPdf = getPdf;
 globalScope.PDFJS.pdfBug = false;
 
+
 var Page = (function PageClosure() {
+
+  function getDefaultAnnotationAppearance(annotationDict) {
+    var appearanceState = annotationDict.get('AP');
+    if (!isDict(appearanceState)) {
+      return;
+    }
+
+    var appearance;
+    var appearances = appearanceState.get('N');
+    if (isDict(appearances)) {
+      var as = annotationDict.get('AS');
+      if (as && appearances.has(as.name)) {
+        appearance = appearances.get(as.name);
+      }
+    } else {
+      appearance = appearances;
+    }
+    return appearance;
+  }
+
   function Page(xref, pageIndex, pageDict, ref) {
     this.pageIndex = pageIndex;
     this.pageDict = pageDict;
     this.xref = xref;
     this.ref = ref;
-
-    this.displayReadyPromise = null;
   }
 
   Page.prototype = {
@@ -219,6 +238,17 @@ var Page = (function PageClosure() {
                                 'p' + this.pageIndex + '_');
 
       var list = pe.getOperatorList(contentStream, resources, dependency);
+
+      var annotations = this.getAnnotationsForDraw();
+      var annotationEvaluator = new PartialEvaluator(
+        xref, handler, this.pageIndex,
+        'p' + this.pageIndex + '_annotation');
+      var annotationsList = annotationEvaluator.getAnnotationsOperatorList(
+          annotations, dependency);
+
+      Util.concatenateToArray(list.fnArray, annotationsList.fnArray);
+      Util.concatenateToArray(list.argsArray, annotationsList.argsArray);
+
       pe.optimizeQueue(list);
       return list;
     },
@@ -248,7 +278,59 @@ var Page = (function PageClosure() {
       }
       return links;
     },
+
     getAnnotations: function Page_getAnnotations() {
+      var annotations = this.getAnnotationsBase();
+      var items = [];
+      for (var i = 0, length = annotations.length; i < length; ++i) {
+        items.push(annotations[i].item);
+      }
+      return items;
+    },
+
+    getAnnotationsForDraw: function Page_getAnnotationsForDraw() {
+      var annotations = this.getAnnotationsBase();
+      var items = [];
+      for (var i = 0, length = annotations.length; i < length; ++i) {
+        var item = annotations[i].item;
+        var annotationDict = annotations[i].dict;
+
+        item.annotationFlags = annotationDict.get('F');
+
+        var appearance = getDefaultAnnotationAppearance(annotationDict);
+        if (appearance &&
+            // TODO(mack): The proper implementation requires that the
+            // appearance stream overrides Name, but we're currently
+            // doing it the other way around for 'Text' annotations since we
+            // have special rendering for it
+            item.type !== 'Text') {
+
+          item.appearance = appearance;
+          var appearanceDict = appearance.dict;
+          item.resources = appearanceDict.get('Resources');
+          item.bbox = appearanceDict.get('BBox') || [0, 0, 1, 1];
+          item.matrix = appearanceDict.get('Matrix') || [1, 0, 0, 1, 0 ,0];
+        }
+
+        var border = annotationDict.get('BS');
+        if (isDict(border) && !item.appearance) {
+          var borderWidth = border.has('W') ? border.get('W') : 1;
+          if (borderWidth !== 0) {
+            item.border = {
+              width: borderWidth,
+              type: border.get('S') || 'S',
+              rgb: annotationDict.get('C') || [0, 0, 1]
+            };
+          }
+        }
+
+        items.push(item);
+      }
+
+      return items;
+    },
+
+    getAnnotationsBase: function Page_getAnnotationsBase() {
       var xref = this.xref;
       function getInheritableProperty(annotation, name) {
         var item = annotation;
@@ -288,11 +370,13 @@ var Page = (function PageClosure() {
         var subtype = annotation.get('Subtype');
         if (!isName(subtype))
           continue;
-        var rect = annotation.get('Rect');
 
         var item = {};
         item.type = subtype.name;
-        item.rect = rect;
+        var rect = annotation.get('Rect');
+        item.rect = Util.normalizeRect(rect);
+
+        var includeAnnotation = true;
         switch (subtype.name) {
           case 'Link':
             var a = annotation.get('A');
@@ -337,6 +421,14 @@ var Page = (function PageClosure() {
             var fieldType = getInheritableProperty(annotation, 'FT');
             if (!isName(fieldType))
               break;
+
+            // Do not display digital signatures since we do not currently
+            // validate them.
+            if (fieldType.name === 'Sig') {
+              includeAnnotation = false;
+              break;
+            }
+
             item.fieldType = fieldType.name;
             // Building the full field name by collecting the field and
             // its ancestors 'T' properties and joining them using '.'.
@@ -385,10 +477,18 @@ var Page = (function PageClosure() {
               annotation.get('Name').name;
             break;
           default:
-            TODO('unimplemented annotation type: ' + subtype.name);
+            var appearance = getDefaultAnnotationAppearance(annotation);
+            if (!appearance) {
+              TODO('unimplemented annotation type: ' + subtype.name);
+            }
             break;
         }
-        items.push(item);
+        if (includeAnnotation) {
+          items.push({
+            item: item,
+            dict: annotation
+          });
+        }
       }
       return items;
     }
@@ -953,6 +1053,10 @@ var Util = PDFJS.Util = (function UtilClosure() {
     return num < 0 ? -1 : 1;
   };
 
+  Util.concatenateToArray = function concatenateToArray(arr1, arr2) {
+    return Array.prototype.push.apply(arr1, arr2);
+  };
+
   return Util;
 })();
 
@@ -3530,6 +3634,38 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       this.restore();
     },
 
+    beginAnnotation: function CanvasGraphics_beginAnnotation(rect, transform,
+                                                             matrix, border) {
+      this.save();
+
+      if (rect && isArray(rect) && 4 == rect.length) {
+        var width = rect[2] - rect[0];
+        var height = rect[3] - rect[1];
+
+        if (border) {
+          // TODO(mack): Support different border styles
+          this.save();
+          var rgb = border.rgb;
+          this.setStrokeRGBColor(rgb[0], rgb[1], rgb[2]);
+          this.setLineWidth(border.width);
+          this.rectangle(rect[0], rect[1], width, height);
+          this.stroke();
+          this.restore();
+        }
+
+        this.rectangle(rect[0], rect[1], width, height);
+        this.clip();
+        this.endPath();
+      }
+
+      this.transform.apply(this, transform);
+      this.transform.apply(this, matrix);
+    },
+
+    endAnnotation: function CanvasGraphics_endAnnotation() {
+      this.restore();
+    },
+
     paintJpegXObject: function CanvasGraphics_paintJpegXObject(objId, w, h) {
       var domImage = this.objs.get(objId);
       if (!domImage) {
@@ -3805,59 +3941,68 @@ var Cmd = (function CmdClosure() {
 })();
 
 var Dict = (function DictClosure() {
+  var nonSerializable = function nonSerializableClosure() {
+    return nonSerializable; // creating closure on some variable
+  };
+
   // xref is optional
   function Dict(xref) {
     // Map should only be used internally, use functions below to access.
-    var map = Object.create(null);
+    this.map = Object.create(null);
+    this.xref = xref;
+    this.__nonSerializable__ = nonSerializable; // disable cloning of the Dict
+  }
 
-    this.assignXref = function Dict_assignXref(newXref) {
-      xref = newXref;
-    };
+  Dict.prototype = {
+    assignXref: function Dict_assignXref(newXref) {
+      this.xref = newXref;
+    },
 
     // automatically dereferences Ref objects
-    this.get = function Dict_get(key1, key2, key3) {
+    get: function Dict_get(key1, key2, key3) {
       var value;
-      if (typeof (value = map[key1]) != 'undefined' || key1 in map ||
+      var xref = this.xref;
+      if (typeof (value = this.map[key1]) != 'undefined' || key1 in this.map ||
           typeof key2 == 'undefined') {
         return xref ? xref.fetchIfRef(value) : value;
       }
-      if (typeof (value = map[key2]) != 'undefined' || key2 in map ||
+      if (typeof (value = this.map[key2]) != 'undefined' || key2 in this.map ||
           typeof key3 == 'undefined') {
         return xref ? xref.fetchIfRef(value) : value;
       }
-      value = map[key3] || null;
+      value = this.map[key3] || null;
       return xref ? xref.fetchIfRef(value) : value;
-    };
+    },
 
     // no dereferencing
-    this.getRaw = function Dict_getRaw(key) {
-      return map[key];
-    };
+    getRaw: function Dict_getRaw(key) {
+      return this.map[key];
+    },
 
     // creates new map and dereferences all Refs
-    this.getAll = function Dict_getAll() {
+    getAll: function Dict_getAll() {
       var all = {};
-      for (var key in map) {
+      for (var key in this.map) {
         var obj = this.get(key);
         all[key] = obj instanceof Dict ? obj.getAll() : obj;
       }
       return all;
-    };
+    },
 
-    this.set = function Dict_set(key, value) {
-      map[key] = value;
-    };
+    set: function Dict_set(key, value) {
+      this.map[key] = value;
+    },
 
-    this.has = function Dict_has(key) {
-      return key in map;
-    };
+    has: function Dict_has(key) {
+      return key in this.map;
+    },
 
-    this.forEach = function Dict_forEach(callback) {
-      for (var key in map) {
+    forEach: function Dict_forEach(callback) {
+      for (var key in this.map) {
         callback(key, this.get(key));
       }
-    };
-  }
+    }
+  };
 
   return Dict;
 })();
@@ -12689,7 +12834,13 @@ var ColorSpace = (function ColorSpaceClosure() {
       }
       this.getRgbBuffer(src, srcOffset, count, dest, 0, bits);
       return dest;
-    }
+    },
+    /**
+     * True if the colorspace has components in the default range of [0, 1].
+     * This should be true for all colorspaces except for lab color spaces
+     * which are [0,100], [-128, 127], [-128, 127].
+     */
+    usesZeroToOneRange: true
   };
 
   ColorSpace.parse = function ColorSpace_parse(cs, xref, res) {
@@ -12901,8 +13052,8 @@ var AlternateCS = (function AlternateCSClosure() {
       var base = this.base;
       var scale = 1 / ((1 << bits) - 1);
       var baseNumComps = base.numComps;
-      var isGetRgbBufferSupported = 'getRgbBuffer' in base;
-      var isPassthrough = base.isPassthrough(8) || !isGetRgbBufferSupported;
+      var usesZeroToOneRange = base.usesZeroToOneRange;
+      var isPassthrough = base.isPassthrough(8) || !usesZeroToOneRange;
       var pos = isPassthrough ? destOffset : 0;
       var baseBuf = isPassthrough ? dest : new Uint8Array(baseNumComps * count);
       var numComps = this.numComps;
@@ -12913,7 +13064,7 @@ var AlternateCS = (function AlternateCSClosure() {
           scaled[j] = src[srcOffset++] * scale;
         }
         var tinted = tintFn(scaled);
-        if (isGetRgbBufferSupported) {
+        if (usesZeroToOneRange) {
           for (var j = 0; j < baseNumComps; j++) {
             baseBuf[pos++] = tinted[j] * 255;
           }
@@ -12934,7 +13085,8 @@ var AlternateCS = (function AlternateCSClosure() {
     createRgbBuffer: ColorSpace.prototype.createRgbBuffer,
     isDefaultDecode: function AlternateCS_isDefaultDecode(decodeMap) {
       return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
+    },
+    usesZeroToOneRange: true
   };
 
   return AlternateCS;
@@ -13011,7 +13163,8 @@ var IndexedCS = (function IndexedCSClosure() {
     isDefaultDecode: function IndexedCS_isDefaultDecode(decodeMap) {
       // indexed color maps shouldn't be changed
       return true;
-    }
+    },
+    usesZeroToOneRange: true
   };
   return IndexedCS;
 })();
@@ -13053,7 +13206,8 @@ var DeviceGrayCS = (function DeviceGrayCSClosure() {
     createRgbBuffer: ColorSpace.prototype.createRgbBuffer,
     isDefaultDecode: function DeviceGrayCS_isDefaultDecode(decodeMap) {
       return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
+    },
+    usesZeroToOneRange: true
   };
   return DeviceGrayCS;
 })();
@@ -13101,722 +13255,55 @@ var DeviceRgbCS = (function DeviceRgbCSClosure() {
     createRgbBuffer: ColorSpace.prototype.createRgbBuffer,
     isDefaultDecode: function DeviceRgbCS_isDefaultDecode(decodeMap) {
       return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
+    },
+    usesZeroToOneRange: true
   };
   return DeviceRgbCS;
 })();
 
 var DeviceCmykCS = (function DeviceCmykCSClosure() {
-  // Sampled RGB colors from CMYK US Web Coated (SWOP) colorspace
-  var lut = new Uint8Array([
-    255, 255, 254, 221, 222, 223, 191, 193, 195, 161, 163, 166, 133, 136, 138,
-    105, 107, 109, 75, 75, 77, 35, 31, 32, 255, 252, 224, 226, 220, 198, 195,
-    191, 173, 164, 162, 147, 136, 134, 122, 107, 106, 96, 75, 74, 66, 33, 29,
-    24, 255, 249, 197, 229, 218, 174, 198, 190, 153, 166, 160, 129, 138, 133,
-    107, 108, 104, 83, 76, 73, 56, 33, 28, 15, 255, 247, 168, 232, 216, 149,
-    200, 188, 130, 168, 158, 110, 139, 131, 90, 110, 103, 70, 77, 72, 45, 32,
-    27, 4, 255, 245, 140, 234, 214, 124, 202, 186, 108, 170, 157, 91, 140, 130,
-    74, 110, 102, 56, 77, 71, 33, 31, 27, 0, 255, 243, 107, 235, 212, 95, 203,
-    184, 83, 171, 155, 69, 141, 129, 55, 111, 101, 40, 77, 70, 19, 29, 26, 0,
-    255, 241, 64, 237, 211, 59, 204, 183, 52, 171, 154, 42, 142, 128, 31, 111,
-    100, 16, 77, 69, 0, 27, 26, 0, 255, 240, 0, 238, 209, 0, 205, 182, 3, 172,
-    153, 0, 142, 127, 0, 112, 100, 0, 77, 69, 0, 26, 25, 0, 251, 225, 236, 218,
-    196, 207, 189, 171, 181, 160, 144, 154, 133, 120, 128, 105, 94, 101, 74, 64,
-    70, 35, 21, 25, 255, 222, 208, 222, 195, 184, 192, 169, 161, 162, 143, 136,
-    135, 118, 113, 106, 92, 88, 75, 63, 60, 34, 20, 17, 255, 220, 184, 225, 193,
-    162, 195, 168, 142, 164, 142, 120, 136, 117, 99, 107, 91, 77, 75, 62, 50,
-    33, 20, 8, 255, 218, 157, 227, 191, 139, 197, 166, 121, 165, 140, 102, 137,
-    116, 84, 108, 90, 64, 76, 61, 40, 32, 19, 0, 255, 216, 132, 229, 189, 116,
-    198, 165, 101, 167, 139, 85, 138, 115, 69, 109, 89, 51, 76, 61, 28, 31, 18,
-    0, 255, 214, 102, 230, 188, 90, 199, 163, 78, 167, 138, 65, 139, 114, 51,
-    109, 89, 35, 76, 60, 14, 29, 18, 0, 255, 213, 65, 232, 186, 58, 200, 162,
-    50, 168, 136, 39, 139, 113, 28, 110, 88, 12, 76, 60, 0, 27, 18, 0, 255, 212,
-    8, 232, 185, 13, 201, 161, 11, 169, 136, 3, 139, 112, 0, 110, 87, 0, 76, 59,
-    0, 26, 18, 0, 248, 197, 219, 216, 172, 192, 187, 150, 168, 158, 126, 143,
-    132, 104, 119, 104, 81, 93, 74, 54, 64, 35, 10, 19, 251, 195, 193, 219, 171,
-    171, 190, 149, 150, 161, 125, 127, 133, 103, 105, 106, 80, 81, 75, 53, 54,
-    34, 10, 10, 254, 193, 171, 221, 169, 151, 192, 148, 132, 162, 124, 112, 134,
-    102, 92, 106, 79, 70, 75, 52, 45, 34, 9, 1, 255, 191, 147, 223, 168, 130,
-    193, 146, 113, 163, 123, 95, 135, 101, 77, 107, 78, 58, 75, 52, 35, 32, 9,
-    0, 255, 190, 124, 225, 166, 109, 195, 145, 95, 164, 122, 79, 136, 100, 63,
-    107, 77, 46, 76, 51, 24, 31, 9, 0, 255, 188, 97, 226, 165, 85, 196, 143, 74,
-    165, 121, 60, 137, 99, 47, 108, 77, 31, 75, 51, 10, 29, 9, 0, 255, 187, 64,
-    227, 164, 56, 196, 142, 48, 165, 120, 37, 137, 98, 25, 108, 76, 9, 75, 50,
-    0, 28, 9, 0, 255, 186, 23, 228, 163, 21, 197, 142, 15, 166, 119, 5, 137, 98,
-    0, 108, 76, 0, 75, 50, 0, 27, 8, 0, 245, 168, 201, 214, 147, 177, 186, 128,
-    155, 157, 107, 131, 131, 88, 109, 104, 67, 85, 74, 42, 57, 35, 0, 12, 248,
-    166, 178, 216, 146, 157, 188, 127, 138, 159, 107, 116, 132, 87, 96, 105, 66,
-    74, 74, 41, 48, 35, 0, 3, 250, 165, 158, 218, 145, 139, 189, 126, 122, 160,
-    106, 103, 133, 86, 84, 105, 66, 64, 75, 41, 39, 33, 0, 0, 252, 164, 136,
-    220, 144, 120, 190, 125, 104, 161, 105, 87, 134, 86, 71, 106, 65, 52, 75,
-    41, 29, 32, 0, 0, 253, 162, 115, 221, 142, 101, 191, 124, 88, 161, 104, 72,
-    134, 85, 58, 106, 64, 41, 75, 40, 19, 31, 0, 0, 254, 161, 91, 222, 141, 80,
-    192, 123, 68, 162, 103, 55, 134, 84, 42, 106, 64, 26, 75, 40, 6, 29, 0, 0,
-    255, 160, 62, 223, 140, 54, 193, 122, 45, 162, 102, 34, 135, 83, 22, 106,
-    63, 5, 74, 40, 0, 28, 0, 0, 255, 159, 29, 223, 140, 25, 193, 121, 18, 163,
-    101, 7, 135, 83, 0, 107, 63, 0, 74, 40, 0, 28, 0, 0, 243, 142, 185, 212,
-    123, 163, 184, 107, 142, 156, 89, 120, 130, 72, 100, 104, 53, 77, 74, 29,
-    51, 35, 0, 4, 245, 140, 164, 214, 123, 145, 186, 106, 127, 157, 89, 107,
-    131, 72, 88, 104, 53, 67, 74, 29, 42, 34, 0, 0, 247, 139, 146, 215, 122,
-    129, 187, 106, 112, 158, 88, 94, 132, 71, 77, 104, 53, 57, 74, 29, 33, 33,
-    0, 0, 248, 138, 126, 217, 121, 111, 188, 105, 96, 159, 87, 80, 132, 70, 64,
-    105, 52, 47, 74, 29, 24, 31, 0, 0, 249, 137, 107, 218, 120, 94, 189, 104,
-    81, 159, 86, 66, 132, 70, 52, 105, 52, 36, 74, 29, 15, 30, 0, 0, 250, 136,
-    85, 218, 119, 74, 189, 103, 63, 160, 86, 51, 133, 69, 38, 105, 51, 22, 74,
-    29, 2, 29, 0, 0, 251, 135, 59, 219, 118, 51, 190, 102, 42, 160, 85, 31, 133,
-    69, 19, 105, 51, 3, 74, 29, 0, 29, 0, 0, 252, 134, 31, 219, 118, 26, 190,
-    102, 19, 160, 85, 7, 133, 69, 0, 105, 51, 0, 73, 29, 0, 28, 0, 0, 240, 113,
-    169, 210, 98, 149, 183, 84, 130, 155, 69, 110, 129, 54, 90, 103, 37, 70, 74,
-    11, 44, 32, 0, 1, 242, 111, 150, 212, 97, 132, 184, 84, 116, 156, 69, 97,
-    130, 54, 79, 103, 37, 60, 74, 12, 36, 31, 0, 0, 244, 111, 134, 213, 97, 118,
-    185, 83, 102, 157, 68, 86, 130, 54, 69, 104, 37, 51, 74, 13, 28, 30, 0, 0,
-    245, 110, 116, 214, 96, 102, 186, 83, 88, 157, 68, 73, 131, 53, 58, 104, 37,
-    41, 74, 14, 19, 29, 0, 0, 246, 110, 98, 215, 96, 86, 186, 82, 74, 157, 67,
-    60, 131, 53, 46, 104, 37, 30, 73, 14, 10, 28, 0, 0, 247, 109, 79, 215, 95,
-    69, 187, 82, 58, 158, 67, 46, 131, 53, 33, 104, 37, 18, 73, 15, 1, 28, 0, 0,
-    247, 108, 56, 216, 95, 48, 187, 82, 40, 158, 67, 29, 131, 53, 16, 104, 37,
-    0, 73, 15, 0, 27, 0, 0, 248, 108, 32, 216, 94, 27, 187, 81, 20, 158, 67, 8,
-    131, 53, 0, 104, 37, 0, 72, 16, 0, 27, 0, 0, 238, 78, 154, 208, 66, 135,
-    181, 55, 118, 154, 43, 99, 129, 30, 81, 103, 12, 62, 74, 0, 38, 27, 0, 0,
-    240, 77, 136, 210, 66, 120, 183, 56, 105, 155, 43, 88, 129, 30, 71, 103, 13,
-    53, 73, 0, 29, 26, 0, 0, 241, 77, 122, 211, 66, 107, 183, 56, 93, 155, 44,
-    77, 129, 31, 62, 103, 14, 44, 73, 0, 23, 26, 0, 0, 242, 77, 106, 211, 66,
-    92, 184, 56, 80, 155, 44, 65, 129, 31, 51, 103, 15, 35, 73, 0, 14, 25, 0, 0,
-    243, 77, 90, 212, 66, 79, 184, 56, 67, 156, 44, 54, 129, 32, 41, 103, 16,
-    25, 73, 0, 6, 25, 0, 0, 243, 77, 73, 213, 66, 63, 184, 56, 53, 156, 44, 41,
-    130, 32, 28, 103, 17, 13, 72, 0, 0, 25, 0, 0, 244, 77, 53, 213, 67, 45, 185,
-    56, 37, 156, 45, 26, 130, 33, 13, 103, 18, 0, 72, 0, 0, 25, 0, 0, 244, 77,
-    33, 213, 67, 28, 185, 57, 21, 156, 45, 9, 130, 33, 0, 103, 19, 0, 72, 0, 0,
-    24, 0, 0, 237, 13, 138, 207, 4, 122, 180, 0, 106, 153, 0, 89, 128, 0, 72,
-    102, 0, 54, 73, 0, 31, 21, 0, 0, 238, 16, 123, 208, 6, 108, 181, 0, 94, 154,
-    0, 78, 128, 0, 63, 102, 0, 46, 72, 0, 24, 21, 0, 0, 239, 20, 110, 209, 11,
-    96, 181, 1, 83, 154, 0, 69, 128, 0, 54, 102, 0, 38, 72, 0, 17, 22, 0, 0,
-    239, 23, 96, 209, 15, 84, 182, 5, 72, 154, 0, 58, 128, 0, 45, 102, 0, 29,
-    72, 0, 9, 22, 0, 0, 240, 26, 82, 210, 19, 71, 182, 10, 60, 154, 0, 48, 128,
-    0, 35, 102, 0, 20, 72, 0, 3, 22, 0, 0, 241, 27, 67, 210, 21, 58, 182, 14,
-    48, 154, 3, 37, 128, 0, 24, 102, 0, 8, 71, 0, 0, 22, 0, 0, 241, 29, 50, 210,
-    23, 42, 183, 17, 34, 154, 6, 23, 129, 0, 10, 102, 0, 0, 71, 0, 0, 22, 0, 0,
-    241, 30, 34, 211, 25, 28, 183, 19, 21, 155, 9, 10, 129, 0, 0, 102, 0, 0, 71,
-    0, 0, 22, 0, 0, 211, 239, 252, 184, 210, 221, 160, 183, 194, 135, 155, 164,
-    111, 128, 137, 87, 101, 109, 59, 70, 76, 22, 28, 32, 218, 237, 223, 190,
-    208, 196, 165, 181, 172, 139, 153, 146, 114, 127, 121, 89, 100, 95, 61, 69,
-    66, 21, 27, 25, 223, 235, 196, 195, 206, 174, 169, 179, 152, 142, 151, 129,
-    117, 126, 107, 91, 99, 83, 62, 68, 56, 20, 26, 17, 227, 232, 168, 198, 204,
-    149, 171, 177, 130, 144, 150, 110, 119, 124, 91, 93, 98, 70, 63, 68, 46, 20,
-    25, 6, 231, 230, 142, 201, 202, 125, 174, 176, 109, 146, 148, 92, 120, 123,
-    75, 94, 97, 57, 63, 67, 35, 19, 25, 0, 234, 229, 112, 203, 200, 98, 176,
-    174, 86, 147, 147, 71, 121, 122, 57, 94, 96, 42, 64, 66, 21, 17, 24, 0, 236,
-    227, 75, 205, 199, 66, 177, 173, 57, 148, 146, 47, 122, 121, 35, 95, 95, 21,
-    64, 65, 2, 14, 24, 0, 238, 226, 32, 207, 198, 30, 178, 172, 25, 149, 145,
-    17, 123, 120, 6, 95, 94, 0, 64, 65, 0, 11, 24, 0, 211, 211, 233, 184, 186,
-    206, 160, 162, 180, 135, 137, 153, 112, 113, 127, 88, 89, 100, 61, 60, 70,
-    23, 18, 26, 217, 209, 207, 190, 184, 183, 165, 161, 160, 139, 136, 136, 115,
-    112, 113, 90, 88, 88, 62, 59, 60, 23, 17, 19, 221, 208, 183, 193, 183, 162,
-    167, 159, 142, 141, 134, 120, 116, 111, 99, 91, 87, 77, 62, 59, 51, 22, 17,
-    10, 224, 206, 158, 196, 181, 139, 170, 157, 122, 143, 133, 103, 118, 110,
-    84, 92, 86, 64, 63, 58, 40, 22, 16, 0, 227, 204, 133, 198, 179, 118, 172,
-    156, 102, 144, 132, 86, 119, 109, 70, 93, 85, 52, 64, 57, 30, 20, 16, 0,
-    230, 203, 106, 200, 178, 93, 173, 155, 81, 145, 130, 67, 120, 108, 53, 94,
-    84, 37, 64, 57, 17, 17, 16, 0, 232, 201, 73, 202, 177, 64, 175, 154, 55,
-    146, 129, 44, 121, 107, 33, 94, 83, 18, 64, 56, 0, 15, 16, 0, 233, 201, 38,
-    203, 176, 32, 175, 153, 27, 147, 129, 18, 121, 106, 6, 94, 83, 0, 64, 56, 0,
-    13, 16, 0, 210, 186, 216, 184, 163, 191, 160, 143, 167, 136, 120, 142, 112,
-    99, 118, 88, 77, 93, 61, 50, 64, 24, 6, 21, 215, 184, 192, 189, 162, 170,
-    164, 141, 149, 138, 119, 126, 115, 98, 104, 90, 76, 81, 62, 50, 54, 24, 6,
-    12, 219, 183, 171, 192, 161, 151, 166, 140, 132, 140, 118, 112, 116, 97, 92,
-    91, 75, 71, 63, 49, 46, 23, 6, 3, 222, 181, 148, 194, 159, 130, 168, 139,
-    114, 142, 117, 95, 117, 96, 78, 92, 74, 59, 63, 49, 36, 22, 6, 0, 224, 180,
-    125, 196, 158, 110, 170, 138, 96, 143, 116, 80, 118, 95, 64, 92, 74, 47, 64,
-    48, 25, 20, 6, 0, 226, 178, 100, 197, 157, 88, 171, 136, 76, 144, 115, 62,
-    119, 94, 49, 93, 73, 33, 64, 48, 13, 18, 6, 0, 228, 177, 71, 199, 156, 62,
-    172, 135, 52, 144, 114, 41, 119, 94, 30, 93, 72, 14, 64, 47, 0, 16, 6, 0,
-    229, 177, 40, 200, 155, 34, 173, 135, 27, 145, 113, 18, 120, 93, 5, 93, 72,
-    0, 63, 47, 0, 15, 6, 0, 210, 159, 199, 184, 140, 176, 160, 122, 154, 136,
-    102, 131, 113, 84, 108, 89, 64, 85, 62, 39, 57, 25, 0, 14, 214, 158, 177,
-    188, 139, 157, 163, 121, 137, 138, 102, 116, 114, 83, 96, 90, 63, 74, 63,
-    38, 48, 25, 0, 5, 217, 157, 158, 190, 138, 139, 165, 120, 122, 139, 101,
-    103, 115, 82, 84, 91, 62, 64, 63, 38, 40, 23, 0, 0, 219, 156, 137, 192, 137,
-    120, 167, 119, 105, 140, 100, 88, 116, 82, 71, 91, 62, 53, 63, 38, 30, 22,
-    0, 0, 221, 155, 116, 193, 136, 102, 168, 118, 89, 141, 99, 73, 117, 81, 59,
-    92, 61, 42, 63, 38, 21, 20, 0, 0, 223, 153, 94, 195, 135, 82, 169, 117, 70,
-    142, 98, 57, 117, 80, 44, 92, 61, 29, 63, 37, 8, 18, 0, 0, 224, 153, 68,
-    196, 134, 58, 170, 116, 49, 143, 97, 38, 118, 80, 26, 92, 60, 11, 63, 37, 0,
-    17, 0, 0, 225, 152, 41, 197, 133, 34, 170, 116, 27, 143, 97, 17, 118, 79, 4,
-    92, 60, 0, 63, 37, 0, 16, 0, 0, 209, 134, 183, 183, 118, 162, 160, 102, 142,
-    136, 85, 120, 113, 69, 100, 89, 50, 77, 62, 26, 51, 23, 0, 6, 213, 133, 163,
-    187, 117, 144, 163, 102, 126, 137, 85, 107, 114, 68, 88, 90, 50, 67, 63, 26,
-    43, 22, 0, 1, 215, 133, 146, 188, 116, 129, 164, 101, 112, 139, 84, 94, 115,
-    68, 77, 91, 50, 58, 63, 27, 34, 20, 0, 0, 217, 132, 127, 190, 116, 111, 165,
-    100, 97, 139, 84, 81, 116, 67, 65, 91, 49, 48, 63, 27, 25, 19, 0, 0, 219,
-    131, 108, 191, 115, 95, 166, 100, 82, 140, 83, 68, 116, 67, 53, 91, 49, 37,
-    63, 27, 17, 17, 0, 0, 220, 130, 88, 192, 114, 76, 167, 99, 65, 141, 82, 53,
-    116, 66, 40, 91, 49, 24, 63, 27, 5, 16, 0, 0, 221, 129, 64, 193, 113, 55,
-    168, 98, 46, 141, 82, 35, 117, 66, 23, 91, 49, 7, 63, 27, 0, 14, 0, 0, 222,
-    129, 41, 194, 113, 34, 168, 98, 26, 141, 81, 16, 117, 66, 3, 92, 48, 0, 62,
-    27, 0, 13, 0, 0, 209, 108, 168, 183, 94, 148, 160, 81, 130, 135, 66, 110,
-    113, 51, 91, 89, 35, 70, 63, 8, 45, 18, 0, 1, 212, 107, 150, 186, 94, 132,
-    162, 81, 116, 137, 66, 97, 114, 52, 80, 90, 35, 60, 63, 9, 37, 16, 0, 0,
-    214, 107, 134, 187, 93, 118, 163, 80, 103, 138, 66, 86, 114, 51, 70, 90, 35,
-    52, 63, 10, 29, 15, 0, 0, 215, 106, 117, 188, 93, 103, 164, 80, 89, 138, 66,
-    74, 115, 51, 59, 90, 35, 42, 63, 11, 21, 13, 0, 0, 216, 106, 100, 189, 92,
-    88, 164, 79, 75, 139, 65, 62, 115, 51, 48, 91, 35, 32, 63, 12, 12, 12, 0, 0,
-    217, 105, 82, 190, 92, 71, 165, 79, 60, 139, 65, 48, 115, 51, 35, 91, 35,
-    20, 62, 13, 3, 11, 0, 0, 218, 105, 61, 191, 92, 52, 166, 79, 43, 140, 65,
-    32, 116, 51, 20, 91, 35, 3, 62, 14, 0, 10, 0, 0, 219, 104, 41, 192, 91, 34,
-    166, 78, 26, 140, 65, 15, 116, 51, 2, 91, 35, 0, 62, 14, 0, 10, 0, 0, 208,
-    76, 153, 183, 65, 135, 159, 54, 118, 135, 42, 99, 113, 29, 82, 89, 10, 62,
-    62, 0, 38, 10, 0, 0, 211, 76, 137, 185, 65, 121, 161, 55, 105, 136, 43, 88,
-    114, 30, 72, 90, 12, 54, 63, 0, 31, 9, 0, 0, 212, 76, 122, 186, 66, 108,
-    162, 55, 94, 137, 43, 78, 114, 30, 63, 90, 13, 45, 62, 0, 24, 9, 0, 0, 213,
-    76, 107, 187, 66, 94, 162, 55, 81, 137, 43, 67, 114, 31, 52, 90, 15, 36, 62,
-    0, 16, 8, 0, 0, 214, 76, 92, 188, 66, 80, 163, 55, 69, 138, 44, 56, 114, 31,
-    42, 90, 16, 27, 62, 0, 8, 8, 0, 0, 215, 76, 76, 188, 66, 65, 164, 55, 55,
-    138, 44, 43, 114, 32, 31, 90, 16, 16, 62, 0, 1, 7, 0, 0, 216, 76, 57, 189,
-    66, 49, 164, 56, 40, 138, 44, 29, 115, 32, 16, 90, 17, 1, 61, 0, 0, 7, 0, 0,
-    217, 76, 40, 190, 66, 33, 164, 56, 25, 138, 44, 14, 114, 33, 1, 90, 18, 0,
-    61, 0, 0, 7, 0, 0, 207, 26, 139, 182, 16, 122, 159, 3, 106, 135, 0, 89, 113,
-    0, 73, 89, 0, 55, 62, 0, 32, 4, 0, 0, 210, 27, 124, 184, 18, 109, 160, 7,
-    95, 136, 0, 79, 113, 0, 64, 90, 0, 47, 62, 0, 25, 4, 0, 0, 211, 30, 111,
-    185, 21, 98, 161, 11, 84, 136, 0, 70, 113, 0, 55, 90, 0, 39, 62, 0, 18, 4,
-    0, 0, 212, 32, 98, 185, 24, 85, 161, 15, 73, 136, 2, 60, 113, 0, 46, 90, 0,
-    30, 61, 0, 11, 4, 0, 0, 213, 34, 85, 186, 26, 73, 162, 17, 62, 137, 5, 50,
-    113, 0, 37, 89, 0, 22, 61, 0, 5, 4, 0, 0, 213, 35, 70, 187, 27, 60, 162, 19,
-    50, 137, 8, 39, 114, 0, 26, 89, 0, 11, 61, 0, 0, 4, 0, 0, 214, 35, 54, 187,
-    29, 45, 163, 21, 37, 137, 11, 26, 114, 0, 13, 89, 0, 0, 60, 0, 0, 4, 0, 0,
-    214, 35, 40, 188, 29, 32, 163, 22, 24, 137, 12, 13, 114, 0, 0, 89, 0, 0, 60,
-    0, 0, 4, 0, 0, 169, 226, 249, 148, 199, 219, 129, 173, 192, 108, 147, 163,
-    88, 122, 136, 68, 96, 108, 43, 66, 76, 4, 25, 33, 178, 224, 221, 156, 197,
-    195, 136, 172, 171, 114, 145, 145, 93, 121, 120, 71, 95, 95, 46, 65, 66, 4,
-    24, 25, 185, 222, 196, 162, 195, 173, 140, 170, 151, 117, 144, 128, 96, 119,
-    106, 74, 94, 83, 47, 65, 57, 4, 24, 18, 190, 220, 169, 166, 193, 149, 144,
-    168, 130, 120, 142, 110, 99, 118, 91, 76, 93, 70, 49, 64, 46, 3, 23, 8, 195,
-    218, 143, 170, 191, 126, 147, 167, 110, 123, 141, 93, 100, 117, 76, 77, 92,
-    58, 50, 63, 36, 3, 23, 0, 199, 216, 115, 173, 190, 101, 149, 165, 88, 125,
-    140, 74, 102, 116, 59, 78, 91, 43, 51, 63, 23, 0, 23, 0, 202, 215, 83, 176,
-    189, 72, 152, 164, 62, 126, 138, 51, 103, 115, 39, 79, 90, 25, 51, 62, 6, 0,
-    22, 0, 204, 214, 50, 178, 188, 43, 153, 163, 37, 127, 138, 28, 104, 114, 18,
-    80, 89, 3, 51, 62, 0, 0, 22, 0, 172, 200, 231, 152, 176, 204, 132, 154, 178,
-    111, 130, 152, 91, 108, 126, 70, 84, 100, 46, 57, 70, 9, 15, 27, 180, 198,
-    205, 158, 175, 182, 138, 153, 159, 116, 129, 135, 95, 107, 112, 73, 83, 88,
-    48, 56, 60, 8, 15, 20, 186, 197, 182, 163, 173, 161, 141, 151, 141, 119,
-    128, 119, 97, 106, 99, 75, 82, 77, 49, 55, 51, 8, 14, 11, 190, 195, 158,
-    166, 172, 139, 144, 150, 122, 121, 127, 103, 99, 105, 84, 77, 81, 65, 50,
-    55, 41, 8, 14, 2, 194, 193, 135, 169, 170, 119, 147, 148, 103, 123, 125, 87,
-    101, 104, 70, 78, 81, 53, 51, 54, 31, 5, 14, 0, 197, 192, 109, 172, 169, 96,
-    149, 147, 83, 124, 124, 69, 102, 103, 55, 79, 80, 39, 51, 54, 19, 2, 14, 0,
-    200, 191, 80, 174, 168, 69, 150, 146, 59, 126, 123, 48, 103, 102, 36, 79,
-    79, 22, 52, 53, 2, 0, 14, 0, 202, 190, 51, 176, 167, 43, 152, 145, 36, 127,
-    123, 27, 103, 101, 16, 80, 79, 1, 52, 53, 0, 0, 14, 0, 175, 176, 215, 154,
-    156, 190, 134, 136, 166, 113, 115, 141, 93, 94, 118, 72, 73, 93, 48, 47, 64,
-    12, 2, 22, 182, 175, 191, 160, 154, 169, 139, 135, 148, 117, 114, 126, 96,
-    94, 104, 75, 72, 81, 50, 47, 55, 12, 3, 14, 186, 174, 170, 163, 153, 151,
-    142, 134, 132, 119, 113, 111, 98, 93, 92, 76, 71, 71, 51, 46, 46, 11, 3, 5,
-    190, 172, 148, 166, 152, 130, 144, 132, 114, 121, 112, 96, 100, 92, 78, 77,
-    71, 59, 51, 46, 36, 9, 4, 0, 192, 171, 127, 169, 151, 111, 146, 131, 97,
-    123, 111, 81, 101, 91, 65, 78, 70, 48, 52, 45, 26, 6, 4, 0, 195, 170, 103,
-    171, 150, 90, 148, 130, 78, 124, 110, 64, 102, 90, 51, 79, 70, 35, 52, 45,
-    15, 3, 5, 0, 198, 169, 76, 173, 149, 66, 149, 129, 56, 125, 109, 45, 103,
-    89, 33, 79, 69, 18, 52, 45, 0, 1, 5, 0, 199, 168, 51, 174, 148, 43, 150,
-    129, 35, 126, 108, 26, 103, 89, 14, 80, 69, 0, 52, 45, 0, 0, 5, 0, 177, 151,
-    198, 156, 134, 175, 136, 117, 153, 115, 98, 130, 95, 80, 108, 74, 60, 85,
-    50, 36, 58, 11, 0, 15, 183, 150, 176, 161, 133, 156, 140, 116, 137, 118, 97,
-    116, 97, 79, 96, 76, 60, 74, 51, 36, 49, 11, 0, 6, 186, 150, 158, 163, 132,
-    139, 142, 115, 122, 120, 97, 103, 99, 79, 84, 77, 59, 64, 52, 36, 41, 9, 0,
-    1, 189, 148, 137, 166, 131, 121, 144, 114, 105, 121, 96, 88, 100, 78, 72,
-    78, 59, 54, 52, 36, 31, 7, 0, 0, 191, 147, 118, 168, 130, 103, 145, 113, 90,
-    122, 95, 75, 101, 77, 60, 78, 59, 43, 52, 35, 22, 5, 0, 0, 193, 147, 97,
-    169, 129, 84, 147, 112, 72, 123, 94, 59, 101, 77, 46, 79, 58, 31, 52, 35,
-    11, 4, 0, 0, 195, 146, 73, 171, 128, 62, 148, 111, 53, 124, 93, 41, 102, 76,
-    30, 79, 58, 15, 52, 35, 0, 3, 0, 0, 197, 145, 50, 172, 128, 42, 149, 111,
-    34, 125, 93, 24, 102, 76, 12, 79, 57, 0, 52, 35, 0, 2, 0, 0, 179, 128, 183,
-    157, 113, 162, 137, 98, 142, 116, 82, 120, 96, 66, 100, 75, 48, 78, 51, 24,
-    52, 5, 0, 8, 183, 128, 163, 161, 113, 144, 140, 98, 126, 119, 81, 107, 98,
-    65, 88, 76, 48, 68, 52, 24, 43, 6, 0, 1, 186, 127, 146, 163, 112, 129, 142,
-    97, 112, 120, 81, 95, 99, 65, 77, 77, 47, 58, 52, 24, 35, 4, 0, 0, 188, 126,
-    128, 165, 111, 112, 144, 96, 97, 121, 80, 81, 100, 65, 66, 78, 47, 48, 53,
-    24, 26, 3, 0, 0, 190, 126, 110, 167, 110, 96, 145, 96, 83, 122, 80, 69, 101,
-    64, 54, 78, 47, 38, 52, 25, 18, 2, 0, 0, 192, 125, 90, 168, 110, 79, 146,
-    95, 67, 123, 79, 54, 101, 64, 42, 79, 47, 26, 52, 25, 7, 2, 0, 0, 194, 124,
-    69, 170, 109, 59, 147, 95, 49, 123, 79, 38, 101, 63, 26, 79, 47, 11, 52, 25,
-    0, 1, 0, 0, 195, 124, 49, 171, 109, 40, 148, 94, 32, 124, 78, 22, 102, 63,
-    9, 79, 46, 0, 52, 25, 0, 1, 0, 0, 180, 104, 168, 158, 91, 148, 138, 78, 130,
-    117, 64, 110, 97, 49, 91, 76, 33, 70, 52, 7, 46, 2, 0, 1, 184, 103, 150,
-    162, 91, 133, 141, 78, 116, 119, 64, 98, 99, 50, 80, 77, 33, 61, 52, 8, 37,
-    2, 0, 0, 186, 103, 135, 163, 90, 119, 142, 78, 103, 120, 64, 87, 99, 50, 70,
-    78, 33, 52, 52, 10, 30, 1, 0, 0, 188, 103, 118, 165, 90, 103, 143, 77, 90,
-    121, 63, 75, 100, 49, 60, 78, 33, 43, 52, 11, 22, 1, 0, 0, 189, 102, 102,
-    166, 89, 89, 144, 77, 76, 121, 63, 63, 100, 49, 49, 78, 34, 33, 52, 12, 14,
-    0, 0, 0, 191, 102, 84, 167, 89, 73, 145, 77, 62, 122, 63, 50, 101, 49, 37,
-    78, 34, 22, 52, 13, 4, 0, 0, 0, 192, 101, 65, 168, 89, 55, 146, 76, 46, 123,
-    63, 35, 101, 49, 23, 78, 34, 7, 51, 13, 0, 0, 0, 0, 193, 101, 48, 169, 88,
-    39, 146, 76, 31, 123, 63, 20, 101, 49, 8, 78, 34, 0, 51, 14, 0, 0, 0, 0,
-    181, 75, 154, 159, 64, 136, 139, 54, 118, 118, 41, 100, 98, 28, 82, 77, 8,
-    63, 51, 0, 39, 0, 0, 0, 184, 75, 137, 162, 65, 121, 141, 54, 106, 119, 42,
-    89, 99, 29, 72, 77, 11, 54, 52, 0, 32, 0, 0, 0, 186, 75, 123, 163, 65, 109,
-    142, 54, 94, 120, 43, 79, 99, 30, 63, 78, 12, 46, 52, 0, 25, 0, 0, 0, 187,
-    76, 108, 164, 65, 95, 143, 55, 82, 121, 43, 68, 100, 31, 54, 78, 14, 37, 52,
-    0, 17, 0, 0, 0, 188, 76, 94, 165, 65, 82, 144, 55, 70, 121, 43, 57, 100, 31,
-    44, 78, 15, 28, 51, 0, 9, 0, 0, 0, 189, 75, 78, 166, 65, 68, 144, 55, 57,
-    121, 43, 45, 100, 31, 33, 78, 16, 18, 51, 0, 2, 0, 0, 0, 190, 75, 61, 167,
-    65, 52, 145, 55, 42, 122, 44, 31, 100, 32, 19, 78, 16, 4, 51, 0, 0, 0, 0, 0,
-    191, 75, 46, 168, 65, 37, 145, 55, 29, 122, 44, 18, 100, 32, 5, 78, 17, 0,
-    50, 0, 0, 0, 0, 0, 181, 35, 140, 160, 24, 123, 140, 12, 107, 118, 0, 90, 98,
-    0, 74, 77, 0, 56, 51, 0, 33, 0, 0, 0, 184, 34, 125, 162, 26, 110, 141, 15,
-    96, 120, 1, 80, 99, 0, 65, 78, 0, 48, 51, 0, 26, 0, 0, 0, 186, 36, 113, 163,
-    27, 99, 142, 18, 86, 120, 5, 71, 99, 0, 57, 78, 0, 40, 51, 0, 20, 0, 0, 0,
-    187, 38, 99, 164, 30, 87, 142, 21, 74, 120, 8, 61, 99, 0, 48, 78, 0, 32, 51,
-    0, 12, 0, 0, 0, 187, 39, 87, 164, 31, 75, 143, 22, 64, 120, 11, 51, 100, 0,
-    39, 78, 0, 24, 51, 0, 6, 0, 0, 0, 188, 40, 73, 165, 32, 62, 143, 24, 52,
-    121, 13, 40, 100, 0, 28, 78, 0, 14, 51, 0, 0, 0, 0, 0, 189, 40, 58, 166, 33,
-    48, 144, 25, 39, 121, 15, 28, 100, 1, 16, 78, 0, 2, 50, 0, 0, 0, 0, 0, 190,
-    40, 45, 166, 34, 36, 144, 26, 27, 121, 16, 17, 100, 3, 3, 77, 0, 0, 49, 0,
-    0, 0, 0, 0, 120, 213, 247, 106, 188, 217, 92, 164, 190, 76, 139, 162, 60,
-    115, 135, 43, 91, 107, 21, 62, 76, 0, 22, 34, 134, 211, 219, 118, 186, 193,
-    102, 162, 169, 84, 138, 144, 67, 114, 120, 49, 90, 95, 26, 62, 66, 0, 22,
-    26, 143, 209, 195, 125, 184, 172, 108, 161, 151, 90, 136, 128, 72, 113, 106,
-    53, 89, 83, 29, 61, 57, 0, 22, 19, 150, 207, 169, 131, 182, 149, 113, 159,
-    130, 94, 135, 110, 76, 112, 91, 56, 88, 71, 31, 60, 47, 0, 21, 9, 156, 205,
-    145, 136, 181, 127, 117, 158, 111, 97, 133, 94, 78, 111, 77, 58, 87, 59, 33,
-    60, 37, 0, 21, 0, 161, 204, 118, 141, 179, 104, 121, 156, 90, 100, 132, 75,
-    81, 110, 61, 60, 86, 45, 35, 59, 25, 0, 21, 0, 165, 203, 89, 144, 178, 77,
-    124, 155, 67, 102, 131, 55, 82, 109, 43, 62, 85, 29, 36, 59, 10, 0, 21, 0,
-    169, 202, 62, 147, 178, 53, 126, 155, 45, 104, 131, 36, 84, 108, 25, 62, 85,
-    11, 36, 58, 0, 0, 21, 0, 129, 189, 229, 114, 167, 202, 99, 146, 177, 83,
-    124, 151, 67, 102, 126, 49, 79, 99, 28, 53, 70, 0, 12, 28, 140, 188, 204,
-    124, 166, 180, 107, 145, 158, 89, 123, 134, 72, 101, 111, 54, 79, 88, 31,
-    53, 60, 0, 12, 21, 148, 186, 182, 130, 164, 161, 112, 144, 141, 93, 121,
-    119, 76, 100, 99, 56, 78, 77, 33, 52, 51, 0, 12, 13, 153, 184, 158, 134,
-    163, 140, 116, 142, 122, 97, 120, 103, 78, 99, 85, 59, 77, 65, 35, 52, 42,
-    0, 12, 3, 158, 183, 136, 138, 161, 120, 119, 141, 104, 99, 119, 87, 80, 98,
-    71, 60, 77, 54, 36, 51, 32, 0, 12, 0, 162, 182, 112, 142, 160, 98, 122, 140,
-    85, 102, 118, 70, 82, 97, 56, 62, 76, 41, 37, 51, 21, 0, 11, 0, 166, 181,
-    85, 145, 159, 74, 125, 139, 63, 103, 117, 51, 84, 97, 39, 63, 75, 25, 37,
-    51, 6, 0, 11, 0, 168, 180, 60, 147, 158, 51, 126, 138, 43, 105, 116, 34, 85,
-    96, 23, 64, 75, 8, 38, 50, 0, 0, 11, 0, 136, 167, 213, 120, 148, 188, 105,
-    129, 165, 88, 109, 140, 71, 90, 117, 54, 69, 92, 32, 44, 64, 0, 2, 23, 145,
-    166, 190, 128, 147, 168, 111, 128, 147, 93, 108, 125, 75, 89, 104, 57, 68,
-    81, 34, 44, 55, 0, 2, 15, 151, 165, 170, 133, 146, 150, 115, 127, 131, 96,
-    107, 111, 78, 88, 92, 59, 68, 71, 36, 43, 46, 0, 2, 6, 155, 163, 148, 136,
-    144, 131, 118, 126, 114, 99, 106, 96, 80, 87, 79, 61, 67, 60, 37, 43, 37, 0,
-    2, 0, 159, 162, 128, 140, 143, 112, 121, 125, 97, 101, 105, 82, 82, 87, 66,
-    62, 67, 49, 38, 43, 27, 0, 2, 0, 163, 161, 105, 142, 142, 92, 123, 124, 80,
-    103, 104, 66, 83, 86, 52, 63, 66, 37, 39, 43, 17, 0, 2, 0, 166, 160, 81,
-    145, 141, 70, 125, 123, 59, 104, 104, 48, 84, 85, 36, 64, 66, 21, 39, 42, 2,
-    0, 1, 0, 168, 160, 59, 147, 141, 50, 126, 122, 41, 105, 103, 32, 85, 85, 20,
-    64, 65, 6, 39, 42, 0, 0, 1, 0, 142, 144, 197, 125, 128, 174, 109, 111, 153,
-    92, 93, 130, 75, 76, 108, 57, 57, 85, 36, 33, 58, 0, 0, 16, 149, 143, 176,
-    131, 127, 156, 114, 110, 136, 96, 93, 116, 78, 75, 96, 60, 57, 74, 37, 33,
-    49, 0, 0, 7, 153, 142, 157, 135, 126, 139, 117, 110, 122, 98, 92, 103, 80,
-    75, 84, 61, 56, 65, 38, 33, 41, 0, 0, 1, 157, 142, 138, 138, 125, 121, 120,
-    109, 106, 100, 91, 89, 82, 74, 72, 62, 56, 54, 39, 33, 32, 0, 0, 0, 160,
-    141, 119, 140, 124, 105, 122, 108, 91, 102, 91, 76, 83, 74, 61, 63, 56, 44,
-    40, 33, 23, 0, 0, 0, 163, 140, 99, 143, 123, 86, 124, 107, 74, 103, 90, 61,
-    84, 73, 48, 64, 55, 32, 40, 33, 13, 0, 0, 0, 165, 139, 77, 145, 122, 66,
-    125, 107, 56, 104, 89, 44, 85, 73, 33, 65, 55, 18, 40, 33, 1, 0, 0, 0, 167,
-    139, 57, 146, 122, 48, 126, 106, 39, 105, 89, 29, 86, 72, 18, 65, 55, 3, 40,
-    33, 0, 0, 0, 0, 146, 123, 182, 129, 108, 161, 113, 94, 141, 95, 78, 120, 78,
-    62, 99, 60, 45, 78, 38, 21, 52, 0, 0, 9, 152, 122, 163, 134, 108, 144, 117,
-    94, 126, 98, 78, 107, 80, 62, 88, 61, 45, 68, 39, 22, 44, 0, 0, 1, 156, 122,
-    146, 137, 107, 129, 119, 93, 113, 100, 77, 95, 82, 62, 78, 63, 45, 59, 40,
-    22, 36, 0, 0, 0, 158, 121, 128, 139, 107, 113, 121, 92, 98, 101, 77, 82, 83,
-    62, 66, 64, 45, 49, 40, 23, 27, 0, 0, 0, 161, 120, 111, 141, 106, 97, 122,
-    92, 84, 103, 77, 70, 84, 62, 56, 64, 45, 40, 40, 23, 19, 0, 0, 0, 163, 120,
-    93, 143, 105, 81, 124, 91, 69, 104, 76, 56, 85, 61, 43, 65, 45, 28, 40, 24,
-    9, 0, 0, 0, 165, 119, 73, 145, 105, 62, 125, 91, 52, 105, 76, 41, 85, 61,
-    29, 65, 44, 15, 40, 24, 0, 0, 0, 0, 166, 119, 55, 146, 104, 46, 126, 90, 37,
-    105, 75, 27, 86, 61, 15, 65, 44, 0, 40, 24, 0, 0, 0, 0, 150, 100, 168, 132,
-    88, 148, 115, 75, 130, 97, 61, 110, 80, 47, 91, 62, 30, 71, 39, 7, 46, 0, 0,
-    2, 154, 100, 150, 136, 88, 133, 119, 75, 116, 100, 61, 98, 82, 47, 81, 63,
-    31, 62, 40, 9, 38, 0, 0, 0, 157, 100, 135, 138, 87, 119, 120, 75, 104, 101,
-    61, 87, 83, 48, 71, 64, 31, 53, 40, 10, 31, 0, 0, 0, 159, 99, 119, 140, 87,
-    104, 122, 75, 91, 102, 61, 75, 84, 48, 61, 64, 32, 44, 40, 11, 23, 0, 0, 0,
-    161, 99, 104, 141, 87, 90, 123, 74, 78, 103, 61, 64, 84, 48, 50, 65, 32, 35,
-    40, 12, 15, 0, 0, 0, 163, 99, 87, 143, 86, 75, 124, 74, 64, 104, 61, 52, 85,
-    47, 39, 65, 32, 24, 40, 13, 6, 0, 0, 0, 164, 98, 69, 144, 86, 58, 125, 74,
-    49, 104, 61, 38, 85, 47, 26, 65, 32, 11, 40, 13, 0, 0, 0, 0, 166, 98, 53,
-    145, 86, 44, 126, 74, 35, 105, 60, 25, 86, 47, 13, 65, 32, 0, 40, 14, 0, 0,
-    0, 0, 152, 75, 154, 134, 64, 136, 117, 53, 119, 99, 41, 101, 82, 27, 83, 63,
-    7, 64, 39, 0, 40, 0, 0, 0, 156, 74, 138, 138, 64, 122, 120, 53, 106, 101,
-    41, 90, 83, 28, 73, 64, 10, 55, 40, 0, 33, 0, 0, 0, 158, 74, 124, 139, 64,
-    110, 121, 54, 95, 102, 42, 80, 84, 29, 64, 65, 12, 47, 41, 0, 26, 0, 0, 0,
-    160, 75, 110, 140, 64, 96, 122, 54, 83, 103, 42, 69, 84, 30, 55, 65, 13, 39,
-    41, 0, 18, 0, 0, 0, 161, 75, 96, 142, 64, 83, 123, 54, 71, 103, 43, 58, 85,
-    30, 45, 65, 14, 30, 41, 0, 11, 0, 0, 0, 163, 75, 81, 143, 64, 70, 124, 54,
-    59, 104, 43, 47, 85, 31, 35, 65, 15, 20, 41, 0, 3, 0, 0, 0, 164, 74, 65,
-    144, 64, 55, 125, 54, 45, 104, 43, 34, 85, 31, 22, 66, 16, 7, 41, 0, 0, 0,
-    0, 0, 165, 74, 51, 145, 64, 42, 125, 54, 33, 105, 43, 22, 86, 32, 10, 65,
-    17, 0, 40, 0, 0, 0, 0, 0, 154, 41, 142, 136, 30, 124, 119, 19, 108, 101, 3,
-    91, 83, 0, 75, 64, 0, 57, 39, 0, 34, 0, 0, 0, 158, 40, 127, 139, 31, 112,
-    121, 21, 97, 102, 7, 81, 84, 0, 66, 65, 0, 49, 40, 0, 27, 0, 0, 0, 159, 41,
-    114, 140, 32, 100, 122, 23, 87, 103, 10, 72, 85, 0, 58, 65, 0, 42, 40, 0,
-    21, 0, 0, 0, 160, 43, 101, 141, 34, 88, 123, 25, 76, 103, 13, 62, 85, 0, 49,
-    65, 0, 33, 41, 0, 14, 0, 0, 0, 161, 44, 89, 142, 35, 77, 123, 26, 65, 103,
-    15, 53, 85, 1, 40, 65, 0, 25, 41, 0, 7, 0, 0, 0, 162, 44, 75, 143, 36, 64,
-    124, 28, 54, 104, 17, 42, 85, 3, 30, 65, 0, 16, 40, 0, 1, 0, 0, 0, 164, 45,
-    61, 144, 37, 51, 124, 29, 42, 104, 18, 31, 85, 4, 19, 65, 0, 4, 40, 0, 0, 0,
-    0, 0, 164, 45, 49, 144, 37, 40, 125, 29, 31, 105, 19, 20, 86, 6, 7, 65, 0,
-    0, 39, 0, 0, 0, 0, 0, 49, 202, 244, 45, 178, 215, 38, 156, 188, 28, 132,
-    160, 14, 110, 134, 0, 86, 107, 0, 59, 76, 0, 20, 34, 80, 200, 217, 70, 176,
-    192, 60, 154, 168, 47, 131, 143, 34, 109, 119, 16, 85, 94, 0, 58, 66, 0, 20,
-    27, 95, 198, 194, 84, 175, 171, 71, 153, 150, 57, 130, 127, 42, 108, 106,
-    25, 84, 83, 0, 58, 57, 0, 20, 19, 107, 196, 169, 93, 173, 149, 79, 151, 130,
-    64, 128, 110, 49, 106, 91, 32, 84, 71, 3, 57, 47, 0, 19, 10, 115, 195, 145,
-    100, 171, 128, 86, 150, 112, 69, 127, 94, 53, 105, 78, 36, 83, 59, 8, 57,
-    37, 0, 19, 1, 122, 193, 120, 107, 170, 106, 91, 149, 92, 74, 126, 77, 57,
-    104, 62, 39, 82, 46, 13, 56, 26, 0, 18, 0, 128, 192, 93, 112, 169, 81, 95,
-    148, 70, 77, 125, 58, 60, 104, 46, 42, 81, 31, 15, 56, 13, 0, 17, 0, 132,
-    191, 69, 115, 168, 60, 98, 147, 51, 79, 124, 41, 62, 103, 30, 43, 81, 17,
-    16, 56, 0, 0, 17, 0, 77, 180, 227, 69, 159, 200, 60, 139, 176, 48, 118, 150,
-    35, 97, 125, 20, 75, 99, 0, 50, 70, 0, 9, 29, 96, 178, 203, 85, 158, 179,
-    73, 138, 157, 59, 117, 133, 45, 96, 111, 29, 75, 87, 3, 50, 60, 0, 9, 21,
-    107, 177, 181, 94, 156, 160, 80, 137, 140, 65, 116, 119, 51, 96, 98, 34, 74,
-    77, 9, 49, 52, 0, 8, 14, 115, 175, 158, 101, 155, 140, 86, 135, 122, 71,
-    114, 103, 55, 95, 85, 38, 73, 65, 14, 49, 42, 0, 7, 4, 121, 174, 137, 106,
-    153, 120, 91, 134, 105, 74, 113, 88, 58, 94, 72, 41, 73, 54, 17, 49, 33, 0,
-    6, 0, 127, 173, 114, 111, 152, 100, 95, 133, 86, 78, 112, 72, 61, 93, 58,
-    43, 72, 42, 19, 48, 22, 0, 6, 0, 132, 172, 88, 115, 151, 77, 98, 132, 66,
-    80, 112, 54, 63, 92, 42, 45, 72, 28, 20, 48, 9, 0, 5, 0, 135, 171, 67, 118,
-    151, 57, 100, 131, 49, 82, 111, 39, 65, 92, 28, 46, 71, 13, 21, 48, 0, 0, 5,
-    0, 93, 159, 211, 83, 141, 187, 72, 123, 164, 59, 104, 140, 46, 85, 116, 31,
-    65, 92, 8, 41, 64, 0, 1, 23, 106, 158, 189, 94, 140, 167, 81, 122, 147, 67,
-    103, 124, 52, 85, 103, 36, 65, 81, 14, 41, 55, 0, 0, 15, 114, 157, 169, 100,
-    139, 150, 87, 121, 131, 71, 102, 111, 56, 84, 92, 40, 64, 71, 17, 41, 47, 0,
-    0, 7, 121, 156, 148, 106, 138, 131, 91, 120, 114, 75, 101, 96, 60, 83, 79,
-    43, 64, 60, 20, 40, 37, 0, 0, 1, 126, 155, 129, 110, 136, 113, 95, 119, 98,
-    78, 101, 82, 62, 83, 67, 45, 63, 50, 22, 40, 28, 0, 0, 0, 130, 154, 107,
-    114, 135, 94, 98, 118, 81, 81, 100, 67, 64, 82, 54, 46, 63, 38, 23, 40, 18,
-    0, 0, 0, 134, 153, 84, 117, 135, 73, 101, 117, 62, 83, 99, 51, 66, 81, 39,
-    48, 62, 24, 24, 40, 5, 0, 0, 0, 137, 152, 65, 119, 134, 55, 102, 117, 46,
-    84, 99, 36, 67, 81, 25, 48, 62, 11, 24, 40, 0, 0, 0, 0, 105, 138, 196, 93,
-    122, 173, 81, 106, 152, 67, 89, 129, 53, 72, 107, 38, 54, 84, 17, 30, 58, 0,
-    0, 17, 115, 137, 175, 101, 121, 155, 88, 106, 136, 73, 89, 115, 58, 72, 95,
-    42, 54, 74, 21, 31, 49, 0, 0, 8, 120, 136, 157, 106, 120, 139, 92, 105, 121,
-    76, 88, 103, 61, 71, 84, 44, 53, 65, 23, 31, 41, 0, 0, 1, 125, 135, 138,
-    110, 119, 122, 95, 104, 106, 79, 87, 89, 63, 71, 73, 46, 53, 55, 25, 31, 33,
-    0, 0, 0, 129, 134, 120, 113, 119, 105, 98, 103, 91, 81, 87, 76, 65, 71, 61,
-    48, 53, 45, 26, 31, 24, 0, 0, 0, 133, 134, 101, 116, 118, 88, 100, 103, 76,
-    83, 86, 62, 67, 70, 49, 49, 53, 34, 27, 31, 14, 0, 0, 0, 136, 133, 80, 119,
-    117, 69, 102, 102, 58, 85, 86, 47, 68, 70, 35, 50, 52, 20, 27, 31, 3, 0, 0,
-    0, 138, 133, 62, 121, 117, 52, 104, 102, 43, 86, 85, 33, 69, 69, 22, 50, 52,
-    7, 27, 31, 0, 0, 0, 0, 114, 118, 182, 100, 104, 161, 87, 90, 141, 73, 75,
-    120, 59, 59, 99, 43, 42, 78, 22, 20, 52, 0, 0, 10, 121, 117, 163, 106, 104,
-    144, 92, 90, 126, 77, 75, 107, 62, 59, 88, 46, 42, 68, 24, 21, 44, 0, 0, 2,
-    125, 117, 146, 110, 103, 129, 95, 89, 113, 79, 74, 95, 64, 59, 78, 47, 42,
-    59, 26, 21, 36, 0, 0, 0, 129, 116, 129, 113, 102, 113, 98, 89, 99, 82, 74,
-    83, 66, 59, 67, 49, 42, 50, 27, 22, 28, 0, 0, 0, 132, 116, 112, 116, 102,
-    98, 100, 88, 85, 83, 73, 71, 67, 59, 57, 50, 43, 41, 28, 22, 20, 0, 0, 0,
-    134, 115, 95, 118, 101, 82, 102, 88, 71, 85, 73, 58, 68, 59, 45, 51, 43, 30,
-    29, 22, 11, 0, 0, 0, 137, 115, 76, 120, 101, 65, 104, 87, 55, 86, 73, 44,
-    69, 58, 32, 51, 42, 18, 29, 22, 1, 0, 0, 0, 139, 114, 60, 122, 100, 50, 105,
-    87, 41, 87, 72, 31, 70, 58, 19, 51, 42, 4, 29, 22, 0, 0, 0, 0, 120, 97, 168,
-    106, 85, 149, 92, 73, 130, 77, 59, 110, 63, 45, 91, 47, 28, 71, 25, 6, 47,
-    0, 0, 3, 126, 97, 151, 111, 85, 133, 96, 73, 117, 80, 59, 98, 65, 46, 81,
-    48, 29, 62, 27, 7, 39, 0, 0, 0, 129, 97, 136, 113, 85, 120, 98, 73, 104, 82,
-    59, 88, 67, 46, 72, 50, 30, 54, 29, 8, 32, 0, 0, 0, 132, 96, 120, 116, 84,
-    105, 100, 72, 91, 84, 59, 76, 68, 46, 61, 51, 30, 45, 29, 9, 24, 0, 0, 0,
-    134, 96, 105, 117, 84, 92, 102, 72, 79, 85, 59, 65, 69, 46, 52, 51, 30, 36,
-    30, 10, 16, 0, 0, 0, 136, 96, 89, 119, 84, 77, 103, 72, 66, 86, 59, 53, 69,
-    46, 41, 52, 31, 26, 30, 11, 7, 0, 0, 0, 138, 95, 71, 121, 83, 61, 105, 72,
-    51, 87, 59, 40, 70, 46, 28, 52, 31, 14, 30, 11, 0, 0, 0, 0, 139, 95, 57,
-    122, 83, 47, 106, 71, 38, 88, 59, 28, 71, 46, 17, 52, 31, 2, 29, 12, 0, 0,
-    0, 0, 125, 74, 155, 110, 63, 137, 96, 52, 120, 81, 40, 101, 66, 27, 83, 49,
-    7, 64, 27, 0, 41, 0, 0, 0, 129, 73, 139, 114, 63, 123, 99, 53, 107, 83, 41,
-    90, 68, 28, 74, 51, 10, 56, 29, 0, 33, 0, 0, 0, 132, 74, 125, 116, 63, 110,
-    101, 53, 96, 84, 41, 80, 69, 29, 65, 51, 12, 48, 30, 0, 27, 0, 0, 0, 134,
-    74, 111, 118, 64, 97, 102, 53, 84, 85, 42, 70, 69, 29, 56, 52, 13, 40, 30,
-    0, 19, 0, 0, 0, 136, 74, 97, 119, 64, 85, 103, 53, 73, 86, 42, 60, 70, 30,
-    47, 52, 14, 31, 30, 0, 12, 0, 0, 0, 137, 74, 83, 121, 64, 71, 104, 54, 61,
-    87, 42, 49, 71, 30, 36, 53, 15, 22, 30, 0, 5, 0, 0, 0, 139, 74, 67, 122, 64,
-    57, 105, 54, 47, 88, 42, 36, 71, 31, 25, 53, 16, 9, 30, 0, 0, 0, 0, 0, 140,
-    73, 54, 123, 64, 45, 106, 54, 36, 88, 43, 26, 71, 31, 14, 53, 17, 1, 29, 0,
-    0, 0, 0, 0, 129, 44, 143, 114, 34, 126, 99, 24, 110, 84, 9, 92, 68, 0, 76,
-    51, 0, 58, 28, 0, 35, 0, 0, 0, 132, 44, 128, 117, 35, 113, 102, 25, 98, 85,
-    12, 82, 69, 0, 67, 52, 0, 50, 29, 0, 28, 0, 0, 0, 134, 45, 116, 118, 36,
-    102, 103, 27, 88, 86, 14, 73, 70, 0, 59, 52, 0, 43, 29, 0, 22, 0, 0, 0, 136,
-    46, 103, 119, 37, 90, 103, 28, 77, 87, 17, 64, 71, 1, 50, 53, 0, 35, 30, 0,
-    15, 0, 0, 0, 137, 47, 90, 120, 38, 78, 104, 29, 67, 87, 18, 54, 71, 3, 42,
-    53, 0, 27, 29, 0, 8, 0, 0, 0, 138, 47, 77, 121, 39, 66, 105, 30, 56, 88, 19,
-    44, 71, 5, 32, 53, 0, 18, 29, 0, 2, 0, 0, 0, 139, 48, 63, 122, 39, 53, 106,
-    31, 44, 88, 20, 33, 71, 7, 21, 53, 0, 6, 28, 0, 0, 0, 0, 0, 140, 48, 52,
-    123, 40, 42, 107, 31, 33, 89, 21, 23, 72, 8, 10, 53, 0, 0, 27, 0, 0, 0, 0,
-    0, 0, 192, 242, 0, 169, 213, 0, 148, 187, 0, 125, 159, 0, 104, 133, 0, 82,
-    106, 0, 56, 76, 0, 18, 34, 0, 189, 216, 0, 167, 190, 0, 147, 167, 0, 124,
-    142, 0, 103, 119, 0, 81, 94, 0, 55, 66, 0, 16, 27, 0, 188, 193, 0, 166, 170,
-    0, 145, 149, 0, 123, 127, 0, 102, 105, 0, 80, 83, 0, 55, 57, 0, 15, 20, 32,
-    186, 168, 27, 164, 149, 17, 144, 130, 0, 122, 110, 0, 101, 91, 0, 79, 71, 0,
-    55, 47, 0, 14, 11, 56, 184, 146, 47, 163, 129, 37, 142, 113, 23, 121, 95, 5,
-    100, 78, 0, 79, 60, 0, 54, 38, 0, 14, 2, 70, 183, 122, 60, 161, 107, 49,
-    141, 94, 35, 120, 79, 20, 100, 64, 0, 78, 48, 0, 54, 27, 0, 13, 0, 80, 182,
-    96, 69, 160, 84, 57, 140, 73, 43, 119, 61, 28, 99, 48, 6, 78, 34, 0, 53, 15,
-    0, 13, 0, 87, 181, 74, 75, 160, 65, 62, 140, 56, 47, 119, 46, 32, 98, 35,
-    12, 77, 21, 0, 53, 2, 0, 13, 0, 0, 171, 225, 0, 151, 199, 0, 132, 174, 0,
-    112, 149, 0, 92, 124, 0, 71, 98, 0, 47, 69, 0, 4, 29, 0, 169, 201, 0, 150,
-    178, 0, 131, 156, 0, 111, 133, 0, 92, 111, 0, 71, 87, 0, 47, 60, 0, 3, 22,
-    41, 168, 180, 36, 148, 159, 28, 130, 140, 15, 110, 118, 0, 91, 98, 0, 70,
-    77, 0, 46, 52, 0, 2, 14, 61, 166, 158, 53, 147, 139, 43, 129, 122, 31, 109,
-    103, 17, 90, 85, 0, 70, 66, 0, 46, 43, 0, 2, 5, 73, 165, 137, 64, 146, 121,
-    53, 128, 106, 40, 108, 89, 26, 89, 73, 6, 69, 55, 0, 46, 33, 0, 1, 0, 83,
-    164, 115, 72, 145, 101, 60, 127, 88, 46, 107, 73, 32, 89, 59, 14, 69, 43, 0,
-    46, 23, 0, 1, 0, 90, 163, 91, 78, 144, 80, 65, 126, 69, 51, 106, 57, 37, 88,
-    44, 19, 68, 30, 0, 45, 11, 0, 1, 0, 95, 163, 72, 82, 143, 62, 69, 125, 53,
-    54, 106, 43, 39, 88, 32, 22, 68, 18, 0, 45, 0, 0, 1, 0, 0, 152, 210, 0, 134,
-    186, 0, 117, 163, 0, 99, 139, 0, 81, 116, 0, 62, 92, 0, 38, 64, 0, 1, 24,
-    47, 151, 188, 42, 133, 167, 35, 117, 146, 24, 98, 124, 10, 81, 103, 0, 61,
-    81, 0, 38, 55, 0, 0, 16, 65, 150, 169, 57, 132, 149, 47, 116, 131, 36, 98,
-    111, 23, 80, 92, 4, 61, 71, 0, 38, 47, 0, 0, 7, 76, 148, 148, 67, 131, 131,
-    56, 115, 114, 44, 97, 96, 31, 79, 79, 14, 61, 61, 0, 38, 38, 0, 0, 1, 84,
-    147, 129, 74, 130, 114, 62, 114, 99, 49, 96, 83, 35, 79, 68, 19, 60, 50, 0,
-    37, 29, 0, 0, 0, 91, 146, 109, 80, 129, 95, 67, 113, 83, 53, 95, 69, 39, 78,
-    55, 23, 60, 39, 1, 37, 20, 0, 0, 0, 97, 146, 87, 84, 128, 76, 71, 112, 65,
-    57, 95, 53, 42, 78, 41, 26, 60, 26, 4, 37, 7, 0, 0, 0, 101, 145, 69, 88,
-    128, 59, 74, 112, 50, 59, 94, 40, 44, 77, 29, 27, 59, 15, 4, 37, 0, 0, 0, 0,
-    52, 132, 195, 47, 117, 172, 40, 102, 151, 30, 85, 129, 19, 69, 107, 2, 51,
-    84, 0, 28, 58, 0, 0, 18, 70, 131, 175, 61, 116, 155, 52, 101, 135, 41, 85,
-    115, 29, 68, 95, 13, 51, 74, 0, 28, 49, 0, 0, 9, 80, 130, 157, 70, 115, 139,
-    59, 100, 121, 47, 84, 103, 35, 68, 85, 19, 51, 65, 0, 28, 42, 0, 0, 1, 87,
-    130, 138, 76, 114, 122, 65, 100, 106, 52, 84, 89, 39, 68, 73, 24, 50, 55, 4,
-    28, 33, 0, 0, 0, 93, 129, 121, 81, 114, 106, 69, 99, 92, 56, 83, 77, 42, 67,
-    62, 27, 50, 46, 7, 29, 25, 0, 0, 0, 98, 128, 102, 86, 113, 89, 73, 98, 77,
-    59, 82, 64, 45, 67, 50, 29, 50, 35, 9, 29, 16, 0, 0, 0, 102, 127, 82, 89,
-    112, 71, 76, 98, 61, 61, 82, 49, 47, 66, 37, 31, 50, 23, 11, 29, 4, 0, 0, 0,
-    105, 127, 66, 92, 112, 56, 78, 97, 47, 63, 82, 37, 48, 66, 25, 32, 50, 11,
-    10, 29, 0, 0, 0, 0, 72, 114, 181, 63, 100, 160, 54, 87, 140, 44, 72, 119,
-    32, 57, 99, 18, 39, 78, 0, 18, 52, 0, 0, 11, 83, 113, 163, 73, 100, 144, 62,
-    86, 126, 50, 71, 107, 38, 57, 88, 24, 40, 68, 3, 19, 44, 0, 0, 3, 89, 113,
-    147, 78, 99, 129, 67, 86, 113, 55, 71, 95, 42, 57, 78, 27, 40, 60, 8, 19,
-    37, 0, 0, 0, 95, 112, 129, 83, 98, 114, 71, 85, 99, 58, 71, 83, 45, 56, 67,
-    30, 40, 50, 11, 20, 29, 0, 0, 0, 99, 111, 113, 86, 98, 99, 74, 85, 86, 60,
-    70, 72, 47, 56, 57, 31, 40, 41, 12, 20, 21, 0, 0, 0, 103, 111, 96, 90, 97,
-    84, 77, 84, 72, 63, 70, 59, 49, 56, 46, 33, 40, 31, 13, 21, 12, 0, 0, 0,
-    106, 110, 78, 93, 97, 67, 79, 84, 57, 64, 70, 46, 50, 56, 34, 34, 40, 19,
-    13, 21, 2, 0, 0, 0, 108, 110, 63, 95, 97, 53, 81, 84, 44, 66, 69, 34, 51,
-    56, 22, 35, 40, 7, 13, 21, 0, 0, 0, 0, 85, 94, 168, 74, 82, 149, 64, 70,
-    130, 53, 57, 110, 41, 43, 91, 27, 26, 71, 5, 5, 47, 0, 0, 4, 92, 94, 151,
-    81, 82, 134, 70, 70, 117, 57, 57, 99, 45, 44, 81, 30, 27, 62, 10, 7, 39, 0,
-    0, 0, 97, 94, 136, 85, 82, 120, 73, 70, 105, 60, 57, 88, 47, 44, 72, 32, 28,
-    54, 13, 8, 32, 0, 0, 0, 101, 94, 121, 88, 82, 106, 76, 70, 92, 62, 57, 77,
-    49, 44, 62, 34, 28, 45, 14, 9, 25, 0, 0, 0, 104, 93, 106, 91, 81, 93, 78,
-    70, 80, 64, 57, 66, 50, 44, 52, 35, 29, 37, 14, 10, 17, 0, 0, 0, 106, 93,
-    90, 93, 81, 78, 80, 69, 67, 66, 57, 55, 52, 44, 42, 36, 29, 27, 15, 11, 8,
-    0, 0, 0, 109, 92, 74, 96, 81, 63, 82, 69, 53, 67, 57, 42, 53, 44, 30, 36,
-    29, 16, 15, 11, 1, 0, 0, 0, 111, 92, 60, 97, 80, 50, 83, 69, 41, 68, 57, 31,
-    53, 44, 20, 37, 30, 5, 15, 11, 0, 0, 0, 0, 94, 73, 155, 82, 63, 137, 72, 52,
-    120, 59, 40, 102, 47, 26, 84, 32, 8, 65, 9, 0, 42, 0, 0, 0, 99, 73, 140, 87,
-    63, 124, 76, 52, 108, 62, 40, 91, 49, 27, 75, 34, 11, 57, 12, 0, 34, 0, 0,
-    0, 103, 73, 126, 90, 63, 111, 78, 53, 97, 64, 41, 81, 51, 28, 66, 35, 13,
-    49, 13, 0, 27, 0, 0, 0, 105, 73, 112, 92, 63, 98, 80, 53, 85, 66, 41, 71,
-    52, 29, 57, 36, 14, 41, 15, 0, 20, 0, 0, 0, 107, 73, 99, 94, 63, 86, 81, 53,
-    74, 67, 41, 61, 53, 29, 48, 37, 15, 32, 16, 0, 13, 0, 0, 0, 110, 73, 85, 96,
-    63, 73, 83, 53, 62, 68, 42, 50, 54, 30, 38, 38, 16, 23, 16, 1, 5, 0, 0, 0,
-    112, 73, 69, 98, 63, 59, 84, 53, 49, 69, 42, 38, 55, 30, 27, 38, 16, 12, 17,
-    1, 0, 0, 0, 0, 113, 73, 57, 99, 63, 47, 85, 53, 38, 70, 42, 28, 55, 30, 17,
-    38, 17, 3, 16, 2, 0, 0, 0, 0, 101, 47, 144, 88, 38, 127, 77, 27, 111, 64,
-    14, 94, 51, 0, 77, 35, 0, 59, 9, 0, 36, 0, 0, 0, 105, 47, 129, 92, 38, 114,
-    80, 28, 99, 66, 16, 83, 53, 0, 68, 37, 0, 51, 13, 0, 29, 0, 0, 0, 107, 48,
-    117, 94, 39, 103, 81, 29, 89, 67, 18, 74, 54, 2, 60, 38, 0, 44, 15, 0, 23,
-    0, 0, 0, 109, 49, 104, 95, 40, 91, 82, 31, 79, 68, 19, 65, 54, 5, 51, 39, 0,
-    36, 17, 0, 16, 0, 0, 0, 110, 50, 92, 97, 40, 80, 84, 31, 68, 69, 20, 56, 55,
-    7, 43, 39, 0, 28, 17, 0, 9, 0, 0, 0, 112, 50, 79, 98, 41, 68, 85, 32, 57,
-    70, 21, 46, 56, 8, 34, 40, 0, 20, 18, 0, 3, 0, 0, 0, 113, 50, 65, 100, 41,
-    55, 86, 33, 46, 71, 22, 35, 56, 10, 23, 40, 0, 8, 17, 0, 0, 0, 0, 0, 115,
-    50, 54, 101, 41, 44, 87, 33, 36, 71, 23, 25, 56, 11, 14, 40, 0, 1, 16, 0, 0,
-    0, 0, 0, 0, 182, 240, 0, 161, 212, 0, 141, 185, 0, 120, 158, 0, 99, 132, 0,
-    78, 106, 0, 53, 75, 0, 12, 35, 0, 180, 214, 0, 159, 189, 0, 140, 166, 0,
-    119, 141, 0, 99, 118, 0, 77, 94, 0, 53, 66, 0, 11, 28, 0, 179, 192, 0, 158,
-    169, 0, 138, 149, 0, 118, 126, 0, 98, 105, 0, 77, 83, 0, 52, 57, 0, 10, 21,
-    0, 177, 168, 0, 156, 149, 0, 137, 130, 0, 116, 110, 0, 97, 91, 0, 76, 71, 0,
-    52, 48, 0, 9, 12, 0, 175, 146, 0, 155, 129, 0, 136, 113, 0, 115, 96, 0, 96,
-    79, 0, 75, 60, 0, 51, 39, 0, 9, 3, 0, 174, 123, 0, 154, 109, 0, 135, 95, 0,
-    115, 80, 0, 95, 65, 0, 75, 49, 0, 51, 28, 0, 8, 0, 0, 173, 98, 0, 153, 87,
-    0, 134, 76, 0, 114, 63, 0, 95, 50, 0, 74, 35, 0, 51, 17, 0, 8, 0, 0, 172,
-    78, 0, 152, 70, 0, 134, 60, 0, 114, 49, 0, 94, 38, 0, 74, 24, 0, 51, 5, 0,
-    8, 0, 0, 163, 224, 0, 144, 198, 0, 126, 173, 0, 107, 148, 0, 88, 123, 0, 68,
-    98, 0, 44, 69, 0, 1, 29, 0, 162, 200, 0, 143, 177, 0, 125, 155, 0, 106, 132,
-    0, 88, 110, 0, 68, 87, 0, 44, 60, 0, 1, 22, 0, 160, 180, 0, 142, 159, 0,
-    124, 139, 0, 105, 118, 0, 87, 98, 0, 67, 77, 0, 44, 52, 0, 0, 15, 0, 159,
-    158, 0, 140, 139, 0, 123, 122, 0, 104, 103, 0, 86, 85, 0, 67, 66, 0, 43, 43,
-    0, 0, 5, 0, 157, 138, 0, 139, 121, 0, 122, 106, 0, 103, 89, 0, 85, 73, 0,
-    66, 56, 0, 43, 34, 0, 0, 0, 0, 156, 116, 0, 138, 102, 0, 121, 89, 0, 103,
-    75, 0, 85, 60, 0, 66, 44, 0, 43, 24, 0, 0, 0, 6, 155, 94, 2, 137, 82, 0,
-    120, 71, 0, 102, 59, 0, 84, 46, 0, 65, 32, 0, 43, 13, 0, 0, 0, 30, 155, 75,
-    23, 137, 66, 11, 120, 57, 0, 102, 46, 0, 84, 35, 0, 65, 20, 0, 43, 2, 0, 0,
-    0, 0, 145, 209, 0, 129, 185, 0, 112, 162, 0, 95, 138, 0, 77, 115, 0, 59, 91,
-    0, 35, 64, 0, 1, 24, 0, 144, 188, 0, 128, 166, 0, 112, 145, 0, 94, 124, 0,
-    77, 103, 0, 58, 81, 0, 35, 55, 0, 0, 16, 0, 143, 168, 0, 127, 149, 0, 111,
-    130, 0, 93, 111, 0, 77, 92, 0, 58, 71, 0, 35, 47, 0, 0, 8, 0, 142, 148, 0,
-    126, 131, 0, 110, 114, 0, 93, 97, 0, 76, 79, 0, 58, 61, 0, 35, 38, 0, 0, 1,
-    0, 141, 130, 0, 125, 114, 0, 109, 100, 0, 92, 84, 0, 75, 68, 0, 58, 51, 0,
-    35, 30, 0, 0, 0, 27, 140, 110, 22, 124, 97, 12, 108, 84, 0, 91, 70, 0, 75,
-    56, 0, 57, 40, 0, 35, 21, 0, 0, 0, 43, 139, 89, 36, 123, 78, 26, 108, 67,
-    12, 91, 55, 0, 74, 43, 0, 57, 28, 0, 35, 9, 0, 0, 0, 51, 139, 72, 43, 123,
-    63, 33, 107, 53, 20, 90, 43, 3, 74, 31, 0, 57, 18, 0, 35, 1, 0, 0, 0, 0,
-    127, 194, 0, 112, 172, 0, 98, 151, 0, 81, 128, 0, 66, 107, 0, 48, 84, 0, 26,
-    58, 0, 0, 18, 0, 126, 174, 0, 111, 154, 0, 97, 135, 0, 81, 115, 0, 65, 95,
-    0, 48, 74, 0, 26, 50, 0, 0, 9, 0, 125, 157, 0, 111, 139, 0, 96, 121, 0, 81,
-    103, 0, 65, 85, 0, 48, 65, 0, 27, 42, 0, 0, 2, 20, 125, 139, 17, 110, 122,
-    9, 96, 107, 0, 80, 90, 0, 65, 73, 0, 48, 56, 0, 27, 34, 0, 0, 0, 39, 124,
-    122, 33, 109, 107, 25, 95, 93, 13, 80, 78, 0, 65, 63, 0, 48, 46, 0, 27, 26,
-    0, 0, 0, 51, 123, 103, 43, 108, 90, 34, 94, 78, 23, 79, 65, 8, 64, 51, 0,
-    48, 36, 0, 27, 17, 0, 0, 0, 59, 122, 84, 51, 108, 73, 41, 94, 63, 29, 79,
-    51, 15, 64, 39, 0, 47, 24, 0, 27, 6, 0, 0, 0, 64, 122, 69, 55, 107, 59, 45,
-    94, 50, 32, 78, 39, 19, 64, 28, 0, 47, 14, 0, 27, 0, 0, 0, 0, 0, 110, 181,
-    0, 97, 160, 0, 83, 140, 0, 69, 119, 0, 54, 99, 0, 37, 78, 0, 16, 53, 0, 0,
-    12, 7, 109, 163, 8, 96, 144, 3, 83, 126, 0, 69, 107, 0, 54, 88, 0, 38, 68,
-    0, 17, 45, 0, 0, 3, 34, 109, 147, 30, 96, 129, 23, 83, 113, 13, 69, 95, 0,
-    54, 78, 0, 38, 60, 0, 18, 37, 0, 0, 0, 48, 108, 130, 41, 95, 114, 33, 82,
-    99, 23, 68, 84, 10, 54, 68, 0, 38, 51, 0, 18, 29, 0, 0, 0, 56, 108, 114, 49,
-    94, 100, 40, 82, 87, 29, 68, 72, 16, 54, 58, 0, 38, 42, 0, 18, 22, 0, 0, 0,
-    63, 107, 97, 55, 94, 85, 45, 81, 73, 34, 68, 60, 21, 54, 47, 5, 38, 32, 0,
-    18, 13, 0, 0, 0, 68, 106, 80, 59, 93, 69, 49, 81, 59, 37, 67, 47, 25, 54,
-    35, 9, 38, 21, 0, 18, 4, 0, 0, 0, 72, 106, 66, 63, 93, 56, 52, 81, 47, 40,
-    67, 36, 27, 53, 25, 11, 38, 11, 0, 18, 0, 0, 0, 0, 28, 92, 168, 24, 80, 149,
-    19, 68, 130, 11, 55, 111, 0, 41, 92, 0, 25, 71, 0, 6, 47, 0, 0, 5, 46, 92,
-    151, 40, 80, 134, 33, 68, 117, 24, 55, 99, 12, 42, 81, 0, 26, 63, 0, 7, 40,
-    0, 0, 0, 55, 91, 137, 48, 80, 121, 40, 68, 105, 30, 55, 89, 18, 42, 72, 2,
-    27, 55, 0, 8, 32, 0, 0, 0, 62, 91, 121, 54, 79, 107, 45, 68, 93, 34, 55, 77,
-    23, 42, 62, 7, 27, 46, 0, 8, 25, 0, 0, 0, 67, 91, 107, 58, 79, 93, 49, 68,
-    81, 38, 55, 67, 26, 42, 53, 12, 27, 37, 0, 8, 18, 0, 0, 0, 72, 90, 91, 62,
-    79, 79, 52, 67, 68, 41, 55, 56, 29, 42, 43, 15, 28, 28, 1, 9, 9, 0, 0, 0,
-    76, 90, 75, 66, 78, 65, 56, 67, 55, 43, 55, 44, 31, 42, 32, 17, 28, 18, 2,
-    9, 2, 0, 0, 0, 78, 90, 62, 68, 78, 52, 58, 67, 43, 45, 55, 33, 32, 42, 22,
-    19, 28, 7, 2, 9, 0, 0, 0, 0, 53, 72, 156, 46, 62, 138, 39, 51, 121, 30, 39,
-    102, 20, 25, 84, 2, 9, 65, 0, 0, 42, 0, 0, 0, 62, 72, 140, 55, 62, 124, 46,
-    52, 108, 36, 40, 91, 25, 27, 75, 9, 11, 57, 0, 0, 34, 0, 0, 0, 68, 72, 127,
-    59, 62, 112, 50, 52, 97, 39, 40, 82, 28, 27, 66, 13, 12, 49, 0, 0, 28, 0, 0,
-    0, 72, 73, 113, 63, 62, 99, 53, 52, 86, 42, 40, 71, 30, 28, 57, 17, 13, 41,
-    0, 0, 21, 0, 0, 0, 76, 72, 100, 66, 62, 87, 56, 52, 75, 44, 41, 62, 32, 29,
-    48, 19, 14, 33, 3, 0, 13, 0, 0, 0, 79, 72, 86, 69, 62, 74, 58, 52, 63, 46,
-    41, 51, 34, 29, 39, 21, 15, 24, 4, 1, 6, 0, 0, 0, 81, 72, 71, 71, 62, 61,
-    60, 52, 51, 48, 41, 40, 35, 29, 28, 22, 15, 13, 5, 1, 0, 0, 0, 0, 83, 72,
-    59, 73, 62, 49, 62, 52, 41, 49, 41, 31, 36, 30, 20, 22, 16, 5, 4, 2, 0, 0,
-    0, 0, 67, 49, 144, 59, 40, 128, 50, 30, 112, 40, 18, 95, 29, 2, 78, 13, 0,
-    60, 0, 0, 37, 0, 0, 0, 73, 50, 130, 64, 40, 115, 55, 31, 100, 44, 19, 84,
-    32, 4, 69, 18, 0, 52, 0, 0, 30, 0, 0, 0, 76, 50, 118, 67, 41, 104, 57, 32,
-    90, 46, 20, 75, 34, 7, 61, 20, 0, 45, 0, 0, 24, 0, 0, 0, 79, 51, 105, 69,
-    42, 92, 59, 33, 80, 47, 21, 66, 35, 9, 52, 22, 0, 37, 1, 0, 16, 0, 0, 0, 81,
-    52, 93, 71, 42, 81, 61, 33, 70, 49, 22, 57, 36, 11, 44, 23, 0, 29, 2, 0, 9,
-    0, 0, 0, 83, 52, 80, 73, 43, 69, 62, 34, 59, 50, 23, 47, 37, 12, 35, 23, 0,
-    21, 3, 0, 3, 0, 0, 0, 85, 52, 67, 75, 43, 57, 64, 34, 47, 51, 24, 36, 38,
-    13, 25, 24, 0, 10, 3, 0, 0, 0, 0, 0, 87, 52, 56, 76, 43, 46, 65, 34, 37, 52,
-    24, 27, 39, 14, 16, 24, 0, 2, 2, 0, 0, 0, 0, 0, 0, 174, 238, 0, 154, 210, 0,
-    135, 184, 0, 115, 157, 0, 95, 132, 0, 75, 105, 0, 50, 75, 0, 6, 35, 0, 172,
-    213, 0, 153, 188, 0, 134, 165, 0, 114, 141, 0, 94, 118, 0, 74, 93, 0, 50,
-    66, 0, 5, 28, 0, 171, 191, 0, 151, 169, 0, 133, 148, 0, 113, 126, 0, 94,
-    105, 0, 73, 83, 0, 50, 57, 0, 5, 21, 0, 169, 168, 0, 150, 148, 0, 131, 130,
-    0, 112, 110, 0, 93, 92, 0, 73, 71, 0, 49, 48, 0, 5, 13, 0, 167, 146, 0, 148,
-    130, 0, 130, 113, 0, 111, 96, 0, 92, 79, 0, 72, 61, 0, 49, 39, 0, 4, 3, 0,
-    166, 124, 0, 147, 110, 0, 129, 96, 0, 110, 81, 0, 92, 66, 0, 72, 49, 0, 49,
-    29, 0, 4, 0, 0, 165, 100, 0, 146, 89, 0, 129, 78, 0, 110, 65, 0, 91, 52, 0,
-    72, 37, 0, 49, 18, 0, 4, 0, 0, 164, 82, 0, 146, 73, 0, 128, 64, 0, 109, 52,
-    0, 91, 41, 0, 72, 26, 0, 49, 8, 0, 4, 0, 0, 157, 223, 0, 138, 197, 0, 121,
-    172, 0, 102, 147, 0, 84, 123, 0, 65, 98, 0, 41, 69, 0, 1, 30, 0, 155, 199,
-    0, 137, 176, 0, 120, 155, 0, 102, 132, 0, 84, 110, 0, 65, 87, 0, 41, 60, 0,
-    1, 22, 0, 154, 179, 0, 136, 158, 0, 119, 139, 0, 101, 118, 0, 83, 98, 0, 64,
-    77, 0, 41, 52, 0, 0, 15, 0, 152, 158, 0, 135, 139, 0, 118, 122, 0, 100, 103,
-    0, 83, 85, 0, 64, 66, 0, 41, 43, 0, 0, 6, 0, 151, 138, 0, 133, 122, 0, 117,
-    106, 0, 99, 90, 0, 82, 74, 0, 64, 56, 0, 41, 35, 0, 0, 0, 0, 150, 117, 0,
-    133, 103, 0, 116, 90, 0, 99, 76, 0, 82, 61, 0, 63, 45, 0, 41, 25, 0, 0, 0,
-    0, 149, 95, 0, 132, 84, 0, 116, 73, 0, 98, 61, 0, 81, 48, 0, 63, 33, 0, 41,
-    15, 0, 0, 0, 0, 148, 78, 0, 131, 69, 0, 115, 59, 0, 98, 49, 0, 81, 37, 0,
-    63, 23, 0, 40, 4, 0, 0, 0, 0, 140, 208, 0, 124, 184, 0, 108, 161, 0, 91,
-    137, 0, 74, 115, 0, 56, 91, 0, 33, 64, 0, 1, 24, 0, 139, 187, 0, 123, 165,
-    0, 107, 145, 0, 90, 123, 0, 74, 102, 0, 56, 80, 0, 33, 55, 0, 0, 17, 0, 138,
-    168, 0, 122, 149, 0, 106, 130, 0, 90, 110, 0, 73, 91, 0, 56, 71, 0, 33, 47,
-    0, 0, 8, 0, 136, 148, 0, 121, 131, 0, 105, 115, 0, 89, 97, 0, 73, 80, 0, 55,
-    61, 0, 33, 39, 0, 0, 1, 0, 135, 130, 0, 120, 115, 0, 105, 100, 0, 88, 84, 0,
-    72, 69, 0, 55, 52, 0, 33, 30, 0, 0, 0, 0, 135, 111, 0, 119, 98, 0, 104, 85,
-    0, 88, 71, 0, 72, 57, 0, 55, 41, 0, 33, 22, 0, 0, 0, 0, 134, 91, 0, 118, 80,
-    0, 103, 69, 0, 87, 57, 0, 72, 44, 0, 54, 30, 0, 33, 11, 0, 0, 0, 0, 133, 75,
-    0, 118, 65, 0, 103, 56, 0, 87, 45, 0, 71, 34, 0, 54, 20, 0, 33, 2, 0, 0, 0,
-    0, 123, 194, 0, 108, 171, 0, 94, 150, 0, 78, 128, 0, 63, 106, 0, 46, 84, 0,
-    24, 58, 0, 0, 19, 0, 122, 174, 0, 107, 154, 0, 93, 135, 0, 78, 114, 0, 63,
-    95, 0, 46, 74, 0, 25, 50, 0, 0, 10, 0, 121, 157, 0, 107, 139, 0, 93, 121, 0,
-    78, 103, 0, 63, 85, 0, 46, 65, 0, 25, 42, 0, 0, 2, 0, 120, 139, 0, 106, 122,
-    0, 92, 107, 0, 77, 90, 0, 62, 74, 0, 46, 56, 0, 25, 34, 0, 0, 0, 0, 119,
-    122, 0, 105, 107, 0, 91, 93, 0, 77, 78, 0, 62, 63, 0, 45, 47, 0, 25, 26, 0,
-    0, 0, 0, 119, 104, 0, 104, 91, 0, 91, 79, 0, 76, 66, 0, 62, 52, 0, 45, 37,
-    0, 25, 18, 0, 0, 0, 0, 118, 86, 0, 104, 75, 0, 90, 64, 0, 76, 52, 0, 61, 40,
-    0, 45, 26, 0, 25, 7, 0, 0, 0, 0, 118, 71, 0, 104, 61, 0, 90, 52, 0, 75, 42,
-    0, 61, 30, 0, 45, 17, 0, 24, 1, 0, 0, 0, 0, 107, 181, 0, 94, 160, 0, 81,
-    140, 0, 66, 119, 0, 52, 99, 0, 35, 78, 0, 15, 53, 0, 0, 13, 0, 106, 163, 0,
-    93, 144, 0, 80, 126, 0, 66, 107, 0, 52, 88, 0, 36, 68, 0, 15, 45, 0, 0, 4,
-    0, 106, 147, 0, 93, 130, 0, 80, 113, 0, 66, 96, 0, 52, 79, 0, 36, 60, 0, 16,
-    37, 0, 0, 0, 0, 105, 130, 0, 92, 115, 0, 79, 100, 0, 66, 84, 0, 52, 68, 0,
-    36, 51, 0, 16, 30, 0, 0, 0, 0, 104, 115, 0, 91, 101, 0, 79, 87, 0, 65, 73,
-    0, 52, 59, 0, 36, 43, 0, 16, 22, 0, 0, 0, 0, 104, 98, 0, 91, 86, 0, 79, 74,
-    0, 65, 61, 0, 52, 48, 0, 36, 33, 0, 16, 14, 0, 0, 0, 0, 103, 81, 0, 90, 70,
-    0, 78, 60, 0, 65, 49, 0, 52, 37, 0, 36, 22, 0, 16, 5, 0, 0, 0, 0, 103, 68,
-    0, 90, 58, 0, 78, 49, 0, 65, 38, 0, 51, 27, 0, 36, 13, 0, 16, 0, 0, 0, 0, 0,
-    90, 168, 0, 78, 149, 0, 67, 130, 0, 54, 111, 0, 40, 92, 0, 24, 72, 0, 6, 47,
-    0, 0, 6, 0, 90, 152, 0, 78, 134, 0, 67, 117, 0, 54, 99, 0, 40, 82, 0, 25,
-    63, 0, 6, 40, 0, 0, 0, 0, 89, 137, 0, 78, 121, 0, 66, 106, 0, 54, 89, 0, 41,
-    73, 0, 26, 55, 0, 7, 33, 0, 0, 0, 0, 89, 122, 0, 77, 107, 0, 66, 93, 0, 54,
-    78, 0, 41, 63, 0, 26, 46, 0, 7, 25, 0, 0, 0, 0, 89, 108, 0, 77, 94, 0, 66,
-    81, 0, 53, 68, 0, 41, 54, 0, 26, 38, 0, 8, 18, 0, 0, 0, 7, 88, 92, 4, 77,
-    80, 0, 66, 69, 0, 53, 57, 0, 41, 44, 0, 27, 29, 0, 8, 10, 0, 0, 0, 23, 88,
-    77, 19, 76, 66, 11, 65, 56, 0, 53, 45, 0, 41, 33, 0, 27, 19, 0, 8, 3, 0, 0,
-    0, 30, 88, 64, 26, 76, 54, 18, 65, 45, 4, 53, 35, 0, 41, 24, 0, 27, 9, 0, 8,
-    0, 0, 0, 0, 0, 72, 156, 0, 62, 138, 0, 51, 121, 0, 39, 103, 0, 26, 85, 0, 9,
-    66, 0, 0, 42, 0, 0, 0, 0, 72, 141, 0, 62, 125, 0, 51, 109, 0, 39, 92, 0, 27,
-    75, 0, 11, 57, 0, 0, 35, 0, 0, 0, 0, 72, 128, 0, 62, 113, 0, 51, 98, 0, 40,
-    82, 0, 27, 67, 0, 12, 50, 0, 1, 28, 0, 0, 0, 17, 72, 114, 13, 62, 100, 6,
-    51, 87, 0, 40, 72, 0, 28, 58, 0, 13, 42, 0, 1, 21, 0, 0, 0, 28, 72, 101, 23,
-    61, 88, 16, 51, 76, 4, 40, 62, 0, 28, 49, 0, 14, 34, 0, 1, 14, 0, 0, 0, 36,
-    72, 87, 30, 61, 75, 23, 51, 64, 12, 40, 52, 1, 28, 40, 0, 14, 25, 0, 1, 7,
-    0, 0, 0, 41, 71, 72, 35, 61, 62, 28, 51, 52, 17, 40, 41, 5, 28, 29, 0, 14,
-    15, 0, 0, 0, 0, 0, 0, 45, 71, 60, 39, 61, 51, 31, 51, 42, 20, 40, 32, 8, 29,
-    21, 0, 15, 6, 0, 0, 0, 0, 0, 0, 0, 51, 145, 0, 42, 129, 0, 33, 113, 0, 20,
-    96, 0, 5, 79, 0, 0, 60, 0, 0, 37, 0, 0, 0, 24, 52, 131, 21, 42, 116, 15, 33,
-    101, 5, 21, 85, 0, 7, 69, 0, 0, 52, 0, 1, 30, 0, 0, 0, 34, 52, 119, 29, 43,
-    105, 22, 33, 91, 12, 22, 76, 0, 8, 61, 0, 0, 45, 0, 1, 24, 0, 0, 0, 40, 53,
-    106, 34, 43, 93, 27, 34, 80, 17, 23, 67, 5, 9, 53, 0, 0, 37, 0, 0, 16, 0, 0,
-    0, 45, 53, 94, 38, 44, 82, 31, 34, 70, 20, 24, 58, 10, 11, 45, 0, 0, 29, 0,
-    0, 9, 0, 0, 0, 48, 53, 81, 42, 44, 70, 34, 35, 60, 24, 24, 48, 13, 12, 36,
-    0, 0, 21, 0, 0, 3, 0, 0, 0, 51, 53, 68, 45, 44, 58, 37, 35, 48, 26, 25, 37,
-    15, 13, 26, 2, 1, 11, 0, 0, 0, 0, 0, 0, 54, 54, 57, 47, 44, 47, 39, 35, 39,
-    28, 25, 29, 17, 13, 17, 4, 1, 3, 0, 0, 0, 0, 0, 0]);
-
+  // The coefficients below was found using numerical analysis: the method of
+  // steepest descent for the sum((f_i - color_value_i)^2) for r/g/b colors,
+  // where color_value is the tabular value from the table of sampled RGB colors
+  // from CMYK US Web Coated (SWOP) colorspace, and f_i is the corresponding
+  // CMYK color conversion using the estimation below:
+  //   f(A, B,.. N) = Acc+Bcm+Ccy+Dck+c+Fmm+Gmy+Hmk+Im+Jyy+Kyk+Ly+Mkk+Nk+255
   function convertToRgb(src, srcOffset, srcScale, dest, destOffset) {
-    // using lut as in spline interpolation (see function.js)
-    var cubeVertices = 16; // 1 << number of colors
-    var cubeN = new Float32Array(cubeVertices);
-    var cubeVertex = new Uint32Array(cubeVertices);
-    for (var j = 0; j < cubeVertices; j++)
-      cubeN[j] = 1;
+    var c = src[srcOffset + 0] * srcScale;
+    var m = src[srcOffset + 1] * srcScale;
+    var y = src[srcOffset + 2] * srcScale;
+    var k = src[srcOffset + 3] * srcScale;
 
-    var k = 3, pos = 1;
-    var lutDomain = 7, lutStep = 8;
-    for (var i = 3; i >= 0; i--) {
-      var e = src[srcOffset + i] * srcScale * lutDomain;
+    var r =
+      c * (-4.387332384609988 * c + 54.48615194189176 * m +
+           18.82290502165302 * y + 212.25662451639585 * k +
+           -285.2331026137004) +
+      m * (1.7149763477362134 * m - 5.6096736904047315 * y +
+           -17.873870861415444 * k - 5.497006427196366) +
+      y * (-2.5217340131683033 * y - 21.248923337353073 * k +
+           17.5119270841813) +
+      k * (-21.86122147463605 * k - 189.48180835922747) + 255;
+    var g =
+      c * (8.841041422036149 * c + 60.118027045597366 * m +
+           6.871425592049007 * y + 31.159100130055922 * k +
+           -79.2970844816548) +
+      m * (-15.310361306967817 * m + 17.575251261109482 * y +
+           131.35250912493976 * k - 190.9453302588951) +
+      y * (4.444339102852739 * y + 9.8632861493405 * k - 24.86741582555878) +
+      k * (-20.737325471181034 * k - 187.80453709719578) + 255;
+    var b = 
+      c * (0.8842522430003296 * c + 8.078677503112928 * m +
+           30.89978309703729 * y - 0.23883238689178934 * k +
+           -14.183576799673286) +
+      m * (10.49593273432072 * m + 63.02378494754052 * y +
+           50.606957656360734 * k - 112.23884253719248) +
+      y * (0.03296041114873217 * y + 115.60384449646641 * k +
+           -193.58209356861505) +
+      k * (-22.33816807309886 * k - 180.12613974708367) + 255;
 
-      var e0 = e < lutDomain ? Math.floor(e) : e - 1; // e1 = e0 + 1;
-      var n0 = e0 + 1 - e; // (e1 - e) / (e1 - e0);
-      var n1 = e - e0; // (e - e0) / (e1 - e0);
-      var offset0 = e0 * k;
-      var offset1 = offset0 + k; // e1 * k
-      for (var j = 0; j < cubeVertices; j++) {
-        if (j & pos) {
-          cubeN[j] *= n1;
-          cubeVertex[j] += offset1;
-        } else {
-          cubeN[j] *= n0;
-          cubeVertex[j] += offset0;
-        }
-      }
-
-      k *= lutStep;
-      pos <<= 1;
-    }
-    var y0 = 0, y1 = 0, y2 = 0;
-    for (var i = 0; i < cubeVertices; i++)
-      y0 += lut[cubeVertex[i]] * cubeN[i];
-    for (var i = 0; i < cubeVertices; i++)
-      y1 += lut[cubeVertex[i] + 1] * cubeN[i];
-    for (var i = 0; i < cubeVertices; i++)
-      y2 += lut[cubeVertex[i] + 2] * cubeN[i];
-    dest[destOffset] = y0 > 255 ? 255 : y0;
-    dest[destOffset + 1] = y1 > 255 ? 255 : y1;
-    dest[destOffset + 2] = y2 > 255 ? 255 : y2;
+    dest[destOffset] = r > 255 ? 255 : r < 0 ? 0 : r;
+    dest[destOffset + 1] = g > 255 ? 255 : g < 0 ? 0 : g;
+    dest[destOffset + 2] = b > 255 ? 255 : b < 0 ? 0 : b;
   }
 
   function DeviceCmykCS() {
@@ -13850,7 +13337,8 @@ var DeviceCmykCS = (function DeviceCmykCSClosure() {
     createRgbBuffer: ColorSpace.prototype.createRgbBuffer,
     isDefaultDecode: function DeviceCmykCS_isDefaultDecode(decodeMap) {
       return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
+    },
+    usesZeroToOneRange: true
   };
 
   return DeviceCmykCS;
@@ -13911,11 +13399,26 @@ var LabCS = (function LabCSClosure() {
       return (108 / 841) * (x - 4 / 29);
   }
 
-  function convertToRgb(cs, src, srcOffset, dest, destOffset) {
+  function decode(value, high1, low2, high2) {
+    return low2 + (value) * (high2 - low2) / (high1);
+  }
+
+  // If decoding is needed maxVal should be 2^bits per component - 1.
+  function convertToRgb(cs, src, srcOffset, maxVal, dest, destOffset) {
+    // XXX: Lab input is in the range of [0, 100], [amin, amax], [bmin, bmax]
+    // not the usual [0, 1]. If a command like setFillColor is used the src
+    // values will already be within the correct range. However, if we are
+    // converting an image we have to map the values to the correct range given
+    // above.
     // Ls,as,bs <---> L*,a*,b* in the spec
     var Ls = src[srcOffset];
     var as = src[srcOffset + 1];
     var bs = src[srcOffset + 2];
+    if (maxVal !== false) {
+      Ls = decode(Ls, maxVal, 0, 100);
+      as = decode(as, maxVal, cs.amin, cs.amax);
+      bs = decode(bs, maxVal, cs.bmin, cs.bmax);
+    }
 
     // Adjust limits of 'as' and 'bs'
     as = as > cs.amax ? cs.amax : as < cs.amin ? cs.amin : as;
@@ -13944,36 +13447,40 @@ var LabCS = (function LabCSClosure() {
       g = X * -0.9689 + Y * 1.8758 + Z * 0.0415;
       b = X * 0.0557 + Y * -0.2040 + Z * 1.0570;
     }
-
-    // clamp color values to [0,255] range
-    dest[destOffset] = r < 0 ? 0 : r > 1 ? 255 : r * 255;
-    dest[destOffset + 1] = g < 0 ? 0 : g > 1 ? 255 : g * 255;
-    dest[destOffset + 2] = b < 0 ? 0 : b > 1 ? 255 : b * 255;
+    // clamp color values to [0,1] range then convert to [0,255] range.
+    dest[destOffset] = Math.sqrt(r < 0 ? 0 : r > 1 ? 1 : r) * 255;
+    dest[destOffset + 1] = Math.sqrt(g < 0 ? 0 : g > 1 ? 1 : g) * 255;
+    dest[destOffset + 2] = Math.sqrt(b < 0 ? 0 : b > 1 ? 1 : b) * 255;
   }
 
   LabCS.prototype = {
     getRgb: function LabCS_getRgb(src, srcOffset) {
       var rgb = new Uint8Array(3);
-      convertToRgb(this, src, srcOffset, rgb, 0);
+      convertToRgb(this, src, srcOffset, false, rgb, 0);
       return rgb;
     },
     getRgbItem: function LabCS_getRgbItem(src, srcOffset, dest, destOffset) {
-      convertToRgb(this, src, srcOffset, dest, destOffset);
+      convertToRgb(this, src, srcOffset, false, dest, destOffset);
+    },
+    getRgbBuffer: function LabCS_getRgbBuffer(src, srcOffset, count,
+                                              dest, destOffset, bits) {
+      var maxVal = (1 << bits) - 1;
+      for (var i = 0; i < count; i++) {
+        convertToRgb(this, src, srcOffset, maxVal, dest, destOffset);
+        srcOffset += 3;
+        destOffset += 3;
+      }
     },
     getOutputLength: function LabCS_getOutputLength(inputLength) {
       return inputLength;
     },
     isPassthrough: ColorSpace.prototype.isPassthrough,
     isDefaultDecode: function LabCS_isDefaultDecode(decodeMap) {
-      // From Table 90 in Adobe's:
-      // "Document management - Portable document format", 1st ed, 2008
-      if (decodeMap[0] === 0 && decodeMap[1] === 100 &&
-          decodeMap[2] === this.amin && decodeMap[3] === this.amax &&
-          decodeMap[4] === this.bmin && decodeMap[5] === this.bmax)
-        return true;
-      else
-        return false;
-    }
+      // XXX: Decoding is handled with the lab conversion because of the strange
+      // ranges that are used.
+      return true;
+    },
+    usesZeroToOneRange: false
   };
   return LabCS;
 })();
@@ -14884,10 +14391,6 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
             xobj.dict.get('Resources') || resources,
             dependencyArray, queue);
 
-        self.getOperatorList(xobj,
-                             xobj.dict.get('Resources') || resources,
-                             dependencyArray, queue);
-
         // Add the dependencies that are required to execute the
         // operatorList.
         insertDependency(dependencyArray.slice(depIdx));
@@ -15199,6 +14702,73 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
       return queue;
     },
 
+    getAnnotationsOperatorList:
+        function PartialEvaluator_getAnnotationsOperatorList(annotations,
+                                                             dependency) {
+      // 12.5.5: Algorithm: Appearance streams
+      function getTransformMatrix(rect, bbox, matrix) {
+        var bounds = Util.getAxialAlignedBoundingBox(bbox, matrix);
+        var minX = bounds[0];
+        var minY = bounds[1];
+        var maxX = bounds[2];
+        var maxY = bounds[3];
+        var width = rect[2] - rect[0];
+        var height = rect[3] - rect[1];
+        var xRatio = width / (maxX - minX);
+        var yRatio = height / (maxY - minY);
+        return [
+          xRatio,
+          0,
+          0,
+          yRatio,
+          rect[0] - minX * xRatio,
+          rect[1] - minY * yRatio
+        ];
+      }
+
+      var fnArray = [];
+      var argsArray = [];
+      // deal with annotations
+      for (var i = 0, length = annotations.length; i < length; ++i) {
+        var annotation = annotations[i];
+
+        // check whether we can visualize annotation
+        if (!annotation ||
+            !annotation.annotationFlags ||
+            (annotation.annotationFlags & 0x0022) || // Hidden or NoView
+            !annotation.rect ||                      // rectangle is nessessary
+            !annotation.appearance) {                // appearance is nessessary
+          continue;
+        }
+
+        // apply rectangle
+        var rect = annotation.rect;
+        var bbox = annotation.bbox;
+        var matrix = annotation.matrix;
+        var transform = getTransformMatrix(rect, bbox, matrix);
+        var border = annotation.border;
+
+        fnArray.push('beginAnnotation');
+        argsArray.push([rect, transform, matrix, border]);
+
+        if (annotation.appearance) {
+          var list = this.getOperatorList(annotation.appearance,
+            annotation.resources, dependency);
+
+          Util.concatenateToArray(fnArray, list.fnArray);
+          Util.concatenateToArray(argsArray, list.argsArray);
+        }
+
+        fnArray.push('endAnnotation');
+        argsArray.push([]);
+      }
+
+      return {
+        fnArray: fnArray,
+        argsArray: argsArray
+      };
+    },
+
     optimizeQueue: function PartialEvaluator_optimizeQueue(queue) {
       var fnArray = queue.fnArray, argsArray = queue.argsArray;
       // grouping paintInlineImageXObject's into paintInlineImageXObjectGroup
@@ -18374,7 +17944,7 @@ var Font = (function FontClosure() {
     file.virtualOffset += data.length;
   }
 
-  function getRanges(glyphs) {
+  function getRanges(glyphs, deltas) {
     // Array.sort() sorts by characters, not numerically, so convert to an
     // array of characters.
     var codes = [];
@@ -18389,14 +17959,14 @@ var Font = (function FontClosure() {
     var ranges = [];
     for (var n = 0; n < length; ) {
       var start = codes[n].unicode;
-      var codeIndices = [codes[n].code];
+      var codeIndices = [deltas ? deltas[codes[n].code] : codes[n].code + 1];
       ++n;
       var end = start;
       while (n < length && end + 1 == codes[n].unicode) {
-        codeIndices.push(codes[n].code);
+        codeIndices.push(deltas ? deltas[codes[n].code] : codes[n].code + 1);
         ++end;
         ++n;
-        if (end === 0x10000) { break; }
+        if (end === 0xFFFF) { break; }
       }
       ranges.push([start, end, codeIndices]);
     }
@@ -18405,7 +17975,7 @@ var Font = (function FontClosure() {
   }
 
   function createCmapTable(glyphs, deltas) {
-    var ranges = getRanges(glyphs);
+    var ranges = getRanges(glyphs, deltas);
 
     var numTables = ranges[ranges.length - 1][1] > 0xFFFF ? 2 : 1;
     var cmap = '\x00\x00' + // version
@@ -18419,8 +17989,11 @@ var Font = (function FontClosure() {
     }
     var bmpLength = i + 1;
 
-    if (ranges[i][1] === 0xFFFF) { ranges[i][1] = 0xFFFE; }
-    var segCount = bmpLength + 1;
+    if (ranges[i][0] < 0xFFFF && ranges[i][1] === 0xFFFF) {
+      ranges[i][1] = 0xFFFE;
+    }
+    var trailingRangesCount = ranges[i][1] < 0xFFFF ? 1 : 0; 
+    var segCount = bmpLength + trailingRangesCount;
     var segCount2 = segCount * 2;
     var searchRange = getMaxPower2(segCount) * 2;
     var searchEntry = Math.log(segCount) / Math.log(2);
@@ -18434,41 +18007,44 @@ var Font = (function FontClosure() {
     var glyphsIds = '';
     var bias = 0;
 
-    if (deltas) {
-      for (var i = 0, ii = bmpLength; i < ii; i++) {
-        var range = ranges[i];
-        var start = range[0];
-        var end = range[1];
+    for (var i = 0, ii = bmpLength; i < ii; i++) {
+      var range = ranges[i];
+      var start = range[0];
+      var end = range[1];
+      startCount += string16(start);
+      endCount += string16(end);
+      var codes = range[2];
+      var contiguous = true;
+      for (var j = 1, jj = codes.length; j < jj; ++j) {
+        if (codes[j] !== codes[j - 1] + 1) {
+          contiguous = false;
+          break;
+        }
+      }
+      if (!contiguous) {
         var offset = (segCount - i) * 2 + bias * 2;
         bias += (end - start + 1);
 
-        startCount += string16(start);
-        endCount += string16(end);
         idDeltas += string16(0);
         idRangeOffsets += string16(offset);
 
-        var codes = range[2];
-        for (var j = 0, jj = codes.length; j < jj; ++j)
-          glyphsIds += string16(deltas[codes[j]]);
-      }
-    } else {
-      for (var i = 0, ii = bmpLength; i < ii; i++) {
-        var range = ranges[i];
-        var start = range[0];
-        var end = range[1];
-        var startCode = range[2][0];
+        for (var j = 0, jj = codes.length; j < jj; ++j) {
+          glyphsIds += string16(codes[j]);
+        }
+      } else {
+        var startCode = codes[0];
 
-        startCount += string16(start);
-        endCount += string16(end);
-        idDeltas += string16((startCode - start + 1) & 0xFFFF);
+        idDeltas += string16((startCode - start) & 0xFFFF);
         idRangeOffsets += string16(0);
       }
     }
 
-    endCount += '\xFF\xFF';
-    startCount += '\xFF\xFF';
-    idDeltas += '\x00\x01';
-    idRangeOffsets += '\x00\x00';
+    if (trailingRangesCount > 0) {
+      endCount += '\xFF\xFF';
+      startCount += '\xFF\xFF';
+      idDeltas += '\x00\x01';
+      idRangeOffsets += '\x00\x00';
+    }
 
     var format314 = '\x00\x00' + // language
                     string16(segCount2) +
@@ -18486,46 +18062,24 @@ var Font = (function FontClosure() {
               string32(4 + numTables * 8 +
                        4 + format314.length); // start of the table record
       format31012 = '';
-      if (deltas) {
-        for (var i = 0, ii = ranges.length; i < ii; i++) {
-          var range = ranges[i];
-          var start = range[0];
-          var codes = range[2];
-          var code = deltas[codes[0]];
-          for (var j = 1, jj = codes.length; j < jj; ++j) {
-            if (deltas[codes[j]] !== deltas[codes[j - 1]] + 1) {
-              var end = range[0] + j - 1;
-              format31012 += string32(start) + // startCharCode
-                             string32(end) + // endCharCode
-                             string32(code); // startGlyphID
-              start = end + 1;
-              code = deltas[codes[j]];
-            }
+      for (var i = 0, ii = ranges.length; i < ii; i++) {
+        var range = ranges[i];
+        var start = range[0];
+        var codes = range[2];
+        var code = codes[0];
+        for (var j = 1, jj = codes.length; j < jj; ++j) {
+          if (codes[j] !== codes[j - 1] + 1) {
+            var end = range[0] + j - 1;
+            format31012 += string32(start) + // startCharCode
+                           string32(end) + // endCharCode
+                           string32(code); // startGlyphID
+            start = end + 1;
+            code = codes[j];
           }
-          format31012 += string32(start) + // startCharCode
-                         string32(range[1]) + // endCharCode
-                         string32(code); // startGlyphID
-        }
-      } else {
-        for (var i = 0, ii = ranges.length; i < ii; i++) {
-          var range = ranges[i];
-          var start = range[0];
-          var codes = range[2];
-          var code = codes[0];
-          for (var j = 1, jj = codes.length; j < jj; ++j) {
-            if (codes[j] !== codes[j - 1] + 1) {
-              var end = range[0] + j - 1;
-              format31012 += string32(start) + // startCharCode
-                             string32(end) + // endCharCode
-                             string32(code); // startGlyphID
-              start = end + 1;
-              code = codes[j];
-            }
-          }
-          format31012 += string32(start) + // startCharCode
-                         string32(range[1]) + // endCharCode
-                         string32(code); // startGlyphID
         }
+        format31012 += string32(start) + // startCharCode
+                       string32(range[1]) + // endCharCode
+                       string32(code); // startGlyphID
       }
       header31012 = '\x00\x0C' + // format
                     '\x00\x00' + // reserved
@@ -20815,8 +20369,11 @@ var Type1CharString = (function Type1CharStringClosure() {
  * Type1Parser encapsulate the needed code for parsing a Type1 font
  * program. Some of its logic depends on the Type2 charstrings
  * structure.
+ * Note: this doesn't really parse the font since that would require evaluation
+ * of PostScript, but it is possible in most cases to extract what we need
+ * without a full parse.
  */
-var Type1Parser = function type1Parser() {
+var Type1Parser = (function Type1ParserClosure() {
   /*
    * Decrypt a Sequence of Ciphertext Bytes to Produce the Original Sequence
    * of Plaintext Bytes. The function took a key as a parameter which can be
@@ -20839,271 +20396,258 @@ var Type1Parser = function type1Parser() {
     return decryptedString.slice(discardNumber);
   }
 
-  /*
-   * Returns an object containing a Subrs array and a CharStrings
-   * array extracted from and eexec encrypted block of data
-   */
-  function readNumberArray(str, index) {
-    var start = index;
-    while (str[index++] != '[')
-      start++;
-    start++;
-
-    var count = 0;
-    while (str[index++] != ']')
-      count++;
-
-    str = str.substr(start, count);
-
-    str = str.trim();
-    // Remove adjacent spaces
-    str = str.replace(/\s+/g, ' ');
-
-    var array = str.split(' ');
-    for (var i = 0, ii = array.length; i < ii; i++)
-      array[i] = parseFloat(array[i] || 0);
-    return array;
+  function isSpecial(c) {
+    return c === '/' ||
+           c === '[' || c === ']' ||
+           c === '{' || c === '}' ||
+           c === '(' || c === ')';
   }
 
-  function readNumber(str, index) {
-    while (str[index] == ' ')
-      index++;
-
-    var start = index;
-
-    var count = 0;
-    while (str[index++] != ' ')
-      count++;
-
-    return parseFloat(str.substr(start, count) || 0);
-  }
-
-  function readBoolean(str, index) {
-    while (str[index] == ' ')
-      index++;
-
-    var start = index;
-
-    var count = 0;
-    var length = str.length;
-    while (index < length && str[index++] != ' ') {
-      count++;
+  function Type1Parser(stream, encrypted) {
+    if (encrypted) {
+      stream = new Stream(decrypt(stream.getBytes(), EEXEC_ENCRYPT_KEY, 4));
     }
-
-    // Use 1 and 0 since that's what type2 charstrings use.
-    return str.substr(start, count) === 'true' ? 1 : 0;
+    this.stream = stream;
   }
 
-
-  function isSeparator(c) {
-    return c == ' ' || c == '\n' || c == '\x0d';
-  }
-
-  this.extractFontProgram = function Type1Parser_extractFontProgram(stream) {
-    var eexec = decrypt(stream, EEXEC_ENCRYPT_KEY, 4);
-    var eexecStr = '';
-    for (var i = 0, ii = eexec.length; i < ii; i++)
-      eexecStr += String.fromCharCode(eexec[i]);
-
-    var glyphsSection = false, subrsSection = false;
-    var subrs = [], charstrings = [];
-    var program = {
-      subrs: [],
-      charstrings: [],
-      properties: {
-        'privateData': {
-          'lenIV': 4
+  Type1Parser.prototype = {
+    readNumberArray: function Type1Parser_readNumberArray() {
+      this.getToken(); // read '[' or '{' (arrays can start with either)
+      var array = [];
+      while (true) {
+        var token = this.getToken();
+        if (token === null || token === ']' || token === '}') {
+          break;
         }
+        array.push(parseFloat(token || 0));
       }
-    };
+      return array;
+    },
 
-    var glyph = '';
-    var token = '';
-    var length = 0;
+    readNumber: function Type1Parser_readNumber() {
+      var token = this.getToken();
+      return parseFloat(token || 0);
+    },
 
-    var c = '';
-    var count = eexecStr.length;
-    for (var i = 0; i < count; i++) {
-      var getToken = function getToken() {
-        while (i < count && isSeparator(eexecStr[i]))
-          ++i;
+    readInt: function Type1Parser_readInt() {
+      // Use '| 0' to prevent setting a double into length such as the double
+      // does not flow into the loop variable.
+      var token = this.getToken();
+      return parseInt(token || 0, 10) | 0;
+    },
 
-        var token = '';
-        while (i < count && !isSeparator(eexecStr[i]))
-          token += eexecStr[i++];
+    readBoolean: function Type1Parser_readBoolean() {
+      var token = this.getToken();
 
-        return token;
-      };
-      var c = eexecStr[i];
+      // Use 1 and 0 since that's what type2 charstrings use.
+      return token === 'true' ? 1 : 0;
+    },
 
-      if ((glyphsSection || subrsSection) &&
-          (token == 'RD' || token == '-|')) {
-        i++;
-        var data = eexec.slice(i, i + length);
-        var lenIV = program.properties.privateData['lenIV'];
-        var encoded = decrypt(data, CHAR_STRS_ENCRYPT_KEY, lenIV);
+    getToken: function Type1Parser_getToken() {
+      // Eat whitespace and comments.
+      var comment = false;
+      var ch;
+      var stream = this.stream;
+      while (true) {
+        if ((ch = stream.lookChar()) === null)
+          return null;
 
-        if (glyphsSection) {
-          charstrings.push({
-            glyph: glyph,
-            encoded: encoded
-          });
-        } else {
-          subrs.push(encoded);
-        }
-        i += length;
-        token = '';
-      } else if (isSeparator(c)) {
-        // Use '| 0' to prevent setting a double into length such as the double
-        // does not flow into the loop variable.
-        length = parseInt(token, 10) | 0;
-        token = '';
-      } else {
-        token += c;
-        if (!glyphsSection) {
-          switch (token) {
-            case '/CharString':
-              glyphsSection = true;
-              break;
-            case '/Subrs':
-              ++i;
-              var num = parseInt(getToken(), 10);
-              getToken(); // read in 'array'
-              for (var j = 0; j < num; ++j) {
-                var t = getToken(); // read in 'dup'
-                if (t == 'ND' || t == '|-' || t == 'noaccess')
-                  break;
-                var index = parseInt(getToken(), 10);
-                if (index > j)
-                  j = index;
-                var length = parseInt(getToken(), 10);
-                getToken(); // read in 'RD'
-                var data = eexec.slice(i + 1, i + 1 + length);
-                var lenIV = program.properties.privateData['lenIV'];
-                var encoded = decrypt(data, CHAR_STRS_ENCRYPT_KEY, lenIV);
-                i = i + 1 + length;
-                t = getToken(); // read in 'NP'
-                if (t == 'noaccess')
-                  getToken(); // read in 'put'
-                subrs[index] = encoded;
-              }
-              break;
-            case '/BlueValues':
-            case '/OtherBlues':
-            case '/FamilyBlues':
-            case '/FamilyOtherBlues':
-              var blueArray = readNumberArray(eexecStr, i + 1);
-              // *Blue* values may contain invalid data: disables reading of
-              // those values when hinting is disabled.
-              if (blueArray.length > 0 && (blueArray.length % 2) === 0 &&
-                  HINTING_ENABLED) {
-                program.properties.privateData[token.substring(1)] = blueArray;
-              }
-              break;
-            case '/StemSnapH':
-            case '/StemSnapV':
-              program.properties.privateData[token.substring(1)] =
-                readNumberArray(eexecStr, i + 1);
-              break;
-            case '/StdHW':
-            case '/StdVW':
-              program.properties.privateData[token.substring(1)] =
-                readNumberArray(eexecStr, i + 1)[0];
-              break;
-            case '/BlueShift':
-            case '/lenIV':
-            case '/BlueFuzz':
-            case '/BlueScale':
-            case '/LanguageGroup':
-            case '/ExpansionFactor':
-              program.properties.privateData[token.substring(1)] =
-                readNumber(eexecStr, i + 1);
-              break;
-            case '/ForceBold':
-              program.properties.privateData[token.substring(1)] =
-                readBoolean(eexecStr, i + 1);
-              break;
+        if (comment) {
+          if (ch === '\x0a' || ch === '\x0d') {
+            comment = false;
           }
-        } else if (c == '/') {
-          token = glyph = '';
-          while ((c = eexecStr[++i]) != ' ')
-            glyph += c;
+        } else if (ch === '%') {
+          comment = true;
+        } else if (!Lexer.isSpace(ch)) {
+          break;
         }
+        stream.skip();
       }
-    }
-
-    for (var i = 0; i < charstrings.length; i++) {
-      var glyph = charstrings[i].glyph;
-      var encoded = charstrings[i].encoded;
-      var charString = new Type1CharString();
-      var error = charString.convert(encoded, subrs);
-      var output = charString.output;
-      if (error) {
-        // It seems when FreeType encounters an error while evaluating a glyph
-        // that it completely ignores the glyph so we'll mimic that behaviour
-        // here and put an endchar to make the validator happy.
-        output = [14];
+      if (isSpecial(ch)) {
+        stream.skip();
+        return ch;
       }
-      program.charstrings.push({
-        glyph: glyph,
-        data: output,
-        seac: charString.seac,
-        lsb: charString.lsb,
-        width: charString.width
-      });
-    }
+      var token = '';
+      do {
+        token += ch;
+        stream.skip();
+        ch = stream.lookChar();
+      } while (ch !== null && !Lexer.isSpace(ch) && !isSpecial(ch));
+      return token;
+    },
 
-    return program;
-  };
+    /*
+     * Returns an object containing a Subrs array and a CharStrings
+     * array extracted from and eexec encrypted block of data
+     */
+    extractFontProgram: function Type1Parser_extractFontProgram() {
+      var stream = this.stream;
 
-  this.extractFontHeader = function Type1Parser_extractFontHeader(stream,
-                                                                  properties) {
-    var headerString = '';
-    for (var i = 0, ii = stream.length; i < ii; i++)
-      headerString += String.fromCharCode(stream[i]);
-
-    var token = '';
-    var count = headerString.length;
-    for (var i = 0; i < count; i++) {
-      var getToken = function getToken() {
-        var character = headerString[i];
-        while (i < count && (isSeparator(character) || character == '/'))
-          character = headerString[++i];
-
-        var token = '';
-        while (i < count && !(isSeparator(character) || character == '/')) {
-          token += character;
-          character = headerString[++i];
+      var subrs = [], charstrings = [];
+      var program = {
+        subrs: [],
+        charstrings: [],
+        properties: {
+          'privateData': {
+            'lenIV': 4
+          }
         }
-
-        return token;
       };
-
-      var c = headerString[i];
-      if (isSeparator(c)) {
+      var token;
+      while ((token = this.getToken()) !== null) {
+        if (token !== '/') {
+          continue;
+        }
+        token = this.getToken();
         switch (token) {
-          case '/FontMatrix':
-            var matrix = readNumberArray(headerString, i + 1);
+          case 'CharStrings':
+            // The number immediately following CharStrings must be greater or
+            // equal to the number of CharStrings.
+            this.getToken();
+            this.getToken(); // read in 'dict'
+            this.getToken(); // read in 'dup'
+            this.getToken(); // read in 'begin'
+            while(true) {
+              token = this.getToken();
+              if (token === null || token === 'end') {
+                break;
+              }
+
+              if (token !== '/') {
+                continue;
+              }
+              var glyph = this.getToken();
+              var length = this.readInt();
+              this.getToken(); // read in 'RD' or '-|'
+              var data = stream.makeSubStream(stream.pos + 1, length);
+              var lenIV = program.properties.privateData['lenIV'];
+              var encoded = decrypt(data.getBytes(), CHAR_STRS_ENCRYPT_KEY,
+                                    lenIV);
+              // Skip past the required space and binary data.
+              stream.skip(1 + length);
+              token = this.getToken(); // read in 'ND' or '|-'
+              if (token === 'noaccess') {
+                this.getToken(); // read in 'def'
+              }
+              charstrings.push({
+                glyph: glyph,
+                encoded: encoded
+              });
+            }
+            break;
+          case 'Subrs':
+            var num = this.readInt();
+            this.getToken(); // read in 'array'
+            for (var j = 0; j < num; ++j) {
+              token = this.getToken(); // read in 'dup'
+              var index = this.readInt();
+              if (index > j)
+                j = index;
+              var length = this.readInt();
+              this.getToken(); // read in 'RD' or '-|'
+              var data = stream.makeSubStream(stream.pos + 1, length);
+              var lenIV = program.properties.privateData['lenIV'];
+              var encoded = decrypt(data.getBytes(), CHAR_STRS_ENCRYPT_KEY,
+                                    lenIV);
+              // Skip past the required space and binary data.
+              stream.skip(1 + length);
+              token = this.getToken(); // read in 'NP' or '|'
+              if (token === 'noaccess') {
+                this.getToken(); // read in 'put'
+              }
+              subrs[index] = encoded;
+            }
+            break;
+          case 'BlueValues':
+          case 'OtherBlues':
+          case 'FamilyBlues':
+          case 'FamilyOtherBlues':
+            var blueArray = this.readNumberArray();
+            // *Blue* values may contain invalid data: disables reading of
+            // those values when hinting is disabled.
+            if (blueArray.length > 0 && (blueArray.length % 2) === 0 &&
+                HINTING_ENABLED) {
+              program.properties.privateData[token] = blueArray;
+            }
+            break;
+          case 'StemSnapH':
+          case 'StemSnapV':
+            program.properties.privateData[token] = this.readNumberArray();
+            break;
+          case 'StdHW':
+          case 'StdVW':
+            program.properties.privateData[token] =
+              this.readNumberArray()[0];
+            break;
+          case 'BlueShift':
+          case 'lenIV':
+          case 'BlueFuzz':
+          case 'BlueScale':
+          case 'LanguageGroup':
+          case 'ExpansionFactor':
+            program.properties.privateData[token] = this.readNumber();
+            break;
+          case 'ForceBold':
+            program.properties.privateData[token] = this.readBoolean();
+            break;
+        }
+      }
+
+      for (var i = 0; i < charstrings.length; i++) {
+        var glyph = charstrings[i].glyph;
+        var encoded = charstrings[i].encoded;
+        var charString = new Type1CharString();
+        var error = charString.convert(encoded, subrs);
+        var output = charString.output;
+        if (error) {
+          // It seems when FreeType encounters an error while evaluating a glyph
+          // that it completely ignores the glyph so we'll mimic that behaviour
+          // here and put an endchar to make the validator happy.
+          output = [14];
+        }
+        program.charstrings.push({
+          glyph: glyph,
+          data: output,
+          seac: charString.seac,
+          lsb: charString.lsb,
+          width: charString.width
+        });
+      }
+
+      return program;
+    },
+
+    extractFontHeader: function Type1Parser_extractFontHeader(properties) {
+      var token;
+      while ((token = this.getToken()) !== null) {
+        if (token !== '/') {
+          continue;
+        }
+        token = this.getToken();
+        switch (token) {
+          case 'FontMatrix':
+            var matrix = this.readNumberArray();
             properties.fontMatrix = matrix;
             break;
-          case '/Encoding':
-            var encodingArg = getToken();
+          case 'Encoding':
+            var encodingArg = this.getToken();
             var encoding;
             if (!/^\d+$/.test(encodingArg)) {
               // encoding name is specified
               encoding = Encodings[encodingArg];
             } else {
               encoding = [];
-              var size = parseInt(encodingArg, 10);
-              getToken(); // read in 'array'
+              var size = parseInt(encodingArg, 10) | 0;
+              this.getToken(); // read in 'array'
 
               for (var j = 0; j < size; j++) {
-                var token = getToken();
-                if (token == 'dup') {
-                  var index = parseInt(getToken(), 10);
-                  var glyph = getToken();
+                var token = this.getToken();
+                if (token === 'dup') {
+                  var index = this.readInt();
+                  this.getToken(); // read in '/'
+                  var glyph = this.getToken();
                   encoding[index] = glyph;
-                  getToken(); // read the in 'put'
+                  this.getToken(); // read the in 'put'
                 }
               }
             }
@@ -21113,13 +20657,12 @@ var Type1Parser = function type1Parser() {
             }
             break;
         }
-        token = '';
-      } else {
-        token += c;
       }
     }
   };
-};
+
+  return Type1Parser;
+})();
 
 /**
  * The CFF class takes a Type1 file and wrap it into a
@@ -21193,17 +20736,17 @@ var CFFStandardStrings = [
   'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold'
 ];
 
-var type1Parser = new Type1Parser();
-
 // Type1Font is also a CIDFontType0.
 var Type1Font = function Type1Font(name, file, properties) {
   // Get the data block containing glyphs and subrs informations
-  var headerBlock = file.getBytes(properties.length1);
-  type1Parser.extractFontHeader(headerBlock, properties);
+  var headerBlock = new Stream(file.getBytes(properties.length1));
+  var headerBlockParser = new Type1Parser(headerBlock);
+  headerBlockParser.extractFontHeader(properties);
 
   // Decrypt the data blocks and retrieve it's content
-  var eexecBlock = file.getBytes(properties.length2);
-  var data = type1Parser.extractFontProgram(eexecBlock);
+  var eexecBlock = new Stream(file.getBytes(properties.length2));
+  var eexecBlockParser = new Type1Parser(eexecBlock, true);
+  var data = eexecBlockParser.extractFontProgram();
   for (var info in data.properties)
     properties[info] = data.properties[info];
 
@@ -27062,7 +26605,7 @@ var PDFImage = (function PDFImageClosure() {
     // Clamp the value to the range
     return value < 0 ? 0 : value > max ? max : value;
   }
-  function PDFImage(xref, res, image, inline, smask, mask) {
+  function PDFImage(xref, res, image, inline, smask, mask, isMask) {
     this.image = image;
     if (image.getParams) {
       // JPX/JPEG2000 streams directly contain bits per component
@@ -27108,8 +26651,9 @@ var PDFImage = (function PDFImageClosure() {
 
     this.decode = dict.get('Decode', 'D');
     this.needsDecode = false;
-    if (this.decode && this.colorSpace &&
-        !this.colorSpace.isDefaultDecode(this.decode)) {
+    if (this.decode &&
+        ((this.colorSpace && !this.colorSpace.isDefaultDecode(this.decode)) ||
+         (isMask && !ColorSpace.isDefaultDecode(this.decode, 1)))) {
       this.needsDecode = true;
       // Do some preprocessing to avoid more math.
       var max = (1 << bitsPerComponent) - 1;
@@ -27127,7 +26671,7 @@ var PDFImage = (function PDFImageClosure() {
       this.smask = new PDFImage(xref, res, smask, false);
     } else if (mask) {
       if (isStream(mask)) {
-        this.mask = new PDFImage(xref, res, mask, false);
+        this.mask = new PDFImage(xref, res, mask, false, null, null, true);
       } else {
         // Color key mask (just an array).
         this.mask = mask;
@@ -27229,13 +26773,37 @@ var PDFImage = (function PDFImageClosure() {
         return this.height;
       return Math.max(this.height, this.smask.height);
     },
+    decodeBuffer: function PDFImage_decodeBuffer(buffer) {
+      var bpc = this.bpc;
+      var decodeMap = this.decode;
+      var numComps = this.numComps;
+
+      var decodeAddends, decodeCoefficients;
+      var decodeAddends = this.decodeAddends;
+      var decodeCoefficients = this.decodeCoefficients;
+      var max = (1 << bpc) - 1;
+
+      if (bpc === 1) {
+        // If the buffer needed decode that means it just needs to be inverted.
+        for (var i = 0, ii = buffer.length; i < ii; i++) {
+          buffer[i] = +!(buffer[i]);
+        }
+        return;
+      }
+      var index = 0;
+      for (var i = 0, ii = this.width * this.height; i < ii; i++) {
+        for (var j = 0; j < numComps; j++) {
+          buffer[index] = decodeAndClamp(buffer[index], decodeAddends[j],
+                                            decodeCoefficients[j], max);
+          index++;
+        }
+      }
+    },
     getComponents: function PDFImage_getComponents(buffer) {
       var bpc = this.bpc;
-      var needsDecode = this.needsDecode;
-      var decodeMap = this.decode;
 
       // This image doesn't require any extra work.
-      if (bpc == 8 && !needsDecode)
+      if (bpc === 8)
         return buffer;
 
       var bufferLength = buffer.length;
@@ -27248,29 +26816,11 @@ var PDFImage = (function PDFImageClosure() {
       var output = bpc <= 8 ? new Uint8Array(length) :
         bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
       var rowComps = width * numComps;
-      var decodeAddends, decodeCoefficients;
-      if (needsDecode) {
-        decodeAddends = this.decodeAddends;
-        decodeCoefficients = this.decodeCoefficients;
-      }
+
       var max = (1 << bpc) - 1;
 
-      if (bpc == 8) {
-        // Optimization for reading 8 bpc images that have a decode.
-        for (var i = 0, ii = length; i < ii; ++i) {
-          var compIndex = i % numComps;
-          var value = buffer[i];
-          value = decodeAndClamp(value, decodeAddends[compIndex],
-                          decodeCoefficients[compIndex], max);
-          output[i] = value;
-        }
-      } else if (bpc == 1) {
+      if (bpc === 1) {
         // Optimization for reading 1 bpc images.
-        var valueZero = 0, valueOne = 1;
-        if (decodeMap) {
-          valueZero = decodeMap[0] ? 1 : 0;
-          valueOne = decodeMap[1] ? 1 : 0;
-        }
         var mask = 0;
         var buf = 0;
 
@@ -27287,7 +26837,7 @@ var PDFImage = (function PDFImageClosure() {
             mask = 128;
           }
 
-          output[i] = !(buf & mask) ? valueZero : valueOne;
+          output[i] = +!!(buf & mask);
         }
       } else {
         // The general case that handles all other bpc values.
@@ -27305,12 +26855,7 @@ var PDFImage = (function PDFImageClosure() {
 
           var remainingBits = bits - bpc;
           var value = buf >> remainingBits;
-          if (needsDecode) {
-            var compIndex = i % numComps;
-            value = decodeAndClamp(value, decodeAddends[compIndex],
-                            decodeCoefficients[compIndex], max);
-          }
-          output[i] = value;
+          output[i] = value < 0 ? 0 : value > max ? max : value;
           buf = buf & ((1 << remainingBits) - 1);
           bits = remainingBits;
         }
@@ -27410,21 +26955,27 @@ var PDFImage = (function PDFImageClosure() {
       // imgArray can be incomplete (e.g. after CCITT fax encoding)
       var actualHeight = 0 | (imgArray.length / rowBytes *
                          height / originalHeight);
+      var comps = this.getComponents(imgArray);
+      // Build opacity here since color key masking needs to be perormed on
+      // undecoded values.
+      var opacity = this.getOpacity(width, height, comps);
 
-      var comps = this.colorSpace.createRgbBuffer(this.getComponents(imgArray),
-        0, originalWidth * originalHeight, bpc);
+      if (this.needsDecode) {
+        this.decodeBuffer(comps);
+      }
+      var rgbBuf = this.colorSpace.createRgbBuffer(comps, 0,
+                                    originalWidth * originalHeight, bpc);
       if (originalWidth != width || originalHeight != height)
-        comps = PDFImage.resize(comps, this.bpc, 3, originalWidth,
+        rgbBuf = PDFImage.resize(rgbBuf, this.bpc, 3, originalWidth,
                                 originalHeight, width, height);
       var compsPos = 0;
-      var opacity = this.getOpacity(width, height, imgArray);
       var opacityPos = 0;
       var length = width * actualHeight * 4;
 
       for (var i = 0; i < length; i += 4) {
-        buffer[i] = comps[compsPos++];
-        buffer[i + 1] = comps[compsPos++];
-        buffer[i + 2] = comps[compsPos++];
+        buffer[i] = rgbBuf[compsPos++];
+        buffer[i + 1] = rgbBuf[compsPos++];
+        buffer[i + 2] = rgbBuf[compsPos++];
         buffer[i + 3] = opacity[opacityPos++];
       }
     },
@@ -27442,6 +26993,9 @@ var PDFImage = (function PDFImageClosure() {
       var imgArray = this.getImageBytes(height * rowBytes);
 
       var comps = this.getComponents(imgArray);
+      if (this.needsDecode) {
+        this.decodeBuffer(comps);
+      }
       var length = width * height;
       // we aren't using a colorspace so we need to scale the value
       var scale = 255 / ((1 << bpc) - 1);
@@ -34039,11 +33593,6 @@ var WorkerMessageHandler = {
     handler.on('RenderPageRequest', function wphSetupRenderPage(data) {
       var pageNum = data.pageIndex + 1;
 
-      // The following code does quite the same as
-      // Page.prototype.startRendering, but stops at one point and sends the
-      // result back to the main thread.
-      var gfx = new CanvasGraphics(null);
-
       var start = Date.now();
 
       var dependency = [];
diff --git a/browser/extensions/pdfjs/content/web/debugger.js b/browser/extensions/pdfjs/content/web/debugger.js
index c14ad3fdad75..2305bb7731c0 100644
--- a/browser/extensions/pdfjs/content/web/debugger.js
+++ b/browser/extensions/pdfjs/content/web/debugger.js
@@ -46,7 +46,7 @@ var FontInspector = (function FontInspectorClosure() {
     }
   }
   function textLayerClick(e) {
-    if (!e.target.dataset.fontName || e.target.tagName != 'DIV')
+    if (!e.target.dataset.fontName || e.target.tagName.toUpperCase() !== 'DIV')
       return;
     var fontName = e.target.dataset.fontName;
     var selects = document.getElementsByTagName('input');
diff --git a/browser/extensions/pdfjs/content/web/viewer.css b/browser/extensions/pdfjs/content/web/viewer.css
index dabae8b1106a..e647a751da23 100644
--- a/browser/extensions/pdfjs/content/web/viewer.css
+++ b/browser/extensions/pdfjs/content/web/viewer.css
@@ -88,6 +88,18 @@ select {
   margin-bottom: 100%;
 }
 
+:-webkit-full-screen a:not(.internalLink) {
+  display: none;
+}
+
+:-moz-full-screen a:not(.internalLink) {
+  display: none;
+}
+
+:fullscreen a:not(.internalLink) {
+  display: none;
+}
+
 #viewerContainer.presentationControls {
   cursor: default;
 }
@@ -391,12 +403,14 @@ html[dir='ltr'] #toolbarViewerLeft > *,
 html[dir='ltr'] #toolbarViewerMiddle > *,
 html[dir='ltr'] #toolbarViewerRight > *,
 html[dir='ltr'] .findbar > * {
+  position: relative;
   float: left;
 }
 html[dir='rtl'] #toolbarViewerLeft > *,
 html[dir='rtl'] #toolbarViewerMiddle > *,
 html[dir='rtl'] #toolbarViewerRight > *,
 html[dir='rtl'] .findbar > * {
+  position: relative;
   float: right;
 }
 
@@ -747,6 +761,14 @@ html[dir='rtl'] #findPrevious {
 html[dir='rtl'] #findNext {
   margin-left: 3px;
 }
+.toolbarButton::before {
+  /* All matching images have a size of 16x16
+   * (except for the print button: 18x16)
+   * All relevant containers have a size of 32x25 */
+  position: absolute;
+  top: 4px;
+  left: 7px;
+}
 
 html[dir='ltr'] .toolbarButton.findPrevious::before {
   display: inline-block;
@@ -806,6 +828,7 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
 .toolbarButton.print::before {
   display: inline-block;
   content: url(images/toolbarButton-print.png);
+  left: 6px;
 }
 
 .toolbarButton.openFile::before {
@@ -1038,7 +1061,6 @@ html[dir='rtl'] .outlineItem > a {
   color: hsla(0,0%,100%,1);
 }
 
-.noOutline,
 .noResults {
   font-size: 12px;
   color: hsla(0,0%,100%,.8);
diff --git a/browser/extensions/pdfjs/content/web/viewer.js b/browser/extensions/pdfjs/content/web/viewer.js
index f50e6102c812..af134417cd55 100644
--- a/browser/extensions/pdfjs/content/web/viewer.js
+++ b/browser/extensions/pdfjs/content/web/viewer.js
@@ -922,7 +922,7 @@ var PDFView = {
                   doc.webkitRequestFullScreen;
 
     // Disable fullscreen button if we're in an iframe
-    if (!!window.frameElement)
+    if (window.parent !== window)
       support = false;
 
     Object.defineProperty(this, 'supportsFullScreen', { value: support,
@@ -952,6 +952,16 @@ var PDFView = {
     return support;
   },
 
+  get supportsDocumentColors() {
+    var support = true;
+    support = FirefoxCom.requestSync('supportsDocumentColors');
+    Object.defineProperty(this, 'supportsDocumentColors', { value: support,
+                                                            enumerable: true,
+                                                            configurable: true,
+                                                            writable: false });
+    return support;
+  },
+
   get isHorizontalScrollbarEnabled() {
     var div = document.getElementById('viewerContainer');
     return div.scrollWidth > div.clientWidth;
@@ -1370,6 +1380,7 @@ var PDFView = {
     PDFJS.Promise.all(promises).then(function() {
       pdfDocument.getOutline().then(function(outline) {
         self.outline = new DocumentOutlineView(outline);
+        document.getElementById('viewOutline').disabled = !outline;
       });
 
       // Make all navigation keys work on document load,
@@ -1979,6 +1990,7 @@ var PageView = function pageView(container, id, scale,
           PDFView.navigateTo(dest);
         return false;
       };
+      link.className = 'internalLink';
     }
     function createElementWithStyle(tagName, item, rect) {
       if (!rect) {
@@ -2233,6 +2245,13 @@ var PageView = function pageView(container, id, scale,
           'Web fonts are disabled: unable to use embedded PDF fonts.'));
         PDFView.fallback();
       }
+      if (self.textLayer && self.textLayer.textDivs &&
+          self.textLayer.textDivs.length > 0 &&
+          !PDFView.supportsDocumentColors) {
+        console.error(mozL10n.get('web_colors_disabled', null,
+          'Web colors are disabled.'));
+        PDFView.fallback();
+      }
       if (error) {
         PDFView.error(mozL10n.get('rendering_error', null,
           'An error occurred while rendering the page.'), error);
@@ -2536,9 +2555,17 @@ var ThumbnailView = function thumbnailView(container, id, defaultViewport) {
 
 var DocumentOutlineView = function documentOutlineView(outline) {
   var outlineView = document.getElementById('outlineView');
+  var outlineButton = document.getElementById('viewOutline');
   while (outlineView.firstChild)
     outlineView.removeChild(outlineView.firstChild);
 
+  if (!outline) {
+    if (!outlineView.classList.contains('hidden'))
+      PDFView.switchSidebarView('thumbs');
+
+    return;
+  }
+
   function bindItemLink(domObj, item) {
     domObj.href = PDFView.getDestinationHash(item.dest);
     domObj.onclick = function documentOutlineViewOnclick(e) {
@@ -2547,14 +2574,6 @@ var DocumentOutlineView = function documentOutlineView(outline) {
     };
   }
 
-  if (!outline) {
-    var noOutline = document.createElement('div');
-    noOutline.classList.add('noOutline');
-    noOutline.textContent = mozL10n.get('no_outline', null,
-      'No Outline Available');
-    outlineView.appendChild(noOutline);
-    return;
-  }
 
   var queue = [{parent: outlineView, items: outline}];
   while (queue.length > 0) {
@@ -2643,7 +2662,6 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv, pageIdx) {
 
   this.beginLayout = function textLayerBuilderBeginLayout() {
     this.textDivs = [];
-    this.textLayerQueue = [];
     this.renderingDone = false;
   };
 
@@ -3418,9 +3436,9 @@ window.addEventListener('keydown', function keydown(evt) {
 
   // Some shortcuts should not get handled if a control/input element
   // is selected.
-  var curElement = document.activeElement;
-  if (curElement && (curElement.tagName == 'INPUT' ||
-                     curElement.tagName == 'SELECT')) {
+  var curElement = document.activeElement || document.querySelector(':focus');
+  if (curElement && (curElement.tagName.toUpperCase() === 'INPUT' ||
+                     curElement.tagName.toUpperCase() === 'SELECT')) {
     return;
   }
   var controlsElement = document.getElementById('toolbar');
diff --git a/browser/locales/en-US/pdfviewer/viewer.properties b/browser/locales/en-US/pdfviewer/viewer.properties
index 9255bfc6c8b8..e0d25ac79b41 100644
--- a/browser/locales/en-US/pdfviewer/viewer.properties
+++ b/browser/locales/en-US/pdfviewer/viewer.properties
@@ -53,9 +53,6 @@ thumbs_label=Thumbnails
 findbar.title=Find in Document
 findbar_label=Find
 
-# Document outline messages
-no_outline=No Outline Available
-
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -123,3 +120,4 @@ request_password=PDF is protected by a password:
 printing_not_supported=Warning: Printing is not fully supported by this browser.
 printing_not_ready=Warning: The PDF is not fully loaded for printing.
 web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
+web_colors_disabled=Web colors are disabled.

From 43f304766296ed46bcf08c2425f988c10ebb0039 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 16 Apr 2013 10:39:16 -0700
Subject: [PATCH 353/438] Bug 857989 - Add Serif/Sans Serif font toggle to
 Reader Mode. r=lucasr

---
 mobile/android/app/mobile.js                  |  3 +++
 .../android/chrome/content/aboutReader.html   |  2 ++
 mobile/android/chrome/content/aboutReader.js  | 26 +++++++++++++++++++
 .../en-US/chrome/aboutReader.properties       |  3 +++
 mobile/android/themes/core/aboutReader.css    | 15 +++++++++--
 5 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 4a9b191960e2..168d200ca5f6 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -653,6 +653,9 @@ pref("reader.margin_size", 5);
 // The default color scheme in reader (light, dark, sepia)
 pref("reader.color_scheme", "light");
 
+// The font type in reader (sans-serif, serif)
+pref("reader.font_type", "sans-serif");
+
 // Used to show a first-launch tip in reader
 pref("reader.has_used_toolbar", false);
 
diff --git a/mobile/android/chrome/content/aboutReader.html b/mobile/android/chrome/content/aboutReader.html
index eaa89665e4fc..bee6f0197460 100644
--- a/mobile/android/chrome/content/aboutReader.html
+++ b/mobile/android/chrome/content/aboutReader.html
@@ -29,6 +29,8 @@
       <li class="dropdown-popup">
         <ul id="color-scheme-buttons" class="segmented-button"></ul>
         <hr></hr>
+        <ul id="font-type-buttons" class="segmented-button"></ul>
+        <hr></hr>
         <div id="font-size-control" class="step-control"></div>
         <hr></hr>
         <div id="margin-size-control" class="step-control"></div>
diff --git a/mobile/android/chrome/content/aboutReader.js b/mobile/android/chrome/content/aboutReader.js
index 7b165cfb3577..ca2b53d21f66 100644
--- a/mobile/android/chrome/content/aboutReader.js
+++ b/mobile/android/chrome/content/aboutReader.js
@@ -69,6 +69,17 @@ let AboutReader = function(doc, win) {
   this._setupSegmentedButton("color-scheme-buttons", colorSchemeOptions, colorScheme, this._setColorScheme.bind(this));
   this._setColorScheme(colorScheme);
 
+  let fontTypeOptions = [
+    { name: gStrings.GetStringFromName("aboutReader.fontTypeSansSerif"),
+      value: "sans-serif"},
+    { name: gStrings.GetStringFromName("aboutReader.fontTypeSerif"),
+      value: "serif"}
+  ];
+
+  let fontType = Services.prefs.getCharPref("reader.font_type");
+  this._setupSegmentedButton("font-type-buttons", fontTypeOptions, fontType, this._setFontType.bind(this));
+  this._setFontType(fontType);
+
   let fontTitle = gStrings.GetStringFromName("aboutReader.textTitle");
   this._setupStepControl("font-size-control", fontTitle, this._onFontSizeChange.bind(this));
   this._fontSize = 0;
@@ -297,6 +308,21 @@ AboutReader.prototype = {
     Services.prefs.setCharPref("reader.color_scheme", this._colorScheme);
   },
 
+  _setFontType: function Reader_setFontType(newFontType) {
+    if (this._fontType === newFontType)
+      return;
+
+    let bodyClasses = this._doc.body.classList;
+
+    if (this._fontType)
+      bodyClasses.remove(this._fontType);
+
+    this._fontType = newFontType;
+    bodyClasses.add(this._fontType);
+
+    Services.prefs.setCharPref("reader.font_type", this._fontType);
+  },
+
   _getToolbarVisibility: function Reader_getToolbarVisibility() {
     return !this._toolbarElement.classList.contains("toolbar-hidden");
   },
diff --git a/mobile/android/locales/en-US/chrome/aboutReader.properties b/mobile/android/locales/en-US/chrome/aboutReader.properties
index 1c911b173964..dd6bdf03efd5 100644
--- a/mobile/android/locales/en-US/chrome/aboutReader.properties
+++ b/mobile/android/locales/en-US/chrome/aboutReader.properties
@@ -12,4 +12,7 @@ aboutReader.colorSchemeLight=Light
 aboutReader.colorSchemeDark=Dark
 aboutReader.colorSchemeSepia=Sepia
 
+aboutReader.fontTypeSansSerif=Sans
+aboutReader.fontTypeSerif=Serif
+
 aboutReader.toolbarTip=Tap the screen to show reader options
diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 145b46b26769..b6b4df020816 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -7,7 +7,6 @@ html {
 }
 
 body {
-  font-family: "Open Sans","Droid Sans",sans-serif;
   margin-top: 20px;
   margin-bottom: 20px;
 }
@@ -22,6 +21,14 @@ body {
   color: #eeeeee;
 }
 
+.sans-serif {
+  font-family: "Open Sans",sans-serif;
+}
+
+.serif {
+  font-family: "Charis SIL",serif;
+}
+
 .message {
   margin-top: 40px;
   display: none;
@@ -42,7 +49,6 @@ body {
 }
 
 .header > h1 {
-  font-family: "Open Sans","Droid Sans",sans-serif;
   font-weight: 300;
   line-height: 1.1em;
   width: 100%;
@@ -404,6 +410,11 @@ body {
   float: left;
 }
 
+.dropdown-popup > hr:first-of-type {
+  float: none;
+  margin: 0;
+}
+
 .dropdown-popup .button:active {
   background-color: #ccc;
 }

From 82e8d55330388f275766a473e671e1e7fbb90f55 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 16 Apr 2013 10:39:16 -0700
Subject: [PATCH 354/438] Bug 860326 - Don't update BrowserToolbar after
 editing a top site on about:home. r=wesj

---
 mobile/android/base/BrowserApp.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index ecdf25b6b618..a8576f8bb6a5 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -801,7 +801,12 @@ abstract public class BrowserApp extends GeckoApp
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        String url = resultCode == Activity.RESULT_OK ? data.getStringExtra(AwesomeBar.URL_KEY) : null;
+        String url = null;
+        // Don't update the url in the toolbar if the activity was just launched to pick a site.
+        boolean pickSite = data.getStringExtra(AwesomeBar.TARGET_KEY).equals(AwesomeBar.Target.PICK_SITE.toString());
+        if (resultCode == Activity.RESULT_OK && !pickSite) {
+            url = data.getStringExtra(AwesomeBar.URL_KEY);
+        }
         mBrowserToolbar.fromAwesomeBarSearch(url);
     }
 

From 17984156f4a7a65664f379cffc51ada0ffcf20b0 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Tue, 16 Apr 2013 09:53:33 -0700
Subject: [PATCH 355/438] No bug; fix typo in header comment for
 gfxCallbackDrawable. comment-only, DONTBUILD

---
 gfx/thebes/gfxDrawable.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxDrawable.h b/gfx/thebes/gfxDrawable.h
index 1acdb3776637..9d05f219ef13 100644
--- a/gfx/thebes/gfxDrawable.h
+++ b/gfx/thebes/gfxDrawable.h
@@ -92,7 +92,7 @@ public:
 };
 
 /**
- * gfxSurfaceDrawable
+ * gfxCallbackDrawable
  * A convenience implementation of gfxDrawable for callbacks.
  */
 class THEBES_API gfxCallbackDrawable : public gfxDrawable {

From b460b44c8770bad0fa9589f615583aaa7648c923 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 17 Apr 2013 10:52:52 -0400
Subject: [PATCH 356/438] Bug 860494 - Move the named property check further
 down in XrayWrapper. r=bz

---
 js/xpconnect/wrappers/XrayWrapper.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index d76dc37f9a68..8ba8a4dde8ee 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1477,14 +1477,25 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, HandleObject wra
         return true;
     }
 
+    if (!JS_GetPropertyDescriptorById(cx, holder, id, 0, desc))
+        return false;
+    if (desc->obj) {
+        desc->obj = wrapper;
+        return true;
+    }
+
+    // Nothing in the cache. Call through, and cache the result.
+    if (!Traits::resolveNativeProperty(cx, wrapper, holder, id, desc, flags))
+        return false;
+
     // We need to handle named access on the Window somewhere other than
     // Traits::resolveOwnProperty, because per spec it happens on the Global
     // Scope Polluter and thus the resulting properties are non-|own|. However,
-    // we're set up (below) to cache (on the holder) anything that comes out of
+    // we're set up (above) to cache (on the holder) anything that comes out of
     // resolveNativeProperty, which we don't want for something dynamic like
-    // named access. So we just handle it here.
+    // named access. So we just handle it separately here.
     nsGlobalWindow *win;
-    if (Traits::Type == XrayForWrappedNative && JSID_IS_STRING(id) &&
+    if (!desc->obj && Traits::Type == XrayForWrappedNative && JSID_IS_STRING(id) &&
         (win = static_cast<nsGlobalWindow*>(As<nsPIDOMWindow>(wrapper))))
     {
         nsCOMPtr<nsIDOMWindow> childDOMWin = win->GetChildWindow(id);
@@ -1500,16 +1511,6 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, HandleObject wra
         }
     }
 
-    if (!JS_GetPropertyDescriptorById(cx, holder, id, 0, desc))
-        return false;
-    if (desc->obj) {
-        desc->obj = wrapper;
-        return true;
-    }
-
-    // Nothing in the cache. Call through, and cache the result.
-    if (!Traits::resolveNativeProperty(cx, wrapper, holder, id, desc, flags))
-        return false;
 
     if (!desc->obj &&
         id == nsXPConnect::GetRuntimeInstance()->GetStringID(XPCJSRuntime::IDX_TO_STRING))

From 0fcaa3f3cdc652af5c498fbab437ec987d551a7e Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 17 Apr 2013 10:52:52 -0400
Subject: [PATCH 357/438] Bug 860494 - Tests. r=bz

---
 js/xpconnect/tests/chrome/Makefile.in         |  1 +
 js/xpconnect/tests/chrome/test_bug860494.xul  | 37 +++++++++++++++++++
 js/xpconnect/tests/mochitest/Makefile.in      |  1 +
 .../tests/mochitest/file_bug860494.html       | 14 +++++++
 4 files changed, 53 insertions(+)
 create mode 100644 js/xpconnect/tests/chrome/test_bug860494.xul
 create mode 100644 js/xpconnect/tests/mochitest/file_bug860494.html

diff --git a/js/xpconnect/tests/chrome/Makefile.in b/js/xpconnect/tests/chrome/Makefile.in
index 48708fcac4c6..4dabc4a09bfe 100644
--- a/js/xpconnect/tests/chrome/Makefile.in
+++ b/js/xpconnect/tests/chrome/Makefile.in
@@ -50,6 +50,7 @@ MOCHITEST_CHROME_FILES = \
 		test_bug812415.xul \
 		test_bug853283.xul \
 		test_bug853571.xul \
+		test_bug860494.xul \
 		test_APIExposer.xul \
 		test_chrometoSource.xul \
 		outoflinexulscript.js \
diff --git a/js/xpconnect/tests/chrome/test_bug860494.xul b/js/xpconnect/tests/chrome/test_bug860494.xul
new file mode 100644
index 000000000000..d29e65b6ac8d
--- /dev/null
+++ b/js/xpconnect/tests/chrome/test_bug860494.xul
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=860494
+-->
+<window title="Mozilla Bug 860494"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <!-- test results are displayed in the html:body -->
+  <body xmlns="http://www.w3.org/1999/xhtml">
+  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=860494"
+     target="_blank">Mozilla Bug 860494</a>
+  </body>
+
+  <!-- test code goes here -->
+  <script type="application/javascript">
+  <![CDATA[
+  /** Test for Bug 860494 **/
+  SimpleTest.waitForExplicitFinish();
+
+  function go() {
+    var iwin = $('ifr').contentWindow;
+    // NB: mochitest-chrome actually runs the test as a content docshell.
+    is(iwin.top, window.top, "iframe names shouldn't shadow |top| via Xray");
+    is(iwin.parent, window, "iframe names shouldn't shadow |parent| via Xray");
+    ok(!!/http/.exec(iwin.location), "iframe names shouldn't shadow |location| via Xray");
+    is(iwin.length, 5, "iframe names shouldn't shadow |length| via Xray");
+    is(iwin.window, iwin, "iframe names shouldn't shadow |window| via Xray");
+    SimpleTest.finish();
+  }
+
+  ]]>
+  </script>
+  <iframe id="ifr" type="content" onload="go();" src="http://example.org/tests/js/xpconnect/tests/mochitest/file_bug860494.html" />
+</window>
diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in
index 3206cce00430..82208c776e1c 100644
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -92,6 +92,7 @@ MOCHITEST_FILES =	chrome_wrappers_helper.html \
 		test_bug803730.html \
 		test_bug809547.html \
 		test_bug809674.html \
+		file_bug860494.html \
 		file_crosscompartment_weakmap.html \
 		test_crosscompartment_weakmap.html \
 		$(NULL)
diff --git a/js/xpconnect/tests/mochitest/file_bug860494.html b/js/xpconnect/tests/mochitest/file_bug860494.html
new file mode 100644
index 000000000000..f7c631037dd1
--- /dev/null
+++ b/js/xpconnect/tests/mochitest/file_bug860494.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title></title>
+</head>
+<body>
+<iframe name="top"></iframe>
+<iframe name="parent"></iframe>
+<iframe name="location"></iframe>
+<iframe name="length"></iframe>
+<iframe name="window"></iframe>
+</body>
+</html>

From 63b663859db0953cc46fa0caeaa63f29611dd899 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 17 Apr 2013 11:00:47 -0400
Subject: [PATCH 358/438] Backed out changeset e2e27a2e5113 (bug 858723) for
 mochitest-other failures.

---
 .../components/osfile/osfile_async_front.jsm  |  5 +-
 .../components/osfile/osfile_async_worker.js  |  4 +-
 .../tests/xpcshell/test_osfile_closed.js      | 48 -------------------
 .../osfile/tests/xpcshell/xpcshell.ini        |  1 -
 4 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js

diff --git a/toolkit/components/osfile/osfile_async_front.jsm b/toolkit/components/osfile/osfile_async_front.jsm
index d70642adb9c7..3b559d8e90a1 100644
--- a/toolkit/components/osfile/osfile_async_front.jsm
+++ b/toolkit/components/osfile/osfile_async_front.jsm
@@ -237,7 +237,7 @@ File.prototype = {
    * @rejects {OS.File.Error}
    */
   close: function close() {
-    if (this._fdmsg != null) {
+    if (this._fdmsg) {
       let msg = this._fdmsg;
       this._fdmsg = null;
       return this._closeResult =
@@ -254,6 +254,9 @@ File.prototype = {
    * @rejects {OS.File.Error}
    */
   stat: function stat() {
+    if (!this._fdmsg) {
+      return Promise.reject(OSError.closed("accessing file"));
+    }
     return Scheduler.post("File_prototype_stat", [this._fdmsg], this).then(
       File.Info.fromMsg
     );
diff --git a/toolkit/components/osfile/osfile_async_worker.js b/toolkit/components/osfile/osfile_async_worker.js
index 2abbbbb7a849..7bb79e1acb0c 100644
--- a/toolkit/components/osfile/osfile_async_worker.js
+++ b/toolkit/components/osfile/osfile_async_worker.js
@@ -165,7 +165,7 @@ if (this.Components) {
      let withFile = function withFile(id, f) {
        let file = OpenedFiles.get(id);
        if (file == null) {
-         throw OS.File.Error.closed("accessing file");
+         throw new Error("Could not find File");
        }
        return f.call(file);
      };
@@ -175,7 +175,7 @@ if (this.Components) {
        let file = OpenedDirectoryIterators.get(fd);
        if (file == null) {
          if (!ignoreAbsent) {
-           throw OS.File.Error.closed("accessing directory");
+           throw new Error("Could not find Directory");
          }
          return;
        }
diff --git a/toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js b/toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js
deleted file mode 100644
index a428f4f4dd35..000000000000
--- a/toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js
+++ /dev/null
@@ -1,48 +0,0 @@
-"use strict";
-
-Components.utils.import("resource://gre/modules/osfile.jsm");
-Components.utils.import("resource://gre/modules/Task.jsm");
-
-function run_test() {
-  do_test_pending();
-  run_next_test();
-}
-
-add_task(function test_closed() {
-  OS.Shared.DEBUG = true;
-  let currentDir = yield OS.File.getCurrentDirectory();
-  do_print("Open a file, ensure that we can call stat()");
-  let path = OS.Path.join(currentDir, "test_osfile_closed.js");
-  let file = yield OS.File.open(path);
-  yield file.stat();
-  do_check_true(true);
-
-  yield file.close();
-
-  do_print("Ensure that we cannot stat() on closed file");
-  let exn;
-  try {
-    yield file.stat();
-  } catch (ex) {
-    exn = ex;
-  }
-  do_print("Ensure that this raises the correct error");
-  do_check_true(!!exn);
-  do_check_true(exn instanceof OS.File.Error);
-  do_check_true(exn.becauseClosed);
-
-  do_print("Ensure that we cannot read() on closed file");
-  exn = null;
-  try {
-    yield file.read();
-  } catch (ex) {
-    exn = ex;
-  }
-  do_print("Ensure that this raises the correct error");
-  do_check_true(!!exn);
-  do_check_true(exn instanceof OS.File.Error);
-  do_check_true(exn.becauseClosed);
-
-});
-
-add_task(do_test_finished);
\ No newline at end of file
diff --git a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
index ad1d10d60a7d..ab01e16f5f47 100644
--- a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
@@ -2,7 +2,6 @@
 head =
 tail =
 
-[test_osfile_closed.js]
 [test_path.js]
 [test_osfile_async.js]
 [test_profiledir.js]

From 0a02b10ae45d91a649a56bb85c54dc47cfdd6ab8 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Tue, 16 Apr 2013 19:02:57 +0200
Subject: [PATCH 359/438] Bug 862092 - "Assertion failure: target->isNative()
 == obj->isNative()" adopting a <select>. r=bz.

--HG--
extra : rebase_source : 1905aa3aa956a599e9ce1de8866f7dc58feb73be
---
 dom/bindings/BindingUtils.cpp           | 41 +++++++++++++++++++------
 dom/bindings/crashtests/862092.html     | 19 ++++++++++++
 dom/bindings/crashtests/crashtests.list |  1 +
 dom/bindings/test/Makefile.in           |  1 +
 dom/bindings/test/test_bug862092.html   | 37 ++++++++++++++++++++++
 5 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 dom/bindings/crashtests/862092.html
 create mode 100644 dom/bindings/test/test_bug862092.html

diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index 85adf4ff3e3c..d54a504b1fae 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -1492,24 +1492,37 @@ ReparentWrapper(JSContext* aCx, JS::HandleObject aObjArg)
   js::SetReservedSlot(newobj, DOM_OBJECT_SLOT,
                       js::GetReservedSlot(aObj, DOM_OBJECT_SLOT));
 
+  bool isProxy = js::IsProxy(aObj);
+
   // At this point, both |aObj| and |newobj| point to the same native
   // which is bad, because one of them will end up being finalized with a
   // native it does not own. |cloneGuard| ensures that if we exit before
   // clearing |aObj|'s reserved slot the reserved slot of |newobj| will be
   // set to null. |aObj| will go away soon, because we swap it with
   // another object during the transplant and let that object die.
-  JSObject *propertyHolder;
+  JSObject* propertyHolder;
   {
     AutoCloneDOMObjectSlotGuard cloneGuard(aObj, newobj);
 
-    propertyHolder = JS_NewObjectWithGivenProto(aCx, nullptr, nullptr,
-                                                newParent);
-    if (!propertyHolder) {
-      return NS_ERROR_OUT_OF_MEMORY;
+    JSObject* copyFrom;
+    if (isProxy) {
+      copyFrom = DOMProxyHandler::GetExpandoObject(aObj);
+    } else {
+      copyFrom = aObj;
     }
 
-    if (!JS_CopyPropertiesFrom(aCx, propertyHolder, aObj)) {
-      return NS_ERROR_FAILURE;
+    if (copyFrom) {
+      propertyHolder = JS_NewObjectWithGivenProto(aCx, nullptr, nullptr,
+                                                  newParent);
+      if (!propertyHolder) {
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+
+      if (!JS_CopyPropertiesFrom(aCx, propertyHolder, copyFrom)) {
+        return NS_ERROR_FAILURE;
+      }
+    } else {
+      propertyHolder = nullptr;
     }
 
     // Expandos from other compartments are attached to the target JS object.
@@ -1558,8 +1571,18 @@ ReparentWrapper(JSContext* aCx, JS::HandleObject aObjArg)
   cache->SetPreservingWrapper(false);
   cache->SetWrapper(aObj);
   cache->SetPreservingWrapper(preserving);
-  if (!JS_CopyPropertiesFrom(aCx, aObj, propertyHolder)) {
-    MOZ_CRASH();
+
+  if (propertyHolder) {
+    JSObject* copyTo;
+    if (isProxy) {
+      copyTo = DOMProxyHandler::EnsureExpandoObject(aCx, aObj);
+    } else {
+      copyTo = aObj;
+    }
+
+    if (!copyTo || !JS_CopyPropertiesFrom(aCx, copyTo, propertyHolder)) {
+      MOZ_CRASH();
+    }
   }
 
   nsObjectLoadingContent* htmlobject;
diff --git a/dom/bindings/crashtests/862092.html b/dom/bindings/crashtests/862092.html
new file mode 100644
index 000000000000..1b31775a9797
--- /dev/null
+++ b/dom/bindings/crashtests/862092.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+
+function boom()
+{
+  var frameDoc = document.getElementById("f").contentDocument;
+  frameDoc.adoptNode(document.createElement("select"));
+}
+
+</script>
+</head>
+
+<body onload="boom();">
+<iframe id="f"></iframe>
+</body>
+</html>
diff --git a/dom/bindings/crashtests/crashtests.list b/dom/bindings/crashtests/crashtests.list
index ea8e158fbc70..7b3e58bb69f4 100644
--- a/dom/bindings/crashtests/crashtests.list
+++ b/dom/bindings/crashtests/crashtests.list
@@ -4,3 +4,4 @@ load 822340-2.html
 load 832899.html
 load 860591.html
 load 860551.html
+load 862092.html
diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in
index 4ea6e7f8753b..7a88add9657a 100644
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -72,6 +72,7 @@ MOCHITEST_FILES := \
   test_queryInterface.html \
   test_exceptionThrowing.html \
   test_bug852846.html \
+  test_bug862092.html \
   $(NULL)
 
 MOCHITEST_CHROME_FILES = \
diff --git a/dom/bindings/test/test_bug862092.html b/dom/bindings/test/test_bug862092.html
new file mode 100644
index 000000000000..4b0633328105
--- /dev/null
+++ b/dom/bindings/test/test_bug862092.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=862092
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 862092</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  /** Test for Bug 862092 **/
+
+  SimpleTest.waitForExplicitFinish();
+  function runTest()
+  {
+    var frameDoc = document.getElementById("f").contentDocument;
+    var a = document.createElement("select");
+    a.expando = "test";
+    a = frameDoc.adoptNode(a)
+    is(a.expando, "test", "adoptNode needs to preserve expandos");
+    SimpleTest.finish();
+  }
+
+  </script>
+</head>
+<body onload="runTest();">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=862092">Mozilla Bug 862092</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+<iframe id="f"></iframe>
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>

From 29b3a5a2ee2fa58ca79744a22052b81e10139055 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 16 Apr 2013 13:45:53 -0400
Subject: [PATCH 360/438] Backed out 2 changesets (bug 734691) for leaks.

Backed out changeset ba88d9730af6 (bug 734691)
Backed out changeset 7d2fbf7b0372 (bug 734691)
---
 dom/workers/RuntimeService.cpp     |  21 +--
 ipc/chromium/src/base/thread.cc    |   5 -
 tools/profiler/BreakpadSampler.cpp |  15 +-
 tools/profiler/GeckoProfiler.h     |   7 -
 tools/profiler/GeckoProfilerFunc.h |   4 -
 tools/profiler/GeckoProfilerImpl.h |  24 ---
 tools/profiler/Makefile.in         |   3 -
 tools/profiler/ProfileEntry.cpp    |  14 +-
 tools/profiler/ProfileEntry.h      |  16 +-
 tools/profiler/PseudoStack.h       |   4 -
 tools/profiler/TableTicker.cpp     |  57 +++----
 tools/profiler/TableTicker.h       |  78 ++--------
 tools/profiler/platform-linux.cc   | 236 ++++++++++-------------------
 tools/profiler/platform-macos.cc   | 142 +++++------------
 tools/profiler/platform-win32.cc   | 127 ++++------------
 tools/profiler/platform.cpp        |  94 +++---------
 tools/profiler/platform.h          | 104 ++-----------
 17 files changed, 228 insertions(+), 723 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index c5744cae3ea2..070f739dce2d 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -42,8 +42,6 @@
 #include "OSFileConstants.h"
 #include <algorithm>
 
-#include "GeckoProfiler.h"
-
 using namespace mozilla;
 using namespace mozilla::dom;
 
@@ -265,10 +263,6 @@ JSBool
 OperationCallback(JSContext* aCx)
 {
   WorkerPrivate* worker = GetWorkerPrivateFromContext(aCx);
-
-  // Now is a good time to turn on profiling if it's pending.
-  profiler_js_operation_callback();
-
   return worker->OperationCallback(aCx);
 }
 
@@ -521,19 +515,13 @@ public:
       return NS_ERROR_FAILURE;
     }
 
-    JSRuntime* rt = JS_GetRuntime(cx);
-
-    profiler_register_thread("WebWorker");
-#ifdef MOZ_ENABLE_PROFILER_SPS
-    if (PseudoStack* stack = mozilla_get_pseudo_stack())
-      stack->sampleRuntime(rt);
-#endif
-
     {
       JSAutoRequest ar(cx);
       workerPrivate->DoRunLoop(cx);
     }
 
+    JSRuntime* rt = JS_GetRuntime(cx);
+
     // XXX Bug 666963 - CTypes can create another JSContext for use with
     // closures, and then it holds that context in a reserved slot on the CType
     // prototype object. We have to destroy that context before we can destroy
@@ -552,14 +540,9 @@ public:
       JS_DestroyContext(cx);
     }
 
-#ifdef MOZ_ENABLE_PROFILER_SPS
-    if (PseudoStack* stack = mozilla_get_pseudo_stack())
-      stack->sampleRuntime(nullptr);
-#endif
     JS_DestroyRuntime(rt);
 
     workerPrivate->ScheduleDeletion(false);
-    profiler_unregister_thread();
     return NS_OK;
   }
 };
diff --git a/ipc/chromium/src/base/thread.cc b/ipc/chromium/src/base/thread.cc
index 31ec62832ec3..f447fbb201eb 100644
--- a/ipc/chromium/src/base/thread.cc
+++ b/ipc/chromium/src/base/thread.cc
@@ -8,7 +8,6 @@
 #include "base/string_util.h"
 #include "base/thread_local.h"
 #include "base/waitable_event.h"
-#include "GeckoProfiler.h"
 
 namespace base {
 
@@ -137,8 +136,6 @@ void Thread::StopSoon() {
 }
 
 void Thread::ThreadMain() {
-  profiler_register_thread(name_.c_str());
-
   // The message loop for this thread.
   MessageLoop message_loop(startup_data_->options.message_loop_type);
 
@@ -164,8 +161,6 @@ void Thread::ThreadMain() {
   // Assert that MessageLoop::Quit was called by ThreadQuitTask.
   DCHECK(GetThreadWasQuitProperly());
 
-  profiler_unregister_thread();
-
   // We can't receive messages anymore.
   message_loop_ = NULL;
   thread_id_ = 0;
diff --git a/tools/profiler/BreakpadSampler.cpp b/tools/profiler/BreakpadSampler.cpp
index d30a55b6ea2f..bc804e3627f5 100644
--- a/tools/profiler/BreakpadSampler.cpp
+++ b/tools/profiler/BreakpadSampler.cpp
@@ -158,13 +158,6 @@ void genPseudoBacktraceEntries(/*MODIFIED*/UnwinderThreadBuffer* utb,
 // RUNS IN SIGHANDLER CONTEXT
 void BreakpadSampler::Tick(TickSample* sample)
 {
-  if (!sample->threadProfile) {
-    // Platform doesn't support multithread, so use the main thread profile we created
-    sample->threadProfile = GetPrimaryThreadProfile();
-  }
-
-  ThreadProfile& currThreadProfile = *sample->threadProfile;
-
   /* Get hold of an empty inter-thread buffer into which to park
      the ProfileEntries for this sample. */
   UnwinderThreadBuffer* utb = uwt__acquire_empty_buffer();
@@ -179,7 +172,7 @@ void BreakpadSampler::Tick(TickSample* sample)
      thread, and park them in |utb|. */
 
   // Marker(s) come before the sample
-  PseudoStack* stack = currThreadProfile.GetPseudoStack();
+  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
     utb__addEntry( utb, ProfileEntry('m', stack->getMarker(i)) );
   }
@@ -193,7 +186,7 @@ void BreakpadSampler::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      currThreadProfile.erase();
+      mPrimaryThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -300,9 +293,9 @@ void BreakpadSampler::Tick(TickSample* sample)
 #   else
 #     error "Unsupported platform"
 #   endif
-    uwt__release_full_buffer(&currThreadProfile, utb, ucV);
+    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, ucV);
   } else {
-    uwt__release_full_buffer(&currThreadProfile, utb, NULL);
+    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, NULL);
   }
 }
 
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 9c2507a71dad..4c8e2b5452c8 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -135,13 +135,6 @@ static inline void profiler_lock() {}
 // Re-enable the profiler and notify 'profiler-unlocked'.
 static inline void profiler_unlock() {}
 
-static inline void profiler_register_thread(const char* name) {}
-static inline void profiler_unregister_thread() {}
-
-// Call by the JSRuntime's operation callback. This is used to enable
-// profiling on auxilerary threads.
-static inline void profiler_js_operation_callback() {}
-
 #else
 
 #include "GeckoProfilerImpl.h"
diff --git a/tools/profiler/GeckoProfilerFunc.h b/tools/profiler/GeckoProfilerFunc.h
index 41134bfb5ce7..2c26d8eb8a92 100644
--- a/tools/profiler/GeckoProfilerFunc.h
+++ b/tools/profiler/GeckoProfilerFunc.h
@@ -57,10 +57,6 @@ void mozilla_sampler_lock();
 // Unlock the profiler, leaving it stopped and fires profiler-unlocked.
 void mozilla_sampler_unlock();
 
-// Register/unregister threads with the profiler
-bool mozilla_sampler_register_thread(const char* name);
-void mozilla_sampler_unregister_thread();
-
 /* Returns true if env var SPS_NEW is set to anything, else false. */
 extern bool sps_version2();
 
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index b5c20626c610..917bd04173f7 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -140,29 +140,6 @@ void profiler_unlock()
   return mozilla_sampler_unlock();
 }
 
-static inline
-void profiler_register_thread(const char* name)
-{
-  mozilla_sampler_register_thread(name);
-}
-
-static inline
-void profiler_unregister_thread()
-{
-  mozilla_sampler_unregister_thread();
-}
-
-static inline
-void profiler_js_operation_callback()
-{
-  PseudoStack *stack = tlsPseudoStack.get();
-  if (!stack) {
-    return;
-  }
-
-  stack->jsOperationCallback();
-}
-
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
@@ -177,7 +154,6 @@ void profiler_js_operation_callback()
 #define PROFILER_MAIN_THREAD_LABEL_PRINTF(name_space, info, ...)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla::SamplerStackFramePrintfRAII SAMPLER_APPEND_LINE_NUMBER(sampler_raii)(name_space "::" info, __LINE__, __VA_ARGS__)
 #define PROFILER_MAIN_THREAD_MARKER(info)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla_sampler_add_marker(info)
 
-
 /* FIXME/bug 789667: memory constraints wouldn't much of a problem for
  * this small a sample buffer size, except that serializing the
  * profile data is extremely, unnecessarily memory intensive. */
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index 98bcadcffde8..eb62fbd25143 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -43,9 +43,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
-# Uncomment for better debugging in opt builds
-#MOZ_OPTIMIZE_FLAGS += -O0 -g
-
 CPPSRCS		= \
   platform.cpp \
   nsProfilerFactory.cpp \
diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
index d3608cace5fc..d8c74b748217 100644
--- a/tools/profiler/ProfileEntry.cpp
+++ b/tools/profiler/ProfileEntry.cpp
@@ -134,27 +134,19 @@ std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
 
 #define DYNAMIC_MAX_STRING 512
 
-ThreadProfile::ThreadProfile(const char* aName, int aEntrySize,
-                             PseudoStack *aStack, int aThreadId,
-                             PlatformData* aPlatform,
-                             bool aIsMainThread)
+ThreadProfile::ThreadProfile(int aEntrySize, PseudoStack *aStack)
   : mWritePos(0)
   , mLastFlushPos(0)
   , mReadPos(0)
   , mEntrySize(aEntrySize)
   , mPseudoStack(aStack)
   , mMutex("ThreadProfile::mMutex")
-  , mName(strdup(aName))
-  , mThreadId(aThreadId)
-  , mIsMainThread(aIsMainThread)
-  , mPlatformData(aPlatform)
 {
   mEntries = new ProfileEntry[mEntrySize];
 }
 
 ThreadProfile::~ThreadProfile()
 {
-  free(mName);
   delete[] mEntries;
 }
 
@@ -307,10 +299,6 @@ JSCustomObject* ThreadProfile::ToJSObject(JSContext *aCx)
 }
 
 void ThreadProfile::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile) {
-  // Thread meta data
-  b.DefineProperty(profile, "name", mName);
-  b.DefineProperty(profile, "tid", mThreadId);
-
   JSCustomArray *samples = b.CreateArray();
   b.DefineProperty(profile, "samples", samples);
 
diff --git a/tools/profiler/ProfileEntry.h b/tools/profiler/ProfileEntry.h
index 378dc42481c2..897abb23c6ea 100644
--- a/tools/profiler/ProfileEntry.h
+++ b/tools/profiler/ProfileEntry.h
@@ -6,12 +6,12 @@
 #ifndef MOZ_PROFILE_ENTRY_H
 #define MOZ_PROFILE_ENTRY_H
 
-#include <ostream>
 #include "GeckoProfilerImpl.h"
 #include "JSAObjectBuilder.h"
 #include "platform.h"
 #include "mozilla/Mutex.h"
 
+class ThreadProfile;
 class ThreadProfile;
 
 class ProfileEntry
@@ -56,9 +56,7 @@ typedef void (*IterateTagsCallback)(const ProfileEntry& entry, const char* tagSt
 class ThreadProfile
 {
 public:
-  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack,
-                int aThreadId, PlatformData* aPlatformData,
-                bool aIsMainThread);
+  ThreadProfile(int aEntrySize, PseudoStack *aStack);
   ~ThreadProfile();
   void addTag(ProfileEntry aTag);
   void flush();
@@ -72,12 +70,6 @@ public:
   PseudoStack* GetPseudoStack();
   mozilla::Mutex* GetMutex();
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
-
-  bool IsMainThread() const { return mIsMainThread; }
-  const char* Name() const { return mName; }
-  int ThreadId() const { return mThreadId; }
-
-  PlatformData* GetPlatformData() { return mPlatformData; }
 private:
   // Circular buffer 'Keep One Slot Open' implementation
   // for simplicity
@@ -88,10 +80,6 @@ private:
   int            mEntrySize;
   PseudoStack*   mPseudoStack;
   mozilla::Mutex mMutex;
-  char*          mName;
-  int            mThreadId;
-  bool           mIsMainThread;
-  PlatformData*  mPlatformData;  // Platform specific data.
 };
 
 std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
diff --git a/tools/profiler/PseudoStack.h b/tools/profiler/PseudoStack.h
index b12bb226dae5..9079ffbfc3a8 100644
--- a/tools/profiler/PseudoStack.h
+++ b/tools/profiler/PseudoStack.h
@@ -220,10 +220,6 @@ public:
       mStartJSSampling = true;
     }
   }
-  void jsOperationCallback() {
-    if (mStartJSSampling)
-      enableJSSampling();
-  }
   void disableJSSampling() {
     mStartJSSampling = false;
     if (mRuntime)
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index 349f7e794338..c31d9d94e4fa 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -173,26 +173,16 @@ void TableTicker::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile)
   JSCustomArray *threads = b.CreateArray();
   b.DefineProperty(profile, "threads", threads);
 
+  // For now we only have one thread
   SetPaused(true);
-
-  {
-    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
-    for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
-      // Thread not being profiled, skip it
-      if (!sRegisteredThreads->at(i)->Profile())
-        continue;
-
-      MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
-
-      JSCustomObject* threadSamples = b.CreateObject();
-      sRegisteredThreads->at(i)->Profile()->BuildJSObject(b, threadSamples);
-      b.ArrayPush(threads, threadSamples);
-    }
-  }
-
+  ThreadProfile* prof = GetPrimaryThreadProfile();
+  prof->GetMutex()->Lock();
+  JSCustomObject* threadSamples = b.CreateObject();
+  prof->BuildJSObject(b, threadSamples);
+  b.ArrayPush(threads, threadSamples);
+  prof->GetMutex()->Unlock();
   SetPaused(false);
-} 
+}
 
 // END SaveProfileTask et al
 ////////////////////////////////////////////////////////////////////////
@@ -295,7 +285,7 @@ void StackWalkCallback(void* aPC, void* aSP, void* aClosure)
 void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample)
 {
 #ifndef XP_MACOSX
-  uintptr_t thread = GetThreadHandle(aSample->threadProfile->GetPlatformData());
+  uintptr_t thread = GetThreadHandle(platform_data());
   MOZ_ASSERT(thread);
 #endif
   void* pc_array[1000];
@@ -312,7 +302,7 @@ void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample
 
   uint32_t maxFrames = uint32_t(array.size - array.count);
 #ifdef XP_MACOSX
-  pthread_t pt = GetProfiledThread(aSample->threadProfile->GetPlatformData());
+  pthread_t pt = GetProfiledThread(platform_data());
   void *stackEnd = reinterpret_cast<void*>(-1);
   if (pt)
     stackEnd = static_cast<char*>(pthread_get_stackaddr_np(pt));
@@ -393,12 +383,10 @@ void doSampleStackTrace(PseudoStack *aStack, ThreadProfile &aProfile, TickSample
 
 void TableTicker::Tick(TickSample* sample)
 {
-  ThreadProfile& currThreadProfile = *sample->threadProfile;
-
   // Marker(s) come before the sample
-  PseudoStack* stack = currThreadProfile.GetPseudoStack();
+  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
-    addDynamicTag(currThreadProfile, 'm', stack->getMarker(i));
+    addDynamicTag(mPrimaryThreadProfile, 'm', stack->getMarker(i));
   }
   stack->mQueueClearMarker = true;
 
@@ -410,7 +398,7 @@ void TableTicker::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      currThreadProfile.erase();
+      mPrimaryThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -426,29 +414,29 @@ void TableTicker::Tick(TickSample* sample)
 
 #if defined(USE_BACKTRACE) || defined(USE_NS_STACKWALK)
   if (mUseStackWalk) {
-    doNativeBacktrace(currThreadProfile, sample);
+    doNativeBacktrace(mPrimaryThreadProfile, sample);
   } else {
-    doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
+    doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
   }
 #else
-  doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
+  doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
 #endif
 
   if (recordSample)
-    currThreadProfile.flush();
+    mPrimaryThreadProfile.flush();
 
-  if (!sLastTracerEvent.IsNull() && sample && currThreadProfile.IsMainThread()) {
+  if (!sLastTracerEvent.IsNull() && sample) {
     TimeDuration delta = sample->timestamp - sLastTracerEvent;
-    currThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
+    mPrimaryThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
   }
 
   if (sample) {
     TimeDuration delta = sample->timestamp - mStartTime;
-    currThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
+    mPrimaryThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
   }
 
   if (sLastFrameNumber != sFrameNumber) {
-    currThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
+    mPrimaryThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
     sLastFrameNumber = sFrameNumber;
   }
 }
@@ -472,8 +460,7 @@ void mozilla_sampler_print_location1()
     return;
   }
 
-  ThreadProfile threadProfile("Temp", PROFILE_DEFAULT_ENTRY, stack,
-                              0, Sampler::AllocPlatformData(0), false);
+  ThreadProfile threadProfile(1000, stack);
   doSampleStackTrace(stack, threadProfile, NULL);
 
   threadProfile.flush();
diff --git a/tools/profiler/TableTicker.h b/tools/profiler/TableTicker.h
index 1af75f19ef60..6b00d1e1c6d5 100644
--- a/tools/profiler/TableTicker.h
+++ b/tools/profiler/TableTicker.h
@@ -5,7 +5,6 @@
 
 #include "platform.h"
 #include "ProfileEntry.h"
-#include "mozilla/Mutex.h"
 
 static bool
 hasFeature(const char** aFeatures, uint32_t aFeatureCount, const char* aFeature) {
@@ -26,10 +25,10 @@ class BreakpadSampler;
 
 class TableTicker: public Sampler {
  public:
-  TableTicker(int aInterval, int aEntrySize,
+  TableTicker(int aInterval, int aEntrySize, PseudoStack *aStack,
               const char** aFeatures, uint32_t aFeatureCount)
-    : Sampler(aInterval, true, aEntrySize)
-    , mPrimaryThreadProfile(nullptr)
+    : Sampler(aInterval, true)
+    , mPrimaryThreadProfile(aEntrySize, aStack)
     , mStartTime(TimeStamp::Now())
     , mSaveRequested(false)
   {
@@ -38,54 +37,13 @@ class TableTicker: public Sampler {
     //XXX: It's probably worth splitting the jank profiler out from the regular profiler at some point
     mJankOnly = hasFeature(aFeatures, aFeatureCount, "jank");
     mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
-    mProfileThreads = hasFeature(aFeatures, aFeatureCount, "threads");
     mAddLeafAddresses = hasFeature(aFeatures, aFeatureCount, "leaf");
-
-    {
-      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
-      // Create ThreadProfile for each registered thread
-      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-        ThreadInfo* info = sRegisteredThreads->at(i);
-
-        if (!info->IsMainThread() && !mProfileThreads)
-          continue;
-
-        ThreadProfile* profile = new ThreadProfile(info->Name(),
-                                                   aEntrySize,
-                                                   info->Stack(),
-                                                   info->ThreadId(),
-                                                   info->GetPlatformData(),
-                                                   info->IsMainThread());
-        profile->addTag(ProfileEntry('m', "Start"));
-
-        info->SetProfile(profile);
-      }
-
-      SetActiveSampler(this);
-    }
+    mPrimaryThreadProfile.addTag(ProfileEntry('m', "Start"));
   }
 
-  ~TableTicker() {
-    if (IsActive())
-      Stop();
+  ~TableTicker() { if (IsActive()) Stop(); }
 
-    SetActiveSampler(nullptr);
-
-    // Destroy ThreadProfile for all threads
-    {
-      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
-      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-        ThreadInfo* info = sRegisteredThreads->at(i);
-        ThreadProfile* profile = info->Profile();
-        if (profile) {
-          delete profile;
-          info->SetProfile(nullptr);
-        }
-      }
-    }
-  }
+  virtual void SampleStack(TickSample* sample) {}
 
   // Called within a signal. This function must be reentrant
   virtual void Tick(TickSample* sample);
@@ -100,27 +58,14 @@ class TableTicker: public Sampler {
 
   ThreadProfile* GetPrimaryThreadProfile()
   {
-    if (!mPrimaryThreadProfile) {
-      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
-      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-        ThreadInfo* info = sRegisteredThreads->at(i);
-        if (info->IsMainThread()) {
-          mPrimaryThreadProfile = info->Profile();
-          break;
-        }
-      }
-    }
-
-    return mPrimaryThreadProfile;
+    return &mPrimaryThreadProfile;
   }
 
   void ToStreamAsJSON(std::ostream& stream);
   virtual JSObject *ToJSObject(JSContext *aCx);
   JSCustomObject *GetMetaJSCustomObject(JSAObjectBuilder& b);
 
-  bool ProfileJS() const { return mProfileJS; }
-  bool ProfileThreads() const { return mProfileThreads; }
+  const bool ProfileJS() { return mProfileJS; }
 
   virtual BreakpadSampler* AsBreakpadSampler() { return nullptr; }
 
@@ -131,21 +76,20 @@ protected:
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
 
   // This represent the application's main thread (SAMPLER_INIT)
-  ThreadProfile* mPrimaryThreadProfile;
+  ThreadProfile mPrimaryThreadProfile;
   TimeStamp mStartTime;
   bool mSaveRequested;
   bool mAddLeafAddresses;
   bool mUseStackWalk;
   bool mJankOnly;
   bool mProfileJS;
-  bool mProfileThreads;
 };
 
 class BreakpadSampler: public TableTicker {
  public:
-  BreakpadSampler(int aInterval, int aEntrySize,
+  BreakpadSampler(int aInterval, int aEntrySize, PseudoStack *aStack,
               const char** aFeatures, uint32_t aFeatureCount)
-    : TableTicker(aInterval, aEntrySize, aFeatures, aFeatureCount)
+    : TableTicker(aInterval, aEntrySize, aStack, aFeatures, aFeatureCount)
   {}
 
   // Called within a signal. This function must be reentrant
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index 68b127f3480e..0cc1c058156a 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -39,7 +39,6 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <stdlib.h>
-#include <sched.h>
 #ifdef ANDROID
 #include <android/log.h>
 #else
@@ -61,14 +60,9 @@
 #include <stdarg.h>
 #include "platform.h"
 #include "GeckoProfilerImpl.h"
-#include "mozilla/Mutex.h"
-#include "ProfileEntry.h"
-#include "nsThreadUtils.h"
-#include "TableTicker.h"
 
 #include <string.h>
 #include <stdio.h>
-#include <list>
 
 #define SIGNAL_SAVE_PROFILE SIGUSR2
 
@@ -81,27 +75,15 @@ pid_t gettid()
 }
 #endif
 
+static Sampler* sActiveSampler = NULL;
+
+
 #ifdef ANDROID
 #include "android-signal-defs.h"
 #endif
 
-struct SamplerRegistry {
-  static void AddActiveSampler(Sampler *sampler) {
-    ASSERT(!SamplerRegistry::sampler);
-    SamplerRegistry::sampler = sampler;
-  }
-  static void RemoveActiveSampler(Sampler *sampler) {
-    SamplerRegistry::sampler = NULL;
-  }
-  static Sampler *sampler;
-};
-
-Sampler *SamplerRegistry::sampler = NULL;
-
-static ThreadProfile* sCurrentThreadProfile = NULL;
-
 static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context) {
-  Sampler::GetActiveSampler()->RequestSave();
+  sActiveSampler->RequestSave();
 }
 
 #ifdef ANDROID
@@ -112,7 +94,7 @@ static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context
 #define V8_HOST_ARCH_X64 1
 #endif
 static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
-  if (!Sampler::GetActiveSampler())
+  if (!sActiveSampler)
     return;
 
   TickSample sample_obj;
@@ -121,7 +103,7 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 
 #ifdef ENABLE_SPS_LEAF_DATA
   // If profiling, we extract the current pc and sp.
-  if (Sampler::GetActiveSampler()->IsProfiling()) {
+  if (sActiveSampler->IsProfiling()) {
     // Extracting the sample from the context is extremely machine dependent.
     ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
     mcontext_t& mcontext = ucontext->uc_mcontext;
@@ -156,104 +138,94 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 #endif
   }
 #endif
-  sample->threadProfile = sCurrentThreadProfile;
   sample->timestamp = mozilla::TimeStamp::Now();
 
-  Sampler::GetActiveSampler()->Tick(sample);
-
-  sCurrentThreadProfile = NULL;
+  sActiveSampler->Tick(sample);
 }
 
-int tgkill(pid_t tgid, pid_t tid, int signalno) {
-  return syscall(SYS_tgkill, tgid, tid, signalno);
+#ifndef XP_MACOSX
+void tgkill(pid_t tgid, pid_t tid, int signalno) {
+  syscall(SYS_tgkill, tgid, tid, signalno);
 }
+#endif
 
-class PlatformData : public Malloced {
+class Sampler::PlatformData : public Malloced {
  public:
-  PlatformData()
+  explicit PlatformData(Sampler* sampler)
+      : sampler_(sampler),
+        signal_handler_installed_(false),
+        vm_tgid_(getpid()),
+#ifndef XP_MACOSX
+        vm_tid_(gettid()),
+#endif
+        signal_sender_launched_(false)
+#ifdef XP_MACOSX
+        , signal_receiver_(pthread_self())
+#endif
   {
   }
+
+  void SignalSender() {
+    while (sampler_->IsActive()) {
+      sampler_->HandleSaveRequest();
+
+      if (!sampler_->IsPaused()) {
+#ifdef XP_MACOSX
+        pthread_kill(signal_receiver_, SIGPROF);
+#else
+        // Glibc doesn't provide a wrapper for tgkill(2).
+        tgkill(vm_tgid_, vm_tid_, SIGPROF);
+#endif
+      }
+
+      // Convert ms to us and subtract 100 us to compensate delays
+      // occuring during signal delivery.
+      // TODO measure and confirm this.
+      const useconds_t interval = sampler_->interval_ * 1000 - 100;
+      //int result = usleep(interval);
+      usleep(interval);
+    }
+  }
+
+  Sampler* sampler_;
+  bool signal_handler_installed_;
+  struct sigaction old_sigprof_signal_handler_;
+  struct sigaction old_sigsave_signal_handler_;
+  pid_t vm_tgid_;
+  pid_t vm_tid_;
+  bool signal_sender_launched_;
+  pthread_t signal_sender_thread_;
+#ifdef XP_MACOSX
+  pthread_t signal_receiver_;
+#endif
 };
 
-/* static */ PlatformData*
-Sampler::AllocPlatformData(int aThreadId)
-{
-  return new PlatformData;
-}
 
-/* static */ void
-Sampler::FreePlatformData(PlatformData* aData)
-{
-  delete aData;
-}
-
-static void* SignalSender(void* arg) {
-  int vm_tgid_ = getpid();
-
-  while (SamplerRegistry::sampler->IsActive()) {
-    SamplerRegistry::sampler->HandleSaveRequest();
-
-    if (!SamplerRegistry::sampler->IsPaused()) {
-      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-      std::vector<ThreadInfo*> threads =
-        SamplerRegistry::sampler->GetRegisteredThreads();
-
-      for (uint32_t i = 0; i < threads.size(); i++) {
-        ThreadInfo* info = threads[i];
-
-        // This will be null if we're not interested in profiling this thread.
-        if (!info->Profile())
-          continue;
-
-        // We use sCurrentThreadProfile the ThreadProfile for the
-        // thread we're profiling to the signal handler
-        sCurrentThreadProfile = info->Profile();
-
-        int threadId = info->ThreadId();
-
-        if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
-          printf_stderr("profiler failed to signal tid=%d\n", threadId);
-#ifdef DEBUG
-          abort();
-#endif
-          continue;
-        }
-
-        // Wait for the signal handler to run before moving on to the next one
-        while (sCurrentThreadProfile)
-          sched_yield();
-      }
-    }
-
-    // Convert ms to us and subtract 100 us to compensate delays
-    // occuring during signal delivery.
-    // TODO measure and confirm this.
-    const useconds_t interval =
-      SamplerRegistry::sampler->interval() * 1000 - 100;
-    //int result = usleep(interval);
-    usleep(interval);
-  }
+static void* SenderEntry(void* arg) {
+  Sampler::PlatformData* data =
+      reinterpret_cast<Sampler::PlatformData*>(arg);
+  data->SignalSender();
   return 0;
 }
 
 
-Sampler::Sampler(int interval, bool profiling, int entrySize)
+Sampler::Sampler(int interval, bool profiling)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false),
-      entrySize_(entrySize) {
+      active_(false) {
+  data_ = new PlatformData(this);
 }
 
 Sampler::~Sampler() {
-  ASSERT(!signal_sender_launched_);
+  ASSERT(!data_->signal_sender_launched_);
+  delete data_;
 }
 
 
 void Sampler::Start() {
   LOG("Sampler started");
-
-  SamplerRegistry::AddActiveSampler(this);
+  if (sActiveSampler != NULL) return;
 
   // Request profiling signals.
   LOG("Request signal");
@@ -261,7 +233,7 @@ void Sampler::Start() {
   sa.sa_sigaction = ProfilerSignalHandler;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGPROF, &sa, &old_sigprof_signal_handler_) != 0) {
+  if (sigaction(SIGPROF, &sa, &data_->old_sigprof_signal_handler_) != 0) {
     LOG("Error installing signal");
     return;
   }
@@ -271,22 +243,25 @@ void Sampler::Start() {
   sa2.sa_sigaction = ProfilerSaveSignalHandler;
   sigemptyset(&sa2.sa_mask);
   sa2.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &old_sigsave_signal_handler_) != 0) {
+  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &data_->old_sigsave_signal_handler_) != 0) {
     LOG("Error installing start signal");
     return;
   }
   LOG("Signal installed");
-  signal_handler_installed_ = true;
+  data_->signal_handler_installed_ = true;
 
   // Start a thread that sends SIGPROF signal to VM thread.
   // Sending the signal ourselves instead of relying on itimer provides
   // much better accuracy.
   SetActive(true);
   if (pthread_create(
-          &signal_sender_thread_, NULL, SignalSender, NULL) == 0) {
-    signal_sender_launched_ = true;
+          &data_->signal_sender_thread_, NULL, SenderEntry, data_) == 0) {
+    data_->signal_sender_launched_ = true;
   }
   LOG("Profiler thread started");
+
+  // Set this sampler as the active sampler.
+  sActiveSampler = this;
 }
 
 
@@ -295,62 +270,20 @@ void Sampler::Stop() {
 
   // Wait for signal sender termination (it will exit after setting
   // active_ to false).
-  if (signal_sender_launched_) {
-    pthread_join(signal_sender_thread_, NULL);
-    signal_sender_launched_ = false;
+  if (data_->signal_sender_launched_) {
+    pthread_join(data_->signal_sender_thread_, NULL);
+    data_->signal_sender_launched_ = false;
   }
 
-  SamplerRegistry::RemoveActiveSampler(this);
-
   // Restore old signal handler
-  if (signal_handler_installed_) {
-    sigaction(SIGNAL_SAVE_PROFILE, &old_sigsave_signal_handler_, 0);
-    sigaction(SIGPROF, &old_sigprof_signal_handler_, 0);
-    signal_handler_installed_ = false;
-  }
-}
-
-bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
-{
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  ThreadInfo* info = new ThreadInfo(aName, gettid(),
-    aIsMainThread, aPseudoStack);
-
-  bool profileThread = sActiveSampler &&
-    (aIsMainThread || sActiveSampler->ProfileThreads());
-
-  if (profileThread) {
-    // We need to create the ThreadProfile now
-    info->SetProfile(new ThreadProfile(info->Name(),
-                                       sActiveSampler->EntrySize(),
-                                       info->Stack(),
-                                       info->ThreadId(),
-                                       info->GetPlatformData(),
-                                       aIsMainThread));
-    if (sActiveSampler->ProfileJS()) {
-      info->Profile()->GetPseudoStack()->enableJSSampling();
-    }
+  if (data_->signal_handler_installed_) {
+    sigaction(SIGNAL_SAVE_PROFILE, &data_->old_sigsave_signal_handler_, 0);
+    sigaction(SIGPROF, &data_->old_sigprof_signal_handler_, 0);
+    data_->signal_handler_installed_ = false;
   }
 
-  sRegisteredThreads->push_back(info);
-  return true;
-}
-
-void Sampler::UnregisterCurrentThread()
-{
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  int id = gettid();
-
-  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-    ThreadInfo* info = sRegisteredThreads->at(i);
-    if (info->ThreadId() == id) {
-      delete info;
-      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
-      break;
-    }
-  }
+  // This sampler is no longer the active sampler.
+  sActiveSampler = NULL;
 }
 
 #ifdef ANDROID
@@ -374,4 +307,3 @@ void OS::RegisterStartHandler()
   }
 }
 #endif
-
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index ac338808da1a..99392cc7ed61 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -28,10 +28,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nsThreadUtils.h"
-
 #include "platform.h"
-#include "TableTicker.h"
 #include "UnwinderThread2.h"  /* uwt__register_thread_for_profiling */
 
 // this port is based off of v8 svn revision 9837
@@ -92,13 +89,21 @@ void OS::Sleep(int milliseconds) {
   usleep(1000 * milliseconds);
 }
 
+class Thread::PlatformData : public Malloced {
+ public:
+  PlatformData() : thread_(kNoThread) {}
+  pthread_t thread_;  // Thread handle for pthread.
+};
+
 Thread::Thread(const char* name)
-    : stack_size_(0) {
+    : data_(new PlatformData),
+      stack_size_(0) {
   set_name(name);
 }
 
 
 Thread::~Thread() {
+  delete data_;
 }
 
 
@@ -134,9 +139,9 @@ static void* ThreadEntry(void* arg) {
   }
   // END temp hack for SPS v1-vs-v2
 
-  thread->thread_ = pthread_self();
+  thread->data()->thread_ = pthread_self();
   SetThreadName(thread->name());
-  ASSERT(thread->thread_ != kNoThread);
+  ASSERT(thread->data()->thread_ != kNoThread);
   thread->Run();
   return NULL;
 }
@@ -156,15 +161,15 @@ void Thread::Start() {
     pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_));
     attr_ptr = &attr;
   }
-  pthread_create(&thread_, attr_ptr, ThreadEntry, this);
-  ASSERT(thread_ != kNoThread);
+  pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this);
+  ASSERT(data_->thread_ != kNoThread);
 }
 
 void Thread::Join() {
-  pthread_join(thread_, NULL);
+  pthread_join(data_->thread_, NULL);
 }
 
-class PlatformData : public Malloced {
+class Sampler::PlatformData : public Malloced {
  public:
   PlatformData() : profiled_thread_(mach_thread_self())
   {
@@ -190,26 +195,15 @@ class PlatformData : public Malloced {
   pthread_t profiled_pthread_;
 };
 
-/* static */ PlatformData*
-Sampler::AllocPlatformData(int aThreadId)
-{
-  return new PlatformData;
-}
-
-/* static */ void
-Sampler::FreePlatformData(PlatformData* aData)
-{
-  delete aData;
-}
 
 class SamplerThread : public Thread {
  public:
   explicit SamplerThread(int interval)
-      : Thread("SamplerThread")
-      , interval_(interval) {}
+      : Thread("SamplerThread"),
+        interval_(interval) {}
 
   static void AddActiveSampler(Sampler* sampler) {
-    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+    ScopedLock lock(mutex_);
     SamplerRegistry::AddActiveSampler(sampler);
     if (instance_ == NULL) {
       instance_ = new SamplerThread(sampler->interval());
@@ -220,45 +214,37 @@ class SamplerThread : public Thread {
   }
 
   static void RemoveActiveSampler(Sampler* sampler) {
-    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+    ScopedLock lock(mutex_);
     instance_->Join();
     //XXX: unlike v8 we need to remove the active sampler after doing the Join
     // because we drop the sampler immediately
     SamplerRegistry::RemoveActiveSampler(sampler);
     delete instance_;
     instance_ = NULL;
+    /*
+    if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) {
+      RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_);
+      delete instance_;
+      instance_ = NULL;
+    }
+    */
   }
 
   // Implement Thread::Run().
   virtual void Run() {
     while (SamplerRegistry::sampler->IsActive()) {
-      {
-        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-        std::vector<ThreadInfo*> threads =
-          SamplerRegistry::sampler->GetRegisteredThreads();
-        for (uint32_t i = 0; i < threads.size(); i++) {
-          ThreadInfo* info = threads[i];
-
-          // This will be null if we're not interested in profiling this thread.
-          if (!info->Profile())
-            continue;
-
-          ThreadProfile* thread_profile = info->Profile();
-
-          if (!SamplerRegistry::sampler->IsPaused())
-            SampleContext(SamplerRegistry::sampler, thread_profile);
-        }
-      }
+      if (!SamplerRegistry::sampler->IsPaused())
+        SampleContext(SamplerRegistry::sampler);
       OS::Sleep(interval_);
     }
   }
 
-  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
-    thread_act_t profiled_thread =
-      thread_profile->GetPlatformData()->profiled_thread();
-
+  void SampleContext(Sampler* sampler) {
+    thread_act_t profiled_thread = sampler->platform_data()->profiled_thread();
     TickSample sample_obj;
     TickSample* sample = &sample_obj;
+    //TickSample* sample = CpuProfiler::TickSampleEvent(sampler->isolate());
+    //if (sample == NULL) sample = &sample_obj;
 
     if (KERN_SUCCESS != thread_suspend(profiled_thread)) return;
 
@@ -288,11 +274,12 @@ class SamplerThread : public Thread {
                          flavor,
                          reinterpret_cast<natural_t*>(&state),
                          &count) == KERN_SUCCESS) {
+      //sample->state = sampler->isolate()->current_vm_state();
       sample->pc = reinterpret_cast<Address>(state.REGISTER_FIELD(ip));
       sample->sp = reinterpret_cast<Address>(state.REGISTER_FIELD(sp));
       sample->fp = reinterpret_cast<Address>(state.REGISTER_FIELD(bp));
       sample->timestamp = mozilla::TimeStamp::Now();
-      sample->threadProfile = thread_profile;
+      sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
     thread_resume(profiled_thread);
@@ -310,21 +297,25 @@ class SamplerThread : public Thread {
 
 #undef REGISTER_FIELD
 
+
+Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
-Sampler::Sampler(int interval, bool profiling, int entrySize)
+
+Sampler::Sampler(int interval, bool profiling)
     : // isolate_(isolate),
       interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false),
-      entrySize_(entrySize) /*,
+      active_(false) /*,
       samples_taken_(0)*/ {
+  data_ = new PlatformData;
 }
 
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
+  delete data_;
 }
 
 
@@ -342,56 +333,7 @@ void Sampler::Stop() {
 }
 
 pthread_t
-Sampler::GetProfiledThread(PlatformData* aData)
+Sampler::GetProfiledThread(Sampler::PlatformData* aData)
 {
   return aData->profiled_pthread();
 }
-
-#include <sys/syscall.h>
-pid_t gettid()
-{
-  return (pid_t) syscall(SYS_thread_selfid);
-}
-
-bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
-{
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  ThreadInfo* info = new ThreadInfo(aName, gettid(),
-    aIsMainThread, aPseudoStack);
-
-  bool profileThread = sActiveSampler &&
-    (aIsMainThread || sActiveSampler->ProfileThreads());
-
-  if (profileThread) {
-    // We need to create the ThreadProfile now
-    info->SetProfile(new ThreadProfile(info->Name(),
-                                       sActiveSampler->EntrySize(),
-                                       info->Stack(),
-                                       info->ThreadId(),
-                                       info->GetPlatformData(),
-                                       aIsMainThread));
-    if (sActiveSampler->ProfileJS()) {
-      info->Profile()->GetPseudoStack()->enableJSSampling();
-    }
-  }
-
-  sRegisteredThreads->push_back(info);
-  return true;
-}
-
-void Sampler::UnregisterCurrentThread()
-{
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  int id = gettid();
-
-  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-    ThreadInfo* info = sRegisteredThreads->at(i);
-    if (info->ThreadId() == id) {
-      delete info;
-      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
-      break;
-    }
-  }
-}
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index c63fc32cccba..af68f4c52354 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -28,23 +28,22 @@
 
 #include <windows.h>
 #include <mmsystem.h>
-#include <process.h>
 #include "platform.h"
-#include "TableTicker.h"
-#include "ProfileEntry.h"
+#include <process.h>
 
-class PlatformData : public Malloced {
+
+class Sampler::PlatformData : public Malloced {
  public:
   // Get a handle to the calling thread. This is the thread that we are
   // going to profile. We need to make a copy of the handle because we are
   // going to use it in the sampler thread. Using GetThreadHandle() will
   // not work in this case. We're using OpenThread because DuplicateHandle
   // for some reason doesn't work in Chrome's sandbox.
-  PlatformData(int aThreadId) : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
+  PlatformData() : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
                                                THREAD_SUSPEND_RESUME |
                                                THREAD_QUERY_INFORMATION,
                                                false,
-                                               aThreadId)) {}
+                                               GetCurrentThreadId())) {}
 
   ~PlatformData() {
     if (profiled_thread_ != NULL) {
@@ -59,20 +58,8 @@ class PlatformData : public Malloced {
   HANDLE profiled_thread_;
 };
 
-/* static */ PlatformData*
-Sampler::AllocPlatformData(int aThreadId)
-{
-  return new PlatformData(aThreadId);
-}
-
-/* static */ void
-Sampler::FreePlatformData(PlatformData* aData)
-{
-  delete aData;
-}
-
 uintptr_t
-Sampler::GetThreadHandle(PlatformData* aData)
+Sampler::GetThreadHandle(Sampler::PlatformData* aData)
 {
   return (uintptr_t) aData->profiled_thread();
 }
@@ -80,9 +67,9 @@ Sampler::GetThreadHandle(PlatformData* aData)
 class SamplerThread : public Thread {
  public:
   SamplerThread(int interval, Sampler* sampler)
-      : Thread("SamplerThread")
-      , interval_(interval)
-      , sampler_(sampler) {}
+      : Thread("SamplerThread"),
+        interval_(interval),
+        sampler_(sampler) {}
 
   static void StartSampler(Sampler* sampler) {
     if (instance_ == NULL) {
@@ -109,24 +96,8 @@ class SamplerThread : public Thread {
         ::timeBeginPeriod(interval_);
 
     while (sampler_->IsActive()) {
-      {
-        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-        std::vector<ThreadInfo*> threads =
-          sampler_->GetRegisteredThreads();
-        for (uint32_t i = 0; i < threads.size(); i++) {
-          ThreadInfo* info = threads[i];
-
-          // This will be null if we're not interested in profiling this thread.
-          if (!info->Profile())
-            continue;
-
-          ThreadProfile* thread_profile = info->Profile();
-
-          if (!sampler_->IsPaused()) {
-            SampleContext(sampler_, thread_profile);
-          }
-        }
-      }
+      if (!sampler_->IsPaused())
+        SampleContext(sampler_);
       OS::Sleep(interval_);
     }
 
@@ -135,10 +106,8 @@ class SamplerThread : public Thread {
         ::timeEndPeriod(interval_);
   }
 
-  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
-    uintptr_t thread = Sampler::GetThreadHandle(
-                               thread_profile->GetPlatformData());
-    HANDLE profiled_thread = reinterpret_cast<HANDLE>(thread);
+  void SampleContext(Sampler* sampler) {
+    HANDLE profiled_thread = sampler->platform_data()->profiled_thread();
     if (profiled_thread == NULL)
       return;
 
@@ -151,7 +120,6 @@ class SamplerThread : public Thread {
 
     // Grab the timestamp before pausing the thread, to avoid deadlocks.
     sample->timestamp = mozilla::TimeStamp::Now();
-    sample->threadProfile = thread_profile;
 
     static const DWORD kSuspendFailed = static_cast<DWORD>(-1);
     if (SuspendThread(profiled_thread) == kSuspendFailed)
@@ -169,6 +137,7 @@ class SamplerThread : public Thread {
       sample->fp = reinterpret_cast<Address>(context.Ebp);
 #endif
       sample->context = &context;
+      sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
     ResumeThread(profiled_thread);
@@ -186,16 +155,17 @@ class SamplerThread : public Thread {
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
-Sampler::Sampler(int interval, bool profiling, int entrySize)
+Sampler::Sampler(int interval, bool profiling)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
       active_(false),
-      entrySize_(entrySize) {
+      data_(new PlatformData) {
 }
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
+  delete data_;
 }
 
 void Sampler::Start() {
@@ -219,11 +189,18 @@ static unsigned int __stdcall ThreadEntry(void* arg) {
   return 0;
 }
 
+class Thread::PlatformData : public Malloced {
+ public:
+  explicit PlatformData(HANDLE thread) : thread_(thread) {}
+  HANDLE thread_;
+  unsigned thread_id_;
+};
+
 // Initialize a Win32 thread object. The thread has an invalid thread
 // handle until it is started.
 Thread::Thread(const char* name)
     : stack_size_(0) {
-  thread_ = kNoThread;
+  data_ = new PlatformData(kNoThread);
   set_name(name);
 }
 
@@ -234,72 +211,30 @@ void Thread::set_name(const char* name) {
 
 // Close our own handle for the thread.
 Thread::~Thread() {
-  if (thread_ != kNoThread) CloseHandle(thread_);
+  if (data_->thread_ != kNoThread) CloseHandle(data_->thread_);
+  delete data_;
 }
 
 // Create a new thread. It is important to use _beginthreadex() instead of
 // the Win32 function CreateThread(), because the CreateThread() does not
 // initialize thread specific structures in the C runtime library.
 void Thread::Start() {
-  thread_ = reinterpret_cast<HANDLE>(
+  data_->thread_ = reinterpret_cast<HANDLE>(
       _beginthreadex(NULL,
                      static_cast<unsigned>(stack_size_),
                      ThreadEntry,
                      this,
                      0,
-                     &thread_id_));
+                     &data_->thread_id_));
 }
 
 // Wait for thread to terminate.
 void Thread::Join() {
-  if (thread_id_ != GetCurrentThreadId()) {
-    WaitForSingleObject(thread_, INFINITE);
+  if (data_->thread_id_ != GetCurrentThreadId()) {
+    WaitForSingleObject(data_->thread_, INFINITE);
   }
 }
 
 void OS::Sleep(int milliseconds) {
   ::Sleep(milliseconds);
 }
-
-bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
-{
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  ThreadInfo* info = new ThreadInfo(aName, GetCurrentThreadId(),
-    aIsMainThread, aPseudoStack);
-
-  bool profileThread = sActiveSampler &&
-    (aIsMainThread || sActiveSampler->ProfileThreads());
-
-  if (profileThread) {
-    // We need to create the ThreadProfile now
-    info->SetProfile(new ThreadProfile(info->Name(),
-                                       sActiveSampler->EntrySize(),
-                                       info->Stack(),
-                                       GetCurrentThreadId(),
-                                       info->GetPlatformData(),
-                                       aIsMainThread));
-    if (sActiveSampler->ProfileJS()) {
-      info->Profile()->GetPseudoStack()->enableJSSampling();
-    }
-  }
-
-  sRegisteredThreads->push_back(info);
-  return true;
-}
-
-void Sampler::UnregisterCurrentThread()
-{
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  int id = GetCurrentThreadId();
-
-  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-    ThreadInfo* info = sRegisteredThreads->at(i);
-    if (info->ThreadId() == id) {
-      delete info;
-      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
-      break;
-    }
-  }
-}
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 80a317365be2..653b681dd17c 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -18,7 +18,6 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "mozilla/Services.h"
-#include "nsThreadUtils.h"
 
 mozilla::ThreadLocal<PseudoStack *> tlsPseudoStack;
 mozilla::ThreadLocal<TableTicker *> tlsTicker;
@@ -28,16 +27,15 @@ mozilla::ThreadLocal<TableTicker *> tlsTicker;
 // it as the flag itself.
 bool stack_key_initialized;
 
-TimeStamp   sLastTracerEvent; // is raced on
-int         sFrameNumber = 0;
-int         sLastFrameNumber = 0;
-static bool sIsProfiling = false; // is raced on
+TimeStamp sLastTracerEvent; // is raced on
+int       sFrameNumber = 0;
+int       sLastFrameNumber = 0;
 
 /* used to keep track of the last event that we sampled during */
 unsigned int sLastSampledEventGeneration = 0;
 
 /* a counter that's incremented everytime we get responsiveness event
- * note: it might also be worth trackplaing everytime we go around
+ * note: it might also be worth tracking everytime we go around
  * the event loop */
 unsigned int sCurrentEventGeneration = 0;
 /* we don't need to worry about overflow because we only treat the
@@ -45,35 +43,6 @@ unsigned int sCurrentEventGeneration = 0;
  * a problem if 2^32 events happen between samples that we need
  * to know are associated with different events */
 
-std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = nullptr;
-mozilla::Mutex* Sampler::sRegisteredThreadsMutex = nullptr;
-
-TableTicker* Sampler::sActiveSampler;
-
-void Sampler::Startup() {
-  sRegisteredThreads = new std::vector<ThreadInfo*>();
-  sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
-}
-
-void Sampler::Shutdown() {
-  while (sRegisteredThreads->size() > 0) {
-    delete sRegisteredThreads->back();
-    sRegisteredThreads->pop_back();
-  }
-
-  delete sRegisteredThreadsMutex;
-  delete sRegisteredThreads;
-}
-
-ThreadInfo::~ThreadInfo() {
-  free(mName);
-
-  if (mProfile)
-    delete mProfile;
-
-  Sampler::FreePlatformData(mPlatformData);
-}
-
 bool sps_version2()
 {
   static int version = 0; // Raced on, potentially
@@ -253,13 +222,9 @@ void mozilla_sampler_init()
   }
   stack_key_initialized = true;
 
-  Sampler::Startup();
-
   PseudoStack *stack = new PseudoStack();
   tlsPseudoStack.set(stack);
 
-  Sampler::RegisterCurrentThread("Gecko", stack, true);
-
   if (sps_version2()) {
     // Read mode settings from MOZ_PROFILER_MODE and interval
     // settings from MOZ_PROFILER_INTERVAL and stack-scan threshhold
@@ -329,9 +294,6 @@ void mozilla_sampler_shutdown()
   }
 
   profiler_stop();
-
-  Sampler::Shutdown();
-
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
   // TODO Need to find a safe time to delete Stack
@@ -390,7 +352,6 @@ const char** mozilla_sampler_get_features()
 #endif
     "jank",
     "js",
-    "threads",
     NULL
   };
 
@@ -422,29 +383,16 @@ void mozilla_sampler_start(int aProfileEntries, int aInterval,
   if (sps_version2()) {
     t = new BreakpadSampler(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                            aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                           aFeatures, aFeatureCount);
+                           stack, aFeatures, aFeatureCount);
   } else {
     t = new TableTicker(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                         aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                        aFeatures, aFeatureCount);
+                        stack, aFeatures, aFeatureCount);
   }
   tlsTicker.set(t);
   t->Start();
-  if (t->ProfileJS()) {
-      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-      std::vector<ThreadInfo*> threads = t->GetRegisteredThreads();
-
-      for (uint32_t i = 0; i < threads.size(); i++) {
-        ThreadInfo* info = threads[i];
-        ThreadProfile* thread_profile = info->Profile();
-        if (!thread_profile) {
-          continue;
-        }
-        thread_profile->GetPseudoStack()->enableJSSampling();
-      }
-  }
-
-  sIsProfiling = true;
+  if (t->ProfileJS())
+      stack->enableJSSampling();
 
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
@@ -472,8 +420,6 @@ void mozilla_sampler_stop()
   if (disableJS)
     stack->disableJSSampling();
 
-  sIsProfiling = false;
-
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
     os->NotifyObservers(nullptr, "profiler-stopped", nullptr);
@@ -481,7 +427,15 @@ void mozilla_sampler_stop()
 
 bool mozilla_sampler_is_active()
 {
-  return sIsProfiling;
+  if (!stack_key_initialized)
+    profiler_init();
+
+  TableTicker *t = tlsTicker.get();
+  if (!t) {
+    return false;
+  }
+
+  return t->IsActive();
 }
 
 static double sResponsivenessTimes[100];
@@ -533,20 +487,6 @@ void mozilla_sampler_unlock()
     os->NotifyObservers(nullptr, "profiler-unlocked", nullptr);
 }
 
-bool mozilla_sampler_register_thread(const char* aName)
-{
-  PseudoStack* stack = new PseudoStack();
-  tlsPseudoStack.set(stack);
-
-  return Sampler::RegisterCurrentThread(aName, stack, false);
-}
-
-void mozilla_sampler_unregister_thread()
-{
-  Sampler::UnregisterCurrentThread();
-}
-
 // END externally visible functions
 ////////////////////////////////////////////////////////////////////////
 
-
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index f78c6911f9d4..22bc75afbe87 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -35,23 +35,14 @@
 #define __android_log_print(a, ...)
 #endif
 
-#ifdef XP_UNIX
-#include <pthread.h>
-#endif
-
 #include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 #include "mozilla/unused.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/Mutex.h"
 #include "PlatformMacros.h"
 #include "v8-support.h"
 #include <vector>
 
-#ifdef XP_WIN
-#include <windows.h>
-#endif
-
 #define ASSERT(a) MOZ_ASSERT(a)
 
 #ifdef ANDROID
@@ -192,17 +183,14 @@ class Thread {
   // prctl().
   static const int kMaxThreadNameLength = 16;
 
-#ifdef XP_WIN
-  HANDLE thread_;
-  unsigned thread_id_;
-#endif
-#if defined(XP_MACOSX)
-  pthread_t thread_;
-#endif
+  class PlatformData;
+  PlatformData* data() { return data_; }
 
  private:
   void set_name(const char *name);
 
+  PlatformData* data_;
+
   char name_[kMaxThreadNameLength];
   int stack_size_;
 
@@ -244,9 +232,6 @@ extern int     sUnwindStackScan;  /* max # of dubious frames allowed */
 // (if used for profiling) the program counter and stack pointer for
 // the thread that created it.
 
-class PseudoStack;
-class ThreadProfile;
-
 // TickSample captures the information collected for each sample.
 class TickSample {
  public:
@@ -270,23 +255,23 @@ class TickSample {
   Address function;  // The last called JS function.
   void*   context;   // The context from the signal handler, if available. On
                      // Win32 this may contain the windows thread context.
-  ThreadProfile* threadProfile;
   static const int kMaxFramesCount = 64;
+  Address stack[kMaxFramesCount];  // Call stack.
   int frames_count;  // Number of captured frames.
   mozilla::TimeStamp timestamp;
 };
 
-class ThreadInfo;
-class PlatformData;
-class TableTicker;
 class Sampler {
  public:
   // Initialize sampler.
-  explicit Sampler(int interval, bool profiling, int entrySize);
+  explicit Sampler(int interval, bool profiling);
   virtual ~Sampler();
 
   int interval() const { return interval_; }
 
+  // Performs stack sampling.
+  virtual void SampleStack(TickSample* sample) = 0;
+
   // This method is called for each sampling period with the current
   // program counter.
   virtual void Tick(TickSample* sample) = 0;
@@ -310,14 +295,9 @@ class Sampler {
   bool IsPaused() const { return paused_; }
   void SetPaused(bool value) { NoBarrier_Store(&paused_, value); }
 
-  virtual bool ProfileThreads() const = 0;
+  class PlatformData;
 
-  int EntrySize() { return entrySize_; }
-
-  // We can't new/delete the type safely without defining it
-  // (-Wdelete-incomplete). Use these Alloc/Free functions instead.
-  static PlatformData* AllocPlatformData(int aThreadId);
-  static void FreePlatformData(PlatformData*);
+  PlatformData* platform_data() { return data_; }
 
   // If we move the backtracing code into the platform files we won't
   // need to have these hacks
@@ -328,26 +308,6 @@ class Sampler {
 #ifdef XP_MACOSX
   static pthread_t GetProfiledThread(PlatformData*);
 #endif
-
-  static std::vector<ThreadInfo*> GetRegisteredThreads() {
-    return *sRegisteredThreads;
-  }
-
-  static bool RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread);
-  static void UnregisterCurrentThread();
-
-  static void Startup();
-  // Should only be called on shutdown
-  static void Shutdown();
-
-  static TableTicker* GetActiveSampler() { return sActiveSampler; }
-  static void SetActiveSampler(TableTicker* sampler) { sActiveSampler = sampler; }
-
-  static mozilla::Mutex* sRegisteredThreadsMutex;
- protected:
-  static std::vector<ThreadInfo*>* sRegisteredThreads;
-  static TableTicker* sActiveSampler;
-
  private:
   void SetActive(bool value) { NoBarrier_Store(&active_, value); }
 
@@ -355,47 +315,7 @@ class Sampler {
   const bool profiling_;
   Atomic32 paused_;
   Atomic32 active_;
-  const int entrySize_;
-
-  // Refactor me!
-#if defined(SPS_OS_linux) || defined(SPS_OS_android)
-  bool signal_handler_installed_;
-  struct sigaction old_sigprof_signal_handler_;
-  struct sigaction old_sigsave_signal_handler_;
-  bool signal_sender_launched_;
-  pthread_t signal_sender_thread_;
-#endif
-};
-
-class ThreadInfo {
- public:
-  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
-    : mName(strdup(aName))
-    , mThreadId(aThreadId)
-    , mIsMainThread(aIsMainThread)
-    , mPseudoStack(aPseudoStack)
-    , mPlatformData(Sampler::AllocPlatformData(aThreadId))
-    , mProfile(NULL) {}
-
-  virtual ~ThreadInfo();
-
-  const char* Name() const { return mName; }
-  int ThreadId() const { return mThreadId; }
-
-  bool IsMainThread() const { return mIsMainThread; }
-  PseudoStack* Stack() const { return mPseudoStack; }
-  
-  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
-  ThreadProfile* Profile() const { return mProfile; }
-
-  PlatformData* GetPlatformData() const { return mPlatformData; }
- private:
-  char* mName;
-  int mThreadId;
-  const bool mIsMainThread;
-  PseudoStack* mPseudoStack;
-  PlatformData* mPlatformData;
-  ThreadProfile* mProfile;
+  PlatformData* data_;  // Platform specific data.
 };
 
 #endif /* ndef TOOLS_PLATFORM_H_ */

From a27528e1952a32e58e2b45a2a0fb2de61ad36e3e Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 16 Apr 2013 10:37:14 -0700
Subject: [PATCH 361/438] Bug 862440 - Remove unused aboutReaderContent.html
 and aboutReaderContent.css. r=bnicholson

---
 .../chrome/content/aboutReaderContent.html    |  18 -
 .../themes/core/aboutReaderContent.css        | 309 ------------------
 2 files changed, 327 deletions(-)
 delete mode 100644 mobile/android/chrome/content/aboutReaderContent.html
 delete mode 100644 mobile/android/themes/core/aboutReaderContent.css

diff --git a/mobile/android/chrome/content/aboutReaderContent.html b/mobile/android/chrome/content/aboutReaderContent.html
deleted file mode 100644
index b21e2e4d942b..000000000000
--- a/mobile/android/chrome/content/aboutReaderContent.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <!-- make links load outside of frame -->
-  <base target="_parent" />
-
-  <link rel="stylesheet" href="chrome://browser/skin/aboutReaderContent.css" type="text/css"/>
-</head>
-<body>
-  <div id="reader-header" class="header">
-    <div id="reader-domain" class="domain"></div>
-    <h1 id="reader-title"></h1>
-    <div id="reader-credits" class="credits"></div>
-  </div>
-  <div id="reader-content" class="content"></div>
-</body>
-</html>
-
diff --git a/mobile/android/themes/core/aboutReaderContent.css b/mobile/android/themes/core/aboutReaderContent.css
deleted file mode 100644
index b91ab044eb65..000000000000
--- a/mobile/android/themes/core/aboutReaderContent.css
+++ /dev/null
@@ -1,309 +0,0 @@
-html {
-  -moz-text-size-adjust: none;
-}
-
-body {
-  font-family: "Open Sans","Droid Sans",sans-serif;
-  margin: 0;
-  padding-top: 20px;
-  padding-bottom: 20px;
-} 
-
-.light {
-  color: #222222;
-}
-
-.dark {
-  color: #eeeeee;
-}
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.header > .domain {
-  margin-top: 10px;
-  padding-bottom: 10px;
-  border-bottom: 2px solid; 
-}
-
-.header > h1 {
-  font-family: "Open Sans","Droid Sans",sans-serif;
-  font-weight: 300;
-  line-height: 1.1em;
-  width: 100%;
-  margin: 0px;
-  margin-top: 32px;
-  margin-bottom: 16px;
-  padding: 0px;
-}
-
-.header > .credits {
-  padding: 0px;
-  margin: 0px;
-  margin-bottom: 32px;
-}
-
-.light > .header > .domain {
-  color: #ee7600;
-  border-bottom-color: #d0d0d0; 
-}
-
-.light > .header > h1 {
-  color: #222222;
-}
-
-.light > .header > .credits {
-  color: #898989;
-}
-
-.dark > .header > .domain {
-  color: #ff9400;
-  border-bottom-color: #777777; 
-}
-
-.dark > .header > h1 {
-  color: #eeeeee;
-}
-
-.dark > .header > .credits {
-  color: #aaaaaa;
-}
-
-.font-size1 > .header > h1 {
-  font-size: 23px;
-}
-
-.font-size2 > .header > h1 {
-  font-size: 25px;
-}
-
-.font-size3 > .header > h1 {
-  font-size: 27px;
-}
-
-.font-size4 > .header > h1 {
-  font-size: 29px;
-}
-
-.font-size5 > .header > h1 {
-  font-size: 31px;
-}
-
-.font-size6 > .header > h1 {
-  font-size: 33px;
-}
-
-.font-size7 > .header > h1 {
-  font-size: 35px;
-}
-
-/* This covers caption, domain, and credits
-   texts in the reader UI */
-.font-size1 > .content .wp-caption-text,
-.font-size1 > .content figcaption,
-.font-size1 > .header > .domain,
-.font-size1 > .header > .credits {
-  font-size: 6px;
-}
-
-.font-size2 > .content .wp-caption-text,
-.font-size2 > .content figcaption,
-.font-size2 > .header > .domain,
-.font-size2 > .header > .credits {
-  font-size: 8px;
-}
-
-.font-size3 > .content .wp-caption-text,
-.font-size3 > .content figcaption,
-.font-size3 > .header > .domain,
-.font-size3 > .header > .credits {
-  font-size: 11px;
-}
-
-.font-size4 > .content .wp-caption-text,
-.font-size4 > .content figcaption,
-.font-size4 > .header > .domain,
-.font-size4 > .header > .credits {
-  font-size: 13px;
-}
-
-.font-size5 > .content .wp-caption-text,
-.font-size5 > .content figcaption,
-.font-size5 > .header > .domain,
-.font-size5 > .header > .credits {
-  font-size: 15px;
-}
-
-.font-size6 > .content .wp-caption-text,
-.font-size6 > .content figcaption,
-.font-size6 > .header > .domain,
-.font-size6 > .header > .credits {
-  font-size: 17px;
-}
-
-.font-size7 > .content .wp-caption-text,
-.font-size7 > .content figcaption,
-.font-size7 > .header > .domain,
-.font-size7 > .header > .credits {
-  font-size: 19px;
-}
-
-.content {
-  display: none;
-}
-
-.content a {
-  text-decoration: underline !important;
-  font-weight: normal;
-}
-
-.light > .content a,
-.light > .content a:visited,
-.light > .content a:hover,
-.light > .content a:active {
-  color: #ee6700 !important;
-}
-
-.dark > .content a,
-.dark > .content a:visited,
-.dark > .content a:hover,
-.dark > .content a:active {
-  color: #ff9400 !important;
-}
-
-.content * {
-  max-width: 100% !important;
-  height: auto !important;
-}
-
-.content p {
-  line-height: 1.4em !important;
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-}
-
-/* Covers all images showing edge-to-edge using a 
-   an optional caption text */
-.content .wp-caption,
-.content figure {
-  display: block !important;
-  width: 100% !important;
-  margin: 0px !important;
-  margin-bottom: 32px !important;
-}
-
-/* Images marked to be shown edge-to-edge with an
-   optional captio ntext */
-.content p > img:only-child,
-.content p > a:only-child > img:only-child,
-.content .wp-caption img,
-.content figure img {
-  max-width: none !important;
-  height: auto !important;
-  display: block !important;
-  margin-top: 0px !important;
-  margin-bottom: 32px !important;
-}
-
-/* If image is place inside one of these blocks
-   there's no need to add margin at the bottom */
-.content .wp-caption img,
-.content figure img {
-  margin-bottom: 0px !important;
-}
-
-/* Image caption text */
-.content .caption,
-.content .wp-caption-text,
-.content figcaption {
-  margin: 0px !important;
-  padding-top: 4px !important;
-}
-
-.light > .content .caption,
-.light > .content .wp-caption-text,
-.light > .content figcaption {
-  color: #898989;
-}
-
-.dark > .content .caption,
-.dark > .content .wp-caption-text,
-.dark > .content figcaption {
-  color: #aaaaaa;
-}
-
-/* Ensure all pre-formatted code inside the reader content
-   are properly wrapped inside content width */
-.content code,
-.content pre {
-  white-space: pre-wrap !important;
-  margin-bottom: 20px !important;
-}
-
-.content blockquote {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  -moz-padding-start: 16px !important;
-  border: 0px !important;
-  border-left: 2px solid !important;
-}
-
-.light > .content blockquote {
-  color: #898989 !important;
-  border-left-color: #d0d0d0 !important;
-}
-
-.dark > .content blockquote {
-  color: #aaaaaa !important;
-  border-left-color: #777777 !important;
-}
-
-.content ul,
-.content ol {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  line-height: 1.5em;
-}
-
-.content ul {
-  -moz-padding-start: 30px !important;
-  list-style: disk !important;
-}
-
-.content ol {
-  -moz-padding-start: 35px !important;
-  list-style: decimal !important;
-}
-
-.font-size1 > .content {
-  font-size: 10px !important;
-}
-
-.font-size2 > .content {
-  font-size: 12px !important;
-}
-
-.font-size3 > .content {
-  font-size: 14px !important;
-}
-
-.font-size4 > .content {
-  font-size: 16px !important;
-}
-
-.font-size5 > .content {
-  font-size: 18px !important;
-}
-
-.font-size6 > .content {
-  font-size: 20px !important;
-}
-
-.font-size7 > .content {
-  font-size: 22px !important;
-}
-

From 5b4c8051e335eb47a4832568b36594ef2a24ac81 Mon Sep 17 00:00:00 2001
From: Ben Hearsum <bhearsum@mozilla.com>
Date: Tue, 16 Apr 2013 14:04:59 -0400
Subject: [PATCH 362/438] bug 861967: updater sets PLATFORM_VERSION part of URL
 wrong. r=snorp

---
 mobile/android/base/AppConstants.java.in     | 3 +++
 mobile/android/base/UpdateServiceHelper.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
index dc2477f6f790..33825d6d7a49 100644
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -16,6 +16,9 @@ public class AppConstants {
     public static final String MOZ_APP_ID = "@MOZ_APP_ID@";
     public static final String MOZ_APP_NAME = "@MOZ_APP_NAME@";
     public static final String MOZ_APP_VERSION = "@MOZ_APP_VERSION@";
+    // MOZILLA_VERSION is already quoted when it gets substituted in. If we
+    // add additional quotes we end up with ""x.y"", which is a syntax error.
+    public static final String MOZILLA_VERSION = @MOZILLA_VERSION@;
     public static final String MOZ_CHILD_PROCESS_NAME = "@MOZ_CHILD_PROCESS_NAME@";
     public static final String MOZ_UPDATE_CHANNEL = "@MOZ_UPDATE_CHANNEL@";
     public static final String OS_TARGET = "@OS_TARGET@";
diff --git a/mobile/android/base/UpdateServiceHelper.java b/mobile/android/base/UpdateServiceHelper.java
index 5d4ece5ea8e5..307101f6ef94 100644
--- a/mobile/android/base/UpdateServiceHelper.java
+++ b/mobile/android/base/UpdateServiceHelper.java
@@ -64,7 +64,7 @@ public class UpdateServiceHelper {
                      AppConstants.MOZ_APP_VERSION         +
                      "/%BUILDID%/Android_"                + AppConstants.MOZ_APP_ABI + pkgSpecial +
                      "/%LOCALE%/"                         + AppConstants.MOZ_UPDATE_CHANNEL +
-                     "/%OS_VERSION%/default/default/"     + AppConstants.MOZ_APP_VERSION +
+                     "/%OS_VERSION%/default/default/"     + AppConstants.MOZILLA_VERSION +
                      "/update.xml";
     }
 

From b55d4bd0d88a84e166a81467dbc8b7da307fdcc9 Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Tue, 16 Apr 2013 20:35:09 +0200
Subject: [PATCH 363/438] Bug 859065 - Avoid "command timed out: 1200 seconds
 without output, attempting to kill" by providing an inner xpcshell timeout of
 5 minutes. r=jmaher

---
 testing/xpcshell/head.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/testing/xpcshell/head.js b/testing/xpcshell/head.js
index 38fc9ab057da..ac2723b6f523 100644
--- a/testing/xpcshell/head.js
+++ b/testing/xpcshell/head.js
@@ -10,6 +10,8 @@
  * for more information.
  */
 
+const _XPCSHELL_TIMEOUT_MS = 5 * 60 * 1000;
+
 var _quit = false;
 var _passed = true;
 var _tests_pending = 0;
@@ -315,6 +317,15 @@ function _execute_test() {
   // Call do_get_idle() to restore the factory and get the service.
   _fakeIdleService.activate();
 
+  // Terminate asynchronous tests when a global timeout occurs.
+  do_timeout(_XPCSHELL_TIMEOUT_MS, function _do_main_timeout() {
+    try {
+      do_throw("test timed out");
+    } catch (e if e == Components.results.NS_ERROR_ABORT) {
+      // We don't want do_timeout to report the do_throw exception again.
+    }
+  });
+
   // _HEAD_FILES is dynamically defined by <runxpcshelltests.py>.
   _load_files(_HEAD_FILES);
   // _TEST_FILE is dynamically defined by <runxpcshelltests.py>.

From 4a707b8706a534171a40a7b629dc222fe65d7d50 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Tue, 16 Apr 2013 11:45:02 -0700
Subject: [PATCH 364/438] Bug 830492 - Manually control WAL checkpointing
 during heavy I/O; r=rnewman

---
 services/healthreport/healthreporter.jsm      |  2 +
 services/metrics/storage.jsm                  | 45 ++++++++++++++++++-
 .../tests/xpcshell/test_metrics_storage.js    | 35 +++++++++++++++
 3 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/services/healthreport/healthreporter.jsm b/services/healthreport/healthreporter.jsm
index d11c85ef41af..782820796f8e 100644
--- a/services/healthreport/healthreporter.jsm
+++ b/services/healthreport/healthreporter.jsm
@@ -569,6 +569,7 @@ AbstractHealthReporter.prototype = Object.freeze({
     }
 
     return Task.spawn(function collectAndObtain() {
+      yield this._storage.setAutoCheckpoint(0);
       yield this._providerManager.ensurePullOnlyProvidersRegistered();
 
       let payload;
@@ -583,6 +584,7 @@ AbstractHealthReporter.prototype = Object.freeze({
                                ex);
       } finally {
         yield this._providerManager.ensurePullOnlyProvidersUnregistered();
+        yield this._storage.setAutoCheckpoint(1);
 
         if (error) {
           throw error;
diff --git a/services/metrics/storage.jsm b/services/metrics/storage.jsm
index 248f3f6b8552..5a69fa7a3c89 100644
--- a/services/metrics/storage.jsm
+++ b/services/metrics/storage.jsm
@@ -701,6 +701,7 @@ function MetricsStorageSqliteBackend(connection) {
   this._log = Log4Moz.repository.getLogger("Services.Metrics.MetricsStorage");
 
   this._connection = connection;
+  this._enabledWALCheckpointPages = null;
 
   // Integer IDs to string name.
   this._typesByID = new Map();
@@ -1138,8 +1139,15 @@ MetricsStorageSqliteBackend.prototype = Object.freeze({
       self._log.info("Journal mode is " + journalMode);
 
       if (journalMode == "wal") {
-        yield self._connection.execute("PRAGMA wal_autocheckpoint=" +
-                                       Math.ceil(self.MAX_WAL_SIZE_KB * 1024 / pageSize));
+        self._enabledWALCheckpointPages =
+          Math.ceil(self.MAX_WAL_SIZE_KB * 1024 / pageSize);
+
+        self._log.info("WAL auto checkpoint pages: " +
+                       self._enabledWALCheckpointPages);
+
+        // We disable auto checkpoint during initialization to make it
+        // quicker.
+        yield self.setAutoCheckpoint(0);
       } else {
         if (journalMode != "truncate") {
          // Fall back to truncate (which is faster than delete).
@@ -1151,6 +1159,8 @@ MetricsStorageSqliteBackend.prototype = Object.freeze({
         yield self._connection.execute("PRAGMA synchronous=FULL");
       }
 
+      let doCheckpoint = false;
+
       // 1. Create the schema.
       yield self._connection.executeTransaction(function ensureSchema(conn) {
         let schema = conn.schemaVersion;
@@ -1163,6 +1173,7 @@ MetricsStorageSqliteBackend.prototype = Object.freeze({
           }
 
           self._connection.schemaVersion = 1;
+          doCheckpoint = true;
         } else if (schema != 1) {
           throw new Error("Unknown database schema: " + schema);
         } else {
@@ -1203,6 +1214,8 @@ MetricsStorageSqliteBackend.prototype = Object.freeze({
             self._typesByName.set(type, id);
           }
         });
+
+        doCheckpoint = true;
       }
 
       // 4. Obtain measurement info.
@@ -1233,6 +1246,14 @@ MetricsStorageSqliteBackend.prototype = Object.freeze({
         self._fieldsByInfo.set([measurementID, fieldName].join(":"), fieldID);
         self._fieldsByMeasurement.get(measurementID).add(fieldID);
       });
+
+      // Perform a checkpoint after initialization (if needed) and
+      // enable auto checkpoint during regular operation.
+      if (doCheckpoint) {
+        yield self.checkpoint();
+      }
+
+      yield self.setAutoCheckpoint(1);
     });
   },
 
@@ -1287,11 +1308,31 @@ MetricsStorageSqliteBackend.prototype = Object.freeze({
    * sparingly.
    */
   checkpoint: function () {
+    if (!this._enabledWALCheckpointPages) {
+      return CommonUtils.laterTickResolvingPromise();
+    }
+
     return this.enqueueOperation(function checkpoint() {
+      this._log.info("Performing manual WAL checkpoint.");
       return this._connection.execute("PRAGMA wal_checkpoint");
     }.bind(this));
   },
 
+  setAutoCheckpoint: function (on) {
+    // If we aren't in WAL mode, wal_autocheckpoint won't do anything so
+    // we no-op.
+    if (!this._enabledWALCheckpointPages) {
+      return CommonUtils.laterTickResolvingPromise();
+    }
+
+    let val = on ? this._enabledWALCheckpointPages : 0;
+
+    return this.enqueueOperation(function setWALCheckpoint() {
+      this._log.info("Setting WAL auto checkpoint to " + val);
+      return this._connection.execute("PRAGMA wal_autocheckpoint=" + val);
+    }.bind(this));
+  },
+
   /**
    * Ensure a field ID matches a specified type.
    *
diff --git a/services/metrics/tests/xpcshell/test_metrics_storage.js b/services/metrics/tests/xpcshell/test_metrics_storage.js
index 13f0743c9fff..67f09b9f1490 100644
--- a/services/metrics/tests/xpcshell/test_metrics_storage.js
+++ b/services/metrics/tests/xpcshell/test_metrics_storage.js
@@ -59,6 +59,13 @@ add_task(function test_get_sqlite_backend() {
 
   do_check_neq(backend._connection, null);
 
+  // Ensure WAL and auto checkpoint are enabled.
+  do_check_neq(backend._enabledWALCheckpointPages, null);
+  let rows = yield backend._connection.execute("PRAGMA journal_mode");
+  do_check_eq(rows[0].getResultByIndex(0), "wal");
+  rows = yield backend._connection.execute("PRAGMA wal_autocheckpoint");
+  do_check_eq(rows[0].getResultByIndex(0), backend._enabledWALCheckpointPages);
+
   yield backend.close();
   do_check_null(backend._connection);
 });
@@ -89,6 +96,34 @@ add_task(function test_future_schema_errors() {
   do_check_true(failed);
 });
 
+add_task(function test_checkpoint_apis() {
+  let backend = yield Metrics.Storage("checkpoint_apis");
+  let c = backend._connection;
+  let count = c._statementCounter;
+
+  yield backend.setAutoCheckpoint(0);
+  do_check_eq(c._statementCounter, count + 1);
+
+  let rows = yield c.execute("PRAGMA wal_autocheckpoint");
+  do_check_eq(rows[0].getResultByIndex(0), 0);
+  count = c._statementCounter;
+
+  yield backend.setAutoCheckpoint(1);
+  do_check_eq(c._statementCounter, count + 1);
+
+  rows = yield c.execute("PRAGMA wal_autocheckpoint");
+  do_check_eq(rows[0].getResultByIndex(0), backend._enabledWALCheckpointPages);
+  count = c._statementCounter;
+
+  yield backend.checkpoint();
+  do_check_eq(c._statementCounter, count + 1);
+
+  yield backend.checkpoint();
+  do_check_eq(c._statementCounter, count + 2);
+
+  yield backend.close();
+});
+
 add_task(function test_measurement_registration() {
   let backend = yield Metrics.Storage("measurement_registration");
 

From 0448cc1d1fe60960284114d5178d209432c638a7 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Tue, 16 Apr 2013 11:46:05 -0700
Subject: [PATCH 365/438] Bug 855024 - Better management of pull-only
 providers; r=rnewman

---
 .../tests/xpcshell/test_healthreporter.js     |   2 +
 services/metrics/providermanager.jsm          | 134 ++++++++++++++++--
 .../xpcshell/test_metrics_provider_manager.js |  93 ++++++++++++
 3 files changed, 215 insertions(+), 14 deletions(-)

diff --git a/services/healthreport/tests/xpcshell/test_healthreporter.js b/services/healthreport/tests/xpcshell/test_healthreporter.js
index 3895da327f28..696cded784b7 100644
--- a/services/healthreport/tests/xpcshell/test_healthreporter.js
+++ b/services/healthreport/tests/xpcshell/test_healthreporter.js
@@ -198,6 +198,8 @@ add_task(function test_pull_only_providers() {
     do_check_null(reporter.getProvider("DummyConstantProvider"));
 
     yield reporter._providerManager.ensurePullOnlyProvidersRegistered();
+    do_check_eq(reporter._providerManager._providers.size, 2);
+    do_check_true(reporter._storage.hasProvider("DummyConstantProvider"));
     yield reporter.collectMeasurements();
     yield reporter._providerManager.ensurePullOnlyProvidersUnregistered();
 
diff --git a/services/metrics/providermanager.jsm b/services/metrics/providermanager.jsm
index 08e27b03cc85..553734647bcb 100644
--- a/services/metrics/providermanager.jsm
+++ b/services/metrics/providermanager.jsm
@@ -34,7 +34,9 @@ this.ProviderManager = function (storage) {
   this._providerInitializing = false;
 
   this._pullOnlyProviders = {};
-  this._pullOnlyProvidersRegistered = false;
+  this._pullOnlyProvidersRegisterCount = 0;
+  this._pullOnlyProvidersState = this.PULL_ONLY_NOT_REGISTERED;
+  this._pullOnlyProvidersCurrentPromise = null;
 
   // Callback to allow customization of providers after they are constructed
   // but before they call out into their initialization code.
@@ -42,6 +44,11 @@ this.ProviderManager = function (storage) {
 }
 
 this.ProviderManager.prototype = Object.freeze({
+  PULL_ONLY_NOT_REGISTERED: "none",
+  PULL_ONLY_REGISTERING: "registering",
+  PULL_ONLY_UNREGISTERING: "unregistering",
+  PULL_ONLY_REGISTERED: "registered",
+
   get providers() {
     let providers = [];
     for (let [name, entry] of this._providers) {
@@ -225,41 +232,134 @@ this.ProviderManager.prototype = Object.freeze({
    * Ensure that pull-only providers are registered.
    */
   ensurePullOnlyProvidersRegistered: function () {
-    if (this._pullOnlyProvidersRegistered) {
+    let state = this._pullOnlyProvidersState;
+
+    this._pullOnlyProvidersRegisterCount++;
+
+    if (state == this.PULL_ONLY_REGISTERED) {
+      this._log.debug("Requested pull-only provider registration and " +
+                      "providers are already registered.");
       return CommonUtils.laterTickResolvingPromise();
     }
 
-    let onFinished = function () {
-      this._pullOnlyProvidersRegistered = true;
+    // If we're in the process of registering, chain off that request.
+    if (state == this.PULL_ONLY_REGISTERING) {
+      this._log.debug("Requested pull-only provider registration and " +
+                      "registration is already in progress.");
+      return this._pullOnlyProvidersCurrentPromise;
+    }
 
-      return CommonUtils.laterTickResolvingPromise();
-    }.bind(this);
+    this._log.debug("Pull-only provider registration requested.");
+
+    // A side-effect of setting this is that an active unregistration will
+    // effectively short circuit and finish as soon as the in-flight
+    // unregistration (if any) finishes.
+    this._pullOnlyProvidersState = this.PULL_ONLY_REGISTERING;
+
+    let inFlightPromise = this._pullOnlyProvidersCurrentPromise;
+
+    this._pullOnlyProvidersCurrentPromise =
+      Task.spawn(function registerPullProviders() {
+
+      if (inFlightPromise) {
+        this._log.debug("Waiting for in-flight pull-only provider activity " +
+                        "to finish before registering.");
+        try {
+          yield inFlightPromise;
+        } catch (ex) {
+          this._log.warn("Error when waiting for existing pull-only promise: " +
+                         CommonUtils.exceptionStr(ex));
+        }
+      }
 
-    return Task.spawn(function registerPullProviders() {
       for each (let providerType in this._pullOnlyProviders) {
+        // Short-circuit if we're no longer registering.
+        if (this._pullOnlyProvidersState != this.PULL_ONLY_REGISTERING) {
+          this._log.debug("Aborting pull-only provider registration.");
+          break;
+        }
+
         try {
           let provider = this._initProviderFromType(providerType);
+
+          // This is a no-op if the provider is already registered. So, the
+          // only overhead is constructing an instance. This should be cheap
+          // and isn't worth optimizing.
           yield this.registerProvider(provider);
         } catch (ex) {
           this._recordError("Error registering pull-only provider", ex);
         }
       }
-    }.bind(this)).then(onFinished, onFinished);
+
+      // It's possible we changed state while registering. Only mark as
+      // registered if we didn't change state.
+      if (this._pullOnlyProvidersState == this.PULL_ONLY_REGISTERING) {
+        this._pullOnlyProvidersState = this.PULL_ONLY_REGISTERED;
+        this._pullOnlyProvidersCurrentPromise = null;
+      }
+    }.bind(this));
+    return this._pullOnlyProvidersCurrentPromise;
   },
 
   ensurePullOnlyProvidersUnregistered: function () {
-    if (!this._pullOnlyProvidersRegistered) {
+    let state = this._pullOnlyProvidersState;
+
+    // If we're not registered, this is a no-op.
+    if (state == this.PULL_ONLY_NOT_REGISTERED) {
+      this._log.debug("Requested pull-only provider unregistration but none " +
+                      "are registered.");
       return CommonUtils.laterTickResolvingPromise();
     }
 
-    let onFinished = function () {
-      this._pullOnlyProvidersRegistered = false;
+    // If we're currently unregistering, recycle the promise from last time.
+    if (state == this.PULL_ONLY_UNREGISTERING) {
+      this._log.debug("Requested pull-only provider unregistration and " +
+                 "unregistration is in progress.");
+      this._pullOnlyProvidersRegisterCount =
+        Math.max(0, this._pullOnlyProvidersRegisterCount - 1);
 
+      return this._pullOnlyProvidersCurrentPromise;
+    }
+
+    // We ignore this request while multiple entities have requested
+    // registration because we don't want a request from an "inner,"
+    // short-lived request to overwrite the desire of the "parent,"
+    // longer-lived request.
+    if (this._pullOnlyProvidersRegisterCount > 1) {
+      this._log.debug("Requested pull-only provider unregistration while " +
+                      "other callers still want them registered. Ignoring.");
+      this._pullOnlyProvidersRegisterCount--;
       return CommonUtils.laterTickResolvingPromise();
-    }.bind(this);
+    }
+
+    // We are either fully registered or registering with a single consumer.
+    // In both cases we are authoritative and can commence unregistration.
+
+    this._log.debug("Pull-only providers being unregistered.");
+    this._pullOnlyProvidersRegisterCount =
+      Math.max(0, this._pullOnlyProvidersRegisterCount - 1);
+    this._pullOnlyProvidersState = this.PULL_ONLY_UNREGISTERING;
+    let inFlightPromise = this._pullOnlyProvidersCurrentPromise;
+
+    this._pullOnlyProvidersCurrentPromise =
+      Task.spawn(function unregisterPullProviders() {
+
+      if (inFlightPromise) {
+        this._log.debug("Waiting for in-flight pull-only provider activity " +
+                        "to complete before unregistering.");
+        try {
+          yield inFlightPromise;
+        } catch (ex) {
+          this._log.warn("Error when waiting for existing pull-only promise: " +
+                         CommonUtils.exceptionStr(ex));
+        }
+      }
 
-    return Task.spawn(function unregisterPullProviders() {
       for (let provider of this.providers) {
+        if (this._pullOnlyProvidersState != this.PULL_ONLY_UNREGISTERING) {
+          return;
+        }
+
         if (!provider.pullOnly) {
           continue;
         }
@@ -276,7 +376,13 @@ this.ProviderManager.prototype = Object.freeze({
           this.unregisterProvider(provider.name);
         }
       }
-    }.bind(this)).then(onFinished, onFinished);
+
+      if (this._pullOnlyProvidersState == this.PULL_ONLY_UNREGISTERING) {
+        this._pullOnlyProvidersState = this.PULL_ONLY_NOT_REGISTERED;
+        this._pullOnlyProvidersCurrentPromise = null;
+      }
+    }.bind(this));
+    return this._pullOnlyProvidersCurrentPromise;
   },
 
   _popAndInitProvider: function () {
diff --git a/services/metrics/tests/xpcshell/test_metrics_provider_manager.js b/services/metrics/tests/xpcshell/test_metrics_provider_manager.js
index 94ecdfcdff97..d3c1e9013d0c 100644
--- a/services/metrics/tests/xpcshell/test_metrics_provider_manager.js
+++ b/services/metrics/tests/xpcshell/test_metrics_provider_manager.js
@@ -8,7 +8,18 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 Cu.import("resource://gre/modules/Metrics.jsm");
 Cu.import("resource://testing-common/services/metrics/mocks.jsm");
 
+const PULL_ONLY_TESTING_CATEGORY = "testing-only-pull-only-providers";
+
 function run_test() {
+  let cm = Cc["@mozilla.org/categorymanager;1"]
+             .getService(Ci.nsICategoryManager);
+  cm.addCategoryEntry(PULL_ONLY_TESTING_CATEGORY, "DummyProvider",
+                      "resource://testing-common/services/metrics/mocks.jsm",
+                      false, true);
+  cm.addCategoryEntry(PULL_ONLY_TESTING_CATEGORY, "DummyConstantProvider",
+                      "resource://testing-common/services/metrics/mocks.jsm",
+                      false, true);
+
   run_next_test();
 };
 
@@ -175,3 +186,85 @@ add_task(function test_collect_daily() {
   yield storage.close();
 });
 
+add_task(function test_pull_only_not_initialized() {
+  let storage = yield Metrics.Storage("pull_only_not_initialized");
+  let manager = new Metrics.ProviderManager(storage);
+  yield manager.registerProvidersFromCategoryManager(PULL_ONLY_TESTING_CATEGORY);
+  do_check_eq(manager.providers.length, 1);
+  do_check_eq(manager.providers[0].name, "DummyProvider");
+  yield storage.close();
+});
+
+add_task(function test_pull_only_registration() {
+  let storage = yield Metrics.Storage("pull_only_registration");
+  let manager = new Metrics.ProviderManager(storage);
+  yield manager.registerProvidersFromCategoryManager(PULL_ONLY_TESTING_CATEGORY);
+  do_check_eq(manager.providers.length, 1);
+
+  // Simple registration and unregistration.
+  yield manager.ensurePullOnlyProvidersRegistered();
+  do_check_eq(manager.providers.length, 2);
+  do_check_neq(manager.getProvider("DummyConstantProvider"), null);
+  yield manager.ensurePullOnlyProvidersUnregistered();
+  do_check_eq(manager.providers.length, 1);
+  do_check_null(manager.getProvider("DummyConstantProvider"));
+
+  // Multiple calls to register work.
+  yield manager.ensurePullOnlyProvidersRegistered();
+  do_check_eq(manager.providers.length, 2);
+  yield manager.ensurePullOnlyProvidersRegistered();
+  do_check_eq(manager.providers.length, 2);
+
+  // Unregister with 2 requests for registration should not unregister.
+  yield manager.ensurePullOnlyProvidersUnregistered();
+  do_check_eq(manager.providers.length, 2);
+
+  // But the 2nd one will.
+  yield manager.ensurePullOnlyProvidersUnregistered();
+  do_check_eq(manager.providers.length, 1);
+
+  yield storage.close();
+});
+
+add_task(function test_pull_only_register_while_registering() {
+  let storage = yield Metrics.Storage("pull_only_register_will_registering");
+  let manager = new Metrics.ProviderManager(storage);
+  yield manager.registerProvidersFromCategoryManager(PULL_ONLY_TESTING_CATEGORY);
+
+  manager.ensurePullOnlyProvidersRegistered();
+  manager.ensurePullOnlyProvidersRegistered();
+  yield manager.ensurePullOnlyProvidersRegistered();
+  do_check_eq(manager.providers.length, 2);
+
+  manager.ensurePullOnlyProvidersUnregistered();
+  manager.ensurePullOnlyProvidersUnregistered();
+  yield manager.ensurePullOnlyProvidersUnregistered();
+  do_check_eq(manager.providers.length, 1);
+
+  yield storage.close();
+});
+
+add_task(function test_pull_only_unregister_while_registering() {
+  let storage = yield Metrics.Storage("pull_only_unregister_while_registering");
+  let manager = new Metrics.ProviderManager(storage);
+  yield manager.registerProvidersFromCategoryManager(PULL_ONLY_TESTING_CATEGORY);
+
+  manager.ensurePullOnlyProvidersRegistered();
+  yield manager.ensurePullOnlyProvidersUnregistered();
+  do_check_eq(manager.providers.length, 1);
+
+  yield storage.close();
+});
+
+add_task(function test_pull_only_register_while_unregistering() {
+  let storage = yield Metrics.Storage("pull_only_register_while_unregistering");
+  let manager = new Metrics.ProviderManager(storage);
+  yield manager.registerProvidersFromCategoryManager(PULL_ONLY_TESTING_CATEGORY);
+
+  yield manager.ensurePullOnlyProvidersRegistered();
+  manager.ensurePullOnlyProvidersUnregistered();
+  yield manager.ensurePullOnlyProvidersRegistered();
+  do_check_eq(manager.providers.length, 2);
+
+  yield storage.close();
+});

From 6e447584828a5140d90eb1926c297d02ec707687 Mon Sep 17 00:00:00 2001
From: Sunny <indiasuny000@gmail.com>
Date: Wed, 17 Apr 2013 11:48:07 -0400
Subject: [PATCH 366/438] Bug 708814 -  Introduce a new function
 "onFullscreenChange" which is called when mozfullscreenchange event takes
 place and add a timer for hiding videocontrol when fullscreen starts. r=jaws

---
 toolkit/content/widgets/videocontrols.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index 1bb851f7e556..40657a92ff65 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -1029,6 +1029,13 @@
                         this.fullscreenButton.removeAttribute("fullscreened");
                 },
 
+                onFullscreenChange: function () {
+                    if (this.isVideoInFullScreen()) {
+                        this.Utils._hideControlsTimeout = setTimeout(this._hideControlsFn, this.HIDE_CONTROLS_TIMEOUT_MS);
+                    }
+                    this.setFullscreenButtonState();
+                },
+
                 clickToPlayClickHandler : function(e) {
                     if (e.button != 0 || this.hasError())
                         return;
@@ -1423,7 +1430,7 @@
                     }
 
                     addListener(this.videocontrols, "transitionend", this.onTransitionEnd);
-                    addListener(this.video.ownerDocument, "mozfullscreenchange", this.setFullscreenButtonState);
+                    addListener(this.video.ownerDocument, "mozfullscreenchange", this.onFullscreenChange);
                     addListener(this.video, "keypress", this.keyHandler);
 
                     this.log("--- videocontrols initialized ---");

From 9f4b6ef454ad1943a894fbf1560e603d2329b60c Mon Sep 17 00:00:00 2001
From: Jan-Ivar Bruaroey <jib@mozilla.com>
Date: Wed, 17 Apr 2013 01:16:02 -0400
Subject: [PATCH 367/438] Bug 861718 - Friendly error about PeerConnection
 missing in Offline mode. r=jesup

---
 dom/media/PeerConnection.js | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/dom/media/PeerConnection.js b/dom/media/PeerConnection.js
index 476f066d55a5..fd9e95a562f2 100644
--- a/dom/media/PeerConnection.js
+++ b/dom/media/PeerConnection.js
@@ -272,7 +272,7 @@ PeerConnection.prototype = {
 
     // Nothing starts until ICE gathering completes.
     this._queueOrRun({
-      func: this._pc.initialize,
+      func: this._getPC().initialize,
       args: [this._observer, win, rtcConfig, Services.tm.currentThread],
       wait: true
     });
@@ -285,6 +285,13 @@ PeerConnection.prototype = {
     _globalPCList.addPC(this);
   },
 
+  _getPC: function() {
+    if (!this._pc) {
+      throw new Components.Exception("PeerConnection is gone (did you turn on Offline mode?)");
+    }
+    return this._pc;
+  },
+
   /**
    * Add a function to the queue or run it immediately if the queue is empty.
    * Argument is an object with the func, args and wait properties; wait should
@@ -467,7 +474,7 @@ PeerConnection.prototype = {
     this._onCreateOfferFailure = onError;
 
     this._queueOrRun({
-      func: this._pc.createOffer,
+      func: this._getPC().createOffer,
       args: [constraints],
       wait: true
     });
@@ -493,7 +500,7 @@ PeerConnection.prototype = {
 
     // TODO: Implement provisional answer.
 
-    this._pc.createAnswer(constraints);
+    this._getPC().createAnswer(constraints);
   },
 
   createAnswer: function(onSuccess, onError, constraints, provisional) {
@@ -536,7 +543,7 @@ PeerConnection.prototype = {
     }
 
     this._queueOrRun({
-      func: this._pc.setLocalDescription,
+      func: this._getPC().setLocalDescription,
       args: [type, desc.sdp],
       wait: true,
       type: desc.type
@@ -565,7 +572,7 @@ PeerConnection.prototype = {
     }
 
     this._queueOrRun({
-      func: this._pc.setRemoteDescription,
+      func: this._getPC().setRemoteDescription,
       args: [type, desc.sdp],
       wait: true,
       type: desc.type
@@ -589,7 +596,7 @@ PeerConnection.prototype = {
     this._onAddIceCandidateError = onError;
 
     this._queueOrRun({
-      func: this._pc.addIceCandidate,
+      func: this._getPC().addIceCandidate,
       args: [cand.candidate, cand.sdpMid || "", cand.sdpMLineIndex],
       wait: true
     });
@@ -598,7 +605,7 @@ PeerConnection.prototype = {
   addStream: function(stream, constraints) {
     // TODO: Implement constraints.
     this._queueOrRun({
-      func: this._pc.addStream,
+      func: this._getPC().addStream,
       args: [stream],
       wait: false
     });
@@ -611,7 +618,7 @@ PeerConnection.prototype = {
 
   close: function() {
     this._queueOrRun({
-      func: this._pc.close,
+      func: this._getPC().close,
       args: [false],
       wait: false
     });
@@ -620,17 +627,17 @@ PeerConnection.prototype = {
 
   get localStreams() {
     this._checkClosed();
-    return this._pc.localStreams;
+    return this._getPC().localStreams;
   },
 
   get remoteStreams() {
     this._checkClosed();
-    return this._pc.remoteStreams;
+    return this._getPC().remoteStreams;
   },
 
   get localDescription() {
     this._checkClosed();
-    let sdp = this._pc.localDescription;
+    let sdp = this._getPC().localDescription;
     if (sdp.length == 0) {
       return null;
     }
@@ -642,7 +649,7 @@ PeerConnection.prototype = {
 
   get remoteDescription() {
     this._checkClosed();
-    let sdp = this._pc.remoteDescription;
+    let sdp = this._getPC().remoteDescription;
     if (sdp.length == 0) {
       return null;
     }
@@ -660,7 +667,7 @@ PeerConnection.prototype = {
     }
 
     var state="undefined";
-    switch (this._pc.readyState) {
+    switch (this._getPC().readyState) {
       case Ci.IPeerConnection.kNew:
         state = "new";
         break;
@@ -707,7 +714,7 @@ PeerConnection.prototype = {
     }
 
     // Synchronous since it doesn't block.
-    let channel = this._pc.createDataChannel(
+    let channel = this._getPC().createDataChannel(
       label, protocol, type, dict.outOfOrderAllowed, dict.maxRetransmitTime,
       dict.maxRetransmitNum, dict.preset ? true : false,
       dict.stream != undefined ? dict.stream : 0xFFFF
@@ -720,7 +727,7 @@ PeerConnection.prototype = {
       numstreams = 16;
     }
     this._queueOrRun({
-      func: this._pc.connectDataConnection,
+      func: this._getPC().connectDataConnection,
       args: [localport, remoteport, numstreams],
       wait: false
     });

From 78dad25bc357819c0b3867d7c4ca67bbf06498d0 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 17 Apr 2013 11:48:34 -0400
Subject: [PATCH 368/438] Backed out changeset 409285b3f69c (bug 862092) for
 mochitest-2 failures on a CLOSED TREE.

---
 dom/bindings/BindingUtils.cpp           | 41 ++++++-------------------
 dom/bindings/crashtests/862092.html     | 19 ------------
 dom/bindings/crashtests/crashtests.list |  1 -
 dom/bindings/test/Makefile.in           |  1 -
 dom/bindings/test/test_bug862092.html   | 37 ----------------------
 5 files changed, 9 insertions(+), 90 deletions(-)
 delete mode 100644 dom/bindings/crashtests/862092.html
 delete mode 100644 dom/bindings/test/test_bug862092.html

diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index d54a504b1fae..85adf4ff3e3c 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -1492,37 +1492,24 @@ ReparentWrapper(JSContext* aCx, JS::HandleObject aObjArg)
   js::SetReservedSlot(newobj, DOM_OBJECT_SLOT,
                       js::GetReservedSlot(aObj, DOM_OBJECT_SLOT));
 
-  bool isProxy = js::IsProxy(aObj);
-
   // At this point, both |aObj| and |newobj| point to the same native
   // which is bad, because one of them will end up being finalized with a
   // native it does not own. |cloneGuard| ensures that if we exit before
   // clearing |aObj|'s reserved slot the reserved slot of |newobj| will be
   // set to null. |aObj| will go away soon, because we swap it with
   // another object during the transplant and let that object die.
-  JSObject* propertyHolder;
+  JSObject *propertyHolder;
   {
     AutoCloneDOMObjectSlotGuard cloneGuard(aObj, newobj);
 
-    JSObject* copyFrom;
-    if (isProxy) {
-      copyFrom = DOMProxyHandler::GetExpandoObject(aObj);
-    } else {
-      copyFrom = aObj;
+    propertyHolder = JS_NewObjectWithGivenProto(aCx, nullptr, nullptr,
+                                                newParent);
+    if (!propertyHolder) {
+      return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    if (copyFrom) {
-      propertyHolder = JS_NewObjectWithGivenProto(aCx, nullptr, nullptr,
-                                                  newParent);
-      if (!propertyHolder) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-
-      if (!JS_CopyPropertiesFrom(aCx, propertyHolder, copyFrom)) {
-        return NS_ERROR_FAILURE;
-      }
-    } else {
-      propertyHolder = nullptr;
+    if (!JS_CopyPropertiesFrom(aCx, propertyHolder, aObj)) {
+      return NS_ERROR_FAILURE;
     }
 
     // Expandos from other compartments are attached to the target JS object.
@@ -1571,18 +1558,8 @@ ReparentWrapper(JSContext* aCx, JS::HandleObject aObjArg)
   cache->SetPreservingWrapper(false);
   cache->SetWrapper(aObj);
   cache->SetPreservingWrapper(preserving);
-
-  if (propertyHolder) {
-    JSObject* copyTo;
-    if (isProxy) {
-      copyTo = DOMProxyHandler::EnsureExpandoObject(aCx, aObj);
-    } else {
-      copyTo = aObj;
-    }
-
-    if (!copyTo || !JS_CopyPropertiesFrom(aCx, copyTo, propertyHolder)) {
-      MOZ_CRASH();
-    }
+  if (!JS_CopyPropertiesFrom(aCx, aObj, propertyHolder)) {
+    MOZ_CRASH();
   }
 
   nsObjectLoadingContent* htmlobject;
diff --git a/dom/bindings/crashtests/862092.html b/dom/bindings/crashtests/862092.html
deleted file mode 100644
index 1b31775a9797..000000000000
--- a/dom/bindings/crashtests/862092.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<script>
-
-function boom()
-{
-  var frameDoc = document.getElementById("f").contentDocument;
-  frameDoc.adoptNode(document.createElement("select"));
-}
-
-</script>
-</head>
-
-<body onload="boom();">
-<iframe id="f"></iframe>
-</body>
-</html>
diff --git a/dom/bindings/crashtests/crashtests.list b/dom/bindings/crashtests/crashtests.list
index 7b3e58bb69f4..ea8e158fbc70 100644
--- a/dom/bindings/crashtests/crashtests.list
+++ b/dom/bindings/crashtests/crashtests.list
@@ -4,4 +4,3 @@ load 822340-2.html
 load 832899.html
 load 860591.html
 load 860551.html
-load 862092.html
diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in
index 7a88add9657a..4ea6e7f8753b 100644
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -72,7 +72,6 @@ MOCHITEST_FILES := \
   test_queryInterface.html \
   test_exceptionThrowing.html \
   test_bug852846.html \
-  test_bug862092.html \
   $(NULL)
 
 MOCHITEST_CHROME_FILES = \
diff --git a/dom/bindings/test/test_bug862092.html b/dom/bindings/test/test_bug862092.html
deleted file mode 100644
index 4b0633328105..000000000000
--- a/dom/bindings/test/test_bug862092.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=862092
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 862092</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  /** Test for Bug 862092 **/
-
-  SimpleTest.waitForExplicitFinish();
-  function runTest()
-  {
-    var frameDoc = document.getElementById("f").contentDocument;
-    var a = document.createElement("select");
-    a.expando = "test";
-    a = frameDoc.adoptNode(a)
-    is(a.expando, "test", "adoptNode needs to preserve expandos");
-    SimpleTest.finish();
-  }
-
-  </script>
-</head>
-<body onload="runTest();">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=862092">Mozilla Bug 862092</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-<iframe id="f"></iframe>
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>

From 040af911d404311303e49018b057f590221cf7a4 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 17 Apr 2013 12:00:20 -0400
Subject: [PATCH 369/438] Backed out changesets b9f7fd0996f0 and c0ab16b6003e
 (bug 860494) for mochitest failures on a CLOSED TREE.

---
 js/xpconnect/tests/chrome/Makefile.in         |  1 -
 js/xpconnect/tests/chrome/test_bug860494.xul  | 37 -------------------
 js/xpconnect/tests/mochitest/Makefile.in      |  1 -
 .../tests/mochitest/file_bug860494.html       | 14 -------
 js/xpconnect/wrappers/XrayWrapper.cpp         | 27 +++++++-------
 5 files changed, 13 insertions(+), 67 deletions(-)
 delete mode 100644 js/xpconnect/tests/chrome/test_bug860494.xul
 delete mode 100644 js/xpconnect/tests/mochitest/file_bug860494.html

diff --git a/js/xpconnect/tests/chrome/Makefile.in b/js/xpconnect/tests/chrome/Makefile.in
index 4dabc4a09bfe..48708fcac4c6 100644
--- a/js/xpconnect/tests/chrome/Makefile.in
+++ b/js/xpconnect/tests/chrome/Makefile.in
@@ -50,7 +50,6 @@ MOCHITEST_CHROME_FILES = \
 		test_bug812415.xul \
 		test_bug853283.xul \
 		test_bug853571.xul \
-		test_bug860494.xul \
 		test_APIExposer.xul \
 		test_chrometoSource.xul \
 		outoflinexulscript.js \
diff --git a/js/xpconnect/tests/chrome/test_bug860494.xul b/js/xpconnect/tests/chrome/test_bug860494.xul
deleted file mode 100644
index d29e65b6ac8d..000000000000
--- a/js/xpconnect/tests/chrome/test_bug860494.xul
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=860494
--->
-<window title="Mozilla Bug 860494"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-
-  <!-- test results are displayed in the html:body -->
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=860494"
-     target="_blank">Mozilla Bug 860494</a>
-  </body>
-
-  <!-- test code goes here -->
-  <script type="application/javascript">
-  <![CDATA[
-  /** Test for Bug 860494 **/
-  SimpleTest.waitForExplicitFinish();
-
-  function go() {
-    var iwin = $('ifr').contentWindow;
-    // NB: mochitest-chrome actually runs the test as a content docshell.
-    is(iwin.top, window.top, "iframe names shouldn't shadow |top| via Xray");
-    is(iwin.parent, window, "iframe names shouldn't shadow |parent| via Xray");
-    ok(!!/http/.exec(iwin.location), "iframe names shouldn't shadow |location| via Xray");
-    is(iwin.length, 5, "iframe names shouldn't shadow |length| via Xray");
-    is(iwin.window, iwin, "iframe names shouldn't shadow |window| via Xray");
-    SimpleTest.finish();
-  }
-
-  ]]>
-  </script>
-  <iframe id="ifr" type="content" onload="go();" src="http://example.org/tests/js/xpconnect/tests/mochitest/file_bug860494.html" />
-</window>
diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in
index 82208c776e1c..3206cce00430 100644
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -92,7 +92,6 @@ MOCHITEST_FILES =	chrome_wrappers_helper.html \
 		test_bug803730.html \
 		test_bug809547.html \
 		test_bug809674.html \
-		file_bug860494.html \
 		file_crosscompartment_weakmap.html \
 		test_crosscompartment_weakmap.html \
 		$(NULL)
diff --git a/js/xpconnect/tests/mochitest/file_bug860494.html b/js/xpconnect/tests/mochitest/file_bug860494.html
deleted file mode 100644
index f7c631037dd1..000000000000
--- a/js/xpconnect/tests/mochitest/file_bug860494.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title></title>
-</head>
-<body>
-<iframe name="top"></iframe>
-<iframe name="parent"></iframe>
-<iframe name="location"></iframe>
-<iframe name="length"></iframe>
-<iframe name="window"></iframe>
-</body>
-</html>
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 8ba8a4dde8ee..d76dc37f9a68 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1477,25 +1477,14 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, HandleObject wra
         return true;
     }
 
-    if (!JS_GetPropertyDescriptorById(cx, holder, id, 0, desc))
-        return false;
-    if (desc->obj) {
-        desc->obj = wrapper;
-        return true;
-    }
-
-    // Nothing in the cache. Call through, and cache the result.
-    if (!Traits::resolveNativeProperty(cx, wrapper, holder, id, desc, flags))
-        return false;
-
     // We need to handle named access on the Window somewhere other than
     // Traits::resolveOwnProperty, because per spec it happens on the Global
     // Scope Polluter and thus the resulting properties are non-|own|. However,
-    // we're set up (above) to cache (on the holder) anything that comes out of
+    // we're set up (below) to cache (on the holder) anything that comes out of
     // resolveNativeProperty, which we don't want for something dynamic like
-    // named access. So we just handle it separately here.
+    // named access. So we just handle it here.
     nsGlobalWindow *win;
-    if (!desc->obj && Traits::Type == XrayForWrappedNative && JSID_IS_STRING(id) &&
+    if (Traits::Type == XrayForWrappedNative && JSID_IS_STRING(id) &&
         (win = static_cast<nsGlobalWindow*>(As<nsPIDOMWindow>(wrapper))))
     {
         nsCOMPtr<nsIDOMWindow> childDOMWin = win->GetChildWindow(id);
@@ -1511,6 +1500,16 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, HandleObject wra
         }
     }
 
+    if (!JS_GetPropertyDescriptorById(cx, holder, id, 0, desc))
+        return false;
+    if (desc->obj) {
+        desc->obj = wrapper;
+        return true;
+    }
+
+    // Nothing in the cache. Call through, and cache the result.
+    if (!Traits::resolveNativeProperty(cx, wrapper, holder, id, desc, flags))
+        return false;
 
     if (!desc->obj &&
         id == nsXPConnect::GetRuntimeInstance()->GetStringID(XPCJSRuntime::IDX_TO_STRING))

From 3603e99ba348e4fa1c57a461916f099113a2ae0e Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Wed, 17 Apr 2013 08:50:54 -0700
Subject: [PATCH 370/438] Bug 840012 - Handle OOM in CreateThisForFunction
 (r=hannes)

--HG--
extra : rebase_source : 0a4cf9d0eb6373ff61f21dd386c103854236e0d1
---
 js/src/ion/VMFunctions.cpp                 |  5 ++++-
 js/src/jit-test/tests/basic/testBug0012.js | 16 ++++++++++++++++
 js/src/shell/js.cpp                        |  5 ++++-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 js/src/jit-test/tests/basic/testBug0012.js

diff --git a/js/src/ion/VMFunctions.cpp b/js/src/ion/VMFunctions.cpp
index b1dd826206a0..b971fb606f04 100644
--- a/js/src/ion/VMFunctions.cpp
+++ b/js/src/ion/VMFunctions.cpp
@@ -531,7 +531,10 @@ CreateThis(JSContext *cx, HandleObject callee, MutableHandleValue rval)
             JSScript *script = fun->getOrCreateScript(cx);
             if (!script || !script->ensureHasTypes(cx))
                 return false;
-            rval.set(ObjectValue(*CreateThisForFunction(cx, callee, false)));
+            JSObject *thisObj = CreateThisForFunction(cx, callee, false);
+            if (!thisObj)
+                return false;
+            rval.set(ObjectValue(*thisObj));
         }
     }
 
diff --git a/js/src/jit-test/tests/basic/testBug0012.js b/js/src/jit-test/tests/basic/testBug0012.js
new file mode 100644
index 000000000000..8ba5cd6e6d29
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug0012.js
@@ -0,0 +1,16 @@
+// |jit-test| error:out of memory
+
+gcPreserveCode();
+evaluate("gcparam(\"maxBytes\", gcparam(\"gcBytes\") + 4*1024);");
+evaluate("\
+function testDontEnum(F) { \
+  function test() {\
+    typeof (new test(\"1\")) != 'function'\
+  }\
+  test();\
+} \
+var list = [];\
+for (i in list)\
+  var F = this[list[i]];\
+actual = testDontEnum(F);\
+");
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index c58c6c0d1408..5d08e05c3eed 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -1043,7 +1043,10 @@ Evaluate(JSContext *cx, unsigned argc, jsval *vp)
         }
         if (!JS_ExecuteScript(cx, global, script, vp)) {
             if (catchTermination && !JS_IsExceptionPending(cx)) {
-                args.rval().setString(JS_NewStringCopyZ(cx, "terminated"));
+                JSString *str = JS_NewStringCopyZ(cx, "terminated");
+                if (!str)
+                    return false;
+                args.rval().setString(str);
                 return true;
             }
             return false;

From cf806297b9b7c2897f105d48f40ed38345f81e08 Mon Sep 17 00:00:00 2001
From: Malini Das <mdas@mozilla.com>
Date: Wed, 17 Apr 2013 12:06:39 -0400
Subject: [PATCH 371/438] Bug 860849 - Fix 'Illegal Value' error in marionette,
 r=jgriffin

---
 testing/marionette/marionette-elements.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/testing/marionette/marionette-elements.js b/testing/marionette/marionette-elements.js
index e7a64c88b1b6..3f1880b9aaf0 100644
--- a/testing/marionette/marionette-elements.js
+++ b/testing/marionette/marionette-elements.js
@@ -41,7 +41,6 @@ function ElementException(msg, num, stack) {
   this.stack = stack;
 }
 
-/* NOTE: Bug 736592 has been created to replace seenItems with a weakRef map */
 this.ElementManager = function ElementManager(notSupported) {
   this.searchTimeout = 0;
   this.seenItems = {};
@@ -72,8 +71,15 @@ ElementManager.prototype = {
   */
   addToKnownElements: function EM_addToKnownElements(element) {
     for (let i in this.seenItems) {
-      if (XPCNativeWrapper(this.seenItems[i].get()) == XPCNativeWrapper(element)) {
-        return i;
+      let foundEl = this.seenItems[i].get();
+      if (foundEl) {
+        if (XPCNativeWrapper(foundEl) == XPCNativeWrapper(element)) {
+          return i;
+        }
+      }
+      else {
+        //cleanup reference to GC'd element
+        delete this.seenItems[i];
       }
     }
     var id = uuidGen.generateUUID().toString();
@@ -99,7 +105,7 @@ ElementManager.prototype = {
     }
     el = el.get();
     // use XPCNativeWrapper to compare elements; see bug 834266
-    if (!(XPCNativeWrapper(el).ownerDocument == XPCNativeWrapper(win).document)) {
+    if (!el || !(XPCNativeWrapper(el).ownerDocument == XPCNativeWrapper(win).document)) {
       throw new ElementException("Stale element reference", 10, null);
     }
     return el;
@@ -137,11 +143,6 @@ ElementManager.prototype = {
           result = null;
         }
         else if (val.nodeType == 1) {
-          for(let i in this.seenItems) {
-            if (this.seenItems[i].get() == val) {
-              result = {'ELEMENT': i};
-            }
-          }
           result = {'ELEMENT': this.addToKnownElements(val)};
         }
         else {

From b53f213e98c8decdfe596fe40ba9aff16bab9a28 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 17 Apr 2013 09:13:49 -0700
Subject: [PATCH 372/438] Bug 858340 - Domain autocompletion for Fennec.
 r=jchen

---
 mobile/android/base/AwesomeBar.java           | 109 +++++++++++++-----
 mobile/android/base/AwesomeBarTabs.java       |   6 +-
 .../android/base/awesomebar/AllPagesTab.java  |  65 ++++++++++-
 mobile/android/base/util/StringUtils.java     |  22 ++++
 4 files changed, 168 insertions(+), 34 deletions(-)

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index ecebc736e617..d67e660359b8 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -46,7 +46,13 @@ import android.widget.Toast;
 
 import java.net.URLEncoder;
 
-public class AwesomeBar extends GeckoActivity {
+interface AutocompleteHandler {
+    void onAutocomplete(String res);
+}
+
+public class AwesomeBar extends GeckoActivity
+                        implements AutocompleteHandler,
+                                   TextWatcher {
     private static final String LOGTAG = "GeckoAwesomeBar";
 
     public static final String URL_KEY = "url";
@@ -168,35 +174,7 @@ public class AwesomeBar extends GeckoActivity {
             }
         });
 
-        mText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable s) {
-                String text = s.toString();
-                mAwesomeTabs.filter(text);
-
-                // If the AwesomeBar has a composition string, don't call updateGoButton().
-                // That method resets IME and composition state will be broken.
-                if (!hasCompositionString(s)) {
-                    updateGoButton(text);
-                }
-
-                if (Build.VERSION.SDK_INT >= 11) {
-                    getActionBar().hide();
-                }
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count,
-                                          int after) {
-                // do nothing
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before,
-                                      int count) {
-                // do nothing
-            }
-        });
+        mText.addTextChangedListener(this);
 
         mText.setOnKeyListener(new View.OnKeyListener() {
             @Override
@@ -727,4 +705,75 @@ public class AwesomeBar extends GeckoActivity {
         }
         return false;
     }
+
+    // return early if we're backspacing through the string, or have no autocomplete results
+    public void onAutocomplete(final String result) {
+        final String text = mText.getText().toString();
+
+        if (result == null) {
+            mAutoCompleteResult = "";
+            return;
+        }
+
+        if (!result.startsWith(text) || text.equals(result)) {
+            return;
+        }
+
+        mAutoCompleteResult = result;
+        mText.getText().append(result.substring(text.length()));
+        mText.setSelection(text.length(), result.length());
+    }
+
+    @Override
+    public void afterTextChanged(final Editable s) {
+        final String text = s.toString();
+        boolean useHandler = false;
+        boolean reuseAutocomplete = false;
+        if (!hasCompositionString(s) && !StringUtils.isSearchQuery(text, false)) {
+            useHandler = true;
+
+            // If you're hitting backspace (the string is getting smaller
+            // or is unchanged), don't autocomplete.
+            if (mAutoCompletePrefix != null && (mAutoCompletePrefix.length() >= text.length())) {
+                useHandler = false;
+            } else if (mAutoCompleteResult != null && mAutoCompleteResult.startsWith(text)) {
+                // If this text already matches our autocomplete text, autocomplete likely
+                // won't change. Just reuse the old autocomplete value.
+                useHandler = false;
+                reuseAutocomplete = true;
+            }
+        }
+
+        // If this is the autocomplete text being set, don't run the filter.
+        if (mAutoCompleteResult == null || !mAutoCompleteResult.equals(text)) {
+            mAwesomeTabs.filter(text, useHandler ? this : null);
+            mAutoCompletePrefix = text;
+
+            if (reuseAutocomplete) {
+                onAutocomplete(mAutoCompleteResult);
+            }
+        }
+
+        // If the AwesomeBar has a composition string, don't call updateGoButton().
+        // That method resets IME and composition state will be broken.
+        if (!hasCompositionString(s)) {
+            updateGoButton(text);
+        }
+
+        if (Build.VERSION.SDK_INT >= 11) {
+            getActionBar().hide();
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count,
+                                  int after) {
+        // do nothing
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before,
+                              int count) {
+        // do nothing
+    }
 }
diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java
index 4dd8a7bcae7f..a7b6d1b7dbbb 100644
--- a/mobile/android/base/AwesomeBarTabs.java
+++ b/mobile/android/base/AwesomeBarTabs.java
@@ -173,7 +173,7 @@ public class AwesomeBarTabs extends TabHost
         }
 
         // Initialize "All Pages" list with no filter
-        filter("");
+        filter("", null);
     }
 
     @Override
@@ -308,7 +308,7 @@ public class AwesomeBarTabs extends TabHost
         return (HistoryTab)getAwesomeBarTabForTag("history");
     }
 
-    public void filter(String searchTerm) {
+    public void filter(String searchTerm, AutocompleteHandler handler) {
 
         // If searching, disable left / right tab swipes
         mSearching = searchTerm.length() != 0;
@@ -322,7 +322,7 @@ public class AwesomeBarTabs extends TabHost
         styleSelectedTab();
 
         // Perform the actual search
-        allPages.filter(searchTerm);
+        allPages.filter(searchTerm, handler);
 
         // If searching, hide the tabs bar
         findViewById(R.id.tab_widget_container).setVisibility(mSearching ? View.GONE : View.VISIBLE);
diff --git a/mobile/android/base/awesomebar/AllPagesTab.java b/mobile/android/base/awesomebar/AllPagesTab.java
index 3e49fb01c48d..c0ac2061e2ae 100644
--- a/mobile/android/base/awesomebar/AllPagesTab.java
+++ b/mobile/android/base/awesomebar/AllPagesTab.java
@@ -25,6 +25,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Message;
@@ -63,6 +64,8 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
     private static final int SUGGESTION_TIMEOUT = 3000;
     private static final int SUGGESTION_MAX = 3;
     private static final int ANIMATION_DURATION = 250;
+    // The maximum number of rows deep in a search we'll dig for an autocomplete result
+    private static final int MAX_AUTOCOMPLETE_SEARCH = 20;
 
     private String mSearchTerm;
     private ArrayList<SearchEngine> mSearchEngines;
@@ -76,6 +79,7 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
     private View mSuggestionsOptInPrompt;
     private Handler mHandler;
     private ListView mListView;
+    private volatile AutocompleteHandler mAutocompleteHandler = null;
 
     private static final int MESSAGE_LOAD_FAVICONS = 1;
     private static final int MESSAGE_UPDATE_FAVICONS = 2;
@@ -169,7 +173,9 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
         }
     }
 
-    public void filter(String searchTerm) {
+    public void filter(String searchTerm, AutocompleteHandler handler) {
+        mAutocompleteHandler = handler;
+
         AwesomeBarCursorAdapter adapter = getCursorAdapter();
         adapter.filter(searchTerm);
 
@@ -182,6 +188,61 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
         }
     }
 
+    private void findAutocompleteFor(String searchTerm, Cursor cursor) {
+        if (TextUtils.isEmpty(searchTerm) || cursor == null || mAutocompleteHandler == null)
+            return;
+
+        // avoid searching the path if we don't have to. Currently just decided by if there is
+        // a '/' character in the string
+        final String res = searchHosts(searchTerm, cursor, searchTerm.indexOf("/") > 0);
+
+        if (res != null) {
+            ThreadUtils.postToUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    // Its possible that mAutocompleteHandler has been destroyed
+                    if (mAutocompleteHandler != null) {
+                        mAutocompleteHandler.onAutocomplete(res);
+                        mAutocompleteHandler = null;
+                    }
+                }
+            });
+        }
+    }
+
+    private String searchHosts(String searchTerm, Cursor cursor, boolean searchPath) {
+        int i = 0;
+        if (cursor.moveToFirst()) {
+            int urlIndex = cursor.getColumnIndexOrThrow(URLColumns.URL);
+            do {
+                final Uri url = Uri.parse(cursor.getString(urlIndex));
+                String host = StringUtils.stripCommonSubdomains(url.getHost());
+                // host may be null for about pages
+                if (host == null)
+                    continue;
+
+                StringBuilder hostBuilder = new StringBuilder(host);
+               if (hostBuilder.indexOf(searchTerm) == 0) {
+                    return hostBuilder.append("/").toString();
+                }
+
+                if (searchPath) {
+                    List<String> path = url.getPathSegments();
+
+                    for (String seg : path) {
+                        hostBuilder.append("/").append(seg);
+                        if (hostBuilder.indexOf(searchTerm) == 0) {
+                            return hostBuilder.append("/").toString();
+                        }
+                    }
+                }
+
+                i++;
+            } while (i < MAX_AUTOCOMPLETE_SEARCH && cursor.moveToNext());
+        }
+        return null;
+    }
+
     /**
      * Query for suggestions, but don't show them yet.
      */
@@ -237,6 +298,8 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
                         Telemetry.HistogramAdd("FENNEC_AWESOMEBAR_ALLPAGES_EMPTY_TIME", time);
                         mTelemetrySent = true;
                     }
+
+                    findAutocompleteFor(constraint.toString(), c);
                     return c;
                 }
             });
diff --git a/mobile/android/base/util/StringUtils.java b/mobile/android/base/util/StringUtils.java
index 96b412121e07..1c2b1f3aaa9f 100644
--- a/mobile/android/base/util/StringUtils.java
+++ b/mobile/android/base/util/StringUtils.java
@@ -44,4 +44,26 @@ public class StringUtils {
         // Otherwise, text is ambiguous, and we keep its status unchanged
         return wasSearchQuery;
     }
+
+    public static String stripScheme(String url) {
+        if (url == null)
+            return url;
+
+        if (url.startsWith("http://")) {
+            return url.substring(7);
+        }
+        return url;
+    }
+
+    public static String stripCommonSubdomains(String host) {
+        if (host == null)
+            return host;
+        // In contrast to desktop, we also strip mobile subdomains,
+        // since its unlikely users are intentionally typing them
+        if (host.startsWith("www.")) return host.substring(4);
+        else if (host.startsWith("mobile.")) return host.substring(7);
+        else if (host.startsWith("m.")) return host.substring(2);
+        return host;
+    }
+
 }

From 6d58db8d6146856db5f6e86528872df099b9a107 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Tue, 16 Apr 2013 11:48:55 -0700
Subject: [PATCH 373/438] Bug 861655: Settings screen should be in white.
 [r=wesj]

---
 mobile/android/base/resources/values-v11/styles.xml | 1 -
 mobile/android/base/resources/values-v11/themes.xml | 1 -
 mobile/android/base/resources/values/styles.xml     | 8 --------
 mobile/android/base/resources/values/themes.xml     | 6 +-----
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
index 1a55cd33aa80..517d6edd0f97 100644
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -58,7 +58,6 @@
  
     <!-- GeckoPreferences ActionBar -->
     <style name="ActionBar.GeckoPreferences">
-         <item name="android:background">@color/background_normal</item>
          <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
     </style>
  
diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml
index feeb3dc00700..593983859b38 100644
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -30,7 +30,6 @@
     </style>
 
     <style name="GeckoPreferencesBase" parent="GeckoBase">
-        <item name="android:windowBackground">@color/background_normal</item>
         <item name="android:windowActionBar">true</item>
         <item name="android:windowNoTitle">false</item>
         <item name="android:actionBarStyle">@style/ActionBar.GeckoPreferences</item>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 7b841508e9c9..25d684788edf 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -420,12 +420,4 @@
 
     <style name="GeckoDialogTitle.SubTitle" />
 
-    <style name="PreferencesListView" parent="@android:style/Widget.ListView">
-        <item name="android:cacheColorHint">@color/background_normal</item>
-    </style>
-
-    <style name="PreferencesExpandableListView" parent="@android:style/Widget.ExpandableListView">
-        <item name="android:cacheColorHint">@color/background_normal</item>
-    </style>
-
 </resources>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index ebfb354eeefe..8f3dddf37122 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -28,7 +28,6 @@
 
     <style name="GeckoPreferencesBase" parent="GeckoBase">
         <item name="android:windowNoTitle">false</item>
-        <item name="android:windowBackground">@color/background_normal</item>
     </style>
 
     <!--
@@ -91,9 +90,6 @@
         <item name="android:expandableListViewStyle">@style/Widget.ExpandableListView</item>
     </style>
 
-    <style name="Gecko.Preferences" parent="GeckoPreferencesBase">
-        <item name="android:listViewStyle">@style/PreferencesListView</item>
-        <item name="android:expandableListViewStyle">@style/PreferencesExpandableListView</item>
-    </style>
+    <style name="Gecko.Preferences" parent="GeckoPreferencesBase"/>
 
 </resources>

From 263241169ff10c96e56d8a43af7c91594d55367d Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Tue, 16 Apr 2013 20:53:03 +0200
Subject: [PATCH 374/438] Bug 837390 - Profiler livelock caused by SA_RESTART
 restarting fork() syscall.  r=bgirard

---
 tools/profiler/platform-linux.cc | 51 +++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index 0cc1c058156a..b87ce4fba436 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -78,6 +78,47 @@ pid_t gettid()
 static Sampler* sActiveSampler = NULL;
 
 
+#if !defined(ANDROID)
+// Keep track of when any of our threads calls fork(), so we can
+// temporarily disable signal delivery during the fork() call.  Not
+// doing so appears to cause a kind of race, in which signals keep
+// getting delivered to the thread doing fork(), which keeps causing
+// it to fail and be restarted; hence forward progress is delayed a
+// great deal.  A side effect of this is to permanently disable
+// sampling in the child process.  See bug 837390.
+
+// Unfortunately this is only doable on non-Android, since Bionic
+// doesn't have pthread_atfork.
+
+// This records the current state at the time we paused it.
+static bool was_paused = false;
+
+// In the parent, just before the fork, record the pausedness state,
+// and then pause.
+static void paf_prepare(void) {
+  if (sActiveSampler) {
+    was_paused = sActiveSampler->IsPaused();
+    sActiveSampler->SetPaused(true);
+  } else {
+    was_paused = false;
+  }
+}
+
+// In the parent, just after the fork, return pausedness to the
+// pre-fork state.
+static void paf_parent(void) {
+  if (sActiveSampler)
+    sActiveSampler->SetPaused(was_paused);
+}
+
+// Set up the fork handlers.  This is called just once, at the first
+// call to SenderEntry.
+static void* setup_atfork() {
+  pthread_atfork(paf_prepare, paf_parent, NULL);
+  return NULL;
+}
+#endif /* !defined(ANDROID) */
+
 #ifdef ANDROID
 #include "android-signal-defs.h"
 #endif
@@ -202,10 +243,18 @@ class Sampler::PlatformData : public Malloced {
 
 
 static void* SenderEntry(void* arg) {
+# if defined(ANDROID)
+  // pthread_atfork isn't available on Android.
+  void* initialize_atfork = NULL;
+# else
+  // This call is done just once, at the first call to SenderEntry.
+  // It returns NULL.
+  static void* initialize_atfork = setup_atfork();
+# endif
   Sampler::PlatformData* data =
       reinterpret_cast<Sampler::PlatformData*>(arg);
   data->SignalSender();
-  return 0;
+  return initialize_atfork; // which is guaranteed to be NULL
 }
 
 

From b892ddd6bace70e5601d96533c8d1366802757c0 Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aklotz@mozilla.com>
Date: Tue, 16 Apr 2013 13:19:17 -0600
Subject: [PATCH 375/438] Bug 826851: Unit tests for Plugin Hang UI.
 r=bsmedberg

---
 dom/plugins/ipc/hangui/PluginHangUIChild.cpp  |   1 +
 dom/plugins/test/mochitest/Makefile.in        |   5 +
 dom/plugins/test/mochitest/dialog_watcher.js  | 172 ++++++++++++
 dom/plugins/test/mochitest/hangui_common.js   |  20 ++
 dom/plugins/test/mochitest/hangui_iface.js    | 121 ++++++++
 .../test/mochitest/hangui_subpage.html        |   4 +
 dom/plugins/test/mochitest/test_hangui.xul    | 263 ++++++++++++++++++
 dom/plugins/test/testplugin/nptest.cpp        |  21 ++
 8 files changed, 607 insertions(+)
 create mode 100644 dom/plugins/test/mochitest/dialog_watcher.js
 create mode 100644 dom/plugins/test/mochitest/hangui_common.js
 create mode 100644 dom/plugins/test/mochitest/hangui_iface.js
 create mode 100644 dom/plugins/test/mochitest/hangui_subpage.html
 create mode 100644 dom/plugins/test/mochitest/test_hangui.xul

diff --git a/dom/plugins/ipc/hangui/PluginHangUIChild.cpp b/dom/plugins/ipc/hangui/PluginHangUIChild.cpp
index eee2ffd7550c..ff49e2dfb6e1 100644
--- a/dom/plugins/ipc/hangui/PluginHangUIChild.cpp
+++ b/dom/plugins/ipc/hangui/PluginHangUIChild.cpp
@@ -308,6 +308,7 @@ PluginHangUIChild::HangUIDlgProc(HWND aDlgHandle, UINT aMsgCode, WPARAM aWParam,
     }
     case WM_DESTROY: {
       EnableWindow(mParentWindow, TRUE);
+      SetForegroundWindow(mParentWindow);
       break;
     }
     default:
diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in
index 51e95374ae26..17821040fd7c 100644
--- a/dom/plugins/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -141,6 +141,11 @@ MOCHITEST_CHROME_FILES += \
       test_idle_hang.xul \
       test_busy_hang.xul \
       hang_test.js \
+      test_hangui.xul \
+      hangui_subpage.html \
+      hangui_common.js \
+      hangui_iface.js \
+      dialog_watcher.js \
       $(NULL)
   endif
 endif
diff --git a/dom/plugins/test/mochitest/dialog_watcher.js b/dom/plugins/test/mochitest/dialog_watcher.js
new file mode 100644
index 000000000000..b146a4aa8470
--- /dev/null
+++ b/dom/plugins/test/mochitest/dialog_watcher.js
@@ -0,0 +1,172 @@
+const EVENT_OBJECT_SHOW = 0x8002;
+const EVENT_OBJECT_HIDE = 0x8003;
+const WINEVENT_OUTOFCONTEXT = 0;
+const WINEVENT_SKIPOWNPROCESS = 2;
+const QS_ALLINPUT = 0x04FF;
+const INFINITE = 0xFFFFFFFF;
+const WAIT_OBJECT_0 = 0;
+const WAIT_TIMEOUT = 258;
+const PM_NOREMOVE = 0;
+
+function DialogWatcher(titleText, onDialogStart, onDialogEnd) {
+  this.titleText = titleText;
+  this.onDialogStart = onDialogStart;
+  this.onDialogEnd = onDialogEnd;
+}
+
+DialogWatcher.prototype.init = function() {
+  this.hwnd = undefined;
+  if (!this.user32) {
+    this.user32 = ctypes.open("user32.dll");
+  }
+  if (!this.findWindow) {
+    this.findWindow = user32.declare("FindWindowW",
+                                     ctypes.winapi_abi,
+                                     ctypes.uintptr_t,
+                                     ctypes.jschar.ptr,
+                                     ctypes.jschar.ptr);
+  }
+  if (!this.winEventProcType) {
+    this.winEventProcType = ctypes.FunctionType(ctypes.stdcall_abi,
+                                                ctypes.void_t,
+                                                [ctypes.uintptr_t,
+                                                ctypes.uint32_t,
+                                                ctypes.uintptr_t,
+                                                ctypes.long,
+                                                ctypes.long,
+                                                ctypes.uint32_t,
+                                                ctypes.uint32_t]).ptr;
+  }
+  if (!this.setWinEventHook) {
+    this.setWinEventHook = user32.declare("SetWinEventHook",
+                                          ctypes.winapi_abi,
+                                          ctypes.uintptr_t,
+                                          ctypes.uint32_t,
+                                          ctypes.uint32_t,
+                                          ctypes.uintptr_t,
+                                          this.winEventProcType,
+                                          ctypes.uint32_t,
+                                          ctypes.uint32_t,
+                                          ctypes.uint32_t);
+  }
+  if (!this.unhookWinEvent) {
+    this.unhookWinEvent = user32.declare("UnhookWinEvent",
+                                         ctypes.winapi_abi,
+                                         ctypes.int,
+                                         ctypes.uintptr_t);
+  }
+  if (!this.pointType) {
+    this.pointType = ctypes.StructType("tagPOINT",
+                                       [ { "x": ctypes.long },
+                                         { "y": ctypes.long } ] );
+  }
+  if (!this.msgType) {
+    this.msgType = ctypes.StructType("tagMSG",
+                                     [ { "hwnd": ctypes.uintptr_t },
+                                       { "message": ctypes.uint32_t },
+                                       { "wParam": ctypes.uintptr_t },
+                                       { "lParam": ctypes.intptr_t },
+                                       { "time": ctypes.uint32_t },
+                                       { "pt": this.pointType } ] );
+  }
+  if (!this.peekMessage) {
+    this.peekMessage = user32.declare("PeekMessageW",
+                                      ctypes.winapi_abi,
+                                      ctypes.int,
+                                      this.msgType.ptr,
+                                      ctypes.uintptr_t,
+                                      ctypes.uint32_t,
+                                      ctypes.uint32_t,
+                                      ctypes.uint32_t);
+  }
+  if (!this.msgWaitForMultipleObjects) {
+    this.msgWaitForMultipleObjects = user32.declare("MsgWaitForMultipleObjects",
+                                                    ctypes.winapi_abi,
+                                                    ctypes.uint32_t,
+                                                    ctypes.uint32_t,
+                                                    ctypes.uintptr_t.ptr,
+                                                    ctypes.int,
+                                                    ctypes.uint32_t,
+                                                    ctypes.uint32_t);
+  }
+  if (!this.getWindowTextW) {
+    this.getWindowTextW = user32.declare("GetWindowTextW",
+                                         ctypes.winapi_abi,
+                                         ctypes.int,
+                                         ctypes.uintptr_t,
+                                         ctypes.jschar.ptr,
+                                         ctypes.int);
+  }
+};
+
+DialogWatcher.prototype.getWindowText = function(hwnd) {
+  var bufType = ctypes.ArrayType(ctypes.jschar);
+  var buffer = new bufType(256);
+  
+  if (this.getWindowTextW(hwnd, buffer, buffer.length)) {
+    return buffer.readString();
+  }
+};
+
+DialogWatcher.prototype.processWindowEvents = function(timeout) {
+  var onWinEvent = function(self, hook, event, hwnd, idObject, idChild, dwEventThread, dwmsEventTime) {
+    var nhwnd = Number(hwnd)
+    if (event == EVENT_OBJECT_SHOW) {
+      if (nhwnd == self.hwnd) {
+        // We've already picked up this event via FindWindow
+        return;
+      }
+      var windowText = self.getWindowText(hwnd);
+      if (windowText == self.titleText && self.onDialogStart) {
+        self.hwnd = nhwnd;
+        self.onDialogStart(nhwnd);
+      }
+    } else if (event == EVENT_OBJECT_HIDE && nhwnd == self.hwnd && self.onDialogEnd) {
+      self.onDialogEnd();
+      self.hwnd = null;
+    }
+  };
+  var self = this;
+  var callback = this.winEventProcType(function(hook, event, hwnd, idObject,
+                                                idChild, dwEventThread,
+                                                dwmsEventTime) {
+      onWinEvent(self, hook, event, hwnd, idObject, idChild, dwEventThread,
+                 dwmsEventTime);
+    } );
+  var hook = this.setWinEventHook(EVENT_OBJECT_SHOW, EVENT_OBJECT_HIDE,
+                                  0, callback, 0, 0,
+                                  WINEVENT_OUTOFCONTEXT | WINEVENT_SKIPOWNPROCESS);
+  if (!hook) {
+    return;
+  }
+  // Check if the window is already showing
+  var hwnd = this.findWindow(null, this.titleText);
+  if (hwnd && hwnd > 0) {
+    this.hwnd = Number(hwnd);
+    if (this.onDialogStart) {
+      this.onDialogStart(this.hwnd);
+    }
+  }
+
+  if (!timeout) {
+    timeout = INFINITE;
+  }
+
+  var waitStatus = WAIT_OBJECT_0;
+  var expectingStart = this.onDialogStart && this.hwnd === undefined;
+  while (this.hwnd === undefined || this.onDialogEnd && this.hwnd) {
+    waitStatus = this.msgWaitForMultipleObjects(0, null, 0, expectingStart ?
+                                                            INFINITE : timeout, 0);
+    if (waitStatus == WAIT_OBJECT_0) {
+      var msg = new this.msgType;
+      this.peekMessage(msg.address(), 0, 0, 0, PM_NOREMOVE);
+    } else if (waitStatus == WAIT_TIMEOUT) {
+      break;
+    }
+  }
+
+  this.unhookWinEvent(hook);
+  // Returns true if the hook was successful, something was found, and we never timed out
+  return this.hwnd !== undefined && waitStatus == WAIT_OBJECT_0;
+};
+
diff --git a/dom/plugins/test/mochitest/hangui_common.js b/dom/plugins/test/mochitest/hangui_common.js
new file mode 100644
index 000000000000..776357efc361
--- /dev/null
+++ b/dom/plugins/test/mochitest/hangui_common.js
@@ -0,0 +1,20 @@
+// Plugin Hang UI constants
+const HANGUIOP_NOTHING = 0;
+const HANGUIOP_CANCEL = 1;
+const HANGUIOP_COMMAND = 2;
+const IDC_CONTINUE = 1001;
+const IDC_STOP = 1002;
+const IDC_NOFUTURE = 1003;
+
+// Windows constants
+const WM_CLOSE = 0x0010;
+const WM_COMMAND = 0x0111;
+const BM_GETCHECK = 0x00F0;
+const BM_SETCHECK = 0x00F1;
+const BN_CLICKED = 0;
+const BST_CHECKED = 1;
+
+// Test-specific constants
+const EPSILON_MS = 1000;
+const STALL_DURATION = 5;
+
diff --git a/dom/plugins/test/mochitest/hangui_iface.js b/dom/plugins/test/mochitest/hangui_iface.js
new file mode 100644
index 000000000000..4cd559c54527
--- /dev/null
+++ b/dom/plugins/test/mochitest/hangui_iface.js
@@ -0,0 +1,121 @@
+var user32;
+var sendMessage;
+var getDlgItem;
+var messageBox;
+var watcher;
+
+importScripts("hangui_common.js");
+importScripts("dialog_watcher.js");
+
+function initCTypes() {
+  if (!user32) {
+    user32 = ctypes.open("user32.dll");
+  }
+  if (!getDlgItem) {
+    getDlgItem = user32.declare("GetDlgItem",
+                                ctypes.winapi_abi,
+                                ctypes.uintptr_t,
+                                ctypes.uintptr_t,
+                                ctypes.int);
+  }
+  if (!sendMessage) {
+    sendMessage = user32.declare("SendMessageW",
+                                 ctypes.winapi_abi,
+                                 ctypes.intptr_t,
+                                 ctypes.uintptr_t,
+                                 ctypes.uint32_t,
+                                 ctypes.uintptr_t,
+                                 ctypes.intptr_t);
+  }
+  if (!messageBox) {
+    // Handy for debugging the test itself
+    messageBox = user32.declare("MessageBoxW",
+                                ctypes.winapi_abi,
+                                ctypes.int,
+                                ctypes.uintptr_t,
+                                ctypes.jschar.ptr,
+                                ctypes.jschar.ptr,
+                                ctypes.uint32_t);
+  }
+  if (!watcher) {
+    watcher = new DialogWatcher("Warning: Unresponsive plugin");
+  }
+}
+
+function postSuccess(params) {
+  self.postMessage({"status": true, "params": params});
+}
+
+function postFail(params, msg) {
+  self.postMessage({"status": false, "params": params, "msg": msg});
+}
+
+function onDialogStart(inparams, hwnd) {
+  var params = Object.create(inparams);
+  params.testName += " (Start)";
+  params.callback = null;
+  if (!params.expectToFind) {
+    postFail(params, "Dialog showed when we weren't expecting it to!");
+    return;
+  }
+  if (params.opCode == HANGUIOP_CANCEL) {
+    sendMessage(hwnd, WM_CLOSE, 0, 0);
+  } else if (params.opCode == HANGUIOP_COMMAND) {
+    if (params.check) {
+      var checkbox = getDlgItem(hwnd, IDC_NOFUTURE);
+      if (!checkbox) {
+        postFail(params, "Couldn't find checkbox");
+        return;
+      }
+      sendMessage(checkbox, BM_SETCHECK, BST_CHECKED, 0);
+      sendMessage(hwnd, WM_COMMAND, (BN_CLICKED << 16) | IDC_NOFUTURE, checkbox);
+    }
+    var button = getDlgItem(hwnd, params.commandId);
+    if (!button) {
+      postFail(params,
+               "GetDlgItem failed to find button with ID " + params.commandId);
+      return;
+    }
+    sendMessage(hwnd, WM_COMMAND, (BN_CLICKED << 16) | params.commandId, button);
+  }
+  postSuccess(params);
+}
+
+function onDialogEnd(inparams) {
+  var params = Object.create(inparams);
+  params.testName += " (End)";
+  params.callback = inparams.callback;
+  postSuccess(params);
+}
+
+self.onmessage = function(event) {
+  initCTypes();
+  watcher.init();
+  var params = event.data;
+  var timeout = params.timeoutMs;
+  if (params.expectToFind) {
+    watcher.onDialogStart = function(hwnd) { onDialogStart(params, hwnd); };
+    if (params.expectToClose) {
+      watcher.onDialogEnd = function() { onDialogEnd(params); };
+    }
+  } else {
+    watcher.onDialogStart = null;
+    watcher.onDialogEnd = null;
+  }
+  var result = watcher.processWindowEvents(timeout);
+  if (result === null) {
+    postFail(params, "Hook failed");
+  } else if (!result) {
+    if (params.expectToFind) {
+      postFail(params, "The dialog didn't show but we were expecting it to");
+    } else {
+      postSuccess(params);
+    }
+  }
+}
+
+self.onerror = function(event) {
+  var msg = "Error: " + event.message + " at " + event.filename + ":" + event.lineno;
+  postFail(null, msg);
+};
+
diff --git a/dom/plugins/test/mochitest/hangui_subpage.html b/dom/plugins/test/mochitest/hangui_subpage.html
new file mode 100644
index 000000000000..401912f68e07
--- /dev/null
+++ b/dom/plugins/test/mochitest/hangui_subpage.html
@@ -0,0 +1,4 @@
+<html>
+<body onload="window.parent.frameLoaded()">
+  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
+
diff --git a/dom/plugins/test/mochitest/test_hangui.xul b/dom/plugins/test/mochitest/test_hangui.xul
new file mode 100644
index 000000000000..2842a79c1c4a
--- /dev/null
+++ b/dom/plugins/test/mochitest/test_hangui.xul
@@ -0,0 +1,263 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+<window title="Basic Plugin Tests"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <title>Plugin Hang UI Test</title>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript"
+          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
+  <script type="application/javascript"
+          src="http://mochi.test:8888/chrome/dom/plugins/test/hangui_common.js" />
+
+<body xmlns="http://www.w3.org/1999/xhtml">
+  <iframe id="iframe1" src="hangui_subpage.html" width="400" height="400"></iframe>
+</body>
+<script class="testbody" type="application/javascript">
+<![CDATA[
+SimpleTest.waitForExplicitFinish();
+
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+const hangUITimeoutPref = "dom.ipc.plugins.hangUITimeoutSecs";
+const hangUIMinDisplayPref = "dom.ipc.plugins.hangUIMinDisplaySecs";
+const timeoutPref = "dom.ipc.plugins.timeoutSecs";
+
+var worker = new ChromeWorker("hangui_iface.js");
+worker.onmessage = function(event) {
+  var result = event.data;
+  var params = result.params;
+  var output = params.testName;
+  if (result.msg) {
+    output += ": " + result.msg;
+  }
+  ok(result.status, output);
+  if (params.callback) {
+    var cb = eval(params.callback);
+    var timeout = setTimeout(function() { clearTimeout(timeout); cb(); }, 100);
+  }
+};
+worker.onerror = function(event) {
+  var output = "Error: " + event.message + " at " + event.filename + ":" + event.lineno;
+  ok(false, output);
+};
+
+var iframe;
+var p;
+var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+
+function hanguiOperation(testName, timeoutSec, expectFind, expectClose, opCode,
+                         commandId, check, cb) {
+  var timeoutMs = timeoutSec * 1000 + EPSILON_MS;
+  worker.postMessage({ "timeoutMs": timeoutMs, "expectToFind": expectFind,
+                       "expectToClose": expectClose, "opCode": opCode,
+                       "commandId": commandId, "check": check,
+                       "testName": testName, "callback": cb });
+}
+
+function hanguiExpect(testName, shouldBeShowing, shouldClose, cb) {
+  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
+  if (!shouldBeShowing && !timeoutSec) {
+    timeoutSec = Services.prefs.getIntPref(timeoutPref);
+  }
+  hanguiOperation(testName, timeoutSec, shouldBeShowing, shouldClose, HANGUIOP_NOTHING, 0, false, cb);
+}
+
+function hanguiContinue(testName, check, cb) {
+  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
+  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_COMMAND, IDC_CONTINUE, check, cb);
+}
+
+function hanguiStop(testName, check, cb) {
+  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
+  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_COMMAND, IDC_STOP, check, cb);
+}
+
+function hanguiCancel(testName, cb) {
+  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
+  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_CANCEL, 0, false, cb);
+}
+
+function finishTest() {
+  if (obsCount > 0) {
+    os.removeObserver(testObserver, "plugin-crashed");
+    --obsCount;
+  }
+  SpecialPowers.clearUserPref(hangUITimeoutPref);
+  SpecialPowers.clearUserPref(hangUIMinDisplayPref);
+  SpecialPowers.clearUserPref(timeoutPref);
+  SimpleTest.finish();
+}
+
+function runTests() {
+  if (!SimpleTest.testPluginIsOOP()) {
+    ok(true, "Skipping this test when test plugin is not OOP.");
+    SimpleTest.finish();
+  }
+
+  resetVars();
+
+  hanguiExpect("Prime ChromeWorker", false, false, "test1");
+}
+
+window.frameLoaded = runTests;
+
+var obsCount = 0;
+
+function onPluginCrashedHangUI(aEvent) {
+  ok(true, "Plugin crashed notification received");
+  is(aEvent.type, "PluginCrashed", "event is correct type");
+
+  is(p, aEvent.target, "Plugin crashed event target is plugin element");
+
+  ok(aEvent instanceof Components.interfaces.nsIDOMDataContainerEvent,
+     "plugin crashed event has the right interface");
+
+  var minidumpID = aEvent.getData("minidumpID");
+  isnot(minidumpID, "", "got a non-empty dump ID");
+  var pluginName = aEvent.getData("pluginName");
+  is(pluginName, "Test Plug-in", "got correct plugin name");
+  var pluginFilename = aEvent.getData("pluginFilename");
+  isnot(pluginFilename, "", "got a non-empty filename");
+  var didReport = aEvent.getData("submittedCrashReport");
+  // The app itself may or may not have decided to submit the report, so
+  // allow either true or false here.
+  ok((didReport == true || didReport == false), "event said crash report was submitted");
+  os.removeObserver(testObserver, "plugin-crashed");
+  --obsCount;
+}
+
+function resetVars() {
+  iframe = document.getElementById('iframe1');
+  p = iframe.contentDocument.getElementById("plugin1");
+  if (obsCount == 0) {
+    os.addObserver(testObserver, "plugin-crashed", true);
+    ++obsCount;
+  }
+  iframe.contentDocument.addEventListener("PluginCrashed",
+                                          onPluginCrashedHangUI,
+                                          false);
+}
+
+function test9b() {
+  hanguiExpect("test9b: Plugin Hang UI is not showing (checkbox)", false);
+  p.stall(STALL_DURATION);
+  hanguiExpect("test9b: Plugin Hang UI is still not showing (checkbox)", false, false, "finishTest");
+  p.stall(STALL_DURATION);
+}
+
+function test9a() {
+  resetVars();
+  SpecialPowers.setIntPref(hangUITimeoutPref, 1);
+  SpecialPowers.setIntPref(hangUIMinDisplayPref, 1);
+  SpecialPowers.setIntPref(timeoutPref, 45);
+  hanguiContinue("test9a: Continue button works with checkbox", true, "test9b");
+  p.stall(STALL_DURATION);
+}
+
+function test9() {
+  window.frameLoaded = test9a;
+  iframe.contentWindow.location.reload();
+}
+
+function test8a() {
+  resetVars();
+  SpecialPowers.setIntPref(hangUITimeoutPref, 1);
+  SpecialPowers.setIntPref(hangUIMinDisplayPref, 4);
+  hanguiExpect("test8a: Plugin Hang UI is not showing (disabled due to hangUIMinDisplaySecs)", false, false, "test9");
+  var exceptionThrown = false;
+  try {
+    p.hang();
+  } catch(e) {
+    exceptionThrown = true;
+  }
+  ok(exceptionThrown, "test8a: Exception thrown from hang() when plugin was terminated");
+}
+
+function test8() {
+  window.frameLoaded = test8a;
+  iframe.contentWindow.location.reload();
+}
+
+function test7a() {
+  resetVars();
+  SpecialPowers.setIntPref(hangUITimeoutPref, 0);
+  hanguiExpect("test7a: Plugin Hang UI is not showing (disabled)", false, false, "test8");
+  var exceptionThrown = false;
+  try {
+    p.hang();
+  } catch(e) {
+    exceptionThrown = true;
+  }
+  ok(exceptionThrown, "test7a: Exception thrown from hang() when plugin was terminated");
+}
+
+function test7() {
+  window.frameLoaded = test7a;
+  iframe.contentWindow.location.reload();
+}
+
+function test6() {
+  SpecialPowers.setIntPref(hangUITimeoutPref, 1);
+  SpecialPowers.setIntPref(hangUIMinDisplayPref, 1);
+  SpecialPowers.setIntPref(timeoutPref, 3);
+  hanguiExpect("test6: Plugin Hang UI is showing", true, true, "test7");
+  var exceptionThrown = false;
+  try {
+    p.hang();
+  } catch(e) {
+    exceptionThrown = true;
+  }
+  ok(exceptionThrown, "test6: Exception thrown from hang() when plugin was terminated (child timeout)");
+}
+
+function test5a() {
+  resetVars();
+  hanguiCancel("test5a: Close button works", "test6");
+  p.stall(STALL_DURATION);
+}
+
+function test5() {
+  window.frameLoaded = test5a;
+  iframe.contentWindow.location.reload();
+}
+
+function test4() {
+  hanguiStop("test4: Stop button works", false);
+  // We'll get an exception here because the plugin was terminated
+  var exceptionThrown = false;
+  try {
+    p.hang();
+  } catch(e) {
+    exceptionThrown = true;
+  }
+  ok(exceptionThrown, "test4: Exception thrown from hang() when plugin was terminated");
+  SimpleTest.executeSoon(test5);
+}
+
+function test3() {
+  hanguiContinue("test3: Continue button works", false, "test4");
+  p.stall(STALL_DURATION);
+}
+
+function test2() {
+  // This test is identical to test1 because there were some bugs where the 
+  // Hang UI would show on the first hang but not on subsequent hangs
+  hanguiExpect("test2: Plugin Hang UI is showing", true, true, "test3");
+  p.stall(STALL_DURATION);
+}
+
+function test1() {
+  SpecialPowers.setIntPref(hangUITimeoutPref, 1);
+  SpecialPowers.setIntPref(hangUIMinDisplayPref, 1);
+  SpecialPowers.setIntPref(timeoutPref, 45);
+  hanguiExpect("test1: Plugin Hang UI is showing", true, true, "test2");
+  p.stall(STALL_DURATION);
+}
+
+]]>
+</script>
+</window>
diff --git a/dom/plugins/test/testplugin/nptest.cpp b/dom/plugins/test/testplugin/nptest.cpp
index f52937e87865..2b7c6feb5b5c 100644
--- a/dom/plugins/test/testplugin/nptest.cpp
+++ b/dom/plugins/test/testplugin/nptest.cpp
@@ -147,6 +147,7 @@ static bool getAuthInfo(NPObject* npobj, const NPVariant* args, uint32_t argCoun
 static bool asyncCallbackTest(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool checkGCRace(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool hangPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
+static bool stallPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool getClipboardText(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool callOnDestroy(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool reinitWidget(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
@@ -210,6 +211,7 @@ static const NPUTF8* sPluginMethodIdentifierNames[] = {
   "asyncCallbackTest",
   "checkGCRace",
   "hang",
+  "stall",
   "getClipboardText",
   "callOnDestroy",
   "reinitWidget",
@@ -274,6 +276,7 @@ static const ScriptableFunction sPluginMethodFunctions[] = {
   asyncCallbackTest,
   checkGCRace,
   hangPlugin,
+  stallPlugin,
   getClipboardText,
   callOnDestroy,
   reinitWidget,
@@ -3314,6 +3317,24 @@ hangPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount,
   return true;
 }
 
+bool
+stallPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount,
+           NPVariant* result)
+{
+  uint32_t stallTimeSeconds = 0;
+  if ((argCount == 1) && NPVARIANT_IS_INT32(args[0])) {
+    stallTimeSeconds = (uint32_t) NPVARIANT_TO_INT32(args[0]);
+  }
+
+#ifdef XP_WIN
+  Sleep(stallTimeSeconds * 1000U);
+#else
+  sleep(stallTimeSeconds);
+#endif
+
+  return true;
+}
+
 #if defined(MOZ_WIDGET_GTK)
 bool
 getClipboardText(NPObject* npobj, const NPVariant* args, uint32_t argCount,

From 6c20d931b60862db1e8426432be65f8514198548 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Tue, 16 Apr 2013 13:32:39 -0600
Subject: [PATCH 376/438] Bug 862493 - disable robocop tests that cause
 instability on panda; r=jmaher DONTBUILD

---
 mobile/android/base/tests/robocop.ini | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/tests/robocop.ini b/mobile/android/base/tests/robocop.ini
index eaea025c348b..a0792b5eda9d 100644
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -13,24 +13,24 @@
 # [test_bug720538] # see bug 746876
 [testFlingCorrectness]
 [testOverscroll]
-[testAxisLocking]
-[testAboutPage]
-[testWebContentContextMenu]
+# [testAxisLocking] # see bug 862493
+# [testAboutPage] # see bug 862493
+# [testWebContentContextMenu] # see bug 862493
 [testPasswordProvider]
 # [testPasswordEncrypt] # see bug 824067
-[testFormHistory]
+# [testFormHistory] # see bug 862493
 [testBrowserProvider]
 [testSearchSuggestions]
 # [testThumbnails] # see bug 813107
 [testAddonManager]
 [testHistory]
 [testVkbOverlap]
-[testDoorHanger]
+# [testDoorHanger] # see bug 862493
 [testTabHistory]
 [testShareLink]
-[testClearPrivateData]
+# [testClearPrivateData] # see bug 862493
 # [testSettingsMenuItems] # see bug 843947
-[testSystemPages]
+# [testSystemPages] # see bug 862493
 # [testPermissions] # see bug 757475
 # [testJarReader] # see bug 738890
 [testDistribution]

From df7deac25bf881c3db55c2609ca897dbf559da66 Mon Sep 17 00:00:00 2001
From: Mike Shal <mshal@mozilla.com>
Date: Tue, 16 Apr 2013 15:24:43 -0400
Subject: [PATCH 377/438] Bug 846634 - Part 2: Move EXPORTS to moz.build;
 r=joey

---
 accessible/public/Makefile.in                 |   4 -
 accessible/public/ia2/Makefile.in             |  10 +-
 accessible/public/ia2/moz.build               |  31 ++++
 accessible/public/moz.build                   |   4 +
 accessible/public/msaa/Makefile.in            |   9 --
 accessible/public/msaa/moz.build              |   9 ++
 accessible/src/atk/Makefile.in                |  11 --
 accessible/src/atk/moz.build                  |   9 ++
 accessible/src/base/Makefile.in               |  24 ---
 accessible/src/base/moz.build                 |  20 +++
 accessible/src/generic/Makefile.in            |   8 -
 accessible/src/generic/moz.build              |   6 +
 accessible/src/mac/Makefile.in                |  12 --
 accessible/src/mac/moz.build                  |  10 ++
 accessible/src/other/Makefile.in              |  11 --
 accessible/src/other/moz.build                |   9 ++
 accessible/src/windows/ia2/Makefile.in        |  10 --
 accessible/src/windows/ia2/moz.build          |  10 ++
 accessible/src/windows/msaa/Makefile.in       |  12 --
 accessible/src/windows/msaa/moz.build         |  10 ++
 accessible/src/xpcom/Makefile.in              |   2 -
 accessible/src/xpcom/moz.build                |   4 +
 browser/components/about/Makefile.in          |   4 -
 browser/components/about/moz.build            |   4 +
 browser/components/build/Makefile.in          |   2 -
 browser/components/build/moz.build            |   4 +
 browser/components/dirprovider/Makefile.in    |   3 -
 browser/components/dirprovider/moz.build      |   4 +
 caps/include/Makefile.in                      |   4 -
 caps/include/moz.build                        |   4 +
 chrome/src/Makefile.in                        |   6 -
 chrome/src/moz.build                          |   4 +
 content/base/public/Makefile.in               |  47 ------
 content/base/public/moz.build                 |  45 ++++++
 content/base/src/Makefile.in                  |  45 ------
 content/base/src/moz.build                    |  44 +++++
 content/canvas/public/Makefile.in             |  16 --
 content/canvas/public/moz.build               |  14 ++
 content/canvas/src/Makefile.in                |   8 -
 content/canvas/src/moz.build                  |   6 +
 content/events/public/Makefile.in             |  17 --
 content/events/public/moz.build               |  15 ++
 content/events/src/Makefile.in                |  16 --
 content/events/src/moz.build                  |  14 ++
 content/html/content/public/Makefile.in       |  22 ---
 content/html/content/public/moz.build         |  20 +++
 content/html/content/src/Makefile.in          |  70 --------
 content/html/content/src/moz.build            |  68 ++++++++
 content/html/document/src/Makefile.in         |   4 -
 content/html/document/src/moz.build           |   4 +
 content/media/Makefile.in                     |  32 ----
 content/media/dash/Makefile.in                |   7 -
 content/media/dash/moz.build                  |   7 +
 content/media/gstreamer/Makefile.in           |   6 -
 content/media/gstreamer/moz.build             |   6 +
 content/media/moz.build                       |  32 ++++
 content/media/ogg/Makefile.in                 |   6 -
 content/media/ogg/moz.build                   |   6 +
 content/media/omx/Makefile.in                 |   5 -
 content/media/omx/moz.build                   |   5 +
 content/media/plugins/Makefile.in             |   7 -
 content/media/plugins/moz.build               |   7 +
 content/media/raw/Makefile.in                 |   6 -
 content/media/raw/moz.build                   |   6 +
 content/media/wave/Makefile.in                |   5 -
 content/media/wave/moz.build                  |   5 +
 content/media/webaudio/Makefile.in            |  25 ---
 content/media/webaudio/moz.build              |  24 +++
 content/media/webm/Makefile.in                |   5 -
 content/media/webm/moz.build                  |   5 +
 content/media/webrtc/Makefile.in              |   9 --
 content/media/webrtc/moz.build                |   7 +
 .../media/webspeech/recognition/Makefile.in   |  12 --
 content/media/webspeech/recognition/moz.build |  12 ++
 content/media/webspeech/synth/Makefile.in     |  12 --
 content/media/webspeech/synth/moz.build       |  12 ++
 content/media/wmf/Makefile.in                 |   6 -
 content/media/wmf/moz.build                   |   6 +
 content/smil/Makefile.in                      |  25 ---
 content/smil/moz.build                        |  25 +++
 content/svg/content/src/Makefile.in           |  88 ----------
 content/svg/content/src/moz.build             |  86 ++++++++++
 content/svg/document/src/Makefile.in          |   6 -
 content/svg/document/src/moz.build            |   4 +
 content/xbl/src/Makefile.in                   |   6 -
 content/xbl/src/moz.build                     |   6 +
 content/xml/content/src/Makefile.in           |   8 -
 content/xml/content/src/moz.build             |   6 +
 content/xml/document/public/Makefile.in       |   4 -
 content/xml/document/public/moz.build         |   4 +
 content/xml/document/src/Makefile.in          |   6 -
 content/xml/document/src/moz.build            |   4 +
 content/xslt/public/Makefile.in               |   4 -
 content/xslt/public/moz.build                 |   4 +
 content/xul/document/public/Makefile.in       |   7 -
 content/xul/document/public/moz.build         |   3 +
 db/sqlite3/src/Makefile.in                    |   4 -
 db/sqlite3/src/moz.build                      |   4 +
 docshell/base/Makefile.in                     |  14 --
 docshell/base/moz.build                       |  12 ++
 docshell/build/Makefile.in                    |   4 -
 docshell/build/moz.build                      |   4 +
 docshell/shistory/src/Makefile.in             |   3 -
 docshell/shistory/src/moz.build               |   4 +
 dom/activities/src/Makefile.in                |   5 -
 dom/activities/src/moz.build                  |   4 +
 dom/alarm/Makefile.in                         |   6 -
 dom/alarm/moz.build                           |   4 +
 dom/audiochannel/Makefile.in                  |   9 --
 dom/audiochannel/moz.build                    |   7 +
 dom/base/Makefile.in                          |  42 -----
 dom/base/moz.build                            |  41 +++++
 dom/battery/Makefile.in                       |   7 -
 dom/battery/moz.build                         |   5 +
 dom/bindings/Makefile.in                      |  25 ---
 dom/bindings/moz.build                        |  22 +++
 dom/bluetooth/Makefile.in                     |   8 -
 dom/bluetooth/moz.build                       |   8 +
 dom/browser-element/Makefile.in               |  10 --
 dom/browser-element/moz.build                 |   9 ++
 dom/camera/Makefile.in                        |   7 -
 dom/camera/moz.build                          |   7 +
 dom/cellbroadcast/src/Makefile.in             |   6 -
 dom/cellbroadcast/src/moz.build               |   4 +
 dom/devicestorage/Makefile.in                 |  12 --
 dom/devicestorage/moz.build                   |  10 ++
 dom/encoding/Makefile.in                      |   9 --
 dom/encoding/moz.build                        |   8 +
 dom/file/Makefile.in                          |  22 ---
 dom/file/moz.build                            |  20 +++
 dom/icc/src/Makefile.in                       |   6 -
 dom/icc/src/moz.build                         |   4 +
 dom/indexedDB/Makefile.in                     |  24 ---
 dom/indexedDB/ipc/Makefile.in                 |   4 -
 dom/indexedDB/ipc/moz.build                   |   4 +
 dom/indexedDB/moz.build                       |  22 +++
 dom/interfaces/storage/Makefile.in            |   4 -
 dom/interfaces/storage/moz.build              |   4 +
 dom/ipc/Makefile.in                           |  35 ----
 dom/ipc/moz.build                             |  29 ++++
 dom/media/Makefile.in                         |   6 -
 dom/media/moz.build                           |   4 +
 dom/mobilemessage/src/Makefile.in             |  29 ----
 dom/mobilemessage/src/moz.build               |  25 +++
 dom/network/src/Makefile.in                   |  10 --
 dom/network/src/moz.build                     |   8 +
 dom/plugins/base/Makefile.in                  |  24 ---
 dom/plugins/base/android/Makefile.in          |   5 -
 dom/plugins/base/android/moz.build            |   5 +
 dom/plugins/base/moz.build                    |  22 +++
 dom/plugins/ipc/Makefile.in                   |  46 ------
 dom/plugins/ipc/moz.build                     |  43 +++++
 dom/power/Makefile.in                         |   7 -
 dom/power/moz.build                           |   5 +
 dom/quota/Makefile.in                         |  20 ---
 dom/quota/moz.build                           |  18 +++
 dom/src/geolocation/Makefile.in               |   4 -
 dom/src/geolocation/moz.build                 |   5 +
 dom/src/json/Makefile.in                      |   3 -
 dom/src/json/moz.build                        |   4 +
 dom/src/jsurl/Makefile.in                     |   2 -
 dom/src/jsurl/moz.build                       |   4 +
 dom/src/notification/Makefile.in              |   9 --
 dom/src/notification/moz.build                |   5 +
 dom/src/storage/Makefile.in                   |   3 -
 dom/src/storage/moz.build                     |   4 +
 dom/system/Makefile.in                        |  16 --
 dom/system/gonk/Makefile.in                   |   4 -
 dom/system/gonk/moz.build                     |   5 +
 dom/system/moz.build                          |  13 ++
 dom/time/Makefile.in                          |   8 -
 dom/time/moz.build                            |   6 +
 dom/voicemail/Makefile.in                     |   5 -
 dom/voicemail/moz.build                       |   4 +
 dom/workers/Makefile.in                       |  23 ---
 dom/workers/moz.build                         |  20 +++
 editor/public/Makefile.in                     |   4 -
 editor/public/moz.build                       |   4 +
 editor/txmgr/public/Makefile.in               |   4 -
 editor/txmgr/public/moz.build                 |   4 +
 editor/txtsvc/public/Makefile.in              |   7 -
 editor/txtsvc/public/moz.build                |   7 +
 embedding/browser/webBrowser/Makefile.in      |   4 -
 embedding/browser/webBrowser/moz.build        |   4 +
 .../components/appstartup/src/Makefile.in     |   4 -
 embedding/components/appstartup/src/moz.build |   4 +
 .../windowwatcher/public/Makefile.in          |   3 -
 .../components/windowwatcher/public/moz.build |   4 +
 gfx/2d/Makefile.in                            |  25 ---
 gfx/2d/moz.build                              |  24 +++
 gfx/angle/Makefile.in                         |   7 -
 gfx/angle/moz.build                           |   5 +
 gfx/cairo/cairo/src/Makefile.in               |  20 ---
 gfx/cairo/cairo/src/moz.build                 |  60 +++++++
 gfx/cairo/libpixman/src/Makefile.in           |   2 -
 gfx/cairo/libpixman/src/moz.build             |   5 +
 gfx/gl/Makefile.in                            |  34 ----
 gfx/gl/moz.build                              |  29 ++++
 gfx/graphite2/moz-gr-update.sh                |   5 +
 gfx/graphite2/src/Makefile.in                 |   3 -
 gfx/graphite2/src/moz.build                   |   8 +
 gfx/harfbuzz/src/Makefile.in                  |  18 ---
 gfx/harfbuzz/src/moz.build                    |  16 ++
 gfx/ipc/Makefile.in                           |  11 --
 gfx/ipc/moz.build                             |  10 ++
 gfx/layers/Makefile.in                        |  91 -----------
 gfx/layers/moz.build                          | 102 ++++++++++++
 gfx/ots/src/Makefile.in                       |   5 -
 gfx/ots/src/moz.build                         |   5 +
 gfx/qcms/Makefile.in                          |   2 -
 gfx/qcms/moz.build                            |   5 +
 gfx/skia/Makefile.in                          | 150 ------------------
 gfx/skia/moz.build                            | 150 ++++++++++++++++++
 gfx/src/Makefile.in                           |  29 ----
 gfx/src/moz.build                             |  25 +++
 gfx/thebes/Makefile.in                        | 142 -----------------
 gfx/thebes/moz.build                          | 119 ++++++++++++++
 gfx/ycbcr/Makefile.in                         |   6 -
 gfx/ycbcr/moz.build                           |   7 +
 hal/Makefile.in                               |  10 --
 hal/moz.build                                 |   9 ++
 image/public/Makefile.in                      |   2 -
 image/public/moz.build                        |   4 +
 image/src/Makefile.in                         |   6 -
 image/src/moz.build                           |   7 +
 intl/chardet/public/Makefile.in               |   7 -
 intl/chardet/public/moz.build                 |   7 +
 intl/hyphenation/public/Makefile.in           |   5 -
 intl/hyphenation/public/moz.build             |   5 +
 intl/locale/public/Makefile.in                |  13 --
 intl/locale/public/moz.build                  |  13 ++
 intl/locale/src/Makefile.in                   |   4 -
 intl/locale/src/moz.build                     |   4 +
 intl/lwbrk/public/Makefile.in                 |   6 -
 intl/lwbrk/public/moz.build                   |   6 +
 intl/uconv/public/Makefile.in                 |   8 -
 intl/uconv/public/moz.build                   |   8 +
 intl/uconv/ucvcn/Makefile.in                  |   2 -
 intl/uconv/ucvcn/moz.build                    |   4 +
 intl/uconv/ucvibm/Makefile.in                 |   2 -
 intl/uconv/ucvibm/moz.build                   |   4 +
 intl/uconv/ucvja/Makefile.in                  |   5 -
 intl/uconv/ucvja/moz.build                    |   5 +
 intl/uconv/ucvko/Makefile.in                  |   2 -
 intl/uconv/ucvko/moz.build                    |   4 +
 intl/uconv/ucvlatin/Makefile.in               |   2 -
 intl/uconv/ucvlatin/moz.build                 |   4 +
 intl/uconv/ucvtw/Makefile.in                  |   2 -
 intl/uconv/ucvtw/moz.build                    |   4 +
 intl/uconv/ucvtw2/Makefile.in                 |   2 -
 intl/uconv/ucvtw2/moz.build                   |   4 +
 intl/unicharutil/public/Makefile.in           |   7 -
 intl/unicharutil/public/moz.build             |   7 +
 intl/unicharutil/util/Makefile.in             |   7 -
 intl/unicharutil/util/moz.build               |   7 +
 ipc/dbus/Makefile.in                          |   8 -
 ipc/dbus/moz.build                            |   6 +
 ipc/glue/Makefile.in                          |  51 ------
 ipc/glue/moz.build                            |  48 ++++++
 ipc/ipdl/test/cxx/Makefile.in                 |   8 -
 ipc/ipdl/test/cxx/moz.build                   |   7 +
 ipc/netd/Makefile.in                          |   6 -
 ipc/netd/moz.build                            |   4 +
 ipc/ril/Makefile.in                           |   6 -
 ipc/ril/moz.build                             |   4 +
 ipc/testshell/Makefile.in                     |   8 -
 ipc/testshell/moz.build                       |   6 +
 ipc/unixsocket/Makefile.in                    |   4 -
 ipc/unixsocket/moz.build                      |   4 +
 js/ipc/Makefile.in                            |  10 --
 js/ipc/moz.build                              |   8 +
 js/jsd/Makefile.in                            |   2 -
 js/jsd/moz.build                              |   4 +
 js/src/Makefile.in                            |  65 +-------
 js/src/moz.build                              |  56 ++++++-
 js/xpconnect/public/Makefile.in               |   8 -
 js/xpconnect/public/moz.build                 |   8 +
 js/xpconnect/src/Makefile.in                  |   9 --
 js/xpconnect/src/moz.build                    |   9 ++
 js/xpconnect/wrappers/Makefile.in             |   4 -
 js/xpconnect/wrappers/moz.build               |   4 +
 layout/base/Makefile.in                       |  44 -----
 layout/base/moz.build                         |  42 +++++
 layout/build/Makefile.in                      |   6 -
 layout/build/moz.build                        |   6 +
 layout/forms/Makefile.in                      |   8 -
 layout/forms/moz.build                        |   8 +
 layout/generic/Makefile.in                    |  33 ----
 layout/generic/moz.build                      |  31 ++++
 layout/inspector/src/Makefile.in              |   5 -
 layout/inspector/src/moz.build                |   5 +
 layout/ipc/Makefile.in                        |   8 -
 layout/ipc/moz.build                          |   6 +
 layout/style/Makefile.in                      |  68 --------
 layout/style/moz.build                        |  66 ++++++++
 layout/svg/Makefile.in                        |   9 --
 layout/svg/moz.build                          |   9 ++
 layout/tables/Makefile.in                     |   4 -
 layout/tables/moz.build                       |   4 +
 layout/tools/layout-debug/src/Makefile.in     |   4 -
 layout/tools/layout-debug/src/moz.build       |   4 +
 layout/xul/base/public/Makefile.in            |   6 -
 layout/xul/base/public/moz.build              |   6 +
 layout/xul/grid/Makefile.in                   |  12 --
 layout/xul/grid/moz.build                     |  12 ++
 layout/xul/tree/Makefile.in                   |   5 -
 layout/xul/tree/moz.build                     |   5 +
 media/kiss_fft/Makefile.in                    |   4 -
 media/kiss_fft/moz.build                      |   5 +
 media/libcubeb/include/Makefile.in            |   3 -
 media/libcubeb/include/moz.build              |   5 +
 media/libjpeg/Makefile.in                     |   9 --
 media/libjpeg/moz.build                       |   9 ++
 media/libnestegg/include/Makefile.in          |   3 -
 media/libnestegg/include/moz.build            |   5 +
 media/libogg/include/ogg/Makefile.in          |   8 -
 media/libogg/include/ogg/moz.build            |   6 +
 media/libopus/Makefile.in                     |   9 --
 media/libopus/moz.build                       |   7 +
 media/libpng/Makefile.in                      |   2 -
 media/libpng/moz.build                        |   6 +
 media/libsoundtouch/src/Makefile.in           |   8 -
 media/libsoundtouch/src/moz.build             |   7 +
 media/libspeex_resampler/src/Makefile.in      |   8 -
 media/libspeex_resampler/src/moz.build        |   6 +
 media/libtheora/include/theora/Makefile.in    |   9 --
 media/libtheora/include/theora/moz.build      |   7 +
 media/libtremor/include/tremor/Makefile.in    |   3 -
 media/libtremor/include/tremor/moz.build      |   4 +
 media/libvorbis/include/vorbis/Makefile.in    |   3 -
 media/libvorbis/include/vorbis/moz.build      |   4 +
 media/libvpx/Makefile.in                      |  27 ----
 media/libvpx/moz.build                        |  25 +++
 media/mtransport/build/Makefile.in            |  20 ---
 media/mtransport/build/moz.build              |  18 +++
 media/mtransport/standalone/Makefile.in       |  16 --
 media/mtransport/standalone/moz.build         |  14 ++
 media/webvtt/Makefile.in                      |  11 --
 media/webvtt/moz.build                        |   9 ++
 memory/build/Makefile.in                      |  10 --
 memory/build/moz.build                        |  10 ++
 memory/mozalloc/Makefile.in                   |  20 ---
 memory/mozalloc/moz.build                     |  24 +++
 memory/mozjemalloc/Makefile.in                |   2 -
 memory/mozjemalloc/moz.build                  |   4 +
 memory/replace/dmd/Makefile.in                |   2 -
 memory/replace/dmd/moz.build                  |   4 +
 mobile/android/components/build/Makefile.in   |   3 -
 mobile/android/components/build/moz.build     |   4 +
 modules/libbz2/src/Makefile.in                |   4 -
 modules/libbz2/src/moz.build                  |   4 +
 modules/libjar/Makefile.in                    |   2 -
 modules/libjar/moz.build                      |   5 +
 modules/libjar/objs.mk                        |   6 -
 modules/libmar/src/Makefile.in                |   5 -
 modules/libmar/src/moz.build                  |   5 +
 modules/libpref/public/Makefile.in            |   6 -
 modules/libpref/public/moz.build              |   4 +
 modules/zlib/src/Makefile.in                  |   3 -
 modules/zlib/src/moz.build                    |   6 +
 mozglue/android/Makefile.in                   |   2 -
 mozglue/android/moz.build                     |   4 +
 netwerk/Makefile.in                           |   2 -
 netwerk/base/public/Makefile.in               |  12 --
 netwerk/base/public/moz.build                 |  12 ++
 netwerk/base/src/Makefile.in                  |  13 --
 netwerk/base/src/moz.build                    |  11 ++
 netwerk/build/Makefile.in                     |   2 -
 netwerk/build/moz.build                       |   4 +
 netwerk/cache/Makefile.in                     |   5 -
 netwerk/cache/moz.build                       |   5 +
 netwerk/cookie/Makefile.in                    |   7 -
 netwerk/cookie/moz.build                      |   5 +
 netwerk/dns/Makefile.in                       |   6 -
 netwerk/dns/moz.build                         |   4 +
 netwerk/ipc/Makefile.in                       |  12 --
 netwerk/ipc/moz.build                         |  10 ++
 netwerk/mime/Makefile.in                      |   4 -
 netwerk/mime/moz.build                        |   4 +
 netwerk/moz.build                             |   4 +
 netwerk/protocol/about/Makefile.in            |   2 -
 netwerk/protocol/about/moz.build              |   4 +
 netwerk/protocol/device/Makefile.in           |   7 -
 netwerk/protocol/device/moz.build             |   5 +
 netwerk/protocol/ftp/Makefile.in              |   9 --
 netwerk/protocol/ftp/moz.build                |   9 ++
 netwerk/protocol/http/Makefile.in             |  20 ---
 netwerk/protocol/http/moz.build               |  15 ++
 netwerk/protocol/websocket/Makefile.in        |   9 --
 netwerk/protocol/websocket/moz.build          |   7 +
 netwerk/protocol/wyciwyg/Makefile.in          |   7 -
 netwerk/protocol/wyciwyg/moz.build            |   5 +
 netwerk/sctp/datachannel/Makefile.in          |   7 -
 netwerk/sctp/datachannel/moz.build            |   5 +
 netwerk/sctp/src/Makefile.in                  |   6 -
 netwerk/sctp/src/moz.build                    |   4 +
 netwerk/srtp/src/Makefile.in                  |   2 -
 other-licenses/skia-npapi/Makefile.in         |   2 -
 other-licenses/skia-npapi/moz.build           |   4 +
 other-licenses/snappy/Makefile.in             |   8 -
 other-licenses/snappy/moz.build               |   6 +
 parser/Makefile.in                            |   4 -
 parser/expat/Makefile.in                      |   2 -
 parser/expat/lib/Makefile.in                  |   4 -
 parser/expat/lib/moz.build                    |   5 +
 parser/expat/moz.build                        |   4 +
 parser/html/Makefile.in                       |  36 -----
 parser/html/moz.build                         |  36 +++++
 parser/htmlparser/public/Makefile.in          |  22 ---
 parser/htmlparser/public/moz.build            |  20 +++
 parser/moz.build                              |   4 +
 parser/xml/src/Makefile.in                    |   6 -
 parser/xml/src/moz.build                      |   6 +
 profile/dirserviceprovider/public/Makefile.in |   4 -
 profile/dirserviceprovider/public/moz.build   |   4 +
 rdf/base/public/Makefile.in                   |   5 -
 rdf/base/public/moz.build                     |   5 +
 rdf/build/Makefile.in                         |   2 -
 rdf/build/moz.build                           |   4 +
 rdf/datasource/public/Makefile.in             |   4 -
 rdf/datasource/public/moz.build               |   4 +
 rdf/util/public/Makefile.in                   |   2 -
 rdf/util/public/moz.build                     |   4 +
 security/manager/ssl/src/Makefile.in          |  13 --
 security/manager/ssl/src/moz.build            |  11 ++
 startupcache/Makefile.in                      |   5 -
 startupcache/moz.build                        |   5 +
 storage/build/Makefile.in                     |   2 -
 storage/build/moz.build                       |   4 +
 storage/public/Makefile.in                    |  17 --
 storage/public/moz.build                      |  15 ++
 storage/src/Makefile.in                       |   7 -
 storage/src/moz.build                         |   5 +
 testing/gtest/Makefile.in                     |  49 ------
 testing/gtest/moz.build                       |  47 ++++++
 toolkit/components/build/Makefile.in          |   2 -
 toolkit/components/build/moz.build            |   4 +
 toolkit/components/mediasniffer/Makefile.in   |   4 -
 toolkit/components/mediasniffer/moz.build     |   4 +
 toolkit/components/places/Makefile.in         |   7 -
 toolkit/components/places/moz.build           |   5 +
 toolkit/components/protobuf/Makefile.in       |  28 ----
 toolkit/components/protobuf/moz.build         |  26 +++
 toolkit/components/startup/Makefile.in        |   3 -
 toolkit/components/startup/moz.build          |   4 +
 toolkit/components/telemetry/Makefile.in      |   8 -
 toolkit/components/telemetry/moz.build        |   6 +
 toolkit/crashreporter/Makefile.in             |   4 -
 toolkit/crashreporter/moz.build               |   4 +
 toolkit/mozapps/update/common/Makefile.in     |  11 --
 toolkit/mozapps/update/common/moz.build       |  13 ++
 toolkit/xre/Makefile.in                       |   4 -
 toolkit/xre/moz.build                         |   9 ++
 tools/jprof/stub/Makefile.in                  |   8 -
 tools/jprof/stub/moz.build                    |   4 +
 tools/profiler/Makefile.in                    |   9 --
 tools/profiler/moz.build                      |  10 ++
 tools/trace-malloc/lib/Makefile.in            |   2 -
 tools/trace-malloc/lib/moz.build              |   4 +
 uriloader/base/Makefile.in                    |   5 -
 uriloader/base/moz.build                      |   5 +
 uriloader/exthandler/Makefile.in              |  14 --
 uriloader/exthandler/moz.build                |  32 ++++
 uriloader/prefetch/Makefile.in                |  11 --
 uriloader/prefetch/moz.build                  |   9 ++
 view/public/Makefile.in                       |   6 -
 view/public/moz.build                         |   6 +
 widget/Makefile.in                            |  57 -------
 widget/android/Makefile.in                    |   2 -
 widget/android/moz.build                      |   6 +
 widget/cocoa/Makefile.in                      |   7 -
 widget/cocoa/moz.build                        |   7 +
 widget/gonk/Makefile.in                       |   1 -
 widget/gonk/moz.build                         |   4 +
 widget/gtk2/Makefile.in                       |   6 -
 widget/gtk2/moz.build                         |   6 +
 widget/gtkxtbin/Makefile.in                   |   3 -
 widget/gtkxtbin/moz.build                     |   4 +
 widget/moz.build                              |  34 ++++
 widget/qt/Makefile.in                         |   4 -
 widget/qt/moz.build                           |   4 +
 widget/windows/Makefile.in                    |   4 -
 widget/windows/moz.build                      |  10 ++
 widget/xpwidgets/Makefile.in                  |   4 -
 widget/xpwidgets/moz.build                    |   4 +
 xpcom/base/Makefile.in                        |  29 ----
 xpcom/base/moz.build                          |  31 +++-
 xpcom/build/Makefile.in                       |  23 ---
 xpcom/build/moz.build                         |  18 +++
 xpcom/components/Makefile.in                  |  12 --
 xpcom/components/moz.build                    |  10 ++
 xpcom/ds/Makefile.in                          |  39 -----
 xpcom/ds/moz.build                            |  32 ++++
 xpcom/glue/Makefile.in                        |  34 ----
 xpcom/glue/moz.build                          |  32 ++++
 xpcom/io/Makefile.in                          |  36 -----
 xpcom/io/moz.build                            |  30 ++++
 xpcom/reflect/xptcall/public/Makefile.in      |   6 -
 xpcom/reflect/xptcall/public/moz.build        |   6 +
 xpcom/reflect/xptinfo/public/Makefile.in      |  11 --
 xpcom/reflect/xptinfo/public/moz.build        |   7 +
 xpcom/string/public/Makefile.in               |  29 ----
 xpcom/string/public/moz.build                 |  29 ++++
 xpcom/threads/Makefile.in                     |  16 --
 xpcom/threads/moz.build                       |  12 ++
 xpcom/typelib/xpt/public/Makefile.in          |   3 -
 xpcom/typelib/xpt/public/moz.build            |   6 +
 xpfe/appshell/public/Makefile.in              |   4 -
 xpfe/appshell/public/moz.build                |   4 +
 509 files changed, 3133 insertions(+), 3213 deletions(-)

diff --git a/accessible/public/Makefile.in b/accessible/public/Makefile.in
index 6a7f780a704e..abee20e1a8cf 100644
--- a/accessible/public/Makefile.in
+++ b/accessible/public/Makefile.in
@@ -11,9 +11,5 @@ VPATH   = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= \
-      nsIAccessibilityService.h \
-      $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/accessible/public/ia2/Makefile.in b/accessible/public/ia2/Makefile.in
index 5cbea0f17fdf..aa26c1894052 100644
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -22,6 +22,8 @@ FORCE_SHARED_LIB = 1
 
 SRCS_IN_OBJDIR   = 1
 
+# Please keep this list in sync with the moz.build file until the rest of this
+# Makefile is ported over.
 MIDL_INTERFACES = \
   Accessible2.idl \
   AccessibleAction.idl \
@@ -39,6 +41,8 @@ MIDL_INTERFACES = \
   AccessibleValue.idl \
   $(NULL)
 
+# Please keep this list in sync with the moz.build file until the rest of this
+# Makefile is ported over.
 MIDL_ENUMS = \
   AccessibleEventId.idl \
   AccessibleRole.idl \
@@ -46,12 +50,6 @@ MIDL_ENUMS = \
   IA2CommonTypes.idl \
   $(NULL)
 
-EXPORTS = \
-  $(MIDL_INTERFACES:%.idl=%.h) \
-  $(MIDL_INTERFACES:%.idl=%_i.c) \
-  $(MIDL_ENUMS:%.idl=%.h) \
-  $(NULL)
-
 CSRCS	= \
   dlldata.c \
   $(MIDL_INTERFACES:%.idl=%_p.c) \
diff --git a/accessible/public/ia2/moz.build b/accessible/public/ia2/moz.build
index c7f93f43bd4b..07d875014de7 100644
--- a/accessible/public/ia2/moz.build
+++ b/accessible/public/ia2/moz.build
@@ -6,3 +6,34 @@
 
 MODULE = 'accessibility'
 
+# Please keep this list in sync with the Makefile.in until the rest of that file
+# is ported over.
+midl_interfaces = [
+    'Accessible2',
+    'AccessibleAction',
+    'AccessibleApplication',
+    'AccessibleComponent',
+    'AccessibleEditableText',
+    'AccessibleHyperlink',
+    'AccessibleHypertext',
+    'AccessibleImage',
+    'AccessibleRelation',
+    'AccessibleTable',
+    'AccessibleTable2',
+    'AccessibleTableCell',
+    'AccessibleText',
+    'AccessibleValue',
+]
+
+# Please keep this list in sync with the Makefile.in until the rest of that file
+# is ported over.
+midl_enums = [
+    'AccessibleEventId',
+    'AccessibleRole',
+    'AccessibleStates',
+    'IA2CommonTypes',
+]
+
+EXPORTS += [x + '.h' for x in midl_enums]
+EXPORTS += [x + '.h' for x in midl_interfaces]
+EXPORTS += [x + '_i.c' for x in midl_interfaces]
diff --git a/accessible/public/moz.build b/accessible/public/moz.build
index afce7a62e50a..f7d525207037 100644
--- a/accessible/public/moz.build
+++ b/accessible/public/moz.build
@@ -39,3 +39,7 @@ XPIDL_SOURCES += [
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'nsIAccessibilityService.h',
+]
+
diff --git a/accessible/public/msaa/Makefile.in b/accessible/public/msaa/Makefile.in
index 08d41e00e311..c03fa5b873cf 100644
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -57,15 +57,6 @@ done_gen: ISimpleDOMNode.idl \
 	$(MIDL) $(MIDL_FLAGS) -Oicf $(srcdir)/ISimpleDOMText.idl
 	touch $@
 
-EXPORTS = \
-	ISimpleDOMNode.h \
-	ISimpleDOMNode_i.c \
-	ISimpleDOMDocument.h \
-	ISimpleDOMDocument_i.c \
-	ISimpleDOMText.h \
-	ISimpleDOMText_i.c \
-	$(NULL)
-
 export:: done_gen
 
 # This marshall dll is also registered in the installer
diff --git a/accessible/public/msaa/moz.build b/accessible/public/msaa/moz.build
index c7f93f43bd4b..e10135caf34a 100644
--- a/accessible/public/msaa/moz.build
+++ b/accessible/public/msaa/moz.build
@@ -6,3 +6,12 @@
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'ISimpleDOMDocument.h',
+    'ISimpleDOMDocument_i.c',
+    'ISimpleDOMNode.h',
+    'ISimpleDOMNode_i.c',
+    'ISimpleDOMText.h',
+    'ISimpleDOMText_i.c',
+]
+
diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in
index cfa0183e179f..33a3e065e5ca 100644
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -36,17 +36,6 @@ CPPSRCS = \
   UtilInterface.cpp \
   $(NULL)
 
-EXPORTS = \
-  nsAccessNodeWrap.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla/a11y
-
-EXPORTS_mozilla/a11y = \
-  AccessibleWrap.h \
-  HyperTextAccessibleWrap.h \
-  $(null)
-
 # we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/accessible/src/atk/moz.build b/accessible/src/atk/moz.build
index c7f93f43bd4b..0ea19e66bd87 100644
--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -6,3 +6,12 @@
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'nsAccessNodeWrap.h',
+]
+
+EXPORTS.mozilla.a11y += [
+    'AccessibleWrap.h',
+    'HyperTextAccessibleWrap.h',
+]
+
diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in
index 403ef9591d1e..b051e3e260da 100644
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -46,30 +46,6 @@ CPPSRCS += \
   $(NULL)
 endif
 
-EXPORTS = \
-  AccEvent.h \
-  nsAccessibilityService.h \
-  nsAccessNode.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla/a11y
-
-EXPORTS_mozilla/a11y = \
-  DocManager.h \
-  FocusManager.h \
-  AccTypes.h \
-  Platform.h \
-  States.h \
-  SelectionManager.h \
-  Role.h \
-  $(NULL)
-
-ifdef MOZ_DEBUG
-EXPORTS_mozilla/a11y += \
-  Logging.h \
-  $(NULL)
-endif
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/accessible/src/base/moz.build b/accessible/src/base/moz.build
index c7f93f43bd4b..3076be5c7e15 100644
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -6,3 +6,23 @@
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'AccEvent.h',
+    'nsAccessNode.h',
+    'nsAccessibilityService.h',
+]
+
+EXPORTS.mozilla.a11y += [
+    'AccTypes.h',
+    'DocManager.h',
+    'FocusManager.h',
+    'Platform.h',
+    'Role.h',
+    'SelectionManager.h',
+    'States.h',
+]
+
+if CONFIG['MOZ_DEBUG']:
+    EXPORTS.mozilla.a11y += [
+        'Logging.h',
+    ]
diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in
index 1d5643edd4ec..441a644b2ee9 100644
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -28,14 +28,6 @@ CPPSRCS = \
   TextLeafAccessible.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES = mozilla/a11y
-
-EXPORTS_mozilla/a11y = \
-  Accessible.h \
-  DocAccessible.h \
-  HyperTextAccessible.h \
-  $(null)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/accessible/src/generic/moz.build b/accessible/src/generic/moz.build
index c7f93f43bd4b..74390fe424b9 100644
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'accessibility'
 
+EXPORTS.mozilla.a11y += [
+    'Accessible.h',
+    'DocAccessible.h',
+    'HyperTextAccessible.h',
+]
+
diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in
index bb985489fa50..ef3580a71a29 100644
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -26,18 +26,6 @@ CMMSRCS = \
           RootAccessibleWrap.mm \
           $(NULL)
 
-EXPORTS = \
-  nsAccessNodeWrap.h \
-  mozAccessibleProtocol.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla/a11y
-
-EXPORTS_mozilla/a11y = \
-  AccessibleWrap.h \
-  HyperTextAccessibleWrap.h \
-  $(null)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/accessible/src/mac/moz.build b/accessible/src/mac/moz.build
index c7f93f43bd4b..45977c688c1e 100644
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -6,3 +6,13 @@
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'mozAccessibleProtocol.h',
+    'nsAccessNodeWrap.h',
+]
+
+EXPORTS.mozilla.a11y += [
+    'AccessibleWrap.h',
+    'HyperTextAccessibleWrap.h',
+]
+
diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in
index d4029c1089b9..22efccbd2426 100644
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -19,17 +19,6 @@ CPPSRCS = \
   Platform.cpp \
   $(NULL)
 
-EXPORTS = \
-  nsAccessNodeWrap.h \
-  $(null)
-
-EXPORTS_NAMESPACES = mozilla/a11y
-
-EXPORTS_mozilla/a11y = \
-  AccessibleWrap.h \
-  HyperTextAccessibleWrap.h \
-  $(null)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/accessible/src/other/moz.build b/accessible/src/other/moz.build
index c7f93f43bd4b..0ea19e66bd87 100644
--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@@ -6,3 +6,12 @@
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'nsAccessNodeWrap.h',
+]
+
+EXPORTS.mozilla.a11y += [
+    'AccessibleWrap.h',
+    'HyperTextAccessibleWrap.h',
+]
+
diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in
index bc4f17b7a53b..b5ed88e1b6ef 100644
--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -28,16 +28,6 @@ CPPSRCS += \
   ia2AccessibleValue.cpp \
   $(NULL)
 
-EXPORTS = \
-  ia2AccessibleValue.h \
-  ia2AccessibleAction.h \
-  ia2AccessibleComponent.h \
-  ia2AccessibleEditableText.h \
-  ia2AccessibleHyperlink.h \
-  ia2AccessibleHypertext.h \
-  ia2AccessibleText.h \
-  $(NULL)
-
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
diff --git a/accessible/src/windows/ia2/moz.build b/accessible/src/windows/ia2/moz.build
index c7f93f43bd4b..f5da405ee9cc 100644
--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -6,3 +6,13 @@
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'ia2AccessibleAction.h',
+    'ia2AccessibleComponent.h',
+    'ia2AccessibleEditableText.h',
+    'ia2AccessibleHyperlink.h',
+    'ia2AccessibleHypertext.h',
+    'ia2AccessibleText.h',
+    'ia2AccessibleValue.h',
+]
+
diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in
index d76a2589f9ad..36446d05569c 100644
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -41,18 +41,6 @@ CPPSRCS += \
   $(NULL)
 endif
 
-EXPORTS = \
-  nsAccessNodeWrap.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla/a11y \
-
-EXPORTS_mozilla/a11y = \
-  AccessibleWrap.h \
-  Compatibility.h \
-  HyperTextAccessibleWrap.h \
-  $(null)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build
index c7f93f43bd4b..8cd739529459 100644
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -6,3 +6,13 @@
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'nsAccessNodeWrap.h',
+]
+
+EXPORTS.mozilla.a11y += [
+    'AccessibleWrap.h',
+    'Compatibility.h',
+    'HyperTextAccessibleWrap.h',
+]
+
diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in
index 98ca7657a3d2..3c791eee8459 100644
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = accessibility_xpcom_s
 LIBXUL_LIBRARY = 1
 
-EXPORTS := xpcAccEvents.h
-
 CPPSRCS = \
   xpcAccEvents.cpp \
   nsAccessibleRelation.cpp \
diff --git a/accessible/src/xpcom/moz.build b/accessible/src/xpcom/moz.build
index c7f93f43bd4b..7d24d9eacd54 100644
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'accessibility'
 
+EXPORTS += [
+    'xpcAccEvents.h',
+]
+
diff --git a/browser/components/about/Makefile.in b/browser/components/about/Makefile.in
index 844b2e68cfa1..50397b72037d 100644
--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@@ -14,10 +14,6 @@ LIBRARY_NAME = browserabout_s
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
-EXPORTS_NAMESPACES = mozilla/browser
-
-EXPORTS_mozilla/browser = AboutRedirector.h
-
 CPPSRCS = AboutRedirector.cpp
 
 LOCAL_INCLUDES = -I$(srcdir)/../build
diff --git a/browser/components/about/moz.build b/browser/components/about/moz.build
index 56c5590a581d..214a10bb83a6 100644
--- a/browser/components/about/moz.build
+++ b/browser/components/about/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'browserabout'
 
+EXPORTS.mozilla.browser += [
+    'AboutRedirector.h',
+]
+
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 6632bd8f23a5..5f4ebaffadde 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -17,8 +17,6 @@ FORCE_SHARED_LIB = 1
 
 USE_STATIC_LIBS = 1
 
-EXPORTS = nsBrowserCompsCID.h
-
 CPPSRCS = nsModule.cpp \
           $(NULL)
 
diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
index 731ac5c96557..eae645ad5c77 100644
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'browsercomps'
 
+EXPORTS += [
+    'nsBrowserCompsCID.h',
+]
+
diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in
index 315c351d19c2..5574c1b49488 100644
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -14,9 +14,6 @@ LIBRARY_NAME = browserdir_s
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
-EXPORTS_NAMESPACES = mozilla/browser
-EXPORTS_mozilla/browser = DirectoryProvider.h
-
 CPPSRCS = DirectoryProvider.cpp
 
 LOCAL_INCLUDES = -I$(srcdir)/../build
diff --git a/browser/components/dirprovider/moz.build b/browser/components/dirprovider/moz.build
index 7876da02e683..08b678163a24 100644
--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@@ -8,3 +8,7 @@ TEST_DIRS += ['tests']
 
 MODULE = 'browserdir'
 
+EXPORTS.mozilla.browser += [
+    'DirectoryProvider.h',
+]
+
diff --git a/caps/include/Makefile.in b/caps/include/Makefile.in
index 975157b9f41e..ac724e1bc29c 100644
--- a/caps/include/Makefile.in
+++ b/caps/include/Makefile.in
@@ -10,9 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-            nsJSPrincipals.h \
-            $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/caps/include/moz.build b/caps/include/moz.build
index 30195b33bf0e..92bd909638b7 100644
--- a/caps/include/moz.build
+++ b/caps/include/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'caps'
 
+EXPORTS += [
+    'nsJSPrincipals.h',
+]
+
diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in
index 2f0bc2b1b246..167305e599d7 100644
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -14,12 +14,6 @@ LIBRARY_NAME    = chrome_s
 LIBXUL_LIBRARY  = 1
 FORCE_STATIC_LIB = 1
 
-EXPORTS_NAMESPACES = mozilla/chrome
-
-EXPORTS_mozilla/chrome = \
-		RegistryMessageUtils.h \
-		$(NULL)
-
 CPPSRCS		= \
 		nsChromeRegistry.cpp \
 		nsChromeRegistryChrome.cpp \
diff --git a/chrome/src/moz.build b/chrome/src/moz.build
index 14a26232a554..65551267e634 100644
--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'chrome'
 
+EXPORTS.mozilla.chrome += [
+    'RegistryMessageUtils.h',
+]
+
diff --git a/content/base/public/Makefile.in b/content/base/public/Makefile.in
index 118d2ebc7e18..934eea6cb2ad 100644
--- a/content/base/public/Makefile.in
+++ b/content/base/public/Makefile.in
@@ -10,52 +10,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= \
-mozFlushType.h \
-nsIContent.h \
-nsIAttribute.h \
-nsIContentIterator.h \
-nsContentPolicyUtils.h \
-nsContentUtils.h \
-nsDocElementCreatedNotificationRunner.h \
-nsIDocument.h \
-nsIDocumentInlines.h \
-nsDeprecatedOperationList.h \
-nsIDocumentObserver.h \
-nsIMutationObserver.h \
-nsINameSpaceManager.h \
-nsINode.h \
-nsINodeInfo.h \
-nsINodeList.h \
-nsIScriptElement.h \
-nsIStyleSheetLinkingElement.h \
-nsIContentSerializer.h \
-nsIXPathEvaluatorInternal.h \
-nsCaseTreatment.h \
-nsContentCID.h \
-nsCopySupport.h \
-nsContentCreatorFunctions.h \
-nsDOMFile.h \
-nsLineBreaker.h \
-nsReferencedElement.h \
-nsTreeSanitizer.h \
-nsViewportInfo.h \
-nsXMLNameSpaceMap.h \
-nsHostObjectProtocolHandler.h \
-$(NULL)
-
-EXPORTS_NAMESPACES = mozilla/dom mozilla
-
-EXPORTS_mozilla/dom = \
-		DirectionalityUtils.h \
-		Element.h \
-		FragmentOrElement.h \
-		FromParser.h \
-		$(NULL)
-
-EXPORTS_mozilla = \
-		CORSMode.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/content/base/public/moz.build b/content/base/public/moz.build
index b8d30d620831..7da0a383a5f3 100644
--- a/content/base/public/moz.build
+++ b/content/base/public/moz.build
@@ -33,3 +33,48 @@ XPIDL_MODULE = 'content_base'
 
 MODULE = 'content'
 
+EXPORTS += [
+    'mozFlushType.h',
+    'nsCaseTreatment.h',
+    'nsContentCID.h',
+    'nsContentCreatorFunctions.h',
+    'nsContentPolicyUtils.h',
+    'nsContentUtils.h',
+    'nsCopySupport.h',
+    'nsDOMFile.h',
+    'nsDeprecatedOperationList.h',
+    'nsDocElementCreatedNotificationRunner.h',
+    'nsHostObjectProtocolHandler.h',
+    'nsIAttribute.h',
+    'nsIContent.h',
+    'nsIContentIterator.h',
+    'nsIContentSerializer.h',
+    'nsIDocument.h',
+    'nsIDocumentInlines.h',
+    'nsIDocumentObserver.h',
+    'nsIMutationObserver.h',
+    'nsINameSpaceManager.h',
+    'nsINode.h',
+    'nsINodeInfo.h',
+    'nsINodeList.h',
+    'nsIScriptElement.h',
+    'nsIStyleSheetLinkingElement.h',
+    'nsIXPathEvaluatorInternal.h',
+    'nsLineBreaker.h',
+    'nsReferencedElement.h',
+    'nsTreeSanitizer.h',
+    'nsViewportInfo.h',
+    'nsXMLNameSpaceMap.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'DirectionalityUtils.h',
+    'Element.h',
+    'FragmentOrElement.h',
+    'FromParser.h',
+]
+
+EXPORTS.mozilla += [
+    'CORSMode.h',
+]
+
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 0b2ae791a111..326f00d94136 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -13,50 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= gkconbase_s
 LIBXUL_LIBRARY	= 1
 
-
-EXPORTS		= \
-		nsAtomListUtils.h \
-		nsAttrName.h \
-		nsContentList.h \
-		nsContentListDeclarations.h \
-		nsContentSink.h \
-		nsGkAtomList.h \
-		nsGkAtoms.h \
-		nsNodeInfoManager.h \
-		nsNodeUtils.h \
-		nsPropertyTable.h \
-		nsRange.h \
-		nsScriptLoader.h \
-		nsStubDocumentObserver.h \
-		nsStubMutationObserver.h \
-		nsTextFragment.h \
-		mozAutoDocUpdate.h \
-		nsFrameMessageManager.h \
-		nsAttrAndChildArray.h \
-		nsAttrValue.h \
-		nsAttrValueInlines.h \
-		nsCrossSiteListenerProxy.h \
-		nsDOMAttributeMap.h \
-		nsMappedAttributeElement.h \
-		nsStyledElement.h \
-		nsSandboxFlags.h \
-		$(NULL)
-
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-  Attr.h \
-  Comment.h \
-  DocumentFragment.h \
-  DocumentType.h \
-  DOMImplementation.h \
-  EventSource.h \
-  Link.h \
-  NodeIterator.h \
-  Text.h \
-  TreeWalker.h \
-  $(NULL)
-
 CPPSRCS		= \
 		Comment.cpp \
 		DirectionalityUtils.cpp \
@@ -148,7 +104,6 @@ CPPSRCS		= \
 		$(NULL)
 
 ifdef MOZ_WEBRTC
-EXPORTS += nsDOMDataChannel.h
 CPPSRCS += nsDOMDataChannel.cpp
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index cefde4764ea5..6a22764189e1 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -6,3 +6,47 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsAtomListUtils.h',
+    'nsAttrName.h',
+    'nsContentList.h',
+    'nsContentListDeclarations.h',
+    'nsContentSink.h',
+    'nsGkAtomList.h',
+    'nsGkAtoms.h',
+    'nsNodeInfoManager.h',
+    'nsNodeUtils.h',
+    'nsPropertyTable.h',
+    'nsRange.h',
+    'nsScriptLoader.h',
+    'nsStubDocumentObserver.h',
+    'nsStubMutationObserver.h',
+    'nsTextFragment.h',
+    'mozAutoDocUpdate.h',
+    'nsFrameMessageManager.h',
+    'nsAttrAndChildArray.h',
+    'nsAttrValue.h',
+    'nsAttrValueInlines.h',
+    'nsCrossSiteListenerProxy.h',
+    'nsDOMAttributeMap.h',
+    'nsMappedAttributeElement.h',
+    'nsStyledElement.h',
+    'nsSandboxFlags.h',
+]
+
+if CONFIG['MOZ_WEBRTC']:
+    EXPORTS += ['nsDOMDataChannel.h']
+
+EXPORTS.mozilla.dom += [
+    'Attr.h',
+    'Comment.h',
+    'DocumentFragment.h',
+    'DocumentType.h',
+    'DOMImplementation.h',
+    'EventSource.h',
+    'Link.h',
+    'NodeIterator.h',
+    'Text.h',
+    'TreeWalker.h',
+]
+
diff --git a/content/canvas/public/Makefile.in b/content/canvas/public/Makefile.in
index 3681a8baf995..955c2ba8abcf 100644
--- a/content/canvas/public/Makefile.in
+++ b/content/canvas/public/Makefile.in
@@ -10,20 +10,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = mozilla/ipc
-
-EXPORTS		= \
-		nsICanvasRenderingContextInternal.h \
-		nsICanvasElementExternal.h \
-		$(NULL)
-
-EXPORTS_mozilla/ipc = \
-		DocumentRendererChild.h \
-		DocumentRendererParent.h \
-		DocumentRendererShmemChild.h \
-		DocumentRendererShmemParent.h \
-		DocumentRendererNativeIDChild.h \
-		DocumentRendererNativeIDParent.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/content/canvas/public/moz.build b/content/canvas/public/moz.build
index 49e6f314ee6b..e05025a6ec0f 100644
--- a/content/canvas/public/moz.build
+++ b/content/canvas/public/moz.build
@@ -12,3 +12,17 @@ XPIDL_MODULE = 'content_canvas'
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsICanvasElementExternal.h',
+    'nsICanvasRenderingContextInternal.h',
+]
+
+EXPORTS.mozilla.ipc += [
+    'DocumentRendererChild.h',
+    'DocumentRendererNativeIDChild.h',
+    'DocumentRendererNativeIDParent.h',
+    'DocumentRendererParent.h',
+    'DocumentRendererShmemChild.h',
+    'DocumentRendererShmemParent.h',
+]
+
diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index 10c307f67430..feab07d112ea 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -16,14 +16,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-	CanvasUtils.h \
-	CanvasRenderingContext2D.h \
-  ImageData.h \
-  $(NULL)
-
 CPPSRCS	= \
 	CanvasImageCache.cpp \
 	CanvasRenderingContext2D.cpp \
diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build
index cefde4764ea5..f258c795d801 100644
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'content'
 
+EXPORTS.mozilla.dom += [
+    'CanvasRenderingContext2D.h',
+    'CanvasUtils.h',
+    'ImageData.h',
+]
+
diff --git a/content/events/public/Makefile.in b/content/events/public/Makefile.in
index 034dcf25e7e1..ac724e1bc29c 100644
--- a/content/events/public/Makefile.in
+++ b/content/events/public/Makefile.in
@@ -10,22 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsMutationEvent.h \
-		nsIPrivateTextEvent.h \
-		nsIPrivateTextRange.h \
-		nsAsyncDOMEvent.h \
-		nsEventDispatcher.h \
-		nsEventStates.h \
-		nsEventNameList.h \
-		nsVKList.h \
-		$(NULL)
-
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-  EventTarget.h \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/content/events/public/moz.build b/content/events/public/moz.build
index 11dc7e9b9771..096c39306834 100644
--- a/content/events/public/moz.build
+++ b/content/events/public/moz.build
@@ -12,3 +12,18 @@ XPIDL_MODULE = 'content_events'
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsAsyncDOMEvent.h',
+    'nsEventDispatcher.h',
+    'nsEventNameList.h',
+    'nsEventStates.h',
+    'nsIPrivateTextEvent.h',
+    'nsIPrivateTextRange.h',
+    'nsMutationEvent.h',
+    'nsVKList.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'EventTarget.h',
+]
+
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index bd7402e4bb8c..832ef8bb2d75 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -14,22 +14,6 @@ LIBRARY_NAME	= gkconevents_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-		Touch.h \
-		$(NULL)
-
-EXPORTS		= \
-		nsEventStateManager.h \
-		nsEventListenerManager.h \
-		nsDOMEventTargetHelper.h \
-		nsDOMEvent.h \
-		nsDOMGamepad.h \
-		nsDOMTouchEvent.h \
-		nsDOMUIEvent.h \
-		$(NULL)
-
 CPPSRCS		= \
 		nsEventListenerManager.cpp \
 		nsEventStateManager.cpp \
diff --git a/content/events/src/moz.build b/content/events/src/moz.build
index cefde4764ea5..0f6a3d95a730 100644
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -6,3 +6,17 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsDOMEvent.h',
+    'nsDOMEventTargetHelper.h',
+    'nsDOMGamepad.h',
+    'nsDOMTouchEvent.h',
+    'nsDOMUIEvent.h',
+    'nsEventListenerManager.h',
+    'nsEventStateManager.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'Touch.h',
+]
+
diff --git a/content/html/content/public/Makefile.in b/content/html/content/public/Makefile.in
index d200c305edea..9c2f05a15bdf 100644
--- a/content/html/content/public/Makefile.in
+++ b/content/html/content/public/Makefile.in
@@ -10,26 +10,4 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS = \
-		nsIConstraintValidation.h \
-		nsIFormControl.h \
-		nsIForm.h \
-		nsIFormProcessor.h \
-		nsILink.h \
-		nsIRadioVisitor.h \
-		nsIRadioGroupContainer.h \
-		nsITextControlElement.h \
-		nsFormSubmission.h \
-		nsIHTMLCollection.h \
-		$(NULL)
-
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-		HTMLCanvasElement.h \
-		HTMLMediaElement.h \
-		HTMLAudioElement.h \
-		HTMLVideoElement.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/content/html/content/public/moz.build b/content/html/content/public/moz.build
index 26222fc97342..0ca5f3d1bd84 100644
--- a/content/html/content/public/moz.build
+++ b/content/html/content/public/moz.build
@@ -15,3 +15,23 @@ XPIDL_MODULE = 'content_html'
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsFormSubmission.h',
+    'nsIConstraintValidation.h',
+    'nsIForm.h',
+    'nsIFormControl.h',
+    'nsIFormProcessor.h',
+    'nsIHTMLCollection.h',
+    'nsILink.h',
+    'nsIRadioGroupContainer.h',
+    'nsIRadioVisitor.h',
+    'nsITextControlElement.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'HTMLAudioElement.h',
+    'HTMLCanvasElement.h',
+    'HTMLMediaElement.h',
+    'HTMLVideoElement.h',
+]
+
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index 42f35735c0ac..6b4f81d1addf 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -13,76 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= gkconhtmlcon_s
 LIBXUL_LIBRARY	= 1
 
-EXPORTS		= \
-		HTMLPropertiesCollection.h \
-		nsGenericHTMLElement.h \
-		nsClientRect.h \
-		nsHTMLDNSPrefetch.h \
-		$(NULL)
-
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-		HTMLAnchorElement.h \
-		HTMLAreaElement.h \
-		HTMLBodyElement.h \
-		HTMLBRElement.h \
-		HTMLButtonElement.h \
-		HTMLDataElement.h \
-		HTMLDataListElement.h \
-		HTMLDivElement.h \
-		HTMLFieldSetElement.h \
-		HTMLFontElement.h \
-		HTMLFrameElement.h \
-		HTMLFrameSetElement.h \
-		HTMLHeadingElement.h \
-		HTMLHRElement.h \
-		HTMLIFrameElement.h \
-		HTMLImageElement.h \
-		HTMLInputElement.h \
-		HTMLLabelElement.h \
-		HTMLLegendElement.h \
-		HTMLLIElement.h \
-		HTMLLinkElement.h \
-		HTMLMapElement.h \
-		HTMLMenuElement.h \
-		HTMLMenuItemElement.h \
-		HTMLMetaElement.h \
-		HTMLMeterElement.h \
-		HTMLModElement.h \
-		HTMLObjectElement.h \
-		HTMLOptionElement.h \
-		HTMLOptionsCollection.h \
-		HTMLOptGroupElement.h \
-		HTMLOutputElement.h \
-		HTMLParagraphElement.h \
-		HTMLPreElement.h \
-		HTMLProgressElement.h \
-		HTMLScriptElement.h \
-		HTMLSelectElement.h \
-		HTMLSharedElement.h \
-		HTMLSharedListElement.h \
-		HTMLSharedObjectElement.h \
-		HTMLSourceElement.h \
-		HTMLSpanElement.h \
-		HTMLStyleElement.h \
-		HTMLTableCaptionElement.h \
-		HTMLTableCellElement.h \
-		HTMLTableColElement.h \
-		HTMLTableElement.h \
-		HTMLTableRowElement.h \
-		HTMLTableSectionElement.h \
-		HTMLTemplateElement.h \
-		HTMLTextAreaElement.h \
-		HTMLTimeElement.h \
-		HTMLTitleElement.h \
-		HTMLUnknownElement.h \
-		MediaError.h \
-		TimeRanges.h \
-		UndoManager.h \
-		ValidityState.h \
-		$(NULL)
-
 CPPSRCS		= \
 		HTMLPropertiesCollection.cpp \
 		nsClientRect.cpp \
diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index cefde4764ea5..492488a96282 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -6,3 +6,71 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'HTMLPropertiesCollection.h',
+    'nsGenericHTMLElement.h',
+    'nsClientRect.h',
+    'nsHTMLDNSPrefetch.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'HTMLAnchorElement.h',
+    'HTMLAreaElement.h',
+    'HTMLBodyElement.h',
+    'HTMLBRElement.h',
+    'HTMLButtonElement.h',
+    'HTMLDataElement.h',
+    'HTMLDataListElement.h',
+    'HTMLDivElement.h',
+    'HTMLFieldSetElement.h',
+    'HTMLFontElement.h',
+    'HTMLFrameElement.h',
+    'HTMLFrameSetElement.h',
+    'HTMLHeadingElement.h',
+    'HTMLHRElement.h',
+    'HTMLIFrameElement.h',
+    'HTMLImageElement.h',
+    'HTMLInputElement.h',
+    'HTMLLabelElement.h',
+    'HTMLLegendElement.h',
+    'HTMLLIElement.h',
+    'HTMLLinkElement.h',
+    'HTMLMapElement.h',
+    'HTMLMenuElement.h',
+    'HTMLMenuItemElement.h',
+    'HTMLMetaElement.h',
+    'HTMLMeterElement.h',
+    'HTMLModElement.h',
+    'HTMLObjectElement.h',
+    'HTMLOptionElement.h',
+    'HTMLOptionsCollection.h',
+    'HTMLOptGroupElement.h',
+    'HTMLOutputElement.h',
+    'HTMLParagraphElement.h',
+    'HTMLPreElement.h',
+    'HTMLProgressElement.h',
+    'HTMLScriptElement.h',
+    'HTMLSelectElement.h',
+    'HTMLSharedElement.h',
+    'HTMLSharedListElement.h',
+    'HTMLSharedObjectElement.h',
+    'HTMLSourceElement.h',
+    'HTMLSpanElement.h',
+    'HTMLStyleElement.h',
+    'HTMLTableCaptionElement.h',
+    'HTMLTableCellElement.h',
+    'HTMLTableColElement.h',
+    'HTMLTableElement.h',
+    'HTMLTableRowElement.h',
+    'HTMLTableSectionElement.h',
+    'HTMLTemplateElement.h',
+    'HTMLTextAreaElement.h',
+    'HTMLTimeElement.h',
+    'HTMLTitleElement.h',
+    'HTMLUnknownElement.h',
+    'MediaError.h',
+    'TimeRanges.h',
+    'UndoManager.h',
+    'ValidityState.h',
+]
+
diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in
index b9556cc7dee5..e99bd14fa039 100644
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -23,10 +23,6 @@ CPPSRCS		= \
 		VideoDocument.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsIHTMLDocument.h \
-		$(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build
index cefde4764ea5..0be0dcfa08c8 100644
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsIHTMLDocument.h',
+]
+
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 645791b1f761..71e88e1dae73 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -15,38 +15,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
-EXPORTS = \
-  AbstractMediaDecoder.h \
-  AudioChannelFormat.h \
-  AudioEventTimeline.h \
-  AudioNodeEngine.h \
-  AudioNodeStream.h \
-  AudioSampleFormat.h \
-  AudioSegment.h \
-  AudioStream.h \
-  BufferMediaResource.h \
-  DecoderTraits.h \
-  DOMMediaStream.h \
-  FileBlockCache.h \
-  MediaDecoderOwner.h \
-  MediaResource.h \
-  MediaSegment.h \
-  MediaStreamGraph.h \
-  AudioAvailableEventManager.h \
-  MediaDecoder.h \
-  MediaDecoderStateMachine.h \
-  MediaDecoderReader.h \
-  MediaCache.h \
-  SharedBuffer.h \
-  StreamBuffer.h \
-  TimeVarying.h \
-  VideoFrameContainer.h \
-  VideoUtils.h \
-  VideoSegment.h \
-  VorbisUtils.h \
-  MediaMetadataManager.h \
-  $(NULL)
-
 CPPSRCS = \
   AudioChannelFormat.cpp \
   AudioNodeEngine.cpp \
diff --git a/content/media/dash/Makefile.in b/content/media/dash/Makefile.in
index 78505ed07a79..22f90f1711a7 100644
--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@@ -18,13 +18,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME   := gkcondash_s
 LIBXUL_LIBRARY := 1
 
-EXPORTS := \
-  DASHDecoder.h \
-  DASHRepDecoder.h \
-  DASHReader.h \
-  DASHRepReader.h \
-  $(NULL)
-
 CPPSRCS := \
   DASHDecoder.cpp \
   DASHRepDecoder.cpp \
diff --git a/content/media/dash/moz.build b/content/media/dash/moz.build
index cefde4764ea5..6900c8fb3e9f 100644
--- a/content/media/dash/moz.build
+++ b/content/media/dash/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'DASHDecoder.h',
+    'DASHReader.h',
+    'DASHRepDecoder.h',
+    'DASHRepReader.h',
+]
+
diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in
index 29fb0d472906..5745bc710e29 100644
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -14,12 +14,6 @@ LIBRARY_NAME	= gkcongstreamer_s
 LIBXUL_LIBRARY 	= 1
 
 
-EXPORTS		+= \
-		GStreamerDecoder.h \
-		GStreamerReader.h \
-		GStreamerFormatHelper.h \
-		$(NULL)
-
 CPPSRCS		= \
 		GStreamerReader.cpp \
 		GStreamerDecoder.cpp \
diff --git a/content/media/gstreamer/moz.build b/content/media/gstreamer/moz.build
index cefde4764ea5..bbaf1e86805c 100644
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'GStreamerDecoder.h',
+    'GStreamerFormatHelper.h',
+    'GStreamerReader.h',
+]
+
diff --git a/content/media/moz.build b/content/media/moz.build
index d62dc548e914..5f256159bd2a 100644
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -42,3 +42,35 @@ TEST_DIRS += ['test']
 
 MODULE = 'content'
 
+EXPORTS += [
+    'AbstractMediaDecoder.h',
+    'AudioAvailableEventManager.h',
+    'AudioChannelFormat.h',
+    'AudioEventTimeline.h',
+    'AudioNodeEngine.h',
+    'AudioNodeStream.h',
+    'AudioSampleFormat.h',
+    'AudioSegment.h',
+    'AudioStream.h',
+    'BufferMediaResource.h',
+    'DOMMediaStream.h',
+    'DecoderTraits.h',
+    'FileBlockCache.h',
+    'MediaCache.h',
+    'MediaDecoder.h',
+    'MediaDecoderOwner.h',
+    'MediaDecoderReader.h',
+    'MediaDecoderStateMachine.h',
+    'MediaMetadataManager.h',
+    'MediaResource.h',
+    'MediaSegment.h',
+    'MediaStreamGraph.h',
+    'SharedBuffer.h',
+    'StreamBuffer.h',
+    'TimeVarying.h',
+    'VideoFrameContainer.h',
+    'VideoSegment.h',
+    'VideoUtils.h',
+    'VorbisUtils.h',
+]
+
diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in
index 841cbdd5225e..c12aa9a0dd38 100644
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -14,12 +14,6 @@ LIBXUL_LIBRARY 	= 1
 FAIL_ON_WARNINGS := 1
 
 
-EXPORTS		+= \
-		OggDecoder.h \
-		OggCodecState.h \
-		OggReader.h \
-		$(NULL)
-
 CPPSRCS		= \
 		OggDecoder.cpp \
 		OggCodecState.cpp \
diff --git a/content/media/ogg/moz.build b/content/media/ogg/moz.build
index cefde4764ea5..295e287988d9 100644
--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'OggCodecState.h',
+    'OggDecoder.h',
+    'OggReader.h',
+]
+
diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in
index 9d9bfb69936e..bf6cdf068208 100644
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@@ -12,11 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= gkconomx_s
 LIBXUL_LIBRARY 	= 1
 
-EXPORTS		+= \
-		MediaOmxDecoder.h \
-		MediaOmxReader.h \
-		$(NULL)
-
 CPPSRCS		= \
 		MediaOmxDecoder.cpp \
 		MediaOmxReader.cpp \
diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build
index cefde4764ea5..3ceb1f4e26c0 100644
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'MediaOmxDecoder.h',
+    'MediaOmxReader.h',
+]
+
diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in
index 4ee4fb177994..084d06f08d98 100644
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@@ -12,13 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= gkconmediaplugins_s
 LIBXUL_LIBRARY 	= 1
 
-EXPORTS		+= \
-		MPAPI.h \
-		MediaPluginHost.h \
-		MediaPluginDecoder.h \
-		MediaPluginReader.h \
-		$(NULL)
-
 CPPSRCS		= \
 		MediaPluginHost.cpp \
 		MediaPluginDecoder.cpp \
diff --git a/content/media/plugins/moz.build b/content/media/plugins/moz.build
index cefde4764ea5..7735395aabe4 100644
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'MPAPI.h',
+    'MediaPluginDecoder.h',
+    'MediaPluginHost.h',
+    'MediaPluginReader.h',
+]
+
diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in
index c0efa3011375..e94e66551675 100644
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@@ -14,12 +14,6 @@ LIBRARY_NAME = gkconraw_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-EXPORTS += \
-  RawDecoder.h \
-  RawReader.h \
-  RawStructs.h \
-  $(NULL)
-
 CPPSRCS += \
   RawDecoder.cpp \
   RawReader.cpp \
diff --git a/content/media/raw/moz.build b/content/media/raw/moz.build
index cefde4764ea5..a96852e9113a 100644
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'RawDecoder.h',
+    'RawReader.h',
+    'RawStructs.h',
+]
+
diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in
index e9bf8d88ee79..882fbffd2259 100644
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -14,11 +14,6 @@ LIBRARY_NAME	= gkconwave_s
 LIBXUL_LIBRARY 	= 1
 
 
-EXPORTS		+= \
-		WaveDecoder.h \
-		WaveReader.h \
-		$(NULL)
-
 CPPSRCS		= \
 		WaveDecoder.cpp \
 		WaveReader.cpp \
diff --git a/content/media/wave/moz.build b/content/media/wave/moz.build
index cefde4764ea5..16d70ae615f8 100644
--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'WaveDecoder.h',
+    'WaveReader.h',
+]
+
diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in
index 8e15eb609a17..85b5269d27ea 100644
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@@ -35,31 +35,6 @@ CPPSRCS := \
   WebAudioUtils.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES := mozilla/dom
-EXPORTS_mozilla/dom := \
-  AnalyserNode.h \
-  AudioBuffer.h \
-  AudioBufferSourceNode.h \
-  AudioContext.h \
-  AudioDestinationNode.h \
-  AudioListener.h \
-  AudioNode.h \
-  AudioParam.h \
-  BiquadFilterNode.h \
-  DelayNode.h \
-  DynamicsCompressorNode.h \
-  EnableWebAudioCheck.h \
-  GainNode.h \
-  PannerNode.h \
-  $(NULL)
-
-EXPORTS := \
-  AudioParamTimeline.h \
-  MediaBufferDecoder.h \
-  ThreeDPoint.h \
-  WebAudioUtils.h \
-  $(NULL)
-
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build
index 2e61741da464..a4183d613ca3 100644
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -10,3 +10,27 @@ TEST_TOOL_DIRS += ['compiledtest']
 
 MODULE = 'content'
 
+EXPORTS += [
+    'AudioParamTimeline.h',
+    'MediaBufferDecoder.h',
+    'ThreeDPoint.h',
+    'WebAudioUtils.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'AnalyserNode.h',
+    'AudioBuffer.h',
+    'AudioBufferSourceNode.h',
+    'AudioContext.h',
+    'AudioDestinationNode.h',
+    'AudioListener.h',
+    'AudioNode.h',
+    'AudioParam.h',
+    'BiquadFilterNode.h',
+    'DelayNode.h',
+    'DynamicsCompressorNode.h',
+    'EnableWebAudioCheck.h',
+    'GainNode.h',
+    'PannerNode.h',
+]
+
diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in
index 2b1b8666b4c9..0c76ef929212 100644
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -14,11 +14,6 @@ LIBRARY_NAME	= gkconwebm_s
 LIBXUL_LIBRARY 	= 1
 
 
-EXPORTS		+= \
-		WebMDecoder.h \
-		WebMReader.h \
-		$(NULL)
-
 CPPSRCS		= \
 		WebMBufferedParser.cpp \
 		WebMDecoder.cpp \
diff --git a/content/media/webm/moz.build b/content/media/webm/moz.build
index cefde4764ea5..1430913ad4a4 100644
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'WebMDecoder.h',
+    'WebMReader.h',
+]
+
diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in
index ff737e70c63e..b8567a26e3b8 100644
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@@ -12,20 +12,11 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = gkconwebrtc_s
 LIBXUL_LIBRARY = 1
 
-EXPORTS	+= \
-  MediaEngine.h \
-  MediaEngineDefault.h \
-  $(NULL)
-
 CPPSRCS	= \
   MediaEngineDefault.cpp \
   $(NULL)
 
 ifdef MOZ_WEBRTC
-EXPORTS += \
-  MediaEngineWebRTC.h \
-  $(NULL)
-
 CPPSRCS += \
   MediaEngineWebRTC.cpp \
   MediaEngineWebRTCVideo.cpp \
diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build
index cefde4764ea5..3f5d4a0834d8 100644
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'MediaEngine.h',
+    'MediaEngineDefault.h',
+]
+
+if CONFIG['MOZ_WEBRTC']:
+    EXPORTS += ['MediaEngineWebRTC.h']
diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in
index 77674638d238..5f5aad0c282d 100644
--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@@ -34,18 +34,6 @@ CPPSRCS := \
   FakeSpeechRecognitionService.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES := mozilla/dom
-EXPORTS_mozilla/dom := \
-  FakeSpeechRecognitionService.h \
-  SpeechGrammar.h \
-  SpeechGrammarList.h \
-  SpeechRecognitionAlternative.h \
-  SpeechRecognition.h \
-  SpeechRecognitionResult.h \
-  SpeechRecognitionResultList.h \
-  SpeechStreamListener.h \
-  $(NULL)
-
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/config.mk
diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build
index 91171fb198aa..4f474c8b78d7 100644
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -14,3 +14,15 @@ XPIDL_SOURCES = [
 ]
 
 TEST_DIRS += ['test']
+
+EXPORTS.mozilla.dom += [
+    'FakeSpeechRecognitionService.h',
+    'SpeechGrammar.h',
+    'SpeechGrammarList.h',
+    'SpeechRecognition.h',
+    'SpeechRecognitionAlternative.h',
+    'SpeechRecognitionResult.h',
+    'SpeechRecognitionResultList.h',
+    'SpeechStreamListener.h',
+]
+
diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in
index 92fef0e811f8..f975cba430c9 100644
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -33,18 +33,6 @@ CPPSRCS := \
   nsSpeechTask.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES := mozilla/dom
-EXPORTS_mozilla/dom := \
-  EnableSpeechSynthesisCheck.h \
-  SpeechSynthesisUtterance.h \
-  SpeechSynthesisVoice.h \
-  SpeechSynthesis.h \
-  SpeechSynthesisChild.h \
-  SpeechSynthesisParent.h \
-  nsSynthVoiceRegistry.h \
-  nsSpeechTask.h \
-  $(NULL)
-
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/config.mk
diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build
index 4f1e68273ce8..0cb086b7b8cb 100644
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -14,3 +14,15 @@ XPIDL_SOURCES += [
     'nsISpeechService.idl',
     'nsISynthVoiceRegistry.idl'
     ]
+
+EXPORTS.mozilla.dom += [
+    'EnableSpeechSynthesisCheck.h',
+    'SpeechSynthesis.h',
+    'SpeechSynthesisChild.h',
+    'SpeechSynthesisParent.h',
+    'SpeechSynthesisUtterance.h',
+    'SpeechSynthesisVoice.h',
+    'nsSpeechTask.h',
+    'nsSynthVoiceRegistry.h',
+]
+
diff --git a/content/media/wmf/Makefile.in b/content/media/wmf/Makefile.in
index ede5d188be32..f5c926a72400 100644
--- a/content/media/wmf/Makefile.in
+++ b/content/media/wmf/Makefile.in
@@ -13,12 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= gkconwmf_s
 LIBXUL_LIBRARY 	= 1
 
-EXPORTS		+= \
-		WMFDecoder.h \
-		WMFReader.h \
-		WMF.h \
-		$(NULL)
-
 CPPSRCS		= \
 		WMFByteStream.cpp \
 		WMFDecoder.cpp \
diff --git a/content/media/wmf/moz.build b/content/media/wmf/moz.build
index cefde4764ea5..2637b9183e2d 100644
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'WMF.h',
+    'WMFDecoder.h',
+    'WMFReader.h',
+]
+
diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in
index ca8325d13d0f..083aa503bf3d 100644
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -14,31 +14,6 @@ LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS	= \
-	nsISMILAttr.h \
-	nsISMILType.h \
-	nsSMILAnimationController.h \
-	nsSMILAnimationFunction.h \
-	nsSMILCompositorTable.h \
-	nsSMILCSSProperty.h \
-	nsSMILInstanceTime.h \
-	nsSMILInterval.h \
-	nsSMILKeySpline.h \
-	nsSMILMappedAttribute.h \
-	nsSMILMilestone.h \
-	nsSMILNullType.h \
-	nsSMILRepeatCount.h \
-	nsSMILSetAnimationFunction.h \
-	nsSMILTargetIdentifier.h \
-	nsSMILTimeContainer.h \
-	nsSMILTimedElement.h \
-	nsSMILTimeValue.h \
-	nsSMILTimeValueSpec.h \
-	nsSMILTimeValueSpecParams.h \
-	nsSMILTypes.h \
-	nsSMILValue.h \
-	$(NULL)
-
 CPPSRCS	= \
 	nsDOMTimeEvent.cpp \
 	nsSMILAnimationController.cpp \
diff --git a/content/smil/moz.build b/content/smil/moz.build
index 28d2f948650b..a43c940fb463 100644
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -8,3 +8,28 @@ TEST_TOOL_DIRS += ['test']
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsISMILAttr.h',
+    'nsISMILType.h',
+    'nsSMILAnimationController.h',
+    'nsSMILAnimationFunction.h',
+    'nsSMILCSSProperty.h',
+    'nsSMILCompositorTable.h',
+    'nsSMILInstanceTime.h',
+    'nsSMILInterval.h',
+    'nsSMILKeySpline.h',
+    'nsSMILMappedAttribute.h',
+    'nsSMILMilestone.h',
+    'nsSMILNullType.h',
+    'nsSMILRepeatCount.h',
+    'nsSMILSetAnimationFunction.h',
+    'nsSMILTargetIdentifier.h',
+    'nsSMILTimeContainer.h',
+    'nsSMILTimeValue.h',
+    'nsSMILTimeValueSpec.h',
+    'nsSMILTimeValueSpecParams.h',
+    'nsSMILTimedElement.h',
+    'nsSMILTypes.h',
+    'nsSMILValue.h',
+]
+
diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in
index 5052914c3a8e..9af34fea52c4 100644
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -161,94 +161,6 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
-EXPORTS =  			\
-	nsSVGClass.h               \
-	nsSVGElement.h             \
-	nsSVGFeatures.h            \
-	SVGAttrValueWrapper.h      \
-	SVGStringList.h            \
-	$(NULL)
-
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-	nsSVGAnimatedTransformList.h \
-	SVGAElement.h \
-	SVGAltGlyphElement.h \
-	SVGAngle.h \
-	SVGAnimatedAngle.h \
-	SVGAnimatedBoolean.h \
-	SVGAnimatedLength.h \
-	SVGAnimatedTransformList.h \
-	SVGAnimateElement.h \
-	SVGAnimateTransformElement.h \
-	SVGAnimateMotionElement.h \
-	SVGAnimationElement.h \
-	SVGClipPathElement.h \
-	SVGCircleElement.h \
-	SVGComponentTransferFunctionElement.h \
-	SVGDefsElement.h \
-	SVGDescElement.h \
-	SVGEllipseElement.h \
-	SVGFEBlendElement.h \
-	SVGFEColorMatrixElement.h \
-	SVGFEComponentTransferElement.h \
-	SVGFECompositeElement.h \
-	SVGFEConvolveMatrixElement.h \
-	SVGFEDiffuseLightingElement.h \
-	SVGFEDisplacementMapElement.h \
-	SVGFEDistantLightElement.h \
-	SVGFEFloodElement.h \
-	SVGFEGaussianBlurElement.h \
-	SVGFEImageElement.h \
-	SVGFEMergeElement.h \
-	SVGFEMergeNodeElement.h \
-	SVGFEMorphologyElement.h \
-	SVGFEOffsetElement.h \
-	SVGFEPointLightElement.h \
-	SVGFESpecularLightingElement.h \
-	SVGFESpotLightElement.h \
-	SVGFETileElement.h \
-	SVGFETurbulenceElement.h \
-	SVGFilterElement.h \
-	SVGForeignObjectElement.h \
-	SVGGElement.h \
-	SVGGradientElement.h \
-	SVGGraphicsElement.h \
-	SVGImageElement.h \
-	SVGLineElement.h \
-	SVGMarkerElement.h \
-	SVGMaskElement.h \
-	SVGMatrix.h \
-	SVGMetadataElement.h \
-	SVGMPathElement.h \
-	SVGPathElement.h \
-	SVGPatternElement.h \
-	SVGPolygonElement.h \
-	SVGPolylineElement.h \
-	SVGRect.h \
-	SVGIRect.h \
-	SVGRectElement.h \
-	SVGScriptElement.h \
-	SVGSetElement.h \
-	SVGStopElement.h \
-	SVGStyleElement.h \
-	SVGSymbolElement.h \
-	SVGSVGElement.h \
-	SVGSwitchElement.h \
-	SVGTests.h \
-	SVGTextContentElement.h \
-	SVGTextElement.h \
-	SVGTextPathElement.h \
-	SVGTextPositioningElement.h \
-	SVGTitleElement.h \
-	SVGTransform.h \
-	SVGTransformableElement.h \
-	SVGTSpanElement.h \
-	SVGUseElement.h \
-	SVGViewElement.h \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += 	\
diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build
index cefde4764ea5..bd90b6ba14f6 100644
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -6,3 +6,89 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'SVGAttrValueWrapper.h',
+    'SVGStringList.h',
+    'nsSVGClass.h',
+    'nsSVGElement.h',
+    'nsSVGFeatures.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'nsSVGAnimatedTransformList.h',
+    'SVGAElement.h',
+    'SVGAltGlyphElement.h',
+    'SVGAngle.h',
+    'SVGAnimatedAngle.h',
+    'SVGAnimatedBoolean.h',
+    'SVGAnimatedLength.h',
+    'SVGAnimatedTransformList.h',
+    'SVGAnimateElement.h',
+    'SVGAnimateMotionElement.h',
+    'SVGAnimateTransformElement.h',
+    'SVGAnimationElement.h',
+    'SVGCircleElement.h',
+    'SVGClipPathElement.h',
+    'SVGComponentTransferFunctionElement.h',
+    'SVGDefsElement.h',
+    'SVGDescElement.h',
+    'SVGEllipseElement.h',
+    'SVGFEBlendElement.h',
+    'SVGFEColorMatrixElement.h',
+    'SVGFEComponentTransferElement.h',
+    'SVGFECompositeElement.h',
+    'SVGFEConvolveMatrixElement.h',
+    'SVGFEDiffuseLightingElement.h',
+    'SVGFEDisplacementMapElement.h',
+    'SVGFEDistantLightElement.h',
+    'SVGFEFloodElement.h',
+    'SVGFEGaussianBlurElement.h',
+    'SVGFEImageElement.h',
+    'SVGFEMergeElement.h',
+    'SVGFEMergeNodeElement.h',
+    'SVGFEMorphologyElement.h',
+    'SVGFEOffsetElement.h',
+    'SVGFEPointLightElement.h',
+    'SVGFESpecularLightingElement.h',
+    'SVGFESpotLightElement.h',
+    'SVGFETileElement.h',
+    'SVGFETurbulenceElement.h',
+    'SVGFilterElement.h',
+    'SVGForeignObjectElement.h',
+    'SVGGElement.h',
+    'SVGGradientElement.h',
+    'SVGGraphicsElement.h',
+    'SVGImageElement.h',
+    'SVGIRect.h',
+    'SVGLineElement.h',
+    'SVGMarkerElement.h',
+    'SVGMaskElement.h',
+    'SVGMatrix.h',
+    'SVGMetadataElement.h',
+    'SVGMPathElement.h',
+    'SVGPathElement.h',
+    'SVGPatternElement.h',
+    'SVGPolygonElement.h',
+    'SVGPolylineElement.h',
+    'SVGRectElement.h',
+    'SVGRect.h',
+    'SVGScriptElement.h',
+    'SVGSetElement.h',
+    'SVGStopElement.h',
+    'SVGStyleElement.h',
+    'SVGSVGElement.h',
+    'SVGSwitchElement.h',
+    'SVGSymbolElement.h',
+    'SVGTests.h',
+    'SVGTextContentElement.h',
+    'SVGTextElement.h',
+    'SVGTextPathElement.h',
+    'SVGTextPositioningElement.h',
+    'SVGTitleElement.h',
+    'SVGTransformableElement.h',
+    'SVGTransform.h',
+    'SVGTSpanElement.h',
+    'SVGUseElement.h',
+    'SVGViewElement.h',
+]
+
diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in
index ed7cd3969d41..267008b2109a 100644
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -21,12 +21,6 @@ CPPSRCS		= \
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-	SVGDocument.h \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build
index cefde4764ea5..efec01c77098 100644
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'content'
 
+EXPORTS.mozilla.dom += [
+    'SVGDocument.h',
+]
+
diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in
index fd4530975ad2..974718d477f0 100644
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -34,12 +34,6 @@ CPPSRCS		= \
     nsXBLSerialize.cpp \
 		$(NULL)
 
-EXPORTS   = \
-  nsBindingManager.h \
-  nsXBLBinding.h \
-  nsXBLService.h \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build
index cefde4764ea5..ec7467308fa0 100644
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsBindingManager.h',
+    'nsXBLBinding.h',
+    'nsXBLService.h',
+]
+
diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in
index 324aa3614224..07f893e73348 100644
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -14,14 +14,6 @@ LIBRARY_NAME	= gkconxmlcon_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-  CDATASection.h \
-  ProcessingInstruction.h \
-  XMLStylesheetProcessingInstruction.h \
-  $(NULL)
-
 CPPSRCS		= \
 		nsXMLElement.cpp \
 		CDATASection.cpp \
diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build
index cefde4764ea5..fe062faa87bd 100644
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'content'
 
+EXPORTS.mozilla.dom += [
+    'CDATASection.h',
+    'ProcessingInstruction.h',
+    'XMLStylesheetProcessingInstruction.h',
+]
+
diff --git a/content/xml/document/public/Makefile.in b/content/xml/document/public/Makefile.in
index c444bf9744de..ac724e1bc29c 100644
--- a/content/xml/document/public/Makefile.in
+++ b/content/xml/document/public/Makefile.in
@@ -10,9 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsIXMLContentSink.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/content/xml/document/public/moz.build b/content/xml/document/public/moz.build
index cefde4764ea5..1cb923cf858e 100644
--- a/content/xml/document/public/moz.build
+++ b/content/xml/document/public/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsIXMLContentSink.h',
+]
+
diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in
index 147e797b439c..058d2e9355c2 100644
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -14,12 +14,6 @@ LIBRARY_NAME	= gkconxmldoc_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-  XMLDocument.h \
-  $(NULL)
-
 CPPSRCS		= \
 		nsXMLContentSink.cpp \
 		nsXMLFragmentContentSink.cpp \
diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build
index cefde4764ea5..0fdfde9ef0d0 100644
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'content'
 
+EXPORTS.mozilla.dom += [
+    'XMLDocument.h',
+]
+
diff --git a/content/xslt/public/Makefile.in b/content/xslt/public/Makefile.in
index c22560d3145b..d2044d8ab77b 100644
--- a/content/xslt/public/Makefile.in
+++ b/content/xslt/public/Makefile.in
@@ -9,9 +9,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsIDocumentTransformer.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/content/xslt/public/moz.build b/content/xslt/public/moz.build
index 1682b0a45766..d64b93f8cebe 100644
--- a/content/xslt/public/moz.build
+++ b/content/xslt/public/moz.build
@@ -18,3 +18,7 @@ XPIDL_MODULE = 'content_xslt'
 
 MODULE = 'content'
 
+EXPORTS += [
+    'nsIDocumentTransformer.h',
+]
+
diff --git a/content/xul/document/public/Makefile.in b/content/xul/document/public/Makefile.in
index e271ce84e8ff..ac724e1bc29c 100644
--- a/content/xul/document/public/Makefile.in
+++ b/content/xul/document/public/Makefile.in
@@ -10,12 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-
-ifdef MOZ_XUL
-EXPORTS		= \
-		nsIXULDocument.h \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/content/xul/document/public/moz.build b/content/xul/document/public/moz.build
index 934c804131f4..372dad688bb7 100644
--- a/content/xul/document/public/moz.build
+++ b/content/xul/document/public/moz.build
@@ -13,6 +13,9 @@ if CONFIG['MOZ_XUL']:
     XPIDL_SOURCES += [
         'nsIXULOverlayProvider.idl',
     ]
+    EXPORTS += [
+        'nsIXULDocument.h',
+    ]
 
 MODULE = 'xuldoc'
 
diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in
index d14b9bb6f066..64100d09c886 100644
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -61,10 +61,6 @@ ifeq ($(OS_ARCH),WINNT)
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 
-EXPORTS = \
-  sqlite3.h \
-  $(NULL)
-
 CSRCS = \
   sqlite3.c \
   $(NULL)
diff --git a/db/sqlite3/src/moz.build b/db/sqlite3/src/moz.build
index a3224da81985..0aebc605a2e9 100644
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'sqlite3'
 
+EXPORTS += [
+    'sqlite3.h',
+]
+
diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
index bff2af10b4fd..ac65ec25d3d0 100644
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -17,20 +17,6 @@ ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
-EXPORTS = \
-  nsDocShellLoadTypes.h \
-  nsILinkHandler.h \
-  nsIWebShellServices.h \
-  SerializedLoadContext.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla = \
-  IHistory.h \
-  LoadContext.h \
-  $(NULL)
-
 CPPSRCS = \
   nsDocShell.cpp \
   nsDocShellLoadInfo.cpp \
diff --git a/docshell/base/moz.build b/docshell/base/moz.build
index 66fd0da30957..1d4cc3749256 100644
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -35,3 +35,15 @@ XPIDL_SOURCES += [
 
 MODULE = 'docshell'
 
+EXPORTS += [
+    'SerializedLoadContext.h',
+    'nsDocShellLoadTypes.h',
+    'nsILinkHandler.h',
+    'nsIWebShellServices.h',
+]
+
+EXPORTS.mozilla += [
+    'IHistory.h',
+    'LoadContext.h',
+]
+
diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in
index 80bc6cadee1b..b6ee7f4427ba 100644
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -18,10 +18,6 @@ EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
 
 
-EXPORTS = \
-		  nsDocShellCID.h \
-		  $(NULL)
-
 CPPSRCS		= \
 		nsDocShellModule.cpp		\
 		$(NULL)
diff --git a/docshell/build/moz.build b/docshell/build/moz.build
index 4f9038559ed9..53c06ab9b4bd 100644
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'docshell'
 
+EXPORTS += [
+    'nsDocShellCID.h',
+]
+
diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in
index 6352c156020c..529e76451476 100644
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -15,9 +15,6 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS		= nsSHEntryShared.h \
-		  $(NULL)
-
 CPPSRCS		= nsSHEntry.cpp        \
             nsSHTransaction.cpp   \
             nsSHistory.cpp \
diff --git a/docshell/shistory/src/moz.build b/docshell/shistory/src/moz.build
index 2f0c40e78b0f..91cf3305336f 100644
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'shistory'
 
+EXPORTS += [
+    'nsSHEntryShared.h',
+]
+
diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in
index ebfd0a7e3f78..6969280dddb4 100644
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -20,11 +20,6 @@ CPPSRCS = \
   Activity.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES = mozilla/dom
-EXPORTS_mozilla/dom = \
-  Activity.h \
-  $(NULL)
-
 EXTRA_COMPONENTS = \
   ActivityOptions.js \
   ActivityProxy.js \
diff --git a/dom/activities/src/moz.build b/dom/activities/src/moz.build
index f0a612a32de6..1f94e4971e81 100644
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom += [
+    'Activity.h',
+]
+
diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in
index 25835e388c75..55a697fb64ba 100644
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -16,8 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/alarm
-
 EXTRA_COMPONENTS =       \
   AlarmsManager.js       \
   AlarmsManager.manifest \
@@ -28,10 +26,6 @@ EXTRA_JS_MODULES = \
   AlarmService.jsm \
   $(NULL)
 
-EXPORTS_mozilla/dom/alarm = \
-  AlarmHalService.h         \
-  $(NULL)
-
 CPPSRCS =             \
   AlarmHalService.cpp \
   $(NULL)
diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build
index 8eb0311c26d1..ef521315cc09 100644
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -19,3 +19,7 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom.alarm += [
+    'AlarmHalService.h',
+]
+
diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in
index 2ee0e1e0f602..ace3f8f6dc28 100644
--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@@ -27,15 +27,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
-EXPORTS_NAMESPACES = \
-  mozilla/dom \
-  $(NULL)
-
-EXPORTS = AudioChannelService.h \
-          AudioChannelServiceChild.h \
-          AudioChannelCommon.h \
-          AudioChannelAgent.h
-
 CPPSRCS += \
   AudioChannelService.cpp \
   AudioChannelServiceChild.cpp \
diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build
index fc1f1e11849c..7763b61cbd39 100644
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -14,3 +14,10 @@ XPIDL_MODULE = 'dom_audiochannel'
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'AudioChannelAgent.h',
+    'AudioChannelCommon.h',
+    'AudioChannelService.h',
+    'AudioChannelServiceChild.h',
+]
+
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
index 378705268a42..07854469e2e6 100644
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -34,48 +34,6 @@ EXTRA_JS_MODULES += \
   ObjectWrapper.jsm \
   $(NULL)
 
-EXPORTS = \
-  nsDOMCID.h \
-  nsDOMClassInfoClasses.h \
-  nsDOMClassInfoID.h \
-  nsDOMJSUtils.h \
-  nsDOMString.h \
-  nsIDOMClassInfo.h \
-  nsIDOMScriptObjectFactory.h \
-  nsIGlobalObject.h \
-  nsIJSEventListener.h \
-  nsIJSNativeInitializer.h \
-  nsIScriptContext.h	\
-  nsIScriptExternalNameSet.h \
-  nsIScriptGlobalObject.h \
-  nsIScriptGlobalObjectOwner.h \
-  nsIScriptNameSpaceManager.h \
-  nsIScriptObjectPrincipal.h \
-  nsIScriptRuntime.h \
-  nsIScriptTimeoutHandler.h \
-  nsJSEnvironment.h \
-  nsJSUtils.h \
-  nsPIDOMWindow.h \
-  nsPIWindowRoot.h \
-  nsFocusManager.h \
-  nsWrapperCache.h \
-  nsWrapperCacheInlines.h \
-  nsContentPermissionHelper.h \
-  nsStructuredCloneContainer.h \
-  nsWindowMemoryReporter.h \
-  Crypto.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla/dom
-EXPORTS_mozilla/dom = \
-  DOMError.h \
-  DOMRequest.h \
-  DOMCursor.h \
-  StructuredCloneTags.h \
-  ScreenOrientation.h \
-  URL.h \
-  $(NULL)
-
 CPPSRCS =			\
 	nsBarProps.cpp          \
 	nsDOMException.cpp 	\
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 4af99b1543f2..3d88914c277e 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -22,3 +22,44 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'Crypto.h',
+    'nsContentPermissionHelper.h',
+    'nsDOMCID.h',
+    'nsDOMClassInfoClasses.h',
+    'nsDOMClassInfoID.h',
+    'nsDOMJSUtils.h',
+    'nsDOMString.h',
+    'nsFocusManager.h',
+    'nsIDOMClassInfo.h',
+    'nsIDOMScriptObjectFactory.h',
+    'nsIGlobalObject.h',
+    'nsIJSEventListener.h',
+    'nsIJSNativeInitializer.h',
+    'nsIScriptContext.h',
+    'nsIScriptExternalNameSet.h',
+    'nsIScriptGlobalObject.h',
+    'nsIScriptGlobalObjectOwner.h',
+    'nsIScriptNameSpaceManager.h',
+    'nsIScriptObjectPrincipal.h',
+    'nsIScriptRuntime.h',
+    'nsIScriptTimeoutHandler.h',
+    'nsJSEnvironment.h',
+    'nsJSUtils.h',
+    'nsPIDOMWindow.h',
+    'nsPIWindowRoot.h',
+    'nsStructuredCloneContainer.h',
+    'nsWindowMemoryReporter.h',
+    'nsWrapperCache.h',
+    'nsWrapperCacheInlines.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'DOMCursor.h',
+    'DOMError.h',
+    'DOMRequest.h',
+    'ScreenOrientation.h',
+    'StructuredCloneTags.h',
+    'URL.h',
+]
+
diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in
index ab48e8fcbaa3..9690540bcc73 100644
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@@ -16,13 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/battery
-
-EXPORTS_mozilla/dom/battery = \
-  Constants.h \
-  Types.h \
-  $(NULL)
-
 CPPSRCS = \
   BatteryManager.cpp \
   $(NULL)
diff --git a/dom/battery/moz.build b/dom/battery/moz.build
index f728b5c029d8..318c1aa4542b 100644
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -17,3 +17,8 @@ XPIDL_FLAGS += [
     '-I$(topsrcdir)/dom/interfaces/events',
 ]
 
+EXPORTS.mozilla.dom.battery += [
+    'Constants.h',
+    'Types.h',
+]
+
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index 18790733efde..a0aa75c3126b 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -51,31 +51,6 @@ CPPSRCS = \
   DOMJSProxyHandler.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES = $(binding_include_path) mozilla
-
-EXPORTS_mozilla = \
-  ErrorResult.h \
-  $(NULL)
-
-EXPORTS_$(binding_include_path) = \
-  BindingDeclarations.h \
-  BindingUtils.h \
-  CallbackFunction.h \
-  CallbackInterface.h \
-  CallbackObject.h \
-  DOMJSClass.h \
-  DOMJSProxyHandler.h \
-  Errors.msg \
-  NonRefcountedDOMObject.h \
-  Nullable.h \
-  PrimitiveConversions.h \
-  PrototypeList.h \
-  RegisterBindings.h \
-  TypedArray.h \
-  UnionConversions.h \
-  UnionTypes.h \
-  $(NULL)
-
 LOCAL_INCLUDES += -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/js/xpconnect/wrappers \
   -I$(topsrcdir)/content/canvas/src \
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index f0a612a32de6..31aad04016a4 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -6,3 +6,25 @@
 
 MODULE = 'dom'
 
+EXPORTS.mozilla += [
+    'ErrorResult.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'BindingDeclarations.h',
+    'BindingUtils.h',
+    'CallbackFunction.h',
+    'CallbackInterface.h',
+    'CallbackObject.h',
+    'DOMJSClass.h',
+    'DOMJSProxyHandler.h',
+    'Errors.msg',
+    'NonRefcountedDOMObject.h',
+    'Nullable.h',
+    'PrimitiveConversions.h',
+    'PrototypeList.h',
+    'RegisterBindings.h',
+    'TypedArray.h',
+    'UnionConversions.h',
+    'UnionTypes.h',
+]
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
index cf9562a74d86..8a147de6f2bc 100644
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -23,14 +23,6 @@ include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += $(srcdir)/ipc
 
-EXPORTS_NAMESPACES = \
-  mozilla/dom/bluetooth \
-  mozilla/dom/bluetooth/ipc \
-  $(NULL)
-
-EXPORTS_mozilla/dom/bluetooth = BluetoothCommon.h
-EXPORTS_mozilla/dom/bluetooth/ipc = BluetoothMessageUtils.h
-
 ifneq (,$(MOZ_B2G_BT))
 
 LIBRARY_NAME     = dombluetooth_s
diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build
index e678babf3e72..4ae4a99da70d 100644
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -25,3 +25,11 @@ if CONFIG['MOZ_B2G_BT']:
         'nsIDOMBluetoothDeviceEvent.idl'
     ]
 
+EXPORTS.mozilla.dom.bluetooth.ipc += [
+    'BluetoothMessageUtils.h',
+]
+
+EXPORTS.mozilla.dom.bluetooth += [
+    'BluetoothCommon.h',
+]
+
diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in
index a9f580f4754d..26c20cdf3480 100644
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -16,16 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS = \
-  nsOpenWindowEventDetail.h \
-  nsAsyncScrollEventDetail.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla
-EXPORTS_mozilla = \
-  BrowserElementParent.h \
-  $(NULL)
-
 CPPSRCS = \
   nsOpenWindowEventDetail.cpp \
   nsAsyncScrollEventDetail.cpp \
diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build
index 4abf20402c78..ead711e381b8 100644
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -15,3 +15,12 @@ XPIDL_MODULE = 'dom_browserelement'
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'nsAsyncScrollEventDetail.h',
+    'nsOpenWindowEventDetail.h',
+]
+
+EXPORTS.mozilla += [
+    'BrowserElementParent.h',
+]
+
diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in
index 065b495d1893..72e1cde2f3a4 100644
--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@@ -52,13 +52,6 @@ CPPSRCS += \
   $(NULL)
 endif
 
-EXPORTS = \
-  CameraCommon.h \
-  DOMCameraManager.h \
-  GonkNativeWindow.h \
-  GonkNativeWindowClient.h \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/camera/moz.build b/dom/camera/moz.build
index 2197fd8e2a6f..d00a36a611c5 100644
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -20,3 +20,10 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'CameraCommon.h',
+    'DOMCameraManager.h',
+    'GonkNativeWindow.h',
+    'GonkNativeWindowClient.h',
+]
+
diff --git a/dom/cellbroadcast/src/Makefile.in b/dom/cellbroadcast/src/Makefile.in
index 5ce0236b54ca..1f8b27f359fb 100644
--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@@ -16,12 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-  CellBroadcast.h \
-  $(NULL)
-
 CPPSRCS = \
   CellBroadcast.cpp \
   $(NULL)
diff --git a/dom/cellbroadcast/src/moz.build b/dom/cellbroadcast/src/moz.build
index a5029d5e88f5..2f3c2dd3f983 100644
--- a/dom/cellbroadcast/src/moz.build
+++ b/dom/cellbroadcast/src/moz.build
@@ -6,3 +6,7 @@
 
 XPIDL_MODULE = 'dom_cellbroadcast'
 
+EXPORTS.mozilla.dom += [
+    'CellBroadcast.h',
+]
+
diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in
index 434321220e63..3359deb7510f 100644
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -16,24 +16,12 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/devicestorage
-
-EXPORTS_mozilla/dom/devicestorage = \
-  DeviceStorageRequestChild.h \
-  DeviceStorageRequestParent.h \
-  $(NULL)
-
 CPPSRCS		= \
 		nsDeviceStorage.cpp \
 		DeviceStorageRequestParent.cpp \
 		DeviceStorageRequestChild.cpp \
 		$(NULL)
 
-EXPORTS         = \
-		DeviceStorage.h \
-		nsDeviceStorage.h \
-		$(NULL)
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build
index 8f80fe23696f..d2219ccfd139 100644
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -10,3 +10,13 @@ XPIDL_MODULE = 'dom_devicestorage'
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'DeviceStorage.h',
+    'nsDeviceStorage.h',
+]
+
+EXPORTS.mozilla.dom.devicestorage += [
+    'DeviceStorageRequestChild.h',
+    'DeviceStorageRequestParent.h',
+]
+
diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in
index d95e84a7b120..5493da97b1b8 100644
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@@ -14,15 +14,6 @@ LIBRARY_NAME	= domencoding_s
 LIBXUL_LIBRARY	= 1
 FORCE_STATIC_LIB = 1
 
-EXPORTS_NAMESPACES = mozilla/dom
-EXPORTS_mozilla/dom = \
-  EncodingUtils.h \
-  TextDecoder.h \
-  TextDecoderBase.h \
-  TextEncoder.h \
-  TextEncoderBase.h \
-  $(NULL)
-
 CPPSRCS = \
 	EncodingUtils.cpp \
 	TextDecoder.cpp \
diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build
index 37048db5674b..8e947a456eb6 100644
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -8,3 +8,11 @@ TEST_DIRS += ['test']
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom += [
+    'EncodingUtils.h',
+    'TextDecoder.h',
+    'TextDecoderBase.h',
+    'TextEncoder.h',
+    'TextEncoderBase.h',
+]
+
diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in
index 4880cae177c0..c19cb31940eb 100644
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@@ -16,8 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/file
-
 CPPSRCS = \
   AsyncHelper.cpp \
   DOMFileHandle.cpp \
@@ -38,25 +36,5 @@ CPPSRCS = \
   ArchiveRequest.cpp \
   $(NULL)
 
-EXPORTS = \
-  nsIFileStorage.h \
-  $(NULL)
-
-EXPORTS_mozilla/dom/file = \
-  DOMFileHandle.h \
-  DOMFileRequest.h \
-  File.h \
-  FileCommon.h \
-  FileHandle.h \
-  FileHelper.h \
-  FileService.h \
-  LockedFile.h \
-  ArchiveEvent.h \
-  ArchiveZipEvent.h \
-  ArchiveZipFile.h \
-  ArchiveReader.h \
-  ArchiveRequest.h \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/dom/file/moz.build b/dom/file/moz.build
index 3d85de6ef342..cd3e4991d19c 100644
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -21,3 +21,23 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'nsIFileStorage.h',
+]
+
+EXPORTS.mozilla.dom.file += [
+    'ArchiveEvent.h',
+    'ArchiveReader.h',
+    'ArchiveRequest.h',
+    'ArchiveZipEvent.h',
+    'ArchiveZipFile.h',
+    'DOMFileHandle.h',
+    'DOMFileRequest.h',
+    'File.h',
+    'FileCommon.h',
+    'FileHandle.h',
+    'FileHelper.h',
+    'FileService.h',
+    'LockedFile.h',
+]
+
diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in
index d4612e49f5db..823d053d7243 100644
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@@ -16,12 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/icc
-
-EXPORTS_mozilla/dom/icc = \
-  StkCommandEvent.h \
-  $(NULL)
-
 CPPSRCS = \
   IccManager.cpp \
   StkCommandEvent.cpp \
diff --git a/dom/icc/src/moz.build b/dom/icc/src/moz.build
index 895d11993cfb..fda7fb34f88b 100644
--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -4,3 +4,7 @@
 # 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/.
 
+EXPORTS.mozilla.dom.icc += [
+    'StkCommandEvent.h',
+]
+
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index bffa6631483e..cb37208a52b6 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -16,8 +16,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
-EXPORTS_NAMESPACES = mozilla/dom/indexedDB
-
 CPPSRCS = \
   AsyncConnectionHelper.cpp \
   CheckPermissionsHelper.cpp \
@@ -43,28 +41,6 @@ CPPSRCS = \
   TransactionThreadPool.cpp \
   $(NULL)
 
-EXPORTS_mozilla/dom/indexedDB = \
-  Client.h \
-  DatabaseInfo.h \
-  FileManager.h \
-  FileInfo.h \
-  IDBCursor.h \
-  IDBDatabase.h \
-  IDBEvents.h \
-  IDBFactory.h \
-  IDBFileHandle.h \
-  IDBIndex.h \
-  IDBKeyRange.h \
-  IDBObjectStore.h \
-  IDBRequest.h \
-  IDBTransaction.h \
-  IDBWrapperCache.h \
-  IndexedDatabase.h \
-  IndexedDatabaseManager.h \
-  Key.h \
-  KeyPath.h \
-  $(NULL)
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   -I$(topsrcdir)/content/base/src \
diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in
index 0122eddfb302..f1a14334b558 100644
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -15,15 +15,11 @@ LIBRARY_NAME = dom_indexeddb_ipc_s
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 
-EXPORTS_NAMESPACES = mozilla/dom/indexedDB
-
 CPPSRCS += \
   IndexedDBChild.cpp \
   IndexedDBParent.cpp \
   $(NULL)
 
-EXPORTS_mozilla/dom/indexedDB = SerializationHelpers.h
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/indexedDB \
   -I$(topsrcdir)/content/events/src \
diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build
index f0a612a32de6..6e1eb9c54cad 100644
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom.indexedDB += [
+    'SerializationHelpers.h',
+]
+
diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build
index f1e2d791614a..d1fb542676c0 100644
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -31,3 +31,25 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom.indexedDB += [
+    'Client.h',
+    'DatabaseInfo.h',
+    'FileInfo.h',
+    'FileManager.h',
+    'IDBCursor.h',
+    'IDBDatabase.h',
+    'IDBEvents.h',
+    'IDBFactory.h',
+    'IDBFileHandle.h',
+    'IDBIndex.h',
+    'IDBKeyRange.h',
+    'IDBObjectStore.h',
+    'IDBRequest.h',
+    'IDBTransaction.h',
+    'IDBWrapperCache.h',
+    'IndexedDatabase.h',
+    'IndexedDatabaseManager.h',
+    'Key.h',
+    'KeyPath.h',
+]
+
diff --git a/dom/interfaces/storage/Makefile.in b/dom/interfaces/storage/Makefile.in
index 34e7c38592a5..a41a5c5a47fb 100644
--- a/dom/interfaces/storage/Makefile.in
+++ b/dom/interfaces/storage/Makefile.in
@@ -11,9 +11,5 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS =                                      \
-       nsPIDOMStorage.h                        \
-       $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/dom/interfaces/storage/moz.build b/dom/interfaces/storage/moz.build
index 31466faf6dfe..d592ba168627 100644
--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@@ -21,3 +21,7 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'nsPIDOMStorage.h',
+]
+
diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
index b7bb84c57af9..98ec839a3822 100644
--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -15,41 +15,6 @@ FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-EXPORTS = \
-  nsICachedFileDescriptorListener.h \
-  PCOMContentPermissionRequestChild.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = \
-  mozilla \
-  mozilla/dom \
-  mozilla/dom/ipc \
-  $(NULL)
-
-EXPORTS_mozilla = \
-  AppProcessChecker.h \
-  $(NULL)
-
-EXPORTS_mozilla/dom = \
-  ContentChild.h \
-  ContentParent.h \
-  ContentProcess.h \
-  CrashReporterChild.h \
-  CrashReporterParent.h \
-  PermissionMessageUtils.h \
-  StructuredCloneUtils.h \
-  TabParent.h \
-  TabChild.h \
-  TabContext.h \
-  TabMessageUtils.h \
-  $(NULL)
-
-EXPORTS_mozilla/dom/ipc = \
-  Blob.h \
-  ProcessPriorityManager.h \
-  nsIRemoteBlob.h \
-  $(NULL)
-
 CPPSRCS = \
   AppProcessChecker.cpp \
   Blob.cpp \
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index 561fa0e9f61a..594d9873f61b 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -9,3 +9,32 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'PCOMContentPermissionRequestChild.h',
+    'nsICachedFileDescriptorListener.h',
+]
+
+EXPORTS.mozilla.dom.ipc += [
+    'Blob.h',
+    'ProcessPriorityManager.h',
+    'nsIRemoteBlob.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'ContentChild.h',
+    'ContentParent.h',
+    'ContentProcess.h',
+    'CrashReporterChild.h',
+    'CrashReporterParent.h',
+    'PermissionMessageUtils.h',
+    'StructuredCloneUtils.h',
+    'TabChild.h',
+    'TabContext.h',
+    'TabMessageUtils.h',
+    'TabParent.h',
+]
+
+EXPORTS.mozilla += [
+    'AppProcessChecker.h',
+]
+
diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in
index 57a8b22b03ea..b7715990c34f 100644
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -22,12 +22,6 @@ EXTRA_COMPONENTS = \
   PeerConnection.manifest \
   $(NULL)
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla = \
-  MediaManager.h \
-  $(NULL)
-
 CPPSRCS = \
   MediaManager.cpp \
   $(NULL)
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 373f7ea8a085..991fad8b9d56 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -20,3 +20,7 @@ XPIDL_MODULE = 'dom_media'
 
 MODULE = 'dom'
 
+EXPORTS.mozilla += [
+    'MediaManager.h',
+]
+
diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in
index 18aa0aca025e..27e314fd7b74 100644
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -27,30 +27,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = \
-  mozilla/dom \
-  mozilla/dom/mobilemessage \
-  $(NULL)
-
-EXPORTS_mozilla/dom = \
-  SmsManager.h \
-  MobileMessageManager.h \
-  SmsMessage.h \
-  MmsMessage.h \
-  SmsSegmentInfo.h \
-  SmsFilter.h \
-  $(NULL)
-
-EXPORTS_mozilla/dom/mobilemessage = \
-  SmsChild.h \
-  SmsParent.h \
-  MobileMessageService.h \
-  SmsServicesFactory.h \
-  Constants.h \
-  Types.h \
-  MobileMessageCallback.h \
-  $(NULL)
-
 CPPSRCS = \
   MobileMessageCursorCallback.cpp \
   MobileMessageThread.cpp \
@@ -90,11 +66,6 @@ EXTRA_COMPONENTS = \
   ril/MobileMessageDatabaseService.manifest \
   $(NULL)
 else
-EXPORTS_mozilla/dom/mobilemessage += \
-  MobileMessageDatabaseService.h \
-  MmsService.h \
-  $(NULL)
-
 CPPSRCS += \
   MobileMessageDatabaseService.cpp \
   MmsService.cpp \
diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build
index 895d11993cfb..656ab7a3990b 100644
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -4,3 +4,28 @@
 # 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/.
 
+EXPORTS.mozilla.dom.mobilemessage += [
+    'SmsChild.h',
+    'SmsParent.h',
+    'MobileMessageService.h',
+    'SmsServicesFactory.h',
+    'Constants.h',
+    'Types.h',
+    'MobileMessageCallback.h',
+]
+
+if not CONFIG['MOZ_B2G_RIL']:
+    EXPORTS.mozilla.dom.mobilemessage += [
+        'MobileMessageDatabaseService.h',
+        'MmsService.h',
+    ]
+
+EXPORTS.mozilla.dom += [
+    'SmsManager.h',
+    'MobileMessageManager.h',
+    'SmsMessage.h',
+    'MmsMessage.h',
+    'SmsSegmentInfo.h',
+    'SmsFilter.h',
+]
+
diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in
index ad9bb45d36b5..38edafb30bd9 100644
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -36,16 +36,6 @@ endif
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/network
-
-EXPORTS_mozilla/dom/network = \
-  Utils.h \
-  Types.h \
-  Constants.h \
-  TCPSocketChild.h \
-  TCPSocketParent.h \
-  $(NULL)
-
 CPPSRCS = \
   Connection.cpp \
   Utils.cpp \
diff --git a/dom/network/src/moz.build b/dom/network/src/moz.build
index 895d11993cfb..e0c7b2db1630 100644
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -4,3 +4,11 @@
 # 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/.
 
+EXPORTS.mozilla.dom.network += [
+    'Constants.h',
+    'TCPSocketChild.h',
+    'TCPSocketParent.h',
+    'Types.h',
+    'Utils.h',
+]
+
diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in
index aab71ae45fa4..325670fb32ed 100644
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -16,30 +16,6 @@ IS_COMPONENT    = 1
 MODULE_NAME	= nsPluginModule
 LIBXUL_LIBRARY = 1
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS = \
-  npapi.h \
-  npfunctions.h \
-  nptypes.h \
-  npruntime.h \
-  nsPluginLogging.h \
-  nsPluginNativeWindow.h \
-  nsPluginsCID.h \
-  nsNPAPIPluginInstance.h \
-  nsPluginsDir.h \
-  nsPluginTags.h \
-  nsPluginDirServiceProvider.h \
-  nsPluginHost.h \
-  nsJSNPRuntime.h \
-  nsPluginInstanceOwner.h \
-  nsPluginPlayPreviewInfo.h \
-  $(NULL)
-
-EXPORTS_mozilla = \
-  PluginPRLibrary.h \
-  $(NULL)
-
 CPPSRCS		= \
 		nsNPAPIPlugin.cpp \
 		nsNPAPIPluginInstance.cpp \
diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in
index 65de7ecf2ac0..597e08b73958 100644
--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -19,11 +19,6 @@ FAIL_ON_WARNINGS := 1
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
-EXPORTS = \
-  ANPKeyCodes.h \
-  android_npapi.h \
-  $(NULL)
-
 CPPSRCS += ANPAudio.cpp    \
            ANPEvent.cpp    \
            ANPMatrix.cpp   \
diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build
index 79ac156e14f1..197fc0a5e4b7 100644
--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'plugin'
 
+EXPORTS += [
+    'ANPKeyCodes.h',
+    'android_npapi.h',
+]
+
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
index 1bde4895efb4..3ec6f7414484 100644
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -20,3 +20,25 @@ XPIDL_SOURCES += [
 
 MODULE = 'plugin'
 
+EXPORTS += [
+    'npapi.h',
+    'npfunctions.h',
+    'npruntime.h',
+    'nptypes.h',
+    'nsJSNPRuntime.h',
+    'nsNPAPIPluginInstance.h',
+    'nsPluginDirServiceProvider.h',
+    'nsPluginHost.h',
+    'nsPluginInstanceOwner.h',
+    'nsPluginLogging.h',
+    'nsPluginNativeWindow.h',
+    'nsPluginPlayPreviewInfo.h',
+    'nsPluginTags.h',
+    'nsPluginsCID.h',
+    'nsPluginsDir.h',
+]
+
+EXPORTS.mozilla += [
+    'PluginPRLibrary.h',
+]
+
diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in
index 3edc0dca7141..7f679a71a981 100644
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -11,44 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS := 1
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla = \
-  PluginLibrary.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla mozilla/plugins
-
-EXPORTS_mozilla/plugins = \
-  BrowserStreamChild.h \
-  BrowserStreamParent.h \
-  ChildAsyncCall.h \
-  ChildTimer.h \
-  NPEventOSX.h \
-  NPEventWindows.h \
-  NPEventUnix.h \
-  NPEventAndroid.h \
-  PluginIdentifierChild.h \
-  PluginIdentifierParent.h \
-  PluginInstanceChild.h \
-  PluginInstanceParent.h \
-  PluginMessageUtils.h \
-  PluginModuleChild.h \
-  PluginModuleParent.h \
-  PluginProcessParent.h \
-  PluginScriptableObjectChild.h \
-  PluginScriptableObjectParent.h \
-  PluginScriptableObjectUtils.h \
-  PluginScriptableObjectUtils-inl.h \
-  PluginUtilsOSX.h \
-  AStream.h \
-  PluginStreamChild.h \
-  PluginStreamParent.h \
-  PluginProcessChild.h \
-  StreamNotifyChild.h \
-  StreamNotifyParent.h \
-  $(NULL)
-
 LIBRARY_NAME     = domplugins_s
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
@@ -97,10 +59,6 @@ CPPSRCS += \
 DEFINES += \
   -DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \
   $(NULL)
-
-EXPORTS_mozilla/plugins += \
-  PluginSurfaceParent.h \
-  $(NULL)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -108,10 +66,6 @@ CMMSRCS   += \
     PluginUtilsOSX.mm \
     PluginInterposeOSX.mm \
     $(NULL)
-
-EXPORTS_mozilla/plugins += \
-    PluginInterposeOSX.h \
-    $(NULL)
 endif
 
 LOCAL_INCLUDES = \
diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build
index a039372f74bb..115ae7c1172e 100644
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -9,3 +9,46 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 
 MODULE = 'dom'
 
+EXPORTS.mozilla += [
+    'PluginLibrary.h',
+]
+
+EXPORTS.mozilla.plugins += [
+    'AStream.h',
+    'BrowserStreamChild.h',
+    'BrowserStreamParent.h',
+    'ChildAsyncCall.h',
+    'ChildTimer.h',
+    'NPEventAndroid.h',
+    'NPEventOSX.h',
+    'NPEventUnix.h',
+    'NPEventWindows.h',
+    'PluginIdentifierChild.h',
+    'PluginIdentifierParent.h',
+    'PluginInstanceChild.h',
+    'PluginInstanceParent.h',
+    'PluginMessageUtils.h',
+    'PluginModuleChild.h',
+    'PluginModuleParent.h',
+    'PluginProcessChild.h',
+    'PluginProcessParent.h',
+    'PluginScriptableObjectChild.h',
+    'PluginScriptableObjectParent.h',
+    'PluginScriptableObjectUtils-inl.h',
+    'PluginScriptableObjectUtils.h',
+    'PluginStreamChild.h',
+    'PluginStreamParent.h',
+    'PluginUtilsOSX.h',
+    'StreamNotifyChild.h',
+    'StreamNotifyParent.h',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXPORTS.mozilla.plugins += [
+        'PluginSurfaceParent.h',
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXPORTS.mozilla.plugins += [
+        'PluginInterposeOSX.h',
+    ]
diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in
index 63d8fde84d3f..214b0f373ac2 100644
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -18,13 +18,6 @@ endif # !_MSC_VER
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/power
-
-EXPORTS_mozilla/dom/power = \
-  PowerManagerService.h \
-  Types.h \
-  $(NULL)
-
 CPPSRCS = \
   PowerManager.cpp \
   PowerManagerService.cpp \
diff --git a/dom/power/moz.build b/dom/power/moz.build
index 1fed9a9001e8..379acd8a7c71 100644
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -16,3 +16,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_power'
 
+EXPORTS.mozilla.dom.power += [
+    'PowerManagerService.h',
+    'Types.h',
+]
+
diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in
index 41cf0e4e5de3..1ee7cd05d3cf 100644
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@@ -16,8 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/quota
-
 CPPSRCS = \
   CheckQuotaHelper.cpp \
   FileStreams.cpp \
@@ -25,24 +23,6 @@ CPPSRCS = \
   QuotaObject.cpp \
   $(NULL)
 
-EXPORTS = \
-  nsIOfflineStorage.h \
-  $(NULL)
-
-EXPORTS_mozilla/dom/quota = \
-  AcquireListener.h \
-  ArrayCluster.h \
-  Client.h \
-  FileStreams.h \
-  OriginOrPatternString.h \
-  QuotaCommon.h \
-  QuotaManager.h \
-  QuotaObject.h \
-  StoragePrivilege.h \
-  UsageRunnable.h \
-  Utilities.h \
-  $(NULL)
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   $(NULL)
diff --git a/dom/quota/moz.build b/dom/quota/moz.build
index adac47fbd1e8..51c733778628 100644
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -14,3 +14,21 @@ XPIDL_MODULE = 'dom_quota'
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'nsIOfflineStorage.h',
+]
+
+EXPORTS.mozilla.dom.quota += [
+    'AcquireListener.h',
+    'ArrayCluster.h',
+    'Client.h',
+    'FileStreams.h',
+    'OriginOrPatternString.h',
+    'QuotaCommon.h',
+    'QuotaManager.h',
+    'QuotaObject.h',
+    'StoragePrivilege.h',
+    'UsageRunnable.h',
+    'Utilities.h',
+]
+
diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in
index 5fea3e707cda..9d96297a2c5b 100644
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -28,8 +28,6 @@ LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
-EXPORTS        = nsGeoPosition.h
-
 ifdef MOZ_MAEMO_LIBLOCATION
 LOCAL_INCLUDES  += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
                    -I$(topsrcdir)/dom/system/unix \
@@ -49,8 +47,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/gonk
 endif
 
-EXPORTS         += nsGeoPositionIPCSerialiser.h
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build
index f0a612a32de6..8f4ad075aa77 100644
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'nsGeoPosition.h',
+    'nsGeoPositionIPCSerialiser.h',
+]
+
diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in
index 7d0f0fd3f66c..5ced2b1257c7 100644
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -19,9 +19,6 @@ CPPSRCS =                      \
        nsJSON.cpp              \
        $(NULL)
 
-EXPORTS = nsJSON.h \
-          $(NULL)
-
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
diff --git a/dom/src/json/moz.build b/dom/src/json/moz.build
index 37048db5674b..c77207336a3e 100644
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -8,3 +8,7 @@ TEST_DIRS += ['test']
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'nsJSON.h',
+]
+
diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in
index 80fc8e738f03..e3f2b9741c69 100644
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -18,8 +18,6 @@ LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= nsJSProtocolHandler.cpp
 
-EXPORTS		= $(srcdir)/nsJSProtocolHandler.h
-
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(topsrcdir)/dom/base \
diff --git a/dom/src/jsurl/moz.build b/dom/src/jsurl/moz.build
index 6d207717e805..9fe15d61e5eb 100644
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -8,3 +8,7 @@ TEST_DIRS += ['test']
 
 MODULE = 'jsurl'
 
+EXPORTS += [
+    'nsJSProtocolHandler.h',
+]
+
diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in
index 719ebd9b5910..46e040a76e08 100644
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -21,15 +21,6 @@ CPPSRCS = \
   DesktopNotification.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES = \
-  mozilla/dom \
-  $(NULL)
-
-EXPORTS_mozilla/dom = \
-  Notification.h \
-  DesktopNotification.h \
-  $(NULL)
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/ipc \
diff --git a/dom/src/notification/moz.build b/dom/src/notification/moz.build
index f0a612a32de6..c2f04065d724 100644
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom += [
+    'Notification.h',
+    'DesktopNotification.h',
+]
+
diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in
index 347c718fd273..81d82d1469dc 100644
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -23,9 +23,6 @@ CPPSRCS = \
        DOMStorageIPC.cpp \
        $(NULL)
 
-EXPORTS_NAMESPACES = mozilla/dom
-EXPORTS_mozilla/dom = DOMStorageIPC.h
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build
index f0a612a32de6..a1575a78d444 100644
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom += [
+    'DOMStorageIPC.h',
+]
+
diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in
index 6eb795609526..d44f171d063f 100644
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -49,26 +49,10 @@ EXTRA_COMPONENTS = \
   $(NULL)
 endif
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS     = \
-  nsDeviceSensors.h \
-  $(NULL)
-
-EXPORTS_mozilla = \
-  OSFileConstants.h \
-  $(NULL)
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
-ifdef MOZ_GAMEPAD
-EXPORTS_NAMESPACES += mozilla/dom
-EXPORTS_mozilla/dom = \
-  GamepadService.h \
-  $(NULL)
-endif
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in
index 0e50221b4ea1..b6e563625198 100644
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -59,10 +59,6 @@ CPPSRCS += \
   VolumeServiceIOThread.cpp \
   VolumeServiceTest.cpp \
   $(NULL)
-EXPORTS = \
-  GonkGPSGeolocationProvider.h \
-  nsVolume.h \
-  $(NULL)
 endif
 
 EXTRA_COMPONENTS = \
diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build
index 11a079bc6de2..3a2e45a58f79 100644
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -35,3 +35,8 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    EXPORTS += [
+        'GonkGPSGeolocationProvider.h',
+        'nsVolume.h',
+    ]
diff --git a/dom/system/moz.build b/dom/system/moz.build
index bff930295523..288f38e833f5 100644
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -26,3 +26,16 @@ XPIDL_MODULE = 'dom_system'
 
 MODULE = 'dom'
 
+EXPORTS += [
+    'nsDeviceSensors.h',
+]
+
+if CONFIG['MOZ_GAMEPAD']:
+    EXPORTS.mozilla.dom = [
+        'GamepadService.h',
+    ]
+
+EXPORTS.mozilla += [
+    'OSFileConstants.h',
+]
+
diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in
index a880dc721adc..073ddaec4b0a 100644
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@@ -16,8 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom/time
-
 CPPSRCS = \
   TimeManager.cpp \
   TimeService.cpp \
@@ -25,12 +23,6 @@ CPPSRCS = \
   DateCacheCleaner.cpp \
   $(NULL)
 
-EXPORTS_mozilla/dom/time = \
-  TimeService.h \
-  TimeChangeObserver.h \
-  DateCacheCleaner.h \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/time/moz.build b/dom/time/moz.build
index aa14323d702d..ea49b9bbf4ad 100644
--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -14,3 +14,9 @@ XPIDL_MODULE = 'dom_time'
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom.time += [
+    'DateCacheCleaner.h',
+    'TimeChangeObserver.h',
+    'TimeService.h',
+]
+
diff --git a/dom/voicemail/Makefile.in b/dom/voicemail/Makefile.in
index d299e62d5ac0..fb70e1b11820 100644
--- a/dom/voicemail/Makefile.in
+++ b/dom/voicemail/Makefile.in
@@ -16,11 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXPORTS_NAMESPACES = mozilla/dom
-EXPORTS_mozilla/dom = \
-  Voicemail.h \
-  $(NULL)
-
 CPPSRCS = \
   Voicemail.cpp \
   $(NULL)
diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build
index c7f11f885476..ab110e26c320 100644
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -22,3 +22,7 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+EXPORTS.mozilla.dom += [
+    'Voicemail.h',
+]
+
diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in
index a9421f3fda1d..341136a43b46 100644
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -40,29 +40,6 @@ CPPSRCS = \
   XMLHttpRequest.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES = \
-  mozilla/dom/workers \
-  mozilla/dom/workers/bindings \
-  $(NULL)
-
-# Public stuff.
-EXPORTS_mozilla/dom/workers = Workers.h
-
-# Stuff needed for the bindings, not really public though.
-EXPORTS_mozilla/dom/workers/bindings = \
-  DOMBindingBase.h \
-  EventListenerManager.h \
-  EventTarget.h \
-  FileReaderSync.h \
-  URL.h \
-  TextDecoder.h \
-  TextEncoder.h \
-  WorkerFeature.h \
-  XMLHttpRequestEventTarget.h \
-  XMLHttpRequestUpload.h \
-  XMLHttpRequest.h \
-  $(NULL)
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
diff --git a/dom/workers/moz.build b/dom/workers/moz.build
index 37048db5674b..b81da84e6322 100644
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -8,3 +8,23 @@ TEST_DIRS += ['test']
 
 MODULE = 'dom'
 
+# Public stuff.
+EXPORTS.mozilla.dom.workers += [
+    'Workers.h',
+]
+
+# Stuff needed for the bindings, not really public though.
+EXPORTS.mozilla.dom.workers.bindings += [
+    'DOMBindingBase.h',
+    'EventListenerManager.h',
+    'EventTarget.h',
+    'FileReaderSync.h',
+    'TextDecoder.h',
+    'TextEncoder.h',
+    'URL.h',
+    'WorkerFeature.h',
+    'XMLHttpRequest.h',
+    'XMLHttpRequestEventTarget.h',
+    'XMLHttpRequestUpload.h',
+]
+
diff --git a/editor/public/Makefile.in b/editor/public/Makefile.in
index b52c1d2076e2..a856a07f11c9 100644
--- a/editor/public/Makefile.in
+++ b/editor/public/Makefile.in
@@ -10,9 +10,5 @@ VPATH           := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS         := \
-                nsEditorCID.h \
-                $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/editor/public/moz.build b/editor/public/moz.build
index 30c2d06042f5..51968bbb36ce 100644
--- a/editor/public/moz.build
+++ b/editor/public/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'editor'
 
+EXPORTS += [
+    'nsEditorCID.h',
+]
+
diff --git a/editor/txmgr/public/Makefile.in b/editor/txmgr/public/Makefile.in
index f87df67a3f4f..ac724e1bc29c 100644
--- a/editor/txmgr/public/Makefile.in
+++ b/editor/txmgr/public/Makefile.in
@@ -10,9 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsTransactionManagerCID.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/editor/txmgr/public/moz.build b/editor/txmgr/public/moz.build
index 719d60c80a70..8ea255260213 100644
--- a/editor/txmgr/public/moz.build
+++ b/editor/txmgr/public/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'txmgr'
 
+EXPORTS += [
+    'nsTransactionManagerCID.h',
+]
+
diff --git a/editor/txtsvc/public/Makefile.in b/editor/txtsvc/public/Makefile.in
index 6e69c15eb18f..b7dfd3988bb3 100644
--- a/editor/txtsvc/public/Makefile.in
+++ b/editor/txtsvc/public/Makefile.in
@@ -11,12 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= \
-		nsISpellChecker.h \
-		nsITextService.h \
-		nsITextServicesDocument.h \
-		nsTextServicesCID.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/editor/txtsvc/public/moz.build b/editor/txtsvc/public/moz.build
index 91a7a4bbce1e..23eeba229d76 100644
--- a/editor/txtsvc/public/moz.build
+++ b/editor/txtsvc/public/moz.build
@@ -11,3 +11,10 @@ XPIDL_SOURCES += [
 
 MODULE = 'txtsvc'
 
+EXPORTS += [
+    'nsISpellChecker.h',
+    'nsITextService.h',
+    'nsITextServicesDocument.h',
+    'nsTextServicesCID.h',
+]
+
diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in
index 2a0f3092ac63..ea58a7623dac 100644
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -15,10 +15,6 @@ LIBXUL_LIBRARY	= 1
 
 
 
-EXPORTS         = \
-                nsCTooltipTextProvider.h \
-                $(NULL)
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../content/base/src \
 		-I$(srcdir)/../../../content/svg/content/src \
diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build
index b939a8f4c410..724612ff8792 100644
--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -33,3 +33,7 @@ XPIDL_MODULE = 'webBrowser_core'
 
 MODULE = 'webbrwsr'
 
+EXPORTS += [
+    'nsCTooltipTextProvider.h',
+]
+
diff --git a/embedding/components/appstartup/src/Makefile.in b/embedding/components/appstartup/src/Makefile.in
index 6e3760ada88c..7690674cbfdf 100644
--- a/embedding/components/appstartup/src/Makefile.in
+++ b/embedding/components/appstartup/src/Makefile.in
@@ -17,10 +17,6 @@ LIBXUL_LIBRARY	= 1
 CPPSRCS		= nsAppStartupNotifier.cpp \
                   $(NULL)
 
-EXPORTS =	\
-		nsIAppStartupNotifier.h		\
-		$(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
diff --git a/embedding/components/appstartup/src/moz.build b/embedding/components/appstartup/src/moz.build
index 8fef8ab8b5a6..c8e55961bc3a 100644
--- a/embedding/components/appstartup/src/moz.build
+++ b/embedding/components/appstartup/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'embedcomponents'
 
+EXPORTS += [
+    'nsIAppStartupNotifier.h',
+]
+
diff --git a/embedding/components/windowwatcher/public/Makefile.in b/embedding/components/windowwatcher/public/Makefile.in
index fe0f6b1cf81b..c064df10e66a 100644
--- a/embedding/components/windowwatcher/public/Makefile.in
+++ b/embedding/components/windowwatcher/public/Makefile.in
@@ -12,8 +12,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= nsPromptUtils.h \
-                  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/embedding/components/windowwatcher/public/moz.build b/embedding/components/windowwatcher/public/moz.build
index ff6f6055aad9..4a4e3def8eb4 100644
--- a/embedding/components/windowwatcher/public/moz.build
+++ b/embedding/components/windowwatcher/public/moz.build
@@ -16,3 +16,7 @@ XPIDL_SOURCES += [
 
 MODULE = 'windowwatcher'
 
+EXPORTS += [
+    'nsPromptUtils.h',
+]
+
diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in
index edf2dc97a10b..05b481a7befa 100644
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -14,26 +14,6 @@ LIBRARY_NAME	= gfx2d
 LIBXUL_LIBRARY	= 1
 EXPORT_LIBRARY	= 1
 
-EXPORTS_NAMESPACES = mozilla/gfx
-EXPORTS_mozilla/gfx	= \
-        2D.h \
-        BasePoint.h \
-        BasePoint3D.h \
-        BasePoint4D.h \
-        BaseMargin.h \
-        BaseRect.h \
-        BaseSize.h \
-        Blur.h \
-        PathHelpers.h \
-        Point.h \
-        Matrix.h \
-        Rect.h \
-        Scale.h \
-        Types.h \
-        Tools.h \
-        UserData.h \
-	$(NULL)
-
 CPPSRCS	= \
         Factory.cpp \
         Rect.cpp \
@@ -71,11 +51,6 @@ CPPSRCS	+= \
 CMMSRCS = \
 	   QuartzSupport.mm \
 	   $(NULL)
-
-EXPORTS_mozilla/gfx	+= \
-	   QuartzSupport.h \
-	   MacIOSurface.h \
-	   $(NULL)
 endif
 
 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
index 38d1298f7b5e..33b91507e611 100644
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -6,3 +6,27 @@
 
 MODULE = 'gfx2d'
 
+EXPORTS.mozilla.gfx += [
+    '2D.h',
+    'BaseMargin.h',
+    'BasePoint.h',
+    'BasePoint3D.h',
+    'BasePoint4D.h',
+    'BaseRect.h',
+    'BaseSize.h',
+    'Blur.h',
+    'Matrix.h',
+    'PathHelpers.h',
+    'Point.h',
+    'Rect.h',
+    'Scale.h',
+    'Tools.h',
+    'Types.h',
+    'UserData.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXPORTS.mozilla.gfx += [
+        'QuartzSupport.h',
+        'MacIOSurface.h',
+    ]
diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in
index 203a65ff0778..922cf6f6b490 100644
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -15,13 +15,6 @@ ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
-EXPORTS_NAMESPACES = angle
-
-EXPORTS_angle = \
-  include/GLSLANG/ShaderLang.h \
-  include/KHR/khrplatform.h \
-  $(NULL)
-
 # The below is a rough translation of build_angle.gypi:
 DEFINES += -DANGLE_DISABLE_TRACE
 DEFINES += -DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0
diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build
index 8bb5d9272dc3..7774053f5478 100644
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -10,3 +10,8 @@ if CONFIG['MOZ_ANGLE_RENDERER']:
 
 MODULE = 'angle'
 
+EXPORTS.angle += [
+    'include/GLSLANG/ShaderLang.h',
+    'include/KHR/khrplatform.h',
+]
+
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index fd4c89a8092f..6be98895637a 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -96,10 +96,6 @@ ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CSRCS += cairo-deflate-stream.c
 endif
 
-EXPORTS_NAMESPACES = cairo
-
-EXPORTS_cairo = cairo.h cairo-version.h cairo-features.h cairo-platform.h cairo-deprecated.h cairo-rename.h cairo-tee.h
-
 # cairo-type1-subset.c should be here, but it's only supported on freetype platforms
 
 PSPDF_BASE_CSRCS = \
@@ -117,9 +113,6 @@ PDF_CSRCS = \
 
 PS_CSRCS = cairo-ps-surface.c
 
-PDF_EXPORTS = cairo-pdf.h
-PS_EXPORTS = cairo-ps.h
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 DEFINES += -DDISABLE_SOME_FLOATING_POINT
 CSRCS	+=	cairo-win32-surface.c
@@ -138,9 +131,7 @@ else
 DEFINES += -DCAIRO_OMIT_WIN32_PRINTING
 endif
 
-EXPORTS_cairo += cairo-win32.h
 CSRCS   += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS)
-EXPORTS_cairo += $(PDF_EXPORTS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
@@ -149,42 +140,33 @@ ifdef MOZ_OS2_HIGH_MEMORY
 DEFINES += -DOS2_HIGH_MEMORY
 endif
 CSRCS   += cairo-os2-surface.c
-EXPORTS_cairo += cairo-os2.h cairo-os2-private.h
 CSRCS   += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS)
-EXPORTS_cairo += $(PDF_EXPORTS)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CSRCS   += cairo-quartz-surface.c cairo-quartz-image-surface.c cairo-quartz-font.c
-EXPORTS_cairo += cairo-quartz.h cairo-quartz-image.h
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
 CPPSRCS += cairo-beos-surface.cpp
-EXPORTS_cairo += cairo-beos.h
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CSRCS   += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS) $(PS_CSRCS)
-EXPORTS_cairo += $(PDF_EXPORTS) $(PS_EXPORTS)
 endif
 
 ifneq (,$(filter android gonk,$(MOZ_WIDGET_TOOLKIT)))
 CSRCS   += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS)
-EXPORTS_cairo += $(PDF_EXPORTS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CPPSRCS += cairo-qt-surface.cpp
 CSRCS   += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS) 
-EXPORTS_cairo += cairo-qt.h
-EXPORTS_cairo += $(PDF_EXPORTS)
 OS_INCLUDES += $(MOZ_QT_CFLAGS)
 endif
 
 ifdef BUILD_CAIRO_SVG
 CSRCS	+= cairo-svg-surface.c
-EXPORTS_cairo += cairo-svg.h
 endif
 
 ifdef MOZ_X11
@@ -192,13 +174,11 @@ CSRCS   += cairo-xlib-surface.c \
 	   cairo-xlib-screen.c \
 	   cairo-xlib-visual.c \
 	   cairo-xlib-display.c
-EXPORTS_cairo += cairo-xlib.h cairo-xlib-xrender.h
 OS_INCLUDES += $(XCFLAGS)
 endif
 
 ifdef MOZ_ENABLE_CAIRO_FT
 CSRCS   += cairo-ft-font.c cairo-type1-subset.c
-EXPORTS_cairo += cairo-ft.h
 OS_INCLUDES += $(CAIRO_FT_CFLAGS)
 endif
 
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
index 1de2ff479415..2d69d4810c85 100644
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -8,3 +8,63 @@ CONFIGURE_SUBST_FILES += ['cairo-features.h']
 
 MODULE = 'cairo'
 
+EXPORTS.cairo += [
+    'cairo-deprecated.h',
+    'cairo-features.h',
+    'cairo-platform.h',
+    'cairo-rename.h',
+    'cairo-tee.h',
+    'cairo-version.h',
+    'cairo.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXPORTS.cairo += [
+        'cairo-win32.h',
+        'cairo-pdf.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
+    EXPORTS.cairo += [
+        'cairo-os2.h',
+        'cairo-os2-private.h',
+        'cairo-pdf.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXPORTS.cairo += [
+        'cairo-quartz.h',
+        'cairo-quartz-image.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
+    EXPORTS.cairo += [
+        'cairo-beos.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
+    EXPORTS.cairo += [
+        'cairo-pdf.h',
+        'cairo-ps.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
+    EXPORTS.cairo += [
+        'cairo-pdf.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+    EXPORTS.cairo += [
+        'cairo-qt.h',
+        'cairo-pdf.h',
+    ]
+
+if CONFIG['BUILD_CAIRO_SVG']:
+    EXPORTS.cairo += [
+        'cairo-svg.h'
+    ]
+
+if CONFIG['MOZ_X11']:
+    EXPORTS.cairo += [
+        'cairo-xlib.h',
+        'cairo-xlib-xrender.h',
+    ]
+
+if CONFIG['MOZ_ENABLE_CAIRO_FT']:
+    EXPORTS.cairo += [
+        'cairo-ft.h',
+    ]
diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
index adfb437429ab..0f9dddbf6e62 100644
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -141,8 +141,6 @@ DEFINES += -DUSE_ARM_NEON
 ARM_NEON_CFLAGS = -mfpu=neon
 endif
 
-EXPORTS		= pixman.h pixman-version.h
-
 LOCAL_INCLUDES	+= -I$(srcdir) -I$(srcdir)/../../cairo/src
 
 FORCE_STATIC_LIB = 1
diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build
index 2b1104f03836..18e12a7396f6 100644
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'libpixman'
 
+EXPORTS += [
+    'pixman-version.h',
+    'pixman.h',
+]
+
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index fad293c33bf1..fc4e98a2a8df 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -14,37 +14,8 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS	= \
-  ForceDiscreteGPUHelperCGL.h \
-  GLContext.h \
-  GLContextProvider.h \
-  GLContextProviderImpl.h \
-  GLContextSymbols.h \
-  GLContextTypes.h \
-  GLDefs.h \
-  GLLibraryLoader.h \
-  GLLibraryEGL.h \
-  GLScreenBuffer.h \
-  GLTextureImage.h \
-  SharedSurface.h \
-  SharedSurfaceEGL.h \
-  SharedSurfaceGL.h \
-  SurfaceFactory.h \
-  SurfaceStream.h \
-  SurfaceTypes.h \
-  $(NULL)
-
-ifdef MOZ_X11
-EXPORTS += \
-  GLXLibrary.h \
-  $(NULL)
-endif
-
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXPORTS	+= \
-  WGLLibrary.h \
-  $(NULL)
 ifdef MOZ_WEBGL
 DEFINES += -DMOZ_WEBGL
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
@@ -121,10 +92,6 @@ endif
 
 # Win32 is a special snowflake, for ANGLE
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXPORTS += \
-  SharedSurfaceANGLE.h \
-  $(NULL)
-
 CPPSRCS += \
   GLContextProviderEGL.cpp \
   GLLibraryEGL.cpp \
@@ -138,7 +105,6 @@ endif
 
 ifdef MOZ_ENABLE_SKIA_GPU
 CPPSRCS += GLContextSkia.cpp
-EXPORTS += GLContextSkia.h
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
index 2ff4edaba6bb..b819dd16c995 100644
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -6,3 +6,32 @@
 
 MODULE = 'gl'
 
+EXPORTS += [
+    'ForceDiscreteGPUHelperCGL.h',
+    'GLContext.h',
+    'GLContextProvider.h',
+    'GLContextProviderImpl.h',
+    'GLContextSymbols.h',
+    'GLContextTypes.h',
+    'GLDefs.h',
+    'GLLibraryEGL.h',
+    'GLLibraryLoader.h',
+    'GLScreenBuffer.h',
+    'GLTextureImage.h',
+    'SharedSurface.h',
+    'SharedSurfaceEGL.h',
+    'SharedSurfaceGL.h',
+    'SurfaceFactory.h',
+    'SurfaceStream.h',
+    'SurfaceTypes.h',
+]
+
+if CONFIG['MOZ_X11']:
+    EXPORTS += ['GLXLibrary.h']
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXPORTS += [
+        'WGLLibrary.h',
+        'SharedSurfaceANGLE.h',
+    ]
+if CONFIG['MOZ_ENABLE_SKIA_GPU']:
+    EXPORTS += ['GLContextSkia.h']
diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
index e26738028288..f3d76ea8de74 100644
--- a/gfx/graphite2/moz-gr-update.sh
+++ b/gfx/graphite2/moz-gr-update.sh
@@ -30,6 +30,11 @@ echo
 
 hg stat gfx/graphite2
 
+echo
+echo If gfx/graphite2/src/files.mk has changed, please make corresponding
+echo changes to gfx/graphite2/src/moz.build
+echo
+
 echo
 echo Now use hg commands to create a patch for the mozilla tree.
 echo
diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in
index f2de3841af50..f7dd9441c507 100644
--- a/gfx/graphite2/src/Makefile.in
+++ b/gfx/graphite2/src/Makefile.in
@@ -34,9 +34,6 @@ endif
 # and leave bare filenames
 CPPSRCS = $(subst $($(_NS)_BASE)/src/,,$(_SOURCES))
 
-EXPORTS_NAMESPACES = graphite2
-EXPORTS_graphite2 = $(_PUBLIC_HEADERS)
-
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 
diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build
index 182eca8d77e0..bd0e4f726cc9 100644
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -6,3 +6,11 @@
 
 MODULE = 'graphite2'
 
+# This should contain all of the _PUBLIC_HEADERS from files.mk
+EXPORTS.graphite2 += [
+    '../include/graphite2/Font.h',
+    '../include/graphite2/Log.h',
+    '../include/graphite2/Segment.h',
+    '../include/graphite2/Types.h',
+]
+
diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in
index 4bdfbffc24bf..c2506aa06f5f 100644
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@@ -64,24 +64,6 @@ CPPSRCS	=                        \
   hb-warning.cc                  \
   $(NULL)
 
-EXPORTS_NAMESPACES = harfbuzz
-
-EXPORTS_harfbuzz = \
-  hb.h             \
-  hb-blob.h        \
-  hb-buffer.h      \
-  hb-common.h      \
-  hb-font.h        \
-  hb-ot.h          \
-  hb-ot-layout.h   \
-  hb-ot-tag.h      \
-  hb-set.h         \
-  hb-shape.h       \
-  hb-shape-plan.h  \
-  hb-unicode.h     \
-  hb-version.h     \
-  $(NULL)
-
 LOCAL_INCLUDES  += -I$(srcdir) 
 
 FORCE_STATIC_LIB = 1
diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build
index 42bbcd01fbeb..9e4c9cbd30a0 100644
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -6,3 +6,19 @@
 
 MODULE = 'harfbuzz'
 
+EXPORTS.harfbuzz += [
+    'hb-blob.h',
+    'hb-buffer.h',
+    'hb-common.h',
+    'hb-font.h',
+    'hb-ot-layout.h',
+    'hb-ot-tag.h',
+    'hb-ot.h',
+    'hb-set.h',
+    'hb-shape-plan.h',
+    'hb-shape.h',
+    'hb-unicode.h',
+    'hb-version.h',
+    'hb.h',
+]
+
diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in
index e94aed5681b0..6290a2eee4a7 100644
--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@@ -15,20 +15,9 @@ FORCE_STATIC_LIB   = 1
 LIBXUL_LIBRARY     = 1
 EXPORT_LIBRARY     = 1
 
-EXPORTS_NAMESPACES = mozilla/gfx
-
-EXPORTS_mozilla/gfx = \
-        SharedDIB.h   \
-        $(NULL)
-
 CPPSRCS = SharedDIB.cpp
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXPORTS_mozilla/gfx += \
-  SharedDIBWin.h \
-  SharedDIBSurface.h \
-  $(NULL)
-
 CPPSRCS += \
   SharedDIBWin.cpp \
   SharedDIBSurface.cpp \
diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build
index 8818e064a054..a24937cf37b6 100644
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -6,3 +6,13 @@
 
 MODULE = 'gfxipc'
 
+EXPORTS.mozilla.gfx += [
+    'SharedDIB.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXPORTS.mozilla.gfx += [
+        'SharedDIBWin.h',
+        'SharedDIBSurface.h',
+    ]
+
diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in
index edb3315fef9f..a2d7a51b1303 100644
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -28,39 +28,6 @@ ifdef MOZ_DEBUG
 DEFINES += -DD3D_DEBUG_INFO
 endif
 
-EXPORTS = \
-        BasicCanvasLayer.h \
-        BasicImplData.h \
-        BasicLayers.h \
-        BasicLayersImpl.h \
-        BasicTiledThebesLayer.h \
-        BasicThebesLayer.h \
-        CompositableHost.h \
-        LayerManagerComposite.h \
-        Composer2D.h \
-        GonkIOSurfaceImage.h \
-        FrameMetrics.h \
-        CompositorChild.h \
-        CompositorParent.h \
-        ImageContainer.h \
-        ImageLayers.h \
-        ImageLayerOGL.h \
-        ImageHost.h \
-        ImageTypes.h \
-        Layers.h \
-        LayersLogging.h \
-        LayerManagerOGLShaders.h \
-        LayerManagerOGL.h \
-        LayerManagerOGLProgram.h \
-        LayerSorter.h \
-        LayerTreeInvalidation.h \
-        ReadbackLayer.h \
-        ShadowLayersManager.h \
-        SharedTextureImage.h \
-        TexturePoolOGL.h \
-        ShmemYCbCrImage.h \
-        $(NULL)
-
 CPPSRCS = \
         BasicImages.cpp \
         BasicLayerManager.cpp \
@@ -104,11 +71,6 @@ GTEST_CPPSRCS = \
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifdef MOZ_ENABLE_D3D9_LAYER
-EXPORTS += \
-        LayerManagerD3D9.h \
-        DeviceManagerD3D9.h \
-        $(NULL)
-
 CPPSRCS += \
         LayerManagerD3D9.cpp \
         ThebesLayerD3D9.cpp \
@@ -121,11 +83,6 @@ CPPSRCS += \
         $(NULL)
 endif
 ifdef MOZ_ENABLE_D3D10_LAYER
-EXPORTS += \
-        LayerManagerD3D10.h \
-        ReadbackManagerD3D10.h \
-        $(NULL)
-
 CPPSRCS += \
         CanvasLayerD3D10.cpp \
         ColorLayerD3D10.cpp \
@@ -139,49 +96,6 @@ CPPSRCS += \
 endif
 endif
 
-EXPORTS_NAMESPACES = gfxipc mozilla/layers
-EXPORTS_gfxipc = ShadowLayerUtils.h
-EXPORTS_mozilla/layers =\
-        AsyncPanZoomController.h \
-        Axis.h \
-        CanvasClient.h \
-        CompositableClient.h \
-        CompositableTransactionParent.h \
-        Compositor.h \
-        CompositorOGL.h \
-        CompositorTypes.h \
-        ContentHost.h \
-        CompositingRenderTargetOGL.h \
-        CompositorCocoaWidgetHelper.h \
-        CompositorChild.h \
-        CompositorParent.h \
-        CompositableForwarder.h \
-        ContentClient.h \
-        Effects.h \
-        GeckoContentController.h \
-        GestureEventListener.h \
-        ImageBridgeChild.h \
-        ImageBridgeParent.h \
-        ImageClient.h \
-        ImageHost.h \
-        ISurfaceAllocator.h \
-        LayersTypes.h \
-        ShadowLayers.h \
-        ShadowLayersChild.h \
-        ShadowLayersParent.h \
-        ShadowLayersManager.h \
-        RenderTrace.h \
-        SharedRGBImage.h \
-        SharedPlanarYCbCrImage.h \
-        ShmemYCbCrImage.h \
-        TaskThrottler.h \
-        TextureClient.h \
-        TextureHost.h \
-        TextureClientOGL.h \
-        TextureHostOGL.h \
-        TiledContentClient.h \
-        $(NULL)
-
 CPPSRCS += \
         AsyncPanZoomController.cpp \
         Axis.cpp \
@@ -219,14 +133,10 @@ CPPSRCS += \
         $(NULL)
 
 ifdef MOZ_X11 #{
-EXPORTS_mozilla/layers += ShadowLayerUtilsX11.h
 CPPSRCS += ShadowLayerUtilsX11.cpp
 endif #}
 
 ifdef MOZ_ENABLE_D3D10_LAYER
-EXPORTS_mozilla/layers += \
-        ShadowLayerUtilsD3D10.h \
-        $(NULL)
 DEFINES	+= -DMOZ_ENABLE_D3D10_LAYER
 endif
 
@@ -238,7 +148,6 @@ endif
 # libraries, but only Gonk is able to use it reliably because Gecko
 # has full system permissions there.
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-EXPORTS_mozilla/layers += ShadowLayerUtilsGralloc.h
 CPPSRCS += \
         ShadowLayerUtilsGralloc.cpp \
         GrallocImages.cpp \
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index 0cbbe72570ef..1e3bb8c6d0e8 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -6,3 +6,105 @@
 
 MODULE = 'thebes'
 
+EXPORTS += [
+    'BasicCanvasLayer.h',
+    'BasicImplData.h',
+    'BasicLayers.h',
+    'BasicLayersImpl.h',
+    'BasicTiledThebesLayer.h',
+    'BasicThebesLayer.h',
+    'CompositableHost.h',
+    'LayerManagerComposite.h',
+    'Composer2D.h',
+    'GonkIOSurfaceImage.h',
+    'FrameMetrics.h',
+    'CompositorChild.h',
+    'CompositorParent.h',
+    'ImageContainer.h',
+    'ImageLayers.h',
+    'ImageLayerOGL.h',
+    'ImageHost.h',
+    'ImageTypes.h',
+    'Layers.h',
+    'LayersLogging.h',
+    'LayerManagerOGLShaders.h',
+    'LayerManagerOGL.h',
+    'LayerManagerOGLProgram.h',
+    'LayerSorter.h',
+    'LayerTreeInvalidation.h',
+    'ReadbackLayer.h',
+    'ShadowLayersManager.h',
+    'SharedTextureImage.h',
+    'TexturePoolOGL.h',
+    'ShmemYCbCrImage.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    if CONFIG['MOZ_ENABLE_D3D9_LAYER']:
+        EXPORTS += [
+            'LayerManagerD3D9.h',
+            'DeviceManagerD3D9.h',
+        ]
+    if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
+        EXPORTS += [
+            'LayerManagerD3D10.h',
+            'ReadbackManagerD3D10.h',
+        ]
+        EXPORTS.mozilla.layers += [
+            'ShadowLayerUtilsD3D10.h',
+        ]
+
+EXPORTS.gfxipc += [
+    'ShadowLayerUtils.h',
+]
+
+EXPORTS.mozilla.layers += [
+    'AsyncPanZoomController.h',
+    'Axis.h',
+    'CanvasClient.h',
+    'CompositableClient.h',
+    'CompositableTransactionParent.h',
+    'Compositor.h',
+    'CompositorOGL.h',
+    'CompositorTypes.h',
+    'ContentHost.h',
+    'CompositingRenderTargetOGL.h',
+    'CompositorCocoaWidgetHelper.h',
+    'CompositorChild.h',
+    'CompositorParent.h',
+    'CompositableForwarder.h',
+    'ContentClient.h',
+    'Effects.h',
+    'GeckoContentController.h',
+    'GestureEventListener.h',
+    'ImageBridgeChild.h',
+    'ImageBridgeParent.h',
+    'ImageClient.h',
+    'ImageHost.h',
+    'ISurfaceAllocator.h',
+    'LayersTypes.h',
+    'ShadowLayers.h',
+    'ShadowLayersChild.h',
+    'ShadowLayersParent.h',
+    'ShadowLayersManager.h',
+    'RenderTrace.h',
+    'SharedRGBImage.h',
+    'SharedPlanarYCbCrImage.h',
+    'ShmemYCbCrImage.h',
+    'TaskThrottler.h',
+    'TextureClient.h',
+    'TextureHost.h',
+    'TextureClientOGL.h',
+    'TextureHostOGL.h',
+    'TiledContentClient.h',
+]
+
+if CONFIG['MOZ_X11']:
+    EXPORTS.mozilla.layers += [
+        'ShadowLayerUtilsX11.h'
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    EXPORTS.mozilla.layers += [
+        'ShadowLayerUtilsGralloc.h'
+    ]
diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in
index 631007a960e7..969dfc44bed7 100644
--- a/gfx/ots/src/Makefile.in
+++ b/gfx/ots/src/Makefile.in
@@ -78,11 +78,6 @@ CPPSRCS	= \
   svg.cc \
   $(NULL)
 
-EXPORTS = \
-  ../include/opentype-sanitiser.h \
-  ../include/ots-memory-stream.h  \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DPACKAGE_VERSION="\"moz\""
diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build
index 9a3b1894edaa..6e6749078b9f 100644
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'ots'
 
+EXPORTS += [
+    '../include/opentype-sanitiser.h',
+    '../include/ots-memory-stream.h',
+]
+
diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in
index d77207dd2bfb..99353540dc89 100644
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = mozqcms
 LIBXUL_LIBRARY = 1
 
-EXPORTS      = qcms.h qcmstypes.h
-
 CSRCS = \
   chain.c \
   iccread.c \
diff --git a/gfx/qcms/moz.build b/gfx/qcms/moz.build
index 102d4692309b..b384a7beb36a 100644
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'qcms'
 
+EXPORTS += [
+    'qcms.h',
+    'qcmstypes.h',
+]
+
diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in
index da6358be8e2e..5b74b2eaa0fd 100644
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -14,8 +14,6 @@ LIBRARY_NAME	= skia
 LIBXUL_LIBRARY  = 1
 EXPORT_LIBRARY  = 1
 
-EXPORTS_NAMESPACES = skia
-
 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0
 
 LOCAL_INCLUDES += \
@@ -56,147 +54,6 @@ VPATH += \
 	$(srcdir)/src/sfnt \
 	$(NULL)
 
-EXPORTS_skia = \
-	include/core/Sk64.h \
-	include/core/SkAdvancedTypefaceMetrics.h \
-	include/core/SkBitmap.h \
-	include/core/SkBlitRow.h \
-	include/core/SkBounder.h \
-	include/core/SkCanvas.h \
-	include/core/SkChunkAlloc.h \
-	include/core/SkClipStack.h \
-	include/core/SkColor.h \
-	include/core/SkColorFilter.h \
-	include/core/SkColorPriv.h \
-	include/core/SkColorShader.h \
-	include/core/SkColorTable.h \
-	include/core/SkComposeShader.h \
-	include/core/SkData.h \
-	include/core/SkDeque.h \
-	include/core/SkDevice.h \
-	include/core/SkDither.h \
-	include/core/SkDraw.h \
-	include/core/SkDrawFilter.h \
-	include/core/SkDrawLooper.h \
-	include/core/SkEmptyShader.h \
-	include/core/SkEndian.h \
-	include/core/SkFixed.h \
-	include/core/SkFlattenable.h \
-	include/core/SkFloatBits.h \
-	include/core/SkFloatingPoint.h \
-	include/core/SkFontHost.h \
-	include/core/SkGeometry.h \
-	include/core/SkGraphics.h \
-	include/core/SkInstCnt.h \
-	include/core/SkLineClipper.h \
-	include/core/SkMMapStream.h \
-	include/core/SkMallocPixelRef.h \
-	include/core/SkMask.h \
-	include/core/SkMaskFilter.h \
-	include/core/SkMath.h \
-	include/core/SkMatrix.h \
-	include/core/SkMetaData.h \
-	include/core/SkOSFile.h \
-	include/core/SkPackBits.h \
-	include/core/SkPaint.h \
-	include/core/SkPath.h \
-	include/core/SkPathEffect.h \
-	include/core/SkPathMeasure.h \
-	include/core/SkPicture.h \
-	include/core/SkPixelRef.h \
-	include/core/SkPoint.h \
-	include/core/SkPostConfig.h \
-	include/core/SkPreConfig.h \
-	include/core/SkRandom.h \
-	include/core/SkRasterizer.h \
-	include/core/SkReader32.h \
-	include/core/SkRect.h \
-	include/core/SkRefCnt.h \
-	include/core/SkRegion.h \
-	include/core/SkScalar.h \
-	include/core/SkScalarCompare.h \
-	include/core/SkShader.h \
-	include/core/SkSize.h \
-	include/core/SkStream.h \
-	include/core/SkString.h \
-	include/core/SkTArray.h \
-	include/core/SkTDArray.h \
-	include/core/SkTDLinkedList.h \
-	include/core/SkTDStack.h \
-	include/core/SkTDict.h \
-	include/core/SkTLazy.h \
-	include/core/SkTRegistry.h \
-	include/core/SkTScopedPtr.h \
-	include/core/SkTSearch.h \
-	include/core/SkTemplates.h \
-	include/core/SkThread.h \
-	include/core/SkThread_platform.h \
-	include/core/SkTime.h \
-	include/core/SkTrace.h \
-	include/core/SkTypeface.h \
-	include/core/SkTypes.h \
-	include/core/SkUnPreMultiply.h \
-	include/core/SkUnitMapper.h \
-	include/core/SkUtils.h \
-	include/core/SkWeakRefCnt.h \
-	include/core/SkWriter32.h \
-	include/core/SkXfermode.h \
-	include/config/SkUserConfig.h \
-	include/effects/SkDashPathEffect.h \
-	include/effects/SkGradientShader.h \
-	include/effects/SkBlurDrawLooper.h \
-	include/effects/SkBlurMaskFilter.h \
-	include/effects/SkLayerDrawLooper.h \
-	include/effects/SkLayerRasterizer.h \
-	include/effects/SkMorphologyImageFilter.h \
-	include/gpu/GrAARectRenderer.h \
-	include/gpu/GrCacheID.h \
-	include/gpu/GrClipData.h \
-	include/gpu/GrColor.h \
-	include/gpu/GrConfig.h \
-	include/gpu/GrContextFactory.h \
-	include/gpu/GrContext.h \
-	include/gpu/GrCustomStage.h \
-	include/gpu/GrCustomStageUnitTest.h \
-	include/gpu/GrFontScaler.h \
-	include/gpu/GrGlyph.h \
-	include/gpu/GrInstanceCounter.h \
-	include/gpu/GrKey.h \
-	include/gpu/GrMatrix.h \
-	include/gpu/GrNoncopyable.h \
-	include/gpu/GrPaint.h \
-	include/gpu/GrPoint.h \
-	include/gpu/GrProgramStageFactory.h \
-	include/gpu/GrRect.h \
-	include/gpu/GrRefCnt.h \
-	include/gpu/GrRenderTarget.h \
-	include/gpu/GrResource.h \
-	include/gpu/GrSamplerState.h \
-	include/gpu/GrScalar.h \
-	include/gpu/GrSurface.h \
-	include/gpu/GrTextContext.h \
-	include/gpu/GrTextureAccess.h \
-	include/gpu/GrTexture.h \
-	include/gpu/GrTypes.h \
-	include/gpu/GrUserConfig.h \
-	include/gpu/SkGpuCanvas.h \
-	include/gpu/SkGpuDevice.h \
-	include/gpu/SkGr.h \
-	include/gpu/SkGrPixelRef.h \
-	include/gpu/SkGrTexturePixelRef.h \
-	include/gpu/gl/GrGLConfig.h \
-	include/gpu/gl/GrGLFunctions.h \
-	include/gpu/gl/GrGLInterface.h \
-	include/gpu/gl/SkANGLEGLContext.h \
-	include/gpu/gl/SkDebugGLContext.h \
-	include/gpu/gl/SkGLContext.h \
-	include/gpu/gl/SkMesaGLContext.h \
-	include/gpu/gl/SkNativeGLContext.h \
-	include/gpu/gl/SkNullGLContext.h \
-	include/utils/SkDeferredCanvas.h \
-	include/views/SkTextBox.h \
-	$(NULL)
-
 GPU_CPPSRCS = \
 	GrAAConvexPathRenderer.cpp \
 	GrAAHairLinePathRenderer.cpp \
@@ -438,9 +295,6 @@ CPPSRCS += \
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXPORTS_skia += \
-	include/ports/SkTypeface_mac.h \
-	$(NULL)
 CPPSRCS += \
 	SkFontHost_mac_coretext.cpp \
 	SkStream_mac.cpp \
@@ -506,10 +360,6 @@ DEFINES += -DSK_USE_POSIX_THREADS=1
 endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
-EXPORTS_skia += \
-	include/config/sk_stdint.h \
-	include/ports/SkTypeface_win.h \
-	$(NULL)
 CPPSRCS += \
 	SkFontHost_win.cpp \
 	SkFontHost_tables.cpp \
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index 5502597b47c7..d50201d65a5b 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -6,3 +6,153 @@
 
 MODULE = 'skia'
 
+EXPORTS.skia += [
+    'include/config/SkUserConfig.h',
+    'include/core/Sk64.h',
+    'include/core/SkAdvancedTypefaceMetrics.h',
+    'include/core/SkBitmap.h',
+    'include/core/SkBlitRow.h',
+    'include/core/SkBounder.h',
+    'include/core/SkCanvas.h',
+    'include/core/SkChunkAlloc.h',
+    'include/core/SkClipStack.h',
+    'include/core/SkColor.h',
+    'include/core/SkColorFilter.h',
+    'include/core/SkColorPriv.h',
+    'include/core/SkColorShader.h',
+    'include/core/SkColorTable.h',
+    'include/core/SkComposeShader.h',
+    'include/core/SkData.h',
+    'include/core/SkDeque.h',
+    'include/core/SkDevice.h',
+    'include/core/SkDither.h',
+    'include/core/SkDraw.h',
+    'include/core/SkDrawFilter.h',
+    'include/core/SkDrawLooper.h',
+    'include/core/SkEmptyShader.h',
+    'include/core/SkEndian.h',
+    'include/core/SkFixed.h',
+    'include/core/SkFlattenable.h',
+    'include/core/SkFloatBits.h',
+    'include/core/SkFloatingPoint.h',
+    'include/core/SkFontHost.h',
+    'include/core/SkGeometry.h',
+    'include/core/SkGraphics.h',
+    'include/core/SkInstCnt.h',
+    'include/core/SkLineClipper.h',
+    'include/core/SkMMapStream.h',
+    'include/core/SkMallocPixelRef.h',
+    'include/core/SkMask.h',
+    'include/core/SkMaskFilter.h',
+    'include/core/SkMath.h',
+    'include/core/SkMatrix.h',
+    'include/core/SkMetaData.h',
+    'include/core/SkOSFile.h',
+    'include/core/SkPackBits.h',
+    'include/core/SkPaint.h',
+    'include/core/SkPath.h',
+    'include/core/SkPathEffect.h',
+    'include/core/SkPathMeasure.h',
+    'include/core/SkPicture.h',
+    'include/core/SkPixelRef.h',
+    'include/core/SkPoint.h',
+    'include/core/SkPostConfig.h',
+    'include/core/SkPreConfig.h',
+    'include/core/SkRandom.h',
+    'include/core/SkRasterizer.h',
+    'include/core/SkReader32.h',
+    'include/core/SkRect.h',
+    'include/core/SkRefCnt.h',
+    'include/core/SkRegion.h',
+    'include/core/SkScalar.h',
+    'include/core/SkScalarCompare.h',
+    'include/core/SkShader.h',
+    'include/core/SkSize.h',
+    'include/core/SkStream.h',
+    'include/core/SkString.h',
+    'include/core/SkTArray.h',
+    'include/core/SkTDArray.h',
+    'include/core/SkTDLinkedList.h',
+    'include/core/SkTDStack.h',
+    'include/core/SkTDict.h',
+    'include/core/SkTLazy.h',
+    'include/core/SkTRegistry.h',
+    'include/core/SkTScopedPtr.h',
+    'include/core/SkTSearch.h',
+    'include/core/SkTemplates.h',
+    'include/core/SkThread.h',
+    'include/core/SkThread_platform.h',
+    'include/core/SkTime.h',
+    'include/core/SkTrace.h',
+    'include/core/SkTypeface.h',
+    'include/core/SkTypes.h',
+    'include/core/SkUnPreMultiply.h',
+    'include/core/SkUnitMapper.h',
+    'include/core/SkUtils.h',
+    'include/core/SkWeakRefCnt.h',
+    'include/core/SkWriter32.h',
+    'include/core/SkXfermode.h',
+    'include/effects/SkBlurDrawLooper.h',
+    'include/effects/SkBlurMaskFilter.h',
+    'include/effects/SkDashPathEffect.h',
+    'include/effects/SkGradientShader.h',
+    'include/effects/SkLayerDrawLooper.h',
+    'include/effects/SkLayerRasterizer.h',
+    'include/effects/SkMorphologyImageFilter.h',
+    'include/gpu/GrAARectRenderer.h',
+    'include/gpu/GrCacheID.h',
+    'include/gpu/GrClipData.h',
+    'include/gpu/GrColor.h',
+    'include/gpu/GrConfig.h',
+    'include/gpu/GrContext.h',
+    'include/gpu/GrContextFactory.h',
+    'include/gpu/GrCustomStage.h',
+    'include/gpu/GrCustomStageUnitTest.h',
+    'include/gpu/GrFontScaler.h',
+    'include/gpu/GrGlyph.h',
+    'include/gpu/GrInstanceCounter.h',
+    'include/gpu/GrKey.h',
+    'include/gpu/GrMatrix.h',
+    'include/gpu/GrNoncopyable.h',
+    'include/gpu/GrPaint.h',
+    'include/gpu/GrPoint.h',
+    'include/gpu/GrProgramStageFactory.h',
+    'include/gpu/GrRect.h',
+    'include/gpu/GrRefCnt.h',
+    'include/gpu/GrRenderTarget.h',
+    'include/gpu/GrResource.h',
+    'include/gpu/GrSamplerState.h',
+    'include/gpu/GrScalar.h',
+    'include/gpu/GrSurface.h',
+    'include/gpu/GrTextContext.h',
+    'include/gpu/GrTexture.h',
+    'include/gpu/GrTextureAccess.h',
+    'include/gpu/GrTypes.h',
+    'include/gpu/GrUserConfig.h',
+    'include/gpu/SkGpuCanvas.h',
+    'include/gpu/SkGpuDevice.h',
+    'include/gpu/SkGr.h',
+    'include/gpu/SkGrPixelRef.h',
+    'include/gpu/SkGrTexturePixelRef.h',
+    'include/gpu/gl/GrGLConfig.h',
+    'include/gpu/gl/GrGLFunctions.h',
+    'include/gpu/gl/GrGLInterface.h',
+    'include/gpu/gl/SkANGLEGLContext.h',
+    'include/gpu/gl/SkDebugGLContext.h',
+    'include/gpu/gl/SkGLContext.h',
+    'include/gpu/gl/SkMesaGLContext.h',
+    'include/gpu/gl/SkNativeGLContext.h',
+    'include/gpu/gl/SkNullGLContext.h',
+    'include/utils/SkDeferredCanvas.h',
+    'include/views/SkTextBox.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXPORTS.skia += [
+        'include/ports/SkTypeface_mac.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXPORTS.skia += [
+        'include/config/sk_stdint.h',
+        'include/ports/SkTypeface_win.h',
+    ]
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index f7146934c2a4..203c57c316cf 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -17,35 +17,6 @@ LIBXUL_LIBRARY = 1
 IS_COMPONENT   = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS	= \
-	gfxCore.h \
-	gfxCrashReporterUtils.h \
-	nsColor.h \
-	nsColorNames.h \
-	nsColorNameList.h \
-	nsCoord.h \
-	nsFont.h \
-	nsRect.h \
-	nsRegion.h \
-	nsPoint.h \
-	nsSize.h \
-	nsMargin.h \
-	nsTransform2D.h \
-	nsRenderingContext.h \
-	nsFontMetrics.h \
-	nsDeviceContext.h \
-	nsGfxCIID.h \
-	nsITheme.h \
-	nsThemeConstants.h \
-	nsBoundingMetrics.h \
-	$(NULL)
-
-ifdef MOZ_X11
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla	+= X11Util.h
-endif
-
 CPPSRCS = \
         nsColor.cpp \
         nsFont.cpp \
diff --git a/gfx/src/moz.build b/gfx/src/moz.build
index 344f1181487f..206621a43318 100644
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -11,3 +11,28 @@ XPIDL_SOURCES += [
 
 MODULE = 'gfx'
 
+EXPORTS += [
+    'gfxCore.h',
+    'gfxCrashReporterUtils.h',
+    'nsBoundingMetrics.h',
+    'nsColor.h',
+    'nsColorNameList.h',
+    'nsColorNames.h',
+    'nsCoord.h',
+    'nsDeviceContext.h',
+    'nsFont.h',
+    'nsFontMetrics.h',
+    'nsGfxCIID.h',
+    'nsITheme.h',
+    'nsMargin.h',
+    'nsPoint.h',
+    'nsRect.h',
+    'nsRegion.h',
+    'nsRenderingContext.h',
+    'nsSize.h',
+    'nsThemeConstants.h',
+    'nsTransform2D.h',
+]
+
+if CONFIG['MOZ_X11']:
+    EXPORTS.mozilla += ['X11Util.h']
diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in
index b7d195cdf18b..6b1e16f46e11 100644
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -17,148 +17,12 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
-EXPORTS	= \
-	gfx2DGlue.h \
-	gfx3DMatrix.h \
-	gfxASurface.h \
-	gfxAlphaRecovery.h \
-	gfxBlur.h \
-	gfxCachedTempSurface.h \
-	gfxColor.h \
-	gfxContext.h \
-	gfxDrawable.h \
-	gfxFailure.h \
-	gfxFont.h \
-	gfxFontConstants.h \
-	gfxFontFeatures.h \
-	gfxFontUtils.h \
-	gfxFontTest.h \
-	gfxImageSurface.h \
-	gfxLineSegment.h \
-	gfxMatrix.h \
-	gfxPath.h \
-	gfxPattern.h \
-	gfxPlatform.h \
-	gfxPoint.h \
-	gfxPoint3D.h \
-	gfxPointH3D.h \
-	gfxQuad.h \
-	gfxQuaternion.h \
-	gfxRect.h \
-	gfxSkipChars.h \
-	gfxTeeSurface.h \
-	gfxTypes.h \
-	gfxUtils.h \
-	gfxUserFontSet.h \
-	nsSurfaceTexture.h \
-	gfxBaseSharedMemorySurface.h \
-	gfxSharedImageSurface.h \
-	gfxSharedQuartzSurface.h \
-	gfxReusableSurfaceWrapper.h \
-	gfxSVGGlyphs.h \
-	RoundedRect.h \
-	$(NULL)
-
 # gfxSVGGlyphs needs nsDOMParser.h
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/content/base/public \
 	-I$(topsrcdir)/content/xml/document/src \
 	$(NULL)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-EXPORTS += \
-	gfxAndroidPlatform.h \
-	gfxFT2Fonts.h \
-	gfxFT2FontBase.h \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-EXPORTS += \
-	gfxAndroidPlatform.h \
-	gfxFT2Fonts.h \
-	gfxFT2FontBase.h \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-EXPORTS += \
-	gfxPlatformMac.h \
-	gfxQuartzSurface.h \
-	gfxQuartzImageSurface.h \
-	gfxQuartzNativeDrawing.h \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-EXPORTS += \
-	gfxFT2FontBase.h \
-	gfxGdkNativeRenderer.h \
-	gfxPDFSurface.h \
-	gfxPSSurface.h \
-	gfxPlatformGtk.h \
-	$(NULL)
-
-ifdef MOZ_X11
-EXPORTS += \
-	gfxXlibSurface.h \
-        gfxXlibNativeRenderer.h \
-	$(NULL)
-endif
-
-ifdef MOZ_PANGO
-EXPORTS += gfxPangoFonts.h
-else
-EXPORTS += gfxFT2Fonts.h
-endif
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXPORTS	+= \
-	gfxOS2Fonts.h \
-	gfxOS2Platform.h \
-	gfxOS2Surface.h \
-	gfxPDFSurface.h \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-EXPORTS += \
-	gfxFT2FontBase.h \
-	gfxQPainterSurface.h \
-	gfxQtNativeRenderer.h \
-	gfxQtPlatform.h \
-	gfxPDFSurface.h \
-	$(NULL)
-
-ifdef MOZ_X11
-EXPORTS += \
-	gfxXlibSurface.h \
-	$(NULL)
-endif
-
-ifdef MOZ_PANGO
-EXPORTS += gfxPangoFonts.h
-else
-EXPORTS += gfxFT2Fonts.h
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXPORTS	+= \
-	gfxPDFSurface.h \
-	gfxWindowsPlatform.h \
-	gfxWindowsSurface.h \
-	gfxWindowsNativeDrawing.h \
-	gfxDWriteFonts.h \
-	gfxD2DSurface.h \
-	gfxGDIFont.h \
-	gfxGDIFontList.h \
-	gfxPlatformFontList.h \
-	$(NULL)
-endif
-
 CPPSRCS	= \
 	gfx3DMatrix.cpp \
 	gfxASurface.cpp \
@@ -243,9 +107,6 @@ ACDEFINES +=	-UWIN32_LEAN_AND_MEAN
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-EXPORTS	+= \
-	gfxPDFSurface.h \
-	$(NULL)
 CPPSRCS += \
 	gfxAndroidPlatform.cpp \
 	gfxFT2Fonts.cpp \
@@ -261,9 +122,6 @@ DEFINES +=	-DMOZ_USING_ANDROID_JAVA_WIDGETS
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-EXPORTS	+= \
-	gfxPDFSurface.h \
-	$(NULL)
 CPPSRCS += \
 	gfxAndroidPlatform.cpp \
 	gfxFT2Fonts.cpp \
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 0cbbe72570ef..b59c7e7f19e0 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -6,3 +6,122 @@
 
 MODULE = 'thebes'
 
+EXPORTS += [
+    'RoundedRect.h',
+    'gfx2DGlue.h',
+    'gfx3DMatrix.h',
+    'gfxASurface.h',
+    'gfxAlphaRecovery.h',
+    'gfxBaseSharedMemorySurface.h',
+    'gfxBlur.h',
+    'gfxCachedTempSurface.h',
+    'gfxColor.h',
+    'gfxContext.h',
+    'gfxDrawable.h',
+    'gfxFailure.h',
+    'gfxFont.h',
+    'gfxFontConstants.h',
+    'gfxFontFeatures.h',
+    'gfxFontTest.h',
+    'gfxFontUtils.h',
+    'gfxImageSurface.h',
+    'gfxLineSegment.h',
+    'gfxMatrix.h',
+    'gfxPath.h',
+    'gfxPattern.h',
+    'gfxPlatform.h',
+    'gfxPoint.h',
+    'gfxPoint3D.h',
+    'gfxPointH3D.h',
+    'gfxQuad.h',
+    'gfxQuaternion.h',
+    'gfxRect.h',
+    'gfxReusableSurfaceWrapper.h',
+    'gfxSVGGlyphs.h',
+    'gfxSharedImageSurface.h',
+    'gfxSharedQuartzSurface.h',
+    'gfxSkipChars.h',
+    'gfxTeeSurface.h',
+    'gfxTypes.h',
+    'gfxUserFontSet.h',
+    'gfxUtils.h',
+    'nsSurfaceTexture.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    EXPORTS += [
+        'gfxAndroidPlatform.h',
+        'gfxFT2Fonts.h',
+        'gfxFT2FontBase.h',
+        'gfxPDFSurface.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    EXPORTS += [
+        'gfxAndroidPlatform.h',
+        'gfxFT2Fonts.h',
+        'gfxFT2FontBase.h',
+        'gfxPDFSurface.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXPORTS += [
+        'gfxPlatformMac.h',
+        'gfxQuartzSurface.h',
+        'gfxQuartzImageSurface.h',
+        'gfxQuartzNativeDrawing.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
+    EXPORTS += [
+        'gfxFT2FontBase.h',
+        'gfxGdkNativeRenderer.h',
+        'gfxPDFSurface.h',
+        'gfxPSSurface.h',
+        'gfxPlatformGtk.h',
+    ]
+
+    if CONFIG['MOZ_X11']:
+        EXPORTS += [
+            'gfxXlibSurface.h',
+            'gfxXlibNativeRenderer.h',
+        ]
+
+    if CONFIG['MOZ_PANGO']:
+        EXPORTS += ['gfxPangoFonts.h']
+    else:
+        EXPORTS += ['gfxFT2Fonts.h']
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
+    EXPORTS += [
+        'gfxOS2Fonts.h',
+        'gfxOS2Platform.h',
+        'gfxOS2Surface.h',
+        'gfxPDFSurface.h',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+    EXPORTS += [
+        'gfxFT2FontBase.h',
+        'gfxQPainterSurface.h',
+        'gfxQtNativeRenderer.h',
+        'gfxQtPlatform.h',
+        'gfxPDFSurface.h',
+    ]
+
+    if CONFIG['MOZ_X11']:
+        EXPORTS += [
+            'gfxXlibSurface.h',
+        ]
+
+    if CONFIG['MOZ_PANGO']:
+        EXPORTS += ['gfxPangoFonts.h']
+    else:
+        EXPORTS += ['gfxFT2Fonts.h']
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXPORTS += [
+        'gfxPDFSurface.h',
+        'gfxWindowsPlatform.h',
+        'gfxWindowsSurface.h',
+        'gfxWindowsNativeDrawing.h',
+        'gfxDWriteFonts.h',
+        'gfxD2DSurface.h',
+        'gfxGDIFont.h',
+        'gfxGDIFontList.h',
+        'gfxPlatformFontList.h',
+    ]
diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in
index 7b6d34d97364..7f7dc023fc32 100644
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -11,12 +11,6 @@ EXPORT_LIBRARY = 1
 
 DEFINES += -D_IMPL_NS_GFX
 
-EXPORTS      = chromium_types.h \
-               yuv_convert.h \
-               yuv_row.h \
-               ycbcr_to_rgb565.h \
-               $(NULL)
-
 CPPSRCS = yuv_convert.cpp \
           yuv_row_c.cpp \
           yuv_row_table.cpp \
diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build
index e0f34ff68d8a..521af421a0cd 100644
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'ycbcr'
 
+EXPORTS += [
+    'chromium_types.h',
+    'ycbcr_to_rgb565.h',
+    'yuv_convert.h',
+    'yuv_row.h',
+]
+
diff --git a/hal/Makefile.in b/hal/Makefile.in
index ed63727f8498..2bcfe435bd6a 100644
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -25,16 +25,6 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla
-EXPORTS_mozilla = \
-  Hal.h \
-  HalImpl.h \
-  HalSandbox.h \
-  HalSensor.h \
-  HalTypes.h \
-  HalWakeLock.h \
-  $(NULL)
-
 CPPSRCS = \
   Hal.cpp \
   SandboxHal.cpp \
diff --git a/hal/moz.build b/hal/moz.build
index f61cd068ffa5..100e25b18151 100644
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -10,3 +10,12 @@ XPIDL_SOURCES += [
 
 MODULE = 'hal'
 
+EXPORTS.mozilla += [
+    'Hal.h',
+    'HalImpl.h',
+    'HalSandbox.h',
+    'HalSensor.h',
+    'HalTypes.h',
+    'HalWakeLock.h',
+]
+
diff --git a/image/public/Makefile.in b/image/public/Makefile.in
index 05798547f568..b7dfd3988bb3 100644
--- a/image/public/Makefile.in
+++ b/image/public/Makefile.in
@@ -11,7 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= ImageLogging.h
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/image/public/moz.build b/image/public/moz.build
index efb8faef4b34..bda4ba6ebdb5 100644
--- a/image/public/moz.build
+++ b/image/public/moz.build
@@ -19,3 +19,7 @@ XPIDL_SOURCES += [
 
 MODULE = 'imglib2'
 
+EXPORTS += [
+    'ImageLogging.h',
+]
+
diff --git a/image/src/Makefile.in b/image/src/Makefile.in
index 897a40f02bdb..0d8f6c89a14c 100644
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -17,12 +17,6 @@ LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 
-EXPORTS		=  imgLoader.h \
-		   imgRequest.h \
-		   imgRequestProxy.h \
-		   ImageOps.h \
-		   $(NULL)
-
 CPPSRCS		= \
 			Image.cpp \
 			ImageFactory.cpp \
diff --git a/image/src/moz.build b/image/src/moz.build
index 13cedf11b6e6..38db8f492ae4 100644
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'imglib2'
 
+EXPORTS += [
+    'ImageOps.h',
+    'imgLoader.h',
+    'imgRequest.h',
+    'imgRequestProxy.h',
+]
+
diff --git a/intl/chardet/public/Makefile.in b/intl/chardet/public/Makefile.in
index cf7dcf9ba289..ac724e1bc29c 100644
--- a/intl/chardet/public/Makefile.in
+++ b/intl/chardet/public/Makefile.in
@@ -10,12 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsDetectionConfident.h \
-		nsICharsetDetectionObserver.h \
-		nsICharsetDetector.h \
-		nsIStringCharsetDetector.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/intl/chardet/public/moz.build b/intl/chardet/public/moz.build
index eef1b390e46c..bea11ce78923 100644
--- a/intl/chardet/public/moz.build
+++ b/intl/chardet/public/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'chardet'
 
+EXPORTS += [
+    'nsDetectionConfident.h',
+    'nsICharsetDetectionObserver.h',
+    'nsICharsetDetector.h',
+    'nsIStringCharsetDetector.h',
+]
+
diff --git a/intl/hyphenation/public/Makefile.in b/intl/hyphenation/public/Makefile.in
index e39dc8a70809..d2044d8ab77b 100644
--- a/intl/hyphenation/public/Makefile.in
+++ b/intl/hyphenation/public/Makefile.in
@@ -9,10 +9,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsHyphenationManager.h \
-		nsHyphenator.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/intl/hyphenation/public/moz.build b/intl/hyphenation/public/moz.build
index e6c45d6e1e46..1f8ec023866f 100644
--- a/intl/hyphenation/public/moz.build
+++ b/intl/hyphenation/public/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'hyphenation'
 
+EXPORTS += [
+    'nsHyphenationManager.h',
+    'nsHyphenator.h',
+]
+
diff --git a/intl/locale/public/Makefile.in b/intl/locale/public/Makefile.in
index 07ea1c5896c2..ac724e1bc29c 100644
--- a/intl/locale/public/Makefile.in
+++ b/intl/locale/public/Makefile.in
@@ -10,18 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsCollationCID.h \
-		nsDateTimeFormatCID.h \
-		nsIDateTimeFormat.h \
-		nsILanguageAtomService.h \
-		nsPosixLocale.h \
-		nsIOS2Locale.h \
-		nsWin32Locale.h \
-		nsCharsetAlias.h \
-		nsIPlatformCharset.h \
-		nsLocaleCID.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/intl/locale/public/moz.build b/intl/locale/public/moz.build
index 52481c1f1696..1285ec577e8f 100644
--- a/intl/locale/public/moz.build
+++ b/intl/locale/public/moz.build
@@ -6,3 +6,16 @@
 
 MODULE = 'locale'
 
+EXPORTS += [
+    'nsCharsetAlias.h',
+    'nsCollationCID.h',
+    'nsDateTimeFormatCID.h',
+    'nsIDateTimeFormat.h',
+    'nsILanguageAtomService.h',
+    'nsIOS2Locale.h',
+    'nsIPlatformCharset.h',
+    'nsLocaleCID.h',
+    'nsPosixLocale.h',
+    'nsWin32Locale.h',
+]
+
diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in
index db4da44f7d03..d252057c2e93 100644
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -27,10 +27,6 @@ CPPSRCS		= \
 		nsUConvPropertySearch.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsCollation.h \
-		$(NULL)
-
 EXPORT_RESOURCE = \
 		$(srcdir)/langGroups.properties \
 		$(srcdir)/language.properties \
diff --git a/intl/locale/src/moz.build b/intl/locale/src/moz.build
index aa14c10f6af6..c42d65df0772 100644
--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@@ -15,3 +15,7 @@ else:
 
 MODULE = 'locale'
 
+EXPORTS += [
+    'nsCollation.h',
+]
+
diff --git a/intl/lwbrk/public/Makefile.in b/intl/lwbrk/public/Makefile.in
index a7b1e38e89e2..ac724e1bc29c 100644
--- a/intl/lwbrk/public/Makefile.in
+++ b/intl/lwbrk/public/Makefile.in
@@ -10,11 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsILineBreaker.h \
-		nsIWordBreaker.h \
-		nsLWBrkCIID.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/intl/lwbrk/public/moz.build b/intl/lwbrk/public/moz.build
index 4914e87390af..0ea47dcce74f 100644
--- a/intl/lwbrk/public/moz.build
+++ b/intl/lwbrk/public/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'lwbrk'
 
+EXPORTS += [
+    'nsILineBreaker.h',
+    'nsIWordBreaker.h',
+    'nsLWBrkCIID.h',
+]
+
diff --git a/intl/uconv/public/Makefile.in b/intl/uconv/public/Makefile.in
index 9538536d6b08..ac724e1bc29c 100644
--- a/intl/uconv/public/Makefile.in
+++ b/intl/uconv/public/Makefile.in
@@ -10,13 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsIUnicodeDecoder.h \
-		nsIUnicodeEncoder.h \
-		uconvutil.h \
-		nsEncoderDecoderUtils.h \
-		nsUConvCID.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/intl/uconv/public/moz.build b/intl/uconv/public/moz.build
index 5c414eb753e9..59968cf67496 100644
--- a/intl/uconv/public/moz.build
+++ b/intl/uconv/public/moz.build
@@ -6,3 +6,11 @@
 
 MODULE = 'uconv'
 
+EXPORTS += [
+    'nsEncoderDecoderUtils.h',
+    'nsIUnicodeDecoder.h',
+    'nsIUnicodeEncoder.h',
+    'nsUConvCID.h',
+    'uconvutil.h',
+]
+
diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in
index 365edb27c135..d36008ef85d2 100644
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@@ -26,8 +26,6 @@ CPPSRCS		= \
 		nsGBKConvUtil.cpp \
 		$(NULL)
 
-EXPORTS		= nsUCvCnCID.h
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvcn/moz.build b/intl/uconv/ucvcn/moz.build
index 45358d13bcfe..fbf1d702d4fe 100644
--- a/intl/uconv/ucvcn/moz.build
+++ b/intl/uconv/ucvcn/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ucvcn'
 
+EXPORTS += [
+    'nsUCvCnCID.h',
+]
+
diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in
index 2ad1d809e611..1ca28ef5fdf8 100644
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@@ -41,8 +41,6 @@ CPPSRCS		+= \
 		$(NULL)
 endif
 
-EXPORTS		= nsUCvIBMCID.h
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvibm/moz.build b/intl/uconv/ucvibm/moz.build
index b9c952879637..69e88aaa84a6 100644
--- a/intl/uconv/ucvibm/moz.build
+++ b/intl/uconv/ucvibm/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ucvibm'
 
+EXPORTS += [
+    'nsUCvIBMCID.h',
+]
+
diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in
index d1d612b535ba..1a5d854e9308 100644
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -23,11 +23,6 @@ CPPSRCS		= \
 		nsUnicodeToJISx0201.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsUCVJACID.h \
-		nsUCVJA2CID.h \
-		$(NULL)
-
 #SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX)
 
 LOCAL_INCLUDES	= -I$(srcdir)/../util
diff --git a/intl/uconv/ucvja/moz.build b/intl/uconv/ucvja/moz.build
index 6467e1aa84ff..c59f6e217460 100644
--- a/intl/uconv/ucvja/moz.build
+++ b/intl/uconv/ucvja/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'ucvja'
 
+EXPORTS += [
+    'nsUCVJA2CID.h',
+    'nsUCVJACID.h',
+]
+
diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in
index 4770052433f8..bcfd06e0d9ab 100644
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -23,8 +23,6 @@ CPPSRCS		= \
 		nsJohabToUnicode.cpp \
 		$(NULL)
 
-EXPORTS		= nsUCvKOCID.h
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvko/moz.build b/intl/uconv/ucvko/moz.build
index bb5a7a4a188f..218da0990980 100644
--- a/intl/uconv/ucvko/moz.build
+++ b/intl/uconv/ucvko/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ucvko'
 
+EXPORTS += [
+    'nsUCvKOCID.h',
+]
+
diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in
index 19fca2ecc252..6737c3e2c7ba 100644
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -132,8 +132,6 @@ CPPSRCS		= \
 		nsUnicodeToTSCII.cpp \
 		$(NULL)
 
-EXPORTS		= nsUCvLatinCID.h
-
 LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src
 
 include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvlatin/moz.build b/intl/uconv/ucvlatin/moz.build
index 4c99cd4451f1..ec99ee054855 100644
--- a/intl/uconv/ucvlatin/moz.build
+++ b/intl/uconv/ucvlatin/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ucvlatin'
 
+EXPORTS += [
+    'nsUCvLatinCID.h',
+]
+
diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in
index b86677173094..5e67edf52ca8 100644
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@@ -23,8 +23,6 @@ CPPSRCS		= \
 		nsUnicodeToHKSCS.cpp \
 		$(NULL)
 
-EXPORTS		= nsUCvTWCID.h
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvtw/moz.build b/intl/uconv/ucvtw/moz.build
index 72e2f9f68ded..d9888d034194 100644
--- a/intl/uconv/ucvtw/moz.build
+++ b/intl/uconv/ucvtw/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ucvtw'
 
+EXPORTS += [
+    'nsUCvTWCID.h',
+]
+
diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in
index c05d3e7b251b..76f48662fb6f 100644
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@@ -24,7 +24,5 @@ CPPSRCS		= \
 
 LOCAL_INCLUDES	= -I$(srcdir)/../util
 
-EXPORTS		= nsUCvTW2CID.h
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/intl/uconv/ucvtw2/moz.build b/intl/uconv/ucvtw2/moz.build
index d69b3e48097a..a9fd123d525c 100644
--- a/intl/uconv/ucvtw2/moz.build
+++ b/intl/uconv/ucvtw2/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ucvtw2'
 
+EXPORTS += [
+    'nsUCvTW2CID.h',
+]
+
diff --git a/intl/unicharutil/public/Makefile.in b/intl/unicharutil/public/Makefile.in
index ff4b9e04fba3..ac724e1bc29c 100644
--- a/intl/unicharutil/public/Makefile.in
+++ b/intl/unicharutil/public/Makefile.in
@@ -10,12 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsICaseConversion.h \
-		nsIUGenCategory.h \
-		nsUnicharUtilCIID.h \
-		nsUnicodeNormalizer.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/intl/unicharutil/public/moz.build b/intl/unicharutil/public/moz.build
index 53c86e912271..5892a753168d 100644
--- a/intl/unicharutil/public/moz.build
+++ b/intl/unicharutil/public/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'unicharutil'
 
+EXPORTS += [
+    'nsICaseConversion.h',
+    'nsIUGenCategory.h',
+    'nsUnicharUtilCIID.h',
+    'nsUnicodeNormalizer.h',
+]
+
diff --git a/intl/unicharutil/util/Makefile.in b/intl/unicharutil/util/Makefile.in
index 0e918c698678..38a364521718 100644
--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@@ -25,13 +25,6 @@ SDK_HEADERS = \
 	nsUnicharUtils.h \
 	$(NULL)
 
-EXPORTS = \
-	nsBidiUtils.h \
-	nsSpecialCasingData.h \
-	nsUnicodeProperties.h \
-	nsUnicodeScriptCodes.h \
-	$(NULL)
-
 CPPSRCS	= \
 	nsUnicharUtils.cpp \
 	nsBidiUtils.cpp \
diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
index 464297fa9287..f0b71b183088 100644
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -8,3 +8,10 @@ DIRS += ['internal']
 
 MODULE = 'unicharutil'
 
+EXPORTS += [
+    'nsBidiUtils.h',
+    'nsSpecialCasingData.h',
+    'nsUnicodeProperties.h',
+    'nsUnicodeScriptCodes.h',
+]
+
diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in
index 5e0a6d1fe10a..d1a6d5c176f2 100644
--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@@ -18,14 +18,6 @@ ifdef MOZ_ENABLE_DBUS
 	LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
 endif
 
-EXPORTS_NAMESPACES = mozilla/ipc
-
-EXPORTS_mozilla/ipc = \
-  RawDBusConnection.h \
-  DBusThread.h \
-  DBusUtils.h \
-  $(NULL)
-
 CPPSRCS += \
   RawDBusConnection.cpp \
   DBusThread.cpp \
diff --git a/ipc/dbus/moz.build b/ipc/dbus/moz.build
index 4e3b1f2e0c82..2070049d58a0 100644
--- a/ipc/dbus/moz.build
+++ b/ipc/dbus/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'ipc'
 
+EXPORTS.mozilla.ipc += [
+    'DBusThread.h',
+    'DBusUtils.h',
+    'RawDBusConnection.h',
+]
+
diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in
index 1dfe05c99bf5..3e554d552260 100644
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -16,57 +16,6 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-EXPORTS_NAMESPACES = ipc mozilla/ipc
-
-EXPORTS_ipc = IPCMessageUtils.h
-
-EXPORTS_mozilla/ipc = \
-  AsyncChannel.h \
-  BrowserProcessSubThread.h \
-  CrossProcessMutex.h \
-  FileDescriptor.h \
-  FileDescriptorUtils.h \
-  GeckoChildProcessHost.h \
-  InputStreamUtils.h \
-  IOThreadChild.h \
-  ProcessChild.h \
-  ProtocolUtils.h \
-  RPCChannel.h \
-  SharedMemory.h \
-  SharedMemoryBasic.h \
-  SharedMemorySysV.h \
-  Shmem.h \
-  SyncChannel.h \
-  ScopedXREEmbed.h \
-  Transport.h \
-  URIUtils.h \
-  $(NULL)
-
-EXPORTS = \
-  nsIIPCSerializableInputStream.h \
-  nsIIPCSerializableURI.h \
-  $(NULL)
-
-ifeq ($(OS_ARCH),WINNT) #{
-EXPORTS_mozilla/ipc += \
-  Transport_win.h \
-  $(NULL)
-else
-# POSIX
-EXPORTS_mozilla/ipc += \
-  Transport_posix.h \
-  $(NULL)
-endif #}
-
-ifeq ($(OS_TARGET),Android)
-# Android has its own,
-# almost-but-not-quite-compatible-with-POSIX-or-/dev/shm shared memory
-# impl.
-EXPORTS_mozilla/ipc += SharedMemoryBasic_android.h
-else
-EXPORTS_mozilla/ipc += SharedMemoryBasic_chromium.h
-endif #}
-
 CPPSRCS += \
   AsyncChannel.cpp \
   BrowserProcessSubThread.cpp \
diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build
index 4e3b1f2e0c82..104da923ddd7 100644
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -6,3 +6,51 @@
 
 MODULE = 'ipc'
 
+EXPORTS += [
+    'nsIIPCSerializableInputStream.h',
+    'nsIIPCSerializableURI.h',
+]
+
+EXPORTS.mozilla.ipc += [
+    'AsyncChannel.h',
+    'BrowserProcessSubThread.h',
+    'CrossProcessMutex.h',
+    'FileDescriptor.h',
+    'FileDescriptorUtils.h',
+    'GeckoChildProcessHost.h',
+    'IOThreadChild.h',
+    'InputStreamUtils.h',
+    'ProcessChild.h',
+    'ProtocolUtils.h',
+    'RPCChannel.h',
+    'ScopedXREEmbed.h',
+    'SharedMemory.h',
+    'SharedMemoryBasic.h',
+    'SharedMemorySysV.h',
+    'Shmem.h',
+    'SyncChannel.h',
+    'Transport.h',
+    'URIUtils.h',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXPORTS.mozilla.ipc += [
+        'Transport_win.h',
+    ]
+else:
+    EXPORTS.mozilla.ipc += [
+        'Transport_posix.h',
+    ]
+
+# Android has its own,
+# almost-but-not-quite-compatible-with-POSIX-or-/dev/shm shared memory
+# impl.
+if CONFIG['OS_TARGET'] == 'Android':
+    EXPORTS.mozilla.ipc += ['SharedMemoryBasic_android.h']
+else:
+    EXPORTS.mozilla.ipc += ['SharedMemoryBasic_chromium.h']
+
+EXPORTS.ipc += [
+    'IPCMessageUtils.h',
+]
+
diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in
index 14d8df2db9f0..0c56a103b4dc 100644
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -9,14 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = mozilla/_ipdltest
-EXPORTS_mozilla/_ipdltest =  \
-  IPDLUnitTests.h  \
-  IPDLUnitTestProcessChild.h  \
-  IPDLUnitTestTypes.h \
-  IPDLUnitTestUtils.h \
-  $(NULL)
-
 LIBRARY_NAME = $(MODULE)_s
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build
index ec9d31250687..03c56ad2cab4 100644
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -8,3 +8,10 @@ TOOL_DIRS += ['app']
 
 MODULE = 'ipdlunittest'
 
+EXPORTS.mozilla._ipdltest += [
+    'IPDLUnitTestProcessChild.h',
+    'IPDLUnitTestTypes.h',
+    'IPDLUnitTestUtils.h',
+    'IPDLUnitTests.h',
+]
+
diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in
index 24273d9e3b08..dbafdc1cf151 100644
--- a/ipc/netd/Makefile.in
+++ b/ipc/netd/Makefile.in
@@ -14,12 +14,6 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-EXPORTS_NAMESPACES = mozilla/ipc
-
-EXPORTS_mozilla/ipc = \
-  Netd.h \
-  $(NULL)
-
 CPPSRCS += \
   Netd.cpp \
   $(NULL)
diff --git a/ipc/netd/moz.build b/ipc/netd/moz.build
index 4e3b1f2e0c82..c8c354428f6e 100644
--- a/ipc/netd/moz.build
+++ b/ipc/netd/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ipc'
 
+EXPORTS.mozilla.ipc += [
+    'Netd.h',
+]
+
diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in
index 4b7e40d507ca..88345a28c5f4 100644
--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@@ -14,12 +14,6 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-EXPORTS_NAMESPACES = mozilla/ipc
-
-EXPORTS_mozilla/ipc = \
-  Ril.h \
-  $(NULL)
-
 CPPSRCS += \
   Ril.cpp \
   $(NULL)
diff --git a/ipc/ril/moz.build b/ipc/ril/moz.build
index 4e3b1f2e0c82..bbb2da15f484 100644
--- a/ipc/ril/moz.build
+++ b/ipc/ril/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ipc'
 
+EXPORTS.mozilla.ipc += [
+    'Ril.h',
+]
+
diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in
index 9d3d7147527c..b81d2ec371b5 100644
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -16,14 +16,6 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-EXPORTS_NAMESPACES = mozilla/ipc
-
-EXPORTS_mozilla/ipc = \
-  TestShellChild.h \
-  TestShellParent.h \
-  XPCShellEnvironment.h \
-  $(NULL)
-
 CPPSRCS += \
   TestShellChild.cpp \
   TestShellParent.cpp \
diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build
index c0425665dbfa..a3bff58d570d 100644
--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'ipcshell'
 
+EXPORTS.mozilla.ipc += [
+    'TestShellChild.h',
+    'TestShellParent.h',
+    'XPCShellEnvironment.h',
+]
+
diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in
index 46ddaa0f9e19..177434c93694 100644
--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@@ -15,10 +15,6 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/ipc
-
-EXPORTS_mozilla/ipc = UnixSocket.h
-
 CPPSRCS += UnixSocket.cpp
 
 include $(topsrcdir)/config/config.mk
diff --git a/ipc/unixsocket/moz.build b/ipc/unixsocket/moz.build
index 4e3b1f2e0c82..7bdd35879bbb 100644
--- a/ipc/unixsocket/moz.build
+++ b/ipc/unixsocket/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'ipc'
 
+EXPORTS.mozilla.ipc += [
+    'UnixSocket.h',
+]
+
diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in
index 6ee991aeb92a..971785742da7 100644
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -15,16 +15,6 @@ FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/jsipc
-
-EXPORTS_mozilla/jsipc = \
-  CPOWTypes.h \
-  ContextWrapperChild.h \
-  ContextWrapperParent.h \
-  ObjectWrapperParent.h \
-  ObjectWrapperChild.h \
-  $(NULL)
-
 CPPSRCS = \
   ObjectWrapperParent.cpp \
   ObjectWrapperChild.cpp \
diff --git a/js/ipc/moz.build b/js/ipc/moz.build
index ef76dfaaf1a7..08582ab5ac7a 100644
--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -6,3 +6,11 @@
 
 MODULE = 'js'
 
+EXPORTS.mozilla.jsipc += [
+    'CPOWTypes.h',
+    'ContextWrapperChild.h',
+    'ContextWrapperParent.h',
+    'ObjectWrapperChild.h',
+    'ObjectWrapperParent.h',
+]
+
diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index 36a5cfe4b545..400b0c475eb9 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -28,8 +28,6 @@ XPCSHELL_TESTS  = test
 
 # REQUIRES	= java js
 
-EXPORTS		= jsdebug.h
-
 ifdef JS_THREADSAFE
 DEFINES         += -DJS_THREADSAFE
 endif
diff --git a/js/jsd/moz.build b/js/jsd/moz.build
index e42cf67ea4d4..b8c5b18f66f6 100644
--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -9,3 +9,7 @@ TEST_TOOL_DIRS += ['test']
 
 MODULE = 'jsdebug'
 
+EXPORTS += [
+    'jsdebug.h',
+]
+
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 290613a002cd..f8f00c3557a0 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -150,37 +150,10 @@ CPPSRCS		+= \
 		$(NULL)
 endif
 
-# Changes to internal header files, used externally, massively slow down
-# browser builds.  Don't add new files here unless you know what you're
-# doing!
-INSTALLED_HEADERS = \
-		js-config.h \
-		jscpucfg.h \
-		js.msg \
-		jsalloc.h \
-		jsapi.h \
-		jsclass.h \
-		jsclist.h \
-		jsdbgapi.h \
-		jsdhash.h \
-		jsfriendapi.h \
-		jslock.h \
-		json.h \
-		jsproxy.h \
-		jsprf.h \
-		jsprototypes.h \
-		jsprvtd.h \
-		jspubtd.h \
-		jstypes.h \
-		jsutil.h \
-		jsversion.h \
-		jswrapper.h \
-		$(NULL)
-
 ######################################################
 # BEGIN include exported headers from the JS engine
 #
-#       Ultimately, after cleansing INSTALLED_HEADERS,
+#       Ultimately, after cleansing EXPORTS,
 #       these will be the ONLY headers exported by
 #       the js engine
 #
@@ -188,29 +161,6 @@ VPATH		+= \
 		$(srcdir)/../public \
 		$(NULL)
 
-EXPORTS_NAMESPACES += js
-
-# If you add a header here, add it to js/src/jsapi-tests/testIntTypesABI.cpp so
-# that we ensure we don't over-expose our internal integer typedefs.  Note that
-# LegacyIntTypes.h below is deliberately exempted from this requirement.
-EXPORTS_js = \
-		Anchor.h \
-		CallArgs.h \
-		CharacterEncoding.h \
-		GCAPI.h \
-		HashTable.h \
-		HeapAPI.h \
-		LegacyIntTypes.h \
-		MemoryMetrics.h \
-		PropertyKey.h \
-		RequiredDefines.h \
-		RootingAPI.h \
-		TemplateLib.h \
-		Utility.h \
-		Value.h \
-		Vector.h \
-		$(NULL)
-
 ###############################################
 # BEGIN enable non-releasable features
 #
@@ -498,18 +448,11 @@ endif # JS_HAS_CTYPES
 
 LOCAL_INCLUDES += -I$(MFBT_ROOT)/double-conversion
 
-ifdef HAVE_DTRACE
-INSTALLED_HEADERS += \
-		$(CURDIR)/javascript-trace.h \
-		$(NULL)
-endif
-
 # PerfMeasurement is available regardless of low-level support for it;
 # it just doesn't necessarily do anything useful.  There is one
 # implementation source file per supported operating system, plus a stub
 # for unsupported OSes, plus the Javascript wrapper.
 VPATH += $(srcdir)/perf
-INSTALLED_HEADERS += jsperf.h
 CPPSRCS += jsperf.cpp
 ifdef HAVE_LINUX_PERF_EVENT_H
 CPPSRCS += pm_linux.cpp
@@ -517,8 +460,6 @@ else
 CPPSRCS += pm_stub.cpp
 endif
 
-EXPORTS = $(INSTALLED_HEADERS)
-
 DASH_R		= -r
 
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
@@ -855,7 +796,7 @@ SDK_BINARY = js-config
 #
 #   $(includedir)/
 #      $(MODULE)/
-#        jsapi.h, jspubtd.h, etc. (all of INSTALLED_HEADERS)
+#        jsapi.h, jspubtd.h, etc. (all of EXPORTS)
 #        js/
 #          js/public/* headers (all are public)
 #        ds/
@@ -887,7 +828,7 @@ SDK_BINARY = js-config
 # this is the structure implemented below.
 #
 
-install:: $(INSTALLED_HEADERS)
+install:: $(EXPORTS)
 	$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)
 
 install:: $(EXPORTS_js)
diff --git a/js/src/moz.build b/js/src/moz.build
index 7d7e72265acc..557d55287979 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -24,5 +24,59 @@ TEST_DIRS += ['tests', 'gdb']
 
 MODULE = 'js'
 
-
 CONFIGURE_SUBST_FILES += ['devtools/rootAnalysis/Makefile']
+
+# Changes to internal header files, used externally, massively slow down
+# browser builds.  Don't add new files here unless you know what you're
+# doing!
+EXPORTS += [
+    'js-config.h',
+    'jscpucfg.h',
+    'js.msg',
+    'jsalloc.h',
+    'jsapi.h',
+    'jsclass.h',
+    'jsclist.h',
+    'jsdbgapi.h',
+    'jsdhash.h',
+    'jsfriendapi.h',
+    'jslock.h',
+    'json.h',
+    'jsproxy.h',
+    'jsprf.h',
+    'jsprototypes.h',
+    'jsprvtd.h',
+    'jspubtd.h',
+    'jstypes.h',
+    'jsutil.h',
+    'jsversion.h',
+    'jswrapper.h',
+    'jsperf.h',
+]
+
+if CONFIG['HAVE_DTRACE']:
+    EXPORTS += [
+        '$(CURDIR)/javascript-trace.h',
+    ]
+
+# If you add a header here, add it to js/src/jsapi-tests/testIntTypesABI.cpp so
+# that we ensure we don't over-expose our internal integer typedefs.  Note that
+# LegacyIntTypes.h below is deliberately exempted from this requirement.
+EXPORTS.js += [
+    'Anchor.h',
+    'CallArgs.h',
+    'CharacterEncoding.h',
+    'GCAPI.h',
+    'HashTable.h',
+    'HeapAPI.h',
+    'LegacyIntTypes.h',
+    'MemoryMetrics.h',
+    'PropertyKey.h',
+    'RequiredDefines.h',
+    'RootingAPI.h',
+    'TemplateLib.h',
+    'Utility.h',
+    'Value.h',
+    'Vector.h',
+]
+
diff --git a/js/xpconnect/public/Makefile.in b/js/xpconnect/public/Makefile.in
index 07398dccbea5..654736c57b5a 100644
--- a/js/xpconnect/public/Makefile.in
+++ b/js/xpconnect/public/Makefile.in
@@ -10,12 +10,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsAXPCNativeCallContext.h \
-		xpc_map_end.h \
-		nsAutoJSValHolder.h \
-		nsTArrayHelpers.h \
-		SandboxPrivate.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/js/xpconnect/public/moz.build b/js/xpconnect/public/moz.build
index 9044174da20b..f915f42ce230 100644
--- a/js/xpconnect/public/moz.build
+++ b/js/xpconnect/public/moz.build
@@ -6,3 +6,11 @@
 
 MODULE = 'xpconnect'
 
+EXPORTS += [
+    'SandboxPrivate.h',
+    'nsAXPCNativeCallContext.h',
+    'nsAutoJSValHolder.h',
+    'nsTArrayHelpers.h',
+    'xpc_map_end.h',
+]
+
diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
index e4dc3b73ea0a..ddf5b30e7c69 100644
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -13,15 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME    = xpconnect_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
-EXPORTS = \
-		qsObjectHelper.h \
-		xpcObjectHelper.h \
-		xpcpublic.h \
-		XPCJSMemoryReporter.h \
-		GeneratedEvents.h \
-		BackstagePass.h \
-		$(NULL)
-
 CPPSRCS		= \
 		nsScriptError.cpp \
 		nsXPConnect.cpp \
diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build
index 9044174da20b..ee9826ad2d67 100644
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -6,3 +6,12 @@
 
 MODULE = 'xpconnect'
 
+EXPORTS += [
+    'BackstagePass.h',
+    'GeneratedEvents.h',
+    'XPCJSMemoryReporter.h',
+    'qsObjectHelper.h',
+    'xpcObjectHelper.h',
+    'xpcpublic.h',
+]
+
diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in
index ad732db7176f..69b08cfe42b4 100644
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= xpcwrappers_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
-EXPORTS = \
-  WrapperFactory.h \
-  $(NULL)
-
 CPPSRCS = \
   AccessCheck.cpp \
   WaiveXrayWrapper.cpp \
diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build
index 445b2783e34e..f3b0da337ff5 100644
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'xpcwrappers'
 
+EXPORTS += [
+    'WrapperFactory.h',
+]
+
diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in
index dc6135588e10..03c31f16030e 100644
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -18,47 +18,6 @@ endif # !_MSC_VER
 
 
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS		= \
-		DisplayItemClip.h \
-		DisplayListClipState.h \
-		FrameLayerBuilder.h \
-		FramePropertyTable.h \
-		nsArenaMemoryStats.h \
-		nsBidi.h \
-		nsBidiPresUtils.h \
-		nsCaret.h \
-		nsCSSFrameConstructor.h \
-		nsChangeHint.h \
-		nsCompatibility.h \
-		nsDisplayItemTypes.h \
-		nsDisplayItemTypesList.h \
-		nsDisplayList.h \
-		nsDisplayListInvalidation.h \
-		nsFrameManager.h \
-		nsFrameManagerBase.h \
-		nsFrameTraversal.h \
-		nsIFrameTraversal.h \
-		nsILayoutDebugger.h \
-		nsILayoutHistoryState.h \
-		nsIPercentHeightObserver.h  \
-		nsIPresShell.h \
-		nsIReflowCallback.h \
-		nsLayoutUtils.h \
-		nsPresArena.h \
-		nsPresContext.h \
-		nsPresState.h \
-		nsRefreshDriver.h \
-		nsStyleChangeList.h \
-		nsStyleConsts.h \
-		StackArena.h \
-		$(NULL)
-
-EXPORTS_mozilla = \
-  PaintTracker.h \
-  $(NULL)
-
 CPPSRCS		= \
 		DisplayItemClip.cpp \
 		DisplayListClipState.cpp \
@@ -95,9 +54,6 @@ CPPSRCS		= \
 		$(NULL)
 
 ifndef MOZ_XUL
-EXPORTS    += \
-		nsPIBoxObject.h \
-		$(NULL)
 CPPSRCS    += \
 		nsBoxObject.cpp \
 		$(NULL)
diff --git a/layout/base/moz.build b/layout/base/moz.build
index de6f74054aa6..ff9ed1914d7f 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -14,8 +14,50 @@ if not CONFIG['MOZ_XUL']:
     XPIDL_SOURCES += [
         'nsIBoxObject.idl',
     ]
+    EXPORTS    += [
+        'nsPIBoxObject.h',
+    ]
 
 XPIDL_MODULE = 'layout_base'
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'DisplayItemClip.h',
+    'DisplayListClipState.h',
+    'FrameLayerBuilder.h',
+    'FramePropertyTable.h',
+    'StackArena.h',
+    'nsArenaMemoryStats.h',
+    'nsBidi.h',
+    'nsBidiPresUtils.h',
+    'nsCSSFrameConstructor.h',
+    'nsCaret.h',
+    'nsChangeHint.h',
+    'nsCompatibility.h',
+    'nsDisplayItemTypes.h',
+    'nsDisplayItemTypesList.h',
+    'nsDisplayList.h',
+    'nsDisplayListInvalidation.h',
+    'nsFrameManager.h',
+    'nsFrameManagerBase.h',
+    'nsFrameTraversal.h',
+    'nsIFrameTraversal.h',
+    'nsILayoutDebugger.h',
+    'nsILayoutHistoryState.h',
+    'nsIPercentHeightObserver.h',
+    'nsIPresShell.h',
+    'nsIReflowCallback.h',
+    'nsLayoutUtils.h',
+    'nsPresArena.h',
+    'nsPresContext.h',
+    'nsPresState.h',
+    'nsRefreshDriver.h',
+    'nsStyleChangeList.h',
+    'nsStyleConsts.h',
+]
+
+EXPORTS.mozilla += [
+    'PaintTracker.h',
+]
+
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index afa2e9f40f56..e0af088078a5 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -29,12 +29,6 @@ CPPSRCS		= \
 		nsLayoutStatics.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsLayoutCID.h \
-		nsContentDLF.h \
-		nsLayoutStatics.h \
-		$(NULL)
-
 SHARED_LIBRARY_LIBS = \
 	../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
 	../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 3fdb57646108..022e8e0d183a 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'nsContentDLF.h',
+    'nsLayoutCID.h',
+    'nsLayoutStatics.h',
+]
+
diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in
index f0c8b7abf97b..8d1d87883b00 100644
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -14,14 +14,6 @@ LIBRARY_NAME	= gkforms_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS		= \
-		nsIListControlFrame.h \
-		nsIComboboxControlFrame.h \
-		nsIFormControlFrame.h \
-		nsISelectControlFrame.h \
-		nsITextControlFrame.h \
-		$(NULL)
-
 CPPSRCS		= \
 		nsButtonFrameRenderer.cpp \
 		nsComboboxControlFrame.cpp \
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index 4a7d52c4e511..0d470c306c3c 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -8,3 +8,11 @@ TEST_DIRS += ['test']
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'nsIComboboxControlFrame.h',
+    'nsIFormControlFrame.h',
+    'nsIListControlFrame.h',
+    'nsISelectControlFrame.h',
+    'nsITextControlFrame.h',
+]
+
diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in
index cfe0c28c8177..5b1861d793b2 100644
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -15,39 +15,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
-EXPORTS		= \
-		nsQueryFrame.h \
-		nsFrameIdList.h \
-		nsFrameList.h \
-		nsCanvasFrame.h \
-		nsHTMLParts.h \
-		nsHTMLReflowMetrics.h \
-		nsHTMLReflowState.h \
-		nsIAnonymousContentCreator.h \
-		nsIFrame.h \
-		nsIFrameUtil.h \
-		nsILineIterator.h \
-		nsIObjectFrame.h \
-		nsIPageSequenceFrame.h \
-		nsIScrollableFrame.h \
-		ScrollbarActivity.h \
-		nsIStatefulFrame.h \
-		nsFrameSelection.h \
-		nsSubDocumentFrame.h \
-		Selection.h \
-		nsObjectFrame.h \
-		$(NULL)
-
-EXPORTS_NAMESPACES = mozilla/layout mozilla
-
-EXPORTS_mozilla/layout = \
-		FrameChildList.h \
-		$(NULL)
-
-EXPORTS_mozilla = \
-		Selection.h \
-		$(NULL)
-
 CPPSRCS		= \
 		FrameChildList.cpp \
 		nsAbsoluteContainingBlock.cpp \
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index 4a7d52c4e511..5b477bfde970 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -8,3 +8,34 @@ TEST_DIRS += ['test']
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'ScrollbarActivity.h',
+    'Selection.h',
+    'nsCanvasFrame.h',
+    'nsFrameIdList.h',
+    'nsFrameList.h',
+    'nsFrameSelection.h',
+    'nsHTMLParts.h',
+    'nsHTMLReflowMetrics.h',
+    'nsHTMLReflowState.h',
+    'nsIAnonymousContentCreator.h',
+    'nsIFrame.h',
+    'nsIFrameUtil.h',
+    'nsILineIterator.h',
+    'nsIObjectFrame.h',
+    'nsIPageSequenceFrame.h',
+    'nsIScrollableFrame.h',
+    'nsIStatefulFrame.h',
+    'nsObjectFrame.h',
+    'nsQueryFrame.h',
+    'nsSubDocumentFrame.h',
+]
+
+EXPORTS.mozilla += [
+    'Selection.h',
+]
+
+EXPORTS.mozilla.layout += [
+    'FrameChildList.h',
+]
+
diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in
index 4e8bba7e4cea..9533cab27d14 100644
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -14,11 +14,6 @@ LIBRARY_NAME = inspector_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS = \
-  nsFontFace.h \
-  nsFontFaceList.h \
-  $(NULL)
-
 CPPSRCS= \
   inDeepTreeWalker.cpp \
   inFlasher.cpp \
diff --git a/layout/inspector/src/moz.build b/layout/inspector/src/moz.build
index 8be2ec5c3c1f..7078b81e642c 100644
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'inspector'
 
+EXPORTS += [
+    'nsFontFace.h',
+    'nsFontFaceList.h',
+]
+
diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in
index bdd7438a896f..76965e03dc49 100644
--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@@ -15,14 +15,6 @@ FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/layout
-
-EXPORTS_mozilla/layout = \
-  RenderFrameChild.h \
-  RenderFrameParent.h \
-  RenderFrameUtils.h \
-  $(NULL)
-
 CPPSRCS = \
   RenderFrameChild.cpp \
   RenderFrameParent.cpp \
diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build
index 3fdb57646108..86565cc931a3 100644
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'layout'
 
+EXPORTS.mozilla.layout += [
+    'RenderFrameChild.h',
+    'RenderFrameParent.h',
+    'RenderFrameUtils.h',
+]
+
diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in
index ff7b8277a495..286089337c47 100644
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -20,74 +20,6 @@ OS_CFLAGS := $(OS_CFLAGS) -Wshadow
 OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow
 endif
 
-EXPORTS_NAMESPACES = mozilla/css mozilla/dom
-
-EXPORTS		= \
-		AnimationCommon.h \
-		nsAnimationManager.h \
-		nsCSSAnonBoxList.h \
-		nsCSSAnonBoxes.h \
-		nsCSSFontDescList.h \
-		nsCSSKeywordList.h \
-		nsCSSKeywords.h \
-		nsCSSParser.h \
-		nsCSSPropAliasList.h \
-		nsCSSPropList.h \
-		nsCSSProperty.h \
-		nsCSSProps.h \
-		nsCSSPseudoClassList.h \
-		nsCSSPseudoClasses.h \
-		nsCSSPseudoElementList.h \
-		nsCSSPseudoElements.h \
-		nsCSSRuleProcessor.h \
-		nsCSSStyleSheet.h \
-		nsCSSValue.h \
-		nsDOMCSSAttrDeclaration.h \
-		nsDOMCSSDeclaration.h \
-		nsDOMCSSRGBColor.h \
-		nsDOMMediaQueryList.h \
-		nsICSSDeclaration.h \
-		nsICSSLoaderObserver.h \
-		nsICSSPseudoComparator.h \
-		nsICSSRuleList.h \
-		nsICSSStyleRuleDOMWrapper.h \
-		nsIStyleRule.h \
-		nsIStyleRuleProcessor.h \
-		nsIStyleSheet.h \
-		nsLayoutStylesheetCache.h \
-		nsRuleData.h \
-		nsRuleNode.h \
-		nsRuleProcessorData.h \
-		nsRuleWalker.h \
-		nsStyleAnimation.h \
-		nsStyleContext.h \
-		nsStyleCoord.h \
-		nsStyleSet.h \
-		nsStyleStruct.h \
-		nsStyleStructFwd.h \
-		nsStyleStructInlines.h \
-		nsStyleStructList.h \
-		nsStyleTransformMatrix.h \
-		nsStyleUtil.h \
-		$(NULL)
-
-EXPORTS_mozilla/css = \
-		Declaration.h \
-		ErrorReporter.h \
-		GroupRule.h \
-		ImageLoader.h \
-		ImportRule.h \
-		Loader.h \
-		NameSpaceRule.h \
-		Rule.h \
-		StyleRule.h \
-		$(NULL)
-
-EXPORTS_mozilla/dom = \
-		CSS.h \
-		CSSValue.h \
-		$(NULL)
-
 CPPSRCS		= \
 		AnimationCommon.cpp \
 		CSS.cpp \
diff --git a/layout/style/moz.build b/layout/style/moz.build
index 1f33b586cb48..f8906812091f 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -9,3 +9,69 @@ TEST_TOOL_DIRS += ['test']
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'AnimationCommon.h',
+    'nsAnimationManager.h',
+    'nsCSSAnonBoxList.h',
+    'nsCSSAnonBoxes.h',
+    'nsCSSFontDescList.h',
+    'nsCSSKeywordList.h',
+    'nsCSSKeywords.h',
+    'nsCSSParser.h',
+    'nsCSSPropAliasList.h',
+    'nsCSSPropList.h',
+    'nsCSSProperty.h',
+    'nsCSSProps.h',
+    'nsCSSPseudoClassList.h',
+    'nsCSSPseudoClasses.h',
+    'nsCSSPseudoElementList.h',
+    'nsCSSPseudoElements.h',
+    'nsCSSRuleProcessor.h',
+    'nsCSSStyleSheet.h',
+    'nsCSSValue.h',
+    'nsDOMCSSAttrDeclaration.h',
+    'nsDOMCSSDeclaration.h',
+    'nsDOMCSSRGBColor.h',
+    'nsDOMMediaQueryList.h',
+    'nsICSSDeclaration.h',
+    'nsICSSLoaderObserver.h',
+    'nsICSSPseudoComparator.h',
+    'nsICSSRuleList.h',
+    'nsICSSStyleRuleDOMWrapper.h',
+    'nsIStyleRule.h',
+    'nsIStyleRuleProcessor.h',
+    'nsIStyleSheet.h',
+    'nsLayoutStylesheetCache.h',
+    'nsRuleData.h',
+    'nsRuleNode.h',
+    'nsRuleProcessorData.h',
+    'nsRuleWalker.h',
+    'nsStyleAnimation.h',
+    'nsStyleContext.h',
+    'nsStyleCoord.h',
+    'nsStyleSet.h',
+    'nsStyleStruct.h',
+    'nsStyleStructFwd.h',
+    'nsStyleStructInlines.h',
+    'nsStyleStructList.h',
+    'nsStyleTransformMatrix.h',
+    'nsStyleUtil.h',
+]
+
+EXPORTS.mozilla.dom += [
+    'CSS.h',
+    'CSSValue.h',
+]
+
+EXPORTS.mozilla.css += [
+    'Declaration.h',
+    'ErrorReporter.h',
+    'GroupRule.h',
+    'ImageLoader.h',
+    'ImportRule.h',
+    'Loader.h',
+    'NameSpaceRule.h',
+    'Rule.h',
+    'StyleRule.h',
+]
+
diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in
index 1f4969a49d03..56f7d65e8443 100644
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -58,15 +58,6 @@ include $(topsrcdir)/config/config.mk
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
-EXPORTS = \
-	nsSVGEffects.h \
-	nsSVGFilterInstance.h \
-	nsSVGForeignObjectFrame.h \
-	nsSVGIntegrationUtils.h \
-	nsSVGUtils.h \
-	SVGImageContext.h \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index 3fdb57646108..194935eec9be 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -6,3 +6,12 @@
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'SVGImageContext.h',
+    'nsSVGEffects.h',
+    'nsSVGFilterInstance.h',
+    'nsSVGForeignObjectFrame.h',
+    'nsSVGIntegrationUtils.h',
+    'nsSVGUtils.h',
+]
+
diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in
index 1dad47a00de7..31380a64d6b7 100644
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -18,10 +18,6 @@ endif # !_MSC_VER
 
 
 
-EXPORTS		= \
-		nsITableCellLayout.h \
-		$(NULL)
-
 CPPSRCS		= \
 		BasicTableLayoutStrategy.cpp \
 		FixedTableLayoutStrategy.cpp \
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index 4a7d52c4e511..b8d03817b458 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -8,3 +8,7 @@ TEST_DIRS += ['test']
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'nsITableCellLayout.h',
+]
+
diff --git a/layout/tools/layout-debug/src/Makefile.in b/layout/tools/layout-debug/src/Makefile.in
index 07bd3ef8ba50..116e3fa4bfb0 100644
--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -18,10 +18,6 @@ LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 
-EXPORTS		= \
-		nsLayoutDebugCIID.h \
-		$(NULL)
-
 CPPSRCS		= \
 		nsDebugFactory.cpp \
 		nsLayoutDebugCLH.cpp \
diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build
index 5e6a7ada1d6b..0472abb02f6f 100644
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -11,3 +11,7 @@ XPIDL_SOURCES += [
 
 MODULE = 'layout_debug'
 
+EXPORTS += [
+    'nsLayoutDebugCIID.h',
+]
+
diff --git a/layout/xul/base/public/Makefile.in b/layout/xul/base/public/Makefile.in
index 9905be3fe901..b7dfd3988bb3 100644
--- a/layout/xul/base/public/Makefile.in
+++ b/layout/xul/base/public/Makefile.in
@@ -11,11 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= \
-		nsPIBoxObject.h \
-		nsIScrollbarMediator.h \
-		nsXULPopupManager.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/layout/xul/base/public/moz.build b/layout/xul/base/public/moz.build
index 7b8ff87bdf27..f4963b000517 100644
--- a/layout/xul/base/public/moz.build
+++ b/layout/xul/base/public/moz.build
@@ -21,3 +21,9 @@ XPIDL_MODULE = 'layout_xul'
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'nsIScrollbarMediator.h',
+    'nsPIBoxObject.h',
+    'nsXULPopupManager.h',
+]
+
diff --git a/layout/xul/grid/Makefile.in b/layout/xul/grid/Makefile.in
index 1f193b2af941..1e724c3e26b4 100644
--- a/layout/xul/grid/Makefile.in
+++ b/layout/xul/grid/Makefile.in
@@ -26,18 +26,6 @@ CPPSRCS	= \
         nsGridCell.cpp \
         $(NULL)
 
-EXPORTS = \
-          nsGridLayout2.h       \
-          nsGridRowLayout.h \
-          nsGridRowLeafLayout.h \
-          nsGridRowLeafFrame.h \
-          nsGridRowGroupLayout.h \
-          nsIGridPart.h \
-          nsGrid.h \
-          nsGridRow.h \
-          nsGridCell.h \
-          $(NULL)
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../base/src \
diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build
index 3fdb57646108..850c98c39da4 100644
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -6,3 +6,15 @@
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'nsGrid.h',
+    'nsGridCell.h',
+    'nsGridLayout2.h',
+    'nsGridRow.h',
+    'nsGridRowGroupLayout.h',
+    'nsGridRowLayout.h',
+    'nsGridRowLeafFrame.h',
+    'nsGridRowLeafLayout.h',
+    'nsIGridPart.h',
+]
+
diff --git a/layout/xul/tree/Makefile.in b/layout/xul/tree/Makefile.in
index 605038e48480..56dbd49c0edf 100644
--- a/layout/xul/tree/Makefile.in
+++ b/layout/xul/tree/Makefile.in
@@ -26,11 +26,6 @@ CPPSRCS		= \
 		nsTreeUtils.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsTreeColFrame.h \
-		nsTreeUtils.h \
-		$(NULL)
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(topsrcdir)/content/events/src \
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index 255ce8720d7d..8e599e3ff2d9 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -16,3 +16,8 @@ XPIDL_MODULE = 'layout_xul_tree'
 
 MODULE = 'layout'
 
+EXPORTS += [
+    'nsTreeColFrame.h',
+    'nsTreeUtils.h',
+]
+
diff --git a/media/kiss_fft/Makefile.in b/media/kiss_fft/Makefile.in
index 29df7b498532..5f8186445cfe 100644
--- a/media/kiss_fft/Makefile.in
+++ b/media/kiss_fft/Makefile.in
@@ -13,10 +13,6 @@ LIBRARY_NAME = kiss_fft
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
-EXPORTS_NAMESPACES = kiss_fft
-
-EXPORTS_kiss_fft = kiss_fft.h kiss_fftr.h
-
 CSRCS = kiss_fft.c kiss_fftr.c
 
 include $(topsrcdir)/config/rules.mk
diff --git a/media/kiss_fft/moz.build b/media/kiss_fft/moz.build
index 7434f232e31f..1c4d584cc3a4 100644
--- a/media/kiss_fft/moz.build
+++ b/media/kiss_fft/moz.build
@@ -5,3 +5,8 @@
 
 MODULE = 'kiss_fft'
 
+EXPORTS.kiss_fft += [
+    'kiss_fft.h',
+    'kiss_fftr.h',
+]
+
diff --git a/media/libcubeb/include/Makefile.in b/media/libcubeb/include/Makefile.in
index 2b1d051ead81..8f8ae705dd6e 100644
--- a/media/libcubeb/include/Makefile.in
+++ b/media/libcubeb/include/Makefile.in
@@ -9,7 +9,4 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = cubeb
-EXPORTS_cubeb      = cubeb.h cubeb-stdint.h
-
 include $(topsrcdir)/config/rules.mk
diff --git a/media/libcubeb/include/moz.build b/media/libcubeb/include/moz.build
index 895d11993cfb..3ad81074efd0 100644
--- a/media/libcubeb/include/moz.build
+++ b/media/libcubeb/include/moz.build
@@ -4,3 +4,8 @@
 # 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/.
 
+EXPORTS.cubeb += [
+    'cubeb-stdint.h',
+    'cubeb.h',
+]
+
diff --git a/media/libjpeg/Makefile.in b/media/libjpeg/Makefile.in
index 2a208ad1d5d3..58e129fb5062 100644
--- a/media/libjpeg/Makefile.in
+++ b/media/libjpeg/Makefile.in
@@ -148,15 +148,6 @@ ifeq (1,$(LIBJPEG_TURBO_X86_ASM))
 	$(NULL)
 endif
 
-EXPORTS	= \
-	jconfig.h \
-	jerror.h \
-	jinclude.h \
-	jmorecfg.h \
-	jpegint.h \
-	jpeglib.h \
-	$(NULL)
-
 # need static lib for some of the libimg componentry to link properly
 FORCE_STATIC_LIB = 1
 
diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build
index 12aa294fba6b..a16b149afb7c 100644
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@@ -8,3 +8,12 @@ DIRS += ['simd']
 
 MODULE = 'jpeg'
 
+EXPORTS += [
+    'jconfig.h',
+    'jerror.h',
+    'jinclude.h',
+    'jmorecfg.h',
+    'jpegint.h',
+    'jpeglib.h',
+]
+
diff --git a/media/libnestegg/include/Makefile.in b/media/libnestegg/include/Makefile.in
index fd5ad8ae7368..ef40c1e3e807 100644
--- a/media/libnestegg/include/Makefile.in
+++ b/media/libnestegg/include/Makefile.in
@@ -9,7 +9,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = nestegg
-EXPORTS_nestegg    = nestegg.h nestegg-stdint.h
-
 include $(topsrcdir)/config/rules.mk
diff --git a/media/libnestegg/include/moz.build b/media/libnestegg/include/moz.build
index 895d11993cfb..bbd1d0dbbdab 100644
--- a/media/libnestegg/include/moz.build
+++ b/media/libnestegg/include/moz.build
@@ -4,3 +4,8 @@
 # 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/.
 
+EXPORTS.nestegg += [
+    'nestegg-stdint.h',
+    'nestegg.h',
+]
+
diff --git a/media/libogg/include/ogg/Makefile.in b/media/libogg/include/ogg/Makefile.in
index a624b70d05bb..ef40c1e3e807 100644
--- a/media/libogg/include/ogg/Makefile.in
+++ b/media/libogg/include/ogg/Makefile.in
@@ -9,12 +9,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = ogg
-
-EXPORTS_ogg = \
-  ogg.h \
-  config_types.h \
-  os_types.h \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/media/libogg/include/ogg/moz.build b/media/libogg/include/ogg/moz.build
index 895d11993cfb..17db24a3fb75 100644
--- a/media/libogg/include/ogg/moz.build
+++ b/media/libogg/include/ogg/moz.build
@@ -4,3 +4,9 @@
 # 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/.
 
+EXPORTS.ogg += [
+    'config_types.h',
+    'ogg.h',
+    'os_types.h',
+]
+
diff --git a/media/libopus/Makefile.in b/media/libopus/Makefile.in
index 8c1d9da6f2ea..94e00e0da924 100644
--- a/media/libopus/Makefile.in
+++ b/media/libopus/Makefile.in
@@ -35,15 +35,6 @@ ifeq ($(OS_ARCH),SunOS)
 DEFINES += -DHAVE_ALLOCA_H
 endif
 
-EXPORTS_NAMESPACES = opus
-
-EXPORTS_opus = \
-  include/opus.h \
-  include/opus_defines.h \
-  include/opus_types.h \
-  include/opus_multistream.h \
-  $(NULL)
-
 LOCAL_INCLUDES += \
   -I$(srcdir)/include \
   -I$(srcdir)/celt \
diff --git a/media/libopus/moz.build b/media/libopus/moz.build
index f253c1d562ee..14d6ee76e049 100644
--- a/media/libopus/moz.build
+++ b/media/libopus/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'opus'
 
+EXPORTS.opus += [
+    'include/opus.h',
+    'include/opus_defines.h',
+    'include/opus_multistream.h',
+    'include/opus_types.h',
+]
+
diff --git a/media/libpng/Makefile.in b/media/libpng/Makefile.in
index f5392cce87be..a94a5a730aa6 100644
--- a/media/libpng/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -42,8 +42,6 @@ CSRCS		+= \
 DEFINES		+= -DMOZ_PNG_READ \
 		-DMOZ_PNG_WRITE
 
-EXPORTS		= png.h pngconf.h mozpngconf.h
-
 LOCAL_INCLUDES	= -I$(srcdir)
 
 FORCE_STATIC_LIB = 1
diff --git a/media/libpng/moz.build b/media/libpng/moz.build
index 12be53a14124..077f2c50e216 100644
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'png'
 
+EXPORTS += [
+    'mozpngconf.h',
+    'png.h',
+    'pngconf.h',
+]
+
diff --git a/media/libsoundtouch/src/Makefile.in b/media/libsoundtouch/src/Makefile.in
index 7bf8d6ab43d5..9221b1f60996 100644
--- a/media/libsoundtouch/src/Makefile.in
+++ b/media/libsoundtouch/src/Makefile.in
@@ -12,19 +12,11 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = soundtouch
 SHORT_LIBNAME = soundt
 VISIBILITY_FLAGS =
-EXPORTS_NAMESPACES = soundtouch
-
 EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
 
 # Use abort() instead of exception in SoundTouch.
 DEFINES += -DST_NO_EXCEPTION_HANDLING=1
 
-EXPORTS_soundtouch = SoundTouch.h \
-                     STTypes.h \
-                     FIFOSamplePipe.h \
-                     soundtouch_config.h \
-                     $(NULL)
-
 CPPSRCS = AAFilter.cpp \
           cpu_detect_x86.cpp \
           FIFOSampleBuffer.cpp \
diff --git a/media/libsoundtouch/src/moz.build b/media/libsoundtouch/src/moz.build
index 5e97fa2a8798..7737d485c6e7 100644
--- a/media/libsoundtouch/src/moz.build
+++ b/media/libsoundtouch/src/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'soundtouch'
 
+EXPORTS.soundtouch += [
+    'FIFOSamplePipe.h',
+    'STTypes.h',
+    'SoundTouch.h',
+    'soundtouch_config.h',
+]
+
diff --git a/media/libspeex_resampler/src/Makefile.in b/media/libspeex_resampler/src/Makefile.in
index 9b4aab61aed8..83122d1b6536 100644
--- a/media/libspeex_resampler/src/Makefile.in
+++ b/media/libspeex_resampler/src/Makefile.in
@@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = speex_resampler
 FORCE_STATIC_LIB = 1
 
-EXPORTS_NAMESPACES = speex
-
 # We don't compile the full speex codec, only the resampler.
 DEFINES += -DOUTSIDE_SPEEX
 # Speex wants a random prefix when building in another program, to avoid name
@@ -32,10 +30,4 @@ CSRCS = \
     resample.c \
     $(NULL)
 
-EXPORTS_speex = \
-    speex_config_types.h \
-    speex_resampler.h \
-    speex_types.h \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build
index 6446f9d33cc5..a84a46c09744 100644
--- a/media/libspeex_resampler/src/moz.build
+++ b/media/libspeex_resampler/src/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'speex_resampler'
 
+EXPORTS.speex += [
+    'speex_config_types.h',
+    'speex_resampler.h',
+    'speex_types.h',
+]
+
diff --git a/media/libtheora/include/theora/Makefile.in b/media/libtheora/include/theora/Makefile.in
index 9936ce92ed72..ef40c1e3e807 100644
--- a/media/libtheora/include/theora/Makefile.in
+++ b/media/libtheora/include/theora/Makefile.in
@@ -9,13 +9,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = theora
-
-EXPORTS_theora = \
-		theora.h \
-		theoradec.h \
-		theoraenc.h \
-		codec.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/media/libtheora/include/theora/moz.build b/media/libtheora/include/theora/moz.build
index 895d11993cfb..3eee91519442 100644
--- a/media/libtheora/include/theora/moz.build
+++ b/media/libtheora/include/theora/moz.build
@@ -4,3 +4,10 @@
 # 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/.
 
+EXPORTS.theora += [
+    'codec.h',
+    'theora.h',
+    'theoradec.h',
+    'theoraenc.h',
+]
+
diff --git a/media/libtremor/include/tremor/Makefile.in b/media/libtremor/include/tremor/Makefile.in
index 5f689fd730b8..76b2edaa400c 100644
--- a/media/libtremor/include/tremor/Makefile.in
+++ b/media/libtremor/include/tremor/Makefile.in
@@ -9,7 +9,4 @@ VPATH  = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = tremor
-EXPORTS_tremor = ivorbiscodec.h
-
 include $(topsrcdir)/config/rules.mk
diff --git a/media/libtremor/include/tremor/moz.build b/media/libtremor/include/tremor/moz.build
index 895d11993cfb..b4e9a5edebdb 100644
--- a/media/libtremor/include/tremor/moz.build
+++ b/media/libtremor/include/tremor/moz.build
@@ -4,3 +4,7 @@
 # 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/.
 
+EXPORTS.tremor += [
+    'ivorbiscodec.h',
+]
+
diff --git a/media/libvorbis/include/vorbis/Makefile.in b/media/libvorbis/include/vorbis/Makefile.in
index 2f0751107056..ef40c1e3e807 100644
--- a/media/libvorbis/include/vorbis/Makefile.in
+++ b/media/libvorbis/include/vorbis/Makefile.in
@@ -9,7 +9,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = vorbis
-EXPORTS_vorbis = codec.h
-
 include $(topsrcdir)/config/rules.mk
diff --git a/media/libvorbis/include/vorbis/moz.build b/media/libvorbis/include/vorbis/moz.build
index 895d11993cfb..7dbbc499218c 100644
--- a/media/libvorbis/include/vorbis/moz.build
+++ b/media/libvorbis/include/vorbis/moz.build
@@ -4,3 +4,7 @@
 # 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/.
 
+EXPORTS.vorbis += [
+    'codec.h',
+]
+
diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in
index 21d820ecf1af..4e0ee50f9e66 100644
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -67,33 +67,6 @@ ASFLAGS=$(VPX_ASFLAGS) -I. -I$(topsrcdir)/media/libvpx/ -I$(topsrcdir)/media/lib
 AS_DASH_C_FLAG=$(VPX_DASH_C_FLAG)
 ASM_SUFFIX=$(VPX_ASM_SUFFIX)
 
-EXPORTS_NAMESPACES = vpx
-
-EXPORTS_vpx = \
-  vp8.h \
-  vp8cx.h \
-  vp8dx.h \
-  vp8e.h \
-  vpx_codec.h \
-  vpx_codec_impl_bottom.h \
-  vpx_codec_impl_top.h \
-  vpx_decoder.h \
-  vpx_decoder_compat.h \
-  vpx_encoder.h\
-  vpx_image.h \
-  vpx_mem_intrnl.h \
-  vpx_mem.h \
-  mem.h \
-  vpx_integer.h \
-  vpx_timer.h \
-  arm.h \
-  x86.h \
-  scale_mode.h \
-  vpxscale.h \
-  yv12config.h \
-  yv12extend.h \
-  $(NULL)
-
 CSRCS += \
   vpx_config_c.c \
   vp8_dx_iface.c \
diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build
index 8efdf8eedd71..63efae6521b9 100644
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -6,3 +6,28 @@
 
 MODULE = 'vpx'
 
+EXPORTS.vpx += [
+    'arm.h',
+    'mem.h',
+    'scale_mode.h',
+    'vp8.h',
+    'vp8cx.h',
+    'vp8dx.h',
+    'vp8e.h',
+    'vpx_codec.h',
+    'vpx_codec_impl_bottom.h',
+    'vpx_codec_impl_top.h',
+    'vpx_decoder.h',
+    'vpx_decoder_compat.h',
+    'vpx_encoder.h',
+    'vpx_image.h',
+    'vpx_integer.h',
+    'vpx_mem.h',
+    'vpx_mem_intrnl.h',
+    'vpx_timer.h',
+    'vpxscale.h',
+    'x86.h',
+    'yv12config.h',
+    'yv12extend.h',
+]
+
diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in
index cc8435c891f0..f93ca185b0e1 100644
--- a/media/mtransport/build/Makefile.in
+++ b/media/mtransport/build/Makefile.in
@@ -24,26 +24,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
-EXPORTS_NAMESPACES = mtransport
-
-EXPORTS_mtransport = \
-  ../dtlsidentity.h \
-  ../nricectx.h \
-  ../nricemediastream.h \
-  ../nriceresolverfake.h \
-  ../transportflow.h \
-  ../transportlayer.h \
-  ../transportlayerdtls.h \
-  ../transportlayerice.h \
-  ../transportlayerlog.h \
-  ../transportlayerloopback.h \
-  ../transportlayerprsock.h \
-  ../m_cpp_utils.h \
-  ../runnable_utils.h \
-  ../runnable_utils_generated.h \
-  ../sigslot.h \
-  $(NULL)
-
 CPPSRCS = \
 	$(MTRANSPORT_LCPPSRCS) \
 	$(NULL)
diff --git a/media/mtransport/build/moz.build b/media/mtransport/build/moz.build
index 3e50784af93a..1a0488223334 100644
--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@@ -6,3 +6,21 @@
 
 MODULE = 'mtransport'
 
+EXPORTS.mtransport += [
+    '../dtlsidentity.h',
+    '../m_cpp_utils.h',
+    '../nricectx.h',
+    '../nricemediastream.h',
+    '../nriceresolverfake.h',
+    '../runnable_utils.h',
+    '../runnable_utils_generated.h',
+    '../sigslot.h',
+    '../transportflow.h',
+    '../transportlayer.h',
+    '../transportlayerdtls.h',
+    '../transportlayerice.h',
+    '../transportlayerlog.h',
+    '../transportlayerloopback.h',
+    '../transportlayerprsock.h',
+]
+
diff --git a/media/mtransport/standalone/Makefile.in b/media/mtransport/standalone/Makefile.in
index 87e3f2780a40..9ab7522dbc29 100644
--- a/media/mtransport/standalone/Makefile.in
+++ b/media/mtransport/standalone/Makefile.in
@@ -20,22 +20,6 @@ endif
 
 SRCS_IN_OBJDIR	= 1
 
-EXPORTS_NAMESPACES = mtransport
-
-EXPORTS_mtransport = \
-  ../dtlsidentity.h \
-  ../nricectx.h \
-  ../nricemediastream.h \
-  ../nriceresolverfake.h \
-  ../transportflow.h \
-  ../transportlayer.h \
-  ../transportlayerdtls.h \
-  ../transportlayerice.h \
-  ../transportlayerlog.h \
-  ../transportlayerloopback.h \
-  ../transportlayerprsock.h \
-  $(NULL)
-
 CPPSRCS = \
 	$(MTRANSPORT_LCPPSRCS) \
 	$(NULL)
diff --git a/media/mtransport/standalone/moz.build b/media/mtransport/standalone/moz.build
index f37fa3d73472..7a9ab1e353a1 100644
--- a/media/mtransport/standalone/moz.build
+++ b/media/mtransport/standalone/moz.build
@@ -6,3 +6,17 @@
 
 MODULE = 'mtransport_s'
 
+EXPORTS.mtransport += [
+    '../dtlsidentity.h',
+    '../nricectx.h',
+    '../nricemediastream.h',
+    '../nriceresolverfake.h',
+    '../transportflow.h',
+    '../transportlayer.h',
+    '../transportlayerdtls.h',
+    '../transportlayerice.h',
+    '../transportlayerlog.h',
+    '../transportlayerloopback.h',
+    '../transportlayerprsock.h',
+]
+
diff --git a/media/webvtt/Makefile.in b/media/webvtt/Makefile.in
index 3fbc0c8e07f1..cea611b76ca8 100644
--- a/media/webvtt/Makefile.in
+++ b/media/webvtt/Makefile.in
@@ -11,22 +11,11 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME      = webvtt
 
-EXPORTS_NAMESPACES = webvtt
-
 DEFINES += \
   -DWEBVTT_NO_CONFIG_H=1 \
   -DWEBVTT_STATIC=1 \
   $(NULL)
 
-EXPORTS_webvtt = \
-  include/webvtt/cue.h \
-  include/webvtt/error.h \
-  include/webvtt/node.h \
-  include/webvtt/parser.h \
-  include/webvtt/string.h \
-  include/webvtt/util.h \
-  $(NULL)
-
 CSRCS = \
   alloc.c \
   cue.c \
diff --git a/media/webvtt/moz.build b/media/webvtt/moz.build
index 3d8f388c8b7f..8eb36ce5d45e 100644
--- a/media/webvtt/moz.build
+++ b/media/webvtt/moz.build
@@ -27,3 +27,12 @@
 
 MODULE = 'webvtt'
 
+EXPORTS.webvtt += [
+    'include/webvtt/cue.h',
+    'include/webvtt/error.h',
+    'include/webvtt/node.h',
+    'include/webvtt/parser.h',
+    'include/webvtt/string.h',
+    'include/webvtt/util.h',
+]
+
diff --git a/memory/build/Makefile.in b/memory/build/Makefile.in
index ac1d35e41ea7..8a86ed0edb30 100644
--- a/memory/build/Makefile.in
+++ b/memory/build/Makefile.in
@@ -24,11 +24,6 @@ CSRCS = \
   jemalloc_config.c \
   $(NULL)
 
-EXPORTS = \
-  mozmemory.h \
-  mozmemory_wrap.h \
-  $(NULL)
-
 ifdef MOZ_JEMALLOC3
 CSRCS += mozjemalloc_compat.c
 LOCAL_INCLUDES += -I../jemalloc/src/include
@@ -47,11 +42,6 @@ ifdef MOZ_REPLACE_MALLOC
 DEFINES += -DMOZ_REPLACE_MALLOC
 CSRCS += replace_malloc.c
 
-EXPORTS += \
-  replace_malloc.h \
-  malloc_decls.h \
-  $(NULL)
-
 # The zone allocator for OSX needs some jemalloc internal functions
 ifeq (Darwin,$(OS_TARGET))
 LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include
diff --git a/memory/build/moz.build b/memory/build/moz.build
index c4c6f8832383..3223cff8851f 100644
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@@ -6,3 +6,13 @@
 
 MODULE = 'memory'
 
+EXPORTS += [
+    'mozmemory.h',
+    'mozmemory_wrap.h',
+]
+
+if CONFIG['MOZ_REPLACE_MALLOC']:
+    EXPORTS += [
+        'replace_malloc.h',
+        'malloc_decls.h',
+    ]
diff --git a/memory/mozalloc/Makefile.in b/memory/mozalloc/Makefile.in
index 62d01c45c074..86bff9da8bba 100644
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -35,16 +35,6 @@ ifeq (,$(filter-out OS2,$(OS_ARCH)))
 DEFINES		+= -D_GNU_SOURCE
 endif
 
-EXPORTS_NAMESPACES 	= mozilla
-EXPORTS_mozilla 	=			\
-	fallible.h				\
-	mozalloc.h		 		\
-	mozalloc_abort.h			\
-	mozalloc_macro_wrappers.h 		\
-	mozalloc_oom.h				\
-	mozalloc_undef_macro_wrappers.h		\
-	$(NULL)
-
 CPPSRCS 		=			\
 	mozalloc.cpp				\
 	mozalloc_abort.cpp			\
@@ -52,9 +42,6 @@ CPPSRCS 		=			\
 	$(NULL)
 
 ifdef WRAP_STL_INCLUDES #{
-ifdef GNU_CXX #{
-EXPORTS_mozilla	+= throw_gcc.h
-else
 ifdef _MSC_VER #{
 
 ifeq ($(MOZ_MSVC_STL_WRAP__RAISE),1) #{
@@ -66,19 +53,12 @@ endif #}
 endif #}
 
 ifdef BUILD_MSVC_WRAPPERS #{
-EXPORTS_mozilla		+=			\
-	msvc_raise_wrappers.h			\
-	msvc_throw_wrapper.h			\
-	throw_msvc.h				\
-	$(NULL)
-
 CPPSRCS			+= 			\
 	msvc_raise_wrappers.cpp			\
 	msvc_throw_wrapper.cpp			\
 	$(NULL)
 endif #}
 
-endif #}
 endif #}
 
 endif #}
diff --git a/memory/mozalloc/moz.build b/memory/mozalloc/moz.build
index f96aa8c65ba6..0a027faf6def 100644
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -6,3 +6,27 @@
 
 MODULE = 'mozalloc'
 
+EXPORTS.mozilla += [
+    'fallible.h',
+    'mozalloc.h',
+    'mozalloc_abort.h',
+    'mozalloc_macro_wrappers.h',
+    'mozalloc_oom.h',
+    'mozalloc_undef_macro_wrappers.h',
+]
+
+if CONFIG['MOZ_MSVC_STL_WRAP__RAISE'] or CONFIG['MOZ_MSVC_STL_WRAP__Throw']:
+    build_msvc_wrappers = 1
+else:
+    build_msvc_wrappers = 0
+
+if CONFIG['WRAP_STL_INCLUDES']:
+    if CONFIG['GNU_CXX']:
+        EXPORTS.mozilla += ['throw_gcc.h']
+    elif CONFIG['_MSC_VER']:
+        if build_msvc_wrappers:
+            EXPORTS.mozilla += [
+                'msvc_raise_wrappers.h',
+                'msvc_throw_wrapper.h',
+                'throw_msvc.h',
+            ]
diff --git a/memory/mozjemalloc/Makefile.in b/memory/mozjemalloc/Makefile.in
index 03754a96b888..d7ce3d81cf2a 100644
--- a/memory/mozjemalloc/Makefile.in
+++ b/memory/mozjemalloc/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS = jemalloc_types.h
-
 ifndef MOZ_JEMALLOC3
 CSRCS = jemalloc.c
 
diff --git a/memory/mozjemalloc/moz.build b/memory/mozjemalloc/moz.build
index 701c97905383..c3b7a81c5621 100644
--- a/memory/mozjemalloc/moz.build
+++ b/memory/mozjemalloc/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'jemalloc'
 
+EXPORTS += [
+    'jemalloc_types.h',
+]
+
diff --git a/memory/replace/dmd/Makefile.in b/memory/replace/dmd/Makefile.in
index 58aa1d07d351..f738b25aa583 100644
--- a/memory/replace/dmd/Makefile.in
+++ b/memory/replace/dmd/Makefile.in
@@ -26,8 +26,6 @@ CSRCS 		+= strcpy.c
 VPATH 		+= $(topsrcdir)/mfbt
 CPPSRCS 	+= HashFunctions.cpp
 
-EXPORTS 	= DMD.h
-
 # Disable mozglue.
 WRAP_LDFLAGS 	=
 MOZ_GLUE_LDFLAGS=
diff --git a/memory/replace/dmd/moz.build b/memory/replace/dmd/moz.build
index 64441eb79e3c..1a1e9dc1967a 100644
--- a/memory/replace/dmd/moz.build
+++ b/memory/replace/dmd/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'dmd'
 
+EXPORTS += [
+    'DMD.h',
+]
+
diff --git a/mobile/android/components/build/Makefile.in b/mobile/android/components/build/Makefile.in
index b7f32e8ca170..0b61aa8bedca 100644
--- a/mobile/android/components/build/Makefile.in
+++ b/mobile/android/components/build/Makefile.in
@@ -16,9 +16,6 @@ LIBXUL_LIBRARY  = 1
 IS_COMPONENT	= 1
 EXPORT_LIBRARY  = 1
 
-EXPORTS = nsBrowserComponents.h
-
-
 CPPSRCS = \
 	nsBrowserModule.cpp \
 	nsShellService.cpp \
diff --git a/mobile/android/components/build/moz.build b/mobile/android/components/build/moz.build
index a1bf1468889c..cdf42b298ffb 100644
--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -10,3 +10,7 @@ XPIDL_SOURCES += [
 
 MODULE = 'browsercomps'
 
+EXPORTS += [
+    'nsBrowserComponents.h',
+]
+
diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in
index f4f1f1a10d18..5d52eb9edb61 100644
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -36,10 +36,6 @@ CSRCS		= \
 
 HOST_CSRCS	= $(CSRCS)
 
-EXPORTS		= \
-		bzlib.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 # The intermediate (.ii/.s) files for host and target can have the same name...
diff --git a/modules/libbz2/src/moz.build b/modules/libbz2/src/moz.build
index 49a2b848979f..a0a7078d4197 100644
--- a/modules/libbz2/src/moz.build
+++ b/modules/libbz2/src/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'libbz2'
 
+EXPORTS += [
+    'bzlib.h',
+]
+
diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in
index 7c80f0f44de6..a41f96b2d8e5 100644
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -21,8 +21,6 @@ FAIL_ON_WARNINGS = 1
 
 CPPSRCS		= $(MODULES_LIBJAR_LCPPSRCS)
 
-EXPORTS		= $(MODULES_LIBJAR_LEXPORTS)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build
index 16b52b8a0008..ebc10c68b81e 100644
--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@@ -15,3 +15,8 @@ XPIDL_SOURCES += [
 
 MODULE = 'jar'
 
+EXPORTS += [
+    'zipstruct.h',
+    'nsJARURI.h',
+    'nsZipArchive.h',
+]
diff --git a/modules/libjar/objs.mk b/modules/libjar/objs.mk
index b29e30f3c2a6..6ad4b2ad37ed 100644
--- a/modules/libjar/objs.mk
+++ b/modules/libjar/objs.mk
@@ -13,12 +13,6 @@ MODULES_LIBJAR_LCPPSRCS = \
 		nsJARURI.cpp  \
 		$(NULL)
 
-MODULES_LIBJAR_LEXPORTS = \
-		zipstruct.h \
-		nsJARURI.h \
-		nsZipArchive.h \
-		$(NULL)
-
 MODULES_LIBJAR_LXPIDLSRCS = \
 		nsIZipReader.idl \
 		nsIJARChannel.idl \
diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in
index 69b1da43823b..f8a74dc8cedd 100644
--- a/modules/libmar/src/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -31,11 +31,6 @@ CSRCS		= \
 		$(HOST_CSRCS) \
 		$(NULL)
 
-EXPORTS		= \
-		mar.h \
-		mar_cmdline.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 # The intermediate (.ii/.s) files for host and target can have the same name...
diff --git a/modules/libmar/src/moz.build b/modules/libmar/src/moz.build
index cb80e8c43cbe..ebf0fa1cb111 100644
--- a/modules/libmar/src/moz.build
+++ b/modules/libmar/src/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'libmar'
 
+EXPORTS += [
+    'mar.h',
+    'mar_cmdline.h',
+]
+
diff --git a/modules/libpref/public/Makefile.in b/modules/libpref/public/Makefile.in
index c0390737287a..b7dfd3988bb3 100644
--- a/modules/libpref/public/Makefile.in
+++ b/modules/libpref/public/Makefile.in
@@ -11,11 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla = \
-              Preferences.h \
-              $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/modules/libpref/public/moz.build b/modules/libpref/public/moz.build
index 7fba8c28da53..4a25cf31c5c5 100644
--- a/modules/libpref/public/moz.build
+++ b/modules/libpref/public/moz.build
@@ -15,3 +15,7 @@ XPIDL_SOURCES += [
 
 MODULE = 'pref'
 
+EXPORTS.mozilla += [
+    'Preferences.h',
+]
+
diff --git a/modules/zlib/src/Makefile.in b/modules/zlib/src/Makefile.in
index d7dc135d0fea..428d4f7a2def 100644
--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@@ -15,7 +15,4 @@ LIBRARY_NAME	= mozz
 
 CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)
 
-EXPORTS		= zlib.h zconf.h mozzconf.h
-
-
 include $(topsrcdir)/config/rules.mk
diff --git a/modules/zlib/src/moz.build b/modules/zlib/src/moz.build
index 600b6ce6a31e..2ec478dbe09f 100644
--- a/modules/zlib/src/moz.build
+++ b/modules/zlib/src/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'zlib'
 
+EXPORTS += [
+    'mozzconf.h',
+    'zconf.h',
+    'zlib.h',
+]
+
diff --git a/mozglue/android/Makefile.in b/mozglue/android/Makefile.in
index 06784c4747f3..f34463bbc1ef 100644
--- a/mozglue/android/Makefile.in
+++ b/mozglue/android/Makefile.in
@@ -54,8 +54,6 @@ LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/smime
 LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/freebl/
 LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/ssl
 
-EXPORTS = APKOpen.h
-
 include $(topsrcdir)/config/rules.mk
 
 prcpucfg.h: $(topsrcdir)/nsprpub/pr/include/md/_linux.cfg
diff --git a/mozglue/android/moz.build b/mozglue/android/moz.build
index ea12cfedbf72..adb0370a4b7b 100644
--- a/mozglue/android/moz.build
+++ b/mozglue/android/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'android'
 
+EXPORTS += [
+    'APKOpen.h',
+]
+
diff --git a/netwerk/Makefile.in b/netwerk/Makefile.in
index 1c4d89f49d08..cb80f2af6a33 100644
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -9,8 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS     = necko-config.h
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in
index bab67518c5cb..08045875b61a 100644
--- a/netwerk/base/public/Makefile.in
+++ b/netwerk/base/public/Makefile.in
@@ -12,18 +12,6 @@ FAIL_ON_WARNINGS := 1
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= \
-		netCore.h \
-		nsNetUtil.h \
-		nsNetStrings.h \
-		nsChannelProperties.h \
-		nsURIHashKey.h \
-		nsReadLine.h \
-		nsASocketHandler.h \
-		nsAsyncRedirectVerifyHelper.h \
-		nsStreamListenerWrapper.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
diff --git a/netwerk/base/public/moz.build b/netwerk/base/public/moz.build
index 1a0535538b36..54c67775a565 100644
--- a/netwerk/base/public/moz.build
+++ b/netwerk/base/public/moz.build
@@ -118,3 +118,15 @@ if CONFIG['MOZ_TOOLKIT_SEARCH']:
 
 MODULE = 'necko'
 
+EXPORTS += [
+    'netCore.h',
+    'nsASocketHandler.h',
+    'nsAsyncRedirectVerifyHelper.h',
+    'nsChannelProperties.h',
+    'nsNetStrings.h',
+    'nsNetUtil.h',
+    'nsReadLine.h',
+    'nsStreamListenerWrapper.h',
+    'nsURIHashKey.h',
+]
+
diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in
index 6adaf024c112..6023c3c75598 100644
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -15,19 +15,6 @@ LIBRARY_NAME	= neckobase_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS := 1
 
-EXPORTS = \
-		nsMIMEInputStream.h \
-		nsURLHelper.h \
-		nsFileStreams.h \
-		$(NULL)
-
-EXPORTS_NAMESPACES = mozilla/net
-
-EXPORTS_mozilla/net = \
-		Dashboard.h \
-		DashboardTypes.h \
-		$(NULL)
-
 CPPSRCS		= \
 		BackgroundFileSaver.cpp \
 		nsTransportUtils.cpp \
diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build
index 8b58b4859ca4..6b5d7193f6c0 100644
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -6,3 +6,14 @@
 
 MODULE = 'necko'
 
+EXPORTS += [
+    'nsFileStreams.h',
+    'nsMIMEInputStream.h',
+    'nsURLHelper.h',
+]
+
+EXPORTS.mozilla.net += [
+    'Dashboard.h',
+    'DashboardTypes.h',
+]
+
diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in
index b63ecc999e65..55dd4b772152 100644
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -18,8 +18,6 @@ LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 CPPSRCS = nsNetModule.cpp
-EXPORTS = nsNetCID.h
-
 SHARED_LIBRARY_LIBS = \
   ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
   ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build
index 8b58b4859ca4..ee3c1d4a67d5 100644
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'necko'
 
+EXPORTS += [
+    'nsNetCID.h',
+]
+
diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in
index b84ccb271bdb..6befbbd72b2f 100644
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -16,11 +16,6 @@ FAIL_ON_WARNINGS := 1
 
 FORCE_STATIC_LIB = 1
 
-EXPORTS = \
-  nsCacheService.h \
-  nsApplicationCacheService.h \
-  $(NULL)
-
 CPPSRCS = \
   nsCache.cpp \
   nsCacheEntry.cpp \
diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build
index e80624fc9c64..599915e6e321 100644
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -17,3 +17,8 @@ XPIDL_MODULE = 'necko_cache'
 
 MODULE = 'nkcache'
 
+EXPORTS += [
+    'nsApplicationCacheService.h',
+    'nsCacheService.h',
+]
+
diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in
index 3b352363d1eb..658fd7b56871 100644
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -25,13 +25,6 @@ CPPSRCS = \
 
 XPCSHELL_TESTS += test/unit
 
-EXPORTS_NAMESPACES = mozilla/net
-
-EXPORTS_mozilla/net = \
-		CookieServiceParent.h \
-		CookieServiceChild.h  \
-		$(NULL)
-
 CPPSRCS += \
 		CookieServiceParent.cpp \
 		CookieServiceChild.cpp \
diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build
index c21412ef57fe..518c5ce902e2 100644
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -17,3 +17,8 @@ XPIDL_MODULE = 'necko_cookie'
 
 MODULE = 'necko'
 
+if CONFIG['NECKO_COOKIES']:
+    EXPORTS.mozilla.net = [
+        'CookieServiceParent.h',
+        'CookieServiceChild.h',
+    ]
diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in
index 20a2edbc2b53..d68158ce0191 100644
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -28,12 +28,6 @@ CSRCS = \
   punycode.c \
   $(NULL)
 
-EXPORTS_NAMESPACES = mozilla/net
-
-EXPORTS_mozilla/net = \
-  DNS.h \
-  $(null)
-
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
index 9f78262f7c85..1e6f97b2f95f 100644
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -17,3 +17,7 @@ XPIDL_MODULE = 'necko_dns'
 
 MODULE = 'necko'
 
+EXPORTS.mozilla.net += [
+    'DNS.h',
+]
+
diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in
index 4a26ba55278a..45a8abb97f7e 100644
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@@ -14,18 +14,6 @@ LIBRARY_NAME = neckoipc_s
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
-EXPORTS_NAMESPACES = mozilla/net
-
-EXPORTS_mozilla/net = \
-  NeckoParent.h       \
-  NeckoChild.h        \
-  NeckoCommon.h       \
-  NeckoMessageUtils.h \
-  ChannelEventQueue.h \
-  RemoteOpenFileParent.h \
-  RemoteOpenFileChild.h \
-  $(NULL)
-
 CPPSRCS =               \
   NeckoCommon.cpp       \
   NeckoChild.cpp        \
diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build
index 9698dbedc629..2150a00b4dd4 100644
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -12,3 +12,13 @@ XPIDL_MODULE = 'necko_ipc'
 
 MODULE = 'necko'
 
+EXPORTS.mozilla.net += [
+    'ChannelEventQueue.h',
+    'NeckoChild.h',
+    'NeckoCommon.h',
+    'NeckoMessageUtils.h',
+    'NeckoParent.h',
+    'RemoteOpenFileChild.h',
+    'RemoteOpenFileParent.h',
+]
+
diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in
index cca4220456d4..0deafd765640 100644
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@@ -16,10 +16,6 @@ LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
-EXPORTS = \
-  nsMimeTypes.h \
-  $(NULL)
-
 CPPSRCS = \
   nsMIMEHeaderParamImpl.cpp \
   $(NULL)
diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build
index 9e3ef7b9bf7d..5f33604b5f29 100644
--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -16,3 +16,7 @@ XPIDL_FLAGS += [
 
 MODULE = 'mimetype'
 
+EXPORTS += [
+    'nsMimeTypes.h',
+]
+
diff --git a/netwerk/moz.build b/netwerk/moz.build
index e0dcfa67929d..ad37d15c7cc5 100644
--- a/netwerk/moz.build
+++ b/netwerk/moz.build
@@ -36,3 +36,7 @@ TEST_TOOL_DIRS += ['test']
 
 MODULE = 'necko'
 
+EXPORTS += [
+    'necko-config.h',
+]
+
diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in
index a49a5d7fc490..6c8cbcd925f4 100644
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -16,8 +16,6 @@ LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
-EXPORTS = nsAboutProtocolUtils.h
-
 CPPSRCS = \
   nsAboutProtocolHandler.cpp \
   nsAboutBlank.cpp \
diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build
index 988854f800a7..01f4cd8f13ee 100644
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -12,3 +12,7 @@ XPIDL_MODULE = 'necko_about'
 
 MODULE = 'necko'
 
+EXPORTS += [
+    'nsAboutProtocolUtils.h',
+]
+
diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in
index 70508a77da2c..0fc2bdc85402 100644
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@@ -23,13 +23,6 @@ ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += AndroidCaptureProvider.cpp \
            CameraStreamImpl.cpp \
            $(NULL)
-
-EXPORTS_NAMESPACES = mozilla/net
-
-EXPORTS_mozilla/net += \
-  CameraStreamImpl.h  \
-  $(NULL)
-
 endif
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build
index 2889ddb272d8..c23bf3c2ba8b 100644
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'deviceprotocol'
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    EXPORTS.mozilla.net += [
+        'CameraStreamImpl.h',
+    ]
+
diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in
index 1343174f759b..20ebd7f8ea96 100644
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -16,15 +16,6 @@ LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
-EXPORTS = ftpCore.h
-
-EXPORTS_NAMESPACES = mozilla/net
-
-EXPORTS_mozilla/net += \
-  FTPChannelParent.h \
-  FTPChannelChild.h  \
-  $(NULL)
-
 CPPSRCS = \
   nsFtpProtocolHandler.cpp \
   nsFTPChannel.cpp \
diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build
index e6f60698f81d..f768faf54319 100644
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -12,3 +12,12 @@ XPIDL_MODULE = 'necko_ftp'
 
 MODULE = 'necko'
 
+EXPORTS += [
+    'ftpCore.h',
+]
+
+EXPORTS.mozilla.net += [
+    'FTPChannelChild.h',
+    'FTPChannelParent.h',
+]
+
diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in
index 3c9980124bc1..8ca3df0b00d3 100644
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -15,26 +15,6 @@ LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
-EXPORTS_NAMESPACES = mozilla/net
-
-EXPORTS_mozilla/net = \
-  HttpBaseChannel.h \
-  $(NULL)
-
-EXPORTS_mozilla/net += \
-  HttpChannelParent.h \
-  HttpChannelChild.h  \
-  PHttpChannelParams.h \
-  HttpInfo.h \
-  $(NULL)
-
-EXPORTS = \
-  nsHttpResponseHead.h \
-  nsHttpHeaderArray.h \
-  nsHttp.h \
-  nsHttpAtomList.h \
-  $(NULL)
-
 CPPSRCS = \
   nsHttp.cpp \
   nsHttpHeaderArray.cpp \
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index 8fdfe58888c1..11a74965f161 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -26,3 +26,18 @@ XPIDL_FLAGS += [
 
 MODULE = 'necko'
 
+EXPORTS += [
+    'nsHttp.h',
+    'nsHttpAtomList.h',
+    'nsHttpHeaderArray.h',
+    'nsHttpResponseHead.h',
+]
+
+EXPORTS.mozilla.net += [
+    'HttpBaseChannel.h',
+    'HttpChannelChild.h',
+    'HttpChannelParent.h',
+    'HttpInfo.h',
+    'PHttpChannelParams.h',
+]
+
diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in
index ec75608784d6..d1084d0e2ea0 100644
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -14,8 +14,6 @@ LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/net
-
 CPPSRCS = \
   WebSocketChannel.cpp \
   WebSocketChannelParent.cpp \
@@ -23,13 +21,6 @@ CPPSRCS = \
   BaseWebSocketChannel.cpp \
   $(NULL)
 
-EXPORTS_mozilla/net = \
-  WebSocketChannel.h \
-  WebSocketChannelParent.h \
-  WebSocketChannelChild.h \
-  BaseWebSocketChannel.h \
-  $(NULL)
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/content/base/src \
diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build
index 9c57e7a65536..28b25dadf2ff 100644
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -13,3 +13,10 @@ XPIDL_MODULE = 'necko_websocket'
 
 MODULE = 'necko'
 
+EXPORTS.mozilla.net += [
+    'BaseWebSocketChannel.h',
+    'WebSocketChannel.h',
+    'WebSocketChannelChild.h',
+    'WebSocketChannelParent.h',
+]
+
diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in
index db518ccc9270..235acdc72acb 100644
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -14,13 +14,6 @@ LIBXUL_LIBRARY	= 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/net
-
-EXPORTS_mozilla/net += \
-  WyciwygChannelParent.h \
-  WyciwygChannelChild.h  \
-  $(NULL)
-
 CPPSRCS		= \
 		nsWyciwyg.cpp \
 		nsWyciwygChannel.cpp \
diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build
index bfc4ebe73d80..77d7f9436daf 100644
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -16,3 +16,8 @@ XPIDL_FLAGS += [
 
 MODULE = 'necko'
 
+EXPORTS.mozilla.net += [
+    'WyciwygChannelChild.h',
+    'WyciwygChannelParent.h',
+]
+
diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in
index 6801d917e8ff..7ebedffa59fa 100644
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@@ -15,17 +15,10 @@ LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
 
-EXPORTS_NAMESPACES = mozilla/net
-
 CPPSRCS = \
   DataChannel.cpp \
   $(NULL)
 
-EXPORTS_mozilla/net = \
-  DataChannel.h \
-  DataChannelProtocol.h \
-  $(NULL)
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/xpcom/ds \
   -I$(srcdir)/../src \
diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build
index 4a0ee3d72605..ef74519ae1ee 100644
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -8,3 +8,8 @@ XPIDL_MODULE = 'necko_datachan'
 
 MODULE = 'necko'
 
+EXPORTS.mozilla.net += [
+    'DataChannel.h',
+    'DataChannelProtocol.h',
+]
+
diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in
index 09e8c728fa29..eb8660007b80 100644
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@@ -19,8 +19,6 @@ LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
 
-EXPORTS_NAMESPACES = mozilla/net
-
 ifeq ($(OS_TARGET),Android)
 CPPSRCS = \
   ifaddrs_android.cpp \
@@ -55,10 +53,6 @@ CSRCS = \
   sctp6_usrreq.c \
   $(NULL)
 
-EXPORTS_mozilla/net = \
-  usrsctp.h \
-  $(NULL)
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/content/base/src \
diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build
index 664217079327..d9ba7adbea3f 100644
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -8,3 +8,7 @@ XPIDL_MODULE = 'necko_sctp'
 
 MODULE = 'necko'
 
+EXPORTS.mozilla.net += [
+    'usrsctp.h',
+]
+
diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in
index 93adf1a8430a..36ae4c835aaf 100644
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -24,8 +24,6 @@ LIBRARY_NAME = nksrtp_s
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 
-EXPORTS_NAMESPACES = mozilla/net
-
 CSRCS := \
   ekt.c \
   srtp.c \
diff --git a/other-licenses/skia-npapi/Makefile.in b/other-licenses/skia-npapi/Makefile.in
index 5a2324941df5..6a0730260f0f 100644
--- a/other-licenses/skia-npapi/Makefile.in
+++ b/other-licenses/skia-npapi/Makefile.in
@@ -34,6 +34,4 @@ CPPSRCS = \
   ANPTypeface.cpp \
   $(NULL)
 
-EXPORTS = SkANP.h
-
 include $(topsrcdir)/config/rules.mk
diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build
index 60d82642e644..02da1c654f87 100644
--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'skia_npapi'
 
+EXPORTS += [
+    'SkANP.h',
+]
+
diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in
index fdf8a2c49f09..5fe70981d4e6 100644
--- a/other-licenses/snappy/Makefile.in
+++ b/other-licenses/snappy/Makefile.in
@@ -26,12 +26,4 @@ CPPSRCS = \
   snappy-c.cc \
   $(NULL)
 
-EXPORTS_NAMESPACES = snappy
-
-EXPORTS_snappy = \
-  snappy.h \
-  snappy-c.h \
-  snappy-stubs-public.h \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/other-licenses/snappy/moz.build b/other-licenses/snappy/moz.build
index 895d11993cfb..f3356ece1040 100644
--- a/other-licenses/snappy/moz.build
+++ b/other-licenses/snappy/moz.build
@@ -4,3 +4,9 @@
 # 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/.
 
+EXPORTS.snappy += [
+    'snappy-c.h',
+    'snappy-stubs-public.h',
+    'snappy.h',
+]
+
diff --git a/parser/Makefile.in b/parser/Makefile.in
index 74721b700366..8f8ae705dd6e 100644
--- a/parser/Makefile.in
+++ b/parser/Makefile.in
@@ -9,8 +9,4 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS = \
-  nsCharsetSource.h \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/parser/expat/Makefile.in b/parser/expat/Makefile.in
index ea0f01d7c5af..ef40c1e3e807 100644
--- a/parser/expat/Makefile.in
+++ b/parser/expat/Makefile.in
@@ -9,6 +9,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= expat_config.h
-
 include $(topsrcdir)/config/rules.mk
diff --git a/parser/expat/lib/Makefile.in b/parser/expat/lib/Makefile.in
index d97937bab9af..4b5294721bd3 100644
--- a/parser/expat/lib/Makefile.in
+++ b/parser/expat/lib/Makefile.in
@@ -17,10 +17,6 @@ CSRCS		= \
 		xmltok.c \
 		$(NULL)
 
-EXPORTS		= \
-		expat.h \
-		expat_external.h
-
 # We want only the static lib, not the shared lib
 FORCE_STATIC_LIB = 1
 
diff --git a/parser/expat/lib/moz.build b/parser/expat/lib/moz.build
index dd516f255d0a..c3ed00b20226 100644
--- a/parser/expat/lib/moz.build
+++ b/parser/expat/lib/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'expat'
 
+EXPORTS += [
+    'expat.h',
+    'expat_external.h',
+]
+
diff --git a/parser/expat/moz.build b/parser/expat/moz.build
index 0b41ddfe9713..255a1db7743d 100644
--- a/parser/expat/moz.build
+++ b/parser/expat/moz.build
@@ -8,3 +8,7 @@ DIRS += ['lib']
 
 MODULE = 'expat'
 
+EXPORTS += [
+    'expat_config.h',
+]
+
diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in
index 2b5cf8ce6311..9bfb1002616b 100644
--- a/parser/html/Makefile.in
+++ b/parser/html/Makefile.in
@@ -12,42 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= html5p_s
 LIBXUL_LIBRARY	= 1
 
-EXPORTS		= \
-		jArray.h \
-		nsAHtml5TreeBuilderState.h \
-		nsHtml5ArrayCopy.h \
-		nsHtml5Atoms.h \
-		nsHtml5AtomList.h \
-		nsHtml5AtomTable.h \
-		nsHtml5ByteReadable.h \
-		nsHtml5DocumentMode.h \
-		nsHtml5HtmlAttributes.h \
-		nsHtml5Macros.h \
-		nsHtml5MetaScanner.h \
-		nsHtml5MetaScannerHSupplement.h \
- 		nsHtml5Module.h \
-		nsHtml5NamedCharacters.h \
-		nsHtml5NamedCharactersAccel.h \
-		nsHtml5Parser.h \
-		nsHtml5PendingNotification.h \
-		nsHtml5Speculation.h \
-		nsHtml5SpeculativeLoad.h \
-		nsHtml5StreamParser.h \
-		nsHtml5SVGLoadDispatcher.h \
-		nsHtml5TreeOperation.h \
-		nsHtml5TreeOpExecutor.h \
-		nsAHtml5TreeOpSink.h \
-		nsHtml5TreeOpStage.h \
-		nsHtml5UTF16Buffer.h \
-		nsHtml5UTF16BufferHSupplement.h \
-		nsHtml5DependentUTF16Buffer.h \
-		nsHtml5OwningUTF16Buffer.h \
-		nsHtml5PlainTextUtils.h \
-		nsHtml5ViewSourceUtils.h \
-		nsHtml5StringParser.h \
-		nsParserUtils.h \
-		$(NULL)
-
 CPPSRCS		= \
 		nsHtml5Atoms.cpp \
 		nsHtml5Atom.cpp \
diff --git a/parser/html/moz.build b/parser/html/moz.build
index 6f6a05135260..aacebd939a0d 100644
--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -11,3 +11,39 @@ XPIDL_SOURCES += [
 
 MODULE = 'html5'
 
+EXPORTS += [
+    'jArray.h',
+    'nsAHtml5TreeBuilderState.h',
+    'nsAHtml5TreeOpSink.h',
+    'nsHtml5ArrayCopy.h',
+    'nsHtml5AtomList.h',
+    'nsHtml5AtomTable.h',
+    'nsHtml5Atoms.h',
+    'nsHtml5ByteReadable.h',
+    'nsHtml5DependentUTF16Buffer.h',
+    'nsHtml5DocumentMode.h',
+    'nsHtml5HtmlAttributes.h',
+    'nsHtml5Macros.h',
+    'nsHtml5MetaScanner.h',
+    'nsHtml5MetaScannerHSupplement.h',
+    'nsHtml5Module.h',
+    'nsHtml5NamedCharacters.h',
+    'nsHtml5NamedCharactersAccel.h',
+    'nsHtml5OwningUTF16Buffer.h',
+    'nsHtml5Parser.h',
+    'nsHtml5PendingNotification.h',
+    'nsHtml5PlainTextUtils.h',
+    'nsHtml5SVGLoadDispatcher.h',
+    'nsHtml5Speculation.h',
+    'nsHtml5SpeculativeLoad.h',
+    'nsHtml5StreamParser.h',
+    'nsHtml5StringParser.h',
+    'nsHtml5TreeOpExecutor.h',
+    'nsHtml5TreeOpStage.h',
+    'nsHtml5TreeOperation.h',
+    'nsHtml5UTF16Buffer.h',
+    'nsHtml5UTF16BufferHSupplement.h',
+    'nsHtml5ViewSourceUtils.h',
+    'nsParserUtils.h',
+]
+
diff --git a/parser/htmlparser/public/Makefile.in b/parser/htmlparser/public/Makefile.in
index d5a8b6f39030..4d0aa40964aa 100644
--- a/parser/htmlparser/public/Makefile.in
+++ b/parser/htmlparser/public/Makefile.in
@@ -11,26 +11,4 @@ VPATH       = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS = \
-		nsIContentSink.h            \
-		nsITokenizer.h              \
-		nsIHTMLContentSink.h        \
-		nsIFragmentContentSink.h    \
-		nsIParserNode.h             \
-		nsIParser.h                 \
-		nsIDTD.h                    \
-		nsIElementObserver.h        \
-		nsIParserService.h          \
-		nsHTMLTagList.h             \
-		nsHTMLTags.h                \
-		nsHTMLTokens.h              \
-		nsScannerString.h           \
-		nsParserCIID.h              \
-		nsToken.h                   \
-		nsParserConstants.h         \
-		nsParserBase.h             \
-		$(NULL)
-
-EXPORTS   := $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
diff --git a/parser/htmlparser/public/moz.build b/parser/htmlparser/public/moz.build
index 128dbc3a55fd..0aff7b6279d9 100644
--- a/parser/htmlparser/public/moz.build
+++ b/parser/htmlparser/public/moz.build
@@ -11,3 +11,23 @@ XPIDL_SOURCES += [
 
 MODULE = 'htmlparser'
 
+EXPORTS += [
+    'nsHTMLTagList.h',
+    'nsHTMLTags.h',
+    'nsHTMLTokens.h',
+    'nsIContentSink.h',
+    'nsIDTD.h',
+    'nsIElementObserver.h',
+    'nsIFragmentContentSink.h',
+    'nsIHTMLContentSink.h',
+    'nsIParser.h',
+    'nsIParserNode.h',
+    'nsIParserService.h',
+    'nsITokenizer.h',
+    'nsParserBase.h',
+    'nsParserCIID.h',
+    'nsParserConstants.h',
+    'nsScannerString.h',
+    'nsToken.h',
+]
+
diff --git a/parser/moz.build b/parser/moz.build
index 99033018ba4d..c778ff456c1f 100644
--- a/parser/moz.build
+++ b/parser/moz.build
@@ -8,3 +8,7 @@ DIRS += ['expat', 'xml', 'htmlparser', 'html']
 
 MODULE = 'parser'
 
+EXPORTS += [
+    'nsCharsetSource.h',
+]
+
diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in
index aeb39291fae3..9ffd15ca34e0 100644
--- a/parser/xml/src/Makefile.in
+++ b/parser/xml/src/Makefile.in
@@ -21,12 +21,6 @@ CPPSRCS		= \
 		nsSAXXMLReader.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsSAXAttributes.h \
-		nsSAXLocator.h \
-		nsSAXXMLReader.h \
-		$(NULL)
-
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/parser/xml/src/moz.build b/parser/xml/src/moz.build
index 28ade1635442..70c13412cf38 100644
--- a/parser/xml/src/moz.build
+++ b/parser/xml/src/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'xml'
 
+EXPORTS += [
+    'nsSAXAttributes.h',
+    'nsSAXLocator.h',
+    'nsSAXXMLReader.h',
+]
+
diff --git a/profile/dirserviceprovider/public/Makefile.in b/profile/dirserviceprovider/public/Makefile.in
index 6f0c68f146d9..d4892b071d4f 100644
--- a/profile/dirserviceprovider/public/Makefile.in
+++ b/profile/dirserviceprovider/public/Makefile.in
@@ -9,9 +9,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsProfileDirServiceProvider.h   \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/profile/dirserviceprovider/public/moz.build b/profile/dirserviceprovider/public/moz.build
index 3edcb5b8edd6..e5419a10b3dc 100644
--- a/profile/dirserviceprovider/public/moz.build
+++ b/profile/dirserviceprovider/public/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'profdirserviceprovider'
 
+EXPORTS += [
+    'nsProfileDirServiceProvider.h',
+]
+
diff --git a/rdf/base/public/Makefile.in b/rdf/base/public/Makefile.in
index 1ab21ca7aaf2..ac724e1bc29c 100644
--- a/rdf/base/public/Makefile.in
+++ b/rdf/base/public/Makefile.in
@@ -10,10 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		rdf.h \
-		nsIRDFContentSink.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/rdf/base/public/moz.build b/rdf/base/public/moz.build
index 05466ed0fe34..f7bc4129e2e7 100644
--- a/rdf/base/public/moz.build
+++ b/rdf/base/public/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'rdf'
 
+EXPORTS += [
+    'nsIRDFContentSink.h',
+    'rdf.h',
+]
+
diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in
index e711544b60d7..0d9b1640cdd4 100644
--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -27,8 +27,6 @@ SHARED_LIBRARY_LIBS = \
 		../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-EXPORTS		= nsRDFCID.h
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
diff --git a/rdf/build/moz.build b/rdf/build/moz.build
index 05466ed0fe34..406f3af36667 100644
--- a/rdf/build/moz.build
+++ b/rdf/build/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'rdf'
 
+EXPORTS += [
+    'nsRDFCID.h',
+]
+
diff --git a/rdf/datasource/public/Makefile.in b/rdf/datasource/public/Makefile.in
index ff93c762d5eb..ac724e1bc29c 100644
--- a/rdf/datasource/public/Makefile.in
+++ b/rdf/datasource/public/Makefile.in
@@ -10,9 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsILocalStore.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/rdf/datasource/public/moz.build b/rdf/datasource/public/moz.build
index 05466ed0fe34..a9f8aeb403c0 100644
--- a/rdf/datasource/public/moz.build
+++ b/rdf/datasource/public/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'rdf'
 
+EXPORTS += [
+    'nsILocalStore.h',
+]
+
diff --git a/rdf/util/public/Makefile.in b/rdf/util/public/Makefile.in
index 1c770b59d9f6..ac724e1bc29c 100644
--- a/rdf/util/public/Makefile.in
+++ b/rdf/util/public/Makefile.in
@@ -10,7 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= $(srcdir)/nsRDFResource.h
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/rdf/util/public/moz.build b/rdf/util/public/moz.build
index ea9312a2c721..c5a23226ca8e 100644
--- a/rdf/util/public/moz.build
+++ b/rdf/util/public/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'rdfutil'
 
+EXPORTS += [
+    'nsRDFResource.h',
+]
+
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 2898fbc7187c..71294f88752e 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -91,18 +91,5 @@ DEFINES += \
   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
   $(NULL)
 
-EXPORTS += \
-  CryptoTask.h \
-  nsNSSShutDown.h \
-  ScopedNSSTypes.h \
-  nsRandomGenerator.h \
-  $(NULL)
-
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla += \
-  PublicSSL.h \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build
index 1dab6d46dc86..b40211b59ae3 100644
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -6,3 +6,14 @@
 
 MODULE = 'pipnss'
 
+EXPORTS += [
+    'CryptoTask.h',
+    'ScopedNSSTypes.h',
+    'nsNSSShutDown.h',
+    'nsRandomGenerator.h',
+]
+
+EXPORTS.mozilla += [
+    'PublicSSL.h',
+]
+
diff --git a/startupcache/Makefile.in b/startupcache/Makefile.in
index 96f45bc760c2..1552db5658ae 100644
--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@@ -21,9 +21,4 @@ CPPSRCS = StartupCache.cpp \
   StartupCacheModule.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES = mozilla/scache
-EXPORTS_mozilla/scache = StartupCache.h \
-  StartupCacheUtils.h \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/startupcache/moz.build b/startupcache/moz.build
index a0098afa39ed..41a34a7d1c73 100644
--- a/startupcache/moz.build
+++ b/startupcache/moz.build
@@ -13,3 +13,8 @@ XPIDL_SOURCES += [
 
 MODULE = 'startupcache'
 
+EXPORTS.mozilla.scache += [
+    'StartupCache.h',
+    'StartupCacheUtils.h',
+]
+
diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in
index e388b622dfb5..7fcba0674058 100644
--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@@ -17,8 +17,6 @@ MODULE_NAME = mozStorageModule
 LIBXUL_LIBRARY = 1
 
 
-EXPORTS = mozStorageCID.h
-
 CPPSRCS = mozStorageModule.cpp
 
 LOCAL_INCLUDES = \
diff --git a/storage/build/moz.build b/storage/build/moz.build
index 43de43e9233c..eeccbabc0bc8 100644
--- a/storage/build/moz.build
+++ b/storage/build/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'storage'
 
+EXPORTS += [
+    'mozStorageCID.h',
+]
+
diff --git a/storage/public/Makefile.in b/storage/public/Makefile.in
index 69d7eeb737c2..ae8442f27341 100644
--- a/storage/public/Makefile.in
+++ b/storage/public/Makefile.in
@@ -11,21 +11,4 @@ VPATH   = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-# NOTE When adding something to this list, you probably need to add it to the
-#      storage.h file too.
-EXPORTS_NAMESPACES = mozilla mozilla/storage
-
-EXPORTS = \
-	mozStorageHelper.h \
-	$(NULL)
-
-EXPORTS_mozilla = storage.h
-
-# NOTE When adding something to this list, you probably need to add it to the
-#      storage.h file too.
-EXPORTS_mozilla/storage = \
-  StatementCache.h \
-  $(NULL)
-# SEE ABOVE NOTE!
-
 include $(topsrcdir)/config/rules.mk
diff --git a/storage/public/moz.build b/storage/public/moz.build
index 359ebb920e95..2cfd6d21497f 100644
--- a/storage/public/moz.build
+++ b/storage/public/moz.build
@@ -29,3 +29,18 @@ XPIDL_SOURCES += [
 
 MODULE = 'storage'
 
+EXPORTS += [
+    'mozStorageHelper.h',
+]
+
+EXPORTS.mozilla += [
+    'storage.h',
+]
+
+# NOTE When adding something to this list, you probably need to add it to the
+#      storage.h file too.
+EXPORTS.mozilla.storage += [
+    'StatementCache.h',
+]
+# SEE ABOVE NOTE!
+
diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in
index 015f3726f463..0ed7a2bfdcb2 100644
--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@@ -32,13 +32,6 @@ DEFINES += -DMOZ_STORAGE_MEMORY
 endif
 endif
 
-EXPORTS_NAMESPACES = mozilla/storage
-
-EXPORTS_mozilla/storage = \
-  Variant.h \
-  Variant_inl.h \
-  $(NULL)
-
 CPPSRCS = \
   mozStorageService.cpp \
   mozStorageConnection.cpp \
diff --git a/storage/src/moz.build b/storage/src/moz.build
index 43de43e9233c..4ed56218f081 100644
--- a/storage/src/moz.build
+++ b/storage/src/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'storage'
 
+EXPORTS.mozilla.storage += [
+    'Variant.h',
+    'Variant_inl.h',
+]
+
diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in
index c47b4b72ab2e..9f99d61a0418 100644
--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -33,55 +33,6 @@ GTEST_CPPSRCS = \
   SanityTest.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES = gtest gtest/internal gmock gmock/internal
-
-EXPORTS_gtest = \
-  gtest/include/gtest/gtest-death-test.h \
-  gtest/include/gtest/gtest-message.h \
-  gtest/include/gtest/gtest-param-test.h \
-  gtest/include/gtest/gtest-printers.h \
-  gtest/include/gtest/gtest-spi.h \
-  gtest/include/gtest/gtest-test-part.h \
-  gtest/include/gtest/gtest-typed-test.h \
-  gtest/include/gtest/gtest.h \
-  gtest/include/gtest/gtest_pred_impl.h \
-  gtest/include/gtest/gtest_prod.h \
-  $(NULL)
-
-# GTest internal are exposed in gtest.h. See comment in gtest.h
-EXPORTS_gtest/internal = \
-  gtest/include/gtest/internal/gtest-death-test-internal.h \
-  gtest/include/gtest/internal/gtest-filepath.h \
-  gtest/include/gtest/internal/gtest-internal.h \
-  gtest/include/gtest/internal/gtest-linked_ptr.h \
-  gtest/include/gtest/internal/gtest-param-util-generated.h \
-  gtest/include/gtest/internal/gtest-param-util.h \
-  gtest/include/gtest/internal/gtest-port.h \
-  gtest/include/gtest/internal/gtest-string.h \
-  gtest/include/gtest/internal/gtest-tuple.h \
-  gtest/include/gtest/internal/gtest-type-util.h \
-  $(NULL)
-
-EXPORTS_gmock = \
-  gmock/include/gmock/gmock-actions.h \
-  gmock/include/gmock/gmock-cardinalities.h \
-  gmock/include/gmock/gmock-generated-actions.h \
-  gmock/include/gmock/gmock-generated-function-mockers.h \
-  gmock/include/gmock/gmock-generated-matchers.h \
-  gmock/include/gmock/gmock-generated-nice-strict.h \
-  gmock/include/gmock/gmock-matchers.h \
-  gmock/include/gmock/gmock-more-actions.h \
-  gmock/include/gmock/gmock-spec-builders.h \
-  gmock/include/gmock/gmock.h \
-  $(NULL)
-
-# gmock also includes internal interfaces in it's public header
-EXPORTS_gmock/internal = \
-  gmock/include/gmock/internal/gmock-generated-internal-utils.h \
-  gmock/include/gmock/internal/gmock-internal-utils.h \
-  gmock/include/gmock/internal/gmock-port.h \
-  $(NULL)
-
 LOCAL_INCLUDES += \
   -I$(srcdir)/gtest \
   -I$(srcdir)/gtest/include \
diff --git a/testing/gtest/moz.build b/testing/gtest/moz.build
index c01154ee04ee..143027714170 100644
--- a/testing/gtest/moz.build
+++ b/testing/gtest/moz.build
@@ -6,3 +6,50 @@
 
 MODULE = 'gtest'
 
+EXPORTS.gtest += [
+    'gtest/include/gtest/gtest-death-test.h',
+    'gtest/include/gtest/gtest-message.h',
+    'gtest/include/gtest/gtest-param-test.h',
+    'gtest/include/gtest/gtest-printers.h',
+    'gtest/include/gtest/gtest-spi.h',
+    'gtest/include/gtest/gtest-test-part.h',
+    'gtest/include/gtest/gtest-typed-test.h',
+    'gtest/include/gtest/gtest.h',
+    'gtest/include/gtest/gtest_pred_impl.h',
+    'gtest/include/gtest/gtest_prod.h',
+]
+
+# GTest internal are exposed in gtest.h. See comment in gtest.h
+EXPORTS.gtest.internal += [
+    'gtest/include/gtest/internal/gtest-death-test-internal.h',
+    'gtest/include/gtest/internal/gtest-filepath.h',
+    'gtest/include/gtest/internal/gtest-internal.h',
+    'gtest/include/gtest/internal/gtest-linked_ptr.h',
+    'gtest/include/gtest/internal/gtest-param-util-generated.h',
+    'gtest/include/gtest/internal/gtest-param-util.h',
+    'gtest/include/gtest/internal/gtest-port.h',
+    'gtest/include/gtest/internal/gtest-string.h',
+    'gtest/include/gtest/internal/gtest-tuple.h',
+    'gtest/include/gtest/internal/gtest-type-util.h',
+]
+
+EXPORTS.gmock += [
+    'gmock/include/gmock/gmock-actions.h',
+    'gmock/include/gmock/gmock-cardinalities.h',
+    'gmock/include/gmock/gmock-generated-actions.h',
+    'gmock/include/gmock/gmock-generated-function-mockers.h',
+    'gmock/include/gmock/gmock-generated-matchers.h',
+    'gmock/include/gmock/gmock-generated-nice-strict.h',
+    'gmock/include/gmock/gmock-matchers.h',
+    'gmock/include/gmock/gmock-more-actions.h',
+    'gmock/include/gmock/gmock-spec-builders.h',
+    'gmock/include/gmock/gmock.h',
+]
+
+# gmock also includes internal interfaces in it's public header
+EXPORTS.gmock.internal += [
+    'gmock/include/gmock/internal/gmock-generated-internal-utils.h',
+    'gmock/include/gmock/internal/gmock-internal-utils.h',
+    'gmock/include/gmock/internal/gmock-port.h',
+]
+
diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in
index 6f0bb352f5e1..47c6fa8997f0 100644
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -16,8 +16,6 @@ IS_COMPONENT = 1
 MODULE_NAME = nsToolkitCompsModule
 LIBXUL_LIBRARY = 1
 
-EXPORTS = nsToolkitCompsCID.h
-
 CPPSRCS = nsToolkitCompsModule.cpp
 
 include $(topsrcdir)/config/config.mk
diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build
index 3b8b09262348..d01a78024fd9 100644
--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'toolkitcomps'
 
+EXPORTS += [
+    'nsToolkitCompsCID.h',
+]
+
diff --git a/toolkit/components/mediasniffer/Makefile.in b/toolkit/components/mediasniffer/Makefile.in
index 1be77d5680e8..89d51fdf31d1 100644
--- a/toolkit/components/mediasniffer/Makefile.in
+++ b/toolkit/components/mediasniffer/Makefile.in
@@ -21,9 +21,5 @@ CPPSRCS = \
     nsMediaSnifferModule.cpp \
     $(NULL)
 
-EXPORTS = \
-    nsMediaSniffer.h \
-    $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build
index 5bd6caa5bbe5..a397e9da9bc8 100644
--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -8,3 +8,7 @@ TEST_DIRS += ['test']
 
 MODULE = 'mediasniffer'
 
+EXPORTS += [
+    'nsMediaSniffer.h',
+]
+
diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in
index 6d6769597080..f71f1b6be515 100644
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -16,13 +16,6 @@ EXPORT_LIBRARY = 1
 MODULE_NAME = nsPlacesModule
 IS_COMPONENT = 1
 
-EXPORTS_NAMESPACES = mozilla/places
-
-EXPORTS_mozilla/places = \
-  History.h \
-  Database.h \
-  $(NULL)
-
 CPPSRCS = \
   nsAnnoProtocolHandler.cpp \
   nsAnnotationService.cpp \
diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build
index e3dba0b14885..1326e046ff4a 100644
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -27,5 +27,10 @@ if CONFIG['MOZ_PLACES']:
         'nsPIPlacesHistoryListenersNotifier.idl',
     ]
 
+    EXPORTS.mozilla.places = [
+        'History.h',
+        'Database.h',
+    ]
+
 MODULE = 'places'
 
diff --git a/toolkit/components/protobuf/Makefile.in b/toolkit/components/protobuf/Makefile.in
index 56af06e25ed2..23d974e31020 100644
--- a/toolkit/components/protobuf/Makefile.in
+++ b/toolkit/components/protobuf/Makefile.in
@@ -40,34 +40,6 @@ CPPSRCS = \
 # These exports should only be included by source code automatically generated
 # by the protocol compiler, protoc. The verbose naming is due to directory
 # structure included in the generated code.
-EXPORTS_NAMESPACES = protobuf protobuf/google protobuf/google/protobuf protobuf/google/protobuf/stubs protobuf/google/protobuf/io
-
-EXPORTS_protobuf/google/protobuf = \
-  extension_set.h \
-  generated_message_util.h \
-  message_lite.h \
-  repeated_field.h \
-  wire_format_lite.h \
-  wire_format_lite_inl.h \
-  $(NULL)
-
-EXPORTS_protobuf/google/protobuf/stubs = \
-  common.h \
-  hash.h \
-  map-util.h \
-  once.h \
-  stl_util-inl.h \
-  $(NULL)
-
-EXPORTS_protobuf/google/protobuf/io = \
-  coded_stream.h \
-  coded_stream_inl.h \
-  package_info.h \
-  zero_copy_stream.h \
-  zero_copy_stream_impl.h \
-  zero_copy_stream_impl_lite.h \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build
index ff1f61fcda5c..f256ae748c74 100644
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -6,3 +6,29 @@
 
 MODULE = 'protobuf'
 
+EXPORTS.protobuf.google.protobuf += [
+    'extension_set.h',
+    'generated_message_util.h',
+    'message_lite.h',
+    'repeated_field.h',
+    'wire_format_lite.h',
+    'wire_format_lite_inl.h',
+]
+
+EXPORTS.protobuf.google.protobuf.stubs += [
+    'common.h',
+    'hash.h',
+    'map-util.h',
+    'once.h',
+    'stl_util-inl.h',
+]
+
+EXPORTS.protobuf.google.protobuf.io += [
+    'coded_stream.h',
+    'coded_stream_inl.h',
+    'package_info.h',
+    'zero_copy_stream.h',
+    'zero_copy_stream_impl.h',
+    'zero_copy_stream_impl_lite.h',
+]
+
diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in
index 78ce552ae35f..9627e6d6af08 100644
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -19,9 +19,6 @@ CPPSRCS = \
   StartupTimeline.cpp \
   $(NULL)
 
-EXPORTS_NAMESPACES = mozilla
-EXPORTS_mozilla = StartupTimeline.h
-
 ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += nsUserInfoOS2.cpp
 else
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build
index a4cb4a7f477d..b2b5ac742096 100644
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -10,3 +10,7 @@ TEST_DIRS += ['tests/browser']
 
 MODULE = 'toolkitcomps'
 
+EXPORTS.mozilla += [
+    'StartupTimeline.h',
+]
+
diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
index 07c0bdd3d01f..c90a968dceaf 100644
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -21,14 +21,6 @@ FAIL_ON_WARNINGS = 1
 
 LIBRARY_NAME = telemetry
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla = \
-  Telemetry.h \
-  ProcessedStack.h \
-  TelemetryHistogramEnums.h \
-  $(NULL)
-
 EXTRA_PP_COMPONENTS = \
   TelemetryPing.js \
   $(NULL)
diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
index 8b183775c0f9..68371d998b98 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -13,3 +13,9 @@ XPIDL_SOURCES += [
 
 MODULE = 'telemetry'
 
+EXPORTS.mozilla += [
+    'ProcessedStack.h',
+    'Telemetry.h',
+    'TelemetryHistogramEnums.h',
+]
+
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
index f9714a74f318..8cdb53926fe8 100644
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -42,10 +42,6 @@ endif
 LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src
 DEFINES += -DUNICODE -D_UNICODE
 
-EXPORTS = \
-	nsExceptionHandler.h \
-	$(NULL)
-
 CPPSRCS = \
 	nsExceptionHandler.cpp \
 	$(NULL)
diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build
index 43c5596c8876..d276c400bfbc 100644
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -55,3 +55,7 @@ TEST_TOOL_DIRS += ['test']
 
 MODULE = 'crashreporter'
 
+EXPORTS += [
+    'nsExceptionHandler.h',
+]
+
diff --git a/toolkit/mozapps/update/common/Makefile.in b/toolkit/mozapps/update/common/Makefile.in
index afc1d56295c0..b5ab3ddd5048 100644
--- a/toolkit/mozapps/update/common/Makefile.in
+++ b/toolkit/mozapps/update/common/Makefile.in
@@ -21,22 +21,11 @@ CPPSRCS = \
   readstrings.cpp \
   $(NULL)
 
-EXPORTS = updatelogging.h \
-  updatedefines.h \
-  readstrings.h \
-  $(NULL)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS += updatehelper.cpp \
   uachelper.cpp \
   pathhash.cpp \
   $(NULL)
-
-EXPORTS = updatehelper.h \
-  updatehelper.cpp \
-  uachelper.h \
-  pathhash.h \
-  $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build
index 881bb228c76e..69a8da7277d5 100644
--- a/toolkit/mozapps/update/common/moz.build
+++ b/toolkit/mozapps/update/common/moz.build
@@ -6,3 +6,16 @@
 
 MODULE = 'libupdatecommon'
 
+EXPORTS += [
+    'readstrings.h',
+    'updatedefines.h',
+    'updatelogging.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXPORTS += [
+        'updatehelper.h',
+        'updatehelper.cpp',
+        'uachelper.h',
+        'pathhash.h',
+    ]
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 37cd28e01cab..844d64d1eaa3 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -40,7 +40,6 @@ endif
 
 ifdef MOZ_INSTRUMENT_EVENT_LOOP
 CPPSRCS += EventTracer.cpp
-EXPORTS += EventTracer.h
 endif
 
 DEFINES += -DIMPL_XREAPI \
@@ -58,11 +57,9 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS += nsNativeAppSupportWin.cpp
 CPPSRCS += nsWindowsDllBlocklist.cpp
 DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
-EXPORTS += nsWindowsDllInterceptor.h
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CMMSRCS = nsNativeAppSupportCocoa.mm
-EXPORTS += MacQuirks.h
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS += nsNativeAppSupportOS2.cpp
@@ -75,7 +72,6 @@ MOCSRCS += moc_nsNativeAppSupportQt.cpp
 CPPSRCS += $(MOCSRCS)
 CPPSRCS += nsNativeAppSupportQt.cpp
 CPPSRCS += nsQAppInstance.cpp
-EXPORTS += nsQAppInstance.h
 else
 CPPSRCS += nsNativeAppSupportDefault.cpp
 endif
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index 23666a92e405..186976816e91 100644
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -17,3 +17,12 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 
 MODULE = 'xulapp'
 
+if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
+    EXPORTS += ['EventTracer.h']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXPORTS += ['nsWindowsDllInterceptor.h']
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXPORTS += ['MacQuirks.h']
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+    EXPORTS += ['nsQAppInstance.h']
diff --git a/tools/jprof/stub/Makefile.in b/tools/jprof/stub/Makefile.in
index 94e859c9e6ec..8ea5bded36ec 100644
--- a/tools/jprof/stub/Makefile.in
+++ b/tools/jprof/stub/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		=
 LIBRARY_NAME	= jprof
 EXPORT_LIBRARY	= 1
 FORCE_SHARED_LIB = 1
@@ -23,13 +22,6 @@ CPPSRCS		= \
 		libmalloc.cpp \
 		$(NULL)
 
-EXPORTS         = \
-                jprof.h \
-                $(NULL)
-
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
-
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_JPROF_API
diff --git a/tools/jprof/stub/moz.build b/tools/jprof/stub/moz.build
index 4df3c914f6d5..c7ea5a7dcff0 100644
--- a/tools/jprof/stub/moz.build
+++ b/tools/jprof/stub/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'jprof'
 
+EXPORTS += [
+    'jprof.h',
+]
+
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index eb62fbd25143..64b394444d73 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -14,16 +14,7 @@ XPCSHELL_TESTS = tests
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS = GeckoProfiler.h
-
 ifdef MOZ_ENABLE_PROFILER_SPS
-EXPORTS += \
-  GeckoProfilerImpl.h \
-  GeckoProfilerFunc.h \
-  PseudoStack.h \
-  shared-libraries.h \
-  $(NULL)
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/mozglue/linker \
   -I$(topsrcdir)/ipc/chromium/src \
diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build
index 07efc1173927..4ed5e658a76b 100644
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -9,4 +9,14 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     XPIDL_SOURCES += [
         'nsIProfiler.idl',
     ]
+    EXPORTS += [
+        'GeckoProfilerImpl.h',
+        'GeckoProfilerFunc.h',
+        'PseudoStack.h',
+        'shared-libraries.h',
+    ]
+
+EXPORTS += [
+    'GeckoProfiler.h',
+]
 
diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in
index 53af5fa5b524..8547304b2e8b 100644
--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -28,8 +28,6 @@ CPPSRCS		= \
 		nsTypeInfo.cpp \
 		$(NULL)
 
-EXPORTS         = nsTraceMalloc.h
-
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS		+= nsDebugHelpWin32.cpp nsWinTraceMalloc.cpp
 endif
diff --git a/tools/trace-malloc/lib/moz.build b/tools/trace-malloc/lib/moz.build
index 334dc4065d66..06aeb0c7c76a 100644
--- a/tools/trace-malloc/lib/moz.build
+++ b/tools/trace-malloc/lib/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'tracemalloc'
 
+EXPORTS += [
+    'nsTraceMalloc.h',
+]
+
diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in
index d046493908e9..367ed48267e3 100644
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -20,11 +20,6 @@ CPPSRCS = 							\
 				nsDocLoader.cpp			\
 				$(NULL)
 
-EXPORTS = 							\
-				nsURILoader.h	 		\
-				nsDocLoader.h			\
-				$(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/uriloader/base/moz.build b/uriloader/base/moz.build
index 1157161b8d02..7a52be0280e0 100644
--- a/uriloader/base/moz.build
+++ b/uriloader/base/moz.build
@@ -18,3 +18,8 @@ XPIDL_SOURCES += [
 
 MODULE = 'uriloader'
 
+EXPORTS += [
+    'nsDocLoader.h',
+    'nsURILoader.h',
+]
+
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index f5129520512e..515d0118f201 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -66,9 +66,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 OSHELPER += nsMIMEInfoAndroid.cpp
 OSHELPER += nsAndroidHandlerApp.cpp
 OSHELPER += nsExternalSharingAppService.cpp
-EXPORTS += nsExternalSharingAppService.h
 OSHELPER += nsExternalURLHandlerService.cpp
-EXPORTS += nsExternalURLHandlerService.h
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
@@ -85,17 +83,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 OSHELPER  += nsMIMEInfoOS2.cpp
 endif
 
-EXPORTS_NAMESPACES = mozilla/dom
-
-EXPORTS_mozilla/dom = \
-    ExternalHelperAppParent.h \
-    ExternalHelperAppChild.h
-
-EXPORTS += \
-		$(OSDIR)/nsOSHelperAppService.h \
-		nsExternalHelperAppService.h \
-		$(NULL)
-
 CPPSRCS	= \
 	nsExternalHelperAppService.cpp	\
 	nsExternalProtocolHandler.cpp \
@@ -114,7 +101,6 @@ endif
 ifdef MOZ_ENABLE_MEEGOTOUCHSHARE
 OSHELPER  += nsMeegoExternalSharingAppService.cpp
 LOCAL_INCLUDES   += $(MOZ_PLATFORM_MAEMO_CFLAGS)
-EXPORTS += nsExternalSharingAppService.h
 endif
 
 ifeq ($(MOZ_PLATFORM_MAEMO),5)
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
index 5adf7bc0cdfb..eeb0c4fb8c30 100644
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -19,3 +19,35 @@ XPIDL_SOURCES += [
 
 MODULE = 'exthandler'
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
+    osdir = 'os2'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    osdir = 'win'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    osdir = 'win'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    osdir = 'android'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    osdir = 'gonk'
+else:
+    osdir = 'unix'
+
+EXPORTS += [
+    osdir + '/nsOSHelperAppService.h',
+    'nsExternalHelperAppService.h',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    EXPORTS += [
+        'nsExternalSharingAppService.h',
+        'nsExternalURLHandlerService.h',
+    ]
+
+if CONFIG['MOZ_ENABLE_MEEGOTOUCHSHARE']:
+    EXPORTS += ['nsExternalSharingAppService.h']
+
+EXPORTS.mozilla.dom += [
+    'ExternalHelperAppChild.h',
+    'ExternalHelperAppParent.h',
+]
+
diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in
index cdd1a185c861..f0a15d5e386b 100644
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -14,13 +14,6 @@ LIBRARY_NAME	= prefetch_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-EXPORTS_NAMESPACES = mozilla/docshell
-
-EXPORTS_mozilla/docshell += \
-  OfflineCacheUpdateParent.h \
-  OfflineCacheUpdateChild.h  \
-  $(NULL)
-
 CPPSRCS = \
 		nsPrefetchService.cpp \
 		nsOfflineCacheUpdate.cpp \
@@ -30,10 +23,6 @@ CPPSRCS = \
 		OfflineCacheUpdateParent.cpp \
 		$(NULL)
 
-EXPORTS = \
-		nsCPrefetchService.h \
-		$(NULL)
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build
index acca39bc1682..0e4ead3a9dfb 100644
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -11,3 +11,12 @@ XPIDL_SOURCES += [
 
 MODULE = 'prefetch'
 
+EXPORTS += [
+    'nsCPrefetchService.h',
+]
+
+EXPORTS.mozilla.docshell += [
+    'OfflineCacheUpdateChild.h',
+    'OfflineCacheUpdateParent.h',
+]
+
diff --git a/view/public/Makefile.in b/view/public/Makefile.in
index 7bb3624688d2..ac724e1bc29c 100644
--- a/view/public/Makefile.in
+++ b/view/public/Makefile.in
@@ -10,11 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		nsView.h \
-		nsViewManager.h \
-		nsIScrollPositionListener.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/view/public/moz.build b/view/public/moz.build
index dfd02c4412ac..1512b777e5d5 100644
--- a/view/public/moz.build
+++ b/view/public/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'view'
 
+EXPORTS += [
+    'nsIScrollPositionListener.h',
+    'nsView.h',
+    'nsViewManager.h',
+]
+
diff --git a/widget/Makefile.in b/widget/Makefile.in
index 0e1f0dd466c2..14e2d885e383 100644
--- a/widget/Makefile.in
+++ b/widget/Makefile.in
@@ -11,62 +11,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS_NAMESPACES = IPC mozilla
-
-EXPORTS_IPC = \
-		nsGUIEventIPC.h \
-		$(NULL)
-
-EXPORTS_mozilla = \
-		LookAndFeel.h \
-		WidgetUtils.h \
-		$(NULL)
-
-ifdef MOZ_INSTRUMENT_EVENT_LOOP
-EXPORTS_mozilla += \
-		WidgetTraceEvent.h \
-		$(NULL)
-endif
-
-EXPORTS		= \
-		InputData.h \
-		nsIWidget.h \
-		nsGUIEvent.h \
-		nsEvent.h \
-		nsNativeWidget.h \
-		nsWidgetInitData.h \
-		nsWidgetsCID.h \
-		nsIPluginWidget.h \
-		nsINativeKeyBindings.h \
-		nsIDeviceContextSpec.h \
-		nsIRollupListener.h \
-		nsIWidgetListener.h \
-		$(NULL)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-EXPORTS		+= \
-		nsINativeMenuService.h \
-		nsIPrintDialogService.h \
-		$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXPORTS		+= nsIDragSessionOS2.h
-endif
-
-ifneq (,$(filter android gonk,$(MOZ_WIDGET_TOOLKIT)))
-EXPORTS		+= \
-		nsIPrintDialogService.h \
-		$(NULL)
-endif
-
-ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
-EXPORTS		+= \
-		nsIPrintDialogService.h \
-		$(NULL)
-endif
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in
index b4fbf3154c25..349e12f50266 100644
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -55,8 +55,6 @@ NOT_THERE_YET_CPPSRCS = \
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
-EXPORTS = AndroidBridge.h AndroidJavaWrappers.h AndroidJNIWrapper.h
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_WIDGET
diff --git a/widget/android/moz.build b/widget/android/moz.build
index 25f391033e99..0b9fdd8a4783 100644
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -12,3 +12,9 @@ XPIDL_MODULE = 'widget_android'
 
 MODULE = 'widget'
 
+EXPORTS += [
+    'AndroidBridge.h',
+    'AndroidJNIWrapper.h',
+    'AndroidJavaWrappers.h',
+]
+
diff --git a/widget/cocoa/Makefile.in b/widget/cocoa/Makefile.in
index 8eb42738618e..41ae39c8e0fc 100644
--- a/widget/cocoa/Makefile.in
+++ b/widget/cocoa/Makefile.in
@@ -18,13 +18,6 @@ LIBXUL_LIBRARY = 1
 
 
 
-EXPORTS = \
-		mozView.h \
-		nsChangeObserver.h \
-		nsCocoaUtils.h \
-		nsCocoaFeatures.h \
-		$(NULL)
-
 CMMSRCS = \
   nsBidiKeyboard.mm \
   nsClipboard.mm \
diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build
index 7d96f7f4f142..25d2441488e8 100644
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -12,3 +12,10 @@ XPIDL_MODULE = 'widget_cocoa'
 
 MODULE = 'widget'
 
+EXPORTS += [
+    'mozView.h',
+    'nsChangeObserver.h',
+    'nsCocoaFeatures.h',
+    'nsCocoaUtils.h',
+]
+
diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in
index 300d277d2b7b..19df67fb797a 100644
--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@@ -22,7 +22,6 @@ VPATH           = \
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS         = OrientationObserver.h
 LIBRARY_NAME    = widget_gonk
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build
index 512339139a0f..15f9f229d9e0 100644
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -16,3 +16,7 @@
 
 MODULE = 'widget'
 
+EXPORTS += [
+    'OrientationObserver.h',
+]
+
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
index 68f890575bdb..1abb0a2f3f78 100644
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -72,12 +72,6 @@ endif
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
-EXPORTS		= \
-                nsGTKToolkit.h \
-		nsIImageToPixbuf.h \
-		mozcontainer.h \
-		$(NULL)
-
 ifdef NATIVE_THEME_SUPPORT
 CSRCS		+= gtk2drawing.c
 CPPSRCS		+= nsNativeThemeGTK.cpp
diff --git a/widget/gtk2/moz.build b/widget/gtk2/moz.build
index 41a76827ca6f..c64fe6cb4a1e 100644
--- a/widget/gtk2/moz.build
+++ b/widget/gtk2/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'widget'
 
+EXPORTS += [
+    'mozcontainer.h',
+    'nsGTKToolkit.h',
+    'nsIImageToPixbuf.h',
+]
+
diff --git a/widget/gtkxtbin/Makefile.in b/widget/gtkxtbin/Makefile.in
index 3cf8b737e7ea..7d4868299219 100644
--- a/widget/gtkxtbin/Makefile.in
+++ b/widget/gtkxtbin/Makefile.in
@@ -21,9 +21,6 @@ CSRCS		= \
 		$(NULL)
 endif
 
-EXPORTS         = gtk2xtbin.h 
-
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_ENABLE_GTK2
diff --git a/widget/gtkxtbin/moz.build b/widget/gtkxtbin/moz.build
index 330cd07536f3..1c0dfd55cda8 100644
--- a/widget/gtkxtbin/moz.build
+++ b/widget/gtkxtbin/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'gtkxtbin'
 
+EXPORTS += [
+    'gtk2xtbin.h',
+]
+
diff --git a/widget/moz.build b/widget/moz.build
index 6f1050c0beca..4b01ceca8482 100644
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -10,6 +10,8 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if toolkit in ('os2', 'cocoa', 'qt', 'android', 'gonk'):
     DIRS += [toolkit]
+if toolkit in ('qt', 'android', 'gonk', 'gtk2'):
+    EXPORTS += ['nsIPrintDialogService.h']
 
 if toolkit == 'windows':
     DIRS += ['windows']
@@ -34,10 +36,15 @@ elif toolkit == 'cocoa':
         'nsIStandaloneNativeMenu.idl',
         'nsITaskbarProgress.idl',
     ]
+    EXPORTS += [
+        'nsINativeMenuService.h',
+        'nsIPrintDialogService.h',
+    ]
 elif toolkit == 'os2':
     XPIDL_SOURCES += [
         'nsIRwsService.idl',
     ]
+    EXPORTS += ['nsIDragSessionOS2.h']
 
 TEST_TOOL_DIRS += ['tests']
 
@@ -89,3 +96,30 @@ if CONFIG['MOZ_METRO']:
 
 MODULE = 'widget'
 
+EXPORTS += [
+    'InputData.h',
+    'nsEvent.h',
+    'nsGUIEvent.h',
+    'nsIDeviceContextSpec.h',
+    'nsINativeKeyBindings.h',
+    'nsIPluginWidget.h',
+    'nsIRollupListener.h',
+    'nsIWidget.h',
+    'nsIWidgetListener.h',
+    'nsNativeWidget.h',
+    'nsWidgetInitData.h',
+    'nsWidgetsCID.h',
+]
+
+EXPORTS.mozilla += [
+    'LookAndFeel.h',
+    'WidgetUtils.h',
+]
+
+if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
+    EXPORTS.mozilla += [
+        'WidgetTraceEvent.h',
+    ]
+
+EXPORTS.IPC = ['nsGUIEventIPC.h']
+
diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in
index e27928ad22ab..5eac4f243c78 100644
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -55,10 +55,6 @@ CPPSRCS	+= \
 		mozqglwidgetwrapper.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsQtKeyUtils.h \
-		$(NULL)
-
 ifdef MOZ_ENABLE_QTMOBILITY
 MOCSRCS += moc_mozqorientationsensorfilter.cpp
 CPPSRCS += mozqorientationsensorfilter.cpp
diff --git a/widget/qt/moz.build b/widget/qt/moz.build
index d5e2dc72cca3..a8ffc141375a 100644
--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -8,3 +8,7 @@ DIRS += ['faststartupqt']
 
 MODULE = 'widget'
 
+EXPORTS += [
+    'nsQtKeyUtils.h',
+]
+
diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in
index b25e1014d54b..4537a9913f0f 100644
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -92,10 +92,6 @@ SHARED_LIBRARY_LIBS = \
   ../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
   $(NULL)
 
-EXPORTS		= nsdefs.h WindowHook.h WinUtils.h
-EXPORTS_NAMESPACES = mozilla/widget
-EXPORTS_mozilla/widget = AudioSession.h
-
 LOCAL_INCLUDES	= \
 		-I. \
 		-I$(srcdir)/../xpwidgets \
diff --git a/widget/windows/moz.build b/widget/windows/moz.build
index 297d079719ac..d0b488960a6b 100644
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -11,3 +11,13 @@ TEST_DIRS += ['tests']
 
 MODULE = 'widget'
 
+EXPORTS += [
+    'WinUtils.h',
+    'WindowHook.h',
+    'nsdefs.h',
+]
+
+EXPORTS.mozilla.widget += [
+    'AudioSession.h',
+]
+
diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in
index c9c2220641d5..50bac7a39258 100644
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -13,10 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= xpwidgets_s
 LIBXUL_LIBRARY  = 1
 
-EXPORTS = \
-		GfxInfoCollector.h \
-		$(NULL)
-
 DEFINES += \
   -D_IMPL_NS_WIDGET \
   $(NULL)
diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build
index 41a76827ca6f..8da27cbca9bf 100644
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'widget'
 
+EXPORTS += [
+    'GfxInfoCollector.h',
+]
+
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index 97c04a14e6e8..653c81d038a5 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -55,34 +55,6 @@ CSRCS = \
 		nsErrorAssertsC.c \
 		$(NULL)
 
-EXPORTS		= \
-		nsAgg.h \
-		nsAutoRef.h \
-		nsCom.h \
-		nsDebugImpl.h \
-		nsIAllocator.h \
-		nsIID.h \
-		nsISizeOf.h \
-		nsISupportsObsolete.h \
-		nsStackWalk.h \
-		nsTraceRefcntImpl.h \
-		nsWeakPtr.h \
-		nsInterfaceRequestorAgg.h \
-		nsGZFileWriter.h \
-		$(NULL)
-
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla = \
-	MapsMemoryReporter.h \
-	nsMemoryInfoDumper.h \
-	ClearOnShutdown.h \
-	StaticPtr.h \
-	AvailableMemoryTracker.h \
-	StackWalk.h \
-	VisualEventTracer.h \
-	$(NULL)
-
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += nsCrashOnException.cpp
 endif
@@ -91,7 +63,6 @@ ifeq ($(OS_ARCH),WINNT)
 
 ifdef MOZ_DEBUG
 CSRCS		+= pure_api.c
-EXPORTS		+= pure.h
 endif
 
 endif #if OS_ARCH == WINNT
diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build
index 99a86cbed7f2..dbd4defb0fda 100644
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -26,7 +26,7 @@ XPIDL_SOURCES += [
     'nsITraceRefcnt.idl',
     'nsIUUIDGenerator.idl',
     'nsIVersionComparator.idl',
-		'nsIVisualEventTracer.idl',
+    'nsIVisualEventTracer.idl',
     'nsIWeakReference.idl',
     'nsrootidl.idl',
 ]
@@ -40,3 +40,32 @@ XPIDL_MODULE = 'xpcom_base'
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'nsAgg.h',
+    'nsAutoRef.h',
+    'nsCom.h',
+    'nsDebugImpl.h',
+    'nsGZFileWriter.h',
+    'nsIAllocator.h',
+    'nsIID.h',
+    'nsISizeOf.h',
+    'nsISupportsObsolete.h',
+    'nsInterfaceRequestorAgg.h',
+    'nsStackWalk.h',
+    'nsTraceRefcntImpl.h',
+    'nsWeakPtr.h',
+]
+
+if CONFIG['MOZ_DEBUG']:
+    EXPORTS += ['pure.h']
+
+EXPORTS.mozilla += [
+    'AvailableMemoryTracker.h',
+    'ClearOnShutdown.h',
+    'MapsMemoryReporter.h',
+    'StackWalk.h',
+    'StaticPtr.h',
+    'VisualEventTracer.h',
+    'nsMemoryInfoDumper.h',
+]
+
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index 372faed2253f..c911daecbbb6 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -85,34 +85,11 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../docshell/base \
 		$(NULL)
 
-EXPORTS_NAMESPACES = mozilla
-
 SDK_HEADERS =  \
   nsXPCOM.h       \
   nsXPCOMCID.h    \
   $(NULL)
 
-EXPORTS	= \
-  nsXPCOMCIDInternal.h \
-  xrecore.h \
-  nsXULAppAPI.h \
-  nsXREAppData.h \
-  $(NULL)
-
-EXPORTS_mozilla = \
-  XPCOM.h \
-  Services.h \
-  ServiceList.h \
-  Omnijar.h \
-  FileLocation.h \
-  mozPoisonWrite.h \
-  $(NULL)
-
-ifeq ($(OS_ARCH),WINNT)
-EXPORTS_mozilla += perfprobe.h
-endif
-
-
 GARBAGE         += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS)
 
 include $(topsrcdir)/config/config.mk
diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
index 6834f25b09ea..9da8c4f9f768 100644
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -6,3 +6,21 @@
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'nsXPCOMCIDInternal.h',
+    'nsXREAppData.h',
+    'nsXULAppAPI.h',
+    'xrecore.h',
+]
+
+EXPORTS.mozilla += [
+    'FileLocation.h',
+    'Omnijar.h',
+    'ServiceList.h',
+    'Services.h',
+    'XPCOM.h',
+    'mozPoisonWrite.h',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXPORTS.mozilla += ['perfprobe.h']
diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
index bef11bdd4e31..99e87e035217 100644
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -14,18 +14,6 @@ LIBRARY_NAME	= xpcomcomponents_s
 LIBXUL_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS	= \
-  nsCategoryManagerUtils.h \
-  $(NULL)
-
-EXPORTS_mozilla = \
-  Module.h \
-  ModuleLoader.h \
-  ModuleUtils.h \
-  $(NULL)
-
 CPPSRCS		= \
 		nsCategoryManager.cpp \
 		nsComponentManager.cpp \
diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
index 06fd9e53993b..814f4efe1e52 100644
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -18,3 +18,13 @@ XPIDL_MODULE = 'xpcom_components'
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'nsCategoryManagerUtils.h',
+]
+
+EXPORTS.mozilla += [
+    'Module.h',
+    'ModuleLoader.h',
+    'ModuleUtils.h',
+]
+
diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in
index 157afc9a8e95..fb01f9e2a579 100644
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -47,47 +47,8 @@ else
 $(error No TimeStamp implementation on this platform.  Build will not succeed)
 endif
 
-EXPORTS_NAMESPACES = mozilla
-
-EXPORTS_mozilla = \
-  CharTokenizer.h \
-  TimeStamp.h \
-  StringBuilder.h \
-  $(NULL)
-
-ifeq ($(OS_ARCH),WINNT)
-EXPORTS_mozilla += \
-  TimeStamp_windows.h \
-  $(NULL)
-endif
-
-EXPORTS		= \
-		nsArray.h \
-		nsAtomService.h \
-		nsCheapSets.h \
-		nsCppSharedAllocator.h \
-		nsCRT.h \
-		nsExpirationTracker.h \
-		nsHashtable.h \
-		nsIByteBuffer.h \
-		nsIUnicharBuffer.h \
-		nsMathUtils.h \
-		nsObserverList.h \
-		nsObserverService.h \
-		nsStaticNameTable.h \
-		nsStaticAtom.h \
-		nsSupportsArray.h \
-		nsSupportsPrimitives.h \
-		nsVariant.h \
-		nsStringEnumerator.h \
-		nsHashPropertyBag.h \
-		nsWhitespaceTokenizer.h \
-		nsCharSeparatedTokenizer.h \
-		$(NULL)			
-
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += nsWindowsRegKey.cpp
-EXPORTS += nsWindowsRegKey.h
 endif
 
 EXTRA_COMPONENTS = \
diff --git a/xpcom/ds/moz.build b/xpcom/ds/moz.build
index 6ab94820fd8f..da921558fcd3 100644
--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -35,8 +35,40 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     XPIDL_SOURCES += [
         'nsIWindowsRegKey.idl',
     ]
+    EXPORTS += ['nsWindowsRegKey.h']
+    EXPORTS.mozilla += ['TimeStamp_windows.h']
 
 XPIDL_MODULE = 'xpcom_ds'
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'nsArray.h',
+    'nsAtomService.h',
+    'nsCRT.h',
+    'nsCharSeparatedTokenizer.h',
+    'nsCheapSets.h',
+    'nsCppSharedAllocator.h',
+    'nsExpirationTracker.h',
+    'nsHashPropertyBag.h',
+    'nsHashtable.h',
+    'nsIByteBuffer.h',
+    'nsIUnicharBuffer.h',
+    'nsMathUtils.h',
+    'nsObserverList.h',
+    'nsObserverService.h',
+    'nsStaticAtom.h',
+    'nsStaticNameTable.h',
+    'nsStringEnumerator.h',
+    'nsSupportsArray.h',
+    'nsSupportsPrimitives.h',
+    'nsVariant.h',
+    'nsWhitespaceTokenizer.h',
+]
+
+EXPORTS.mozilla += [
+    'CharTokenizer.h',
+    'StringBuilder.h',
+    'TimeStamp.h',
+]
+
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index ed76ab3311bb..852984390eec 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -72,40 +72,6 @@ SDK_HEADERS = \
 		pldhash.h \
 		$(NULL)
 
-EXPORTS_NAMESPACES = mozilla mozilla/threads
-
-EXPORTS = \
-		nsThreadUtils.h \
-		nsTPriorityQueue.h \
-		nsProxyRelease.h \
-		nsXPTCUtils.h \
-		nsCycleCollectorUtils.h \
-		nsCycleCollectionNoteChild.h \
-		nsCycleCollectionTraversalCallback.h \
-		$(NULL)
-
-EXPORTS_mozilla = \
-  AppData.h \
-  AutoRestore.h \
-  BlockingResourceBase.h \
-  CondVar.h \
-  DeadlockDetector.h \
-  FileUtils.h \
-  GenericFactory.h \
-  IntentionalCrash.h \
-  Monitor.h \
-  Mutex.h \
-  ReentrantMonitor.h \
-  SSE.h \
-  arm.h \
-  unused.h \
-  Observer.h \
-  $(NULL)
-
-EXPORTS_mozilla/threads = \
-  nsThreadIDs.h \
-  $(NULL)
-
 SDK_LIBRARY     =                        \
 		$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(NULL)
diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build
index 27eee4c3343d..c37ef16d6247 100644
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -13,3 +13,35 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'nsCycleCollectionNoteChild.h',
+    'nsCycleCollectionTraversalCallback.h',
+    'nsCycleCollectorUtils.h',
+    'nsProxyRelease.h',
+    'nsTPriorityQueue.h',
+    'nsThreadUtils.h',
+    'nsXPTCUtils.h',
+]
+
+EXPORTS.mozilla += [
+    'AppData.h',
+    'AutoRestore.h',
+    'BlockingResourceBase.h',
+    'CondVar.h',
+    'DeadlockDetector.h',
+    'FileUtils.h',
+    'GenericFactory.h',
+    'IntentionalCrash.h',
+    'Monitor.h',
+    'Mutex.h',
+    'Observer.h',
+    'ReentrantMonitor.h',
+    'SSE.h',
+    'arm.h',
+    'unused.h',
+]
+
+EXPORTS.mozilla.threads += [
+    'nsThreadIDs.h',
+]
+
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
index 05d2b448af9f..b8e2c4e67748 100644
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -62,47 +62,11 @@ CPPSRCS		+= nsLocalFileUnix.cpp
 endif # windows
 endif # OS2
 
-EXPORTS		= \
-		nsAnonymousTemporaryFile.h \
-		nsAppDirectoryServiceDefs.h \
-		nsDirectoryService.h \
-		nsDirectoryServiceAtomList.h \
-		nsEscape.h \
-		nsLinebreakConverter.h \
-		nsLocalFile.h \
-		nsMultiplexInputStream.h \
-		nsNativeCharsetUtils.h \
-		nsScriptableInputStream.h \
-		nsStorageStream.h \
-		nsStringStream.h \
-		nsStreamUtils.h \
-		nsUnicharInputStream.h \
-		nsWildCard.h \
-		SpecialSystemDirectory.h \
-		$(NULL)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXPORTS		+= nsLocalFileOS2.h
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXPORTS		+= nsLocalFileWin.h
-else
-EXPORTS		+= nsLocalFileUnix.h
-endif # windows
-endif # os2
-
-EXPORTS_NAMESPACES = mozilla
-EXPORTS_mozilla = \
-    Base64.h \
-    $(NULL)
-
 SDK_HEADERS =  \
 		nsDirectoryServiceDefs.h \
 		nsDirectoryServiceUtils.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build
index eab5a7f47a38..eb7747795abb 100644
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -47,7 +47,37 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         'nsILocalFileMac.idl',
     ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
+    EXPORTS += ['nsLocalFileOS2.h']
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXPORTS += ['nsLocalFileWin.h']
+else:
+    EXPORTS += ['nsLocalFileUnix.h']
+
 XPIDL_MODULE = 'xpcom_io'
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'SpecialSystemDirectory.h',
+    'nsAnonymousTemporaryFile.h',
+    'nsAppDirectoryServiceDefs.h',
+    'nsDirectoryService.h',
+    'nsDirectoryServiceAtomList.h',
+    'nsEscape.h',
+    'nsLinebreakConverter.h',
+    'nsLocalFile.h',
+    'nsMultiplexInputStream.h',
+    'nsNativeCharsetUtils.h',
+    'nsScriptableInputStream.h',
+    'nsStorageStream.h',
+    'nsStreamUtils.h',
+    'nsStringStream.h',
+    'nsUnicharInputStream.h',
+    'nsWildCard.h',
+]
+
+EXPORTS.mozilla += [
+    'Base64.h',
+]
+
diff --git a/xpcom/reflect/xptcall/public/Makefile.in b/xpcom/reflect/xptcall/public/Makefile.in
index 660edb971ee0..ac724e1bc29c 100644
--- a/xpcom/reflect/xptcall/public/Makefile.in
+++ b/xpcom/reflect/xptcall/public/Makefile.in
@@ -10,11 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= \
-		xptcall.h \
-		xptcstubsdecl.inc \
-		xptcstubsdef.inc \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpcom/reflect/xptcall/public/moz.build b/xpcom/reflect/xptcall/public/moz.build
index 6834f25b09ea..49da5831e93d 100644
--- a/xpcom/reflect/xptcall/public/moz.build
+++ b/xpcom/reflect/xptcall/public/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'xptcall.h',
+    'xptcstubsdecl.inc',
+    'xptcstubsdef.inc',
+]
+
diff --git a/xpcom/reflect/xptinfo/public/Makefile.in b/xpcom/reflect/xptinfo/public/Makefile.in
index 8adec75ca937..9b02060ae961 100644
--- a/xpcom/reflect/xptinfo/public/Makefile.in
+++ b/xpcom/reflect/xptinfo/public/Makefile.in
@@ -11,17 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= \
-		xptinfo.h \
-		$(NULL)
-
-EXPORTS_NAMESPACES := mozilla
-EXPORTS_mozilla := \
-  XPTInterfaceInfoManager.h \
-  $(null)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS		+= -DEXPORT_XPCI_API
diff --git a/xpcom/reflect/xptinfo/public/moz.build b/xpcom/reflect/xptinfo/public/moz.build
index 28066d3523b7..0d4c710f4175 100644
--- a/xpcom/reflect/xptinfo/public/moz.build
+++ b/xpcom/reflect/xptinfo/public/moz.build
@@ -13,3 +13,10 @@ XPIDL_MODULE = 'xpcom_xpti'
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'xptinfo.h',
+]
+
+EXPORTS.mozilla += [
+    'XPTInterfaceInfoManager.h',
+]
diff --git a/xpcom/string/public/Makefile.in b/xpcom/string/public/Makefile.in
index 0569dc619f73..9e241465ee07 100644
--- a/xpcom/string/public/Makefile.in
+++ b/xpcom/string/public/Makefile.in
@@ -11,35 +11,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		=				\
-		nsAString.h			\
-		nsAlgorithm.h			\
-		nsCharTraits.h			\
-		nsDependentString.h		\
-		nsDependentSubstring.h		\
-		nsLiteralString.h		\
-		nsPrintfCString.h		\
-		nsPromiseFlatString.h		\
-		nsReadableUtils.h		\
-		nsString.h			\
-		nsStringBuffer.h		\
-		nsStringFwd.h			\
-		nsStringIterator.h		\
-		nsSubstring.h			\
-		nsSubstringTuple.h		\
-		nsTDependentString.h		\
-		nsTDependentSubstring.h		\
-		nsTPromiseFlatString.h		\
-		nsTString.h			\
-		nsTSubstring.h			\
-		nsTSubstringTuple.h		\
-		nsUTF8Utils.h			\
-		nsXPIDLString.h			\
-		string-template-def-unichar.h	\
-		string-template-def-char.h	\
-		string-template-undef.h		\
-		$(NULL)			
-
 SDK_HEADERS	=				\
 		nsXPCOMStrings.h		\
 		nsEmbedString.h			\
diff --git a/xpcom/string/public/moz.build b/xpcom/string/public/moz.build
index 7810e69deea1..8b725a88c151 100644
--- a/xpcom/string/public/moz.build
+++ b/xpcom/string/public/moz.build
@@ -6,3 +6,32 @@
 
 MODULE = 'string'
 
+EXPORTS += [
+    'nsAString.h',
+    'nsAlgorithm.h',
+    'nsCharTraits.h',
+    'nsDependentString.h',
+    'nsDependentSubstring.h',
+    'nsLiteralString.h',
+    'nsPrintfCString.h',
+    'nsPromiseFlatString.h',
+    'nsReadableUtils.h',
+    'nsString.h',
+    'nsStringBuffer.h',
+    'nsStringFwd.h',
+    'nsStringIterator.h',
+    'nsSubstring.h',
+    'nsSubstringTuple.h',
+    'nsTDependentString.h',
+    'nsTDependentSubstring.h',
+    'nsTPromiseFlatString.h',
+    'nsTString.h',
+    'nsTSubstring.h',
+    'nsTSubstringTuple.h',
+    'nsUTF8Utils.h',
+    'nsXPIDLString.h',
+    'string-template-def-char.h',
+    'string-template-def-unichar.h',
+    'string-template-undef.h',
+]
+
diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in
index cbd8122e853f..231fec599b67 100644
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -14,8 +14,6 @@ LIBRARY_NAME	= xpcomthreads_s
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 
-EXPORTS_NAMESPACES = mozilla
-
 CPPSRCS		= \
 		nsEventQueue.cpp \
 		nsEnvironment.cpp \
@@ -29,20 +27,6 @@ CPPSRCS		= \
 		LazyIdleThread.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsThread.h \
-		nsProcess.h \
-		nsEventQueue.h \
-		$(NULL)
-
-EXPORTS_mozilla = \
-  HangMonitor.h \
-  LazyIdleThread.h \
-  SyncRunnable.h \
-  $(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 LOCAL_INCLUDES	= -I$(srcdir)/../components
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build
index 349e87e3109c..93f83cbc9373 100644
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -22,3 +22,15 @@ XPIDL_MODULE = 'xpcom_threads'
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'nsEventQueue.h',
+    'nsProcess.h',
+    'nsThread.h',
+]
+
+EXPORTS.mozilla += [
+    'HangMonitor.h',
+    'LazyIdleThread.h',
+    'SyncRunnable.h',
+]
+
diff --git a/xpcom/typelib/xpt/public/Makefile.in b/xpcom/typelib/xpt/public/Makefile.in
index 5238ef33438d..ac724e1bc29c 100644
--- a/xpcom/typelib/xpt/public/Makefile.in
+++ b/xpcom/typelib/xpt/public/Makefile.in
@@ -10,8 +10,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS		= xpt_arena.h xpt_struct.h xpt_xdr.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpcom/typelib/xpt/public/moz.build b/xpcom/typelib/xpt/public/moz.build
index 6834f25b09ea..ccc0fa74296f 100644
--- a/xpcom/typelib/xpt/public/moz.build
+++ b/xpcom/typelib/xpt/public/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'xpcom'
 
+EXPORTS += [
+    'xpt_arena.h',
+    'xpt_struct.h',
+    'xpt_xdr.h',
+]
+
diff --git a/xpfe/appshell/public/Makefile.in b/xpfe/appshell/public/Makefile.in
index 50d6d64fe68a..76d6a647f63d 100644
--- a/xpfe/appshell/public/Makefile.in
+++ b/xpfe/appshell/public/Makefile.in
@@ -11,9 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-EXPORTS		= \
-		nsAppShellCID.h \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpfe/appshell/public/moz.build b/xpfe/appshell/public/moz.build
index 35cbda6791bf..8cd054a60cfc 100644
--- a/xpfe/appshell/public/moz.build
+++ b/xpfe/appshell/public/moz.build
@@ -15,3 +15,7 @@ XPIDL_SOURCES += [
 
 MODULE = 'appshell'
 
+EXPORTS += [
+    'nsAppShellCID.h',
+]
+

From 9205e033e1480d1345dcea312f9acb059cfdcb4d Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 16 Apr 2013 15:38:50 -0400
Subject: [PATCH 378/438] Backed out changeset 1d41c64ab235 (bug 860326) for
 robocop crashes.

---
 mobile/android/base/BrowserApp.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index a8576f8bb6a5..ecdf25b6b618 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -801,12 +801,7 @@ abstract public class BrowserApp extends GeckoApp
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        String url = null;
-        // Don't update the url in the toolbar if the activity was just launched to pick a site.
-        boolean pickSite = data.getStringExtra(AwesomeBar.TARGET_KEY).equals(AwesomeBar.Target.PICK_SITE.toString());
-        if (resultCode == Activity.RESULT_OK && !pickSite) {
-            url = data.getStringExtra(AwesomeBar.URL_KEY);
-        }
+        String url = resultCode == Activity.RESULT_OK ? data.getStringExtra(AwesomeBar.URL_KEY) : null;
         mBrowserToolbar.fromAwesomeBarSearch(url);
     }
 

From 657125683f7cdf8fae961c9402a37c5c8a73a5be Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Tue, 16 Apr 2013 15:55:45 -0400
Subject: [PATCH 379/438] Bug 857876 - If we're not storing source data,
 explicitly shut down the decoder when the image data is complete. r=seth

---
 image/src/RasterImage.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index 5c9e5624241e..bcc2b5c0f2bc 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -1759,6 +1759,13 @@ RasterImage::DoImageDataComplete()
   {
     MutexAutoLock lock(mDecodingMutex);
 
+    // If we're not storing any source data, then there's nothing more we can do
+    // once we've tried decoding for size.
+    if (!StoringSourceData() && mDecoder) {
+      nsresult rv = ShutdownDecoder(eShutdownIntent_Done);
+      CONTAINER_ENSURE_SUCCESS(rv);
+    }
+
     // If DecodeUntilSizeAvailable didn't finish the decode, let the decode worker
     // finish decoding this image.
     if (mDecoder) {
@@ -2596,6 +2603,7 @@ nsresult
 RasterImage::ShutdownDecoder(eShutdownIntent aIntent)
 {
   MOZ_ASSERT(NS_IsMainThread());
+  mDecodingMutex.AssertCurrentThreadOwns();
 
   // Ensure that our intent is valid
   NS_ABORT_IF_FALSE((aIntent >= 0) && (aIntent < eShutdownIntent_AllCount),

From 67c54cf1daec607d7bf4eb1aba74cf5fcb08b66a Mon Sep 17 00:00:00 2001
From: EKR <ekr@rtfm.com>
Date: Tue, 16 Apr 2013 13:13:09 -0700
Subject: [PATCH 380/438] Bug 854085. Make thread asserts conditional on DEBUG
 not MOZ_DEBUG. r=jesup

---
 media/mtransport/runnable_utils.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/mtransport/runnable_utils.h b/media/mtransport/runnable_utils.h
index 4426caee22cc..5da3ff8aa52f 100644
--- a/media/mtransport/runnable_utils.h
+++ b/media/mtransport/runnable_utils.h
@@ -68,7 +68,7 @@ static inline nsresult RUN_ON_THREAD(nsIEventTarget *thread, runnable_args_base
   return RUN_ON_THREAD(thread, static_cast<nsIRunnable *>(runnable), flags);
 }
 
-#ifdef MOZ_DEBUG
+#ifdef DEBUG
 #define ASSERT_ON_THREAD(t) do {                \
     if (t) {                                    \
       bool on;                                    \

From 16e6da25d8e76061cb440feab9005bd8f4be682f Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 16 Apr 2013 16:46:47 -0400
Subject: [PATCH 381/438] Bug 857073 - Simplify ChromeUtils usages. r=jmaher

---
 browser/base/content/test/browser_drag.js     |  7 +++-
 browser/base/content/test/browser_homeDrop.js |  8 ++---
 browser/base/content/test/browser_tabDrop.js  |  6 ++--
 .../test/browser_tab_drag_drop_perwindow.js   | 12 +++----
 .../places/tests/browser/browser_475045.js    |  8 ++---
 .../components/search/test/browser_426329.js  | 10 +++---
 .../mochitest/tests/SimpleTest/ChromeUtils.js | 34 ++++++++-----------
 .../tests/browser/browser_browserDrop.js      |  6 ++--
 .../test/browser/browser_dragdrop.js          | 24 ++++++-------
 9 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/browser/base/content/test/browser_drag.js b/browser/base/content/test/browser_drag.js
index b8368de4d44f..6aa14bea06c6 100644
--- a/browser/base/content/test/browser_drag.js
+++ b/browser/base/content/test/browser_drag.js
@@ -2,6 +2,11 @@ function test()
 {
   waitForExplicitFinish();
 
+  let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
+                     getService(Ci.mozIJSSubScriptLoader);
+  let ChromeUtils = {};
+  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
+
   // ---- Test dragging the proxy icon ---
   var value = content.location.href;
   var urlString = value + "\n" + content.document.title;
@@ -36,5 +41,5 @@ function test()
     finish();
   }, true);
 
-  EventUtils.synthesizeDrop(tab, tab, [[{type: "text/uri-list", data: "http://mochi.test:8888/"}]], "copy", window);
+  ChromeUtils.synthesizeDrop(tab, tab, [[{type: "text/uri-list", data: "http://mochi.test:8888/"}]], "copy", window);
 }
diff --git a/browser/base/content/test/browser_homeDrop.js b/browser/base/content/test/browser_homeDrop.js
index ce9c2492bcb4..397fbe1ff4c0 100644
--- a/browser/base/content/test/browser_homeDrop.js
+++ b/browser/base/content/test/browser_homeDrop.js
@@ -13,8 +13,8 @@ function test() {
 
   let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
                      getService(Ci.mozIJSSubScriptLoader);
-  let chromeUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
+  let ChromeUtils = {};
+  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
 
   let homeButton = document.getElementById("home-button");
   ok(homeButton, "home button present");
@@ -44,14 +44,14 @@ function test() {
         // The drop handler throws an exception when dragging URIs that inherit
         // principal, e.g. javascript:
         expectUncaughtException();
-        chromeUtils.synthesizeDrop(homeButton, homeButton, [[{type: "text/plain", data: "javascript:8888"}]], "copy", window, EventUtils);
+        ChromeUtils.synthesizeDrop(homeButton, homeButton, [[{type: "text/plain", data: "javascript:8888"}]], "copy", window);
       });
     })
   });
 
   Services.wm.addListener(dialogListener);
 
-  chromeUtils.synthesizeDrop(homeButton, homeButton, [[{type: "text/plain", data: "http://mochi.test:8888/"}]], "copy", window, EventUtils);
+  ChromeUtils.synthesizeDrop(homeButton, homeButton, [[{type: "text/plain", data: "http://mochi.test:8888/"}]], "copy", window);
 }
 
 function WindowListener(aURL, aCallback) {
diff --git a/browser/base/content/test/browser_tabDrop.js b/browser/base/content/test/browser_tabDrop.js
index 11d0554f8a10..c159270f372a 100644
--- a/browser/base/content/test/browser_tabDrop.js
+++ b/browser/base/content/test/browser_tabDrop.js
@@ -11,8 +11,8 @@ function test() {
 
   let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
                      getService(Ci.mozIJSSubScriptLoader);
-  let chromeUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
+  let ChromeUtils = {};
+  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
 
   let tabContainer = gBrowser.tabContainer;
   var receivedDropCount = 0;
@@ -55,7 +55,7 @@ function test() {
       // instead). The events created by synthesizeDrop have all of their
       // coordinates set to 0 (screenX/screenY), so they're treated as drops
       // on the outer edge of the tab, thus they open new tabs.
-      chromeUtils.synthesizeDrop(newTab, newTab, [[{type: "text/plain", data: text}]], "link", window, EventUtils);
+      ChromeUtils.synthesizeDrop(newTab, newTab, [[{type: "text/plain", data: text}]], "link", window);
     });
   }
 
diff --git a/browser/base/content/test/browser_tab_drag_drop_perwindow.js b/browser/base/content/test/browser_tab_drag_drop_perwindow.js
index 97ceea6c0a83..f787ae860b62 100644
--- a/browser/base/content/test/browser_tab_drag_drop_perwindow.js
+++ b/browser/base/content/test/browser_tab_drag_drop_perwindow.js
@@ -8,8 +8,8 @@ function test() {
 
   let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
                      getService(Ci.mozIJSSubScriptLoader);
-  let chromeUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
+  let ChromeUtils = {};
+  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
 
   function testOnWindow(aIsPrivate, aCallback) {
     whenNewWindowLoaded({private: aIsPrivate}, function(win) {
@@ -23,14 +23,14 @@ function test() {
       let normalTab = aNormalWindow.gBrowser.addTab("about:blank", {skipAnimation: true});
       let privateTab = aPrivateWindow.gBrowser.addTab("about:blank", {skipAnimation: true});
 
-      let effect = chromeUtils.synthesizeDrop(normalTab, privateTab,
+      let effect = ChromeUtils.synthesizeDrop(normalTab, privateTab,
         [[{type: TAB_DROP_TYPE, data: normalTab}]],
-        null, aNormalWindow, EventUtils, aPrivateWindow);
+        null, aNormalWindow, aPrivateWindow);
       is(effect, "none", "Should not be able to drag a normal tab to a private window");
 
-      effect = chromeUtils.synthesizeDrop(privateTab, normalTab,
+      effect = ChromeUtils.synthesizeDrop(privateTab, normalTab,
         [[{type: TAB_DROP_TYPE, data: privateTab}]],
-        null, aPrivateWindow, EventUtils, aNormalWindow);
+        null, aPrivateWindow, aNormalWindow);
       is(effect, "none", "Should not be able to drag a private tab to a normal window");
 
       aNormalWindow.gBrowser.swapBrowsersAndCloseOther(normalTab, privateTab);
diff --git a/browser/components/places/tests/browser/browser_475045.js b/browser/components/places/tests/browser/browser_475045.js
index 6827b2874eb2..e8ca5027851a 100644
--- a/browser/components/places/tests/browser/browser_475045.js
+++ b/browser/components/places/tests/browser/browser_475045.js
@@ -2,10 +2,10 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 // Instead of loading ChromeUtils.js into the test scope in browser-test.js for all tests,
 // we only need ChromeUtils.js for a few files which is why we are using loadSubScript.
-var chromeUtils = {};
+var ChromeUtils = {};
 this._scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
                      getService(Ci.mozIJSSubScriptLoader);
-this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
+this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
 
 function test() {
   // Make sure the bookmarks bar is visible and restore its state on cleanup.
@@ -37,11 +37,11 @@ function test() {
   let simulateDragDrop = function(aEffect, aMimeType) {
     const uriSpec = "http://www.mozilla.org/D1995729-A152-4e30-8329-469B01F30AA7";
     let uri = makeURI(uriSpec);
-    chromeUtils.synthesizeDrop(placesItems.childNodes[0], 
+    ChromeUtils.synthesizeDrop(placesItems.childNodes[0],
                               placesItems, 
                               [[{type: aMimeType, 
                                 data: uriSpec}]], 
-                              aEffect, window, EventUtils);
+                              aEffect, window);
 
     // Verify that the drop produces exactly one bookmark.
     let bookmarkIds = PlacesUtils.bookmarks
diff --git a/browser/components/search/test/browser_426329.js b/browser/components/search/test/browser_426329.js
index d21e07a88998..92e3e630efb8 100644
--- a/browser/components/search/test/browser_426329.js
+++ b/browser/components/search/test/browser_426329.js
@@ -1,9 +1,9 @@
 // Instead of loading ChromeUtils.js into the test scope in browser-test.js for all tests,
 // we only need ChromeUtils.js for a few files which is why we are using loadSubScript.
-var chromeUtils = {};
+var ChromeUtils = {};
 this._scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
                      getService(Ci.mozIJSSubScriptLoader);
-this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
+this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
 
 function test() {
   waitForExplicitFinish();
@@ -153,7 +153,7 @@ function test() {
     searchBar.addEventListener("popupshowing", stopPopup, true);
     // drop on the search button so that we don't need to worry about the
     // default handlers for textboxes.
-    chromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/plain", data: "Some Text" } ]], "copy", window, EventUtils);
+    ChromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/plain", data: "Some Text" } ]], "copy", window);
     doOnloadOnce(function(event) {
       is(searchBar.value, "Some Text", "drop text/plain on searchbar");
       testDropInternalText();
@@ -162,7 +162,7 @@ function test() {
 
   function testDropInternalText() {
     init();
-    chromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/x-moz-text-internal", data: "More Text" } ]], "copy", window, EventUtils);
+    ChromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/x-moz-text-internal", data: "More Text" } ]], "copy", window);
     doOnloadOnce(function(event) {
       is(searchBar.value, "More Text", "drop text/x-moz-text-internal on searchbar");
       testDropLink();
@@ -171,7 +171,7 @@ function test() {
 
   function testDropLink() {
     init();
-    chromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/uri-list", data: "http://www.mozilla.org" } ]], "copy", window, EventUtils);
+    ChromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/uri-list", data: "http://www.mozilla.org" } ]], "copy", window);
     is(searchBar.value, "More Text", "drop text/uri-list on searchbar");
     SimpleTest.executeSoon(testRightClick);
   }
diff --git a/testing/mochitest/tests/SimpleTest/ChromeUtils.js b/testing/mochitest/tests/SimpleTest/ChromeUtils.js
index da6407172b77..a8576ab89be9 100644
--- a/testing/mochitest/tests/SimpleTest/ChromeUtils.js
+++ b/testing/mochitest/tests/SimpleTest/ChromeUtils.js
@@ -5,10 +5,13 @@
  * EventUtils.js, but when porting to specialPowers, we didn't want
  * to move unnecessary functions.
  *
- * ChromeUtils.js depends on EventUtils.js being loaded.
- *
  */
 
+const EventUtils = {};
+const scriptLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"].
+                   getService(Components.interfaces.mozIJSSubScriptLoader);
+scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
+
 /**
  * Synthesize a query text content event.
  *
@@ -186,13 +189,13 @@ function synthesizeDragStart(element, expectedDragData, aWindow, x, y)
     event.stopPropagation();
   }
   aWindow.addEventListener("dragstart", trapDrag, false);
-  synthesizeMouse(element, x, y, { type: "mousedown" }, aWindow);
+  EventUtils.synthesizeMouse(element, x, y, { type: "mousedown" }, aWindow);
   x += step; y += step;
-  synthesizeMouse(element, x, y, { type: "mousemove" }, aWindow);
+  EventUtils.synthesizeMouse(element, x, y, { type: "mousemove" }, aWindow);
   x += step; y += step;
-  synthesizeMouse(element, x, y, { type: "mousemove" }, aWindow);
+  EventUtils.synthesizeMouse(element, x, y, { type: "mousemove" }, aWindow);
   aWindow.removeEventListener("dragstart", trapDrag, false);
-  synthesizeMouse(element, x, y, { type: "mouseup" }, aWindow);
+  EventUtils.synthesizeMouse(element, x, y, { type: "mouseup" }, aWindow);
   return result;
 }
 
@@ -207,24 +210,18 @@ function synthesizeDragStart(element, expectedDragData, aWindow, x, y)
  *                       [ [ {type: value, data: value}, ...], ... ]
  *  dropEffect - the drop effect to set during the dragstart event, or 'move' if null
  *  aWindow - optional; defaults to the current window object.
- *  eventUtils - optional; allows you to pass in a reference to EventUtils.js. 
- *               If the eventUtils parameter is not passed in, we assume EventUtils.js is 
- *               in the scope. Used by browser-chrome tests.
  *  aDestWindow - optional; defaults to aWindow.
  *                Used when destElement is in a different window than srcElement.
  *
  * Returns the drop effect that was desired.
  */
-function synthesizeDrop(srcElement, destElement, dragData, dropEffect, aWindow, eventUtils, aDestWindow)
+function synthesizeDrop(srcElement, destElement, dragData, dropEffect, aWindow, aDestWindow)
 {
   if (!aWindow)
     aWindow = window;
   if (!aDestWindow)
     aDestWindow = aWindow;
 
-  var synthesizeMouseAtCenter = (eventUtils || window).synthesizeMouseAtCenter;
-  var synthesizeMouse = (eventUtils || window).synthesizeMouse;
-
   var gWindowUtils = aDestWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
                                  getInterface(Components.interfaces.nsIDOMWindowUtils);
   var ds = Components.classes["@mozilla.org/widget/dragservice;1"].
@@ -249,23 +246,22 @@ function synthesizeDrop(srcElement, destElement, dragData, dropEffect, aWindow,
   try {
     // need to use real mouse action
     aWindow.addEventListener("dragstart", trapDrag, true);
-    synthesizeMouseAtCenter(srcElement, { type: "mousedown" }, aWindow);
+    EventUtils.synthesizeMouseAtCenter(srcElement, { type: "mousedown" }, aWindow);
 
     var rect = srcElement.getBoundingClientRect();
     var x = rect.width / 2;
     var y = rect.height / 2;
-    synthesizeMouse(srcElement, x, y, { type: "mousemove" }, aWindow);
-    synthesizeMouse(srcElement, x+10, y+10, { type: "mousemove" }, aWindow);
+    EventUtils.synthesizeMouse(srcElement, x, y, { type: "mousemove" }, aWindow);
+    EventUtils.synthesizeMouse(srcElement, x+10, y+10, { type: "mousemove" }, aWindow);
     aWindow.removeEventListener("dragstart", trapDrag, true);
 
     event = aDestWindow.document.createEvent("DragEvents");
     event.initDragEvent("dragenter", true, true, aDestWindow, 0, 0, 0, 0, 0, false, false, false, false, 0, null, dataTransfer);
     gWindowUtils.dispatchDOMEventViaPresShell(destElement, event, true);
-
     var event = aDestWindow.document.createEvent("DragEvents");
     event.initDragEvent("dragover", true, true, aDestWindow, 0, 0, 0, 0, 0, false, false, false, false, 0, null, dataTransfer);
     if (gWindowUtils.dispatchDOMEventViaPresShell(destElement, event, true)) {
-      synthesizeMouseAtCenter(destElement, { type: "mouseup" }, aDestWindow);
+      EventUtils.synthesizeMouseAtCenter(destElement, { type: "mouseup" }, aDestWindow);
       return "none";
     }
 
@@ -275,7 +271,7 @@ function synthesizeDrop(srcElement, destElement, dragData, dropEffect, aWindow,
       gWindowUtils.dispatchDOMEventViaPresShell(destElement, event, true);
     }
 
-    synthesizeMouseAtCenter(destElement, { type: "mouseup" }, aDestWindow);
+    EventUtils.synthesizeMouseAtCenter(destElement, { type: "mouseup" }, aDestWindow);
 
     return dataTransfer.dropEffect;
   } finally {
diff --git a/toolkit/content/tests/browser/browser_browserDrop.js b/toolkit/content/tests/browser/browser_browserDrop.js
index 10af83461b7e..67f8f589c040 100644
--- a/toolkit/content/tests/browser/browser_browserDrop.js
+++ b/toolkit/content/tests/browser/browser_browserDrop.js
@@ -11,8 +11,8 @@ function test() {
 
   let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
                      getService(Ci.mozIJSSubScriptLoader);
-  let chromeUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
+  let ChromeUtils = {};
+  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
 
   let browser = gBrowser.selectedBrowser;
 
@@ -48,7 +48,7 @@ function test() {
     if (valid)
       validDropCount++;
     executeSoon(function () {
-      chromeUtils.synthesizeDrop(browser, browser, [[{type: "text/plain", data: text}]], "copy", window, EventUtils);
+      ChromeUtils.synthesizeDrop(browser, browser, [[{type: "text/plain", data: text}]], "copy", window);
     });
   }
 
diff --git a/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js b/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
index a3998ff5a315..597b03dc208c 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
@@ -11,10 +11,10 @@
 // Instead of loading ChromeUtils.js into the test scope in browser-test.js for all tests,
 // we only need ChromeUtils.js for a few files which is why we are using loadSubScript.
 var gManagerWindow;
-var chromeUtils = {};
+var ChromeUtils = {};
 this._scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
                      getService(Ci.mozIJSSubScriptLoader);
-this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
+this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
 
 // This listens for the next opened window and checks it is of the right url.
 // opencallback is called when the new window is fully loaded
@@ -134,9 +134,9 @@ add_test(function() {
   });
 
   var viewContainer = gManagerWindow.document.getElementById("view-port");
-  var effect = chromeUtils.synthesizeDrop(viewContainer, viewContainer,
+  var effect = ChromeUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "text/x-moz-url", data: url}]],
-               "copy", gManagerWindow, EventUtils);
+               "copy", gManagerWindow);
   is(effect, "copy", "Drag should be accepted");
 });
 
@@ -155,9 +155,9 @@ add_test(function() {
   });
 
   var viewContainer = gManagerWindow.document.getElementById("view-port");
-  var effect = chromeUtils.synthesizeDrop(viewContainer, viewContainer,
+  var effect = ChromeUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "application/x-moz-file", data: fileurl.file}]],
-               "copy", gManagerWindow, EventUtils);
+               "copy", gManagerWindow);
   is(effect, "copy", "Drag should be accepted");
 });
 
@@ -177,10 +177,10 @@ add_test(function() {
   });
 
   var viewContainer = gManagerWindow.document.getElementById("view-port");
-  var effect = chromeUtils.synthesizeDrop(viewContainer, viewContainer,
+  var effect = ChromeUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "text/x-moz-url", data: url1}],
                 [{type: "text/x-moz-url", data: url2}]],
-               "copy", gManagerWindow, EventUtils);
+               "copy", gManagerWindow);
   is(effect, "copy", "Drag should be accepted");
 });
 
@@ -200,10 +200,10 @@ add_test(function() {
   });
 
   var viewContainer = gManagerWindow.document.getElementById("view-port");
-  var effect = chromeUtils.synthesizeDrop(viewContainer, viewContainer,
+  var effect = ChromeUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "application/x-moz-file", data: fileurl1.file}],
                 [{type: "application/x-moz-file", data: fileurl2.file}]],
-               "copy", gManagerWindow, EventUtils);
+               "copy", gManagerWindow);
   is(effect, "copy", "Drag should be accepted");
 });
 
@@ -223,9 +223,9 @@ add_test(function() {
   });
 
   var viewContainer = gManagerWindow.document.getElementById("view-port");
-  var effect = chromeUtils.synthesizeDrop(viewContainer, viewContainer,
+  var effect = ChromeUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "text/x-moz-url", data: url}],
                 [{type: "application/x-moz-file", data: fileurl.file}]],
-               "copy", gManagerWindow, EventUtils);
+               "copy", gManagerWindow);
   is(effect, "copy", "Drag should be accepted");
 });

From 9c45940197f800c587f68c84ae49cdb4147f75ae Mon Sep 17 00:00:00 2001
From: Chris Cooper <ccooper@deadsquid.com>
Date: Tue, 16 Apr 2013 17:58:16 -0400
Subject: [PATCH 382/438] Bug 851753 - add new mozconfig for static analysis
 with clang (currently unused, hence DONTBUILD) - r=jcranmer

---
 .../mozconfigs/linux64/debug-static-analysis-clang   | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 browser/config/mozconfigs/linux64/debug-static-analysis-clang

diff --git a/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/browser/config/mozconfigs/linux64/debug-static-analysis-clang
new file mode 100644
index 000000000000..d6f57fad4df0
--- /dev/null
+++ b/browser/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -0,0 +1,12 @@
+. "$topsrcdir/build/mozconfig.common"
+
+ac_add_options --enable-debug
+
+# Use Clang as specified in manifest
+export CC="$topsrcdir/clang/bin/clang"
+export CXX="$topsrcdir/clang/bin/clang++"
+
+# Add the static checker
+ac_add_options --enable-clang-plugin
+
+. "$topsrcdir/build/mozconfig.common.override"

From 506926c100340db4a61f8b4ad0454cc2abe0684b Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Tue, 16 Apr 2013 22:15:15 -0700
Subject: [PATCH 383/438] Bug 862669 - Fix some warnings in SIPCC Android code.
 r=jesup

---
 .../src/sipcc/cpr/android/cpr_android_ipc.c      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/media/webrtc/signaling/src/sipcc/cpr/android/cpr_android_ipc.c b/media/webrtc/signaling/src/sipcc/cpr/android/cpr_android_ipc.c
index 3a4c2826e4d2..500409de86fd 100644
--- a/media/webrtc/signaling/src/sipcc/cpr/android/cpr_android_ipc.c
+++ b/media/webrtc/signaling/src/sipcc/cpr/android/cpr_android_ipc.c
@@ -179,6 +179,8 @@ cprCreateMessageQueue (const char *name, uint16_t depth)
     static const char fname[] = "cprCreateMessageQueue";
     cpr_msg_queue_t *msgq;
     static int key_id = 100; /* arbitrary starting number */
+    pthread_cond_t _cond = PTHREAD_COND_INITIALIZER;
+    pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER;
 
     msgq = cpr_calloc(1, sizeof(cpr_msg_queue_t));
     if (msgq == NULL) {
@@ -189,12 +191,9 @@ cprCreateMessageQueue (const char *name, uint16_t depth)
     }
 
     msgq->name = name ? name : unnamed_string;
-	msgq->queueId = key_id++;
-
-	pthread_cond_t _cond = PTHREAD_COND_INITIALIZER;
-	msgq->cond = _cond;
-	pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER;
-	msgq->mutex = _lock;
+    msgq->queueId = key_id++;
+    msgq->cond = _cond;
+    msgq->mutex = _lock;
 
     /*
      * Add message queue to list for statistics reporting
@@ -321,7 +320,7 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
     cpr_msgq_node_t *node;
     struct timespec timeout;
     struct timeval tv;
-    struct timezone *tz;
+    struct timezone tz;
 
     /* Initialize ppUserData */
     if (ppUserData) {
@@ -339,7 +338,7 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
     /*
      * If waitForever is set, block on the message queue
      * until a message is received, else return after
-	 * 25msec of waiting
+     * 25msec of waiting
      */
 	pthread_mutex_lock(&msgq->mutex);
 
@@ -351,7 +350,6 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
 		timeout.tv_sec = tv.tv_sec;
 
 		pthread_cond_timedwait(&msgq->cond, &msgq->mutex, &timeout);
-
 	}
 	else
 	{

From fa750e7efc15e36f2dc6849eb0654e3f3f0442e7 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 17 Apr 2013 12:09:18 +0100
Subject: [PATCH 384/438] Bug 814587 - Add "Add to Reading List" context menu
 (r=bnicholson)

---
 mobile/android/chrome/content/browser.js               | 7 +++++++
 mobile/android/locales/en-US/chrome/browser.properties | 1 +
 2 files changed, 8 insertions(+)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index eee668e8b8ef..58eef982f52a 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -383,6 +383,13 @@ var BrowserApp = {
         NativeWindow.toast.show(label, "short");
       });
 
+    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.addToReadingList"),
+      NativeWindow.contextmenus.linkOpenableContext,
+      function(aTarget) {
+        let url = NativeWindow.contextmenus._getLinkURL(aTarget);
+        Services.obs.notifyObservers(null, "Reader:Add", JSON.stringify({ url: url }));
+      });
+
     NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.copyLink"),
       NativeWindow.contextmenus.linkCopyableContext,
       function(aTarget) {
diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties
index a23f5a3eb42b..845002b531e2 100644
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -155,6 +155,7 @@ selectionHelper.textCopied=Text copied to clipboard
 # Context menu
 contextmenu.openInNewTab=Open Link in New Tab
 contextmenu.openInPrivateTab=Open Link in Private Tab
+contextmenu.addToReadingList=Add to Reading List
 contextmenu.share=Share
 contextmenu.copyLink=Copy Link
 contextmenu.shareLink=Share Link

From 73d60bbe9fc0c33265351e11ab4b0812b7361a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20Wang?= <fred.wang@free.fr>
Date: Wed, 17 Apr 2013 07:47:09 -0400
Subject: [PATCH 385/438] Bug 717546 - Partial support for negative
 mspace@width. r=karlt

---
 layout/mathml/nsMathMLContainerFrame.cpp |  2 +-
 layout/mathml/nsMathMLmspaceFrame.cpp    | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index 94a4d1e605f7..91b97054103a 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -1286,7 +1286,7 @@ nsMathMLContainerFrame::Place(nsRenderingContext& aRenderingContext,
   // another math frame
   mBoundingMetrics.width = child.X();
 
-  aDesiredSize.width = mBoundingMetrics.width;
+  aDesiredSize.width = std::max(0, mBoundingMetrics.width);
   aDesiredSize.height = ascent + descent;
   aDesiredSize.ascent = ascent;
   aDesiredSize.mBoundingMetrics = mBoundingMetrics;
diff --git a/layout/mathml/nsMathMLmspaceFrame.cpp b/layout/mathml/nsMathMLmspaceFrame.cpp
index 95b201b8da75..dffdc8a37f1c 100644
--- a/layout/mathml/nsMathMLmspaceFrame.cpp
+++ b/layout/mathml/nsMathMLmspaceFrame.cpp
@@ -106,18 +106,16 @@ nsMathMLmspaceFrame::Reflow(nsPresContext*          aPresContext,
                             nsReflowStatus&          aStatus)
 {
   ProcessAttributes(aPresContext);
-  // nsLineLayout doesn't expect negative widths.
-  // XXXfredw Negative spaces are not implemented. See bug 717546
 
   mBoundingMetrics = nsBoundingMetrics();
-  mBoundingMetrics.width = std::max(0, mWidth);
+  mBoundingMetrics.width = mWidth;
   mBoundingMetrics.ascent = mHeight;
   mBoundingMetrics.descent = mDepth;
   mBoundingMetrics.leftBearing = 0;
   mBoundingMetrics.rightBearing = mBoundingMetrics.width;
 
   aDesiredSize.ascent = mHeight;
-  aDesiredSize.width = mBoundingMetrics.width;
+  aDesiredSize.width = std::max(0, mBoundingMetrics.width);
   aDesiredSize.height = aDesiredSize.ascent + mDepth;
   // Also return our bounding metrics
   aDesiredSize.mBoundingMetrics = mBoundingMetrics;
@@ -133,8 +131,8 @@ nsMathMLmspaceFrame::MeasureForWidth(nsRenderingContext& aRenderingContext,
 {
   ProcessAttributes(PresContext());
   mBoundingMetrics = nsBoundingMetrics();
-  mBoundingMetrics.width = std::max(0, mWidth);
-  aDesiredSize.width = mBoundingMetrics.width;
+  mBoundingMetrics.width = mWidth;
+  aDesiredSize.width = std::max(0, mBoundingMetrics.width);
   aDesiredSize.mBoundingMetrics = mBoundingMetrics;
   return NS_OK;
 }

From 1c5cea6056721edb52747addff5623b1269d4b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20Wang?= <fred.wang@free.fr>
Date: Wed, 17 Apr 2013 07:47:09 -0400
Subject: [PATCH 386/438] Bug 717546 - Add reftest. r=karlt

---
 .../mathml/negative-mspace-1-ref.html         | 25 +++++++++++++++++
 layout/reftests/mathml/negative-mspace-1.html | 27 +++++++++++++++++++
 layout/reftests/mathml/reftest.list           |  1 +
 3 files changed, 53 insertions(+)
 create mode 100644 layout/reftests/mathml/negative-mspace-1-ref.html
 create mode 100644 layout/reftests/mathml/negative-mspace-1.html

diff --git a/layout/reftests/mathml/negative-mspace-1-ref.html b/layout/reftests/mathml/negative-mspace-1-ref.html
new file mode 100644
index 000000000000..2903c43a17f9
--- /dev/null
+++ b/layout/reftests/mathml/negative-mspace-1-ref.html
@@ -0,0 +1,25 @@
+<!doctype>
+<html>
+  <head>
+    <title>negative mspace</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  </head>
+  <body>
+    <p>
+      <math>
+	<mrow>
+	  <mspace width="1em" height="1em" mathbackground="red"></mspace>
+	  <mspace width="1em" height="1em" mathbackground="blue"></mspace>
+	</mrow>
+      </math>
+    </p>
+    <p>
+      <math>
+	<mrow>
+	  <mspace width="1em" height="1em" mathbackground="blue"></mspace>
+	  <mspace width="1em" height="1em" mathbackground="red"></mspace>
+	</mrow>
+      </math>
+    </p>
+  </body>
+</html>
diff --git a/layout/reftests/mathml/negative-mspace-1.html b/layout/reftests/mathml/negative-mspace-1.html
new file mode 100644
index 000000000000..bc03ac0c0099
--- /dev/null
+++ b/layout/reftests/mathml/negative-mspace-1.html
@@ -0,0 +1,27 @@
+<!doctype>
+<html>
+  <head>
+    <title>negative mspace</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  </head>
+  <body>
+    <p>
+      <math>
+	<mrow>
+	  <mspace width="2em" height="1em" mathbackground="red"></mspace>
+	  <mspace width="-1em"/>
+	  <mspace width="1em" height="1em" mathbackground="blue"></mspace>
+	</mrow>
+      </math>
+    </p>
+    <p>
+      <math dir="rtl">
+	<mrow>
+	  <mspace width="2em" height="1em" mathbackground="red"></mspace>
+	  <mspace width="-1em"/>
+	  <mspace width="1em" height="1em" mathbackground="blue"></mspace>
+	</mrow>
+      </math>
+    </p>
+  </body>
+</html>
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
index f3a6c557438a..6ac476bea042 100644
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -97,6 +97,7 @@ fails == mstyle-5.xhtml mstyle-5-ref.xhtml # Bug 787215
 == mfrac-linethickness-2.xhtml mfrac-linethickness-2-ref.xhtml
 == mfrac-linethickness-3.xhtml mfrac-linethickness-3-ref.xhtml
 == mathml-negativespace.html mathml-negativespace-ref.html
+== negative-mspace-1.html negative-mspace-1-ref.html
 != link-1.xhtml link-ref.xhtml
 == munderover-empty-scripts.html munderover-empty-scripts-ref.html
 == positive-namedspace.html positive-namedspace-ref.html

From cbfeb4cc13d41778290e1cd2a766d3a40138ba6a Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Wed, 17 Apr 2013 13:36:02 +0800
Subject: [PATCH 387/438] Bug 852034 - Replace restoreBookmarksFromJSONFile
 with importFromFile. r=mano

---
 browser/components/nsBrowserGlue.js           |   7 +-
 browser/components/places/content/places.js   |  18 +-
 .../tests/unit/test_browserGlue_prefs.js      |   4 +-
 .../sync/tests/unit/test_bookmark_engine.js   |   2 +-
 .../components/places/BookmarkJSONUtils.jsm   | 209 ++++++++++--------
 .../bookmarks/test_405938_restore_queries.js  |   2 +-
 .../test_417228-exclude-from-backup.js        |   4 +-
 .../bookmarks/test_417228-other-roots.js      |   2 +-
 .../test_424958-json-quoted-folders.js        |   2 +-
 .../places/tests/bookmarks/test_448584.js     |   2 +-
 .../places/tests/bookmarks/test_458683.js     |   2 +-
 .../places/tests/unit/test_384370.js          |   2 +-
 .../test_bookmarks_restore_notification.js    |  29 ++-
 13 files changed, 163 insertions(+), 122 deletions(-)

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 91f0333046ac..c590e1d298c7 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -32,6 +32,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "BookmarkHTMLUtils",
                                   "resource://gre/modules/BookmarkHTMLUtils.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "BookmarkJSONUtils",
+                                  "resource://gre/modules/BookmarkJSONUtils.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this, "webappsUI",
                                   "resource:///modules/webappsUI.jsm");
 
@@ -931,7 +934,7 @@ BrowserGlue.prototype = {
         var bookmarksBackupFile = PlacesUtils.backups.getMostRecent("json");
         if (bookmarksBackupFile) {
           // restore from JSON backup
-          PlacesUtils.restoreBookmarksFromJSONFile(bookmarksBackupFile);
+          yield BookmarkJSONUtils.importFromFile(bookmarksBackupFile, true);
           importBookmarks = false;
         }
         else {
@@ -1031,6 +1034,8 @@ BrowserGlue.prototype = {
         this._idleService.addIdleObserver(this, BOOKMARKS_BACKUP_IDLE_TIME);
         this._isIdleObserver = true;
       }
+
+      Services.obs.notifyObservers(null, "places-browser-init-complete", "");
     }.bind(this));
   },
 
diff --git a/browser/components/places/content/places.js b/browser/components/places/content/places.js
index a64637ed1acd..2fa3bd42097c 100644
--- a/browser/components/places/content/places.js
+++ b/browser/components/places/content/places.js
@@ -3,7 +3,12 @@
  * 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/. */
 
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource:///modules/MigrationUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+                                  "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "BookmarkJSONUtils",
+                                  "resource://gre/modules/BookmarkJSONUtils.jsm");
 
 var PlacesOrganizer = {
   _places: null,
@@ -441,12 +446,13 @@ var PlacesOrganizer = {
                          PlacesUIUtils.getString("bookmarksRestoreAlert")))
       return;
 
-    try {
-      PlacesUtils.restoreBookmarksFromJSONFile(aFile);
-    }
-    catch(ex) {
-      this._showErrorAlert(PlacesUIUtils.getString("bookmarksRestoreParseError"));
-    }
+    Task.spawn(function() {
+      try {
+        yield BookmarkJSONUtils.importFromFile(aFile, true);
+      } catch(ex) {
+        PlacesOrganizer._showErrorAlert(PlacesUIUtils.getString("bookmarksRestoreParseError"));
+      }
+    });
   },
 
   _showErrorAlert: function PO__showErrorAlert(aMsg) {
diff --git a/browser/components/places/tests/unit/test_browserGlue_prefs.js b/browser/components/places/tests/unit/test_browserGlue_prefs.js
index d3997057e4ea..e8366a6146f2 100644
--- a/browser/components/places/tests/unit/test_browserGlue_prefs.js
+++ b/browser/components/places/tests/unit/test_browserGlue_prefs.js
@@ -39,7 +39,7 @@ function waitForImportAndSmartBookmarks(aCallback) {
     // Wait for Places init notification.
     Services.obs.addObserver(function(aSubject, aTopic, aData) {
       Services.obs.removeObserver(arguments.callee,
-                                  PlacesUtils.TOPIC_INIT_COMPLETE);
+                                  "places-browser-init-complete");
       do_execute_soon(function () {
         // Ensure preferences status.
         do_check_false(Services.prefs.getBoolPref(PREF_AUTO_EXPORT_HTML));
@@ -58,7 +58,7 @@ function waitForImportAndSmartBookmarks(aCallback) {
 
         run_next_test();
       });
-    }, PlacesUtils.TOPIC_INIT_COMPLETE, false);
+    }, "places-browser-init-complete", false);
   },
 
   function test_import()
diff --git a/services/sync/tests/unit/test_bookmark_engine.js b/services/sync/tests/unit/test_bookmark_engine.js
index 782713d97a97..aa486c3e0471 100644
--- a/services/sync/tests/unit/test_bookmark_engine.js
+++ b/services/sync/tests/unit/test_bookmark_engine.js
@@ -231,7 +231,7 @@ add_task(function test_restorePromptsReupload() {
     do_check_eq(wbos[0], bmk2_guid);
 
     _("Now restore from a backup.");
-    PlacesUtils.restoreBookmarksFromJSONFile(backupFile);
+    yield BookmarkJSONUtils.importFromFile(backupFile, true);
 
     _("Ensure we have the bookmarks we expect locally.");
     let guids = store.getAllIDs();
diff --git a/toolkit/components/places/BookmarkJSONUtils.jsm b/toolkit/components/places/BookmarkJSONUtils.jsm
index 6b29f1f1e8a4..28a5f55791cb 100644
--- a/toolkit/components/places/BookmarkJSONUtils.jsm
+++ b/toolkit/components/places/BookmarkJSONUtils.jsm
@@ -49,7 +49,7 @@ this.BookmarkJSONUtils = Object.freeze({
    */
   importFromFile: function BJU_importFromFile(aFile, aReplace) {
     let importer = new BookmarkImporter();
-    return importer.importFromURL(NetUtil.newURI(aFile).spec, aReplace);
+    return importer.importFromFile(aFile, aReplace);
   },
 
   /**
@@ -70,6 +70,31 @@ this.BookmarkJSONUtils = Object.freeze({
 
 function BookmarkImporter() {}
 BookmarkImporter.prototype = {
+  /**
+   * Import bookmarks from a file.
+   *
+   * @param aFile
+   *        the bookmark file.
+   * @param aReplace
+   *        Boolean if true, replace existing bookmarks, else merge.
+   *
+   * @return {Promise}
+   * @resolves When the new bookmarks have been created.
+   * @rejects JavaScript exception.
+   */
+  importFromFile: function(aFile, aReplace) {
+    if (aFile.exists()) {
+      return this.importFromURL(NetUtil.newURI(aFile).spec, aReplace);
+    }
+
+    notifyObservers(PlacesUtils.TOPIC_BOOKMARKS_RESTORE_BEGIN);
+
+    return Task.spawn(function() {
+      notifyObservers(PlacesUtils.TOPIC_BOOKMARKS_RESTORE_FAILED);
+      throw new Error("File does not exist.");
+    });
+  },
+
   /**
    * Import bookmarks from a url.
    *
@@ -143,104 +168,104 @@ BookmarkImporter.prototype = {
       Services.tm.mainThread.dispatch(function() {
         deferred.resolve(); // Nothing to restore
       }, Ci.nsIThread.DISPATCH_NORMAL);
-    }
+    } else {
+      // Ensure tag folder gets processed last
+      nodes[0].children.sort(function sortRoots(aNode, bNode) {
+        return (aNode.root && aNode.root == "tagsFolder") ? 1 :
+               (bNode.root && bNode.root == "tagsFolder") ? -1 : 0;
+      });
 
-    // Ensure tag folder gets processed last
-    nodes[0].children.sort(function sortRoots(aNode, bNode) {
-      return (aNode.root && aNode.root == "tagsFolder") ? 1 :
-             (bNode.root && bNode.root == "tagsFolder") ? -1 : 0;
-    });
-
-    let batch = {
-      nodes: nodes[0].children,
-      runBatched: function runBatched() {
-        if (aReplace) {
-          // Get roots excluded from the backup, we will not remove them
-          // before restoring.
-          let excludeItems = PlacesUtils.annotations.getItemsWithAnnotation(
-                               PlacesUtils.EXCLUDE_FROM_BACKUP_ANNO);
-          // Delete existing children of the root node, excepting:
-          // 1. special folders: delete the child nodes
-          // 2. tags folder: untag via the tagging api
-          let root = PlacesUtils.getFolderContents(PlacesUtils.placesRootId,
+      let batch = {
+        nodes: nodes[0].children,
+        runBatched: function runBatched() {
+          if (aReplace) {
+            // Get roots excluded from the backup, we will not remove them
+            // before restoring.
+            let excludeItems = PlacesUtils.annotations.getItemsWithAnnotation(
+                                 PlacesUtils.EXCLUDE_FROM_BACKUP_ANNO);
+            // Delete existing children of the root node, excepting:
+            // 1. special folders: delete the child nodes
+            // 2. tags folder: untag via the tagging api
+            let root = PlacesUtils.getFolderContents(PlacesUtils.placesRootId,
                                                    false, false).root;
-          let childIds = [];
-          for (let i = 0; i < root.childCount; i++) {
-            let childId = root.getChild(i).itemId;
-            if (excludeItems.indexOf(childId) == -1 &&
-                childId != PlacesUtils.tagsFolderId) {
-              childIds.push(childId);
-            }
-          }
-          root.containerOpen = false;
-
-          for (let i = 0; i < childIds.length; i++) {
-            let rootItemId = childIds[i];
-            if (PlacesUtils.isRootItem(rootItemId)) {
-              PlacesUtils.bookmarks.removeFolderChildren(rootItemId);
-            } else {
-              PlacesUtils.bookmarks.removeItem(rootItemId);
-            }
-          }
-        }
-
-        let searchIds = [];
-        let folderIdMap = [];
-
-        batch.nodes.forEach(function(node) {
-          if (!node.children || node.children.length == 0)
-            return; // Nothing to restore for this root
-
-          if (node.root) {
-            let container = PlacesUtils.placesRootId; // Default to places root
-            switch (node.root) {
-              case "bookmarksMenuFolder":
-                container = PlacesUtils.bookmarksMenuFolderId;
-                break;
-              case "tagsFolder":
-                container = PlacesUtils.tagsFolderId;
-                break;
-              case "unfiledBookmarksFolder":
-                container = PlacesUtils.unfiledBookmarksFolderId;
-                break;
-              case "toolbarFolder":
-                container = PlacesUtils.toolbarFolderId;
-                break;
-            }
-
-            // Insert the data into the db
-            node.children.forEach(function(child) {
-              let index = child.index;
-              let [folders, searches] =
-                this.importJSONNode(child, container, index, 0);
-              for (let i = 0; i < folders.length; i++) {
-                if (folders[i])
-                  folderIdMap[i] = folders[i];
+            let childIds = [];
+            for (let i = 0; i < root.childCount; i++) {
+              let childId = root.getChild(i).itemId;
+              if (excludeItems.indexOf(childId) == -1 &&
+                  childId != PlacesUtils.tagsFolderId) {
+                childIds.push(childId);
               }
-              searchIds = searchIds.concat(searches);
-            }.bind(this));
-          } else {
-            this.importJSONNode(
-              node, PlacesUtils.placesRootId, node.index, 0);
+            }
+            root.containerOpen = false;
+
+            for (let i = 0; i < childIds.length; i++) {
+              let rootItemId = childIds[i];
+              if (PlacesUtils.isRootItem(rootItemId)) {
+                PlacesUtils.bookmarks.removeFolderChildren(rootItemId);
+              } else {
+                PlacesUtils.bookmarks.removeItem(rootItemId);
+              }
+            }
           }
-        }.bind(this));
 
-        // Fixup imported place: uris that contain folders
-        searchIds.forEach(function(aId) {
-          let oldURI = PlacesUtils.bookmarks.getBookmarkURI(aId);
-          let uri = fixupQuery(oldURI, folderIdMap);
-          if (!uri.equals(oldURI)) {
-            PlacesUtils.bookmarks.changeBookmarkURI(aId, uri);
-          }
-        });
+          let searchIds = [];
+          let folderIdMap = [];
 
-        Services.tm.mainThread.dispatch(function() {
-          deferred.resolve();
-        }, Ci.nsIThread.DISPATCH_NORMAL);
-      }.bind(this)
-    };
+          batch.nodes.forEach(function(node) {
+            if (!node.children || node.children.length == 0)
+              return; // Nothing to restore for this root
 
-    PlacesUtils.bookmarks.runInBatchMode(batch, null);
+            if (node.root) {
+              let container = PlacesUtils.placesRootId; // Default to places root
+              switch (node.root) {
+                case "bookmarksMenuFolder":
+                  container = PlacesUtils.bookmarksMenuFolderId;
+                  break;
+                case "tagsFolder":
+                  container = PlacesUtils.tagsFolderId;
+                  break;
+                case "unfiledBookmarksFolder":
+                  container = PlacesUtils.unfiledBookmarksFolderId;
+                  break;
+                case "toolbarFolder":
+                  container = PlacesUtils.toolbarFolderId;
+                  break;
+              }
+
+              // Insert the data into the db
+              node.children.forEach(function(child) {
+                let index = child.index;
+                let [folders, searches] =
+                  this.importJSONNode(child, container, index, 0);
+                for (let i = 0; i < folders.length; i++) {
+                  if (folders[i])
+                    folderIdMap[i] = folders[i];
+                }
+                searchIds = searchIds.concat(searches);
+              }.bind(this));
+            } else {
+              this.importJSONNode(
+                node, PlacesUtils.placesRootId, node.index, 0);
+            }
+          }.bind(this));
+
+          // Fixup imported place: uris that contain folders
+          searchIds.forEach(function(aId) {
+            let oldURI = PlacesUtils.bookmarks.getBookmarkURI(aId);
+            let uri = fixupQuery(oldURI, folderIdMap);
+            if (!uri.equals(oldURI)) {
+              PlacesUtils.bookmarks.changeBookmarkURI(aId, uri);
+            }
+          });
+
+          Services.tm.mainThread.dispatch(function() {
+            deferred.resolve();
+          }, Ci.nsIThread.DISPATCH_NORMAL);
+        }.bind(this)
+      };
+
+      PlacesUtils.bookmarks.runInBatchMode(batch, null);
+    }
 
     return deferred.promise;
   },
diff --git a/toolkit/components/places/tests/bookmarks/test_405938_restore_queries.js b/toolkit/components/places/tests/bookmarks/test_405938_restore_queries.js
index ac5ba42dd9f0..f4921783d131 100644
--- a/toolkit/components/places/tests/bookmarks/test_405938_restore_queries.js
+++ b/toolkit/components/places/tests/bookmarks/test_405938_restore_queries.js
@@ -219,7 +219,7 @@ function run_test() {
 
     // restore json file
     try {
-      PlacesUtils.restoreBookmarksFromJSONFile(jsonFile);
+      yield BookmarkJSONUtils.importFromFile(jsonFile, true);
     } catch(ex) { do_throw("couldn't import the exported file: " + ex); }
 
     // validate
diff --git a/toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js b/toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js
index eb5542188a55..5a876e74a386 100644
--- a/toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js
+++ b/toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js
@@ -132,7 +132,7 @@ function run_test() {
 
     // restore json file
     try {
-      PlacesUtils.restoreBookmarksFromJSONFile(jsonFile);
+      yield BookmarkJSONUtils.importFromFile(jsonFile, true);
     } catch(ex) {
       do_throw("couldn't import the exported file: " + ex);
     }
@@ -147,7 +147,7 @@ function run_test() {
     PlacesUtils.bookmarks.removeItem(test._excludeRootId);
     // restore json file
     try {
-      PlacesUtils.restoreBookmarksFromJSONFile(jsonFile);
+      yield BookmarkJSONUtils.importFromFile(jsonFile, true);
     } catch(ex) {
       do_throw("couldn't import the exported file: " + ex);
     }
diff --git a/toolkit/components/places/tests/bookmarks/test_417228-other-roots.js b/toolkit/components/places/tests/bookmarks/test_417228-other-roots.js
index ec12dfddd678..f966953fc492 100644
--- a/toolkit/components/places/tests/bookmarks/test_417228-other-roots.js
+++ b/toolkit/components/places/tests/bookmarks/test_417228-other-roots.js
@@ -158,7 +158,7 @@ function run_test() {
 
     // restore json file
     try {
-      PlacesUtils.restoreBookmarksFromJSONFile(jsonFile, excludedItemsFromRestore);
+      yield BookmarkJSONUtils.importFromFile(jsonFile, true);
     } catch(ex) { do_throw("couldn't import the exported file: " + ex); }
 
     // validate
diff --git a/toolkit/components/places/tests/bookmarks/test_424958-json-quoted-folders.js b/toolkit/components/places/tests/bookmarks/test_424958-json-quoted-folders.js
index 280972857d84..1c7804e77a03 100644
--- a/toolkit/components/places/tests/bookmarks/test_424958-json-quoted-folders.js
+++ b/toolkit/components/places/tests/bookmarks/test_424958-json-quoted-folders.js
@@ -88,7 +88,7 @@ function run_test() {
 
     // restore json file
     try {
-      PlacesUtils.restoreBookmarksFromJSONFile(jsonFile);
+      yield BookmarkJSONUtils.importFromFile(jsonFile, true);
     } catch(ex) { do_throw("couldn't import the exported file: " + ex); }
 
     // validate
diff --git a/toolkit/components/places/tests/bookmarks/test_448584.js b/toolkit/components/places/tests/bookmarks/test_448584.js
index 2619a53642e9..4fd827e24dcc 100644
--- a/toolkit/components/places/tests/bookmarks/test_448584.js
+++ b/toolkit/components/places/tests/bookmarks/test_448584.js
@@ -110,7 +110,7 @@ function run_test() {
 
     // restore json file
     try {
-      PlacesUtils.restoreBookmarksFromJSONFile(jsonFile);
+      yield BookmarkJSONUtils.importFromFile(jsonFile, true);
     } catch(ex) { do_throw("couldn't import the exported file: " + ex); }
 
     // validate
diff --git a/toolkit/components/places/tests/bookmarks/test_458683.js b/toolkit/components/places/tests/bookmarks/test_458683.js
index 0d942ea2e032..9eb658297d9f 100644
--- a/toolkit/components/places/tests/bookmarks/test_458683.js
+++ b/toolkit/components/places/tests/bookmarks/test_458683.js
@@ -131,7 +131,7 @@ function run_test() {
 
     // restore json file
     try {
-      PlacesUtils.restoreBookmarksFromJSONFile(jsonFile);
+      yield BookmarkJSONUtils.importFromFile(jsonFile, true);
     } catch(ex) { do_throw("couldn't import the exported file: " + ex); }
 
     // validate
diff --git a/toolkit/components/places/tests/unit/test_384370.js b/toolkit/components/places/tests/unit/test_384370.js
index 7abc2a698094..0e7a6b86c891 100644
--- a/toolkit/components/places/tests/unit/test_384370.js
+++ b/toolkit/components/places/tests/unit/test_384370.js
@@ -69,7 +69,7 @@ function run_test() {
       // 2. empty bookmarks db
       // 3. import bookmarks.exported.json
       try {
-        PlacesUtils.restoreBookmarksFromJSONFile(jsonFile);
+        yield BookmarkJSONUtils.importFromFile(jsonFile, true);
       } catch(ex) { do_throw("couldn't import the exported file: " + ex); }
       LOG("imported json");
 
diff --git a/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js b/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
index bc70f33d3d1f..43f885ea7a74 100644
--- a/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
@@ -54,7 +54,7 @@ var tests = [
         yield BookmarkJSONUtils.exportToFile(this.file);
         remove_all_bookmarks();
         try {
-          PlacesUtils.restoreBookmarksFromJSONFile(this.file);
+          yield BookmarkJSONUtils.importFromFile(this.file, true);
         }
         catch (e) {
           do_throw("  Restore should not have failed");
@@ -71,12 +71,14 @@ var tests = [
     folderId:   null,
     run:        function () {
       this.file = createFile("bookmarks-test_restoreNotification.json");
-      try {
-        PlacesUtils.restoreBookmarksFromJSONFile(this.file);
-      }
-      catch (e) {
-        do_throw("  Restore should not have failed");
-      }
+      Task.spawn(function() {
+        try {
+          yield BookmarkJSONUtils.importFromFile(this.file, true);
+        }
+        catch (e) {
+          do_throw("  Restore should not have failed" + e);
+        }
+      }.bind(this));
     }
   },
 
@@ -89,11 +91,14 @@ var tests = [
     run:        function () {
       this.file = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
       this.file.append("this file doesn't exist because nobody created it");
-      try {
-        PlacesUtils.restoreBookmarksFromJSONFile(this.file);
-        do_throw("  Restore should have failed");
-      }
-      catch (e) {}
+      Task.spawn(function() {
+        try {
+          yield BookmarkJSONUtils.importFromFile(this.file, true);
+          do_throw("  Restore should have failed");
+        }
+        catch (e) {
+        }
+      }.bind(this));
     }
   },
 

From 28f34cd9f9f2caefc4ca90b3a5214337d6960b6b Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Wed, 17 Apr 2013 14:08:11 +0800
Subject: [PATCH 388/438] Bug 855638 - Part 1: Remove previous calls to
 PlacesUtils.backups and move them to PlacesBackups. r=mak

---
 .../migration/src/FirefoxProfileMigrator.js          |  6 +++---
 browser/components/nsBrowserGlue.js                  | 12 ++++++++----
 browser/components/places/content/places.js          | 10 ++++++----
 toolkit/components/places/PlacesBackups.jsm          |  4 +++-
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
index 777f7d442272..23e021d25bce 100644
--- a/browser/components/migration/src/FirefoxProfileMigrator.js
+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
@@ -15,8 +15,8 @@
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource:///modules/MigrationUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-                                  "resource://gre/modules/PlacesUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesBackups",
+                                  "resource://gre/modules/PlacesBackups.jsm");
 
 function FirefoxProfileMigrator() { }
 
@@ -76,7 +76,7 @@ FirefoxProfileMigrator.prototype.getResources = function() {
                                   ["signons.sqlite", "key3.db"]);
   let formData = getFileResource(types.FORMDATA, ["formhistory.sqlite"]);
   let bookmarksBackups = getFileResource(types.OTHERDATA,
-    [PlacesUtils.backups.profileRelativeFolderPath]);
+    [PlacesBackups.profileRelativeFolderPath]);
   let dictionary = getFileResource(types.OTHERDATA, ["persdict.dat"]);
 
   return [r for each (r in [places, cookies, passwords, formData,
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index c590e1d298c7..bf1ad021b18f 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -62,6 +62,10 @@ XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesBackups",
+                                  "resource://gre/modules/PlacesBackups.jsm");
+
+
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
 const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";
 
@@ -931,7 +935,7 @@ BrowserGlue.prototype = {
       // from bookmarks.html, we will try to restore from JSON
       if (importBookmarks && !restoreDefaultBookmarks && !importBookmarksHTML) {
         // get latest JSON backup
-        var bookmarksBackupFile = PlacesUtils.backups.getMostRecent("json");
+        var bookmarksBackupFile = PlacesBackups.getMostRecent("json");
         if (bookmarksBackupFile) {
           // restore from JSON backup
           yield BookmarkJSONUtils.importFromFile(bookmarksBackupFile, true);
@@ -1102,12 +1106,12 @@ BrowserGlue.prototype = {
    * @return true if bookmarks should be backed up, false if not.
    */
   _shouldBackupBookmarks: function BG__shouldBackupBookmarks() {
-    let lastBackupFile = PlacesUtils.backups.getMostRecent();
+    let lastBackupFile = PlacesBackups.getMostRecent();
 
     // Should backup bookmarks if there are no backups or the maximum interval between
     // backups elapsed.
     return (!lastBackupFile ||
-            new Date() - PlacesUtils.backups.getDateForFile(lastBackupFile) > BOOKMARKS_BACKUP_INTERVAL);
+            new Date() - PlacesBackups.getDateForFile(lastBackupFile) > BOOKMARKS_BACKUP_INTERVAL);
   },
 
   /**
@@ -1123,7 +1127,7 @@ BrowserGlue.prototype = {
       }
       catch(ex) { /* Use default. */ }
 
-      yield PlacesUtils.backups.create(maxBackups); // Don't force creation.
+      yield PlacesBackups.create(maxBackups); // Don't force creation.
     });
   },
 
diff --git a/browser/components/places/content/places.js b/browser/components/places/content/places.js
index 2fa3bd42097c..178149bf8502 100644
--- a/browser/components/places/content/places.js
+++ b/browser/components/places/content/places.js
@@ -9,6 +9,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "BookmarkJSONUtils",
                                   "resource://gre/modules/BookmarkJSONUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesBackups",
+                                  "resource://gre/modules/PlacesBackups.jsm");
 
 var PlacesOrganizer = {
   _places: null,
@@ -365,13 +367,13 @@ var PlacesOrganizer = {
     while (restorePopup.childNodes.length > 1)
       restorePopup.removeChild(restorePopup.firstChild);
 
-    let backupFiles = PlacesUtils.backups.entries;
+    let backupFiles = PlacesBackups.entries;
     if (backupFiles.length == 0)
       return;
 
     // Populate menu with backups.
     for (let i = 0; i < backupFiles.length; i++) {
-      let backupDate = PlacesUtils.backups.getDateForFile(backupFiles[i]);
+      let backupDate = PlacesBackups.getDateForFile(backupFiles[i]);
       let m = restorePopup.insertBefore(document.createElement("menuitem"),
                                         document.getElementById("restoreFromFile"));
       m.setAttribute("label",
@@ -395,7 +397,7 @@ var PlacesOrganizer = {
    */
   onRestoreMenuItemClick: function PO_onRestoreMenuItemClick(aMenuItem) {
     let backupName = aMenuItem.getAttribute("value");
-    let backupFiles = PlacesUtils.backups.entries;
+    let backupFiles = PlacesBackups.entries;
     for (let i = 0; i < backupFiles.length; i++) {
       if (backupFiles[i].leafName == backupName) {
         this.restoreBookmarksFromFile(backupFiles[i]);
@@ -484,7 +486,7 @@ var PlacesOrganizer = {
             Ci.nsIFilePicker.modeSave);
     fp.appendFilter(PlacesUIUtils.getString("bookmarksRestoreFilterName"),
                     PlacesUIUtils.getString("bookmarksRestoreFilterExtension"));
-    fp.defaultString = PlacesUtils.backups.getFilenameForDate();
+    fp.defaultString = PlacesBackups.getFilenameForDate();
     fp.displayDirectory = backupsDir;
     fp.open(fpCallback);
   },
diff --git a/toolkit/components/places/PlacesBackups.jsm b/toolkit/components/places/PlacesBackups.jsm
index fef047df3140..aeaeaf2b1917 100644
--- a/toolkit/components/places/PlacesBackups.jsm
+++ b/toolkit/components/places/PlacesBackups.jsm
@@ -29,7 +29,7 @@ this.PlacesBackups = {
 
   get folder() {
     let bookmarksBackupDir = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
-    bookmarksBackupDir.append("bookmarkbackups");
+    bookmarksBackupDir.append(this.profileRelativeFolderPath);
     if (!bookmarksBackupDir.exists()) {
       bookmarksBackupDir.create(Ci.nsIFile.DIRECTORY_TYPE, parseInt("0700", 8));
       if (!bookmarksBackupDir.exists())
@@ -39,6 +39,8 @@ this.PlacesBackups = {
     return this.folder = bookmarksBackupDir;
   },
 
+  get profileRelativeFolderPath() "bookmarkbackups",
+
   /**
    * Cache current backups in a sorted (by date DESC) array.
    */

From 09c0944c7e2f0aa2f262e03ab55e28098f20fc90 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Wed, 17 Apr 2013 14:10:02 +0800
Subject: [PATCH 389/438] Bug 855638 - Part 2: Remove previous calls to
 PlacesUtils.backups and move them to PlacesBackups. r=mak

---
 .../bookmarks/test_466303-json-remove-backups.js   |  6 +++---
 .../bookmarks/test_477583_json-backup-in-future.js | 14 +++++++-------
 toolkit/components/places/tests/head_common.js     |  5 ++++-
 .../places/tests/unit/test_utils_backups_create.js |  6 +++---
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/toolkit/components/places/tests/bookmarks/test_466303-json-remove-backups.js b/toolkit/components/places/tests/bookmarks/test_466303-json-remove-backups.js
index 3b926a4ac699..7c5f8809341f 100644
--- a/toolkit/components/places/tests/bookmarks/test_466303-json-remove-backups.js
+++ b/toolkit/components/places/tests/bookmarks/test_466303-json-remove-backups.js
@@ -10,7 +10,7 @@ function run_test() {
   do_test_pending();
 
   // Get bookmarkBackups directory
-  var bookmarksBackupDir = PlacesUtils.backups.folder;
+  var bookmarksBackupDir = PlacesBackups.folder;
 
   // Create an html dummy backup in the past
   var htmlBackupFile = bookmarksBackupDir.clone();
@@ -31,7 +31,7 @@ function run_test() {
   do_check_true(jsonBackupFile.exists());
 
   // Export bookmarks to JSON.
-  var backupFilename = PlacesUtils.backups.getFilenameForDate();
+  var backupFilename = PlacesBackups.getFilenameForDate();
   var lastBackupFile = bookmarksBackupDir.clone();
   lastBackupFile.append(backupFilename);
   if (lastBackupFile.exists())
@@ -39,7 +39,7 @@ function run_test() {
   do_check_false(lastBackupFile.exists());
 
   Task.spawn(function() {
-    yield PlacesUtils.backups.create(NUMBER_OF_BACKUPS);
+    yield PlacesBackups.create(NUMBER_OF_BACKUPS);
     do_check_true(lastBackupFile.exists());
 
     // Check that last backup has been retained
diff --git a/toolkit/components/places/tests/bookmarks/test_477583_json-backup-in-future.js b/toolkit/components/places/tests/bookmarks/test_477583_json-backup-in-future.js
index 403108155e76..a201ce7c67b0 100644
--- a/toolkit/components/places/tests/bookmarks/test_477583_json-backup-in-future.js
+++ b/toolkit/components/places/tests/bookmarks/test_477583_json-backup-in-future.js
@@ -7,7 +7,7 @@
 function run_test() {
   do_test_pending();
 
-  let bookmarksBackupDir = PlacesUtils.backups.folder;
+  let bookmarksBackupDir = PlacesBackups.folder;
   // Remove all files from backups folder.
   let files = bookmarksBackupDir.directoryEntries;
   while (files.hasMoreElements()) {
@@ -18,7 +18,7 @@ function run_test() {
   // Create a json dummy backup in the future.
   let dateObj = new Date();
   dateObj.setYear(dateObj.getFullYear() + 1);
-  let name = PlacesUtils.backups.getFilenameForDate(dateObj);
+  let name = PlacesBackups.getFilenameForDate(dateObj);
   do_check_eq(name, "bookmarks-" + dateObj.toLocaleFormat("%Y-%m-%d") + ".json");
   let futureBackupFile = bookmarksBackupDir.clone();
   futureBackupFile.append(name);
@@ -28,15 +28,15 @@ function run_test() {
   futureBackupFile.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0600);
   do_check_true(futureBackupFile.exists());
 
-  do_check_eq(PlacesUtils.backups.entries.length, 0);
+  do_check_eq(PlacesBackups.entries.length, 0);
 
   Task.spawn(function() {
-    yield PlacesUtils.backups.create();
+    yield PlacesBackups.create();
     // Check that a backup for today has been created.
-    do_check_eq(PlacesUtils.backups.entries.length, 1);
-    let mostRecentBackupFile = PlacesUtils.backups.getMostRecent();
+    do_check_eq(PlacesBackups.entries.length, 1);
+    let mostRecentBackupFile = PlacesBackups.getMostRecent();
     do_check_neq(mostRecentBackupFile, null);
-    let todayName = PlacesUtils.backups.getFilenameForDate();
+    let todayName = PlacesBackups.getFilenameForDate();
     do_check_eq(mostRecentBackupFile.leafName, todayName);
 
     // Check that future backup has been removed.
diff --git a/toolkit/components/places/tests/head_common.js b/toolkit/components/places/tests/head_common.js
index 2bfffe06b44a..a62ecce8ba46 100644
--- a/toolkit/components/places/tests/head_common.js
+++ b/toolkit/components/places/tests/head_common.js
@@ -33,10 +33,13 @@ XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "BookmarkJSONUtils",
+                                  "resource://gre/modules/BookmarkJSONUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesBackups",
+                                  "resource://gre/modules/PlacesBackups.jsm");
 
 // This imports various other objects in addition to PlacesUtils.
 Cu.import("resource://gre/modules/PlacesUtils.jsm");
-Cu.import("resource://gre/modules/BookmarkJSONUtils.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "SMALLPNG_DATA_URI", function() {
   return NetUtil.newURI(
diff --git a/toolkit/components/places/tests/unit/test_utils_backups_create.js b/toolkit/components/places/tests/unit/test_utils_backups_create.js
index 9f58eb460604..a45081fcd55a 100644
--- a/toolkit/components/places/tests/unit/test_utils_backups_create.js
+++ b/toolkit/components/places/tests/unit/test_utils_backups_create.js
@@ -33,7 +33,7 @@ function run_test() {
   dates.sort();
 
   // Get and cleanup the backups folder.
-  var bookmarksBackupDir = PlacesUtils.backups.folder;
+  var bookmarksBackupDir = PlacesBackups.folder;
 
   // Fake backups are created backwards to ensure we won't consider file
   // creation time.
@@ -58,7 +58,7 @@ function run_test() {
   }
 
   Task.spawn(function() {
-    yield PlacesUtils.backups.create(Math.floor(dates.length/2));
+    yield PlacesBackups.create(Math.floor(dates.length/2));
     // Add today's backup.
     dates.push(dateObj.toLocaleFormat("%Y-%m-%d"));
 
@@ -84,7 +84,7 @@ function run_test() {
     bookmarksBackupDir.remove(true);
     do_check_false(bookmarksBackupDir.exists());
     // Recreate the folder.
-    PlacesUtils.backups.folder;
+    PlacesBackups.folder;
 
     do_test_finished();
   });

From 79986edfc9ff84f1156fb28e22b273d4f2c044c4 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 17 Apr 2013 13:19:29 +0300
Subject: [PATCH 390/438] Bug 862024 - Warning about replaced window.console
 API shows when content scripts do not change the object; r=past

---
 browser/devtools/framework/Target.jsm         |  1 +
 .../browser_warn_user_about_replaced_api.js   | 89 ++++++++++++-------
 browser/devtools/webconsole/webconsole.js     | 15 ++--
 3 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/browser/devtools/framework/Target.jsm b/browser/devtools/framework/Target.jsm
index d3b685726adc..e3103efb6e98 100644
--- a/browser/devtools/framework/Target.jsm
+++ b/browser/devtools/framework/Target.jsm
@@ -320,6 +320,7 @@ TabTarget.prototype = {
       let event = Object.create(null);
       event.url = aPacket.url;
       event.title = aPacket.title;
+      event.nativeConsoleAPI = aPacket.nativeConsoleAPI;
       // Send any stored event payload (DOMWindow or nsIRequest) for backwards
       // compatibility with non-remotable tools.
       if (aPacket.state == "start") {
diff --git a/browser/devtools/webconsole/test/browser_warn_user_about_replaced_api.js b/browser/devtools/webconsole/test/browser_warn_user_about_replaced_api.js
index 60f742666115..5cc2d6f8169d 100644
--- a/browser/devtools/webconsole/test/browser_warn_user_about_replaced_api.js
+++ b/browser/devtools/webconsole/test/browser_warn_user_about_replaced_api.js
@@ -4,45 +4,72 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const TEST_REPLACED_API_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console-replaced-api.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/testscript.js";
 
 function test() {
   waitForExplicitFinish();
 
-  // First test that the warning does not appear on a normal page (about:blank)
-  addTab("about:blank");
+  // First test that the warning does not appear on a page that doesn't override
+  // the window.console object.
+  addTab(TEST_URI);
   browser.addEventListener("load", function onLoad() {
     browser.removeEventListener("load", onLoad, true);
-    testOpenWebConsole(false);
+    openConsole(null, testWarningNotPresent);
   }, true);
-}
 
-function testWarningPresent() {
-  // Then test that the warning does appear on a page that replaces the API
-  browser.addEventListener("load", function onLoad() {
-    browser.removeEventListener("load", onLoad, true);
-    testOpenWebConsole(true);
-  }, true);
-  browser.contentWindow.location = TEST_REPLACED_API_URI;
-}
+  function testWarningNotPresent(hud)
+  {
+    is(hud.outputNode.textContent.indexOf("logging API"), -1,
+       "no warning displayed");
 
-function testOpenWebConsole(shouldWarn) {
-  openConsole(null, function(hud) {
-    waitForSuccess({
-      name: (shouldWarn ? "no " : "") + "API replacement warning",
-      validatorFn: function()
-      {
-        let pos = hud.outputNode.textContent.indexOf("disabled by");
-        return shouldWarn ? pos > -1 : pos == -1;
-      },
-      successFn: function() {
-        if (shouldWarn) {
-          finishTest();
-        }
-        else {
-          closeConsole(null, testWarningPresent);
-        }
-      },
-      failureFn: finishTest,
+    // Bug 862024: make sure the warning doesn't show after page reload.
+    info("reload " + TEST_URI);
+    executeSoon(() => content.location.reload());
+
+    waitForMessages({
+      webconsole: hud,
+      messages: [{
+        text: "testscript.js",
+        category: CATEGORY_NETWORK,
+      }],
+    }).then(() => executeSoon(() => {
+      is(hud.outputNode.textContent.indexOf("logging API"), -1,
+         "no warning displayed");
+
+      closeConsole(null, loadTestPage);
+    }));
+  }
+
+  function loadTestPage()
+  {
+    info("load test " + TEST_REPLACED_API_URI);
+    browser.addEventListener("load", function onLoad() {
+      browser.removeEventListener("load", onLoad, true);
+      openConsole(null, testWarningPresent);
+    }, true);
+    content.location = TEST_REPLACED_API_URI;
+  }
+
+  function testWarningPresent(hud)
+  {
+    info("wait for the warning to show");
+    let warning = {
+      webconsole: hud,
+      messages: [{
+        text: /logging API .+ disabled by a script/,
+        category: CATEGORY_JS,
+        severity: SEVERITY_WARNING,
+      }],
+    };
+
+    waitForMessages(warning).then(() => {
+      hud.jsterm.clearOutput();
+
+      executeSoon(() => {
+        info("reload the test page and wait for the warning to show");
+        waitForMessages(warning).then(finishTest);
+        content.location.reload();
+      });
     });
-  });
+  }
 }
diff --git a/browser/devtools/webconsole/webconsole.js b/browser/devtools/webconsole/webconsole.js
index 82a4231bfdff..e90ebe0a53d2 100644
--- a/browser/devtools/webconsole/webconsole.js
+++ b/browser/devtools/webconsole/webconsole.js
@@ -4714,16 +4714,16 @@ WebConsoleConnectionProxy.prototype = {
   },
 
   /**
-   * The "tabNavigated" message type handler. We redirect any message to
-   * the UI for displaying.
+   * The "will-navigate" and "navigate" event handlers. We redirect any message
+   * to the UI for displaying.
    *
    * @private
-   * @param string aType
-   *        Message type.
+   * @param string aEvent
+   *        Event type.
    * @param object aPacket
    *        The message received from the server.
    */
-  _onTabNavigated: function WCCP__onTabNavigated(aType, aPacket)
+  _onTabNavigated: function WCCP__onTabNavigated(aEvent, aPacket)
   {
     if (!this.owner) {
       return;
@@ -4733,7 +4733,7 @@ WebConsoleConnectionProxy.prototype = {
       this.owner.onLocationChange(aPacket.url, aPacket.title);
     }
 
-    if (aType == "navigate" && !aPacket.nativeConsoleAPI) {
+    if (aEvent == "navigate" && !aPacket.nativeConsoleAPI) {
       this.owner.logWarningAboutReplacedAPI();
     }
   },
@@ -4775,7 +4775,8 @@ WebConsoleConnectionProxy.prototype = {
     this.client.removeListener("networkEvent", this._onNetworkEvent);
     this.client.removeListener("networkEventUpdate", this._onNetworkEventUpdate);
     this.client.removeListener("fileActivity", this._onFileActivity);
-    this.client.removeListener("tabNavigated", this._onTabNavigated);
+    this.target.off("will-navigate", this._onTabNavigated);
+    this.target.off("navigate", this._onTabNavigated);
 
     this.client = null;
     this.webConsoleClient = null;

From 480557614fbbc0641b870c1d3d8786d6a9791420 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Wed, 17 Apr 2013 14:02:01 +0200
Subject: [PATCH 391/438] Bug 861936 - Allow calling cubeb_stream_get_position
 while in the callback when using the pulseaudio backend. r=kinetik

---
 media/libcubeb/README_MOZILLA    |  2 +-
 media/libcubeb/src/cubeb_pulse.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/media/libcubeb/README_MOZILLA b/media/libcubeb/README_MOZILLA
index 1e4372758275..ab2816b662f3 100644
--- a/media/libcubeb/README_MOZILLA
+++ b/media/libcubeb/README_MOZILLA
@@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
 
 The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
 
-The git commit ID used was a2f8aca29015dc0c0e0ac67e3710cd2df5d042c4.
+The git commit ID used was 951a3c6a88aa723e222715a89bfdc65f547ddf9e.
diff --git a/media/libcubeb/src/cubeb_pulse.c b/media/libcubeb/src/cubeb_pulse.c
index e5cde2980691..bd7ca06c3602 100644
--- a/media/libcubeb/src/cubeb_pulse.c
+++ b/media/libcubeb/src/cubeb_pulse.c
@@ -43,6 +43,7 @@ MAKE_TYPEDEF(pa_stream_write);
 MAKE_TYPEDEF(pa_threaded_mainloop_free);
 MAKE_TYPEDEF(pa_threaded_mainloop_get_api);
 MAKE_TYPEDEF(pa_threaded_mainloop_lock);
+MAKE_TYPEDEF(pa_threaded_mainloop_in_thread);
 MAKE_TYPEDEF(pa_threaded_mainloop_new);
 MAKE_TYPEDEF(pa_threaded_mainloop_signal);
 MAKE_TYPEDEF(pa_threaded_mainloop_start);
@@ -296,6 +297,7 @@ pulse_init(cubeb ** context, char const * context_name)
   LOAD(pa_threaded_mainloop_free);
   LOAD(pa_threaded_mainloop_get_api);
   LOAD(pa_threaded_mainloop_lock);
+  LOAD(pa_threaded_mainloop_in_thread);
   LOAD(pa_threaded_mainloop_new);
   LOAD(pa_threaded_mainloop_signal);
   LOAD(pa_threaded_mainloop_start);
@@ -494,13 +496,19 @@ pulse_stream_stop(cubeb_stream * stm)
 static int
 pulse_stream_get_position(cubeb_stream * stm, uint64_t * position)
 {
-  int r;
+  int r, in_thread;
   pa_usec_t r_usec;
   uint64_t bytes;
 
-  WRAP(pa_threaded_mainloop_lock)(stm->context->mainloop);
+  in_thread = WRAP(pa_threaded_mainloop_in_thread)(stm->context->mainloop);
+
+  if (!in_thread) {
+    WRAP(pa_threaded_mainloop_lock)(stm->context->mainloop);
+  }
   r = WRAP(pa_stream_get_time)(stm->stream, &r_usec);
-  WRAP(pa_threaded_mainloop_unlock)(stm->context->mainloop);
+  if (!in_thread) {
+    WRAP(pa_threaded_mainloop_unlock)(stm->context->mainloop);
+  }
 
   if (r != 0) {
     return CUBEB_ERROR;

From ac6db16c395e4336e83ed3689bcf7e9cd6538f92 Mon Sep 17 00:00:00 2001
From: Chia-hung Tai <ctai@mozilla.com>
Date: Wed, 17 Apr 2013 20:15:01 +0800
Subject: [PATCH 392/438] Bug 862365 - B2G MMS: Support auto-home in retrieve
 mode(follow-up fixed). r=vyang

---
 dom/mms/src/ril/MmsService.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/dom/mms/src/ril/MmsService.js b/dom/mms/src/ril/MmsService.js
index c8efa87b3e35..457e27a702c4 100644
--- a/dom/mms/src/ril/MmsService.js
+++ b/dom/mms/src/ril/MmsService.js
@@ -164,13 +164,13 @@ XPCOMUtils.defineLazyGetter(this, "gMmsConnection", function () {
     },
 
     /**
-     * Return the roaming status of data connection.
+     * Return the roaming status of voice call.
      *
-     * @return true if data connection is roaming.
+     * @return true if voice call is roaming.
      */
-    isDataConnRoaming: function isDataConnRoaming() {
-      let isRoaming = gRIL.rilContext.data.roaming;
-      debug("isDataConnRoaming = " + isRoaming);
+    isVoiceRoaming: function isVoiceRoaming() {
+      let isRoaming = gRIL.rilContext.voice.roaming;
+      debug("isVoiceRoaming = " + isRoaming);
       return isRoaming;
     },
 
@@ -1166,9 +1166,14 @@ MmsService.prototype = {
       retrievalMode = Services.prefs.getCharPref(PREF_RETRIEVAL_MODE);
     } catch (e) {}
 
-    let isRoaming = gMmsConnection.isDataConnRoaming();
-    if ((retrievalMode === RETRIEVAL_MODE_AUTOMATIC_HOME && isRoaming) ||
-        RETRIEVAL_MODE_MANUAL === retrievalMode ||
+    // In roaming environment, we send notify response only in
+    // automatic retrieval mode.
+    if ((retrievalMode !== RETRIEVAL_MODE_AUTOMATIC) &&
+        gMmsConnection.isVoiceRoaming()) {
+      return;
+    }
+
+    if (RETRIEVAL_MODE_MANUAL === retrievalMode ||
         RETRIEVAL_MODE_NEVER === retrievalMode) {
       let mmsStatus = RETRIEVAL_MODE_NEVER === retrievalMode
                     ? MMS.MMS_PDU_STATUS_REJECTED

From 57bda6477bb62ab75d4251b3dd59619989eb60a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=BCxen?= <tuexen@fh-muenster.de>
Date: Wed, 17 Apr 2013 08:30:19 -0400
Subject: [PATCH 393/438] Bug 862744: Fix code to avoid reusing a DataChannel
 while it's in the process of closing r=jesup

---
 netwerk/sctp/datachannel/DataChannel.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp
index 3bb94a915dfc..c79aa2972737 100644
--- a/netwerk/sctp/datachannel/DataChannel.cpp
+++ b/netwerk/sctp/datachannel/DataChannel.cpp
@@ -829,7 +829,7 @@ DataChannelConnection::FindChannelByStream(uint16_t streamOut)
 uint16_t
 DataChannelConnection::FindFreeStream()
 {
-  uint32_t i, limit;
+  uint32_t i, j, limit;
 
   limit = mStreams.Length();
   if (limit > MAX_NUM_STREAMS)
@@ -838,15 +838,16 @@ DataChannelConnection::FindFreeStream()
   for (i = (mAllocateEven ? 0 : 1); i < limit; i += 2) {
     if (!mStreams[i]) {
       // Verify it's not still in the process of closing
-      for (uint32_t j = 0; j < mStreamsResetting.Length(); ++j) {
+      for (j = 0; j < mStreamsResetting.Length(); ++j) {
         if (mStreamsResetting[j] == i) {
-          continue;
+          break;
         }
       }
-      break;
+      if (j = mStreamsResetting.Length())
+        break;
     }
   }
-  if (i == limit) {
+  if (i >= limit) {
     return INVALID_STREAM;
   }
   return i;

From f7f1330788952c33352866d8c0cb1f2257409524 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 17 Apr 2013 14:58:35 +0200
Subject: [PATCH 394/438] Bug 861158 - Always run jarmaker for searchplugins.
 r=ted

---
 mobile/locales/Makefile.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in
index 8113675fc3d3..4f9667089b7e 100644
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -126,10 +126,6 @@ $(search-jar): $(search-jar-preqs)
 	printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/$(AB_CD)/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >>  $@
 	@echo   >> $@
 
-.PHONY: searchplugins
-searchplugins: $(search-jar-ts)
-	@echo "\nGenerating: $@"
-
 ###################
 search-dir-deps = \
   $(plugin-file) \
@@ -146,7 +142,8 @@ search-preqs =\
   $(GLOBAL_DEPS) \
   $(NULL)
 
-$(search-jar-ts): $(search-preqs)
+.PHONY: searchplugins
+searchplugins: $(search-preqs)
 	$(PYTHON) $(jar-maker) \
           $(QUIET) -j $(FINAL_TARGET)/chrome \
           -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \

From 3be1522d20cef58fd184d5575c8034af6c72168f Mon Sep 17 00:00:00 2001
From: David Hsu <dvdhsu@gmail.com>
Date: Wed, 17 Apr 2013 09:12:08 -0400
Subject: [PATCH 395/438] Bug 861205 - Added fuzzyEquals method for float
 comparisions. r=kats

Replaces the (Math.abs(x) < 1e-6) previously used.
---
 mobile/android/chrome/content/browser.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 58eef982f52a..7b64dfcdf209 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -150,6 +150,10 @@ function sendMessageToJava(aMessage) {
   return getBridge().handleGeckoMessage(JSON.stringify(aMessage));
 }
 
+function fuzzyEquals(a, b) {
+  return (Math.abs(a - b) < 1e-6);
+}
+
 #ifdef MOZ_CRASHREPORTER
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyServiceGetter(this, "CrashReporter",
@@ -2589,7 +2593,7 @@ Tab.prototype = {
   },
 
   getActive: function getActive() {
-      return this.browser.docShellIsActive;
+    return this.browser.docShellIsActive;
   },
 
   setDisplayPort: function(aDisplayPort) {
@@ -2622,7 +2626,7 @@ Tab.prototype = {
         this._drawZoom = resolution;
         cwu.setResolution(resolution, resolution);
       }
-    } else if (Math.abs(resolution - zoom) >= 1e-6) {
+    } else if (!fuzzyEquals(resolution, zoom)) {
       dump("Warning: setDisplayPort resolution did not match zoom for background tab! (" + resolution + " != " + zoom + ")");
     }
 
@@ -2644,12 +2648,11 @@ Tab.prototype = {
       height: (aDisplayPort.bottom - aDisplayPort.top) / resolution
     };
 
-    let epsilon = 0.001;
     if (this._oldDisplayPort == null ||
-        Math.abs(displayPort.x - this._oldDisplayPort.x) > epsilon ||
-        Math.abs(displayPort.y - this._oldDisplayPort.y) > epsilon ||
-        Math.abs(displayPort.width - this._oldDisplayPort.width) > epsilon ||
-        Math.abs(displayPort.height - this._oldDisplayPort.height) > epsilon) {
+        !fuzzyEquals(displayPort.x, this._oldDisplayPort.x) ||
+        !fuzzyEquals(displayPort.y, this._oldDisplayPort.y) ||
+        !fuzzyEquals(displayPort.width, this._oldDisplayPort.width) ||
+        !fuzzyEquals(displayPort.height, this._oldDisplayPort.height)) {
       if (BrowserApp.gUseLowPrecision) {
         // Set the display-port to be 4x the size of the critical display-port,
         // on each dimension, giving us a 0.25x lower precision buffer around the
@@ -2882,7 +2885,7 @@ Tab.prototype = {
 
   setResolution: function(aZoom, aForce) {
     // Set zoom level
-    if (aForce || Math.abs(aZoom - this._zoom) >= 1e-6) {
+    if (aForce || !fuzzyEquals(aZoom, this._zoom)) {
       this._zoom = aZoom;
       if (BrowserApp.selectedTab == this) {
         let cwu = window.top.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
@@ -3577,7 +3580,7 @@ Tab.prototype = {
   },
 
   setBrowserSize: function(aWidth, aHeight) {
-    if (Math.abs(this.browserWidth - aWidth) < 1e-6 && Math.abs(this.browserHeight - aHeight) < 1e-6) {
+    if (fuzzyEquals(this.browserWidth, aWidth) && fuzzyEquals(this.browserHeight, aHeight)) {
       return;
     }
 
@@ -3932,7 +3935,7 @@ var BrowserEventHandler = {
     let dw = (aRect.width - vRect.width);
     let dx = (aRect.x - vRect.x);
 
-    if (Math.abs(aViewport.zoom - maxZoomAllowed) < 1e-6 && overlap.width / aRect.width > 0.9) {
+    if (fuzzyEquals(aViewport.zoom, maxZoomAllowed) && overlap.width / aRect.width > 0.9) {
       // we're already at the max zoom and the block is not spilling off the side of the screen so that even
       // if the block isn't taking up most of the viewport we can't pan/zoom in any more. return true so that we zoom out
       return true;

From 698312967c4c15ef7d69cd853260e2407dfb0d8f Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall@mozilla.com>
Date: Wed, 17 Apr 2013 15:29:50 +0200
Subject: [PATCH 396/438] Bug 861103: Fix for 'Install Later' in B2G updates.
 r=dhylands

--HG--
extra : rebase_source : a4e283b28adcbea09dc9fcc3cba1eed9d85321ab
---
 b2g/components/UpdatePrompt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/components/UpdatePrompt.js b/b2g/components/UpdatePrompt.js
index 4159599f7363..62e04ae9234a 100644
--- a/b2g/components/UpdatePrompt.js
+++ b/b2g/components/UpdatePrompt.js
@@ -415,7 +415,7 @@ UpdatePrompt.prototype = {
         // for the user to press Later or Install Now. In this situation we
         // don't want to clear this._update, becuase handleApplyPromptResult
         // needs it.
-        if (this._applyPromptTimer == null) {
+        if (this._applyPromptTimer == null && !this._waitingForIdle) {
           this._update = null;
         }
         break;

From 3bec57eee8e47a7fdc41af9f975ac1a6ff282500 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 17 Apr 2013 10:08:39 -0700
Subject: [PATCH 397/438] Bug 862621: Remove unused variable 'shmType' from
 SharedPlanarYCbCrImage::Allocate. r=Bas

---
 gfx/layers/ipc/SharedPlanarYCbCrImage.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gfx/layers/ipc/SharedPlanarYCbCrImage.cpp b/gfx/layers/ipc/SharedPlanarYCbCrImage.cpp
index 66e8cf92409d..6e37cc8e9cbc 100644
--- a/gfx/layers/ipc/SharedPlanarYCbCrImage.cpp
+++ b/gfx/layers/ipc/SharedPlanarYCbCrImage.cpp
@@ -103,7 +103,6 @@ SharedPlanarYCbCrImage::Allocate(PlanarYCbCrImage::Data& aData)
 {
   NS_ABORT_IF_FALSE(!mAllocated, "This image already has allocated data");
 
-  SharedMemory::SharedMemoryType shmType = OptimalShmemType();
   size_t size = ShmemYCbCrImage::ComputeMinBufferSize(aData.mYSize,
                                                       aData.mCbCrSize);
 

From 10ee4aac6839e85fffcf54fd56c8fc88903e4b22 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 17 Apr 2013 13:31:05 -0400
Subject: [PATCH 398/438] Backed out changeset f5a10853e457 (bug 858340) for
 Android bustage on a CLOSED TREE.

---
 mobile/android/base/AwesomeBar.java           | 109 +++++-------------
 mobile/android/base/AwesomeBarTabs.java       |   6 +-
 .../android/base/awesomebar/AllPagesTab.java  |  65 +----------
 mobile/android/base/util/StringUtils.java     |  22 ----
 4 files changed, 34 insertions(+), 168 deletions(-)

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index d67e660359b8..ecebc736e617 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -46,13 +46,7 @@ import android.widget.Toast;
 
 import java.net.URLEncoder;
 
-interface AutocompleteHandler {
-    void onAutocomplete(String res);
-}
-
-public class AwesomeBar extends GeckoActivity
-                        implements AutocompleteHandler,
-                                   TextWatcher {
+public class AwesomeBar extends GeckoActivity {
     private static final String LOGTAG = "GeckoAwesomeBar";
 
     public static final String URL_KEY = "url";
@@ -174,7 +168,35 @@ public class AwesomeBar extends GeckoActivity
             }
         });
 
-        mText.addTextChangedListener(this);
+        mText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void afterTextChanged(Editable s) {
+                String text = s.toString();
+                mAwesomeTabs.filter(text);
+
+                // If the AwesomeBar has a composition string, don't call updateGoButton().
+                // That method resets IME and composition state will be broken.
+                if (!hasCompositionString(s)) {
+                    updateGoButton(text);
+                }
+
+                if (Build.VERSION.SDK_INT >= 11) {
+                    getActionBar().hide();
+                }
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count,
+                                          int after) {
+                // do nothing
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before,
+                                      int count) {
+                // do nothing
+            }
+        });
 
         mText.setOnKeyListener(new View.OnKeyListener() {
             @Override
@@ -705,75 +727,4 @@ public class AwesomeBar extends GeckoActivity
         }
         return false;
     }
-
-    // return early if we're backspacing through the string, or have no autocomplete results
-    public void onAutocomplete(final String result) {
-        final String text = mText.getText().toString();
-
-        if (result == null) {
-            mAutoCompleteResult = "";
-            return;
-        }
-
-        if (!result.startsWith(text) || text.equals(result)) {
-            return;
-        }
-
-        mAutoCompleteResult = result;
-        mText.getText().append(result.substring(text.length()));
-        mText.setSelection(text.length(), result.length());
-    }
-
-    @Override
-    public void afterTextChanged(final Editable s) {
-        final String text = s.toString();
-        boolean useHandler = false;
-        boolean reuseAutocomplete = false;
-        if (!hasCompositionString(s) && !StringUtils.isSearchQuery(text, false)) {
-            useHandler = true;
-
-            // If you're hitting backspace (the string is getting smaller
-            // or is unchanged), don't autocomplete.
-            if (mAutoCompletePrefix != null && (mAutoCompletePrefix.length() >= text.length())) {
-                useHandler = false;
-            } else if (mAutoCompleteResult != null && mAutoCompleteResult.startsWith(text)) {
-                // If this text already matches our autocomplete text, autocomplete likely
-                // won't change. Just reuse the old autocomplete value.
-                useHandler = false;
-                reuseAutocomplete = true;
-            }
-        }
-
-        // If this is the autocomplete text being set, don't run the filter.
-        if (mAutoCompleteResult == null || !mAutoCompleteResult.equals(text)) {
-            mAwesomeTabs.filter(text, useHandler ? this : null);
-            mAutoCompletePrefix = text;
-
-            if (reuseAutocomplete) {
-                onAutocomplete(mAutoCompleteResult);
-            }
-        }
-
-        // If the AwesomeBar has a composition string, don't call updateGoButton().
-        // That method resets IME and composition state will be broken.
-        if (!hasCompositionString(s)) {
-            updateGoButton(text);
-        }
-
-        if (Build.VERSION.SDK_INT >= 11) {
-            getActionBar().hide();
-        }
-    }
-
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count,
-                                  int after) {
-        // do nothing
-    }
-
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before,
-                              int count) {
-        // do nothing
-    }
 }
diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java
index a7b6d1b7dbbb..4dd8a7bcae7f 100644
--- a/mobile/android/base/AwesomeBarTabs.java
+++ b/mobile/android/base/AwesomeBarTabs.java
@@ -173,7 +173,7 @@ public class AwesomeBarTabs extends TabHost
         }
 
         // Initialize "All Pages" list with no filter
-        filter("", null);
+        filter("");
     }
 
     @Override
@@ -308,7 +308,7 @@ public class AwesomeBarTabs extends TabHost
         return (HistoryTab)getAwesomeBarTabForTag("history");
     }
 
-    public void filter(String searchTerm, AutocompleteHandler handler) {
+    public void filter(String searchTerm) {
 
         // If searching, disable left / right tab swipes
         mSearching = searchTerm.length() != 0;
@@ -322,7 +322,7 @@ public class AwesomeBarTabs extends TabHost
         styleSelectedTab();
 
         // Perform the actual search
-        allPages.filter(searchTerm, handler);
+        allPages.filter(searchTerm);
 
         // If searching, hide the tabs bar
         findViewById(R.id.tab_widget_container).setVisibility(mSearching ? View.GONE : View.VISIBLE);
diff --git a/mobile/android/base/awesomebar/AllPagesTab.java b/mobile/android/base/awesomebar/AllPagesTab.java
index c0ac2061e2ae..3e49fb01c48d 100644
--- a/mobile/android/base/awesomebar/AllPagesTab.java
+++ b/mobile/android/base/awesomebar/AllPagesTab.java
@@ -25,7 +25,6 @@ import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Message;
@@ -64,8 +63,6 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
     private static final int SUGGESTION_TIMEOUT = 3000;
     private static final int SUGGESTION_MAX = 3;
     private static final int ANIMATION_DURATION = 250;
-    // The maximum number of rows deep in a search we'll dig for an autocomplete result
-    private static final int MAX_AUTOCOMPLETE_SEARCH = 20;
 
     private String mSearchTerm;
     private ArrayList<SearchEngine> mSearchEngines;
@@ -79,7 +76,6 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
     private View mSuggestionsOptInPrompt;
     private Handler mHandler;
     private ListView mListView;
-    private volatile AutocompleteHandler mAutocompleteHandler = null;
 
     private static final int MESSAGE_LOAD_FAVICONS = 1;
     private static final int MESSAGE_UPDATE_FAVICONS = 2;
@@ -173,9 +169,7 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
         }
     }
 
-    public void filter(String searchTerm, AutocompleteHandler handler) {
-        mAutocompleteHandler = handler;
-
+    public void filter(String searchTerm) {
         AwesomeBarCursorAdapter adapter = getCursorAdapter();
         adapter.filter(searchTerm);
 
@@ -188,61 +182,6 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
         }
     }
 
-    private void findAutocompleteFor(String searchTerm, Cursor cursor) {
-        if (TextUtils.isEmpty(searchTerm) || cursor == null || mAutocompleteHandler == null)
-            return;
-
-        // avoid searching the path if we don't have to. Currently just decided by if there is
-        // a '/' character in the string
-        final String res = searchHosts(searchTerm, cursor, searchTerm.indexOf("/") > 0);
-
-        if (res != null) {
-            ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    // Its possible that mAutocompleteHandler has been destroyed
-                    if (mAutocompleteHandler != null) {
-                        mAutocompleteHandler.onAutocomplete(res);
-                        mAutocompleteHandler = null;
-                    }
-                }
-            });
-        }
-    }
-
-    private String searchHosts(String searchTerm, Cursor cursor, boolean searchPath) {
-        int i = 0;
-        if (cursor.moveToFirst()) {
-            int urlIndex = cursor.getColumnIndexOrThrow(URLColumns.URL);
-            do {
-                final Uri url = Uri.parse(cursor.getString(urlIndex));
-                String host = StringUtils.stripCommonSubdomains(url.getHost());
-                // host may be null for about pages
-                if (host == null)
-                    continue;
-
-                StringBuilder hostBuilder = new StringBuilder(host);
-               if (hostBuilder.indexOf(searchTerm) == 0) {
-                    return hostBuilder.append("/").toString();
-                }
-
-                if (searchPath) {
-                    List<String> path = url.getPathSegments();
-
-                    for (String seg : path) {
-                        hostBuilder.append("/").append(seg);
-                        if (hostBuilder.indexOf(searchTerm) == 0) {
-                            return hostBuilder.append("/").toString();
-                        }
-                    }
-                }
-
-                i++;
-            } while (i < MAX_AUTOCOMPLETE_SEARCH && cursor.moveToNext());
-        }
-        return null;
-    }
-
     /**
      * Query for suggestions, but don't show them yet.
      */
@@ -298,8 +237,6 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
                         Telemetry.HistogramAdd("FENNEC_AWESOMEBAR_ALLPAGES_EMPTY_TIME", time);
                         mTelemetrySent = true;
                     }
-
-                    findAutocompleteFor(constraint.toString(), c);
                     return c;
                 }
             });
diff --git a/mobile/android/base/util/StringUtils.java b/mobile/android/base/util/StringUtils.java
index 1c2b1f3aaa9f..96b412121e07 100644
--- a/mobile/android/base/util/StringUtils.java
+++ b/mobile/android/base/util/StringUtils.java
@@ -44,26 +44,4 @@ public class StringUtils {
         // Otherwise, text is ambiguous, and we keep its status unchanged
         return wasSearchQuery;
     }
-
-    public static String stripScheme(String url) {
-        if (url == null)
-            return url;
-
-        if (url.startsWith("http://")) {
-            return url.substring(7);
-        }
-        return url;
-    }
-
-    public static String stripCommonSubdomains(String host) {
-        if (host == null)
-            return host;
-        // In contrast to desktop, we also strip mobile subdomains,
-        // since its unlikely users are intentionally typing them
-        if (host.startsWith("www.")) return host.substring(4);
-        else if (host.startsWith("mobile.")) return host.substring(7);
-        else if (host.startsWith("m.")) return host.substring(2);
-        return host;
-    }
-
 }

From 2b155b9336d2119131525d9c1fbbaddf846bb9e4 Mon Sep 17 00:00:00 2001
From: John Hopkins <jhopkins@mozilla.com>
Date: Wed, 17 Apr 2013 13:35:28 -0400
Subject: [PATCH 399/438] Bug 862472 - Update snapshots to pick up font
 updates. r=bhearsum

---
 b2g/config/otoro/releng-otoro.tt      |  4 +-
 b2g/config/otoro/sources.xml          | 70 +++++++++++++--------------
 b2g/config/panda/releng-pandaboard.tt |  4 +-
 b2g/config/panda/sources.xml          | 56 ++++++++++-----------
 b2g/config/unagi/releng-unagi.tt      |  4 +-
 b2g/config/unagi/sources.xml          | 70 +++++++++++++--------------
 6 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/b2g/config/otoro/releng-otoro.tt b/b2g/config/otoro/releng-otoro.tt
index c0de0ece62e3..91db77247cf6 100644
--- a/b2g/config/otoro/releng-otoro.tt
+++ b/b2g/config/otoro/releng-otoro.tt
@@ -1,7 +1,7 @@
 [
 {
-"size": 896338804,
-"digest": "b9609e56607af44de60c70c8570712167245c5597dc87921326c646a78fabf569d3a79f8cea350f2addeb7d9e749612cae870874ca9359297b2c0e1af7ae3993",
+"size": 896371048,
+"digest": "73e89a23226726739c60b2e5be00da9d24d7ab8a39d60cf4c84a0ebf1d16a0cb1ff92440e72a6bdeef44cc7252a13d0bdd8a08770c858a5abce3f0bcea7a17ce",
 "algorithm": "sha512",
 "filename": "gonk.tar.xz"
 },
diff --git a/b2g/config/otoro/sources.xml b/b2g/config/otoro/sources.xml
index c5d2ad565eec..e879dd7ceacd 100644
--- a/b2g/config/otoro/sources.xml
+++ b/b2g/config/otoro/sources.xml
@@ -11,17 +11,17 @@
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
 
   <!-- Gonk specific things and forks -->
-  <project name="platform_build" path="build" remote="b2g" revision="c647d5f967a5f17aaa27c792ea0ee35a2d44b113">
+  <project name="platform_build" path="build" remote="b2g" revision="a56a09f9b3342e5d5cb05699288913035f4f6e48">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <!-- Information: fake-dalvik is tagged with B2G_1_0_0_20130125190500 --><project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="9429d142f7f46add49f4665ce81ac0c0416dd9c1"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6b8f901c98fe50a775b388af972f98500bb3f4ff"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="f634b3d50effdd42828cc757c01fdbf74e562a36"/>
   <!-- Information: librecovery is tagged with B2G_1_0_0_20130125190500 --><project name="librecovery" path="librecovery" remote="b2g" revision="601fc18b28c9d7cf6954b281ddd3b705c74a9215"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="302ab954f16d0ad708e87a1cf5e94f5d93f174c9"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="c2cd096baa69d4f5c2473523d352fba1a94c5cf4"/>
 
   <!-- Stock Android things -->
-  <!-- Information: platform/abi/cpp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
+  <!-- Information: platform/abi/cpp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <!-- Information: platform/bionic is tagged with M8960AAAAANLYA100715A --><project name="platform/bionic" path="bionic" revision="cd5dfce80bc3f0139a56b58aca633202ccaee7f8"/>
   <!-- Information: platform/bootable/recovery is tagged with M8960AAAAANLYA100715A --><project name="platform/bootable/recovery" path="bootable/recovery" revision="e0a9ac010df3afaa47ba107192c05ac8b5516435"/>
   <!-- Information: platform/development is tagged with M8960AAAAANLYA100715A --><project name="platform/development" path="development" revision="a384622f5fcb1d2bebb9102591ff7ae91fe8ed2d"/>
@@ -29,62 +29,62 @@
   <!-- Information: device/sample is tagged with M8960AAAAANLYA100715A --><project name="device/sample" path="device/sample" revision="c328f3d4409db801628861baa8d279fb8855892f"/>
   <project name="platform_external_apriori" path="external/apriori" remote="b2g" revision="2c3a7113299eb789a076be23449d868b3bfa07fd"/>
   <!-- Information: platform/external/bluetooth/bluez is tagged with M76XXUSNEKNLYA2040 --><project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="1023c91c66e9c3bd1132480051993bf7827770f6"/>
-  <!-- Information: platform/external/bluetooth/glib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="c6b49241cc1a8950723a5f74f8f4b4f4c3fa970e"/>
+  <!-- Information: platform/external/bluetooth/glib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="c6b49241cc1a8950723a5f74f8f4b4f4c3fa970e"/>
   <!-- Information: platform/external/bluetooth/hcidump is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="02b1eb24fbb3d0135a81edb4a2175b1397308d7d"/>
-  <!-- Information: platform/external/bsdiff is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/bsdiff" path="external/bsdiff" revision="81872540236d9bb15cccf963d05b9de48baa5375"/>
-  <!-- Information: platform/external/bzip2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/bzip2" path="external/bzip2" revision="048dacdca43eed1534689ececcf2781c63e1e4ba"/>
+  <!-- Information: platform/external/bsdiff is tagged with M8960AAAAANLYA20234 --><project name="platform/external/bsdiff" path="external/bsdiff" revision="81872540236d9bb15cccf963d05b9de48baa5375"/>
+  <!-- Information: platform/external/bzip2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/bzip2" path="external/bzip2" revision="048dacdca43eed1534689ececcf2781c63e1e4ba"/>
   <!-- Information: platform/external/dbus is tagged with M8960AAAAANLYA100715A --><project name="platform/external/dbus" path="external/dbus" revision="c7517b6195dc6926728352113e6cc335da3f9c9e"/>
   <!-- Information: platform/external/dhcpcd is tagged with M8960AAAAANLYA100715A --><project name="platform/external/dhcpcd" path="external/dhcpcd" revision="1e00fb67022d0921af0fead263f81762781b9ffa"/>
-  <!-- Information: platform/external/dnsmasq is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/dnsmasq" path="external/dnsmasq" revision="f621afad94df46204c25fc2593a19d704d2637f5"/>
+  <!-- Information: platform/external/dnsmasq is tagged with M8960AAAAANLYA20234 --><project name="platform/external/dnsmasq" path="external/dnsmasq" revision="f621afad94df46204c25fc2593a19d704d2637f5"/>
   <project name="platform_external_elfcopy" path="external/elfcopy" remote="b2g" revision="62c1bed1c4505369cac2e72fbe30452a598fb690"/>
   <project name="platform_external_elfutils" path="external/elfutils" remote="b2g" revision="72940dec691fa3255e13df01f8c53b620e446066"/>
-  <!-- Information: platform/external/e2fsprogs is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="d5f550bb2f556c5d287f7c8d2b77223654bcec37"/>
-  <!-- Information: platform/external/expat is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/expat" path="external/expat" revision="6df134250feab71edb5915ecaa6268210bca76c5"/>
-  <!-- Information: platform/external/fdlibm is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/fdlibm" path="external/fdlibm" revision="988ffeb12a6e044ae3504838ef1fee3fe0716934"/>
-  <!-- Information: platform/external/flac is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/flac" path="external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
-  <!-- Information: platform/external/freetype is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/freetype" path="external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
-  <!-- Information: platform/external/giflib is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <!-- Information: platform/external/e2fsprogs is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="d5f550bb2f556c5d287f7c8d2b77223654bcec37"/>
+  <!-- Information: platform/external/expat is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/expat" path="external/expat" revision="6df134250feab71edb5915ecaa6268210bca76c5"/>
+  <!-- Information: platform/external/fdlibm is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/fdlibm" path="external/fdlibm" revision="988ffeb12a6e044ae3504838ef1fee3fe0716934"/>
+  <!-- Information: platform/external/flac is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/flac" path="external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
+  <!-- Information: platform/external/freetype is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/freetype" path="external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
+  <!-- Information: platform/external/giflib is tagged with M8960AAAAANLYA20234 --><project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
   <project name="platform/external/gtest" path="external/gtest" revision="8c212ebe53bb2baab3575f03069016f1fb11e449"/>
-  <!-- Information: platform/external/harfbuzz is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/harfbuzz" path="external/harfbuzz" revision="116610d63a859521dacf00fb6818ee9ab2e666f6"/>
-  <!-- Information: platform/external/icu4c is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/icu4c" path="external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
-  <!-- Information: platform/external/iptables is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/iptables" path="external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>
+  <!-- Information: platform/external/harfbuzz is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/harfbuzz" path="external/harfbuzz" revision="116610d63a859521dacf00fb6818ee9ab2e666f6"/>
+  <!-- Information: platform/external/icu4c is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/icu4c" path="external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
+  <!-- Information: platform/external/iptables is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/iptables" path="external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>
   <!-- Information: platform/external/jpeg is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/jpeg" path="external/jpeg" revision="a62e464d672a4623233180e4023034bf825f066e"/>
-  <!-- Information: platform/external/libgsm is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
-  <!-- Information: platform/external/liblzf is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
-  <!-- Information: platform/external/libnfc-nxp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="3a912b065a31a72c63ad56ac224cfeaa933423b6"/>
-  <!-- Information: platform/external/libnl-headers is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
+  <!-- Information: platform/external/libgsm is tagged with M8960AAAAANLYA20234 --><project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <!-- Information: platform/external/liblzf is tagged with M8064AAAAANLYA1203 --><project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
+  <!-- Information: platform/external/libnfc-nxp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="3a912b065a31a72c63ad56ac224cfeaa933423b6"/>
+  <!-- Information: platform/external/libnl-headers is tagged with M8064AAAAANLYA1203 --><project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
   <!-- Information: platform/external/libpng is tagged with M8960AAAAANLYA100715A --><project name="platform/external/libpng" path="external/libpng" revision="9c3730f0efa69f580f03463c237cd928f3196404"/>
-  <!-- Information: platform/external/libvpx is tagged with M8960AAAAANLYA1519349 --><project name="platform/external/libvpx" path="external/libvpx" revision="3a40da0d96da5c520e7707aa14f48a80956e20d7"/>
+  <!-- Information: platform/external/libvpx is tagged with AU_LINUX_ANDROID_ICS_STRAWBERRY_RB5.04.00.04.29.023 --><project name="platform/external/libvpx" path="external/libvpx" revision="3a40da0d96da5c520e7707aa14f48a80956e20d7"/>
   <!-- Information: platform/external/llvm is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/llvm" path="external/llvm" revision="bff5923831940309f7d8ddbff5826ca6ed2dc050"/>
   <!-- Information: platform/external/mksh is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/mksh" path="external/mksh" revision="ec646e8f5e7dac9a77d1de549c6ed92c04d0cd4b"/>
   <!-- Information: platform_external_opensans is tagged with B2G_1_0_0_20130125190500 --><project name="platform_external_opensans" path="external/opensans" remote="b2g" revision="b5b4c226ca1d71e936153cf679dda6d3d60e2354"/>
   <!-- Information: platform/external/openssl is tagged with AU_LINUX_ANDROID_ICS.04.00.04.00.110 --><project name="platform/external/openssl" path="external/openssl" revision="27d333cce9a31c806b4bfa042925f045c727aecd"/>
-  <!-- Information: platform/external/protobuf is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/protobuf" path="external/protobuf" revision="e217977611c52bccde7f7c78e1d3c790c6357431"/>
-  <!-- Information: platform/external/safe-iop is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <!-- Information: platform/external/protobuf is tagged with M8960AAAAANLYA20234 --><project name="platform/external/protobuf" path="external/protobuf" revision="e217977611c52bccde7f7c78e1d3c790c6357431"/>
+  <!-- Information: platform/external/safe-iop is tagged with M8960AAAAANLYA20234 --><project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
   <!-- Information: screencap-gonk is tagged with B2G_1_0_0_20130125190500 --><project name="screencap-gonk" path="external/screencap-gonk" remote="b2g" revision="e6403c71e9eca8cb943739d5a0a192deac60fc51"/>
   <!-- Information: platform/external/skia is tagged with M8960AAAAANLYA100715A --><project name="platform/external/skia" path="external/skia" revision="7d90c85f2c0e3b747f7c7eff8bc9253b0063b439"/>
   <!-- Information: platform/external/sonivox is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/sonivox" path="external/sonivox" revision="7c967779dfc61ac1f346e972de91d4bfce7dccbb"/>
-  <!-- Information: platform/external/speex is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/speex" path="external/speex" revision="ebe6230a7f7c69f5a4389f2b09b7b19ef9e94f32"/>
+  <!-- Information: platform/external/speex is tagged with M8960AAAAANLYA20234 --><project name="platform/external/speex" path="external/speex" revision="ebe6230a7f7c69f5a4389f2b09b7b19ef9e94f32"/>
   <project name="platform/external/sqlite" path="external/sqlite" revision="fb30e613139b8836fdc8e81e166cf3a76e5fa17f"/>
-  <!-- Information: platform/external/stlport is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/stlport" path="external/stlport" revision="a6734e0645fce81c9610de0488b729207bfa576e"/>
-  <!-- Information: platform/external/strace is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/strace" path="external/strace" revision="c9fd2e5ef7d002e12e7cf2512506c84a9414b0fd"/>
-  <!-- Information: platform/external/tagsoup is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <!-- Information: platform/external/stlport is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/stlport" path="external/stlport" revision="a6734e0645fce81c9610de0488b729207bfa576e"/>
+  <!-- Information: platform/external/strace is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/strace" path="external/strace" revision="c9fd2e5ef7d002e12e7cf2512506c84a9414b0fd"/>
+  <!-- Information: platform/external/tagsoup is tagged with M8064AAAAANLYA1203 --><project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
   <!-- Information: platform/external/tinyalsa is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/tinyalsa" path="external/tinyalsa" revision="06cc244ee512c1352215e543615738bc8ac82814"/>
-  <!-- Information: platform/external/tremolo is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/tremolo" path="external/tremolo" revision="25bd78d2392dbdc879ae53382cde9d019f79cf6f"/>
+  <!-- Information: platform/external/tremolo is tagged with M8960AAAAANLYA20234 --><project name="platform/external/tremolo" path="external/tremolo" revision="25bd78d2392dbdc879ae53382cde9d019f79cf6f"/>
   <!-- Information: unbootimg is tagged with B2G_1_0_0_20130125190500 --><project name="unbootimg" path="external/unbootimg" remote="b2g" revision="9464623d92eb8668544916dc5a8f4f6337d0bc08"/>
-  <!-- Information: platform/external/webp is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/webp" path="external/webp" revision="88fe2b83c4b9232cd08729556fd0485d6a6a92cd"/>
-  <!-- Information: platform/external/webrtc is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/webrtc" path="external/webrtc" revision="137024dc8a2e9251a471e20518a9c3ae06f81f23"/>
-  <!-- Information: platform/external/wpa_supplicant is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="a01d37870bbf9892d43e792e5de0683ca41c5497"/>
+  <!-- Information: platform/external/webp is tagged with M8960AAAAANLYA20234 --><project name="platform/external/webp" path="external/webp" revision="88fe2b83c4b9232cd08729556fd0485d6a6a92cd"/>
+  <!-- Information: platform/external/webrtc is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/webrtc" path="external/webrtc" revision="137024dc8a2e9251a471e20518a9c3ae06f81f23"/>
+  <!-- Information: platform/external/wpa_supplicant is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="a01d37870bbf9892d43e792e5de0683ca41c5497"/>
   <!-- Information: platform/external/hostap is tagged with M8960AAAAANLYA1047 --><project name="platform/external/hostap" path="external/hostap" revision="bf04b0faadbdeb4b7943f2e2c4c5aa59df872bb1"/>
   <!-- Information: platform/external/zlib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.01.19.008 --><project name="platform/external/zlib" path="external/zlib" revision="f96a1d1ebfdf1cd582210fd09c23d8f59e0ae094"/>
-  <!-- Information: platform/external/yaffs2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/yaffs2" path="external/yaffs2" revision="0afa916204c664b3114429637b63af1321a0aeca"/>
+  <!-- Information: platform/external/yaffs2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/yaffs2" path="external/yaffs2" revision="0afa916204c664b3114429637b63af1321a0aeca"/>
   <!-- Information: platform/frameworks/base is tagged with M76XXUSNEKNLYA2040 --><project name="platform/frameworks/base" path="frameworks/base" revision="eb2bc75803ca179353c24c364a9c8a8ce23e8b78"/>
-  <!-- Information: platform/frameworks/opt/emoji is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="a95d8db002770469d72dfaf59ff37ac96db29a87"/>
+  <!-- Information: platform/frameworks/opt/emoji is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="a95d8db002770469d72dfaf59ff37ac96db29a87"/>
   <!-- Information: platform/frameworks/support is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/frameworks/support" path="frameworks/support" revision="27208692b001981f1806f4f396434f4eac78b909"/>
   <!-- Information: platform/hardware/libhardware is tagged with M8960AAAAANLYA1049B --><project name="platform/hardware/libhardware" path="hardware/libhardware" revision="4a619901847621f8a7305edf42dd07347a140484"/>
   <!-- Information: platform/hardware/libhardware_legacy is tagged with M8960AAAAANLYA153611 --><project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="87b4d7afa8f854b445e2d0d95091f6f6069f2b30"/>
   <!-- Information: platform/libcore is tagged with M8960AAAAANLYA100715A --><project name="platform/libcore" path="libcore" revision="30841f9fba9ccd5c54f4f079f495994db97f283e"/>
-  <!-- Information: platform/ndk is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/ndk" path="ndk" revision="9f555971e1481854d5b4dc11b3e6af9fff4f241f"/>
+  <!-- Information: platform/ndk is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/ndk" path="ndk" revision="9f555971e1481854d5b4dc11b3e6af9fff4f241f"/>
   <!-- Information: platform/prebuilt is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/prebuilt" path="prebuilt" revision="447ea790fcc957dde59730ecc2a65ca263bdc733"/>
   <!-- Information: platform/system/bluetooth is tagged with M8960AAAAANLYA100703 --><project name="platform/system/bluetooth" path="system/bluetooth" revision="7772cad4823f1f427ce1d4df84a55982386d6d18"/>
   <!-- Information: platform/system/core is tagged with M76XXUSNEKNLYA2040 --><project name="platform/system/core" path="system/core" revision="bf1970408676ce570b8f4dc3efa038e47552137f"/>
diff --git a/b2g/config/panda/releng-pandaboard.tt b/b2g/config/panda/releng-pandaboard.tt
index 993f6404e0ea..690096cafe96 100644
--- a/b2g/config/panda/releng-pandaboard.tt
+++ b/b2g/config/panda/releng-pandaboard.tt
@@ -1,7 +1,7 @@
 [
 {
-"size": 678095100,
-"digest": "79cf8ecf3c8faa18c4f485eed5f611fdaea25585f2ab3203eb912185c644179708b283c6222661006c145fa67d18e39c28fdf76ebe971ef5e0fbaf348f16a1ac",
+"size": 678265436,
+"digest": "36d05d77831be476e639095c04f25557171bb61c6764b2f6a49e253471aac8855adff17989089f1dce790d7e860c91d0b1d0f268fbc8fc661fca0c83ca7d65f5",
 "algorithm": "sha512",
 "filename": "gonk.tar.xz"
 },
diff --git a/b2g/config/panda/sources.xml b/b2g/config/panda/sources.xml
index 22eddfe89dd9..a276fb6d22a1 100644
--- a/b2g/config/panda/sources.xml
+++ b/b2g/config/panda/sources.xml
@@ -11,16 +11,16 @@
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
 
   <!-- Gonk specific things and forks -->
-  <project name="platform_build" path="build" remote="b2g" revision="c647d5f967a5f17aaa27c792ea0ee35a2d44b113">
+  <project name="platform_build" path="build" remote="b2g" revision="a56a09f9b3342e5d5cb05699288913035f4f6e48">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <!-- Information: fake-dalvik is tagged with B2G_1_0_0_20130125190500 --><project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="5f073eb845698119b729af991a6dd0325586487d"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6b8f901c98fe50a775b388af972f98500bb3f4ff"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="f634b3d50effdd42828cc757c01fdbf74e562a36"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="3769dfb6566897c8dca0abdc596728602d5fabae"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="c2cd096baa69d4f5c2473523d352fba1a94c5cf4"/>
 
   <!-- Stock Android things -->
-  <!-- Information: platform/abi/cpp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
+  <!-- Information: platform/abi/cpp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="c7bab8cb8483e7869eabdbd4add7c9e5beeecc80"/>
   <!-- Information: platform/bootable/recovery is tagged with android-4.0.4_r2.1 --><project name="platform/bootable/recovery" path="bootable/recovery" revision="fadc5ac81d6400ebdd041f7d4ea64021596d6b7d"/>
   <!-- Information: device/common is tagged with android-sdk-adt_r20 --><project name="device/common" path="device/common" revision="7d4526582f88808a3194e1a3b304abb369d2745c"/>
@@ -29,55 +29,55 @@
   <!-- Information: platform/external/bluetooth/bluez is tagged with android-4.0.4_r2.1 --><project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="966afbd88f0bfc325bf80274ad2723c238883fa1"/>
   <!-- Information: platform/external/bluetooth/glib is tagged with android-cts-4.1_r2 --><project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="1143b9918eab068401b604eb11c3f651f4e38b25"/>
   <!-- Information: platform/external/bluetooth/hcidump is tagged with android-cts-4.1_r2 --><project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="7322661808c2006b7848e79e6bb72b37fbcf6710"/>
-  <!-- Information: platform/external/bsdiff is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/bsdiff" path="external/bsdiff" revision="81872540236d9bb15cccf963d05b9de48baa5375"/>
+  <!-- Information: platform/external/bsdiff is tagged with M8960AAAAANLYA20234 --><project name="platform/external/bsdiff" path="external/bsdiff" revision="81872540236d9bb15cccf963d05b9de48baa5375"/>
   <project name="platform/external/busybox" path="external/busybox" remote="linaro" revision="2e461c8029a50d986dfe4ab07ae5a1834b5c40f0"/>
-  <!-- Information: platform/external/bzip2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/bzip2" path="external/bzip2" revision="048dacdca43eed1534689ececcf2781c63e1e4ba"/>
+  <!-- Information: platform/external/bzip2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/bzip2" path="external/bzip2" revision="048dacdca43eed1534689ececcf2781c63e1e4ba"/>
   <!-- Information: platform/external/dbus is tagged with android-cts-4.1_r2 --><project name="platform/external/dbus" path="external/dbus" revision="537eaff5de9aace3348436166d4cde7adc1e488e"/>
   <!-- Information: platform/external/dhcpcd is tagged with android-sdk-adt_r20 --><project name="platform/external/dhcpcd" path="external/dhcpcd" revision="ddaa48f57b54b2862b3e6dcf18a44c9647f3baaa"/>
-  <!-- Information: platform/external/dnsmasq is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/dnsmasq" path="external/dnsmasq" revision="f621afad94df46204c25fc2593a19d704d2637f5"/>
+  <!-- Information: platform/external/dnsmasq is tagged with M8960AAAAANLYA20234 --><project name="platform/external/dnsmasq" path="external/dnsmasq" revision="f621afad94df46204c25fc2593a19d704d2637f5"/>
   <project name="platform_external_elfcopy" path="external/elfcopy" remote="b2g" revision="62c1bed1c4505369cac2e72fbe30452a598fb690"/>
   <project name="platform_external_elfutils" path="external/elfutils" remote="b2g" revision="72940dec691fa3255e13df01f8c53b620e446066"/>
-  <!-- Information: platform/external/expat is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/expat" path="external/expat" revision="6df134250feab71edb5915ecaa6268210bca76c5"/>
-  <!-- Information: platform/external/fdlibm is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/fdlibm" path="external/fdlibm" revision="988ffeb12a6e044ae3504838ef1fee3fe0716934"/>
-  <!-- Information: platform/external/flac is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/flac" path="external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
-  <!-- Information: platform/external/freetype is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/freetype" path="external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
-  <!-- Information: platform/external/giflib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <!-- Information: platform/external/expat is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/expat" path="external/expat" revision="6df134250feab71edb5915ecaa6268210bca76c5"/>
+  <!-- Information: platform/external/fdlibm is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/fdlibm" path="external/fdlibm" revision="988ffeb12a6e044ae3504838ef1fee3fe0716934"/>
+  <!-- Information: platform/external/flac is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/flac" path="external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
+  <!-- Information: platform/external/freetype is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/freetype" path="external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
+  <!-- Information: platform/external/giflib is tagged with M8960AAAAANLYA20234 --><project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
   <project name="platform/external/gtest" path="external/gtest" revision="8c212ebe53bb2baab3575f03069016f1fb11e449"/>
   <!-- Information: platform/external/harfbuzz is tagged with android-sdk-adt_r20 --><project name="platform/external/harfbuzz" path="external/harfbuzz" revision="bae491c03a00757d83ede8d855b7d85d246bde3d"/>
   <!-- icu4c is missing the default tag in caf, that's the *only* reason for the hardcode -->
-  <!-- Information: platform/external/icu4c is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/icu4c" path="external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
-  <!-- Information: platform/external/iptables is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/iptables" path="external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>
-  <!-- Information: platform/external/jhead is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/jhead" path="external/jhead" revision="754078052c687f6721536009c816644c73e4f145"/>
+  <!-- Information: platform/external/icu4c is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/icu4c" path="external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
+  <!-- Information: platform/external/iptables is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/iptables" path="external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>
+  <!-- Information: platform/external/jhead is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/jhead" path="external/jhead" revision="754078052c687f6721536009c816644c73e4f145"/>
   <!-- Information: platform/external/jpeg is tagged with android-cts-4.1_r2 --><project name="platform/external/jpeg" path="external/jpeg" revision="d4fad7f50f79626455d88523207e05b868819cd8"/>
-  <!-- Information: platform/external/libgsm is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
-  <!-- Information: platform/external/liblzf is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
+  <!-- Information: platform/external/libgsm is tagged with M8960AAAAANLYA20234 --><project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <!-- Information: platform/external/liblzf is tagged with M8064AAAAANLYA1203 --><project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
   <!-- Information: platform/external/libnfc-nxp is tagged with android-4.0.4_r2.1 --><project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="533c14450e6239cce8acb74f4e4dea2c89f8f219"/>
-  <!-- Information: platform/external/libnl-headers is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
+  <!-- Information: platform/external/libnl-headers is tagged with M8064AAAAANLYA1203 --><project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
   <!-- Information: platform/external/libpng is tagged with android-4.0.4_r2.1 --><project name="platform/external/libpng" path="external/libpng" revision="84d92c718ab9f48faec0f640747c4b6f7a995607"/>
   <!-- Information: platform/external/libvpx is tagged with AU_LINUX_ANDROID_ICS_STRAWBERRY_RB5.04.00.04.29.023 --><project name="platform/external/libvpx" path="external/libvpx" revision="3a40da0d96da5c520e7707aa14f48a80956e20d7"/>
   <!-- Information: platform/external/mksh is tagged with M8960AAAAANLYA1099D --><project name="platform/external/mksh" path="external/mksh" revision="5155f1c7438ef540d7b25eb70aa1639579795b07"/>
   <!-- Information: platform_external_opensans is tagged with B2G_1_0_0_20130125190500 --><project name="platform_external_opensans" path="external/opensans" remote="b2g" revision="b5b4c226ca1d71e936153cf679dda6d3d60e2354"/>
   <!-- Information: platform/external/openssl is tagged with android-4.0.4_r2.1 --><project name="platform/external/openssl" path="external/openssl" revision="ce96fb211b9a44bbd7fb5ef7ed0e6c1244045c2e"/>
-  <!-- Information: platform/external/protobuf is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/protobuf" path="external/protobuf" revision="e217977611c52bccde7f7c78e1d3c790c6357431"/>
-  <!-- Information: platform/external/safe-iop is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <!-- Information: platform/external/protobuf is tagged with M8960AAAAANLYA20234 --><project name="platform/external/protobuf" path="external/protobuf" revision="e217977611c52bccde7f7c78e1d3c790c6357431"/>
+  <!-- Information: platform/external/safe-iop is tagged with M8960AAAAANLYA20234 --><project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
   <!-- Information: screencap-gonk is tagged with B2G_1_0_0_20130125190500 --><project name="screencap-gonk" path="external/screencap-gonk" remote="b2g" revision="e6403c71e9eca8cb943739d5a0a192deac60fc51"/>
   <!-- Information: platform/external/skia is tagged with android-4.0.4_r2.1 --><project name="platform/external/skia" path="external/skia" revision="5c67a309e16bffe7013defda8f1217b3ce2420b4"/>
   <!-- Information: platform/external/sonivox is tagged with android-sdk-adt_r20 --><project name="platform/external/sonivox" path="external/sonivox" revision="5f9600971859fe072f31b38a51c38157f5f9b381"/>
-  <!-- Information: platform/external/speex is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/speex" path="external/speex" revision="ebe6230a7f7c69f5a4389f2b09b7b19ef9e94f32"/>
+  <!-- Information: platform/external/speex is tagged with M8960AAAAANLYA20234 --><project name="platform/external/speex" path="external/speex" revision="ebe6230a7f7c69f5a4389f2b09b7b19ef9e94f32"/>
   <!-- Information: platform/external/sqlite is tagged with android-4.0.4_r2.1 --><project name="platform/external/sqlite" path="external/sqlite" revision="c999ff8c12a4cf81cb9ad628f47b2720effba5e5"/>
-  <!-- Information: platform/external/stlport is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/stlport" path="external/stlport" revision="a6734e0645fce81c9610de0488b729207bfa576e"/>
-  <!-- Information: platform/external/strace is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/strace" path="external/strace" revision="c9fd2e5ef7d002e12e7cf2512506c84a9414b0fd"/>
-  <!-- Information: platform/external/tagsoup is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <!-- Information: platform/external/stlport is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/stlport" path="external/stlport" revision="a6734e0645fce81c9610de0488b729207bfa576e"/>
+  <!-- Information: platform/external/strace is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/strace" path="external/strace" revision="c9fd2e5ef7d002e12e7cf2512506c84a9414b0fd"/>
+  <!-- Information: platform/external/tagsoup is tagged with M8064AAAAANLYA1203 --><project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
   <!-- Information: platform/external/tinyalsa is tagged with android-4.0.4_r2.1 --><project name="platform/external/tinyalsa" path="external/tinyalsa" revision="495239e683a728957c890c124b239f9b7b8ef5a8"/>
-  <!-- Information: platform/external/tremolo is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/tremolo" path="external/tremolo" revision="25bd78d2392dbdc879ae53382cde9d019f79cf6f"/>
-  <!-- Information: platform/external/webp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/webp" path="external/webp" revision="88fe2b83c4b9232cd08729556fd0485d6a6a92cd"/>
+  <!-- Information: platform/external/tremolo is tagged with M8960AAAAANLYA20234 --><project name="platform/external/tremolo" path="external/tremolo" revision="25bd78d2392dbdc879ae53382cde9d019f79cf6f"/>
+  <!-- Information: platform/external/webp is tagged with M8960AAAAANLYA20234 --><project name="platform/external/webp" path="external/webp" revision="88fe2b83c4b9232cd08729556fd0485d6a6a92cd"/>
   <!-- Information: platform/external/webrtc is tagged with android-sdk-adt_r20 --><project name="platform/external/webrtc" path="external/webrtc" revision="4b6dc1ec58105d17dc8c2f550124cc0621dc93b7"/>
-  <!-- Information: platform/external/wpa_supplicant is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="a01d37870bbf9892d43e792e5de0683ca41c5497"/>
+  <!-- Information: platform/external/wpa_supplicant is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="a01d37870bbf9892d43e792e5de0683ca41c5497"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="6dd24fc3792d71edccef9b09140f9a44b063a553"/>
   <!-- Information: platform/external/zlib is tagged with android-4.0.4_r2.1 --><project name="platform/external/zlib" path="external/zlib" revision="69e5801bd16a495e1c1666669fe827b1ddb8d56b"/>
   <!-- Information: platform/external/yaffs2 is tagged with android-4.0.4-aah_r1 --><project name="platform/external/yaffs2" path="external/yaffs2" revision="6232e2d5ab34a40d710e4b05ab0ec6e3727804e7"/>
   <!-- Information: platform/frameworks/base is tagged with android-4.0.4_r2.1 --><project name="platform/frameworks/base" path="frameworks/base" revision="df331873c8576e0ae34ae1ee3cc258beed373535"/>
-  <!-- Information: platform/frameworks/opt/emoji is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.052 --><project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="a95d8db002770469d72dfaf59ff37ac96db29a87"/>
+  <!-- Information: platform/frameworks/opt/emoji is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="a95d8db002770469d72dfaf59ff37ac96db29a87"/>
   <!-- Information: platform/frameworks/support is tagged with android-4.0.4_r2.1 --><project name="platform/frameworks/support" path="frameworks/support" revision="bfc8e01b7b0d5ea70ce89d0409b72b7f7d540f43"/>
   <!-- Information: platform/hardware/libhardware is tagged with android-4.0.4_r2.1 --><project name="platform/hardware/libhardware" path="hardware/libhardware" revision="a9b677fce432b29ab8f61e13796f34880dc0fe0f"/>
   <!-- Information: platform/hardware/libhardware_legacy is tagged with android-4.0.4_r2.1 --><project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="153d0f1a27e0a157cabb6ca9d0d88248630f5695"/>
diff --git a/b2g/config/unagi/releng-unagi.tt b/b2g/config/unagi/releng-unagi.tt
index 3305a0598af5..58763d146fef 100644
--- a/b2g/config/unagi/releng-unagi.tt
+++ b/b2g/config/unagi/releng-unagi.tt
@@ -1,7 +1,7 @@
 [
 {
-"size": 833339832,
-"digest": "c5bc3424d9a52bd12dc6d849e8bd111514a7edfb84180bf8dd67f77e925fea95e9f41afade187694e1724b3d9b817e7cf2ba62be000a9f11db1e7ff689bb85fd",
+"size": 833424196,
+"digest": "f47e040bac9a0e872dc7289993093c3d1be1befbab2d7caad17645a222147398573aa563f5485ca00ccfbf8c3cefc12d09fe91bf10499baa6d373e80de6bdd70",
 "algorithm": "sha512",
 "filename": "gonk.tar.xz"
 },
diff --git a/b2g/config/unagi/sources.xml b/b2g/config/unagi/sources.xml
index 0d7f47d68802..b589feb816ad 100644
--- a/b2g/config/unagi/sources.xml
+++ b/b2g/config/unagi/sources.xml
@@ -11,17 +11,17 @@
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
 
   <!-- Gonk specific things and forks -->
-  <project name="platform_build" path="build" remote="b2g" revision="c647d5f967a5f17aaa27c792ea0ee35a2d44b113">
+  <project name="platform_build" path="build" remote="b2g" revision="eef073ce712b741f799192fc86a4e009834760ab">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <!-- Information: fake-dalvik is tagged with B2G_1_0_0_20130125190500 --><project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="9429d142f7f46add49f4665ce81ac0c0416dd9c1"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6b8f901c98fe50a775b388af972f98500bb3f4ff"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="f634b3d50effdd42828cc757c01fdbf74e562a36"/>
   <!-- Information: librecovery is tagged with B2G_1_0_0_20130125190500 --><project name="librecovery" path="librecovery" remote="b2g" revision="601fc18b28c9d7cf6954b281ddd3b705c74a9215"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="302ab954f16d0ad708e87a1cf5e94f5d93f174c9"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="c2cd096baa69d4f5c2473523d352fba1a94c5cf4"/>
 
   <!-- Stock Android things -->
-  <!-- Information: platform/abi/cpp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
+  <!-- Information: platform/abi/cpp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <!-- Information: platform/bionic is tagged with M8960AAAAANLYA100715A --><project name="platform/bionic" path="bionic" revision="cd5dfce80bc3f0139a56b58aca633202ccaee7f8"/>
   <!-- Information: platform/bootable/recovery is tagged with M8960AAAAANLYA100715A --><project name="platform/bootable/recovery" path="bootable/recovery" revision="e0a9ac010df3afaa47ba107192c05ac8b5516435"/>
   <!-- Information: platform/development is tagged with M8960AAAAANLYA100715A --><project name="platform/development" path="development" revision="a384622f5fcb1d2bebb9102591ff7ae91fe8ed2d"/>
@@ -29,62 +29,62 @@
   <!-- Information: device/sample is tagged with M8960AAAAANLYA100715A --><project name="device/sample" path="device/sample" revision="c328f3d4409db801628861baa8d279fb8855892f"/>
   <project name="platform_external_apriori" path="external/apriori" remote="b2g" revision="2c3a7113299eb789a076be23449d868b3bfa07fd"/>
   <!-- Information: platform/external/bluetooth/bluez is tagged with M76XXUSNEKNLYA2040 --><project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="1023c91c66e9c3bd1132480051993bf7827770f6"/>
-  <!-- Information: platform/external/bluetooth/glib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="c6b49241cc1a8950723a5f74f8f4b4f4c3fa970e"/>
+  <!-- Information: platform/external/bluetooth/glib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="c6b49241cc1a8950723a5f74f8f4b4f4c3fa970e"/>
   <!-- Information: platform/external/bluetooth/hcidump is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="02b1eb24fbb3d0135a81edb4a2175b1397308d7d"/>
-  <!-- Information: platform/external/bsdiff is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/bsdiff" path="external/bsdiff" revision="81872540236d9bb15cccf963d05b9de48baa5375"/>
-  <!-- Information: platform/external/bzip2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/bzip2" path="external/bzip2" revision="048dacdca43eed1534689ececcf2781c63e1e4ba"/>
+  <!-- Information: platform/external/bsdiff is tagged with M8960AAAAANLYA20234 --><project name="platform/external/bsdiff" path="external/bsdiff" revision="81872540236d9bb15cccf963d05b9de48baa5375"/>
+  <!-- Information: platform/external/bzip2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/bzip2" path="external/bzip2" revision="048dacdca43eed1534689ececcf2781c63e1e4ba"/>
   <!-- Information: platform/external/dbus is tagged with M8960AAAAANLYA100715A --><project name="platform/external/dbus" path="external/dbus" revision="c7517b6195dc6926728352113e6cc335da3f9c9e"/>
   <!-- Information: platform/external/dhcpcd is tagged with M8960AAAAANLYA100715A --><project name="platform/external/dhcpcd" path="external/dhcpcd" revision="1e00fb67022d0921af0fead263f81762781b9ffa"/>
-  <!-- Information: platform/external/dnsmasq is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/dnsmasq" path="external/dnsmasq" revision="f621afad94df46204c25fc2593a19d704d2637f5"/>
+  <!-- Information: platform/external/dnsmasq is tagged with M8960AAAAANLYA20234 --><project name="platform/external/dnsmasq" path="external/dnsmasq" revision="f621afad94df46204c25fc2593a19d704d2637f5"/>
   <project name="platform_external_elfcopy" path="external/elfcopy" remote="b2g" revision="62c1bed1c4505369cac2e72fbe30452a598fb690"/>
   <project name="platform_external_elfutils" path="external/elfutils" remote="b2g" revision="72940dec691fa3255e13df01f8c53b620e446066"/>
-  <!-- Information: platform/external/e2fsprogs is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="d5f550bb2f556c5d287f7c8d2b77223654bcec37"/>
-  <!-- Information: platform/external/expat is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/expat" path="external/expat" revision="6df134250feab71edb5915ecaa6268210bca76c5"/>
-  <!-- Information: platform/external/fdlibm is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/fdlibm" path="external/fdlibm" revision="988ffeb12a6e044ae3504838ef1fee3fe0716934"/>
-  <!-- Information: platform/external/flac is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/flac" path="external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
-  <!-- Information: platform/external/freetype is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/freetype" path="external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
-  <!-- Information: platform/external/giflib is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <!-- Information: platform/external/e2fsprogs is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="d5f550bb2f556c5d287f7c8d2b77223654bcec37"/>
+  <!-- Information: platform/external/expat is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/expat" path="external/expat" revision="6df134250feab71edb5915ecaa6268210bca76c5"/>
+  <!-- Information: platform/external/fdlibm is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/fdlibm" path="external/fdlibm" revision="988ffeb12a6e044ae3504838ef1fee3fe0716934"/>
+  <!-- Information: platform/external/flac is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/flac" path="external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
+  <!-- Information: platform/external/freetype is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/freetype" path="external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
+  <!-- Information: platform/external/giflib is tagged with M8960AAAAANLYA20234 --><project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
   <project name="platform/external/gtest" path="external/gtest" revision="8c212ebe53bb2baab3575f03069016f1fb11e449"/>
-  <!-- Information: platform/external/harfbuzz is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/harfbuzz" path="external/harfbuzz" revision="116610d63a859521dacf00fb6818ee9ab2e666f6"/>
-  <!-- Information: platform/external/icu4c is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/icu4c" path="external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
-  <!-- Information: platform/external/iptables is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/iptables" path="external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>
+  <!-- Information: platform/external/harfbuzz is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/harfbuzz" path="external/harfbuzz" revision="116610d63a859521dacf00fb6818ee9ab2e666f6"/>
+  <!-- Information: platform/external/icu4c is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/icu4c" path="external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
+  <!-- Information: platform/external/iptables is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/iptables" path="external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>
   <!-- Information: platform/external/jpeg is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/jpeg" path="external/jpeg" revision="a62e464d672a4623233180e4023034bf825f066e"/>
-  <!-- Information: platform/external/libgsm is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
-  <!-- Information: platform/external/liblzf is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
-  <!-- Information: platform/external/libnfc-nxp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="3a912b065a31a72c63ad56ac224cfeaa933423b6"/>
-  <!-- Information: platform/external/libnl-headers is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
+  <!-- Information: platform/external/libgsm is tagged with M8960AAAAANLYA20234 --><project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <!-- Information: platform/external/liblzf is tagged with M8960AAAAANLYA23232 --><project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
+  <!-- Information: platform/external/libnfc-nxp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="3a912b065a31a72c63ad56ac224cfeaa933423b6"/>
+  <!-- Information: platform/external/libnl-headers is tagged with M8960AAAAANLYA23232 --><project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
   <!-- Information: platform/external/libpng is tagged with M8960AAAAANLYA100715A --><project name="platform/external/libpng" path="external/libpng" revision="9c3730f0efa69f580f03463c237cd928f3196404"/>
-  <!-- Information: platform/external/libvpx is tagged with M8960AAAAANLYA1519349 --><project name="platform/external/libvpx" path="external/libvpx" revision="3a40da0d96da5c520e7707aa14f48a80956e20d7"/>
+  <!-- Information: platform/external/libvpx is tagged with AU_LINUX_ANDROID_ICS_STRAWBERRY_RB5.04.00.04.29.023 --><project name="platform/external/libvpx" path="external/libvpx" revision="3a40da0d96da5c520e7707aa14f48a80956e20d7"/>
   <!-- Information: platform/external/llvm is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/llvm" path="external/llvm" revision="bff5923831940309f7d8ddbff5826ca6ed2dc050"/>
   <!-- Information: platform/external/mksh is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/mksh" path="external/mksh" revision="ec646e8f5e7dac9a77d1de549c6ed92c04d0cd4b"/>
   <!-- Information: platform_external_opensans is tagged with B2G_1_0_0_20130125190500 --><project name="platform_external_opensans" path="external/opensans" remote="b2g" revision="b5b4c226ca1d71e936153cf679dda6d3d60e2354"/>
   <!-- Information: platform/external/openssl is tagged with AU_LINUX_ANDROID_ICS.04.00.04.00.110 --><project name="platform/external/openssl" path="external/openssl" revision="27d333cce9a31c806b4bfa042925f045c727aecd"/>
-  <!-- Information: platform/external/protobuf is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/protobuf" path="external/protobuf" revision="e217977611c52bccde7f7c78e1d3c790c6357431"/>
-  <!-- Information: platform/external/safe-iop is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <!-- Information: platform/external/protobuf is tagged with M8960AAAAANLYA20234 --><project name="platform/external/protobuf" path="external/protobuf" revision="e217977611c52bccde7f7c78e1d3c790c6357431"/>
+  <!-- Information: platform/external/safe-iop is tagged with M8960AAAAANLYA20234 --><project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
   <!-- Information: screencap-gonk is tagged with B2G_1_0_0_20130125190500 --><project name="screencap-gonk" path="external/screencap-gonk" remote="b2g" revision="e6403c71e9eca8cb943739d5a0a192deac60fc51"/>
   <!-- Information: platform/external/skia is tagged with M8960AAAAANLYA100715A --><project name="platform/external/skia" path="external/skia" revision="7d90c85f2c0e3b747f7c7eff8bc9253b0063b439"/>
   <!-- Information: platform/external/sonivox is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/sonivox" path="external/sonivox" revision="7c967779dfc61ac1f346e972de91d4bfce7dccbb"/>
-  <!-- Information: platform/external/speex is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/speex" path="external/speex" revision="ebe6230a7f7c69f5a4389f2b09b7b19ef9e94f32"/>
+  <!-- Information: platform/external/speex is tagged with M8960AAAAANLYA20234 --><project name="platform/external/speex" path="external/speex" revision="ebe6230a7f7c69f5a4389f2b09b7b19ef9e94f32"/>
   <project name="platform/external/sqlite" path="external/sqlite" revision="fb30e613139b8836fdc8e81e166cf3a76e5fa17f"/>
-  <!-- Information: platform/external/stlport is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/stlport" path="external/stlport" revision="a6734e0645fce81c9610de0488b729207bfa576e"/>
-  <!-- Information: platform/external/strace is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/strace" path="external/strace" revision="c9fd2e5ef7d002e12e7cf2512506c84a9414b0fd"/>
-  <!-- Information: platform/external/tagsoup is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <!-- Information: platform/external/stlport is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/stlport" path="external/stlport" revision="a6734e0645fce81c9610de0488b729207bfa576e"/>
+  <!-- Information: platform/external/strace is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/strace" path="external/strace" revision="c9fd2e5ef7d002e12e7cf2512506c84a9414b0fd"/>
+  <!-- Information: platform/external/tagsoup is tagged with M8960AAAAANLYA23232 --><project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
   <!-- Information: platform/external/tinyalsa is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/external/tinyalsa" path="external/tinyalsa" revision="06cc244ee512c1352215e543615738bc8ac82814"/>
-  <!-- Information: platform/external/tremolo is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/tremolo" path="external/tremolo" revision="25bd78d2392dbdc879ae53382cde9d019f79cf6f"/>
+  <!-- Information: platform/external/tremolo is tagged with M8960AAAAANLYA20234 --><project name="platform/external/tremolo" path="external/tremolo" revision="25bd78d2392dbdc879ae53382cde9d019f79cf6f"/>
   <!-- Information: unbootimg is tagged with B2G_1_0_0_20130125190500 --><project name="unbootimg" path="external/unbootimg" remote="b2g" revision="9464623d92eb8668544916dc5a8f4f6337d0bc08"/>
-  <!-- Information: platform/external/webp is tagged with AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.123 --><project name="platform/external/webp" path="external/webp" revision="88fe2b83c4b9232cd08729556fd0485d6a6a92cd"/>
-  <!-- Information: platform/external/webrtc is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/webrtc" path="external/webrtc" revision="137024dc8a2e9251a471e20518a9c3ae06f81f23"/>
-  <!-- Information: platform/external/wpa_supplicant is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="a01d37870bbf9892d43e792e5de0683ca41c5497"/>
+  <!-- Information: platform/external/webp is tagged with M8960AAAAANLYA20234 --><project name="platform/external/webp" path="external/webp" revision="88fe2b83c4b9232cd08729556fd0485d6a6a92cd"/>
+  <!-- Information: platform/external/webrtc is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/webrtc" path="external/webrtc" revision="137024dc8a2e9251a471e20518a9c3ae06f81f23"/>
+  <!-- Information: platform/external/wpa_supplicant is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="a01d37870bbf9892d43e792e5de0683ca41c5497"/>
   <!-- Information: platform/external/hostap is tagged with M8960AAAAANLYA1047 --><project name="platform/external/hostap" path="external/hostap" revision="bf04b0faadbdeb4b7943f2e2c4c5aa59df872bb1"/>
   <!-- Information: platform/external/zlib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.01.19.008 --><project name="platform/external/zlib" path="external/zlib" revision="f96a1d1ebfdf1cd582210fd09c23d8f59e0ae094"/>
-  <!-- Information: platform/external/yaffs2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/external/yaffs2" path="external/yaffs2" revision="0afa916204c664b3114429637b63af1321a0aeca"/>
+  <!-- Information: platform/external/yaffs2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/external/yaffs2" path="external/yaffs2" revision="0afa916204c664b3114429637b63af1321a0aeca"/>
   <!-- Information: platform/frameworks/base is tagged with M76XXUSNEKNLYA2040 --><project name="platform/frameworks/base" path="frameworks/base" revision="eb2bc75803ca179353c24c364a9c8a8ce23e8b78"/>
-  <!-- Information: platform/frameworks/opt/emoji is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="a95d8db002770469d72dfaf59ff37ac96db29a87"/>
+  <!-- Information: platform/frameworks/opt/emoji is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="a95d8db002770469d72dfaf59ff37ac96db29a87"/>
   <!-- Information: platform/frameworks/support is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/frameworks/support" path="frameworks/support" revision="27208692b001981f1806f4f396434f4eac78b909"/>
   <!-- Information: platform/hardware/libhardware is tagged with M8960AAAAANLYA1049B --><project name="platform/hardware/libhardware" path="hardware/libhardware" revision="4a619901847621f8a7305edf42dd07347a140484"/>
   <!-- Information: platform/hardware/libhardware_legacy is tagged with M8960AAAAANLYA153611 --><project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="87b4d7afa8f854b445e2d0d95091f6f6069f2b30"/>
   <!-- Information: platform/libcore is tagged with M8960AAAAANLYA100715A --><project name="platform/libcore" path="libcore" revision="30841f9fba9ccd5c54f4f079f495994db97f283e"/>
-  <!-- Information: platform/ndk is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.19.035 --><project name="platform/ndk" path="ndk" revision="9f555971e1481854d5b4dc11b3e6af9fff4f241f"/>
+  <!-- Information: platform/ndk is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.01.00.019.065 --><project name="platform/ndk" path="ndk" revision="9f555971e1481854d5b4dc11b3e6af9fff4f241f"/>
   <!-- Information: platform/prebuilt is tagged with AU_LINUX_ANDROID_ICS_CHOCOLATE.04.00.04.05.324 --><project name="platform/prebuilt" path="prebuilt" revision="447ea790fcc957dde59730ecc2a65ca263bdc733"/>
   <!-- Information: platform/system/bluetooth is tagged with M8960AAAAANLYA100703 --><project name="platform/system/bluetooth" path="system/bluetooth" revision="7772cad4823f1f427ce1d4df84a55982386d6d18"/>
   <!-- Information: platform/system/core is tagged with M76XXUSNEKNLYA2040 --><project name="platform/system/core" path="system/core" revision="bf1970408676ce570b8f4dc3efa038e47552137f"/>

From b20ca8726779513f0eb3bf19e2e83e56b0e470e2 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 17 Apr 2013 12:06:36 -0700
Subject: [PATCH 400/438] Bug 862809 - Add mach reftest-ipc and mach
 crashtest-ipc; r=bz

DONTBUILD (NPOTB)
---
 layout/tools/reftest/mach_commands.py | 59 ++++++++++++++++++---------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/layout/tools/reftest/mach_commands.py b/layout/tools/reftest/mach_commands.py
index 2dc1b72e09fe..1754a531650a 100644
--- a/layout/tools/reftest/mach_commands.py
+++ b/layout/tools/reftest/mach_commands.py
@@ -34,7 +34,9 @@ class ReftestRunner(MozbuildObject):
         """Returns the manifest file used for a given test suite."""
         files = {
           'reftest': 'reftest.list',
-          'crashtest': 'crashtests.list'
+          'reftest-ipc': 'reftest.list',
+          'crashtest': 'crashtests.list',
+          'crashtest-ipc': 'crashtests.list',
         }
         assert suite in files
         return files[suite]
@@ -73,7 +75,7 @@ class ReftestRunner(MozbuildObject):
         debugger to run.
         """
 
-        if suite not in ('reftest', 'crashtest'):
+        if suite not in ('reftest', 'reftest-ipc', 'crashtest', 'crashtest-ipc'):
             raise Exception('None or unrecognized reftest suite type.')
 
         env = {}
@@ -103,28 +105,47 @@ class ReftestRunner(MozbuildObject):
             pass_thru=pass_thru, ensure_exit_code=False)
 
 
+def ReftestCommand(func):
+    """Decorator that adds shared command arguments to reftest commands."""
+
+    debugger = CommandArgument('--debugger', metavar='DEBUGGER',
+        help=DEBUGGER_HELP)
+    func = debugger(func)
+
+    flter = CommandArgument('--filter', metavar='REGEX',
+        help='A JS regular expression to match test URLs against, to select '
+             'a subset of tests to run.')
+    func = flter(func)
+
+    path = CommandArgument('test_file', nargs='?', metavar='MANIFEST',
+        help='Reftest manifest file, or a directory in which to select '
+             'reftest.list. If omitted, the entire test suite is executed.')
+    func = path(func)
+
+    return func
+
+
 @CommandProvider
 class MachCommands(MachCommandBase):
     @Command('reftest', help='Run a reftest.')
-    @CommandArgument('test_file', default=None, nargs='?', metavar='MANIFEST',
-        help='Reftest manifest file, or a directory in which to select '
-             'reftest.list. If omitted, the entire test suite is executed.')
-    @CommandArgument('--filter', default=None, metavar='REGEX',
-        help='A JS regular expression to match test URLs against, to select '
-             'a subset of tests to run.')
-    @CommandArgument('--debugger', metavar='DEBUGGER', help=DEBUGGER_HELP)
-    def run_reftest(self, test_file, filter, debugger=None):
-        return self._run_reftest(test_file, filter=filter, suite='reftest',
-            debugger=debugger)
+    @ReftestCommand
+    def run_reftest(self, test_file, **kwargs):
+        return self._run_reftest(test_file, suite='reftest', **kwargs)
+
+    @Command('reftest-ipc', help='Run IPC reftests.')
+    @ReftestCommand
+    def run_ipc(self, test_file, **kwargs):
+        return self._run_reftest(test_file, suite='reftest-ipc', **kwargs)
 
     @Command('crashtest', help='Run a crashtest.')
-    @CommandArgument('test_file', default=None, nargs='?', metavar='MANIFEST',
-        help='Crashtest manifest file, or a direction in which to select '
-             'crashtests.list.')
-    @CommandArgument('--debugger', metavar='DEBUGGER', help=DEBUGGER_HELP)
-    def run_crashtest(self, test_file, debugger=None):
-        return self._run_reftest(test_file, suite='crashtest',
-            debugger=debugger)
+    @ReftestCommand
+    def run_crashtest(self, test_file, **kwargs):
+        return self._run_reftest(test_file, suite='crashtest', **kwargs)
+
+    @Command('crashtest-ipc', help='Run IPC crashtests.')
+    @ReftestCommand
+    def run_crashtest_ipc(self, test_file, **kwargs):
+        return self._run_reftest(test_file, suite='crashtest-ipc', **kwargs)
 
     def _run_reftest(self, test_file=None, filter=None, suite=None,
             debugger=None):

From 3400505bb7ecc42b640aeb217d71c18e673ca955 Mon Sep 17 00:00:00 2001
From: Girish Sharma <scrapmachines@gmail.com>
Date: Wed, 17 Apr 2013 12:27:36 +0530
Subject: [PATCH 401/438] Bug 862294 - Sidebar should be responsive in docked
 Toolbox, r=vporof

---
 browser/devtools/inspector/inspector.xul      |  4 +--
 browser/devtools/netmonitor/netmonitor.css    |  8 ++++++
 browser/devtools/netmonitor/netmonitor.xul    |  4 +--
 browser/devtools/webconsole/webconsole.xul    |  4 +--
 browser/themes/linux/devtools/common.css      |  1 +
 browser/themes/linux/devtools/netmonitor.css  | 16 +++++++++++
 browser/themes/osx/devtools/common.css        |  1 +
 browser/themes/osx/devtools/netmonitor.css    | 16 +++++++++++
 browser/themes/shared/devtools/common.inc.css | 28 +++++++++++++++++++
 browser/themes/windows/devtools/common.css    |  1 +
 .../themes/windows/devtools/netmonitor.css    | 16 +++++++++++
 11 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/browser/devtools/inspector/inspector.xul b/browser/devtools/inspector/inspector.xul
index 1008b920c3d6..130f1b75bbb1 100644
--- a/browser/devtools/inspector/inspector.xul
+++ b/browser/devtools/inspector/inspector.xul
@@ -63,7 +63,7 @@
     </menupopup>
   </popupset>
 
-  <hbox flex="1">
+  <box flex="1" class="devtools-responsive-container">
     <vbox flex="1">
       <toolbar id="inspector-toolbar"
         class="devtools-toolbar"
@@ -91,5 +91,5 @@
       <tabs/>
       <tabpanels flex="1"/>
     </tabbox>
-  </hbox>
+  </box>
 </window>
diff --git a/browser/devtools/netmonitor/netmonitor.css b/browser/devtools/netmonitor/netmonitor.css
index 8050531eb5d7..75d14f856ad8 100644
--- a/browser/devtools/netmonitor/netmonitor.css
+++ b/browser/devtools/netmonitor/netmonitor.css
@@ -6,3 +6,11 @@
 #response-content-image-box {
   overflow: auto;
 }
+
+/* Responsive sidebar */
+@media (max-width: 700px) {
+  #details-pane-toggle,
+  .requests-menu-waterfall {
+    display: none;
+  }
+}
diff --git a/browser/devtools/netmonitor/netmonitor.xul b/browser/devtools/netmonitor/netmonitor.xul
index aaf28d6d8774..88db6a46e348 100644
--- a/browser/devtools/netmonitor/netmonitor.xul
+++ b/browser/devtools/netmonitor/netmonitor.xul
@@ -17,7 +17,7 @@
   <script type="text/javascript" src="netmonitor-controller.js"/>
   <script type="text/javascript" src="netmonitor-view.js"/>
 
-  <hbox id="body" flex="1">
+  <box id="body" flex="1" class="devtools-responsive-container">
     <vbox id="network-table" flex="1">
       <toolbar id="requests-menu-toolbar"
                class="devtools-toolbar"
@@ -262,6 +262,6 @@
         </tabpanel>
       </tabpanels>
     </tabbox>
-  </hbox>
+  </box>
 
 </window>
diff --git a/browser/devtools/webconsole/webconsole.xul b/browser/devtools/webconsole/webconsole.xul
index 2f747198bafc..6aaf75ad18eb 100644
--- a/browser/devtools/webconsole/webconsole.xul
+++ b/browser/devtools/webconsole/webconsole.xul
@@ -67,7 +67,7 @@
     </menupopup>
   </popupset>
 
-  <hbox class="hud-outer-wrapper" flex="1">
+  <box class="hud-outer-wrapper devtools-responsive-container" flex="1">
     <vbox class="hud-console-wrapper" flex="1">
       <toolbar class="hud-console-filter-toolbar devtools-toolbar" mode="full">
         <toolbarbutton label="&btnPageNet.label;" type="menu-button"
@@ -145,5 +145,5 @@
       <tabs/>
       <tabpanels flex="1"/>
     </tabbox>
-  </hbox>
+  </box>
 </window>
diff --git a/browser/themes/linux/devtools/common.css b/browser/themes/linux/devtools/common.css
index e65b4f0a8f74..336e2c543626 100644
--- a/browser/themes/linux/devtools/common.css
+++ b/browser/themes/linux/devtools/common.css
@@ -216,6 +216,7 @@
   background-color: transparent;
   -moz-margin-end: -3px;
   position: relative;
+  cursor: e-resize;
 }
 
 /* In-tools sidebar */
diff --git a/browser/themes/linux/devtools/netmonitor.css b/browser/themes/linux/devtools/netmonitor.css
index f94b6e6d7933..56925dfcd724 100644
--- a/browser/themes/linux/devtools/netmonitor.css
+++ b/browser/themes/linux/devtools/netmonitor.css
@@ -297,3 +297,19 @@
 #timings-tabpanel .requests-menu-timings-total {
   transition: transform 0.2s ease-out;
 }
+
+/* Responsive sidebar */
+@media (max-width: 700px) {
+  #details-pane {
+    max-width: none;
+    margin: 0 !important;
+    /* To prevent all the margin hacks to hide the sidebar */
+  }
+
+  .requests-menu-size {
+    border-width: 0px !important;
+    box-shadow: none !important;
+    /* !important are required here because Timeline is not visible and thus
+       the right border and box-shadow of Size column should be hidden */
+  }
+}
diff --git a/browser/themes/osx/devtools/common.css b/browser/themes/osx/devtools/common.css
index bd2be535ce27..e7b29c118f9b 100644
--- a/browser/themes/osx/devtools/common.css
+++ b/browser/themes/osx/devtools/common.css
@@ -230,6 +230,7 @@
   width: 3px;
   -moz-margin-end: -3px;
   position: relative;
+  cursor: e-resize;
 }
 
 /* In-tools sidebar */
diff --git a/browser/themes/osx/devtools/netmonitor.css b/browser/themes/osx/devtools/netmonitor.css
index d1f1c24f39ad..270fc5cf9b49 100644
--- a/browser/themes/osx/devtools/netmonitor.css
+++ b/browser/themes/osx/devtools/netmonitor.css
@@ -297,3 +297,19 @@
 #timings-tabpanel .requests-menu-timings-total {
   transition: transform 0.2s ease-out;
 }
+
+/* Responsive sidebar */
+@media (max-width: 700px) {
+  #details-pane {
+    max-width: none;
+    margin: 0 !important;
+    /* To prevent all the margin hacks to hide the sidebar */
+  }
+
+  .requests-menu-size {
+    border-width: 0px !important;
+    box-shadow: none !important;
+    /* !important are required here because Timeline is not visible and thus
+       the right border and box-shadow of Size column should be hidden */
+  }
+}
diff --git a/browser/themes/shared/devtools/common.inc.css b/browser/themes/shared/devtools/common.inc.css
index c9ae98d9ca3d..268164e01c08 100644
--- a/browser/themes/shared/devtools/common.inc.css
+++ b/browser/themes/shared/devtools/common.inc.css
@@ -83,3 +83,31 @@
 .devtools-autocomplete-listbox.light-theme > richlistitem > label {
   color: #666;
 }
+
+/* Responsive container */
+
+.devtools-responsive-container {
+  -moz-box-orient: horizontal;
+}
+
+@media (max-width: 700px) {
+  .devtools-responsive-container {
+    -moz-box-orient: vertical;
+  }
+
+  .devtools-responsive-container > .devtools-side-splitter {
+    border: 0;
+    margin: 0;
+    border-top: 1px solid black;
+    min-height: 3px;
+    height: 3px;
+    margin-bottom: -3px;
+    /* In some edge case the cursor is not changed to n-resize */
+    cursor: n-resize;
+  }
+
+  .devtools-responsive-container > .devtools-sidebar-tabs {
+    min-height: 35vh;
+    max-height: 75vh;
+  }
+}
diff --git a/browser/themes/windows/devtools/common.css b/browser/themes/windows/devtools/common.css
index 2bb1fd1070fd..0bc24fd4c278 100644
--- a/browser/themes/windows/devtools/common.css
+++ b/browser/themes/windows/devtools/common.css
@@ -236,6 +236,7 @@
   background-color: transparent;
   -moz-margin-end: -3px;
   position: relative;
+  cursor: e-resize;
 }
 
 /* In-tools sidebar */
diff --git a/browser/themes/windows/devtools/netmonitor.css b/browser/themes/windows/devtools/netmonitor.css
index d1f1c24f39ad..270fc5cf9b49 100644
--- a/browser/themes/windows/devtools/netmonitor.css
+++ b/browser/themes/windows/devtools/netmonitor.css
@@ -297,3 +297,19 @@
 #timings-tabpanel .requests-menu-timings-total {
   transition: transform 0.2s ease-out;
 }
+
+/* Responsive sidebar */
+@media (max-width: 700px) {
+  #details-pane {
+    max-width: none;
+    margin: 0 !important;
+    /* To prevent all the margin hacks to hide the sidebar */
+  }
+
+  .requests-menu-size {
+    border-width: 0px !important;
+    box-shadow: none !important;
+    /* !important are required here because Timeline is not visible and thus
+       the right border and box-shadow of Size column should be hidden */
+  }
+}

From d3e7c334ed88c4d784111874094ca625672927a3 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Tue, 16 Apr 2013 18:00:33 +0300
Subject: [PATCH 402/438] Bug 849071 - Create some kind of chrome to turn
 source mapping on/off in the debugger, r=vporof

---
 .../devtools/debugger/debugger-controller.js  |  28 ++-
 browser/devtools/debugger/debugger-toolbar.js |  14 ++
 browser/devtools/debugger/debugger.xul        |   7 +
 browser/devtools/debugger/test/Makefile.in    |   1 +
 .../test/browser_dbg_source_maps-02.js        | 203 ++++++++++++++++++
 .../chrome/browser/devtools/debugger.dtd      |   6 +
 toolkit/devtools/debugger/dbg-client.jsm      |  17 ++
 .../debugger/server/dbg-script-actors.js      |  13 ++
 8 files changed, 286 insertions(+), 3 deletions(-)
 create mode 100644 browser/devtools/debugger/test/browser_dbg_source_maps-02.js

diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index 9df4b43e1269..cd7a08136121 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -253,9 +253,7 @@ let DebuggerController = {
       if (aCallback) {
         aCallback();
       }
-    }, {
-      useSourceMaps: Services.prefs.getBoolPref("devtools.debugger.source-maps-enabled")
-    });
+    }, { useSourceMaps: Prefs.sourceMapsEnabled });
   },
 
   /**
@@ -299,6 +297,29 @@ let DebuggerController = {
       if (aCallback) {
         aCallback();
       }
+    }, { useSourceMaps: Prefs.sourceMapsEnabled });
+  },
+
+  /**
+   * Detach and reattach to the thread actor with useSourceMaps true, blow
+   * away old scripts and get sources again.
+   */
+  reconfigureThread: function DC_reconfigureThread(aUseSourceMaps) {
+    this.client.reconfigureThread(aUseSourceMaps, (aResponse) => {
+      if (aResponse.error) {
+        let msg = "Couldn't reconfigure thread: " + aResponse.message;
+        Cu.reportError(msg);
+        dumpn(msg);
+        return;
+      }
+
+      // Update the source list widget.
+      DebuggerView.Sources.empty();
+      SourceUtils.clearCache();
+      this.SourceScripts._handleTabNavigation();
+      // Update the stack frame list.
+      this.activeThread._clearFrames();
+      this.activeThread.fillFrames(CALL_STACK_PAGE_SIZE);
     });
   },
 
@@ -1659,6 +1680,7 @@ let Prefs = new ViewHelpers.Prefs("devtools.debugger", {
   variablesSortingEnabled: ["Bool", "ui.variables-sorting-enabled"],
   variablesOnlyEnumVisible: ["Bool", "ui.variables-only-enum-visible"],
   variablesSearchboxVisible: ["Bool", "ui.variables-searchbox-visible"],
+  sourceMapsEnabled: ["Bool", "source-maps-enabled"],
   remoteHost: ["Char", "remote-host"],
   remotePort: ["Int", "remote-port"],
   remoteAutoConnect: ["Bool", "remote-autoconnect"],
diff --git a/browser/devtools/debugger/debugger-toolbar.js b/browser/devtools/debugger/debugger-toolbar.js
index d8b164d201cf..0b8c4f101395 100644
--- a/browser/devtools/debugger/debugger-toolbar.js
+++ b/browser/devtools/debugger/debugger-toolbar.js
@@ -187,6 +187,7 @@ function OptionsView() {
   this._toggleShowPanesOnStartup = this._toggleShowPanesOnStartup.bind(this);
   this._toggleShowVariablesOnlyEnum = this._toggleShowVariablesOnlyEnum.bind(this);
   this._toggleShowVariablesFilterBox = this._toggleShowVariablesFilterBox.bind(this);
+  this._toggleShowOriginalSource = this._toggleShowOriginalSource.bind(this);
 }
 
 OptionsView.prototype = {
@@ -201,11 +202,13 @@ OptionsView.prototype = {
     this._showPanesOnStartupItem = document.getElementById("show-panes-on-startup");
     this._showVariablesOnlyEnumItem = document.getElementById("show-vars-only-enum");
     this._showVariablesFilterBoxItem = document.getElementById("show-vars-filter-box");
+    this._showOriginalSourceItem = document.getElementById("show-original-source");
 
     this._pauseOnExceptionsItem.setAttribute("checked", Prefs.pauseOnExceptions);
     this._showPanesOnStartupItem.setAttribute("checked", Prefs.panesVisibleOnStartup);
     this._showVariablesOnlyEnumItem.setAttribute("checked", Prefs.variablesOnlyEnumVisible);
     this._showVariablesFilterBoxItem.setAttribute("checked", Prefs.variablesSearchboxVisible);
+    this._showOriginalSourceItem.setAttribute("checked", Prefs.sourceMapsEnabled);
   },
 
   /**
@@ -262,10 +265,21 @@ OptionsView.prototype = {
       this._showVariablesFilterBoxItem.getAttribute("checked") == "true";
   },
 
+  /**
+   * Listener handling the 'show original source' menuitem command.
+   */
+  _toggleShowOriginalSource: function DVO__toggleShowOriginalSource() {
+    let pref = Prefs.sourceMapsEnabled =
+      this._showOriginalSourceItem.getAttribute("checked") == "true";
+
+    DebuggerController.reconfigureThread(pref);
+  },
+
   _button: null,
   _pauseOnExceptionsItem: null,
   _showPanesOnStartupItem: null,
   _showVariablesOnlyEnumItem: null,
+  _showOriginalSourceItem: null,
   _showVariablesFilterBoxItem: null
 };
 
diff --git a/browser/devtools/debugger/debugger.xul b/browser/devtools/debugger/debugger.xul
index a24d637daa16..d4c8d755450b 100644
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -64,6 +64,8 @@
              oncommand="DebuggerView.Options._toggleShowVariablesOnlyEnum()"/>
     <command id="toggleShowVariablesFilterBox"
              oncommand="DebuggerView.Options._toggleShowVariablesFilterBox()"/>
+    <command id="toggleShowOriginalSource"
+             oncommand="DebuggerView.Options._toggleShowOriginalSource()"/>
   </commandset>
 
   <popupset id="debuggerPopupset">
@@ -160,6 +162,11 @@
                 label="&debuggerUI.showVarsFilter;"
                 accesskey="&debuggerUI.showVarsFilter.key;"
                 command="toggleShowVariablesFilterBox"/>
+      <menuitem id="show-original-source"
+                type="checkbox"
+                label="&debuggerUI.showOriginalSource;"
+                accesskey="&debuggerUI.showOriginalSource.key;"
+                command="toggleShowOriginalSource"/>
     </menupopup>
   </popupset>
 
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index 07eeed6da264..d8f9b1ee8f0b 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -97,6 +97,7 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_progress-listener-bug.js \
 	browser_dbg_chrome-debugging.js \
 	browser_dbg_source_maps-01.js \
+	browser_dbg_source_maps-02.js \
 	head.js \
 	helpers.js \
 	$(NULL)
diff --git a/browser/devtools/debugger/test/browser_dbg_source_maps-02.js b/browser/devtools/debugger/test/browser_dbg_source_maps-02.js
new file mode 100644
index 000000000000..882bd7e77c96
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_source_maps-02.js
@@ -0,0 +1,203 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that we can toggle between the original and generated sources.
+ */
+
+const TAB_URL = EXAMPLE_URL + "binary_search.html";
+
+var gPane = null;
+var gTab = null;
+var gDebuggee = null;
+var gDebugger = null;
+var gPrevPref = null;
+
+function test()
+{
+  let scriptShown = false;
+  let framesAdded = false;
+  let resumed = false;
+  let testStarted = false;
+
+  gPrevPref = Services.prefs.getBoolPref(
+    "devtools.debugger.source-maps-enabled");
+  Services.prefs.setBoolPref("devtools.debugger.source-maps-enabled", true);
+
+  debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
+    resumed = true;
+    gTab = aTab;
+    gDebuggee = aDebuggee;
+    gPane = aPane;
+    gDebugger = gPane.panelWin;
+
+    gDebugger.addEventListener("Debugger:SourceShown", function _onSourceShown(aEvent) {
+      gDebugger.removeEventListener("Debugger:SourceShown", _onSourceShown);
+      // Show original sources should be already enabled.
+      is(gPrevPref, false,
+        "The source maps functionality should be disabled by default.");
+      is(gDebugger.Prefs.sourceMapsEnabled, true,
+        "The source maps pref should be true from startup.");
+      is(gDebugger.DebuggerView.Options._showOriginalSourceItem.getAttribute("checked"),
+         "true", "Source maps should be enabled from startup. ")
+
+      ok(aEvent.detail.url.indexOf(".coffee") != -1,
+         "The debugger should show the source mapped coffee script file.");
+      ok(aEvent.detail.url.indexOf(".js") == -1,
+         "The debugger should not show the generated js script file.");
+      ok(gDebugger.editor.getText().search(/isnt/) != -1,
+         "The debugger's editor should have the coffee script source displayed.");
+      ok(gDebugger.editor.getText().search(/function/) == -1,
+         "The debugger's editor should not have the JS source displayed.");
+
+      testToggleGeneratedSource();
+    });
+  });
+}
+
+function testToggleGeneratedSource() {
+  gDebugger.addEventListener("Debugger:SourceShown", function _onSourceShown(aEvent) {
+    gDebugger.removeEventListener("Debugger:SourceShown", _onSourceShown);
+
+    is(gDebugger.Prefs.sourceMapsEnabled, false,
+      "The source maps pref should have been set to false.");
+    is(gDebugger.DebuggerView.Options._showOriginalSourceItem.getAttribute("checked"),
+       "false", "Source maps should be enabled from startup. ")
+
+    ok(aEvent.detail.url.indexOf(".coffee") == -1,
+       "The debugger should not show the source mapped coffee script file.");
+    ok(aEvent.detail.url.indexOf(".js") != -1,
+       "The debugger should show the generated js script file.");
+    ok(gDebugger.editor.getText().search(/isnt/) == -1,
+       "The debugger's editor should have the coffee script source displayed.");
+      ok(gDebugger.editor.getText().search(/function/) != -1,
+         "The debugger's editor should not have the JS source displayed.");
+
+    testSetBreakpoint();
+  });
+
+  // Disable source maps.
+  gDebugger.DebuggerView.Options._showOriginalSourceItem.setAttribute("checked",
+                                                                      "false");
+  gDebugger.DebuggerView.Options._toggleShowOriginalSource();
+}
+
+function testSetBreakpoint() {
+  let { activeThread } = gDebugger.DebuggerController;
+  activeThread.setBreakpoint({
+    url: EXAMPLE_URL + "binary_search.js",
+    line: 7
+  }, function (aResponse, bpClient) {
+    ok(!aResponse.error,
+       "Should be able to set a breakpoint in a JavaScript file.");
+    testHitBreakpoint();
+  });
+}
+
+function testHitBreakpoint() {
+  let { activeThread } = gDebugger.DebuggerController;
+  activeThread.resume(function (aResponse) {
+    ok(!aResponse.error, "Shouldn't get an error resuming");
+    is(aResponse.type, "resumed", "Type should be 'resumed'");
+
+    activeThread.addOneTimeListener("framesadded", function (aEvent, aPacket) {
+      // Make sure that we have JavaScript stack frames.
+      let frames = gDebugger.DebuggerView.StackFrames._container._list;
+      let childNodes = frames.childNodes;
+
+      is(frames.querySelectorAll(".dbg-stackframe").length, 1,
+        "Correct number of frames.");
+      ok(frames.querySelector("#stackframe-0 .dbg-stackframe-details")
+         .getAttribute("value").search(/js/),
+         "First frame should be a JS frame.");
+
+      waitForCaretPos(6, testToggleOnPause);
+    });
+
+    // This will cause the breakpoint to be hit, and put us back in the paused
+    // stated.
+    executeSoon(function() {
+      gDebuggee.binary_search([0, 2, 3, 5, 7, 10], 5);
+    });
+  });
+}
+
+function testToggleOnPause() {
+  gDebugger.addEventListener("Debugger:SourceShown", function _onSourceShown(aEvent) {
+    gDebugger.removeEventListener("Debugger:SourceShown", _onSourceShown);
+
+    is(gDebugger.Prefs.sourceMapsEnabled, true,
+      "The source maps pref should have been set to true.");
+    is(gDebugger.DebuggerView.Options._showOriginalSourceItem.getAttribute("checked"),
+      "true", "Source maps should be enabled. ")
+
+    ok(aEvent.detail.url.indexOf(".coffee") != -1,
+       "The debugger should show the source mapped coffee script file.");
+    ok(aEvent.detail.url.indexOf(".js") == -1,
+       "The debugger should not show the generated js script file.");
+    ok(gDebugger.editor.getText().search(/isnt/) != -1,
+       "The debugger's editor should not have the coffee script source displayed.");
+    ok(gDebugger.editor.getText().search(/function/) == -1,
+       "The debugger's editor should have the JS source displayed.");
+
+    // Make sure that we have coffee script stack frames.
+    let frames = gDebugger.DebuggerView.StackFrames._container._list;
+    let childNodes = frames.childNodes;
+
+    is(frames.querySelectorAll(".dbg-stackframe").length, 1,
+      "Correct number of frames.");
+    ok(frames.querySelector("#stackframe-0 .dbg-stackframe-details")
+       .getAttribute("value").search(/coffee/),
+       "First frame should be a coffee script frame.");
+
+    waitForCaretPos(4, resumeAndFinish);
+  });
+
+  // Enable source maps.
+  gDebugger.DebuggerView.Options._showOriginalSourceItem.setAttribute("checked",
+                                                                      "true");
+  gDebugger.DebuggerView.Options._toggleShowOriginalSource();
+}
+
+function resumeAndFinish()
+{
+  let { activeThread } = gDebugger.DebuggerController;
+  activeThread.resume(function (aResponse) {
+    ok(!aResponse.error, "Shouldn't get an error resuming");
+    is(aResponse.type, "resumed", "Type should be 'resumed'");
+
+    closeDebuggerAndFinish();
+  });
+}
+
+function waitForCaretPos(number, callback)
+{
+  // Poll every few milliseconds until the source editor line is active.
+  let count = 0;
+  let intervalID = window.setInterval(function() {
+    info("count: " + count + " ");
+    if (++count > 50) {
+      ok(false, "Timed out while polling for the line.");
+      window.clearInterval(intervalID);
+      return closeDebuggerAndFinish();
+    }
+    if (gDebugger.DebuggerView.editor.getCaretPosition().line != number) {
+      return;
+    }
+    is(gDebugger.DebuggerView.editor.getCaretPosition().line, number,
+       "The right line is focused.")
+    // We got the source editor at the expected line, it's safe to callback.
+    window.clearInterval(intervalID);
+    callback();
+  }, 100);
+}
+
+registerCleanupFunction(function() {
+  Services.prefs.setBoolPref("devtools.debugger.source-maps-enabled", false);
+  removeTab(gTab);
+  gPane = null;
+  gTab = null;
+  gDebuggee = null;
+  gDebugger = null;
+  gPrevPref = null;
+});
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
index 80ce43d238e4..4b54e7f9a7e5 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
@@ -65,6 +65,12 @@
 <!ENTITY debuggerUI.showOnlyEnum        "Show only enumerable properties">
 <!ENTITY debuggerUI.showOnlyEnum.key    "P">
 
+<!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
+  -  the checkbox that toggles the display of original or sourcemap-derived
+  -  sources. -->
+<!ENTITY debuggerUI.showOriginalSource      "Show original sources">
+<!ENTITY debuggerUI.showOriginalSource.key  "O">
+
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
   -  appears in the filter panel popup as a description. -->
 <!ENTITY debuggerUI.searchPanelTitle    "Operators">
diff --git a/toolkit/devtools/debugger/dbg-client.jsm b/toolkit/devtools/debugger/dbg-client.jsm
index 03f47948351d..bd567dd40186 100644
--- a/toolkit/devtools/debugger/dbg-client.jsm
+++ b/toolkit/devtools/debugger/dbg-client.jsm
@@ -486,6 +486,23 @@ DebuggerClient.prototype = {
     });
   },
 
+  /**
+   * Reconfigure a thread actor.
+   *
+   * @param boolean aUseSourceMaps
+   *        A flag denoting whether to use source maps or not.
+   * @param function aOnResponse
+   *        Called with the response packet.
+   */
+  reconfigureThread: function DC_reconfigureThread(aUseSourceMaps, aOnResponse) {
+    let packet = {
+      to: this.activeThread._actor,
+      type: "reconfigure",
+      options: { useSourceMaps: aUseSourceMaps }
+    };
+    this.request(packet, aOnResponse);
+  },
+
   /**
    * Release an object actor.
    *
diff --git a/toolkit/devtools/debugger/server/dbg-script-actors.js b/toolkit/devtools/debugger/server/dbg-script-actors.js
index efb59d4f1fb5..e60e4d62440f 100644
--- a/toolkit/devtools/debugger/server/dbg-script-actors.js
+++ b/toolkit/devtools/debugger/server/dbg-script-actors.js
@@ -253,6 +253,18 @@ ThreadActor.prototype = {
     };
   },
 
+  onReconfigure: function TA_onReconfigure(aRequest) {
+    if (this.state == "exited") {
+      return { error: "wrongState" };
+    }
+
+    update(this._options, aRequest.options || {});
+    // Clear existing sources, so they can be recreated on next access.
+    this._sources = null;
+
+    return {};
+  },
+
   /**
    * Pause the debuggee, by entering a nested event loop, and return a 'paused'
    * packet to the client.
@@ -1281,6 +1293,7 @@ ThreadActor.prototype = {
 ThreadActor.prototype.requestTypes = {
   "attach": ThreadActor.prototype.onAttach,
   "detach": ThreadActor.prototype.onDetach,
+  "reconfigure": ThreadActor.prototype.onReconfigure,
   "resume": ThreadActor.prototype.onResume,
   "clientEvaluate": ThreadActor.prototype.onClientEvaluate,
   "frames": ThreadActor.prototype.onFrames,

From 093dfd766beee8a48306a229378ae43d720bac43 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Wed, 17 Apr 2013 12:53:15 -0400
Subject: [PATCH 403/438] Bug 862500 - Properly shutdown profiler in xpcshell,
 shutdown and error cases. r=snorp

--HG--
extra : rebase_source : 8b887475b97e3562ca5fd73e93eaa9edab8ef1fb
---
 toolkit/xre/nsAppRunner.cpp      |  8 ++------
 toolkit/xre/nsEmbedFunctions.cpp |  2 +-
 tools/profiler/GeckoProfiler.h   | 10 ++++++++++
 tools/profiler/platform-linux.cc |  6 ++++++
 tools/profiler/platform-macos.cc |  6 ++++++
 tools/profiler/platform-win32.cc |  6 ++++++
 tools/profiler/platform.cpp      | 13 +++++++++++++
 xpcom/build/nsXPComInit.cpp      |  2 ++
 8 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 661ebcaebae2..77d572bb8126 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3894,7 +3894,7 @@ XREMain::XRE_mainRun()
 int
 XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 {
-  profiler_init();
+  GeckoProfilerInitRAII profilerGuard;
   PROFILER_LABEL("Startup", "XRE_Main");
 
   nsresult rv = NS_OK;
@@ -3995,7 +3995,6 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
     MOZ_gdk_display_close(mGdkDisplay);
 #endif
 
-    profiler_shutdown();
     rv = LaunchChild(mNativeApp, true);
 
 #ifdef MOZ_CRASHREPORTER
@@ -4018,8 +4017,6 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 
   XRE_DeinitCommandLine();
 
-  profiler_shutdown();
-
   return NS_FAILED(rv) ? 1 : 0;
 }
 
@@ -4092,7 +4089,7 @@ public:
 int
 XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
 {
-  profiler_init();
+  GeckoProfilerInitRAII profilerGuard;
   PROFILER_LABEL("Startup", "XRE_Main");
 
   nsresult rv = NS_OK;
@@ -4133,7 +4130,6 @@ XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
   // thread that called XRE_metroStartup.
   NS_ASSERTION(!xreMainPtr->mScopedXPCom,
                "XPCOM Shutdown hasn't occured, and we are exiting.");
-  profiler_shutdown();
   return 0;
 }
 
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index d1941620f39c..b64f76d90e8c 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -282,7 +282,7 @@ XRE_InitChildProcess(int aArgc,
   NS_ENSURE_ARG_MIN(aArgc, 2);
   NS_ENSURE_ARG_POINTER(aArgv);
   NS_ENSURE_ARG_POINTER(aArgv[0]);
-  profiler_init();
+  GeckoProfilerInitRAII profilerGuard;
   PROFILER_LABEL("Startup", "XRE_InitChildProcess");
 
   sChildProcessType = aProcess;
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 9c2507a71dad..7e40705d001b 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -148,4 +148,14 @@ static inline void profiler_js_operation_callback() {}
 
 #endif
 
+class GeckoProfilerInitRAII {
+public:
+  GeckoProfilerInitRAII() {
+    profiler_init();
+  }
+  ~GeckoProfilerInitRAII() {
+    profiler_shutdown();
+  }
+};
+
 #endif // ifndef SAMPLER_H
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index 8570e1e60158..ae8e02417970 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -360,6 +360,9 @@ void Sampler::Stop() {
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return false;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   ThreadInfo* info = new ThreadInfo(aName, gettid(),
@@ -387,6 +390,9 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = gettid();
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index ac338808da1a..f5d1d9ad5be4 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -355,6 +355,9 @@ pid_t gettid()
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return false;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   ThreadInfo* info = new ThreadInfo(aName, gettid(),
@@ -382,6 +385,9 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = gettid();
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index c63fc32cccba..ad4eef407802 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -263,6 +263,9 @@ void OS::Sleep(int milliseconds) {
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return false;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   ThreadInfo* info = new ThreadInfo(aName, GetCurrentThreadId(),
@@ -290,6 +293,9 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = GetCurrentThreadId();
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 80a317365be2..c0230f2d7a86 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -31,6 +31,7 @@ bool stack_key_initialized;
 TimeStamp   sLastTracerEvent; // is raced on
 int         sFrameNumber = 0;
 int         sLastFrameNumber = 0;
+int         sInitCount = 0; // Each init must have a matched shutdown.
 static bool sIsProfiling = false; // is raced on
 
 /* used to keep track of the last event that we sampled during */
@@ -63,6 +64,11 @@ void Sampler::Shutdown() {
 
   delete sRegisteredThreadsMutex;
   delete sRegisteredThreads;
+
+  // UnregisterThread can be called after shutdown in XPCShell. Thus
+  // we need to point to null to ignore such a call after shutdown.
+  sRegisteredThreadsMutex = nullptr;
+  sRegisteredThreads = nullptr;
 }
 
 ThreadInfo::~ThreadInfo() {
@@ -243,6 +249,8 @@ void read_profiler_env_vars()
 
 void mozilla_sampler_init()
 {
+  sInitCount++;
+
   if (stack_key_initialized)
     return;
 
@@ -306,6 +314,11 @@ void mozilla_sampler_init()
 
 void mozilla_sampler_shutdown()
 {
+  sInitCount--;
+
+  if (sInitCount > 0)
+    return;
+
   // Save the profile on shutdown if requested.
   TableTicker *t = tlsTicker.get();
   if (t) {
diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index ec8afdbf1c67..b9bd79fa1a1c 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -733,6 +733,8 @@ ShutdownXPCOM(nsIServiceManager* servMgr)
 
     NS_LogTerm();
 
+    profiler_shutdown();
+
     return NS_OK;
 }
 

From efe4d8a5a5fd0c764c9e071c80de10d18137ff3e Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 18 Apr 2013 01:21:46 -0400
Subject: [PATCH 404/438] Bug 862113.  Fix test for CSS2 pseudo-elements to not
 trigger assertions.  r=dholbert

---
 layout/style/crashtests/862113.html     | 16 ++++++++++++++++
 layout/style/crashtests/crashtests.list |  1 +
 layout/style/nsComputedDOMStyle.cpp     |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 layout/style/crashtests/862113.html

diff --git a/layout/style/crashtests/862113.html b/layout/style/crashtests/862113.html
new file mode 100644
index 000000000000..319132b78332
--- /dev/null
+++ b/layout/style/crashtests/862113.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+
+function boom()
+{
+  window.getComputedStyle(document.documentElement, ":foo");
+}
+
+</script>
+</head>
+
+<body onload="boom();"></body>
+</html>
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
index 9990fffc7783..b1ab155892d9 100644
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -89,3 +89,4 @@ load 822766-1.html
 load 827591-1.html
 load 840898.html
 load 842134.html
+load 862113.html
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 0c9d5b9e02a9..0523fb56a7f8 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -116,7 +116,8 @@ nsComputedDOMStyle::nsComputedDOMStyle(dom::Element* aElement,
 
     // There aren't any non-CSS2 pseudo-elements with a single ':'
     if (!haveTwoColons &&
-        !nsCSSPseudoElements::IsCSS2PseudoElement(mPseudo)) {
+        (!nsCSSPseudoElements::IsPseudoElement(mPseudo) ||
+         !nsCSSPseudoElements::IsCSS2PseudoElement(mPseudo))) {
       // XXXbz I'd really rather we threw an exception or something, but
       // the DOM spec sucks.
       mPseudo = nullptr;

From 5508e4bd90150f859f8a3ee27ac66e8604543b82 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 18 Apr 2013 01:21:46 -0400
Subject: [PATCH 405/438] Bug 862610.  When we have named constructors, make
 sure we managed to set up an interface object before looking for them. 
 r=peterv

---
 dom/bindings/Codegen.py                 |  3 +++
 dom/bindings/crashtests/862610.html     | 20 ++++++++++++++++++++
 dom/bindings/crashtests/crashtests.list |  1 +
 3 files changed, 24 insertions(+)
 create mode 100644 dom/bindings/crashtests/862610.html

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 245fbce9431c..800ab4f78f8a 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -1786,6 +1786,9 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
     def definition_body(self):
         if len(self.descriptor.interface.namedConstructors) > 0:
             getConstructor = """  JSObject* interfaceObject = GetConstructorObject(aCx, aGlobal);
+  if (!interfaceObject) {
+    return nullptr;
+  }
   for (unsigned slot = DOM_INTERFACE_SLOTS_BASE; slot < JSCLASS_RESERVED_SLOTS(&InterfaceObjectClass.mBase); ++slot) {
     JSObject* constructor = &js::GetReservedSlot(interfaceObject, slot).toObject();
     if (JS_GetFunctionId(JS_GetObjectFunction(constructor)) == JSID_TO_STRING(id)) {
diff --git a/dom/bindings/crashtests/862610.html b/dom/bindings/crashtests/862610.html
new file mode 100644
index 000000000000..1426ff4a6ad8
--- /dev/null
+++ b/dom/bindings/crashtests/862610.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+  HTMLElement.prototype.__proto__ = Proxy.create({}, {});
+  try {
+    window.Image;
+  } finally {
+    // Restore our prototype so the test harnesses can deal with us
+    // We can't just assign to __proto__ because it lives on our proto chain
+    // and we messed that up.
+    var desc = Object.getOwnPropertyDescriptor(Object.prototype, "__proto__");
+    desc.set.call(HTMLElement.prototype, Element.prototype);
+  }
+</script>
+</head>
+
+<body></body>
+</html>
diff --git a/dom/bindings/crashtests/crashtests.list b/dom/bindings/crashtests/crashtests.list
index ea8e158fbc70..7cb12fd15d03 100644
--- a/dom/bindings/crashtests/crashtests.list
+++ b/dom/bindings/crashtests/crashtests.list
@@ -4,3 +4,4 @@ load 822340-2.html
 load 832899.html
 load 860591.html
 load 860551.html
+load 862610.html

From e6860e379acb940ede55dd4c1b17fa240e8d2f4d Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Wed, 17 Apr 2013 23:23:33 -0700
Subject: [PATCH 406/438] Back out 248daf8c6362 (bug 852915) for Win7
 mochitest-1 orange

---
 content/media/wmf/WMFDecoder.cpp | 29 +++------------------------
 content/media/wmf/WMFDecoder.h   |  4 ----
 content/media/wmf/WMFReader.cpp  | 34 ++++++--------------------------
 widget/windows/WinUtils.cpp      | 17 ----------------
 widget/windows/WinUtils.h        |  4 ----
 5 files changed, 9 insertions(+), 79 deletions(-)

diff --git a/content/media/wmf/WMFDecoder.cpp b/content/media/wmf/WMFDecoder.cpp
index 9674b430cacc..2cc08433e253 100644
--- a/content/media/wmf/WMFDecoder.cpp
+++ b/content/media/wmf/WMFDecoder.cpp
@@ -21,27 +21,6 @@ MediaDecoderStateMachine* WMFDecoder::CreateStateMachine()
   return new MediaDecoderStateMachine(this, new WMFReader(this));
 }
 
-/* static */
-bool
-WMFDecoder::IsMP3Supported()
-{
-  if (!MediaDecoder::IsWMFEnabled()) {
-    return false;
-  }
-  if (WinUtils::GetWindowsVersion() != WinUtils::WIN7_VERSION) {
-    return true;
-  }
-  // We're on Windows 7. MP3 support is disabled if no service pack
-  // is installed, as it's crashy on Win7 SP0.
-  UINT spMajorVer = 0, spMinorVer = 0;
-  if (!WinUtils::GetWindowsServicePackVersion(spMajorVer, spMinorVer)) {
-    // Um... We can't determine the service pack version... Just block
-    // MP3 as a precaution...
-    return false;
-  }
-  return spMajorVer != 0;
-}
-
 bool
 WMFDecoder::GetSupportedCodecs(const nsACString& aType,
                                char const *const ** aCodecList)
@@ -51,15 +30,13 @@ WMFDecoder::GetSupportedCodecs(const nsACString& aType,
     return false;
 
   // Assume that if LoadDLLs() didn't fail, we can playback the types that
-  // we know should be supported by Windows Media Foundation.
+  // we know should be supported on Windows 7+ using WMF.
   static char const *const mp3AudioCodecs[] = {
     "mp3",
     nullptr
   };
-  if ((aType.EqualsASCII("audio/mpeg") || aType.EqualsASCII("audio/mp3")) &&
-      IsMP3Supported()) {
-    // Note: We block MP3 playback on Window 7 SP0 since it seems to crash
-    // in some circumstances.
+  if (aType.EqualsASCII("audio/mpeg") ||
+      aType.EqualsASCII("audio/mp3")) {
     if (aCodecList) {
       *aCodecList = mp3AudioCodecs;
     }
diff --git a/content/media/wmf/WMFDecoder.h b/content/media/wmf/WMFDecoder.h
index 3847b67b0ff0..87a3fb4ac462 100644
--- a/content/media/wmf/WMFDecoder.h
+++ b/content/media/wmf/WMFDecoder.h
@@ -42,10 +42,6 @@ public:
   // Returns true if the WMF backend is preffed on, and we're running on a
   // version of Windows which is likely to support WMF.
   static bool IsEnabled();
-
-  // Returns true if MP3 decoding is enabled on this system. We block
-  // MP3 playback on Windows 7 SP0, since it's crashy on that platform.
-  static bool IsMP3Supported();
 };
 
 } // namespace mozilla
diff --git a/content/media/wmf/WMFReader.cpp b/content/media/wmf/WMFReader.cpp
index 8b112ef5685e..b9317a2ea021 100644
--- a/content/media/wmf/WMFReader.cpp
+++ b/content/media/wmf/WMFReader.cpp
@@ -388,28 +388,6 @@ WMFReader::ConfigureVideoDecoder()
   return S_OK;
 }
 
-static void
-GetSupportedAudioCodecs(const GUID** aCodecs, uint32_t* aNumCodecs)
-{
-  MOZ_ASSERT(aCodecs);
-  MOZ_ASSERT(aNumCodecs);
-
-  if (WMFDecoder::IsMP3Supported()) {
-    static const GUID codecs[] = {
-      MFAudioFormat_AAC,
-      MFAudioFormat_MP3
-    };
-    *aCodecs = codecs;
-    *aNumCodecs = NS_ARRAY_LENGTH(codecs);
-  } else {
-    static const GUID codecs[] = {
-      MFAudioFormat_AAC
-    };
-    *aCodecs = codecs;
-    *aNumCodecs = NS_ARRAY_LENGTH(codecs);
-  }
-}
-
 HRESULT
 WMFReader::ConfigureAudioDecoder()
 {
@@ -421,15 +399,15 @@ WMFReader::ConfigureAudioDecoder()
     return S_OK;
   }
 
-  const GUID* codecs;
-  uint32_t numCodecs = 0;
-  GetSupportedAudioCodecs(&codecs, &numCodecs);
-
+  static const GUID MP4AudioTypes[] = {
+    MFAudioFormat_AAC,
+    MFAudioFormat_MP3
+  };
   HRESULT hr = ConfigureSourceReaderStream(mSourceReader,
                                            MF_SOURCE_READER_FIRST_AUDIO_STREAM,
                                            MFAudioFormat_Float,
-                                           codecs,
-                                           numCodecs);
+                                           MP4AudioTypes,
+                                           NS_ARRAY_LENGTH(MP4AudioTypes));
   if (FAILED(hr)) {
     NS_WARNING("Failed to configure WMF Audio decoder for PCM output");
     return hr;
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index 42f83026cf47..98ac5009ae2d 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -73,23 +73,6 @@ WinUtils::GetWindowsVersion()
   return static_cast<WinVersion>(version);
 }
 
-/* static */
-bool
-WinUtils::GetWindowsServicePackVersion(UINT& aOutMajor, UINT& aOutMinor)
-{
-  OSVERSIONINFOEX osInfo;
-  osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-  // This cast is safe and supposed to be here, don't worry
-  if (!::GetVersionEx((OSVERSIONINFO*)&osInfo)) {
-    return false;
-  }
-  
-  aOutMajor = osInfo.wServicePackMajor;
-  aOutMinor = osInfo.wServicePackMinor;
-
-  return true;
-}
-
 /* static */
 bool
 WinUtils::PeekMessage(LPMSG aMsg, HWND aWnd, UINT aFirstMessage,
diff --git a/widget/windows/WinUtils.h b/widget/windows/WinUtils.h
index b244cfe7b9d2..27c9aec7dd5e 100644
--- a/widget/windows/WinUtils.h
+++ b/widget/windows/WinUtils.h
@@ -49,10 +49,6 @@ public:
   };
   static WinVersion GetWindowsVersion();
 
-  // Retrieves the Service Pack version number.
-  // Returns true on success, false on failure.
-  static bool GetWindowsServicePackVersion(UINT& aOutMajor, UINT& aOutMinor);
-
   /**
    * PeekMessage() and GetMessage() are wrapper methods for PeekMessageW(),
    * GetMessageW(), ITfMessageMgr::PeekMessageW() and

From 8fd461d02388cebb0075051e9b6564a67dcad6d3 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 18 Apr 2013 09:14:38 +0200
Subject: [PATCH 407/438] Bug 859705 - Un-szip libraries before pushing them on
 the device for xpcshell tests. r=ted

---
 testing/testsuite-targets.mk            |  4 ++++
 testing/xpcshell/remotexpcshelltests.py | 30 ++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index cd45b5d4bc9c..cb7c965ff2b7 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -454,6 +454,10 @@ stage-jstests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/js/src/tests stage-package
 
 stage-android: make-stage-dir
+ifdef MOZ_ENABLE_SZIP
+# Tinderbox scripts are not unzipping everything, so the file needs to be in a directory it unzips
+	$(NSINSTALL) $(DIST)/host/bin/szip $(PKG_STAGE)/bin/host
+endif
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/sutAgentAndroid.apk $(PKG_STAGE)/bin
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/watcher/Watcher.apk $(PKG_STAGE)/bin
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/fencp/FenCP.apk $(PKG_STAGE)/bin
diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index 734ba519861a..e460b2e3ccf8 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -10,6 +10,8 @@ import runxpcshelltests as xpcshell
 import tempfile
 from automationutils import replaceBackSlashes
 import devicemanagerADB, devicemanagerSUT, devicemanager
+from zipfile import ZipFile
+import shutil
 
 here = os.path.dirname(os.path.abspath(__file__))
 
@@ -52,6 +54,8 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
             print >> sys.stderr, "Couldn't find local xpcshell test directory"
             sys.exit(1)
 
+        if options.localAPK:
+            self.localAPKContents = ZipFile(options.localAPK)
         if options.setup:
             self.setupUtilities()
             self.setupModules()
@@ -67,7 +71,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         packageName = None
         if self.options.localAPK:
             try:
-                packageName = subprocess.check_output(["unzip", "-p", self.options.localAPK, "package-name.txt"])
+                packageName = self.localAPKContents.read("package-name.txt")
                 if packageName:
                     self.appRoot = self.device.getAppRoot(packageName.strip())
             except Exception as detail:
@@ -129,6 +133,29 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.pushLibs()
 
     def pushLibs(self):
+        if self.options.localAPK:
+            try:
+                dir = tempfile.mkdtemp()
+                szip = os.path.join(self.localBin, '..', 'host', 'bin', 'szip')
+                if not os.path.exists(szip):
+                    # Tinderbox builds must run szip from the test package
+                    szip = os.path.join(self.localBin, 'host', 'szip')
+                if not os.path.exists(szip):
+                    # If the test package doesn't contain szip, it means files
+                    # are not szipped in the test package.
+                    szip = None
+                for info in self.localAPKContents.infolist():
+                    if info.filename.endswith(".so"):
+                        print >> sys.stderr, "Pushing %s.." % info.filename
+                        remoteFile = self.remoteJoin(self.remoteBinDir, info.filename)
+                        self.localAPKContents.extract(info, dir)
+                        file = os.path.join(dir, info.filename)
+                        if szip:
+                            out = subprocess.check_output([szip, '-d', file], stderr=subprocess.STDOUT)
+                        self.device.pushFile(os.path.join(dir, info.filename), remoteFile)
+            finally:
+                shutil.rmtree(dir)
+
         for file in os.listdir(self.localLib):
             if (file.endswith(".so")):
                 print >> sys.stderr, "Pushing %s.." % file
@@ -143,6 +170,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
             for root, dirs, files in os.walk(localArmLib):
                 for file in files:
                     if (file.endswith(".so")):
+                        print >> sys.stderr, "Pushing %s.." % file
                         remoteFile = self.remoteJoin(self.remoteBinDir, file)
                         self.device.pushFile(os.path.join(root, file), remoteFile)
 

From d1d7cb4cbed74bd3f4487738e6f58c510eef127e Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 18 Apr 2013 09:15:13 +0200
Subject: [PATCH 408/438] Bug 848764 - Enable on-demand decompression.
 r=blassey

---
 configure.in               | 5 +++--
 mobile/android/confvars.sh | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 2e0cea550412..cd002a093249 100644
--- a/configure.in
+++ b/configure.in
@@ -2484,8 +2484,6 @@ AC_SUBST(MOZ_LINKER)
 if test -n "$MOZ_LINKER"; then
   AC_DEFINE(MOZ_LINKER)
 fi
-AC_SUBST(MOZ_ENABLE_SZIP)
-AC_SUBST(MOZ_SZIP_FLAGS)
 
 dnl Only one oddball right now (QNX), but this gives us flexibility
 dnl if any other platforms need to override this in the future.
@@ -8916,6 +8914,9 @@ AC_SUBST(LIBJPEG_TURBO_ARM_ASM)
 AC_SUBST(MOZ_PACKAGE_JSSHELL)
 AC_SUBST(MOZ_FOLD_LIBS)
 
+AC_SUBST(MOZ_ENABLE_SZIP)
+AC_SUBST(MOZ_SZIP_FLAGS)
+
 AC_MSG_CHECKING([for posix_fallocate])
 AC_TRY_LINK([#define _XOPEN_SOURCE 600
   #include <fcntl.h>],
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 5d9c60031028..ef4fdd7dfc6f 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -54,4 +54,6 @@ MOZ_APP_STATIC_INI=1
 
 MOZ_FENNEC=1
 
+MOZ_ENABLE_SZIP=1
+
 MOZ_FOLD_LIBS=1

From 44dd94849445ceb296d60fbe6c3fe16ebd779f30 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 18 Apr 2013 11:13:10 +0200
Subject: [PATCH 409/438] Disable on-demand decompression (bug 848764)

---
 mobile/android/confvars.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index ef4fdd7dfc6f..5d9c60031028 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -54,6 +54,4 @@ MOZ_APP_STATIC_INI=1
 
 MOZ_FENNEC=1
 
-MOZ_ENABLE_SZIP=1
-
 MOZ_FOLD_LIBS=1

From 47bf8f7b4094c8f960ad3325b2e91ac8845ed01d Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Thu, 18 Apr 2013 03:04:13 -0700
Subject: [PATCH 410/438] Bug 863185 - Define variable in order to use it,
 r=dburns

---
 testing/marionette/marionette-actors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/marionette/marionette-actors.js b/testing/marionette/marionette-actors.js
index b589072a2a51..98572c732a92 100644
--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -262,7 +262,7 @@ MarionetteDriverActor.prototype = {
             default:
               break;
           }
-          code = error.hasOwnProperty('code') ? e.code : 500;
+          let code = error.hasOwnProperty('code') ? e.code : 500;
           this.sendError(error.toString(), code, error.stack, commandId);
         }
       }

From 856ff05efe24ae7c4d3ffb07053ca49bdaf4b75f Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Thu, 18 Apr 2013 07:40:08 -0400
Subject: [PATCH 411/438] Bug 862520 - Disable quickCheckAPI-B2.html on Windows
 XP. r=jgilbert

---
 content/canvas/test/webgl/skipped_tests_winxp.txt           | 1 +
 .../test/webgl/test_webgl_conformance_test_suite.html       | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 content/canvas/test/webgl/skipped_tests_winxp.txt

diff --git a/content/canvas/test/webgl/skipped_tests_winxp.txt b/content/canvas/test/webgl/skipped_tests_winxp.txt
new file mode 100644
index 000000000000..acd3034f978e
--- /dev/null
+++ b/content/canvas/test/webgl/skipped_tests_winxp.txt
@@ -0,0 +1 @@
+conformance/more/conformance/quickCheckAPI-B2.html
\ No newline at end of file
diff --git a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
index 8e151f41b664..9cebad3b333c 100644
--- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@@ -499,6 +499,12 @@ function start() {
                       .split('\n');
   }
 
+  if (kIsWindows && !kIsWindowsVistaOrHigher) {
+    var testsToSkip = loadTextFileSynchronous('skipped_tests_winxp.txt')
+                      .replace(/\r/g, '') // convert to unix line breaks
+                      .split('\n');
+  }
+
   runTestSuite();
 }
 

From 4704d8b6c1aea11c350e1a9c1b19c6f367a0ed3b Mon Sep 17 00:00:00 2001
From: Sudheera Palihakkara <catchsudheera@gmail.com>
Date: Thu, 18 Apr 2013 07:40:09 -0400
Subject: [PATCH 412/438] Bug 327598 - Set the return value of RemoveElementAt
 to void instead of bool. r=Neil

---
 xpcom/glue/nsVoidArray.cpp | 28 +++++++++++++---------------
 xpcom/glue/nsVoidArray.h   |  8 ++++----
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/xpcom/glue/nsVoidArray.cpp b/xpcom/glue/nsVoidArray.cpp
index 9010e7e1a745..60bddbfc7726 100644
--- a/xpcom/glue/nsVoidArray.cpp
+++ b/xpcom/glue/nsVoidArray.cpp
@@ -567,14 +567,13 @@ bool nsVoidArray::MoveElement(int32_t aFrom, int32_t aTo)
   return true;
 }
 
-bool nsVoidArray::RemoveElementsAt(int32_t aIndex, int32_t aCount)
+void nsVoidArray::RemoveElementsAt(int32_t aIndex, int32_t aCount)
 {
   int32_t oldCount = Count();
   NS_ASSERTION(aIndex >= 0,"RemoveElementsAt(negative index)");
   if (uint32_t(aIndex) >= uint32_t(oldCount))
   {
-    // An invalid index causes the replace to fail
-    return false;
+    return;
   }
   // Limit to available entries starting at aIndex
   if (aCount + aIndex > oldCount)
@@ -589,14 +588,17 @@ bool nsVoidArray::RemoveElementsAt(int32_t aIndex, int32_t aCount)
   }
 
   mImpl->mCount -= aCount;
-  return true;
+  return;
 }
 
 bool nsVoidArray::RemoveElement(void* aElement)
 {
   int32_t theIndex = IndexOf(aElement);
   if (theIndex != -1)
-    return RemoveElementAt(theIndex);
+  {
+    RemoveElementAt(theIndex);
+    return true;
+  }
 
   return false;
 }
@@ -897,23 +899,21 @@ nsSmallVoidArray::RemoveElement(void* aElement)
   return AsArray()->RemoveElement(aElement);
 }
 
-bool
+void
 nsSmallVoidArray::RemoveElementAt(int32_t aIndex)
 {
   if (HasSingle()) {
     if (aIndex == 0) {
       mImpl = nullptr;
-
-      return true;
     }
     
-    return false;
+    return;
   }
 
-  return AsArray()->RemoveElementAt(aIndex);
+  AsArray()->RemoveElementAt(aIndex);
 }
 
-bool
+void
 nsSmallVoidArray::RemoveElementsAt(int32_t aIndex, int32_t aCount)
 {
   if (HasSingle()) {
@@ -921,14 +921,12 @@ nsSmallVoidArray::RemoveElementsAt(int32_t aIndex, int32_t aCount)
       if (aCount > 0) {
         mImpl = nullptr;
       }
-
-      return true;
     }
 
-    return false;
+    return;
   }
 
-  return AsArray()->RemoveElementsAt(aIndex, aCount);
+  AsArray()->RemoveElementsAt(aIndex, aCount);
 }
 
 void
diff --git a/xpcom/glue/nsVoidArray.h b/xpcom/glue/nsVoidArray.h
index 672f051d9fec..78193bc50eb1 100644
--- a/xpcom/glue/nsVoidArray.h
+++ b/xpcom/glue/nsVoidArray.h
@@ -90,8 +90,8 @@ public:
   }
 
   bool RemoveElement(void* aElement);
-  bool RemoveElementsAt(int32_t aIndex, int32_t aCount);
-  bool RemoveElementAt(int32_t aIndex) { return RemoveElementsAt(aIndex,1); }
+  void RemoveElementsAt(int32_t aIndex, int32_t aCount);
+  void RemoveElementAt(int32_t aIndex) { return RemoveElementsAt(aIndex,1); }
 
   void   Clear();
 
@@ -210,8 +210,8 @@ public:
     return InsertElementsAt(aElements, Count());
   }
   bool RemoveElement(void* aElement);
-  bool RemoveElementsAt(int32_t aIndex, int32_t aCount);
-  bool RemoveElementAt(int32_t aIndex);
+  void RemoveElementsAt(int32_t aIndex, int32_t aCount);
+  void RemoveElementAt(int32_t aIndex);
 
   void Clear();
   bool SizeTo(int32_t aMin);

From bd278720eaea0bfd72f0674912e1b7bef3d06427 Mon Sep 17 00:00:00 2001
From: Cykesiopka <cykesiopka@hotmail.com>
Date: Thu, 18 Apr 2013 07:40:09 -0400
Subject: [PATCH 413/438] Bug 530352 - Remove last nsIFileSpec comment. r=vlad

---
 widget/xpwidgets/nsTransferable.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp
index 32b88b06d5b5..2f15f4727962 100644
--- a/widget/xpwidgets/nsTransferable.cpp
+++ b/widget/xpwidgets/nsTransferable.cpp
@@ -52,9 +52,6 @@ uint32_t GetDataForFlavor (const nsTArray<DataStruct>& aArray,
 DataStruct::~DataStruct() 
 { 
   if (mCacheFileName) nsCRT::free(mCacheFileName); 
-
-    //nsIFileSpec * cacheFile = GetFileSpec(mCacheFileName);
-    //cacheFile->Remove();
 }
 
 //-------------------------------------------------------------------------

From 8e4e3ebabe7a06dcb3f59662673d2a7e4d306dae Mon Sep 17 00:00:00 2001
From: Andres Hernandez <andres@appcoast.com>
Date: Wed, 17 Apr 2013 17:47:28 +0800
Subject: [PATCH 414/438] Bug 854288 - Remove
 PlaceUtils.restoreBookmarksFromJSONFile in PlacesUtils.jsm. r=mak

---
 toolkit/components/places/PlacesUtils.jsm | 188 +---------------------
 1 file changed, 4 insertions(+), 184 deletions(-)

diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index acce15831a17..6c933c7bb3e2 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -1162,121 +1162,6 @@ this.PlacesUtils = {
     return urls;
   },
 
-  /**
-   * Import bookmarks from a JSON string.
-   * Note: any item annotated with "places/excludeFromBackup" won't be removed
-   *       before executing the restore.
-   * 
-   * @param aString
-   *        JSON string of serialized bookmark data.
-   * @param aReplace
-   *        Boolean if true, replace existing bookmarks, else merge.
-   */
-  restoreBookmarksFromJSONString:
-  function PU_restoreBookmarksFromJSONString(aString, aReplace) {
-    // convert string to JSON
-    var nodes = this.unwrapNodes(aString, this.TYPE_X_MOZ_PLACE_CONTAINER);
-
-    if (nodes.length == 0 || !nodes[0].children ||
-        nodes[0].children.length == 0)
-      return; // nothing to restore
-
-    // ensure tag folder gets processed last
-    nodes[0].children.sort(function sortRoots(aNode, bNode) {
-      return (aNode.root && aNode.root == "tagsFolder") ? 1 :
-              (bNode.root && bNode.root == "tagsFolder") ? -1 : 0;
-    });
-
-    var batch = {
-      nodes: nodes[0].children,
-      runBatched: function restore_runBatched() {
-        if (aReplace) {
-          // Get roots excluded from the backup, we will not remove them
-          // before restoring.
-          var excludeItems = PlacesUtils.annotations.getItemsWithAnnotation(
-            PlacesUtils.EXCLUDE_FROM_BACKUP_ANNO
-          );
-          // delete existing children of the root node, excepting:
-          // 1. special folders: delete the child nodes
-          // 2. tags folder: untag via the tagging api
-          var query = PlacesUtils.history.getNewQuery();
-          query.setFolders([PlacesUtils.placesRootId], 1);
-          var options = PlacesUtils.history.getNewQueryOptions();
-          options.expandQueries = false;
-          var root = PlacesUtils.history.executeQuery(query, options).root;
-          root.containerOpen = true;
-          var childIds = [];
-          for (var i = 0; i < root.childCount; i++) {
-            var childId = root.getChild(i).itemId;
-            if (excludeItems.indexOf(childId) == -1 &&
-                childId != PlacesUtils.tagsFolderId)
-              childIds.push(childId);
-          }
-          root.containerOpen = false;
-
-          for (var i = 0; i < childIds.length; i++) {
-            var rootItemId = childIds[i];
-            if (PlacesUtils.isRootItem(rootItemId))
-              PlacesUtils.bookmarks.removeFolderChildren(rootItemId);
-            else
-              PlacesUtils.bookmarks.removeItem(rootItemId);
-          }
-        }
-
-        var searchIds = [];
-        var folderIdMap = [];
-
-        this.nodes.forEach(function(node) {
-          if (!node.children || node.children.length == 0)
-            return; // nothing to restore for this root
-
-          if (node.root) {
-            var container = this.placesRootId; // default to places root
-            switch (node.root) {
-              case "bookmarksMenuFolder":
-                container = this.bookmarksMenuFolderId;
-                break;
-              case "tagsFolder":
-                container = this.tagsFolderId;
-                break;
-              case "unfiledBookmarksFolder":
-                container = this.unfiledBookmarksFolderId;
-                break;
-              case "toolbarFolder":
-                container = this.toolbarFolderId;
-                break;
-            }
- 
-            // insert the data into the db
-            node.children.forEach(function(child) {
-              var index = child.index;
-              var [folders, searches] = this.importJSONNode(child, container, index, 0);
-              for (var i = 0; i < folders.length; i++) {
-                if (folders[i])
-                  folderIdMap[i] = folders[i];
-              }
-              searchIds = searchIds.concat(searches);
-            }, this);
-          }
-          else {
-            this.importJSONNode(node, this.placesRootId, node.index, 0);
-          }
-        }, PlacesUtils);
-
-        // fixup imported place: uris that contain folders
-        searchIds.forEach(function(aId) {
-          var oldURI = this.bookmarks.getBookmarkURI(aId);
-          var uri = this._fixupQuery(this.bookmarks.getBookmarkURI(aId),
-                                     folderIdMap);
-          if (!uri.equals(oldURI))
-            this.bookmarks.changeBookmarkURI(aId, uri);
-        }, PlacesUtils);
-      }
-    };
-
-    this.bookmarks.runInBatchMode(batch, null);
-  },
-
   /**
    * Takes a JSON-serialized node and inserts it into the db.
    *
@@ -1422,25 +1307,6 @@ this.PlacesUtils = {
     return [folderIdMap, searchIds];
   },
 
-  /**
-   * Replaces imported folder ids with their local counterparts in a place: URI.
-   *
-   * @param   aURI
-   *          A place: URI with folder ids.
-   * @param   aFolderIdMap
-   *          An array mapping old folder id to new folder ids.
-   * @returns the fixed up URI if all matched. If some matched, it returns
-   *          the URI with only the matching folders included. If none matched it
-   *          returns the input URI unchanged.
-   */
-  _fixupQuery: function PU__fixupQuery(aQueryURI, aFolderIdMap) {
-    function convert(str, p1, offset, s) {
-      return "folder=" + aFolderIdMap[p1];
-    }
-    var stringURI = aQueryURI.spec.replace(/folder=([0-9]+)/g, convert);
-    return this._uri(stringURI);
-  },
-
   /**
    * Serializes the given node (and all its descendents) as JSON
    * and writes the serialization to the given output stream.
@@ -1653,13 +1519,6 @@ this.PlacesUtils = {
     }
   },
 
-  /**
-   * Serialize a JS object to JSON
-   */
-  toJSONString: function PU_toJSONString(aObj) {
-    return JSON.stringify(aObj);
-  },
-
   /**
    * Restores bookmarks and tags from a JSON file.
    * WARNING: This method *removes* any bookmarks in the collection before
@@ -1670,50 +1529,11 @@ this.PlacesUtils = {
    */
   restoreBookmarksFromJSONFile:
   function PU_restoreBookmarksFromJSONFile(aFile) {
-    const RESTORE_NSIOBSERVER_DATA = "json";
+    Deprecated.warning(
+      "restoreBookmarksFromJSONFile is deprecated and will be removed in a future version",
+      "https://bugzilla.mozilla.org/show_bug.cgi?id=854388");
 
-    let failed = false;
-    Services.obs.notifyObservers(null,
-                                 this.TOPIC_BOOKMARKS_RESTORE_BEGIN,
-                                 RESTORE_NSIOBSERVER_DATA);
-
-    try {
-      // open file stream
-      var stream = Cc["@mozilla.org/network/file-input-stream;1"].
-                   createInstance(Ci.nsIFileInputStream);
-      stream.init(aFile, 0x01, 0, 0);
-      var converted = Cc["@mozilla.org/intl/converter-input-stream;1"].
-                      createInstance(Ci.nsIConverterInputStream);
-      converted.init(stream, "UTF-8", 8192,
-                     Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-
-      // read in contents
-      var str = {};
-      var jsonStr = "";
-      while (converted.readString(8192, str) != 0)
-        jsonStr += str.value;
-      converted.close();
-
-      if (jsonStr.length == 0)
-        return; // empty file
-
-      this.restoreBookmarksFromJSONString(jsonStr, true);
-    }
-    catch (exc) {
-      failed = true;
-      Services.obs.notifyObservers(null,
-                                   this.TOPIC_BOOKMARKS_RESTORE_FAILED,
-                                   RESTORE_NSIOBSERVER_DATA);
-      Cu.reportError("Bookmarks JSON restore failed: " + exc);
-      throw exc;
-    }
-    finally {
-      if (!failed) {
-        Services.obs.notifyObservers(null,
-                                     this.TOPIC_BOOKMARKS_RESTORE_SUCCESS,
-                                     RESTORE_NSIOBSERVER_DATA);
-      }
-    }
+    BookmarkJSONUtils.importFromFile(aFile, true);
   },
 
   /**

From 52fe922eaa725b2f73c132783bbb48dc98874336 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 18 Apr 2013 09:35:26 +0300
Subject: [PATCH 415/438] Bug 862435 - Tilt doesn't open if the Inspector was
 opened beforehand, r=dtownsend

---
 browser/devtools/tilt/TiltVisualizer.jsm      |  6 +-
 browser/devtools/tilt/test/Makefile.in        |  1 +
 .../test/browser_tilt_picking_inspector.js    | 61 +++++++++++++++++++
 3 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 browser/devtools/tilt/test/browser_tilt_picking_inspector.js

diff --git a/browser/devtools/tilt/TiltVisualizer.jsm b/browser/devtools/tilt/TiltVisualizer.jsm
index a7a30950a505..94fb6db3e2a2 100644
--- a/browser/devtools/tilt/TiltVisualizer.jsm
+++ b/browser/devtools/tilt/TiltVisualizer.jsm
@@ -80,6 +80,7 @@ this.TiltVisualizer = function TiltVisualizer(aProperties)
    * Save a reference to the top-level window.
    */
   this.chromeWindow = aProperties.chromeWindow;
+  this.tab = aProperties.tab;
 
   /**
    * The canvas element used for rendering the visualization.
@@ -99,8 +100,6 @@ this.TiltVisualizer = function TiltVisualizer(aProperties)
     aProperties.onError || null,
     aProperties.onLoad || null);
 
-  this.bindToInspector(aProperties.tab);
-
   /**
    * Visualization mouse and keyboard controller.
    */
@@ -110,11 +109,12 @@ this.TiltVisualizer = function TiltVisualizer(aProperties)
 TiltVisualizer.prototype = {
 
   /**
-   * Initializes the visualizer
+   * Initializes the visualizer.
    */
   init: function TV_init()
   {
     this.presenter.init();
+    this.bindToInspector(this.tab);
   },
 
   /**
diff --git a/browser/devtools/tilt/test/Makefile.in b/browser/devtools/tilt/test/Makefile.in
index ccce5deb80e2..cf3e6d35134b 100644
--- a/browser/devtools/tilt/test/Makefile.in
+++ b/browser/devtools/tilt/test/Makefile.in
@@ -41,6 +41,7 @@ MOCHITEST_BROWSER_FILES = \
 	browser_tilt_math06.js \
 	browser_tilt_math07.js \
 	browser_tilt_picking.js \
+	browser_tilt_picking_inspector.js \
 	browser_tilt_picking_delete.js \
 	browser_tilt_picking_highlight01-offs.js \
 	browser_tilt_picking_highlight01.js \
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_inspector.js b/browser/devtools/tilt/test/browser_tilt_picking_inspector.js
new file mode 100644
index 000000000000..5ee8d69ccdbe
--- /dev/null
+++ b/browser/devtools/tilt/test/browser_tilt_picking_inspector.js
@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+let presenter;
+
+function test() {
+  if (!isTiltEnabled()) {
+    info("Skipping highlight test because Tilt isn't enabled.");
+    return;
+  }
+  if (!isWebGLSupported()) {
+    info("Skipping highlight test because WebGL isn't supported.");
+    return;
+  }
+
+  waitForExplicitFinish();
+
+  createTab(function() {
+    let { TargetFactory } = Cu.import("resource:///modules/devtools/Target.jsm", {});
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+    gDevTools.showToolbox(target, "inspector").then(function(toolbox) {
+      let contentDocument = toolbox.target.tab.linkedBrowser.contentDocument;
+      let div = contentDocument.getElementById("first-law");
+      toolbox.getCurrentPanel().selection.setNode(div);
+
+      createTilt({
+        onTiltOpen: function(instance)
+        {
+          presenter = instance.presenter;
+          whenOpen();
+        }
+      }, false, function suddenDeath()
+      {
+        info("Tilt could not be initialized properly.");
+        cleanup();
+      });
+    });
+  });
+}
+
+function whenOpen() {
+  ok(presenter._currentSelection > 0,
+    "Highlighting a node didn't work properly.");
+  ok(!presenter._highlight.disabled,
+    "After highlighting a node, it should be highlighted. D'oh.");
+  ok(!presenter.controller.arcball._resetInProgress,
+    "Highlighting a node that's already visible shouldn't trigger a reset.");
+
+  executeSoon(function() {
+    Services.obs.addObserver(cleanup, DESTROYED, false);
+    Tilt.destroy(Tilt.currentWindowId);
+  });
+}
+
+function cleanup() {
+  Services.obs.removeObserver(cleanup, DESTROYED);
+  gBrowser.removeCurrentTab();
+  finish();
+}

From 70904684d140bf90875bc0061a94df57b086f785 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 18 Apr 2013 09:35:26 +0300
Subject: [PATCH 416/438] Bug 861783 - Removing watch expression of large
 object not possible via mouse, r=past

---
 browser/devtools/shared/widgets/VariablesView.jsm | 8 +++++---
 browser/devtools/shared/widgets/widgets.css       | 5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/browser/devtools/shared/widgets/VariablesView.jsm b/browser/devtools/shared/widgets/VariablesView.jsm
index d1c0a4a5989b..43f3267234a5 100644
--- a/browser/devtools/shared/widgets/VariablesView.jsm
+++ b/browser/devtools/shared/widgets/VariablesView.jsm
@@ -404,8 +404,8 @@ VariablesView.prototype = {
       return;
     }
     this._searchboxContainer.parentNode.removeChild(this._searchboxContainer);
-    this._searchboxNode.addEventListener("input", this._onSearchboxInput, false);
-    this._searchboxNode.addEventListener("keypress", this._onSearchboxKeyPress, false);
+    this._searchboxNode.removeEventListener("input", this._onSearchboxInput, false);
+    this._searchboxNode.removeEventListener("keypress", this._onSearchboxKeyPress, false);
 
     this._searchboxContainer = null;
     this._searchboxNode = null;
@@ -1543,7 +1543,9 @@ Scope.prototype = {
    * The click listener for this scope's title.
    */
   _onClick: function S__onClick(e) {
-    if (e.target == this._inputNode) {
+    if (e.target == this._inputNode ||
+        e.target == this._editNode ||
+        e.target == this._deleteNode) {
       return;
     }
     this.toggle();
diff --git a/browser/devtools/shared/widgets/widgets.css b/browser/devtools/shared/widgets/widgets.css
index 614e0cde6960..c7882e345190 100644
--- a/browser/devtools/shared/widgets/widgets.css
+++ b/browser/devtools/shared/widgets/widgets.css
@@ -36,6 +36,11 @@
   -moz-user-focus: normal;
 }
 
+.variables-view-scope > .title,
+.variable-or-property > .title {
+  overflow: hidden;
+}
+
 .variables-view-scope[non-header] > .title,
 .variable-or-property[non-header] > .title,
 .variable-or-property[non-match] > .title {

From 776cb9f6ef7593e6888a7f41de14e14f80c9f7f3 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 18 Apr 2013 09:35:27 +0300
Subject: [PATCH 417/438] Bug 859308 - Hide Blocked in Timings tab until we
 know what that's doing, r=rcampbell

---
 browser/devtools/netmonitor/netmonitor-view.js | 3 ++-
 browser/devtools/netmonitor/netmonitor.css     | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/devtools/netmonitor/netmonitor-view.js b/browser/devtools/netmonitor/netmonitor-view.js
index b2a2aeb7f5a3..273dd1ed9f84 100644
--- a/browser/devtools/netmonitor/netmonitor-view.js
+++ b/browser/devtools/netmonitor/netmonitor-view.js
@@ -540,7 +540,8 @@ create({ constructor: RequestsMenuView, proto: MenuContainer.prototype }, {
    */
   _createWaterfallView: function NVRM__createWaterfallView(aItem, aTimings) {
     let { target, attachment } = aItem;
-    let sections = ["blocked", "dns", "connect", "send", "wait", "receive"];
+    let sections = ["dns", "connect", "send", "wait", "receive"];
+    // Skipping "blocked" because it doesn't work yet.
 
     let timingsNode = $(".requests-menu-timings", target);
     let startCapNode = $(".requests-menu-timings-cap.start", timingsNode);
diff --git a/browser/devtools/netmonitor/netmonitor.css b/browser/devtools/netmonitor/netmonitor.css
index 75d14f856ad8..4eb682a1a184 100644
--- a/browser/devtools/netmonitor/netmonitor.css
+++ b/browser/devtools/netmonitor/netmonitor.css
@@ -7,6 +7,10 @@
   overflow: auto;
 }
 
+#timings-summary-blocked {
+  display: none; /* This doesn't work yet. */
+}
+
 /* Responsive sidebar */
 @media (max-width: 700px) {
   #details-pane-toggle,

From 439a4e45b573e923bb031fcab778c05f822e0396 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 18 Apr 2013 09:35:27 +0300
Subject: [PATCH 418/438] Bug 861487 - Sizes are displayed with non-localized
 decimal separator, r=rcampbell

---
 .../devtools/netmonitor/netmonitor-view.js    | 12 +++++----
 .../test/browser_net_content-type.js          |  4 +--
 .../netmonitor/test/browser_net_json-long.js  |  2 +-
 .../browser_net_simple-request-details.js     |  9 ++++---
 .../test/browser_net_status-codes.js          |  4 +--
 .../devtools/shared/widgets/ViewHelpers.jsm   | 26 +++++++++++++++++++
 6 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/browser/devtools/netmonitor/netmonitor-view.js b/browser/devtools/netmonitor/netmonitor-view.js
index 273dd1ed9f84..1b489ecf4159 100644
--- a/browser/devtools/netmonitor/netmonitor-view.js
+++ b/browser/devtools/netmonitor/netmonitor-view.js
@@ -505,7 +505,8 @@ create({ constructor: RequestsMenuView, proto: MenuContainer.prototype }, {
         break;
       }
       case "contentSize": {
-        let size = (aValue / 1024).toFixed(CONTENT_SIZE_DECIMALS);
+        let kb = aValue / 1024;
+        let size = L10N.numberWithDecimals(kb, CONTENT_SIZE_DECIMALS);
         let node = $(".requests-menu-size", aItem.target);
         let text = L10N.getFormatStr("networkMenu.sizeKB", size);
         node.setAttribute("value", text);
@@ -522,7 +523,7 @@ create({ constructor: RequestsMenuView, proto: MenuContainer.prototype }, {
       }
       case "totalTime": {
         let node = $(".requests-menu-timings-total", aItem.target);
-        let text = L10N.getFormatStr("networkMenu.totalMS", aValue);
+        let text = L10N.getFormatStr("networkMenu.totalMS", aValue); // integer
         node.setAttribute("value", text);
         node.setAttribute("tooltiptext", text);
         break;
@@ -880,9 +881,10 @@ create({ constructor: NetworkDetailsView, proto: MenuContainer.prototype }, {
    *        The message received from the server.
    */
   _addHeaders: function NVND__addHeaders(aName, aResponse) {
-    let kb = (aResponse.headersSize / 1024).toFixed(HEADERS_SIZE_DECIMALS);
-    let size = L10N.getFormatStr("networkMenu.sizeKB", kb);
-    let headersScope = this._headers.addScope(aName + " (" + size + ")");
+    let kb = aResponse.headersSize / 1024;
+    let size = L10N.numberWithDecimals(kb, HEADERS_SIZE_DECIMALS);
+    let text = L10N.getFormatStr("networkMenu.sizeKB", size);
+    let headersScope = this._headers.addScope(aName + " (" + text + ")");
     headersScope.expanded = true;
 
     for (let header of aResponse.headers) {
diff --git a/browser/devtools/netmonitor/test/browser_net_content-type.js b/browser/devtools/netmonitor/test/browser_net_content-type.js
index 82eb286ce95d..984ef119e6b2 100644
--- a/browser/devtools/netmonitor/test/browser_net_content-type.js
+++ b/browser/devtools/netmonitor/test/browser_net_content-type.js
@@ -48,7 +48,7 @@ function test() {
           statusText: "OK",
           type: "json",
           fullMimeType: "application/json; charset=utf-8",
-          size: L10N.getFormatStr("networkMenu.sizeKB", 0.03),
+          size: L10N.getFormatStr("networkMenu.sizeKB", 0.02),
           time: true
         });
       verifyRequestItemTarget(RequestsMenu.getItemAtIndex(4),
@@ -66,7 +66,7 @@ function test() {
           statusText: "OK",
           type: "png",
           fullMimeType: "image/png",
-          size: L10N.getFormatStr("networkMenu.sizeKB", 0.76),
+          size: L10N.getFormatStr("networkMenu.sizeKB", 0.75),
           time: true
         });
 
diff --git a/browser/devtools/netmonitor/test/browser_net_json-long.js b/browser/devtools/netmonitor/test/browser_net_json-long.js
index 613a3a1a978e..8aee0209e87b 100644
--- a/browser/devtools/netmonitor/test/browser_net_json-long.js
+++ b/browser/devtools/netmonitor/test/browser_net_json-long.js
@@ -25,7 +25,7 @@ function test() {
           statusText: "OK",
           type: "json",
           fullMimeType: "text/json; charset=utf-8",
-          size: L10N.getFormatStr("networkMenu.sizeKB", 83.96),
+          size: L10N.getFormatStr("networkMenu.sizeKB", 83.95),
           time: true
         });
 
diff --git a/browser/devtools/netmonitor/test/browser_net_simple-request-details.js b/browser/devtools/netmonitor/test/browser_net_simple-request-details.js
index 6cb6e2adb48a..d3b651fb1b37 100644
--- a/browser/devtools/netmonitor/test/browser_net_simple-request-details.js
+++ b/browser/devtools/netmonitor/test/browser_net_simple-request-details.js
@@ -73,14 +73,15 @@ function test() {
 
       is(responseScope.querySelector(".name").getAttribute("value"),
         L10N.getStr("responseHeaders") + " (" +
-        L10N.getFormatStr("networkMenu.sizeKB", "0.169") + ")",
+        L10N.getFormatStr("networkMenu.sizeKB", L10N.numberWithDecimals(0.168, 3)) + ")",
         "The response headers scope doesn't have the correct title.");
 
       ok(requestScope.querySelector(".name").getAttribute("value").contains(
-        L10N.getStr("requestHeaders") + " (0."),
-        // Can't test for full request headers title because the size may
-        // vary across platforms ("User-Agent" header differs).
+        L10N.getStr("requestHeaders") + " (0"),
         "The request headers scope doesn't have the correct title.");
+      // Can't test for full request headers title because the size may
+      // vary across platforms ("User-Agent" header differs). We're pretty
+      // sure it's smaller than 1 MB though, so it starts with a 0.
 
       is(responseScope.querySelectorAll(".variables-view-variable .name")[0].getAttribute("value"),
         "Connection", "The first response header name was incorrect.");
diff --git a/browser/devtools/netmonitor/test/browser_net_status-codes.js b/browser/devtools/netmonitor/test/browser_net_status-codes.js
index fcbae1a669b9..a3b8bfc74c45 100644
--- a/browser/devtools/netmonitor/test/browser_net_status-codes.js
+++ b/browser/devtools/netmonitor/test/browser_net_status-codes.js
@@ -24,7 +24,7 @@ function test() {
           statusText: "Switching Protocols",
           type: "plain",
           fullMimeType: "text/plain; charset=utf-8",
-          size: L10N.getFormatStr("networkMenu.sizeKB", "0.00"),
+          size: L10N.getFormatStr("networkMenu.sizeKB", 0),
           time: true
         });
       verifyRequestItemTarget(requestItems[1] = RequestsMenu.getItemAtIndex(1),
@@ -42,7 +42,7 @@ function test() {
           statusText: "See Other",
           type: "plain",
           fullMimeType: "text/plain; charset=utf-8",
-          size: L10N.getFormatStr("networkMenu.sizeKB", "0.00"),
+          size: L10N.getFormatStr("networkMenu.sizeKB", 0),
           time: true
         });
       verifyRequestItemTarget(requestItems[3] = RequestsMenu.getItemAtIndex(3),
diff --git a/browser/devtools/shared/widgets/ViewHelpers.jsm b/browser/devtools/shared/widgets/ViewHelpers.jsm
index bb681374a622..36da2c3ea2f2 100644
--- a/browser/devtools/shared/widgets/ViewHelpers.jsm
+++ b/browser/devtools/shared/widgets/ViewHelpers.jsm
@@ -201,6 +201,32 @@ ViewHelpers.L10N.prototype = {
    */
   getFormatStr: function L10N_getFormatStr(aName, ...aArgs) {
     return this.stringBundle.formatStringFromName(aName, aArgs, aArgs.length);
+  },
+
+  /**
+   * Converts a number to a locale-aware string format and keeps a certain
+   * number of decimals.
+   *
+   * @param number aNumber
+   *        The number to convert.
+   * @param number aDecimals [optional]
+   *        Total decimals to keep.
+   * @return string
+   *         The localized number as a string.
+   */
+  numberWithDecimals: function L10N__numberWithDecimals(aNumber, aDecimals = 0) {
+    // If this is an integer, don't do anything special.
+    if (aNumber == (aNumber | 0)) {
+      return aNumber;
+    }
+    // Remove {n} trailing decimals. Can't use toFixed(n) because
+    // toLocaleString converts the number to a string. Also can't use
+    // toLocaleString(, { maximumFractionDigits: n }) because it's not
+    // implemented on OS X (bug 368838). Gross.
+    let localized = aNumber.toLocaleString(); // localize
+    let padded = localized + new Array(aDecimals).join("0"); // pad with zeros
+    let match = padded.match("([^]*?\\d{" + aDecimals + "})\\d*$");
+    return match.pop();
   }
 };
 

From 0768d0e206fb447b1a588171a24625c3d15c2488 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 18 Apr 2013 09:35:27 +0300
Subject: [PATCH 419/438] Bug 862198 - Intermittent browser_net_json-long.js |
 Test timed out, found a tab, r=rcampbell

---
 browser/devtools/netmonitor/test/browser_net_json-long.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/devtools/netmonitor/test/browser_net_json-long.js b/browser/devtools/netmonitor/test/browser_net_json-long.js
index 8aee0209e87b..f97241fbd32c 100644
--- a/browser/devtools/netmonitor/test/browser_net_json-long.js
+++ b/browser/devtools/netmonitor/test/browser_net_json-long.js
@@ -11,7 +11,7 @@ function test() {
 
     // This is receiving over 80 KB of json and will populate over 6000 items
     // in a variables view instance. Debug builds are slow.
-    requestLongerTimeout(2);
+    requestLongerTimeout(3);
 
     let { document, L10N, SourceEditor, NetMonitorView } = aMonitor.panelWin;
     let { RequestsMenu } = NetMonitorView;

From 86e7a005560c7d6cd6e02ea513f9ec0aa858f482 Mon Sep 17 00:00:00 2001
From: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Date: Thu, 18 Apr 2013 14:18:45 +0200
Subject: [PATCH 420/438] Bug 859318 - Part 1: IDL changes for call waiting
 functions. r=sicking

---
 .../interfaces/nsIDOMMobileConnection.idl     | 31 +++++++++++++++++--
 .../nsIMobileConnectionProvider.idl           |  6 +++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/dom/network/interfaces/nsIDOMMobileConnection.idl b/dom/network/interfaces/nsIDOMMobileConnection.idl
index 65224dce231b..bccec81b9f5b 100644
--- a/dom/network/interfaces/nsIDOMMobileConnection.idl
+++ b/dom/network/interfaces/nsIDOMMobileConnection.idl
@@ -13,7 +13,7 @@ interface nsIDOMMozMobileCellInfo;
 interface nsIDOMMozIccManager;
 interface nsIDOMMozMobileCFInfo;
 
-[scriptable, builtinclass, uuid(2065b3c3-e876-4be1-b373-428ee254a63e)]
+[scriptable, builtinclass, uuid(bde7e16c-ff1f-4c7f-b1cd-480984cbb206)]
 interface nsIDOMMozMobileConnection : nsIDOMEventTarget
 {
   const long ICC_SERVICE_CLASS_VOICE = (1 << 0);
@@ -254,7 +254,7 @@ interface nsIDOMMozMobileConnection : nsIDOMEventTarget
    */
   nsIDOMDOMRequest cancelMMI();
 
-   /**
+  /**
    * Configures call forward options.
    *
    * @param CFInfo
@@ -285,6 +285,33 @@ interface nsIDOMMozMobileConnection : nsIDOMEventTarget
    */
   nsIDOMDOMRequest getCallForwardingOption(in unsigned short reason);
 
+  /**
+   * Configures call waiting options.
+   *
+   * @param enabled
+   *        Value containing the desired call waiting status.
+   *
+   * If successful, the request's onsuccess will be called.
+   *
+   * Otherwise, the request's onerror will be called, and the request's error
+   * will be either 'RadioNotAvailable', 'RequestNotSupported',
+   * 'IllegalSIMorME', or 'GenericFailure'
+   */
+  nsIDOMDOMRequest setCallWaitingOption(in bool enabled);
+
+  /**
+   * Queries current call waiting options.
+   *
+   * If successful, the request's onsuccess will be called, and the request's
+   * result will be a boolean indicating the call waiting status.
+   *
+   *
+   * Otherwise, the request's onerror will be called, and the request's error
+   * will be either 'RadioNotAvailable', 'RequestNotSupported',
+   * or 'GenericFailure'.
+   */
+  nsIDOMDOMRequest getCallWaitingOption();
+
   /**
    * The 'cardstatechange' event is notified when the 'cardState' attribute
    * changes value.
diff --git a/dom/network/interfaces/nsIMobileConnectionProvider.idl b/dom/network/interfaces/nsIMobileConnectionProvider.idl
index 12d44f33af20..408b754bd210 100644
--- a/dom/network/interfaces/nsIMobileConnectionProvider.idl
+++ b/dom/network/interfaces/nsIMobileConnectionProvider.idl
@@ -35,7 +35,7 @@ interface nsIMobileConnectionListener : nsISupports
  * XPCOM component (in the content process) that provides the mobile
  * network information.
  */
-[scriptable, uuid(152da558-c3c0-45ad-9ac5-1adaf7a83c0d)]
+[scriptable, uuid(3b02afb4-2fc5-471a-b529-816125bf90ae)]
 interface nsIMobileConnectionProvider : nsISupports
 {
   /**
@@ -67,4 +67,8 @@ interface nsIMobileConnectionProvider : nsISupports
                                            in unsigned short reason);
   nsIDOMDOMRequest setCallForwardingOption(in nsIDOMWindow          window,
                                            in nsIDOMMozMobileCFInfo CFInfo);
+
+  nsIDOMDOMRequest setCallWaitingOption(in nsIDOMWindow   window,
+                                        in bool enabled);
+  nsIDOMDOMRequest getCallWaitingOption(in nsIDOMWindow   window);
 };

From 16ce03d869ef48ca8aed8075a1a5cc5209c56323 Mon Sep 17 00:00:00 2001
From: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Date: Thu, 18 Apr 2013 14:18:48 +0200
Subject: [PATCH 421/438] Bug 859318 - Part 2: Changes in MobileConnection.cpp
 for call waiting functions. r=smaug

---
 dom/network/src/MobileConnection.cpp | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/dom/network/src/MobileConnection.cpp b/dom/network/src/MobileConnection.cpp
index 8591e46d5778..b39addb43e52 100644
--- a/dom/network/src/MobileConnection.cpp
+++ b/dom/network/src/MobileConnection.cpp
@@ -300,6 +300,31 @@ MobileConnection::SetCallForwardingOption(nsIDOMMozMobileCFInfo* aCFInfo,
   return mProvider->SetCallForwardingOption(GetOwner(), aCFInfo, aRequest);
 }
 
+NS_IMETHODIMP
+MobileConnection::GetCallWaitingOption(nsIDOMDOMRequest** aRequest)
+{
+  *aRequest = nullptr;
+
+  if (!mProvider) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return mProvider->GetCallWaitingOption(GetOwner(), aRequest);
+}
+
+NS_IMETHODIMP
+MobileConnection::SetCallWaitingOption(bool aEnabled,
+                                       nsIDOMDOMRequest** aRequest)
+{
+  *aRequest = nullptr;
+
+  if (!mProvider) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return mProvider->SetCallWaitingOption(GetOwner(), aEnabled, aRequest);
+}
+
 // nsIMobileConnectionListener
 
 NS_IMETHODIMP

From 954208aba247f991e0cd1c8bb1027b06fe9bb212 Mon Sep 17 00:00:00 2001
From: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Date: Thu, 18 Apr 2013 14:18:50 +0200
Subject: [PATCH 422/438] Bug 859318 - Part 3: RIL changes for call waiting
 functions. r=vicamo

---
 dom/system/gonk/RILContentHelper.js    | 67 ++++++++++++++++++++
 dom/system/gonk/RadioInterfaceLayer.js | 87 +++++++++++---------------
 dom/system/gonk/ril_worker.js          | 33 +++++++++-
 3 files changed, 136 insertions(+), 51 deletions(-)

diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js
index 4db3fa2390cf..5bc82ce6d494 100644
--- a/dom/system/gonk/RILContentHelper.js
+++ b/dom/system/gonk/RILContentHelper.js
@@ -77,6 +77,8 @@ const RIL_IPC_MSG_NAMES = [
   "RIL:DataError",
   "RIL:SetCallForwardingOption",
   "RIL:GetCallForwardingOption",
+  "RIL:SetCallWaitingOption",
+  "RIL:GetCallWaitingOption",
   "RIL:CellBroadcastReceived",
   "RIL:CfStateChanged",
   "RIL:IccOpenChannel",
@@ -736,6 +738,37 @@ RILContentHelper.prototype = {
     return request;
   },
 
+  getCallWaitingOption: function getCallWaitingOption(window) {
+    if (window == null) {
+      throw Components.Exception("Can't get window object",
+                                  Cr.NS_ERROR_UNEXPECTED);
+    }
+    let request = Services.DOMRequest.createRequest(window);
+    let requestId = this.getRequestId(request);
+
+    cpmm.sendAsyncMessage("RIL:GetCallWaitingOption", {
+      requestId: requestId
+    });
+
+    return request;
+  },
+
+  setCallWaitingOption: function setCallWaitingOption(window, enabled) {
+    if (window == null) {
+      throw Components.Exception("Can't get window object",
+                                  Cr.NS_ERROR_UNEXPECTED);
+    }
+    let request = Services.DOMRequest.createRequest(window);
+    let requestId = this.getRequestId(request);
+
+    cpmm.sendAsyncMessage("RIL:SetCallWaitingOption", {
+      requestId: requestId,
+      enabled: enabled
+    });
+
+    return request;
+  },
+
   _mobileConnectionListeners: null,
   _telephonyListeners: null,
   _cellBroadcastListeners: null,
@@ -1104,6 +1137,12 @@ RILContentHelper.prototype = {
       case "RIL:SetCallForwardingOption":
         this.handleSetCallForwardingOption(msg.json);
         break;
+      case "RIL:GetCallWaitingOption":
+        this.handleGetCallWaitingOption(msg.json);
+        break;
+      case "RIL:SetCallWaitingOption":
+        this.handleSetCallWaitingOption(msg.json);
+        break;
       case "RIL:CfStateChanged":
         this._deliverEvent("_mobileConnectionListeners",
                            "notifyCFStateChange",
@@ -1284,6 +1323,34 @@ RILContentHelper.prototype = {
     Services.DOMRequest.fireSuccess(request, null);
   },
 
+  handleGetCallWaitingOption: function handleGetCallWaitingOption(message) {
+    let requestId = message.requestId;
+    let request = this.takeRequest(requestId);
+    if (!request) {
+      return;
+    }
+
+    if (!message.success) {
+      Services.DOMRequest.fireError(request, message.errorMsg);
+      return;
+    }
+    Services.DOMRequest.fireSuccess(request, message.enabled);
+  },
+
+  handleSetCallWaitingOption: function handleSetCallWaitingOption(message) {
+    let requestId = message.requestId;
+    let request = this.takeRequest(requestId);
+    if (!request) {
+      return;
+    }
+
+    if (!message.success) {
+      Services.DOMRequest.fireError(request, message.errorMsg);
+      return;
+    }
+    Services.DOMRequest.fireSuccess(request, null);
+  },
+
   handleSendCancelMMIOK: function handleSendCancelMMIOK(message) {
     let request = this.takeRequest(message.requestId);
     if (!request) {
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index f1689ab9fa95..9c789f23b8dd 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -103,7 +103,9 @@ const RIL_IPC_MOBILECONNECTION_MSG_NAMES = [
   "RIL:RegisterMobileConnectionMsg",
   "RIL:RegisterIccMsg",
   "RIL:SetCallForwardingOption",
-  "RIL:GetCallForwardingOption"
+  "RIL:GetCallForwardingOption",
+  "RIL:SetCallWaitingOption",
+  "RIL:GetCallWaitingOption"
 ];
 
 const RIL_IPC_VOICEMAIL_MSG_NAMES = [
@@ -263,8 +265,6 @@ function RadioInterfaceLayer() {
     displayName: null
   };
 
-  this.callWaitingStatus = null;
-
   // Read the 'ril.radio.disabled' setting in order to start with a known
   // value at boot time.
   let lock = gSettingsService.createLock();
@@ -533,6 +533,14 @@ RadioInterfaceLayer.prototype = {
         this.saveRequestTarget(msg);
         this.getCallForwardingOption(msg.json);
         break;
+      case "RIL:SetCallWaitingOption":
+        this.saveRequestTarget(msg);
+        this.setCallWaitingOption(msg.json);
+        break;
+      case "RIL:GetCallWaitingOption":
+        this.saveRequestTarget(msg);
+        this.getCallWaitingOption(msg.json);
+        break;
       case "RIL:RegisterCellBroadcastMsg":
         this.registerMessageTarget("cellbroadcast", msg.target);
         break;
@@ -623,9 +631,6 @@ RadioInterfaceLayer.prototype = {
         this.rilContext.cardState = message.cardState;
         this._sendMobileConnectionMessage("RIL:CardStateChanged", message);
         break;
-      case "setCallWaiting":
-        this.handleCallWaitingStatusChange(message);
-        break;
       case "sms-received":
         let ackOk = this.handleSmsReceived(message);
         if (ackOk) {
@@ -713,6 +718,12 @@ RadioInterfaceLayer.prototype = {
       case "setCallForward":
         this.handleSetCallForward(message);
         break;
+      case "queryCallWaiting":
+        this.handleQueryCallWaiting(message);
+        break;
+      case "setCallWaiting":
+        this.handleSetCallWaiting(message);
+        break;
       case "setCellBroadcastSearchList":
         this.handleSetCellBroadcastSearchList(message);
         break;
@@ -1163,40 +1174,6 @@ RadioInterfaceLayer.prototype = {
     }
   },
 
-  handleCallWaitingStatusChange: function handleCallWaitingStatusChange(message) {
-    let newStatus = message.enabled;
-
-    // RIL fails in setting call waiting status. Set "ril.callwaiting.enabled"
-    // to null and set the error message.
-    if (message.errorMsg) {
-      let lock = gSettingsService.createLock();
-      lock.set("ril.callwaiting.enabled", null, null, message.errorMsg);
-      return;
-    }
-
-    this.callWaitingStatus = newStatus;
-  },
-
-  setCallWaitingEnabled: function setCallWaitingEnabled(value) {
-    debug("Current call waiting status is " + this.callWaitingStatus +
-          ", desired call waiting status is " + value);
-    if (!this.rilContext.voice.connected) {
-      // The voice network is not connected. Wait for that.
-      return;
-    }
-
-    if (value == null) {
-      // We haven't read the valid value from the settings DB yet.
-      // Wait for that.
-      return;
-    }
-
-    if (this.callWaitingStatus != value) {
-      debug("Setting call waiting status to " + value);
-      this.worker.postMessage({rilMessageType: "setCallWaiting", enabled: value});
-    }
-  },
-
   updateRILNetworkInterface: function updateRILNetworkInterface() {
     if (this._dataCallSettingsToRead.length) {
       debug("We haven't read completely the APN data from the " +
@@ -1878,6 +1855,15 @@ RadioInterfaceLayer.prototype = {
     this._sendRequestResults(messageType, message);
   },
 
+  handleQueryCallWaiting: function handleQueryCallWaiting(message) {
+    debug("handleQueryCallWaiting: " + JSON.stringify(message));
+    this._sendRequestResults("RIL:GetCallWaitingOption", message);
+  },
+
+  handleSetCallWaiting: function handleSetCallWaiting(message) {
+    debug("handleSetCallWaiting: " + JSON.stringify(message));
+    this._sendRequestResults("RIL:SetCallWaitingOption", message);
+  },
   // nsIObserver
 
   observe: function observe(subject, topic, data) {
@@ -1937,11 +1923,6 @@ RadioInterfaceLayer.prototype = {
   // the radio power.
   _changingRadioPower: false,
 
-  // Flag to determine whether we reject a waiting call directly or we
-  // notify the UI of a waiting call. It corresponds to the
-  // 'ril.callwaiting.enbled' setting from the UI.
-  _callWaitingEnabled: null,
-
   // APN data for making data calls.
   dataCallSettings: {},
   dataCallSettingsMMS: {},
@@ -2023,10 +2004,6 @@ RadioInterfaceLayer.prototype = {
         key = aName.slice(9);
         this.dataCallSettingsSUPL[key] = aResult;
         break;
-      case "ril.callwaiting.enabled":
-        this._callWaitingEnabled = aResult;
-        this.setCallWaitingEnabled(this._callWaitingEnabled);
-        break;
       case kTimeNitzAutomaticUpdateEnabled:
         this._nitzAutomaticUpdateEnabled = aResult;
 
@@ -2233,6 +2210,18 @@ RadioInterfaceLayer.prototype = {
     this.worker.postMessage(message);
   },
 
+  setCallWaitingOption: function setCallWaitingOption(message) {
+    debug("setCallWaitingOption: " + JSON.stringify(message));
+    message.rilMessageType = "setCallWaiting";
+    this.worker.postMessage(message);
+  },
+
+  getCallWaitingOption: function getCallWaitingOption(message) {
+    debug("getCallWaitingOption: " + JSON.stringify(message));
+    message.rilMessageType = "queryCallWaiting";
+    this.worker.postMessage(message);
+  },
+
   get microphoneMuted() {
     return gAudioManager.microphoneMuted;
   },
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index be0b4c1c40ec..9e99fbfdeffc 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -1381,6 +1381,19 @@ let RIL = {
     Buf.sendParcel();
   },
 
+  /**
+   * Query call waiting status.
+   *
+   */
+  queryCallWaiting: function queryCallWaiting(options) {
+    Buf.newParcel(REQUEST_QUERY_CALL_WAITING, options);
+    Buf.writeUint32(1);
+    // As per 3GPP TS 24.083, section 1.6 UE doesn't need to send service
+    // class parameter in call waiting interrogation  to network
+    Buf.writeUint32(ICC_SERVICE_CLASS_NONE);
+    Buf.sendParcel();
+  },
+
   /**
    * Set call waiting status.
    *
@@ -4733,9 +4746,25 @@ RIL[REQUEST_SET_CALL_FORWARD] =
     }
     this.sendDOMMessage(options);
 };
-RIL[REQUEST_QUERY_CALL_WAITING] = null;
+RIL[REQUEST_QUERY_CALL_WAITING] =
+  function REQUEST_QUERY_CALL_WAITING(length, options) {
+  options.success = options.rilRequestError == 0;
+  if (!options.success) {
+    options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
+    this.sendDOMMessage(options);
+    return;
+  }
+  options.length = Buf.readUint32();
+  options.enabled = ((Buf.readUint32() == 1) &&
+                     ((Buf.readUint32() & ICC_SERVICE_CLASS_VOICE) == 0x01));
+  this.sendDOMMessage(options);
+};
+
 RIL[REQUEST_SET_CALL_WAITING] = function REQUEST_SET_CALL_WAITING(length, options) {
-  options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
+  options.success = options.rilRequestError == 0;
+  if (!options.success) {
+    options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
+  }
   this.sendDOMMessage(options);
 };
 RIL[REQUEST_SMS_ACKNOWLEDGE] = null;

From 94ca2b063a1d2687c17fc42103a05783be4adcda Mon Sep 17 00:00:00 2001
From: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Date: Thu, 18 Apr 2013 14:18:53 +0200
Subject: [PATCH 423/438] Bug 859318 - Part 4: Add test for call waiting
 functions. r=vicamo

---
 dom/system/gonk/tests/test_ril_worker_cw.js | 131 ++++++++++++++++++++
 dom/system/gonk/tests/xpcshell.ini          |   1 +
 2 files changed, 132 insertions(+)
 create mode 100644 dom/system/gonk/tests/test_ril_worker_cw.js

diff --git a/dom/system/gonk/tests/test_ril_worker_cw.js b/dom/system/gonk/tests/test_ril_worker_cw.js
new file mode 100644
index 000000000000..6c0d846cec7f
--- /dev/null
+++ b/dom/system/gonk/tests/test_ril_worker_cw.js
@@ -0,0 +1,131 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+subscriptLoader.loadSubScript("resource://gre/modules/ril_consts.js", this);
+
+function run_test() {
+  run_next_test();
+}
+
+function _getWorker() {
+  let _postedMessage;
+  let _worker = newWorker({
+    postRILMessage: function fakePostRILMessage(data) {
+    },
+    postMessage: function fakePostMessage(message) {
+      _postedMessage = message;
+    }
+  });
+  return {
+    get postedMessage() {
+      return _postedMessage;
+    },
+    get worker() {
+      return _worker;
+    }
+  };
+}
+
+add_test(function test_setCallWaiting_success() {
+  let workerHelper = _getWorker();
+  let worker = workerHelper.worker;
+
+  worker.RIL.setCallWaiting = function fakeSetCallWaiting(options) {
+    worker.RIL[REQUEST_SET_CALL_WAITING](0, {
+      rilRequestError: ERROR_SUCCESS
+    });
+  };
+
+  worker.RIL.setCallWaiting({
+    enabled: true
+  });
+
+  let postedMessage = workerHelper.postedMessage;
+
+  do_check_eq(postedMessage.errorMsg, undefined);
+  do_check_true(postedMessage.success);
+
+  run_next_test();
+});
+
+add_test(function test_setCallWaiting_generic_failure() {
+  let workerHelper = _getWorker();
+  let worker = workerHelper.worker;
+
+  worker.RIL.setCallWaiting = function fakeSetCallWaiting(options) {
+    worker.RIL[REQUEST_SET_CALL_WAITING](0, {
+      rilRequestError: ERROR_GENERIC_FAILURE
+    });
+  };
+
+  worker.RIL.setCallWaiting({
+    enabled: true
+  });
+
+  let postedMessage = workerHelper.postedMessage;
+
+  do_check_eq(postedMessage.errorMsg, "GenericFailure");
+  do_check_false(postedMessage.success);
+
+  run_next_test();
+});
+
+add_test(function test_queryCallWaiting_success_enabled_true() {
+  let workerHelper = _getWorker();
+  let worker = workerHelper.worker;
+
+  worker.Buf.readUint32 = function fakeReadUint32() {
+    return worker.Buf.int32Array.pop();
+  };
+
+  worker.RIL.queryCallWaiting = function fakeQueryCallWaiting(options) {
+    worker.Buf.int32Array = [
+      1,  // serviceClass
+      1,  // enabled
+      1   // length
+    ];
+    worker.RIL[REQUEST_QUERY_CALL_WAITING](1, {
+      rilRequestError: ERROR_SUCCESS
+    });
+  };
+
+  worker.RIL.queryCallWaiting({});
+
+  let postedMessage = workerHelper.postedMessage;
+
+  do_check_eq(postedMessage.errorMsg, undefined);
+  do_check_true(postedMessage.success);
+  do_check_eq(postedMessage.length, 1);
+  do_check_true(postedMessage.enabled);
+  run_next_test();
+});
+
+add_test(function test_queryCallWaiting_success_enabled_false() {
+  let workerHelper = _getWorker();
+  let worker = workerHelper.worker;
+
+  worker.Buf.readUint32 = function fakeReadUint32() {
+    return worker.Buf.int32Array.pop();
+  };
+
+  worker.RIL.queryCallWaiting = function fakeQueryCallWaiting(options) {
+    worker.Buf.int32Array = [
+      1,  // serviceClass
+      0,  // enabled
+      1   // length
+    ];
+    worker.RIL[REQUEST_QUERY_CALL_WAITING](1, {
+      rilRequestError: ERROR_SUCCESS
+    });
+  };
+
+  worker.RIL.queryCallWaiting({});
+
+  let postedMessage = workerHelper.postedMessage;
+
+  do_check_eq(postedMessage.errorMsg, undefined);
+  do_check_true(postedMessage.success);
+  do_check_eq(postedMessage.length, 1);
+  do_check_false(postedMessage.enabled);
+  run_next_test();
+});
diff --git a/dom/system/gonk/tests/xpcshell.ini b/dom/system/gonk/tests/xpcshell.ini
index fe54d6c8eb2b..607bdc78c79b 100644
--- a/dom/system/gonk/tests/xpcshell.ini
+++ b/dom/system/gonk/tests/xpcshell.ini
@@ -9,3 +9,4 @@ tail =
 [test_ril_worker_cf.js]
 [test_ril_worker_cellbroadcast.js]
 [test_ril_worker_ruim.js]
+[test_ril_worker_cw.js]

From aa2196b82c8a63aee7ecb8b4cd9cbc92d55d3615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Thu, 18 Apr 2013 03:18:30 -0700
Subject: [PATCH 424/438] Bug 854849 - Sanitize displayable fields in manifests
 r=vingtetun

---
 dom/apps/src/AppsUtils.jsm                    | 49 +++++++++++++++
 dom/apps/tests/Makefile.in                    |  2 +
 .../tests/file_hosted_app.template.webapp     |  2 +-
 dom/apps/tests/test_app_update.html           |  2 +
 dom/apps/tests/unit/test_manifestSanitizer.js | 63 +++++++++++++++++++
 dom/apps/tests/unit/xpcshell.ini              |  5 ++
 dom/tests/mochitest/webapps/apps/utf8.webapp  |  2 +-
 .../mochitest/webapps/test_install_utf8.xul   |  2 +-
 testing/xpcshell/xpcshell.ini                 |  1 +
 9 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 dom/apps/tests/unit/test_manifestSanitizer.js
 create mode 100644 dom/apps/tests/unit/xpcshell.ini

diff --git a/dom/apps/src/AppsUtils.jsm b/dom/apps/src/AppsUtils.jsm
index 7c92be6550f8..9d6353efe299 100644
--- a/dom/apps/src/AppsUtils.jsm
+++ b/dom/apps/src/AppsUtils.jsm
@@ -205,6 +205,53 @@ this.AppsUtils = {
              "isCoreApp": isCoreApp };
   },
 
+  /**
+    * Remove potential HTML tags from displayable fields in the manifest.
+    * We check name, description, developer name, and permission description
+    */
+  sanitizeManifest: function(aManifest) {
+    let sanitizer = Cc["@mozilla.org/parserutils;1"]
+                      .getService(Ci.nsIParserUtils);
+    if (!sanitizer) {
+      return;
+    }
+
+    function sanitize(aStr) {
+      return sanitizer.convertToPlainText(aStr,
+               Ci.nsIDocumentEncoder.OutputRaw, 0);
+    }
+
+    function sanitizeEntryPoint(aRoot) {
+      aRoot.name = sanitize(aRoot.name);
+
+      if (aRoot.description) {
+        aRoot.description = sanitize(aRoot.description);
+      }
+
+      if (aRoot.developer && aRoot.developer.name) {
+        aRoot.developer.name = sanitize(aRoot.developer.name);
+      }
+
+      if (aRoot.permissions) {
+        for (let permission in aRoot.permissions) {
+          if (aRoot.permissions[permission].description) {
+            aRoot.permissions[permission].description =
+             sanitize(aRoot.permissions[permission].description);
+          }
+        }
+      }
+    }
+
+    // First process the main section, then the entry points.
+    sanitizeEntryPoint(aManifest);
+
+    if (aManifest.entry_points) {
+      for (let entry in aManifest.entry_points) {
+        sanitizeEntryPoint(aManifest.entry_points[entry]);
+      }
+    }
+  },
+
   /**
    * From https://developer.mozilla.org/en/OpenWebApps/The_Manifest
    * Only the name property is mandatory.
@@ -213,6 +260,8 @@ this.AppsUtils = {
     if (aManifest.name == undefined)
       return false;
 
+    this.sanitizeManifest(aManifest);
+
     // launch_path, entry_points launch paths, message hrefs, and activity hrefs can't be absolute
     if (aManifest.launch_path && isAbsoluteURI(aManifest.launch_path))
       return false;
diff --git a/dom/apps/tests/Makefile.in b/dom/apps/tests/Makefile.in
index e1a16c831fac..b00f28d85df4 100644
--- a/dom/apps/tests/Makefile.in
+++ b/dom/apps/tests/Makefile.in
@@ -24,4 +24,6 @@ MOCHITEST_CHROME_FILES = \
   test_apps_service.xul \
   $(NULL)
 
+XPCSHELL_TESTS = unit
+
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/apps/tests/file_hosted_app.template.webapp b/dom/apps/tests/file_hosted_app.template.webapp
index 13c7223c081e..938761988254 100644
--- a/dom/apps/tests/file_hosted_app.template.webapp
+++ b/dom/apps/tests/file_hosted_app.template.webapp
@@ -1,5 +1,5 @@
 {
   "name": "Really Rapid Release (hosted)",
-  "description": "Updated even faster than Firefox, just to annoy slashdotters.",
+  "description": "Updated even faster than <a href='http://mozilla.org'>Firefox</a>, just to annoy slashdotters.",
   "launch_path": "/tests/dom/apps/tests/file_app.sjs?apptype=hosted"
 }
diff --git a/dom/apps/tests/test_app_update.html b/dom/apps/tests/test_app_update.html
index 1fe5ef77646a..23d02d6b139f 100644
--- a/dom/apps/tests/test_app_update.html
+++ b/dom/apps/tests/test_app_update.html
@@ -69,6 +69,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
     yield;
     var app = request.result;
     ok(app, "App is non-null");
+    ok(app.manifest.description == "Updated even faster than Firefox, just to annoy slashdotters.",
+       "Manifest is HTML-sanitized");
 
     // Check the app a few times.
     checkAppState(app, true, 2, continueTest);
diff --git a/dom/apps/tests/unit/test_manifestSanitizer.js b/dom/apps/tests/unit/test_manifestSanitizer.js
new file mode 100644
index 000000000000..4b0c999a73f8
--- /dev/null
+++ b/dom/apps/tests/unit/test_manifestSanitizer.js
@@ -0,0 +1,63 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function testEntryPoint(aRoot) {
+  do_check_true(aRoot.name == "hello world");
+  do_check_true(aRoot.description == "A bold name");
+  do_check_true(aRoot.developer.name == "Blink Inc.");
+
+  let permissions = aRoot.permissions;
+  do_check_true(permissions.contacts.description == "Required for autocompletion in the share screen");
+  do_check_true(permissions.alarms.description == "Required to schedule notifications");
+}
+
+function run_test() {
+  Components.utils.import("resource:///modules/AppsUtils.jsm");
+
+  do_check_true(!!AppsUtils);
+
+  // Test manifest, with one entry point.
+  let manifest = {
+    name: "hello <b>world</b>",
+    description: "A bold name",
+    developer: {
+      name: "<blink>Blink</blink> Inc.",
+      url: "http://blink.org"
+    },
+    permissions : {
+      "contacts": {
+        "description": "Required for autocompletion in the <a href='http://shareme.com'>share</a> screen",
+        "access": "readcreate"
+        },
+      "alarms": {
+        "description": "Required to schedule notifications"
+      }
+    },
+
+    entry_points: {
+      "subapp": {
+        name: "hello <b>world</b>",
+        description: "A bold name",
+        developer: {
+          name: "<blink>Blink</blink> Inc.",
+          url: "http://blink.org"
+        },
+        permissions : {
+          "contacts": {
+            "description": "Required for autocompletion in the <a href='http://shareme.com'>share</a> screen",
+            "access": "readcreate"
+            },
+          "alarms": {
+            "description": "Required to schedule notifications"
+          }
+        }
+      }
+    }
+  }
+
+  AppsUtils.sanitizeManifest(manifest);
+
+  // Check the main section and the subapp entry point.
+  testEntryPoint(manifest);
+  testEntryPoint(manifest.entry_points.subapp);
+}
diff --git a/dom/apps/tests/unit/xpcshell.ini b/dom/apps/tests/unit/xpcshell.ini
new file mode 100644
index 000000000000..bacd1de945e9
--- /dev/null
+++ b/dom/apps/tests/unit/xpcshell.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+head =
+tail =
+
+[test_manifestSanitizer.js]
diff --git a/dom/tests/mochitest/webapps/apps/utf8.webapp b/dom/tests/mochitest/webapps/apps/utf8.webapp
index b3c4ef3f612c..52ca311426a6 100644
--- a/dom/tests/mochitest/webapps/apps/utf8.webapp
+++ b/dom/tests/mochitest/webapps/apps/utf8.webapp
@@ -1,5 +1,5 @@
 {
- "name": "TheBOM  ゲゴケ゚セニツ゚ヅヂチ",
+ "name": "TheBOM ゲゴケ゚セニツ゚ヅヂチ",
  "description": "This App is THE BOM, yo. ヅヂチ",
  "installs_allowed_from": ["*"]
 }
diff --git a/dom/tests/mochitest/webapps/test_install_utf8.xul b/dom/tests/mochitest/webapps/test_install_utf8.xul
index acb2b38e0a1b..30d7a38ec731 100644
--- a/dom/tests/mochitest/webapps/test_install_utf8.xul
+++ b/dom/tests/mochitest/webapps/test_install_utf8.xul
@@ -24,7 +24,7 @@ var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/utf8.webapp";
 
 confirmNextInstall();
 navigator.mozApps.install(url, null).onsuccess = function onInstall() {
-  is(this.result.manifest.name, "TheBOM  ゲゴケ゚セニツ゚ヅヂチ", "manifest.name");
+  is(this.result.manifest.name, "TheBOM ゲゴケ゚セニツ゚ヅヂチ", "manifest.name");
   is(this.result.manifest.description, "This App is THE BOM, yo. ヅヂチ",
      "manifest.description");
 
diff --git a/testing/xpcshell/xpcshell.ini b/testing/xpcshell/xpcshell.ini
index 3d1906172647..5ad1c817a0b7 100644
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -10,6 +10,7 @@
 [include:parser/xml/test/unit/xpcshell.ini]
 [include:image/test/unit/xpcshell.ini]
 [include:dom/activities/tests/unit/xpcshell.ini]
+[include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/encoding/test/unit/xpcshell.ini]
 [include:dom/plugins/test/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]

From 1b1855494c0924bd6f834e746f29397cc072afd4 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Thu, 18 Apr 2013 07:40:09 -0400
Subject: [PATCH 425/438] Bug 855412 - Change the signature of NS_NewSVGRect to
 not use the outparam. r=Ms2ger

---
 content/svg/content/src/SVGRect.cpp           | 20 +++++++++----------
 content/svg/content/src/SVGRect.h             | 10 ++++------
 content/svg/content/src/SVGSVGElement.cpp     |  4 +---
 .../content/src/SVGTransformableElement.cpp   |  4 +---
 layout/svg/nsSVGGlyphFrame.cpp                |  4 +---
 5 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/content/svg/content/src/SVGRect.cpp b/content/svg/content/src/SVGRect.cpp
index 934b8e524831..3dd62db2db3c 100644
--- a/content/svg/content/src/SVGRect.cpp
+++ b/content/svg/content/src/SVGRect.cpp
@@ -38,21 +38,19 @@ NS_INTERFACE_MAP_END
 ////////////////////////////////////////////////////////////////////////
 // Exported creation functions:
 
-nsresult
-NS_NewSVGRect(mozilla::dom::SVGRect** result, float x, float y,
-              float width, float height)
+already_AddRefed<mozilla::dom::SVGRect>
+NS_NewSVGRect(float x, float y, float width, float height)
 {
-  *result = new mozilla::dom::SVGRect(x, y, width, height);
-  if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-  NS_ADDREF(*result);
-  return NS_OK;
+  nsRefPtr<mozilla::dom::SVGRect> rect =
+    new mozilla::dom::SVGRect(x, y, width, height);
+
+  return rect.forget();
 }
 
-nsresult
-NS_NewSVGRect(mozilla::dom::SVGRect** result, const gfxRect& rect)
+already_AddRefed<mozilla::dom::SVGRect>
+NS_NewSVGRect(const gfxRect& rect)
 {
-  return NS_NewSVGRect(result,
-                       rect.X(), rect.Y(),
+  return NS_NewSVGRect(rect.X(), rect.Y(),
                        rect.Width(), rect.Height());
 }
 
diff --git a/content/svg/content/src/SVGRect.h b/content/svg/content/src/SVGRect.h
index 9ffd93dd80c6..186bf3d88237 100644
--- a/content/svg/content/src/SVGRect.h
+++ b/content/svg/content/src/SVGRect.h
@@ -76,12 +76,10 @@ protected:
 } // namespace dom
 } // namespace mozilla
 
-nsresult
-NS_NewSVGRect(mozilla::dom::SVGRect** result,
-              float x=0.0f, float y=0.0f,
-              float width=0.0f, float height=0.0f);
+already_AddRefed<mozilla::dom::SVGRect>
+NS_NewSVGRect(float x=0.0f, float y=0.0f, float width=0.0f, float height=0.0f);
 
-nsresult
-NS_NewSVGRect(mozilla::dom::SVGRect** result, const gfxRect& rect);
+already_AddRefed<mozilla::dom::SVGRect>
+NS_NewSVGRect(const gfxRect& rect);
 
 #endif //mozilla_dom_SVGRect_h
diff --git a/content/svg/content/src/SVGSVGElement.cpp b/content/svg/content/src/SVGSVGElement.cpp
index 55ce926e6583..f01b97315733 100644
--- a/content/svg/content/src/SVGSVGElement.cpp
+++ b/content/svg/content/src/SVGSVGElement.cpp
@@ -411,9 +411,7 @@ SVGSVGElement::CreateSVGMatrix()
 already_AddRefed<SVGIRect>
 SVGSVGElement::CreateSVGRect()
 {
-  nsRefPtr<SVGRect> rect;
-  NS_NewSVGRect(getter_AddRefs(rect));
-  return rect.forget();
+  return NS_NewSVGRect();
 }
 
 already_AddRefed<SVGTransform>
diff --git a/content/svg/content/src/SVGTransformableElement.cpp b/content/svg/content/src/SVGTransformableElement.cpp
index 5c04fa081938..03ee7dedbab1 100644
--- a/content/svg/content/src/SVGTransformableElement.cpp
+++ b/content/svg/content/src/SVGTransformableElement.cpp
@@ -173,9 +173,7 @@ SVGTransformableElement::GetBBox(ErrorResult& rv)
     return nullptr;
   }
 
-  nsRefPtr<SVGRect> rect;
-  rv = NS_NewSVGRect(getter_AddRefs(rect), nsSVGUtils::GetBBox(frame));
-  return rect.forget();
+  return NS_NewSVGRect(nsSVGUtils::GetBBox(frame));
 }
 
 already_AddRefed<SVGMatrix>
diff --git a/layout/svg/nsSVGGlyphFrame.cpp b/layout/svg/nsSVGGlyphFrame.cpp
index 3bdf9d50a883..06011f9d4682 100644
--- a/layout/svg/nsSVGGlyphFrame.cpp
+++ b/layout/svg/nsSVGGlyphFrame.cpp
@@ -1285,9 +1285,7 @@ nsSVGGlyphFrame::GetExtentOfChar(uint32_t charnum, dom::SVGIRect **_retval)
                             metrics.mAscent + metrics.mDescent));
   tmpCtx->IdentityMatrix();
 
-  nsRefPtr<dom::SVGRect> rect;
-  nsresult rv = NS_NewSVGRect(getter_AddRefs(rect), tmpCtx->GetUserPathExtent());
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsRefPtr<dom::SVGRect> rect = NS_NewSVGRect(tmpCtx->GetUserPathExtent());
 
   rect.forget(_retval);
   return NS_OK;

From 72635c5a7638cb337124b33f9f87052e010eedaf Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Apr 2013 08:15:09 -0400
Subject: [PATCH 426/438] Backed out 3 changesets (bug 734691, bug 862500) for
 leaks.

Backed out changeset 4444510d672f (bug 862500)
Backed out changeset 5c321bc4dc63 (bug 734691)
Backed out changeset e045934f78be (bug 734691)
---
 dom/workers/RuntimeService.cpp     |  21 +--
 ipc/chromium/src/base/thread.cc    |   5 -
 toolkit/xre/nsAppRunner.cpp        |   8 +-
 toolkit/xre/nsEmbedFunctions.cpp   |   2 +-
 tools/profiler/BreakpadSampler.cpp |  15 +-
 tools/profiler/GeckoProfiler.h     |  17 --
 tools/profiler/GeckoProfilerFunc.h |   4 -
 tools/profiler/GeckoProfilerImpl.h |  24 ---
 tools/profiler/Makefile.in         |   3 -
 tools/profiler/ProfileEntry.cpp    |  14 +-
 tools/profiler/ProfileEntry.h      |  16 +-
 tools/profiler/PseudoStack.h       |   4 -
 tools/profiler/TableTicker.cpp     |  57 +++----
 tools/profiler/TableTicker.h       |  78 ++-------
 tools/profiler/platform-linux.cc   | 257 +++++++++++------------------
 tools/profiler/platform-macos.cc   | 148 +++++------------
 tools/profiler/platform-win32.cc   | 133 ++++-----------
 tools/profiler/platform.cpp        | 107 ++----------
 tools/profiler/platform.h          | 104 ++----------
 xpcom/build/nsXPComInit.cpp        |   2 -
 20 files changed, 243 insertions(+), 776 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index c5744cae3ea2..070f739dce2d 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -42,8 +42,6 @@
 #include "OSFileConstants.h"
 #include <algorithm>
 
-#include "GeckoProfiler.h"
-
 using namespace mozilla;
 using namespace mozilla::dom;
 
@@ -265,10 +263,6 @@ JSBool
 OperationCallback(JSContext* aCx)
 {
   WorkerPrivate* worker = GetWorkerPrivateFromContext(aCx);
-
-  // Now is a good time to turn on profiling if it's pending.
-  profiler_js_operation_callback();
-
   return worker->OperationCallback(aCx);
 }
 
@@ -521,19 +515,13 @@ public:
       return NS_ERROR_FAILURE;
     }
 
-    JSRuntime* rt = JS_GetRuntime(cx);
-
-    profiler_register_thread("WebWorker");
-#ifdef MOZ_ENABLE_PROFILER_SPS
-    if (PseudoStack* stack = mozilla_get_pseudo_stack())
-      stack->sampleRuntime(rt);
-#endif
-
     {
       JSAutoRequest ar(cx);
       workerPrivate->DoRunLoop(cx);
     }
 
+    JSRuntime* rt = JS_GetRuntime(cx);
+
     // XXX Bug 666963 - CTypes can create another JSContext for use with
     // closures, and then it holds that context in a reserved slot on the CType
     // prototype object. We have to destroy that context before we can destroy
@@ -552,14 +540,9 @@ public:
       JS_DestroyContext(cx);
     }
 
-#ifdef MOZ_ENABLE_PROFILER_SPS
-    if (PseudoStack* stack = mozilla_get_pseudo_stack())
-      stack->sampleRuntime(nullptr);
-#endif
     JS_DestroyRuntime(rt);
 
     workerPrivate->ScheduleDeletion(false);
-    profiler_unregister_thread();
     return NS_OK;
   }
 };
diff --git a/ipc/chromium/src/base/thread.cc b/ipc/chromium/src/base/thread.cc
index 31ec62832ec3..f447fbb201eb 100644
--- a/ipc/chromium/src/base/thread.cc
+++ b/ipc/chromium/src/base/thread.cc
@@ -8,7 +8,6 @@
 #include "base/string_util.h"
 #include "base/thread_local.h"
 #include "base/waitable_event.h"
-#include "GeckoProfiler.h"
 
 namespace base {
 
@@ -137,8 +136,6 @@ void Thread::StopSoon() {
 }
 
 void Thread::ThreadMain() {
-  profiler_register_thread(name_.c_str());
-
   // The message loop for this thread.
   MessageLoop message_loop(startup_data_->options.message_loop_type);
 
@@ -164,8 +161,6 @@ void Thread::ThreadMain() {
   // Assert that MessageLoop::Quit was called by ThreadQuitTask.
   DCHECK(GetThreadWasQuitProperly());
 
-  profiler_unregister_thread();
-
   // We can't receive messages anymore.
   message_loop_ = NULL;
   thread_id_ = 0;
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 77d572bb8126..661ebcaebae2 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3894,7 +3894,7 @@ XREMain::XRE_mainRun()
 int
 XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 {
-  GeckoProfilerInitRAII profilerGuard;
+  profiler_init();
   PROFILER_LABEL("Startup", "XRE_Main");
 
   nsresult rv = NS_OK;
@@ -3995,6 +3995,7 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
     MOZ_gdk_display_close(mGdkDisplay);
 #endif
 
+    profiler_shutdown();
     rv = LaunchChild(mNativeApp, true);
 
 #ifdef MOZ_CRASHREPORTER
@@ -4017,6 +4018,8 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 
   XRE_DeinitCommandLine();
 
+  profiler_shutdown();
+
   return NS_FAILED(rv) ? 1 : 0;
 }
 
@@ -4089,7 +4092,7 @@ public:
 int
 XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
 {
-  GeckoProfilerInitRAII profilerGuard;
+  profiler_init();
   PROFILER_LABEL("Startup", "XRE_Main");
 
   nsresult rv = NS_OK;
@@ -4130,6 +4133,7 @@ XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
   // thread that called XRE_metroStartup.
   NS_ASSERTION(!xreMainPtr->mScopedXPCom,
                "XPCOM Shutdown hasn't occured, and we are exiting.");
+  profiler_shutdown();
   return 0;
 }
 
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index b64f76d90e8c..d1941620f39c 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -282,7 +282,7 @@ XRE_InitChildProcess(int aArgc,
   NS_ENSURE_ARG_MIN(aArgc, 2);
   NS_ENSURE_ARG_POINTER(aArgv);
   NS_ENSURE_ARG_POINTER(aArgv[0]);
-  GeckoProfilerInitRAII profilerGuard;
+  profiler_init();
   PROFILER_LABEL("Startup", "XRE_InitChildProcess");
 
   sChildProcessType = aProcess;
diff --git a/tools/profiler/BreakpadSampler.cpp b/tools/profiler/BreakpadSampler.cpp
index d30a55b6ea2f..bc804e3627f5 100644
--- a/tools/profiler/BreakpadSampler.cpp
+++ b/tools/profiler/BreakpadSampler.cpp
@@ -158,13 +158,6 @@ void genPseudoBacktraceEntries(/*MODIFIED*/UnwinderThreadBuffer* utb,
 // RUNS IN SIGHANDLER CONTEXT
 void BreakpadSampler::Tick(TickSample* sample)
 {
-  if (!sample->threadProfile) {
-    // Platform doesn't support multithread, so use the main thread profile we created
-    sample->threadProfile = GetPrimaryThreadProfile();
-  }
-
-  ThreadProfile& currThreadProfile = *sample->threadProfile;
-
   /* Get hold of an empty inter-thread buffer into which to park
      the ProfileEntries for this sample. */
   UnwinderThreadBuffer* utb = uwt__acquire_empty_buffer();
@@ -179,7 +172,7 @@ void BreakpadSampler::Tick(TickSample* sample)
      thread, and park them in |utb|. */
 
   // Marker(s) come before the sample
-  PseudoStack* stack = currThreadProfile.GetPseudoStack();
+  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
     utb__addEntry( utb, ProfileEntry('m', stack->getMarker(i)) );
   }
@@ -193,7 +186,7 @@ void BreakpadSampler::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      currThreadProfile.erase();
+      mPrimaryThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -300,9 +293,9 @@ void BreakpadSampler::Tick(TickSample* sample)
 #   else
 #     error "Unsupported platform"
 #   endif
-    uwt__release_full_buffer(&currThreadProfile, utb, ucV);
+    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, ucV);
   } else {
-    uwt__release_full_buffer(&currThreadProfile, utb, NULL);
+    uwt__release_full_buffer(&mPrimaryThreadProfile, utb, NULL);
   }
 }
 
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 7e40705d001b..4c8e2b5452c8 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -135,27 +135,10 @@ static inline void profiler_lock() {}
 // Re-enable the profiler and notify 'profiler-unlocked'.
 static inline void profiler_unlock() {}
 
-static inline void profiler_register_thread(const char* name) {}
-static inline void profiler_unregister_thread() {}
-
-// Call by the JSRuntime's operation callback. This is used to enable
-// profiling on auxilerary threads.
-static inline void profiler_js_operation_callback() {}
-
 #else
 
 #include "GeckoProfilerImpl.h"
 
 #endif
 
-class GeckoProfilerInitRAII {
-public:
-  GeckoProfilerInitRAII() {
-    profiler_init();
-  }
-  ~GeckoProfilerInitRAII() {
-    profiler_shutdown();
-  }
-};
-
 #endif // ifndef SAMPLER_H
diff --git a/tools/profiler/GeckoProfilerFunc.h b/tools/profiler/GeckoProfilerFunc.h
index 41134bfb5ce7..2c26d8eb8a92 100644
--- a/tools/profiler/GeckoProfilerFunc.h
+++ b/tools/profiler/GeckoProfilerFunc.h
@@ -57,10 +57,6 @@ void mozilla_sampler_lock();
 // Unlock the profiler, leaving it stopped and fires profiler-unlocked.
 void mozilla_sampler_unlock();
 
-// Register/unregister threads with the profiler
-bool mozilla_sampler_register_thread(const char* name);
-void mozilla_sampler_unregister_thread();
-
 /* Returns true if env var SPS_NEW is set to anything, else false. */
 extern bool sps_version2();
 
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index b5c20626c610..917bd04173f7 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -140,29 +140,6 @@ void profiler_unlock()
   return mozilla_sampler_unlock();
 }
 
-static inline
-void profiler_register_thread(const char* name)
-{
-  mozilla_sampler_register_thread(name);
-}
-
-static inline
-void profiler_unregister_thread()
-{
-  mozilla_sampler_unregister_thread();
-}
-
-static inline
-void profiler_js_operation_callback()
-{
-  PseudoStack *stack = tlsPseudoStack.get();
-  if (!stack) {
-    return;
-  }
-
-  stack->jsOperationCallback();
-}
-
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
@@ -177,7 +154,6 @@ void profiler_js_operation_callback()
 #define PROFILER_MAIN_THREAD_LABEL_PRINTF(name_space, info, ...)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla::SamplerStackFramePrintfRAII SAMPLER_APPEND_LINE_NUMBER(sampler_raii)(name_space "::" info, __LINE__, __VA_ARGS__)
 #define PROFILER_MAIN_THREAD_MARKER(info)  MOZ_ASSERT(NS_IsMainThread(), "This can only be called on the main thread"); mozilla_sampler_add_marker(info)
 
-
 /* FIXME/bug 789667: memory constraints wouldn't much of a problem for
  * this small a sample buffer size, except that serializing the
  * profile data is extremely, unnecessarily memory intensive. */
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index d7e1b9bfbe4a..64b394444d73 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -34,9 +34,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
-# Uncomment for better debugging in opt builds
-#MOZ_OPTIMIZE_FLAGS += -O0 -g
-
 CPPSRCS		= \
   platform.cpp \
   nsProfilerFactory.cpp \
diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
index d3608cace5fc..d8c74b748217 100644
--- a/tools/profiler/ProfileEntry.cpp
+++ b/tools/profiler/ProfileEntry.cpp
@@ -134,27 +134,19 @@ std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
 
 #define DYNAMIC_MAX_STRING 512
 
-ThreadProfile::ThreadProfile(const char* aName, int aEntrySize,
-                             PseudoStack *aStack, int aThreadId,
-                             PlatformData* aPlatform,
-                             bool aIsMainThread)
+ThreadProfile::ThreadProfile(int aEntrySize, PseudoStack *aStack)
   : mWritePos(0)
   , mLastFlushPos(0)
   , mReadPos(0)
   , mEntrySize(aEntrySize)
   , mPseudoStack(aStack)
   , mMutex("ThreadProfile::mMutex")
-  , mName(strdup(aName))
-  , mThreadId(aThreadId)
-  , mIsMainThread(aIsMainThread)
-  , mPlatformData(aPlatform)
 {
   mEntries = new ProfileEntry[mEntrySize];
 }
 
 ThreadProfile::~ThreadProfile()
 {
-  free(mName);
   delete[] mEntries;
 }
 
@@ -307,10 +299,6 @@ JSCustomObject* ThreadProfile::ToJSObject(JSContext *aCx)
 }
 
 void ThreadProfile::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile) {
-  // Thread meta data
-  b.DefineProperty(profile, "name", mName);
-  b.DefineProperty(profile, "tid", mThreadId);
-
   JSCustomArray *samples = b.CreateArray();
   b.DefineProperty(profile, "samples", samples);
 
diff --git a/tools/profiler/ProfileEntry.h b/tools/profiler/ProfileEntry.h
index 378dc42481c2..897abb23c6ea 100644
--- a/tools/profiler/ProfileEntry.h
+++ b/tools/profiler/ProfileEntry.h
@@ -6,12 +6,12 @@
 #ifndef MOZ_PROFILE_ENTRY_H
 #define MOZ_PROFILE_ENTRY_H
 
-#include <ostream>
 #include "GeckoProfilerImpl.h"
 #include "JSAObjectBuilder.h"
 #include "platform.h"
 #include "mozilla/Mutex.h"
 
+class ThreadProfile;
 class ThreadProfile;
 
 class ProfileEntry
@@ -56,9 +56,7 @@ typedef void (*IterateTagsCallback)(const ProfileEntry& entry, const char* tagSt
 class ThreadProfile
 {
 public:
-  ThreadProfile(const char* aName, int aEntrySize, PseudoStack *aStack,
-                int aThreadId, PlatformData* aPlatformData,
-                bool aIsMainThread);
+  ThreadProfile(int aEntrySize, PseudoStack *aStack);
   ~ThreadProfile();
   void addTag(ProfileEntry aTag);
   void flush();
@@ -72,12 +70,6 @@ public:
   PseudoStack* GetPseudoStack();
   mozilla::Mutex* GetMutex();
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
-
-  bool IsMainThread() const { return mIsMainThread; }
-  const char* Name() const { return mName; }
-  int ThreadId() const { return mThreadId; }
-
-  PlatformData* GetPlatformData() { return mPlatformData; }
 private:
   // Circular buffer 'Keep One Slot Open' implementation
   // for simplicity
@@ -88,10 +80,6 @@ private:
   int            mEntrySize;
   PseudoStack*   mPseudoStack;
   mozilla::Mutex mMutex;
-  char*          mName;
-  int            mThreadId;
-  bool           mIsMainThread;
-  PlatformData*  mPlatformData;  // Platform specific data.
 };
 
 std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
diff --git a/tools/profiler/PseudoStack.h b/tools/profiler/PseudoStack.h
index b12bb226dae5..9079ffbfc3a8 100644
--- a/tools/profiler/PseudoStack.h
+++ b/tools/profiler/PseudoStack.h
@@ -220,10 +220,6 @@ public:
       mStartJSSampling = true;
     }
   }
-  void jsOperationCallback() {
-    if (mStartJSSampling)
-      enableJSSampling();
-  }
   void disableJSSampling() {
     mStartJSSampling = false;
     if (mRuntime)
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index 349f7e794338..c31d9d94e4fa 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -173,26 +173,16 @@ void TableTicker::BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile)
   JSCustomArray *threads = b.CreateArray();
   b.DefineProperty(profile, "threads", threads);
 
+  // For now we only have one thread
   SetPaused(true);
-
-  {
-    mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
-    for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
-      // Thread not being profiled, skip it
-      if (!sRegisteredThreads->at(i)->Profile())
-        continue;
-
-      MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
-
-      JSCustomObject* threadSamples = b.CreateObject();
-      sRegisteredThreads->at(i)->Profile()->BuildJSObject(b, threadSamples);
-      b.ArrayPush(threads, threadSamples);
-    }
-  }
-
+  ThreadProfile* prof = GetPrimaryThreadProfile();
+  prof->GetMutex()->Lock();
+  JSCustomObject* threadSamples = b.CreateObject();
+  prof->BuildJSObject(b, threadSamples);
+  b.ArrayPush(threads, threadSamples);
+  prof->GetMutex()->Unlock();
   SetPaused(false);
-} 
+}
 
 // END SaveProfileTask et al
 ////////////////////////////////////////////////////////////////////////
@@ -295,7 +285,7 @@ void StackWalkCallback(void* aPC, void* aSP, void* aClosure)
 void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample)
 {
 #ifndef XP_MACOSX
-  uintptr_t thread = GetThreadHandle(aSample->threadProfile->GetPlatformData());
+  uintptr_t thread = GetThreadHandle(platform_data());
   MOZ_ASSERT(thread);
 #endif
   void* pc_array[1000];
@@ -312,7 +302,7 @@ void TableTicker::doNativeBacktrace(ThreadProfile &aProfile, TickSample* aSample
 
   uint32_t maxFrames = uint32_t(array.size - array.count);
 #ifdef XP_MACOSX
-  pthread_t pt = GetProfiledThread(aSample->threadProfile->GetPlatformData());
+  pthread_t pt = GetProfiledThread(platform_data());
   void *stackEnd = reinterpret_cast<void*>(-1);
   if (pt)
     stackEnd = static_cast<char*>(pthread_get_stackaddr_np(pt));
@@ -393,12 +383,10 @@ void doSampleStackTrace(PseudoStack *aStack, ThreadProfile &aProfile, TickSample
 
 void TableTicker::Tick(TickSample* sample)
 {
-  ThreadProfile& currThreadProfile = *sample->threadProfile;
-
   // Marker(s) come before the sample
-  PseudoStack* stack = currThreadProfile.GetPseudoStack();
+  PseudoStack* stack = mPrimaryThreadProfile.GetPseudoStack();
   for (int i = 0; stack->getMarker(i) != NULL; i++) {
-    addDynamicTag(currThreadProfile, 'm', stack->getMarker(i));
+    addDynamicTag(mPrimaryThreadProfile, 'm', stack->getMarker(i));
   }
   stack->mQueueClearMarker = true;
 
@@ -410,7 +398,7 @@ void TableTicker::Tick(TickSample* sample)
       // XXX: we also probably want to add an entry to the profile to help
       // distinguish which samples are part of the same event. That, or record
       // the event generation in each sample
-      currThreadProfile.erase();
+      mPrimaryThreadProfile.erase();
     }
     sLastSampledEventGeneration = sCurrentEventGeneration;
 
@@ -426,29 +414,29 @@ void TableTicker::Tick(TickSample* sample)
 
 #if defined(USE_BACKTRACE) || defined(USE_NS_STACKWALK)
   if (mUseStackWalk) {
-    doNativeBacktrace(currThreadProfile, sample);
+    doNativeBacktrace(mPrimaryThreadProfile, sample);
   } else {
-    doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
+    doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
   }
 #else
-  doSampleStackTrace(stack, currThreadProfile, mAddLeafAddresses ? sample : nullptr);
+  doSampleStackTrace(stack, mPrimaryThreadProfile, mAddLeafAddresses ? sample : nullptr);
 #endif
 
   if (recordSample)
-    currThreadProfile.flush();
+    mPrimaryThreadProfile.flush();
 
-  if (!sLastTracerEvent.IsNull() && sample && currThreadProfile.IsMainThread()) {
+  if (!sLastTracerEvent.IsNull() && sample) {
     TimeDuration delta = sample->timestamp - sLastTracerEvent;
-    currThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
+    mPrimaryThreadProfile.addTag(ProfileEntry('r', delta.ToMilliseconds()));
   }
 
   if (sample) {
     TimeDuration delta = sample->timestamp - mStartTime;
-    currThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
+    mPrimaryThreadProfile.addTag(ProfileEntry('t', delta.ToMilliseconds()));
   }
 
   if (sLastFrameNumber != sFrameNumber) {
-    currThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
+    mPrimaryThreadProfile.addTag(ProfileEntry('f', sFrameNumber));
     sLastFrameNumber = sFrameNumber;
   }
 }
@@ -472,8 +460,7 @@ void mozilla_sampler_print_location1()
     return;
   }
 
-  ThreadProfile threadProfile("Temp", PROFILE_DEFAULT_ENTRY, stack,
-                              0, Sampler::AllocPlatformData(0), false);
+  ThreadProfile threadProfile(1000, stack);
   doSampleStackTrace(stack, threadProfile, NULL);
 
   threadProfile.flush();
diff --git a/tools/profiler/TableTicker.h b/tools/profiler/TableTicker.h
index 274f1aac05c0..6b00d1e1c6d5 100644
--- a/tools/profiler/TableTicker.h
+++ b/tools/profiler/TableTicker.h
@@ -5,7 +5,6 @@
 
 #include "platform.h"
 #include "ProfileEntry.h"
-#include "mozilla/Mutex.h"
 
 static bool
 hasFeature(const char** aFeatures, uint32_t aFeatureCount, const char* aFeature) {
@@ -26,10 +25,10 @@ class BreakpadSampler;
 
 class TableTicker: public Sampler {
  public:
-  TableTicker(int aInterval, int aEntrySize,
+  TableTicker(int aInterval, int aEntrySize, PseudoStack *aStack,
               const char** aFeatures, uint32_t aFeatureCount)
-    : Sampler(aInterval, true, aEntrySize)
-    , mPrimaryThreadProfile(nullptr)
+    : Sampler(aInterval, true)
+    , mPrimaryThreadProfile(aEntrySize, aStack)
     , mStartTime(TimeStamp::Now())
     , mSaveRequested(false)
   {
@@ -38,54 +37,13 @@ class TableTicker: public Sampler {
     //XXX: It's probably worth splitting the jank profiler out from the regular profiler at some point
     mJankOnly = hasFeature(aFeatures, aFeatureCount, "jank");
     mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
-    mProfileThreads = true || hasFeature(aFeatures, aFeatureCount, "threads");
     mAddLeafAddresses = hasFeature(aFeatures, aFeatureCount, "leaf");
-
-    {
-      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
-      // Create ThreadProfile for each registered thread
-      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-        ThreadInfo* info = sRegisteredThreads->at(i);
-
-        if (!info->IsMainThread() && !mProfileThreads)
-          continue;
-
-        ThreadProfile* profile = new ThreadProfile(info->Name(),
-                                                   aEntrySize,
-                                                   info->Stack(),
-                                                   info->ThreadId(),
-                                                   info->GetPlatformData(),
-                                                   info->IsMainThread());
-        profile->addTag(ProfileEntry('m', "Start"));
-
-        info->SetProfile(profile);
-      }
-
-      SetActiveSampler(this);
-    }
+    mPrimaryThreadProfile.addTag(ProfileEntry('m', "Start"));
   }
 
-  ~TableTicker() {
-    if (IsActive())
-      Stop();
+  ~TableTicker() { if (IsActive()) Stop(); }
 
-    SetActiveSampler(nullptr);
-
-    // Destroy ThreadProfile for all threads
-    {
-      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
-      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-        ThreadInfo* info = sRegisteredThreads->at(i);
-        ThreadProfile* profile = info->Profile();
-        if (profile) {
-          delete profile;
-          info->SetProfile(nullptr);
-        }
-      }
-    }
-  }
+  virtual void SampleStack(TickSample* sample) {}
 
   // Called within a signal. This function must be reentrant
   virtual void Tick(TickSample* sample);
@@ -100,27 +58,14 @@ class TableTicker: public Sampler {
 
   ThreadProfile* GetPrimaryThreadProfile()
   {
-    if (!mPrimaryThreadProfile) {
-      mozilla::MutexAutoLock lock(*sRegisteredThreadsMutex);
-
-      for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-        ThreadInfo* info = sRegisteredThreads->at(i);
-        if (info->IsMainThread()) {
-          mPrimaryThreadProfile = info->Profile();
-          break;
-        }
-      }
-    }
-
-    return mPrimaryThreadProfile;
+    return &mPrimaryThreadProfile;
   }
 
   void ToStreamAsJSON(std::ostream& stream);
   virtual JSObject *ToJSObject(JSContext *aCx);
   JSCustomObject *GetMetaJSCustomObject(JSAObjectBuilder& b);
 
-  bool ProfileJS() const { return mProfileJS; }
-  bool ProfileThreads() const { return mProfileThreads; }
+  const bool ProfileJS() { return mProfileJS; }
 
   virtual BreakpadSampler* AsBreakpadSampler() { return nullptr; }
 
@@ -131,21 +76,20 @@ protected:
   void BuildJSObject(JSAObjectBuilder& b, JSCustomObject* profile);
 
   // This represent the application's main thread (SAMPLER_INIT)
-  ThreadProfile* mPrimaryThreadProfile;
+  ThreadProfile mPrimaryThreadProfile;
   TimeStamp mStartTime;
   bool mSaveRequested;
   bool mAddLeafAddresses;
   bool mUseStackWalk;
   bool mJankOnly;
   bool mProfileJS;
-  bool mProfileThreads;
 };
 
 class BreakpadSampler: public TableTicker {
  public:
-  BreakpadSampler(int aInterval, int aEntrySize,
+  BreakpadSampler(int aInterval, int aEntrySize, PseudoStack *aStack,
               const char** aFeatures, uint32_t aFeatureCount)
-    : TableTicker(aInterval, aEntrySize, aFeatures, aFeatureCount)
+    : TableTicker(aInterval, aEntrySize, aStack, aFeatures, aFeatureCount)
   {}
 
   // Called within a signal. This function must be reentrant
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index ae8e02417970..b87ce4fba436 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -39,7 +39,6 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <stdlib.h>
-#include <sched.h>
 #ifdef ANDROID
 #include <android/log.h>
 #else
@@ -61,14 +60,9 @@
 #include <stdarg.h>
 #include "platform.h"
 #include "GeckoProfilerImpl.h"
-#include "mozilla/Mutex.h"
-#include "ProfileEntry.h"
-#include "nsThreadUtils.h"
-#include "TableTicker.h"
 
 #include <string.h>
 #include <stdio.h>
-#include <list>
 
 #define SIGNAL_SAVE_PROFILE SIGUSR2
 
@@ -81,6 +75,9 @@ pid_t gettid()
 }
 #endif
 
+static Sampler* sActiveSampler = NULL;
+
+
 #if !defined(ANDROID)
 // Keep track of when any of our threads calls fork(), so we can
 // temporarily disable signal delivery during the fork() call.  Not
@@ -99,9 +96,9 @@ static bool was_paused = false;
 // In the parent, just before the fork, record the pausedness state,
 // and then pause.
 static void paf_prepare(void) {
-  if (Sampler::GetActiveSampler()) {
-    was_paused = Sampler::GetActiveSampler()->IsPaused();
-    Sampler::GetActiveSampler()->SetPaused(true);
+  if (sActiveSampler) {
+    was_paused = sActiveSampler->IsPaused();
+    sActiveSampler->SetPaused(true);
   } else {
     was_paused = false;
   }
@@ -110,8 +107,8 @@ static void paf_prepare(void) {
 // In the parent, just after the fork, return pausedness to the
 // pre-fork state.
 static void paf_parent(void) {
-  if (Sampler::GetActiveSampler())
-    Sampler::GetActiveSampler()->SetPaused(was_paused);
+  if (sActiveSampler)
+    sActiveSampler->SetPaused(was_paused);
 }
 
 // Set up the fork handlers.  This is called just once, at the first
@@ -126,23 +123,8 @@ static void* setup_atfork() {
 #include "android-signal-defs.h"
 #endif
 
-struct SamplerRegistry {
-  static void AddActiveSampler(Sampler *sampler) {
-    ASSERT(!SamplerRegistry::sampler);
-    SamplerRegistry::sampler = sampler;
-  }
-  static void RemoveActiveSampler(Sampler *sampler) {
-    SamplerRegistry::sampler = NULL;
-  }
-  static Sampler *sampler;
-};
-
-Sampler *SamplerRegistry::sampler = NULL;
-
-static ThreadProfile* sCurrentThreadProfile = NULL;
-
 static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context) {
-  Sampler::GetActiveSampler()->RequestSave();
+  sActiveSampler->RequestSave();
 }
 
 #ifdef ANDROID
@@ -153,7 +135,7 @@ static void ProfilerSaveSignalHandler(int signal, siginfo_t* info, void* context
 #define V8_HOST_ARCH_X64 1
 #endif
 static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
-  if (!Sampler::GetActiveSampler())
+  if (!sActiveSampler)
     return;
 
   TickSample sample_obj;
@@ -162,7 +144,7 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 
 #ifdef ENABLE_SPS_LEAF_DATA
   // If profiling, we extract the current pc and sp.
-  if (Sampler::GetActiveSampler()->IsProfiling()) {
+  if (sActiveSampler->IsProfiling()) {
     // Extracting the sample from the context is extremely machine dependent.
     ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
     mcontext_t& mcontext = ucontext->uc_mcontext;
@@ -197,37 +179,70 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
 #endif
   }
 #endif
-  sample->threadProfile = sCurrentThreadProfile;
   sample->timestamp = mozilla::TimeStamp::Now();
 
-  Sampler::GetActiveSampler()->Tick(sample);
-
-  sCurrentThreadProfile = NULL;
+  sActiveSampler->Tick(sample);
 }
 
-int tgkill(pid_t tgid, pid_t tid, int signalno) {
-  return syscall(SYS_tgkill, tgid, tid, signalno);
+#ifndef XP_MACOSX
+void tgkill(pid_t tgid, pid_t tid, int signalno) {
+  syscall(SYS_tgkill, tgid, tid, signalno);
 }
+#endif
 
-class PlatformData : public Malloced {
+class Sampler::PlatformData : public Malloced {
  public:
-  PlatformData()
-  {}
+  explicit PlatformData(Sampler* sampler)
+      : sampler_(sampler),
+        signal_handler_installed_(false),
+        vm_tgid_(getpid()),
+#ifndef XP_MACOSX
+        vm_tid_(gettid()),
+#endif
+        signal_sender_launched_(false)
+#ifdef XP_MACOSX
+        , signal_receiver_(pthread_self())
+#endif
+  {
+  }
+
+  void SignalSender() {
+    while (sampler_->IsActive()) {
+      sampler_->HandleSaveRequest();
+
+      if (!sampler_->IsPaused()) {
+#ifdef XP_MACOSX
+        pthread_kill(signal_receiver_, SIGPROF);
+#else
+        // Glibc doesn't provide a wrapper for tgkill(2).
+        tgkill(vm_tgid_, vm_tid_, SIGPROF);
+#endif
+      }
+
+      // Convert ms to us and subtract 100 us to compensate delays
+      // occuring during signal delivery.
+      // TODO measure and confirm this.
+      const useconds_t interval = sampler_->interval_ * 1000 - 100;
+      //int result = usleep(interval);
+      usleep(interval);
+    }
+  }
+
+  Sampler* sampler_;
+  bool signal_handler_installed_;
+  struct sigaction old_sigprof_signal_handler_;
+  struct sigaction old_sigsave_signal_handler_;
+  pid_t vm_tgid_;
+  pid_t vm_tid_;
+  bool signal_sender_launched_;
+  pthread_t signal_sender_thread_;
+#ifdef XP_MACOSX
+  pthread_t signal_receiver_;
+#endif
 };
 
-/* static */ PlatformData*
-Sampler::AllocPlatformData(int aThreadId)
-{
-  return new PlatformData;
-}
 
-/* static */ void
-Sampler::FreePlatformData(PlatformData* aData)
-{
-  delete aData;
-}
-
-static void* SignalSender(void* arg) {
+static void* SenderEntry(void* arg) {
 # if defined(ANDROID)
   // pthread_atfork isn't available on Android.
   void* initialize_atfork = NULL;
@@ -236,72 +251,30 @@ static void* SignalSender(void* arg) {
   // It returns NULL.
   static void* initialize_atfork = setup_atfork();
 # endif
-
-  int vm_tgid_ = getpid();
-
-  while (SamplerRegistry::sampler->IsActive()) {
-    SamplerRegistry::sampler->HandleSaveRequest();
-
-    if (!SamplerRegistry::sampler->IsPaused()) {
-      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-      std::vector<ThreadInfo*> threads =
-        SamplerRegistry::sampler->GetRegisteredThreads();
-
-      for (uint32_t i = 0; i < threads.size(); i++) {
-        ThreadInfo* info = threads[i];
-
-        // This will be null if we're not interested in profiling this thread.
-        if (!info->Profile())
-          continue;
-
-        // We use sCurrentThreadProfile the ThreadProfile for the
-        // thread we're profiling to the signal handler
-        sCurrentThreadProfile = info->Profile();
-
-        int threadId = info->ThreadId();
-
-        if (tgkill(vm_tgid_, threadId, SIGPROF) != 0) {
-          printf_stderr("profiler failed to signal tid=%d\n", threadId);
-#ifdef DEBUG
-          abort();
-#endif
-          continue;
-        }
-
-        // Wait for the signal handler to run before moving on to the next one
-        while (sCurrentThreadProfile)
-          sched_yield();
-      }
-    }
-
-    // Convert ms to us and subtract 100 us to compensate delays
-    // occuring during signal delivery.
-    // TODO measure and confirm this.
-    const useconds_t interval =
-      SamplerRegistry::sampler->interval() * 1000 - 100;
-    //int result = usleep(interval);
-    usleep(interval);
-  }
+  Sampler::PlatformData* data =
+      reinterpret_cast<Sampler::PlatformData*>(arg);
+  data->SignalSender();
   return initialize_atfork; // which is guaranteed to be NULL
 }
 
-Sampler::Sampler(int interval, bool profiling, int entrySize)
+
+Sampler::Sampler(int interval, bool profiling)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false),
-      entrySize_(entrySize) {
+      active_(false) {
+  data_ = new PlatformData(this);
 }
 
 Sampler::~Sampler() {
-  ASSERT(!signal_sender_launched_);
+  ASSERT(!data_->signal_sender_launched_);
+  delete data_;
 }
 
 
 void Sampler::Start() {
   LOG("Sampler started");
-
-  SamplerRegistry::AddActiveSampler(this);
+  if (sActiveSampler != NULL) return;
 
   // Request profiling signals.
   LOG("Request signal");
@@ -309,7 +282,7 @@ void Sampler::Start() {
   sa.sa_sigaction = ProfilerSignalHandler;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGPROF, &sa, &old_sigprof_signal_handler_) != 0) {
+  if (sigaction(SIGPROF, &sa, &data_->old_sigprof_signal_handler_) != 0) {
     LOG("Error installing signal");
     return;
   }
@@ -319,22 +292,25 @@ void Sampler::Start() {
   sa2.sa_sigaction = ProfilerSaveSignalHandler;
   sigemptyset(&sa2.sa_mask);
   sa2.sa_flags = SA_RESTART | SA_SIGINFO;
-  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &old_sigsave_signal_handler_) != 0) {
+  if (sigaction(SIGNAL_SAVE_PROFILE, &sa2, &data_->old_sigsave_signal_handler_) != 0) {
     LOG("Error installing start signal");
     return;
   }
   LOG("Signal installed");
-  signal_handler_installed_ = true;
+  data_->signal_handler_installed_ = true;
 
   // Start a thread that sends SIGPROF signal to VM thread.
   // Sending the signal ourselves instead of relying on itimer provides
   // much better accuracy.
   SetActive(true);
   if (pthread_create(
-        &signal_sender_thread_, NULL, SignalSender, NULL) == 0) {
-    signal_sender_launched_ = true;
+          &data_->signal_sender_thread_, NULL, SenderEntry, data_) == 0) {
+    data_->signal_sender_launched_ = true;
   }
   LOG("Profiler thread started");
+
+  // Set this sampler as the active sampler.
+  sActiveSampler = this;
 }
 
 
@@ -343,68 +319,20 @@ void Sampler::Stop() {
 
   // Wait for signal sender termination (it will exit after setting
   // active_ to false).
-  if (signal_sender_launched_) {
-    pthread_join(signal_sender_thread_, NULL);
-    signal_sender_launched_ = false;
+  if (data_->signal_sender_launched_) {
+    pthread_join(data_->signal_sender_thread_, NULL);
+    data_->signal_sender_launched_ = false;
   }
 
-  SamplerRegistry::RemoveActiveSampler(this);
-
   // Restore old signal handler
-  if (signal_handler_installed_) {
-    sigaction(SIGNAL_SAVE_PROFILE, &old_sigsave_signal_handler_, 0);
-    sigaction(SIGPROF, &old_sigprof_signal_handler_, 0);
-    signal_handler_installed_ = false;
-  }
-}
-
-bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
-{
-  if (!Sampler::sRegisteredThreadsMutex)
-    return false;
-
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  ThreadInfo* info = new ThreadInfo(aName, gettid(),
-    aIsMainThread, aPseudoStack);
-
-  bool profileThread = sActiveSampler &&
-    (aIsMainThread || sActiveSampler->ProfileThreads());
-
-  if (profileThread) {
-    // We need to create the ThreadProfile now
-    info->SetProfile(new ThreadProfile(info->Name(),
-                                       sActiveSampler->EntrySize(),
-                                       info->Stack(),
-                                       info->ThreadId(),
-                                       info->GetPlatformData(),
-                                       aIsMainThread));
-    if (sActiveSampler->ProfileJS()) {
-      info->Profile()->GetPseudoStack()->enableJSSampling();
-    }
+  if (data_->signal_handler_installed_) {
+    sigaction(SIGNAL_SAVE_PROFILE, &data_->old_sigsave_signal_handler_, 0);
+    sigaction(SIGPROF, &data_->old_sigprof_signal_handler_, 0);
+    data_->signal_handler_installed_ = false;
   }
 
-  sRegisteredThreads->push_back(info);
-  return true;
-}
-
-void Sampler::UnregisterCurrentThread()
-{
-  if (!Sampler::sRegisteredThreadsMutex)
-    return;
-
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  int id = gettid();
-
-  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-    ThreadInfo* info = sRegisteredThreads->at(i);
-    if (info->ThreadId() == id) {
-      delete info;
-      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
-      break;
-    }
-  }
+  // This sampler is no longer the active sampler.
+  sActiveSampler = NULL;
 }
 
 #ifdef ANDROID
@@ -428,4 +356,3 @@ void OS::RegisterStartHandler()
   }
 }
 #endif
-
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index f5d1d9ad5be4..99392cc7ed61 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -28,10 +28,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nsThreadUtils.h"
-
 #include "platform.h"
-#include "TableTicker.h"
 #include "UnwinderThread2.h"  /* uwt__register_thread_for_profiling */
 
 // this port is based off of v8 svn revision 9837
@@ -92,13 +89,21 @@ void OS::Sleep(int milliseconds) {
   usleep(1000 * milliseconds);
 }
 
+class Thread::PlatformData : public Malloced {
+ public:
+  PlatformData() : thread_(kNoThread) {}
+  pthread_t thread_;  // Thread handle for pthread.
+};
+
 Thread::Thread(const char* name)
-    : stack_size_(0) {
+    : data_(new PlatformData),
+      stack_size_(0) {
   set_name(name);
 }
 
 
 Thread::~Thread() {
+  delete data_;
 }
 
 
@@ -134,9 +139,9 @@ static void* ThreadEntry(void* arg) {
   }
   // END temp hack for SPS v1-vs-v2
 
-  thread->thread_ = pthread_self();
+  thread->data()->thread_ = pthread_self();
   SetThreadName(thread->name());
-  ASSERT(thread->thread_ != kNoThread);
+  ASSERT(thread->data()->thread_ != kNoThread);
   thread->Run();
   return NULL;
 }
@@ -156,15 +161,15 @@ void Thread::Start() {
     pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_));
     attr_ptr = &attr;
   }
-  pthread_create(&thread_, attr_ptr, ThreadEntry, this);
-  ASSERT(thread_ != kNoThread);
+  pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this);
+  ASSERT(data_->thread_ != kNoThread);
 }
 
 void Thread::Join() {
-  pthread_join(thread_, NULL);
+  pthread_join(data_->thread_, NULL);
 }
 
-class PlatformData : public Malloced {
+class Sampler::PlatformData : public Malloced {
  public:
   PlatformData() : profiled_thread_(mach_thread_self())
   {
@@ -190,26 +195,15 @@ class PlatformData : public Malloced {
   pthread_t profiled_pthread_;
 };
 
-/* static */ PlatformData*
-Sampler::AllocPlatformData(int aThreadId)
-{
-  return new PlatformData;
-}
-
-/* static */ void
-Sampler::FreePlatformData(PlatformData* aData)
-{
-  delete aData;
-}
 
 class SamplerThread : public Thread {
  public:
   explicit SamplerThread(int interval)
-      : Thread("SamplerThread")
-      , interval_(interval) {}
+      : Thread("SamplerThread"),
+        interval_(interval) {}
 
   static void AddActiveSampler(Sampler* sampler) {
-    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+    ScopedLock lock(mutex_);
     SamplerRegistry::AddActiveSampler(sampler);
     if (instance_ == NULL) {
       instance_ = new SamplerThread(sampler->interval());
@@ -220,45 +214,37 @@ class SamplerThread : public Thread {
   }
 
   static void RemoveActiveSampler(Sampler* sampler) {
-    mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
+    ScopedLock lock(mutex_);
     instance_->Join();
     //XXX: unlike v8 we need to remove the active sampler after doing the Join
     // because we drop the sampler immediately
     SamplerRegistry::RemoveActiveSampler(sampler);
     delete instance_;
     instance_ = NULL;
+    /*
+    if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) {
+      RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_);
+      delete instance_;
+      instance_ = NULL;
+    }
+    */
   }
 
   // Implement Thread::Run().
   virtual void Run() {
     while (SamplerRegistry::sampler->IsActive()) {
-      {
-        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-        std::vector<ThreadInfo*> threads =
-          SamplerRegistry::sampler->GetRegisteredThreads();
-        for (uint32_t i = 0; i < threads.size(); i++) {
-          ThreadInfo* info = threads[i];
-
-          // This will be null if we're not interested in profiling this thread.
-          if (!info->Profile())
-            continue;
-
-          ThreadProfile* thread_profile = info->Profile();
-
-          if (!SamplerRegistry::sampler->IsPaused())
-            SampleContext(SamplerRegistry::sampler, thread_profile);
-        }
-      }
+      if (!SamplerRegistry::sampler->IsPaused())
+        SampleContext(SamplerRegistry::sampler);
       OS::Sleep(interval_);
     }
   }
 
-  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
-    thread_act_t profiled_thread =
-      thread_profile->GetPlatformData()->profiled_thread();
-
+  void SampleContext(Sampler* sampler) {
+    thread_act_t profiled_thread = sampler->platform_data()->profiled_thread();
     TickSample sample_obj;
     TickSample* sample = &sample_obj;
+    //TickSample* sample = CpuProfiler::TickSampleEvent(sampler->isolate());
+    //if (sample == NULL) sample = &sample_obj;
 
     if (KERN_SUCCESS != thread_suspend(profiled_thread)) return;
 
@@ -288,11 +274,12 @@ class SamplerThread : public Thread {
                          flavor,
                          reinterpret_cast<natural_t*>(&state),
                          &count) == KERN_SUCCESS) {
+      //sample->state = sampler->isolate()->current_vm_state();
       sample->pc = reinterpret_cast<Address>(state.REGISTER_FIELD(ip));
       sample->sp = reinterpret_cast<Address>(state.REGISTER_FIELD(sp));
       sample->fp = reinterpret_cast<Address>(state.REGISTER_FIELD(bp));
       sample->timestamp = mozilla::TimeStamp::Now();
-      sample->threadProfile = thread_profile;
+      sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
     thread_resume(profiled_thread);
@@ -310,21 +297,25 @@ class SamplerThread : public Thread {
 
 #undef REGISTER_FIELD
 
+
+Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
-Sampler::Sampler(int interval, bool profiling, int entrySize)
+
+Sampler::Sampler(int interval, bool profiling)
     : // isolate_(isolate),
       interval_(interval),
       profiling_(profiling),
       paused_(false),
-      active_(false),
-      entrySize_(entrySize) /*,
+      active_(false) /*,
       samples_taken_(0)*/ {
+  data_ = new PlatformData;
 }
 
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
+  delete data_;
 }
 
 
@@ -342,62 +333,7 @@ void Sampler::Stop() {
 }
 
 pthread_t
-Sampler::GetProfiledThread(PlatformData* aData)
+Sampler::GetProfiledThread(Sampler::PlatformData* aData)
 {
   return aData->profiled_pthread();
 }
-
-#include <sys/syscall.h>
-pid_t gettid()
-{
-  return (pid_t) syscall(SYS_thread_selfid);
-}
-
-bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
-{
-  if (!Sampler::sRegisteredThreadsMutex)
-    return false;
-
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  ThreadInfo* info = new ThreadInfo(aName, gettid(),
-    aIsMainThread, aPseudoStack);
-
-  bool profileThread = sActiveSampler &&
-    (aIsMainThread || sActiveSampler->ProfileThreads());
-
-  if (profileThread) {
-    // We need to create the ThreadProfile now
-    info->SetProfile(new ThreadProfile(info->Name(),
-                                       sActiveSampler->EntrySize(),
-                                       info->Stack(),
-                                       info->ThreadId(),
-                                       info->GetPlatformData(),
-                                       aIsMainThread));
-    if (sActiveSampler->ProfileJS()) {
-      info->Profile()->GetPseudoStack()->enableJSSampling();
-    }
-  }
-
-  sRegisteredThreads->push_back(info);
-  return true;
-}
-
-void Sampler::UnregisterCurrentThread()
-{
-  if (!Sampler::sRegisteredThreadsMutex)
-    return;
-
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  int id = gettid();
-
-  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-    ThreadInfo* info = sRegisteredThreads->at(i);
-    if (info->ThreadId() == id) {
-      delete info;
-      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
-      break;
-    }
-  }
-}
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index ad4eef407802..af68f4c52354 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -28,23 +28,22 @@
 
 #include <windows.h>
 #include <mmsystem.h>
-#include <process.h>
 #include "platform.h"
-#include "TableTicker.h"
-#include "ProfileEntry.h"
+#include <process.h>
 
-class PlatformData : public Malloced {
+
+class Sampler::PlatformData : public Malloced {
  public:
   // Get a handle to the calling thread. This is the thread that we are
   // going to profile. We need to make a copy of the handle because we are
   // going to use it in the sampler thread. Using GetThreadHandle() will
   // not work in this case. We're using OpenThread because DuplicateHandle
   // for some reason doesn't work in Chrome's sandbox.
-  PlatformData(int aThreadId) : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
+  PlatformData() : profiled_thread_(OpenThread(THREAD_GET_CONTEXT |
                                                THREAD_SUSPEND_RESUME |
                                                THREAD_QUERY_INFORMATION,
                                                false,
-                                               aThreadId)) {}
+                                               GetCurrentThreadId())) {}
 
   ~PlatformData() {
     if (profiled_thread_ != NULL) {
@@ -59,20 +58,8 @@ class PlatformData : public Malloced {
   HANDLE profiled_thread_;
 };
 
-/* static */ PlatformData*
-Sampler::AllocPlatformData(int aThreadId)
-{
-  return new PlatformData(aThreadId);
-}
-
-/* static */ void
-Sampler::FreePlatformData(PlatformData* aData)
-{
-  delete aData;
-}
-
 uintptr_t
-Sampler::GetThreadHandle(PlatformData* aData)
+Sampler::GetThreadHandle(Sampler::PlatformData* aData)
 {
   return (uintptr_t) aData->profiled_thread();
 }
@@ -80,9 +67,9 @@ Sampler::GetThreadHandle(PlatformData* aData)
 class SamplerThread : public Thread {
  public:
   SamplerThread(int interval, Sampler* sampler)
-      : Thread("SamplerThread")
-      , interval_(interval)
-      , sampler_(sampler) {}
+      : Thread("SamplerThread"),
+        interval_(interval),
+        sampler_(sampler) {}
 
   static void StartSampler(Sampler* sampler) {
     if (instance_ == NULL) {
@@ -109,24 +96,8 @@ class SamplerThread : public Thread {
         ::timeBeginPeriod(interval_);
 
     while (sampler_->IsActive()) {
-      {
-        mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-        std::vector<ThreadInfo*> threads =
-          sampler_->GetRegisteredThreads();
-        for (uint32_t i = 0; i < threads.size(); i++) {
-          ThreadInfo* info = threads[i];
-
-          // This will be null if we're not interested in profiling this thread.
-          if (!info->Profile())
-            continue;
-
-          ThreadProfile* thread_profile = info->Profile();
-
-          if (!sampler_->IsPaused()) {
-            SampleContext(sampler_, thread_profile);
-          }
-        }
-      }
+      if (!sampler_->IsPaused())
+        SampleContext(sampler_);
       OS::Sleep(interval_);
     }
 
@@ -135,10 +106,8 @@ class SamplerThread : public Thread {
         ::timeEndPeriod(interval_);
   }
 
-  void SampleContext(Sampler* sampler, ThreadProfile* thread_profile) {
-    uintptr_t thread = Sampler::GetThreadHandle(
-                               thread_profile->GetPlatformData());
-    HANDLE profiled_thread = reinterpret_cast<HANDLE>(thread);
+  void SampleContext(Sampler* sampler) {
+    HANDLE profiled_thread = sampler->platform_data()->profiled_thread();
     if (profiled_thread == NULL)
       return;
 
@@ -151,7 +120,6 @@ class SamplerThread : public Thread {
 
     // Grab the timestamp before pausing the thread, to avoid deadlocks.
     sample->timestamp = mozilla::TimeStamp::Now();
-    sample->threadProfile = thread_profile;
 
     static const DWORD kSuspendFailed = static_cast<DWORD>(-1);
     if (SuspendThread(profiled_thread) == kSuspendFailed)
@@ -169,6 +137,7 @@ class SamplerThread : public Thread {
       sample->fp = reinterpret_cast<Address>(context.Ebp);
 #endif
       sample->context = &context;
+      sampler->SampleStack(sample);
       sampler->Tick(sample);
     }
     ResumeThread(profiled_thread);
@@ -186,16 +155,17 @@ class SamplerThread : public Thread {
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
-Sampler::Sampler(int interval, bool profiling, int entrySize)
+Sampler::Sampler(int interval, bool profiling)
     : interval_(interval),
       profiling_(profiling),
       paused_(false),
       active_(false),
-      entrySize_(entrySize) {
+      data_(new PlatformData) {
 }
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
+  delete data_;
 }
 
 void Sampler::Start() {
@@ -219,11 +189,18 @@ static unsigned int __stdcall ThreadEntry(void* arg) {
   return 0;
 }
 
+class Thread::PlatformData : public Malloced {
+ public:
+  explicit PlatformData(HANDLE thread) : thread_(thread) {}
+  HANDLE thread_;
+  unsigned thread_id_;
+};
+
 // Initialize a Win32 thread object. The thread has an invalid thread
 // handle until it is started.
 Thread::Thread(const char* name)
     : stack_size_(0) {
-  thread_ = kNoThread;
+  data_ = new PlatformData(kNoThread);
   set_name(name);
 }
 
@@ -234,78 +211,30 @@ void Thread::set_name(const char* name) {
 
 // Close our own handle for the thread.
 Thread::~Thread() {
-  if (thread_ != kNoThread) CloseHandle(thread_);
+  if (data_->thread_ != kNoThread) CloseHandle(data_->thread_);
+  delete data_;
 }
 
 // Create a new thread. It is important to use _beginthreadex() instead of
 // the Win32 function CreateThread(), because the CreateThread() does not
 // initialize thread specific structures in the C runtime library.
 void Thread::Start() {
-  thread_ = reinterpret_cast<HANDLE>(
+  data_->thread_ = reinterpret_cast<HANDLE>(
       _beginthreadex(NULL,
                      static_cast<unsigned>(stack_size_),
                      ThreadEntry,
                      this,
                      0,
-                     &thread_id_));
+                     &data_->thread_id_));
 }
 
 // Wait for thread to terminate.
 void Thread::Join() {
-  if (thread_id_ != GetCurrentThreadId()) {
-    WaitForSingleObject(thread_, INFINITE);
+  if (data_->thread_id_ != GetCurrentThreadId()) {
+    WaitForSingleObject(data_->thread_, INFINITE);
   }
 }
 
 void OS::Sleep(int milliseconds) {
   ::Sleep(milliseconds);
 }
-
-bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
-{
-  if (!Sampler::sRegisteredThreadsMutex)
-    return false;
-
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  ThreadInfo* info = new ThreadInfo(aName, GetCurrentThreadId(),
-    aIsMainThread, aPseudoStack);
-
-  bool profileThread = sActiveSampler &&
-    (aIsMainThread || sActiveSampler->ProfileThreads());
-
-  if (profileThread) {
-    // We need to create the ThreadProfile now
-    info->SetProfile(new ThreadProfile(info->Name(),
-                                       sActiveSampler->EntrySize(),
-                                       info->Stack(),
-                                       GetCurrentThreadId(),
-                                       info->GetPlatformData(),
-                                       aIsMainThread));
-    if (sActiveSampler->ProfileJS()) {
-      info->Profile()->GetPseudoStack()->enableJSSampling();
-    }
-  }
-
-  sRegisteredThreads->push_back(info);
-  return true;
-}
-
-void Sampler::UnregisterCurrentThread()
-{
-  if (!Sampler::sRegisteredThreadsMutex)
-    return;
-
-  mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-
-  int id = GetCurrentThreadId();
-
-  for (uint32_t i = 0; i < sRegisteredThreads->size(); i++) {
-    ThreadInfo* info = sRegisteredThreads->at(i);
-    if (info->ThreadId() == id) {
-      delete info;
-      sRegisteredThreads->erase(sRegisteredThreads->begin() + i);
-      break;
-    }
-  }
-}
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index c0230f2d7a86..653b681dd17c 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -18,7 +18,6 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "mozilla/Services.h"
-#include "nsThreadUtils.h"
 
 mozilla::ThreadLocal<PseudoStack *> tlsPseudoStack;
 mozilla::ThreadLocal<TableTicker *> tlsTicker;
@@ -28,17 +27,15 @@ mozilla::ThreadLocal<TableTicker *> tlsTicker;
 // it as the flag itself.
 bool stack_key_initialized;
 
-TimeStamp   sLastTracerEvent; // is raced on
-int         sFrameNumber = 0;
-int         sLastFrameNumber = 0;
-int         sInitCount = 0; // Each init must have a matched shutdown.
-static bool sIsProfiling = false; // is raced on
+TimeStamp sLastTracerEvent; // is raced on
+int       sFrameNumber = 0;
+int       sLastFrameNumber = 0;
 
 /* used to keep track of the last event that we sampled during */
 unsigned int sLastSampledEventGeneration = 0;
 
 /* a counter that's incremented everytime we get responsiveness event
- * note: it might also be worth trackplaing everytime we go around
+ * note: it might also be worth tracking everytime we go around
  * the event loop */
 unsigned int sCurrentEventGeneration = 0;
 /* we don't need to worry about overflow because we only treat the
@@ -46,40 +43,6 @@ unsigned int sCurrentEventGeneration = 0;
  * a problem if 2^32 events happen between samples that we need
  * to know are associated with different events */
 
-std::vector<ThreadInfo*>* Sampler::sRegisteredThreads = nullptr;
-mozilla::Mutex* Sampler::sRegisteredThreadsMutex = nullptr;
-
-TableTicker* Sampler::sActiveSampler;
-
-void Sampler::Startup() {
-  sRegisteredThreads = new std::vector<ThreadInfo*>();
-  sRegisteredThreadsMutex = new mozilla::Mutex("sRegisteredThreads mutex");
-}
-
-void Sampler::Shutdown() {
-  while (sRegisteredThreads->size() > 0) {
-    delete sRegisteredThreads->back();
-    sRegisteredThreads->pop_back();
-  }
-
-  delete sRegisteredThreadsMutex;
-  delete sRegisteredThreads;
-
-  // UnregisterThread can be called after shutdown in XPCShell. Thus
-  // we need to point to null to ignore such a call after shutdown.
-  sRegisteredThreadsMutex = nullptr;
-  sRegisteredThreads = nullptr;
-}
-
-ThreadInfo::~ThreadInfo() {
-  free(mName);
-
-  if (mProfile)
-    delete mProfile;
-
-  Sampler::FreePlatformData(mPlatformData);
-}
-
 bool sps_version2()
 {
   static int version = 0; // Raced on, potentially
@@ -249,8 +212,6 @@ void read_profiler_env_vars()
 
 void mozilla_sampler_init()
 {
-  sInitCount++;
-
   if (stack_key_initialized)
     return;
 
@@ -261,13 +222,9 @@ void mozilla_sampler_init()
   }
   stack_key_initialized = true;
 
-  Sampler::Startup();
-
   PseudoStack *stack = new PseudoStack();
   tlsPseudoStack.set(stack);
 
-  Sampler::RegisterCurrentThread("Gecko", stack, true);
-
   if (sps_version2()) {
     // Read mode settings from MOZ_PROFILER_MODE and interval
     // settings from MOZ_PROFILER_INTERVAL and stack-scan threshhold
@@ -314,11 +271,6 @@ void mozilla_sampler_init()
 
 void mozilla_sampler_shutdown()
 {
-  sInitCount--;
-
-  if (sInitCount > 0)
-    return;
-
   // Save the profile on shutdown if requested.
   TableTicker *t = tlsTicker.get();
   if (t) {
@@ -342,9 +294,6 @@ void mozilla_sampler_shutdown()
   }
 
   profiler_stop();
-
-  Sampler::Shutdown();
-
   // We can't delete the Stack because we can be between a
   // sampler call_enter/call_exit point.
   // TODO Need to find a safe time to delete Stack
@@ -403,7 +352,6 @@ const char** mozilla_sampler_get_features()
 #endif
     "jank",
     "js",
-    "threads",
     NULL
   };
 
@@ -435,29 +383,16 @@ void mozilla_sampler_start(int aProfileEntries, int aInterval,
   if (sps_version2()) {
     t = new BreakpadSampler(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                            aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                           aFeatures, aFeatureCount);
+                           stack, aFeatures, aFeatureCount);
   } else {
     t = new TableTicker(aInterval ? aInterval : PROFILE_DEFAULT_INTERVAL,
                         aProfileEntries ? aProfileEntries : PROFILE_DEFAULT_ENTRY,
-                        aFeatures, aFeatureCount);
+                        stack, aFeatures, aFeatureCount);
   }
   tlsTicker.set(t);
   t->Start();
-  if (t->ProfileJS()) {
-      mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
-      std::vector<ThreadInfo*> threads = t->GetRegisteredThreads();
-
-      for (uint32_t i = 0; i < threads.size(); i++) {
-        ThreadInfo* info = threads[i];
-        ThreadProfile* thread_profile = info->Profile();
-        if (!thread_profile) {
-          continue;
-        }
-        thread_profile->GetPseudoStack()->enableJSSampling();
-      }
-  }
-
-  sIsProfiling = true;
+  if (t->ProfileJS())
+      stack->enableJSSampling();
 
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
@@ -485,8 +420,6 @@ void mozilla_sampler_stop()
   if (disableJS)
     stack->disableJSSampling();
 
-  sIsProfiling = false;
-
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os)
     os->NotifyObservers(nullptr, "profiler-stopped", nullptr);
@@ -494,7 +427,15 @@ void mozilla_sampler_stop()
 
 bool mozilla_sampler_is_active()
 {
-  return sIsProfiling;
+  if (!stack_key_initialized)
+    profiler_init();
+
+  TableTicker *t = tlsTicker.get();
+  if (!t) {
+    return false;
+  }
+
+  return t->IsActive();
 }
 
 static double sResponsivenessTimes[100];
@@ -546,20 +487,6 @@ void mozilla_sampler_unlock()
     os->NotifyObservers(nullptr, "profiler-unlocked", nullptr);
 }
 
-bool mozilla_sampler_register_thread(const char* aName)
-{
-  PseudoStack* stack = new PseudoStack();
-  tlsPseudoStack.set(stack);
-
-  return Sampler::RegisterCurrentThread(aName, stack, false);
-}
-
-void mozilla_sampler_unregister_thread()
-{
-  Sampler::UnregisterCurrentThread();
-}
-
 // END externally visible functions
 ////////////////////////////////////////////////////////////////////////
 
-
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index f78c6911f9d4..22bc75afbe87 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -35,23 +35,14 @@
 #define __android_log_print(a, ...)
 #endif
 
-#ifdef XP_UNIX
-#include <pthread.h>
-#endif
-
 #include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 #include "mozilla/unused.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/Mutex.h"
 #include "PlatformMacros.h"
 #include "v8-support.h"
 #include <vector>
 
-#ifdef XP_WIN
-#include <windows.h>
-#endif
-
 #define ASSERT(a) MOZ_ASSERT(a)
 
 #ifdef ANDROID
@@ -192,17 +183,14 @@ class Thread {
   // prctl().
   static const int kMaxThreadNameLength = 16;
 
-#ifdef XP_WIN
-  HANDLE thread_;
-  unsigned thread_id_;
-#endif
-#if defined(XP_MACOSX)
-  pthread_t thread_;
-#endif
+  class PlatformData;
+  PlatformData* data() { return data_; }
 
  private:
   void set_name(const char *name);
 
+  PlatformData* data_;
+
   char name_[kMaxThreadNameLength];
   int stack_size_;
 
@@ -244,9 +232,6 @@ extern int     sUnwindStackScan;  /* max # of dubious frames allowed */
 // (if used for profiling) the program counter and stack pointer for
 // the thread that created it.
 
-class PseudoStack;
-class ThreadProfile;
-
 // TickSample captures the information collected for each sample.
 class TickSample {
  public:
@@ -270,23 +255,23 @@ class TickSample {
   Address function;  // The last called JS function.
   void*   context;   // The context from the signal handler, if available. On
                      // Win32 this may contain the windows thread context.
-  ThreadProfile* threadProfile;
   static const int kMaxFramesCount = 64;
+  Address stack[kMaxFramesCount];  // Call stack.
   int frames_count;  // Number of captured frames.
   mozilla::TimeStamp timestamp;
 };
 
-class ThreadInfo;
-class PlatformData;
-class TableTicker;
 class Sampler {
  public:
   // Initialize sampler.
-  explicit Sampler(int interval, bool profiling, int entrySize);
+  explicit Sampler(int interval, bool profiling);
   virtual ~Sampler();
 
   int interval() const { return interval_; }
 
+  // Performs stack sampling.
+  virtual void SampleStack(TickSample* sample) = 0;
+
   // This method is called for each sampling period with the current
   // program counter.
   virtual void Tick(TickSample* sample) = 0;
@@ -310,14 +295,9 @@ class Sampler {
   bool IsPaused() const { return paused_; }
   void SetPaused(bool value) { NoBarrier_Store(&paused_, value); }
 
-  virtual bool ProfileThreads() const = 0;
+  class PlatformData;
 
-  int EntrySize() { return entrySize_; }
-
-  // We can't new/delete the type safely without defining it
-  // (-Wdelete-incomplete). Use these Alloc/Free functions instead.
-  static PlatformData* AllocPlatformData(int aThreadId);
-  static void FreePlatformData(PlatformData*);
+  PlatformData* platform_data() { return data_; }
 
   // If we move the backtracing code into the platform files we won't
   // need to have these hacks
@@ -328,26 +308,6 @@ class Sampler {
 #ifdef XP_MACOSX
   static pthread_t GetProfiledThread(PlatformData*);
 #endif
-
-  static std::vector<ThreadInfo*> GetRegisteredThreads() {
-    return *sRegisteredThreads;
-  }
-
-  static bool RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread);
-  static void UnregisterCurrentThread();
-
-  static void Startup();
-  // Should only be called on shutdown
-  static void Shutdown();
-
-  static TableTicker* GetActiveSampler() { return sActiveSampler; }
-  static void SetActiveSampler(TableTicker* sampler) { sActiveSampler = sampler; }
-
-  static mozilla::Mutex* sRegisteredThreadsMutex;
- protected:
-  static std::vector<ThreadInfo*>* sRegisteredThreads;
-  static TableTicker* sActiveSampler;
-
  private:
   void SetActive(bool value) { NoBarrier_Store(&active_, value); }
 
@@ -355,47 +315,7 @@ class Sampler {
   const bool profiling_;
   Atomic32 paused_;
   Atomic32 active_;
-  const int entrySize_;
-
-  // Refactor me!
-#if defined(SPS_OS_linux) || defined(SPS_OS_android)
-  bool signal_handler_installed_;
-  struct sigaction old_sigprof_signal_handler_;
-  struct sigaction old_sigsave_signal_handler_;
-  bool signal_sender_launched_;
-  pthread_t signal_sender_thread_;
-#endif
-};
-
-class ThreadInfo {
- public:
-  ThreadInfo(const char* aName, int aThreadId, bool aIsMainThread, PseudoStack* aPseudoStack)
-    : mName(strdup(aName))
-    , mThreadId(aThreadId)
-    , mIsMainThread(aIsMainThread)
-    , mPseudoStack(aPseudoStack)
-    , mPlatformData(Sampler::AllocPlatformData(aThreadId))
-    , mProfile(NULL) {}
-
-  virtual ~ThreadInfo();
-
-  const char* Name() const { return mName; }
-  int ThreadId() const { return mThreadId; }
-
-  bool IsMainThread() const { return mIsMainThread; }
-  PseudoStack* Stack() const { return mPseudoStack; }
-  
-  void SetProfile(ThreadProfile* aProfile) { mProfile = aProfile; }
-  ThreadProfile* Profile() const { return mProfile; }
-
-  PlatformData* GetPlatformData() const { return mPlatformData; }
- private:
-  char* mName;
-  int mThreadId;
-  const bool mIsMainThread;
-  PseudoStack* mPseudoStack;
-  PlatformData* mPlatformData;
-  ThreadProfile* mProfile;
+  PlatformData* data_;  // Platform specific data.
 };
 
 #endif /* ndef TOOLS_PLATFORM_H_ */
diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index b9bd79fa1a1c..ec8afdbf1c67 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -733,8 +733,6 @@ ShutdownXPCOM(nsIServiceManager* servMgr)
 
     NS_LogTerm();
 
-    profiler_shutdown();
-
     return NS_OK;
 }
 

From 3e1b613ce9468b95c0f2bbc565fd3f88723a011c Mon Sep 17 00:00:00 2001
From: Dave Hylands <dhylands@mozilla.com>
Date: Thu, 18 Apr 2013 16:13:23 +0200
Subject: [PATCH 427/438] Bug 860934 - Use relative paths when handling device
 storage r=dougt

---
 dom/bluetooth/BluetoothOppManager.cpp         |  15 +-
 dom/camera/GonkCameraControl.cpp              |   3 +-
 dom/devicestorage/DeviceStorage.h             |  20 +-
 .../DeviceStorageRequestChild.cpp             |  11 +-
 .../DeviceStorageRequestParent.cpp            |  55 ++-
 .../DeviceStorageRequestParent.h              |  11 +-
 dom/devicestorage/PDeviceStorageRequest.ipdl  |   4 +-
 dom/devicestorage/nsDeviceStorage.cpp         | 317 ++++++++++--------
 dom/ipc/ContentChild.cpp                      |   5 +-
 dom/ipc/ContentParent.cpp                     |  17 +-
 dom/ipc/PContent.ipdl                         |  17 +-
 11 files changed, 243 insertions(+), 232 deletions(-)

diff --git a/dom/bluetooth/BluetoothOppManager.cpp b/dom/bluetooth/BluetoothOppManager.cpp
index 7847e768d66d..aec315cdadfc 100644
--- a/dom/bluetooth/BluetoothOppManager.cpp
+++ b/dom/bluetooth/BluetoothOppManager.cpp
@@ -29,7 +29,9 @@
 #include "nsIOutputStream.h"
 #include "nsNetUtil.h"
 
-#define TARGET_FOLDER "/sdcard/downloads/bluetooth/"
+#define TARGET_ROOT   "/sdcard/"
+#define TARGET_SUBDIR "downloads/bluetooth/"
+#define TARGET_FOLDER TARGET_ROOT TARGET_SUBDIR
 
 USING_BLUETOOTH_NAMESPACE
 using namespace mozilla;
@@ -561,6 +563,11 @@ BluetoothOppManager::CreateFile()
    */
   f->GetLeafName(sFileName);
 
+  nsString fullFileName;
+  f->GetPath(fullFileName);
+  MOZ_ASSERT(StringBeginsWith(fullFileName, NS_LITERAL_STRING(TARGET_ROOT)));
+  nsDependentSubstring storagePath = Substring(fullFileName, strlen(TARGET_ROOT));
+
   mDsFile = nullptr;
 
   nsCOMPtr<nsIMIMEService> mimeSvc = do_GetService(NS_MIMESERVICE_CONTRACTID);
@@ -570,11 +577,11 @@ BluetoothOppManager::CreateFile()
 
     if (NS_SUCCEEDED(rv)) {
       if (StringBeginsWith(mimeType, NS_LITERAL_CSTRING("image/"))) {
-        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("pictures"), f);
+        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("pictures"), storagePath);
       } else if (StringBeginsWith(mimeType, NS_LITERAL_CSTRING("video/"))) {
-        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("movies"), f);
+        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("movies"), storagePath);
       } else if (StringBeginsWith(mimeType, NS_LITERAL_CSTRING("audio/"))) {
-        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("music"), f);
+        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("music"), storagePath);
       } else {
         NS_WARNING("Couldn't recognize the mimetype of received file.");
       }
diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp
index bf5a08ffc886..85907d7ca0f0 100644
--- a/dom/camera/GonkCameraControl.cpp
+++ b/dom/camera/GonkCameraControl.cpp
@@ -905,7 +905,8 @@ nsGonkCameraControl::StartRecordingImpl(StartRecordingTask* aStartRecording)
    */
   nsCOMPtr<nsIFile> filename = aStartRecording->mFolder;
   filename->AppendRelativePath(aStartRecording->mFilename);
-  mVideoFile = new DeviceStorageFile(NS_LITERAL_STRING("videos"), filename);
+  mVideoFile = new DeviceStorageFile(NS_LITERAL_STRING("videos"),
+                                     aStartRecording->mFilename);
 
   nsAutoCString nativeFilename;
   filename->GetNativePath(nativeFilename);
diff --git a/dom/devicestorage/DeviceStorage.h b/dom/devicestorage/DeviceStorage.h
index 4d478306548a..78d0d64d9228 100644
--- a/dom/devicestorage/DeviceStorage.h
+++ b/dom/devicestorage/DeviceStorage.h
@@ -20,10 +20,18 @@ public:
   nsCOMPtr<nsIFile> mFile;
   nsString mPath;
   nsString mStorageType;
+  nsString mRootDir;
   bool mEditable;
 
-  DeviceStorageFile(const nsAString& aStorageType, nsIFile* aFile, const nsAString& aPath);
-  DeviceStorageFile(const nsAString& aStorageType, nsIFile* aFile);
+  // Used when the path will be set later via SetPath.
+  DeviceStorageFile(const nsAString& aStorageType);
+  // Used for non-enumeration purposes.
+  DeviceStorageFile(const nsAString& aStorageType, const nsAString& aPath);
+  // Used for enumerations. When you call Enumerate, you can pass in a directory to enumerate
+  // and the results that are returned are relative to that directory, files related to an
+  // enumeration need to know the "root of the enumeration" directory.
+  DeviceStorageFile(const nsAString& aStorageType, const nsAString& aRootDir, const nsAString& aPath);
+
   void SetPath(const nsAString& aPath);
   void SetEditable(bool aEditable);
 
@@ -32,6 +40,7 @@ public:
   // we want to make sure that the names of file can't reach
   // outside of the type of storage the user asked for.
   bool IsSafePath();
+  bool IsSafePath(const nsAString& aPath);
 
   nsresult Remove();
   nsresult Write(nsIInputStream* aInputStream);
@@ -40,10 +49,13 @@ public:
   void collectFilesInternal(nsTArray<nsRefPtr<DeviceStorageFile> > &aFiles, PRTime aSince, nsAString& aRootPath);
 
   static void DirectoryDiskUsage(nsIFile* aFile, uint64_t* aSoFar, const nsAString& aStorageType);
-
+  static void GetRootDirectoryForType(const nsAString& aType,
+                                      const nsAString& aVolName,
+                                      nsIFile** aFile);
 private:
+  void Init(const nsAString& aStorageType);
   void NormalizeFilePath();
-  void AppendRelativePath();
+  void AppendRelativePath(const nsAString& aPath);
 };
 
 /*
diff --git a/dom/devicestorage/DeviceStorageRequestChild.cpp b/dom/devicestorage/DeviceStorageRequestChild.cpp
index 9b5ef97f29ee..9c90591c3b42 100644
--- a/dom/devicestorage/DeviceStorageRequestChild.cpp
+++ b/dom/devicestorage/DeviceStorageRequestChild.cpp
@@ -100,14 +100,9 @@ DeviceStorageRequestChild::Recv__delete__(const DeviceStorageResponseValue& aVal
 
       uint32_t count = r.paths().Length();
       for (uint32_t i = 0; i < count; i++) {
-        nsCOMPtr<nsIFile> f;
-        nsresult rv = NS_NewLocalFile(r.paths()[i].fullpath(), false, getter_AddRefs(f));
-        if (NS_FAILED(rv)) {
-          continue;
-        }
-
-        nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(r.paths()[i].type(), f);
-        dsf->SetPath(r.paths()[i].name());
+        nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(r.type(),
+                                                                r.relpath(),
+                                                                r.paths()[i].name());
         cursor->mFiles.AppendElement(dsf);
       }
 
diff --git a/dom/devicestorage/DeviceStorageRequestParent.cpp b/dom/devicestorage/DeviceStorageRequestParent.cpp
index e046024e962f..8f438445614a 100644
--- a/dom/devicestorage/DeviceStorageRequestParent.cpp
+++ b/dom/devicestorage/DeviceStorageRequestParent.cpp
@@ -34,10 +34,7 @@ DeviceStorageRequestParent::Dispatch()
     {
       DeviceStorageAddParams p = mParams;
 
-      nsCOMPtr<nsIFile> f;
-      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
-
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
 
       BlobParent* bp = static_cast<BlobParent*>(p.blobParent());
       nsCOMPtr<nsIDOMBlob> blob = bp->GetBlob();
@@ -56,12 +53,7 @@ DeviceStorageRequestParent::Dispatch()
     case DeviceStorageParams::TDeviceStorageGetParams:
     {
       DeviceStorageGetParams p = mParams;
-
-      nsCOMPtr<nsIFile> f;
-      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
-
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
-      dsf->SetPath(p.name());
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.rootDir(), p.relpath());
       nsRefPtr<CancelableRunnable> r = new ReadFileEvent(this, dsf);
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -74,10 +66,7 @@ DeviceStorageRequestParent::Dispatch()
     {
       DeviceStorageDeleteParams p = mParams;
 
-      nsCOMPtr<nsIFile> f;
-      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
-
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
       nsRefPtr<CancelableRunnable> r = new DeleteFileEvent(this, dsf);
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -90,10 +79,7 @@ DeviceStorageRequestParent::Dispatch()
     {
       DeviceStorageFreeSpaceParams p = mParams;
 
-      nsCOMPtr<nsIFile> f;
-      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
-
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
       nsRefPtr<FreeSpaceFileEvent> r = new FreeSpaceFileEvent(this, dsf);
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -106,10 +92,7 @@ DeviceStorageRequestParent::Dispatch()
     {
       DeviceStorageUsedSpaceParams p = mParams;
 
-      nsCOMPtr<nsIFile> f;
-      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
-
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
       nsRefPtr<UsedSpaceFileEvent> r = new UsedSpaceFileEvent(this, dsf);
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -121,7 +104,9 @@ DeviceStorageRequestParent::Dispatch()
     case DeviceStorageParams::TDeviceStorageAvailableParams:
     {
       DeviceStorageAvailableParams p = mParams;
-      nsRefPtr<PostAvailableResultEvent> r = new PostAvailableResultEvent(this, p.fullpath());
+
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
+      nsRefPtr<PostAvailableResultEvent> r = new PostAvailableResultEvent(this, dsf);
       NS_DispatchToMainThread(r);
       break;
     }
@@ -129,11 +114,7 @@ DeviceStorageRequestParent::Dispatch()
     case DeviceStorageParams::TDeviceStorageEnumerationParams:
     {
       DeviceStorageEnumerationParams p = mParams;
-
-      nsCOMPtr<nsIFile> f;
-      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
-
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath(), NS_LITERAL_STRING(""));
       nsRefPtr<CancelableRunnable> r = new EnumerateFileEvent(this, dsf, p.since());
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -382,8 +363,12 @@ DeviceStorageRequestParent::PostBlobSuccessEvent::CancelableRun() {
 }
 
 DeviceStorageRequestParent::PostEnumerationSuccessEvent::PostEnumerationSuccessEvent(DeviceStorageRequestParent* aParent,
+                                                                                     const nsAString& aStorageType,
+                                                                                     const nsAString& aRelPath,
                                                                                      InfallibleTArray<DeviceStorageFileValue>& aPaths)
   : CancelableRunnable(aParent)
+  , mStorageType(aStorageType)
+  , mRelPath(aRelPath)
   , mPaths(aPaths)
 {
 }
@@ -394,7 +379,7 @@ nsresult
 DeviceStorageRequestParent::PostEnumerationSuccessEvent::CancelableRun() {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  EnumerationResponse response(mPaths);
+  EnumerationResponse response(mStorageType, mRelPath, mPaths);
   unused << mParent->Send__delete__(mParent, response);
   return NS_OK;
 }
@@ -621,13 +606,11 @@ DeviceStorageRequestParent::EnumerateFileEvent::CancelableRun()
 
   uint32_t count = files.Length();
   for (uint32_t i = 0; i < count; i++) {
-    nsString fullpath;
-    files[i]->mFile->GetPath(fullpath);
-    DeviceStorageFileValue dsvf(mFile->mStorageType, files[i]->mPath, fullpath);
+    DeviceStorageFileValue dsvf(files[i]->mPath);
     values.AppendElement(dsvf);
   }
 
-  r = new PostEnumerationSuccessEvent(mParent, values);
+  r = new PostEnumerationSuccessEvent(mParent, mFile->mStorageType, mFile->mRootDir, values);
   NS_DispatchToMainThread(r);
   return NS_OK;
 }
@@ -655,9 +638,9 @@ DeviceStorageRequestParent::PostPathResultEvent::CancelableRun()
 }
 
 DeviceStorageRequestParent::PostAvailableResultEvent::PostAvailableResultEvent(DeviceStorageRequestParent* aParent,
-                                                                               const nsAString &aPath)
+                                                                               DeviceStorageFile* aFile)
   : CancelableRunnable(aParent)
-  , mPath(aPath)
+  , mFile(aFile)
 {
 }
 
@@ -673,7 +656,7 @@ DeviceStorageRequestParent::PostAvailableResultEvent::CancelableRun()
   nsString state;
   state.Assign(NS_LITERAL_STRING("available"));
 #ifdef MOZ_WIDGET_GONK
-  nsresult rv = GetSDCardStatus(mPath, state);
+  nsresult rv = GetSDCardStatus(mFile->mPath, state);
   if (NS_FAILED(rv)) {
     state.Assign(NS_LITERAL_STRING("unavailable"));
   }
diff --git a/dom/devicestorage/DeviceStorageRequestParent.h b/dom/devicestorage/DeviceStorageRequestParent.h
index 7a124a71b56f..5aee8dce45ef 100644
--- a/dom/devicestorage/DeviceStorageRequestParent.h
+++ b/dom/devicestorage/DeviceStorageRequestParent.h
@@ -105,10 +105,15 @@ private:
   class PostEnumerationSuccessEvent : public CancelableRunnable
   {
     public:
-      PostEnumerationSuccessEvent(DeviceStorageRequestParent* aParent, InfallibleTArray<DeviceStorageFileValue>& aPaths);
+      PostEnumerationSuccessEvent(DeviceStorageRequestParent* aParent,
+                                  const nsAString& aStorageType,
+                                  const nsAString& aRelPath,
+                                  InfallibleTArray<DeviceStorageFileValue>& aPaths);
       virtual ~PostEnumerationSuccessEvent();
       virtual nsresult CancelableRun();
     private:
+      const nsString mStorageType;
+      const nsString mRelPath;
       InfallibleTArray<DeviceStorageFileValue> mPaths;
   };
 
@@ -211,11 +216,11 @@ private:
  class PostAvailableResultEvent : public CancelableRunnable
  {
     public:
-      PostAvailableResultEvent(DeviceStorageRequestParent* aParent, const nsAString& aPath);
+      PostAvailableResultEvent(DeviceStorageRequestParent* aParent, DeviceStorageFile* aFile);
       virtual ~PostAvailableResultEvent();
       virtual nsresult CancelableRun();
     private:
-      nsString mPath;
+      nsRefPtr<DeviceStorageFile> mFile;
  };
 
 protected:
diff --git a/dom/devicestorage/PDeviceStorageRequest.ipdl b/dom/devicestorage/PDeviceStorageRequest.ipdl
index 6d0073f745f5..a79ae1b3e042 100644
--- a/dom/devicestorage/PDeviceStorageRequest.ipdl
+++ b/dom/devicestorage/PDeviceStorageRequest.ipdl
@@ -27,13 +27,13 @@ struct BlobResponse
 
 struct DeviceStorageFileValue
 {
-  nsString type;
   nsString name;
-  nsString fullpath;
 };
 
 struct EnumerationResponse
 {
+  nsString type;
+  nsString relpath;
   DeviceStorageFileValue[] paths;
 };
 
diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp
index 1e848f9083d6..8d8e6bc1b162 100644
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -311,35 +311,151 @@ private:
 };
 
 DeviceStorageFile::DeviceStorageFile(const nsAString& aStorageType,
-                                     nsIFile* aFile,
+                                     const nsAString& aRootDir,
+                                     const nsAString& aPath)
+  : mPath(aPath)
+  , mStorageType(aStorageType)
+  , mRootDir(aRootDir)
+  , mEditable(false)
+{
+  Init(aStorageType);
+  AppendRelativePath(mRootDir);
+  if (!mPath.EqualsLiteral("")) {
+    AppendRelativePath(mPath);
+  }
+  NormalizeFilePath();
+}
+
+DeviceStorageFile::DeviceStorageFile(const nsAString& aStorageType,
                                      const nsAString& aPath)
   : mPath(aPath)
   , mStorageType(aStorageType)
   , mEditable(false)
 {
-  NS_ASSERTION(aFile, "Must not create a DeviceStorageFile with a null nsIFile");
-  // always take a clone
-  nsCOMPtr<nsIFile> file;
-  aFile->Clone(getter_AddRefs(mFile));
-
-  AppendRelativePath();
+  Init(aStorageType);
+  AppendRelativePath(aPath);
   NormalizeFilePath();
+}
+
+DeviceStorageFile::DeviceStorageFile(const nsAString& aStorageType)
+  : mStorageType(aStorageType)
+  , mEditable(false)
+{
+  Init(aStorageType);
+}
+
+void
+DeviceStorageFile::Init(const nsAString& aStorageType)
+{
+  // The hard-coded sdcard below will change as part of bug 858416
+  DeviceStorageFile::GetRootDirectoryForType(aStorageType,
+                                             NS_LITERAL_STRING("sdcard"),
+                                             getter_AddRefs(mFile));
 
   DebugOnly<DeviceStorageTypeChecker*> typeChecker = DeviceStorageTypeChecker::CreateOrGet();
   NS_ASSERTION(typeChecker, "DeviceStorageTypeChecker is null");
 }
 
-DeviceStorageFile::DeviceStorageFile(const nsAString& aStorageType, nsIFile* aFile)
-  : mStorageType(aStorageType)
-  , mEditable(false)
+void
+DeviceStorageFile::GetRootDirectoryForType(const nsAString &aType, const
+                                           nsAString &aVolName,
+                                           nsIFile** aFile)
 {
-  NS_ASSERTION(aFile, "Must not create a DeviceStorageFile with a null nsIFile");
-  // always take a clone
-  nsCOMPtr<nsIFile> file;
-  aFile->Clone(getter_AddRefs(mFile));
+  nsCOMPtr<nsIFile> f;
+  nsCOMPtr<nsIProperties> dirService = do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
+  NS_ASSERTION(dirService, "Must have directory service");
 
-  DebugOnly<DeviceStorageTypeChecker*> typeChecker = DeviceStorageTypeChecker::CreateOrGet();
-  NS_ASSERTION(typeChecker, "DeviceStorageTypeChecker is null");
+#ifdef MOZ_WIDGET_GONK
+  nsString volMountPoint(NS_LITERAL_STRING("/sdcard"));
+  if (!aVolName.EqualsLiteral("")) {
+    nsCOMPtr<nsIVolumeService> vs = do_GetService(NS_VOLUMESERVICE_CONTRACTID);
+    if (vs) {
+      nsresult rv;
+      nsCOMPtr<nsIVolume> vol;
+      rv = vs->GetVolumeByName(aVolName, getter_AddRefs(vol));
+      if (NS_SUCCEEDED(rv)) {
+        vol->GetMountPoint(volMountPoint);
+      }
+    }
+  }
+#endif
+
+  // Picture directory
+  if (aType.EqualsLiteral(DEVICESTORAGE_PICTURES)) {
+#ifdef MOZ_WIDGET_GONK
+    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
+#elif defined (MOZ_WIDGET_COCOA)
+    dirService->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_UNIX)
+    dirService->Get(NS_UNIX_XDG_PICTURES_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_WIN)
+    dirService->Get(NS_WIN_PICTURES_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#endif
+  }
+
+  // Video directory
+  else if (aType.EqualsLiteral(DEVICESTORAGE_VIDEOS)) {
+#ifdef MOZ_WIDGET_GONK
+    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
+#elif defined (MOZ_WIDGET_COCOA)
+    dirService->Get(NS_OSX_MOVIE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_UNIX)
+    dirService->Get(NS_UNIX_XDG_VIDEOS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_WIN)
+    dirService->Get(NS_WIN_VIDEOS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#endif
+  }
+
+  // Music directory
+  else if (aType.EqualsLiteral(DEVICESTORAGE_MUSIC)) {
+#ifdef MOZ_WIDGET_GONK
+    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
+#elif defined (MOZ_WIDGET_COCOA)
+    dirService->Get(NS_OSX_MUSIC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_UNIX)
+    dirService->Get(NS_UNIX_XDG_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_WIN)
+    dirService->Get(NS_WIN_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#endif
+  }
+
+  // Apps directory
+  else if (aType.EqualsLiteral(DEVICESTORAGE_APPS)) {
+#ifdef MOZ_WIDGET_GONK
+    NS_NewLocalFile(NS_LITERAL_STRING("/data"), false, getter_AddRefs(f));
+#else
+    dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+    if (f) {
+      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("webapps"));
+    }
+#endif
+  }
+
+   // default SDCard
+   else if (aType.EqualsLiteral(DEVICESTORAGE_SDCARD)) {
+#ifdef MOZ_WIDGET_GONK
+     NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
+#else
+    // Eventually, on desktop, we want to do something smarter -- for example,
+    // detect when an sdcard is inserted, and use that instead of this.
+    dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+    if (f) {
+      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("fake-sdcard"));
+    }
+#endif
+  }
+
+  // in testing, we default all device storage types to a temp directory
+  if (f && mozilla::Preferences::GetBool("device.storage.testing", false)) {
+    dirService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+    if (f) {
+      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("device-storage-testing"));
+      f->Create(nsIFile::DIRECTORY_TYPE, 0777);
+      f->Normalize();
+    }
+  }
+
+  NS_IF_ADDREF(*aFile = f.get());
 }
 
 void
@@ -357,10 +473,16 @@ DeviceStorageFile::SetEditable(bool aEditable) {
 // outside of the type of storage the user asked for.
 bool
 DeviceStorageFile::IsSafePath()
+{
+  return IsSafePath(mRootDir) && IsSafePath(mPath);
+}
+
+bool
+DeviceStorageFile::IsSafePath(const nsAString& aPath)
 {
   nsAString::const_iterator start, end;
-  mPath.BeginReading(start);
-  mPath.EndReading(end);
+  aPath.BeginReading(start);
+  aPath.EndReading(end);
 
   // if the path has a ~ or \ in it, return false.
   NS_NAMED_LITERAL_STRING(tilde, "~");
@@ -370,7 +492,7 @@ DeviceStorageFile::IsSafePath()
     return false;
    }
   // split on /.  if any token is "", ., or .., return false.
-  NS_ConvertUTF16toUTF8 cname(mPath);
+  NS_ConvertUTF16toUTF8 cname(aPath);
   char* buffer = cname.BeginWriting();
   const char* token;
 
@@ -397,12 +519,12 @@ DeviceStorageFile::NormalizeFilePath() {
 }
 
 void
-DeviceStorageFile::AppendRelativePath() {
+DeviceStorageFile::AppendRelativePath(const nsAString& aPath) {
 #if defined(XP_WIN)
   // replace forward slashes with backslashes,
   // since nsLocalFileWin chokes on them
   nsString temp;
-  temp.Assign(mPath);
+  temp.Assign(aPath);
 
   PRUnichar* cur = temp.BeginWriting();
   PRUnichar* end = temp.EndWriting();
@@ -413,7 +535,7 @@ DeviceStorageFile::AppendRelativePath() {
   }
   mFile->AppendRelativePath(temp);
 #else
-  mFile->AppendRelativePath(mPath);
+  mFile->AppendRelativePath(aPath);
 #endif
 }
 
@@ -535,7 +657,6 @@ DeviceStorageFile::CollectFiles(nsTArray<nsRefPtr<DeviceStorageFile> > &aFiles,
   if (NS_FAILED(rv)) {
     return;
   }
-
   return collectFilesInternal(aFiles, aSince, rootPath);
 }
 
@@ -584,12 +705,10 @@ DeviceStorageFile::collectFilesInternal(nsTArray<nsRefPtr<DeviceStorageFile> > &
     nsDependentSubstring newPath = Substring(fullpath, len);
 
     if (isDir) {
-      DeviceStorageFile dsf(mStorageType, f);
-      dsf.SetPath(newPath);
+      DeviceStorageFile dsf(mStorageType, mRootDir, newPath);
       dsf.collectFilesInternal(aFiles, aSince, aRootPath);
     } else if (isFile) {
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, f);
-      dsf->SetPath(newPath);
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDir, newPath);
       aFiles.AppendElement(dsf);
     }
   }
@@ -705,11 +824,13 @@ UnregisterForSDCardChanges(nsIObserver* aObserver)
 #endif
 
 void
-nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType, const nsAString& aVolName)
+nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType,
+                                            const nsAString& aVolName)
 {
   nsCOMPtr<nsIFile> f;
-  nsCOMPtr<nsIProperties> dirService = do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
-  NS_ASSERTION(dirService, "Must have directory service");
+  DeviceStorageFile::GetRootDirectoryForType(aType,
+                                             aVolName,
+                                             getter_AddRefs(f));
 
   mVolumeName = NS_LITERAL_STRING("");
 #ifdef MOZ_WIDGET_GONK
@@ -726,84 +847,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType, const nsAStr
       }
     }
   }
-#endif
 
-  // Picture directory
-  if (aType.EqualsLiteral(DEVICESTORAGE_PICTURES)) {
-#ifdef MOZ_WIDGET_GONK
-    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
-#elif defined (MOZ_WIDGET_COCOA)
-    dirService->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_UNIX)
-    dirService->Get(NS_UNIX_XDG_PICTURES_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_WIN)
-    dirService->Get(NS_WIN_PICTURES_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#endif
-  }
-
-  // Video directory
-  else if (aType.EqualsLiteral(DEVICESTORAGE_VIDEOS)) {
-#ifdef MOZ_WIDGET_GONK
-    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
-#elif defined (MOZ_WIDGET_COCOA)
-    dirService->Get(NS_OSX_MOVIE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_UNIX)
-    dirService->Get(NS_UNIX_XDG_VIDEOS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_WIN)
-    dirService->Get(NS_WIN_VIDEOS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#endif
-  }
-
-  // Music directory
-  else if (aType.EqualsLiteral(DEVICESTORAGE_MUSIC)) {
-#ifdef MOZ_WIDGET_GONK
-    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
-#elif defined (MOZ_WIDGET_COCOA)
-    dirService->Get(NS_OSX_MUSIC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_UNIX)
-    dirService->Get(NS_UNIX_XDG_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_WIN)
-    dirService->Get(NS_WIN_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#endif
-  }
-
-  // Apps directory
-  else if (aType.EqualsLiteral(DEVICESTORAGE_APPS)) {
-#ifdef MOZ_WIDGET_GONK
-    NS_NewLocalFile(NS_LITERAL_STRING("/data"), false, getter_AddRefs(f));
-#else
-    dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-    if (f) {
-      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("webapps"));
-    }
-#endif
-  }
-
-   // default SDCard
-   else if (aType.EqualsLiteral(DEVICESTORAGE_SDCARD)) {
-#ifdef MOZ_WIDGET_GONK
-     NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
-#else
-    // Eventually, on desktop, we want to do something smarter -- for example,
-    // detect when an sdcard is inserted, and use that instead of this.
-    dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-    if (f) {
-      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("fake-sdcard"));
-    }
-#endif
-  }
-
-  // in testing, we default all device storage types to a temp directory
-  if (f && mozilla::Preferences::GetBool("device.storage.testing", false)) {
-    dirService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-    if (f) {
-      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("device-storage-testing"));
-      f->Create(nsIFile::DIRECTORY_TYPE, 0777);
-      f->Normalize();
-    }
-  }
-
-#ifdef MOZ_WIDGET_GONK
   RegisterForSDCardChanges(this);
 #endif
 
@@ -1025,20 +1069,13 @@ ContinueCursorEvent::Continue()
     return;
   }
 
-  nsString fullpath;
-  nsresult rv = file->mFile->GetPath(fullpath);
-  if (NS_FAILED(rv)) {
-    NS_ASSERTION(false, "GetPath failed to return a valid path");
-    return;
-  }
-
   nsDOMDeviceStorageCursor* cursor = static_cast<nsDOMDeviceStorageCursor*>(mRequest.get());
   nsString cursorStorageType;
   cursor->GetStorageType(cursorStorageType);
 
   DeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, file);
   child->SetCallback(cursor);
-  DeviceStorageGetParams params(cursorStorageType, file->mPath, fullpath);
+  DeviceStorageGetParams params(cursorStorageType, file->mRootDir, file->mPath);
   ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
   mRequest = nullptr;
 }
@@ -1179,17 +1216,8 @@ nsDOMDeviceStorageCursor::Allow()
   }
 
   if (XRE_GetProcessType() != GeckoProcessType_Default) {
-
-    nsString fullpath;
-    nsresult rv = mFile->mFile->GetPath(fullpath);
-
-    if (NS_FAILED(rv)) {
-      // just do nothing
-      return NS_OK;
-    }
-
     PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(this, mFile);
-    DeviceStorageEnumerationParams params(mFile->mStorageType, fullpath, mSince);
+    DeviceStorageEnumerationParams params(mFile->mStorageType, mFile->mRootDir, mSince);
     ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
     return NS_OK;
   }
@@ -1649,14 +1677,6 @@ public:
       return NS_ERROR_FAILURE;
     }
 
-    nsString fullpath;
-    nsresult rv = mFile->mFile->GetPath(fullpath);
-
-    if (NS_FAILED(rv)) {
-      // just do nothing
-      return NS_OK;
-    }
-
     switch(mRequestType) {
       case DEVICE_STORAGE_REQUEST_CREATE:
       {
@@ -1686,8 +1706,7 @@ public:
           DeviceStorageAddParams params;
           params.blobChild() = actor;
           params.type() = mFile->mStorageType;
-          params.name() = mFile->mPath;
-          params.fullpath() = fullpath;
+          params.relpath() = mFile->mPath;
 
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
@@ -1713,7 +1732,7 @@ public:
 
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageGetParams params(mFile->mStorageType, mFile->mPath, fullpath);
+          DeviceStorageGetParams params(mFile->mStorageType, mFile->mRootDir, mFile->mPath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -1737,7 +1756,7 @@ public:
 
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageDeleteParams params(mFile->mStorageType, fullpath);
+          DeviceStorageDeleteParams params(mFile->mStorageType, mFile->mPath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -1749,7 +1768,7 @@ public:
       {
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageFreeSpaceParams params(mFile->mStorageType, fullpath);
+          DeviceStorageFreeSpaceParams params(mFile->mStorageType, mFile->mPath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -1761,7 +1780,7 @@ public:
       {
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageUsedSpaceParams params(mFile->mStorageType, fullpath);
+          DeviceStorageUsedSpaceParams params(mFile->mStorageType, mFile->mPath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -1773,7 +1792,7 @@ public:
       {
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageAvailableParams params(mFile->mStorageType, fullpath);
+          DeviceStorageAvailableParams params(mFile->mStorageType, mFile->mPath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -2023,7 +2042,7 @@ nsDOMDeviceStorage::AddNamed(nsIDOMBlob *aBlob,
 
   nsCOMPtr<nsIRunnable> r;
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory, aPath);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, aPath);
   if (!dsf->IsSafePath()) {
     r = new PostErrorEvent(request, POST_ERROR_EVENT_PERMISSION_DENIED);
   } else if (!typeChecker->Check(mStorageType, dsf->mFile) ||
@@ -2079,7 +2098,7 @@ nsDOMDeviceStorage::GetInternal(const JS::Value & aPath,
     return NS_OK;
   }
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory, path);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, path);
   dsf->SetEditable(aEditable);
   if (!dsf->IsSafePath()) {
     r = new PostErrorEvent(request, POST_ERROR_EVENT_PERMISSION_DENIED);
@@ -2112,7 +2131,7 @@ nsDOMDeviceStorage::Delete(const JS::Value & aPath, JSContext* aCx, nsIDOMDOMReq
     return NS_OK;
   }
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory, path);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, path);
 
   if (!dsf->IsSafePath()) {
     r = new PostErrorEvent(request, POST_ERROR_EVENT_PERMISSION_DENIED);
@@ -2136,7 +2155,7 @@ nsDOMDeviceStorage::FreeSpace(nsIDOMDOMRequest** aRetval)
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
   NS_ADDREF(*aRetval = request);
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_FREE_SPACE,
                                                      win,
                                                      mPrincipal,
@@ -2157,7 +2176,7 @@ nsDOMDeviceStorage::UsedSpace(nsIDOMDOMRequest** aRetval)
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
   NS_ADDREF(*aRetval = request);
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_USED_SPACE,
                                                      win,
                                                      mPrincipal,
@@ -2178,7 +2197,7 @@ nsDOMDeviceStorage::Available(nsIDOMDOMRequest** aRetval)
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
   NS_ADDREF(*aRetval = request);
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_AVAILABLE,
                                                      win,
                                                      mPrincipal,
@@ -2278,7 +2297,7 @@ nsDOMDeviceStorage::EnumerateInternal(const JS::Value & aName,
     since = ExtractDateFromOptions(aCx, aOptions);
   }
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory, path);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, path, NS_LITERAL_STRING(""));
   dsf->SetEditable(aEditable);
 
   nsRefPtr<nsDOMDeviceStorageCursor> cursor = new nsDOMDeviceStorageCursor(win, mPrincipal,
@@ -2452,7 +2471,7 @@ nsDOMDeviceStorage::AddEventListener(const nsAString & aType,
   }
 
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_WATCH,
                                                      win, mPrincipal, dsf, request, this);
   NS_DispatchToMainThread(r);
@@ -2473,7 +2492,7 @@ nsDOMDeviceStorage::AddEventListener(const nsAString & aType,
   }
 
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_WATCH,
                                                      win, mPrincipal, dsf, request, this);
   NS_DispatchToMainThread(r);
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 1e86af0b3092..a186189b0226 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1176,10 +1176,7 @@ ContentChild::RecvLastPrivateDocShellDestroyed()
 bool
 ContentChild::RecvFilePathUpdate(const nsString& type, const nsString& path, const nsCString& aReason)
 {
-    nsCOMPtr<nsIFile> file;
-    NS_NewLocalFile(path, false, getter_AddRefs(file));
-
-    nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(type, file);
+    nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(type, path);
 
     nsString reason;
     CopyASCIItoUTF16(aReason, reason);
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index ea2fc83feb8f..1134faee6b39 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -1531,10 +1531,7 @@ ContentParent::Observe(nsISupports* aSubject,
         CopyUTF16toUTF8(aData, creason);
         DeviceStorageFile* file = static_cast<DeviceStorageFile*>(aSubject);
 
-        nsString path;
-        file->mFile->GetPath(path);
-
-        unused << SendFilePathUpdate(file->mStorageType, path, creason);
+        unused << SendFilePathUpdate(file->mStorageType, file->mPath, creason);
     }
 #ifdef MOZ_WIDGET_GONK
     else if(!strcmp(aTopic, NS_VOLUME_STATE_CHANGED)) {
@@ -2349,15 +2346,11 @@ ContentParent::RecvAsyncMessage(const nsString& aMsg,
 }
 
 bool
-ContentParent::RecvFilePathUpdateNotify(const nsString& aType, const nsString& aFilePath, const nsCString& aReason)
+ContentParent::RecvFilePathUpdateNotify(const nsString& aType,
+                                        const nsString& aFilePath,
+                                        const nsCString& aReason)
 {
-    nsCOMPtr<nsIFile> file;
-    nsresult rv = NS_NewLocalFile(aFilePath, false, getter_AddRefs(file));
-    if (NS_FAILED(rv)) {
-        // ignore
-        return true;
-    }
-    nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(aType, file);
+    nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(aType, aFilePath);
 
     nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
     if (!obs) {
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index f3a5064a3d24..ebcd9612a28e 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -63,46 +63,45 @@ struct FontListEntry {
 struct DeviceStorageFreeSpaceParams
 {
   nsString type;
-  nsString fullpath;
+  nsString relpath;
 };
 
 struct DeviceStorageUsedSpaceParams
 {
   nsString type;
-  nsString fullpath;
+  nsString relpath;
 };
 
 struct DeviceStorageAvailableParams
 {
   nsString type;
-  nsString fullpath;
+  nsString relpath;
 };
 
 struct DeviceStorageAddParams
 {
   nsString type;
+  nsString relpath;
   PBlob blob;
-  nsString name;
-  nsString fullpath;
 };
 
 struct DeviceStorageGetParams
 {
   nsString type;
-  nsString name;
-  nsString fullpath;
+  nsString rootDir;
+  nsString relpath;
 };
 
 struct DeviceStorageDeleteParams
 {
   nsString type;
-  nsString fullpath;
+  nsString relpath;
 };
 
 struct DeviceStorageEnumerationParams
 {
   nsString type;
-  nsString fullpath;
+  nsString relpath;
   uint64_t since;
 };
 

From c042f794c929b3c9476a166c183b86a0e5619616 Mon Sep 17 00:00:00 2001
From: Gregor Wagner <anygregor@gmail.com>
Date: Thu, 18 Apr 2013 10:39:10 -0400
Subject: [PATCH 428/438] Bug 861462 - Allow contacts to be preloaded when we
 create the contacts DB. r=bent

---
 dom/contacts/fallback/ContactDB.jsm | 51 +++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/dom/contacts/fallback/ContactDB.jsm b/dom/contacts/fallback/ContactDB.jsm
index 86517ebcd926..b85815b104a5 100644
--- a/dom/contacts/fallback/ContactDB.jsm
+++ b/dom/contacts/fallback/ContactDB.jsm
@@ -306,6 +306,57 @@ ContactDB.prototype = {
         db.createObjectStore(SAVED_GETALL_STORE_NAME);
       }
     }
+
+    // Add default contacts
+    if (aOldVersion == 0) {
+      let jsm = {};
+      Cu.import("resource://gre/modules/FileUtils.jsm", jsm);
+      Cu.import("resource://gre/modules/NetUtil.jsm", jsm);
+      // Loading resource://app/defaults/contacts.json doesn't work because
+      // contacts.json is not in the omnijar.
+      // So we look for the app dir instead and go from here...
+      let contactsFile = jsm.FileUtils.getFile("DefRt", ["contacts.json"], false);
+      if (!contactsFile || (contactsFile && !contactsFile.exists())) {
+        // For b2g desktop
+        contactsFile = jsm.FileUtils.getFile("ProfD", ["contacts.json"], false);
+        if (!contactsFile || (contactsFile && !contactsFile.exists())) {
+          return;
+        }
+      }
+
+      let chan = jsm.NetUtil.newChannel(contactsFile);
+      let stream = chan.open();
+      // Obtain a converter to read from a UTF-8 encoded input stream.
+      let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                      .createInstance(Ci.nsIScriptableUnicodeConverter);
+      converter.charset = "UTF-8";
+      let rawstr = converter.ConvertToUnicode(jsm.NetUtil.readInputStreamToString(
+                                              stream,
+                                              stream.available()) || "");
+      stream.close();
+      let contacts;
+      try {
+        contacts = JSON.parse(rawstr);
+      } catch(e) {
+        if (DEBUG) debug("Error parsing " + contactsFile.path + " : " + e);
+        return;
+      }
+
+      let idService = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
+      objectStore = aTransaction.objectStore(STORE_NAME);
+
+      for (let i = 0; i < contacts.length; i++) {
+        let contact = {};
+        contact.properties = contacts[i];
+        contact.id = idService.generateUUID().toString().replace('-', '', 'g')
+                                                        .replace('{', '')
+                                                        .replace('}', '');
+        contact = this.makeImport(contact);
+        this.updateRecordMetadata(contact);
+        if (DEBUG) debug("import: " + JSON.stringify(contact));
+        objectStore.put(contact);
+      }
+    }
   },
 
   makeImport: function makeImport(aContact) {

From 61b45ded3b3784f171d0c0253ef16aeba9903989 Mon Sep 17 00:00:00 2001
From: Gene Lian <clian@mozilla.com>
Date: Wed, 17 Apr 2013 23:22:11 +0800
Subject: [PATCH 429/438] Bug 840066 - [MMS][User Story] Automatic download
 retry on failure. r=vicamo a=leo+

---
 dom/mms/src/ril/MmsService.js   | 34 ++++++++++++++++++++++++++-------
 modules/libpref/src/init/all.js |  8 ++++++--
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/dom/mms/src/ril/MmsService.js b/dom/mms/src/ril/MmsService.js
index 457e27a702c4..4877bbc2320b 100644
--- a/dom/mms/src/ril/MmsService.js
+++ b/dom/mms/src/ril/MmsService.js
@@ -57,9 +57,29 @@ const DELIVERY_STATUS_SUCCESS = "success";
 const DELIVERY_STATUS_PENDING = "pending";
 const DELIVERY_STATUS_ERROR   = "error";
 
+const PREF_SEND_RETRY_COUNT =
+  Services.prefs.getIntPref("dom.mms.sendRetryCount");
 
-const MAX_RETRY_COUNT = Services.prefs.getIntPref("dom.mms.retrievalRetryCount");
-const DELAY_TIME_TO_RETRY = Services.prefs.getIntPref("dom.mms.retrievalRetryInterval");
+const PREF_SEND_RETRY_INTERVAL =
+  Services.prefs.getIntPref("dom.mms.sendRetryInterval");
+
+const PREF_RETRIEVAL_RETRY_COUNT =
+  Services.prefs.getIntPref("dom.mms.retrievalRetryCount");
+
+const PREF_RETRIEVAL_RETRY_INTERVALS = (function () {
+  let intervals =
+    Services.prefs.getCharPref("dom.mms.retrievalRetryIntervals").split(",");
+  for (let i = 0; i < PREF_RETRIEVAL_RETRY_COUNT; ++i) {
+    intervals[i] = parseInt(intervals[i], 10);
+    // If one of the intervals isn't valid (e.g., 0 or NaN),
+    // assign a 10-minute interval to it as a default.
+    if (!intervals[i]) {
+      intervals[i] = 600000;
+    }
+  }
+  intervals.length = PREF_RETRIEVAL_RETRY_COUNT;
+  return intervals;
+})();
 
 XPCOMUtils.defineLazyServiceGetter(this, "gpps",
                                    "@mozilla.org/network/protocol-proxy-service;1",
@@ -608,14 +628,14 @@ RetrieveTransaction.prototype = {
     let that = this;
     this.retrieve((function retryCallback(mmsStatus, msg) {
       if (MMS.MMS_PDU_STATUS_DEFERRED == mmsStatus &&
-          that.retryCount < MAX_RETRY_COUNT) {
-        that.retryCount++;
+          that.retryCount < PREF_RETRIEVAL_RETRY_COUNT) {
         let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
         timer.initWithCallback((function (){
                                  this.retrieve(retryCallback);
                                }).bind(that),
-                               DELAY_TIME_TO_RETRY,
+                               PREF_RETRIEVAL_RETRY_INTERVALS[that.retryCount],
                                Ci.nsITimer.TYPE_ONE_SHOT);
+        that.retryCount++;
         return;
       }
       if (callback) {
@@ -814,12 +834,12 @@ SendTransaction.prototype = {
     let retryCallback = (function (mmsStatus, msg) {
       if ((MMS.MMS_PDU_ERROR_TRANSIENT_FAILURE == mmsStatus ||
             MMS.MMS_PDU_ERROR_PERMANENT_FAILURE == mmsStatus) &&
-          this.retryCount < MAX_RETRY_COUNT) {
+          this.retryCount < PREF_SEND_RETRY_COUNT) {
         this.retryCount++;
 
         let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
         timer.initWithCallback(this.send.bind(this, retryCallback),
-                               DELAY_TIME_TO_RETRY,
+                               PREF_SEND_RETRY_INTERVAL,
                                Ci.nsITimer.TYPE_ONE_SHOT);
         return;
       }
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index bdd1883f5821..d65fe8692660 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4173,8 +4173,12 @@ pref("wap.UAProf.tagname", "x-wap-profile");
 // automatic-home: Automatic retrieval mode in home network.
 // never: Never retrieval mode.
 pref("dom.mms.retrieval_mode", "manual");
-pref("dom.mms.retrievalRetryCount", 3);
-pref("dom.mms.retrievalRetryInterval", 300000);
+
+pref("dom.mms.sendRetryCount", 3);
+pref("dom.mms.sendRetryInterval", 300000);
+
+pref("dom.mms.retrievalRetryCount", 4);
+pref("dom.mms.retrievalRetryIntervals", "60000,300000,600000,1800000");
 
 // If the user puts a finger down on an element and we think the user
 // might be executing a pan gesture, how long do we wait before

From 5f29fb2158cccf9597d17d74dc28a1e695d9d22d Mon Sep 17 00:00:00 2001
From: Gina Yeh <gyeh@mozilla.com>
Date: Thu, 18 Apr 2013 17:41:17 +0200
Subject: [PATCH 430/438] Bug 859727 - Remove routing logic from
 BluetoothScoManager, r=echou, r=rlin

---
 dom/bluetooth/BluetoothScoManager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dom/bluetooth/BluetoothScoManager.cpp b/dom/bluetooth/BluetoothScoManager.cpp
index e9970ed515bb..06ae592a446c 100644
--- a/dom/bluetooth/BluetoothScoManager.cpp
+++ b/dom/bluetooth/BluetoothScoManager.cpp
@@ -83,13 +83,11 @@ BluetoothScoManager::NotifyAudioManager(const nsAString& aAddress)
       NS_WARNING("Failed to notify bluetooth-sco-status-changed observsers!");
       return;
     }
-    am->SetForceForUse(am->USE_COMMUNICATION, am->FORCE_NONE);
   } else {
     if (NS_FAILED(obs->NotifyObservers(nullptr, BLUETOOTH_SCO_STATUS_CHANGED, aAddress.BeginReading()))) {
       NS_WARNING("Failed to notify bluetooth-sco-status-changed observsers!");
       return;
     }
-    am->SetForceForUse(am->USE_COMMUNICATION, am->FORCE_BT_SCO);
   }
 }
 

From dd5be82e7ba0ae4d04ef0047063bd0885ad263f2 Mon Sep 17 00:00:00 2001
From: "ext:(%20rlin%40mozilla.com)" <Randy Lin>
Date: Thu, 18 Apr 2013 16:47:09 +0200
Subject: [PATCH 431/438] Bug 862306 - Route audio stream to BT_SCO in
 AudioManager. r=mwu

---
 dom/system/gonk/AudioManager.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp
index a251bb8df3fe..5a0bd46084fa 100644
--- a/dom/system/gonk/AudioManager.cpp
+++ b/dom/system/gonk/AudioManager.cpp
@@ -154,11 +154,17 @@ AudioManager::Observe(nsISupports* aSubject,
                                             AUDIO_POLICY_DEVICE_STATE_AVAILABLE, address);
       AudioSystem::setDeviceConnectionState(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,
                                             AUDIO_POLICY_DEVICE_STATE_AVAILABLE, address);
+      SetForceForUse(nsIAudioManager::USE_COMMUNICATION, nsIAudioManager::FORCE_BT_SCO);
     } else {
       AudioSystem::setDeviceConnectionState(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET,
                                             AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE, "");
       AudioSystem::setDeviceConnectionState(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,
                                             AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE, "");
+      // only force to none if the current force setting is bt_sco
+      int32_t force;
+      GetForceForUse(nsIAudioManager::USE_COMMUNICATION, &force);
+      if (force == nsIAudioManager::FORCE_BT_SCO)
+        SetForceForUse(nsIAudioManager::USE_COMMUNICATION, nsIAudioManager::FORCE_NONE);
     }
 
     return NS_OK;

From cbe0e4945b5acada78d17a473516b5adc0e39c87 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Thu, 18 Apr 2013 11:34:49 -0400
Subject: [PATCH 432/438] Bug 862500 - Properly shutdown profiler in xpcshell,
 shutdown and error cases. r=snorp

--HG--
extra : rebase_source : 22eeccdcee83e3fd03687e6b969b143502a9c5fc
---
 toolkit/xre/nsAppRunner.cpp      |  8 ++------
 toolkit/xre/nsEmbedFunctions.cpp |  3 +++
 tools/profiler/GeckoProfiler.h   | 10 ++++++++++
 tools/profiler/platform-linux.cc |  6 ++++++
 tools/profiler/platform-macos.cc |  6 ++++++
 tools/profiler/platform-win32.cc |  6 ++++++
 tools/profiler/platform.cpp      | 13 +++++++++++++
 xpcom/build/nsXPComInit.cpp      |  2 ++
 8 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 661ebcaebae2..77d572bb8126 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3894,7 +3894,7 @@ XREMain::XRE_mainRun()
 int
 XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 {
-  profiler_init();
+  GeckoProfilerInitRAII profilerGuard;
   PROFILER_LABEL("Startup", "XRE_Main");
 
   nsresult rv = NS_OK;
@@ -3995,7 +3995,6 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
     MOZ_gdk_display_close(mGdkDisplay);
 #endif
 
-    profiler_shutdown();
     rv = LaunchChild(mNativeApp, true);
 
 #ifdef MOZ_CRASHREPORTER
@@ -4018,8 +4017,6 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 
   XRE_DeinitCommandLine();
 
-  profiler_shutdown();
-
   return NS_FAILED(rv) ? 1 : 0;
 }
 
@@ -4092,7 +4089,7 @@ public:
 int
 XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
 {
-  profiler_init();
+  GeckoProfilerInitRAII profilerGuard;
   PROFILER_LABEL("Startup", "XRE_Main");
 
   nsresult rv = NS_OK;
@@ -4133,7 +4130,6 @@ XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
   // thread that called XRE_metroStartup.
   NS_ASSERTION(!xreMainPtr->mScopedXPCom,
                "XPCOM Shutdown hasn't occured, and we are exiting.");
-  profiler_shutdown();
   return 0;
 }
 
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index d1941620f39c..2fbf9ec484cf 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -424,6 +424,7 @@ XRE_InitChildProcess(int aArgc,
 
   nsresult rv = XRE_InitCommandLine(aArgc, aArgv);
   if (NS_FAILED(rv)) {
+    profiler_shutdown();
     NS_LogTerm();
     return NS_ERROR_FAILURE;
   }
@@ -486,6 +487,7 @@ XRE_InitChildProcess(int aArgc,
       }
 
       if (!process->Init()) {
+        profiler_shutdown();
         NS_LogTerm();
         return NS_ERROR_FAILURE;
       }
@@ -500,6 +502,7 @@ XRE_InitChildProcess(int aArgc,
     }
   }
 
+  profiler_shutdown();
   NS_LogTerm();
   return XRE_DeinitCommandLine();
 }
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 9c2507a71dad..7e40705d001b 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -148,4 +148,14 @@ static inline void profiler_js_operation_callback() {}
 
 #endif
 
+class GeckoProfilerInitRAII {
+public:
+  GeckoProfilerInitRAII() {
+    profiler_init();
+  }
+  ~GeckoProfilerInitRAII() {
+    profiler_shutdown();
+  }
+};
+
 #endif // ifndef SAMPLER_H
diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc
index 8570e1e60158..ae8e02417970 100644
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -360,6 +360,9 @@ void Sampler::Stop() {
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return false;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   ThreadInfo* info = new ThreadInfo(aName, gettid(),
@@ -387,6 +390,9 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = gettid();
diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc
index ac338808da1a..f5d1d9ad5be4 100644
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -355,6 +355,9 @@ pid_t gettid()
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return false;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   ThreadInfo* info = new ThreadInfo(aName, gettid(),
@@ -382,6 +385,9 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = gettid();
diff --git a/tools/profiler/platform-win32.cc b/tools/profiler/platform-win32.cc
index c63fc32cccba..ad4eef407802 100644
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -263,6 +263,9 @@ void OS::Sleep(int milliseconds) {
 
 bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack, bool aIsMainThread)
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return false;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   ThreadInfo* info = new ThreadInfo(aName, GetCurrentThreadId(),
@@ -290,6 +293,9 @@ bool Sampler::RegisterCurrentThread(const char* aName, PseudoStack* aPseudoStack
 
 void Sampler::UnregisterCurrentThread()
 {
+  if (!Sampler::sRegisteredThreadsMutex)
+    return;
+
   mozilla::MutexAutoLock lock(*Sampler::sRegisteredThreadsMutex);
 
   int id = GetCurrentThreadId();
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 80a317365be2..c0230f2d7a86 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -31,6 +31,7 @@ bool stack_key_initialized;
 TimeStamp   sLastTracerEvent; // is raced on
 int         sFrameNumber = 0;
 int         sLastFrameNumber = 0;
+int         sInitCount = 0; // Each init must have a matched shutdown.
 static bool sIsProfiling = false; // is raced on
 
 /* used to keep track of the last event that we sampled during */
@@ -63,6 +64,11 @@ void Sampler::Shutdown() {
 
   delete sRegisteredThreadsMutex;
   delete sRegisteredThreads;
+
+  // UnregisterThread can be called after shutdown in XPCShell. Thus
+  // we need to point to null to ignore such a call after shutdown.
+  sRegisteredThreadsMutex = nullptr;
+  sRegisteredThreads = nullptr;
 }
 
 ThreadInfo::~ThreadInfo() {
@@ -243,6 +249,8 @@ void read_profiler_env_vars()
 
 void mozilla_sampler_init()
 {
+  sInitCount++;
+
   if (stack_key_initialized)
     return;
 
@@ -306,6 +314,11 @@ void mozilla_sampler_init()
 
 void mozilla_sampler_shutdown()
 {
+  sInitCount--;
+
+  if (sInitCount > 0)
+    return;
+
   // Save the profile on shutdown if requested.
   TableTicker *t = tlsTicker.get();
   if (t) {
diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index ec8afdbf1c67..8836c877e156 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -731,6 +731,8 @@ ShutdownXPCOM(nsIServiceManager* servMgr)
     eventtracer::Shutdown();
 #endif
 
+    profiler_shutdown();
+
     NS_LogTerm();
 
     return NS_OK;

From 1afb8a0017fa4c2fbef61e9aace49f90b0bca7ec Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Apr 2013 12:02:27 -0400
Subject: [PATCH 433/438] Backed out changeset 8f7ef60b6f5a (bug 860934) for
 mochitest asserts and crashes.

---
 dom/bluetooth/BluetoothOppManager.cpp         |  15 +-
 dom/camera/GonkCameraControl.cpp              |   3 +-
 dom/devicestorage/DeviceStorage.h             |  20 +-
 .../DeviceStorageRequestChild.cpp             |  11 +-
 .../DeviceStorageRequestParent.cpp            |  55 +--
 .../DeviceStorageRequestParent.h              |  11 +-
 dom/devicestorage/PDeviceStorageRequest.ipdl  |   4 +-
 dom/devicestorage/nsDeviceStorage.cpp         | 317 ++++++++----------
 dom/ipc/ContentChild.cpp                      |   5 +-
 dom/ipc/ContentParent.cpp                     |  17 +-
 dom/ipc/PContent.ipdl                         |  17 +-
 11 files changed, 232 insertions(+), 243 deletions(-)

diff --git a/dom/bluetooth/BluetoothOppManager.cpp b/dom/bluetooth/BluetoothOppManager.cpp
index aec315cdadfc..7847e768d66d 100644
--- a/dom/bluetooth/BluetoothOppManager.cpp
+++ b/dom/bluetooth/BluetoothOppManager.cpp
@@ -29,9 +29,7 @@
 #include "nsIOutputStream.h"
 #include "nsNetUtil.h"
 
-#define TARGET_ROOT   "/sdcard/"
-#define TARGET_SUBDIR "downloads/bluetooth/"
-#define TARGET_FOLDER TARGET_ROOT TARGET_SUBDIR
+#define TARGET_FOLDER "/sdcard/downloads/bluetooth/"
 
 USING_BLUETOOTH_NAMESPACE
 using namespace mozilla;
@@ -563,11 +561,6 @@ BluetoothOppManager::CreateFile()
    */
   f->GetLeafName(sFileName);
 
-  nsString fullFileName;
-  f->GetPath(fullFileName);
-  MOZ_ASSERT(StringBeginsWith(fullFileName, NS_LITERAL_STRING(TARGET_ROOT)));
-  nsDependentSubstring storagePath = Substring(fullFileName, strlen(TARGET_ROOT));
-
   mDsFile = nullptr;
 
   nsCOMPtr<nsIMIMEService> mimeSvc = do_GetService(NS_MIMESERVICE_CONTRACTID);
@@ -577,11 +570,11 @@ BluetoothOppManager::CreateFile()
 
     if (NS_SUCCEEDED(rv)) {
       if (StringBeginsWith(mimeType, NS_LITERAL_CSTRING("image/"))) {
-        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("pictures"), storagePath);
+        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("pictures"), f);
       } else if (StringBeginsWith(mimeType, NS_LITERAL_CSTRING("video/"))) {
-        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("movies"), storagePath);
+        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("movies"), f);
       } else if (StringBeginsWith(mimeType, NS_LITERAL_CSTRING("audio/"))) {
-        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("music"), storagePath);
+        mDsFile = new DeviceStorageFile(NS_LITERAL_STRING("music"), f);
       } else {
         NS_WARNING("Couldn't recognize the mimetype of received file.");
       }
diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp
index 85907d7ca0f0..bf5a08ffc886 100644
--- a/dom/camera/GonkCameraControl.cpp
+++ b/dom/camera/GonkCameraControl.cpp
@@ -905,8 +905,7 @@ nsGonkCameraControl::StartRecordingImpl(StartRecordingTask* aStartRecording)
    */
   nsCOMPtr<nsIFile> filename = aStartRecording->mFolder;
   filename->AppendRelativePath(aStartRecording->mFilename);
-  mVideoFile = new DeviceStorageFile(NS_LITERAL_STRING("videos"),
-                                     aStartRecording->mFilename);
+  mVideoFile = new DeviceStorageFile(NS_LITERAL_STRING("videos"), filename);
 
   nsAutoCString nativeFilename;
   filename->GetNativePath(nativeFilename);
diff --git a/dom/devicestorage/DeviceStorage.h b/dom/devicestorage/DeviceStorage.h
index 78d0d64d9228..4d478306548a 100644
--- a/dom/devicestorage/DeviceStorage.h
+++ b/dom/devicestorage/DeviceStorage.h
@@ -20,18 +20,10 @@ public:
   nsCOMPtr<nsIFile> mFile;
   nsString mPath;
   nsString mStorageType;
-  nsString mRootDir;
   bool mEditable;
 
-  // Used when the path will be set later via SetPath.
-  DeviceStorageFile(const nsAString& aStorageType);
-  // Used for non-enumeration purposes.
-  DeviceStorageFile(const nsAString& aStorageType, const nsAString& aPath);
-  // Used for enumerations. When you call Enumerate, you can pass in a directory to enumerate
-  // and the results that are returned are relative to that directory, files related to an
-  // enumeration need to know the "root of the enumeration" directory.
-  DeviceStorageFile(const nsAString& aStorageType, const nsAString& aRootDir, const nsAString& aPath);
-
+  DeviceStorageFile(const nsAString& aStorageType, nsIFile* aFile, const nsAString& aPath);
+  DeviceStorageFile(const nsAString& aStorageType, nsIFile* aFile);
   void SetPath(const nsAString& aPath);
   void SetEditable(bool aEditable);
 
@@ -40,7 +32,6 @@ public:
   // we want to make sure that the names of file can't reach
   // outside of the type of storage the user asked for.
   bool IsSafePath();
-  bool IsSafePath(const nsAString& aPath);
 
   nsresult Remove();
   nsresult Write(nsIInputStream* aInputStream);
@@ -49,13 +40,10 @@ public:
   void collectFilesInternal(nsTArray<nsRefPtr<DeviceStorageFile> > &aFiles, PRTime aSince, nsAString& aRootPath);
 
   static void DirectoryDiskUsage(nsIFile* aFile, uint64_t* aSoFar, const nsAString& aStorageType);
-  static void GetRootDirectoryForType(const nsAString& aType,
-                                      const nsAString& aVolName,
-                                      nsIFile** aFile);
+
 private:
-  void Init(const nsAString& aStorageType);
   void NormalizeFilePath();
-  void AppendRelativePath(const nsAString& aPath);
+  void AppendRelativePath();
 };
 
 /*
diff --git a/dom/devicestorage/DeviceStorageRequestChild.cpp b/dom/devicestorage/DeviceStorageRequestChild.cpp
index 9c90591c3b42..9b5ef97f29ee 100644
--- a/dom/devicestorage/DeviceStorageRequestChild.cpp
+++ b/dom/devicestorage/DeviceStorageRequestChild.cpp
@@ -100,9 +100,14 @@ DeviceStorageRequestChild::Recv__delete__(const DeviceStorageResponseValue& aVal
 
       uint32_t count = r.paths().Length();
       for (uint32_t i = 0; i < count; i++) {
-        nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(r.type(),
-                                                                r.relpath(),
-                                                                r.paths()[i].name());
+        nsCOMPtr<nsIFile> f;
+        nsresult rv = NS_NewLocalFile(r.paths()[i].fullpath(), false, getter_AddRefs(f));
+        if (NS_FAILED(rv)) {
+          continue;
+        }
+
+        nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(r.paths()[i].type(), f);
+        dsf->SetPath(r.paths()[i].name());
         cursor->mFiles.AppendElement(dsf);
       }
 
diff --git a/dom/devicestorage/DeviceStorageRequestParent.cpp b/dom/devicestorage/DeviceStorageRequestParent.cpp
index 8f438445614a..e046024e962f 100644
--- a/dom/devicestorage/DeviceStorageRequestParent.cpp
+++ b/dom/devicestorage/DeviceStorageRequestParent.cpp
@@ -34,7 +34,10 @@ DeviceStorageRequestParent::Dispatch()
     {
       DeviceStorageAddParams p = mParams;
 
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
+      nsCOMPtr<nsIFile> f;
+      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
+
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
 
       BlobParent* bp = static_cast<BlobParent*>(p.blobParent());
       nsCOMPtr<nsIDOMBlob> blob = bp->GetBlob();
@@ -53,7 +56,12 @@ DeviceStorageRequestParent::Dispatch()
     case DeviceStorageParams::TDeviceStorageGetParams:
     {
       DeviceStorageGetParams p = mParams;
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.rootDir(), p.relpath());
+
+      nsCOMPtr<nsIFile> f;
+      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
+
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
+      dsf->SetPath(p.name());
       nsRefPtr<CancelableRunnable> r = new ReadFileEvent(this, dsf);
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -66,7 +74,10 @@ DeviceStorageRequestParent::Dispatch()
     {
       DeviceStorageDeleteParams p = mParams;
 
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
+      nsCOMPtr<nsIFile> f;
+      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
+
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
       nsRefPtr<CancelableRunnable> r = new DeleteFileEvent(this, dsf);
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -79,7 +90,10 @@ DeviceStorageRequestParent::Dispatch()
     {
       DeviceStorageFreeSpaceParams p = mParams;
 
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
+      nsCOMPtr<nsIFile> f;
+      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
+
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
       nsRefPtr<FreeSpaceFileEvent> r = new FreeSpaceFileEvent(this, dsf);
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -92,7 +106,10 @@ DeviceStorageRequestParent::Dispatch()
     {
       DeviceStorageUsedSpaceParams p = mParams;
 
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
+      nsCOMPtr<nsIFile> f;
+      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
+
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
       nsRefPtr<UsedSpaceFileEvent> r = new UsedSpaceFileEvent(this, dsf);
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -104,9 +121,7 @@ DeviceStorageRequestParent::Dispatch()
     case DeviceStorageParams::TDeviceStorageAvailableParams:
     {
       DeviceStorageAvailableParams p = mParams;
-
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath());
-      nsRefPtr<PostAvailableResultEvent> r = new PostAvailableResultEvent(this, dsf);
+      nsRefPtr<PostAvailableResultEvent> r = new PostAvailableResultEvent(this, p.fullpath());
       NS_DispatchToMainThread(r);
       break;
     }
@@ -114,7 +129,11 @@ DeviceStorageRequestParent::Dispatch()
     case DeviceStorageParams::TDeviceStorageEnumerationParams:
     {
       DeviceStorageEnumerationParams p = mParams;
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), p.relpath(), NS_LITERAL_STRING(""));
+
+      nsCOMPtr<nsIFile> f;
+      NS_NewLocalFile(p.fullpath(), false, getter_AddRefs(f));
+
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(p.type(), f);
       nsRefPtr<CancelableRunnable> r = new EnumerateFileEvent(this, dsf, p.since());
 
       nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -363,12 +382,8 @@ DeviceStorageRequestParent::PostBlobSuccessEvent::CancelableRun() {
 }
 
 DeviceStorageRequestParent::PostEnumerationSuccessEvent::PostEnumerationSuccessEvent(DeviceStorageRequestParent* aParent,
-                                                                                     const nsAString& aStorageType,
-                                                                                     const nsAString& aRelPath,
                                                                                      InfallibleTArray<DeviceStorageFileValue>& aPaths)
   : CancelableRunnable(aParent)
-  , mStorageType(aStorageType)
-  , mRelPath(aRelPath)
   , mPaths(aPaths)
 {
 }
@@ -379,7 +394,7 @@ nsresult
 DeviceStorageRequestParent::PostEnumerationSuccessEvent::CancelableRun() {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  EnumerationResponse response(mStorageType, mRelPath, mPaths);
+  EnumerationResponse response(mPaths);
   unused << mParent->Send__delete__(mParent, response);
   return NS_OK;
 }
@@ -606,11 +621,13 @@ DeviceStorageRequestParent::EnumerateFileEvent::CancelableRun()
 
   uint32_t count = files.Length();
   for (uint32_t i = 0; i < count; i++) {
-    DeviceStorageFileValue dsvf(files[i]->mPath);
+    nsString fullpath;
+    files[i]->mFile->GetPath(fullpath);
+    DeviceStorageFileValue dsvf(mFile->mStorageType, files[i]->mPath, fullpath);
     values.AppendElement(dsvf);
   }
 
-  r = new PostEnumerationSuccessEvent(mParent, mFile->mStorageType, mFile->mRootDir, values);
+  r = new PostEnumerationSuccessEvent(mParent, values);
   NS_DispatchToMainThread(r);
   return NS_OK;
 }
@@ -638,9 +655,9 @@ DeviceStorageRequestParent::PostPathResultEvent::CancelableRun()
 }
 
 DeviceStorageRequestParent::PostAvailableResultEvent::PostAvailableResultEvent(DeviceStorageRequestParent* aParent,
-                                                                               DeviceStorageFile* aFile)
+                                                                               const nsAString &aPath)
   : CancelableRunnable(aParent)
-  , mFile(aFile)
+  , mPath(aPath)
 {
 }
 
@@ -656,7 +673,7 @@ DeviceStorageRequestParent::PostAvailableResultEvent::CancelableRun()
   nsString state;
   state.Assign(NS_LITERAL_STRING("available"));
 #ifdef MOZ_WIDGET_GONK
-  nsresult rv = GetSDCardStatus(mFile->mPath, state);
+  nsresult rv = GetSDCardStatus(mPath, state);
   if (NS_FAILED(rv)) {
     state.Assign(NS_LITERAL_STRING("unavailable"));
   }
diff --git a/dom/devicestorage/DeviceStorageRequestParent.h b/dom/devicestorage/DeviceStorageRequestParent.h
index 5aee8dce45ef..7a124a71b56f 100644
--- a/dom/devicestorage/DeviceStorageRequestParent.h
+++ b/dom/devicestorage/DeviceStorageRequestParent.h
@@ -105,15 +105,10 @@ private:
   class PostEnumerationSuccessEvent : public CancelableRunnable
   {
     public:
-      PostEnumerationSuccessEvent(DeviceStorageRequestParent* aParent,
-                                  const nsAString& aStorageType,
-                                  const nsAString& aRelPath,
-                                  InfallibleTArray<DeviceStorageFileValue>& aPaths);
+      PostEnumerationSuccessEvent(DeviceStorageRequestParent* aParent, InfallibleTArray<DeviceStorageFileValue>& aPaths);
       virtual ~PostEnumerationSuccessEvent();
       virtual nsresult CancelableRun();
     private:
-      const nsString mStorageType;
-      const nsString mRelPath;
       InfallibleTArray<DeviceStorageFileValue> mPaths;
   };
 
@@ -216,11 +211,11 @@ private:
  class PostAvailableResultEvent : public CancelableRunnable
  {
     public:
-      PostAvailableResultEvent(DeviceStorageRequestParent* aParent, DeviceStorageFile* aFile);
+      PostAvailableResultEvent(DeviceStorageRequestParent* aParent, const nsAString& aPath);
       virtual ~PostAvailableResultEvent();
       virtual nsresult CancelableRun();
     private:
-      nsRefPtr<DeviceStorageFile> mFile;
+      nsString mPath;
  };
 
 protected:
diff --git a/dom/devicestorage/PDeviceStorageRequest.ipdl b/dom/devicestorage/PDeviceStorageRequest.ipdl
index a79ae1b3e042..6d0073f745f5 100644
--- a/dom/devicestorage/PDeviceStorageRequest.ipdl
+++ b/dom/devicestorage/PDeviceStorageRequest.ipdl
@@ -27,13 +27,13 @@ struct BlobResponse
 
 struct DeviceStorageFileValue
 {
+  nsString type;
   nsString name;
+  nsString fullpath;
 };
 
 struct EnumerationResponse
 {
-  nsString type;
-  nsString relpath;
   DeviceStorageFileValue[] paths;
 };
 
diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp
index 8d8e6bc1b162..1e848f9083d6 100644
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -311,151 +311,35 @@ private:
 };
 
 DeviceStorageFile::DeviceStorageFile(const nsAString& aStorageType,
-                                     const nsAString& aRootDir,
-                                     const nsAString& aPath)
-  : mPath(aPath)
-  , mStorageType(aStorageType)
-  , mRootDir(aRootDir)
-  , mEditable(false)
-{
-  Init(aStorageType);
-  AppendRelativePath(mRootDir);
-  if (!mPath.EqualsLiteral("")) {
-    AppendRelativePath(mPath);
-  }
-  NormalizeFilePath();
-}
-
-DeviceStorageFile::DeviceStorageFile(const nsAString& aStorageType,
+                                     nsIFile* aFile,
                                      const nsAString& aPath)
   : mPath(aPath)
   , mStorageType(aStorageType)
   , mEditable(false)
 {
-  Init(aStorageType);
-  AppendRelativePath(aPath);
+  NS_ASSERTION(aFile, "Must not create a DeviceStorageFile with a null nsIFile");
+  // always take a clone
+  nsCOMPtr<nsIFile> file;
+  aFile->Clone(getter_AddRefs(mFile));
+
+  AppendRelativePath();
   NormalizeFilePath();
-}
-
-DeviceStorageFile::DeviceStorageFile(const nsAString& aStorageType)
-  : mStorageType(aStorageType)
-  , mEditable(false)
-{
-  Init(aStorageType);
-}
-
-void
-DeviceStorageFile::Init(const nsAString& aStorageType)
-{
-  // The hard-coded sdcard below will change as part of bug 858416
-  DeviceStorageFile::GetRootDirectoryForType(aStorageType,
-                                             NS_LITERAL_STRING("sdcard"),
-                                             getter_AddRefs(mFile));
 
   DebugOnly<DeviceStorageTypeChecker*> typeChecker = DeviceStorageTypeChecker::CreateOrGet();
   NS_ASSERTION(typeChecker, "DeviceStorageTypeChecker is null");
 }
 
-void
-DeviceStorageFile::GetRootDirectoryForType(const nsAString &aType, const
-                                           nsAString &aVolName,
-                                           nsIFile** aFile)
+DeviceStorageFile::DeviceStorageFile(const nsAString& aStorageType, nsIFile* aFile)
+  : mStorageType(aStorageType)
+  , mEditable(false)
 {
-  nsCOMPtr<nsIFile> f;
-  nsCOMPtr<nsIProperties> dirService = do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
-  NS_ASSERTION(dirService, "Must have directory service");
+  NS_ASSERTION(aFile, "Must not create a DeviceStorageFile with a null nsIFile");
+  // always take a clone
+  nsCOMPtr<nsIFile> file;
+  aFile->Clone(getter_AddRefs(mFile));
 
-#ifdef MOZ_WIDGET_GONK
-  nsString volMountPoint(NS_LITERAL_STRING("/sdcard"));
-  if (!aVolName.EqualsLiteral("")) {
-    nsCOMPtr<nsIVolumeService> vs = do_GetService(NS_VOLUMESERVICE_CONTRACTID);
-    if (vs) {
-      nsresult rv;
-      nsCOMPtr<nsIVolume> vol;
-      rv = vs->GetVolumeByName(aVolName, getter_AddRefs(vol));
-      if (NS_SUCCEEDED(rv)) {
-        vol->GetMountPoint(volMountPoint);
-      }
-    }
-  }
-#endif
-
-  // Picture directory
-  if (aType.EqualsLiteral(DEVICESTORAGE_PICTURES)) {
-#ifdef MOZ_WIDGET_GONK
-    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
-#elif defined (MOZ_WIDGET_COCOA)
-    dirService->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_UNIX)
-    dirService->Get(NS_UNIX_XDG_PICTURES_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_WIN)
-    dirService->Get(NS_WIN_PICTURES_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#endif
-  }
-
-  // Video directory
-  else if (aType.EqualsLiteral(DEVICESTORAGE_VIDEOS)) {
-#ifdef MOZ_WIDGET_GONK
-    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
-#elif defined (MOZ_WIDGET_COCOA)
-    dirService->Get(NS_OSX_MOVIE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_UNIX)
-    dirService->Get(NS_UNIX_XDG_VIDEOS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_WIN)
-    dirService->Get(NS_WIN_VIDEOS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#endif
-  }
-
-  // Music directory
-  else if (aType.EqualsLiteral(DEVICESTORAGE_MUSIC)) {
-#ifdef MOZ_WIDGET_GONK
-    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
-#elif defined (MOZ_WIDGET_COCOA)
-    dirService->Get(NS_OSX_MUSIC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_UNIX)
-    dirService->Get(NS_UNIX_XDG_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#elif defined (XP_WIN)
-    dirService->Get(NS_WIN_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-#endif
-  }
-
-  // Apps directory
-  else if (aType.EqualsLiteral(DEVICESTORAGE_APPS)) {
-#ifdef MOZ_WIDGET_GONK
-    NS_NewLocalFile(NS_LITERAL_STRING("/data"), false, getter_AddRefs(f));
-#else
-    dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-    if (f) {
-      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("webapps"));
-    }
-#endif
-  }
-
-   // default SDCard
-   else if (aType.EqualsLiteral(DEVICESTORAGE_SDCARD)) {
-#ifdef MOZ_WIDGET_GONK
-     NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
-#else
-    // Eventually, on desktop, we want to do something smarter -- for example,
-    // detect when an sdcard is inserted, and use that instead of this.
-    dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-    if (f) {
-      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("fake-sdcard"));
-    }
-#endif
-  }
-
-  // in testing, we default all device storage types to a temp directory
-  if (f && mozilla::Preferences::GetBool("device.storage.testing", false)) {
-    dirService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
-    if (f) {
-      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("device-storage-testing"));
-      f->Create(nsIFile::DIRECTORY_TYPE, 0777);
-      f->Normalize();
-    }
-  }
-
-  NS_IF_ADDREF(*aFile = f.get());
+  DebugOnly<DeviceStorageTypeChecker*> typeChecker = DeviceStorageTypeChecker::CreateOrGet();
+  NS_ASSERTION(typeChecker, "DeviceStorageTypeChecker is null");
 }
 
 void
@@ -473,16 +357,10 @@ DeviceStorageFile::SetEditable(bool aEditable) {
 // outside of the type of storage the user asked for.
 bool
 DeviceStorageFile::IsSafePath()
-{
-  return IsSafePath(mRootDir) && IsSafePath(mPath);
-}
-
-bool
-DeviceStorageFile::IsSafePath(const nsAString& aPath)
 {
   nsAString::const_iterator start, end;
-  aPath.BeginReading(start);
-  aPath.EndReading(end);
+  mPath.BeginReading(start);
+  mPath.EndReading(end);
 
   // if the path has a ~ or \ in it, return false.
   NS_NAMED_LITERAL_STRING(tilde, "~");
@@ -492,7 +370,7 @@ DeviceStorageFile::IsSafePath(const nsAString& aPath)
     return false;
    }
   // split on /.  if any token is "", ., or .., return false.
-  NS_ConvertUTF16toUTF8 cname(aPath);
+  NS_ConvertUTF16toUTF8 cname(mPath);
   char* buffer = cname.BeginWriting();
   const char* token;
 
@@ -519,12 +397,12 @@ DeviceStorageFile::NormalizeFilePath() {
 }
 
 void
-DeviceStorageFile::AppendRelativePath(const nsAString& aPath) {
+DeviceStorageFile::AppendRelativePath() {
 #if defined(XP_WIN)
   // replace forward slashes with backslashes,
   // since nsLocalFileWin chokes on them
   nsString temp;
-  temp.Assign(aPath);
+  temp.Assign(mPath);
 
   PRUnichar* cur = temp.BeginWriting();
   PRUnichar* end = temp.EndWriting();
@@ -535,7 +413,7 @@ DeviceStorageFile::AppendRelativePath(const nsAString& aPath) {
   }
   mFile->AppendRelativePath(temp);
 #else
-  mFile->AppendRelativePath(aPath);
+  mFile->AppendRelativePath(mPath);
 #endif
 }
 
@@ -657,6 +535,7 @@ DeviceStorageFile::CollectFiles(nsTArray<nsRefPtr<DeviceStorageFile> > &aFiles,
   if (NS_FAILED(rv)) {
     return;
   }
+
   return collectFilesInternal(aFiles, aSince, rootPath);
 }
 
@@ -705,10 +584,12 @@ DeviceStorageFile::collectFilesInternal(nsTArray<nsRefPtr<DeviceStorageFile> > &
     nsDependentSubstring newPath = Substring(fullpath, len);
 
     if (isDir) {
-      DeviceStorageFile dsf(mStorageType, mRootDir, newPath);
+      DeviceStorageFile dsf(mStorageType, f);
+      dsf.SetPath(newPath);
       dsf.collectFilesInternal(aFiles, aSince, aRootPath);
     } else if (isFile) {
-      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDir, newPath);
+      nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, f);
+      dsf->SetPath(newPath);
       aFiles.AppendElement(dsf);
     }
   }
@@ -824,13 +705,11 @@ UnregisterForSDCardChanges(nsIObserver* aObserver)
 #endif
 
 void
-nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType,
-                                            const nsAString& aVolName)
+nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType, const nsAString& aVolName)
 {
   nsCOMPtr<nsIFile> f;
-  DeviceStorageFile::GetRootDirectoryForType(aType,
-                                             aVolName,
-                                             getter_AddRefs(f));
+  nsCOMPtr<nsIProperties> dirService = do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
+  NS_ASSERTION(dirService, "Must have directory service");
 
   mVolumeName = NS_LITERAL_STRING("");
 #ifdef MOZ_WIDGET_GONK
@@ -847,7 +726,84 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType,
       }
     }
   }
+#endif
 
+  // Picture directory
+  if (aType.EqualsLiteral(DEVICESTORAGE_PICTURES)) {
+#ifdef MOZ_WIDGET_GONK
+    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
+#elif defined (MOZ_WIDGET_COCOA)
+    dirService->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_UNIX)
+    dirService->Get(NS_UNIX_XDG_PICTURES_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_WIN)
+    dirService->Get(NS_WIN_PICTURES_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#endif
+  }
+
+  // Video directory
+  else if (aType.EqualsLiteral(DEVICESTORAGE_VIDEOS)) {
+#ifdef MOZ_WIDGET_GONK
+    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
+#elif defined (MOZ_WIDGET_COCOA)
+    dirService->Get(NS_OSX_MOVIE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_UNIX)
+    dirService->Get(NS_UNIX_XDG_VIDEOS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_WIN)
+    dirService->Get(NS_WIN_VIDEOS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#endif
+  }
+
+  // Music directory
+  else if (aType.EqualsLiteral(DEVICESTORAGE_MUSIC)) {
+#ifdef MOZ_WIDGET_GONK
+    NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
+#elif defined (MOZ_WIDGET_COCOA)
+    dirService->Get(NS_OSX_MUSIC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_UNIX)
+    dirService->Get(NS_UNIX_XDG_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#elif defined (XP_WIN)
+    dirService->Get(NS_WIN_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+#endif
+  }
+
+  // Apps directory
+  else if (aType.EqualsLiteral(DEVICESTORAGE_APPS)) {
+#ifdef MOZ_WIDGET_GONK
+    NS_NewLocalFile(NS_LITERAL_STRING("/data"), false, getter_AddRefs(f));
+#else
+    dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+    if (f) {
+      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("webapps"));
+    }
+#endif
+  }
+
+   // default SDCard
+   else if (aType.EqualsLiteral(DEVICESTORAGE_SDCARD)) {
+#ifdef MOZ_WIDGET_GONK
+     NS_NewLocalFile(volMountPoint, false, getter_AddRefs(f));
+#else
+    // Eventually, on desktop, we want to do something smarter -- for example,
+    // detect when an sdcard is inserted, and use that instead of this.
+    dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+    if (f) {
+      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("fake-sdcard"));
+    }
+#endif
+  }
+
+  // in testing, we default all device storage types to a temp directory
+  if (f && mozilla::Preferences::GetBool("device.storage.testing", false)) {
+    dirService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
+    if (f) {
+      f->AppendRelativeNativePath(NS_LITERAL_CSTRING("device-storage-testing"));
+      f->Create(nsIFile::DIRECTORY_TYPE, 0777);
+      f->Normalize();
+    }
+  }
+
+#ifdef MOZ_WIDGET_GONK
   RegisterForSDCardChanges(this);
 #endif
 
@@ -1069,13 +1025,20 @@ ContinueCursorEvent::Continue()
     return;
   }
 
+  nsString fullpath;
+  nsresult rv = file->mFile->GetPath(fullpath);
+  if (NS_FAILED(rv)) {
+    NS_ASSERTION(false, "GetPath failed to return a valid path");
+    return;
+  }
+
   nsDOMDeviceStorageCursor* cursor = static_cast<nsDOMDeviceStorageCursor*>(mRequest.get());
   nsString cursorStorageType;
   cursor->GetStorageType(cursorStorageType);
 
   DeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, file);
   child->SetCallback(cursor);
-  DeviceStorageGetParams params(cursorStorageType, file->mRootDir, file->mPath);
+  DeviceStorageGetParams params(cursorStorageType, file->mPath, fullpath);
   ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
   mRequest = nullptr;
 }
@@ -1216,8 +1179,17 @@ nsDOMDeviceStorageCursor::Allow()
   }
 
   if (XRE_GetProcessType() != GeckoProcessType_Default) {
+
+    nsString fullpath;
+    nsresult rv = mFile->mFile->GetPath(fullpath);
+
+    if (NS_FAILED(rv)) {
+      // just do nothing
+      return NS_OK;
+    }
+
     PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(this, mFile);
-    DeviceStorageEnumerationParams params(mFile->mStorageType, mFile->mRootDir, mSince);
+    DeviceStorageEnumerationParams params(mFile->mStorageType, fullpath, mSince);
     ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
     return NS_OK;
   }
@@ -1677,6 +1649,14 @@ public:
       return NS_ERROR_FAILURE;
     }
 
+    nsString fullpath;
+    nsresult rv = mFile->mFile->GetPath(fullpath);
+
+    if (NS_FAILED(rv)) {
+      // just do nothing
+      return NS_OK;
+    }
+
     switch(mRequestType) {
       case DEVICE_STORAGE_REQUEST_CREATE:
       {
@@ -1706,7 +1686,8 @@ public:
           DeviceStorageAddParams params;
           params.blobChild() = actor;
           params.type() = mFile->mStorageType;
-          params.relpath() = mFile->mPath;
+          params.name() = mFile->mPath;
+          params.fullpath() = fullpath;
 
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
@@ -1732,7 +1713,7 @@ public:
 
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageGetParams params(mFile->mStorageType, mFile->mRootDir, mFile->mPath);
+          DeviceStorageGetParams params(mFile->mStorageType, mFile->mPath, fullpath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -1756,7 +1737,7 @@ public:
 
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageDeleteParams params(mFile->mStorageType, mFile->mPath);
+          DeviceStorageDeleteParams params(mFile->mStorageType, fullpath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -1768,7 +1749,7 @@ public:
       {
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageFreeSpaceParams params(mFile->mStorageType, mFile->mPath);
+          DeviceStorageFreeSpaceParams params(mFile->mStorageType, fullpath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -1780,7 +1761,7 @@ public:
       {
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageUsedSpaceParams params(mFile->mStorageType, mFile->mPath);
+          DeviceStorageUsedSpaceParams params(mFile->mStorageType, fullpath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -1792,7 +1773,7 @@ public:
       {
         if (XRE_GetProcessType() != GeckoProcessType_Default) {
           PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile);
-          DeviceStorageAvailableParams params(mFile->mStorageType, mFile->mPath);
+          DeviceStorageAvailableParams params(mFile->mStorageType, fullpath);
           ContentChild::GetSingleton()->SendPDeviceStorageRequestConstructor(child, params);
           return NS_OK;
         }
@@ -2042,7 +2023,7 @@ nsDOMDeviceStorage::AddNamed(nsIDOMBlob *aBlob,
 
   nsCOMPtr<nsIRunnable> r;
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, aPath);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory, aPath);
   if (!dsf->IsSafePath()) {
     r = new PostErrorEvent(request, POST_ERROR_EVENT_PERMISSION_DENIED);
   } else if (!typeChecker->Check(mStorageType, dsf->mFile) ||
@@ -2098,7 +2079,7 @@ nsDOMDeviceStorage::GetInternal(const JS::Value & aPath,
     return NS_OK;
   }
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, path);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory, path);
   dsf->SetEditable(aEditable);
   if (!dsf->IsSafePath()) {
     r = new PostErrorEvent(request, POST_ERROR_EVENT_PERMISSION_DENIED);
@@ -2131,7 +2112,7 @@ nsDOMDeviceStorage::Delete(const JS::Value & aPath, JSContext* aCx, nsIDOMDOMReq
     return NS_OK;
   }
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, path);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory, path);
 
   if (!dsf->IsSafePath()) {
     r = new PostErrorEvent(request, POST_ERROR_EVENT_PERMISSION_DENIED);
@@ -2155,7 +2136,7 @@ nsDOMDeviceStorage::FreeSpace(nsIDOMDOMRequest** aRetval)
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
   NS_ADDREF(*aRetval = request);
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_FREE_SPACE,
                                                      win,
                                                      mPrincipal,
@@ -2176,7 +2157,7 @@ nsDOMDeviceStorage::UsedSpace(nsIDOMDOMRequest** aRetval)
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
   NS_ADDREF(*aRetval = request);
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_USED_SPACE,
                                                      win,
                                                      mPrincipal,
@@ -2197,7 +2178,7 @@ nsDOMDeviceStorage::Available(nsIDOMDOMRequest** aRetval)
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
   NS_ADDREF(*aRetval = request);
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_AVAILABLE,
                                                      win,
                                                      mPrincipal,
@@ -2297,7 +2278,7 @@ nsDOMDeviceStorage::EnumerateInternal(const JS::Value & aName,
     since = ExtractDateFromOptions(aCx, aOptions);
   }
 
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, path, NS_LITERAL_STRING(""));
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory, path);
   dsf->SetEditable(aEditable);
 
   nsRefPtr<nsDOMDeviceStorageCursor> cursor = new nsDOMDeviceStorageCursor(win, mPrincipal,
@@ -2471,7 +2452,7 @@ nsDOMDeviceStorage::AddEventListener(const nsAString & aType,
   }
 
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_WATCH,
                                                      win, mPrincipal, dsf, request, this);
   NS_DispatchToMainThread(r);
@@ -2492,7 +2473,7 @@ nsDOMDeviceStorage::AddEventListener(const nsAString & aType,
   }
 
   nsRefPtr<DOMRequest> request = new DOMRequest(win);
-  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType);
+  nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(mStorageType, mRootDirectory);
   nsCOMPtr<nsIRunnable> r = new DeviceStorageRequest(DEVICE_STORAGE_REQUEST_WATCH,
                                                      win, mPrincipal, dsf, request, this);
   NS_DispatchToMainThread(r);
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index a186189b0226..1e86af0b3092 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1176,7 +1176,10 @@ ContentChild::RecvLastPrivateDocShellDestroyed()
 bool
 ContentChild::RecvFilePathUpdate(const nsString& type, const nsString& path, const nsCString& aReason)
 {
-    nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(type, path);
+    nsCOMPtr<nsIFile> file;
+    NS_NewLocalFile(path, false, getter_AddRefs(file));
+
+    nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(type, file);
 
     nsString reason;
     CopyASCIItoUTF16(aReason, reason);
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 1134faee6b39..ea2fc83feb8f 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -1531,7 +1531,10 @@ ContentParent::Observe(nsISupports* aSubject,
         CopyUTF16toUTF8(aData, creason);
         DeviceStorageFile* file = static_cast<DeviceStorageFile*>(aSubject);
 
-        unused << SendFilePathUpdate(file->mStorageType, file->mPath, creason);
+        nsString path;
+        file->mFile->GetPath(path);
+
+        unused << SendFilePathUpdate(file->mStorageType, path, creason);
     }
 #ifdef MOZ_WIDGET_GONK
     else if(!strcmp(aTopic, NS_VOLUME_STATE_CHANGED)) {
@@ -2346,11 +2349,15 @@ ContentParent::RecvAsyncMessage(const nsString& aMsg,
 }
 
 bool
-ContentParent::RecvFilePathUpdateNotify(const nsString& aType,
-                                        const nsString& aFilePath,
-                                        const nsCString& aReason)
+ContentParent::RecvFilePathUpdateNotify(const nsString& aType, const nsString& aFilePath, const nsCString& aReason)
 {
-    nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(aType, aFilePath);
+    nsCOMPtr<nsIFile> file;
+    nsresult rv = NS_NewLocalFile(aFilePath, false, getter_AddRefs(file));
+    if (NS_FAILED(rv)) {
+        // ignore
+        return true;
+    }
+    nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(aType, file);
 
     nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
     if (!obs) {
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index ebcd9612a28e..f3a5064a3d24 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -63,45 +63,46 @@ struct FontListEntry {
 struct DeviceStorageFreeSpaceParams
 {
   nsString type;
-  nsString relpath;
+  nsString fullpath;
 };
 
 struct DeviceStorageUsedSpaceParams
 {
   nsString type;
-  nsString relpath;
+  nsString fullpath;
 };
 
 struct DeviceStorageAvailableParams
 {
   nsString type;
-  nsString relpath;
+  nsString fullpath;
 };
 
 struct DeviceStorageAddParams
 {
   nsString type;
-  nsString relpath;
   PBlob blob;
+  nsString name;
+  nsString fullpath;
 };
 
 struct DeviceStorageGetParams
 {
   nsString type;
-  nsString rootDir;
-  nsString relpath;
+  nsString name;
+  nsString fullpath;
 };
 
 struct DeviceStorageDeleteParams
 {
   nsString type;
-  nsString relpath;
+  nsString fullpath;
 };
 
 struct DeviceStorageEnumerationParams
 {
   nsString type;
-  nsString relpath;
+  nsString fullpath;
   uint64_t since;
 };
 

From 33e2bb296bb3d29a1c286cdf6c54cc4bc83946cc Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Thu, 18 Apr 2013 18:07:55 +0100
Subject: [PATCH 434/438] Bug 863325 - Send correct result with Reader:Added
 message (r=bnicholson)

---
 mobile/android/chrome/content/aboutReader.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/chrome/content/aboutReader.js b/mobile/android/chrome/content/aboutReader.js
index ca2b53d21f66..ccf7049e0422 100644
--- a/mobile/android/chrome/content/aboutReader.js
+++ b/mobile/android/chrome/content/aboutReader.js
@@ -212,9 +212,12 @@ AboutReader.prototype = {
       gChromeWin.Reader.storeArticleInCache(this._article, function(success) {
         dump("Reader:Add (in reader) success=" + success);
 
+        let result = (success ? gChromeWin.Reader.READER_ADD_SUCCESS :
+            gChromeWin.Reader.READER_ADD_FAILED);
+
         gChromeWin.sendMessageToJava({
           type: "Reader:Added",
-          success: success,
+          result: result,
           title: this._article.title,
           url: this._article.url,
         });

From e086f4c1c6dc5e046e0277b3a47a5d4107b54f2f Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 18 Apr 2013 19:58:01 +0300
Subject: [PATCH 435/438] Bug 863094 - Infinity/-Infinity/NaN defaults for
 unrestricted types, r=bz

--HG--
extra : rebase_source : c2495008be9b084656222e6a0773c72d5224e9cc
---
 dom/bindings/Codegen.py                      |  18 +++-
 dom/bindings/parser/WebIDL.py                |  22 ++--
 dom/bindings/parser/tests/test_dictionary.py | 108 +++++++++++++++++++
 dom/bindings/test/TestBindingHeader.h        |   9 ++
 dom/bindings/test/TestCodeGen.webidl         |  26 +++++
 5 files changed, 174 insertions(+), 9 deletions(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 800ab4f78f8a..0dd833a32b13 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -8,6 +8,7 @@ import operator
 import os
 import re
 import string
+import math
 
 from WebIDL import BuiltinTypes, IDLBuiltinType, IDLNullValue, IDLSequenceType, IDLType
 from Configuration import NoSuchDescriptorError, getTypesFromDescriptor, getTypesFromDictionary, getTypesFromCallback, Descriptor
@@ -2045,10 +2046,23 @@ numericSuffixes = {
     IDLType.Tags.uint32: 'U',
     IDLType.Tags.int64: 'LL',
     IDLType.Tags.uint64: 'ULL',
+    IDLType.Tags.unrestricted_float: 'F',
     IDLType.Tags.float: 'F',
+    IDLType.Tags.unrestricted_double: 'D',
     IDLType.Tags.double: 'D'
 }
 
+def numericValue(t, v):
+    if (t == IDLType.Tags.unrestricted_double or
+        t == IDLType.Tags.unrestricted_float):
+        if v == float("inf"):
+            return "MOZ_DOUBLE_POSITIVE_INFINITY()"
+        if v == float("-inf"):
+            return "MOZ_DOUBLE_NEGATIVE_INFINITY()"
+        if math.isnan(v):
+            return "MOZ_DOUBLE_NaN()"
+    return "%s%s" % (v, numericSuffixes[t])
+
 class CastableObjectUnwrapper():
     """
     A class for unwrapping an object named by the "source" argument
@@ -3179,7 +3193,7 @@ for (uint32_t i = 0; i < length; ++i) {
         tag = defaultValue.type.tag()
         if tag in numericSuffixes:
             # Some numeric literals require a suffix to compile without warnings
-            defaultStr = "%s%s" % (defaultValue.value, numericSuffixes[tag])
+            defaultStr = numericValue(tag, defaultValue.value)
         else:
             assert(tag == IDLType.Tags.bool)
             defaultStr = toStringBool(defaultValue.value)
@@ -3286,7 +3300,7 @@ def convertConstIDLValueToJSVal(value):
     if tag == IDLType.Tags.uint32:
         return "UINT_TO_JSVAL(%sU)" % (value.value)
     if tag in [IDLType.Tags.int64, IDLType.Tags.uint64]:
-        return "DOUBLE_TO_JSVAL(%s%s)" % (value.value, numericSuffixes[tag])
+        return "DOUBLE_TO_JSVAL(%s)" % numericValue(tag, value.value)
     if tag == IDLType.Tags.bool:
         return "JSVAL_TRUE" if value.value else "JSVAL_FALSE"
     if tag in [IDLType.Tags.float, IDLType.Tags.double]:
diff --git a/dom/bindings/parser/WebIDL.py b/dom/bindings/parser/WebIDL.py
index 902e4bce8041..4494a229cc13 100644
--- a/dom/bindings/parser/WebIDL.py
+++ b/dom/bindings/parser/WebIDL.py
@@ -8,6 +8,7 @@ from ply import lex, yacc
 import re
 import os
 import traceback
+import math
 
 # Machinery
 
@@ -2257,6 +2258,13 @@ class IDLValue(IDLObject):
                                   % (self.value, type.inner.identifier.name),
                                   [location, type.inner.location])
             return self
+        elif self.type.isFloat() and type.isFloat():
+            if (not type.isUnrestricted() and
+                (self.value == float("inf") or self.value == float("-inf") or
+                 math.isnan(self.value))):
+                raise WebIDLError("Trying to convert unrestricted value %s to non-unrestricted"
+                                  % self.value, [location]);
+            return self
         else:
             raise WebIDLError("Cannot coerce type %s to type %s." %
                               (self.type, type), [location])
@@ -3148,6 +3156,11 @@ class Tokenizer(object):
         "OTHER"
         ]
 
+    def t_FLOATLITERAL(self, t):
+        r'(-?(([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([Ee][+-]?[0-9]+)?|[0-9]+[Ee][+-]?[0-9]+|Infinity))|NaN'
+        t.value = float(t.value)
+        return t
+
     def t_INTEGER(self, t):
         r'-?(0([0-7]+|[Xx][0-9A-Fa-f]+)?|[1-9][0-9]*)'
         try:
@@ -3161,11 +3174,6 @@ class Tokenizer(object):
                                         filename=self._filename)])
         return t
 
-    def t_FLOATLITERAL(self, t):
-        r'-?(([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([Ee][+-]?[0-9]+)?|[0-9]+[Ee][+-]?[0-9]+)'
-        assert False
-        return t
-
     def t_IDENTIFIER(self, t):
         r'[A-Z_a-z][0-9A-Z_a-z]*'
         t.type = self.keywords.get(t.value, 'IDENTIFIER')
@@ -3594,8 +3602,8 @@ class Parser(Tokenizer):
         """
             ConstValue : FLOATLITERAL
         """
-        assert False
-        pass
+        location = self.getLocation(p, 1)
+        p[0] = IDLValue(location, BuiltinTypes[IDLBuiltinType.Types.unrestricted_float], p[1])
 
     def p_ConstValueString(self, p):
         """
diff --git a/dom/bindings/parser/tests/test_dictionary.py b/dom/bindings/parser/tests/test_dictionary.py
index 39037168ecd0..4de41050981c 100644
--- a/dom/bindings/parser/tests/test_dictionary.py
+++ b/dom/bindings/parser/tests/test_dictionary.py
@@ -442,3 +442,111 @@ def WebIDLTest(parser, harness):
         threw = True
 
     harness.ok(threw, "Member type must not be a nullable dictionary")
+
+    parser = parser.reset();
+    parser.parse("""
+        dictionary Foo {
+          unrestricted float  urFloat = 0;
+          unrestricted float  urFloat2 = 1.1;
+          unrestricted float  urFloat3 = -1.1;
+          unrestricted float? urFloat4 = null;
+          unrestricted float  infUrFloat = Infinity;
+          unrestricted float  negativeInfUrFloat = -Infinity;
+          unrestricted float  nanUrFloat = NaN;
+
+          unrestricted double  urDouble = 0;
+          unrestricted double  urDouble2 = 1.1;
+          unrestricted double  urDouble3 = -1.1;
+          unrestricted double? urDouble4 = null;
+          unrestricted double  infUrDouble = Infinity;
+          unrestricted double  negativeInfUrDouble = -Infinity;
+          unrestricted double  nanUrDouble = NaN;
+        };
+    """)
+    results = parser.finish()
+    harness.ok(True, "Parsing default values for unrestricted types succeeded.")
+
+    parser = parser.reset();
+    threw = False
+    try:
+        parser.parse("""
+            dictionary Foo {
+              double f = Infinity;
+            };
+        """)
+        results = parser.finish()
+    except:
+        threw = True
+
+    harness.ok(threw, "Only unrestricted values can be initialized to Infinity")
+
+    parser = parser.reset();
+    threw = False
+    try:
+        parser.parse("""
+            dictionary Foo {
+              double f = -Infinity;
+            };
+        """)
+        results = parser.finish()
+    except:
+        threw = True
+
+    harness.ok(threw, "Only unrestricted values can be initialized to -Infinity")
+
+    parser = parser.reset();
+    threw = False
+    try:
+        parser.parse("""
+            dictionary Foo {
+              double f = NaN;
+            };
+        """)
+        results = parser.finish()
+    except:
+        threw = True
+
+    harness.ok(threw, "Only unrestricted values can be initialized to NaN")
+
+    parser = parser.reset();
+    threw = False
+    try:
+        parser.parse("""
+            dictionary Foo {
+              float f = Infinity;
+            };
+        """)
+        results = parser.finish()
+    except:
+        threw = True
+
+    harness.ok(threw, "Only unrestricted values can be initialized to Infinity")
+
+
+    parser = parser.reset();
+    threw = False
+    try:
+        parser.parse("""
+            dictionary Foo {
+              float f = -Infinity;
+            };
+        """)
+        results = parser.finish()
+    except:
+        threw = True
+
+    harness.ok(threw, "Only unrestricted values can be initialized to -Infinity")
+
+    parser = parser.reset();
+    threw = False
+    try:
+        parser.parse("""
+            dictionary Foo {
+              float f = NaN;
+            };
+        """)
+        results = parser.finish()
+    except:
+        threw = True
+
+    harness.ok(threw, "Only unrestricted values can be initialized to NaN")
diff --git a/dom/bindings/test/TestBindingHeader.h b/dom/bindings/test/TestBindingHeader.h
index fcfb7a04e50a..2434ff388616 100644
--- a/dom/bindings/test/TestBindingHeader.h
+++ b/dom/bindings/test/TestBindingHeader.h
@@ -229,6 +229,15 @@ public:
   double LenientDoubleAttr() const;
   void SetLenientDoubleAttr(double);
 
+  void PassUnrestricted(float arg1,
+                        float arg2,
+                        float arg3,
+                        float arg4,
+                        double arg5,
+                        double arg6,
+                        double arg7,
+                        double arg8);
+
   // Interface types
   already_AddRefed<TestInterface> ReceiveSelf();
   already_AddRefed<TestInterface> ReceiveNullableSelf();
diff --git a/dom/bindings/test/TestCodeGen.webidl b/dom/bindings/test/TestCodeGen.webidl
index 9f9aa9d3b80e..a6f5384a84d8 100644
--- a/dom/bindings/test/TestCodeGen.webidl
+++ b/dom/bindings/test/TestCodeGen.webidl
@@ -192,6 +192,15 @@ interface TestInterface {
   [LenientFloat]
   attribute double lenientDoubleAttr;
 
+  void passUnrestricted(optional unrestricted float arg1 = 0,
+                        optional unrestricted float arg2 = Infinity,
+                        optional unrestricted float arg3 = -Infinity,
+                        optional unrestricted float arg4 = NaN,
+                        optional unrestricted double arg5 = 0,
+                        optional unrestricted double arg6 = Infinity,
+                        optional unrestricted double arg7 = -Infinity,
+                        optional unrestricted double arg8 = NaN);
+
   // Castable interface types
   // XXXbz add tests for throwing versions of all the castable interface stuff
   TestInterface receiveSelf();
@@ -589,6 +598,23 @@ dictionary Dict : ParentDict {
   object? anotherObj = null;
   TestCallback? someCallback = null;
   any someAny;
+
+  unrestricted float  urFloat = 0;
+  unrestricted float  urFloat2 = 1.1;
+  unrestricted float  urFloat3 = -1.1;
+  unrestricted float? urFloat4 = null;
+  unrestricted float  infUrFloat = Infinity;
+  unrestricted float  negativeInfUrFloat = -Infinity;
+  unrestricted float  nanUrFloat = NaN;
+
+  unrestricted double  urDouble = 0;
+  unrestricted double  urDouble2 = 1.1;
+  unrestricted double  urDouble3 = -1.1;
+  unrestricted double? urDouble4 = null;
+  unrestricted double  infUrDouble = Infinity;
+  unrestricted double  negativeInfUrDouble = -Infinity;
+  unrestricted double  nanUrDouble = NaN;
+
 };
 
 dictionary ParentDict : GrandparentDict {

From 5125740ec4931020c37c1e455f741a93b9735368 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Apr 2013 14:04:14 -0400
Subject: [PATCH 436/438] Backed out changeset 36ffb85842ac (bug 862501) for
 mochitest crashes.

---
 js/src/ion/BaselineIC.cpp      | 1 -
 js/src/ion/IonMacroAssembler.h | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/src/ion/BaselineIC.cpp b/js/src/ion/BaselineIC.cpp
index 76cbc2db89fd..4403911b76a8 100644
--- a/js/src/ion/BaselineIC.cpp
+++ b/js/src/ion/BaselineIC.cpp
@@ -1016,7 +1016,6 @@ ICProfiler_PushFunction::Compiler::generateStubCode(MacroAssembler &masm)
     masm.spsPushFrame(&cx->runtime->spsProfiler,
                       Address(BaselineStubReg, ICProfiler_PushFunction::offsetOfStr()),
                       Address(BaselineStubReg, ICProfiler_PushFunction::offsetOfScript()),
-                      BaselineFrameReg,
                       scratch,
                       scratch2);
 
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index 492f7f05c272..6f0a583cf79c 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -779,7 +779,7 @@ class MacroAssembler : public MacroAssemblerSpecific
     }
 
     void spsPushFrame(SPSProfiler *p, const Address &str, const Address &script,
-                      Register framePtr, Register temp, Register temp2)
+                      Register temp, Register temp2)
     {
         Label stackFull;
         spsProfileEntryAddress(p, 0, temp, &stackFull);
@@ -790,7 +790,7 @@ class MacroAssembler : public MacroAssemblerSpecific
         loadPtr(script, temp2);
         storePtr(temp2, Address(temp, ProfileEntry::offsetOfScript()));
 
-        storePtr(framePtr, Address(temp, ProfileEntry::offsetOfStackAddress()));
+        storePtr(ImmWord((void*) 0), Address(temp, ProfileEntry::offsetOfStackAddress()));
 
         // Store 0 for PCIdx because that's what interpreter does.
         // (See Probes::enterScript, which calls spsProfiler.enter, which pushes an entry

From 72d33a4d5d09e94f99019056f5a8dac546ff91dd Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Apr 2013 14:52:59 -0400
Subject: [PATCH 437/438] Backed out changeset 7610346a34ee (bug 859705) for
 intermittent Android xpcshell failures on a CLOSED TREE.

---
 testing/xpcshell/remotexpcshelltests.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index d4eb8f593825..e460b2e3ccf8 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -155,7 +155,6 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
                         self.device.pushFile(os.path.join(dir, info.filename), remoteFile)
             finally:
                 shutil.rmtree(dir)
-            return
 
         for file in os.listdir(self.localLib):
             if (file.endswith(".so")):

From b0450d3e9bbabc402b1916b93457f6759654e5ef Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Apr 2013 14:58:07 -0400
Subject: [PATCH 438/438] Backed out changeset 3b8dcd393805 (bug 859705) for
 intermittent Android xpcshell failures on a CLOSED TREE.

---
 testing/testsuite-targets.mk            |  4 ----
 testing/xpcshell/remotexpcshelltests.py | 30 +------------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index cb7c965ff2b7..cd45b5d4bc9c 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -454,10 +454,6 @@ stage-jstests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/js/src/tests stage-package
 
 stage-android: make-stage-dir
-ifdef MOZ_ENABLE_SZIP
-# Tinderbox scripts are not unzipping everything, so the file needs to be in a directory it unzips
-	$(NSINSTALL) $(DIST)/host/bin/szip $(PKG_STAGE)/bin/host
-endif
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/sutAgentAndroid.apk $(PKG_STAGE)/bin
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/watcher/Watcher.apk $(PKG_STAGE)/bin
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/fencp/FenCP.apk $(PKG_STAGE)/bin
diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index e460b2e3ccf8..734ba519861a 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -10,8 +10,6 @@ import runxpcshelltests as xpcshell
 import tempfile
 from automationutils import replaceBackSlashes
 import devicemanagerADB, devicemanagerSUT, devicemanager
-from zipfile import ZipFile
-import shutil
 
 here = os.path.dirname(os.path.abspath(__file__))
 
@@ -54,8 +52,6 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
             print >> sys.stderr, "Couldn't find local xpcshell test directory"
             sys.exit(1)
 
-        if options.localAPK:
-            self.localAPKContents = ZipFile(options.localAPK)
         if options.setup:
             self.setupUtilities()
             self.setupModules()
@@ -71,7 +67,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         packageName = None
         if self.options.localAPK:
             try:
-                packageName = self.localAPKContents.read("package-name.txt")
+                packageName = subprocess.check_output(["unzip", "-p", self.options.localAPK, "package-name.txt"])
                 if packageName:
                     self.appRoot = self.device.getAppRoot(packageName.strip())
             except Exception as detail:
@@ -133,29 +129,6 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.pushLibs()
 
     def pushLibs(self):
-        if self.options.localAPK:
-            try:
-                dir = tempfile.mkdtemp()
-                szip = os.path.join(self.localBin, '..', 'host', 'bin', 'szip')
-                if not os.path.exists(szip):
-                    # Tinderbox builds must run szip from the test package
-                    szip = os.path.join(self.localBin, 'host', 'szip')
-                if not os.path.exists(szip):
-                    # If the test package doesn't contain szip, it means files
-                    # are not szipped in the test package.
-                    szip = None
-                for info in self.localAPKContents.infolist():
-                    if info.filename.endswith(".so"):
-                        print >> sys.stderr, "Pushing %s.." % info.filename
-                        remoteFile = self.remoteJoin(self.remoteBinDir, info.filename)
-                        self.localAPKContents.extract(info, dir)
-                        file = os.path.join(dir, info.filename)
-                        if szip:
-                            out = subprocess.check_output([szip, '-d', file], stderr=subprocess.STDOUT)
-                        self.device.pushFile(os.path.join(dir, info.filename), remoteFile)
-            finally:
-                shutil.rmtree(dir)
-
         for file in os.listdir(self.localLib):
             if (file.endswith(".so")):
                 print >> sys.stderr, "Pushing %s.." % file
@@ -170,7 +143,6 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
             for root, dirs, files in os.walk(localArmLib):
                 for file in files:
                     if (file.endswith(".so")):
-                        print >> sys.stderr, "Pushing %s.." % file
                         remoteFile = self.remoteJoin(self.remoteBinDir, file)
                         self.device.pushFile(os.path.join(root, file), remoteFile)