From 89896b0b7bad85666df3c7805fab1910493d53f3 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 14 Aug 2013 23:18:56 +0100
Subject: [PATCH 01/98] Bug 905139 - Fix alpha setter for pre-HC AnimatorProxy
 (r=sriram)

---
 mobile/android/base/animation/AnimatorProxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/base/animation/AnimatorProxy.java b/mobile/android/base/animation/AnimatorProxy.java
index 357036af49c..02ce4aa29f4 100644
--- a/mobile/android/base/animation/AnimatorProxy.java
+++ b/mobile/android/base/animation/AnimatorProxy.java
@@ -236,7 +236,7 @@ class AnimatorProxy {
 
         @Override
         public void setAlpha(float alpha) {
-            if (alpha == alpha)
+            if (mAlpha == alpha)
                 return;
 
             mAlpha = alpha;

From 14fd53082f57f308a6c9646a1d71e04a8942f885 Mon Sep 17 00:00:00 2001
From: Sam Foster <sfoster@mozilla.com>
Date: Wed, 14 Aug 2013 15:43:29 -0700
Subject: [PATCH 02/98] Bug 895457 - Override single-row notification layout in
 snapped-view. r=mbrubeck

---
 browser/metro/theme/platform.css | 49 ++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/browser/metro/theme/platform.css b/browser/metro/theme/platform.css
index 7342197d36c..3819fb428df 100644
--- a/browser/metro/theme/platform.css
+++ b/browser/metro/theme/platform.css
@@ -498,6 +498,55 @@ notification {
   -moz-box-flex: 9999;
 }
 
+/* ensure the notification children pick up snapped-view box property overrides */
+.notification-button.box-inherit {
+  -moz-margin-start: inherit;
+  -moz-margin-end: inherit;
+  width: inherit;
+  display: inherit;
+  overflow: inherit;
+}
+
+@media (max-width: 330px) {
+  /* notifications need layout tweaks in narrow viewport
+   */
+  .notification-button {
+      display: block;
+      width: calc(100% - 40px);
+      overflow: visible;
+      -moz-margin-start: 40px;
+      -moz-margin-end: 0;
+  }
+
+  .notification-inner {
+    display: block;
+    padding: @metro_spacing_xnormal@;
+  }
+  .notification-inner > [anonid="details"] {
+    display: inline-block;
+    width: calc(100% - 48px);
+  }
+
+  .notification-inner > .messageCloseButton {
+    display: inline-block;
+    vertical-align: top;
+    -moz-margin-start: 8px;
+    -moz-margin-end: 0;
+  }
+  .notification-inner > [anonid="details"] > .messageImage {
+    display: inline;
+    vertical-align: top;
+    -moz-margin-start: 0;
+    -moz-margin-end: 8px;
+  }
+  .notification-inner > [anonid="details"] > .messageText {
+    display: inline-block;
+    width: calc(100% - 40px);
+    overflow: visible;
+  }
+
+}
+
 /* Prompts ----------------------------------------------------------------- */
 
 .mainContainer {

From 473c0c85bf79fe249d2fbad9d5995c5f0cafe93b Mon Sep 17 00:00:00 2001
From: Sam Foster <sfoster@mozilla.com>
Date: Wed, 14 Aug 2013 15:54:18 -0700
Subject: [PATCH 03/98] Bug 903653 - Raise ColorAnalyzers MAXIMUM_PIXELS to
 144x144. r=ttaubert

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

diff --git a/toolkit/components/places/ColorAnalyzer.js b/toolkit/components/places/ColorAnalyzer.js
index 86d8f36d1d7..861ce710751 100644
--- a/toolkit/components/places/ColorAnalyzer.js
+++ b/toolkit/components/places/ColorAnalyzer.js
@@ -11,7 +11,7 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
-const MAXIMUM_PIXELS = Math.pow(128, 2);
+const MAXIMUM_PIXELS = Math.pow(144, 2);
 
 function ColorAnalyzer() {
   // a queue of callbacks for each job we give to the worker

From df75d1bef2c9d7709beea493138cfc3833606ba2 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Wed, 14 Aug 2013 17:47:16 -0700
Subject: [PATCH 04/98] Backed out changeset 88e21b727815 (bug 903653)

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

diff --git a/toolkit/components/places/ColorAnalyzer.js b/toolkit/components/places/ColorAnalyzer.js
index 861ce710751..86d8f36d1d7 100644
--- a/toolkit/components/places/ColorAnalyzer.js
+++ b/toolkit/components/places/ColorAnalyzer.js
@@ -11,7 +11,7 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
-const MAXIMUM_PIXELS = Math.pow(144, 2);
+const MAXIMUM_PIXELS = Math.pow(128, 2);
 
 function ColorAnalyzer() {
   // a queue of callbacks for each job we give to the worker

From 4f2383e3f31012ce8925e5a40060f0c9c6e214d9 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 8 Nov 2010 13:23:39 +0100
Subject: [PATCH 05/98] Bug 610346 - Remove nsIFormSubmitObserver interface
 from FormTracker. r=rnewman

---
 services/sync/modules/engines/forms.js | 87 --------------------------
 1 file changed, 87 deletions(-)

diff --git a/services/sync/modules/engines/forms.js b/services/sync/modules/engines/forms.js
index df0e31f6be2..6135740f4bc 100644
--- a/services/sync/modules/engines/forms.js
+++ b/services/sync/modules/engines/forms.js
@@ -209,7 +209,6 @@ FormTracker.prototype = {
   __proto__: Tracker.prototype,
 
   QueryInterface: XPCOMUtils.generateQI([
-    Ci.nsIFormSubmitObserver,
     Ci.nsIObserver,
     Ci.nsISupportsWeakReference]),
 
@@ -218,24 +217,13 @@ FormTracker.prototype = {
     switch (topic) {
       case "weave:engine:start-tracking":
         if (!this._enabled) {
-          Svc.Obs.add("form-notifier", this);
           Svc.Obs.add("satchel-storage-changed", this);
-          // HTMLFormElement doesn't use the normal observer/observe
-          // pattern and looks up nsIFormSubmitObservers to .notify()
-          // them so add manually to observers
-          Cc["@mozilla.org/observer-service;1"]
-            .getService(Ci.nsIObserverService)
-            .addObserver(this, "earlyformsubmit", true);
           this._enabled = true;
         }
         break;
       case "weave:engine:stop-tracking":
         if (this._enabled) {
-          Svc.Obs.remove("form-notifier", this);
           Svc.Obs.remove("satchel-storage-changed", this);
-          Cc["@mozilla.org/observer-service;1"]
-            .getService(Ci.nsIObserverService)
-            .removeObserver(this, "earlyformsubmit");
           this._enabled = false;
         }
         break;
@@ -252,79 +240,4 @@ FormTracker.prototype = {
     this.addChangedID(guid);
     this.score += SCORE_INCREMENT_MEDIUM;
   },
-
-  notify: function (formElement, aWindow, actionURI) {
-    if (this.ignoreAll) {
-      return;
-    }
-
-    this._log.trace("Form submission notification for " + actionURI.spec);
-
-    // XXX Bug 487541 Copy the logic from nsFormHistory::Notify to avoid
-    // divergent logic, which can lead to security issues, until there's a
-    // better way to get satchel's results like with a notification.
-
-    // Determine if a dom node has the autocomplete attribute set to "off"
-    let completeOff = function(domNode) {
-      let autocomplete = domNode.getAttribute("autocomplete");
-      return autocomplete && autocomplete.search(/^off$/i) == 0;
-    }
-
-    if (completeOff(formElement)) {
-      this._log.trace("Form autocomplete set to off");
-      return;
-    }
-
-    /* Get number of elements in form, add points and changedIDs */
-    let len = formElement.length;
-    let elements = formElement.elements;
-    for (let i = 0; i < len; i++) {
-      let el = elements.item(i);
-
-      // Grab the name for debugging, but check if empty when satchel would
-      let name = el.name;
-      if (name === "") {
-        name = el.id;
-      }
-
-      if (!(el instanceof Ci.nsIDOMHTMLInputElement)) {
-        this._log.trace(name + " is not a DOMHTMLInputElement: " + el);
-        continue;
-      }
-
-      if (el.type.search(/^text$/i) != 0) {
-        this._log.trace(name + "'s type is not 'text': " + el.type);
-        continue;
-      }
-
-      if (completeOff(el)) {
-        this._log.trace(name + "'s autocomplete set to off");
-        continue;
-      }
-
-      if (el.value === "") {
-        this._log.trace(name + "'s value is empty");
-        continue;
-      }
-
-      if (el.value == el.defaultValue) {
-        this._log.trace(name + "'s value is the default");
-        continue;
-      }
-
-      if (name === "") {
-        this._log.trace("Text input element has no name or id");
-        continue;
-      }
-
-      // Get the GUID on a delay so that it can be added to the DB first...
-      Utils.nextTick(function() {
-        this._log.trace("Logging form element: " + [name, el.value]);
-        let guid = FormWrapper.getGUID(name, el.value);
-        if (guid) {
-          this.trackEntry(guid);
-        }
-      }, this);
-    }
-  }
 };

From 3edee517acef829b9db6c0774db73aadef5c762a Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Mon, 22 Jul 2013 10:12:32 +0100
Subject: [PATCH 06/98] Bug 894840, part 1 - Refactor and move the mode storage
 to nsBaseFilePicker. r=mounir

---
 widget/cocoa/nsFilePicker.h              | 3 +--
 widget/cocoa/nsFilePicker.mm             | 7 ++-----
 widget/gtk2/nsFilePicker.cpp             | 7 ++-----
 widget/gtk2/nsFilePicker.h               | 3 +--
 widget/os2/nsFilePicker.cpp              | 4 +---
 widget/os2/nsFilePicker.h                | 4 +---
 widget/qt/nsFilePicker.cpp               | 4 +---
 widget/qt/nsFilePicker.h                 | 3 +--
 widget/windows/nsFilePicker.cpp          | 4 +---
 widget/windows/nsFilePicker.h            | 4 +---
 widget/windows/winrt/nsMetroFilePicker.h | 3 +--
 widget/xpwidgets/nsBaseFilePicker.cpp    | 8 +++++---
 widget/xpwidgets/nsBaseFilePicker.h      | 4 ++--
 widget/xpwidgets/nsFilePickerProxy.cpp   | 3 +--
 widget/xpwidgets/nsFilePickerProxy.h     | 3 +--
 15 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/widget/cocoa/nsFilePicker.h b/widget/cocoa/nsFilePicker.h
index d2bb3134b67..463ae17bb1c 100644
--- a/widget/cocoa/nsFilePicker.h
+++ b/widget/cocoa/nsFilePicker.h
@@ -47,7 +47,7 @@ public:
 
 protected:
 
-  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle, int16_t aMode);
+  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle);
 
   // actual implementations of get/put dialogs using NSOpenPanel & NSSavePanel
   // aFile is an existing but unspecified file. These functions must specify it.
@@ -62,7 +62,6 @@ protected:
   NSView* GetAccessoryView();
                                                 
   nsString               mTitle;
-  int16_t                mMode;
   nsCOMArray<nsIFile>    mFiles;
   nsString               mDefault;
 
diff --git a/widget/cocoa/nsFilePicker.mm b/widget/cocoa/nsFilePicker.mm
index cb36df8798e..fd42f9732ca 100644
--- a/widget/cocoa/nsFilePicker.mm
+++ b/widget/cocoa/nsFilePicker.mm
@@ -92,8 +92,7 @@ static void SetShowHiddenFileState(NSSavePanel* panel)
 }
 
 nsFilePicker::nsFilePicker()
-: mMode(0)
-, mSelectedTypeIndex(0)
+: mSelectedTypeIndex(0)
 {
 }
 
@@ -102,11 +101,9 @@ nsFilePicker::~nsFilePicker()
 }
 
 void
-nsFilePicker::InitNative(nsIWidget *aParent, const nsAString& aTitle,
-                         int16_t aMode)
+nsFilePicker::InitNative(nsIWidget *aParent, const nsAString& aTitle)
 {
   mTitle = aTitle;
-  mMode = aMode;
 }
 
 NSView* nsFilePicker::GetAccessoryView()
diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
index 3c1e348166f..17b7eb09a07 100644
--- a/widget/gtk2/nsFilePicker.cpp
+++ b/widget/gtk2/nsFilePicker.cpp
@@ -154,8 +154,7 @@ MakeCaseInsensitiveShellGlob(const char* aPattern) {
 NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker)
 
 nsFilePicker::nsFilePicker()
-  : mMode(nsIFilePicker::modeOpen),
-    mSelectedType(0),
+  : mSelectedType(0),
     mRunning(false),
     mAllowURLs(false)
 {
@@ -217,12 +216,10 @@ nsFilePicker::ReadValuesFromFileChooser(GtkWidget *file_chooser)
 
 void
 nsFilePicker::InitNative(nsIWidget *aParent,
-                         const nsAString& aTitle,
-                         int16_t aMode)
+                         const nsAString& aTitle)
 {
   mParentWidget = aParent;
   mTitle.Assign(aTitle);
-  mMode = aMode;
 }
 
 NS_IMETHODIMP
diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
index be9d8ef721a..ca78bc53e7d 100644
--- a/widget/gtk2/nsFilePicker.h
+++ b/widget/gtk2/nsFilePicker.h
@@ -40,7 +40,7 @@ public:
   NS_IMETHODIMP Show(int16_t *aReturn);
 
   // nsBaseFilePicker
-  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle, int16_t aMode);
+  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle);
 
   static void Shutdown();
 
@@ -57,7 +57,6 @@ protected:
   nsCOMPtr<nsIFilePickerShownCallback> mCallback;
   nsCOMArray<nsIFile> mFiles;
 
-  int16_t   mMode;
   int16_t   mSelectedType;
   int16_t   mResult;
   bool      mRunning;
diff --git a/widget/os2/nsFilePicker.cpp b/widget/os2/nsFilePicker.cpp
index 07349e95ffb..8c8628ce45f 100644
--- a/widget/os2/nsFilePicker.cpp
+++ b/widget/os2/nsFilePicker.cpp
@@ -467,12 +467,10 @@ NS_IMETHODIMP nsFilePicker::SetFilterIndex(int32_t aFilterIndex)
 
 //-------------------------------------------------------------------------
 void nsFilePicker::InitNative(nsIWidget *aParent,
-                              const nsAString& aTitle,
-                              int16_t aMode)
+                              const nsAString& aTitle)
 {
   mWnd = (HWND) ((aParent) ? aParent->GetNativeData(NS_NATIVE_WINDOW) : 0); 
   mTitle.Assign(aTitle);
-  mMode = aMode;
 }
 
 
diff --git a/widget/os2/nsFilePicker.h b/widget/os2/nsFilePicker.h
index 13a101a4990..bf9ee4501b1 100644
--- a/widget/os2/nsFilePicker.h
+++ b/widget/os2/nsFilePicker.h
@@ -49,8 +49,7 @@ public:
 
 protected:
   /* method from nsBaseFilePicker */
-  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle,
-                          int16_t aMode);
+  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle);
 
 
   void GetFilterListArray(nsString& aFilterList);
@@ -60,7 +59,6 @@ protected:
 
   HWND                   mWnd;
   nsString               mTitle;
-  int16_t                mMode;
   nsCString              mFile;
   nsString               mDefault;
   nsString               mDefaultExtension;
diff --git a/widget/qt/nsFilePicker.cpp b/widget/qt/nsFilePicker.cpp
index 10967a610d8..89068105c01 100644
--- a/widget/qt/nsFilePicker.cpp
+++ b/widget/qt/nsFilePicker.cpp
@@ -36,7 +36,6 @@ static PRLogModuleInfo* sFilePickerLog = nullptr;
 NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker)
 
 nsFilePicker::nsFilePicker()
-    : mMode(nsIFilePicker::modeOpen)
 {
 #ifdef PR_LOGGING
     if (!sFilePickerLog)
@@ -289,11 +288,10 @@ nsFilePicker::Show(int16_t* aReturn)
     return NS_OK;
 }
 
-void nsFilePicker::InitNative(nsIWidget *aParent, const nsAString &aTitle, int16_t mode)
+void nsFilePicker::InitNative(nsIWidget *aParent, const nsAString &aTitle)
 {
     PR_LOG(sFilePickerLog, PR_LOG_DEBUG, ("nsFilePicker::InitNative"));
     nsAutoString str(aTitle);
     mCaption = QString::fromUtf16(str.get());
     mParent = aParent;
-    mMode = mode;
 }
diff --git a/widget/qt/nsFilePicker.h b/widget/qt/nsFilePicker.h
index 134009a6ec7..fbd7ce9145a 100644
--- a/widget/qt/nsFilePicker.h
+++ b/widget/qt/nsFilePicker.h
@@ -37,13 +37,12 @@ public:
 
 private:
     ~nsFilePicker();
-    void InitNative(nsIWidget*, const nsAString&, short int);
+    void InitNative(nsIWidget*, const nsAString&);
 
 protected:
     QPointer<QFileDialog> mDialog;
     nsCOMArray<nsIFile> mFiles;
 
-    int16_t   mMode;
     int16_t   mSelectedType;
     nsCString mFile;
     nsString  mTitle;
diff --git a/widget/windows/nsFilePicker.cpp b/widget/windows/nsFilePicker.cpp
index 814488f8ad2..ff626f7bafa 100644
--- a/widget/windows/nsFilePicker.cpp
+++ b/widget/windows/nsFilePicker.cpp
@@ -1202,12 +1202,10 @@ nsFilePicker::SetFilterIndex(int32_t aFilterIndex)
 
 void
 nsFilePicker::InitNative(nsIWidget *aParent,
-                         const nsAString& aTitle,
-                         int16_t aMode)
+                         const nsAString& aTitle)
 {
   mParentWidget = aParent;
   mTitle.Assign(aTitle);
-  mMode = aMode;
 }
 
 void 
diff --git a/widget/windows/nsFilePicker.h b/widget/windows/nsFilePicker.h
index d2213da422c..42fa000b07c 100644
--- a/widget/windows/nsFilePicker.h
+++ b/widget/windows/nsFilePicker.h
@@ -95,8 +95,7 @@ protected:
 
   /* method from nsBaseFilePicker */
   virtual void InitNative(nsIWidget *aParent,
-                          const nsAString& aTitle,
-                          int16_t aMode);
+                          const nsAString& aTitle);
   static void GetQualifiedPath(const PRUnichar *aInPath, nsString &aOutPath);
   void GetFilterListArray(nsString& aFilterList);
   bool FilePickerWrapper(OPENFILENAMEW* ofn, PickerType aType);
@@ -118,7 +117,6 @@ protected:
   nsCOMPtr<nsILoadContext> mLoadContext;
   nsCOMPtr<nsIWidget>    mParentWidget;
   nsString               mTitle;
-  int16_t                mMode;
   nsCString              mFile;
   nsString               mFilterList;
   int16_t                mSelectedType;
diff --git a/widget/windows/winrt/nsMetroFilePicker.h b/widget/windows/winrt/nsMetroFilePicker.h
index e9aa6f27488..0117111dddb 100644
--- a/widget/windows/winrt/nsMetroFilePicker.h
+++ b/widget/windows/winrt/nsMetroFilePicker.h
@@ -54,11 +54,10 @@ public:
   HRESULT OnPickMultipleFiles(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::Foundation::Collections::IVectorView<StorageFile*>*>* aFileList, AsyncStatus aStatus);
 
 private:
-  void InitNative(nsIWidget*, const nsAString&, int16_t) {};
+  void InitNative(nsIWidget*, const nsAString&) {};
   nsresult ParseFiltersIntoVector(Microsoft::WRL::ComPtr<ABI::Windows::Foundation::Collections::IVector<HSTRING>>& aVector,
                                   const nsAString& aFilter,
                                   bool aAllowAll);
-  int16_t mMode;
   nsCOMArray<nsILocalFile> mFiles;
   Microsoft::WRL::ComPtr<ABI::Windows::Storage::Pickers::IFileOpenPicker> mFileOpenPicker;
   Microsoft::WRL::ComPtr<ABI::Windows::Storage::Pickers::IFileSavePicker> mFileSavePicker;
diff --git a/widget/xpwidgets/nsBaseFilePicker.cpp b/widget/xpwidgets/nsBaseFilePicker.cpp
index 531e5a0470b..684bf7b8f34 100644
--- a/widget/xpwidgets/nsBaseFilePicker.cpp
+++ b/widget/xpwidgets/nsBaseFilePicker.cpp
@@ -113,8 +113,9 @@ private:
 
 NS_IMPL_ISUPPORTS1(nsBaseFilePickerEnumerator, nsISimpleEnumerator)
 
-nsBaseFilePicker::nsBaseFilePicker() :
-  mAddToRecentDocs(true)
+nsBaseFilePicker::nsBaseFilePicker()
+  : mAddToRecentDocs(true)
+  , mMode(nsIFilePicker::modeOpen)
 {
 
 }
@@ -133,7 +134,8 @@ NS_IMETHODIMP nsBaseFilePicker::Init(nsIDOMWindow *aParent,
   nsCOMPtr<nsIWidget> widget = WidgetUtils::DOMWindowToWidget(aParent);
   NS_ENSURE_TRUE(widget, NS_ERROR_FAILURE);
 
-  InitNative(widget, aTitle, aMode);
+  mMode = aMode;
+  InitNative(widget, aTitle);
 
   return NS_OK;
 }
diff --git a/widget/xpwidgets/nsBaseFilePicker.h b/widget/xpwidgets/nsBaseFilePicker.h
index 57f6890ef7c..e5e270d25ae 100644
--- a/widget/xpwidgets/nsBaseFilePicker.h
+++ b/widget/xpwidgets/nsBaseFilePicker.h
@@ -40,11 +40,11 @@ public:
 
 protected:
 
-  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle,
-                          int16_t aMode) = 0;
+  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle) = 0;
 
   bool mAddToRecentDocs;
   nsCOMPtr<nsIFile> mDisplayDirectory;
+  int16_t mMode;
 };
 
 #endif // nsBaseFilePicker_h__
diff --git a/widget/xpwidgets/nsFilePickerProxy.cpp b/widget/xpwidgets/nsFilePickerProxy.cpp
index f82cc8875ee..d6fd94e619b 100644
--- a/widget/xpwidgets/nsFilePickerProxy.cpp
+++ b/widget/xpwidgets/nsFilePickerProxy.cpp
@@ -29,8 +29,7 @@ nsFilePickerProxy::Init(nsIDOMWindow* /*aParent*/, const nsAString& aTitle,
     return NS_OK;
 }
 
-void nsFilePickerProxy::InitNative(nsIWidget* aParent, const nsAString& aTitle,
-                              int16_t aMode)
+void nsFilePickerProxy::InitNative(nsIWidget* aParent, const nsAString& aTitle)
 {
 }
 
diff --git a/widget/xpwidgets/nsFilePickerProxy.h b/widget/xpwidgets/nsFilePickerProxy.h
index 8abc4b535dd..8be1057b4c5 100644
--- a/widget/xpwidgets/nsFilePickerProxy.h
+++ b/widget/xpwidgets/nsFilePickerProxy.h
@@ -44,11 +44,10 @@ public:
 
 private:
     ~nsFilePickerProxy();
-    void InitNative(nsIWidget*, const nsAString&, short int);
+    void InitNative(nsIWidget*, const nsAString&);
 
     nsCOMArray<nsIFile> mFiles;
 
-    int16_t   mMode;
     int16_t   mSelectedType;
     nsString  mFile;
     nsString  mTitle;

From 68ef94c02a07f1eae2700fd03594d6d00d303ab4 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Mon, 22 Jul 2013 13:46:27 +0100
Subject: [PATCH 07/98] Bug 894840, part 2 - Get rid of the
 nsFilePickerShownCallback ctor's aMulti argument by exposing
 nsIFilePicker.mode. r=mounir

---
 b2g/components/FilePicker.js                  |  5 +++++
 content/html/content/src/HTMLInputElement.cpp | 11 +++++++----
 content/html/content/src/HTMLInputElement.h   |  4 +---
 mobile/android/components/FilePicker.js       |  5 +++++
 toolkit/components/filepicker/nsFilePicker.js |  3 +++
 widget/nsIFilePicker.idl                      |  7 ++++++-
 widget/xpwidgets/nsBaseFilePicker.cpp         |  7 +++++++
 widget/xpwidgets/nsBaseFilePicker.h           |  1 +
 8 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/b2g/components/FilePicker.js b/b2g/components/FilePicker.js
index 4d27d01f51c..980c72fcea5 100644
--- a/b2g/components/FilePicker.js
+++ b/b2g/components/FilePicker.js
@@ -55,6 +55,7 @@ FilePicker.prototype = {
 
   init: function(parent, title, mode) {
     this.mParent = parent;
+    this.mMode = mode;
 
     if (mode != Ci.nsIFilePicker.modeOpen &&
         mode != Ci.nsIFilePicker.modeOpenMultiple) {
@@ -74,6 +75,10 @@ FilePicker.prototype = {
     return this.mFilesEnumerator ? this.mFilesEnumerator.mFiles[0] : null;
   },
 
+  get mode() {
+    return this.mMode;
+  },
+
   appendFilters: function(filterMask) {
     // Ci.nsIFilePicker.filterHTML is not supported
     // Ci.nsIFilePicker.filterText is not supported
diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp
index 91340235ddb..e70ad0d7718 100644
--- a/content/html/content/src/HTMLInputElement.cpp
+++ b/content/html/content/src/HTMLInputElement.cpp
@@ -263,10 +263,9 @@ NS_IMPL_ISUPPORTS1(HTMLInputElementState, HTMLInputElementState)
 NS_DEFINE_STATIC_IID_ACCESSOR(HTMLInputElementState, NS_INPUT_ELEMENT_STATE_IID)
 
 HTMLInputElement::nsFilePickerShownCallback::nsFilePickerShownCallback(
-  HTMLInputElement* aInput, nsIFilePicker* aFilePicker, bool aMulti)
+  HTMLInputElement* aInput, nsIFilePicker* aFilePicker)
   : mFilePicker(aFilePicker)
   , mInput(aInput)
-  , mMulti(aMulti)
 {
 }
 
@@ -319,9 +318,13 @@ HTMLInputElement::nsFilePickerShownCallback::Done(int16_t aResult)
     return NS_OK;
   }
 
+  int16_t mode;
+  mFilePicker->GetMode(&mode);
+  bool multi = mode == static_cast<int16_t>(nsIFilePicker::modeOpenMultiple);
+
   // Collect new selected filenames
   nsCOMArray<nsIDOMFile> newFiles;
-  if (mMulti) {
+  if (multi) {
     nsCOMPtr<nsISimpleEnumerator> iter;
     nsresult rv = mFilePicker->GetDomfiles(getter_AddRefs(iter));
     NS_ENSURE_SUCCESS(rv, rv);
@@ -581,7 +584,7 @@ HTMLInputElement::InitFilePicker()
   const nsCOMArray<nsIDOMFile>& oldFiles = GetFilesInternal();
 
   nsCOMPtr<nsIFilePickerShownCallback> callback =
-    new HTMLInputElement::nsFilePickerShownCallback(this, filePicker, multi);
+    new HTMLInputElement::nsFilePickerShownCallback(this, filePicker);
 
   if (oldFiles.Count()) {
     nsString path;
diff --git a/content/html/content/src/HTMLInputElement.h b/content/html/content/src/HTMLInputElement.h
index 7468ac12593..aaa8ade7286 100644
--- a/content/html/content/src/HTMLInputElement.h
+++ b/content/html/content/src/HTMLInputElement.h
@@ -1242,8 +1242,7 @@ private:
   {
   public:
     nsFilePickerShownCallback(HTMLInputElement* aInput,
-                              nsIFilePicker* aFilePicker,
-                              bool aMulti);
+                              nsIFilePicker* aFilePicker);
     virtual ~nsFilePickerShownCallback()
     { }
 
@@ -1254,7 +1253,6 @@ private:
   private:
     nsCOMPtr<nsIFilePicker> mFilePicker;
     nsRefPtr<HTMLInputElement> mInput;
-    bool mMulti;
   };
 };
 
diff --git a/mobile/android/components/FilePicker.js b/mobile/android/components/FilePicker.js
index 6bb533ffaf7..42b56db4933 100644
--- a/mobile/android/components/FilePicker.js
+++ b/mobile/android/components/FilePicker.js
@@ -26,6 +26,7 @@ FilePicker.prototype = {
 
   init: function(aParent, aTitle, aMode) {
     this._domWin = aParent;
+    this._mode = aMode;
     Services.obs.addObserver(this, "FilePicker:Result", false);
 
     let idService = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator); 
@@ -156,6 +157,10 @@ FilePicker.prototype = {
     throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
   },
 
+  get mode() {
+    return this._mode;
+  },
+
   show: function() {
     if (this._domWin) {
       PromptUtils.fireDialogEvent(this._domWin, "DOMWillOpenModalDialog");
diff --git a/toolkit/components/filepicker/nsFilePicker.js b/toolkit/components/filepicker/nsFilePicker.js
index 0044f362c2c..5a0f94038dc 100644
--- a/toolkit/components/filepicker/nsFilePicker.js
+++ b/toolkit/components/filepicker/nsFilePicker.js
@@ -166,6 +166,9 @@ nsFilePicker.prototype = {
   set addToRecentDocs(a) {},
   get addToRecentDocs()  { return false; },
 
+  /* readonly attribute short mode; */
+  get mode() { return mMode; },
+
   /* members */
   mFilesEnumerator: undefined,
   mDOMFilesEnumerator: undefined,
diff --git a/widget/nsIFilePicker.idl b/widget/nsIFilePicker.idl
index 6814f10c32d..fbb4e8af198 100644
--- a/widget/nsIFilePicker.idl
+++ b/widget/nsIFilePicker.idl
@@ -24,7 +24,7 @@ interface nsIFilePickerShownCallback : nsISupports
   void done(in short aResult);
 };
 
-[scriptable, uuid(a6a24df3-d20a-4b6a-96d4-4736b10a51b7)]
+[scriptable, uuid(f93509a0-0434-11e3-8ffd-0800200c9a66)]
 interface nsIFilePicker : nsISupports
 {
   const short modeOpen        = 0;              // Load a file or directory
@@ -180,4 +180,9 @@ interface nsIFilePicker : nsISupports
   */
   void open(in nsIFilePickerShownCallback aFilePickerShownCallback);
 
+ /**
+  * The picker's mode, as set by the 'mode' argument passed to init()
+  * (one of the modeOpen et. al. constants specified above).
+  */
+  readonly attribute short mode;
 };
diff --git a/widget/xpwidgets/nsBaseFilePicker.cpp b/widget/xpwidgets/nsBaseFilePicker.cpp
index 684bf7b8f34..6611e0e0613 100644
--- a/widget/xpwidgets/nsBaseFilePicker.cpp
+++ b/widget/xpwidgets/nsBaseFilePicker.cpp
@@ -291,6 +291,13 @@ nsBaseFilePicker::SetAddToRecentDocs(bool aFlag)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsBaseFilePicker::GetMode(int16_t* aMode)
+{
+  *aMode = mMode;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsBaseFilePicker::GetDomfile(nsIDOMFile** aDomfile)
 {
diff --git a/widget/xpwidgets/nsBaseFilePicker.h b/widget/xpwidgets/nsBaseFilePicker.h
index e5e270d25ae..92fc4916331 100644
--- a/widget/xpwidgets/nsBaseFilePicker.h
+++ b/widget/xpwidgets/nsBaseFilePicker.h
@@ -34,6 +34,7 @@ public:
   NS_IMETHOD SetDisplayDirectory(nsIFile * aDisplayDirectory);
   NS_IMETHOD GetAddToRecentDocs(bool *aFlag);
   NS_IMETHOD SetAddToRecentDocs(bool aFlag);
+  NS_IMETHOD GetMode(int16_t *aMode);
 
   NS_IMETHOD GetDomfile(nsIDOMFile** aDomfile);
   NS_IMETHOD GetDomfiles(nsISimpleEnumerator** aDomfiles);

From 898fb634c206c1cf3e02e543af8ac12632dc8510 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 7 Aug 2013 00:11:54 +0100
Subject: [PATCH 08/98] Bug 902234 - Cap the number of files that we include in
 the tooltip for <input type=file>. r=enndeakin

---
 .../en-US/chrome/layout/HtmlForm.properties   |  7 +++-
 toolkit/content/widgets/popup.xml             | 37 +++++++++++++------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/dom/locales/en-US/chrome/layout/HtmlForm.properties b/dom/locales/en-US/chrome/layout/HtmlForm.properties
index 1a9910ebe2e..e9a5c19248f 100644
--- a/dom/locales/en-US/chrome/layout/HtmlForm.properties
+++ b/dom/locales/en-US/chrome/layout/HtmlForm.properties
@@ -27,4 +27,9 @@ NoFilesSelected=No files selected.
 # <input type='file' multiple> when there are more than one selected file.
 # %S will be a number greater or equal to 2.
 XFilesSelected=%S files selected.
-ColorPicker=Choose a color
\ No newline at end of file
+ColorPicker=Choose a color
+# LOCALIZATION NOTE (AndXMoreFiles): this string is shown at the end of the
+# tooltip text for <input type='file' multiple> when there are more than 21
+# files selected (when we will only list the first 20, plus an "and X more"
+# line). %S will be the number of files minus 20. 
+AndXMoreFiles=and %S more
diff --git a/toolkit/content/widgets/popup.xml b/toolkit/content/widgets/popup.xml
index b2c1eb70b9e..37b546b8aaf 100644
--- a/toolkit/content/widgets/popup.xml
+++ b/toolkit/content/widgets/popup.xml
@@ -567,23 +567,38 @@
               !tipElement.hasAttribute('title')) {
             let files = tipElement.files;
 
-            if (files.length == 0) {
-              try {
-                var bundle = Components.classes['@mozilla.org/intl/stringbundle;1']
-                                       .getService(Components.interfaces.nsIStringBundleService)
-                                       .createBundle("chrome://global/locale/layout/HtmlForm.properties");
+            try {
+              var bundle = Components.classes['@mozilla.org/intl/stringbundle;1']
+                                     .getService(Components.interfaces.nsIStringBundleService)
+                                     .createBundle("chrome://global/locale/layout/HtmlForm.properties");
+              if (files.length == 0) {
                 if (tipElement.multiple) {
                   titleText = bundle.GetStringFromName("NoFilesSelected");
                 } else {
                   titleText = bundle.GetStringFromName("NoFileSelected");
                 }
-              } catch(e) {}
-            } else {
-              titleText = files[0].name;
-              for (let i=1; i<files.length; ++i) {
-                titleText += "\n" + files[i].name;
+              } else {
+                titleText = files[0].name;
+                // For UX and performance (jank) reasons we cap the number of
+                // files that we list in the tooltip to 20 plus a "and xxx more"
+                // line, or to 21 if exactly 21 files were picked.
+                const TRUNCATED_FILE_COUNT = 20;
+                let count = Math.min(files.length, TRUNCATED_FILE_COUNT);
+                for (let i = 1; i < count; ++i) {
+                  titleText += "\n" + files[i].name;
+                }
+                if (files.length == TRUNCATED_FILE_COUNT + 1) {
+                  titleText += "\n" + files[TRUNCATED_FILE_COUNT].name;
+                } else if (files.length > TRUNCATED_FILE_COUNT + 1) {
+                  let xmoreStr = bundle.GetStringFromName("AndXMoreFiles");
+                  let xmoreNum = files.length - TRUNCATED_FILE_COUNT;
+                  let tmp = {};
+                  Components.utils.import("resource://gre/modules/PluralForm.jsm", tmp);
+                  let andXMoreStr = tmp.PluralForm.get(xmoreNum, xmoreStr).replace("%S", xmoreNum);
+                  titleText += "\n" + andXMoreStr;
+                }
               }
-            }
+            } catch(e) {}
           }
 
           while ((titleText == null) && (XLinkTitleText == null) &&

From 401124f339ac9cc74ca14cf2ff0252bcede0945d Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 14 Aug 2013 10:51:00 +0100
Subject: [PATCH 09/98] Bug 901955 - Get 'opacity' property changes on SVG
 working again. r=roc

---
 .../svg/dynamic-opacity-property-01.svg       | 25 +++++++++++++++++++
 layout/reftests/svg/reftest.list              |  1 +
 layout/svg/nsSVGPathGeometryFrame.cpp         | 17 +++++++++++++
 layout/svg/nsSVGPathGeometryFrame.h           |  2 ++
 4 files changed, 45 insertions(+)
 create mode 100644 layout/reftests/svg/dynamic-opacity-property-01.svg

diff --git a/layout/reftests/svg/dynamic-opacity-property-01.svg b/layout/reftests/svg/dynamic-opacity-property-01.svg
new file mode 100644
index 00000000000..d35f8c82e67
--- /dev/null
+++ b/layout/reftests/svg/dynamic-opacity-property-01.svg
@@ -0,0 +1,25 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg" class="reftest-wait">
+
+  <title>Test repainting for opacity property changes</title>
+
+  <script>
+
+function doTest() {
+  document.getElementById("r").style.opacity = 1;
+  document.documentElement.removeAttribute("class");
+}
+
+document.addEventListener("MozReftestInvalidate", doTest, false);
+setTimeout(doTest, 4000); // fallback for running outside reftest
+
+  </script>
+
+  <rect width="100%" height="100%" fill="lime"/>
+  <rect width="100" height="100" fill="red"/>
+  <rect id="r" width="100" height="100" fill="lime" style="opacity:0.5"/>
+
+</svg>
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index ce2b1e16891..84206c319e5 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -89,6 +89,7 @@ skip-if(B2G) == dynamic-marker-02.svg dynamic-marker-02-ref.svg
 skip-if(B2G) == dynamic-marker-03.svg pass.svg
 == dynamic-mask-01.svg pass.svg
 skip-if(B2G) == dynamic-mask-contents-01.svg pass.svg
+== dynamic-opacity-property-01.svg pass.svg
 skip-if(B2G) == dynamic-pattern-01.svg pass.svg
 skip-if(B2G) == dynamic-pattern-02.svg pass.svg
 skip-if(B2G) == dynamic-pattern-contents-01.svg pass.svg
diff --git a/layout/svg/nsSVGPathGeometryFrame.cpp b/layout/svg/nsSVGPathGeometryFrame.cpp
index d81f33976ef..b8f0114f7a2 100644
--- a/layout/svg/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/nsSVGPathGeometryFrame.cpp
@@ -120,6 +120,23 @@ nsSVGPathGeometryFrame::AttributeChanged(int32_t         aNameSpaceID,
   return NS_OK;
 }
 
+/* virtual */ void
+nsSVGPathGeometryFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
+{
+  nsSVGPathGeometryFrameBase::DidSetStyleContext(aOldStyleContext);
+
+  if (aOldStyleContext) {
+    float oldOpacity = aOldStyleContext->PeekStyleDisplay()->mOpacity;
+    float newOpacity = StyleDisplay()->mOpacity;
+    if (newOpacity != oldOpacity &&
+        nsSVGUtils::CanOptimizeOpacity(this)) {
+      // nsIFrame::BuildDisplayListForStackingContext() is not going to create an
+      // nsDisplayOpacity display list item, so DLBI won't invalidate for us.
+      InvalidateFrame();
+    }
+  }
+}
+
 nsIAtom *
 nsSVGPathGeometryFrame::GetType() const
 {
diff --git a/layout/svg/nsSVGPathGeometryFrame.h b/layout/svg/nsSVGPathGeometryFrame.h
index ad710a665a7..ed0dc6ccb5b 100644
--- a/layout/svg/nsSVGPathGeometryFrame.h
+++ b/layout/svg/nsSVGPathGeometryFrame.h
@@ -56,6 +56,8 @@ public:
                                nsIAtom*        aAttribute,
                                int32_t         aModType) MOZ_OVERRIDE;
 
+  virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
+
   /**
    * Get the "type" of the frame
    *

From ad27de97e4eb62a88e3f6eb4bdcf7b141a6a1f3f Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Wed, 14 Aug 2013 11:08:25 +0100
Subject: [PATCH 10/98] Bug 903456 - GC: StoreBuffer::CellPtrEdge::mark()
 assumes edge is an object pointer r=billm

---
 js/src/gc/Barrier-inl.h   |  4 ++--
 js/src/gc/StoreBuffer.cpp |  1 +
 js/src/gc/StoreBuffer.h   | 28 ++++++++++++++++++++--------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/js/src/gc/Barrier-inl.h b/js/src/gc/Barrier-inl.h
index 98c4e565d80..8fee866ae51 100644
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -263,8 +263,8 @@ RelocatableValue::operator=(const Value &v)
         post();
     } else if (value.isMarkable()) {
         JSRuntime *rt = runtimeFromMainThread(value);
-        value = v;
         relocate(rt);
+        value = v;
     } else {
         value = v;
     }
@@ -281,8 +281,8 @@ RelocatableValue::operator=(const RelocatableValue &v)
         post();
     } else if (value.isMarkable()) {
         JSRuntime *rt = runtimeFromMainThread(value);
-        value = v.value;
         relocate(rt);
+        value = v.value;
     } else {
         value = v.value;
     }
diff --git a/js/src/gc/StoreBuffer.cpp b/js/src/gc/StoreBuffer.cpp
index ee6373bd459..2c9db6dca20 100644
--- a/js/src/gc/StoreBuffer.cpp
+++ b/js/src/gc/StoreBuffer.cpp
@@ -210,6 +210,7 @@ StoreBuffer::GenericBuffer::mark(JSTracer *trc)
 void
 StoreBuffer::CellPtrEdge::mark(JSTracer *trc)
 {
+    JS_ASSERT(GetGCThingTraceKind(*edge) == JSTRACE_OBJECT);
     MarkObjectRoot(trc, reinterpret_cast<JSObject**>(edge), "store buffer edge");
 }
 
diff --git a/js/src/gc/StoreBuffer.h b/js/src/gc/StoreBuffer.h
index b32be8d0a72..f42181602cf 100644
--- a/js/src/gc/StoreBuffer.h
+++ b/js/src/gc/StoreBuffer.h
@@ -407,17 +407,29 @@ class StoreBuffer
     }
 
     /* Insert or update a single edge in the Relocatable buffer. */
-    void putRelocatableValue(Value *v) {
-        bufferRelocVal.put(ValueEdge(v));
+    void putRelocatableValue(Value *valuep) {
+        ValueEdge edge(valuep);
+        if (!edge.inRememberedSet(nursery_))
+            return;
+        bufferRelocVal.put(edge);
     }
-    void putRelocatableCell(Cell **c) {
-        bufferRelocCell.put(CellPtrEdge(c));
+    void putRelocatableCell(Cell **cellp) {
+        CellPtrEdge edge(cellp);
+        if (!edge.inRememberedSet(nursery_))
+            return;
+        bufferRelocCell.put(edge);
     }
-    void removeRelocatableValue(Value *v) {
-        bufferRelocVal.unput(ValueEdge(v));
+    void removeRelocatableValue(Value *valuep) {
+        ValueEdge edge(valuep);
+        if (!edge.inRememberedSet(nursery_))
+            return;
+        bufferRelocVal.unput(edge);
     }
-    void removeRelocatableCell(Cell **c) {
-        bufferRelocCell.unput(CellPtrEdge(c));
+    void removeRelocatableCell(Cell **cellp) {
+        CellPtrEdge edge(cellp);
+        if (!edge.inRememberedSet(nursery_))
+            return;
+        bufferRelocCell.unput(edge);
     }
 
     /* Insert an entry into the generic buffer. */

From e145ee0f9383178b53fc6e8712096a31d9d4c8c4 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Wed, 14 Aug 2013 11:08:26 +0100
Subject: [PATCH 11/98] Bug 904674 - GC: Don't trace additional roots from the
 embedding on minor GC r=billm

---
 js/src/gc/RootMarking.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index f8eee3ec338..a3491fae5e3 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -751,24 +751,30 @@ js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots)
 
     if (!rt->isHeapMinorCollecting()) {
         /*
-         * All JSCompartment::mark does is mark the globals for compartements
+         * All JSCompartment::mark does is mark the globals for compartments
          * which have been entered. Globals aren't nursery allocated so there's
          * no need to do this for minor GCs.
          */
         for (CompartmentsIter c(rt); !c.done(); c.next())
             c->mark(trc);
-    }
 
-    /* The embedding can register additional roots here. */
-    for (size_t i = 0; i < rt->gcBlackRootTracers.length(); i++) {
-        const JSRuntime::ExtraTracer &e = rt->gcBlackRootTracers[i];
-        (*e.op)(trc, e.data);
-    }
+        /*
+         * The embedding can register additional roots here.
+         *
+         * We don't need to trace these in a minor GC because all pointers into
+         * the nursery should be in the store buffer, and we want to avoid the
+         * time taken to trace all these roots.
+         */
+        for (size_t i = 0; i < rt->gcBlackRootTracers.length(); i++) {
+            const JSRuntime::ExtraTracer &e = rt->gcBlackRootTracers[i];
+            (*e.op)(trc, e.data);
+        }
 
-    /* During GC, we don't mark gray roots at this stage. */
-    if (JSTraceDataOp op = rt->gcGrayRootTracer.op) {
-        if (!IS_GC_MARKING_TRACER(trc) && !trc->runtime->isHeapMinorCollecting())
-            (*op)(trc, rt->gcGrayRootTracer.data);
+        /* During GC, we don't mark gray roots at this stage. */
+        if (JSTraceDataOp op = rt->gcGrayRootTracer.op) {
+            if (!IS_GC_MARKING_TRACER(trc))
+                (*op)(trc, rt->gcGrayRootTracer.data);
+        }
     }
 }
 

From 2ad9f88ac660b9f8648987807ec42d2a9c740486 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Wed, 14 Aug 2013 13:03:36 +0200
Subject: [PATCH 12/98] Bug 899722 Part 0: Extract patches for bugs 724533 &
 853701 into separate patches and make update-icu.sh apply them. r=glandium

---
 intl/icu-patches/bug-724533 | 443 ++++++++++++++++++++++++++++++++++++
 intl/icu-patches/bug-853706 |  33 +++
 intl/update-icu.sh          |  23 +-
 3 files changed, 479 insertions(+), 20 deletions(-)
 create mode 100644 intl/icu-patches/bug-724533
 create mode 100644 intl/icu-patches/bug-853706

diff --git a/intl/icu-patches/bug-724533 b/intl/icu-patches/bug-724533
new file mode 100644
index 00000000000..e654c7710e7
--- /dev/null
+++ b/intl/icu-patches/bug-724533
@@ -0,0 +1,443 @@
+# HG changeset patch
+# Parent f0198ba6d08bc0bfc3f67f16ccb54c6f6681ee0c
+# User Norbert Lindenberg <mozilladev@lindenbergsoftware.com>
+Bug 724533 - Make ICU build with Mozilla build for Windows. r=gps
+
+diff --git a/intl/icu/source/aclocal.m4 b/intl/icu/source/aclocal.m4
+--- a/intl/icu/source/aclocal.m4
++++ b/intl/icu/source/aclocal.m4
+@@ -33,17 +33,20 @@ powerpc*-*-linux*)
+ *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
+ *-*-cygwin|*-*-mingw32)
+ 	if test "$GCC" = yes; then
+ 		AC_TRY_COMPILE([
+ #ifndef __MINGW32__
+ #error This is not MinGW
+ #endif], [], icu_cv_host_frag=mh-mingw, icu_cv_host_frag=mh-cygwin)
+ 	else
+-		icu_cv_host_frag=mh-cygwin-msvc
++	        case "${host}" in
++		*-*-mingw32) icu_cv_host_frag=mh-msys-msvc ;;
++		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
++		esac
+ 	fi ;;
+ *-*-*bsd*|*-*-dragonfly*) 	icu_cv_host_frag=mh-bsd-gcc ;;
+ *-*-aix*)
+ 	if test "$GCC" = yes; then
+ 		icu_cv_host_frag=mh-aix-gcc
+ 	else
+ 		icu_cv_host_frag=mh-aix-va
+ 	fi ;;
+@@ -456,27 +459,31 @@ AC_DEFUN(AC_CHECK_STRICT_COMPILE,
+             # We use -std=c99 to disable the gnu99 defaults and its associated warnings
+             CFLAGS="$CFLAGS -Wall -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
+         else
+             case "${host}" in
+             *-*-cygwin)
+                 if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
+                 then
+                     CFLAGS="$CFLAGS /W4"
+-                fi
++                fi ;;
++            *-*-mingw32)
++                CFLAGS="$CFLAGS -W4" ;;
+             esac
+         fi
+         if test "$GXX" = yes
+         then
+             CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+         else
+             case "${host}" in
+             *-*-cygwin)
+                 if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
+                 then
+                     CXXFLAGS="$CXXFLAGS /W4"
+-                fi
++                fi ;;
++            *-*-mingw32)
++                CXXFLAGS="$CXXFLAGS -W4" ;;
+             esac
+         fi
+     fi
+ ])
+ 
+ 
+diff --git a/intl/icu/source/config/mh-cygwin-msvc b/intl/icu/source/config/mh-msys-msvc
+copy from intl/icu/source/config/mh-cygwin-msvc
+copy to intl/icu/source/config/mh-msys-msvc
+--- a/intl/icu/source/config/mh-cygwin-msvc
++++ b/intl/icu/source/config/mh-msys-msvc
+@@ -1,22 +1,22 @@
+-## Cygwin with Microsoft Visual C++ compiler specific setup
++## MSYS with Microsoft Visual C++ compiler specific setup
+ ## Copyright (c) 2001-2012, International Business Machines Corporation and
+ ## others. All Rights Reserved.
+ 
+ # We install sbin tools into the same bin directory because
+ # pkgdata needs some of the tools in sbin, and we can't always depend on
+ # icu-config working on Windows.
+ sbindir=$(bindir)
+ 
+ ## Commands to generate dependency files
+ GEN_DEPS.c=	:
+ GEN_DEPS.cc=	:
+-#GEN_DEPS.c=	$(COMPILE.c) /E
+-#GEN_DEPS.cc=	$(COMPILE.cc) /E
++#GEN_DEPS.c=	$(COMPILE.c) -E
++#GEN_DEPS.cc=	$(COMPILE.cc) -E
+ 
+ ## Flags to create/use a static library
+ ifneq ($(ENABLE_SHARED),YES)
+ ## Make sure that the static libraries can be built and used
+ CPPFLAGS += -DU_STATIC_IMPLEMENTATION#M#
+ else
+ ## Make sure that the static libraries can be built
+ STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
+@@ -36,63 +36,63 @@ CPPFLAGS+=-DU_RELEASE=1#M#
+ endif
+ 
+ ifeq ($(ENABLE_DEBUG),1)
+ # Pass debugging flag through
+ CPPFLAGS+=-D_DEBUG=1#M#
+ ICULIBSUFFIX:=$(ICULIBSUFFIX)d#M#
+ endif
+ 
+-# /GF pools strings and places them into read-only memory
+-# /EHsc enables exception handling
+-# /Zc:wchar_t makes wchar_t a native type. Required for C++ ABI compatibility.
++# -GF pools strings and places them into read-only memory
++# -EHsc enables exception handling
++# -Zc:wchar_t makes wchar_t a native type. Required for C++ ABI compatibility.
+ # -D_CRT_SECURE_NO_DEPRECATE is needed to quiet warnings about using standard C functions.
+-CFLAGS+=/GF /nologo
+-CXXFLAGS+=/GF /nologo /EHsc /Zc:wchar_t
++CFLAGS+=-GF -nologo
++CXXFLAGS+=-GF -nologo -EHsc -Zc:wchar_t
+ CPPFLAGS+=-D_CRT_SECURE_NO_DEPRECATE
+ DEFS+=-DWIN32 -DCYGWINMSVC
+-LDFLAGS+=/nologo
++LDFLAGS+=-nologo
+ 
+ # Commands to compile
+-COMPILE.c=	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) /c
+-COMPILE.cc=	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) /c
++COMPILE.c=	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
++COMPILE.cc=	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
+ 
+ # Commands to link
+-LINK.c=		LINK.EXE /subsystem:console $(LDFLAGS)
+-LINK.cc=	LINK.EXE /subsystem:console $(LDFLAGS)
++LINK.c=		LINK.EXE -subsystem:console $(LDFLAGS)
++LINK.cc=	LINK.EXE -subsystem:console $(LDFLAGS)
+ 
+ ## Commands to make a shared library
+-SHLIB.c=	LINK.EXE /DLL $(LDFLAGS)
+-SHLIB.cc=	LINK.EXE /DLL $(LDFLAGS)
++SHLIB.c=	LINK.EXE -DLL $(LDFLAGS)
++SHLIB.cc=	LINK.EXE -DLL $(LDFLAGS)
+ 
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=	
+ LD_RPATH_PRE=
+ 
+ ## Compiler switch to embed a library name
+-LD_SONAME = /IMPLIB:$(SO_TARGET:.dll=.lib)
++LD_SONAME = -IMPLIB:$(SO_TARGET:.dll=.lib)
+ 
+ ## Shared object suffix
+ SO = dll
+ ## Non-shared intermediate object suffix
+ STATIC_O = ao
+ # OUTOPT is for creating a specific output name
+-OUTOPT = /out:
++OUTOPT = -out:
+ 
+ # Static library prefix and file extension
+ LIBSICU = $(STATIC_PREFIX)$(ICUPREFIX)
+ A = lib
+ 
+ # Cygwin's ar can't handle Win64 right now. So we use Microsoft's tool instead.
+ AR = LIB.EXE#M#
+-ARFLAGS := /nologo $(ARFLAGS:r=)#M#
++ARFLAGS := -nologo $(ARFLAGS:r=)#M#
+ RANLIB = ls -s#M#
+-AR_OUTOPT = /OUT:#M#
++AR_OUTOPT = -OUT:#M#
+ 
+-## An import library is needed for z/OS, MSVC and Cygwin
++## An import library is needed for z-OS, MSVC and Cygwin
+ IMPORT_LIB_EXT = .lib
+ 
+ LIBPREFIX=
+ DEFAULT_LIBS = advapi32.lib
+ 
+ # Change the stubnames so that poorly working FAT disks and installation programs can work.
+ # This is also for backwards compatibility.
+ DATA_STUBNAME = dt
+@@ -109,47 +109,35 @@ LIBICUUC=	$(LIBDIR)/$(LIBICU)$(COMMON_ST
+ LIBICUI18N=	$(LIBDIR)/$(LIBICU)$(I18N_STUBNAME)$(ICULIBSUFFIX).lib
+ LIBICULE=	$(LIBDIR)/$(LIBICU)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX).lib
+ LIBICULX=	$(LIBDIR)/$(LIBICU)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX).lib
+ LIBICUIO=	$(LIBDIR)/$(LIBICU)$(IO_STUBNAME)$(ICULIBSUFFIX).lib
+ LIBCTESTFW=	$(top_builddir)/tools/ctestfw/$(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).lib
+ LIBICUTOOLUTIL=	$(LIBDIR)/$(LIBICU)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX).lib
+ 
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT+=	/base:"0x4ad00000" /NOENTRY# The NOENTRY option is required for creating a resource-only DLL.
+-LDFLAGSICUUC=	/base:"0x4a800000"# in-uc = 1MB
+-LDFLAGSICUI18N=	/base:"0x4a900000"# io-in = 2MB
+-LDFLAGSICUIO=	/base:"0x4ab00000"# le-io = 1MB
+-LDFLAGSICULE=	/base:"0x4ac00000"# lx-le = 512KB
+-LDFLAGSICULX=	/base:"0x4ac80000"
++LDFLAGSICUDT+=	-base:"0x4ad00000" -NOENTRY# The NOENTRY option is required for creating a resource-only DLL.
++LDFLAGSICUUC=	-base:"0x4a800000"# in-uc = 1MB
++LDFLAGSICUI18N=	-base:"0x4a900000"# io-in = 2MB
++LDFLAGSICUIO=	-base:"0x4ab00000"# le-io = 1MB
++LDFLAGSICULE=	-base:"0x4ac00000"# lx-le = 512KB
++LDFLAGSICULX=	-base:"0x4ac80000"
+ LDFLAGSCTESTFW=# Unused for now.
+-LDFLAGSICUTOOLUTIL=	/base:"0x4ac00000"# Same as layout. Layout and tools probably won't mix.
+-
+-# The #M# is used to delete lines for icu-config
+-# Current full path directory.
+-CURR_FULL_DIR=$(subst \,/,$(shell cygpath -da .))#M# -m isn't used because it doesn't work on Win98
+-# Current full path directory for use in source code in a -D compiler option.
+-CURR_SRCCODE_FULL_DIR=$(subst \,\\,$(shell cygpath -da .))#M#
+-
+-ifeq ($(srcdir),.)
+-SOURCE_FILE=$<
+-else
+-SOURCE_FILE=$(shell cygpath -dma $<)#M#
+-endif
++LDFLAGSICUTOOLUTIL=	-base:"0x4ac00000"# Same as layout. Layout and tools probably won't mix.
+ 
+ ## Compilation rules
+ %.$(STATIC_O): $(srcdir)/%.c
+-	$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) /Fo$@ $(SOURCE_FILE)
++	$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -Fo$@ $<
+ %.o: $(srcdir)/%.c
+-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) /Fo$@ $(SOURCE_FILE)
++	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -Fo$@ $<
+ 
+ %.$(STATIC_O): $(srcdir)/%.cpp
+-	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) /Fo$@ $(SOURCE_FILE)
++	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -Fo$@ $<
+ %.o: $(srcdir)/%.cpp
+-	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) /Fo$@ $(SOURCE_FILE)
++	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -Fo$@ $<
+ 
+ 
+ ## Dependency rules
+ ## This is a start to how depdendencies could work
+ # The commented out rules may not properly delete the file when ^C is pressed
+ #   or the compiler fails.
+ # make currently doesn't like rules with C:\\PROGRA~1\\.. in the depedency.
+ #   So system headers are ignored by ignoring \\
+@@ -170,34 +158,34 @@ endif
+ #	@echo -n "$@ $(basename $<).o : " > $@
+ #	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
+ #		| grep "#line 1 " | grep -v \\\\ | cut -d " " -f 3 \
+ #		| /usr/bin/sort -u | sed s/\"$$/\\\\/ | sed s/^\"/\	/ >> $@ \
+ #		|| (rm -f $@ && echo $@ && false)'
+ 
+ ## Compile a Windows resource file
+ %.res : $(srcdir)/%.rc
+-	rc.exe /fo$@ $(CPPFLAGS) $(SOURCE_FILE)
++	rc.exe -fo$@ $(CPPFLAGS) $<
+ 
+ ## Versioned target for a shared library.
+ FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
+ MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
+ 
+ ## Starting in MSVC 2005, manifest files are required. This reduces the obnoxiousness of this feature.
+ 	POST_SO_BUILD_STEP = @([ -e $<.manifest ] && \
+ 	( echo Embedding manifest into $< && mt.exe -nologo -manifest $<.manifest -outputresource:"$<;2" && rm -rf $<.manifest )) \
+ 	|| true
+ 	POST_BUILD_STEP = @([ -e $@.manifest ] && \
+ 	( echo Embedding manifest into $@ && mt.exe -nologo -manifest $@.manifest -outputresource:"$@;1" && rm -rf $@.manifest )) \
+ 	|| true
+ 
+ ## Special pkgdata information that is needed
+ PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR)
+-ICUPKGDATA_INSTALL_DIR = $(shell mkdir -p  $(DESTDIR)$(ICUPKGDATA_DIR) ;  cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M#
+-ICUPKGDATA_INSTALL_LIBDIR = $(shell mkdir -p  $(DESTDIR)$(libdir) ; cygpath -dma $(DESTDIR)$(libdir))#M#
++ICUPKGDATA_INSTALL_DIR = $(shell mkdir -p  $(DESTDIR)$(ICUPKGDATA_DIR) ;  echo $(DESTDIR)$(ICUPKGDATA_DIR))#M#
++ICUPKGDATA_INSTALL_LIBDIR = $(shell mkdir -p  $(DESTDIR)$(libdir) ; echo $(DESTDIR)$(libdir))#M#
+ 
+ ## Versioned import library names. The library names are versioned,
+ ## but the import libraries do not need versioning.
+ IMPORT_LIB = $(basename $(SO_TARGET))$(IMPORT_LIB_EXT)#M#
+ MIDDLE_IMPORT_LIB = $(IMPORT_LIB)#M#
+ FINAL_IMPORT_LIB = $(MIDDLE_IMPORT_LIB)#M#
+ 
+ # The following is for Makefile.inc's use.
+@@ -220,10 +208,10 @@ INSTALL-L=$(INSTALL_PROGRAM)
+ LDLIBRARYPATH_ENVVAR = PATH
+ 
+ # These are needed to allow the pkgdata nmake files to work
+ PKGDATA_INVOKE_OPTS = MAKEFLAGS=
+ 
+ # Include the version information in the shared library
+ ENABLE_SO_VERSION_DATA=1
+ 
+-## End Cygwin-specific setup
++## End MSYS-specific setup
+ 
+diff --git a/intl/icu/source/configure b/intl/icu/source/configure
+--- a/intl/icu/source/configure
++++ b/intl/icu/source/configure
+@@ -4068,29 +4068,33 @@ fi
+             # We use -std=c99 to disable the gnu99 defaults and its associated warnings
+             CFLAGS="$CFLAGS -Wall -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
+         else
+             case "${host}" in
+             *-*-cygwin)
+                 if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
+                 then
+                     CFLAGS="$CFLAGS /W4"
+-                fi
++                fi ;;
++            *-*-mingw32)
++                CFLAGS="$CFLAGS -W4" ;;
+             esac
+         fi
+         if test "$GXX" = yes
+         then
+             CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+         else
+             case "${host}" in
+             *-*-cygwin)
+                 if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
+                 then
+                     CXXFLAGS="$CXXFLAGS /W4"
+-                fi
++                fi ;;
++            *-*-mingw32)
++                CXXFLAGS="$CXXFLAGS -W4" ;;
+             esac
+         fi
+     fi
+ 
+ 
+ # Check if we can build and use 64-bit libraries
+ 
+ 
+@@ -4864,17 +4868,20 @@ main ()
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   icu_cv_host_frag=mh-mingw
+ else
+   icu_cv_host_frag=mh-cygwin
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 	else
+-		icu_cv_host_frag=mh-cygwin-msvc
++	        case "${host}" in
++		*-*-mingw32) icu_cv_host_frag=mh-msys-msvc ;;
++		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
++		esac
+ 	fi ;;
+ *-*-*bsd*|*-*-dragonfly*) 	icu_cv_host_frag=mh-bsd-gcc ;;
+ *-*-aix*)
+ 	if test "$GCC" = yes; then
+ 		icu_cv_host_frag=mh-aix-gcc
+ 	else
+ 		icu_cv_host_frag=mh-aix-va
+ 	fi ;;
+@@ -5106,17 +5113,17 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enabled" >&5
+ $as_echo "$enabled" >&6; }
+ 
+ 
+ # MSVC floating-point option
+ MSVC_RELEASE_FLAG=""
+ if test $enabled = yes
+ then
+-    if test $icu_cv_host_frag = mh-cygwin-msvc
++    if test $icu_cv_host_frag = mh-cygwin-msvc -o $icu_cv_host_frag = mh-msys-msvc
+     then
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+     #if defined _MSC_VER && _MSC_VER >= 1400
+     #else
+     Microsoft Visual C++ < 2005
+     #endif
+diff --git a/intl/icu/source/configure.in b/intl/icu/source/configure.in
+--- a/intl/icu/source/configure.in
++++ b/intl/icu/source/configure.in
+@@ -313,18 +313,18 @@ AC_ARG_ENABLE(auto-cleanup,
+     esac],
+ )
+ AC_MSG_RESULT($enabled)
+ AC_SUBST(UCLN_NO_AUTO_CLEANUP)
+ 
+ # MSVC floating-point option
+ MSVC_RELEASE_FLAG=""
+ if test $enabled = yes
+-then  
+-    if test $icu_cv_host_frag = mh-cygwin-msvc
++then
++    if test $icu_cv_host_frag = mh-cygwin-msvc -o $icu_cv_host_frag = mh-msys-msvc
+     then
+         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+     #if defined _MSC_VER && _MSC_VER >= 1400
+     #else
+     Microsoft Visual C++ < 2005
+     #endif
+         ]], [[]])],[MSVC_RELEASE_FLAG="/fp:precise"],[MSVC_RELEASE_FLAG="/Op"])
+         
+diff --git a/intl/icu/source/data/Makefile.in b/intl/icu/source/data/Makefile.in
+--- a/intl/icu/source/data/Makefile.in
++++ b/intl/icu/source/data/Makefile.in
+@@ -345,17 +345,18 @@ GENRBOPTS=-k
+ -include $(MISCSRCDIR)/misclocal.mk
+ MSC_SOURCE= $(MISC_SOURCE) $(MISC_SOURCE_LOCAL)
+ MSC_SRC_FILES=$(MSC_SOURCE:%=$(MISCSRCDIR)/%)
+ 
+ ifeq ($(ENABLE_SO_VERSION_DATA),1)
+ ifeq ($(PKGDATA_MODE),dll)
+ SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
+ $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
+-	rc.exe /i$(srcdir)/../common /i$(top_builddir)/common /fo$@ $(CPPFLAGS) $(SOURCE_FILE)
++        # fixme: need to tell whether to use - or /, $(SOURCEFILE) or $<
++	rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
+ endif
+ endif
+ 
+ INDEX_NAME=res_index
+ INDEX_FILE=$(OUTTMPDIR)/$(INDEX_NAME).txt
+ 
+ ALL_RES_SRC= $(RES_SRC) $(TRNS_SOURCE) $(MSC_SOURCE)
+ RES_FILES = $(ALL_RES_SRC:%.txt=$(BUILDDIR)/%.res) $(BUILDDIR)/$(INDEX_NAME).res $(BUILDDIR)/pool.res
+diff --git a/intl/icu/source/runConfigureICU b/intl/icu/source/runConfigureICU
+--- a/intl/icu/source/runConfigureICU
++++ b/intl/icu/source/runConfigureICU
+@@ -279,16 +279,27 @@ case $platform in
+         DEBUG_CXXFLAGS='-g -O0'
+         ;;
+     MinGW)
+         THE_OS="MinGW"
+         THE_COMP="the GNU C++"
+         RELEASE_CFLAGS='-O3'
+         RELEASE_CXXFLAGS='-O3'
+         ;;
++    MSYS/MSVC)
++        THE_OS="MSYS"
++        THE_COMP="Microsoft Visual C++"
++        CC=cl; export CC
++        CXX=cl; export CXX
++        RELEASE_CFLAGS='-Gy -MD'
++        RELEASE_CXXFLAGS='-Gy -MD'
++        DEBUG_CFLAGS='-Zi -MDd'
++        DEBUG_CXXFLAGS='-Zi -MDd'
++        DEBUG_LDFLAGS='-DEBUG'
++        ;;
+     *BSD)
+         THE_OS="BSD"
+         THE_COMP="the GNU C++"
+         CC=gcc; export CC
+         CXX=g++; export CXX
+         DEBUG_CFLAGS='-g -O0'
+         DEBUG_CXFLAGS='-g -O0'
+         ;;
diff --git a/intl/icu-patches/bug-853706 b/intl/icu-patches/bug-853706
new file mode 100644
index 00000000000..ecbecd6aec4
--- /dev/null
+++ b/intl/icu-patches/bug-853706
@@ -0,0 +1,33 @@
+# HG changeset patch
+# Parent 7965d384123c42ca0e4e4b18bc3ad73b26369f16
+# User Norbert Lindenberg <mozilladev@lindenbergsoftware.com>
+Bug 853706 - Backported fix for formatting 0 with significant digits from ICU.
+
+diff --git a/intl/icu/source/i18n/decimfmt.cpp b/intl/icu/source/i18n/decimfmt.cpp
+--- a/intl/icu/source/i18n/decimfmt.cpp
++++ b/intl/icu/source/i18n/decimfmt.cpp
+@@ -1709,16 +1709,24 @@ DecimalFormat::subformat(UnicodeString& 
+             }
+ 
+             // Output grouping separator if necessary.
+             if (isGroupingPosition(i)) {
+                 currentLength = appendTo.length();
+                 appendTo.append(*grouping);
+                 handler.addAttribute(kGroupingSeparatorField, currentLength, appendTo.length());
+             }
++        } 
++
++        // This handles the special case of formatting 0. For zero only, we count the 
++        // zero to the left of the decimal point as one signficant digit. Ordinarily we 
++        // do not count any leading 0's as significant. If the number we are formatting 
++        // is not zero, then either sigCount or digits.getCount() will be non-zero. 
++        if (sigCount == 0 && digits.getCount() == 0) { 
++          sigCount = 1; 
+         }
+ 
+         // TODO(dlf): this looks like it was a bug, we marked the int field as ending
+         // before the zero was generated.
+         // Record field information for caller.
+         // if (fieldPosition.getField() == NumberFormat::kIntegerField)
+         //     fieldPosition.setEndIndex(appendTo.length());
+ 
diff --git a/intl/update-icu.sh b/intl/update-icu.sh
index 152a4172ae3..4fad0c630e2 100755
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -3,26 +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/.
 
-# Warning
-# =======
-# As of ICU 51.1, ICU as obtained from the ICU repository does not
-# build with the Mozilla build tools for Windows. Check
-# http://bugs.icu-project.org/trac/ticket/9985
-# whether this has been addressed in the version you're updating to.
-# If not, obtain the patch "Make ICU build with Mozilla build for Windows" from
-# https://bugzilla.mozilla.org/show_bug.cgi?id=724533
-# and reapply it after running update-icu.sh (additional updates may be needed).
-# If the bug has been addressed, please delete this warning.
-
-# Warning
-# =======
-# The fix for ICU bug 10045 has been individually backported into this tree.
-# If you update ICU to a version that does not have this fix yet, obtain the
-# patch "Backported fix for formatting 0 with significant digits from ICU" from
-# https://bugzilla.mozilla.org/show_bug.cgi?id=853706
-# and reapply it after running update-icu.sh.
-# If you update ICU to a version that has the fix, please delete this warning.
-
 # Usage: update-icu.sh <URL of ICU SVN with release>
 # E.g., for ICU 50.1.1: update-icu.sh http://source.icu-project.org/repos/icu/icu/tags/release-50-1-1/
 
@@ -58,4 +38,7 @@ rm ${icu_dir}/source/data/translit/*
 # Record `svn info`
 svn info $1 > ${icu_dir}/SVN-INFO
 
+patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-724533
+patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-853706
+
 hg addremove ${icu_dir}

From 02558cdb8a65038bdc71e9a0f42ce32e165e7cca Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Wed, 14 Aug 2013 13:03:40 +0200
Subject: [PATCH 13/98] Bug 899722 Part 1: Fix ECMAScript intl on BSD by
 stripping the extra 's' added to the library name, as done on linux.
 r=norbert

---
 intl/icu-patches/bug-899722       | 29 +++++++++++++++++++++++++++++
 intl/icu/source/config/mh-bsd-gcc | 14 +++++++++++++-
 intl/update-icu.sh                |  1 +
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 intl/icu-patches/bug-899722

diff --git a/intl/icu-patches/bug-899722 b/intl/icu-patches/bug-899722
new file mode 100644
index 00000000000..c89d2a43891
--- /dev/null
+++ b/intl/icu-patches/bug-899722
@@ -0,0 +1,29 @@
+Bug 899722 Part 1: Fix ECMAScript intl on BSD by stripping the extra 's' added to the library name, as done on linux. r=norbert
+
+diff --git a/intl/icu/source/config/mh-bsd-gcc b/intl/icu/source/config/mh-bsd-gcc
+--- a/intl/icu/source/config/mh-bsd-gcc
++++ b/intl/icu/source/config/mh-bsd-gcc
+@@ -58,10 +58,22 @@ STATIC_O = ao
+ 
+ ## Versioned libraries rules
+ 
+ %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
+ 	$(RM) $@ && ln -s ${<F} $@
+ %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
+ 	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
+ 
+-## End FreeBSD-specific setup
++##  Bind internal references
+ 
++# LDflags that pkgdata will use
++BIR_LDFLAGS= -Wl,-Bsymbolic
++
++# Dependencies [i.e. map files] for the final library
++BIR_DEPS=
++
++## Remove shared library 's'
++STATIC_PREFIX_WHEN_USED = 
++STATIC_PREFIX = 
++
++## End BSD-specific setup
++
diff --git a/intl/icu/source/config/mh-bsd-gcc b/intl/icu/source/config/mh-bsd-gcc
index 5f8a38d5614..f4d6616b13f 100644
--- a/intl/icu/source/config/mh-bsd-gcc
+++ b/intl/icu/source/config/mh-bsd-gcc
@@ -63,5 +63,17 @@ STATIC_O = ao
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
 	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
-## End FreeBSD-specific setup
+##  Bind internal references
+
+# LDflags that pkgdata will use
+BIR_LDFLAGS= -Wl,-Bsymbolic
+
+# Dependencies [i.e. map files] for the final library
+BIR_DEPS=
+
+## Remove shared library 's'
+STATIC_PREFIX_WHEN_USED = 
+STATIC_PREFIX = 
+
+## End BSD-specific setup
 
diff --git a/intl/update-icu.sh b/intl/update-icu.sh
index 4fad0c630e2..dbd38acd063 100755
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -40,5 +40,6 @@ svn info $1 > ${icu_dir}/SVN-INFO
 
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-724533
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-853706
+patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722
 
 hg addremove ${icu_dir}

From 819bc8d03192dd7f6d60e10998c35500205c20bd Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Wed, 14 Aug 2013 13:04:41 +0200
Subject: [PATCH 14/98] Bug 899722 Part 2: Backport upstream r32937 to fix
 symbol collision w/ truncate on BSD r=norbert r=waldo

See http://bugs.icu-project.org/trac/ticket/10290
---
 intl/icu-patches/bug-899722-2      | 110 +++++++++++++++++++++++++++++
 intl/icu/source/tools/genrb/derb.c |  12 ++--
 intl/update-icu.sh                 |   1 +
 3 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 intl/icu-patches/bug-899722-2

diff --git a/intl/icu-patches/bug-899722-2 b/intl/icu-patches/bug-899722-2
new file mode 100644
index 00000000000..73f25ba8054
--- /dev/null
+++ b/intl/icu-patches/bug-899722-2
@@ -0,0 +1,110 @@
+Bug 899722 Part 2 - Backport upstream r32937 to fix symbol collision w/ truncate on BSD r=norbert
+
+http://bugs.icu-project.org/trac/ticket/10290
+diff --git a/intl/icu/source/tools/genrb/derb.c b/intl/icu/source/tools/genrb/derb.c
+--- a/intl/icu/source/tools/genrb/derb.c
++++ b/intl/icu/source/tools/genrb/derb.c
+@@ -49,17 +49,17 @@
+ #define DERB_VERSION "1.0"
+ 
+ #define DERB_DEFAULT_TRUNC 80
+ 
+ static UConverter *defaultConverter = 0;
+ 
+ static const int32_t indentsize = 4;
+ static int32_t truncsize = DERB_DEFAULT_TRUNC;
+-static UBool truncate = FALSE;
++static UBool opt_truncate = FALSE;
+ 
+ static const char *getEncodingName(const char *encoding);
+ static void reportError(const char *pname, UErrorCode *status, const char *when);
+ static UChar *quotedString(const UChar *string);
+ static void printOutBundle(FILE *out, UConverter *converter, UResourceBundle *resource, int32_t indent, const char *pname, UErrorCode *status);
+ static void printString(FILE *out, UConverter *converter, const UChar *str, int32_t len);
+ static void printCString(FILE *out, UConverter *converter, const char *str, int32_t len);
+ static void printIndent(FILE *out, UConverter *converter, int32_t indent);
+@@ -147,24 +147,24 @@ main(int argc, char* argv[]) {
+         encoding = options[2].value;
+     }
+ 
+     if (options[3].doesOccur) {
+         tostdout = 1;
+     }
+ 
+     if(options[4].doesOccur) {
+-        truncate = TRUE;
++        opt_truncate = TRUE;
+         if(options[4].value != NULL) {
+             truncsize = atoi(options[4].value); /* user defined printable size */
+         } else {
+             truncsize = DERB_DEFAULT_TRUNC; /* we'll use default omitting size */
+         }
+     } else {
+-        truncate = FALSE;
++        opt_truncate = FALSE;
+     }
+ 
+     if(options[5].doesOccur) {
+         verbose = TRUE;
+     }
+ 
+     if (options[6].doesOccur) {
+         outputDir = options[6].value;
+@@ -468,17 +468,17 @@ static void printHex(FILE *out, UConvert
+     printString(out, converter, hex, (int32_t)(sizeof(hex)/sizeof(*hex)));
+ }
+ 
+ static void printOutAlias(FILE *out,  UConverter *converter, UResourceBundle *parent, Resource r, const char *key, int32_t indent, const char *pname, UErrorCode *status) {
+     static const UChar cr[] = { '\n' };
+     int32_t len = 0;
+     const UChar* thestr = res_getAlias(&(parent->fResData), r, &len);
+     UChar *string = quotedString(thestr);
+-    if(truncate && len > truncsize) {
++    if(opt_truncate && len > truncsize) {
+         char msg[128];
+         printIndent(out, converter, indent);
+         sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
+             (long)len, (long)truncsize/2);
+         printCString(out, converter, msg, -1);
+         len = truncsize;
+     }
+     if(U_SUCCESS(*status)) {
+@@ -512,17 +512,17 @@ static void printOutBundle(FILE *out, UC
+     switch(ures_getType(resource)) {
+     case URES_STRING :
+         {
+             int32_t len=0;
+             const UChar* thestr = ures_getString(resource, &len, status);
+             UChar *string = quotedString(thestr);
+ 
+             /* TODO: String truncation */
+-            if(truncate && len > truncsize) {
++            if(opt_truncate && len > truncsize) {
+                 char msg[128];
+                 printIndent(out, converter, indent);
+                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
+                         (long)len, (long)(truncsize/2));
+                 printCString(out, converter, msg, -1);
+                 len = truncsize/2;
+             }
+             printIndent(out, converter, indent);
+@@ -571,17 +571,17 @@ static void printOutBundle(FILE *out, UC
+             }
+             printString(out, converter, cr, (int32_t)(sizeof(cr) / sizeof(*cr)));
+             break;
+         }
+     case URES_BINARY :
+         {
+             int32_t len = 0;
+             const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
+-            if(truncate && len > truncsize) {
++            if(opt_truncate && len > truncsize) {
+                 char msg[128];
+                 printIndent(out, converter, indent);
+                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
+                         (long)len, (long)(truncsize/2));
+                 printCString(out, converter, msg, -1);
+                 len = truncsize;
+             }
+             if(U_SUCCESS(*status)) {
+
diff --git a/intl/icu/source/tools/genrb/derb.c b/intl/icu/source/tools/genrb/derb.c
index 2a48d98f542..4aff26e0bda 100644
--- a/intl/icu/source/tools/genrb/derb.c
+++ b/intl/icu/source/tools/genrb/derb.c
@@ -54,7 +54,7 @@ static UConverter *defaultConverter = 0;
 
 static const int32_t indentsize = 4;
 static int32_t truncsize = DERB_DEFAULT_TRUNC;
-static UBool truncate = FALSE;
+static UBool opt_truncate = FALSE;
 
 static const char *getEncodingName(const char *encoding);
 static void reportError(const char *pname, UErrorCode *status, const char *when);
@@ -152,14 +152,14 @@ main(int argc, char* argv[]) {
     }
 
     if(options[4].doesOccur) {
-        truncate = TRUE;
+        opt_truncate = TRUE;
         if(options[4].value != NULL) {
             truncsize = atoi(options[4].value); /* user defined printable size */
         } else {
             truncsize = DERB_DEFAULT_TRUNC; /* we'll use default omitting size */
         }
     } else {
-        truncate = FALSE;
+        opt_truncate = FALSE;
     }
 
     if(options[5].doesOccur) {
@@ -473,7 +473,7 @@ static void printOutAlias(FILE *out,  UConverter *converter, UResourceBundle *pa
     int32_t len = 0;
     const UChar* thestr = res_getAlias(&(parent->fResData), r, &len);
     UChar *string = quotedString(thestr);
-    if(truncate && len > truncsize) {
+    if(opt_truncate && len > truncsize) {
         char msg[128];
         printIndent(out, converter, indent);
         sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
@@ -517,7 +517,7 @@ static void printOutBundle(FILE *out, UConverter *converter, UResourceBundle *re
             UChar *string = quotedString(thestr);
 
             /* TODO: String truncation */
-            if(truncate && len > truncsize) {
+            if(opt_truncate && len > truncsize) {
                 char msg[128];
                 printIndent(out, converter, indent);
                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
@@ -576,7 +576,7 @@ static void printOutBundle(FILE *out, UConverter *converter, UResourceBundle *re
         {
             int32_t len = 0;
             const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
-            if(truncate && len > truncsize) {
+            if(opt_truncate && len > truncsize) {
                 char msg[128];
                 printIndent(out, converter, indent);
                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
diff --git a/intl/update-icu.sh b/intl/update-icu.sh
index dbd38acd063..209c006753a 100755
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -41,5 +41,6 @@ svn info $1 > ${icu_dir}/SVN-INFO
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-724533
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-853706
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722
+patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722-2
 
 hg addremove ${icu_dir}

From 3bb7ed9858d0ea21ba21d7ca541388af3e7af156 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Wed, 14 Aug 2013 13:05:06 +0200
Subject: [PATCH 15/98] Bug 899722 Part 3: Fix build on BSD after bug 853301 by
 properly enabling the ECMAScript intl API. r=glandium

---
 js/src/configure.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/src/configure.in b/js/src/configure.in
index e3bae3cf45e..639ac3ad433 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4290,7 +4290,7 @@ if test -n "$ENABLE_INTL_API"; then
         WINNT)
             ICU_LIB_NAMES="icuin icuuc icudt"
             ;;
-        Darwin|Linux)
+        Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
             ICU_LIB_NAMES="icui18n icuuc icudata"
             ;;
         *)
@@ -4337,6 +4337,9 @@ if test -n "$ENABLE_INTL_API" ; then
         WINNT)
             ICU_TARGET=MSYS/MSVC
             ;;
+        DragonFly|FreeBSD|NetBSD|OpenBSD)
+            ICU_TARGET=BSD
+            ;;
     esac
 
     # To reduce library size, use static linking

From 85fbfe6f480622d82033951da76b4252bbd59230 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 14 Aug 2013 13:17:47 +0200
Subject: [PATCH 16/98] Bug 904535 - Don't #include shared-libraries.h in
 Telemetry.h. r=vdjeric

---
 toolkit/components/telemetry/Telemetry.cpp | 3 +++
 toolkit/components/telemetry/Telemetry.h   | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index 5d89949a43c..bcdd09ccf34 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -49,6 +49,9 @@
 #include "mozilla/FileUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/mozPoisonWrite.h"
+#if defined(MOZ_ENABLE_PROFILER_SPS)
+#include "shared-libraries.h"
+#endif
 
 namespace {
 
diff --git a/toolkit/components/telemetry/Telemetry.h b/toolkit/components/telemetry/Telemetry.h
index 35a2c7b620e..6da04892a69 100644
--- a/toolkit/components/telemetry/Telemetry.h
+++ b/toolkit/components/telemetry/Telemetry.h
@@ -11,9 +11,6 @@
 #include "mozilla/StartupTimeline.h"
 #include "nsTArray.h"
 #include "nsStringGlue.h"
-#if defined(MOZ_ENABLE_PROFILER_SPS)
-#include "shared-libraries.h"
-#endif
 
 namespace base {
   class Histogram;

From 75c769f7a63cc4d3182e7d249bdbf12d7953b1dc Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 14 Aug 2013 13:19:08 +0200
Subject: [PATCH 17/98] Bug 904536 - Remove nsNativeWidget.h. r=roc

---
 widget/moz.build        |  1 -
 widget/nsIWidget.h      |  6 +++++-
 widget/nsNativeWidget.h | 14 --------------
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 widget/nsNativeWidget.h

diff --git a/widget/moz.build b/widget/moz.build
index e0fd3545bd3..7c5b22362f6 100644
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -107,7 +107,6 @@ EXPORTS += [
     'nsIRollupListener.h',
     'nsIWidget.h',
     'nsIWidgetListener.h',
-    'nsNativeWidget.h',
     'nsWidgetInitData.h',
     'nsWidgetsCID.h',
 ]
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
index 59ab1542444..f9520b21fbb 100644
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -14,7 +14,6 @@
 #include "nsEvent.h"
 #include "nsCOMPtr.h"
 #include "nsITheme.h"
-#include "nsNativeWidget.h"
 #include "nsWidgetInitData.h"
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
@@ -62,6 +61,11 @@ class DrawTarget;
  */
 typedef nsEventStatus (* EVENT_CALLBACK)(nsGUIEvent *event);
 
+// Hide the native window system's real window type so as to avoid
+// including native window system types and APIs. This is necessary
+// to ensure cross-platform code.
+typedef void* nsNativeWidget;
+
 /**
  * Flags for the getNativeData function.
  * See getNativeData()
diff --git a/widget/nsNativeWidget.h b/widget/nsNativeWidget.h
deleted file mode 100644
index 0003e3ab8e0..00000000000
--- a/widget/nsNativeWidget.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: C++; tab-width: 40; 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 nsNativeWidget_h__
-#define nsNativeWidget_h__
-
-// Hide the native window systems real window type so as to avoid
-// including native window system types and APIs. This is necessary
-// to ensure cross-platform code.
-typedef void* nsNativeWidget;
-
-#endif // nsNativeWidget_h__

From 97605b2c55bf9b47a55f439eba70f064b6991399 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 14 Aug 2013 13:19:55 +0200
Subject: [PATCH 18/98] Bug 904538 - Don't #include nsITheme.h in nsIWidget.h.
 r=roc

---
 gfx/src/nsITheme.h        |  7 -------
 layout/generic/nsIFrame.h |  1 +
 widget/nsIWidget.h        | 12 +++++++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gfx/src/nsITheme.h b/gfx/src/nsITheme.h
index 618f2f04427..834ba6c1315 100644
--- a/gfx/src/nsITheme.h
+++ b/gfx/src/nsITheme.h
@@ -34,13 +34,6 @@ class nsIWidget;
 #define NS_THEMERENDERER_CID \
 { 0xd930e29b, 0x6909, 0x44e5, { 0xab, 0x4b, 0xaf, 0x10, 0xd6, 0x92, 0x37, 0x5 } }
 
-enum nsTransparencyMode {
-  eTransparencyOpaque = 0,  // Fully opaque
-  eTransparencyTransparent, // Parts of the window may be transparent
-  eTransparencyGlass,       // Transparent parts of the window have Vista AeroGlass effect applied
-  eTransparencyBorderlessGlass // As above, but without a border around the opaque areas when there would otherwise be one with eTransparencyGlass
-};
-
 /**
  * nsITheme is a service that provides platform-specific native
  * rendering for widgets.  In other words, it provides the necessary
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index ebe31271c53..1f77799856d 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -35,6 +35,7 @@
 #include "mozilla/TypedEnum.h"
 #include "nsDirection.h"
 #include <algorithm>
+#include "nsITheme.h"
 
 #ifdef ACCESSIBILITY
 #include "mozilla/a11y/AccTypes.h"
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
index f9520b21fbb..8ddced50b5a 100644
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -13,7 +13,6 @@
 
 #include "nsEvent.h"
 #include "nsCOMPtr.h"
-#include "nsITheme.h"
 #include "nsWidgetInitData.h"
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
@@ -111,6 +110,17 @@ typedef void* nsNativeWidget;
 #define NS_STYLE_WINDOW_SHADOW_TOOLTIP          3
 #define NS_STYLE_WINDOW_SHADOW_SHEET            4
 
+/**
+ * Transparency modes
+ */
+
+enum nsTransparencyMode {
+  eTransparencyOpaque = 0,  // Fully opaque
+  eTransparencyTransparent, // Parts of the window may be transparent
+  eTransparencyGlass,       // Transparent parts of the window have Vista AeroGlass effect applied
+  eTransparencyBorderlessGlass // As above, but without a border around the opaque areas when there would otherwise be one with eTransparencyGlass
+};
+
 /**
  * Cursor types.
  */

From a8a66130d6a886d7bc558f5c9ac66e628dfe9161 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 14 Aug 2013 13:29:11 +0200
Subject: [PATCH 19/98] Bug 904539 - Don't #include ImageLoader.h in
 nsIFrame.h. r=roc

---
 layout/generic/nsFrame.cpp | 15 +++++++++++++++
 layout/generic/nsIFrame.h  | 15 +--------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index a5550603803..199678c1d7a 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -3537,6 +3537,21 @@ nsIFrame::ContentOffsets nsFrame::CalcContentOffsetsFromFramePoint(nsPoint aPoin
   return OffsetsForSingleFrame(this, aPoint);
 }
 
+void
+nsIFrame::AssociateImage(const nsStyleImage& aImage, nsPresContext* aPresContext)
+{
+  if (aImage.GetType() != eStyleImageType_Image) {
+    return;
+  }
+
+  imgIRequest *req = aImage.GetImageData();
+  mozilla::css::ImageLoader* loader =
+    aPresContext->Document()->StyleImageLoader();
+
+  // If this fails there's not much we can do ...
+  loader->AssociateRequestToFrame(req, this);
+}
+
 NS_IMETHODIMP
 nsFrame::GetCursor(const nsPoint& aPoint,
                    nsIFrame::Cursor& aCursor)
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 1f77799856d..1ef13e5e0b0 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -30,7 +30,6 @@
 #include "nsIContent.h"
 #include "nsAlgorithm.h"
 #include "mozilla/layout/FrameChildList.h"
-#include "mozilla/css/ImageLoader.h"
 #include "FramePropertyTable.h"
 #include "mozilla/TypedEnum.h"
 #include "nsDirection.h"
@@ -1366,19 +1365,7 @@ public:
    * Ensure that aImage gets notifed when the underlying image request loads
    * or animates.
    */
-  void AssociateImage(const nsStyleImage& aImage, nsPresContext* aPresContext)
-  {
-    if (aImage.GetType() != eStyleImageType_Image) {
-      return;
-    }
-
-    imgIRequest *req = aImage.GetImageData();
-    mozilla::css::ImageLoader* loader =
-      aPresContext->Document()->StyleImageLoader();
-
-    // If this fails there's not much we can do ...
-    loader->AssociateRequestToFrame(req, this);
-  }
+  void AssociateImage(const nsStyleImage& aImage, nsPresContext* aPresContext);
 
   /**
    * This structure holds information about a cursor. mContainer represents a

From de5b68c553c1d60a31e1c822afc8c03fedfa41cf Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 14 Aug 2013 13:29:51 +0200
Subject: [PATCH 20/98] Bug 904540 - Don't #include nsRefreshDriver.h in
 nsPresContext.h. r=roc

---
 layout/base/nsPresContext.cpp | 25 +++++++++++++++++++++++++
 layout/base/nsPresContext.h   | 18 +++++-------------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 79b258b5851..93ec5adb68c 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -69,6 +69,7 @@
 #include "mozilla/dom/PBrowserChild.h"
 #include "mozilla/dom/TabChild.h"
 #include "RestyleManager.h"
+#include "nsRefreshDriver.h"
 
 #ifdef IBMBIDI
 #include "nsBidiPresUtils.h"
@@ -1509,6 +1510,30 @@ nsPresContext::GetContainerExternal() const
   return GetContainerInternal();
 }
 
+bool
+nsPresContext::ThrottledStyleIsUpToDate() const
+{
+  return mLastUpdateThrottledStyle == mRefreshDriver->MostRecentRefresh();
+}
+
+void
+nsPresContext::TickLastUpdateThrottledStyle()
+{
+  mLastUpdateThrottledStyle = mRefreshDriver->MostRecentRefresh();
+}
+
+bool
+nsPresContext::StyleUpdateForAllAnimationsIsUpToDate()
+{
+  return mLastStyleUpdateForAllAnimations == mRefreshDriver->MostRecentRefresh();
+}
+
+void
+nsPresContext::TickLastStyleUpdateForAllAnimations()
+{
+  mLastStyleUpdateForAllAnimations = mRefreshDriver->MostRecentRefresh();
+}
+
 #ifdef IBMBIDI
 bool
 nsPresContext::BidiEnabledExternal() const
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 634b61d795a..5f0174f7b7c 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -35,7 +35,6 @@
 #include "mozilla/TimeStamp.h"
 #include "prclist.h"
 #include "Layers.h"
-#include "nsRefreshDriver.h"
 
 #ifdef IBMBIDI
 class nsBidiPresUtils;
@@ -71,6 +70,7 @@ class nsTransitionManager;
 class nsAnimationManager;
 class imgIContainer;
 class nsIDOMMediaQueryList;
+class nsRefreshDriver;
 
 #ifdef MOZ_REFLOW_PERF
 class nsRenderingContext;
@@ -690,18 +690,10 @@ public:
   /**
    * Getter and setter for OMTA time counters
    */
-  bool ThrottledStyleIsUpToDate() const {
-    return mLastUpdateThrottledStyle == mRefreshDriver->MostRecentRefresh();
-  }
-  void TickLastUpdateThrottledStyle() {
-    mLastUpdateThrottledStyle = mRefreshDriver->MostRecentRefresh();
-  }
-  bool StyleUpdateForAllAnimationsIsUpToDate() const {
-    return mLastStyleUpdateForAllAnimations == mRefreshDriver->MostRecentRefresh();
-  }
-  void TickLastStyleUpdateForAllAnimations() {
-    mLastStyleUpdateForAllAnimations = mRefreshDriver->MostRecentRefresh();
-  }
+  bool ThrottledStyleIsUpToDate() const;
+  void TickLastUpdateThrottledStyle();
+  bool StyleUpdateForAllAnimationsIsUpToDate();
+  void TickLastStyleUpdateForAllAnimations();
 
 #ifdef IBMBIDI
   /**

From ed4042636b4d59597f74b2cd108cbfa1063ceab3 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 14 Aug 2013 13:33:03 +0200
Subject: [PATCH 21/98] Bug 904541 - Don't #include Layers.h in
 nsPresContext.h. r=roc

---
 layout/base/FrameLayerBuilder.cpp |  2 +-
 layout/base/nsDisplayList.cpp     |  6 ++----
 layout/base/nsLayoutUtils.h       |  1 +
 layout/base/nsPresContext.cpp     | 25 +++++++++++++++++++++++++
 layout/base/nsPresContext.h       | 20 +++++++-------------
 layout/base/nsRefreshDriver.cpp   |  1 +
 layout/generic/nsIFrame.h         |  2 ++
 layout/style/nsComputedDOMStyle.h |  1 +
 8 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 3563960d24b..9f73a753514 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2962,7 +2962,7 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
   containerLayer->SetContentFlags(flags);
 
   mContainerLayerGeneration = oldGeneration;
-  containerLayer->SetUserData(&gNotifySubDocInvalidationData, nullptr);
+  nsPresContext::ClearNotifySubDocInvalidationData(containerLayer);
 
   return containerLayer.forget();
 }
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 1b63d16a72e..324141dc62c 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -3032,14 +3032,12 @@ already_AddRefed<Layer>
 nsDisplayOwnLayer::BuildLayer(nsDisplayListBuilder* aBuilder,
                               LayerManager* aManager,
                               const ContainerParameters& aContainerParameters) {
-  nsRefPtr<Layer> layer = aManager->GetLayerBuilder()->
+  nsRefPtr<ContainerLayer> layer = aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, mList,
                            aContainerParameters, nullptr);
 
   if (mFlags & GENERATE_SUBDOC_INVALIDATIONS) {
-    ContainerLayerPresContext* pres = new ContainerLayerPresContext;
-    pres->mPresContext = mFrame->PresContext();
-    layer->SetUserData(&gNotifySubDocInvalidationData, pres);
+    mFrame->PresContext()->SetNotifySubDocInvalidationData(layer);
   }
   return layer.forget();
 }
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index 7da8306f94a..00b40b6c194 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -35,6 +35,7 @@ class nsIImageLoadingContent;
 #include "nsHTMLReflowState.h"
 #include "nsIFrameLoader.h"
 #include "FrameMetrics.h"
+#include "gfx3DMatrix.h"
 
 #include <limits>
 #include <algorithm>
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 93ec5adb68c..2d313abea6c 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -70,6 +70,7 @@
 #include "mozilla/dom/TabChild.h"
 #include "RestyleManager.h"
 #include "nsRefreshDriver.h"
+#include "Layers.h"
 
 #ifdef IBMBIDI
 #include "nsBidiPresUtils.h"
@@ -95,6 +96,16 @@ using namespace mozilla::layers;
 
 uint8_t gNotifySubDocInvalidationData;
 
+/**
+ * Layer UserData for ContainerLayers that want to be notified
+ * of local invalidations of them and their descendant layers.
+ * Pass a callback to ComputeDifferences to have these called.
+ */
+class ContainerLayerPresContext : public LayerUserData {
+public:
+  nsPresContext* mPresContext;
+};
+
 namespace {
 
 class CharSetChangingRunnable : public nsRunnable
@@ -2352,6 +2363,20 @@ nsPresContext::NotifySubDocInvalidation(ContainerLayer* aContainer,
   }
 }
 
+void
+nsPresContext::SetNotifySubDocInvalidationData(ContainerLayer* aContainer)
+{
+  ContainerLayerPresContext* pres = new ContainerLayerPresContext;
+  pres->mPresContext = this;
+  aContainer->SetUserData(&gNotifySubDocInvalidationData, pres);
+}
+
+/* static */ void
+nsPresContext::ClearNotifySubDocInvalidationData(ContainerLayer* aContainer)
+{
+  aContainer->SetUserData(&gNotifySubDocInvalidationData, nullptr);
+}
+
 struct NotifyDidPaintSubdocumentCallbackClosure {
   uint32_t mFlags;
   bool mNeedsAnotherDidPaintNotification;
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 5f0174f7b7c..8ec9b9f88cd 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -34,7 +34,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
 #include "prclist.h"
-#include "Layers.h"
+#include "nsThreadUtils.h"
 
 #ifdef IBMBIDI
 class nsBidiPresUtils;
@@ -77,7 +77,10 @@ class nsRenderingContext;
 #endif
 
 namespace mozilla {
-  class RestyleManager;
+class RestyleManager;
+namespace layers {
+class ContainerLayer;
+}
 }
 
 // supported values for cached bool types
@@ -125,17 +128,6 @@ public:
   nsTArray<Request> mRequests;
 };
 
-/**
- * Layer UserData for ContainerLayers that want to be notified
- * of local invalidations of them and their descendant layers.
- * Pass a callback to ComputeDifferences to have these called.
- */
-class ContainerLayerPresContext : public mozilla::layers::LayerUserData {
-public:
-  nsPresContext* mPresContext;
-};
-extern uint8_t gNotifySubDocInvalidationData;
-
 /* Used by nsPresContext::HasAuthorSpecifiedRules */
 #define NS_AUTHOR_SPECIFIED_BACKGROUND      (1 << 0)
 #define NS_AUTHOR_SPECIFIED_BORDER          (1 << 1)
@@ -897,6 +889,8 @@ public:
   // Passed to LayerProperties::ComputeDifference
   static void NotifySubDocInvalidation(mozilla::layers::ContainerLayer* aContainer,
                                        const nsIntRegion& aRegion);
+  void SetNotifySubDocInvalidationData(mozilla::layers::ContainerLayer* aContainer);
+  static void ClearNotifySubDocInvalidationData(mozilla::layers::ContainerLayer* aContainer);
   bool IsDOMPaintEventPending();
   void ClearMozAfterPaintEvents() {
     mInvalidateRequestsSinceLastPaint.mRequests.Clear();
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 2c0555381c8..c5215d19800 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -49,6 +49,7 @@ typedef HRESULT (WINAPI*DwmGetCompositionTimingInfoProc)(HWND hWnd, DWM_TIMING_I
 #include "nsPerformance.h"
 #include "mozilla/dom/WindowBinding.h"
 #include "RestyleManager.h"
+#include "Layers.h"
 
 using mozilla::TimeStamp;
 using mozilla::TimeDuration;
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 1ef13e5e0b0..06241eda886 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -35,6 +35,8 @@
 #include "nsDirection.h"
 #include <algorithm>
 #include "nsITheme.h"
+#include "gfx3DMatrix.h"
+#include "gfxASurface.h"
 
 #ifdef ACCESSIBILITY
 #include "mozilla/a11y/AccTypes.h"
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index dc77197daef..6610af2f279 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -30,6 +30,7 @@ class nsIPresShell;
 class nsDOMCSSValueList;
 class nsROCSSPrimitiveValue;
 class nsStyleContext;
+class gfx3DMatrix;
 
 class nsComputedDOMStyle MOZ_FINAL : public nsDOMCSSDeclaration
 {

From b477343b253d4589eb1075100caedce4d0e240ba Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Mon, 12 Aug 2013 23:55:28 +0200
Subject: [PATCH 22/98] Bug 900201 - Implement GfxInfo on gonk - r=ehsan

---
 widget/gonk/GfxInfo.cpp         | 159 ++++++++++++++++++++++++++++++++
 widget/gonk/GfxInfo.h           |  57 ++++++++++++
 widget/gonk/moz.build           |   1 +
 widget/gonk/nsWidgetFactory.cpp |  13 +++
 4 files changed, 230 insertions(+)
 create mode 100644 widget/gonk/GfxInfo.cpp
 create mode 100644 widget/gonk/GfxInfo.h

diff --git a/widget/gonk/GfxInfo.cpp b/widget/gonk/GfxInfo.cpp
new file mode 100644
index 00000000000..3d1c3234028
--- /dev/null
+++ b/widget/gonk/GfxInfo.cpp
@@ -0,0 +1,159 @@
+/* -*- 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 "GfxInfo.h"
+
+using namespace mozilla::widget;
+
+/* GetD2DEnabled and GetDwriteEnabled shouldn't be called until after gfxPlatform initialization
+ * has occurred because they depend on it for information. (See bug 591561) */
+nsresult
+GfxInfo::GetD2DEnabled(bool *aEnabled)
+{
+  return NS_ERROR_FAILURE;
+}
+
+nsresult
+GfxInfo::GetDWriteEnabled(bool *aEnabled)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString DWriteVersion; */
+NS_IMETHODIMP
+GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString cleartypeParameters; */
+NS_IMETHODIMP
+GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDescription; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
+{
+  aAdapterDescription.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDescription2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterRAM; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM)
+{
+  aAdapterRAM.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterRAM2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDriver; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver)
+{
+  aAdapterDriver.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriver2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDriverVersion; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion)
+{
+  aAdapterDriverVersion.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriverVersion2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDriverDate; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate)
+{
+  aAdapterDriverDate.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriverDate2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterVendorID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID)
+{
+  aAdapterVendorID.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterVendorID2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDeviceID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID)
+{
+  aAdapterDeviceID.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDeviceID2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute boolean isGPU2Active; */
+NS_IMETHODIMP
+GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active)
+{
+  return NS_ERROR_FAILURE;
+}
+
+const nsTArray<GfxDriverInfo>&
+GfxInfo::GetGfxDriverInfo()
+{
+  return *mDriverInfo;
+}
+
+uint32_t GfxInfo::OperatingSystemVersion() const
+{
+  return 0;
+}
diff --git a/widget/gonk/GfxInfo.h b/widget/gonk/GfxInfo.h
new file mode 100644
index 00000000000..75c8f98797c
--- /dev/null
+++ b/widget/gonk/GfxInfo.h
@@ -0,0 +1,57 @@
+/* vim: se cin sw=2 ts=2 et : */
+/* -*- 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 __mozilla_widget_GfxInfo_h__
+#define __mozilla_widget_GfxInfo_h__
+
+#include "GfxInfoBase.h"
+#include "GfxDriverInfo.h"
+
+#include "nsString.h"
+
+namespace mozilla {
+namespace widget {
+
+class GfxInfo : public GfxInfoBase
+{
+public:
+  // We only declare the subset of nsIGfxInfo that we actually implement. The
+  // rest is brought forward from GfxInfoBase.
+  NS_IMETHOD GetD2DEnabled(bool *aD2DEnabled);
+  NS_IMETHOD GetDWriteEnabled(bool *aDWriteEnabled);
+  NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
+  NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
+  NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
+  NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
+  NS_IMETHOD GetAdapterVendorID(nsAString & aAdapterVendorID);
+  NS_IMETHOD GetAdapterDeviceID(nsAString & aAdapterDeviceID);
+  NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM);
+  NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion);
+  NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate);
+  NS_IMETHOD GetAdapterDescription2(nsAString & aAdapterDescription);
+  NS_IMETHOD GetAdapterDriver2(nsAString & aAdapterDriver);
+  NS_IMETHOD GetAdapterVendorID2(nsAString & aAdapterVendorID);
+  NS_IMETHOD GetAdapterDeviceID2(nsAString & aAdapterDeviceID);
+  NS_IMETHOD GetAdapterRAM2(nsAString & aAdapterRAM);
+  NS_IMETHOD GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion);
+  NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate);
+  NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active);
+  using GfxInfoBase::GetFeatureStatus;
+  using GfxInfoBase::GetFeatureSuggestedDriverVersion;
+  using GfxInfoBase::GetWebGLParameter;
+
+  virtual uint32_t OperatingSystemVersion() const;
+
+protected:
+
+  virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo();
+};
+
+} // namespace widget
+} // namespace mozilla
+
+#endif /* __mozilla_widget_GfxInfo_h__ */
diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build
index bf37f187277..8bd0de5ba5d 100644
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -53,6 +53,7 @@ CPP_SOURCES += [
     'nsLookAndFeel.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
+    'GfxInfo.cpp',
 ]
 
 if CONFIG['ANDROID_VERSION'] == '15':
diff --git a/widget/gonk/nsWidgetFactory.cpp b/widget/gonk/nsWidgetFactory.cpp
index 934828af8c8..78c6bae7e95 100644
--- a/widget/gonk/nsWidgetFactory.cpp
+++ b/widget/gonk/nsWidgetFactory.cpp
@@ -36,6 +36,16 @@
 
 using namespace mozilla::widget;
 
+// taken from android/nsWidgetFactory.cpp. GfxInfo is a legacy kludge, unfortunately
+// for the time being we still have to implement it on all platforms.
+#include "GfxInfo.h"
+namespace mozilla {
+namespace widget {
+// This constructor should really be shared with all platforms.
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
+}
+}
+
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerGonk)
 NS_GENERIC_FACTORY_CONSTRUCTOR(PuppetScreenManager)
@@ -50,6 +60,7 @@ NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
 NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_TRANSFERABLE_CID);
+NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
 
 static nsresult
 ScreenManagerConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
@@ -67,6 +78,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_HTMLFORMATCONVERTER_CID, false, NULL, nsHTMLFormatConverterConstructor },
     { &kNS_IDLE_SERVICE_CID, false, NULL, nsIdleServiceGonkConstructor },
     { &kNS_TRANSFERABLE_CID, false, NULL, nsTransferableConstructor },
+    { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
     { NULL }
 };
 
@@ -78,6 +90,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
     { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
     { "@mozilla.org/widget/transferable;1", &kNS_TRANSFERABLE_CID },
+    { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
     { NULL }
 };
 

From 7e5943c8be3cc7311f01ba543e3e9a65b4138d53 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Fri, 26 Jul 2013 16:48:35 +0100
Subject: [PATCH 23/98] bug 879963 - reftests for regressions caused when
 multiple rules refer to the same proxy. r=jdaggett

---
 .../dynamic-duplicate-rule-1-ref.html         | 35 ++++++++
 .../font-face/dynamic-duplicate-rule-1a.html  | 65 ++++++++++++++
 .../font-face/dynamic-duplicate-rule-1b.html  | 59 +++++++++++++
 .../font-face/dynamic-duplicate-rule-1c.html  | 85 +++++++++++++++++++
 layout/reftests/font-face/reftest.list        |  5 ++
 5 files changed, 249 insertions(+)
 create mode 100644 layout/reftests/font-face/dynamic-duplicate-rule-1-ref.html
 create mode 100644 layout/reftests/font-face/dynamic-duplicate-rule-1a.html
 create mode 100644 layout/reftests/font-face/dynamic-duplicate-rule-1b.html
 create mode 100644 layout/reftests/font-face/dynamic-duplicate-rule-1c.html

diff --git a/layout/reftests/font-face/dynamic-duplicate-rule-1-ref.html b/layout/reftests/font-face/dynamic-duplicate-rule-1-ref.html
new file mode 100644
index 00000000000..ce1b30b3ef4
--- /dev/null
+++ b/layout/reftests/font-face/dynamic-duplicate-rule-1-ref.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+
+<style type="text/css" id="style1">
+@font-face {
+  font-family: foo;
+  src: local("Arial"),
+       local("DejaVu Sans"),
+       local("Free Sans"),
+       local("Open Sans"),
+       local("Droid Sans"),
+       local("Roboto");
+}
+</style>
+
+<style type="text/css">
+body {
+  font-family: serif;
+}
+.test {
+  font-family: foo;
+}
+</style>
+
+</head>
+
+<body>
+<div>
+foo <span class="test">bar</span> baz
+</div>
+</body>
+
+</html>
diff --git a/layout/reftests/font-face/dynamic-duplicate-rule-1a.html b/layout/reftests/font-face/dynamic-duplicate-rule-1a.html
new file mode 100644
index 00000000000..215f09f3510
--- /dev/null
+++ b/layout/reftests/font-face/dynamic-duplicate-rule-1a.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<head>
+<meta charset="utf-8">
+
+<!-- Testcase for bug 879963 regression.
+     We have two <style> elements with identical @font-face rules, which will
+     share a common proxy font entry. When the entry is loaded, the references
+     in both rules must be updated, otherwise text may disappear if the "wrong"
+     (non-updated) rule is subsequently used.
+     By disabling the first style element after the document has loaded (and the
+     user font has been resolved to a real font entry), we can check that the
+     second rule also works as expected.
+     Note that if a platform doesn't have any of the local() fonts listed,
+     the testcase will "pass" harmlessly as a no-op. -->
+
+<style type="text/css" id="style1">
+@font-face {
+  font-family: foo;
+  src: local("Arial"),
+       local("DejaVu Sans"),
+       local("Free Sans"),
+       local("Open Sans"),
+       local("Droid Sans"),
+       local("Roboto");
+}
+</style>
+
+<style type="text/css" id="style2">
+@font-face {
+  font-family: foo;
+  src: local("Arial"),
+       local("DejaVu Sans"),
+       local("Free Sans"),
+       local("Open Sans"),
+       local("Droid Sans"),
+       local("Roboto");
+}
+</style>
+
+<style type="text/css">
+body {
+  font-family: serif;
+}
+.test {
+  font-family: foo;
+}
+</style>
+
+<script type="application/javascript">
+function run() {
+  document.getElementById("style1").disabled = true;
+  document.documentElement.removeAttribute("class");
+}
+</script>
+
+</head>
+
+<body onload="run()">
+<div>
+foo <span class="test">bar</span> baz
+</div>
+</body>
+
+</html>
diff --git a/layout/reftests/font-face/dynamic-duplicate-rule-1b.html b/layout/reftests/font-face/dynamic-duplicate-rule-1b.html
new file mode 100644
index 00000000000..647bf53d910
--- /dev/null
+++ b/layout/reftests/font-face/dynamic-duplicate-rule-1b.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<head>
+<meta charset="utf-8">
+
+<!-- Testcase for bug 879963 regression.
+     Identical to dynamic-duplicate-rule-1a, except that we disable the
+     second rule (rather than the first), to allow for the possibility of
+     changes in how rules are ordered/searched. -->
+
+<style type="text/css" id="style1">
+@font-face {
+  font-family: foo;
+  src: local("Arial"),
+       local("DejaVu Sans"),
+       local("Free Sans"),
+       local("Open Sans"),
+       local("Droid Sans"),
+       local("Roboto");
+}
+</style>
+
+<style type="text/css" id="style2">
+@font-face {
+  font-family: foo;
+  src: local("Arial"),
+       local("DejaVu Sans"),
+       local("Free Sans"),
+       local("Open Sans"),
+       local("Droid Sans"),
+       local("Roboto");
+}
+</style>
+
+<style type="text/css">
+body {
+  font-family: serif;
+}
+.test {
+  font-family: foo;
+}
+</style>
+
+<script type="application/javascript">
+function run() {
+  document.getElementById("style2").disabled = true;
+  document.documentElement.removeAttribute("class");
+}
+</script>
+
+</head>
+
+<body onload="run()">
+<div>
+foo <span class="test">bar</span> baz
+</div>
+</body>
+
+</html>
diff --git a/layout/reftests/font-face/dynamic-duplicate-rule-1c.html b/layout/reftests/font-face/dynamic-duplicate-rule-1c.html
new file mode 100644
index 00000000000..16fcb3437e8
--- /dev/null
+++ b/layout/reftests/font-face/dynamic-duplicate-rule-1c.html
@@ -0,0 +1,85 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<head>
+<meta charset="utf-8">
+
+<!-- Testcase for bug 879963 regression.
+
+     This test is designed to hit the case where we were adding the same
+     proxy font entry to a family multiple times during user font set updates.
+
+     Note that if a platform doesn't have any of the local() fonts listed,
+     the testcase will "pass" harmlessly as a no-op. -->
+
+<style type="text/css" id="style1">
+@font-face {
+  font-family: foo;
+  src: local("Arial"),
+       local("DejaVu Sans"),
+       local("Free Sans"),
+       local("Open Sans"),
+       local("Droid Sans"),
+       local("Roboto");
+}
+</style>
+
+<style type="text/css" id="style2">
+@font-face {
+  font-family: foo;
+  src: local("Arial"),
+       local("DejaVu Sans"),
+       local("Free Sans"),
+       local("Open Sans"),
+       local("Droid Sans"),
+       local("Roboto");
+}
+</style>
+
+<style type="text/css" id="style3">
+@font-face {
+  font-family: foo;
+  src: local("Arial"),
+       local("DejaVu Sans"),
+       local("Free Sans"),
+       local("Open Sans"),
+       local("Droid Sans"),
+       local("Roboto");
+}
+</style>
+
+<style type="text/css">
+body {
+  font-family: serif;
+}
+.test {
+  font-family: foo;
+}
+</style>
+
+<script type="application/javascript">
+function run() {
+  // Disable one of our three identical style elements.
+  // This will trigger an update of the user font set,
+  // and there will still be two identical rules present.
+  document.getElementById("style3").disabled = true;
+
+  // Now we trigger the use of the 'foo' font family,
+  // so that font loading occurs.
+  // If there are duplicate proxy entries in the family,
+  // and only the first one gets replaced by the real face,
+  // blank text will result.
+  document.getElementById("test").className = "test";
+
+  document.documentElement.removeAttribute("class");
+}
+</script>
+
+</head>
+
+<body onload="run()">
+<div>
+foo <span id="test">bar</span> baz
+</div>
+</body>
+
+</html>
diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list
index 3bbe27d6813..25d00cdfaea 100644
--- a/layout/reftests/font-face/reftest.list
+++ b/layout/reftests/font-face/reftest.list
@@ -153,3 +153,8 @@ HTTP(..) != font-error-404-1.html font-error-404-2.html # sanity-check that the
 
 # Font load redirection
 HTTP(..) == font-redirect.html order-1-ref.html
+
+# Tests for potential regressions from bug 879963
+== dynamic-duplicate-rule-1a.html dynamic-duplicate-rule-1-ref.html
+== dynamic-duplicate-rule-1b.html dynamic-duplicate-rule-1-ref.html
+== dynamic-duplicate-rule-1c.html dynamic-duplicate-rule-1-ref.html

From 5ef7fb8ecef0dfc0c08fb0552eac8f355e7a8aec Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Wed, 14 Aug 2013 13:27:20 +0100
Subject: [PATCH 24/98] bug 904555 - clean up use of nsRect APIs in layout.
 r=roc

---
 layout/generic/nsBlockFrame.cpp         | 4 ++--
 layout/generic/nsFrame.cpp              | 2 +-
 layout/generic/nsIFrame.h               | 4 ++--
 layout/tables/nsTableRowFrame.cpp       | 7 +++----
 layout/tables/nsTableRowGroupFrame.cpp  | 2 +-
 layout/xul/base/src/nsBox.cpp           | 2 +-
 layout/xul/base/src/nsImageBoxFrame.cpp | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 9ca88b983b5..7c9964c0934 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -3039,7 +3039,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
     // construct the html reflow state for the block. ReflowBlock 
     // will initialize it
     nsHTMLReflowState blockHtmlRS(aState.mPresContext, aState.mReflowState, frame, 
-                                  nsSize(availSpace.width, availSpace.height));
+                                  availSpace.Size());
     blockHtmlRS.mFlags.mHasClearance = aLine->HasClearance();
     
     nsFloatManager::SavedState floatManagerState;
@@ -5730,7 +5730,7 @@ nsBlockFrame::ComputeFloatWidth(nsBlockReflowState& aState,
                                                 aFloat);
 
   nsHTMLReflowState floatRS(aState.mPresContext, aState.mReflowState, aFloat, 
-                            nsSize(availSpace.width, availSpace.height));
+                            availSpace.Size());
   return floatRS.ComputedWidth() + floatRS.mComputedBorderPadding.LeftRight() +
     floatRS.mComputedMargin.LeftRight();
 }
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 199678c1d7a..4b0c016d679 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -7715,7 +7715,7 @@ nsFrame::DoLayout(nsBoxLayoutState& aState)
 
       // ensure our size is what we think is should be. Someone could have
       // reset the frame to be smaller or something dumb like that. 
-      SetSize(nsSize(ourRect.width, ourRect.height));
+      SetSize(ourRect.Size());
     }
   }
 
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 06241eda886..494424d0b51 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -830,8 +830,8 @@ public:
    * position.
    */
   nsRect GetRect() const { return mRect; }
-  nsPoint GetPosition() const { return nsPoint(mRect.x, mRect.y); }
-  nsSize GetSize() const { return nsSize(mRect.width, mRect.height); }
+  nsPoint GetPosition() const { return mRect.TopLeft(); }
+  nsSize GetSize() const { return mRect.Size(); }
 
   /**
    * When we change the size of the frame's border-box rect, we may need to
diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index c1e6dba25c7..f95da67a702 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -1260,8 +1260,7 @@ nsTableRowFrame::CollapseRowIfNecessary(nscoord aRowOffset,
         // collapse the cell!
         nsRect cellBounds(0, 0, cRect.width, cRect.height);
         nsOverflowAreas cellOverflow(cellBounds, cellBounds);
-        cellFrame->FinishAndStoreOverflow(cellOverflow,
-                                          nsSize(cRect.width, cRect.height));
+        cellFrame->FinishAndStoreOverflow(cellOverflow, cRect.Size());
         nsTableFrame::RePositionViews(cellFrame);
         ConsiderChildOverflow(overflow, cellFrame);
                 
@@ -1276,8 +1275,8 @@ nsTableRowFrame::CollapseRowIfNecessary(nscoord aRowOffset,
   }
 
   SetRect(rowRect);
-  overflow.UnionAllWith(nsRect(0,0,rowRect.width, rowRect.height));
-  FinishAndStoreOverflow(overflow, nsSize(rowRect.width, rowRect.height));
+  overflow.UnionAllWith(nsRect(0, 0, rowRect.width, rowRect.height));
+  FinishAndStoreOverflow(overflow, rowRect.Size());
 
   nsTableFrame::RePositionViews(this);
   nsTableFrame::InvalidateTableFrame(this, oldRect, oldVisualOverflow, false);
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index c984782e34a..11156858489 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -837,7 +837,7 @@ nsTableRowGroupFrame::CollapseRowGroupIfNecessary(nscoord aYTotalOffset,
   
   SetRect(groupRect);
   overflow.UnionAllWith(nsRect(0, 0, groupRect.width, groupRect.height));
-  FinishAndStoreOverflow(overflow, nsSize(groupRect.width, groupRect.height));
+  FinishAndStoreOverflow(overflow, groupRect.Size());
   nsTableFrame::RePositionViews(this);
   nsTableFrame::InvalidateTableFrame(this, oldGroupRect, oldGroupVisualOverflow,
                                      false);
diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/base/src/nsBox.cpp
index 84e03f8f54f..ada6abe677d 100644
--- a/layout/xul/base/src/nsBox.cpp
+++ b/layout/xul/base/src/nsBox.cpp
@@ -245,7 +245,7 @@ nsBox::SetBounds(nsBoxLayoutState& aState, const nsRect& aRect, bool aRemoveOver
     flags |= stateFlags;
 
     if ((flags & NS_FRAME_NO_MOVE_FRAME) == NS_FRAME_NO_MOVE_FRAME)
-      SetSize(nsSize(aRect.width, aRect.height));
+      SetSize(aRect.Size());
     else
       SetRect(aRect);
 
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp
index e0147855e73..ac4e82f3306 100644
--- a/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -496,7 +496,7 @@ nsImageBoxFrame::GetPrefSize(nsBoxLayoutState& aState)
      GetImageSize();
 
   if (!mUseSrcAttr && (mSubRect.width > 0 || mSubRect.height > 0))
-    size = nsSize(mSubRect.width, mSubRect.height);
+    size = mSubRect.Size();
   else
     size = mImageSize;
 

From f628f6553148bb394a1bf19dcdb7011b56efc8ce Mon Sep 17 00:00:00 2001
From: Christian Holler <choller@mozilla.com>
Date: Wed, 14 Aug 2013 15:54:02 +0200
Subject: [PATCH 25/98] Bug 902132 - Disable WebGL gl-max-texture-dimensions
 test on Mesa. r=bjacob

--HG--
extra : rebase_source : 612e6de1a09be531e9ec05c57b696c7e6345f038
---
 content/canvas/test/webgl/skipped_tests_linux_mesa.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/canvas/test/webgl/skipped_tests_linux_mesa.txt b/content/canvas/test/webgl/skipped_tests_linux_mesa.txt
index 194c3176a72..66a503cdd33 100644
--- a/content/canvas/test/webgl/skipped_tests_linux_mesa.txt
+++ b/content/canvas/test/webgl/skipped_tests_linux_mesa.txt
@@ -1,3 +1,4 @@
+conformance/limits/gl-max-texture-dimensions.html
 conformance/misc/type-conversion-test.html
 conformance/reading/read-pixels-test.html
 conformance/textures/texture-mips.html

From 1f509d1e9bfea3fa66feac0135c7f5a7ed4ea439 Mon Sep 17 00:00:00 2001
From: Guillaume Abadie <gabadie@mozilla.com>
Date: Wed, 14 Aug 2013 10:07:08 -0400
Subject: [PATCH 26/98] bug 899855 - GLContext parse GL_VERSION - r=jgilbert

---
 gfx/gl/GLContext.cpp | 126 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 122 insertions(+), 4 deletions(-)

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 7b1217c8938..589be4d58f7 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -131,10 +131,116 @@ NS_MEMORY_REPORTER_IMPLEMENT(TextureMemoryUsage,
     GetTextureMemoryUsage,
     "Memory used for storing GL textures.")
 
-/*
- * XXX - we should really know the ARB/EXT variants of these
- * instead of only handling the symbol if it's exposed directly.
- */
+static bool
+ParseGLVersion(GLContext* gl, unsigned int* version)
+{
+    GLenum error = gl->fGetError();
+    if (error != LOCAL_GL_NO_ERROR) {
+        MOZ_ASSERT(false, "An OpenGL error has been triggered before.");
+        return false;
+    }
+
+    { // Anon scope to allow identifier reuse
+        /**
+         * OpenGL 3.1 and OpenGL ES 3.0 both introduce GL_{MAJOR,MINOR}_VERSION
+         * with GetIntegerv. So we first try those constantes even we might not
+         * have an OpenGL, to prevent error in parsing GL_VERSION.
+         */
+        GLint majorVersion = 0;
+        GLint minorVersion = 0;
+
+        gl->fGetIntegerv(LOCAL_GL_MAJOR_VERSION, &majorVersion);
+        gl->fGetIntegerv(LOCAL_GL_MINOR_VERSION, &minorVersion);
+
+        // If it's not an OpenGL (ES) 3.0, we will have an error
+        error = gl->fGetError();
+        if (error == LOCAL_GL_NO_ERROR &&
+            majorVersion > 0 &&
+            minorVersion >= 0)
+        {
+            *version = majorVersion * 100 + minorVersion * 10;
+            return true;
+        }
+    }
+
+    /**
+     * We were not able to use GL_{MAJOR,MINOR}_VERSION, so we parse
+     * GL_VERSION.
+     *
+     *
+     * OpenGL 2.x, 3.x, 4.x specifications:
+     *  The VERSION and SHADING_LANGUAGE_VERSION strings are laid out as follows:
+     *
+     *    <version number><space><vendor-specific information>
+     *
+     *  The version number is either of the form major_number.minor_number or
+     *  major_number.minor_number.release_number, where the numbers all have
+     *  one or more digits.
+     *
+     *
+     * OpenGL ES 2.0, 3.0 specifications:
+     *  The VERSION string is laid out as follows:
+     *
+     *     "OpenGL ES N.M vendor-specific information"
+     *
+     *  The version number is either of the form major_number.minor_number or
+     *  major_number.minor_number.release_number, where the numbers all have
+     *  one or more digits.
+     *
+     *
+     * Note:
+     *  We don't care about release_number.
+     */
+    const char* versionString = (const char*)gl->fGetString(LOCAL_GL_VERSION);
+
+    error = gl->fGetError();
+    if (error != LOCAL_GL_NO_ERROR) {
+        MOZ_ASSERT(false, "glGetString(GL_VERSION) has generated an error");
+        return false;
+    } else if (!versionString) {
+        MOZ_ASSERT(false, "glGetString(GL_VERSION) has returned 0");
+        return false;
+    }
+
+    const char kGLESVersionPrefix[] = "OpenGL ES ";
+    if (strncmp(versionString, kGLESVersionPrefix, strlen(kGLESVersionPrefix)) == 0) {
+        versionString += strlen(kGLESVersionPrefix);
+    }
+
+    const char* itr = versionString;
+    char* end = nullptr;
+    int majorVersion = (int)strtol(itr, &end, 10);
+
+    if (!end) {
+        MOZ_ASSERT(false, "Failed to parse the GL major version number.");
+        return false;
+    } else if (*end != '.') {
+        MOZ_ASSERT(false, "Failed to parse GL's major-minor version number separator.");
+        return false;
+    }
+
+    // we skip the '.' between the major and the minor version
+    itr = end + 1;
+
+    end = nullptr;
+
+    int minorVersion = (int)strtol(itr, &end, 10);
+    if (!end) {
+        MOZ_ASSERT(false, "Failed to parse GL's minor version number.");
+        return false;
+    }
+
+    if (majorVersion <= 0 || majorVersion >= 100) {
+        MOZ_ASSERT(false, "Invalid major version.");
+        return false;
+    } else if (minorVersion < 0 || minorVersion >= 10) {
+        MOZ_ASSERT(false, "Invalid minor version.");
+        return false;
+    }
+
+    *version = (unsigned int)(majorVersion * 100 + minorVersion * 10);
+    return true;
+}
 
 bool
 GLContext::InitWithPrefix(const char *prefix, bool trygl)
@@ -295,6 +401,18 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
 
     mInitialized = LoadSymbols(&symbols[0], trygl, prefix);
 
+    if (mInitialized) {
+        unsigned int version = 0;
+
+        bool parseSuccess = ParseGLVersion(this, &version);
+
+        if (version >= mVersion) {
+            mVersion = version;
+        } else if (parseSuccess) {
+            MOZ_ASSERT(false, "Parsed version less than expected.");
+        }
+    }
+
     // Load OpenGL ES 2.0 symbols, or desktop if we aren't using ES 2.
     if (mInitialized) {
         if (IsGLES2()) {

From 1b339f3d88efac97f3a0439a397dbaa83c4666a0 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Wed, 14 Aug 2013 15:39:46 +0100
Subject: [PATCH 27/98] Backed out changeset e0eeacb439f2 (bug 900201) for B2G
 emulator build failures

---
 widget/gonk/GfxInfo.cpp         | 159 --------------------------------
 widget/gonk/GfxInfo.h           |  57 ------------
 widget/gonk/moz.build           |   1 -
 widget/gonk/nsWidgetFactory.cpp |  13 ---
 4 files changed, 230 deletions(-)
 delete mode 100644 widget/gonk/GfxInfo.cpp
 delete mode 100644 widget/gonk/GfxInfo.h

diff --git a/widget/gonk/GfxInfo.cpp b/widget/gonk/GfxInfo.cpp
deleted file mode 100644
index 3d1c3234028..00000000000
--- a/widget/gonk/GfxInfo.cpp
+++ /dev/null
@@ -1,159 +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 "GfxInfo.h"
-
-using namespace mozilla::widget;
-
-/* GetD2DEnabled and GetDwriteEnabled shouldn't be called until after gfxPlatform initialization
- * has occurred because they depend on it for information. (See bug 591561) */
-nsresult
-GfxInfo::GetD2DEnabled(bool *aEnabled)
-{
-  return NS_ERROR_FAILURE;
-}
-
-nsresult
-GfxInfo::GetDWriteEnabled(bool *aEnabled)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString DWriteVersion; */
-NS_IMETHODIMP
-GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString cleartypeParameters; */
-NS_IMETHODIMP
-GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDescription; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
-{
-  aAdapterDescription.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDescription2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterRAM; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM)
-{
-  aAdapterRAM.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterRAM2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDriver; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver)
-{
-  aAdapterDriver.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriver2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDriverVersion; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion)
-{
-  aAdapterDriverVersion.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriverVersion2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDriverDate; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate)
-{
-  aAdapterDriverDate.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriverDate2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterVendorID; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID)
-{
-  aAdapterVendorID.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterVendorID2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDeviceID; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID)
-{
-  aAdapterDeviceID.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDeviceID2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute boolean isGPU2Active; */
-NS_IMETHODIMP
-GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active)
-{
-  return NS_ERROR_FAILURE;
-}
-
-const nsTArray<GfxDriverInfo>&
-GfxInfo::GetGfxDriverInfo()
-{
-  return *mDriverInfo;
-}
-
-uint32_t GfxInfo::OperatingSystemVersion() const
-{
-  return 0;
-}
diff --git a/widget/gonk/GfxInfo.h b/widget/gonk/GfxInfo.h
deleted file mode 100644
index 75c8f98797c..00000000000
--- a/widget/gonk/GfxInfo.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* vim: se cin sw=2 ts=2 et : */
-/* -*- 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 __mozilla_widget_GfxInfo_h__
-#define __mozilla_widget_GfxInfo_h__
-
-#include "GfxInfoBase.h"
-#include "GfxDriverInfo.h"
-
-#include "nsString.h"
-
-namespace mozilla {
-namespace widget {
-
-class GfxInfo : public GfxInfoBase
-{
-public:
-  // We only declare the subset of nsIGfxInfo that we actually implement. The
-  // rest is brought forward from GfxInfoBase.
-  NS_IMETHOD GetD2DEnabled(bool *aD2DEnabled);
-  NS_IMETHOD GetDWriteEnabled(bool *aDWriteEnabled);
-  NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
-  NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
-  NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
-  NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
-  NS_IMETHOD GetAdapterVendorID(nsAString & aAdapterVendorID);
-  NS_IMETHOD GetAdapterDeviceID(nsAString & aAdapterDeviceID);
-  NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM);
-  NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion);
-  NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate);
-  NS_IMETHOD GetAdapterDescription2(nsAString & aAdapterDescription);
-  NS_IMETHOD GetAdapterDriver2(nsAString & aAdapterDriver);
-  NS_IMETHOD GetAdapterVendorID2(nsAString & aAdapterVendorID);
-  NS_IMETHOD GetAdapterDeviceID2(nsAString & aAdapterDeviceID);
-  NS_IMETHOD GetAdapterRAM2(nsAString & aAdapterRAM);
-  NS_IMETHOD GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion);
-  NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate);
-  NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active);
-  using GfxInfoBase::GetFeatureStatus;
-  using GfxInfoBase::GetFeatureSuggestedDriverVersion;
-  using GfxInfoBase::GetWebGLParameter;
-
-  virtual uint32_t OperatingSystemVersion() const;
-
-protected:
-
-  virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo();
-};
-
-} // namespace widget
-} // namespace mozilla
-
-#endif /* __mozilla_widget_GfxInfo_h__ */
diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build
index 8bd0de5ba5d..bf37f187277 100644
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -53,7 +53,6 @@ CPP_SOURCES += [
     'nsLookAndFeel.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
-    'GfxInfo.cpp',
 ]
 
 if CONFIG['ANDROID_VERSION'] == '15':
diff --git a/widget/gonk/nsWidgetFactory.cpp b/widget/gonk/nsWidgetFactory.cpp
index 78c6bae7e95..934828af8c8 100644
--- a/widget/gonk/nsWidgetFactory.cpp
+++ b/widget/gonk/nsWidgetFactory.cpp
@@ -36,16 +36,6 @@
 
 using namespace mozilla::widget;
 
-// taken from android/nsWidgetFactory.cpp. GfxInfo is a legacy kludge, unfortunately
-// for the time being we still have to implement it on all platforms.
-#include "GfxInfo.h"
-namespace mozilla {
-namespace widget {
-// This constructor should really be shared with all platforms.
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
-}
-}
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerGonk)
 NS_GENERIC_FACTORY_CONSTRUCTOR(PuppetScreenManager)
@@ -60,7 +50,6 @@ NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
 NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_TRANSFERABLE_CID);
-NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
 
 static nsresult
 ScreenManagerConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
@@ -78,7 +67,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_HTMLFORMATCONVERTER_CID, false, NULL, nsHTMLFormatConverterConstructor },
     { &kNS_IDLE_SERVICE_CID, false, NULL, nsIdleServiceGonkConstructor },
     { &kNS_TRANSFERABLE_CID, false, NULL, nsTransferableConstructor },
-    { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
     { NULL }
 };
 
@@ -90,7 +78,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
     { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
     { "@mozilla.org/widget/transferable;1", &kNS_TRANSFERABLE_CID },
-    { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
     { NULL }
 };
 

From 76be3e5ae785b58029c7cf3421c70095e331917b Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 14 Aug 2013 15:39:27 +0100
Subject: [PATCH 28/98] Bug 622284 - Write tests for input context menus.
 r=bbondy

---
 browser/base/content/test/Makefile.in         |   4 +-
 .../base/content/test/contextmenu_common.js   | 186 ++++++++++
 .../base/content/test/subtst_contextmenu.html |   1 -
 .../base/content/test/test_contextmenu.html   | 286 ++-------------
 .../content/test/test_contextmenu_input.html  | 338 ++++++++++++++++++
 5 files changed, 555 insertions(+), 260 deletions(-)
 create mode 100644 browser/base/content/test/contextmenu_common.js
 create mode 100644 browser/base/content/test/test_contextmenu_input.html

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 745e3e921c0..07974075470 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -38,13 +38,15 @@ MOCHITEST_FILES = \
         video.ogg \
         $(NULL)
 
-# test_contextmenu.html is disabled on Linux due to bug 513558
+# test_contextmenu.html and test_contextmenu_input are disabled on Linux due to bug 513558
 ifndef MOZ_WIDGET_GTK
 MOCHITEST_FILES += \
         audio.ogg \
         privateBrowsingMode.js \
         subtst_contextmenu.html \
+        contextmenu_common.js \
         test_contextmenu.html \
+        test_contextmenu_input.html \
         $(NULL)
 endif
 
diff --git a/browser/base/content/test/contextmenu_common.js b/browser/base/content/test/contextmenu_common.js
new file mode 100644
index 00000000000..1c32111c29d
--- /dev/null
+++ b/browser/base/content/test/contextmenu_common.js
@@ -0,0 +1,186 @@
+var lastElement;
+
+function openContextMenuFor(element, shiftkey, waitForSpellCheck) {
+    // Context menu should be closed before we open it again.
+    is(SpecialPowers.wrap(contextMenu).state, "closed", "checking if popup is closed");
+
+    if (lastElement)
+      lastElement.blur();
+    element.focus();
+
+    // Some elements need time to focus and spellcheck before any tests are
+    // run on them.
+    function actuallyOpenContextMenuFor() {
+      lastElement = element;
+      var eventDetails = { type : "contextmenu", button : 2, shiftKey : shiftkey };
+      synthesizeMouse(element, 2, 2, eventDetails, element.ownerDocument.defaultView);
+    }
+
+    if (waitForSpellCheck)
+      onSpellCheck(element, actuallyOpenContextMenuFor);
+    else
+      actuallyOpenContextMenuFor();
+}
+
+function closeContextMenu() {
+    contextMenu.hidePopup();
+}
+
+function getVisibleMenuItems(aMenu, aData) {
+    var items = [];
+    var accessKeys = {};
+    for (var i = 0; i < aMenu.childNodes.length; i++) {
+        var item = aMenu.childNodes[i];
+        if (item.hidden)
+            continue;
+
+        var key = item.accessKey;
+        if (key)
+            key = key.toLowerCase();
+
+        var isGenerated = item.hasAttribute("generateditemid");
+
+        if (item.nodeName == "menuitem") {
+            var isSpellSuggestion = item.className == "spell-suggestion";
+            if (isSpellSuggestion) {
+              is(item.id, "", "child menuitem #" + i + " is a spelling suggestion");
+            } else if (isGenerated) {
+              is(item.id, "", "child menuitem #" + i + " is a generated item");
+            } else {
+              ok(item.id, "child menuitem #" + i + " has an ID");
+            }
+            var label = item.getAttribute("label");
+            ok(label.length, "menuitem " + item.id + " has a label");
+            if (isSpellSuggestion) {
+              is(key, "", "Spell suggestions shouldn't have an access key");
+              items.push("*" + label);
+            } else if (isGenerated) {
+              items.push("+" + label);
+            } else if (item.id.indexOf("spell-check-dictionary-") != 0 &&
+                       item.id != "spell-no-suggestions") {
+              ok(key, "menuitem " + item.id + " has an access key");
+              if (accessKeys[key])
+                  ok(false, "menuitem " + item.id + " has same accesskey as " + accessKeys[key]);
+              else
+                  accessKeys[key] = item.id;
+            }
+            if (!isSpellSuggestion && !isGenerated) {
+              items.push(item.id);
+            }
+            if (isGenerated) {
+              var p = {};
+              p.type = item.getAttribute("type");
+              p.icon = item.getAttribute("image");
+              p.checked = item.hasAttribute("checked");
+              p.disabled = item.hasAttribute("disabled");
+              items.push(p);
+            } else {
+              items.push(!item.disabled);
+            }
+        } else if (item.nodeName == "menuseparator") {
+            ok(true, "--- seperator id is " + item.id);
+            items.push("---");
+            items.push(null);
+        } else if (item.nodeName == "menu") {
+            if (isGenerated) {
+                item.id = "generated-submenu-" + aData.generatedSubmenuId++;
+            }
+            ok(item.id, "child menu #" + i + " has an ID");
+            if (!isGenerated) {
+                ok(key, "menu has an access key");
+                if (accessKeys[key])
+                    ok(false, "menu " + item.id + " has same accesskey as " + accessKeys[key]);
+                else
+                    accessKeys[key] = item.id;
+            }
+            items.push(item.id);
+            items.push(!item.disabled);
+            // Add a dummy item to that the indexes in checkMenu are the same
+            // for expectedItems and actualItems.
+            items.push([]);
+            items.push(null);
+        } else {
+            ok(false, "child #" + i + " of menu ID " + aMenu.id +
+                      " has an unknown type (" + item.nodeName + ")");
+        }
+    }
+    return items;
+}
+
+function checkContextMenu(expectedItems) {
+    is(contextMenu.state, "open", "checking if popup is open");
+    var data = { generatedSubmenuId: 1 };
+    checkMenu(contextMenu, expectedItems, data);
+}
+
+/*
+ * checkMenu - checks to see if the specified <menupopup> contains the
+ * expected items and state.
+ * expectedItems is a array of (1) item IDs and (2) a boolean specifying if
+ * the item is enabled or not (or null to ignore it). Submenus can be checked
+ * by providing a nested array entry after the expected <menu> ID.
+ * For example: ["blah", true,              // item enabled
+ *               "submenu", null,           // submenu
+ *                   ["sub1", true,         // submenu contents
+ *                    "sub2", false], null, // submenu contents
+ *               "lol", false]              // item disabled
+ *
+ */
+function checkMenu(menu, expectedItems, data) {
+    var actualItems = getVisibleMenuItems(menu, data);
+    //ok(false, "Items are: " + actualItems);
+    for (var i = 0; i < expectedItems.length; i+=2) {
+        var actualItem   = actualItems[i];
+        var actualEnabled = actualItems[i + 1];
+        var expectedItem = expectedItems[i];
+        var expectedEnabled = expectedItems[i + 1];
+        if (expectedItem instanceof Array) {
+            ok(true, "Checking submenu...");
+            var menuID = expectedItems[i - 2]; // The last item was the menu ID.
+            var submenu = menu.getElementsByAttribute("id", menuID)[0];
+            ok(submenu, "got a submenu element of id='" + menuID + "'");
+            if (submenu) {
+              is(submenu.nodeName, "menu", "submenu element of id='" + menuID +
+                                           "' has expected nodeName");
+              checkMenu(submenu.menupopup, expectedItem, data);
+            }
+        } else {
+            is(actualItem, expectedItem,
+               "checking item #" + i/2 + " (" + expectedItem + ") name");
+
+            if (typeof expectedEnabled == "object" && expectedEnabled != null ||
+                typeof actualEnabled == "object" && actualEnabled != null) {
+
+                ok(!(actualEnabled == null), "actualEnabled is not null");
+                ok(!(expectedEnabled == null), "expectedEnabled is not null");
+                is(typeof actualEnabled, typeof expectedEnabled, "checking types");
+
+                if (typeof actualEnabled != typeof expectedEnabled ||
+                    actualEnabled == null || expectedEnabled == null)
+                  continue;
+
+                is(actualEnabled.type, expectedEnabled.type,
+                   "checking item #" + i/2 + " (" + expectedItem + ") type attr value");
+                var icon = actualEnabled.icon;
+                if (icon) {
+                  var tmp = "";
+                  var j = icon.length - 1;
+                  while (j && icon[j] != "/") {
+                    tmp = icon[j--] + tmp;
+                  }
+                  icon = tmp;
+                }
+                is(icon, expectedEnabled.icon,
+                   "checking item #" + i/2 + " (" + expectedItem + ") icon attr value");
+                is(actualEnabled.checked, expectedEnabled.checked,
+                   "checking item #" + i/2 + " (" + expectedItem + ") has checked attr");
+                is(actualEnabled.disabled, expectedEnabled.disabled,
+                   "checking item #" + i/2 + " (" + expectedItem + ") has disabled attr");
+            } else if (expectedEnabled != null)
+                is(actualEnabled, expectedEnabled,
+                   "checking item #" + i/2 + " (" + expectedItem + ") enabled state");
+        }
+    }
+    // Could find unexpected extra items at the end...
+    is(actualItems.length, expectedItems.length, "checking expected number of menu entries");
+}
diff --git a/browser/base/content/test/subtst_contextmenu.html b/browser/base/content/test/subtst_contextmenu.html
index 5f8a15ddae3..0a2c3fe7504 100644
--- a/browser/base/content/test/subtst_contextmenu.html
+++ b/browser/base/content/test/subtst_contextmenu.html
@@ -23,7 +23,6 @@ Browser context menu subtest.
 <iframe id="test-image-in-iframe" src="ctxmenu-image.png" width="98" height="98" style="border: 1px solid black"></iframe>
 <textarea id="test-textarea">chssseesbbbie</textarea> <!-- a weird word which generates only one suggestion -->
 <div id="test-contenteditable" contenteditable="true">chssseefsbbbie</div> <!-- a more weird word which generates no suggestions -->
-<input id="test-input-spellcheck" type="text" spellcheck="true" autofocus value="prodkjfgigrty"> <!-- this one also generates one suggestion -->
 <div id="test-dom-full-screen">DOM full screen FTW</div>
 <div contextmenu="myMenu">
   <p id="test-pagemenu" hopeless="true">I've got a context menu!</p>
diff --git a/browser/base/content/test/test_contextmenu.html b/browser/base/content/test/test_contextmenu.html
index 7c7697a3e7d..696c02c30be 100644
--- a/browser/base/content/test/test_contextmenu.html
+++ b/browser/base/content/test/test_contextmenu.html
@@ -16,41 +16,14 @@ Browser context menu tests.
 <pre id="test">
 <script> var perWindowPrivateBrowsing = false; </script>
 <script type="text/javascript" src="privateBrowsingMode.js"></script>
+<script type="text/javascript" src="contextmenu_common.js"></script>
 <script class="testbody" type="text/javascript">
 
-/** Test for Login Manager: multiple login autocomplete. **/
-
 SpecialPowers.Cu.import("resource://gre/modules/InlineSpellChecker.jsm", window);
 SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
 
 const Ci = SpecialPowers.Ci;
 
-function openContextMenuFor(element, shiftkey, waitForSpellCheck) {
-    // Context menu should be closed before we open it again.
-    is(SpecialPowers.wrap(contextMenu).state, "closed", "checking if popup is closed");
-
-    if (lastElement)
-      lastElement.blur();
-    element.focus();
-
-    // Some elements need time to focus and spellcheck before any tests are
-    // run on them.
-    function actuallyOpenContextMenuFor() {
-      lastElement = element;
-      var eventDetails = { type : "contextmenu", button : 2, shiftKey : shiftkey };
-      synthesizeMouse(element, 2, 2, eventDetails, element.ownerDocument.defaultView);
-    }
-
-    if (waitForSpellCheck)
-      onSpellCheck(element, actuallyOpenContextMenuFor);
-    else
-      actuallyOpenContextMenuFor();
-}
-
-function closeContextMenu() {
-    contextMenu.hidePopup();
-}
-
 function executeCopyCommand(command, expectedValue)
 {
   // Just execute the command directly rather than simulating a context menu
@@ -91,165 +64,6 @@ function selectInputText(element) {
   element.select();
 }
 
-function getVisibleMenuItems(aMenu, aData) {
-    var items = [];
-    var accessKeys = {};
-    for (var i = 0; i < aMenu.childNodes.length; i++) {
-        var item = aMenu.childNodes[i];
-        if (item.hidden)
-            continue;
-
-        var key = item.accessKey;
-        if (key)
-            key = key.toLowerCase();
-
-        var isGenerated = item.hasAttribute("generateditemid");
-
-        if (item.nodeName == "menuitem") {
-            var isSpellSuggestion = item.className == "spell-suggestion";
-            if (isSpellSuggestion) {
-              is(item.id, "", "child menuitem #" + i + " is a spelling suggestion");
-            } else if (isGenerated) {
-              is(item.id, "", "child menuitem #" + i + " is a generated item");
-            } else {
-              ok(item.id, "child menuitem #" + i + " has an ID");
-            }
-            var label = item.getAttribute("label");
-            ok(label.length, "menuitem " + item.id + " has a label");
-            if (isSpellSuggestion) {
-              is(key, "", "Spell suggestions shouldn't have an access key");
-              items.push("*" + label);
-            } else if (isGenerated) {
-              items.push("+" + label);
-            } else if (item.id.indexOf("spell-check-dictionary-") != 0 &&
-                       item.id != "spell-no-suggestions") {
-              ok(key, "menuitem " + item.id + " has an access key");
-              if (accessKeys[key])
-                  ok(false, "menuitem " + item.id + " has same accesskey as " + accessKeys[key]);
-              else
-                  accessKeys[key] = item.id;
-            }
-            if (!isSpellSuggestion && !isGenerated) {
-              items.push(item.id);
-            }
-            if (isGenerated) {
-              var p = {};
-              p.type = item.getAttribute("type");
-              p.icon = item.getAttribute("image");
-              p.checked = item.hasAttribute("checked");
-              p.disabled = item.hasAttribute("disabled");
-              items.push(p);
-            } else {
-              items.push(!item.disabled);
-            }
-        } else if (item.nodeName == "menuseparator") {
-            ok(true, "--- seperator id is " + item.id);
-            items.push("---");
-            items.push(null);
-        } else if (item.nodeName == "menu") {
-            if (isGenerated) {
-                item.id = "generated-submenu-" + aData.generatedSubmenuId++;
-            }
-            ok(item.id, "child menu #" + i + " has an ID");
-            if (!isGenerated) {
-                ok(key, "menu has an access key");
-                if (accessKeys[key])
-                    ok(false, "menu " + item.id + " has same accesskey as " + accessKeys[key]);
-                else
-                    accessKeys[key] = item.id;
-            }
-            items.push(item.id);
-            items.push(!item.disabled);
-            // Add a dummy item to that the indexes in checkMenu are the same
-            // for expectedItems and actualItems.
-            items.push([]);
-            items.push(null);
-        } else {
-            ok(false, "child #" + i + " of menu ID " + aMenu.id +
-                      " has an unknown type (" + item.nodeName + ")");
-        }
-    }
-    return items;
-}
-
-function checkContextMenu(expectedItems) {
-    is(contextMenu.state, "open", "checking if popup is open");
-    var data = { generatedSubmenuId: 1 };
-    checkMenu(contextMenu, expectedItems, data);
-}
-
-/*
- * checkMenu - checks to see if the specified <menupopup> contains the
- * expected items and state.
- * expectedItems is a array of (1) item IDs and (2) a boolean specifying if
- * the item is enabled or not (or null to ignore it). Submenus can be checked
- * by providing a nested array entry after the expected <menu> ID.
- * For example: ["blah", true,              // item enabled
- *               "submenu", null,           // submenu
- *                   ["sub1", true,         // submenu contents
- *                    "sub2", false], null, // submenu contents
- *               "lol", false]              // item disabled
- *
- */
-function checkMenu(menu, expectedItems, data) {
-    var actualItems = getVisibleMenuItems(menu, data);
-    //ok(false, "Items are: " + actualItems);
-    for (var i = 0; i < expectedItems.length; i+=2) {
-        var actualItem   = actualItems[i];
-        var actualEnabled = actualItems[i + 1];
-        var expectedItem = expectedItems[i];
-        var expectedEnabled = expectedItems[i + 1];
-        if (expectedItem instanceof Array) {
-            ok(true, "Checking submenu...");
-            var menuID = expectedItems[i - 2]; // The last item was the menu ID.
-            var submenu = menu.getElementsByAttribute("id", menuID)[0];
-            ok(submenu, "got a submenu element of id='" + menuID + "'");
-            if (submenu) {
-              is(submenu.nodeName, "menu", "submenu element of id='" + menuID +
-                                           "' has expected nodeName");
-              checkMenu(submenu.menupopup, expectedItem, data);
-            }
-        } else {
-            is(actualItem, expectedItem,
-               "checking item #" + i/2 + " (" + expectedItem + ") name");
-
-            if (typeof expectedEnabled == "object" && expectedEnabled != null ||
-                typeof actualEnabled == "object" && actualEnabled != null) {
-
-                ok(!(actualEnabled == null), "actualEnabled is not null");
-                ok(!(expectedEnabled == null), "expectedEnabled is not null");
-                is(typeof actualEnabled, typeof expectedEnabled, "checking types");
-
-                if (typeof actualEnabled != typeof expectedEnabled ||
-                    actualEnabled == null || expectedEnabled == null)
-                  continue;
-
-                is(actualEnabled.type, expectedEnabled.type,
-                   "checking item #" + i/2 + " (" + expectedItem + ") type attr value");
-                var icon = actualEnabled.icon;
-                if (icon) {
-                  var tmp = "";
-                  var j = icon.length - 1;
-                  while (j && icon[j] != "/") {
-                    tmp = icon[j--] + tmp;
-                  }
-                  icon = tmp;
-                }
-                is(icon, expectedEnabled.icon,
-                   "checking item #" + i/2 + " (" + expectedItem + ") icon attr value");
-                is(actualEnabled.checked, expectedEnabled.checked,
-                   "checking item #" + i/2 + " (" + expectedItem + ") has checked attr");
-                is(actualEnabled.disabled, expectedEnabled.disabled,
-                   "checking item #" + i/2 + " (" + expectedItem + ") has disabled attr");
-            } else if (expectedEnabled != null)
-                is(actualEnabled, expectedEnabled,
-                   "checking item #" + i/2 + " (" + expectedItem + ") enabled state");
-        }
-    }
-    // Could find unexpected extra items at the end...
-    is(actualItems.length, expectedItems.length, "checking expected number of menu entries");
-}
-
 /*
  * runTest
  *
@@ -322,27 +136,10 @@ function runTest(testNum) {
         // Context menu for text mailto-link
         checkContextMenu(["context-copyemail", true].concat(inspectItems));
         closeContextMenu();
-        openContextMenuFor(input); // Invoke context menu for next test.
-        break;
-
-    case 5:
-        // Context menu for text input field
-        checkContextMenu(["context-undo",        false,
-                          "---",                 null,
-                          "context-cut",         false,
-                          "context-copy",        false,
-                          "context-paste",       null, // ignore clipboard state
-                          "context-delete",      false,
-                          "---",                 null,
-                          "context-selectall",   false,
-                          "---",                 null,
-                          "spell-check-enabled", true
-                         ].concat(inspectItems));
-        closeContextMenu();
         openContextMenuFor(img); // Invoke context menu for next test.
         break;
 
-    case 6:
+    case 5:
         // Context menu for an image
         checkContextMenu(["context-viewimage",            true,
                           "context-copyimage-contents",   true,
@@ -357,7 +154,7 @@ function runTest(testNum) {
         openContextMenuFor(canvas); // Invoke context menu for next test.
         break;
 
-    case 7:
+    case 6:
         // Context menu for a canvas
         checkContextMenu(["context-viewimage",    true,
                           "context-saveimage",    true,
@@ -368,7 +165,7 @@ function runTest(testNum) {
         openContextMenuFor(video_ok); // Invoke context menu for next test.
         break;
 
-    case 8:
+    case 7:
         // Context menu for a video (with a VALID media source)
         checkContextMenu(["context-media-play",         true,
                           "context-media-mute",         true,
@@ -392,7 +189,7 @@ function runTest(testNum) {
         openContextMenuFor(audio_in_video); // Invoke context menu for next test.
         break;
 
-    case 9:
+    case 8:
         // Context menu for a video (with an audio-only file)
           checkContextMenu(["context-media-play",         true,
                             "context-media-mute",         true,
@@ -412,7 +209,7 @@ function runTest(testNum) {
         openContextMenuFor(video_bad); // Invoke context menu for next test.
         break;
 
-    case 10:
+    case 9:
         // Context menu for a video (with an INVALID media source)
         checkContextMenu(["context-media-play",         false,
                           "context-media-mute",         false,
@@ -436,7 +233,7 @@ function runTest(testNum) {
         openContextMenuFor(video_bad2); // Invoke context menu for next test.
         break;
 
-    case 11:
+    case 10:
         // Context menu for a video (with an INVALID media source)
         checkContextMenu(["context-media-play",         false,
                           "context-media-mute",         false,
@@ -460,7 +257,7 @@ function runTest(testNum) {
         openContextMenuFor(iframe); // Invoke context menu for next test.
         break;
 
-    case 12:
+    case 11:
         // Context menu for an iframe
         checkContextMenu(["context-back",         false,
                           "context-forward",      false,
@@ -493,7 +290,7 @@ function runTest(testNum) {
         openContextMenuFor(video_in_iframe); // Invoke context menu for next test.
         break;
 
-    case 13:
+    case 12:
         // Context menu for a video in an iframe
         checkContextMenu(["context-media-play",         true,
                           "context-media-mute",         true,
@@ -529,7 +326,7 @@ function runTest(testNum) {
         openContextMenuFor(image_in_iframe); // Invoke context menu for next test.
         break;
 
-    case 14:
+    case 13:
         // Context menu for an image in an iframe
         checkContextMenu(["context-viewimage",            true,
                           "context-copyimage-contents",   true,
@@ -556,7 +353,7 @@ function runTest(testNum) {
         openContextMenuFor(textarea, false, true); // Invoke context menu for next test, but wait for the spellcheck.
         break;
 
-    case 15:
+    case 14:
         // Context menu for textarea
         checkContextMenu(["*chubbiness",         true, // spelling suggestion
                           "spell-add-to-dictionary", true,
@@ -581,14 +378,14 @@ function runTest(testNum) {
         openContextMenuFor(text); // Invoke context menu for next test.
         break;
 
-    case 16:
+    case 15:
         // Re-check context menu for plain text to make sure it hasn't changed
         checkContextMenu(plainTextItems);
         closeContextMenu();
         openContextMenuFor(textarea, false, true); // Invoke context menu for next test.
         break;
 
-    case 17:
+    case 16:
         // Context menu for textarea after a word has been added
         // to the dictionary
         checkContextMenu(["spell-undo-add-to-dictionary", true,
@@ -613,7 +410,7 @@ function runTest(testNum) {
         openContextMenuFor(contenteditable, false, true);
         break;
 
-    case 18:
+    case 17:
         // Context menu for contenteditable
         checkContextMenu(["spell-no-suggestions", false,
                           "spell-add-to-dictionary", true,
@@ -634,42 +431,17 @@ function runTest(testNum) {
                                "spell-add-dictionaries",       true], null
                          ].concat(inspectItems));
 
-        closeContextMenu();
-        openContextMenuFor(inputspell, false, true); // Invoke context menu for next test.
-        break;
-
-    case 19:
-        // Context menu for spell-check input
-        checkContextMenu(["*prodigality",        true, // spelling suggestion
-                          "spell-add-to-dictionary", true,
-                          "---",                 null,
-                          "context-undo",        false,
-                          "---",                 null,
-                          "context-cut",         false,
-                          "context-copy",        false,
-                          "context-paste",       null, // ignore clipboard state
-                          "context-delete",      false,
-                          "---",                 null,
-                          "context-selectall",   true,
-                          "---",                 null,
-                          "spell-check-enabled", true,
-                          "spell-dictionaries",  true,
-                              ["spell-check-dictionary-en-US", true,
-                               "---",                          null,
-                               "spell-add-dictionaries",       true], null
-                         ].concat(inspectItems));
-
         closeContextMenu();
         openContextMenuFor(link); // Invoke context menu for next test.
         break;
 
-    case 20:
+    case 18:
         executeCopyCommand("cmd_copyLink", "http://mozilla.com/");
         closeContextMenu();
         openContextMenuFor(pagemenu); // Invoke context menu for next test.
         break;
 
-    case 21:
+    case 19:
         // Context menu for element with assigned content context menu
         checkContextMenu(["+Plain item",          {type: "", icon: "", checked: false, disabled: false},
                           "+Disabled item",       {type: "", icon: "", checked: false, disabled: true},
@@ -720,7 +492,7 @@ function runTest(testNum) {
         full_screen_element.mozRequestFullScreen();
         break;
 
-        case 22:
+    case 20:
         // Context menu for DOM Fullscreen mode (NOTE: this is *NOT* on an img)
         checkContextMenu(["context-leave-dom-fullscreen", true,
                           "---",                          null,
@@ -749,7 +521,7 @@ function runTest(testNum) {
         subwindow.document.mozCancelFullScreen();
         break;
 
-    case 23:
+    case 21:
         // Context menu for element with assigned content context menu
         // The shift key should bypass content context menu processing
         checkContextMenu(["context-back",         false,
@@ -770,7 +542,7 @@ function runTest(testNum) {
         openContextMenuFor(selecttext); // Invoke context menu for next test.
         return;
 
-    case 24:
+    case 22:
         // Context menu for selected text
         if (SpecialPowers.Services.appinfo.OS == "Darwin") {
           // This test is only enabled on Mac due to bug 736399.
@@ -786,7 +558,7 @@ function runTest(testNum) {
         openContextMenuFor(selecttextlink); // Invoke context menu for next test.
         return;
 
-    case 25:
+    case 23:
         // Context menu for selected text which matches valid URL pattern
         if (SpecialPowers.Services.appinfo.OS == "Darwin") {
           // This test is only enabled on Mac due to bug 736399.
@@ -826,7 +598,7 @@ function runTest(testNum) {
         openContextMenuFor(imagelink)
         break;
 
-    case 26:
+    case 24:
         // Context menu for image link
         if (perWindowPrivateBrowsing) {
           checkContextMenu(["context-openlinkintab", true,
@@ -869,7 +641,7 @@ function runTest(testNum) {
         openContextMenuFor(select_inputtext); // Invoke context menu for next test.
         return;
 
-    case 27:
+    case 25:
         // Context menu for selected text in input
         checkContextMenu(["context-undo",        false,
                           "---",                 null,
@@ -888,7 +660,7 @@ function runTest(testNum) {
         openContextMenuFor(select_inputtext_password); // Invoke context menu for next test.
         return;
 
-    case 28:
+    case 26:
         // Context menu for selected text in input[type="password"]
         checkContextMenu(["context-undo",        false,
                           "---",                 null,
@@ -911,7 +683,7 @@ function runTest(testNum) {
         openContextMenuFor(plugin);
         return;
 
-    case 29:
+    case 27:
         // Context menu for click-to-play blocked plugin
         checkContextMenu(["context-ctp-play",     true,
                           "context-ctp-hide",     true,
@@ -942,7 +714,7 @@ function runTest(testNum) {
         openContextMenuFor(longdesc);
         return;
 
-    case 30:
+    case 28:
         // Context menu for an image with longdesc
         checkContextMenu(["context-viewimage",            true,
                           "context-copyimage-contents",   true,
@@ -958,7 +730,7 @@ function runTest(testNum) {
         openContextMenuFor(srcdoc);
         return;
 
-    case 31:
+    case 29:
         // Context menu for an iframe with srcdoc attribute set
         checkContextMenu(["context-back",         false,
                           "context-forward",      false,
@@ -990,7 +762,6 @@ function runTest(testNum) {
 
     /*
      * Other things that would be nice to test:
-     *  - spelling / misspelled word (in text input?)
      *  - check state of disabled items
      *  - test execution of menu items (maybe as a separate test?)
      */
@@ -1006,10 +777,10 @@ function runTest(testNum) {
 
 
 var testNum = 1;
-var subwindow, chromeWin, contextMenu, lastElement;
+var subwindow, chromeWin, contextMenu;
 var text, link, mailto, input, img, canvas, video_ok, video_bad, video_bad2,
     iframe, video_in_iframe, image_in_iframe, textarea, contenteditable,
-    inputspell, pagemenu, dom_full_screen, plainTextItems, audio_in_video,
+    pagemenu, dom_full_screen, plainTextItems, audio_in_video,
     selecttext, selecttextlink, imagelink, select_inputtext, select_inputtext_password,
     plugin, longdesc, iframe;
 
@@ -1052,7 +823,6 @@ function startTest() {
     textarea = subwindow.document.getElementById("test-textarea");
     contenteditable = subwindow.document.getElementById("test-contenteditable");
     contenteditable.focus(); // content editable needs to be focused to enable spellcheck
-    inputspell = subwindow.document.getElementById("test-input-spellcheck");
     pagemenu = subwindow.document.getElementById("test-pagemenu");
     dom_full_screen = subwindow.document.getElementById("test-dom-full-screen");
     selecttext = subwindow.document.getElementById("test-select-text");
diff --git a/browser/base/content/test/test_contextmenu_input.html b/browser/base/content/test/test_contextmenu_input.html
new file mode 100644
index 00000000000..a0b041e15ad
--- /dev/null
+++ b/browser/base/content/test/test_contextmenu_input.html
@@ -0,0 +1,338 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Tests for browser context menu</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <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>
+Browser context menu tests for input.
+<p id="display"></p>
+
+<div id="content">
+</div>
+
+<pre id="test">
+<script type="text/javascript" src="contextmenu_common.js"></script>
+<script class="testbody" type="text/javascript">
+
+const Ci = SpecialPowers.Ci;
+
+/*
+ * runTest
+ *
+ * Called by a popupshowing event handler. Each test checks for expected menu
+ * contents, closes the popup, and finally triggers the popup on a new element
+ * (thus kicking off another cycle).
+ *
+ */
+function runTest(testNum) {
+  ok(true, "Starting test #" + testNum);
+
+  switch (testNum) {
+    case 1:
+        openContextMenuFor(input); // Invoke context menu for next test.
+        break;
+
+    case 2:
+        // Context menu for text input field.
+        checkContextMenu(["context-undo",        false,
+                          "---",                 null,
+                          "context-cut",         false,
+                          "context-copy",        false,
+                          "context-paste",       null, // ignore clipboard state
+                          "context-delete",      false,
+                          "---",                 null,
+                          "context-selectall",   false,
+                          "---",                 null,
+                          "spell-check-enabled", true,
+                          "---",                 null,
+                          "context-inspect",     true]);
+        closeContextMenu();
+        input.setAttribute('spellcheck', 'true');
+        openContextMenuFor(input); // Invoke context menu for next test.
+        break;
+
+    case 3:
+        var value = SpecialPowers.Services.appinfo.OS != "Darwin";
+        // Context menu for spell-check input.
+        checkContextMenu(["context-undo",        value,
+                          "---",                 null,
+                          "context-cut",         value,
+                          "context-copy",        value,
+                          "context-paste",       null, // ignore clipboard state
+                          "context-delete",      value,
+                          "---",                 null,
+                          "context-selectall",   value,
+                          "---",                 null,
+                          "spell-check-enabled", true,
+                          "spell-dictionaries",  true,
+                              [/*"spell-check-dictionary-en-US", true,*/
+                               "---",                          null,
+                               "spell-add-dictionaries",       true], null,
+                          "---",                 null,
+                          "context-inspect",     true]);
+
+        closeContextMenu();
+        input.removeAttribute('spellcheck');
+        openContextMenuFor(inputspellwrong); // Invoke context menu for next test.
+        break;
+
+    case 4:
+        var value = SpecialPowers.Services.appinfo.OS != "Darwin";
+        // Context menu for spell-check input with a unknwon word.
+        checkContextMenu([/*"*prodigality",        true,*/ // spelling suggestion
+                          /*"spell-add-to-dictionary", true,*/
+                          /*"---",                 null,*/
+                          "context-undo",        value,
+                          "---",                 null,
+                          "context-cut",         value,
+                          "context-copy",        value,
+                          "context-paste",       null, // ignore clipboard state
+                          "context-delete",      value,
+                          "---",                 null,
+                          "context-selectall",   true,
+                          "---",                 null,
+                          "spell-check-enabled", true,
+                          "spell-dictionaries",  true,
+                              [/*"spell-check-dictionary-en-US", true,*/
+                               "---",                          null,
+                               "spell-add-dictionaries",       true], null,
+                          "---",                 null,
+                          "context-inspect",     true]);
+
+        closeContextMenu();
+        openContextMenuFor(inputspellcorrect); // Invoke context menu for next test.
+        break;
+
+    case 5:
+        var value = SpecialPowers.Services.appinfo.OS != "Darwin";
+        // Context menu for spell-check input with a known word.
+        checkContextMenu(["context-undo",        value,
+                          "---",                 null,
+                          "context-cut",         value,
+                          "context-copy",        value,
+                          "context-paste",       null, // ignore clipboard state
+                          "context-delete",      value,
+                          "---",                 null,
+                          "context-selectall",   true,
+                          "---",                 null,
+                          "spell-check-enabled", true,
+                          "spell-dictionaries",  true,
+                              [/*"spell-check-dictionary-en-US", true,*/
+                               "---",                          null,
+                               "spell-add-dictionaries",       true], null,
+                          "---",                 null,
+                          "context-inspect",     true]);
+
+        closeContextMenu();
+        input.disabled = true;
+        openContextMenuFor(input); // Invoke context menu for next test.
+        break;
+
+    case 6:
+        // Context menu for disabled input.
+        checkContextMenu(["context-undo",        false,
+                          "---",                 null,
+                          "context-cut",         false,
+                          "context-copy",        false,
+                          "context-paste",       null, // ignore clipboard state
+                          "context-delete",      false,
+                          "---",                 null,
+                          "context-selectall",   true,
+                          "---",                 null,
+                          "spell-check-enabled", true,
+                          "---",                 null,
+                          "context-inspect",     true]);
+
+        closeContextMenu();
+        input.disabled = false;
+        input.type = 'password';
+        openContextMenuFor(input); // Invoke context menu for next test.
+        break;
+
+    case 7: // password
+    case 8: // email
+    case 9: // url
+    case 10: // tel
+        // Context menu for tel, password, email and url input fields.
+        checkContextMenu(["context-undo",        false,
+                          "---",                 null,
+                          "context-cut",         false,
+                          "context-copy",        false,
+                          "context-paste",       null, // ignore clipboard state
+                          "context-delete",      false,
+                          "---",                 null,
+                          "context-selectall",   false,
+                          "---",                 null,
+                          "context-inspect",     true]);
+
+        closeContextMenu();
+
+        if (testNum == 7) {
+          input.type = 'email';
+        } else if (testNum == 8) {
+          input.type = 'url';
+        } else if (testNum == 9) {
+          input.type = 'tel';
+        } else if (testNum == 10) {
+          input.type = 'date';
+        }
+
+        openContextMenuFor(input); // Invoke context menu for next test.
+        break;
+
+    case 11: // type='date'
+    case 12: // type='time'
+    case 13: // type='number'
+    case 14: // type='color'
+    case 15: // type='range'
+        checkContextMenu(["context-back",         false,
+                          "context-forward",      false,
+                          "context-reload",       true,
+                          "---",                  null,
+                          "context-bookmarkpage", true,
+                          "context-savepage",     true,
+                          "---",                  null,
+                          "context-viewbgimage",  false,
+                          "context-selectall",    null,
+                          "---",                  null,
+                          "context-viewsource",   true,
+                          "context-viewinfo",     true,
+                          "---",                 null,
+                          "context-inspect",     true]);
+        closeContextMenu();
+
+        if (testNum == 11) {
+          input.type = 'time';
+        } else if (testNum == 12) {
+          input.type = 'number';
+        } else if (testNum == 13) {
+          input.type = 'color';
+        } else if (testNum == 14) {
+          input.type = 'range';
+        } else {
+          input.type = 'search';
+        }
+
+        openContextMenuFor(input);
+        break;
+
+    case 16: // type='search'
+        // Context menu for search input fields.
+        checkContextMenu(["context-undo",        false,
+                          "---",                 null,
+                          "context-cut",         false,
+                          "context-copy",        false,
+                          "context-paste",       null, // ignore clipboard state
+                          "context-delete",      false,
+                          "---",                 null,
+                          "context-selectall",   false,
+                          "---",                 null,
+                          "spell-check-enabled", true,
+                          "---",                 null,
+                          "context-inspect",     true]);
+
+        closeContextMenu();
+
+        // Add some todos to make sure all input fields got a test.
+        var todos = [ "datetime", "month", "week", "datetime-local" ];
+        todos.forEach(function(type) {
+          input.type = type;
+          todo_is(input.type, type, "TODO: add test for " + type + " input fields");
+        });
+
+        input.type = 'text';
+        input.readOnly = true;
+        openContextMenuFor(input);
+        break;
+
+    case 17:
+        // Context menu for a read-only input.
+        checkContextMenu(["context-undo",        false,
+                          "---",                 null,
+                          "context-cut",         false,
+                          "context-copy",        false,
+                          "context-paste",       null, // ignore clipboard state
+                          "context-delete",      false,
+                          "---",                 null,
+                          "context-selectall",   false,
+                          "---",                 null,
+                          "context-inspect",     true]);
+        closeContextMenu();
+
+        // Clean-up.
+        subwindow.close();
+        SimpleTest.finish();
+        return;
+
+    default:
+        ok(false, "Unexpected invocation of test #" + testNum);
+        subwindow.close();
+        SimpleTest.finish();
+        return;
+  }
+
+}
+
+
+var gTestNum = 1;
+var subwindow, chromeWin, contextMenu;
+var input, inputspellwrong, inputspellcorrect;
+
+function startTest() {
+    chromeWin = SpecialPowers.wrap(subwindow)
+                    .QueryInterface(Ci.nsIInterfaceRequestor)
+                    .getInterface(Ci.nsIWebNavigation)
+                    .QueryInterface(Ci.nsIDocShellTreeItem)
+                    .rootTreeItem
+                    .QueryInterface(Ci.nsIInterfaceRequestor)
+                    .getInterface(Ci.nsIDOMWindow)
+                    .QueryInterface(Ci.nsIDOMChromeWindow);
+    contextMenu = chromeWin.document.getElementById("contentAreaContextMenu");
+    ok(contextMenu, "Got context menu XUL");
+
+    if (chromeWin.document.getElementById("Browser:Stop").getAttribute("disabled") != "true") {
+      SimpleTest.executeSoon(startTest);
+      return;
+    }
+
+    var inputs = subwindow.document.getElementsByTagName('input');
+    input = inputs[0];
+    inputspellwrong = inputs[1];
+    inputspellcorrect = inputs[2];
+
+    contextMenu.addEventListener("popupshown", function() { runTest(++gTestNum); }, false);
+    runTest(1);
+}
+
+// We open this in a separate window, because the Mochitests run inside a frame.
+// The frame causes an extra menu item, and prevents running the test
+// standalone (ie, clicking the test name in the Mochitest window) to see
+// success/failure messages.
+var painted = false, loaded = false;
+
+function waitForEvents(event)
+{
+  if (event.type == "MozAfterPaint")
+    painted = true;
+  else if (event.type == "load")
+    loaded = true;
+  if (painted && loaded) {
+    subwindow.removeEventListener("MozAfterPaint", waitForEvents, false);
+    subwindow.onload = null;
+    startTest();
+  }
+}
+
+var subwindow = window.open("data:text/html,<!DOCTYPE html><input><input spellcheck='true' value='prodkjfgigrty'><input spellcheck='true' value='foo'><input readonly spellcheck='false'>", "contextmenu-subtext", "width=600,height=700");
+subwindow.addEventListener("MozAfterPaint", waitForEvents, false);
+subwindow.onload = waitForEvents;
+
+SimpleTest.waitForExplicitFinish();
+</script>
+</pre>
+</body>
+</html>

From b2b21d09fa4e8633f9631423df34d90e9c49cc0c Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 14 Aug 2013 12:12:01 +0100
Subject: [PATCH 29/98] Bug 673553 - Move all button attributes reflection
 tests to test_button_attributes_reflection.html. r=Ms2ger

---
 content/html/content/test/Makefile.in         |  1 -
 .../test_button_attributes_reflection.html    | 38 ++++++++++++
 content/html/content/test/test_bug546995.html |  2 -
 content/html/content/test/test_bug566064.html | 59 -------------------
 4 files changed, 38 insertions(+), 62 deletions(-)
 delete mode 100644 content/html/content/test/test_bug566064.html

diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index 8d712b52b5c..487f32fe95a 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -148,7 +148,6 @@ MOCHITEST_FILES = \
 		test_bug569955.html \
 		test_bug573969.html \
 		test_bug561640.html \
-		test_bug566064.html \
 		test_bug582412-1.html \
 		test_bug582412-2.html \
 		test_bug558788-1.html \
diff --git a/content/html/content/test/forms/test_button_attributes_reflection.html b/content/html/content/test/forms/test_button_attributes_reflection.html
index aa2f3ba0db6..4a3fe04fc6e 100644
--- a/content/html/content/test/forms/test_button_attributes_reflection.html
+++ b/content/html/content/test/forms/test_button_attributes_reflection.html
@@ -69,12 +69,14 @@ reflectBoolean({
 reflectString({
   element: document.createElement("button"),
   attribute: "formTarget",
+  otherValues: [ "_blank", "_self", "_parent", "_top" ],
 });
 
 // .name
 reflectString({
   element: document.createElement("button"),
   attribute: "name",
+  otherValues: [ "isindex", "_charset_" ]
 });
 
 // .type
@@ -93,6 +95,42 @@ reflectString({
   attribute: "value",
 });
 
+// .willValidate
+ok("willValidate" in document.createElement("button"),
+   "willValidate should be an IDL attribute of the button element");
+is(typeof(document.createElement("button").willValidate), "boolean",
+   "button.willValidate should be a boolean");
+
+// .validity
+ok("validity" in document.createElement("button"),
+   "validity should be an IDL attribute of the button element");
+is(typeof(document.createElement("button").validity), "object",
+   "button.validity should be an object");
+ok(document.createElement("button").validity instanceof ValidityState,
+   "button.validity sohuld be an instance of ValidityState");
+
+// .validationMessage
+ok("validationMessage" in document.createElement("button"),
+   "validationMessage should be an IDL attribute of the button element");
+is(typeof(document.createElement("button").validationMessage), "string",
+   "button.validationMessage should be a string");
+
+// .checkValidity()
+ok("checkValidity" in document.createElement("button"),
+   "checkValidity() should be a method of the button element");
+is(typeof(document.createElement("button").checkValidity), "function",
+   "button.checkValidity should be a function");
+
+// .setCustomValidity()
+ok("setCustomValidity" in document.createElement("button"),
+   "setCustomValidity() should be a method of the button element");
+is(typeof(document.createElement("button").setCustomValidity), "function",
+   "button.setCustomValidity should be a function");
+
+// .labels
+todo("labels" in document.createElement("button"),
+     "button.labels isn't implemented yet");
+
 </script>
 </pre>
 </body>
diff --git a/content/html/content/test/test_bug546995.html b/content/html/content/test/test_bug546995.html
index 078079d88c5..0135da60107 100644
--- a/content/html/content/test/test_bug546995.html
+++ b/content/html/content/test/test_bug546995.html
@@ -13,7 +13,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=546995
 <p id="display"></p>
 <div id="content" style="display: none">
   <select id='s'></select>
-  <button id='b'></button>
 </div>
 <pre id="test">
 <script type="application/javascript">
@@ -34,7 +33,6 @@ function checkAutofocusIDLAttribute(element)
 
 // TODO: keygen should be added when correctly implemented, see bug 101019.
 checkAutofocusIDLAttribute(document.getElementById('s'));
-checkAutofocusIDLAttribute(document.getElementById('b'));
 
 </script>
 </pre>
diff --git a/content/html/content/test/test_bug566064.html b/content/html/content/test/test_bug566064.html
deleted file mode 100644
index 8e09083f75e..00000000000
--- a/content/html/content/test/test_bug566064.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=566064
--->
-<head>
-  <title>Test for Bug 566064</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=566064">Mozilla Bug 566064</a>
-<p id="display"></p>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 566064 **/
-
-// This test is only checking the IDL/content attribute of 'formtarget'.
-// The behavior is tested in test_bug566046.html.
-
-function isFormTargetEquals(aElement, aValue, aShouldBeNull)
-{
-  if (aShouldBeNull) {
-    contentAtttributeValue = null;
-  } else {
-    contentAtttributeValue = aValue;
-  }
-
-  is(aElement.formTarget, aValue,
-     "formTarget IDL attribute value should be " + aValue);
-  is(aElement.getAttribute('formtarget'), contentAtttributeValue,
-     "formTarget content attribute value should be " + contentAtttributeValue);
-}
-
-function checkFormTarget(aElement)
-{
-  isFormTargetEquals(aElement, "", true);
-
-  aElement.formTarget = "foo";
-  isFormTargetEquals(aElement, "foo");
-
-  aElement.setAttribute("formtarget", "bar");
-  isFormTargetEquals(aElement, "bar");
-
-  aElement.removeAttribute("formtarget");
-  isFormTargetEquals(aElement, "", true);
-}
-
-var button = document.createElement('button');
-
-ok('formTarget' in button, "formTarget is a HTMLButtonElement property");
-
-checkFormTarget(button);
-
-</script>
-</pre>
-</body>
-</html>

From e83bbcc4cd16d2e775b9f6d60c63a9db09e324f8 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Wed, 14 Aug 2013 17:17:00 +0200
Subject: [PATCH 30/98] Bug 892488 - Get rid of the offline application cache
 prompt, r=ehsan+jonas

---
 browser/base/content/test/Makefile.in         |  1 +
 .../test/browser_offlineQuotaNotification.js  |  2 +
 browser/base/content/test/offlineByDefault.js | 17 +++++
 .../test/test_offlineNotification.html        |  3 +
 .../base/content/test/test_offline_gzip.html  |  2 +
 content/base/public/nsContentUtils.h          |  6 ++
 content/base/src/nsContentSink.cpp            |  7 +-
 content/base/src/nsContentUtils.cpp           | 32 +++++++++
 dom/src/offline/nsDOMOfflineResourceList.cpp  | 48 ++++++++++----
 dom/src/offline/nsDOMOfflineResourceList.h    |  1 -
 .../offline/460353_iframe_samemanifest.html   |  4 ++
 .../mochitest/ajax/offline/foreign2.html      | 38 +++++------
 .../mochitest/ajax/offline/offlineChild.html  |  2 +-
 .../mochitest/ajax/offline/offlineTests.js    | 51 ++++++++++++--
 .../ajax/offline/test_bug460353.html          | 15 ++++-
 .../ajax/offline/test_bug474696.html          |  3 +-
 .../ajax/offline/test_bug744719-cancel.html   | 66 +++++++++----------
 .../ajax/offline/test_bug744719.html          |  9 ++-
 .../ajax/offline/test_cancelOfflineCache.html |  1 +
 .../mochitest/ajax/offline/test_foreign.html  | 14 +++-
 .../ajax/offline/test_lowDeviceStorage.html   |  1 -
 .../ajax/offline/test_updatingManifest.html   | 16 +++--
 .../android/base/tests/testDoorHanger.java.in | 61 +++++++++++++++++
 modules/libpref/src/init/all.js               |  2 +
 .../prefetch/nsOfflineCacheUpdateService.cpp  | 14 +---
 25 files changed, 309 insertions(+), 107 deletions(-)
 create mode 100644 browser/base/content/test/offlineByDefault.js

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 07974075470..deee2218ade 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -35,6 +35,7 @@ MOCHITEST_FILES = \
         test_feed_discovery.html \
         test_offline_gzip.html \
         test_offlineNotification.html \
+        offlineByDefault.js \
         video.ogg \
         $(NULL)
 
diff --git a/browser/base/content/test/browser_offlineQuotaNotification.js b/browser/base/content/test/browser_offlineQuotaNotification.js
index a8aba6b9730..507600d3049 100644
--- a/browser/base/content/test/browser_offlineQuotaNotification.js
+++ b/browser/base/content/test/browser_offlineQuotaNotification.js
@@ -14,6 +14,7 @@ registerCleanupFunction(function() {
   var principal = Services.scriptSecurityManager.getNoAppCodebasePrincipal(uri);
   Services.perms.removeFromPrincipal(principal, "offline-app");
   Services.prefs.clearUserPref("offline-apps.quota.warn");
+  Services.prefs.clearUserPref("offline-apps.allow_by_default");
 });
 
 // Check that the "preferences" UI is opened and showing which websites have
@@ -70,5 +71,6 @@ function test() {
     PopupNotifications.panel.firstElementChild.button.click();
   }, true);
 
+  Services.prefs.setBoolPref("offline-apps.allow_by_default", false);
   gBrowser.contentWindow.location = URL;
 }
diff --git a/browser/base/content/test/offlineByDefault.js b/browser/base/content/test/offlineByDefault.js
new file mode 100644
index 00000000000..72f7e52a01b
--- /dev/null
+++ b/browser/base/content/test/offlineByDefault.js
@@ -0,0 +1,17 @@
+var offlineByDefault = {
+  defaultValue: false,
+  prefBranch: SpecialPowers.Cc["@mozilla.org/preferences-service;1"].getService(SpecialPowers.Ci.nsIPrefBranch),
+  set: function(allow) {
+    try {
+      this.defaultValue = this.prefBranch.getBoolPref("offline-apps.allow_by_default");
+    } catch (e) {
+      this.defaultValue = false
+    }
+    this.prefBranch.setBoolPref("offline-apps.allow_by_default", allow);
+  },
+  reset: function() {
+    this.prefBranch.setBoolPref("offline-apps.allow_by_default", this.defaultValue);
+  }
+}
+
+offlineByDefault.set(false);
diff --git a/browser/base/content/test/test_offlineNotification.html b/browser/base/content/test/test_offlineNotification.html
index 8c603f15061..ad015a8623e 100644
--- a/browser/base/content/test/test_offlineNotification.html
+++ b/browser/base/content/test/test_offlineNotification.html
@@ -6,6 +6,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=462856
 <head>
   <title>Test offline app notification</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="offlineByDefault.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="loaded()">
@@ -52,6 +53,8 @@ window.addEventListener("message", function(event) {
       pm.removeFromPrincipal(principal1, "offline-app");
       pm.removeFromPrincipal(principal2, "offline-app");
 
+      offlineByDefault.reset();
+
       SimpleTest.finish();
     }
   }, false);
diff --git a/browser/base/content/test/test_offline_gzip.html b/browser/base/content/test/test_offline_gzip.html
index 09713da92ed..1b4a6129961 100644
--- a/browser/base/content/test/test_offline_gzip.html
+++ b/browser/base/content/test/test_offline_gzip.html
@@ -13,6 +13,7 @@ cache, it can be fetched from the cache successfully.
           src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript"
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="offlineByDefault.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body onload="loaded()">
@@ -46,6 +47,7 @@ function finishTest() {
 
   window.removeEventListener("message", handleMessageEvents, false);
 
+  offlineByDefault.reset();
   SimpleTest.finish();  
 }
 
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 3044829a7f8..383c1fdb84c 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -1503,6 +1503,12 @@ public:
    */
   static bool OfflineAppAllowed(nsIPrincipal *aPrincipal);
 
+  /**
+   * If offline-apps.allow_by_default is true, we set offline-app permission
+   * for the principal and return true.  Otherwise false.
+   */
+  static bool MaybeAllowOfflineAppByDefault(nsIPrincipal *aPrincipal);
+
   /**
    * Increases the count of blockers preventing scripts from running.
    * NOTE: You might want to use nsAutoScriptBlocker rather than calling
diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
index af7deb997d2..ad4c1c843e0 100644
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -1061,8 +1061,11 @@ nsContentSink::ProcessOfflineManifest(const nsAString& aManifestSpec)
       action = CACHE_SELECTION_RESELECT_WITHOUT_MANIFEST;
     }
     else {
-      // Only continue if the document has permission to use offline APIs.
-      if (!nsContentUtils::OfflineAppAllowed(mDocument->NodePrincipal())) {
+      // Only continue if the document has permission to use offline APIs or
+      // when preferences indicate to permit it automatically.
+      if (!nsContentUtils::OfflineAppAllowed(mDocument->NodePrincipal()) &&
+          !nsContentUtils::MaybeAllowOfflineAppByDefault(mDocument->NodePrincipal()) &&
+          !nsContentUtils::OfflineAppAllowed(mDocument->NodePrincipal())) {
         return;
       }
 
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index c39ef5b8b6d..9f40892233f 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -1405,6 +1405,38 @@ nsContentUtils::OfflineAppAllowed(nsIPrincipal *aPrincipal)
   return NS_SUCCEEDED(rv) && allowed;
 }
 
+bool
+nsContentUtils::MaybeAllowOfflineAppByDefault(nsIPrincipal *aPrincipal)
+{
+  if (!Preferences::GetRootBranch())
+    return false;
+
+  nsresult rv;
+
+  bool allowedByDefault;
+  rv = Preferences::GetRootBranch()->GetBoolPref(
+    "offline-apps.allow_by_default", &allowedByDefault);
+  if (NS_FAILED(rv))
+    return false;
+
+  if (!allowedByDefault)
+    return false;
+
+  nsCOMPtr<nsIPermissionManager> permissionManager =
+      do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
+  if (!permissionManager)
+    return false;
+
+  rv = permissionManager->AddFromPrincipal(
+    aPrincipal, "offline-app", nsIPermissionManager::ALLOW_ACTION,
+    nsIPermissionManager::EXPIRE_NEVER, 0);
+  if (NS_FAILED(rv))
+    return false;
+
+  // We have added the permission
+  return true;
+}
+
 // static
 void
 nsContentUtils::Shutdown()
diff --git a/dom/src/offline/nsDOMOfflineResourceList.cpp b/dom/src/offline/nsDOMOfflineResourceList.cpp
index fa4811db5b5..e6de4f4babc 100644
--- a/dom/src/offline/nsDOMOfflineResourceList.cpp
+++ b/dom/src/offline/nsDOMOfflineResourceList.cpp
@@ -84,7 +84,6 @@ nsDOMOfflineResourceList::nsDOMOfflineResourceList(nsIURI *aManifestURI,
   , mManifestURI(aManifestURI)
   , mDocumentURI(aDocumentURI)
   , mExposeCacheUpdateStatus(true)
-  , mDontSetDocumentCache(false)
   , mStatus(nsIDOMOfflineResourceList::IDLE)
   , mCachedKeys(nullptr)
   , mCachedKeysCount(0)
@@ -429,6 +428,11 @@ nsDOMOfflineResourceList::GetStatus(uint16_t *aStatus)
     }
   }
 
+  if (mAvailableApplicationCache) {
+    *aStatus = nsIDOMOfflineResourceList::UPDATEREADY;
+    return NS_OK;
+  }
+
   *aStatus = mStatus;
   return NS_OK;
 }
@@ -455,10 +459,6 @@ nsDOMOfflineResourceList::Update()
                                      window, getter_AddRefs(update));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Since we are invoking the cache update, cache on the document must not
-  // be updated until swapCache() method is called on applicationCache object.
-  mDontSetDocumentCache = true;
-
   return NS_OK;
 }
 
@@ -488,6 +488,8 @@ nsDOMOfflineResourceList::SwapCache()
     mAvailableApplicationCache->GetClientID(availClientId);
     if (availClientId == currClientId)
       return NS_ERROR_DOM_INVALID_STATE_ERR;
+  } else if (mStatus != OBSOLETE) {
+    return NS_ERROR_DOM_INVALID_STATE_ERR;
   }
 
   ClearCachedKeys();
@@ -629,16 +631,36 @@ nsDOMOfflineResourceList::UpdateStateChanged(nsIOfflineCacheUpdate *aUpdate,
 NS_IMETHODIMP
 nsDOMOfflineResourceList::ApplicationCacheAvailable(nsIApplicationCache *aApplicationCache)
 {
-  mAvailableApplicationCache = aApplicationCache;
+  nsCOMPtr<nsIApplicationCache> currentAppCache = GetDocumentAppCache();
+  if (currentAppCache) {
+    // Document already has a cache, we cannot override it.  swapCache is
+    // here to do it on demand.
 
-  if (!mDontSetDocumentCache) {
-    nsCOMPtr<nsIApplicationCacheContainer> appCacheContainer =
-      GetDocumentAppCacheContainer();
+    // If the newly available cache is identical to the current cache, then
+    // just ignore this event.
+    if (aApplicationCache == currentAppCache) {
+      return NS_OK;
+    }
 
-    if (appCacheContainer)
-      appCacheContainer->SetApplicationCache(aApplicationCache);
+    nsCString currClientId, availClientId;
+    currentAppCache->GetClientID(currClientId);
+    aApplicationCache->GetClientID(availClientId);
+    if (availClientId == currClientId) {
+      return NS_OK;
+    }
+
+    mAvailableApplicationCache = aApplicationCache;
+    return NS_OK;
   }
 
+  nsCOMPtr<nsIApplicationCacheContainer> appCacheContainer =
+    GetDocumentAppCacheContainer();
+
+  if (appCacheContainer) {
+    appCacheContainer->SetApplicationCache(aApplicationCache);
+  }
+
+  mAvailableApplicationCache = nullptr;
   return NS_OK;
 }
 
@@ -737,14 +759,12 @@ nsDOMOfflineResourceList::UpdateCompleted(nsIOfflineCacheUpdate *aUpdate)
 
   mCacheUpdate->RemoveObserver(this);
   mCacheUpdate = nullptr;
-  mDontSetDocumentCache = false;
 
   if (NS_SUCCEEDED(rv) && succeeded && !partial) {
+    mStatus = nsIDOMOfflineResourceList::IDLE;
     if (isUpgrade) {
-      mStatus = nsIDOMOfflineResourceList::UPDATEREADY;
       SendEvent(NS_LITERAL_STRING(UPDATEREADY_STR));
     } else {
-      mStatus = nsIDOMOfflineResourceList::IDLE;
       SendEvent(NS_LITERAL_STRING(CACHED_STR));
     }
   }
diff --git a/dom/src/offline/nsDOMOfflineResourceList.h b/dom/src/offline/nsDOMOfflineResourceList.h
index eeb63d2c3a0..40858869cf7 100644
--- a/dom/src/offline/nsDOMOfflineResourceList.h
+++ b/dom/src/offline/nsDOMOfflineResourceList.h
@@ -157,7 +157,6 @@ private:
   nsCOMPtr<nsIApplicationCache> mAvailableApplicationCache;
   nsCOMPtr<nsIOfflineCacheUpdate> mCacheUpdate;
   bool mExposeCacheUpdateStatus;
-  bool mDontSetDocumentCache;
   uint16_t mStatus;
 
   // The set of dynamic keys for this application cache object.
diff --git a/dom/tests/mochitest/ajax/offline/460353_iframe_samemanifest.html b/dom/tests/mochitest/ajax/offline/460353_iframe_samemanifest.html
index 556789792be..de357827b6a 100644
--- a/dom/tests/mochitest/ajax/offline/460353_iframe_samemanifest.html
+++ b/dom/tests/mochitest/ajax/offline/460353_iframe_samemanifest.html
@@ -12,6 +12,10 @@ applicationCache.oncached = function() {
   parent.frameOnUpdate("same", true, applicationCache.status);
 }
 
+applicationCache.onnoupdate = function() {
+  parent.frameOnUpdate("same", true, applicationCache.status);
+}
+
 </script>
 
 </head>
diff --git a/dom/tests/mochitest/ajax/offline/foreign2.html b/dom/tests/mochitest/ajax/offline/foreign2.html
index 133c1748e10..e330c9f5a04 100644
--- a/dom/tests/mochitest/ajax/offline/foreign2.html
+++ b/dom/tests/mochitest/ajax/offline/foreign2.html
@@ -10,59 +10,57 @@
 
 function manifestUpdated()
 {
+dump(">>>>>>>>>>>>>> MANIFESTUPDATED\n");
   var appCacheService = SpecialPowers.Components.classes["@mozilla.org/network/application-cache-service;1"]
     .getService(SpecialPowers.Ci.nsIApplicationCacheService);
 
   var foreign2cache = appCacheService.chooseApplicationCache(
     "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html", OfflineTest.loadContext());
 
-  OfflineTest.ok(foreign2cache, "Foreign 2 cache present, chosen for foreign2.html");
-  OfflineTest.is(foreign2cache.manifestURI.asciiSpec, "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.cacheManifest")
+  window.opener.OfflineTest.ok(foreign2cache, "Foreign 2 cache present, chosen for foreign2.html");
+  window.opener.OfflineTest.is(foreign2cache.manifestURI.asciiSpec, "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.cacheManifest")
 
   var foreign1cache = OfflineTest.getActiveCache(
     "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign1.cacheManifest");
-  OfflineTest.ok(foreign1cache, "Foreign 1 cache loaded");
+  window.opener.OfflineTest.ok(foreign1cache, "Foreign 1 cache loaded");
   foreign1cache.discard();
 
-  OfflineTest.teardown();
-  OfflineTest.finish();
+  window.opener.onDone();
 }
 
 function onLoaded()
 {
+dump(">>>>>>>>>>>>>> ONLOADED\n");
   var appCacheService = SpecialPowers.Components.classes["@mozilla.org/network/application-cache-service;1"]
     .getService(SpecialPowers.Ci.nsIApplicationCacheService);
 
-  var foreign1cache = OfflineTest.getActiveCache(
+  var foreign1cache = window.opener.OfflineTest.getActiveCache(
     "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign1.cacheManifest");
-  OfflineTest.ok(foreign1cache, "Foreign 1 cache loaded");
+  window.opener.OfflineTest.ok(foreign1cache, "Foreign 1 cache loaded");
 
-  var foreign2cache = OfflineTest.getActiveCache(
+  var foreign2cache = window.opener.OfflineTest.getActiveCache(
     "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.cacheManifest");
-  OfflineTest.ok(!foreign2cache, "Foreign 2 cache not present");
+  window.opener.OfflineTest.ok(!foreign2cache, "Foreign 2 cache not present");
 
   foreign1cache = appCacheService.chooseApplicationCache(
-    "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html", OfflineTest.loadContext());
-  OfflineTest.ok(!foreign1cache, "foreign2.html not chosen from foreign1 cache");
+    "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html", window.opener.OfflineTest.loadContext());
+  window.opener.OfflineTest.ok(!foreign1cache, "foreign2.html not chosen from foreign1 cache");
 
   try
   {
-    OfflineTest.ok(applicationCache.status == SpecialPowers.Ci.nsIDOMOfflineResourceList.UNCACHED,
+    window.opener.OfflineTest.ok(applicationCache.status == SpecialPowers.Ci.nsIDOMOfflineResourceList.UNCACHED,
         "there is no associated application cache");
   }
   catch (ex)
   {
-    OfflineTest.ok(false, "applicationCache.status must not throw an exception");
+    window.opener.OfflineTest.ok(false, "applicationCache.status must not throw an exception");
   }
 }
 
-if (OfflineTest.setup())
-{
-  applicationCache.onerror = OfflineTest.failEvent;
-  applicationCache.onupdateready = OfflineTest.failEvent;
-  applicationCache.onnoupdate = OfflineTest.failEvent;
-  applicationCache.oncached = OfflineTest.priv(manifestUpdated);
-}
+applicationCache.onerror = window.opener.OfflineTest.failEvent;
+applicationCache.onupdateready = window.opener.OfflineTest.failEvent;
+applicationCache.onnoupdate = window.opener.OfflineTest.failEvent;
+applicationCache.oncached = window.opener.OfflineTest.priv(manifestUpdated);
 
 </script>
 
diff --git a/dom/tests/mochitest/ajax/offline/offlineChild.html b/dom/tests/mochitest/ajax/offline/offlineChild.html
index 38b6fae9ac0..d70a060a164 100644
--- a/dom/tests/mochitest/ajax/offline/offlineChild.html
+++ b/dom/tests/mochitest/ajax/offline/offlineChild.html
@@ -12,7 +12,7 @@
 // (since we don't get those events)
 function doneLoading()
 {
-  window.top.childFinished();
+  window.parent.childFinished();
 }
 
 if (OfflineTest.setupChild()) {
diff --git a/dom/tests/mochitest/ajax/offline/offlineTests.js b/dom/tests/mochitest/ajax/offline/offlineTests.js
index a39de0a77f7..a5410298b97 100644
--- a/dom/tests/mochitest/ajax/offline/offlineTests.js
+++ b/dom/tests/mochitest/ajax/offline/offlineTests.js
@@ -58,6 +58,8 @@ fetch: function(callback)
 
 var OfflineTest = {
 
+_allowedByDefault: false,
+
 _hasSlave: false,
 
 // The window where test results should be sent.
@@ -71,6 +73,11 @@ _SJSsStated: [],
 
 setupChild: function()
 {
+  if (this._allowedByDefault) {
+    this._masterWindow = window;
+    return true;
+  }
+
   if (window.parent.OfflineTest._hasSlave) {
     return false;
   }
@@ -91,6 +98,17 @@ setup: function()
 {
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
+  var prefBranch = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+  try {
+    this._allowedByDefault = prefBranch.getBoolPref("offline-apps.allow_by_default");
+  } catch (e) {}
+
+  if (this._allowedByDefault) {
+    this._masterWindow = window;
+
+    return true;
+  }
+
   if (!window.opener || !window.opener.OfflineTest ||
       !window.opener.OfflineTest._hasSlave) {
     // Offline applications must be toplevel windows and have the
@@ -154,7 +172,9 @@ teardown: function()
 
 finish: function()
 {
-  if (this._masterWindow) {
+  if (this._allowedByDefault) {
+    SimpleTest.executeSoon(SimpleTest.finish);
+  } else if (this._masterWindow) {
     // Slave window: pass control back to master window, close itself.
     this._masterWindow.SimpleTest.executeSoon(this._masterWindow.OfflineTest.finish);
     window.close();
@@ -237,12 +257,25 @@ waitForAdd: function(url, onFinished) {
 
 manifestURL: function(overload)
 {
-  var manifestURLspec = overload || window.top.document.documentElement.getAttribute("manifest");
+  var manifestURLspec;
+  if (overload) {
+    manifestURLspec = overload;
+  } else {
+    var win = window;
+    while (win && !win.document.documentElement.getAttribute("manifest")) {
+      if (win == win.parent)
+        break;
+      win = win.parent;
+    }
+    if (win)
+      manifestURLspec = win.document.documentElement.getAttribute("manifest");
+  }
 
   var ios = Cc["@mozilla.org/network/io-service;1"]
             .getService(Ci.nsIIOService)
 
   var baseURI = ios.newURI(window.location.href, null, null);
+  dump("manifestURLspec=" + manifestURLspec + "\n");
   return ios.newURI(manifestURLspec, null, baseURI);
 },
 
@@ -261,14 +294,17 @@ getActiveCache: function(overload)
   var serv = Cc["@mozilla.org/network/application-cache-service;1"]
              .getService(Ci.nsIApplicationCacheService);
   var groupID = serv.buildGroupID(this.manifestURL(overload), this.loadContext());
+  dump("Getting active cache for " + groupID + " (o=" + overload + ")\n");
   return serv.getActiveCache(groupID);
 },
 
 getActiveSession: function()
 {
   var cache = this.getActiveCache();
-  if (!cache)
+  if (!cache) {
+    dump("No active cache\n");
     return null;
+  }
 
   var cacheService = Cc["@mozilla.org/network/cache-service;1"]
                      .getService(Ci.nsICacheService);
@@ -302,6 +338,7 @@ checkCacheEntries: function(entries, callback)
 
 checkCache: function(url, expectEntry, callback)
 {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var cacheSession = this.getActiveSession();
   this._checkCache(cacheSession, url, expectEntry, callback);
 },
@@ -310,11 +347,11 @@ _checkCache: function(cacheSession, url, expectEntry, callback)
 {
   if (!cacheSession) {
     if (expectEntry) {
-      this.ok(false, url + " should exist in the offline cache");
+      this.ok(false, url + " should exist in the offline cache (no session)");
     } else {
-      this.ok(true, url + " should not exist in the offline cache");
+      this.ok(true, url + " should not exist in the offline cache (no session)");
     }
-    setTimeout(this.priv(callback), 0);
+    if (callback) setTimeout(this.priv(callback), 0);
     return;
   }
 
@@ -346,7 +383,7 @@ _checkCache: function(cacheSession, url, expectEntry, callback)
           OfflineTest.ok(false, "got invalid error for " + url);
         }
       }
-      setTimeout(OfflineTest.priv(callback), 0);
+      if (callback) setTimeout(OfflineTest.priv(callback), 0);
     }
   };
 
diff --git a/dom/tests/mochitest/ajax/offline/test_bug460353.html b/dom/tests/mochitest/ajax/offline/test_bug460353.html
index c0ba51aa967..84cb0370443 100644
--- a/dom/tests/mochitest/ajax/offline/test_bug460353.html
+++ b/dom/tests/mochitest/ajax/offline/test_bug460353.html
@@ -16,10 +16,16 @@
 <script class="testbody" type="text/javascript">
 
 var result = new Array();
-var expectedUpdates = 2;
+var expectedUpdates = 3; // 2 iframes and our self
 
 init();
 
+function onUpdatePassed()
+{
+  if (!(--expectedUpdates))
+    SimpleTest.executeSoon(finish);
+}
+
 function init()
 {
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -35,6 +41,9 @@ function init()
                     .getService(Ci.nsIScriptSecurityManager)
                     .getNoAppCodebasePrincipal(uri);
   pm.addFromPrincipal(principal, "offline-app", Ci.nsIPermissionManager.ALLOW_ACTION);
+
+  applicationCache.oncached = onUpdatePassed;
+  applicationCache.onnoupdate = onUpdatePassed;
 }
 
 function frameOnLoad(frameid, status)
@@ -52,8 +61,7 @@ function frameOnUpdate(frameid, ok, status)
   result[frameid].updateOK = ok;
   result[frameid].cacheStatus = status;
 
-  if (!(--expectedUpdates))
-    finish();
+  onUpdatePassed();
 }
 
 function finish()
@@ -98,6 +106,7 @@ function cleanCache(manifestURL)
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   var cache = OfflineTest.getActiveCache(manifestURL);
+  dump("Discarding cache for " + manifestURL + " cache=" + cache + "\n");
   if (cache)
     cache.discard();
 }
diff --git a/dom/tests/mochitest/ajax/offline/test_bug474696.html b/dom/tests/mochitest/ajax/offline/test_bug474696.html
index ecc964d386b..779e5df11db 100644
--- a/dom/tests/mochitest/ajax/offline/test_bug474696.html
+++ b/dom/tests/mochitest/ajax/offline/test_bug474696.html
@@ -15,8 +15,9 @@ function manifestUpdated()
 
 function onFallbackLoad(fallbackIdentification)
 {
-  OfflineTest.is(fallbackIdentification, 1, "Got correct fallback for namespace1");
+  OfflineTest.is(fallbackIdentification, 1, "Got correct fallback for namespace1 (2)");
 
+  applicationCache.onerror = function() {}; // the update invoked by the iframe will finish after we discard the cache, ignore error
   OfflineTest.teardown();
   OfflineTest.finish();
 }
diff --git a/dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html b/dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html
index 8487c0ee1ff..8909dc4f3ce 100644
--- a/dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html
+++ b/dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html
@@ -19,42 +19,42 @@ ok(applicationCache.mozItems.length == 0,
 
 function updateCanceled()
 {
-  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/744719-cancel.cacheManifest", false);
-  OfflineTest.checkCache("http://mochi.test:8888/tests/SimpleTest/SimpleTest.js", false);
-  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/offlineTests.js", false);
+  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/744719-cancel.cacheManifest", false, null);
+  OfflineTest.checkCache("http://mochi.test:8888/tests/SimpleTest/SimpleTest.js", false, null);
+  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/offlineTests.js", false, null);
 
-  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/nonexistent744719?010", false);
+  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/nonexistent744719?010", false, null);
 
   var URL = "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/subresource744719.html?";
-  OfflineTest.checkCache(URL + "001", false);
-  OfflineTest.checkCache(URL + "002", false);
-  OfflineTest.checkCache(URL + "003", false);
-  OfflineTest.checkCache(URL + "004", false);
-  OfflineTest.checkCache(URL + "005", false);
-  OfflineTest.checkCache(URL + "006", false);
-  OfflineTest.checkCache(URL + "007", false);
-  OfflineTest.checkCache(URL + "008", false);
-  OfflineTest.checkCache(URL + "009", false);
-  OfflineTest.checkCache(URL + "011", false);
-  OfflineTest.checkCache(URL + "012", false);
-  OfflineTest.checkCache(URL + "013", false);
-  OfflineTest.checkCache(URL + "014", false);
-  OfflineTest.checkCache(URL + "015", false);
-  OfflineTest.checkCache(URL + "016", false);
-  OfflineTest.checkCache(URL + "017", false);
-  OfflineTest.checkCache(URL + "018", false);
-  OfflineTest.checkCache(URL + "019", false);
-  OfflineTest.checkCache(URL + "020", false);
-  OfflineTest.checkCache(URL + "021", false);
-  OfflineTest.checkCache(URL + "022", false);
-  OfflineTest.checkCache(URL + "023", false);
-  OfflineTest.checkCache(URL + "024", false);
-  OfflineTest.checkCache(URL + "025", false);
-  OfflineTest.checkCache(URL + "026", false);
-  OfflineTest.checkCache(URL + "027", false);
-  OfflineTest.checkCache(URL + "028", false);
-  OfflineTest.checkCache(URL + "029", false);
-  OfflineTest.checkCache(URL + "030", false);
+  OfflineTest.checkCache(URL + "001", false, null);
+  OfflineTest.checkCache(URL + "002", false, null);
+  OfflineTest.checkCache(URL + "003", false, null);
+  OfflineTest.checkCache(URL + "004", false, null);
+  OfflineTest.checkCache(URL + "005", false, null);
+  OfflineTest.checkCache(URL + "006", false, null);
+  OfflineTest.checkCache(URL + "007", false, null);
+  OfflineTest.checkCache(URL + "008", false, null);
+  OfflineTest.checkCache(URL + "009", false, null);
+  OfflineTest.checkCache(URL + "011", false, null);
+  OfflineTest.checkCache(URL + "012", false, null);
+  OfflineTest.checkCache(URL + "013", false, null);
+  OfflineTest.checkCache(URL + "014", false, null);
+  OfflineTest.checkCache(URL + "015", false, null);
+  OfflineTest.checkCache(URL + "016", false, null);
+  OfflineTest.checkCache(URL + "017", false, null);
+  OfflineTest.checkCache(URL + "018", false, null);
+  OfflineTest.checkCache(URL + "019", false, null);
+  OfflineTest.checkCache(URL + "020", false, null);
+  OfflineTest.checkCache(URL + "021", false, null);
+  OfflineTest.checkCache(URL + "022", false, null);
+  OfflineTest.checkCache(URL + "023", false, null);
+  OfflineTest.checkCache(URL + "024", false, null);
+  OfflineTest.checkCache(URL + "025", false, null);
+  OfflineTest.checkCache(URL + "026", false, null);
+  OfflineTest.checkCache(URL + "027", false, null);
+  OfflineTest.checkCache(URL + "028", false, null);
+  OfflineTest.checkCache(URL + "029", false, null);
+  OfflineTest.checkCache(URL + "030", false, null);
 
   OfflineTest.teardown();
 
diff --git a/dom/tests/mochitest/ajax/offline/test_bug744719.html b/dom/tests/mochitest/ajax/offline/test_bug744719.html
index 17f0300ee11..d66222db871 100644
--- a/dom/tests/mochitest/ajax/offline/test_bug744719.html
+++ b/dom/tests/mochitest/ajax/offline/test_bug744719.html
@@ -52,11 +52,10 @@ function manifestUpdated()
   OfflineTest.checkCache(URL + "027", true);
   OfflineTest.checkCache(URL + "028", true);
   OfflineTest.checkCache(URL + "029", true);
-  OfflineTest.checkCache(URL + "030", true);
-
-  OfflineTest.teardown();
-
-  OfflineTest.finish();
+  OfflineTest.checkCache(URL + "030", true, function() {
+    OfflineTest.teardown();
+    OfflineTest.finish();
+  });
 }
 
 if (OfflineTest.setup()) {
diff --git a/dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html b/dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html
index d315c4af2cc..29a974b280b 100644
--- a/dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html
+++ b/dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html
@@ -43,6 +43,7 @@ function onProgress () {
 
 if (OfflineTest.setup()) {
   applicationCache.onerror = OfflineTest.priv(onError);
+  applicationCache.onnoupdate = OfflineTest.failEvent;
   applicationCache.onprogress = OfflineTest.priv(onProgress);
   applicationCache.oncached = OfflineTest.priv(manifestCached);
 }
diff --git a/dom/tests/mochitest/ajax/offline/test_foreign.html b/dom/tests/mochitest/ajax/offline/test_foreign.html
index e5b337decc6..c07e7d3388b 100644
--- a/dom/tests/mochitest/ajax/offline/test_foreign.html
+++ b/dom/tests/mochitest/ajax/offline/test_foreign.html
@@ -19,9 +19,11 @@
  * chosen by foreign.html page.
  */
 
+var win;
+
 function manifestUpdated()
 {
-  var appCacheService = SpecialPowers.Components.classes["@mozilla.org/network/application-cache-service;1"]
+  var appCacheService = SpecialPowers.Cc["@mozilla.org/network/application-cache-service;1"]
     .getService(SpecialPowers.Ci.nsIApplicationCacheService);
 
   foreign1cache = appCacheService.chooseApplicationCache(
@@ -30,7 +32,15 @@ function manifestUpdated()
   OfflineTest.ok(foreign1cache, "foreign2.html chosen from foreign1 cache");
   OfflineTest.is(foreign1cache.manifestURI.asciiSpec, "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign1.cacheManifest")
 
-  window.location = "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html";
+  win = window.open("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html");
+}
+
+function onDone() // called by the open window after stuff is finished
+{
+dump(">>>>>>>>>>>>>> ON-DONE\n");
+  win.close();
+  OfflineTest.teardown();
+  OfflineTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
diff --git a/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html b/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html
index 47b65833c7f..c5ead68c778 100644
--- a/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html
+++ b/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html
@@ -46,7 +46,6 @@ if (OfflineTest.setup()) {
           aUpdate.removeObserver(this);
           errorReceived = true;
           OfflineTest.ok(true, "Expected error. Update canceled");
-          finish();
         break;
         case Ci.nsIOfflineCacheUpdateObserver.STATE_FINISHED:
           OfflineTest.ok(errorReceived,
diff --git a/dom/tests/mochitest/ajax/offline/test_updatingManifest.html b/dom/tests/mochitest/ajax/offline/test_updatingManifest.html
index c2a21c5b835..42fc23db0f2 100644
--- a/dom/tests/mochitest/ajax/offline/test_updatingManifest.html
+++ b/dom/tests/mochitest/ajax/offline/test_updatingManifest.html
@@ -38,7 +38,7 @@ function waitForLocations(frames, doneFunc)
   if (frame)
     // toString() might cause problems when this test will
     // completely be changed to test IDN behavior.
-    OfflineTest.waitForAdd(frame.location.toString(), function()
+    OfflineTest.waitForAdd(frame, function()
       {
         waitForLocations(frames, doneFunc);
       }
@@ -94,7 +94,7 @@ function frameLoad(version)
   {
     var call = gCallOnUpdatingFrameLoad;
     gCallOnUpdatingFrameLoad = null;
-    OfflineTest.priv(call)();
+    SimpleTest.executeSoon(OfflineTest.priv(call));
   }
 }
 
@@ -112,12 +112,15 @@ function manifestCached()
   OfflineTest.is(gStep, 0, "Got manifestCached in step 0, gStep=" + gStep);
 
   reloadLocations([fallbackFrame1, fallbackFrame2]);
-  waitForLocations([fallbackFrame1, fallbackFrame2],
-      fallbackLoaded);
+  waitForLocations(
+    ["http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/fallback.html"],
+    fallbackLoaded
+  );
 }
 
 function fallbackLoaded()
 {
+  dump("in fallbackLoaded\n");
   applicationCache.mozAdd("http://mochi.test:8888/tests/SimpleTest/EventUtils.js");
   OfflineTest.waitForAdd("http://mochi.test:8888/tests/SimpleTest/EventUtils.js",
       dynamicLoaded);
@@ -126,7 +129,7 @@ function fallbackLoaded()
 function dynamicLoaded()
 {
   window.open("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/updatingImplicit.html");
-  // window.onload invokes implicitLoaded()
+  // window.applicationCache.noupdate invokes implicitLoaded()
 }
 
 function implicitLoaded(aWindow, errorOccured)
@@ -237,8 +240,8 @@ function manifestUpdated()
         OfflineTest.setSJSState("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/updatingIframe.sjs", "second");
 
         gGotFrameVersion = 0;
-        gCallOnUpdatingFrameLoad = function() {applicationCache.update();};
         updatingFrame.location.reload();
+        // Since the frame is offline-cached, reload of it invokes update
       });
 
     break;
@@ -298,6 +301,7 @@ function manifestNoUpdate()
   applicationCache.onnoupdate = null;
 
   OfflineTest.ok(gStep == 3, "Got manifestNoUpdate in step 3, gStep=" + gStep);
+  ++gStep;
 
   OfflineTest.is(applicationCache.status, SpecialPowers.Ci.nsIDOMOfflineResourceList.UPDATEREADY,
         "we have associated application cache and update is pending (4)");
diff --git a/mobile/android/base/tests/testDoorHanger.java.in b/mobile/android/base/tests/testDoorHanger.java.in
index b4668ffbc9f..c1ac235a7a7 100644
--- a/mobile/android/base/tests/testDoorHanger.java.in
+++ b/mobile/android/base/tests/testDoorHanger.java.in
@@ -1,6 +1,16 @@
 #filter substitution
 package @ANDROID_PACKAGE_NAME@.tests;
 
+import @ANDROID_PACKAGE_NAME@.*;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import java.lang.reflect.Method;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /* This test will test if doorhangers are displayed and dismissed
    The test will test:
    * geolocation doorhangers - sharing and not sharing the location dismisses the doorhanger
@@ -65,6 +75,45 @@ public class testDoorHanger extends BaseTest {
         // Make sure doorhanger is hidden
         mAsserter.is(mSolo.searchText(GEO_MESSAGE), false, "Geolocation doorhanger notification is hidden when opening a new tab");
 
+
+        boolean offlineAllowedByDefault = true;
+        try {
+            // Save offline-allow-by-default preferences first
+            JSONArray getPrefData = new JSONArray();
+            getPrefData.put("offline-apps.allow_by_default");
+            JSONObject message = new JSONObject();
+            message.put("requestId", "testDoorHanger");
+            message.put("preferences", getPrefData);
+
+            Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
+            mActions.sendGeckoEvent("Preferences:Get", message.toString());
+
+            JSONObject data = null;
+            String requestId = "";
+
+            // Wait until we get the correct "Preferences:Data" event
+            while (!requestId.equals("testDoorHanger")) {
+                data = new JSONObject(eventExpecter.blockForEventData());
+                requestId = data.getString("requestId");
+            }
+            eventExpecter.unregisterListener();
+
+            JSONArray preferences = data.getJSONArray("preferences");
+            if (preferences.length() > 0) {
+                JSONObject pref = (JSONObject) preferences.get(0);
+                offlineAllowedByDefault = pref.getBoolean("value");
+            }
+
+            // Turn off offline-allow-by-default
+            JSONObject jsonPref = new JSONObject();
+            jsonPref.put("name", "offline-apps.allow_by_default");
+            jsonPref.put("type", "bool");
+            jsonPref.put("value", false);
+            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
+        } catch (JSONException e) {
+            mAsserter.ok(false, "exception getting preference", e.toString());
+        }
+
         // Load offline storage page
         loadUrl(OFFLINE_STORAGE_URL);
         waitForText(OFFLINE_MESSAGE);
@@ -84,6 +133,18 @@ public class testDoorHanger extends BaseTest {
         loadUrl(OFFLINE_STORAGE_URL);
         mAsserter.is(mSolo.searchText(OFFLINE_MESSAGE), false, "Offline storage doorhanger is no longer triggered");
 
+        try {
+            // Revert offline setting
+            JSONObject jsonPref = new JSONObject();
+            jsonPref.put("name", "offline-apps.allow_by_default");
+            jsonPref.put("type", "boolean");
+            jsonPref.put("value", offlineAllowedByDefault);
+            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
+        } catch (JSONException e) {
+            mAsserter.ok(false, "exception setting preference", e.toString());
+        }
+
+
         // Load login page
         loadUrl(LOGIN_URL);
         waitForText(LOGIN_MESSAGE);
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index bed68772348..5435234bcea 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -61,6 +61,8 @@ pref("browser.cache.disk_cache_ssl",        true);
 pref("browser.cache.check_doc_frequency",   3);
 
 pref("browser.cache.offline.enable",           true);
+// enable offline apps by default, disable prompt
+pref("offline-apps.allow_by_default",          true);
 
 // offline cache capacity in kilobytes
 pref("browser.cache.offline.capacity",         512000);
diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
index 7139b0c505b..d742e738cb8 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
+++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
@@ -686,22 +686,14 @@ OfflineAppPermForURI(nsIURI *aURI,
     const char *permName = pinned ? "pin-app" : "offline-app";
     permissionManager->TestExactPermission(innerURI, permName, &perm);
 
-    if (perm == nsIPermissionManager::UNKNOWN_ACTION && !pinned) {
-        static const char kPrefName[] = "offline-apps.allow_by_default";
-        if (aPrefBranch) {
-            aPrefBranch->GetBoolPref(kPrefName, aAllowed);
-        } else {
-            *aAllowed = Preferences::GetBool(kPrefName, false);
-        }
-
-        return NS_OK;
-    }
-
     if (perm == nsIPermissionManager::ALLOW_ACTION ||
         perm == nsIOfflineCacheUpdateService::ALLOW_NO_WARN) {
         *aAllowed = true;
     }
 
+    // offline-apps.allow_by_default is now effective at the cache selection
+    // algorithm code (nsContentSink).
+
     return NS_OK;
 }
 

From 9e2553429f6bbcf973a66b4be2806725c58dd4ac Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Wed, 14 Aug 2013 11:32:44 -0400
Subject: [PATCH 31/98] Bug 899233 - Notify InputMethodManager of selection
 when not in extracted mode; r=cpeterson

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

diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java
index f36a6c9877e..333059b4120 100644
--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -422,6 +422,13 @@ class GeckoInputConnection
     public void onTextChange(String text, int start, int oldEnd, int newEnd) {
 
         if (mUpdateRequest == null) {
+            // Android always expects selection updates when not in extracted mode;
+            // in extracted mode, the selection is reported through updateExtractedText
+            final Editable editable = getEditable();
+            if (editable != null) {
+                onSelectionChange(Selection.getSelectionStart(editable),
+                                  Selection.getSelectionEnd(editable));
+            }
             return;
         }
 

From a38d83ce462727804d94963ff3ecca9df3897da3 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Wed, 14 Aug 2013 11:32:44 -0400
Subject: [PATCH 32/98] Bug 899233 - Don't restart IME when changing selection;
 r=cpeterson

---
 mobile/android/base/GeckoEditable.java        | 1 +
 mobile/android/base/GeckoInputConnection.java | 4 ++++
 widget/android/AndroidBridge.h                | 1 +
 widget/android/nsWindow.cpp                   | 6 ++++++
 4 files changed, 12 insertions(+)

diff --git a/mobile/android/base/GeckoEditable.java b/mobile/android/base/GeckoEditable.java
index f916ef77ee4..41962694aff 100644
--- a/mobile/android/base/GeckoEditable.java
+++ b/mobile/android/base/GeckoEditable.java
@@ -48,6 +48,7 @@ interface GeckoEditableClient {
    and also for the IC thread to listen to the Editable */
 interface GeckoEditableListener {
     // IME notification type for notifyIME(), corresponding to NotificationToIME enum in Gecko
+    final int NOTIFY_IME_OPEN_VKB = -2;
     final int NOTIFY_IME_REPLY_EVENT = -1;
     final int NOTIFY_IME_OF_FOCUS = 1;
     final int NOTIFY_IME_OF_BLUR = 2;
diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java
index 333059b4120..cc4d2c82242 100644
--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -905,6 +905,10 @@ class GeckoInputConnection
                 resetInputConnection();
                 break;
 
+            case NOTIFY_IME_OPEN_VKB:
+                showSoftInput();
+                break;
+
             default:
                 if (DEBUG) {
                     throw new IllegalArgumentException("Unexpected NOTIFY_IME=" + type);
diff --git a/widget/android/AndroidBridge.h b/widget/android/AndroidBridge.h
index 7db5ac58664..311ecf8ce61 100644
--- a/widget/android/AndroidBridge.h
+++ b/widget/android/AndroidBridge.h
@@ -126,6 +126,7 @@ public:
     enum {
         // Values for NotifyIME, in addition to values from the Gecko
         // NotificationToIME enum; use negative values here to prevent conflict
+        NOTIFY_IME_OPEN_VKB = -2,
         NOTIFY_IME_REPLY_EVENT = -1,
     };
 
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 5d22dcaedeb..8fb77d115aa 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -2198,6 +2198,12 @@ nsWindow::SetInputContext(const InputContext& aContext,
 
     mInputContext.mIMEState.mEnabled = enabled;
 
+    if (enabled == IMEState::ENABLED && aAction.UserMightRequestOpenVKB()) {
+        // Don't reset keyboard when we should simply open the vkb
+        AndroidBridge::NotifyIME(AndroidBridge::NOTIFY_IME_OPEN_VKB);
+        return;
+    }
+
     if (mIMEUpdatingContext) {
         return;
     }

From 9f99cee9a1806ebb8df2e6c6e525371b2a7d00d3 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 14 Aug 2013 08:40:25 -0700
Subject: [PATCH 33/98] Bug 850380 - Derecursify and optimize XPIDL processing
 and move into precompile tier; r=glandium

---
 browser/components/places/moz.build           |   4 -
 browser/components/places/src/moz.build       |   4 -
 config/config.mk                              |   9 +-
 config/makefiles/precompile/Makefile.in       |  12 +-
 config/makefiles/xpidl/Makefile.in            |  67 +++++++++++
 config/rules.mk                               | 104 +++---------------
 dom/activities/interfaces/moz.build           |   6 -
 dom/alarm/moz.build                           |   4 -
 dom/base/moz.build                            |   5 -
 dom/camera/moz.build                          |   7 --
 dom/cellbroadcast/interfaces/moz.build        |   6 -
 dom/file/moz.build                            |   6 -
 dom/fm/moz.build                              |   4 -
 dom/icc/interfaces/moz.build                  |   6 -
 dom/indexedDB/moz.build                       |   5 -
 dom/interfaces/apps/moz.build                 |   5 -
 dom/interfaces/base/moz.build                 |   4 -
 dom/interfaces/contacts/moz.build             |   5 -
 dom/interfaces/core/moz.build                 |   4 -
 dom/interfaces/css/moz.build                  |   5 -
 dom/interfaces/devicestorage/moz.build        |   5 -
 dom/interfaces/events/moz.build               |   4 -
 dom/interfaces/geolocation/moz.build          |   4 -
 dom/interfaces/html/moz.build                 |   5 -
 dom/interfaces/json/moz.build                 |   4 -
 dom/interfaces/notification/moz.build         |   4 -
 dom/interfaces/offline/moz.build              |   4 -
 dom/interfaces/permission/moz.build           |   4 -
 dom/interfaces/range/moz.build                |   4 -
 dom/interfaces/settings/moz.build             |   5 -
 dom/interfaces/smil/moz.build                 |   7 --
 dom/interfaces/storage/moz.build              |   5 -
 dom/interfaces/stylesheets/moz.build          |   4 -
 dom/interfaces/svg/moz.build                  |   6 -
 dom/interfaces/traversal/moz.build            |   4 -
 dom/interfaces/xbl/moz.build                  |   4 -
 dom/interfaces/xpath/moz.build                |   5 -
 dom/interfaces/xul/moz.build                  |   6 -
 dom/messages/interfaces/moz.build             |   4 -
 dom/mobilemessage/interfaces/moz.build        |   6 -
 dom/network/interfaces/moz.build              |   6 -
 dom/payment/interfaces/moz.build              |   4 -
 dom/system/gonk/moz.build                     |   4 -
 dom/telephony/moz.build                       |   6 -
 dom/voicemail/moz.build                       |   6 -
 dom/wifi/moz.build                            |   7 --
 hal/moz.build                                 |   2 +-
 js/src/config/config.mk                       |   9 +-
 js/src/config/rules.mk                        | 104 +++---------------
 js/xpconnect/tests/idl/Makefile.in            |   2 +-
 netwerk/mime/moz.build                        |   4 -
 netwerk/protocol/file/moz.build               |   4 -
 netwerk/protocol/http/moz.build               |   4 -
 netwerk/protocol/res/moz.build                |   4 -
 netwerk/protocol/viewsource/moz.build         |   4 -
 netwerk/protocol/wyciwyg/moz.build            |   4 -
 netwerk/streamconv/public/moz.build           |   4 -
 .../mozbuild/mozbuild/action/xpidl-process.py |  92 ++++++++++++++++
 python/mozbuild/mozbuild/backend/common.py    |  58 ++++++++++
 .../mozbuild/backend/configenvironment.py     |   4 +-
 .../mozbuild/backend/recursivemake.py         |  76 ++++++++++++-
 python/mozbuild/mozbuild/frontend/data.py     |  18 +++
 python/mozbuild/mozbuild/frontend/emitter.py  |  41 ++++++-
 .../mozbuild/frontend/sandbox_symbols.py      |  14 +--
 .../mozbuild/mozbuild/test/backend/common.py  |   9 +-
 .../backend/data/variable_passthru/moz.build  |   4 +-
 .../xpidl/config/makefiles/xpidl/Makefile.in  |   0
 .../test/backend/data/xpidl/moz.build         |   6 +
 .../test/backend/test_recursivemake.py        |  41 ++++---
 .../frontend/data/variable-passthru/moz.build |   4 +-
 .../mozbuild/test/frontend/test_emitter.py    |   6 +-
 toolkit/crashreporter/test/Makefile.in        |   1 -
 xpcom/idl-parser/Makefile.in                  |  14 ++-
 73 files changed, 447 insertions(+), 485 deletions(-)
 create mode 100644 config/makefiles/xpidl/Makefile.in
 create mode 100755 python/mozbuild/mozbuild/action/xpidl-process.py
 create mode 100644 python/mozbuild/mozbuild/backend/common.py
 create mode 100644 python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in
 create mode 100644 python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build

diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build
index 003d9ed15d7..3ff7a9666b7 100644
--- a/browser/components/places/moz.build
+++ b/browser/components/places/moz.build
@@ -7,7 +7,3 @@
 DIRS += ['src']
 TEST_DIRS += ['tests']
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/browser/components/',
-]
-
diff --git a/browser/components/places/src/moz.build b/browser/components/places/src/moz.build
index 1648374d569..58c9712f49b 100644
--- a/browser/components/places/src/moz.build
+++ b/browser/components/places/src/moz.build
@@ -4,10 +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/.
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/browser/components',
-]
-
 EXTRA_COMPONENTS += [
     'BrowserPlaces.manifest',
     'PlacesProtocolHandler.js',
diff --git a/config/config.mk b/config/config.mk
index 79c3ba66e01..90bcc2a65e7 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -365,7 +365,6 @@ MY_RULES	:= $(DEPTH)/config/myrules.mk
 # Default command macros; can be overridden in <arch>.mk.
 #
 CCC = $(CXX)
-XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
@@ -522,12 +521,8 @@ endif
 endif
 
 # Default location of include files
-IDL_DIR		= $(DIST)/idl
-
-XPIDL_FLAGS += -I$(srcdir) -I$(IDL_DIR)
-ifdef LIBXUL_SDK
-XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
-endif
+IDL_PARSER_DIR = $(topsrcdir)/xpcom/idl-parser
+IDL_PARSER_CACHE_DIR = $(DEPTH)/xpcom/idl-parser
 
 SDK_LIB_DIR = $(DIST)/sdk/lib
 SDK_BIN_DIR = $(DIST)/sdk/bin
diff --git a/config/makefiles/precompile/Makefile.in b/config/makefiles/precompile/Makefile.in
index 09355d72d2b..ecfd77095db 100644
--- a/config/makefiles/precompile/Makefile.in
+++ b/config/makefiles/precompile/Makefile.in
@@ -15,17 +15,19 @@ SUPPRESS_DEFAULT_RULES := 1
 
 include $(topsrcdir)/config/rules.mk
 
+# We don't print the build status messages unless we're in a top level build
+# otherwise the output is unexpected and it confuses downstream parsers.
 define make_subtier_dir
 @echo "BUILDSTATUS SUBTIER_START precompile $(1)"
-$(MAKE) -C $(2) $(3)
++$(MAKE) -C $(2) $(3)
 @echo "BUILDSTATUS SUBTIER_FINISH precompile $(1)"
 
 endef
 
 export::
-	@echo "BUILDSTATUS SUBTIERS IPDL WebIDL"
+	@echo "BUILDSTATUS SUBTIERS IPDL WebIDL XPIDL"
 
-export:: ipdl webidl xpidl-parser
+export:: ipdl webidl xpidl-parser xpidl
 
 ipdl:
 	$(call make_subtier_dir,IPDL,$(DEPTH)/ipc/ipdl,ipdl)
@@ -35,3 +37,7 @@ webidl:
 
 xpidl-parser:
 	$(call make_subtier_dir,XPIDLParser,$(DEPTH)/xpcom/idl-parser,xpidl-parser)
+
+xpidl: xpidl-parser
+	$(call py_action,process_install_manifest,$(DIST)/idl $(DEPTH)/_build_manifests/install/dist_idl)
+	$(call make_subtier_dir,XPIDL,$(DEPTH)/config/makefiles/xpidl,xpidl)
diff --git a/config/makefiles/xpidl/Makefile.in b/config/makefiles/xpidl/Makefile.in
new file mode 100644
index 00000000000..d05445c4d2c
--- /dev/null
+++ b/config/makefiles/xpidl/Makefile.in
@@ -0,0 +1,67 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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
+
+SUPPRESS_DEFAULT_RULES := 1
+STANDALONE_MAKEFILE := 1
+
+include $(topsrcdir)/config/rules.mk
+
+# Building XPIDLs effectively consists of two steps:
+#
+#   1) Staging all .idl files to a common directory.
+#   2) Doing everything with the .idl files.
+#
+# Each .idl file is processed into a .h file and typelib information.
+# The .h file shares the same stem as the input file and is installed
+# in the common headers include directory.
+#
+# XPIDL files are logically grouped together by modules. The typelib
+# information for all XPIDLs in the same module is linked together into
+# an .xpt file having the name of the module.
+#
+# As an optimization to reduce overall CPU usage, we process all .idl
+# belonging to a module with a single command invocation. This prevents
+# redundant parsing of .idl files and significantly reduces CPU cycles.
+
+# For dependency files.
+idl_deps_dir := .deps
+
+# Where we put our final, linked .xpt files.
+idl_xpt_dir := xpt
+
+dist_idl_dir := $(DIST)/idl
+dist_include_dir := $(DIST)/include
+process_py := $(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py
+
+# TODO we should use py_action, but that would require extra directories to be
+# in the virtualenv.
+idlprocess := $(PYTHON_PATH) $(PLY_INCLUDE) -I$(IDL_PARSER_DIR) -I$(IDL_PARSER_CACHE_DIR) \
+    $(process_py) --cache-dir $(IDL_PARSER_CACHE_DIR) $(dist_idl_dir) \
+        $(dist_include_dir) $(idl_xpt_dir) $(idl_deps_dir)
+
+xpidl_modules := @xpidl_modules@
+
+@xpidl_rules@
+
+linked_xpt_files := $(addprefix $(idl_xpt_dir)/,$(addsuffix .xpt,$(xpidl_modules)))
+depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp)
+
+xpidl:: $(linked_xpt_files)
+
+$(linked_xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(idl_xpt_dir))
+
+ifdef .PYMAKE
+-includedeps $(depends_files)
+else
+-include $(depends_files)
+endif
+
+.PHONY: xpidl
diff --git a/config/rules.mk b/config/rules.mk
index 86b9c71d49f..eb62a762201 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -33,6 +33,10 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   XPIDL_MODULE \
   $(NULL)
 
+_DEPRECATED_VARIABLES := \
+  XPIDL_FLAGS \
+  $(NULL)
+
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
 # Using $(firstword) may not be perfect. But it should be good enough for most
 # scenarios.
@@ -42,6 +46,10 @@ $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES),$(if $($(var)),\
     $(error Variable $(var) is defined in $(_current_makefile). It should only be defined in moz.build files),\
     ))
 
+$(foreach var,$(_DEPRECATED_VARIABLES),$(if $($(var)),\
+    $(error Variable $(var) is defined in $(_current_makefile). This variable has been deprecated. It does nothing. It must be removed in order to build)\
+    ))
+
 ifneq (,$(XPIDLSRCS)$(SDK_XPIDLSRCS))
     $(error XPIDLSRCS and SDK_XPIDLSRCS have been merged and moved to moz.build files as the XPIDL_SOURCES variable. You must move these variables out of $(_current_makefile))
 endif
@@ -417,8 +425,6 @@ ifeq ($(SOLARIS_SUNPRO_CXX),1)
 GARBAGE_DIRS += SunWS_cache
 endif
 
-XPIDL_GEN_DIR		= _xpidlgen
-
 ifdef MOZ_UPDATE_XTERM
 # Its good not to have a newline at the end of the titlebar string because it
 # makes the make -s output easier to read.  Echo -n does not work on all
@@ -1388,98 +1394,23 @@ endif
 endif
 
 ################################################################################
-# Export the elements of $(XPIDLSRCS)
-# generating .h and .xpt files and moving them to the appropriate places.
-
-ifneq ($(XPIDLSRCS),) #{
-
-export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-
-ifndef XPIDL_MODULE
-XPIDL_MODULE		= $(MODULE)
-endif
-
-ifeq ($(XPIDL_MODULE),) # we need $(XPIDL_MODULE) to make $(XPIDL_MODULE).xpt
-export:: FORCE
-	@echo
-	@echo "*** Error processing XPIDLSRCS:"
-	@echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS,"
-	@echo "so we have a module name to use when creating MODULE.xpt."
-	@echo; sleep 2; false
-endif
-
-# generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
-# warn against overriding existing .h file.
-
-XPIDL_DEPS = \
-  $(LIBXUL_DIST)/sdk/bin/header.py \
-  $(LIBXUL_DIST)/sdk/bin/typelib.py \
-  $(LIBXUL_DIST)/sdk/bin/xpidl.py \
-  $(NULL)
-
-xpidl-preqs = \
-  $(call mkdir_deps,$(XPIDL_GEN_DIR)) \
-  $(call mkdir_deps,$(MDDEPDIR)) \
-  $(NULL)
-
-$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
-	$(REPORT_BUILD)
-	$(PYTHON_PATH) \
-	  $(PLY_INCLUDE) \
-	  $(LIBXUL_DIST)/sdk/bin/header.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
-	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
-# into $(XPIDL_MODULE).xpt and export it to $(FINAL_TARGET)/components.
-$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
-	$(REPORT_BUILD)
-	$(PYTHON_PATH) \
-	  $(PLY_INCLUDE) \
-	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-	  $(LIBXUL_DIST)/sdk/bin/typelib.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
-# no need to link together if XPIDLSRCS contains only XPIDL_MODULE
-ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
-XPT_PY = $(filter %/xpt.py,$(XPIDL_LINK))
-
-xpidl-idl2xpt = $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
-xpidl-module-deps = $(xpidl-idl2xpt) $(GLOBAL_DEPS) $(XPT_PY)
-
-$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(xpidl-module-deps)
-	$(XPIDL_LINK) $@ $(xpidl-idl2xpt)
-
-$(XPT_PY):
-	$(MAKE) -C $(DEPTH)/xpcom/typelib/xpt/tools libs
-
-endif # XPIDL_MODULE.xpt != XPIDLSRCS
+# Install a linked .xpt into the appropriate place.
+# This should ideally be performed by the non-recursive idl make file. Some day.
+ifdef XPT_NAME #{
 
 ifndef NO_DIST_INSTALL
-XPIDL_MODULE_FILES := $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
-XPIDL_MODULE_DEST := $(FINAL_TARGET)/components
-INSTALL_TARGETS += XPIDL_MODULE
+_XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
+_XPT_NAME_DEST := $(FINAL_TARGET)/components
+INSTALL_TARGETS += _XPT_NAME
 
 ifndef NO_INTERFACES_MANIFEST
 libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
-	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPT_NAME)"
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest"
 endif
 endif
 
-GARBAGE_DIRS		+= $(XPIDL_GEN_DIR)
-
-ifndef NO_DIST_INSTALL
-XPIDL_HEADERS_FILES := $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-XPIDL_HEADERS_DEST := $(DIST)/include
-XPIDL_HEADERS_TARGET := export
-INSTALL_TARGETS += XPIDL_HEADERS
-
-XPIDLSRCS_FILES := $(XPIDLSRCS)
-XPIDLSRCS_DEST := $(IDL_DIR)
-XPIDLSRCS_TARGET := export
-INSTALL_TARGETS += XPIDLSRCS
-endif
-endif #} XPIDLSRCS
+endif #} XPT_NAME
 
 ################################################################################
 # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
@@ -1691,7 +1622,7 @@ endif
 #   it.
 
 ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
+MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 ifdef .PYMAKE
@@ -1884,7 +1815,6 @@ FREEZE_VARIABLES = \
   CSRCS \
   CPPSRCS \
   EXPORTS \
-  XPIDLSRCS \
   DIRS \
   LIBRARY \
   MODULE \
diff --git a/dom/activities/interfaces/moz.build b/dom/activities/interfaces/moz.build
index e60db2345f0..a35e3a0b146 100644
--- a/dom/activities/interfaces/moz.build
+++ b/dom/activities/interfaces/moz.build
@@ -15,9 +15,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_activities'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build
index 19aa7ad6236..d851490f445 100644
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -13,10 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_alarm'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom.alarm += [
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 05e00740c82..12d09900da0 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -14,11 +14,6 @@ XPIDL_SOURCES += [
     'nsISiteSpecificUserAgent.idl',
 ]
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/camera/moz.build b/dom/camera/moz.build
index 654b8ec5a5c..92d1b845203 100644
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -10,13 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_camera'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-    '-I$(topsrcdir)/dom/media',
-]
-
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/cellbroadcast/interfaces/moz.build b/dom/cellbroadcast/interfaces/moz.build
index 7fe77a410bf..c5d422b0869 100644
--- a/dom/cellbroadcast/interfaces/moz.build
+++ b/dom/cellbroadcast/interfaces/moz.build
@@ -13,9 +13,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_cellbroadcast'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/file/moz.build b/dom/file/moz.build
index 2a38d905071..1f96114fee2 100644
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -13,12 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_file'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/fm/moz.build b/dom/fm/moz.build
index 126a123058d..10de07f9890 100644
--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@@ -11,10 +11,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_fm'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 CPP_SOURCES += [
diff --git a/dom/icc/interfaces/moz.build b/dom/icc/interfaces/moz.build
index b051de4f3e7..ad615b6b935 100644
--- a/dom/icc/interfaces/moz.build
+++ b/dom/icc/interfaces/moz.build
@@ -13,9 +13,3 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'dom_icc'
-
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build
index 7ed4918afd3..679b08068d6 100644
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -14,11 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_indexeddb'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom.indexedDB += [
diff --git a/dom/interfaces/apps/moz.build b/dom/interfaces/apps/moz.build
index 0c327f04341..3d69090e73b 100644
--- a/dom/interfaces/apps/moz.build
+++ b/dom/interfaces/apps/moz.build
@@ -15,10 +15,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_apps'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/base/moz.build b/dom/interfaces/base/moz.build
index f168c5e3217..d7fbec8bc07 100644
--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@@ -59,9 +59,5 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 XPIDL_MODULE = 'dom_base'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/contacts/moz.build b/dom/interfaces/contacts/moz.build
index a2187db7b66..d7fc401f3fe 100644
--- a/dom/interfaces/contacts/moz.build
+++ b/dom/interfaces/contacts/moz.build
@@ -12,10 +12,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_contacts'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/core/moz.build b/dom/interfaces/core/moz.build
index 1827f37716b..7e79afee574 100644
--- a/dom/interfaces/core/moz.build
+++ b/dom/interfaces/core/moz.build
@@ -29,9 +29,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_core'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/css/moz.build b/dom/interfaces/css/moz.build
index 8a295ecdbbd..8fc352b6043 100644
--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@@ -33,10 +33,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_css'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/stylesheets',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/devicestorage/moz.build b/dom/interfaces/devicestorage/moz.build
index e46e202c636..e5e1fdf120f 100644
--- a/dom/interfaces/devicestorage/moz.build
+++ b/dom/interfaces/devicestorage/moz.build
@@ -11,10 +11,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_devicestorage'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/events/moz.build b/dom/interfaces/events/moz.build
index 72da456eb09..911aea314e2 100644
--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@@ -59,9 +59,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_events'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/geolocation/moz.build b/dom/interfaces/geolocation/moz.build
index 8ccf8f3c15d..bd5aef1f702 100644
--- a/dom/interfaces/geolocation/moz.build
+++ b/dom/interfaces/geolocation/moz.build
@@ -15,9 +15,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_geolocation'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/html/moz.build b/dom/interfaces/html/moz.build
index d7655022d30..690b352e9d8 100644
--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@@ -68,10 +68,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_html'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/json/moz.build b/dom/interfaces/json/moz.build
index 14c14336832..cbd82e5dbbd 100644
--- a/dom/interfaces/json/moz.build
+++ b/dom/interfaces/json/moz.build
@@ -10,9 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_json'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/notification/moz.build b/dom/interfaces/notification/moz.build
index 146044bbdae..1a5ba859957 100644
--- a/dom/interfaces/notification/moz.build
+++ b/dom/interfaces/notification/moz.build
@@ -10,9 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_notification'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/offline/moz.build b/dom/interfaces/offline/moz.build
index fd432b0830c..047461e04e2 100644
--- a/dom/interfaces/offline/moz.build
+++ b/dom/interfaces/offline/moz.build
@@ -11,9 +11,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_offline'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/permission/moz.build b/dom/interfaces/permission/moz.build
index 3aa60267341..500cd8d66c4 100644
--- a/dom/interfaces/permission/moz.build
+++ b/dom/interfaces/permission/moz.build
@@ -11,9 +11,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_permissionsettings'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/range/moz.build b/dom/interfaces/range/moz.build
index e2045e69a49..067455ea830 100644
--- a/dom/interfaces/range/moz.build
+++ b/dom/interfaces/range/moz.build
@@ -10,9 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_range'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/settings/moz.build b/dom/interfaces/settings/moz.build
index 86cb302c99a..e901974686a 100644
--- a/dom/interfaces/settings/moz.build
+++ b/dom/interfaces/settings/moz.build
@@ -11,10 +11,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_settings'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/smil/moz.build b/dom/interfaces/smil/moz.build
index 4ecf6f90a8a..ee14741da91 100644
--- a/dom/interfaces/smil/moz.build
+++ b/dom/interfaces/smil/moz.build
@@ -10,12 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_smil'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-    '-I$(topsrcdir)/dom/interfaces/events',
-    '-I$(topsrcdir)/dom/interfaces/svg',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/storage/moz.build b/dom/interfaces/storage/moz.build
index d592ba16862..7ccf5260ea4 100644
--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@@ -14,11 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_storage'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/interfaces/stylesheets/moz.build b/dom/interfaces/stylesheets/moz.build
index 73974e31cf8..45a4aa3dd61 100644
--- a/dom/interfaces/stylesheets/moz.build
+++ b/dom/interfaces/stylesheets/moz.build
@@ -12,9 +12,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_stylesheets'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/svg/moz.build b/dom/interfaces/svg/moz.build
index 1b789a84cff..529082121a2 100644
--- a/dom/interfaces/svg/moz.build
+++ b/dom/interfaces/svg/moz.build
@@ -12,11 +12,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_svg'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/traversal/moz.build b/dom/interfaces/traversal/moz.build
index 038a359cd0c..3b19b9e3bbd 100644
--- a/dom/interfaces/traversal/moz.build
+++ b/dom/interfaces/traversal/moz.build
@@ -12,9 +12,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_traversal'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xbl/moz.build b/dom/interfaces/xbl/moz.build
index d0f14a8a8d8..6330f7f4bbf 100644
--- a/dom/interfaces/xbl/moz.build
+++ b/dom/interfaces/xbl/moz.build
@@ -10,9 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xbl'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xpath/moz.build b/dom/interfaces/xpath/moz.build
index f532abbbb3d..aaeb0011f05 100644
--- a/dom/interfaces/xpath/moz.build
+++ b/dom/interfaces/xpath/moz.build
@@ -15,10 +15,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xpath'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xul/moz.build b/dom/interfaces/xul/moz.build
index 5f229f30cc5..7f8403fd82e 100644
--- a/dom/interfaces/xul/moz.build
+++ b/dom/interfaces/xul/moz.build
@@ -29,11 +29,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xul'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/messages/interfaces/moz.build b/dom/messages/interfaces/moz.build
index 9d6c27fbb6c..ac40c9bd385 100644
--- a/dom/messages/interfaces/moz.build
+++ b/dom/messages/interfaces/moz.build
@@ -11,7 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_messages'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
diff --git a/dom/mobilemessage/interfaces/moz.build b/dom/mobilemessage/interfaces/moz.build
index 2e7e55c3829..52cc79b9288 100644
--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -29,9 +29,3 @@ if CONFIG['MOZ_B2G_RIL']:
 
 XPIDL_MODULE = 'dom_mobilemessage'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/network/interfaces/moz.build b/dom/network/interfaces/moz.build
index e68fd8675ed..77080c2656c 100644
--- a/dom/network/interfaces/moz.build
+++ b/dom/network/interfaces/moz.build
@@ -27,9 +27,3 @@ if CONFIG['MOZ_B2G_RIL']:
     ]
 
 XPIDL_MODULE = 'dom_network'
-
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/payment/interfaces/moz.build b/dom/payment/interfaces/moz.build
index 078542e1404..4f5f06310df 100644
--- a/dom/payment/interfaces/moz.build
+++ b/dom/payment/interfaces/moz.build
@@ -13,7 +13,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_payment'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build
index 0de1dab38f0..8b2558aa6f5 100644
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -29,10 +29,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_system_gonk'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/network/interfaces',
-]
-
 MODULE = 'dom'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build
index 8a06b1bbcc2..5cc738c0376 100644
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -10,12 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_telephony'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 CPP_SOURCES += [
diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build
index ba04d52293e..5d7511145f1 100644
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -13,12 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_voicemail'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom += [
diff --git a/dom/wifi/moz.build b/dom/wifi/moz.build
index cd324f43879..9a112308424 100644
--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -12,13 +12,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_wifi'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-    '-I$(topsrcdir)/dom/system/gonk',
-]
-
 MODULE = 'dom'
 
 EXTRA_COMPONENTS += [
diff --git a/hal/moz.build b/hal/moz.build
index 055f38b228a..f8aaf814534 100644
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
-    'nsIRecoveryService.idl',
+    'gonk/nsIRecoveryService.idl',
 ]
 
 MODULE = 'hal'
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 79c3ba66e01..90bcc2a65e7 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -365,7 +365,6 @@ MY_RULES	:= $(DEPTH)/config/myrules.mk
 # Default command macros; can be overridden in <arch>.mk.
 #
 CCC = $(CXX)
-XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
@@ -522,12 +521,8 @@ endif
 endif
 
 # Default location of include files
-IDL_DIR		= $(DIST)/idl
-
-XPIDL_FLAGS += -I$(srcdir) -I$(IDL_DIR)
-ifdef LIBXUL_SDK
-XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
-endif
+IDL_PARSER_DIR = $(topsrcdir)/xpcom/idl-parser
+IDL_PARSER_CACHE_DIR = $(DEPTH)/xpcom/idl-parser
 
 SDK_LIB_DIR = $(DIST)/sdk/lib
 SDK_BIN_DIR = $(DIST)/sdk/bin
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 86b9c71d49f..eb62a762201 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -33,6 +33,10 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   XPIDL_MODULE \
   $(NULL)
 
+_DEPRECATED_VARIABLES := \
+  XPIDL_FLAGS \
+  $(NULL)
+
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
 # Using $(firstword) may not be perfect. But it should be good enough for most
 # scenarios.
@@ -42,6 +46,10 @@ $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES),$(if $($(var)),\
     $(error Variable $(var) is defined in $(_current_makefile). It should only be defined in moz.build files),\
     ))
 
+$(foreach var,$(_DEPRECATED_VARIABLES),$(if $($(var)),\
+    $(error Variable $(var) is defined in $(_current_makefile). This variable has been deprecated. It does nothing. It must be removed in order to build)\
+    ))
+
 ifneq (,$(XPIDLSRCS)$(SDK_XPIDLSRCS))
     $(error XPIDLSRCS and SDK_XPIDLSRCS have been merged and moved to moz.build files as the XPIDL_SOURCES variable. You must move these variables out of $(_current_makefile))
 endif
@@ -417,8 +425,6 @@ ifeq ($(SOLARIS_SUNPRO_CXX),1)
 GARBAGE_DIRS += SunWS_cache
 endif
 
-XPIDL_GEN_DIR		= _xpidlgen
-
 ifdef MOZ_UPDATE_XTERM
 # Its good not to have a newline at the end of the titlebar string because it
 # makes the make -s output easier to read.  Echo -n does not work on all
@@ -1388,98 +1394,23 @@ endif
 endif
 
 ################################################################################
-# Export the elements of $(XPIDLSRCS)
-# generating .h and .xpt files and moving them to the appropriate places.
-
-ifneq ($(XPIDLSRCS),) #{
-
-export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-
-ifndef XPIDL_MODULE
-XPIDL_MODULE		= $(MODULE)
-endif
-
-ifeq ($(XPIDL_MODULE),) # we need $(XPIDL_MODULE) to make $(XPIDL_MODULE).xpt
-export:: FORCE
-	@echo
-	@echo "*** Error processing XPIDLSRCS:"
-	@echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS,"
-	@echo "so we have a module name to use when creating MODULE.xpt."
-	@echo; sleep 2; false
-endif
-
-# generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
-# warn against overriding existing .h file.
-
-XPIDL_DEPS = \
-  $(LIBXUL_DIST)/sdk/bin/header.py \
-  $(LIBXUL_DIST)/sdk/bin/typelib.py \
-  $(LIBXUL_DIST)/sdk/bin/xpidl.py \
-  $(NULL)
-
-xpidl-preqs = \
-  $(call mkdir_deps,$(XPIDL_GEN_DIR)) \
-  $(call mkdir_deps,$(MDDEPDIR)) \
-  $(NULL)
-
-$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
-	$(REPORT_BUILD)
-	$(PYTHON_PATH) \
-	  $(PLY_INCLUDE) \
-	  $(LIBXUL_DIST)/sdk/bin/header.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
-	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
-# into $(XPIDL_MODULE).xpt and export it to $(FINAL_TARGET)/components.
-$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
-	$(REPORT_BUILD)
-	$(PYTHON_PATH) \
-	  $(PLY_INCLUDE) \
-	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-	  $(LIBXUL_DIST)/sdk/bin/typelib.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
-# no need to link together if XPIDLSRCS contains only XPIDL_MODULE
-ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
-XPT_PY = $(filter %/xpt.py,$(XPIDL_LINK))
-
-xpidl-idl2xpt = $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
-xpidl-module-deps = $(xpidl-idl2xpt) $(GLOBAL_DEPS) $(XPT_PY)
-
-$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(xpidl-module-deps)
-	$(XPIDL_LINK) $@ $(xpidl-idl2xpt)
-
-$(XPT_PY):
-	$(MAKE) -C $(DEPTH)/xpcom/typelib/xpt/tools libs
-
-endif # XPIDL_MODULE.xpt != XPIDLSRCS
+# Install a linked .xpt into the appropriate place.
+# This should ideally be performed by the non-recursive idl make file. Some day.
+ifdef XPT_NAME #{
 
 ifndef NO_DIST_INSTALL
-XPIDL_MODULE_FILES := $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
-XPIDL_MODULE_DEST := $(FINAL_TARGET)/components
-INSTALL_TARGETS += XPIDL_MODULE
+_XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
+_XPT_NAME_DEST := $(FINAL_TARGET)/components
+INSTALL_TARGETS += _XPT_NAME
 
 ifndef NO_INTERFACES_MANIFEST
 libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
-	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPT_NAME)"
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest"
 endif
 endif
 
-GARBAGE_DIRS		+= $(XPIDL_GEN_DIR)
-
-ifndef NO_DIST_INSTALL
-XPIDL_HEADERS_FILES := $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-XPIDL_HEADERS_DEST := $(DIST)/include
-XPIDL_HEADERS_TARGET := export
-INSTALL_TARGETS += XPIDL_HEADERS
-
-XPIDLSRCS_FILES := $(XPIDLSRCS)
-XPIDLSRCS_DEST := $(IDL_DIR)
-XPIDLSRCS_TARGET := export
-INSTALL_TARGETS += XPIDLSRCS
-endif
-endif #} XPIDLSRCS
+endif #} XPT_NAME
 
 ################################################################################
 # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
@@ -1691,7 +1622,7 @@ endif
 #   it.
 
 ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
+MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 ifdef .PYMAKE
@@ -1884,7 +1815,6 @@ FREEZE_VARIABLES = \
   CSRCS \
   CPPSRCS \
   EXPORTS \
-  XPIDLSRCS \
   DIRS \
   LIBRARY \
   MODULE \
diff --git a/js/xpconnect/tests/idl/Makefile.in b/js/xpconnect/tests/idl/Makefile.in
index 9b11528dacb..379d862d400 100644
--- a/js/xpconnect/tests/idl/Makefile.in
+++ b/js/xpconnect/tests/idl/Makefile.in
@@ -13,6 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 componentdir = js/xpconnect/tests/components
-libs:: $(XPIDL_GEN_DIR)/$(MODULE).xpt
+libs:: $(DEPTH)/config/makefiles/xpidl/xpt/$(MODULE).xpt
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/native
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/js
diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build
index e7e5788a540..2f241e7f247 100644
--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -10,10 +10,6 @@ XPIDL_SOURCES += [
     'nsIMIMEService.idl',
 ]
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'mimetype'
 
 EXPORTS += [
diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build
index 984c08adaab..e3eb168ec78 100644
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -11,10 +11,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index 919e952dd88..6add00fed3c 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -20,10 +20,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_http'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 EXPORTS += [
diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build
index c8a643f4e62..9cd1568e6f4 100644
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -10,10 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_res'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build
index cfa0536e957..22a818b54f2 100644
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -10,10 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build
index a93b21ee10a..21c2489d5f6 100644
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -10,10 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_wyciwyg'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 EXPORTS.mozilla.net += [
diff --git a/netwerk/streamconv/public/moz.build b/netwerk/streamconv/public/moz.build
index c8192430530..3efb0619f9e 100644
--- a/netwerk/streamconv/public/moz.build
+++ b/netwerk/streamconv/public/moz.build
@@ -20,9 +20,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 
 XPIDL_MODULE = 'necko_strconv'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
diff --git a/python/mozbuild/mozbuild/action/xpidl-process.py b/python/mozbuild/mozbuild/action/xpidl-process.py
new file mode 100755
index 00000000000..c1dbd46c966
--- /dev/null
+++ b/python/mozbuild/mozbuild/action/xpidl-process.py
@@ -0,0 +1,92 @@
+#!/usr/bin/env 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/.
+
+# This script is used to generate an output header and xpt file for
+# input IDL file(s). It's purpose is to directly support the build
+# system. The API will change to meet the needs of the build system.
+
+import argparse
+import os
+import sys
+
+from io import BytesIO
+
+from header import print_header
+from typelib import write_typelib
+from xpidl import IDLParser
+from xpt import xpt_link
+
+from mozbuild.util import FileAvoidWrite
+
+
+def process(input_dir, cache_dir, header_dir, xpt_dir, deps_dir, module, stems):
+    p = IDLParser(outputdir=cache_dir)
+
+    xpts = {}
+    deps = set()
+
+    # Write out dependencies for Python modules we import. If this list isn't
+    # up to date, we will not re-process XPIDL files if the processor changes.
+    for imported in ('header', 'typelib', 'xpidl', 'xpt'):
+        path = sys.modules[imported].__file__
+
+        if path.endswith('.pyc'):
+            path = path[0:-1]
+
+        deps.add(path)
+
+    for stem in stems:
+        path = os.path.join(input_dir, '%s.idl' % stem)
+        idl_data = open(path).read()
+
+        idl = p.parse(idl_data, filename=path)
+        idl.resolve([input_dir], p)
+
+        header_path = os.path.join(header_dir, '%s.h' % stem)
+        deps_path = os.path.join(deps_dir, '%s.pp' % stem)
+
+        xpt = BytesIO()
+        write_typelib(idl, xpt, path)
+        xpt.seek(0)
+        xpts[stem] = xpt
+
+        deps |= set(dep.replace('\\', '/') for dep in idl.deps)
+
+        with FileAvoidWrite(header_path) as fh:
+            print_header(idl, fh, path)
+
+    xpt_path = os.path.join(xpt_dir, '%s.xpt' % module)
+    with FileAvoidWrite(xpt_path) as fh:
+        xpt_link(xpts.values()).writefd(fh)
+
+    deps_path = os.path.join(deps_dir, '%s.pp' % module)
+    with FileAvoidWrite(deps_path) as fh:
+        # Need output to be consistent to avoid rewrites.
+        s_deps = sorted(deps)
+        fh.write('%s: %s\n' % (xpt_path, ' '.join(s_deps)))
+        for dep in s_deps:
+            fh.write('%s:\n' % dep)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--cache-dir',
+        help='Directory in which to find or write cached lexer data.')
+    parser.add_argument('inputdir',
+        help='Directory in which to find source .idl files.')
+    parser.add_argument('headerdir',
+        help='Directory in which to write header files.')
+    parser.add_argument('xptdir',
+        help='Directory in which to write xpt file.')
+    parser.add_argument('depsdir',
+        help='Directory in which to write dependency files.')
+    parser.add_argument('module',
+        help='Final module name to use for linked output xpt file.')
+    parser.add_argument('idls', nargs='+',
+        help='Source .idl file(s). Specified as stems only.')
+
+    args = parser.parse_args()
+    process(args.inputdir, args.cache_dir, args.headerdir, args.xptdir,
+        args.depsdir, args.module, args.idls)
diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
new file mode 100644
index 00000000000..0cf7cac49a4
--- /dev/null
+++ b/python/mozbuild/mozbuild/backend/common.py
@@ -0,0 +1,58 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 __future__ import unicode_literals
+
+import mozpack.path as mozpath
+
+from .base import BuildBackend
+
+from ..frontend.data import XPIDLFile
+
+
+class XPIDLManager(object):
+    """Helps manage XPCOM IDLs in the context of the build system."""
+    def __init__(self, config):
+        self.config = config
+        self.topsrcdir = config.topsrcdir
+        self.topobjdir = config.topobjdir
+
+        self.idls = {}
+        self.modules = {}
+
+    def register_idl(self, source, module, allow_existing=False):
+        """Registers an IDL file with this instance.
+
+        The IDL file will be built, installed, etc.
+        """
+        basename = mozpath.basename(source)
+        root = mozpath.splitext(basename)[0]
+
+        entry = {
+            'source': source,
+            'module': module,
+            'basename': basename,
+            'root': root,
+        }
+
+        if not allow_existing and entry['basename'] in self.idls:
+            raise Exception('IDL already registered: %' % entry['basename'])
+
+        self.idls[entry['basename']] = entry
+        self.modules.setdefault(entry['module'], set()).add(entry['root'])
+
+
+class CommonBackend(BuildBackend):
+    """Holds logic common to all build backends."""
+
+    def _init(self):
+        self._idl_manager = XPIDLManager(self.environment)
+
+    def consume_object(self, obj):
+        if isinstance(obj, XPIDLFile):
+            self._idl_manager.register_idl(obj.source_path, obj.module)
+
+    def consume_finished(self):
+        if len(self._idl_manager.idls):
+            self._handle_idl_manager(self._idl_manager)
diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
index dc63edcf4ea..4841ec0081c 100644
--- a/python/mozbuild/mozbuild/backend/configenvironment.py
+++ b/python/mozbuild/mozbuild/backend/configenvironment.py
@@ -168,7 +168,7 @@ class ConfigEnvironment(object):
         assert(isinstance(file, basestring))
         return os.path.normpath(os.path.join(self.topsrcdir, "%s.in" % relpath(file, self.topobjdir)))
 
-    def create_config_file(self, path):
+    def create_config_file(self, path, extra=None):
         '''Creates the given config file. A config file is generated by
         taking the corresponding source file and replacing occurences of
         "@VAR@" by the value corresponding to "VAR" in the substs dict.
@@ -185,6 +185,8 @@ class ConfigEnvironment(object):
         pp.context.update(srcdir = self.get_file_srcdir(path))
         pp.context.update(relativesrcdir = self.get_relative_srcdir(path))
         pp.context.update(DEPTH = self.get_depth(path))
+        if extra:
+            pp.context.update(extra)
         pp.do_filter('attemptSubstitution')
         pp.setMarker(None)
 
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index d0c32be566b..50432a1626d 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -9,14 +9,14 @@ import logging
 import os
 import types
 
-import mozpack.path
 from mozpack.copier import FilePurger
 from mozpack.manifests import (
     InstallManifest,
     PurgeManifest,
 )
+import mozpack.path as mozpath
 
-from .base import BuildBackend
+from .common import CommonBackend
 from ..frontend.data import (
     ConfigFileSubstitution,
     DirectoryTraversal,
@@ -25,6 +25,7 @@ from ..frontend.data import (
     VariablePassthru,
     Exports,
     Program,
+    XPIDLFile,
     XpcshellManifests,
 )
 from ..util import FileAvoidWrite
@@ -75,6 +76,10 @@ class BackendMakeFile(object):
         self.environment = environment
         self.path = os.path.join(objdir, 'backend.mk')
 
+        # XPIDLFiles attached to this file.
+        self.idls = []
+        self.xpt_name = None
+
         self.fh = FileAvoidWrite(self.path)
         self.fh.write('# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT.\n')
         self.fh.write('\n')
@@ -90,15 +95,24 @@ class BackendMakeFile(object):
         # scan and build, installing the new Makefile.
         self.fh.write('NO_SUBMAKEFILES_RULE := 1\n')
 
-
     def write(self, buf):
         self.fh.write(buf)
 
     def close(self):
+        if self.xpt_name:
+            self.fh.write('XPT_NAME := %s\n' % self.xpt_name)
+
+            self.fh.write('NONRECURSIVE_TARGETS += export\n')
+            self.fh.write('NONRECURSIVE_TARGETS_export += xpidl\n')
+            self.fh.write('NONRECURSIVE_TARGETS_export_xpidl_DIRECTORY = '
+                '$(DEPTH)/config/makefiles/xpidl\n')
+            self.fh.write('NONRECURSIVE_TARGETS_export_xpidl_TARGETS += '
+                'xpt/%s' % self.xpt_name)
+
         return self.fh.close()
 
 
-class RecursiveMakeBackend(BuildBackend):
+class RecursiveMakeBackend(CommonBackend):
     """Backend that integrates with the existing recursive make build system.
 
     This backend facilitates the transition from Makefile.in to moz.build
@@ -114,6 +128,8 @@ class RecursiveMakeBackend(BuildBackend):
     """
 
     def _init(self):
+        CommonBackend._init(self)
+
         self._backend_files = {}
         self._ipdl_sources = set()
 
@@ -140,6 +156,11 @@ class RecursiveMakeBackend(BuildBackend):
             dist_public=PurgeManifest(relpath='dist/public'),
             dist_sdk=PurgeManifest(relpath='dist/sdk'),
             tests=PurgeManifest(relpath='_tests'),
+            xpidl=PurgeManifest(relpath='config/makefiles/xpidl'),
+        )
+
+        self._install_manifests = dict(
+            dist_idl=InstallManifest(),
         )
 
     def _update_from_avoid_write(self, result):
@@ -155,6 +176,8 @@ class RecursiveMakeBackend(BuildBackend):
     def consume_object(self, obj):
         """Write out build files necessary to build with recursive make."""
 
+        CommonBackend.consume_object(self, obj)
+
         if not isinstance(obj, SandboxDerived):
             return
 
@@ -168,6 +191,9 @@ class RecursiveMakeBackend(BuildBackend):
                 backend_file.environment.create_config_file(obj.output_path))
             self.backend_input_files.add(obj.input_path)
             self.summary.managed_count += 1
+        elif isinstance(obj, XPIDLFile):
+            backend_file.idls.append(obj)
+            backend_file.xpt_name = '%s.xpt' % obj.module
         elif isinstance(obj, VariablePassthru):
             # Sorted so output is consistent and we don't bump mtimes.
             for k, v in sorted(obj.variables.items()):
@@ -181,7 +207,7 @@ class RecursiveMakeBackend(BuildBackend):
             self._process_exports(obj.exports, backend_file)
 
         elif isinstance(obj, IPDLFile):
-            self._ipdl_sources.add(mozpack.path.join(obj.srcdir, obj.basename))
+            self._ipdl_sources.add(mozpath.join(obj.srcdir, obj.basename))
 
         elif isinstance(obj, Program):
             self._process_program(obj.program, backend_file)
@@ -192,6 +218,8 @@ class RecursiveMakeBackend(BuildBackend):
         self._backend_files[obj.srcdir] = backend_file
 
     def consume_finished(self):
+        CommonBackend.consume_finished(self)
+
         for srcdir in sorted(self._backend_files.keys()):
             bf = self._backend_files[srcdir]
 
@@ -361,6 +389,44 @@ class RecursiveMakeBackend(BuildBackend):
             self._process_exports(children[subdir], backend_file,
                                   namespace=namespace + subdir)
 
+    def _handle_idl_manager(self, manager):
+        build_files = self._purge_manifests['xpidl']
+
+        for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
+            'xpt/.mkdir.done'):
+            build_files.add(p)
+
+        for idl in manager.idls.values():
+            self._install_manifests['dist_idl'].add_symlink(idl['source'],
+                idl['basename'])
+            self._purge_manifests['dist_include'].add('%s.h' % idl['root'])
+
+        for module in manager.modules:
+            build_files.add(mozpath.join('xpt', '%s.xpt' % module))
+            build_files.add(mozpath.join('.deps', '%s.pp' % module))
+
+        modules = manager.modules
+        xpt_modules = sorted(modules.keys())
+        rules = []
+
+        for module in xpt_modules:
+            deps = sorted(modules[module])
+            rules.extend([
+                '$(idl_xpt_dir)/%s.xpt:' % module,
+                '\t@echo "$(notdir $@)"',
+                '\t$(idlprocess) $(basename $(notdir $@)) %s' % ' '.join(deps),
+                '',
+            ])
+
+        out_path = os.path.join(self.environment.topobjdir, 'config',
+            'makefiles', 'xpidl', 'Makefile')
+        result = self.environment.create_config_file(out_path, extra=dict(
+            xpidl_rules='\n'.join(rules),
+            xpidl_modules=' '.join(xpt_modules),
+        ))
+        self._update_from_avoid_write(result)
+        self.summary.managed_count += 1
+
     def _process_program(self, program, backend_file):
         backend_file.write('PROGRAM = %s\n' % program)
 
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
index c98a6246a0c..0ca88f36cdf 100644
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@@ -17,6 +17,8 @@ structures.
 
 from __future__ import unicode_literals
 
+import os
+
 from collections import OrderedDict
 
 
@@ -136,6 +138,22 @@ class VariablePassthru(SandboxDerived):
         SandboxDerived.__init__(self, sandbox)
         self.variables = {}
 
+class XPIDLFile(SandboxDerived):
+    """Describes an XPIDL file to be compiled."""
+
+    __slots__ = (
+        'basename',
+        'source_path',
+    )
+
+    def __init__(self, sandbox, source, module):
+        SandboxDerived.__init__(self, sandbox)
+
+        self.source_path = source
+        self.basename = os.path.basename(source)
+        self.module = module
+
+
 class Exports(SandboxDerived):
     """Sandbox container object for EXPORTS, which is a HierarchicalStringList.
 
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index dbb518dc06c..d85d879b326 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -4,8 +4,13 @@
 
 from __future__ import unicode_literals
 
+import logging
 import os
 
+from mach.mixin.logging import LoggingMixin
+
+import mozpack.path as mozpath
+
 from .data import (
     ConfigFileSubstitution,
     DirectoryTraversal,
@@ -14,13 +19,17 @@ from .data import (
     Program,
     ReaderSummary,
     VariablePassthru,
+    XPIDLFile,
     XpcshellManifests,
 )
 
-from .reader import MozbuildSandbox
+from .reader import (
+    MozbuildSandbox,
+    SandboxValidationError,
+)
 
 
-class TreeMetadataEmitter(object):
+class TreeMetadataEmitter(LoggingMixin):
     """Converts the executed mozbuild files into data structures.
 
     This is a bridge between reader.py and data.py. It takes what was read by
@@ -29,6 +38,8 @@ class TreeMetadataEmitter(object):
     """
 
     def __init__(self, config):
+        self.populate_logger()
+
         self.config = config
 
     def emit(self, output):
@@ -74,6 +85,27 @@ class TreeMetadataEmitter(object):
             sub.relpath = path
             yield sub
 
+        # XPIDL source files get processed and turned into .h and .xpt files.
+        # If there are multiple XPIDL files in a directory, they get linked
+        # together into a final .xpt, which has the name defined by either
+        # MODULE or XPIDL_MODULE (if the latter is defined).
+        xpidl_module = sandbox['MODULE']
+        if sandbox['XPIDL_MODULE']:
+            xpidl_module = sandbox['XPIDL_MODULE']
+
+        if sandbox['XPIDL_SOURCES'] and not xpidl_module:
+            raise SandboxValidationError('MODULE or XPIDL_MODULE must be '
+                'defined if XPIDL_SOURCES is defined.')
+
+        if sandbox['XPIDL_SOURCES'] and sandbox['NO_DIST_INSTALL']:
+            self.log(logging.WARN, 'mozbuild_warning', dict(
+                path=sandbox.main_path),
+                '{path}: NO_DIST_INSTALL has no effect on XPIDL_SOURCES.')
+
+        for idl in sandbox['XPIDL_SOURCES']:
+            yield XPIDLFile(sandbox, mozpath.join(sandbox['SRCDIR'], idl),
+                xpidl_module)
+
         # Proxy some variables as-is until we have richer classes to represent
         # them. We should aim to keep this set small because it violates the
         # desired abstraction of the build definition away from makefiles.
@@ -104,10 +136,7 @@ class TreeMetadataEmitter(object):
             SHARED_LIBRARY_LIBS='SHARED_LIBRARY_LIBS',
             SIMPLE_PROGRAMS='SIMPLE_PROGRAMS',
             SSRCS='SSRCS',
-            XPIDL_FLAGS='XPIDL_FLAGS',
-            XPIDL_MODULE='XPIDL_MODULE',
-            XPIDLSRCS='XPIDL_SOURCES',
-            )
+        )
         for mak, moz in varmap.items():
             if sandbox[moz]:
                 passthru.variables[mak] = sandbox[moz]
diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
index fb7086c13af..891bd86aebf 100644
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -295,10 +295,8 @@ VARIABLES = {
         """Module name.
 
         Historically, this variable was used to describe where to install header
-        files, but that feature is now handled by EXPORTS_NAMESPACES. Currently
-        it is used as the XPIDL module name if XPIDL_MODULE is not defined, but
-        using XPIDL_MODULE directly is preferred. MODULE will likely be removed
-        in the future.
+        files, but that feature is now handled by EXPORTS_NAMESPACES. MODULE
+        will likely be removed in the future.
         """),
 
     'EXPORTS': (HierarchicalStringList, list, HierarchicalStringList(),
@@ -355,14 +353,6 @@ VARIABLES = {
         MODULE.
         """),
 
-    'XPIDL_FLAGS': (list, list, [],
-        """XPCOM Interface Definition Module Flags.
-
-        This is a list of extra flags that are passed to the IDL compiler.
-        Typically this is a set of -I flags that denote extra include
-        directories to search for included .idl files.
-        """),
-
     'IPDL_SOURCES': (StrictOrderingOnAppendList, list, [],
         """IPDL source files.
 
diff --git a/python/mozbuild/mozbuild/test/backend/common.py b/python/mozbuild/mozbuild/test/backend/common.py
index 7102b62b09d..e1f44b158cd 100644
--- a/python/mozbuild/mozbuild/test/backend/common.py
+++ b/python/mozbuild/mozbuild/test/backend/common.py
@@ -75,6 +75,11 @@ CONFIGS = {
         'non_global_defines': [],
         'substs': [],
     },
+    'xpidl': {
+        'defines': [],
+        'non_global_defines': [],
+        'substs': [],
+    },
 }
 
 
@@ -95,9 +100,7 @@ class BackendTester(unittest.TestCase):
         return ConfigEnvironment(srcdir, objdir, **config)
 
     def _emit(self, name, env=None):
-        if not env:
-            env = self._get_environment(name)
-
+        env = env or self._get_environment(name)
         reader = BuildReader(env)
         emitter = TreeMetadataEmitter(env)
 
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
index 4acef55d3f6..d349e488cc7 100644
--- a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
@@ -2,9 +2,7 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-XPIDL_SOURCES = ['bar.idl', 'biz.idl', 'foo.idl']
-XPIDL_MODULE = 'module_name'
-XPIDL_FLAGS = ['-Idir1', '-Idir2', '-Idir3']
+MODULE = 'module_name'
 
 ASFILES = ['bar.s', 'foo.asm']
 
diff --git a/python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in b/python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build b/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
new file mode 100644
index 00000000000..aa192b84276
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
@@ -0,0 +1,6 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+MODULE = 'my_module'
+XPIDL_SOURCES = ['bar.idl', 'foo.idl']
diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
index 84860da1eeb..86a8d5ba54b 100644
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ -217,19 +217,6 @@ class TestRecursiveMakeBackend(BackendTester):
                 'SSRCS += bar.S',
                 'SSRCS += foo.S',
             ],
-            'XPIDL_FLAGS': [
-                'XPIDL_FLAGS += -Idir1',
-                'XPIDL_FLAGS += -Idir2',
-                'XPIDL_FLAGS += -Idir3',
-            ],
-            'XPIDL_MODULE': [
-                'XPIDL_MODULE := module_name'
-            ],
-            'XPIDLSRCS': [
-                'XPIDLSRCS += bar.idl',
-                'XPIDLSRCS += biz.idl',
-                'XPIDLSRCS += foo.idl',
-            ]
         }
 
         for var, val in expected.items():
@@ -281,6 +268,34 @@ class TestRecursiveMakeBackend(BackendTester):
         expected = ('aa', 'bb', 'cc', 'dd', 'valid_val')
         self.assertEqual(xpclines, ["XPCSHELL_TESTS += %s" % val for val in expected])
 
+    def test_xpidl_generation(self):
+        """Ensure xpidl files and directories are written out."""
+        env = self._consume('xpidl', RecursiveMakeBackend)
+
+        # Purge manifests should contain entries.
+        purge_dir = os.path.join(env.topobjdir, '_build_manifests', 'purge')
+        install_dir = os.path.join(env.topobjdir, '_build_manifests',
+            'install')
+        self.assertTrue(os.path.isfile(os.path.join(purge_dir, 'xpidl')))
+        self.assertTrue(os.path.isfile(os.path.join(install_dir, 'dist_idl')))
+
+        m = PurgeManifest(path=os.path.join(purge_dir, 'xpidl'))
+        self.assertIn('.deps/my_module.pp', m.entries)
+        self.assertIn('xpt/my_module.xpt', m.entries)
+
+        m = InstallManifest(path=os.path.join(install_dir, 'dist_idl'))
+        self.assertEqual(len(m), 2)
+        self.assertIn('bar.idl', m)
+        self.assertIn('foo.idl', m)
+
+        m = PurgeManifest(path=os.path.join(purge_dir, 'dist_include'))
+        self.assertIn('foo.h', m.entries)
+
+        p = os.path.join(env.topobjdir, 'config/makefiles/xpidl')
+        self.assertTrue(os.path.isdir(p))
+
+        self.assertTrue(os.path.isfile(os.path.join(p, 'Makefile')))
+
     def test_xpcshell_master_manifest(self):
         """Ensure that the master xpcshell manifest is written out correctly."""
         env = self._consume('xpcshell_manifests', RecursiveMakeBackend)
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
index 71154d31ec3..1bc40a2aae2 100644
--- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
@@ -2,9 +2,7 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-XPIDL_SOURCES += ['bar.idl', 'biz.idl', 'foo.idl']
-XPIDL_MODULE = 'module_name'
-XPIDL_FLAGS += ['-Idir1', '-Idir2', '-Idir3']
+MODULE = 'module_name'
 
 ASFILES += ['fans.asm', 'tans.s']
 
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
index 5d995929359..6c8d6ede6df 100644
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@@ -144,14 +144,12 @@ class TestEmitterBasic(unittest.TestCase):
             LIBRARY_NAME='lib_name',
             LIBS=['fans.lib', 'tans.lib'],
             NO_DIST_INSTALL='1',
+            MODULE='module_name',
             SDK_LIBRARY=['fans.sdk', 'tans.sdk'],
             SHARED_LIBRARY_LIBS=['fans.sll', 'tans.sll'],
             SIMPLE_PROGRAMS=['fans.x', 'tans.x'],
             SSRCS=['fans.S', 'tans.S'],
-            XPIDLSRCS=['bar.idl', 'biz.idl', 'foo.idl'],
-            XPIDL_MODULE='module_name',
-            XPIDL_FLAGS=['-Idir1', '-Idir2', '-Idir3'],
-            )
+        )
 
         variables = objs[1].variables
         self.assertEqual(len(variables), len(wanted))
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index 6e9668868fe..f65357c33f1 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -20,7 +20,6 @@ VPATH += \
   $(NULL)
 
 LOCAL_INCLUDES += \
-  -I$(XPIDL_GEN_DIR) \
   -I$(srcdir)/../google-breakpad/src/ \
   $(NULL)
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in
index 0f2b5d3fda4..7c48ead0f8b 100644
--- a/xpcom/idl-parser/Makefile.in
+++ b/xpcom/idl-parser/Makefile.in
@@ -18,8 +18,8 @@ PARSER_SRCS = \
 
 SDK_BINARY = \
   $(PARSER_SRCS) \
-  xpidllex.py \
-  xpidlyacc.py \
+  $(IDL_PARSER_CACHE_DIR)/xpidllex.py \
+  $(IDL_PARSER_CACHE_DIR)/xpidlyacc.py \
   $(NULL)
 
 SDK_BINARY_TARGET = xpidl-parser
@@ -39,13 +39,13 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 # Generate the PLY lexer and parser.
-xpidllex.py: $(PARSER_SRCS) $(PLY_FILES)
+$(IDL_PARSER_CACHE_DIR)/xpidllex.py: $(PARSER_SRCS) $(PLY_FILES)
 	$(PYTHON_PATH) \
 	  $(PLY_INCLUDE) \
-	  $(srcdir)/header.py --cachedir=. --regen
+	  $(srcdir)/header.py --cachedir=$(IDL_PARSER_CACHE_DIR) --regen
 
 # generating xpidllex.py generates xpidlyacc.py too
-xpidlyacc.py: xpidllex.py
+$(IDL_PARSER_CACHE_DIR)/xpidlyacc.py: $(IDL_PARSER_CACHE_DIR)/xpidllex.py
 
 check::
 	$(PYTHON_PATH) \
@@ -53,10 +53,12 @@ check::
 	  -I. \
 	  $(srcdir)/runtests.py
 
-GARBAGE += \
+garbage_files := \
   xpidllex.py \
   xpidllex.pyc \
   xpidlyacc.py \
   xpidlyacc.pyc \
   xpidl_debug \
   $(NULL)
+
+GARBAGE += $(addprefix $(IDL_PARSER_CACHE_DIR)/,$(garbage_files))

From 4fe32c0c7d728ded40da8a3f95408776199cc955 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Wed, 14 Aug 2013 11:56:57 -0400
Subject: [PATCH 34/98] Bug 904266. Relax intel blacklist on D3D9 more.
 r=bjacob

We've been using the 7.15.10.1666 IntelGMAX3000 driver on Vista so let's use
that everywhere. This should cover the majority of users.

--HG--
extra : rebase_source : 4ca92fd46de14dc5713ab43e15ea6b3b20bb3367
---
 widget/windows/GfxInfo.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
index 06a935ded0c..f11ff0f671a 100644
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -892,21 +892,21 @@ GfxInfo::GetGfxDriverInfo()
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_XP, IntelGMA950,   V(6,14,10,4926));
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_XP, IntelGMA3150,  V(6,14,10,5134));
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_XP, IntelGMAX3000, V(6,14,10,5218));
-    IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_XP, IntelGMAX4500HD, V(6,14,10,5284));
+    IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_XP, IntelGMAX4500HD, V(6,14,10,4969));
 
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_VISTA, IntelGMA500,   V(3,0,20,3200));
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_VISTA, IntelGMA900,   GfxDriverInfo::allDriverVersions);
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_VISTA, IntelGMA950,   V(7,14,10,1504));
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_VISTA, IntelGMA3150,  V(7,14,10,1910));
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_VISTA, IntelGMAX3000, V(7,15,10,1666));
-    IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_VISTA, IntelGMAX4500HD, V(8,15,10,1855));
+    IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_VISTA, IntelGMAX4500HD, V(7,15,10,1666));
 
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMA500,   V(5,0,0,2026));
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMA900,   GfxDriverInfo::allDriverVersions);
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMA950,   V(8,15,10,1930));
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMA3150,  V(8,14,10,1972));
-    IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMAX3000, V(8,15,10,1930));
-    IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMAX4500HD, V(8,15,10,1855));
+    IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMAX3000, V(7,15,10,1666));
+    IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMAX4500HD, V(7,15,10,1666));
 
     /* OpenGL on any Intel hardware is discouraged */
     APPEND_TO_DRIVER_BLOCKLIST2( DRIVER_OS_ALL,

From b14fe48e2a2fd5c35a53a11177e524ed330967b8 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 13 Aug 2013 19:34:22 +0200
Subject: [PATCH 35/98] Bug 899135 - Drop buffers in ScriptProcessorNode
 instead of buffering them when the main thread is blocked. r=roc

---
 .../media/webaudio/ScriptProcessorNode.cpp    | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/content/media/webaudio/ScriptProcessorNode.cpp b/content/media/webaudio/ScriptProcessorNode.cpp
index c9db0474c6e..65b4a14a331 100644
--- a/content/media/webaudio/ScriptProcessorNode.cpp
+++ b/content/media/webaudio/ScriptProcessorNode.cpp
@@ -20,6 +20,10 @@
 namespace mozilla {
 namespace dom {
 
+// The maximum latency, in seconds, that we can live with before dropping
+// buffers.
+static const float MAX_LATENCY_S = 0.5;
+
 NS_IMPL_CYCLE_COLLECTION_CLASS(ScriptProcessorNode)
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ScriptProcessorNode)
@@ -90,9 +94,11 @@ private:
   };
 
 public:
-  SharedBuffers()
+  SharedBuffers(float aSampleRate)
     : mOutputQueue("SharedBuffers::outputQueue")
     , mDelaySoFar(TRACK_TICKS_MAX)
+    , mSampleRate(aSampleRate)
+    , mDroppingBuffers(false)
   {
   }
 
@@ -102,6 +108,29 @@ public:
   {
     MOZ_ASSERT(NS_IsMainThread());
 
+    TimeStamp now = TimeStamp::Now();
+
+    if (mLastEventTime.IsNull()) {
+      mLastEventTime = now;
+    } else {
+      // When the main thread is blocked, and all the event are processed in a
+      // burst after the main thread unblocks, the |(now - mLastEventTime)|
+      // interval will be very short. |latency - bufferDuration| will be
+      // negative, effectively moving back mLatency to a smaller and smaller
+      // value, until it crosses zero, at which point we stop dropping buffers
+      // and resume normal operation.
+      float latency = (now - mLastEventTime).ToSeconds();
+      float bufferDuration = aBufferSize / mSampleRate;
+      mLatency += latency - bufferDuration;
+      mLastEventTime = now;
+      if (mLatency > MAX_LATENCY_S || (mDroppingBuffers && mLatency > 0.0)) {
+        mDroppingBuffers = true;
+        return;
+      } else {
+        mDroppingBuffers = false;
+      }
+    }
+
     MutexAutoLock lock(mOutputQueue.Lock());
     for (uint32_t offset = 0; offset < aBufferSize; offset += WEBAUDIO_BLOCK_SIZE) {
       AudioChunk& chunk = mOutputQueue.Produce();
@@ -158,6 +187,16 @@ private:
   // caused by the main thread lagging behind in producing output buffers.
   // TRACK_TICKS_MAX means that we have not received our first buffer yet.
   TrackTicks mDelaySoFar;
+  // The samplerate of the context.
+  float mSampleRate;
+  // This is the latency caused by the buffering. If this grows too high, we
+  // will drop buffers until it is acceptable.
+  float mLatency;
+  // This is the time at which we last produced a buffer, to detect if the main
+  // thread has been blocked.
+  TimeStamp mLastEventTime;
+  // True if we should be dropping buffers.
+  bool mDroppingBuffers;
 };
 
 class ScriptProcessorNodeEngine : public AudioNodeEngine
@@ -386,7 +425,7 @@ ScriptProcessorNode::ScriptProcessorNode(AudioContext* aContext,
               aNumberOfInputChannels,
               mozilla::dom::ChannelCountMode::Explicit,
               mozilla::dom::ChannelInterpretation::Speakers)
-  , mSharedBuffers(new SharedBuffers())
+  , mSharedBuffers(new SharedBuffers(aContext->SampleRate()))
   , mBufferSize(aBufferSize ?
                   aBufferSize : // respect what the web developer requested
                   4096)         // choose our own buffer size -- 4KB for now

From 3a92f0ae7cfca2cf16ba7338ce70792521b06d80 Mon Sep 17 00:00:00 2001
From: Brian O'Keefe <bokeefe@alum.wpi.edu>
Date: Wed, 17 Jul 2013 16:06:53 -0400
Subject: [PATCH 36/98] Bug 896177 - Remove useless config.mk includes; r=gps

---
 accessible/src/windows/msaa/Makefile.in         | 1 -
 chrome/src/Makefile.in                          | 1 -
 content/base/src/Makefile.in                    | 1 -
 content/events/src/Makefile.in                  | 1 -
 content/mathml/content/src/Makefile.in          | 2 --
 content/media/Makefile.in                       | 1 -
 content/media/webspeech/recognition/Makefile.in | 1 -
 content/media/webspeech/synth/Makefile.in       | 1 -
 content/svg/content/src/Makefile.in             | 2 --
 docshell/base/Makefile.in                       | 1 -
 dom/alarm/Makefile.in                           | 1 -
 dom/audiochannel/Makefile.in                    | 1 -
 dom/base/Makefile.in                            | 1 -
 dom/battery/Makefile.in                         | 1 -
 dom/bluetooth/Makefile.in                       | 1 -
 dom/browser-element/Makefile.in                 | 1 -
 dom/devicestorage/Makefile.in                   | 1 -
 dom/devicestorage/ipc/Makefile.in               | 1 -
 dom/icc/src/Makefile.in                         | 1 -
 dom/indexedDB/Makefile.in                       | 1 -
 dom/indexedDB/ipc/Makefile.in                   | 1 -
 dom/ipc/Makefile.in                             | 1 -
 dom/media/Makefile.in                           | 1 -
 dom/mobilemessage/src/Makefile.in               | 1 -
 dom/network/src/Makefile.in                     | 1 -
 dom/plugins/base/Makefile.in                    | 1 -
 dom/plugins/ipc/Makefile.in                     | 1 -
 dom/power/Makefile.in                           | 1 -
 dom/quota/Makefile.in                           | 1 -
 dom/src/geolocation/Makefile.in                 | 1 -
 dom/src/notification/Makefile.in                | 1 -
 dom/src/storage/Makefile.in                     | 1 -
 dom/time/Makefile.in                            | 1 -
 extensions/cookie/Makefile.in                   | 2 --
 gfx/ipc/Makefile.in                             | 1 -
 hal/Makefile.in                                 | 1 -
 image/decoders/icon/android/Makefile.in         | 1 -
 ipc/dbus/Makefile.in                            | 1 -
 ipc/glue/Makefile.in                            | 1 -
 ipc/ipdl/Makefile.in                            | 1 -
 ipc/ipdl/test/cxx/Makefile.in                   | 1 -
 ipc/netd/Makefile.in                            | 1 -
 ipc/nfc/Makefile.in                             | 1 -
 ipc/ril/Makefile.in                             | 1 -
 ipc/testshell/Makefile.in                       | 1 -
 ipc/unixsocket/Makefile.in                      | 1 -
 js/ipc/Makefile.in                              | 1 -
 layout/build/Makefile.in                        | 1 -
 layout/generic/Makefile.in                      | 1 -
 layout/ipc/Makefile.in                          | 1 -
 modules/libjar/Makefile.in                      | 2 --
 modules/libpref/src/Makefile.in                 | 1 -
 netwerk/base/src/Makefile.in                    | 1 -
 netwerk/build/Makefile.in                       | 1 -
 netwerk/cookie/Makefile.in                      | 1 -
 netwerk/ipc/Makefile.in                         | 1 -
 netwerk/protocol/about/Makefile.in              | 1 -
 netwerk/protocol/device/Makefile.in             | 1 -
 netwerk/protocol/ftp/Makefile.in                | 1 -
 netwerk/protocol/http/Makefile.in               | 1 -
 netwerk/protocol/res/Makefile.in                | 1 -
 netwerk/protocol/websocket/Makefile.in          | 1 -
 netwerk/protocol/wyciwyg/Makefile.in            | 1 -
 netwerk/sctp/datachannel/Makefile.in            | 1 -
 netwerk/sctp/src/Makefile.in                    | 1 -
 netwerk/srtp/src/Makefile.in                    | 1 -
 toolkit/components/alerts/Makefile.in           | 1 -
 toolkit/crashreporter/Makefile.in               | 1 -
 toolkit/crashreporter/injector/Makefile.in      | 1 -
 toolkit/xre/Makefile.in                         | 1 -
 uriloader/exthandler/Makefile.in                | 1 -
 uriloader/prefetch/Makefile.in                  | 1 -
 widget/gtk2/Makefile.in                         | 1 -
 widget/qt/Makefile.in                           | 1 -
 widget/shared/Makefile.in                       | 1 -
 widget/windows/Makefile.in                      | 1 -
 widget/xpwidgets/Makefile.in                    | 1 -
 xpcom/base/Makefile.in                          | 1 -
 xpcom/build/Makefile.in                         | 1 -
 79 files changed, 83 deletions(-)

diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in
index 776d4dc78cd..b595e30c82e 100644
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -13,7 +13,6 @@ LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in
index 94be389f424..31b73227007 100644
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -14,7 +14,6 @@ LIBRARY_NAME    = chrome_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index facc22da0b0..8cdec868b97 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -23,7 +23,6 @@ endif
 
 GQI_SRCS = contentbase.gqi
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index e782a579d43..b24dc90fb0c 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -15,7 +15,6 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in
index 99c886f47b0..25afcb68348 100644
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -14,8 +14,6 @@ LIBRARY_NAME	= gkcontentmathml_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 1b95afead59..094bf731998 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -14,7 +14,6 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in
index 24d955d65e3..3b04c8facef 100644
--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@@ -19,6 +19,5 @@ LIBXUL_LIBRARY := 1
 
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in
index d7a68b51150..2932ae3d145 100644
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -22,6 +22,5 @@ LIBXUL_LIBRARY  = 1
 
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in
index 2ecae27321c..fbb807af718 100644
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -14,8 +14,6 @@ LIBRARY_NAME	= gkcontentsvg_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS	= 1
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
index b33593b5be5..e3bc7131a1b 100644
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -19,7 +19,6 @@ ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in
index b884cd61ac4..f7926ebbc28 100644
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -16,7 +16,6 @@ FAIL_ON_WARNINGS := 1
 include $(topsrcdir)/dom/dom-config.mk
 
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in
index 268acdb7878..2fd96f5d3b5 100644
--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@@ -24,7 +24,6 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
index d4c3114bf04..dcdf8c79270 100644
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -29,7 +29,6 @@ ifdef MOZ_B2G_FM
 DEFINES += -DMOZ_B2G_FM
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in
index 09afc3457c7..67a18432487 100644
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@@ -19,7 +19,6 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
index 732b460750c..b199e4133df 100644
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -51,6 +51,5 @@ LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 endif # MOZ_B2G_BT
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in
index 904139eb98d..948cfaf2a4b 100644
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -16,7 +16,6 @@ FAIL_ON_WARNINGS := 1
 include $(topsrcdir)/dom/dom-config.mk
 
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in
index 637d1c13e83..64840219d03 100644
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -22,6 +22,5 @@ LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/devicestorage/ipc/Makefile.in b/dom/devicestorage/ipc/Makefile.in
index 1a7ae73a256..456b4c181d9 100644
--- a/dom/devicestorage/ipc/Makefile.in
+++ b/dom/devicestorage/ipc/Makefile.in
@@ -16,6 +16,5 @@ MOCHITEST_FILES := \
   $(NULL)
 
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in
index 7d1a37e989f..53bb76a9f17 100644
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@@ -19,6 +19,5 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index 464fa2b9a6f..fcbe4ad23f7 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -25,7 +25,6 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in
index caa1ccb121c..b03544ee582 100644
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -29,7 +29,6 @@ MOCHITEST_FILES = test_ipc.html
 # We're copying tests from another directory so this check is wrong for us.
 #NO_XPCSHELL_MANIFEST_CHECK = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
index 9790ed1537a..32942fb54fa 100644
--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -14,7 +14,6 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in
index d460ec7486b..a9142703acf 100644
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -24,6 +24,5 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in
index 609ebe6fffe..07be2a66111 100644
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -43,6 +43,5 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in
index c2c8ed85589..d7232a698f7 100644
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -29,6 +29,5 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in
index 8c73638e281..32478221476 100644
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -40,7 +40,6 @@ LOCAL_INCLUDES += \
   $(NULL)
 
 include $(topsrcdir)/dom/dom-config.mk
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in
index 9452f7199c1..c5beb773318 100644
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -33,7 +33,6 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in
index 52e7b27e6b3..ea4da2c1e7b 100644
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -15,6 +15,5 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in
index a2d3226d360..5d07fab274c 100644
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@@ -20,6 +20,5 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in
index 40f13238fe6..af1ca2a3a50 100644
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -44,6 +44,5 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/mac
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in
index 237a82dd35f..435a4a67327 100644
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -21,6 +21,5 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in
index ab53230a33e..2aa49de4a8f 100644
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -23,6 +23,5 @@ ifdef ENABLE_TESTS
 DEFINES += -DDOM_STORAGE_TESTS
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in
index 3545171786d..d5f5d6f34f3 100644
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@@ -15,6 +15,5 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in
index 23c9e8bf676..3bc7c8db7aa 100644
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -15,7 +15,5 @@ MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
-
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in
index 77b0dd57696..9264a35c4ff 100644
--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@@ -14,7 +14,6 @@ LIBRARY_NAME       = gfxipc_s
 LIBXUL_LIBRARY     = 1
 EXPORT_LIBRARY     = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/hal/Makefile.in b/hal/Makefile.in
index 227a3c89ff1..f6395f649af 100644
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -34,7 +34,6 @@ ifdef MOZ_GAMEPAD
 LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in
index c3542670bd6..edafdefcdb7 100644
--- a/image/decoders/icon/android/Makefile.in
+++ b/image/decoders/icon/android/Makefile.in
@@ -13,6 +13,5 @@ LIBRARY_NAME	= imgiconandroid_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in
index 0a50db65a2c..3d9a161833b 100644
--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@@ -17,7 +17,6 @@ ifdef MOZ_ENABLE_DBUS
 	LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in
index 49d1022e795..9e2c24449cc 100644
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -18,6 +18,5 @@ EXPORT_LIBRARY = 1
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\"
 DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\"
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in
index e68e89453e8..edb36356e6a 100644
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -24,7 +24,6 @@ GARBAGE += $(CPPSRCS)
 LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders
 
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in
index 1f6b834d599..d0f6444f17f 100644
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -60,7 +60,6 @@ IPDLTESTHDRS = $(addprefix $(srcdir)/,$(addsuffix .h,$(IPDLTESTS)))
 TESTER_TEMPLATE := $(srcdir)/IPDLUnitTests.template.cpp
 GENTESTER := $(srcdir)/genIPDLUnitTests.py
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in
index 28b8d31b129..781fa85bed5 100644
--- a/ipc/netd/Makefile.in
+++ b/ipc/netd/Makefile.in
@@ -13,6 +13,5 @@ LIBRARY_NAME = moznetd_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/ipc/nfc/Makefile.in b/ipc/nfc/Makefile.in
index 8fed5887b08..a084c43a64a 100644
--- a/ipc/nfc/Makefile.in
+++ b/ipc/nfc/Makefile.in
@@ -13,6 +13,5 @@ LIBRARY_NAME = moznfc_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in
index cd201c7be89..f1afb46b7d7 100644
--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@@ -13,6 +13,5 @@ LIBRARY_NAME = mozril_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in
index ce05df5b943..f4d679d2ef2 100644
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -21,6 +21,5 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in
index cb9924dfe09..906de43b3d2 100644
--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@@ -14,6 +14,5 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in
index 4b65c242068..2d5dbca5da9 100644
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -21,7 +21,6 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/js/xpconnect/src \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index fc4bcbf3ced..9bf88b09cdc 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -273,7 +273,6 @@ SHARED_LIBRARY_LIBS += \
   $(DEPTH)/dom/gamepad/$(LIB_PREFIX)domgamepad_s.$(LIB_SUFFIX)
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in
index 0b00d1e873f..270fa777b18 100644
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -20,7 +20,6 @@ RESOURCES_HTML = \
 		$(srcdir)/folder.png \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in
index 524b2c96b65..ebefc89a0eb 100644
--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@@ -14,7 +14,6 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in
index 2abca7da5f0..a66a38ea726 100644
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -16,7 +16,5 @@ EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
index c2afc587d96..76c4e51c47a 100644
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -19,7 +19,6 @@ DEFINES += -DOS_ARCH=$(OS_ARCH) \
            -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
            $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in
index 26170e55d9d..00208d1262f 100644
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -28,7 +28,6 @@ ifdef MOZ_ENABLE_QTNETWORK
 endif
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in
index f38bde3de1a..179d43d7517 100644
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -122,7 +122,6 @@ LOCAL_INCLUDES += -I$(srcdir)/../wifi
 
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in
index 090f3efb9f9..ad683994268 100644
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -26,7 +26,6 @@ LOCAL_INCLUDES	= \
 endif
 
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in
index 481e15fa6a0..2c2c15ce106 100644
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@@ -19,6 +19,5 @@ LOCAL_INCLUDES +=                  \
   -I$(topsrcdir)/modules/libjar    \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in
index 70069532984..c5011f2cce9 100644
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -18,7 +18,6 @@ LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in
index 1875c19939d..3437d16c5be 100644
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@@ -16,7 +16,6 @@ LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
                  $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in
index 956901ce096..bd92e69a511 100644
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -20,7 +20,6 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in
index b008775b459..640b1f0e7d6 100644
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -22,7 +22,6 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in
index 8d3f5f9abe3..af6eb70aa45 100644
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -19,7 +19,6 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/netwerk/base/src \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in
index a6d1a37c880..cdf1e7c66dd 100644
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -21,7 +21,6 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in
index b27c891744f..ff14c12394d 100644
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -17,7 +17,6 @@ LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in
index 14ee38daff8..c37b57f2da3 100644
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@@ -39,7 +39,6 @@ DEFINES += -D__Userspace_os_$(OS_TARGET)=1
 endif
 
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in
index d8bf01d0f72..2fdfefb5a93 100644
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@@ -95,7 +95,6 @@ endif
 endif
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in
index 5e595f02167..184719061ee 100644
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -71,7 +71,6 @@ DEFINES += \
   $(NULL)
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in
index 0c0c89f25ed..a4e3ff492fb 100644
--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@@ -13,6 +13,5 @@ LIBRARY_NAME = alerts_s
 LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
index ec21e327b8f..3003149fdf7 100644
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -37,7 +37,6 @@ endif
 LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src
 DEFINES += -DUNICODE -D_UNICODE
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/toolkit/crashreporter/injector/Makefile.in b/toolkit/crashreporter/injector/Makefile.in
index 8dc07b7ec7c..883245ff9b0 100644
--- a/toolkit/crashreporter/injector/Makefile.in
+++ b/toolkit/crashreporter/injector/Makefile.in
@@ -17,7 +17,6 @@ MOZ_GLUE_LDFLAGS =
 
 SHARED_LIBRARY_LIBS += ../breakpad-windows-standalone/$(LIB_PREFIX)google_breakpad_standalone_s.$(LIB_SUFFIX)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 566cbae0194..894ac9d1f87 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -128,7 +128,6 @@ SHARED_LIBRARY_LIBS += \
 endif
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index 528119947fc..94a4dbe0b25 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -76,7 +76,6 @@ LOCAL_INCLUDES   += $(MOZ_GIO_CFLAGS)
 endif
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in
index a79c6ead9f9..a64befb2dae 100644
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -19,7 +19,6 @@ LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
index 25e1cfed0de..8f97cf03c1f 100644
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -44,7 +44,6 @@ endif
 DEFINES		+= -DNATIVE_THEME_SUPPORT
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in
index 41c0accd288..23c6fa06d9c 100644
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -21,7 +21,6 @@ ifneq (qt,$(MOZ_WIDGET_TOOLKIT))
 INACTIVE_COMPONENT = 1
 endif
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in
index 141623f825f..95af1392734 100644
--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= widget_shared
 LIBXUL_LIBRARY  = 1
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in
index 7e786aa8bc6..3d72c1442a9 100644
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -42,7 +42,6 @@ LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in
index 8f886f63af0..fa345bf80b9 100644
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -44,7 +44,6 @@ LOCAL_INCLUDES	+= \
 		-I$(srcdir) \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index e3ff06172b1..4f1f39b7bd3 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -27,7 +27,6 @@ endif
 
 endif #if OS_ARCH == WINNT
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index 5e991f85cbf..2592ff88f4c 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -61,7 +61,6 @@ LOCAL_INCLUDES	= \
 
 GARBAGE         += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

From 3fd496e2317b805dba33a144748a96611d64d510 Mon Sep 17 00:00:00 2001
From: Brian O'Keefe <bokeefe@alum.wpi.edu>
Date: Wed, 17 Jul 2013 16:07:14 -0400
Subject: [PATCH 37/98] Bug 896177 - Remove more config.mk includes; r=gps

---
 config/config.mk                              |  7 +++---
 config/makefiles/functions.mk                 | 22 +++++++++++++++++++
 content/smil/Makefile.in                      |  4 +---
 dom/bindings/Makefile.in                      |  4 ++--
 dom/plugins/base/android/Makefile.in          |  2 --
 dom/system/Makefile.in                        |  3 +--
 dom/system/android/Makefile.in                |  2 --
 dom/system/mac/Makefile.in                    |  2 --
 dom/system/unix/Makefile.in                   |  2 --
 extensions/pref/autoconfig/src/Makefile.in    |  3 ---
 ipc/chromium/Makefile.in                      |  2 --
 js/src/Makefile.in                            |  2 --
 js/src/config/config.mk                       |  7 +++---
 js/src/config/makefiles/functions.mk          | 22 +++++++++++++++++++
 js/xpconnect/src/Makefile.in                  |  2 --
 js/xpconnect/tests/components/js/Makefile.in  |  2 --
 .../tests/components/native/Makefile.in       |  2 --
 security/build/Makefile.in                    |  7 +++---
 toolkit/components/build/Makefile.in          |  2 --
 widget/windows/winrt/Makefile.in              |  2 --
 xpcom/reflect/xptcall/src/md/os2/Makefile.in  |  2 --
 xpcom/reflect/xptcall/src/md/unix/Makefile.in |  2 --
 .../reflect/xptcall/src/md/win32/Makefile.in  |  2 --
 xpcom/sample/Makefile.in                      |  1 -
 xpcom/tests/bug656331_component/Makefile.in   |  2 --
 xpcom/tests/component/Makefile.in             |  2 --
 xpcom/tests/component_no_aslr/Makefile.in     |  2 --
 xpfe/components/build/Makefile.in             |  3 ---
 28 files changed, 58 insertions(+), 59 deletions(-)
 create mode 100644 config/makefiles/functions.mk
 create mode 100644 js/src/config/makefiles/functions.mk

diff --git a/config/config.mk b/config/config.mk
index 90bcc2a65e7..d9c43946d58 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -62,10 +62,9 @@ check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
-core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
-core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
-
-core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif
 
 RM = rm -f
 
diff --git a/config/makefiles/functions.mk b/config/makefiles/functions.mk
new file mode 100644
index 00000000000..f42596d9413
--- /dev/null
+++ b/config/makefiles/functions.mk
@@ -0,0 +1,22 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# functions.mk
+#
+# Defines functions that are needed by various Makefiles throughout the build
+# system, which are needed before config.mk can be included.
+#
+
+# Define an include-at-most-once flag
+ifdef INCLUDED_FUNCTIONS_MK
+$(error Do not include functions.mk twice!)
+endif
+INCLUDED_FUNCTIONS_MK = 1
+
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
+core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
+
+core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in
index ea52cf4c215..8be207b28d9 100644
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -14,9 +14,7 @@ LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-include $(topsrcdir)/config/config.mk
-
-INCLUDES += 	\
+LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
 		-I$(srcdir)/../events/src \
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index 6c54a3403ab..fee696093f9 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -7,14 +7,14 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+
 LIBRARY_NAME     = dombindings_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 # Need this to find all our DOM source files.
 include $(topsrcdir)/dom/dom-config.mk
 
diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in
index 013ee977823..4af352a492f 100644
--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -15,8 +15,6 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/widget/android \
   -I$(topsrcdir)/widget/xpwidgets \
diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in
index dd058cf86af..092cfa2ecd8 100644
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -23,8 +23,7 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 EXPORT_LIBRARY = 1
+
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in
index 3a92b500400..70991e44d9b 100644
--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -15,8 +15,6 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                      -I$(topsrcdir)/content/events/src
                      $(NULL)
diff --git a/dom/system/mac/Makefile.in b/dom/system/mac/Makefile.in
index d894a1e8a85..1a625657221 100644
--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@@ -15,8 +15,6 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)
 
diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in
index 2b063335986..704e52339e2 100644
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -15,8 +15,6 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 ifdef MOZ_MAEMO_LIBLOCATION
         LOCAL_INCLUDES  += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
                            -I$(topsrcdir)/dom/src/geolocation \
diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in
index e904b9d7586..93c3575e786 100644
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -13,9 +13,6 @@ LIBRARY_NAME     = autoconfig
 EXPORT_LIBRARY   = 1
 LIBXUL_LIBRARY   = 1
 
-
-include $(topsrcdir)/config/config.mk
-
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
 		$(NULL)
diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in
index 20de4af7b63..d86dd2020d5 100644
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -37,8 +37,6 @@ vpath %.mm \
   $(srcdir)/src/chrome/common \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 ifneq ($(OS_ARCH),WINNT) # (if OS_POSIX) {
 ifeq ($(OS_TARGET),Android)
 DEFINES += -DANDROID -D_POSIX_MONOTONIC_CLOCK=0
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index bdc042ec884..5a736a6109a 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -149,8 +149,6 @@ else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
-include $(topsrcdir)/config/config.mk
-
 ifeq (,$(MOZ_GLUE_PROGRAM_LDFLAGS))
 # When building standalone, we need to include mfbt sources, and to declare
 # "exported" mfbt symbols on its behalf when we use its headers.
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 90bcc2a65e7..d9c43946d58 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -62,10 +62,9 @@ check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
-core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
-core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
-
-core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif
 
 RM = rm -f
 
diff --git a/js/src/config/makefiles/functions.mk b/js/src/config/makefiles/functions.mk
new file mode 100644
index 00000000000..f42596d9413
--- /dev/null
+++ b/js/src/config/makefiles/functions.mk
@@ -0,0 +1,22 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# functions.mk
+#
+# Defines functions that are needed by various Makefiles throughout the build
+# system, which are needed before config.mk can be included.
+#
+
+# Define an include-at-most-once flag
+ifdef INCLUDED_FUNCTIONS_MK
+$(error Do not include functions.mk twice!)
+endif
+INCLUDED_FUNCTIONS_MK = 1
+
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
+core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
+
+core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
index 11e5bbc14b0..efe097acc23 100644
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -15,8 +15,6 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \
 		-I$(srcdir)/../loader \
diff --git a/js/xpconnect/tests/components/js/Makefile.in b/js/xpconnect/tests/components/js/Makefile.in
index 1a2e77add1f..26b9c7e0ef4 100644
--- a/js/xpconnect/tests/components/js/Makefile.in
+++ b/js/xpconnect/tests/components/js/Makefile.in
@@ -21,8 +21,6 @@ JS_FILES = \
   xpctest_params.js \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = xpctest.manifest
 
 include $(topsrcdir)/config/rules.mk
diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in
index 9bbd0474f29..82566601058 100644
--- a/js/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@@ -15,8 +15,6 @@ IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
 FORCE_SHARED_LIB = 1
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = xpctest.manifest
 
 EXTRA_DSO_LDOPTS += \
diff --git a/security/build/Makefile.in b/security/build/Makefile.in
index 81b1e2a6ddb..efe0ca9585d 100644
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -20,7 +20,7 @@ endif
 
 default::
 
-include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/makefiles/functions.mk
 
 NSS_LIBS = \
   nss3 \
@@ -394,8 +394,6 @@ nss3.def: $(NSS_STATIC_LIBS_DEFS) $(DEPTH)/db/sqlite3/src/sqlite-processed.def
 	mv $@.tmp $@
 endif
 
-# Force the linker to include everything from the static libraries.
-EXPAND_LIBS_EXEC += --extract
 else
 $(NSS_DIST_DLL_FILES) $(NSS_SDK_LIB_FILES): libs-nss/lib
 endif # MOZ_FOLD_LIBS
@@ -403,6 +401,9 @@ endif # MOZ_FOLD_LIBS
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_FOLD_LIBS
+# Force the linker to include everything from the static libraries.
+EXPAND_LIBS_EXEC += --extract
+
 $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS)
 
 EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in
index 441f4e67247..d21c560de51 100644
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -14,8 +14,6 @@ LIBRARY_NAME = toolkitcomps
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../alerts \
   -I$(srcdir)/../downloads \
diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in
index 047dba66ac4..971e04a3aa6 100644
--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@@ -35,8 +35,6 @@ LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/xpcom/base \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 MIDL_GENERATED_FILES = \
 	UIABridge_i.c \
 	UIABridge_p.c \
diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
index 2c672b6c716..aee80a11414 100644
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -21,8 +21,6 @@ LOCAL_INCLUDES = \
 DEFINES		+= -DMOZ_NEED_LEADING_UNDERSCORE
 
 
-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
 
diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index a21c05819dd..f3e0c89042b 100644
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -26,8 +26,6 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1
 endif
 endif
 
-include $(topsrcdir)/config/config.mk
-
 ######################################################################
 # i386 and beyond
 ######################################################################
diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
index 17274d1093d..2acf067ec35 100644
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -17,8 +17,6 @@ MOZILLA_INTERNAL_API = 1
 LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src
 
 
-include $(topsrcdir)/config/config.mk
-
 ifneq ($(TARGET_CPU),x86_64)
 ifndef GNU_CXX
 # FIXME: bug 413019
diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in
index 309dde0a5cc..698a02addf4 100644
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -25,7 +25,6 @@ IS_COMPONENT	= 1
 # name specified in NS_IMPL_NSGETMODULE
 MODULE_NAME	= nsSampleModule
 
-include $(topsrcdir)/config/config.mk
 
 # EXTRA_DSO_LDOPTS specifies linker flags when building a shared library
 # from this Makefile. We link against the "dependent glue" and against the
diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in
index 2ff81e06bd7..33466a7b704 100644
--- a/xpcom/tests/bug656331_component/Makefile.in
+++ b/xpcom/tests/bug656331_component/Makefile.in
@@ -16,8 +16,6 @@ LIBRARY_NAME	= test656331
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = bug656331.manifest
 
 EXTRA_DSO_LDOPTS = \
diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in
index a16787e6b1a..e9bbcf455ee 100644
--- a/xpcom/tests/component/Makefile.in
+++ b/xpcom/tests/component/Makefile.in
@@ -14,8 +14,6 @@ LIBRARY_NAME	= testcomponent
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = testcomponent.manifest
 
 EXTRA_DSO_LDOPTS = \
diff --git a/xpcom/tests/component_no_aslr/Makefile.in b/xpcom/tests/component_no_aslr/Makefile.in
index dcb97e4b68b..b7e875e654a 100644
--- a/xpcom/tests/component_no_aslr/Makefile.in
+++ b/xpcom/tests/component_no_aslr/Makefile.in
@@ -14,8 +14,6 @@ LIBRARY_NAME	= testcompnoaslr
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = testcompnoaslr.manifest
 
 EXTRA_DSO_LDOPTS = \
diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in
index 9e800253b0d..c0957e044dc 100644
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -14,9 +14,6 @@ LIBRARY_NAME	= appcomps
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
 
-
-include $(topsrcdir)/config/config.mk
-
 # General includes
 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../directory

From 027a15b7103084f2225ad34569a6a13998e09f13 Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Tue, 13 Aug 2013 13:15:34 -0700
Subject: [PATCH 38/98] Bug 904808 - fix path to use .js instead of .foobar in
 test_sourcemaps-07.js; r=fitzgen

---
 toolkit/devtools/server/tests/unit/test_sourcemaps-07.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js
index 81e2b763c22..ef6d10ff600 100644
--- a/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js
+++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js
@@ -27,12 +27,12 @@ function run_test()
 
 function test_cached_original_sources()
 {
-  writeFile("temp.foobar", "initial content");
+  writeFile("temp.js", "initial content");
 
   gClient.addOneTimeListener("newSource", onNewSource);
 
   let node = new SourceNode(1, 0,
-                            getFileUrl("temp.foobar"),
+                            getFileUrl("temp.js"),
                             "function funcFromTemp() {}\n");
   let { code, map } = node.toStringWithSourceMap({
     file: "abc.js"
@@ -52,7 +52,7 @@ function onNewSource(aEvent, aPacket) {
     do_check_eq(aResponse.source, "initial content",
                 "The correct source content should be sent");
 
-    writeFile("temp.foobar", "new content");
+    writeFile("temp.js", "new content");
 
     sourceClient.source(function (aResponse) {
       do_check_true(!aResponse.error,
@@ -60,7 +60,7 @@ function onNewSource(aEvent, aPacket) {
       do_check_eq(aResponse.source, "new content",
                   "The correct source content should not be cached, so we should get the new content");
 
-      do_get_file("temp.foobar").remove(false);
+      do_get_file("temp.js").remove(false);
       finishClient(gClient);
     });
   });

From 9393b75b58ee9ca64ea534155fd9a9df848b8b1d Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Thu, 8 Aug 2013 09:28:15 -0700
Subject: [PATCH 39/98] Bug 890555 - Fix strict mode warnings in devtools tests
 uncovered by fixing bug 890555; r=jimb

---
 toolkit/devtools/server/actors/script.js                   | 7 +++++--
 toolkit/devtools/server/protocol.js                        | 4 ++--
 toolkit/devtools/server/tests/unit/test_breakpoint-17.js   | 6 ++++--
 toolkit/devtools/server/tests/unit/test_dbgactor.js        | 1 +
 toolkit/devtools/server/tests/unit/test_dbgsocket.js       | 1 +
 toolkit/devtools/server/tests/unit/test_frameactor-01.js   | 1 -
 toolkit/devtools/server/tests/unit/test_frameactor-02.js   | 1 -
 toolkit/devtools/server/tests/unit/test_frameactor-03.js   | 1 -
 toolkit/devtools/server/tests/unit/test_frameactor-04.js   | 1 -
 toolkit/devtools/server/tests/unit/test_frameactor-05.js   | 1 -
 toolkit/devtools/server/tests/unit/test_frameclient-01.js  | 1 -
 toolkit/devtools/server/tests/unit/test_frameclient-02.js  | 1 -
 .../devtools/server/tests/unit/test_pause_exceptions-01.js | 1 -
 .../devtools/server/tests/unit/test_pause_exceptions-02.js | 1 -
 .../devtools/server/tests/unit/test_pauselifetime-01.js    | 1 -
 .../devtools/server/tests/unit/test_pauselifetime-02.js    | 1 -
 .../devtools/server/tests/unit/test_pauselifetime-03.js    | 1 -
 .../devtools/server/tests/unit/test_pauselifetime-04.js    | 1 -
 .../devtools/server/tests/unit/test_protocol_children.js   | 4 +---
 toolkit/devtools/server/tests/unit/test_sourcemaps-06.js   | 3 ++-
 .../devtools/server/tests/unit/test_threadlifetime-01.js   | 1 -
 .../devtools/server/tests/unit/test_threadlifetime-02.js   | 1 -
 .../devtools/server/tests/unit/test_threadlifetime-03.js   | 1 -
 .../devtools/server/tests/unit/test_threadlifetime-04.js   | 1 -
 .../devtools/server/tests/unit/test_threadlifetime-05.js   | 1 -
 .../devtools/server/tests/unit/test_threadlifetime-06.js   | 1 -
 26 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index a34468de496..3c0aa581984 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -343,7 +343,9 @@ ThreadActor.prototype = {
   addDebuggee: function TA_addDebuggee(aGlobal) {
     let globalDebugObject;
     try {
-      globalDebugObject = this.dbg.addDebuggee(aGlobal);
+      if (this.dbg) {
+        globalDebugObject = this.dbg.addDebuggee(aGlobal);
+      }
     } catch (e) {
       // Ignore attempts to add the debugger's compartment as a debuggee.
       dumpn("Ignoring request to add the debugger's compartment as a debuggee");
@@ -2333,7 +2335,8 @@ ObjectActor.prototype = {
           toString = desc.value;
           break;
         }
-      } while ((obj = obj.proto));
+        obj = obj.proto;
+      } while ((obj));
     } catch (e) {
       dumpn(e);
     }
diff --git a/toolkit/devtools/server/protocol.js b/toolkit/devtools/server/protocol.js
index c53d56e9cc0..d103b3410f2 100644
--- a/toolkit/devtools/server/protocol.js
+++ b/toolkit/devtools/server/protocol.js
@@ -876,8 +876,8 @@ let actorProto = function(actorProto) {
       let frozenSpec = desc.value._methodSpec;
       let spec = {};
       spec.name = frozenSpec.name || name;
-      spec.request = Request(object.merge({type: spec.name}, frozenSpec.request));
-      spec.response = Response(frozenSpec.response);
+      spec.request = Request(object.merge({type: spec.name}, frozenSpec.request || undefined));
+      spec.response = Response(frozenSpec.response || undefined);
       spec.telemetry = frozenSpec.telemetry;
       spec.release = frozenSpec.release;
       spec.oneway = frozenSpec.oneway;
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-17.js b/toolkit/devtools/server/tests/unit/test_breakpoint-17.js
index 4b1a8bc95a7..5e28e5c724c 100644
--- a/toolkit/devtools/server/tests/unit/test_breakpoint-17.js
+++ b/toolkit/devtools/server/tests/unit/test_breakpoint-17.js
@@ -95,7 +95,8 @@ function test_remove_one(aFirst, aSecond) {
                     "Should be at the right line");
         do_check_eq(frame.where.column, secondLocation.column,
                     "Should be at the right column");
-        return void gThreadClient.resume();
+        gThreadClient.resume();
+        return;
       }
 
       if (why.type == "debuggerStatement") {
@@ -103,7 +104,8 @@ function test_remove_one(aFirst, aSecond) {
         do_check_true(hitSecond,
                       "We should still hit `second`, but not `first`.");
 
-        return void finishClient(gClient);
+        finishClient(gClient);
+        return;
       }
 
       do_check_true(false, "Should never get here");
diff --git a/toolkit/devtools/server/tests/unit/test_dbgactor.js b/toolkit/devtools/server/tests/unit/test_dbgactor.js
index a3d03110bb4..ee0ea566a96 100644
--- a/toolkit/devtools/server/tests/unit/test_dbgactor.js
+++ b/toolkit/devtools/server/tests/unit/test_dbgactor.js
@@ -27,6 +27,7 @@ function run_test()
         }
       }
       do_check_true(false); // We should have found our tab in the list.
+      return undefined;
     });
   });
 
diff --git a/toolkit/devtools/server/tests/unit/test_dbgsocket.js b/toolkit/devtools/server/tests/unit/test_dbgsocket.js
index 5d7aa651c69..bdcd048938f 100644
--- a/toolkit/devtools/server/tests/unit/test_dbgsocket.js
+++ b/toolkit/devtools/server/tests/unit/test_dbgsocket.js
@@ -159,6 +159,7 @@ function makeInfallible(aHandler, aName) {
          */
         Cu.reportError(msg);
       }
+      return undefined;
     }
   }
 }
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-01.js b/toolkit/devtools/server/tests/unit/test_frameactor-01.js
index f2fab9f04fd..52125d7cb0d 100644
--- a/toolkit/devtools/server/tests/unit/test_frameactor-01.js
+++ b/toolkit/devtools/server/tests/unit/test_frameactor-01.js
@@ -39,6 +39,5 @@ function test_pause_frame()
       debugger;
     };
     stopMe();
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-02.js b/toolkit/devtools/server/tests/unit/test_frameactor-02.js
index f91f8228839..2c6c01ccea6 100644
--- a/toolkit/devtools/server/tests/unit/test_frameactor-02.js
+++ b/toolkit/devtools/server/tests/unit/test_frameactor-02.js
@@ -41,6 +41,5 @@ function test_pause_frame()
       debugger;
     };
     stopMe();
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-03.js b/toolkit/devtools/server/tests/unit/test_frameactor-03.js
index 26528abc2c8..b7c08d31a05 100644
--- a/toolkit/devtools/server/tests/unit/test_frameactor-03.js
+++ b/toolkit/devtools/server/tests/unit/test_frameactor-03.js
@@ -43,6 +43,5 @@ function test_pause_frame()
      };
     stopMe();
     debugger;
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-04.js b/toolkit/devtools/server/tests/unit/test_frameactor-04.js
index 4950aa76837..cf40f5889a9 100644
--- a/toolkit/devtools/server/tests/unit/test_frameactor-04.js
+++ b/toolkit/devtools/server/tests/unit/test_frameactor-04.js
@@ -87,6 +87,5 @@ function test_pause_frame()
       depth2();
     };
     depth1();
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-05.js b/toolkit/devtools/server/tests/unit/test_frameactor-05.js
index ef4ea4913d6..71eafa7c04a 100644
--- a/toolkit/devtools/server/tests/unit/test_frameactor-05.js
+++ b/toolkit/devtools/server/tests/unit/test_frameactor-05.js
@@ -85,6 +85,5 @@ function test_pause_frame()
     };
     depth1();
     debugger;
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_frameclient-01.js b/toolkit/devtools/server/tests/unit/test_frameclient-01.js
index 932e74c38a2..b75e7eb20c7 100644
--- a/toolkit/devtools/server/tests/unit/test_frameclient-01.js
+++ b/toolkit/devtools/server/tests/unit/test_frameclient-01.js
@@ -49,6 +49,5 @@ function test_pause_frame()
       recurse();
     };
     recurse();
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_frameclient-02.js b/toolkit/devtools/server/tests/unit/test_frameclient-02.js
index 594e1a10438..7e12abbc861 100644
--- a/toolkit/devtools/server/tests/unit/test_frameclient-02.js
+++ b/toolkit/devtools/server/tests/unit/test_frameclient-02.js
@@ -42,6 +42,5 @@ function test_pause_frame()
       recurse();
     };
     recurse();
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_pause_exceptions-01.js b/toolkit/devtools/server/tests/unit/test_pause_exceptions-01.js
index a1b29fead4a..0ca75e388af 100644
--- a/toolkit/devtools/server/tests/unit/test_pause_exceptions-01.js
+++ b/toolkit/devtools/server/tests/unit/test_pause_exceptions-01.js
@@ -46,6 +46,5 @@ function test_pause_frame()
     try {
       stopMe();
     } catch (e) {}
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_pause_exceptions-02.js b/toolkit/devtools/server/tests/unit/test_pause_exceptions-02.js
index fd4fdc10dec..a09de95d35c 100644
--- a/toolkit/devtools/server/tests/unit/test_pause_exceptions-02.js
+++ b/toolkit/devtools/server/tests/unit/test_pause_exceptions-02.js
@@ -42,7 +42,6 @@ function test_pause_frame()
       try {
         stopMe();
       } catch (e) {}
-      ")"
     } + ")()");
   });
 }
diff --git a/toolkit/devtools/server/tests/unit/test_pauselifetime-01.js b/toolkit/devtools/server/tests/unit/test_pauselifetime-01.js
index cc3c31b857d..a7af929456b 100644
--- a/toolkit/devtools/server/tests/unit/test_pauselifetime-01.js
+++ b/toolkit/devtools/server/tests/unit/test_pauselifetime-01.js
@@ -50,6 +50,5 @@ function test_pause_frame()
       debugger;
     };
     stopMe();
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_pauselifetime-02.js b/toolkit/devtools/server/tests/unit/test_pauselifetime-02.js
index bfcba038cb7..bfbb18e3990 100644
--- a/toolkit/devtools/server/tests/unit/test_pauselifetime-02.js
+++ b/toolkit/devtools/server/tests/unit/test_pauselifetime-02.js
@@ -52,6 +52,5 @@ function test_pause_frame()
       debugger;
     };
     stopMe({ foo: "bar" });
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_pauselifetime-03.js b/toolkit/devtools/server/tests/unit/test_pauselifetime-03.js
index c958d58f622..058ca42e64e 100644
--- a/toolkit/devtools/server/tests/unit/test_pauselifetime-03.js
+++ b/toolkit/devtools/server/tests/unit/test_pauselifetime-03.js
@@ -57,6 +57,5 @@ function test_pause_frame()
       debugger;
     };
     stopMe({ foo: "bar" });
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_pauselifetime-04.js b/toolkit/devtools/server/tests/unit/test_pauselifetime-04.js
index a9f9aa9d176..a9d90d0215b 100644
--- a/toolkit/devtools/server/tests/unit/test_pauselifetime-04.js
+++ b/toolkit/devtools/server/tests/unit/test_pauselifetime-04.js
@@ -44,6 +44,5 @@ function test_pause_frame()
       debugger;
     };
     stopMe({ foo: "bar" });
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_children.js b/toolkit/devtools/server/tests/unit/test_protocol_children.js
index 6322f0133ea..c8b90a8b1ec 100644
--- a/toolkit/devtools/server/tests/unit/test_protocol_children.js
+++ b/toolkit/devtools/server/tests/unit/test_protocol_children.js
@@ -173,8 +173,6 @@ let RootActor = protocol.ActorClass({
     this.manage(this);
   },
 
-  toString: function() "root actor",
-
   sayHello: simpleHello,
 
   getChild: method(function(id) {
@@ -246,7 +244,7 @@ let RootFront = protocol.FrontClass(RootActor, {
 
   clearTemporaryChildren: protocol.custom(function() {
     if (!this._temporaryHolder) {
-      return;
+      return resolve(undefined);
     }
     this._temporaryHolder.destroy();
     delete this._temporaryHolder;
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js
index 9e614762384..96ae819d3a1 100644
--- a/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js
+++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js
@@ -67,7 +67,8 @@ function test_source_content()
 
 function testContents(aSources, aCallback) {
   if (aSources.length === 0) {
-    return aCallback();
+    aCallback();
+    return;
   }
 
   let source = aSources[0];
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-01.js b/toolkit/devtools/server/tests/unit/test_threadlifetime-01.js
index 378e92037e0..3ebd93c8272 100644
--- a/toolkit/devtools/server/tests/unit/test_threadlifetime-01.js
+++ b/toolkit/devtools/server/tests/unit/test_threadlifetime-01.js
@@ -54,6 +54,5 @@ function test_thread_lifetime()
       debugger;
     };
     stopMe({obj: true});
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-02.js b/toolkit/devtools/server/tests/unit/test_threadlifetime-02.js
index a586cf2c626..b56143cdeff 100644
--- a/toolkit/devtools/server/tests/unit/test_threadlifetime-02.js
+++ b/toolkit/devtools/server/tests/unit/test_threadlifetime-02.js
@@ -55,6 +55,5 @@ function test_thread_lifetime()
       debugger;
     };
     stopMe({obj: true});
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-03.js b/toolkit/devtools/server/tests/unit/test_threadlifetime-03.js
index e3608218314..60fa595f02c 100644
--- a/toolkit/devtools/server/tests/unit/test_threadlifetime-03.js
+++ b/toolkit/devtools/server/tests/unit/test_threadlifetime-03.js
@@ -50,7 +50,6 @@ function test_thread_lifetime()
       debugger;
     };
     stopMe({obj: 1}, {obj: 2}, {obj: 3});
-    ")"
   } + ")()");
 }
 
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-04.js b/toolkit/devtools/server/tests/unit/test_threadlifetime-04.js
index e71cdf07219..38cd38dd6ea 100644
--- a/toolkit/devtools/server/tests/unit/test_threadlifetime-04.js
+++ b/toolkit/devtools/server/tests/unit/test_threadlifetime-04.js
@@ -49,6 +49,5 @@ function test_thread_lifetime()
       debugger;
     };
     stopMe({obj: true});
-    ")"
   } + ")()");
 }
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-05.js b/toolkit/devtools/server/tests/unit/test_threadlifetime-05.js
index 03a7ca8669b..7795f010061 100644
--- a/toolkit/devtools/server/tests/unit/test_threadlifetime-05.js
+++ b/toolkit/devtools/server/tests/unit/test_threadlifetime-05.js
@@ -60,7 +60,6 @@ function test_thread_lifetime()
       debugger;
     };
     stopMe({obj: 1}, {obj: 2}, {obj: 3});
-    ")"
   } + ")()");
 }
 
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-06.js b/toolkit/devtools/server/tests/unit/test_threadlifetime-06.js
index 1562766246b..b71a48dc748 100644
--- a/toolkit/devtools/server/tests/unit/test_threadlifetime-06.js
+++ b/toolkit/devtools/server/tests/unit/test_threadlifetime-06.js
@@ -67,6 +67,5 @@ function test_thread_lifetime()
       debugger;
     };
     stopMe({obj: 1}, {obj: 2}, {obj: 3});
-    ")"
   } + ")()");
 }

From 743c84306190078da857c972b6edf1bd7a18b0e3 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb>
Date: Wed, 7 Aug 2013 15:44:00 -0700
Subject: [PATCH 40/98] Bug 890555 - Fix silent bugs in some
 toolkit/devtools/server xpcshell tests; r=dcamp

---
 .../server/tests/unit/test_blackboxing-04.js  |  2 +-
 .../server/tests/unit/test_blackboxing-05.js  | 18 +++++------
 .../server/tests/unit/test_stepping-06.js     | 32 +++++++++----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-04.js b/toolkit/devtools/server/tests/unit/test_blackboxing-04.js
index fce7ce98346..0cc0b550f67 100644
--- a/toolkit/devtools/server/tests/unit/test_blackboxing-04.js
+++ b/toolkit/devtools/server/tests/unit/test_blackboxing-04.js
@@ -53,7 +53,7 @@ function test_black_box()
     "" + function runTest() { // line 1
       doStuff(                // line 2
         function (n) {        // line 3
-          n;                  // line 4
+          return n;           // line 4
         }                     // line 5
       );                      // line 6
     }                         // line 7
diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-05.js b/toolkit/devtools/server/tests/unit/test_blackboxing-05.js
index c6971070980..15aac272624 100644
--- a/toolkit/devtools/server/tests/unit/test_blackboxing-05.js
+++ b/toolkit/devtools/server/tests/unit/test_blackboxing-05.js
@@ -47,15 +47,15 @@ function test_black_box()
   );
 
   Components.utils.evalInSandbox(
-    "" + function runTest() { // line 1
-      doStuff(                // line 2
-        function (n) {        // line 3
-          debugger;           // line 4
-        }                     // line 5
-      );                      // line 6
-    }                         // line 7
-    + "\ndebugger;\n"         // line 8
-    + "runTest()",            // line 9
+    "" + function runTest() {                   // line 1
+      doStuff(                                  // line 2
+        function (n) {                          // line 3
+          debugger;                             // line 4
+        }                                       // line 5
+      );                                        // line 6
+    }                                           // line 7
+    + "\ndebugger;\n"                           // line 8
+    + "try { runTest() } catch (ex) { }",       // line 9
     gDebuggee,
     "1.8",
     SOURCE_URL,
diff --git a/toolkit/devtools/server/tests/unit/test_stepping-06.js b/toolkit/devtools/server/tests/unit/test_stepping-06.js
index d92f831cbe7..3dcb99fd4fb 100644
--- a/toolkit/devtools/server/tests/unit/test_stepping-06.js
+++ b/toolkit/devtools/server/tests/unit/test_stepping-06.js
@@ -71,20 +71,20 @@ function test_simple_stepping()
   });
 
   gDebuggee.eval("var line0 = Error().lineNumber;\n" +
-                 "function f() {\n" + // line0 + 1
-                 "  debugger;\n" +    // line0 + 2
-                 "  var a = 10;\n" +  // line0 + 3
-                 "  return a;\n" +    // line0 + 4
-                 "}\n" +              // line0 + 5
-                 "function g() {\n" + // line0 + 6
-                 "  debugger;\n" +    // line0 + 7
-                 "}\n" +              // line0 + 8
-                 "function h() {\n" + // line0 + 9
-                 "  debugger;\n" +    // line0 + 10
-                 "  throw 'ah';\n" +  // line0 + 11
-                 "  return 2;\n" +    // line0 + 12
-                 "}\n" +              // line0 + 13
-                 "f();\n" +           // line0 + 14
-                 "g();\n" +           // line0 + 15
-                 "h();\n");           // line0 + 16
+                 "function f() {\n" +                   // line0 + 1
+                 "  debugger;\n" +                      // line0 + 2
+                 "  var a = 10;\n" +                    // line0 + 3
+                 "  return a;\n" +                      // line0 + 4
+                 "}\n" +                                // line0 + 5
+                 "function g() {\n" +                   // line0 + 6
+                 "  debugger;\n" +                      // line0 + 7
+                 "}\n" +                                // line0 + 8
+                 "function h() {\n" +                   // line0 + 9
+                 "  debugger;\n" +                      // line0 + 10
+                 "  throw 'ah';\n" +                    // line0 + 11
+                 "  return 2;\n" +                      // line0 + 12
+                 "}\n" +                                // line0 + 13
+                 "f();\n" +                             // line0 + 14
+                 "g();\n" +                             // line0 + 15
+                 "try { h() } catch (ex) { };\n");      // line0 + 16
 }

From 32ae0a0fa58d8fe6a2eb14e79fa581a57634941a Mon Sep 17 00:00:00 2001
From: Irving Reid <irving@mozilla.com>
Date: Sat, 13 Jul 2013 12:37:13 -0400
Subject: [PATCH 41/98] Bug 890555 - Handle case of non-Object argument to
 do_throw; r=ted

---
 testing/xpcshell/head.js     | 85 +++++++++++++++++++------------
 testing/xpcshell/selftest.py | 97 ++++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+), 32 deletions(-)

diff --git a/testing/xpcshell/head.js b/testing/xpcshell/head.js
index 68ff339d79e..cc3b596d927 100644
--- a/testing/xpcshell/head.js
+++ b/testing/xpcshell/head.js
@@ -476,41 +476,36 @@ function do_execute_soon(callback, aName) {
  */
 function do_throw(error, stack) {
   let filename = "";
-  if (!stack) {
-    // Use duck typing rather than instanceof in case error came
-    // from another context
-    if ("filename" in error)
-      filename = error.fileName;
-    if ("stack" in error) {
-      // |error| is likely an exception object
-      stack = error.stack;
-    } else {
-      stack = Components.stack.caller;
-    }
-  }
+  // If we didn't get passed a stack, maybe the error has one
+  // otherwise get it from our call context
+  stack = stack || error.stack || Components.stack.caller;
 
   if (stack instanceof Components.interfaces.nsIStackFrame)
     filename = stack.filename;
+  else if (error.fileName)
+    filename = error.fileName;
 
-  _dump("TEST-UNEXPECTED-FAIL | " + filename + " | " + error +
-        " - See following stack:\n");
+  _dump_message_with_stack("TEST-UNEXPECTED-FAIL | " + filename + " | ", error, stack);
 
+  _passed = false;
+  _do_quit();
+  throw Components.results.NS_ERROR_ABORT;
+}
+
+function _dump_stack(stack) {
   if (stack instanceof Components.interfaces.nsIStackFrame) {
     let frame = stack;
     while (frame != null) {
       _dump(frame + "\n");
       frame = frame.caller;
     }
-  } else if (typeof stack == "string") {
+  }
+  else if (typeof stack == "string") {
     let stackLines = stack.split("\n");
     for (let line of stackLines) {
       _dump(line + "\n");
     }
   }
-
-  _passed = false;
-  _do_quit();
-  throw Components.results.NS_ERROR_ABORT;
 }
 
 function do_throw_todo(text, stack) {
@@ -518,26 +513,52 @@ function do_throw_todo(text, stack) {
     stack = Components.stack.caller;
 
   _passed = false;
-  _dump("TEST-UNEXPECTED-PASS | " + stack.filename + " | " + text +
-        " - See following stack:\n");
-  var frame = Components.stack;
-  while (frame != null) {
-    _dump(frame + "\n");
-    frame = frame.caller;
-  }
+  _dump_message_with_stack("TEST-UNEXPECTED-PASS | " + stack.filename + " | ",
+      text, stack);
 
   _do_quit();
   throw Components.results.NS_ERROR_ABORT;
 }
 
+// Make a nice display string from an object that behaves
+// like Error
+function _exception_message(ex) {
+  let message = "";
+  if (ex.name) {
+    message = ex.name + ": ";
+  }
+  if (ex.message) {
+    message += ex.message;
+  }
+  if (ex.fileName) {
+    message += (" at " + ex.fileName);
+    if (ex.lineNumber) {
+      message += (":" + ex.lineNumber);
+    }
+  }
+  if (message !== "") {
+    return message;
+  }
+  // Force ex to be stringified
+  return "" + ex;
+}
+
+function _dump_message_with_stack(preamble, ex, stack) {
+  _dump(preamble + _exception_message(ex) +
+      (stack ? " - see following stack:\n" : "\n"));
+  if (stack) {
+    _dump_stack(stack);
+  }
+}
+
 function do_report_unexpected_exception(ex, text) {
   var caller_stack = Components.stack.caller;
   text = text ? text + " - " : "";
 
   _passed = false;
-  _dump("TEST-UNEXPECTED-FAIL | " + caller_stack.filename + " | " + text +
-        "Unexpected exception " + ex + ", see following stack:\n" + ex.stack +
-        "\n");
+  _dump_message_with_stack("TEST-UNEXPECTED-FAIL | " + caller_stack.filename +
+        " | " + text + "Unexpected exception ",
+        ex, ex.stack);
 
   _do_quit();
   throw Components.results.NS_ERROR_ABORT;
@@ -547,9 +568,9 @@ function do_note_exception(ex, text) {
   var caller_stack = Components.stack.caller;
   text = text ? text + " - " : "";
 
-  _dump("TEST-INFO | " + caller_stack.filename + " | " + text +
-        "Swallowed exception " + ex + ", see following stack:\n" + ex.stack +
-        "\n");
+  _dump_message_with_stack("TEST-INFO | " + caller_stack.filename +
+        " | " + text + "Swallowed exception ",
+        ex, ex.stack);
 }
 
 function _do_check_neq(left, right, stack, todo) {
diff --git a/testing/xpcshell/selftest.py b/testing/xpcshell/selftest.py
index ebaa2cef75a..dda6b55492d 100644
--- a/testing/xpcshell/selftest.py
+++ b/testing/xpcshell/selftest.py
@@ -84,6 +84,43 @@ add_task(function test() {
 });
 '''
 
+ADD_TEST_THROW_STRING = '''
+function run_test() {do_throw("Passing a string to do_throw")};
+'''
+
+ADD_TEST_THROW_OBJECT = '''
+let error = {
+  message: "Error object",
+  fileName: "failure.js",
+  stack: "ERROR STACK",
+  toString: function() {return this.message;}
+};
+function run_test() {do_throw(error)};
+'''
+
+ADD_TEST_REPORT_OBJECT = '''
+let error = {
+  message: "Error object",
+  fileName: "failure.js",
+  stack: "ERROR STACK",
+  toString: function() {return this.message;}
+};
+function run_test() {do_report_unexpected_exception(error)};
+'''
+
+# A test for genuine JS-generated Error objects
+ADD_TEST_REPORT_REF_ERROR = '''
+function run_test() {
+  let obj = {blah: 0};
+  try {
+    obj.noSuchFunction();
+  }
+  catch (error) {
+    do_report_unexpected_exception(error);
+  }
+};
+'''
+
 class XPCShellTestsTests(unittest.TestCase):
     """
     Yes, these are unit tests for a unit test harness.
@@ -446,5 +483,65 @@ tail =
         self.assertTrue(testcases[1].find("failure") is not None)
         self.assertTrue(testcases[2].find("skipped") is not None)
 
+    def testDoThrowString(self):
+        """
+        Check that do_throw produces reasonable messages when the
+        input is a string instead of an object
+        """
+        self.writeFile("test_error.js", ADD_TEST_THROW_STRING)
+        self.writeManifest(["test_error.js"])
+
+        self.assertTestResult(False)
+        self.assertInLog("TEST-UNEXPECTED-FAIL")
+        self.assertInLog("Passing a string to do_throw")
+        self.assertNotInLog("TEST-PASS")
+
+    def testDoThrowForeignObject(self):
+        """
+        Check that do_throw produces reasonable messages when the
+        input is a generic object with 'filename', 'message' and 'stack' attributes
+        but 'object instanceof Error' returns false
+        """
+        self.writeFile("test_error.js", ADD_TEST_THROW_OBJECT)
+        self.writeManifest(["test_error.js"])
+
+        self.assertTestResult(False)
+        self.assertInLog("TEST-UNEXPECTED-FAIL")
+        self.assertInLog("failure.js")
+        self.assertInLog("Error object")
+        self.assertInLog("ERROR STACK")
+        self.assertNotInLog("TEST-PASS")
+
+    def testDoReportForeignObject(self):
+        """
+        Check that do_report_unexpected_exception produces reasonable messages when the
+        input is a generic object with 'filename', 'message' and 'stack' attributes
+        but 'object instanceof Error' returns false
+        """
+        self.writeFile("test_error.js", ADD_TEST_REPORT_OBJECT)
+        self.writeManifest(["test_error.js"])
+
+        self.assertTestResult(False)
+        self.assertInLog("TEST-UNEXPECTED-FAIL")
+        self.assertInLog("failure.js")
+        self.assertInLog("Error object")
+        self.assertInLog("ERROR STACK")
+        self.assertNotInLog("TEST-PASS")
+
+    def testDoReportRefError(self):
+        """
+        Check that do_report_unexpected_exception produces reasonable messages when the
+        input is a JS-generated Error
+        """
+        self.writeFile("test_error.js", ADD_TEST_REPORT_REF_ERROR)
+        self.writeManifest(["test_error.js"])
+
+        self.assertTestResult(False)
+        self.assertInLog("TEST-UNEXPECTED-FAIL")
+        self.assertInLog("test_error.js")
+        self.assertInLog("obj.noSuchFunction is not a function")
+        self.assertInLog("run_test@")
+        self.assertNotInLog("TEST-PASS")
+
 if __name__ == "__main__":
     unittest.main()

From 0bc2b5c5ea979c20e3d17a75d789754acf25d4b9 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Wed, 14 Aug 2013 12:54:33 -0400
Subject: [PATCH 42/98] Bug 904646 - Skip NULLs when traversing envp/auxv
 pointers to let GDB work on Android 4.3; r=glandium

---
 mozglue/linker/ElfLoader.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mozglue/linker/ElfLoader.cpp b/mozglue/linker/ElfLoader.cpp
index 10e3f9a1484..cbab5952b0b 100644
--- a/mozglue/linker/ElfLoader.cpp
+++ b/mozglue/linker/ElfLoader.cpp
@@ -541,6 +541,7 @@ ElfLoader::DebuggerHelper::DebuggerHelper(): dbg(NULL)
    *   ...
    *   envp[n] (likewise)
    *   NULL
+   *   ... (more NULLs on some platforms such as Android 4.3)
    *   auxv[0] (first ELF auxiliary vector)
    *   auxv[1] (second ELF auxiliary vector)
    *   ...
@@ -587,6 +588,11 @@ ElfLoader::DebuggerHelper::DebuggerHelper(): dbg(NULL)
   /* Finally, scan forward to find the last environment variable pointer and
    * thus the first auxiliary vector. */
   while (*scan++);
+
+  /* Some platforms have more NULLs here, so skip them if we encounter them */
+  while (!*scan)
+    scan++;
+
   AuxVector *auxv = reinterpret_cast<AuxVector *>(scan);
 
   /* The two values of interest in the auxiliary vectors are AT_PHDR and

From 88ffbcdfc3ecdedcd32b86e95827fc57658ab0dc Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 14 Aug 2013 10:13:55 -0700
Subject: [PATCH 43/98] Bug 850380 - Ensure .xpt files are written in binary
 mode (windows bustage)

---
 python/mozbuild/mozbuild/action/xpidl-process.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/mozbuild/mozbuild/action/xpidl-process.py b/python/mozbuild/mozbuild/action/xpidl-process.py
index c1dbd46c966..a61c6d07add 100755
--- a/python/mozbuild/mozbuild/action/xpidl-process.py
+++ b/python/mozbuild/mozbuild/action/xpidl-process.py
@@ -57,9 +57,9 @@ def process(input_dir, cache_dir, header_dir, xpt_dir, deps_dir, module, stems):
         with FileAvoidWrite(header_path) as fh:
             print_header(idl, fh, path)
 
+    # TODO use FileAvoidWrite once it supports binary mode.
     xpt_path = os.path.join(xpt_dir, '%s.xpt' % module)
-    with FileAvoidWrite(xpt_path) as fh:
-        xpt_link(xpts.values()).writefd(fh)
+    xpt_link(xpts.values()).write(xpt_path)
 
     deps_path = os.path.join(deps_dir, '%s.pp' % module)
     with FileAvoidWrite(deps_path) as fh:

From e00814595a5d5ec421a3726b970b211af7d9b6a9 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 14 Aug 2013 13:21:52 -0400
Subject: [PATCH 44/98] Backed out changeset 5432f96b6ba0 (bug 899855) for B2G
 test bustage. CLOSED TREE

---
 gfx/gl/GLContext.cpp | 126 ++-----------------------------------------
 1 file changed, 4 insertions(+), 122 deletions(-)

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 589be4d58f7..7b1217c8938 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -131,116 +131,10 @@ NS_MEMORY_REPORTER_IMPLEMENT(TextureMemoryUsage,
     GetTextureMemoryUsage,
     "Memory used for storing GL textures.")
 
-static bool
-ParseGLVersion(GLContext* gl, unsigned int* version)
-{
-    GLenum error = gl->fGetError();
-    if (error != LOCAL_GL_NO_ERROR) {
-        MOZ_ASSERT(false, "An OpenGL error has been triggered before.");
-        return false;
-    }
-
-    { // Anon scope to allow identifier reuse
-        /**
-         * OpenGL 3.1 and OpenGL ES 3.0 both introduce GL_{MAJOR,MINOR}_VERSION
-         * with GetIntegerv. So we first try those constantes even we might not
-         * have an OpenGL, to prevent error in parsing GL_VERSION.
-         */
-        GLint majorVersion = 0;
-        GLint minorVersion = 0;
-
-        gl->fGetIntegerv(LOCAL_GL_MAJOR_VERSION, &majorVersion);
-        gl->fGetIntegerv(LOCAL_GL_MINOR_VERSION, &minorVersion);
-
-        // If it's not an OpenGL (ES) 3.0, we will have an error
-        error = gl->fGetError();
-        if (error == LOCAL_GL_NO_ERROR &&
-            majorVersion > 0 &&
-            minorVersion >= 0)
-        {
-            *version = majorVersion * 100 + minorVersion * 10;
-            return true;
-        }
-    }
-
-    /**
-     * We were not able to use GL_{MAJOR,MINOR}_VERSION, so we parse
-     * GL_VERSION.
-     *
-     *
-     * OpenGL 2.x, 3.x, 4.x specifications:
-     *  The VERSION and SHADING_LANGUAGE_VERSION strings are laid out as follows:
-     *
-     *    <version number><space><vendor-specific information>
-     *
-     *  The version number is either of the form major_number.minor_number or
-     *  major_number.minor_number.release_number, where the numbers all have
-     *  one or more digits.
-     *
-     *
-     * OpenGL ES 2.0, 3.0 specifications:
-     *  The VERSION string is laid out as follows:
-     *
-     *     "OpenGL ES N.M vendor-specific information"
-     *
-     *  The version number is either of the form major_number.minor_number or
-     *  major_number.minor_number.release_number, where the numbers all have
-     *  one or more digits.
-     *
-     *
-     * Note:
-     *  We don't care about release_number.
-     */
-    const char* versionString = (const char*)gl->fGetString(LOCAL_GL_VERSION);
-
-    error = gl->fGetError();
-    if (error != LOCAL_GL_NO_ERROR) {
-        MOZ_ASSERT(false, "glGetString(GL_VERSION) has generated an error");
-        return false;
-    } else if (!versionString) {
-        MOZ_ASSERT(false, "glGetString(GL_VERSION) has returned 0");
-        return false;
-    }
-
-    const char kGLESVersionPrefix[] = "OpenGL ES ";
-    if (strncmp(versionString, kGLESVersionPrefix, strlen(kGLESVersionPrefix)) == 0) {
-        versionString += strlen(kGLESVersionPrefix);
-    }
-
-    const char* itr = versionString;
-    char* end = nullptr;
-    int majorVersion = (int)strtol(itr, &end, 10);
-
-    if (!end) {
-        MOZ_ASSERT(false, "Failed to parse the GL major version number.");
-        return false;
-    } else if (*end != '.') {
-        MOZ_ASSERT(false, "Failed to parse GL's major-minor version number separator.");
-        return false;
-    }
-
-    // we skip the '.' between the major and the minor version
-    itr = end + 1;
-
-    end = nullptr;
-
-    int minorVersion = (int)strtol(itr, &end, 10);
-    if (!end) {
-        MOZ_ASSERT(false, "Failed to parse GL's minor version number.");
-        return false;
-    }
-
-    if (majorVersion <= 0 || majorVersion >= 100) {
-        MOZ_ASSERT(false, "Invalid major version.");
-        return false;
-    } else if (minorVersion < 0 || minorVersion >= 10) {
-        MOZ_ASSERT(false, "Invalid minor version.");
-        return false;
-    }
-
-    *version = (unsigned int)(majorVersion * 100 + minorVersion * 10);
-    return true;
-}
+/*
+ * XXX - we should really know the ARB/EXT variants of these
+ * instead of only handling the symbol if it's exposed directly.
+ */
 
 bool
 GLContext::InitWithPrefix(const char *prefix, bool trygl)
@@ -401,18 +295,6 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
 
     mInitialized = LoadSymbols(&symbols[0], trygl, prefix);
 
-    if (mInitialized) {
-        unsigned int version = 0;
-
-        bool parseSuccess = ParseGLVersion(this, &version);
-
-        if (version >= mVersion) {
-            mVersion = version;
-        } else if (parseSuccess) {
-            MOZ_ASSERT(false, "Parsed version less than expected.");
-        }
-    }
-
     // Load OpenGL ES 2.0 symbols, or desktop if we aren't using ES 2.
     if (mInitialized) {
         if (IsGLES2()) {

From 90bda8a70744bcbe76c460f45cf85b961c37d052 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 14 Aug 2013 13:29:10 -0400
Subject: [PATCH 45/98] Backed out changeset e91392042137 (bug 892488) for
 mochitest-3 failures. CLOSED TREE

---
 browser/base/content/test/Makefile.in         |  1 -
 .../test/browser_offlineQuotaNotification.js  |  2 -
 browser/base/content/test/offlineByDefault.js | 17 -----
 .../test/test_offlineNotification.html        |  3 -
 .../base/content/test/test_offline_gzip.html  |  2 -
 content/base/public/nsContentUtils.h          |  6 --
 content/base/src/nsContentSink.cpp            |  7 +-
 content/base/src/nsContentUtils.cpp           | 32 ---------
 dom/src/offline/nsDOMOfflineResourceList.cpp  | 48 ++++----------
 dom/src/offline/nsDOMOfflineResourceList.h    |  1 +
 .../offline/460353_iframe_samemanifest.html   |  4 --
 .../mochitest/ajax/offline/foreign2.html      | 38 ++++++-----
 .../mochitest/ajax/offline/offlineChild.html  |  2 +-
 .../mochitest/ajax/offline/offlineTests.js    | 51 ++------------
 .../ajax/offline/test_bug460353.html          | 15 +----
 .../ajax/offline/test_bug474696.html          |  3 +-
 .../ajax/offline/test_bug744719-cancel.html   | 66 +++++++++----------
 .../ajax/offline/test_bug744719.html          |  9 +--
 .../ajax/offline/test_cancelOfflineCache.html |  1 -
 .../mochitest/ajax/offline/test_foreign.html  | 14 +---
 .../ajax/offline/test_lowDeviceStorage.html   |  1 +
 .../ajax/offline/test_updatingManifest.html   | 16 ++---
 .../android/base/tests/testDoorHanger.java.in | 61 -----------------
 modules/libpref/src/init/all.js               |  2 -
 .../prefetch/nsOfflineCacheUpdateService.cpp  | 14 +++-
 25 files changed, 107 insertions(+), 309 deletions(-)
 delete mode 100644 browser/base/content/test/offlineByDefault.js

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index deee2218ade..07974075470 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -35,7 +35,6 @@ MOCHITEST_FILES = \
         test_feed_discovery.html \
         test_offline_gzip.html \
         test_offlineNotification.html \
-        offlineByDefault.js \
         video.ogg \
         $(NULL)
 
diff --git a/browser/base/content/test/browser_offlineQuotaNotification.js b/browser/base/content/test/browser_offlineQuotaNotification.js
index 507600d3049..a8aba6b9730 100644
--- a/browser/base/content/test/browser_offlineQuotaNotification.js
+++ b/browser/base/content/test/browser_offlineQuotaNotification.js
@@ -14,7 +14,6 @@ registerCleanupFunction(function() {
   var principal = Services.scriptSecurityManager.getNoAppCodebasePrincipal(uri);
   Services.perms.removeFromPrincipal(principal, "offline-app");
   Services.prefs.clearUserPref("offline-apps.quota.warn");
-  Services.prefs.clearUserPref("offline-apps.allow_by_default");
 });
 
 // Check that the "preferences" UI is opened and showing which websites have
@@ -71,6 +70,5 @@ function test() {
     PopupNotifications.panel.firstElementChild.button.click();
   }, true);
 
-  Services.prefs.setBoolPref("offline-apps.allow_by_default", false);
   gBrowser.contentWindow.location = URL;
 }
diff --git a/browser/base/content/test/offlineByDefault.js b/browser/base/content/test/offlineByDefault.js
deleted file mode 100644
index 72f7e52a01b..00000000000
--- a/browser/base/content/test/offlineByDefault.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var offlineByDefault = {
-  defaultValue: false,
-  prefBranch: SpecialPowers.Cc["@mozilla.org/preferences-service;1"].getService(SpecialPowers.Ci.nsIPrefBranch),
-  set: function(allow) {
-    try {
-      this.defaultValue = this.prefBranch.getBoolPref("offline-apps.allow_by_default");
-    } catch (e) {
-      this.defaultValue = false
-    }
-    this.prefBranch.setBoolPref("offline-apps.allow_by_default", allow);
-  },
-  reset: function() {
-    this.prefBranch.setBoolPref("offline-apps.allow_by_default", this.defaultValue);
-  }
-}
-
-offlineByDefault.set(false);
diff --git a/browser/base/content/test/test_offlineNotification.html b/browser/base/content/test/test_offlineNotification.html
index ad015a8623e..8c603f15061 100644
--- a/browser/base/content/test/test_offlineNotification.html
+++ b/browser/base/content/test/test_offlineNotification.html
@@ -6,7 +6,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=462856
 <head>
   <title>Test offline app notification</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="offlineByDefault.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="loaded()">
@@ -53,8 +52,6 @@ window.addEventListener("message", function(event) {
       pm.removeFromPrincipal(principal1, "offline-app");
       pm.removeFromPrincipal(principal2, "offline-app");
 
-      offlineByDefault.reset();
-
       SimpleTest.finish();
     }
   }, false);
diff --git a/browser/base/content/test/test_offline_gzip.html b/browser/base/content/test/test_offline_gzip.html
index 1b4a6129961..09713da92ed 100644
--- a/browser/base/content/test/test_offline_gzip.html
+++ b/browser/base/content/test/test_offline_gzip.html
@@ -13,7 +13,6 @@ cache, it can be fetched from the cache successfully.
           src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript"
           src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="offlineByDefault.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body onload="loaded()">
@@ -47,7 +46,6 @@ function finishTest() {
 
   window.removeEventListener("message", handleMessageEvents, false);
 
-  offlineByDefault.reset();
   SimpleTest.finish();  
 }
 
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 383c1fdb84c..3044829a7f8 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -1503,12 +1503,6 @@ public:
    */
   static bool OfflineAppAllowed(nsIPrincipal *aPrincipal);
 
-  /**
-   * If offline-apps.allow_by_default is true, we set offline-app permission
-   * for the principal and return true.  Otherwise false.
-   */
-  static bool MaybeAllowOfflineAppByDefault(nsIPrincipal *aPrincipal);
-
   /**
    * Increases the count of blockers preventing scripts from running.
    * NOTE: You might want to use nsAutoScriptBlocker rather than calling
diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
index ad4c1c843e0..af7deb997d2 100644
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -1061,11 +1061,8 @@ nsContentSink::ProcessOfflineManifest(const nsAString& aManifestSpec)
       action = CACHE_SELECTION_RESELECT_WITHOUT_MANIFEST;
     }
     else {
-      // Only continue if the document has permission to use offline APIs or
-      // when preferences indicate to permit it automatically.
-      if (!nsContentUtils::OfflineAppAllowed(mDocument->NodePrincipal()) &&
-          !nsContentUtils::MaybeAllowOfflineAppByDefault(mDocument->NodePrincipal()) &&
-          !nsContentUtils::OfflineAppAllowed(mDocument->NodePrincipal())) {
+      // Only continue if the document has permission to use offline APIs.
+      if (!nsContentUtils::OfflineAppAllowed(mDocument->NodePrincipal())) {
         return;
       }
 
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 9f40892233f..c39ef5b8b6d 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -1405,38 +1405,6 @@ nsContentUtils::OfflineAppAllowed(nsIPrincipal *aPrincipal)
   return NS_SUCCEEDED(rv) && allowed;
 }
 
-bool
-nsContentUtils::MaybeAllowOfflineAppByDefault(nsIPrincipal *aPrincipal)
-{
-  if (!Preferences::GetRootBranch())
-    return false;
-
-  nsresult rv;
-
-  bool allowedByDefault;
-  rv = Preferences::GetRootBranch()->GetBoolPref(
-    "offline-apps.allow_by_default", &allowedByDefault);
-  if (NS_FAILED(rv))
-    return false;
-
-  if (!allowedByDefault)
-    return false;
-
-  nsCOMPtr<nsIPermissionManager> permissionManager =
-      do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-  if (!permissionManager)
-    return false;
-
-  rv = permissionManager->AddFromPrincipal(
-    aPrincipal, "offline-app", nsIPermissionManager::ALLOW_ACTION,
-    nsIPermissionManager::EXPIRE_NEVER, 0);
-  if (NS_FAILED(rv))
-    return false;
-
-  // We have added the permission
-  return true;
-}
-
 // static
 void
 nsContentUtils::Shutdown()
diff --git a/dom/src/offline/nsDOMOfflineResourceList.cpp b/dom/src/offline/nsDOMOfflineResourceList.cpp
index e6de4f4babc..fa4811db5b5 100644
--- a/dom/src/offline/nsDOMOfflineResourceList.cpp
+++ b/dom/src/offline/nsDOMOfflineResourceList.cpp
@@ -84,6 +84,7 @@ nsDOMOfflineResourceList::nsDOMOfflineResourceList(nsIURI *aManifestURI,
   , mManifestURI(aManifestURI)
   , mDocumentURI(aDocumentURI)
   , mExposeCacheUpdateStatus(true)
+  , mDontSetDocumentCache(false)
   , mStatus(nsIDOMOfflineResourceList::IDLE)
   , mCachedKeys(nullptr)
   , mCachedKeysCount(0)
@@ -428,11 +429,6 @@ nsDOMOfflineResourceList::GetStatus(uint16_t *aStatus)
     }
   }
 
-  if (mAvailableApplicationCache) {
-    *aStatus = nsIDOMOfflineResourceList::UPDATEREADY;
-    return NS_OK;
-  }
-
   *aStatus = mStatus;
   return NS_OK;
 }
@@ -459,6 +455,10 @@ nsDOMOfflineResourceList::Update()
                                      window, getter_AddRefs(update));
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // Since we are invoking the cache update, cache on the document must not
+  // be updated until swapCache() method is called on applicationCache object.
+  mDontSetDocumentCache = true;
+
   return NS_OK;
 }
 
@@ -488,8 +488,6 @@ nsDOMOfflineResourceList::SwapCache()
     mAvailableApplicationCache->GetClientID(availClientId);
     if (availClientId == currClientId)
       return NS_ERROR_DOM_INVALID_STATE_ERR;
-  } else if (mStatus != OBSOLETE) {
-    return NS_ERROR_DOM_INVALID_STATE_ERR;
   }
 
   ClearCachedKeys();
@@ -631,36 +629,16 @@ nsDOMOfflineResourceList::UpdateStateChanged(nsIOfflineCacheUpdate *aUpdate,
 NS_IMETHODIMP
 nsDOMOfflineResourceList::ApplicationCacheAvailable(nsIApplicationCache *aApplicationCache)
 {
-  nsCOMPtr<nsIApplicationCache> currentAppCache = GetDocumentAppCache();
-  if (currentAppCache) {
-    // Document already has a cache, we cannot override it.  swapCache is
-    // here to do it on demand.
+  mAvailableApplicationCache = aApplicationCache;
 
-    // If the newly available cache is identical to the current cache, then
-    // just ignore this event.
-    if (aApplicationCache == currentAppCache) {
-      return NS_OK;
-    }
+  if (!mDontSetDocumentCache) {
+    nsCOMPtr<nsIApplicationCacheContainer> appCacheContainer =
+      GetDocumentAppCacheContainer();
 
-    nsCString currClientId, availClientId;
-    currentAppCache->GetClientID(currClientId);
-    aApplicationCache->GetClientID(availClientId);
-    if (availClientId == currClientId) {
-      return NS_OK;
-    }
-
-    mAvailableApplicationCache = aApplicationCache;
-    return NS_OK;
+    if (appCacheContainer)
+      appCacheContainer->SetApplicationCache(aApplicationCache);
   }
 
-  nsCOMPtr<nsIApplicationCacheContainer> appCacheContainer =
-    GetDocumentAppCacheContainer();
-
-  if (appCacheContainer) {
-    appCacheContainer->SetApplicationCache(aApplicationCache);
-  }
-
-  mAvailableApplicationCache = nullptr;
   return NS_OK;
 }
 
@@ -759,12 +737,14 @@ nsDOMOfflineResourceList::UpdateCompleted(nsIOfflineCacheUpdate *aUpdate)
 
   mCacheUpdate->RemoveObserver(this);
   mCacheUpdate = nullptr;
+  mDontSetDocumentCache = false;
 
   if (NS_SUCCEEDED(rv) && succeeded && !partial) {
-    mStatus = nsIDOMOfflineResourceList::IDLE;
     if (isUpgrade) {
+      mStatus = nsIDOMOfflineResourceList::UPDATEREADY;
       SendEvent(NS_LITERAL_STRING(UPDATEREADY_STR));
     } else {
+      mStatus = nsIDOMOfflineResourceList::IDLE;
       SendEvent(NS_LITERAL_STRING(CACHED_STR));
     }
   }
diff --git a/dom/src/offline/nsDOMOfflineResourceList.h b/dom/src/offline/nsDOMOfflineResourceList.h
index 40858869cf7..eeb63d2c3a0 100644
--- a/dom/src/offline/nsDOMOfflineResourceList.h
+++ b/dom/src/offline/nsDOMOfflineResourceList.h
@@ -157,6 +157,7 @@ private:
   nsCOMPtr<nsIApplicationCache> mAvailableApplicationCache;
   nsCOMPtr<nsIOfflineCacheUpdate> mCacheUpdate;
   bool mExposeCacheUpdateStatus;
+  bool mDontSetDocumentCache;
   uint16_t mStatus;
 
   // The set of dynamic keys for this application cache object.
diff --git a/dom/tests/mochitest/ajax/offline/460353_iframe_samemanifest.html b/dom/tests/mochitest/ajax/offline/460353_iframe_samemanifest.html
index de357827b6a..556789792be 100644
--- a/dom/tests/mochitest/ajax/offline/460353_iframe_samemanifest.html
+++ b/dom/tests/mochitest/ajax/offline/460353_iframe_samemanifest.html
@@ -12,10 +12,6 @@ applicationCache.oncached = function() {
   parent.frameOnUpdate("same", true, applicationCache.status);
 }
 
-applicationCache.onnoupdate = function() {
-  parent.frameOnUpdate("same", true, applicationCache.status);
-}
-
 </script>
 
 </head>
diff --git a/dom/tests/mochitest/ajax/offline/foreign2.html b/dom/tests/mochitest/ajax/offline/foreign2.html
index e330c9f5a04..133c1748e10 100644
--- a/dom/tests/mochitest/ajax/offline/foreign2.html
+++ b/dom/tests/mochitest/ajax/offline/foreign2.html
@@ -10,57 +10,59 @@
 
 function manifestUpdated()
 {
-dump(">>>>>>>>>>>>>> MANIFESTUPDATED\n");
   var appCacheService = SpecialPowers.Components.classes["@mozilla.org/network/application-cache-service;1"]
     .getService(SpecialPowers.Ci.nsIApplicationCacheService);
 
   var foreign2cache = appCacheService.chooseApplicationCache(
     "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html", OfflineTest.loadContext());
 
-  window.opener.OfflineTest.ok(foreign2cache, "Foreign 2 cache present, chosen for foreign2.html");
-  window.opener.OfflineTest.is(foreign2cache.manifestURI.asciiSpec, "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.cacheManifest")
+  OfflineTest.ok(foreign2cache, "Foreign 2 cache present, chosen for foreign2.html");
+  OfflineTest.is(foreign2cache.manifestURI.asciiSpec, "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.cacheManifest")
 
   var foreign1cache = OfflineTest.getActiveCache(
     "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign1.cacheManifest");
-  window.opener.OfflineTest.ok(foreign1cache, "Foreign 1 cache loaded");
+  OfflineTest.ok(foreign1cache, "Foreign 1 cache loaded");
   foreign1cache.discard();
 
-  window.opener.onDone();
+  OfflineTest.teardown();
+  OfflineTest.finish();
 }
 
 function onLoaded()
 {
-dump(">>>>>>>>>>>>>> ONLOADED\n");
   var appCacheService = SpecialPowers.Components.classes["@mozilla.org/network/application-cache-service;1"]
     .getService(SpecialPowers.Ci.nsIApplicationCacheService);
 
-  var foreign1cache = window.opener.OfflineTest.getActiveCache(
+  var foreign1cache = OfflineTest.getActiveCache(
     "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign1.cacheManifest");
-  window.opener.OfflineTest.ok(foreign1cache, "Foreign 1 cache loaded");
+  OfflineTest.ok(foreign1cache, "Foreign 1 cache loaded");
 
-  var foreign2cache = window.opener.OfflineTest.getActiveCache(
+  var foreign2cache = OfflineTest.getActiveCache(
     "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.cacheManifest");
-  window.opener.OfflineTest.ok(!foreign2cache, "Foreign 2 cache not present");
+  OfflineTest.ok(!foreign2cache, "Foreign 2 cache not present");
 
   foreign1cache = appCacheService.chooseApplicationCache(
-    "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html", window.opener.OfflineTest.loadContext());
-  window.opener.OfflineTest.ok(!foreign1cache, "foreign2.html not chosen from foreign1 cache");
+    "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html", OfflineTest.loadContext());
+  OfflineTest.ok(!foreign1cache, "foreign2.html not chosen from foreign1 cache");
 
   try
   {
-    window.opener.OfflineTest.ok(applicationCache.status == SpecialPowers.Ci.nsIDOMOfflineResourceList.UNCACHED,
+    OfflineTest.ok(applicationCache.status == SpecialPowers.Ci.nsIDOMOfflineResourceList.UNCACHED,
         "there is no associated application cache");
   }
   catch (ex)
   {
-    window.opener.OfflineTest.ok(false, "applicationCache.status must not throw an exception");
+    OfflineTest.ok(false, "applicationCache.status must not throw an exception");
   }
 }
 
-applicationCache.onerror = window.opener.OfflineTest.failEvent;
-applicationCache.onupdateready = window.opener.OfflineTest.failEvent;
-applicationCache.onnoupdate = window.opener.OfflineTest.failEvent;
-applicationCache.oncached = window.opener.OfflineTest.priv(manifestUpdated);
+if (OfflineTest.setup())
+{
+  applicationCache.onerror = OfflineTest.failEvent;
+  applicationCache.onupdateready = OfflineTest.failEvent;
+  applicationCache.onnoupdate = OfflineTest.failEvent;
+  applicationCache.oncached = OfflineTest.priv(manifestUpdated);
+}
 
 </script>
 
diff --git a/dom/tests/mochitest/ajax/offline/offlineChild.html b/dom/tests/mochitest/ajax/offline/offlineChild.html
index d70a060a164..38b6fae9ac0 100644
--- a/dom/tests/mochitest/ajax/offline/offlineChild.html
+++ b/dom/tests/mochitest/ajax/offline/offlineChild.html
@@ -12,7 +12,7 @@
 // (since we don't get those events)
 function doneLoading()
 {
-  window.parent.childFinished();
+  window.top.childFinished();
 }
 
 if (OfflineTest.setupChild()) {
diff --git a/dom/tests/mochitest/ajax/offline/offlineTests.js b/dom/tests/mochitest/ajax/offline/offlineTests.js
index a5410298b97..a39de0a77f7 100644
--- a/dom/tests/mochitest/ajax/offline/offlineTests.js
+++ b/dom/tests/mochitest/ajax/offline/offlineTests.js
@@ -58,8 +58,6 @@ fetch: function(callback)
 
 var OfflineTest = {
 
-_allowedByDefault: false,
-
 _hasSlave: false,
 
 // The window where test results should be sent.
@@ -73,11 +71,6 @@ _SJSsStated: [],
 
 setupChild: function()
 {
-  if (this._allowedByDefault) {
-    this._masterWindow = window;
-    return true;
-  }
-
   if (window.parent.OfflineTest._hasSlave) {
     return false;
   }
@@ -98,17 +91,6 @@ setup: function()
 {
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-  var prefBranch = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-  try {
-    this._allowedByDefault = prefBranch.getBoolPref("offline-apps.allow_by_default");
-  } catch (e) {}
-
-  if (this._allowedByDefault) {
-    this._masterWindow = window;
-
-    return true;
-  }
-
   if (!window.opener || !window.opener.OfflineTest ||
       !window.opener.OfflineTest._hasSlave) {
     // Offline applications must be toplevel windows and have the
@@ -172,9 +154,7 @@ teardown: function()
 
 finish: function()
 {
-  if (this._allowedByDefault) {
-    SimpleTest.executeSoon(SimpleTest.finish);
-  } else if (this._masterWindow) {
+  if (this._masterWindow) {
     // Slave window: pass control back to master window, close itself.
     this._masterWindow.SimpleTest.executeSoon(this._masterWindow.OfflineTest.finish);
     window.close();
@@ -257,25 +237,12 @@ waitForAdd: function(url, onFinished) {
 
 manifestURL: function(overload)
 {
-  var manifestURLspec;
-  if (overload) {
-    manifestURLspec = overload;
-  } else {
-    var win = window;
-    while (win && !win.document.documentElement.getAttribute("manifest")) {
-      if (win == win.parent)
-        break;
-      win = win.parent;
-    }
-    if (win)
-      manifestURLspec = win.document.documentElement.getAttribute("manifest");
-  }
+  var manifestURLspec = overload || window.top.document.documentElement.getAttribute("manifest");
 
   var ios = Cc["@mozilla.org/network/io-service;1"]
             .getService(Ci.nsIIOService)
 
   var baseURI = ios.newURI(window.location.href, null, null);
-  dump("manifestURLspec=" + manifestURLspec + "\n");
   return ios.newURI(manifestURLspec, null, baseURI);
 },
 
@@ -294,17 +261,14 @@ getActiveCache: function(overload)
   var serv = Cc["@mozilla.org/network/application-cache-service;1"]
              .getService(Ci.nsIApplicationCacheService);
   var groupID = serv.buildGroupID(this.manifestURL(overload), this.loadContext());
-  dump("Getting active cache for " + groupID + " (o=" + overload + ")\n");
   return serv.getActiveCache(groupID);
 },
 
 getActiveSession: function()
 {
   var cache = this.getActiveCache();
-  if (!cache) {
-    dump("No active cache\n");
+  if (!cache)
     return null;
-  }
 
   var cacheService = Cc["@mozilla.org/network/cache-service;1"]
                      .getService(Ci.nsICacheService);
@@ -338,7 +302,6 @@ checkCacheEntries: function(entries, callback)
 
 checkCache: function(url, expectEntry, callback)
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var cacheSession = this.getActiveSession();
   this._checkCache(cacheSession, url, expectEntry, callback);
 },
@@ -347,11 +310,11 @@ _checkCache: function(cacheSession, url, expectEntry, callback)
 {
   if (!cacheSession) {
     if (expectEntry) {
-      this.ok(false, url + " should exist in the offline cache (no session)");
+      this.ok(false, url + " should exist in the offline cache");
     } else {
-      this.ok(true, url + " should not exist in the offline cache (no session)");
+      this.ok(true, url + " should not exist in the offline cache");
     }
-    if (callback) setTimeout(this.priv(callback), 0);
+    setTimeout(this.priv(callback), 0);
     return;
   }
 
@@ -383,7 +346,7 @@ _checkCache: function(cacheSession, url, expectEntry, callback)
           OfflineTest.ok(false, "got invalid error for " + url);
         }
       }
-      if (callback) setTimeout(OfflineTest.priv(callback), 0);
+      setTimeout(OfflineTest.priv(callback), 0);
     }
   };
 
diff --git a/dom/tests/mochitest/ajax/offline/test_bug460353.html b/dom/tests/mochitest/ajax/offline/test_bug460353.html
index 84cb0370443..c0ba51aa967 100644
--- a/dom/tests/mochitest/ajax/offline/test_bug460353.html
+++ b/dom/tests/mochitest/ajax/offline/test_bug460353.html
@@ -16,16 +16,10 @@
 <script class="testbody" type="text/javascript">
 
 var result = new Array();
-var expectedUpdates = 3; // 2 iframes and our self
+var expectedUpdates = 2;
 
 init();
 
-function onUpdatePassed()
-{
-  if (!(--expectedUpdates))
-    SimpleTest.executeSoon(finish);
-}
-
 function init()
 {
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -41,9 +35,6 @@ function init()
                     .getService(Ci.nsIScriptSecurityManager)
                     .getNoAppCodebasePrincipal(uri);
   pm.addFromPrincipal(principal, "offline-app", Ci.nsIPermissionManager.ALLOW_ACTION);
-
-  applicationCache.oncached = onUpdatePassed;
-  applicationCache.onnoupdate = onUpdatePassed;
 }
 
 function frameOnLoad(frameid, status)
@@ -61,7 +52,8 @@ function frameOnUpdate(frameid, ok, status)
   result[frameid].updateOK = ok;
   result[frameid].cacheStatus = status;
 
-  onUpdatePassed();
+  if (!(--expectedUpdates))
+    finish();
 }
 
 function finish()
@@ -106,7 +98,6 @@ function cleanCache(manifestURL)
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   var cache = OfflineTest.getActiveCache(manifestURL);
-  dump("Discarding cache for " + manifestURL + " cache=" + cache + "\n");
   if (cache)
     cache.discard();
 }
diff --git a/dom/tests/mochitest/ajax/offline/test_bug474696.html b/dom/tests/mochitest/ajax/offline/test_bug474696.html
index 779e5df11db..ecc964d386b 100644
--- a/dom/tests/mochitest/ajax/offline/test_bug474696.html
+++ b/dom/tests/mochitest/ajax/offline/test_bug474696.html
@@ -15,9 +15,8 @@ function manifestUpdated()
 
 function onFallbackLoad(fallbackIdentification)
 {
-  OfflineTest.is(fallbackIdentification, 1, "Got correct fallback for namespace1 (2)");
+  OfflineTest.is(fallbackIdentification, 1, "Got correct fallback for namespace1");
 
-  applicationCache.onerror = function() {}; // the update invoked by the iframe will finish after we discard the cache, ignore error
   OfflineTest.teardown();
   OfflineTest.finish();
 }
diff --git a/dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html b/dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html
index 8909dc4f3ce..8487c0ee1ff 100644
--- a/dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html
+++ b/dom/tests/mochitest/ajax/offline/test_bug744719-cancel.html
@@ -19,42 +19,42 @@ ok(applicationCache.mozItems.length == 0,
 
 function updateCanceled()
 {
-  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/744719-cancel.cacheManifest", false, null);
-  OfflineTest.checkCache("http://mochi.test:8888/tests/SimpleTest/SimpleTest.js", false, null);
-  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/offlineTests.js", false, null);
+  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/744719-cancel.cacheManifest", false);
+  OfflineTest.checkCache("http://mochi.test:8888/tests/SimpleTest/SimpleTest.js", false);
+  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/offlineTests.js", false);
 
-  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/nonexistent744719?010", false, null);
+  OfflineTest.checkCache("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/nonexistent744719?010", false);
 
   var URL = "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/subresource744719.html?";
-  OfflineTest.checkCache(URL + "001", false, null);
-  OfflineTest.checkCache(URL + "002", false, null);
-  OfflineTest.checkCache(URL + "003", false, null);
-  OfflineTest.checkCache(URL + "004", false, null);
-  OfflineTest.checkCache(URL + "005", false, null);
-  OfflineTest.checkCache(URL + "006", false, null);
-  OfflineTest.checkCache(URL + "007", false, null);
-  OfflineTest.checkCache(URL + "008", false, null);
-  OfflineTest.checkCache(URL + "009", false, null);
-  OfflineTest.checkCache(URL + "011", false, null);
-  OfflineTest.checkCache(URL + "012", false, null);
-  OfflineTest.checkCache(URL + "013", false, null);
-  OfflineTest.checkCache(URL + "014", false, null);
-  OfflineTest.checkCache(URL + "015", false, null);
-  OfflineTest.checkCache(URL + "016", false, null);
-  OfflineTest.checkCache(URL + "017", false, null);
-  OfflineTest.checkCache(URL + "018", false, null);
-  OfflineTest.checkCache(URL + "019", false, null);
-  OfflineTest.checkCache(URL + "020", false, null);
-  OfflineTest.checkCache(URL + "021", false, null);
-  OfflineTest.checkCache(URL + "022", false, null);
-  OfflineTest.checkCache(URL + "023", false, null);
-  OfflineTest.checkCache(URL + "024", false, null);
-  OfflineTest.checkCache(URL + "025", false, null);
-  OfflineTest.checkCache(URL + "026", false, null);
-  OfflineTest.checkCache(URL + "027", false, null);
-  OfflineTest.checkCache(URL + "028", false, null);
-  OfflineTest.checkCache(URL + "029", false, null);
-  OfflineTest.checkCache(URL + "030", false, null);
+  OfflineTest.checkCache(URL + "001", false);
+  OfflineTest.checkCache(URL + "002", false);
+  OfflineTest.checkCache(URL + "003", false);
+  OfflineTest.checkCache(URL + "004", false);
+  OfflineTest.checkCache(URL + "005", false);
+  OfflineTest.checkCache(URL + "006", false);
+  OfflineTest.checkCache(URL + "007", false);
+  OfflineTest.checkCache(URL + "008", false);
+  OfflineTest.checkCache(URL + "009", false);
+  OfflineTest.checkCache(URL + "011", false);
+  OfflineTest.checkCache(URL + "012", false);
+  OfflineTest.checkCache(URL + "013", false);
+  OfflineTest.checkCache(URL + "014", false);
+  OfflineTest.checkCache(URL + "015", false);
+  OfflineTest.checkCache(URL + "016", false);
+  OfflineTest.checkCache(URL + "017", false);
+  OfflineTest.checkCache(URL + "018", false);
+  OfflineTest.checkCache(URL + "019", false);
+  OfflineTest.checkCache(URL + "020", false);
+  OfflineTest.checkCache(URL + "021", false);
+  OfflineTest.checkCache(URL + "022", false);
+  OfflineTest.checkCache(URL + "023", false);
+  OfflineTest.checkCache(URL + "024", false);
+  OfflineTest.checkCache(URL + "025", false);
+  OfflineTest.checkCache(URL + "026", false);
+  OfflineTest.checkCache(URL + "027", false);
+  OfflineTest.checkCache(URL + "028", false);
+  OfflineTest.checkCache(URL + "029", false);
+  OfflineTest.checkCache(URL + "030", false);
 
   OfflineTest.teardown();
 
diff --git a/dom/tests/mochitest/ajax/offline/test_bug744719.html b/dom/tests/mochitest/ajax/offline/test_bug744719.html
index d66222db871..17f0300ee11 100644
--- a/dom/tests/mochitest/ajax/offline/test_bug744719.html
+++ b/dom/tests/mochitest/ajax/offline/test_bug744719.html
@@ -52,10 +52,11 @@ function manifestUpdated()
   OfflineTest.checkCache(URL + "027", true);
   OfflineTest.checkCache(URL + "028", true);
   OfflineTest.checkCache(URL + "029", true);
-  OfflineTest.checkCache(URL + "030", true, function() {
-    OfflineTest.teardown();
-    OfflineTest.finish();
-  });
+  OfflineTest.checkCache(URL + "030", true);
+
+  OfflineTest.teardown();
+
+  OfflineTest.finish();
 }
 
 if (OfflineTest.setup()) {
diff --git a/dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html b/dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html
index 29a974b280b..d315c4af2cc 100644
--- a/dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html
+++ b/dom/tests/mochitest/ajax/offline/test_cancelOfflineCache.html
@@ -43,7 +43,6 @@ function onProgress () {
 
 if (OfflineTest.setup()) {
   applicationCache.onerror = OfflineTest.priv(onError);
-  applicationCache.onnoupdate = OfflineTest.failEvent;
   applicationCache.onprogress = OfflineTest.priv(onProgress);
   applicationCache.oncached = OfflineTest.priv(manifestCached);
 }
diff --git a/dom/tests/mochitest/ajax/offline/test_foreign.html b/dom/tests/mochitest/ajax/offline/test_foreign.html
index c07e7d3388b..e5b337decc6 100644
--- a/dom/tests/mochitest/ajax/offline/test_foreign.html
+++ b/dom/tests/mochitest/ajax/offline/test_foreign.html
@@ -19,11 +19,9 @@
  * chosen by foreign.html page.
  */
 
-var win;
-
 function manifestUpdated()
 {
-  var appCacheService = SpecialPowers.Cc["@mozilla.org/network/application-cache-service;1"]
+  var appCacheService = SpecialPowers.Components.classes["@mozilla.org/network/application-cache-service;1"]
     .getService(SpecialPowers.Ci.nsIApplicationCacheService);
 
   foreign1cache = appCacheService.chooseApplicationCache(
@@ -32,15 +30,7 @@ function manifestUpdated()
   OfflineTest.ok(foreign1cache, "foreign2.html chosen from foreign1 cache");
   OfflineTest.is(foreign1cache.manifestURI.asciiSpec, "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign1.cacheManifest")
 
-  win = window.open("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html");
-}
-
-function onDone() // called by the open window after stuff is finished
-{
-dump(">>>>>>>>>>>>>> ON-DONE\n");
-  win.close();
-  OfflineTest.teardown();
-  OfflineTest.finish();
+  window.location = "http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/foreign2.html";
 }
 
 SimpleTest.waitForExplicitFinish();
diff --git a/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html b/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html
index c5ead68c778..47b65833c7f 100644
--- a/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html
+++ b/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html
@@ -46,6 +46,7 @@ if (OfflineTest.setup()) {
           aUpdate.removeObserver(this);
           errorReceived = true;
           OfflineTest.ok(true, "Expected error. Update canceled");
+          finish();
         break;
         case Ci.nsIOfflineCacheUpdateObserver.STATE_FINISHED:
           OfflineTest.ok(errorReceived,
diff --git a/dom/tests/mochitest/ajax/offline/test_updatingManifest.html b/dom/tests/mochitest/ajax/offline/test_updatingManifest.html
index 42fc23db0f2..c2a21c5b835 100644
--- a/dom/tests/mochitest/ajax/offline/test_updatingManifest.html
+++ b/dom/tests/mochitest/ajax/offline/test_updatingManifest.html
@@ -38,7 +38,7 @@ function waitForLocations(frames, doneFunc)
   if (frame)
     // toString() might cause problems when this test will
     // completely be changed to test IDN behavior.
-    OfflineTest.waitForAdd(frame, function()
+    OfflineTest.waitForAdd(frame.location.toString(), function()
       {
         waitForLocations(frames, doneFunc);
       }
@@ -94,7 +94,7 @@ function frameLoad(version)
   {
     var call = gCallOnUpdatingFrameLoad;
     gCallOnUpdatingFrameLoad = null;
-    SimpleTest.executeSoon(OfflineTest.priv(call));
+    OfflineTest.priv(call)();
   }
 }
 
@@ -112,15 +112,12 @@ function manifestCached()
   OfflineTest.is(gStep, 0, "Got manifestCached in step 0, gStep=" + gStep);
 
   reloadLocations([fallbackFrame1, fallbackFrame2]);
-  waitForLocations(
-    ["http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/fallback.html"],
-    fallbackLoaded
-  );
+  waitForLocations([fallbackFrame1, fallbackFrame2],
+      fallbackLoaded);
 }
 
 function fallbackLoaded()
 {
-  dump("in fallbackLoaded\n");
   applicationCache.mozAdd("http://mochi.test:8888/tests/SimpleTest/EventUtils.js");
   OfflineTest.waitForAdd("http://mochi.test:8888/tests/SimpleTest/EventUtils.js",
       dynamicLoaded);
@@ -129,7 +126,7 @@ function fallbackLoaded()
 function dynamicLoaded()
 {
   window.open("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/updatingImplicit.html");
-  // window.applicationCache.noupdate invokes implicitLoaded()
+  // window.onload invokes implicitLoaded()
 }
 
 function implicitLoaded(aWindow, errorOccured)
@@ -240,8 +237,8 @@ function manifestUpdated()
         OfflineTest.setSJSState("http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/updatingIframe.sjs", "second");
 
         gGotFrameVersion = 0;
+        gCallOnUpdatingFrameLoad = function() {applicationCache.update();};
         updatingFrame.location.reload();
-        // Since the frame is offline-cached, reload of it invokes update
       });
 
     break;
@@ -301,7 +298,6 @@ function manifestNoUpdate()
   applicationCache.onnoupdate = null;
 
   OfflineTest.ok(gStep == 3, "Got manifestNoUpdate in step 3, gStep=" + gStep);
-  ++gStep;
 
   OfflineTest.is(applicationCache.status, SpecialPowers.Ci.nsIDOMOfflineResourceList.UPDATEREADY,
         "we have associated application cache and update is pending (4)");
diff --git a/mobile/android/base/tests/testDoorHanger.java.in b/mobile/android/base/tests/testDoorHanger.java.in
index c1ac235a7a7..b4668ffbc9f 100644
--- a/mobile/android/base/tests/testDoorHanger.java.in
+++ b/mobile/android/base/tests/testDoorHanger.java.in
@@ -1,16 +1,6 @@
 #filter substitution
 package @ANDROID_PACKAGE_NAME@.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-import java.lang.reflect.Method;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 /* This test will test if doorhangers are displayed and dismissed
    The test will test:
    * geolocation doorhangers - sharing and not sharing the location dismisses the doorhanger
@@ -75,45 +65,6 @@ public class testDoorHanger extends BaseTest {
         // Make sure doorhanger is hidden
         mAsserter.is(mSolo.searchText(GEO_MESSAGE), false, "Geolocation doorhanger notification is hidden when opening a new tab");
 
-
-        boolean offlineAllowedByDefault = true;
-        try {
-            // Save offline-allow-by-default preferences first
-            JSONArray getPrefData = new JSONArray();
-            getPrefData.put("offline-apps.allow_by_default");
-            JSONObject message = new JSONObject();
-            message.put("requestId", "testDoorHanger");
-            message.put("preferences", getPrefData);
-
-            Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
-            mActions.sendGeckoEvent("Preferences:Get", message.toString());
-
-            JSONObject data = null;
-            String requestId = "";
-
-            // Wait until we get the correct "Preferences:Data" event
-            while (!requestId.equals("testDoorHanger")) {
-                data = new JSONObject(eventExpecter.blockForEventData());
-                requestId = data.getString("requestId");
-            }
-            eventExpecter.unregisterListener();
-
-            JSONArray preferences = data.getJSONArray("preferences");
-            if (preferences.length() > 0) {
-                JSONObject pref = (JSONObject) preferences.get(0);
-                offlineAllowedByDefault = pref.getBoolean("value");
-            }
-
-            // Turn off offline-allow-by-default
-            JSONObject jsonPref = new JSONObject();
-            jsonPref.put("name", "offline-apps.allow_by_default");
-            jsonPref.put("type", "bool");
-            jsonPref.put("value", false);
-            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
-        } catch (JSONException e) {
-            mAsserter.ok(false, "exception getting preference", e.toString());
-        }
-
         // Load offline storage page
         loadUrl(OFFLINE_STORAGE_URL);
         waitForText(OFFLINE_MESSAGE);
@@ -133,18 +84,6 @@ public class testDoorHanger extends BaseTest {
         loadUrl(OFFLINE_STORAGE_URL);
         mAsserter.is(mSolo.searchText(OFFLINE_MESSAGE), false, "Offline storage doorhanger is no longer triggered");
 
-        try {
-            // Revert offline setting
-            JSONObject jsonPref = new JSONObject();
-            jsonPref.put("name", "offline-apps.allow_by_default");
-            jsonPref.put("type", "boolean");
-            jsonPref.put("value", offlineAllowedByDefault);
-            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
-        } catch (JSONException e) {
-            mAsserter.ok(false, "exception setting preference", e.toString());
-        }
-
-
         // Load login page
         loadUrl(LOGIN_URL);
         waitForText(LOGIN_MESSAGE);
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 5435234bcea..bed68772348 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -61,8 +61,6 @@ pref("browser.cache.disk_cache_ssl",        true);
 pref("browser.cache.check_doc_frequency",   3);
 
 pref("browser.cache.offline.enable",           true);
-// enable offline apps by default, disable prompt
-pref("offline-apps.allow_by_default",          true);
 
 // offline cache capacity in kilobytes
 pref("browser.cache.offline.capacity",         512000);
diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
index d742e738cb8..7139b0c505b 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
+++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
@@ -686,14 +686,22 @@ OfflineAppPermForURI(nsIURI *aURI,
     const char *permName = pinned ? "pin-app" : "offline-app";
     permissionManager->TestExactPermission(innerURI, permName, &perm);
 
+    if (perm == nsIPermissionManager::UNKNOWN_ACTION && !pinned) {
+        static const char kPrefName[] = "offline-apps.allow_by_default";
+        if (aPrefBranch) {
+            aPrefBranch->GetBoolPref(kPrefName, aAllowed);
+        } else {
+            *aAllowed = Preferences::GetBool(kPrefName, false);
+        }
+
+        return NS_OK;
+    }
+
     if (perm == nsIPermissionManager::ALLOW_ACTION ||
         perm == nsIOfflineCacheUpdateService::ALLOW_NO_WARN) {
         *aAllowed = true;
     }
 
-    // offline-apps.allow_by_default is now effective at the cache selection
-    // algorithm code (nsContentSink).
-
     return NS_OK;
 }
 

From 1972477f4d556a0798f80f2003ff64a142e5728a Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 14 Aug 2013 13:40:20 -0400
Subject: [PATCH 46/98] No bug - Disable timeout-prone B2G crashtests. CLOSED
 TREE

---
 content/media/test/crashtests/crashtests.list | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
index fab64f81161..91e59303e21 100644
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -33,7 +33,7 @@ load 876249.html
 load 876252.html
 load 876834.html
 load 877820.html
-load 878014.html
+skip-if(B2G) load 878014.html #timeout-prone, bug 833371
 load 878328.html
 load 878407.html
 load 878478.html
@@ -44,7 +44,7 @@ load 880342-1.html
 load 880342-2.html
 load 880384.html
 load 880404.html
-load 880724.html
+skip-if(B2G) load 880724.html, bug 833371
 load 881775.html
 load 882956.html
 test-pref(media.webvtt.enabled,true) load 882549.html

From 07ff40b56ef972c15f7ea13ce550d104e40eca4d Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 14 Aug 2013 14:54:27 -0400
Subject: [PATCH 47/98] No bug - Fix busted crashtest manifest. r=stupidme
 DONTBUILD CLOSED TREE

---
 content/media/test/crashtests/crashtests.list | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
index 91e59303e21..ddc63a3dc26 100644
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -33,7 +33,7 @@ load 876249.html
 load 876252.html
 load 876834.html
 load 877820.html
-skip-if(B2G) load 878014.html #timeout-prone, bug 833371
+skip-if(B2G) load 878014.html # timeout-prone, bug 833371
 load 878328.html
 load 878407.html
 load 878478.html
@@ -44,7 +44,7 @@ load 880342-1.html
 load 880342-2.html
 load 880384.html
 load 880404.html
-skip-if(B2G) load 880724.html, bug 833371
+skip-if(B2G) load 880724.html # timeout-prone, bug 833371
 load 881775.html
 load 882956.html
 test-pref(media.webvtt.enabled,true) load 882549.html

From 64b2bc7dd96298556f8096b29288477299dca804 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 14 Aug 2013 15:12:20 -0400
Subject: [PATCH 48/98] Backed out changesets 1fa1f28c6edf and e74f694f31c4
 (bug 850380) for PGO bustage on a CLOSED TREE.

---
 browser/components/places/moz.build           |   4 +
 browser/components/places/src/moz.build       |   4 +
 config/config.mk                              |   9 +-
 config/makefiles/precompile/Makefile.in       |  12 +-
 config/makefiles/xpidl/Makefile.in            |  67 -----------
 config/rules.mk                               | 104 +++++++++++++++---
 dom/activities/interfaces/moz.build           |   6 +
 dom/alarm/moz.build                           |   4 +
 dom/base/moz.build                            |   5 +
 dom/camera/moz.build                          |   7 ++
 dom/cellbroadcast/interfaces/moz.build        |   6 +
 dom/file/moz.build                            |   6 +
 dom/fm/moz.build                              |   4 +
 dom/icc/interfaces/moz.build                  |   6 +
 dom/indexedDB/moz.build                       |   5 +
 dom/interfaces/apps/moz.build                 |   5 +
 dom/interfaces/base/moz.build                 |   4 +
 dom/interfaces/contacts/moz.build             |   5 +
 dom/interfaces/core/moz.build                 |   4 +
 dom/interfaces/css/moz.build                  |   5 +
 dom/interfaces/devicestorage/moz.build        |   5 +
 dom/interfaces/events/moz.build               |   4 +
 dom/interfaces/geolocation/moz.build          |   4 +
 dom/interfaces/html/moz.build                 |   5 +
 dom/interfaces/json/moz.build                 |   4 +
 dom/interfaces/notification/moz.build         |   4 +
 dom/interfaces/offline/moz.build              |   4 +
 dom/interfaces/permission/moz.build           |   4 +
 dom/interfaces/range/moz.build                |   4 +
 dom/interfaces/settings/moz.build             |   5 +
 dom/interfaces/smil/moz.build                 |   7 ++
 dom/interfaces/storage/moz.build              |   5 +
 dom/interfaces/stylesheets/moz.build          |   4 +
 dom/interfaces/svg/moz.build                  |   6 +
 dom/interfaces/traversal/moz.build            |   4 +
 dom/interfaces/xbl/moz.build                  |   4 +
 dom/interfaces/xpath/moz.build                |   5 +
 dom/interfaces/xul/moz.build                  |   6 +
 dom/messages/interfaces/moz.build             |   4 +
 dom/mobilemessage/interfaces/moz.build        |   6 +
 dom/network/interfaces/moz.build              |   6 +
 dom/payment/interfaces/moz.build              |   4 +
 dom/system/gonk/moz.build                     |   4 +
 dom/telephony/moz.build                       |   6 +
 dom/voicemail/moz.build                       |   6 +
 dom/wifi/moz.build                            |   7 ++
 hal/moz.build                                 |   2 +-
 js/src/config/config.mk                       |   9 +-
 js/src/config/rules.mk                        | 104 +++++++++++++++---
 js/xpconnect/tests/idl/Makefile.in            |   2 +-
 netwerk/mime/moz.build                        |   4 +
 netwerk/protocol/file/moz.build               |   4 +
 netwerk/protocol/http/moz.build               |   4 +
 netwerk/protocol/res/moz.build                |   4 +
 netwerk/protocol/viewsource/moz.build         |   4 +
 netwerk/protocol/wyciwyg/moz.build            |   4 +
 netwerk/streamconv/public/moz.build           |   4 +
 .../mozbuild/mozbuild/action/xpidl-process.py |  92 ----------------
 python/mozbuild/mozbuild/backend/common.py    |  58 ----------
 .../mozbuild/backend/configenvironment.py     |   4 +-
 .../mozbuild/backend/recursivemake.py         |  76 +------------
 python/mozbuild/mozbuild/frontend/data.py     |  18 ---
 python/mozbuild/mozbuild/frontend/emitter.py  |  41 +------
 .../mozbuild/frontend/sandbox_symbols.py      |  14 ++-
 .../mozbuild/mozbuild/test/backend/common.py  |   9 +-
 .../backend/data/variable_passthru/moz.build  |   4 +-
 .../xpidl/config/makefiles/xpidl/Makefile.in  |   0
 .../test/backend/data/xpidl/moz.build         |   6 -
 .../test/backend/test_recursivemake.py        |  41 +++----
 .../frontend/data/variable-passthru/moz.build |   4 +-
 .../mozbuild/test/frontend/test_emitter.py    |   6 +-
 toolkit/crashreporter/test/Makefile.in        |   1 +
 xpcom/idl-parser/Makefile.in                  |  14 +--
 73 files changed, 485 insertions(+), 447 deletions(-)
 delete mode 100644 config/makefiles/xpidl/Makefile.in
 delete mode 100755 python/mozbuild/mozbuild/action/xpidl-process.py
 delete mode 100644 python/mozbuild/mozbuild/backend/common.py
 delete mode 100644 python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in
 delete mode 100644 python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build

diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build
index 3ff7a9666b7..003d9ed15d7 100644
--- a/browser/components/places/moz.build
+++ b/browser/components/places/moz.build
@@ -7,3 +7,7 @@
 DIRS += ['src']
 TEST_DIRS += ['tests']
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/browser/components/',
+]
+
diff --git a/browser/components/places/src/moz.build b/browser/components/places/src/moz.build
index 58c9712f49b..1648374d569 100644
--- a/browser/components/places/src/moz.build
+++ b/browser/components/places/src/moz.build
@@ -4,6 +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/.
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/browser/components',
+]
+
 EXTRA_COMPONENTS += [
     'BrowserPlaces.manifest',
     'PlacesProtocolHandler.js',
diff --git a/config/config.mk b/config/config.mk
index d9c43946d58..42fd0423d0a 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -364,6 +364,7 @@ MY_RULES	:= $(DEPTH)/config/myrules.mk
 # Default command macros; can be overridden in <arch>.mk.
 #
 CCC = $(CXX)
+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
@@ -520,8 +521,12 @@ endif
 endif
 
 # Default location of include files
-IDL_PARSER_DIR = $(topsrcdir)/xpcom/idl-parser
-IDL_PARSER_CACHE_DIR = $(DEPTH)/xpcom/idl-parser
+IDL_DIR		= $(DIST)/idl
+
+XPIDL_FLAGS += -I$(srcdir) -I$(IDL_DIR)
+ifdef LIBXUL_SDK
+XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
+endif
 
 SDK_LIB_DIR = $(DIST)/sdk/lib
 SDK_BIN_DIR = $(DIST)/sdk/bin
diff --git a/config/makefiles/precompile/Makefile.in b/config/makefiles/precompile/Makefile.in
index ecfd77095db..09355d72d2b 100644
--- a/config/makefiles/precompile/Makefile.in
+++ b/config/makefiles/precompile/Makefile.in
@@ -15,19 +15,17 @@ SUPPRESS_DEFAULT_RULES := 1
 
 include $(topsrcdir)/config/rules.mk
 
-# We don't print the build status messages unless we're in a top level build
-# otherwise the output is unexpected and it confuses downstream parsers.
 define make_subtier_dir
 @echo "BUILDSTATUS SUBTIER_START precompile $(1)"
-+$(MAKE) -C $(2) $(3)
+$(MAKE) -C $(2) $(3)
 @echo "BUILDSTATUS SUBTIER_FINISH precompile $(1)"
 
 endef
 
 export::
-	@echo "BUILDSTATUS SUBTIERS IPDL WebIDL XPIDL"
+	@echo "BUILDSTATUS SUBTIERS IPDL WebIDL"
 
-export:: ipdl webidl xpidl-parser xpidl
+export:: ipdl webidl xpidl-parser
 
 ipdl:
 	$(call make_subtier_dir,IPDL,$(DEPTH)/ipc/ipdl,ipdl)
@@ -37,7 +35,3 @@ webidl:
 
 xpidl-parser:
 	$(call make_subtier_dir,XPIDLParser,$(DEPTH)/xpcom/idl-parser,xpidl-parser)
-
-xpidl: xpidl-parser
-	$(call py_action,process_install_manifest,$(DIST)/idl $(DEPTH)/_build_manifests/install/dist_idl)
-	$(call make_subtier_dir,XPIDL,$(DEPTH)/config/makefiles/xpidl,xpidl)
diff --git a/config/makefiles/xpidl/Makefile.in b/config/makefiles/xpidl/Makefile.in
deleted file mode 100644
index d05445c4d2c..00000000000
--- a/config/makefiles/xpidl/Makefile.in
+++ /dev/null
@@ -1,67 +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/.
-
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-SUPPRESS_DEFAULT_RULES := 1
-STANDALONE_MAKEFILE := 1
-
-include $(topsrcdir)/config/rules.mk
-
-# Building XPIDLs effectively consists of two steps:
-#
-#   1) Staging all .idl files to a common directory.
-#   2) Doing everything with the .idl files.
-#
-# Each .idl file is processed into a .h file and typelib information.
-# The .h file shares the same stem as the input file and is installed
-# in the common headers include directory.
-#
-# XPIDL files are logically grouped together by modules. The typelib
-# information for all XPIDLs in the same module is linked together into
-# an .xpt file having the name of the module.
-#
-# As an optimization to reduce overall CPU usage, we process all .idl
-# belonging to a module with a single command invocation. This prevents
-# redundant parsing of .idl files and significantly reduces CPU cycles.
-
-# For dependency files.
-idl_deps_dir := .deps
-
-# Where we put our final, linked .xpt files.
-idl_xpt_dir := xpt
-
-dist_idl_dir := $(DIST)/idl
-dist_include_dir := $(DIST)/include
-process_py := $(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py
-
-# TODO we should use py_action, but that would require extra directories to be
-# in the virtualenv.
-idlprocess := $(PYTHON_PATH) $(PLY_INCLUDE) -I$(IDL_PARSER_DIR) -I$(IDL_PARSER_CACHE_DIR) \
-    $(process_py) --cache-dir $(IDL_PARSER_CACHE_DIR) $(dist_idl_dir) \
-        $(dist_include_dir) $(idl_xpt_dir) $(idl_deps_dir)
-
-xpidl_modules := @xpidl_modules@
-
-@xpidl_rules@
-
-linked_xpt_files := $(addprefix $(idl_xpt_dir)/,$(addsuffix .xpt,$(xpidl_modules)))
-depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp)
-
-xpidl:: $(linked_xpt_files)
-
-$(linked_xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(idl_xpt_dir))
-
-ifdef .PYMAKE
--includedeps $(depends_files)
-else
--include $(depends_files)
-endif
-
-.PHONY: xpidl
diff --git a/config/rules.mk b/config/rules.mk
index eb62a762201..86b9c71d49f 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -33,10 +33,6 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   XPIDL_MODULE \
   $(NULL)
 
-_DEPRECATED_VARIABLES := \
-  XPIDL_FLAGS \
-  $(NULL)
-
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
 # Using $(firstword) may not be perfect. But it should be good enough for most
 # scenarios.
@@ -46,10 +42,6 @@ $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES),$(if $($(var)),\
     $(error Variable $(var) is defined in $(_current_makefile). It should only be defined in moz.build files),\
     ))
 
-$(foreach var,$(_DEPRECATED_VARIABLES),$(if $($(var)),\
-    $(error Variable $(var) is defined in $(_current_makefile). This variable has been deprecated. It does nothing. It must be removed in order to build)\
-    ))
-
 ifneq (,$(XPIDLSRCS)$(SDK_XPIDLSRCS))
     $(error XPIDLSRCS and SDK_XPIDLSRCS have been merged and moved to moz.build files as the XPIDL_SOURCES variable. You must move these variables out of $(_current_makefile))
 endif
@@ -425,6 +417,8 @@ ifeq ($(SOLARIS_SUNPRO_CXX),1)
 GARBAGE_DIRS += SunWS_cache
 endif
 
+XPIDL_GEN_DIR		= _xpidlgen
+
 ifdef MOZ_UPDATE_XTERM
 # Its good not to have a newline at the end of the titlebar string because it
 # makes the make -s output easier to read.  Echo -n does not work on all
@@ -1394,23 +1388,98 @@ endif
 endif
 
 ################################################################################
-# Install a linked .xpt into the appropriate place.
-# This should ideally be performed by the non-recursive idl make file. Some day.
-ifdef XPT_NAME #{
+# Export the elements of $(XPIDLSRCS)
+# generating .h and .xpt files and moving them to the appropriate places.
+
+ifneq ($(XPIDLSRCS),) #{
+
+export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
+
+ifndef XPIDL_MODULE
+XPIDL_MODULE		= $(MODULE)
+endif
+
+ifeq ($(XPIDL_MODULE),) # we need $(XPIDL_MODULE) to make $(XPIDL_MODULE).xpt
+export:: FORCE
+	@echo
+	@echo "*** Error processing XPIDLSRCS:"
+	@echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS,"
+	@echo "so we have a module name to use when creating MODULE.xpt."
+	@echo; sleep 2; false
+endif
+
+# generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
+# warn against overriding existing .h file.
+
+XPIDL_DEPS = \
+  $(LIBXUL_DIST)/sdk/bin/header.py \
+  $(LIBXUL_DIST)/sdk/bin/typelib.py \
+  $(LIBXUL_DIST)/sdk/bin/xpidl.py \
+  $(NULL)
+
+xpidl-preqs = \
+  $(call mkdir_deps,$(XPIDL_GEN_DIR)) \
+  $(call mkdir_deps,$(MDDEPDIR)) \
+  $(NULL)
+
+$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
+	$(REPORT_BUILD)
+	$(PYTHON_PATH) \
+	  $(PLY_INCLUDE) \
+	  $(LIBXUL_DIST)/sdk/bin/header.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
+	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
+
+# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
+# into $(XPIDL_MODULE).xpt and export it to $(FINAL_TARGET)/components.
+$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
+	$(REPORT_BUILD)
+	$(PYTHON_PATH) \
+	  $(PLY_INCLUDE) \
+	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
+	  $(LIBXUL_DIST)/sdk/bin/typelib.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+
+# no need to link together if XPIDLSRCS contains only XPIDL_MODULE
+ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
+XPT_PY = $(filter %/xpt.py,$(XPIDL_LINK))
+
+xpidl-idl2xpt = $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
+xpidl-module-deps = $(xpidl-idl2xpt) $(GLOBAL_DEPS) $(XPT_PY)
+
+$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(xpidl-module-deps)
+	$(XPIDL_LINK) $@ $(xpidl-idl2xpt)
+
+$(XPT_PY):
+	$(MAKE) -C $(DEPTH)/xpcom/typelib/xpt/tools libs
+
+endif # XPIDL_MODULE.xpt != XPIDLSRCS
 
 ifndef NO_DIST_INSTALL
-_XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
-_XPT_NAME_DEST := $(FINAL_TARGET)/components
-INSTALL_TARGETS += _XPT_NAME
+XPIDL_MODULE_FILES := $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
+XPIDL_MODULE_DEST := $(FINAL_TARGET)/components
+INSTALL_TARGETS += XPIDL_MODULE
 
 ifndef NO_INTERFACES_MANIFEST
 libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
-	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPT_NAME)"
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest"
 endif
 endif
 
-endif #} XPT_NAME
+GARBAGE_DIRS		+= $(XPIDL_GEN_DIR)
+
+ifndef NO_DIST_INSTALL
+XPIDL_HEADERS_FILES := $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
+XPIDL_HEADERS_DEST := $(DIST)/include
+XPIDL_HEADERS_TARGET := export
+INSTALL_TARGETS += XPIDL_HEADERS
+
+XPIDLSRCS_FILES := $(XPIDLSRCS)
+XPIDLSRCS_DEST := $(IDL_DIR)
+XPIDLSRCS_TARGET := export
+INSTALL_TARGETS += XPIDLSRCS
+endif
+endif #} XPIDLSRCS
 
 ################################################################################
 # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
@@ -1622,7 +1691,7 @@ endif
 #   it.
 
 ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
+MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 ifdef .PYMAKE
@@ -1815,6 +1884,7 @@ FREEZE_VARIABLES = \
   CSRCS \
   CPPSRCS \
   EXPORTS \
+  XPIDLSRCS \
   DIRS \
   LIBRARY \
   MODULE \
diff --git a/dom/activities/interfaces/moz.build b/dom/activities/interfaces/moz.build
index a35e3a0b146..e60db2345f0 100644
--- a/dom/activities/interfaces/moz.build
+++ b/dom/activities/interfaces/moz.build
@@ -15,3 +15,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_activities'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build
index d851490f445..19aa7ad6236 100644
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -13,6 +13,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_alarm'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom.alarm += [
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 12d09900da0..05e00740c82 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -14,6 +14,11 @@ XPIDL_SOURCES += [
     'nsISiteSpecificUserAgent.idl',
 ]
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/camera/moz.build b/dom/camera/moz.build
index 92d1b845203..654b8ec5a5c 100644
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -10,6 +10,13 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_camera'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+    '-I$(topsrcdir)/dom/media',
+]
+
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/cellbroadcast/interfaces/moz.build b/dom/cellbroadcast/interfaces/moz.build
index c5d422b0869..7fe77a410bf 100644
--- a/dom/cellbroadcast/interfaces/moz.build
+++ b/dom/cellbroadcast/interfaces/moz.build
@@ -13,3 +13,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_cellbroadcast'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
diff --git a/dom/file/moz.build b/dom/file/moz.build
index 1f96114fee2..2a38d905071 100644
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -13,6 +13,12 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_file'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/fm/moz.build b/dom/fm/moz.build
index 10de07f9890..126a123058d 100644
--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@@ -11,6 +11,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_fm'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
 CPP_SOURCES += [
diff --git a/dom/icc/interfaces/moz.build b/dom/icc/interfaces/moz.build
index ad615b6b935..b051de4f3e7 100644
--- a/dom/icc/interfaces/moz.build
+++ b/dom/icc/interfaces/moz.build
@@ -13,3 +13,9 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'dom_icc'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build
index 679b08068d6..7ed4918afd3 100644
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -14,6 +14,11 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_indexeddb'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom.indexedDB += [
diff --git a/dom/interfaces/apps/moz.build b/dom/interfaces/apps/moz.build
index 3d69090e73b..0c327f04341 100644
--- a/dom/interfaces/apps/moz.build
+++ b/dom/interfaces/apps/moz.build
@@ -15,5 +15,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_apps'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/base/moz.build b/dom/interfaces/base/moz.build
index d7fbec8bc07..f168c5e3217 100644
--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@@ -59,5 +59,9 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 XPIDL_MODULE = 'dom_base'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/contacts/moz.build b/dom/interfaces/contacts/moz.build
index d7fc401f3fe..a2187db7b66 100644
--- a/dom/interfaces/contacts/moz.build
+++ b/dom/interfaces/contacts/moz.build
@@ -12,5 +12,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_contacts'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/core/moz.build b/dom/interfaces/core/moz.build
index 7e79afee574..1827f37716b 100644
--- a/dom/interfaces/core/moz.build
+++ b/dom/interfaces/core/moz.build
@@ -29,5 +29,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_core'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/css/moz.build b/dom/interfaces/css/moz.build
index 8fc352b6043..8a295ecdbbd 100644
--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@@ -33,5 +33,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_css'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/stylesheets',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/devicestorage/moz.build b/dom/interfaces/devicestorage/moz.build
index e5e1fdf120f..e46e202c636 100644
--- a/dom/interfaces/devicestorage/moz.build
+++ b/dom/interfaces/devicestorage/moz.build
@@ -11,5 +11,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_devicestorage'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/events/moz.build b/dom/interfaces/events/moz.build
index 911aea314e2..72da456eb09 100644
--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@@ -59,5 +59,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_events'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/geolocation/moz.build b/dom/interfaces/geolocation/moz.build
index bd5aef1f702..8ccf8f3c15d 100644
--- a/dom/interfaces/geolocation/moz.build
+++ b/dom/interfaces/geolocation/moz.build
@@ -15,5 +15,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_geolocation'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/html/moz.build b/dom/interfaces/html/moz.build
index 690b352e9d8..d7655022d30 100644
--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@@ -68,5 +68,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_html'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/json/moz.build b/dom/interfaces/json/moz.build
index cbd82e5dbbd..14c14336832 100644
--- a/dom/interfaces/json/moz.build
+++ b/dom/interfaces/json/moz.build
@@ -10,5 +10,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_json'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/notification/moz.build b/dom/interfaces/notification/moz.build
index 1a5ba859957..146044bbdae 100644
--- a/dom/interfaces/notification/moz.build
+++ b/dom/interfaces/notification/moz.build
@@ -10,5 +10,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_notification'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/offline/moz.build b/dom/interfaces/offline/moz.build
index 047461e04e2..fd432b0830c 100644
--- a/dom/interfaces/offline/moz.build
+++ b/dom/interfaces/offline/moz.build
@@ -11,5 +11,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_offline'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/permission/moz.build b/dom/interfaces/permission/moz.build
index 500cd8d66c4..3aa60267341 100644
--- a/dom/interfaces/permission/moz.build
+++ b/dom/interfaces/permission/moz.build
@@ -11,5 +11,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_permissionsettings'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/range/moz.build b/dom/interfaces/range/moz.build
index 067455ea830..e2045e69a49 100644
--- a/dom/interfaces/range/moz.build
+++ b/dom/interfaces/range/moz.build
@@ -10,5 +10,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_range'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/settings/moz.build b/dom/interfaces/settings/moz.build
index e901974686a..86cb302c99a 100644
--- a/dom/interfaces/settings/moz.build
+++ b/dom/interfaces/settings/moz.build
@@ -11,5 +11,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_settings'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/smil/moz.build b/dom/interfaces/smil/moz.build
index ee14741da91..4ecf6f90a8a 100644
--- a/dom/interfaces/smil/moz.build
+++ b/dom/interfaces/smil/moz.build
@@ -10,5 +10,12 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_smil'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+    '-I$(topsrcdir)/dom/interfaces/events',
+    '-I$(topsrcdir)/dom/interfaces/svg',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/storage/moz.build b/dom/interfaces/storage/moz.build
index 7ccf5260ea4..d592ba16862 100644
--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@@ -14,6 +14,11 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_storage'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/interfaces/stylesheets/moz.build b/dom/interfaces/stylesheets/moz.build
index 45a4aa3dd61..73974e31cf8 100644
--- a/dom/interfaces/stylesheets/moz.build
+++ b/dom/interfaces/stylesheets/moz.build
@@ -12,5 +12,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_stylesheets'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/svg/moz.build b/dom/interfaces/svg/moz.build
index 529082121a2..1b789a84cff 100644
--- a/dom/interfaces/svg/moz.build
+++ b/dom/interfaces/svg/moz.build
@@ -12,5 +12,11 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_svg'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/traversal/moz.build b/dom/interfaces/traversal/moz.build
index 3b19b9e3bbd..038a359cd0c 100644
--- a/dom/interfaces/traversal/moz.build
+++ b/dom/interfaces/traversal/moz.build
@@ -12,5 +12,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_traversal'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xbl/moz.build b/dom/interfaces/xbl/moz.build
index 6330f7f4bbf..d0f14a8a8d8 100644
--- a/dom/interfaces/xbl/moz.build
+++ b/dom/interfaces/xbl/moz.build
@@ -10,5 +10,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xbl'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xpath/moz.build b/dom/interfaces/xpath/moz.build
index aaeb0011f05..f532abbbb3d 100644
--- a/dom/interfaces/xpath/moz.build
+++ b/dom/interfaces/xpath/moz.build
@@ -15,5 +15,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xpath'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xul/moz.build b/dom/interfaces/xul/moz.build
index 7f8403fd82e..5f229f30cc5 100644
--- a/dom/interfaces/xul/moz.build
+++ b/dom/interfaces/xul/moz.build
@@ -29,5 +29,11 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xul'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
diff --git a/dom/messages/interfaces/moz.build b/dom/messages/interfaces/moz.build
index ac40c9bd385..9d6c27fbb6c 100644
--- a/dom/messages/interfaces/moz.build
+++ b/dom/messages/interfaces/moz.build
@@ -11,3 +11,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_messages'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
diff --git a/dom/mobilemessage/interfaces/moz.build b/dom/mobilemessage/interfaces/moz.build
index 52cc79b9288..2e7e55c3829 100644
--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -29,3 +29,9 @@ if CONFIG['MOZ_B2G_RIL']:
 
 XPIDL_MODULE = 'dom_mobilemessage'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
diff --git a/dom/network/interfaces/moz.build b/dom/network/interfaces/moz.build
index 77080c2656c..e68fd8675ed 100644
--- a/dom/network/interfaces/moz.build
+++ b/dom/network/interfaces/moz.build
@@ -27,3 +27,9 @@ if CONFIG['MOZ_B2G_RIL']:
     ]
 
 XPIDL_MODULE = 'dom_network'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
diff --git a/dom/payment/interfaces/moz.build b/dom/payment/interfaces/moz.build
index 4f5f06310df..078542e1404 100644
--- a/dom/payment/interfaces/moz.build
+++ b/dom/payment/interfaces/moz.build
@@ -13,3 +13,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_payment'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build
index 8b2558aa6f5..0de1dab38f0 100644
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -29,6 +29,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_system_gonk'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/network/interfaces',
+]
+
 MODULE = 'dom'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build
index 5cc738c0376..8a06b1bbcc2 100644
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -10,6 +10,12 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_telephony'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
 CPP_SOURCES += [
diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build
index 5d7511145f1..ba04d52293e 100644
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -13,6 +13,12 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_voicemail'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom += [
diff --git a/dom/wifi/moz.build b/dom/wifi/moz.build
index 9a112308424..cd324f43879 100644
--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -12,6 +12,13 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_wifi'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+    '-I$(topsrcdir)/dom/system/gonk',
+]
+
 MODULE = 'dom'
 
 EXTRA_COMPONENTS += [
diff --git a/hal/moz.build b/hal/moz.build
index f8aaf814534..055f38b228a 100644
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
-    'gonk/nsIRecoveryService.idl',
+    'nsIRecoveryService.idl',
 ]
 
 MODULE = 'hal'
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index d9c43946d58..42fd0423d0a 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -364,6 +364,7 @@ MY_RULES	:= $(DEPTH)/config/myrules.mk
 # Default command macros; can be overridden in <arch>.mk.
 #
 CCC = $(CXX)
+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
@@ -520,8 +521,12 @@ endif
 endif
 
 # Default location of include files
-IDL_PARSER_DIR = $(topsrcdir)/xpcom/idl-parser
-IDL_PARSER_CACHE_DIR = $(DEPTH)/xpcom/idl-parser
+IDL_DIR		= $(DIST)/idl
+
+XPIDL_FLAGS += -I$(srcdir) -I$(IDL_DIR)
+ifdef LIBXUL_SDK
+XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
+endif
 
 SDK_LIB_DIR = $(DIST)/sdk/lib
 SDK_BIN_DIR = $(DIST)/sdk/bin
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index eb62a762201..86b9c71d49f 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -33,10 +33,6 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   XPIDL_MODULE \
   $(NULL)
 
-_DEPRECATED_VARIABLES := \
-  XPIDL_FLAGS \
-  $(NULL)
-
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
 # Using $(firstword) may not be perfect. But it should be good enough for most
 # scenarios.
@@ -46,10 +42,6 @@ $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES),$(if $($(var)),\
     $(error Variable $(var) is defined in $(_current_makefile). It should only be defined in moz.build files),\
     ))
 
-$(foreach var,$(_DEPRECATED_VARIABLES),$(if $($(var)),\
-    $(error Variable $(var) is defined in $(_current_makefile). This variable has been deprecated. It does nothing. It must be removed in order to build)\
-    ))
-
 ifneq (,$(XPIDLSRCS)$(SDK_XPIDLSRCS))
     $(error XPIDLSRCS and SDK_XPIDLSRCS have been merged and moved to moz.build files as the XPIDL_SOURCES variable. You must move these variables out of $(_current_makefile))
 endif
@@ -425,6 +417,8 @@ ifeq ($(SOLARIS_SUNPRO_CXX),1)
 GARBAGE_DIRS += SunWS_cache
 endif
 
+XPIDL_GEN_DIR		= _xpidlgen
+
 ifdef MOZ_UPDATE_XTERM
 # Its good not to have a newline at the end of the titlebar string because it
 # makes the make -s output easier to read.  Echo -n does not work on all
@@ -1394,23 +1388,98 @@ endif
 endif
 
 ################################################################################
-# Install a linked .xpt into the appropriate place.
-# This should ideally be performed by the non-recursive idl make file. Some day.
-ifdef XPT_NAME #{
+# Export the elements of $(XPIDLSRCS)
+# generating .h and .xpt files and moving them to the appropriate places.
+
+ifneq ($(XPIDLSRCS),) #{
+
+export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
+
+ifndef XPIDL_MODULE
+XPIDL_MODULE		= $(MODULE)
+endif
+
+ifeq ($(XPIDL_MODULE),) # we need $(XPIDL_MODULE) to make $(XPIDL_MODULE).xpt
+export:: FORCE
+	@echo
+	@echo "*** Error processing XPIDLSRCS:"
+	@echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS,"
+	@echo "so we have a module name to use when creating MODULE.xpt."
+	@echo; sleep 2; false
+endif
+
+# generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
+# warn against overriding existing .h file.
+
+XPIDL_DEPS = \
+  $(LIBXUL_DIST)/sdk/bin/header.py \
+  $(LIBXUL_DIST)/sdk/bin/typelib.py \
+  $(LIBXUL_DIST)/sdk/bin/xpidl.py \
+  $(NULL)
+
+xpidl-preqs = \
+  $(call mkdir_deps,$(XPIDL_GEN_DIR)) \
+  $(call mkdir_deps,$(MDDEPDIR)) \
+  $(NULL)
+
+$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
+	$(REPORT_BUILD)
+	$(PYTHON_PATH) \
+	  $(PLY_INCLUDE) \
+	  $(LIBXUL_DIST)/sdk/bin/header.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
+	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
+
+# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
+# into $(XPIDL_MODULE).xpt and export it to $(FINAL_TARGET)/components.
+$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
+	$(REPORT_BUILD)
+	$(PYTHON_PATH) \
+	  $(PLY_INCLUDE) \
+	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
+	  $(LIBXUL_DIST)/sdk/bin/typelib.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+
+# no need to link together if XPIDLSRCS contains only XPIDL_MODULE
+ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
+XPT_PY = $(filter %/xpt.py,$(XPIDL_LINK))
+
+xpidl-idl2xpt = $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
+xpidl-module-deps = $(xpidl-idl2xpt) $(GLOBAL_DEPS) $(XPT_PY)
+
+$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(xpidl-module-deps)
+	$(XPIDL_LINK) $@ $(xpidl-idl2xpt)
+
+$(XPT_PY):
+	$(MAKE) -C $(DEPTH)/xpcom/typelib/xpt/tools libs
+
+endif # XPIDL_MODULE.xpt != XPIDLSRCS
 
 ifndef NO_DIST_INSTALL
-_XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
-_XPT_NAME_DEST := $(FINAL_TARGET)/components
-INSTALL_TARGETS += _XPT_NAME
+XPIDL_MODULE_FILES := $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
+XPIDL_MODULE_DEST := $(FINAL_TARGET)/components
+INSTALL_TARGETS += XPIDL_MODULE
 
 ifndef NO_INTERFACES_MANIFEST
 libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
-	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPT_NAME)"
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest"
 endif
 endif
 
-endif #} XPT_NAME
+GARBAGE_DIRS		+= $(XPIDL_GEN_DIR)
+
+ifndef NO_DIST_INSTALL
+XPIDL_HEADERS_FILES := $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
+XPIDL_HEADERS_DEST := $(DIST)/include
+XPIDL_HEADERS_TARGET := export
+INSTALL_TARGETS += XPIDL_HEADERS
+
+XPIDLSRCS_FILES := $(XPIDLSRCS)
+XPIDLSRCS_DEST := $(IDL_DIR)
+XPIDLSRCS_TARGET := export
+INSTALL_TARGETS += XPIDLSRCS
+endif
+endif #} XPIDLSRCS
 
 ################################################################################
 # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
@@ -1622,7 +1691,7 @@ endif
 #   it.
 
 ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
+MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 ifdef .PYMAKE
@@ -1815,6 +1884,7 @@ FREEZE_VARIABLES = \
   CSRCS \
   CPPSRCS \
   EXPORTS \
+  XPIDLSRCS \
   DIRS \
   LIBRARY \
   MODULE \
diff --git a/js/xpconnect/tests/idl/Makefile.in b/js/xpconnect/tests/idl/Makefile.in
index 379d862d400..9b11528dacb 100644
--- a/js/xpconnect/tests/idl/Makefile.in
+++ b/js/xpconnect/tests/idl/Makefile.in
@@ -13,6 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 componentdir = js/xpconnect/tests/components
-libs:: $(DEPTH)/config/makefiles/xpidl/xpt/$(MODULE).xpt
+libs:: $(XPIDL_GEN_DIR)/$(MODULE).xpt
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/native
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/js
diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build
index 2f241e7f247..e7e5788a540 100644
--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -10,6 +10,10 @@ XPIDL_SOURCES += [
     'nsIMIMEService.idl',
 ]
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+
 MODULE = 'mimetype'
 
 EXPORTS += [
diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build
index e3eb168ec78..984c08adaab 100644
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -11,6 +11,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index 6add00fed3c..919e952dd88 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -20,6 +20,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_http'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+
 MODULE = 'necko'
 
 EXPORTS += [
diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build
index 9cd1568e6f4..c8a643f4e62 100644
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -10,6 +10,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_res'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build
index 22a818b54f2..cfa0536e957 100644
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -10,6 +10,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build
index 21c2489d5f6..a93b21ee10a 100644
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -10,6 +10,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_wyciwyg'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+
 MODULE = 'necko'
 
 EXPORTS.mozilla.net += [
diff --git a/netwerk/streamconv/public/moz.build b/netwerk/streamconv/public/moz.build
index 3efb0619f9e..c8192430530 100644
--- a/netwerk/streamconv/public/moz.build
+++ b/netwerk/streamconv/public/moz.build
@@ -20,5 +20,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 
 XPIDL_MODULE = 'necko_strconv'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+
 MODULE = 'necko'
 
diff --git a/python/mozbuild/mozbuild/action/xpidl-process.py b/python/mozbuild/mozbuild/action/xpidl-process.py
deleted file mode 100755
index a61c6d07add..00000000000
--- a/python/mozbuild/mozbuild/action/xpidl-process.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env 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/.
-
-# This script is used to generate an output header and xpt file for
-# input IDL file(s). It's purpose is to directly support the build
-# system. The API will change to meet the needs of the build system.
-
-import argparse
-import os
-import sys
-
-from io import BytesIO
-
-from header import print_header
-from typelib import write_typelib
-from xpidl import IDLParser
-from xpt import xpt_link
-
-from mozbuild.util import FileAvoidWrite
-
-
-def process(input_dir, cache_dir, header_dir, xpt_dir, deps_dir, module, stems):
-    p = IDLParser(outputdir=cache_dir)
-
-    xpts = {}
-    deps = set()
-
-    # Write out dependencies for Python modules we import. If this list isn't
-    # up to date, we will not re-process XPIDL files if the processor changes.
-    for imported in ('header', 'typelib', 'xpidl', 'xpt'):
-        path = sys.modules[imported].__file__
-
-        if path.endswith('.pyc'):
-            path = path[0:-1]
-
-        deps.add(path)
-
-    for stem in stems:
-        path = os.path.join(input_dir, '%s.idl' % stem)
-        idl_data = open(path).read()
-
-        idl = p.parse(idl_data, filename=path)
-        idl.resolve([input_dir], p)
-
-        header_path = os.path.join(header_dir, '%s.h' % stem)
-        deps_path = os.path.join(deps_dir, '%s.pp' % stem)
-
-        xpt = BytesIO()
-        write_typelib(idl, xpt, path)
-        xpt.seek(0)
-        xpts[stem] = xpt
-
-        deps |= set(dep.replace('\\', '/') for dep in idl.deps)
-
-        with FileAvoidWrite(header_path) as fh:
-            print_header(idl, fh, path)
-
-    # TODO use FileAvoidWrite once it supports binary mode.
-    xpt_path = os.path.join(xpt_dir, '%s.xpt' % module)
-    xpt_link(xpts.values()).write(xpt_path)
-
-    deps_path = os.path.join(deps_dir, '%s.pp' % module)
-    with FileAvoidWrite(deps_path) as fh:
-        # Need output to be consistent to avoid rewrites.
-        s_deps = sorted(deps)
-        fh.write('%s: %s\n' % (xpt_path, ' '.join(s_deps)))
-        for dep in s_deps:
-            fh.write('%s:\n' % dep)
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--cache-dir',
-        help='Directory in which to find or write cached lexer data.')
-    parser.add_argument('inputdir',
-        help='Directory in which to find source .idl files.')
-    parser.add_argument('headerdir',
-        help='Directory in which to write header files.')
-    parser.add_argument('xptdir',
-        help='Directory in which to write xpt file.')
-    parser.add_argument('depsdir',
-        help='Directory in which to write dependency files.')
-    parser.add_argument('module',
-        help='Final module name to use for linked output xpt file.')
-    parser.add_argument('idls', nargs='+',
-        help='Source .idl file(s). Specified as stems only.')
-
-    args = parser.parse_args()
-    process(args.inputdir, args.cache_dir, args.headerdir, args.xptdir,
-        args.depsdir, args.module, args.idls)
diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
deleted file mode 100644
index 0cf7cac49a4..00000000000
--- a/python/mozbuild/mozbuild/backend/common.py
+++ /dev/null
@@ -1,58 +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/.
-
-from __future__ import unicode_literals
-
-import mozpack.path as mozpath
-
-from .base import BuildBackend
-
-from ..frontend.data import XPIDLFile
-
-
-class XPIDLManager(object):
-    """Helps manage XPCOM IDLs in the context of the build system."""
-    def __init__(self, config):
-        self.config = config
-        self.topsrcdir = config.topsrcdir
-        self.topobjdir = config.topobjdir
-
-        self.idls = {}
-        self.modules = {}
-
-    def register_idl(self, source, module, allow_existing=False):
-        """Registers an IDL file with this instance.
-
-        The IDL file will be built, installed, etc.
-        """
-        basename = mozpath.basename(source)
-        root = mozpath.splitext(basename)[0]
-
-        entry = {
-            'source': source,
-            'module': module,
-            'basename': basename,
-            'root': root,
-        }
-
-        if not allow_existing and entry['basename'] in self.idls:
-            raise Exception('IDL already registered: %' % entry['basename'])
-
-        self.idls[entry['basename']] = entry
-        self.modules.setdefault(entry['module'], set()).add(entry['root'])
-
-
-class CommonBackend(BuildBackend):
-    """Holds logic common to all build backends."""
-
-    def _init(self):
-        self._idl_manager = XPIDLManager(self.environment)
-
-    def consume_object(self, obj):
-        if isinstance(obj, XPIDLFile):
-            self._idl_manager.register_idl(obj.source_path, obj.module)
-
-    def consume_finished(self):
-        if len(self._idl_manager.idls):
-            self._handle_idl_manager(self._idl_manager)
diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
index 4841ec0081c..dc63edcf4ea 100644
--- a/python/mozbuild/mozbuild/backend/configenvironment.py
+++ b/python/mozbuild/mozbuild/backend/configenvironment.py
@@ -168,7 +168,7 @@ class ConfigEnvironment(object):
         assert(isinstance(file, basestring))
         return os.path.normpath(os.path.join(self.topsrcdir, "%s.in" % relpath(file, self.topobjdir)))
 
-    def create_config_file(self, path, extra=None):
+    def create_config_file(self, path):
         '''Creates the given config file. A config file is generated by
         taking the corresponding source file and replacing occurences of
         "@VAR@" by the value corresponding to "VAR" in the substs dict.
@@ -185,8 +185,6 @@ class ConfigEnvironment(object):
         pp.context.update(srcdir = self.get_file_srcdir(path))
         pp.context.update(relativesrcdir = self.get_relative_srcdir(path))
         pp.context.update(DEPTH = self.get_depth(path))
-        if extra:
-            pp.context.update(extra)
         pp.do_filter('attemptSubstitution')
         pp.setMarker(None)
 
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 50432a1626d..d0c32be566b 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -9,14 +9,14 @@ import logging
 import os
 import types
 
+import mozpack.path
 from mozpack.copier import FilePurger
 from mozpack.manifests import (
     InstallManifest,
     PurgeManifest,
 )
-import mozpack.path as mozpath
 
-from .common import CommonBackend
+from .base import BuildBackend
 from ..frontend.data import (
     ConfigFileSubstitution,
     DirectoryTraversal,
@@ -25,7 +25,6 @@ from ..frontend.data import (
     VariablePassthru,
     Exports,
     Program,
-    XPIDLFile,
     XpcshellManifests,
 )
 from ..util import FileAvoidWrite
@@ -76,10 +75,6 @@ class BackendMakeFile(object):
         self.environment = environment
         self.path = os.path.join(objdir, 'backend.mk')
 
-        # XPIDLFiles attached to this file.
-        self.idls = []
-        self.xpt_name = None
-
         self.fh = FileAvoidWrite(self.path)
         self.fh.write('# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT.\n')
         self.fh.write('\n')
@@ -95,24 +90,15 @@ class BackendMakeFile(object):
         # scan and build, installing the new Makefile.
         self.fh.write('NO_SUBMAKEFILES_RULE := 1\n')
 
+
     def write(self, buf):
         self.fh.write(buf)
 
     def close(self):
-        if self.xpt_name:
-            self.fh.write('XPT_NAME := %s\n' % self.xpt_name)
-
-            self.fh.write('NONRECURSIVE_TARGETS += export\n')
-            self.fh.write('NONRECURSIVE_TARGETS_export += xpidl\n')
-            self.fh.write('NONRECURSIVE_TARGETS_export_xpidl_DIRECTORY = '
-                '$(DEPTH)/config/makefiles/xpidl\n')
-            self.fh.write('NONRECURSIVE_TARGETS_export_xpidl_TARGETS += '
-                'xpt/%s' % self.xpt_name)
-
         return self.fh.close()
 
 
-class RecursiveMakeBackend(CommonBackend):
+class RecursiveMakeBackend(BuildBackend):
     """Backend that integrates with the existing recursive make build system.
 
     This backend facilitates the transition from Makefile.in to moz.build
@@ -128,8 +114,6 @@ class RecursiveMakeBackend(CommonBackend):
     """
 
     def _init(self):
-        CommonBackend._init(self)
-
         self._backend_files = {}
         self._ipdl_sources = set()
 
@@ -156,11 +140,6 @@ class RecursiveMakeBackend(CommonBackend):
             dist_public=PurgeManifest(relpath='dist/public'),
             dist_sdk=PurgeManifest(relpath='dist/sdk'),
             tests=PurgeManifest(relpath='_tests'),
-            xpidl=PurgeManifest(relpath='config/makefiles/xpidl'),
-        )
-
-        self._install_manifests = dict(
-            dist_idl=InstallManifest(),
         )
 
     def _update_from_avoid_write(self, result):
@@ -176,8 +155,6 @@ class RecursiveMakeBackend(CommonBackend):
     def consume_object(self, obj):
         """Write out build files necessary to build with recursive make."""
 
-        CommonBackend.consume_object(self, obj)
-
         if not isinstance(obj, SandboxDerived):
             return
 
@@ -191,9 +168,6 @@ class RecursiveMakeBackend(CommonBackend):
                 backend_file.environment.create_config_file(obj.output_path))
             self.backend_input_files.add(obj.input_path)
             self.summary.managed_count += 1
-        elif isinstance(obj, XPIDLFile):
-            backend_file.idls.append(obj)
-            backend_file.xpt_name = '%s.xpt' % obj.module
         elif isinstance(obj, VariablePassthru):
             # Sorted so output is consistent and we don't bump mtimes.
             for k, v in sorted(obj.variables.items()):
@@ -207,7 +181,7 @@ class RecursiveMakeBackend(CommonBackend):
             self._process_exports(obj.exports, backend_file)
 
         elif isinstance(obj, IPDLFile):
-            self._ipdl_sources.add(mozpath.join(obj.srcdir, obj.basename))
+            self._ipdl_sources.add(mozpack.path.join(obj.srcdir, obj.basename))
 
         elif isinstance(obj, Program):
             self._process_program(obj.program, backend_file)
@@ -218,8 +192,6 @@ class RecursiveMakeBackend(CommonBackend):
         self._backend_files[obj.srcdir] = backend_file
 
     def consume_finished(self):
-        CommonBackend.consume_finished(self)
-
         for srcdir in sorted(self._backend_files.keys()):
             bf = self._backend_files[srcdir]
 
@@ -389,44 +361,6 @@ class RecursiveMakeBackend(CommonBackend):
             self._process_exports(children[subdir], backend_file,
                                   namespace=namespace + subdir)
 
-    def _handle_idl_manager(self, manager):
-        build_files = self._purge_manifests['xpidl']
-
-        for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
-            'xpt/.mkdir.done'):
-            build_files.add(p)
-
-        for idl in manager.idls.values():
-            self._install_manifests['dist_idl'].add_symlink(idl['source'],
-                idl['basename'])
-            self._purge_manifests['dist_include'].add('%s.h' % idl['root'])
-
-        for module in manager.modules:
-            build_files.add(mozpath.join('xpt', '%s.xpt' % module))
-            build_files.add(mozpath.join('.deps', '%s.pp' % module))
-
-        modules = manager.modules
-        xpt_modules = sorted(modules.keys())
-        rules = []
-
-        for module in xpt_modules:
-            deps = sorted(modules[module])
-            rules.extend([
-                '$(idl_xpt_dir)/%s.xpt:' % module,
-                '\t@echo "$(notdir $@)"',
-                '\t$(idlprocess) $(basename $(notdir $@)) %s' % ' '.join(deps),
-                '',
-            ])
-
-        out_path = os.path.join(self.environment.topobjdir, 'config',
-            'makefiles', 'xpidl', 'Makefile')
-        result = self.environment.create_config_file(out_path, extra=dict(
-            xpidl_rules='\n'.join(rules),
-            xpidl_modules=' '.join(xpt_modules),
-        ))
-        self._update_from_avoid_write(result)
-        self.summary.managed_count += 1
-
     def _process_program(self, program, backend_file):
         backend_file.write('PROGRAM = %s\n' % program)
 
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
index 0ca88f36cdf..c98a6246a0c 100644
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@@ -17,8 +17,6 @@ structures.
 
 from __future__ import unicode_literals
 
-import os
-
 from collections import OrderedDict
 
 
@@ -138,22 +136,6 @@ class VariablePassthru(SandboxDerived):
         SandboxDerived.__init__(self, sandbox)
         self.variables = {}
 
-class XPIDLFile(SandboxDerived):
-    """Describes an XPIDL file to be compiled."""
-
-    __slots__ = (
-        'basename',
-        'source_path',
-    )
-
-    def __init__(self, sandbox, source, module):
-        SandboxDerived.__init__(self, sandbox)
-
-        self.source_path = source
-        self.basename = os.path.basename(source)
-        self.module = module
-
-
 class Exports(SandboxDerived):
     """Sandbox container object for EXPORTS, which is a HierarchicalStringList.
 
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index d85d879b326..dbb518dc06c 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -4,13 +4,8 @@
 
 from __future__ import unicode_literals
 
-import logging
 import os
 
-from mach.mixin.logging import LoggingMixin
-
-import mozpack.path as mozpath
-
 from .data import (
     ConfigFileSubstitution,
     DirectoryTraversal,
@@ -19,17 +14,13 @@ from .data import (
     Program,
     ReaderSummary,
     VariablePassthru,
-    XPIDLFile,
     XpcshellManifests,
 )
 
-from .reader import (
-    MozbuildSandbox,
-    SandboxValidationError,
-)
+from .reader import MozbuildSandbox
 
 
-class TreeMetadataEmitter(LoggingMixin):
+class TreeMetadataEmitter(object):
     """Converts the executed mozbuild files into data structures.
 
     This is a bridge between reader.py and data.py. It takes what was read by
@@ -38,8 +29,6 @@ class TreeMetadataEmitter(LoggingMixin):
     """
 
     def __init__(self, config):
-        self.populate_logger()
-
         self.config = config
 
     def emit(self, output):
@@ -85,27 +74,6 @@ class TreeMetadataEmitter(LoggingMixin):
             sub.relpath = path
             yield sub
 
-        # XPIDL source files get processed and turned into .h and .xpt files.
-        # If there are multiple XPIDL files in a directory, they get linked
-        # together into a final .xpt, which has the name defined by either
-        # MODULE or XPIDL_MODULE (if the latter is defined).
-        xpidl_module = sandbox['MODULE']
-        if sandbox['XPIDL_MODULE']:
-            xpidl_module = sandbox['XPIDL_MODULE']
-
-        if sandbox['XPIDL_SOURCES'] and not xpidl_module:
-            raise SandboxValidationError('MODULE or XPIDL_MODULE must be '
-                'defined if XPIDL_SOURCES is defined.')
-
-        if sandbox['XPIDL_SOURCES'] and sandbox['NO_DIST_INSTALL']:
-            self.log(logging.WARN, 'mozbuild_warning', dict(
-                path=sandbox.main_path),
-                '{path}: NO_DIST_INSTALL has no effect on XPIDL_SOURCES.')
-
-        for idl in sandbox['XPIDL_SOURCES']:
-            yield XPIDLFile(sandbox, mozpath.join(sandbox['SRCDIR'], idl),
-                xpidl_module)
-
         # Proxy some variables as-is until we have richer classes to represent
         # them. We should aim to keep this set small because it violates the
         # desired abstraction of the build definition away from makefiles.
@@ -136,7 +104,10 @@ class TreeMetadataEmitter(LoggingMixin):
             SHARED_LIBRARY_LIBS='SHARED_LIBRARY_LIBS',
             SIMPLE_PROGRAMS='SIMPLE_PROGRAMS',
             SSRCS='SSRCS',
-        )
+            XPIDL_FLAGS='XPIDL_FLAGS',
+            XPIDL_MODULE='XPIDL_MODULE',
+            XPIDLSRCS='XPIDL_SOURCES',
+            )
         for mak, moz in varmap.items():
             if sandbox[moz]:
                 passthru.variables[mak] = sandbox[moz]
diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
index 891bd86aebf..fb7086c13af 100644
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -295,8 +295,10 @@ VARIABLES = {
         """Module name.
 
         Historically, this variable was used to describe where to install header
-        files, but that feature is now handled by EXPORTS_NAMESPACES. MODULE
-        will likely be removed in the future.
+        files, but that feature is now handled by EXPORTS_NAMESPACES. Currently
+        it is used as the XPIDL module name if XPIDL_MODULE is not defined, but
+        using XPIDL_MODULE directly is preferred. MODULE will likely be removed
+        in the future.
         """),
 
     'EXPORTS': (HierarchicalStringList, list, HierarchicalStringList(),
@@ -353,6 +355,14 @@ VARIABLES = {
         MODULE.
         """),
 
+    'XPIDL_FLAGS': (list, list, [],
+        """XPCOM Interface Definition Module Flags.
+
+        This is a list of extra flags that are passed to the IDL compiler.
+        Typically this is a set of -I flags that denote extra include
+        directories to search for included .idl files.
+        """),
+
     'IPDL_SOURCES': (StrictOrderingOnAppendList, list, [],
         """IPDL source files.
 
diff --git a/python/mozbuild/mozbuild/test/backend/common.py b/python/mozbuild/mozbuild/test/backend/common.py
index e1f44b158cd..7102b62b09d 100644
--- a/python/mozbuild/mozbuild/test/backend/common.py
+++ b/python/mozbuild/mozbuild/test/backend/common.py
@@ -75,11 +75,6 @@ CONFIGS = {
         'non_global_defines': [],
         'substs': [],
     },
-    'xpidl': {
-        'defines': [],
-        'non_global_defines': [],
-        'substs': [],
-    },
 }
 
 
@@ -100,7 +95,9 @@ class BackendTester(unittest.TestCase):
         return ConfigEnvironment(srcdir, objdir, **config)
 
     def _emit(self, name, env=None):
-        env = env or self._get_environment(name)
+        if not env:
+            env = self._get_environment(name)
+
         reader = BuildReader(env)
         emitter = TreeMetadataEmitter(env)
 
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
index d349e488cc7..4acef55d3f6 100644
--- a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
@@ -2,7 +2,9 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-MODULE = 'module_name'
+XPIDL_SOURCES = ['bar.idl', 'biz.idl', 'foo.idl']
+XPIDL_MODULE = 'module_name'
+XPIDL_FLAGS = ['-Idir1', '-Idir2', '-Idir3']
 
 ASFILES = ['bar.s', 'foo.asm']
 
diff --git a/python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in b/python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build b/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
deleted file mode 100644
index aa192b84276..00000000000
--- a/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-MODULE = 'my_module'
-XPIDL_SOURCES = ['bar.idl', 'foo.idl']
diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
index 86a8d5ba54b..84860da1eeb 100644
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ -217,6 +217,19 @@ class TestRecursiveMakeBackend(BackendTester):
                 'SSRCS += bar.S',
                 'SSRCS += foo.S',
             ],
+            'XPIDL_FLAGS': [
+                'XPIDL_FLAGS += -Idir1',
+                'XPIDL_FLAGS += -Idir2',
+                'XPIDL_FLAGS += -Idir3',
+            ],
+            'XPIDL_MODULE': [
+                'XPIDL_MODULE := module_name'
+            ],
+            'XPIDLSRCS': [
+                'XPIDLSRCS += bar.idl',
+                'XPIDLSRCS += biz.idl',
+                'XPIDLSRCS += foo.idl',
+            ]
         }
 
         for var, val in expected.items():
@@ -268,34 +281,6 @@ class TestRecursiveMakeBackend(BackendTester):
         expected = ('aa', 'bb', 'cc', 'dd', 'valid_val')
         self.assertEqual(xpclines, ["XPCSHELL_TESTS += %s" % val for val in expected])
 
-    def test_xpidl_generation(self):
-        """Ensure xpidl files and directories are written out."""
-        env = self._consume('xpidl', RecursiveMakeBackend)
-
-        # Purge manifests should contain entries.
-        purge_dir = os.path.join(env.topobjdir, '_build_manifests', 'purge')
-        install_dir = os.path.join(env.topobjdir, '_build_manifests',
-            'install')
-        self.assertTrue(os.path.isfile(os.path.join(purge_dir, 'xpidl')))
-        self.assertTrue(os.path.isfile(os.path.join(install_dir, 'dist_idl')))
-
-        m = PurgeManifest(path=os.path.join(purge_dir, 'xpidl'))
-        self.assertIn('.deps/my_module.pp', m.entries)
-        self.assertIn('xpt/my_module.xpt', m.entries)
-
-        m = InstallManifest(path=os.path.join(install_dir, 'dist_idl'))
-        self.assertEqual(len(m), 2)
-        self.assertIn('bar.idl', m)
-        self.assertIn('foo.idl', m)
-
-        m = PurgeManifest(path=os.path.join(purge_dir, 'dist_include'))
-        self.assertIn('foo.h', m.entries)
-
-        p = os.path.join(env.topobjdir, 'config/makefiles/xpidl')
-        self.assertTrue(os.path.isdir(p))
-
-        self.assertTrue(os.path.isfile(os.path.join(p, 'Makefile')))
-
     def test_xpcshell_master_manifest(self):
         """Ensure that the master xpcshell manifest is written out correctly."""
         env = self._consume('xpcshell_manifests', RecursiveMakeBackend)
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
index 1bc40a2aae2..71154d31ec3 100644
--- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
@@ -2,7 +2,9 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-MODULE = 'module_name'
+XPIDL_SOURCES += ['bar.idl', 'biz.idl', 'foo.idl']
+XPIDL_MODULE = 'module_name'
+XPIDL_FLAGS += ['-Idir1', '-Idir2', '-Idir3']
 
 ASFILES += ['fans.asm', 'tans.s']
 
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
index 6c8d6ede6df..5d995929359 100644
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@@ -144,12 +144,14 @@ class TestEmitterBasic(unittest.TestCase):
             LIBRARY_NAME='lib_name',
             LIBS=['fans.lib', 'tans.lib'],
             NO_DIST_INSTALL='1',
-            MODULE='module_name',
             SDK_LIBRARY=['fans.sdk', 'tans.sdk'],
             SHARED_LIBRARY_LIBS=['fans.sll', 'tans.sll'],
             SIMPLE_PROGRAMS=['fans.x', 'tans.x'],
             SSRCS=['fans.S', 'tans.S'],
-        )
+            XPIDLSRCS=['bar.idl', 'biz.idl', 'foo.idl'],
+            XPIDL_MODULE='module_name',
+            XPIDL_FLAGS=['-Idir1', '-Idir2', '-Idir3'],
+            )
 
         variables = objs[1].variables
         self.assertEqual(len(variables), len(wanted))
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index f65357c33f1..6e9668868fe 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -20,6 +20,7 @@ VPATH += \
   $(NULL)
 
 LOCAL_INCLUDES += \
+  -I$(XPIDL_GEN_DIR) \
   -I$(srcdir)/../google-breakpad/src/ \
   $(NULL)
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in
index 7c48ead0f8b..0f2b5d3fda4 100644
--- a/xpcom/idl-parser/Makefile.in
+++ b/xpcom/idl-parser/Makefile.in
@@ -18,8 +18,8 @@ PARSER_SRCS = \
 
 SDK_BINARY = \
   $(PARSER_SRCS) \
-  $(IDL_PARSER_CACHE_DIR)/xpidllex.py \
-  $(IDL_PARSER_CACHE_DIR)/xpidlyacc.py \
+  xpidllex.py \
+  xpidlyacc.py \
   $(NULL)
 
 SDK_BINARY_TARGET = xpidl-parser
@@ -39,13 +39,13 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 # Generate the PLY lexer and parser.
-$(IDL_PARSER_CACHE_DIR)/xpidllex.py: $(PARSER_SRCS) $(PLY_FILES)
+xpidllex.py: $(PARSER_SRCS) $(PLY_FILES)
 	$(PYTHON_PATH) \
 	  $(PLY_INCLUDE) \
-	  $(srcdir)/header.py --cachedir=$(IDL_PARSER_CACHE_DIR) --regen
+	  $(srcdir)/header.py --cachedir=. --regen
 
 # generating xpidllex.py generates xpidlyacc.py too
-$(IDL_PARSER_CACHE_DIR)/xpidlyacc.py: $(IDL_PARSER_CACHE_DIR)/xpidllex.py
+xpidlyacc.py: xpidllex.py
 
 check::
 	$(PYTHON_PATH) \
@@ -53,12 +53,10 @@ check::
 	  -I. \
 	  $(srcdir)/runtests.py
 
-garbage_files := \
+GARBAGE += \
   xpidllex.py \
   xpidllex.pyc \
   xpidlyacc.py \
   xpidlyacc.pyc \
   xpidl_debug \
   $(NULL)
-
-GARBAGE += $(addprefix $(IDL_PARSER_CACHE_DIR)/,$(garbage_files))

From d2a8b28589a57f46cd771c872e87cc9587c94a91 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Wed, 14 Aug 2013 16:04:36 +0200
Subject: [PATCH 49/98] Bug 666399 - New Harmony syntax for generators. r=Waldo

Add a GeneratorKind enumeration, and use it in the parser and runtime to
indicate whether a function is a non-generator, a legacy generator, or a
star generator.

Always parse "yield" as TOK_YIELD, regardless of the version.  Add
TokenStream::currentName() to retrieve the current token's name, which
works for TOK_NAME or TOK_YIELD.  The parser should check the validity
of "yield" as a name, if needed, using checkYieldNameValidity().

Parse "function*" as the StarGenerator GeneratorKind, and allow star
generators to be lazily parsed.

Separate parsing of return statements from yield expressions.
---
 js/src/frontend/BytecodeCompiler.cpp          |  11 +-
 js/src/frontend/ParseNode.cpp                 |   6 +-
 js/src/frontend/Parser.cpp                    | 439 ++++++++++++------
 js/src/frontend/Parser.h                      |  36 +-
 js/src/frontend/SharedContext.h               |  28 +-
 js/src/frontend/TokenStream.cpp               |   8 +-
 js/src/frontend/TokenStream.h                 |   7 +
 .../jit-test/tests/generators/es6-syntax.js   |  38 ++
 js/src/jit/AsmJS.cpp                          |   2 +-
 js/src/js.msg                                 |   1 +
 js/src/jsanalyze.cpp                          |   2 +-
 js/src/jsatom.cpp                             |   1 -
 js/src/jsatom.h                               |   1 -
 js/src/jsfun.cpp                              |  17 +-
 js/src/jsfun.h                                |  12 +
 js/src/jsiter.cpp                             |   7 +
 js/src/jsreflect.cpp                          |   1 +
 js/src/jsscript.cpp                           |  26 +-
 js/src/jsscript.h                             |  55 ++-
 js/src/tests/ecma_6/Generators/shell.js       |   1 +
 js/src/tests/ecma_6/Generators/syntax.js      |  97 ++++
 js/src/vm/CommonPropertyNames.h               |   1 +
 js/src/vm/Keywords.h                          |   8 +-
 23 files changed, 599 insertions(+), 206 deletions(-)
 create mode 100644 js/src/jit-test/tests/generators/es6-syntax.js
 create mode 100644 js/src/tests/ecma_6/Generators/shell.js
 create mode 100644 js/src/tests/ecma_6/Generators/syntax.js

diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index 06af275b017..1a0089b47d6 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -69,7 +69,7 @@ CheckArgumentsWithinEval(JSContext *cx, Parser<FullParseHandler> &parser, Handle
     }
 
     // It's an error to use |arguments| in a legacy generator expression.
-    if (script->isGeneratorExp && script->isLegacyGenerator) {
+    if (script->isGeneratorExp && script->isLegacyGenerator()) {
         parser.report(ParseError, false, NULL, JSMSG_BAD_GENEXP_BODY, js_arguments_str);
         return false;
     }
@@ -293,7 +293,8 @@ frontend::CompileScript(ExclusiveContext *cx, LifoAlloc *alloc, HandleObject sco
              */
             JSFunction *fun = evalCaller->functionOrCallerFunction();
             Directives directives(/* strict = */ fun->strict());
-            ObjectBox *funbox = parser.newFunctionBox(/* fn = */ NULL, fun, pc.addr(), directives);
+            ObjectBox *funbox = parser.newFunctionBox(/* fn = */ NULL, fun, pc.addr(),
+                                                      directives, fun->generatorKind());
             if (!funbox)
                 return NULL;
             bce.objectList.add(funbox);
@@ -413,7 +414,9 @@ frontend::CompileLazyFunction(JSContext *cx, LazyScript *lazy, const jschar *cha
     uint32_t staticLevel = lazy->staticLevel(cx);
 
     Rooted<JSFunction*> fun(cx, lazy->function());
-    ParseNode *pn = parser.standaloneLazyFunction(fun, staticLevel, lazy->strict());
+    JS_ASSERT(!lazy->isLegacyGenerator());
+    ParseNode *pn = parser.standaloneLazyFunction(fun, staticLevel, lazy->strict(),
+                                                  lazy->generatorKind());
     if (!pn)
         return false;
 
@@ -517,7 +520,7 @@ frontend::CompileFunctionBody(JSContext *cx, MutableHandleFunction fun, CompileO
     ParseNode *fn;
     while (true) {
         Directives newDirectives = directives;
-        fn = parser.standaloneFunctionBody(fun, formals, directives, &newDirectives);
+        fn = parser.standaloneFunctionBody(fun, formals, NotGenerator, directives, &newDirectives);
         if (fn)
             break;
 
diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index 59a9dc37dd5..55a2c172aa7 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -384,9 +384,9 @@ Parser<FullParseHandler>::cloneParseTree(ParseNode *opn)
         if (pn->getKind() == PNK_MODULE) {
             MOZ_ASSUME_UNREACHABLE("module nodes cannot be cloned");
         }
-        NULLCHECK(pn->pn_funbox =
-                  newFunctionBox(pn, opn->pn_funbox->function(), pc,
-                                 Directives(/* strict = */ opn->pn_funbox->strict)));
+        NULLCHECK(pn->pn_funbox = newFunctionBox(pn, opn->pn_funbox->function(), pc,
+                                                 Directives(/* strict = */ opn->pn_funbox->strict),
+                                                 opn->pn_funbox->generatorKind()));
         NULLCHECK(pn->pn_body = cloneParseTree(opn->pn_body));
         pn->pn_cookie = opn->pn_cookie;
         pn->pn_dflags = opn->pn_dflags;
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index ceed2127464..18174cba8d3 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -56,7 +56,6 @@ namespace frontend {
 typedef Rooted<StaticBlockObject*> RootedStaticBlockObject;
 typedef Handle<StaticBlockObject*> HandleStaticBlockObject;
 
-typedef MutableHandle<PropertyName*> MutableHandlePropertyName;
 
 /*
  * Insist that the next token be of type tt, or report errno and return null.
@@ -455,13 +454,14 @@ Parser<ParseHandler>::newObjectBox(JSObject *obj)
 template <typename ParseHandler>
 FunctionBox::FunctionBox(ExclusiveContext *cx, ObjectBox* traceListHead, JSFunction *fun,
                          ParseContext<ParseHandler> *outerpc, Directives directives,
-                         bool extraWarnings)
+                         bool extraWarnings, GeneratorKind generatorKind)
   : ObjectBox(fun, traceListHead),
     SharedContext(cx, directives, extraWarnings),
     bindings(),
     bufStart(0),
     bufEnd(0),
     ndefaults(0),
+    generatorKindBits_(GeneratorKindAsBits(generatorKind)),
     inWith(false),                  // initialized below
     inGenexpLambda(false),
     hasDestructuringArgs(false),
@@ -522,7 +522,7 @@ FunctionBox::FunctionBox(ExclusiveContext *cx, ObjectBox* traceListHead, JSFunct
 template <typename ParseHandler>
 FunctionBox *
 Parser<ParseHandler>::newFunctionBox(Node fn, JSFunction *fun, ParseContext<ParseHandler> *outerpc,
-                                     Directives inheritedDirectives)
+                                     Directives inheritedDirectives, GeneratorKind generatorKind)
 {
     JS_ASSERT(fun && !IsPoisonedPtr(fun));
 
@@ -535,7 +535,8 @@ Parser<ParseHandler>::newFunctionBox(Node fn, JSFunction *fun, ParseContext<Pars
      */
     FunctionBox *funbox =
         alloc.new_<FunctionBox>(context, traceListHead, fun, outerpc,
-                                inheritedDirectives, options().extraWarningsOption);
+                                inheritedDirectives, options().extraWarningsOption,
+                                generatorKind);
     if (!funbox) {
         js_ReportOutOfMemory(context);
         return NULL;
@@ -852,6 +853,7 @@ Parser<ParseHandler>::checkStrictBinding(PropertyName *name, Node pn)
 template <>
 ParseNode *
 Parser<FullParseHandler>::standaloneFunctionBody(HandleFunction fun, const AutoNameVector &formals,
+                                                 GeneratorKind generatorKind,
                                                  Directives inheritedDirectives,
                                                  Directives *newDirectives)
 {
@@ -866,7 +868,8 @@ Parser<FullParseHandler>::standaloneFunctionBody(HandleFunction fun, const AutoN
     argsbody->makeEmpty();
     fn->pn_body = argsbody;
 
-    FunctionBox *funbox = newFunctionBox(fn, fun, /* outerpc = */ NULL, inheritedDirectives);
+    FunctionBox *funbox = newFunctionBox(fn, fun, /* outerpc = */ NULL, inheritedDirectives,
+                                         generatorKind);
     if (!funbox)
         return null();
     handler.setFunctionBox(fn, funbox);
@@ -1071,8 +1074,14 @@ Parser<ParseHandler>::functionBody(FunctionSyntaxKind kind, FunctionBodyType typ
             return null();
     }
 
-    if (pc->lastYieldOffset != startYieldOffset) {
-        JS_ASSERT(pc->isLegacyGenerator());
+    switch (pc->generatorKind()) {
+      case NotGenerator:
+        JS_ASSERT(pc->lastYieldOffset == startYieldOffset);
+        break;
+
+      case LegacyGenerator:
+        // FIXME: Catch these errors eagerly, in yieldExpression().
+        JS_ASSERT(pc->lastYieldOffset != startYieldOffset);
         if (kind == Arrow) {
             reportWithOffset(ParseError, false, pc->lastYieldOffset,
                              JSMSG_YIELD_IN_ARROW, js_yield_str);
@@ -1084,9 +1093,12 @@ Parser<ParseHandler>::functionBody(FunctionSyntaxKind kind, FunctionBodyType typ
                             JSMSG_BAD_ANON_GENERATOR_RETURN);
             return null();
         }
-        pc->sc->asFunctionBox()->setIsLegacyGenerator();
-    } else {
-        JS_ASSERT(!pc->isLegacyGenerator());
+        break;
+
+      case StarGenerator:
+        JS_ASSERT(kind != Arrow);
+        JS_ASSERT(type == StatementListBody);
+        break;
     }
 
     /* Check for falling off the end of a function that returns a value. */
@@ -1622,6 +1634,11 @@ Parser<ParseHandler>::functionArguments(FunctionSyntaxKind kind, Node *listp, No
               }
 #endif /* JS_HAS_DESTRUCTURING */
 
+              case TOK_YIELD:
+                if (!checkYieldNameValidity(JSMSG_MISSING_FORMAL))
+                    return false;
+                goto TOK_NAME;
+
               case TOK_TRIPLEDOT:
               {
                 hasRest = true;
@@ -1631,15 +1648,16 @@ Parser<ParseHandler>::functionArguments(FunctionSyntaxKind kind, Node *listp, No
                         report(ParseError, false, null(), JSMSG_NO_REST_NAME);
                     return false;
                 }
-                /* Fall through */
+                goto TOK_NAME;
               }
 
+              TOK_NAME:
               case TOK_NAME:
               {
                 if (parenFreeArrow)
                     funbox->setStart(tokenStream);
 
-                RootedPropertyName name(context, tokenStream.currentToken().name());
+                RootedPropertyName name(context, tokenStream.currentName());
                 bool disallowDuplicateArgs = funbox->hasDestructuringArgs || hasDefaults;
                 if (!defineArg(funcpn, name, disallowDuplicateArgs, &duplicatedArg))
                     return false;
@@ -1690,6 +1708,20 @@ Parser<ParseHandler>::functionArguments(FunctionSyntaxKind kind, Node *listp, No
     return true;
 }
 
+template <typename ParseHandler>
+bool
+Parser<ParseHandler>::checkFunctionName(HandlePropertyName funName)
+{
+    if (pc->isStarGenerator() && funName == context->names().yield) {
+        // The name of a named function expression is specified to be bound in
+        // the outer context as if via "let".  In an ES6 generator, "yield" is
+        // not a valid name for a let-bound variable.
+        report(ParseError, false, null(), JSMSG_RESERVED_ID, "yield");
+        return false;
+    }
+    return true;
+}
+
 template <>
 bool
 Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
@@ -1702,6 +1734,9 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
     /* Function statements add a binding to the enclosing scope. */
     bool bodyLevel = pc->atBodyLevel();
 
+    if (!checkFunctionName(funName))
+        return false;
+
     if (kind == Statement) {
         /*
          * Handle redeclaration and optimize cases where we can statically bind the
@@ -1815,7 +1850,9 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
     // so we can skip over them after accounting for their free variables.
     if (LazyScript *lazyOuter = handler.lazyOuterFunction()) {
         JSFunction *fun = handler.nextLazyInnerFunction();
-        FunctionBox *funbox = newFunctionBox(pn, fun, pc, Directives(/* strict = */ false));
+        JS_ASSERT(!fun->isLegacyGenerator());
+        FunctionBox *funbox = newFunctionBox(pn, fun, pc, Directives(/* strict = */ false),
+                                             fun->generatorKind());
         if (!funbox)
             return false;
 
@@ -1891,6 +1928,9 @@ Parser<SyntaxParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
     /* Function statements add a binding to the enclosing scope. */
     bool bodyLevel = pc->atBodyLevel();
 
+    if (!checkFunctionName(funName))
+        return false;
+
     if (kind == Statement) {
         /*
          * Handle redeclaration and optimize cases where we can statically bind the
@@ -1929,7 +1969,8 @@ Parser<SyntaxParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::functionDef(HandlePropertyName funName, const TokenStream::Position &start,
-                                  FunctionType type, FunctionSyntaxKind kind)
+                                  FunctionType type, FunctionSyntaxKind kind,
+                                  GeneratorKind generatorKind)
 {
     JS_ASSERT_IF(kind == Statement, funName);
 
@@ -1957,7 +1998,7 @@ Parser<ParseHandler>::functionDef(HandlePropertyName funName, const TokenStream:
     Directives newDirectives = directives;
 
     while (true) {
-        if (functionArgsAndBody(pn, fun, type, kind, directives, &newDirectives))
+        if (functionArgsAndBody(pn, fun, type, kind, generatorKind, directives, &newDirectives))
             break;
         if (tokenStream.hadError() || directives == newDirectives)
             return null();
@@ -2061,6 +2102,7 @@ Parser<SyntaxParseHandler>::finishFunctionDefinition(Node pn, FunctionBox *funbo
 
     if (pc->sc->strict)
         lazy->setStrict();
+    lazy->setGeneratorKind(funbox->generatorKind());
     if (funbox->usesArguments && funbox->usesApply)
         lazy->setUsesArgumentsAndApply();
     PropagateTransitiveParseFlags(funbox, lazy);
@@ -2073,13 +2115,14 @@ template <>
 bool
 Parser<FullParseHandler>::functionArgsAndBody(ParseNode *pn, HandleFunction fun,
                                               FunctionType type, FunctionSyntaxKind kind,
+                                              GeneratorKind generatorKind,
                                               Directives inheritedDirectives,
                                               Directives *newDirectives)
 {
     ParseContext<FullParseHandler> *outerpc = pc;
 
     // Create box for fun->object early to protect against last-ditch GC.
-    FunctionBox *funbox = newFunctionBox(pn, fun, pc, inheritedDirectives);
+    FunctionBox *funbox = newFunctionBox(pn, fun, pc, inheritedDirectives, generatorKind);
     if (!funbox)
         return false;
 
@@ -2155,13 +2198,14 @@ template <>
 bool
 Parser<SyntaxParseHandler>::functionArgsAndBody(Node pn, HandleFunction fun,
                                                 FunctionType type, FunctionSyntaxKind kind,
+                                                GeneratorKind generatorKind,
                                                 Directives inheritedDirectives,
                                                 Directives *newDirectives)
 {
     ParseContext<SyntaxParseHandler> *outerpc = pc;
 
     // Create box for fun->object early to protect against last-ditch GC.
-    FunctionBox *funbox = newFunctionBox(pn, fun, pc, inheritedDirectives);
+    FunctionBox *funbox = newFunctionBox(pn, fun, pc, inheritedDirectives, generatorKind);
     if (!funbox)
         return false;
 
@@ -2187,14 +2231,15 @@ Parser<SyntaxParseHandler>::functionArgsAndBody(Node pn, HandleFunction fun,
 template <>
 ParseNode *
 Parser<FullParseHandler>::standaloneLazyFunction(HandleFunction fun, unsigned staticLevel,
-                                                 bool strict)
+                                                 bool strict, GeneratorKind generatorKind)
 {
     Node pn = handler.newFunctionDefinition();
     if (!pn)
         return null();
 
     Directives directives(/* strict = */ strict);
-    FunctionBox *funbox = newFunctionBox(pn, fun, /* outerpc = */ NULL, directives);
+    FunctionBox *funbox = newFunctionBox(pn, fun, /* outerpc = */ NULL, directives,
+                                         generatorKind);
     if (!funbox)
         return null();
 
@@ -2268,6 +2313,10 @@ Parser<ParseHandler>::functionArgsAndBodyGeneric(Node pn, HandleFunction fun, Fu
     // Parse the function body.
     FunctionBodyType bodyType = StatementListBody;
     if (tokenStream.getToken(TokenStream::Operand) != TOK_LC) {
+        if (funbox->isStarGenerator()) {
+            report(ParseError, false, null(), JSMSG_CURLY_BEFORE_BODY);
+            return false;
+        }
         tokenStream.ungetToken();
         bodyType = ExpressionBody;
         fun->setIsExprClosure();
@@ -2305,7 +2354,7 @@ template <>
 ParseNode *
 Parser<FullParseHandler>::moduleDecl()
 {
-    JS_ASSERT(tokenStream.currentToken().name() == context->names().module);
+    JS_ASSERT(tokenStream.currentName() == context->names().module);
     if (!((pc->sc->isGlobalSharedContext() || pc->sc->isModuleBox()) && pc->atBodyLevel()))
     {
         report(ParseError, false, NULL, JSMSG_MODULE_STATEMENT);
@@ -2347,18 +2396,44 @@ Parser<SyntaxParseHandler>::moduleDecl()
     return SyntaxParseHandler::NodeFailure;
 }
 
+template <typename ParseHandler>
+bool
+Parser<ParseHandler>::checkYieldNameValidity(unsigned errorNumber)
+{
+    // In star generators and in JS >= 1.7, yield is a keyword.
+    if (pc->isStarGenerator() || versionNumber() >= JSVERSION_1_7) {
+        report(ParseError, false, null(), errorNumber);
+        return false;
+    }
+    // Otherwise in strict mode, yield is a future reserved word.
+    if (pc->sc->strict) {
+        report(ParseError, false, null(), JSMSG_RESERVED_ID, "yield");
+        return false;
+    }
+    return true;
+}
+
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::functionStmt()
 {
-    JS_ASSERT(tokenStream.currentToken().type == TOK_FUNCTION);
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_FUNCTION));
 
     TokenStream::Position start(keepAtoms);
     tokenStream.tell(&start);
 
     RootedPropertyName name(context);
-    if (tokenStream.getToken(TokenStream::KeywordIsName) == TOK_NAME) {
-        name = tokenStream.currentToken().name();
+    GeneratorKind generatorKind = NotGenerator;
+    TokenKind tt = tokenStream.getToken(TokenStream::KeywordIsName);
+
+    if (tt == TOK_MUL) {
+        tokenStream.tell(&start);
+        tt = tokenStream.getToken(TokenStream::KeywordIsName);
+        generatorKind = StarGenerator;
+    }
+
+    if (tt == TOK_NAME) {
+        name = tokenStream.currentName();
     } else {
         /* Unnamed function expressions are forbidden in statement context. */
         report(ParseError, false, null(), JSMSG_UNNAMED_FUNCTION_STMT);
@@ -2370,22 +2445,34 @@ Parser<ParseHandler>::functionStmt()
         !report(ParseStrictError, pc->sc->strict, null(), JSMSG_STRICT_FUNCTION_STATEMENT))
         return null();
 
-    return functionDef(name, start, Normal, Statement);
+    return functionDef(name, start, Normal, Statement, generatorKind);
 }
 
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::functionExpr()
 {
-    RootedPropertyName name(context);
-    JS_ASSERT(tokenStream.currentToken().type == TOK_FUNCTION);
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_FUNCTION));
+
     TokenStream::Position start(keepAtoms);
     tokenStream.tell(&start);
-    if (tokenStream.getToken(TokenStream::KeywordIsName) == TOK_NAME)
-        name = tokenStream.currentToken().name();
+
+    RootedPropertyName name(context);
+    GeneratorKind generatorKind = NotGenerator;
+    TokenKind tt = tokenStream.getToken(TokenStream::KeywordIsName);
+
+    if (tt == TOK_MUL) {
+        tokenStream.tell(&start);
+        tt = tokenStream.getToken(TokenStream::KeywordIsName);
+        generatorKind = StarGenerator;
+    }
+
+    if (tt == TOK_NAME)
+        name = tokenStream.currentName();
     else
         tokenStream.ungetToken();
-    return functionDef(name, start, Normal, Expression);
+
+    return functionDef(name, start, Normal, Expression, generatorKind);
 }
 
 /*
@@ -2519,7 +2606,7 @@ Parser<ParseHandler>::maybeParseDirective(Node list, Node pn, bool *cont)
                 }
             }
         } else if (directive == context->names().useAsm) {
-            if (pc->sc->isFunctionBox())
+            if (pc->sc->isFunctionBox() && !pc->isGenerator())
                 return asmJS(list);
             return report(ParseWarning, false, pn, JSMSG_USE_ASM_DIRECTIVE_FAIL);
         }
@@ -2601,15 +2688,21 @@ Parser<ParseHandler>::condition()
     return pn;
 }
 
-static bool
-MatchLabel(TokenStream &ts, MutableHandlePropertyName label)
+template <typename ParseHandler>
+bool
+Parser<ParseHandler>::matchLabel(MutableHandle<PropertyName*> label)
 {
-    TokenKind tt = ts.peekTokenSameLine(TokenStream::Operand);
+    TokenKind tt = tokenStream.peekTokenSameLine(TokenStream::Operand);
     if (tt == TOK_ERROR)
         return false;
     if (tt == TOK_NAME) {
-        (void) ts.getToken();
-        label.set(ts.currentToken().name());
+        tokenStream.consumeKnownToken(TOK_NAME);
+        label.set(tokenStream.currentName());
+    } else if (tt == TOK_YIELD) {
+        tokenStream.consumeKnownToken(TOK_YIELD);
+        if (!checkYieldNameValidity())
+            return false;
+        label.set(tokenStream.currentName());
     } else {
         label.set(NULL);
     }
@@ -3235,7 +3328,7 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::letBlock(LetContext letContext)
 {
-    JS_ASSERT(tokenStream.currentToken().type == TOK_LET);
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_LET));
 
     RootedStaticBlockObject blockObj(context, StaticBlockObject::create(context));
     if (!blockObj)
@@ -3325,7 +3418,7 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::blockStatement()
 {
-    JS_ASSERT(tokenStream.currentToken().type == TOK_LC);
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_LC));
 
     StmtInfoPC stmtInfo(context);
     if (!PushBlocklikeStatement(&stmtInfo, STMT_BLOCK, pc))
@@ -3367,7 +3460,6 @@ Parser<ParseHandler>::newBindingNode(PropertyName *name, bool functionScope, Var
     }
 
     /* Make a new node for this declarator name (or destructuring pattern). */
-    JS_ASSERT(tokenStream.currentToken().type == TOK_NAME);
     return newName(name);
 }
 
@@ -3456,12 +3548,17 @@ Parser<ParseHandler>::variables(ParseNodeKind kind, bool *psimple,
 #endif /* JS_HAS_DESTRUCTURING */
 
         if (tt != TOK_NAME) {
-            if (tt != TOK_ERROR)
-                report(ParseError, false, null(), JSMSG_NO_VARIABLE_NAME);
-            return null();
+            if (tt == TOK_YIELD) {
+                if (!checkYieldNameValidity(JSMSG_NO_VARIABLE_NAME))
+                    return null();
+            } else {
+                if (tt != TOK_ERROR)
+                    report(ParseError, false, null(), JSMSG_NO_VARIABLE_NAME);
+                return null();
+            }
         }
 
-        RootedPropertyName name(context, tokenStream.currentToken().name());
+        RootedPropertyName name(context, tokenStream.currentName());
         pn2 = newBindingNode(name, kind == PNK_VAR || kind == PNK_CONST, varContext);
         if (!pn2)
             return null();
@@ -4118,9 +4215,14 @@ Parser<SyntaxParseHandler>::forStatement()
     PushStatementPC(pc, &forStmt, STMT_FOR_LOOP);
 
     /* Don't parse 'for each' loops. */
-    if (allowsForEachIn() && tokenStream.peekToken() == TOK_NAME) {
-        JS_ALWAYS_FALSE(abortIfSyntaxParser());
-        return null();
+    if (allowsForEachIn()) {
+        TokenKind tt = tokenStream.peekToken();
+        // Not all "yield" tokens are names, but the ones that aren't names are
+        // invalid in this context anyway.
+        if (tt == TOK_NAME || tt == TOK_YIELD) {
+            JS_ALWAYS_FALSE(abortIfSyntaxParser());
+            return null();
+        }
     }
 
     MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_AFTER_FOR);
@@ -4322,7 +4424,7 @@ Parser<ParseHandler>::continueStatement()
     uint32_t begin = pos().begin;
 
     RootedPropertyName label(context);
-    if (!MatchLabel(tokenStream, &label))
+    if (!matchLabel(&label))
         return null();
 
     StmtInfoPC *stmt = pc->topStmt;
@@ -4369,7 +4471,7 @@ Parser<ParseHandler>::breakStatement()
     uint32_t begin = pos().begin;
 
     RootedPropertyName label(context);
-    if (!MatchLabel(tokenStream, &label))
+    if (!matchLabel(&label))
         return null();
     StmtInfoPC *stmt = pc->topStmt;
     if (label) {
@@ -4400,98 +4502,45 @@ Parser<ParseHandler>::breakStatement()
 
 template <typename ParseHandler>
 typename ParseHandler::Node
-Parser<ParseHandler>::returnStatementOrYieldExpression()
+Parser<ParseHandler>::returnStatement()
 {
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_RETURN) ||
-              tokenStream.isCurrentTokenType(TOK_YIELD));
-    bool isYield = tokenStream.isCurrentTokenType(TOK_YIELD);
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_RETURN));
     uint32_t begin = pos().begin;
 
     if (!pc->sc->isFunctionBox()) {
-        report(ParseError, false, null(), JSMSG_BAD_RETURN_OR_YIELD,
-               isYield ? js_yield_str : js_return_str);
+        report(ParseError, false, null(), JSMSG_BAD_RETURN_OR_YIELD, js_return_str);
         return null();
     }
 
-    // Legacy generators are identified by the presence of "yield" in their
-    // bodies.  We only see "yield" as TOK_YIELD in JS 1.7+.
-    if (isYield) {
-        JS_ASSERT(tokenStream.versionNumber() >= JSVERSION_1_7);
-        if (!abortIfSyntaxParser())
-            return null();
-
-        if (pc->isLegacyGenerator()) {
-            // We are in a legacy generator: a function that has already seen a
-            // yield.
-            JS_ASSERT(pc->sc->isFunctionBox());
-            JS_ASSERT(pc->lastYieldOffset != ParseContext<ParseHandler>::NoYieldOffset);
-        } else {
-            // We are in a code that has not seen a yield, and in JS 1.8 so
-            // "yield" parsed as TOK_YIELD.  Try to transition to being a legacy
-            // generator.
-            JS_ASSERT(tokenStream.currentToken().type == TOK_YIELD);
-            JS_ASSERT(pc->lastYieldOffset == ParseContext<ParseHandler>::NoYieldOffset);
-
-            if (!pc->sc->isFunctionBox()) {
-                report(ParseError, false, null(), JSMSG_BAD_RETURN_OR_YIELD, js_yield_str);
-                return null();
-            }
-
-            pc->generatorParseMode = ParseContext<ParseHandler>::LegacyGenerator;
-        }
-
-        pc->lastYieldOffset = begin;
-    }
-
     // Parse an optional operand.
     //
-    // Checking whether yield has an operand is especially wonky since
-    // there is not a mandatory semicolon.
-    //
-    // ES6 does not permit yield without an operand. We will have to sunset
-    // this extension in order to conform to the ES6 syntax, which treats
-    // "yield \n expr;" as a single ExpressionStatement.
+    // This is ugly, but we don't want to require a semicolon.
     Node exprNode;
-    TokenKind next = tokenStream.peekTokenSameLine(TokenStream::Operand);
-    if (next == TOK_ERROR)
+    switch (tokenStream.peekTokenSameLine(TokenStream::Operand)) {
+      case TOK_ERROR:
         return null();
-    if (next == TOK_EOF || next == TOK_EOL || next == TOK_SEMI || next == TOK_RC ||
-        (isYield && (next == TOK_RB || next == TOK_RP || next == TOK_COLON || next == TOK_COMMA)))
-    {
-        if (isYield) {
-            if (!reportWithOffset(ParseWarning, false, pos().begin, JSMSG_YIELD_WITHOUT_OPERAND))
-                return null();
-        }
-
+      case TOK_EOF:
+      case TOK_EOL:
+      case TOK_SEMI:
+      case TOK_RC:
         exprNode = null();
-        if (!isYield)
-            pc->funHasReturnVoid = true;
-    } else {
-        exprNode = isYield ? assignExpr() : expr();
+        pc->funHasReturnVoid = true;
+        break;
+      default: {
+        exprNode = expr();
         if (!exprNode)
             return null();
-        if (!isYield)
-            pc->funHasReturnExpr = true;
+        pc->funHasReturnExpr = true;
+      }
     }
 
-    if (!isYield) {
-        if (!MatchOrInsertSemicolon(tokenStream))
-            return null();
-    }
+    if (!MatchOrInsertSemicolon(tokenStream))
+        return null();
 
-    Node pn = isYield
-              ? handler.newUnary(PNK_YIELD, JSOP_YIELD, begin, exprNode)
-              : handler.newReturnStatement(exprNode, TokenPos(begin, pos().end));
+    Node pn = handler.newReturnStatement(exprNode, TokenPos(begin, pos().end));
     if (!pn)
         return null();
 
-    if (pc->funHasReturnExpr && pc->isLegacyGenerator()) {
-        /* As in Python (see PEP-255), disallow return v; in generators. */
-        reportBadReturn(pn, ParseError, JSMSG_BAD_GENERATOR_RETURN,
-                        JSMSG_BAD_ANON_GENERATOR_RETURN);
-        return null();
-    }
-
     if (options().extraWarningsOption && pc->funHasReturnExpr && pc->funHasReturnVoid &&
         !reportBadReturn(pn, ParseExtraWarning,
                          JSMSG_NO_RETURN_VALUE, JSMSG_ANON_NO_RETURN_VALUE))
@@ -4499,9 +4548,108 @@ Parser<ParseHandler>::returnStatementOrYieldExpression()
         return null();
     }
 
+    if (pc->isLegacyGenerator() && exprNode) {
+        /* Disallow "return v;" in legacy generators. */
+        reportBadReturn(pn, ParseError, JSMSG_BAD_GENERATOR_RETURN,
+                        JSMSG_BAD_ANON_GENERATOR_RETURN);
+        return null();
+    }
+
     return pn;
 }
 
+template <typename ParseHandler>
+typename ParseHandler::Node
+Parser<ParseHandler>::yieldExpression()
+{
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_YIELD));
+    uint32_t begin = pos().begin;
+
+    switch (pc->generatorKind()) {
+      case StarGenerator:
+      {
+        JS_ASSERT(pc->sc->isFunctionBox());
+
+        pc->lastYieldOffset = begin;
+
+        bool isDelegatingYield = tokenStream.matchToken(TOK_MUL);
+
+        // ES6 generators require a value.
+        Node exprNode = assignExpr();
+        if (!exprNode)
+            return null();
+
+        // FIXME: Plumb isDelegatingYield appropriately.
+        (void) isDelegatingYield;
+        return handler.newUnary(PNK_YIELD, JSOP_YIELD, begin, exprNode);
+      }
+
+      case NotGenerator:
+        // We are in code that has not seen a yield, but we are in JS 1.7 or
+        // later.  Try to transition to being a legacy generator.
+        JS_ASSERT(tokenStream.versionNumber() >= JSVERSION_1_7);
+        JS_ASSERT(pc->lastYieldOffset == ParseContext<ParseHandler>::NoYieldOffset);
+
+        if (!abortIfSyntaxParser())
+            return null();
+
+        if (!pc->sc->isFunctionBox()) {
+            report(ParseError, false, null(), JSMSG_BAD_RETURN_OR_YIELD, js_yield_str);
+            return null();
+        }
+
+        pc->sc->asFunctionBox()->setGeneratorKind(LegacyGenerator);
+
+        if (pc->funHasReturnExpr) {
+            /* As in Python (see PEP-255), disallow return v; in generators. */
+            reportBadReturn(null(), ParseError, JSMSG_BAD_GENERATOR_RETURN,
+                            JSMSG_BAD_ANON_GENERATOR_RETURN);
+            return null();
+        }
+        // Fall through.
+
+      case LegacyGenerator:
+      {
+        // We are in a legacy generator: a function that has already seen a
+        // yield, or in a legacy generator comprehension.
+        JS_ASSERT(pc->sc->isFunctionBox());
+
+        pc->lastYieldOffset = begin;
+
+        // Legacy generators do not require a value.
+        Node exprNode;
+        switch (tokenStream.peekTokenSameLine(TokenStream::Operand)) {
+          case TOK_ERROR:
+            return null();
+          case TOK_EOF:
+          case TOK_EOL:
+          case TOK_SEMI:
+          case TOK_RC:
+          case TOK_RB:
+          case TOK_RP:
+          case TOK_COLON:
+          case TOK_COMMA:
+            // No value.
+            exprNode = null();
+            // ES6 does not permit yield without an operand.  We should
+            // encourage users of yield expressions of this kind to pass an
+            // operand, to bring users closer to standard syntax.
+            if (!reportWithOffset(ParseWarning, false, pos().begin, JSMSG_YIELD_WITHOUT_OPERAND))
+                return null();
+            break;
+          default:
+            exprNode = assignExpr();
+            if (!exprNode)
+                return null();
+        }
+
+        return handler.newUnary(PNK_YIELD, JSOP_YIELD, begin, exprNode);
+      }
+    }
+
+    MOZ_ASSUME_UNREACHABLE("yieldExpr");
+}
+
 template <>
 ParseNode *
 Parser<FullParseHandler>::withStatement()
@@ -4571,7 +4719,7 @@ typename ParseHandler::Node
 Parser<ParseHandler>::labeledStatement()
 {
     uint32_t begin = pos().begin;
-    RootedPropertyName label(context, tokenStream.currentToken().name());
+    RootedPropertyName label(context, tokenStream.currentName());
     for (StmtInfoPC *stmt = pc->topStmt; stmt; stmt = stmt->down) {
         if (stmt->type == STMT_LABEL && stmt->label == label) {
             report(ParseError, false, null(), JSMSG_DUPLICATE_LABEL);
@@ -4712,9 +4860,13 @@ Parser<ParseHandler>::tryStatement()
                 break;
 #endif
 
+              case TOK_YIELD:
+                if (!checkYieldNameValidity(JSMSG_CATCH_IDENTIFIER))
+                    return null();
+                // Fall through.
               case TOK_NAME:
               {
-                RootedPropertyName label(context, tokenStream.currentToken().name());
+                RootedPropertyName label(context, tokenStream.currentName());
                 catchName = newBindingNode(label, false);
                 if (!catchName)
                     return null();
@@ -4850,7 +5002,7 @@ Parser<ParseHandler>::statement(bool canHaveDirectives)
       case TOK_BREAK:
         return breakStatement();
       case TOK_RETURN:
-        return returnStatementOrYieldExpression();
+        return returnStatement();
       case TOK_WITH:
         return withStatement();
       case TOK_THROW:
@@ -4881,10 +5033,18 @@ Parser<ParseHandler>::statement(bool canHaveDirectives)
         }
         return expressionStatement();
 
+      case TOK_YIELD:
+        if (tokenStream.peekToken() == TOK_COLON) {
+            if (!checkYieldNameValidity())
+                return null();
+            return labeledStatement();
+        }
+        return expressionStatement();
+
       case TOK_NAME:
         if (tokenStream.peekToken() == TOK_COLON)
             return labeledStatement();
-        if (tokenStream.currentToken().name() == context->names().module
+        if (tokenStream.currentName() == context->names().module
             && tokenStream.peekTokenSameLine() == TOK_STRING)
         {
             return moduleDecl();
@@ -5197,8 +5357,8 @@ Parser<ParseHandler>::assignExpr()
     if (tt == TOK_STRING && tokenStream.nextTokenEndsExpr())
         return stringLiteral();
 
-    if (tt == TOK_YIELD)
-        return returnStatementOrYieldExpression();
+    if (tt == TOK_YIELD && (versionNumber() >= JSVERSION_1_7 || pc->isGenerator()))
+        return yieldExpression();
 
     tokenStream.ungetToken();
 
@@ -5236,7 +5396,7 @@ Parser<ParseHandler>::assignExpr()
             return null();
         tokenStream.ungetToken();
 
-        return functionDef(NullPtr(), start, Normal, Arrow);
+        return functionDef(NullPtr(), start, Normal, Arrow, NotGenerator);
       }
 
       default:
@@ -5657,7 +5817,7 @@ Parser<FullParseHandler>::comprehensionTail(ParseNode *kid, unsigned blockid, bo
     BindData<FullParseHandler> data(context);
     TokenKind tt;
 
-    JS_ASSERT(tokenStream.currentToken().type == TOK_FOR);
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_FOR));
 
     if (kind == PNK_SEMI) {
         /*
@@ -5742,7 +5902,7 @@ Parser<FullParseHandler>::comprehensionTail(ParseNode *kid, unsigned blockid, bo
 #endif
 
           case TOK_NAME:
-            name = tokenStream.currentToken().name();
+            name = tokenStream.currentName();
 
             /*
              * Create a name node with pn_op JSOP_NAME.  We can't set pn_op to
@@ -5950,7 +6110,8 @@ Parser<FullParseHandler>::generatorExpr(ParseNode *kid)
 
         /* Create box for fun->object early to protect against last-ditch GC. */
         Directives directives(/* strict = */ outerpc->sc->strict);
-        FunctionBox *genFunbox = newFunctionBox(genfn, fun, outerpc, directives);
+        FunctionBox *genFunbox = newFunctionBox(genfn, fun, outerpc, directives,
+                                                LegacyGenerator);
         if (!genFunbox)
             return null();
 
@@ -5970,7 +6131,7 @@ Parser<FullParseHandler>::generatorExpr(ParseNode *kid)
         if (outerpc->sc->isFunctionBox())
             genFunbox->funCxFlags = outerpc->sc->asFunctionBox()->funCxFlags;
 
-        genFunbox->setIsLegacyGenerator();
+        JS_ASSERT(genFunbox->isLegacyGenerator());
         genFunbox->inGenexpLambda = true;
         genfn->pn_blockid = genpc.bodyid;
 
@@ -6111,7 +6272,7 @@ Parser<ParseHandler>::memberExpr(TokenKind tt, bool allowCallSyntax)
             if (tt == TOK_ERROR)
                 return null();
             if (tt == TOK_NAME) {
-                PropertyName *field = tokenStream.currentToken().name();
+                PropertyName *field = tokenStream.currentName();
                 nextMember = handler.newPropertyAccess(lhs, field, pos().end);
                 if (!nextMember)
                     return null();
@@ -6186,9 +6347,7 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::identifierName()
 {
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_NAME));
-
-    RootedPropertyName name(context, tokenStream.currentToken().name());
+    RootedPropertyName name(context, tokenStream.currentName());
     Node pn = newName(name);
     if (!pn)
         return null();
@@ -6402,7 +6561,7 @@ Parser<ParseHandler>::primaryExpr(TokenKind tt)
                 break;
               case TOK_NAME:
                 {
-                    atom = tokenStream.currentToken().name();
+                    atom = tokenStream.currentName();
                     if (atom == context->names().get) {
                         op = JSOP_INITPROP_GETTER;
                     } else if (atom == context->names().set) {
@@ -6416,7 +6575,7 @@ Parser<ParseHandler>::primaryExpr(TokenKind tt)
 
                     tt = tokenStream.getToken(TokenStream::KeywordIsName);
                     if (tt == TOK_NAME) {
-                        atom = tokenStream.currentToken().name();
+                        atom = tokenStream.currentName();
                         pn3 = newName(atom->asPropertyName());
                         if (!pn3)
                             return null();
@@ -6463,7 +6622,7 @@ Parser<ParseHandler>::primaryExpr(TokenKind tt)
                     TokenStream::Position start(keepAtoms);
                     tokenStream.tell(&start);
                     pn2 = functionDef(funName, start, op == JSOP_INITPROP_GETTER ? Getter : Setter,
-                                      Expression);
+                                      Expression, NotGenerator);
                     if (!pn2)
                         return null();
                     pn2 = handler.newBinary(PNK_COLON, pn3, pn2, op);
@@ -6619,6 +6778,10 @@ Parser<ParseHandler>::primaryExpr(TokenKind tt)
       case TOK_STRING:
         return stringLiteral();
 
+      case TOK_YIELD:
+        if (!checkYieldNameValidity())
+            return null();
+        // Fall through.
       case TOK_NAME:
         return identifierName();
 
@@ -6680,7 +6843,7 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::parenExpr(bool *genexp)
 {
-    JS_ASSERT(tokenStream.currentToken().type == TOK_LP);
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_LP));
     uint32_t begin = pos().begin;
 
     if (genexp)
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 2db7782d99e..711884a77d5 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -104,18 +104,20 @@ struct ParseContext : public GenericParseContext
 
     const unsigned  staticLevel;    /* static compilation unit nesting level */
 
-    // Functions start off being parsed as NotGenerator.
-    // NotGenerator transitions to LegacyGenerator on parsing "yield" in JS 1.7.
-    enum GeneratorParseMode { NotGenerator, LegacyGenerator };
-    GeneratorParseMode generatorParseMode;
-
     // lastYieldOffset stores the offset of the last yield that was parsed.
     // NoYieldOffset is its initial value.
     static const uint32_t NoYieldOffset = UINT32_MAX;
     uint32_t         lastYieldOffset;
 
-    bool isGenerator() const { return generatorParseMode != NotGenerator; }
-    bool isLegacyGenerator() const { return generatorParseMode == LegacyGenerator; }
+    // Most functions start off being parsed as non-generators.
+    // Non-generators transition to LegacyGenerator on parsing "yield" in JS 1.7.
+    // An ES6 generator is marked as a "star generator" before its body is parsed.
+    GeneratorKind generatorKind() const {
+        return sc->isFunctionBox() ? sc->asFunctionBox()->generatorKind() : NotGenerator;
+    }
+    bool isGenerator() const { return generatorKind() != NotGenerator; }
+    bool isLegacyGenerator() const { return generatorKind() == LegacyGenerator; }
+    bool isStarGenerator() const { return generatorKind() == StarGenerator; }
 
     Node            blockNode;      /* parse node for a block with let declarations
                                        (block with its own lexical scope)  */
@@ -249,7 +251,6 @@ struct ParseContext : public GenericParseContext
         blockChain(prs->context),
         maybeFunction(maybeFunction),
         staticLevel(staticLevel),
-        generatorParseMode(NotGenerator),
         lastYieldOffset(NoYieldOffset),
         blockNode(ParseHandler::null()),
         decls_(prs->context, prs->alloc),
@@ -399,7 +400,7 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     ObjectBox *newObjectBox(JSObject *obj);
     ModuleBox *newModuleBox(Module *module, ParseContext<ParseHandler> *pc);
     FunctionBox *newFunctionBox(Node fn, JSFunction *fun, ParseContext<ParseHandler> *pc,
-                                Directives directives);
+                                Directives directives, GeneratorKind generatorKind);
 
     /*
      * Create a new function object given parse context (pc) and a name (which
@@ -432,13 +433,16 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     Node statement(bool canHaveDirectives = false);
     bool maybeParseDirective(Node list, Node pn, bool *cont);
 
-    // Parse a function, given only its body. Used for the Function constructor.
+    // Parse a function, given only its body. Used for the Function and
+    // Generator constructors.
     Node standaloneFunctionBody(HandleFunction fun, const AutoNameVector &formals,
+                                GeneratorKind generatorKind,
                                 Directives inheritedDirectives, Directives *newDirectives);
 
     // Parse a function, given only its arguments and body. Used for lazily
     // parsed functions.
-    Node standaloneLazyFunction(HandleFunction fun, unsigned staticLevel, bool strict);
+    Node standaloneLazyFunction(HandleFunction fun, unsigned staticLevel, bool strict,
+                                GeneratorKind generatorKind);
 
     /*
      * Parse a function body.  Pass StatementListBody if the body is a list of
@@ -486,7 +490,7 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     Node switchStatement();
     Node continueStatement();
     Node breakStatement();
-    Node returnStatementOrYieldExpression();
+    Node returnStatement();
     Node withStatement();
     Node labeledStatement();
     Node throwStatement();
@@ -503,6 +507,7 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     Node expr();
     Node assignExpr();
     Node assignExprWithoutYield(unsigned err);
+    Node yieldExpression();
     Node condExpr1();
     Node orExpr1();
     Node unaryExpr();
@@ -516,9 +521,10 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     bool functionArguments(FunctionSyntaxKind kind, Node *list, Node funcpn, bool &hasRest);
 
     Node functionDef(HandlePropertyName name, const TokenStream::Position &start,
-                     FunctionType type, FunctionSyntaxKind kind);
+                     FunctionType type, FunctionSyntaxKind kind, GeneratorKind generatorKind);
     bool functionArgsAndBody(Node pn, HandleFunction fun,
                              FunctionType type, FunctionSyntaxKind kind,
+                             GeneratorKind generatorKind,
                              Directives inheritedDirectives, Directives *newDirectives);
 
     Node unaryOpExpr(ParseNodeKind kind, JSOp op, uint32_t begin);
@@ -535,6 +541,9 @@ class Parser : private AutoGCRooter, public StrictModeGetter
 
     Node identifierName();
 
+    bool matchLabel(MutableHandle<PropertyName*> label);
+    bool checkYieldNameValidity(unsigned errorNumber = JSMSG_SYNTAX_ERROR);
+
     bool allowsForEachIn() {
 #if !JS_HAS_FOR_EACH_IN
         return false;
@@ -555,6 +564,7 @@ class Parser : private AutoGCRooter, public StrictModeGetter
 
     bool checkFunctionArguments();
     bool makeDefIntoUse(Definition *dn, Node pn, JSAtom *atom);
+    bool checkFunctionName(HandlePropertyName funName);
     bool checkFunctionDefinition(HandlePropertyName funName, Node *pn, FunctionSyntaxKind kind,
                                  bool *pbodyProcessed);
     bool finishFunctionDefinition(Node pn, FunctionBox *funbox, Node prelude, Node body);
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 4c01bd97bef..9e36f162933 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -72,10 +72,6 @@ class FunctionContextFlags
     // This class's data is all private and so only visible to these friends.
     friend class FunctionBox;
 
-    // We parsed a yield statement in the function, which can happen in JS1.7+
-    // mode.
-    bool isLegacyGenerator:1;
-
     // The function or a function that encloses it may define new local names
     // at runtime through means other than calling eval.
     bool mightAliasLocals:1;
@@ -129,8 +125,7 @@ class FunctionContextFlags
 
   public:
     FunctionContextFlags()
-     :  isLegacyGenerator(false),
-        mightAliasLocals(false),
+     :  mightAliasLocals(false),
         hasExtensibleScope(false),
         needsDeclEnvObject(false),
         argumentsHasLocalBinding(false),
@@ -264,6 +259,8 @@ class FunctionBox : public ObjectBox, public SharedContext
     uint32_t        startLine;
     uint32_t        startColumn;
     uint16_t        ndefaults;
+
+    uint8_t         generatorKindBits_;     /* The GeneratorKind of this function. */
     bool            inWith:1;               /* some enclosing scope is a with-statement */
     bool            inGenexpLambda:1;       /* lambda from generator expression */
     bool            hasDestructuringArgs:1; /* arguments list contains destructuring expression */
@@ -279,21 +276,30 @@ class FunctionBox : public ObjectBox, public SharedContext
     template <typename ParseHandler>
     FunctionBox(ExclusiveContext *cx, ObjectBox* traceListHead, JSFunction *fun,
                 ParseContext<ParseHandler> *pc, Directives directives,
-                bool extraWarnings);
+                bool extraWarnings, GeneratorKind generatorKind);
 
     ObjectBox *toObjectBox() { return this; }
     JSFunction *function() const { return &object->as<JSFunction>(); }
 
-    // In the future, isGenerator will also return true for ES6 generators.
-    bool isGenerator()              const { return isLegacyGenerator(); }
-    bool isLegacyGenerator()        const { return funCxFlags.isLegacyGenerator; }
+    GeneratorKind generatorKind() const { return GeneratorKindFromBits(generatorKindBits_); }
+    bool isGenerator() const { return generatorKind() != NotGenerator; }
+    bool isLegacyGenerator() const { return generatorKind() == LegacyGenerator; }
+    bool isStarGenerator() const { return generatorKind() == StarGenerator; }
+
+    void setGeneratorKind(GeneratorKind kind) {
+        // A generator kind can be set at initialization, or when "yield" is
+        // first seen.  In both cases the transition can only happen from
+        // NotGenerator.
+        JS_ASSERT(!isGenerator());
+        generatorKindBits_ = GeneratorKindAsBits(kind);
+    }
+
     bool mightAliasLocals()         const { return funCxFlags.mightAliasLocals; }
     bool hasExtensibleScope()       const { return funCxFlags.hasExtensibleScope; }
     bool needsDeclEnvObject()       const { return funCxFlags.needsDeclEnvObject; }
     bool argumentsHasLocalBinding() const { return funCxFlags.argumentsHasLocalBinding; }
     bool definitelyNeedsArgsObj()   const { return funCxFlags.definitelyNeedsArgsObj; }
 
-    void setIsLegacyGenerator()            { funCxFlags.isLegacyGenerator        = true; }
     void setMightAliasLocals()             { funCxFlags.mightAliasLocals         = true; }
     void setHasExtensibleScope()           { funCxFlags.hasExtensibleScope       = true; }
     void setNeedsDeclEnvObject()           { funCxFlags.needsDeclEnvObject       = true; }
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
index b725527231c..8269b92a188 100644
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -932,10 +932,10 @@ TokenStream::checkForKeyword(const jschar *s, size_t length, TokenKind *ttp)
             return reportError(JSMSG_RESERVED_ID, kw->chars);
         }
 
-        // The keyword is not in this version. Treat it as an identifier,
-        // unless it is let or yield which we treat as TOK_STRICT_RESERVED by
-        // falling through to the code below (ES5 forbids them in strict mode).
-        if (kw->tokentype != TOK_LET && kw->tokentype != TOK_YIELD)
+        // The keyword is not in this version. Treat it as an identifier, unless
+        // it is let which we treat as TOK_STRICT_RESERVED by falling through to
+        // the code below (ES5 forbids it in strict mode).
+        if (kw->tokentype != TOK_LET)
             return true;
     }
 
diff --git a/js/src/frontend/TokenStream.h b/js/src/frontend/TokenStream.h
index cb46a52391f..51968f729eb 100644
--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.h
@@ -407,6 +407,13 @@ class MOZ_STACK_CLASS TokenStream
     JSVersion versionNumber() const { return VersionNumber(options().version); }
     JSVersion versionWithFlags() const { return options().version; }
 
+    PropertyName *currentName() const {
+        if (isCurrentTokenType(TOK_YIELD))
+            return cx->names().yield;
+        JS_ASSERT(isCurrentTokenType(TOK_NAME));
+        return currentToken().name();
+    }
+
     bool isCurrentTokenAssignment() const {
         return TokenKindIsAssignment(currentToken().type);
     }
diff --git a/js/src/jit-test/tests/generators/es6-syntax.js b/js/src/jit-test/tests/generators/es6-syntax.js
new file mode 100644
index 00000000000..79b9109cead
--- /dev/null
+++ b/js/src/jit-test/tests/generators/es6-syntax.js
@@ -0,0 +1,38 @@
+// Test interactions between ES6 generators and not-yet-standard
+// features.
+
+function assertSyntaxError(str) {
+    var msg;
+    var evil = eval;
+    try {
+        // Non-direct eval.
+        evil(str);
+    } catch (exc) {
+        if (exc instanceof SyntaxError)
+            return;
+        msg = "Assertion failed: expected SyntaxError, got " + exc;
+    }
+    if (msg === undefined)
+        msg = "Assertion failed: expected SyntaxError, but no exception thrown";
+    throw new Error(msg + " - " + str);
+}
+
+// Destructuring binding.
+assertSyntaxError("function* f(x = yield) {}");
+assertSyntaxError("function* f(x = yield 17) {}");
+assertSyntaxError("function* f([yield]) {}");
+assertSyntaxError("function* f({ yield }) {}");
+assertSyntaxError("function* f(...yield) {}");
+
+// For each.
+assertSyntaxError("for yield");
+assertSyntaxError("for yield (;;) {}");
+assertSyntaxError("for yield (x of y) {}");
+assertSyntaxError("for yield (var i in o) {}");
+
+// Expression bodies.
+assertSyntaxError("function* f() yield 7");
+
+// Asm.js.
+load(libdir + "asm.js");
+assertAsmDirectiveFail("function* f() { 'use asm'; function g() { return 0; } return g; })()")
diff --git a/js/src/jit/AsmJS.cpp b/js/src/jit/AsmJS.cpp
index 4ce4628dee6..54a4002ea23 100644
--- a/js/src/jit/AsmJS.cpp
+++ b/js/src/jit/AsmJS.cpp
@@ -4625,7 +4625,7 @@ ParseFunction(ModuleCompiler &m, ParseNode **fnOut)
     AsmJSParseContext *outerpc = m.parser().pc;
 
     Directives directives(outerpc);
-    FunctionBox *funbox = m.parser().newFunctionBox(fn, fun, outerpc, directives);
+    FunctionBox *funbox = m.parser().newFunctionBox(fn, fun, outerpc, directives, NotGenerator);
     if (!funbox)
         return false;
 
diff --git a/js/src/js.msg b/js/src/js.msg
index 3f665d8d548..cf71af5f763 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -409,3 +409,4 @@ MSG_DEF(JSMSG_BINARYDATA_NOT_BINARYSTRUCT,   355, 1, JSEXN_TYPEERR, "{0} is not
 MSG_DEF(JSMSG_BINARYDATA_SUBARRAY_INTEGER_ARG, 356, 1, JSEXN_ERR, "argument {0} must be an integer")
 MSG_DEF(JSMSG_BINARYDATA_STRUCTTYPE_EMPTY_DESCRIPTOR, 357, 0, JSEXN_ERR, "field descriptor cannot be empty")
 MSG_DEF(JSMSG_BINARYDATA_STRUCTTYPE_BAD_FIELD, 358, 1, JSEXN_ERR, "field {0} is not a valid BinaryData Type descriptor")
+MSG_DEF(JSMSG_ES6_UNIMPLEMENTED,      359, 0, JSEXN_ERR, "ES6 functionality not yet implemented")
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index b83a050a5d8..ea1b452a21c 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -1829,7 +1829,7 @@ ScriptAnalysis::needsArgsObj(JSContext *cx)
      *
      * FIXME: Don't build arguments for ES6 generator expressions.
      */
-    if (cx->compartment()->debugMode() || script_->isGenerator)
+    if (cx->compartment()->debugMode() || script_->isGenerator())
         return true;
 
     /*
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index d5b90b86e9b..ef358b603a3 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -104,7 +104,6 @@ const char js_typeof_str[]          = "typeof";
 const char js_void_str[]            = "void";
 const char js_while_str[]           = "while";
 const char js_with_str[]            = "with";
-const char js_yield_str[]           = "yield";
 
 /*
  * For a browser build from 2007-08-09 after the browser starts up there are
diff --git a/js/src/jsatom.h b/js/src/jsatom.h
index 1769065c100..9cd9272f0a3 100644
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@@ -153,7 +153,6 @@ extern const char js_typeof_str[];
 extern const char js_void_str[];
 extern const char js_while_str[];
 extern const char js_with_str[];
-extern const char js_yield_str[];
 
 namespace js {
 
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index bce514701de..4b0ff495095 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -526,6 +526,7 @@ FindBody(JSContext *cx, HandleFunction fun, StableCharPtr chars, size_t length,
     do {
         switch (ts.getToken()) {
           case TOK_NAME:
+          case TOK_YIELD:
             if (nest == 0)
                 onward = false;
             break;
@@ -1228,14 +1229,7 @@ fun_isGenerator(JSContext *cx, unsigned argc, Value *vp)
         return true;
     }
 
-    bool result = false;
-    if (fun->hasScript()) {
-        JSScript *script = fun->nonLazyScript();
-        JS_ASSERT(script->length != 0);
-        result = script->isGenerator;
-    }
-
-    JS_SET_RVAL(cx, vp, BooleanValue(result));
+    JS_SET_RVAL(cx, vp, BooleanValue(fun->isGenerator()));
     return true;
 }
 
@@ -1456,10 +1450,15 @@ js::Function(JSContext *cx, unsigned argc, Value *vp)
                     return false;
                 }
 
+                if (tt == TOK_YIELD && ts.versionNumber() < JSVERSION_1_7)
+                    tt = TOK_NAME;
+
                 if (tt != TOK_NAME) {
                     if (tt == TOK_TRIPLEDOT) {
                         hasRest = true;
                         tt = ts.getToken();
+                        if (tt == TOK_YIELD && ts.versionNumber() < JSVERSION_1_7)
+                            tt = TOK_NAME;
                         if (tt != TOK_NAME) {
                             if (tt != TOK_ERROR)
                                 ts.reportError(JSMSG_NO_REST_NAME);
@@ -1470,7 +1469,7 @@ js::Function(JSContext *cx, unsigned argc, Value *vp)
                     }
                 }
 
-                if (!formals.append(ts.currentToken().name()))
+                if (!formals.append(ts.currentName()))
                     return false;
 
                 /*
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index 8ac1cd0d683..d3f63f27041 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -282,6 +282,18 @@ class JSFunction : public JSObject
         return u.i.s.lazy_;
     }
 
+    js::GeneratorKind generatorKind() const {
+        if (!isInterpreted())
+            return js::NotGenerator;
+        return hasScript() ? nonLazyScript()->generatorKind() : lazyScript()->generatorKind();
+    }
+
+    bool isGenerator() const { return generatorKind() != js::NotGenerator; }
+
+    bool isLegacyGenerator() const { return generatorKind() == js::LegacyGenerator; }
+
+    bool isStarGenerator() const { return generatorKind() == js::StarGenerator; }
+
     inline void setScript(JSScript *script_);
     inline void initScript(JSScript *script_);
     void initLazyScript(js::LazyScript *lazy) {
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 313815242eb..844eb4e6cb6 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1475,6 +1475,13 @@ js_NewGenerator(JSContext *cx, const FrameRegs &stackRegs)
     JS_ASSERT(stackRegs.stackDepth() == 0);
     StackFrame *stackfp = stackRegs.fp();
 
+    JS_ASSERT(stackfp->script()->isGenerator());
+
+    if (stackfp->script()->isStarGenerator()) {
+        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_ES6_UNIMPLEMENTED);
+        return NULL;
+    }
+
     Rooted<GlobalObject*> global(cx, &stackfp->global());
     RootedObject obj(cx);
     {
diff --git a/js/src/jsreflect.cpp b/js/src/jsreflect.cpp
index 613fc03c7ff..dc33ff76f84 100644
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -2787,6 +2787,7 @@ ASTSerializer::function(ParseNode *pn, ASTType type, MutableHandleValue dst)
 {
     RootedFunction func(cx, pn->pn_funbox->function());
 
+    // FIXME: Provide more information (legacy generator vs star generator).
     bool isGenerator = pn->pn_funbox->isGenerator();
 
     bool isExpression =
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 528f0786fc9..34498c3f67a 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -407,9 +407,9 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
         FunHasAnyAliasedFormal,
         ArgumentsHasVarBinding,
         NeedsArgsObj,
-        IsGenerator,
         IsGeneratorExp,
         IsLegacyGenerator,
+        IsStarGenerator,
         OwnSource,
         ExplicitUseStrict,
         SelfHosted
@@ -496,12 +496,12 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
             scriptBits |= (1 << NeedsArgsObj);
         if (!enclosingScript || enclosingScript->scriptSource() != script->scriptSource())
             scriptBits |= (1 << OwnSource);
-        if (script->isGenerator)
-            scriptBits |= (1 << IsGenerator);
         if (script->isGeneratorExp)
             scriptBits |= (1 << IsGeneratorExp);
-        if (script->isLegacyGenerator)
+        if (script->isLegacyGenerator())
             scriptBits |= (1 << IsLegacyGenerator);
+        if (script->isStarGenerator())
+            scriptBits |= (1 << IsStarGenerator);
 
         JS_ASSERT(!script->compileAndGo);
         JS_ASSERT(!script->hasSingletons);
@@ -596,12 +596,14 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
             script->setArgumentsHasVarBinding();
         if (scriptBits & (1 << NeedsArgsObj))
             script->setNeedsArgsObj(true);
-        if (scriptBits & (1 << IsGenerator))
-            script->isGenerator = true;
         if (scriptBits & (1 << IsGeneratorExp))
             script->isGeneratorExp = true;
-        if (scriptBits & (1 << IsLegacyGenerator))
-            script->isLegacyGenerator = true;
+
+        if (scriptBits & (1 << IsLegacyGenerator)) {
+            JS_ASSERT(!(scriptBits & (1 << IsStarGenerator)));
+            script->setGeneratorKind(LegacyGenerator);
+        } else if (scriptBits & (1 << IsStarGenerator))
+            script->setGeneratorKind(StarGenerator);
     }
 
     JS_STATIC_ASSERT(sizeof(jsbytecode) == 1);
@@ -1962,9 +1964,8 @@ JSScript::fullyInitFromEmitter(ExclusiveContext *cx, HandleScript script, Byteco
     RootedFunction fun(cx, NULL);
     if (funbox) {
         JS_ASSERT(!bce->script->noScriptRval);
-        script->isGenerator = funbox->isGenerator();
         script->isGeneratorExp = funbox->inGenexpLambda;
-        script->isLegacyGenerator = funbox->isLegacyGenerator();
+        script->setGeneratorKind(funbox->generatorKind());
         script->setFunction(funbox->function());
     }
 
@@ -2473,8 +2474,8 @@ js::CloneScript(JSContext *cx, HandleObject enclosingScope, HandleFunction fun,
     dst->funHasAnyAliasedFormal = src->funHasAnyAliasedFormal;
     dst->hasSingletons = src->hasSingletons;
     dst->treatAsRunOnce = src->treatAsRunOnce;
-    dst->isGenerator = src->isGenerator;
     dst->isGeneratorExp = src->isGeneratorExp;
+    dst->setGeneratorKind(src->generatorKind());
 
     /* Copy over hints. */
     dst->shouldInline = src->shouldInline;
@@ -2915,7 +2916,7 @@ JSScript::argumentsOptimizationFailed(JSContext *cx, HandleScript script)
     if (script->needsArgsObj())
         return true;
 
-    JS_ASSERT(!script->isGenerator);
+    JS_ASSERT(!script->isGenerator());
 
     script->needsArgsObj_ = true;
 
@@ -3007,6 +3008,7 @@ LazyScript::LazyScript(JSFunction *fun, void *table, uint32_t numFreeVariables,
     version_(version),
     numFreeVariables_(numFreeVariables),
     numInnerFunctions_(numInnerFunctions),
+    generatorKindBits_(GeneratorKindAsBits(NotGenerator)),
     strict_(false),
     bindingsAccessedDynamically_(false),
     hasDebuggerStatement_(false),
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 8152ffeb65e..7c338b2b6a1 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -414,6 +414,19 @@ class ScriptSourceObject : public JSObject
     static const uint32_t SOURCE_SLOT = 0;
 };
 
+enum GeneratorKind { NotGenerator, LegacyGenerator, StarGenerator };
+
+static inline unsigned
+GeneratorKindAsBits(GeneratorKind generatorKind) {
+    return static_cast<unsigned>(generatorKind);
+}
+
+static inline GeneratorKind
+GeneratorKindFromBits(unsigned val) {
+    JS_ASSERT(val <= StarGenerator);
+    return static_cast<GeneratorKind>(val);
+}
+
 } /* namespace js */
 
 class JSScript : public js::gc::Cell
@@ -538,6 +551,9 @@ class JSScript : public js::gc::Cell
     // optional arrays in |data|.  See the comments above Create() for details.
     ArrayBitsT      hasArrayBits;
 
+    // The GeneratorKind of the script.
+    uint8_t         generatorKindBits_;
+
     // 1-bit fields.
 
   public:
@@ -589,14 +605,9 @@ class JSScript : public js::gc::Cell
 #endif
     bool            invalidatedIdempotentCache:1; /* idempotent cache has triggered invalidation */
 
-    // All generators have isGenerator set to true.
-    bool            isGenerator:1;
     // If the generator was created implicitly via a generator expression,
     // isGeneratorExp will be true.
     bool            isGeneratorExp:1;
-    // Generators are either legacy-style (JS 1.7+ starless generators with
-    // StopIteration), or ES6-style (function* with boxed return values).
-    bool            isLegacyGenerator:1;
 
     bool            hasScriptCounts:1;/* script has an entry in
                                          JSCompartment::scriptCountsMap */
@@ -647,6 +658,19 @@ class JSScript : public js::gc::Cell
     jsbytecode *argumentsBytecode() const { JS_ASSERT(code[0] == JSOP_ARGUMENTS); return code; }
     void setArgumentsHasVarBinding();
 
+    js::GeneratorKind generatorKind() const {
+        return js::GeneratorKindFromBits(generatorKindBits_);
+    }
+    bool isGenerator() const { return generatorKind() != js::NotGenerator; }
+    bool isLegacyGenerator() const { return generatorKind() == js::LegacyGenerator; }
+    bool isStarGenerator() const { return generatorKind() == js::StarGenerator; }
+    void setGeneratorKind(js::GeneratorKind kind) {
+        // A script only gets its generator kind set as part of initialization,
+        // so it can only transition from not being a generator.
+        JS_ASSERT(!isGenerator());
+        generatorKindBits_ = GeneratorKindAsBits(kind);
+    }
+
     /*
      * As an optimization, even when argsHasLocalBinding, the function prologue
      * may not need to create an arguments object. This is determined by
@@ -1148,7 +1172,9 @@ class LazyScript : public js::gc::Cell
     uint32_t version_ : 8;
 
     uint32_t numFreeVariables_ : 24;
-    uint32_t numInnerFunctions_ : 26;
+    uint32_t numInnerFunctions_ : 24;
+
+    uint32_t generatorKindBits_:2;
 
     // N.B. These are booleans but need to be uint32_t to pack correctly on MSVC.
     uint32_t strict_ : 1;
@@ -1214,6 +1240,23 @@ class LazyScript : public js::gc::Cell
         return (HeapPtrFunction *)&freeVariables()[numFreeVariables()];
     }
 
+    GeneratorKind generatorKind() const { return GeneratorKindFromBits(generatorKindBits_); }
+
+    bool isGenerator() const { return generatorKind() != NotGenerator; }
+
+    bool isLegacyGenerator() const { return generatorKind() == LegacyGenerator; }
+
+    bool isStarGenerator() const { return generatorKind() == StarGenerator; }
+
+    void setGeneratorKind(GeneratorKind kind) {
+        // A script only gets its generator kind set as part of initialization,
+        // so it can only transition from NotGenerator.
+        JS_ASSERT(!isGenerator());
+        // Legacy generators cannot currently be lazy.
+        JS_ASSERT(kind != LegacyGenerator);
+        generatorKindBits_ = GeneratorKindAsBits(kind);
+    }
+
     bool strict() const {
         return strict_;
     }
diff --git a/js/src/tests/ecma_6/Generators/shell.js b/js/src/tests/ecma_6/Generators/shell.js
new file mode 100644
index 00000000000..dc4c567ccef
--- /dev/null
+++ b/js/src/tests/ecma_6/Generators/shell.js
@@ -0,0 +1 @@
+version(0);
diff --git a/js/src/tests/ecma_6/Generators/syntax.js b/js/src/tests/ecma_6/Generators/syntax.js
new file mode 100644
index 00000000000..cf0ddb2e104
--- /dev/null
+++ b/js/src/tests/ecma_6/Generators/syntax.js
@@ -0,0 +1,97 @@
+// This file was written by Andy Wingo <wingo@igalia.com> and originally
+// contributed to V8 as generators-parsing.js, available here:
+//
+// http://code.google.com/p/v8/source/browse/branches/bleeding_edge/test/mjsunit/harmony/generators-parsing.js
+
+function assertSyntaxError(str) {
+    var msg;
+    var evil = eval;
+    try {
+        // Non-direct eval.
+        evil(str);
+    } catch (exc) {
+        if (exc instanceof SyntaxError)
+            return;
+        msg = "Assertion failed: expected SyntaxError, got " + exc;
+    }
+    if (msg === undefined)
+        msg = "Assertion failed: expected SyntaxError, but no exception thrown";
+    throw new Error(msg + " - " + str);
+}
+
+// Yield statements.
+function* g() { yield 3; yield 4; }
+
+// Yield expressions.
+function* g() { (yield 3) + (yield 4); }
+
+// You can have a generator in strict mode.
+function* g() { "use strict"; yield 3; yield 4; }
+
+// Generators can have return statements also, which internally parse to a kind
+// of yield expression.
+function* g() { yield 1; return; }
+function* g() { yield 1; return 2; }
+function* g() { yield 1; return 2; yield "dead"; }
+
+// Generator expression.
+(function* () { yield 3; });
+
+// Named generator expression.
+(function* g() { yield 3; });
+
+// Generators do not have to contain yield expressions.
+function* g() { }
+
+// YieldExpressions can occur in the RHS of a YieldExpression.
+function* g() { yield yield 1; }
+function* g() { yield 3 + (yield 4); }
+
+// Generator definitions with a name of "yield" are not specifically ruled out
+// by the spec, as the `yield' name is outside the generator itself.  However,
+// in strict-mode, "yield" is an invalid identifier.
+function* yield() { (yield 3) + (yield 4); }
+assertSyntaxError("function* yield() { 'use strict'; (yield 3) + (yield 4); }");
+
+// In classic mode, yield is a normal identifier, outside of generators.
+function yield(yield) { yield: yield (yield + yield (0)); }
+
+// Yield is always valid as a key in an object literal.
+({ yield: 1 });
+function* g() { yield ({ yield: 1 }) }
+function* g() { yield ({ get yield() { return 1; }}) }
+
+// Yield is a valid property name.
+function* g(obj) { yield obj.yield; }
+
+// Checks that yield is a valid label in classic mode, but not valid in a strict
+// mode or in generators.
+function f() { yield: 1 }
+assertSyntaxError("function f() { 'use strict'; yield: 1 }")
+assertSyntaxError("function* g() { yield: 1 }")
+
+// Yield is only a keyword in the body of the generator, not in nested
+// functions.
+function* g() { function f(yield) { yield (yield + yield (0)); } }
+
+// Yield needs a RHS.
+assertSyntaxError("function* g() { yield; }");
+
+// Yield in a generator is not an identifier.
+assertSyntaxError("function* g() { yield = 10; }");
+
+// Yield binds very loosely, so this parses as "yield (3 + yield 4)", which is
+// invalid.
+assertSyntaxError("function* g() { yield 3 + yield 4; }");
+
+// Yield is still a future-reserved-word in strict mode
+assertSyntaxError("function f() { 'use strict'; var yield = 13; }");
+
+// The name of the NFE is let-bound in G, so is invalid.
+assertSyntaxError("function* g() { yield (function yield() {}); }");
+
+// In generators, yield is invalid as a formal argument name.
+assertSyntaxError("function* g(yield) { yield (10); }");
+
+if (typeof reportCompare == "function")
+    reportCompare(true, true);
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index 38fdef7236c..c3f7cf6ec99 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -152,6 +152,7 @@
     macro(void0, void0, "(void 0)") \
     macro(watch, watch, "watch") \
     macro(writable, writable, "writable") \
+    macro(yield, yield, "yield") \
     /* Type names must be contiguous and ordered; see js::TypeName. */ \
     macro(undefined, undefined, "undefined") \
     macro(object, object, "object") \
diff --git a/js/src/vm/Keywords.h b/js/src/vm/Keywords.h
index aa250b80a89..8e6a93ece2f 100644
--- a/js/src/vm/Keywords.h
+++ b/js/src/vm/Keywords.h
@@ -72,8 +72,12 @@
     macro(protected, protected_, TOK_STRICT_RESERVED, JSVERSION_DEFAULT) \
     macro(public, public_, TOK_STRICT_RESERVED, JSVERSION_DEFAULT) \
     macro(static, static_, TOK_STRICT_RESERVED, JSVERSION_DEFAULT) \
-    /* ES5 future reserved keyword in strict mode, keyword in JS1.7 even when not strict. */ \
-    macro(yield, yield, TOK_YIELD, JSVERSION_1_7) \
+    /* \
+     * ES5 future reserved keyword in strict mode, keyword in JS1.7 even when \
+     * not strict, keyword inside function* in all versions.  Punt logic to \
+     * parser. \
+     */ \
+    macro(yield, yield, TOK_YIELD, JSVERSION_DEFAULT) \
     /* Various conditional keywords. */ \
     FOR_CONST_KEYWORD(macro) \
     FOR_LET_KEYWORD(macro)

From e4f9aac912bbf31a4889bfd8d0025330375f943a Mon Sep 17 00:00:00 2001
From: Andrew Quartey <andrew.quartey@gmail.com>
Date: Wed, 14 Aug 2013 16:26:07 -0400
Subject: [PATCH 50/98] Bug 878144 - Remove
 nsExternalHelperAppService::FixFilePermissions. r=paolo

---
 uriloader/exthandler/mac/nsOSHelperAppService.h     |  3 ---
 uriloader/exthandler/mac/nsOSHelperAppService.mm    |  5 -----
 uriloader/exthandler/nsExternalHelperAppService.cpp |  5 -----
 uriloader/exthandler/nsExternalHelperAppService.h   | 10 +---------
 uriloader/exthandler/unix/nsOSHelperAppService.cpp  |  6 ------
 uriloader/exthandler/unix/nsOSHelperAppService.h    |  1 -
 6 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/uriloader/exthandler/mac/nsOSHelperAppService.h b/uriloader/exthandler/mac/nsOSHelperAppService.h
index 10ee4208bf2..899b6a35b55 100644
--- a/uriloader/exthandler/mac/nsOSHelperAppService.h
+++ b/uriloader/exthandler/mac/nsOSHelperAppService.h
@@ -41,9 +41,6 @@ public:
   nsresult OSProtocolHandlerExists(const char * aScheme,
                                    bool * aHandlerExists);
 
-protected:
-  virtual void FixFilePermissions(nsIFile* aFile);
-
 private:
   uint32_t mPermissions;
 };
diff --git a/uriloader/exthandler/mac/nsOSHelperAppService.mm b/uriloader/exthandler/mac/nsOSHelperAppService.mm
index 8b99923c1ea..51c629ec567 100644
--- a/uriloader/exthandler/mac/nsOSHelperAppService.mm
+++ b/uriloader/exthandler/mac/nsOSHelperAppService.mm
@@ -564,8 +564,3 @@ nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme,
   return NS_OK;
 }
 
-void
-nsOSHelperAppService::FixFilePermissions(nsIFile* aFile)
-{
-  aFile->SetPermissions(mPermissions);
-}
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
index 3fc65452746..864e3ce1b23 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -961,11 +961,6 @@ nsExternalHelperAppService::DeleteTemporaryPrivateFileWhenPossible(nsIFile* aTem
   return DeleteTemporaryFileHelper(aTemporaryFile, mTemporaryPrivateFilesList);
 }
 
-void nsExternalHelperAppService::FixFilePermissions(nsIFile* aFile)
-{
-  // This space intentionally left blank
-}
-
 void nsExternalHelperAppService::ExpungeTemporaryFilesHelper(nsCOMArray<nsIFile> &fileList)
 {
   int32_t numEntries = fileList.Count();
diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h
index 0793655df02..194d5cbbf56 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.h
+++ b/uriloader/exthandler/nsExternalHelperAppService.h
@@ -143,13 +143,6 @@ protected:
   NS_HIDDEN_(bool) GetTypeFromExtras(const nsACString& aExtension,
                                        nsACString& aMIMEType);
 
-  /**
-   * Fixes the file permissions to be correct. Base class has a no-op
-   * implementation, subclasses can use this to correctly inherit ACLs from the
-   * parent directory, to make the permissions obey the umask, etc.
-   */
-  virtual void FixFilePermissions(nsIFile* aFile);
-
 #ifdef PR_LOGGING
   /**
    * NSPR Logging Module. Usage: set NSPR_LOG_MODULES=HelperAppService:level,
@@ -159,9 +152,8 @@ protected:
   static PRLogModuleInfo* mLog;
 
 #endif
-  // friend, so that it can access the nspr log module and FixFilePermissions
+  // friend, so that it can access the nspr log module.
   friend class nsExternalAppHandler;
-  friend class nsExternalLoadRequest;
 
   /**
    * Helper function for ExpungeTemporaryFiles and ExpungeTemporaryPrivateFiles
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
index f771062ff13..e7fae117395 100644
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -1572,9 +1572,3 @@ nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme,
   return NS_OK;
 }
 
-void
-nsOSHelperAppService::FixFilePermissions(nsIFile* aFile)
-{
-  aFile->SetPermissions(mPermissions); 
-}
-
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.h b/uriloader/exthandler/unix/nsOSHelperAppService.h
index b6ec3642b20..8ae9394cea5 100644
--- a/uriloader/exthandler/unix/nsOSHelperAppService.h
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.h
@@ -47,7 +47,6 @@ protected:
   already_AddRefed<nsMIMEInfoBase> GetFromType(const nsCString& aMimeType);
   already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsCString& aFileExt);
 
-  virtual void FixFilePermissions(nsIFile* aFile);
 private:
   uint32_t mPermissions;
 

From 4a2fc3f2654123375f8a938ee7fb19eb4f8c8dce Mon Sep 17 00:00:00 2001
From: Milan Sreckovic <milan@mozilla.com>
Date: Tue, 13 Aug 2013 18:30:28 -0400
Subject: [PATCH 51/98] Bug 899861 - Animated gifs should not wait to play
 until fully downloaded. This is a partial backout of 717872 with the intent
 to re-enable using the separate FrameAnimator class. Hide the new approach
 behind #define USE_FRAME_ANIMATOR for now. r=bgirard

---
 image/src/RasterImage.cpp | 265 +++++++++++++++++++++++++++++++++++++-
 image/src/RasterImage.h   |  90 +++++++++++++
 2 files changed, 353 insertions(+), 2 deletions(-)

diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index 06b3900e785..d2500ad7224 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -387,6 +387,9 @@ RasterImage::RasterImage(imgStatusTracker* aStatusTracker,
   mFrameDecodeFlags(DECODE_FLAGS_DEFAULT),
   mMultipartDecodedFrame(nullptr),
   mAnim(nullptr),
+#ifndef USE_FRAME_ANIMATOR
+  mLoopCount(-1),
+#endif
   mLockCount(0),
   mDecodeCount(0),
 #ifdef DEBUG
@@ -524,6 +527,137 @@ RasterImage::Init(const char* aMimeType,
   return NS_OK;
 }
 
+#ifndef USE_FRAME_ANIMATOR
+uint32_t
+RasterImage::GetSingleLoopTime() const
+{
+  if (!mAnim) {
+    return 0;
+  }
+
+  // If we aren't done decoding, we don't know the image's full play time.
+  if (!mHasBeenDecoded) {
+    return 0;
+  }
+
+  // If we're not looping, a single loop time has no meaning
+  if (mLoopCount == 0) {
+    return 0;
+  }
+
+  uint32_t looptime = 0;
+  for (uint32_t i = 0; i < GetNumFrames(); ++i) {
+    int32_t timeout = mFrameBlender.RawGetFrame(i)->GetTimeout();
+    if (timeout > 0) {
+      looptime += static_cast<uint32_t>(timeout);
+    } else {
+      // If we have a frame that never times out, we're probably in an error
+      // case, but let's handle it more gracefully.
+      NS_WARNING("Negative frame timeout - how did this happen?");
+      return 0;
+    }
+  }
+
+  return looptime;
+}
+
+bool
+RasterImage::AdvanceFrame(TimeStamp aTime, nsIntRect* aDirtyRect)
+{
+  NS_ASSERTION(aTime <= TimeStamp::Now(),
+               "Given time appears to be in the future");
+
+  uint32_t currentFrameIndex = mAnim->currentAnimationFrameIndex;
+  uint32_t nextFrameIndex = mAnim->currentAnimationFrameIndex + 1;
+  uint32_t timeout = 0;
+
+  // Figure out if we have the next full frame. This is more complicated than
+  // just checking GetNumFrames() because decoders append their frames
+  // before they're filled in.
+  NS_ABORT_IF_FALSE(mDecoder || nextFrameIndex <= GetNumFrames(),
+                    "How did we get 2 indices too far by incrementing?");
+
+  // If we don't have a decoder, we know we've got everything we're going to
+  // get. If we do, we only display fully-downloaded frames; everything else
+  // gets delayed.
+  bool haveFullNextFrame = (mMultipart && mBytesDecoded == 0) || !mDecoder ||
+                            nextFrameIndex < mDecoder->GetCompleteFrameCount();
+
+  // If we're done decoding the next frame, go ahead and display it now and
+  // reinit with the next frame's delay time.
+  if (haveFullNextFrame) {
+    if (GetNumFrames() == nextFrameIndex) {
+      // End of Animation, unless we are looping forever
+
+      // If animation mode is "loop once", it's time to stop animating
+      if (mAnimationMode == kLoopOnceAnimMode || mLoopCount == 0) {
+        mAnimationFinished = true;
+        EvaluateAnimation();
+      }
+
+      nextFrameIndex = 0;
+
+      if (mLoopCount > 0) {
+        mLoopCount--;
+      }
+
+      if (!mAnimating) {
+        // break out early if we are actually done animating
+        return false;
+      }
+    }
+
+    timeout = mFrameBlender.GetFrame(nextFrameIndex)->GetTimeout();
+
+  } else {
+    // Uh oh, the frame we want to show is currently being decoded (partial)
+    // Wait until the next refresh driver tick and try again
+    return false;
+  }
+
+  if (!(timeout > 0)) {
+    mAnimationFinished = true;
+    EvaluateAnimation();
+  }
+
+  if (nextFrameIndex == 0) {
+    *aDirtyRect = mAnim->firstFrameRefreshArea;
+  } else {
+    // Change frame
+    if (!mFrameBlender.DoBlend(aDirtyRect, currentFrameIndex, nextFrameIndex)) {
+      // something went wrong, move on to next
+      NS_WARNING("RasterImage::AdvanceFrame(): Compositing of frame failed");
+      mFrameBlender.RawGetFrame(nextFrameIndex)->SetCompositingFailed(true);
+      mAnim->currentAnimationFrameTime = GetCurrentImgFrameEndTime();
+      mAnim->currentAnimationFrameIndex = nextFrameIndex;
+      return false;
+    }
+
+    mFrameBlender.RawGetFrame(nextFrameIndex)->SetCompositingFailed(false);
+  }
+
+  mAnim->currentAnimationFrameTime = GetCurrentImgFrameEndTime();
+
+  // If we can get closer to the current time by a multiple of the image's loop
+  // time, we should.
+  uint32_t loopTime = GetSingleLoopTime();
+  if (loopTime > 0) {
+    TimeDuration delay = aTime - mAnim->currentAnimationFrameTime;
+    if (delay.ToMilliseconds() > loopTime) {
+      // Explicitly use integer division to get the floor of the number of
+      // loops.
+      uint32_t loops = static_cast<uint32_t>(delay.ToMilliseconds()) / loopTime;
+      mAnim->currentAnimationFrameTime += TimeDuration::FromMilliseconds(loops * loopTime);
+    }
+  }
+
+  // Set currentAnimationFrameIndex at the last possible moment
+  mAnim->currentAnimationFrameIndex = nextFrameIndex;
+
+  return true;
+}
+#endif
+
 //******************************************************************************
 // [notxpcom] void requestRefresh ([const] in TimeStamp aTime);
 NS_IMETHODIMP_(void)
@@ -535,12 +669,45 @@ RasterImage::RequestRefresh(const mozilla::TimeStamp& aTime)
 
   EvaluateAnimation();
 
+#ifdef USE_FRAME_ANIMATOR
   FrameAnimator::RefreshResult res;
   if (mAnim) {
     res = mAnim->RequestRefresh(aTime);
   }
+#else
+  // only advance the frame if the current time is greater than or
+  // equal to the current frame's end time.
+  TimeStamp currentFrameEndTime = GetCurrentImgFrameEndTime();
+  bool frameAdvanced = false;
 
+  // The dirtyRect variable will contain an accumulation of the sub-rectangles
+  // that are dirty for each frame we advance in AdvanceFrame().
+  nsIntRect dirtyRect;
+
+  while (currentFrameEndTime <= aTime) {
+    TimeStamp oldFrameEndTime = currentFrameEndTime;
+    nsIntRect frameDirtyRect;
+    bool didAdvance = AdvanceFrame(aTime, &frameDirtyRect);
+    frameAdvanced = frameAdvanced || didAdvance;
+    currentFrameEndTime = GetCurrentImgFrameEndTime();
+
+    // Accumulate the dirty area.
+    dirtyRect = dirtyRect.Union(frameDirtyRect);
+
+    // if we didn't advance a frame, and our frame end time didn't change,
+    // then we need to break out of this loop & wait for the frame(s)
+    // to finish downloading
+    if (!didAdvance && (currentFrameEndTime == oldFrameEndTime)) {
+      break;
+    }
+  }
+#endif
+
+#ifdef USE_FRAME_ANIMATOR
   if (res.frameAdvanced) {
+#else
+  if (frameAdvanced) {
+#endif
     // Notify listeners that our frame has actually changed, but do this only
     // once for all frames that we've now passed (if AdvanceFrame() was called
     // more than once).
@@ -552,14 +719,22 @@ RasterImage::RequestRefresh(const mozilla::TimeStamp& aTime)
 
     // Explicitly call this on mStatusTracker so we're sure to not interfere
     // with the decoding process
-    if (mStatusTracker)
+#ifdef USE_FRAME_ANIMATOR
+    if (mStatusTracker) {
       mStatusTracker->FrameChanged(&res.dirtyRect);
+    }
   }
 
   if (res.animationFinished) {
     mAnimationFinished = true;
     EvaluateAnimation();
   }
+#else
+    if (mStatusTracker) {
+      mStatusTracker->FrameChanged(&dirtyRect);
+    }
+  }
+#endif
 }
 
 //******************************************************************************
@@ -687,12 +862,42 @@ RasterImage::GetDrawableImgFrame(uint32_t framenum)
 uint32_t
 RasterImage::GetCurrentImgFrameIndex() const
 {
-  if (mAnim)
+  if (mAnim) {
+#ifdef USE_FRAME_ANIMATOR
     return mAnim->GetCurrentAnimationFrameIndex();
+#else
+    return mAnim->currentAnimationFrameIndex;
+#endif
+  }
 
   return 0;
 }
 
+#ifndef USE_FRAME_ANIMATOR
+TimeStamp
+RasterImage::GetCurrentImgFrameEndTime() const
+{
+  imgFrame* currentFrame = mFrameBlender.RawGetFrame(mAnim->currentAnimationFrameIndex);
+  TimeStamp currentFrameTime = mAnim->currentAnimationFrameTime;
+  int64_t timeout = currentFrame->GetTimeout();
+
+  if (timeout < 0) {
+    // We need to return a sentinel value in this case, because our logic
+    // doesn't work correctly if we have a negative timeout value. The reason
+    // this positive infinity was chosen was because it works with the loop in
+    // RequestRefresh() above.
+    return TimeStamp() +
+           TimeDuration::FromMilliseconds(static_cast<double>(UINT64_MAX));
+  }
+
+  TimeDuration durationOfTimeout =
+    TimeDuration::FromMilliseconds(static_cast<double>(timeout));
+  TimeStamp currentFrameEndTime = currentFrameTime + durationOfTimeout;
+
+  return currentFrameEndTime;
+}
+#endif
+
 imgFrame*
 RasterImage::GetCurrentImgFrame()
 {
@@ -1062,6 +1267,7 @@ RasterImage::OutOfProcessSizeOfDecoded() const
                                                  NULL);
 }
 
+#ifdef USE_FRAME_ANIMATOR
 void
 RasterImage::EnsureAnimExists()
 {
@@ -1085,6 +1291,7 @@ RasterImage::EnsureAnimExists()
     CurrentStatusTracker().RecordImageIsAnimated();
   }
 }
+#endif
 
 nsresult
 RasterImage::InternalAddFrameHelper(uint32_t framenum, imgFrame *aFrame,
@@ -1166,13 +1373,23 @@ RasterImage::InternalAddFrame(uint32_t framenum,
     int32_t frameDisposalMethod = mFrameBlender.RawGetFrame(0)->GetFrameDisposalMethod();
     if (frameDisposalMethod == FrameBlender::kDisposeClear ||
         frameDisposalMethod == FrameBlender::kDisposeRestorePrevious)
+#ifdef USE_FRAME_ANIMATOR
       mAnim->SetFirstFrameRefreshArea(mFrameBlender.RawGetFrame(0)->GetRect());
+#else
+      mAnim->firstFrameRefreshArea = mFrameBlender.RawGetFrame(0)->GetRect();
+#endif
   }
 
   // Calculate firstFrameRefreshArea
   // Some gifs are huge but only have a small area that they animate
   // We only need to refresh that small area when Frame 0 comes around again
+#ifdef USE_FRAME_ANIMATOR
   mAnim->UnionFirstFrameRefreshArea(frame->GetRect());
+#else
+  nsIntRect frameRect = frame->GetRect();
+  mAnim->firstFrameRefreshArea.UnionRect(mAnim->firstFrameRefreshArea,
+                                         frameRect);
+#endif
 
   rv = InternalAddFrameHelper(framenum, frame.forget(), imageData, imageLength,
                               paletteData, paletteLength, aRetFrame);
@@ -1395,13 +1612,16 @@ RasterImage::DecodingComplete()
     }
   }
 
+#ifdef USE_FRAME_ANIMATOR
   if (mAnim) {
     mAnim->SetDoneDecoding(true);
   }
+#endif
 
   return NS_OK;
 }
 
+#ifdef USE_FRAME_ANIMATOR
 NS_IMETHODIMP
 RasterImage::SetAnimationMode(uint16_t aAnimationMode)
 {
@@ -1410,6 +1630,7 @@ RasterImage::SetAnimationMode(uint16_t aAnimationMode)
   }
   return SetAnimationModeInternal(aAnimationMode);
 }
+#endif
 
 //******************************************************************************
 /* void StartAnimation () */
@@ -1432,7 +1653,13 @@ RasterImage::StartAnimation()
 
     // We need to set the time that this initial frame was first displayed, as
     // this is used in AdvanceFrame().
+#ifdef USE_FRAME_ANIMATOR
     mAnim->InitAnimationFrameTimeIfNecessary();
+#else
+    if (mAnim->currentAnimationFrameTime.IsNull()) {
+      mAnim->currentAnimationFrameTime = TimeStamp::Now();
+    }
+#endif
   }
 
   return NS_OK;
@@ -1459,9 +1686,15 @@ RasterImage::ResetAnimation()
   if (mError)
     return NS_ERROR_FAILURE;
 
+#ifdef USE_FRAME_ANIMATOR
   if (mAnimationMode == kDontAnimMode ||
       !mAnim || mAnim->GetCurrentAnimationFrameIndex() == 0)
     return NS_OK;
+#else
+  if (mAnimationMode == kDontAnimMode ||
+      !mAnim || mAnim->currentAnimationFrameIndex == 0)
+    return NS_OK;
+#endif
 
   mAnimationFinished = false;
 
@@ -1469,10 +1702,14 @@ RasterImage::ResetAnimation()
     StopAnimation();
 
   mFrameBlender.ResetAnimation();
+#ifdef USE_FRAME_ANIMATOR
   if (mAnim) {
     mAnim->ResetAnimation();
   }
+#else
 
+  mAnim->currentAnimationFrameIndex = 0;
+#endif
   UpdateImageContainer();
 
   // Note - We probably want to kick off a redecode somewhere around here when
@@ -1480,8 +1717,12 @@ RasterImage::ResetAnimation()
 
   // Update display if we were animating before
   if (mAnimating && mStatusTracker) {
+#ifdef USE_FRAME_ANIMATOR
     nsIntRect rect = mAnim->GetFirstFrameRefreshArea();
     mStatusTracker->FrameChanged(&rect);
+#else
+    mStatusTracker->FrameChanged(&(mAnim->firstFrameRefreshArea));
+#endif
   }
 
   if (ShouldAnimate()) {
@@ -1503,16 +1744,26 @@ RasterImage::SetAnimationStartTime(const mozilla::TimeStamp& aTime)
   if (mError || mAnimating || !mAnim)
     return;
 
+#ifdef USE_FRAME_ANIMATOR
   mAnim->SetAnimationFrameTime(aTime);
+#else
+  mAnim->currentAnimationFrameTime = aTime;
+#endif
 }
 
 NS_IMETHODIMP_(float)
 RasterImage::GetFrameIndex(uint32_t aWhichFrame)
 {
   MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE, "Invalid argument");
+#ifdef USE_FRAME_ANIMATOR
   return (aWhichFrame == FRAME_FIRST || !mAnim)
          ? 0.0f
          : mAnim->GetCurrentAnimationFrameIndex();
+#else
+  return (aWhichFrame == FRAME_FIRST || !mAnim)
+         ? 0.0f
+         : mAnim->currentAnimationFrameIndex;
+#endif
 }
 
 void
@@ -1521,9 +1772,17 @@ RasterImage::SetLoopCount(int32_t aLoopCount)
   if (mError)
     return;
 
+#ifdef USE_FRAME_ANIMATOR
   if (mAnim) {
     mAnim->SetLoopCount(aLoopCount);
   }
+#else
+  // -1  infinite
+  //  0  no looping, one iteration
+  //  1  one loop, two iterations
+  //  ...
+  mLoopCount = aLoopCount;
+#endif
 }
 
 nsresult
@@ -1795,9 +2054,11 @@ RasterImage::OnNewSourceData()
   mWantFullDecode = true;
   mDecodeRequest = nullptr;
 
+#ifdef USE_FRAME_ANIMATOR
   if (mAnim) {
     mAnim->SetDoneDecoding(false);
   }
+#endif
 
   // We always need the size first.
   rv = InitDecoder(/* aDoSizeDecode = */ true);
diff --git a/image/src/RasterImage.h b/image/src/RasterImage.h
index bc43fec8a01..cd83c6388c9 100644
--- a/image/src/RasterImage.h
+++ b/image/src/RasterImage.h
@@ -41,6 +41,10 @@
   #include "imgIContainerDebug.h"
 #endif
 
+// This will enable FrameAnimator approach to image animation.  Before doing
+// so, make sure bug 899861 symptoms are gone.
+// #define USE_FRAME_ANIMATOR 1
+
 class nsIInputStream;
 class nsIThreadPool;
 
@@ -321,6 +325,22 @@ private:
 
   nsresult OnImageDataCompleteCore(nsIRequest* aRequest, nsISupports*, nsresult aStatus);
 
+#ifndef USE_FRAME_ANIMATOR
+  struct Anim
+  {
+    //! Area of the first frame that needs to be redrawn on subsequent loops.
+    nsIntRect                  firstFrameRefreshArea;
+    uint32_t                   currentAnimationFrameIndex; // 0 to numFrames-1
+
+    // the time that the animation advanced to the current frame
+    TimeStamp                  currentAnimationFrameTime;
+
+    Anim() :
+      currentAnimationFrameIndex(0)
+    {}
+  };
+#endif
+
   /**
    * Each RasterImage has a pointer to one or zero heap-allocated
    * DecodeRequests.
@@ -528,6 +548,35 @@ private:
                      uint32_t aFlags,
                      gfxImageSurface **_retval);
 
+#ifndef USE_FRAME_ANIMATOR
+  /**
+   * Advances the animation. Typically, this will advance a single frame, but it
+   * may advance multiple frames. This may happen if we have infrequently
+   * "ticking" refresh drivers (e.g. in background tabs), or extremely short-
+   * lived animation frames.
+   *
+   * @param aTime the time that the animation should advance to. This will
+   *              typically be <= TimeStamp::Now().
+   *
+   * @param [out] aDirtyRect a pointer to an nsIntRect which encapsulates the
+   *        area to be repainted after the frame is advanced.
+   *
+   * @returns true, if the frame was successfully advanced, false if it was not
+   *          able to be advanced (e.g. the frame to which we want to advance is
+   *          still decoding). Note: If false is returned, then aDirtyRect will
+   *          remain unmodified.
+   */
+  bool AdvanceFrame(mozilla::TimeStamp aTime, nsIntRect* aDirtyRect);
+
+  /**
+   * Gets the length of a single loop of this image, in milliseconds.
+   *
+   * If this image is not finished decoding, is not animated, or it is animated
+   * but does not loop, returns 0.
+   */
+  uint32_t GetSingleLoopTime() const;
+#endif
+
   /**
    * Deletes and nulls out the frame in mFrames[framenum].
    *
@@ -543,11 +592,39 @@ private:
   imgFrame* GetDrawableImgFrame(uint32_t framenum);
   imgFrame* GetCurrentImgFrame();
   uint32_t GetCurrentImgFrameIndex() const;
+#ifndef USE_FRAME_ANIMATOR
+  mozilla::TimeStamp GetCurrentImgFrameEndTime() const;
+#endif
 
   size_t SizeOfDecodedWithComputedFallbackIfHeap(gfxASurface::MemoryLocation aLocation,
                                                  mozilla::MallocSizeOf aMallocSizeOf) const;
 
+#ifdef USE_FRAME_ANIMATOR
   void EnsureAnimExists();
+#else
+  inline void EnsureAnimExists()
+  {
+    if (!mAnim) {
+
+      // Create the animation context
+      mAnim = new Anim();
+
+      // We don't support discarding animated images (See bug 414259).
+      // Lock the image and throw away the key.
+      //
+      // Note that this is inefficient, since we could get rid of the source
+      // data too. However, doing this is actually hard, because we're probably
+      // calling ensureAnimExists mid-decode, and thus we're decoding out of
+      // the source buffer. Since we're going to fix this anyway later, and
+      // since we didn't kill the source data in the old world either, locking
+      // is acceptable for the moment.
+      LockImage();
+
+      // Notify our observers that we are starting animation.
+      CurrentStatusTracker().RecordImageIsAnimated();
+    }
+  }
+#endif
 
   nsresult InternalAddFrameHelper(uint32_t framenum, imgFrame *frame,
                                   uint8_t **imageData, uint32_t *imageLength,
@@ -605,7 +682,14 @@ private: // data
   // IMPORTANT: if you use mAnim in a method, call EnsureImageIsDecoded() first to ensure
   // that the frames actually exist (they may have been discarded to save memory, or
   // we maybe decoding on draw).
+#ifdef USE_FRAME_ANIMATOR
   FrameAnimator* mAnim;
+#else
+  RasterImage::Anim*        mAnim;
+
+  //! # loops remaining before animation stops (-1 no stop)
+  int32_t                    mLoopCount;
+#endif
 
   // Discard members
   uint32_t                   mLockCount;
@@ -722,6 +806,12 @@ inline NS_IMETHODIMP RasterImage::GetAnimationMode(uint16_t *aAnimationMode) {
   return GetAnimationModeInternal(aAnimationMode);
 }
 
+#ifndef USE_FRAME_ANIMATOR
+inline NS_IMETHODIMP RasterImage::SetAnimationMode(uint16_t aAnimationMode) {
+  return SetAnimationModeInternal(aAnimationMode);
+}
+#endif
+
 // Asynchronous Decode Requestor
 //
 // We use this class when someone calls requestDecode() from within a decode

From ca638afd2ecf814de1453f4b19207bac6eba6a1e Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Wed, 14 Aug 2013 09:11:13 -0500
Subject: [PATCH 52/98] Bug 905058 - Before accessing the UIA root element make
 sure the global com ptr is populated. r=bbondy

---
 widget/windows/winrt/MetroWidget.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/widget/windows/winrt/MetroWidget.cpp b/widget/windows/winrt/MetroWidget.cpp
index a629901126a..854430232f0 100644
--- a/widget/windows/winrt/MetroWidget.cpp
+++ b/widget/windows/winrt/MetroWidget.cpp
@@ -686,16 +686,17 @@ MetroWidget::WindowProcedure(HWND aWnd, UINT aMsg, WPARAM aWParam, LPARAM aLPara
       // UiaReturnRawElementProvider passing the return result from FrameworkView
       // OnAutomationProviderRequested as the hwnd (me scratches head) which results in
       // GetLastError always being set to invalid handle (6) after CallWindowProc returns.
-      if (dwObjId == UiaRootObjectId) {
-        NS_ASSERTION(gProviderRoot.Get(), "gProviderRoot is null??");
+      if (dwObjId == UiaRootObjectId && gProviderRoot) {
         ComPtr<IRawElementProviderSimple> simple;
         gProviderRoot.As(&simple);
-        LRESULT res = UiaReturnRawElementProvider(aWnd, aWParam, aLParam, simple.Get());
-        if (res) {
-          return res;
+        if (simple) {
+          LRESULT res = UiaReturnRawElementProvider(aWnd, aWParam, aLParam, simple.Get());
+          if (res) {
+            return res;
+          }
+          NS_ASSERTION(res, "UiaReturnRawElementProvider failed!");
+          Log("UiaReturnRawElementProvider failed! GetLastError=%X", GetLastError());
         }
-        NS_ASSERTION(res, "UiaReturnRawElementProvider failed!");
-        Log("UiaReturnRawElementProvider failed! GetLastError=%X", GetLastError());
       }
       break;
     }

From d165ac6453ac6b29fcc7a38a09008938c9797b7b Mon Sep 17 00:00:00 2001
From: Mihnea Dobrescu-Balaur <mihneadb@gmail.com>
Date: Fri, 19 Jul 2013 19:27:14 -0700
Subject: [PATCH 53/98] Bug 887054 - Part 1: Refactor xpcshell test harness to
 support parallel test runs, disabled in automation. r=ahal, r=ted

---
 testing/xpcshell/remotexpcshelltests.py |  571 +++++------
 testing/xpcshell/runtestsb2g.py         |   56 +-
 testing/xpcshell/runxpcshelltests.py    | 1165 +++++++++++++----------
 testing/xpcshell/selftest.py            |    3 +-
 4 files changed, 998 insertions(+), 797 deletions(-)

diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index 5545ddb4640..1d7172de3ad 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -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/.
 
+import posixpath
 import sys, os
 import subprocess
 import runxpcshelltests as xpcshell
@@ -15,74 +16,26 @@ import shutil
 
 here = os.path.dirname(os.path.abspath(__file__))
 
-# A specialization of XPCShellTests that runs tests on an Android device
-# via devicemanager.
-class XPCShellRemote(xpcshell.XPCShellTests, object):
+def remoteJoin(path1, path2):
+    return posixpath.join(path1, path2)
 
-    def __init__(self, devmgr, options, args):
-        xpcshell.XPCShellTests.__init__(self)
-        self.localLib = options.localLib
-        self.localBin = options.localBin
-        self.options = options
-        self.device = devmgr
-        self.pathMapping = []
-        self.remoteTestRoot = self.device.getTestRoot("xpcshell")
-        # remoteBinDir contains xpcshell and its wrapper script, both of which must
-        # be executable. Since +x permissions cannot usually be set on /mnt/sdcard,
-        # and the test root may be on /mnt/sdcard, remoteBinDir is set to be on
-        # /data/local, always.
-        self.remoteBinDir = "/data/local/xpcb"
-        # Terse directory names are used here ("c" for the components directory)
-        # to minimize the length of the command line used to execute
-        # xpcshell on the remote device. adb has a limit to the number
-        # of characters used in a shell command, and the xpcshell command
-        # line can be quite complex.
-        self.remoteTmpDir = self.remoteJoin(self.remoteTestRoot, "tmp")
-        self.remoteScriptsDir = self.remoteTestRoot
-        self.remoteComponentsDir = self.remoteJoin(self.remoteTestRoot, "c")
-        self.remoteModulesDir = self.remoteJoin(self.remoteTestRoot, "m")
-        self.profileDir = self.remoteJoin(self.remoteTestRoot, "p")
-        self.remoteDebugger = options.debugger
-        self.remoteDebuggerArgs = options.debuggerArgs
-        self.testingModulesDir = options.testingModulesDir
+class RemoteXPCShellTestThread(xpcshell.XPCShellTestThread):
+    def __init__(self, *args, **kwargs):
+        xpcshell.XPCShellTestThread.__init__(self, *args, **kwargs)
 
-        if self.options.objdir:
-            self.xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
-        elif os.path.isdir(os.path.join(here, 'tests')):
-            self.xpcDir = os.path.join(here, 'tests')
+        # embed the mobile params from the harness into the TestThread
+        mobileArgs = kwargs.get('mobileArgs')
+        for key in mobileArgs:
+            setattr(self, key, mobileArgs[key])
+
+    def buildCmdTestFile(self, name):
+        remoteDir = self.remoteForLocal(os.path.dirname(name))
+        if remoteDir == self.remoteHere:
+            remoteName = os.path.basename(name)
         else:
-            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()
-            self.setupTestDir()
-        if options.localAPK:
-            self.remoteAPK = self.remoteJoin(self.remoteBinDir, os.path.basename(options.localAPK))
-            self.setAppRoot()
-
-    def setAppRoot(self):
-        # Determine the application root directory associated with the package
-        # name used by the Fennec APK.
-        self.appRoot = None
-        packageName = None
-        if self.options.localAPK:
-            try:
-                packageName = self.localAPKContents.read("package-name.txt")
-                if packageName:
-                    self.appRoot = self.device.getAppRoot(packageName.strip())
-            except Exception as detail:
-                print "unable to determine app root: " + str(detail)
-                pass
-        return None
-
-    def remoteJoin(self, path1, path2):
-        joined = os.path.join(path1, path2)
-        joined = joined.replace('\\', '/')
-        return joined
+            remoteName = remoteJoin(remoteDir, os.path.basename(name))
+        return ['-e', 'const _TEST_FILE = ["%s"];' %
+                 replaceBackSlashes(remoteName)]
 
     def remoteForLocal(self, local):
         for mapping in self.pathMapping:
@@ -90,177 +43,12 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
                 return mapping.remote
         return local
 
-    def setupUtilities(self):
-        if (not self.device.dirExists(self.remoteBinDir)):
-            # device.mkDir may fail here where shellCheckOutput may succeed -- see bug 817235
-            try:
-                self.device.shellCheckOutput(["mkdir", self.remoteBinDir]);
-            except devicemanager.DMError:
-                # Might get a permission error; try again as root, if available
-                self.device.shellCheckOutput(["mkdir", self.remoteBinDir], root=True);
-                self.device.shellCheckOutput(["chmod", "777", self.remoteBinDir], root=True);
-
-        remotePrefDir = self.remoteJoin(self.remoteBinDir, "defaults/pref")
-        if (self.device.dirExists(self.remoteTmpDir)):
-            self.device.removeDir(self.remoteTmpDir)
-        self.device.mkDir(self.remoteTmpDir)
-        if (not self.device.dirExists(remotePrefDir)):
-            self.device.mkDirs(self.remoteJoin(remotePrefDir, "extra"))
-        if (not self.device.dirExists(self.remoteScriptsDir)):
-            self.device.mkDir(self.remoteScriptsDir)
-        if (not self.device.dirExists(self.remoteComponentsDir)):
-            self.device.mkDir(self.remoteComponentsDir)
-
-        local = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'head.js')
-        remoteFile = self.remoteJoin(self.remoteScriptsDir, "head.js")
-        self.device.pushFile(local, remoteFile)
-
-        local = os.path.join(self.localBin, "xpcshell")
-        remoteFile = self.remoteJoin(self.remoteBinDir, "xpcshell")
-        self.device.pushFile(local, remoteFile)
-
-        local = os.path.join(self.localBin, "components/httpd.js")
-        remoteFile = self.remoteJoin(self.remoteComponentsDir, "httpd.js")
-        self.device.pushFile(local, remoteFile)
-
-        local = os.path.join(self.localBin, "components/httpd.manifest")
-        remoteFile = self.remoteJoin(self.remoteComponentsDir, "httpd.manifest")
-        self.device.pushFile(local, remoteFile)
-
-        local = os.path.join(self.localBin, "components/test_necko.xpt")
-        remoteFile = self.remoteJoin(self.remoteComponentsDir, "test_necko.xpt")
-        self.device.pushFile(local, remoteFile)
-
-        if self.options.localAPK:
-            remoteFile = self.remoteJoin(self.remoteBinDir, os.path.basename(self.options.localAPK))
-            self.device.pushFile(self.options.localAPK, remoteFile)
-
-        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, os.path.basename(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)
-            return
-
-        for file in os.listdir(self.localLib):
-            if (file.endswith(".so")):
-                print >> sys.stderr, "Pushing %s.." % file
-                if 'libxul' in file:
-                    print >> sys.stderr, "This is a big file, it could take a while."
-                remoteFile = self.remoteJoin(self.remoteBinDir, file)
-                self.device.pushFile(os.path.join(self.localLib, file), remoteFile)
-
-        # Additional libraries may be found in a sub-directory such as "lib/armeabi-v7a"
-        localArmLib = os.path.join(self.localLib, "lib")
-        if os.path.exists(localArmLib):
-            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)
-
-    def setupModules(self):
-        if self.testingModulesDir:
-            self.device.pushDir(self.testingModulesDir, self.remoteModulesDir)
-
-    def setupTestDir(self):
-        print 'pushing %s' % self.xpcDir
-        try:
-            self.device.pushDir(self.xpcDir, self.remoteScriptsDir, retryLimit=10)
-        except TypeError:
-            # Foopies have an older mozdevice ver without retryLimit
-            self.device.pushDir(self.xpcDir, self.remoteScriptsDir)
-
-    def buildTestList(self):
-        xpcshell.XPCShellTests.buildTestList(self)
-        uniqueTestPaths = set([])
-        for test in self.alltests:
-            uniqueTestPaths.add(test['here'])
-        for testdir in uniqueTestPaths:
-            abbrevTestDir = os.path.relpath(testdir, self.xpcDir)
-            remoteScriptDir = self.remoteJoin(self.remoteScriptsDir, abbrevTestDir)
-            self.pathMapping.append(PathMapping(testdir, remoteScriptDir))
-
-    def buildXpcsCmd(self, testdir):
-        # change base class' paths to remote paths and use base class to build command
-        self.xpcshell = self.remoteJoin(self.remoteBinDir, "xpcw")
-        self.headJSPath = self.remoteJoin(self.remoteScriptsDir, 'head.js')
-        self.httpdJSPath = self.remoteJoin(self.remoteComponentsDir, 'httpd.js')
-        self.httpdManifest = self.remoteJoin(self.remoteComponentsDir, 'httpd.manifest')
-        self.testingModulesDir = self.remoteModulesDir
-        self.testharnessdir = self.remoteScriptsDir
-        xpcshell.XPCShellTests.buildXpcsCmd(self, testdir)
-        # remove "-g <dir> -a <dir>" and add "--greomni <apk>"
-        del(self.xpcsCmd[1:5])
-        if self.options.localAPK:
-            self.xpcsCmd.insert(3, '--greomni')
-            self.xpcsCmd.insert(4, self.remoteAPK)
-
-        if self.remoteDebugger:
-            # for example, "/data/local/gdbserver" "localhost:12345"
-            self.xpcsCmd = [
-              self.remoteDebugger,
-              self.remoteDebuggerArgs,
-              self.xpcsCmd]
-
-    def getHeadAndTailFiles(self, test):
-        """Override parent method to find files on remote device."""
-        def sanitize_list(s, kind):
-            for f in s.strip().split(' '):
-                f = f.strip()
-                if len(f) < 1:
-                    continue
-
-                path = self.remoteJoin(self.remoteHere, f)
-                if not self.device.fileExists(path):
-                    raise Exception('%s file does not exist: %s' % ( kind,
-                        path))
-
-                yield path
-
-        self.remoteHere = self.remoteForLocal(test['here'])
-
-        return (list(sanitize_list(test['head'], 'head')),
-                list(sanitize_list(test['tail'], 'tail')))
-
-    def buildCmdTestFile(self, name):
-        remoteDir = self.remoteForLocal(os.path.dirname(name))
-        if remoteDir == self.remoteHere:
-            remoteName = os.path.basename(name)
-        else:
-            remoteName = self.remoteJoin(remoteDir, os.path.basename(name))
-        return ['-e', 'const _TEST_FILE = ["%s"];' %
-                 replaceBackSlashes(remoteName)]
 
     def setupTempDir(self):
         # make sure the temp dir exists
         if not self.device.dirExists(self.remoteTmpDir):
             self.device.mkDir(self.remoteTmpDir)
-
-        self.env["XPCSHELL_TEST_TEMP_DIR"] = self.remoteTmpDir
-        if self.interactive:
-            self.log.info("TEST-INFO | temp dir is %s" % self.remoteTmpDir)
+        # env var is set in buildEnvironment
         return self.remoteTmpDir
 
     def setupPluginsDir(self):
@@ -270,7 +58,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         # making sure tmp dir is set up
         self.setupTempDir()
 
-        pluginsDir = self.remoteJoin(self.remoteTmpDir, "plugins")
+        pluginsDir = remoteJoin(self.remoteTmpDir, "plugins")
         self.device.pushDir(self.pluginsPath, pluginsDir)
         if self.interactive:
             self.log.info("TEST-INFO | plugins dir is %s" % pluginsDir)
@@ -288,48 +76,47 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.log.info("TEST-INFO | %s | current directory: %r" % (name, self.remoteHere))
         self.log.info("TEST-INFO | %s | environment: %s" % (name, self.env))
 
-    def setupLeakLogging(self):
-        self.env["XPCOM_MEM_LEAK_LOG"] = self.remoteJoin(self.profileDir, "leaks.log")
-        return self.env["XPCOM_MEM_LEAK_LOG"]
+    def getHeadAndTailFiles(self, test):
+        """Override parent method to find files on remote device."""
+        def sanitize_list(s, kind):
+            for f in s.strip().split(' '):
+                f = f.strip()
+                if len(f) < 1:
+                    continue
 
-    def setLD_LIBRARY_PATH(self, env):
-        env["LD_LIBRARY_PATH"]=self.remoteBinDir
+                path = remoteJoin(self.remoteHere, f)
+                if not self.device.fileExists(path):
+                    raise Exception('%s file does not exist: %s' % ( kind,
+                        path))
 
-    def pushWrapper(self):
-        # Rather than executing xpcshell directly, this wrapper script is
-        # used. By setting environment variables and the cwd in the script,
-        # the length of the per-test command line is shortened. This is
-        # often important when using ADB, as there is a limit to the length
-        # of the ADB command line.
-        localWrapper = tempfile.mktemp()
-        f = open(localWrapper, "w")
-        f.write("#!/system/bin/sh\n")
-        for envkey, envval in self.env.iteritems():
-            f.write("export %s=%s\n" % (envkey, envval))
-        f.write("cd $1\n")
-        f.write("echo xpcw: cd $1\n")
-        f.write("shift\n")
-        f.write("echo xpcw: xpcshell \"$@\"\n")
-        f.write("%s/xpcshell \"$@\"\n" % self.remoteBinDir)
-        f.close()
-        remoteWrapper = self.remoteJoin(self.remoteBinDir, "xpcw")
-        self.device.pushFile(localWrapper, remoteWrapper)
-        os.remove(localWrapper)
-        self.device.chmodDir(self.remoteBinDir)
+                yield path
 
-    def buildEnvironment(self):
-        self.env = {}
-        self.buildCoreEnvironment()
-        self.setLD_LIBRARY_PATH(self.env)
-        self.env["MOZ_LINKER_CACHE"]=self.remoteBinDir
-        if self.options.localAPK and self.appRoot:
-            self.env["GRE_HOME"]=self.appRoot
-        self.env["XPCSHELL_TEST_PROFILE_DIR"]=self.profileDir
-        self.env["TMPDIR"]=self.remoteTmpDir
-        self.env["HOME"]=self.profileDir
-        self.setupTempDir()
-        if self.options.setup:
-            self.pushWrapper()
+        self.remoteHere = self.remoteForLocal(test['here'])
+
+        return (list(sanitize_list(test['head'], 'head')),
+                list(sanitize_list(test['tail'], 'tail')))
+
+    def buildXpcsCmd(self, testdir):
+        # change base class' paths to remote paths and use base class to build command
+        self.xpcshell = remoteJoin(self.remoteBinDir, "xpcw")
+        self.headJSPath = remoteJoin(self.remoteScriptsDir, 'head.js')
+        self.httpdJSPath = remoteJoin(self.remoteComponentsDir, 'httpd.js')
+        self.httpdManifest = remoteJoin(self.remoteComponentsDir, 'httpd.manifest')
+        self.testingModulesDir = self.remoteModulesDir
+        self.testharnessdir = self.remoteScriptsDir
+        xpcshell.XPCShellTestThread.buildXpcsCmd(self, testdir)
+        # remove "-g <dir> -a <dir>" and add "--greomni <apk>"
+        del(self.xpcsCmd[1:5])
+        if self.options.localAPK:
+            self.xpcsCmd.insert(3, '--greomni')
+            self.xpcsCmd.insert(4, self.remoteAPK)
+
+        if self.remoteDebugger:
+            # for example, "/data/local/gdbserver" "localhost:12345"
+            self.xpcsCmd = [
+              self.remoteDebugger,
+              self.remoteDebuggerArgs,
+              self.xpcsCmd]
 
     def launchProcess(self, cmd, stdout, stderr, env, cwd):
         cmd.insert(1, self.remoteHere)
@@ -372,22 +159,245 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
 
     #TODO: consider creating a separate log dir.  We don't have the test file structure,
     #      so we use filename.log.  Would rather see ./logs/filename.log
-    def createLogFile(self, test, stdout, leakLogs):
+    def createLogFile(self, test, stdout):
         try:
             f = None
             filename = test.replace('\\', '/').split('/')[-1] + ".log"
             f = open(filename, "w")
             f.write(stdout)
 
-            for leakLog in leakLogs:
-                if os.path.exists(leakLog):
-                    leaks = open(leakLog, "r")
-                    f.write(leaks.read())
-                    leaks.close()
         finally:
-            if f <> None:
+            if f is not None:
                 f.close()
 
+
+# A specialization of XPCShellTests that runs tests on an Android device
+# via devicemanager.
+class XPCShellRemote(xpcshell.XPCShellTests, object):
+
+    def __init__(self, devmgr, options, args):
+        xpcshell.XPCShellTests.__init__(self)
+        self.localLib = options.localLib
+        self.localBin = options.localBin
+        self.options = options
+        self.device = devmgr
+        self.pathMapping = []
+        self.remoteTestRoot = self.device.getTestRoot("xpcshell")
+        # remoteBinDir contains xpcshell and its wrapper script, both of which must
+        # be executable. Since +x permissions cannot usually be set on /mnt/sdcard,
+        # and the test root may be on /mnt/sdcard, remoteBinDir is set to be on
+        # /data/local, always.
+        self.remoteBinDir = "/data/local/xpcb"
+        # Terse directory names are used here ("c" for the components directory)
+        # to minimize the length of the command line used to execute
+        # xpcshell on the remote device. adb has a limit to the number
+        # of characters used in a shell command, and the xpcshell command
+        # line can be quite complex.
+        self.remoteTmpDir = remoteJoin(self.remoteTestRoot, "tmp")
+        self.remoteScriptsDir = self.remoteTestRoot
+        self.remoteComponentsDir = remoteJoin(self.remoteTestRoot, "c")
+        self.remoteModulesDir = remoteJoin(self.remoteTestRoot, "m")
+        self.profileDir = remoteJoin(self.remoteTestRoot, "p")
+        self.remoteDebugger = options.debugger
+        self.remoteDebuggerArgs = options.debuggerArgs
+        self.testingModulesDir = options.testingModulesDir
+
+        if self.options.objdir:
+            self.xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
+        elif os.path.isdir(os.path.join(here, 'tests')):
+            self.xpcDir = os.path.join(here, 'tests')
+        else:
+            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()
+            self.setupTestDir()
+        self.remoteAPK = None
+        if options.localAPK:
+            self.remoteAPK = remoteJoin(self.remoteBinDir, os.path.basename(options.localAPK))
+            self.setAppRoot()
+
+        # data that needs to be passed to the RemoteXPCShellTestThread
+        self.mobileArgs = {
+            'device': self.device,
+            'remoteBinDir': self.remoteBinDir,
+            'remoteScriptsDir': self.remoteScriptsDir,
+            'remoteComponentsDir': self.remoteComponentsDir,
+            'remoteModulesDir': self.remoteModulesDir,
+            'options': self.options,
+            'remoteDebugger': self.remoteDebugger,
+            'pathMapping': self.pathMapping,
+            'profileDir': self.profileDir,
+            'remoteTmpDir': self.remoteTmpDir,
+        }
+        if self.remoteAPK:
+            self.mobileArgs['remoteAPK'] = self.remoteAPK
+
+    def setLD_LIBRARY_PATH(self, env):
+        env["LD_LIBRARY_PATH"]=self.remoteBinDir
+
+    def pushWrapper(self):
+        # Rather than executing xpcshell directly, this wrapper script is
+        # used. By setting environment variables and the cwd in the script,
+        # the length of the per-test command line is shortened. This is
+        # often important when using ADB, as there is a limit to the length
+        # of the ADB command line.
+        localWrapper = tempfile.mktemp()
+        f = open(localWrapper, "w")
+        f.write("#!/system/bin/sh\n")
+        for envkey, envval in self.env.iteritems():
+            f.write("export %s=%s\n" % (envkey, envval))
+        f.write("cd $1\n")
+        f.write("echo xpcw: cd $1\n")
+        f.write("shift\n")
+        f.write("echo xpcw: xpcshell \"$@\"\n")
+        f.write("%s/xpcshell \"$@\"\n" % self.remoteBinDir)
+        f.close()
+        remoteWrapper = remoteJoin(self.remoteBinDir, "xpcw")
+        self.device.pushFile(localWrapper, remoteWrapper)
+        os.remove(localWrapper)
+        self.device.chmodDir(self.remoteBinDir)
+
+    def buildEnvironment(self):
+        self.env = {}
+        self.buildCoreEnvironment()
+        self.setLD_LIBRARY_PATH(self.env)
+        self.env["MOZ_LINKER_CACHE"] = self.remoteBinDir
+        if self.options.localAPK and self.appRoot:
+            self.env["GRE_HOME"] = self.appRoot
+        self.env["XPCSHELL_TEST_PROFILE_DIR"] = self.profileDir
+        self.env["TMPDIR"] = self.remoteTmpDir
+        self.env["HOME"] = self.profileDir
+        self.env["XPCSHELL_TEST_TEMP_DIR"] = self.remoteTmpDir
+        if self.options.setup:
+            self.pushWrapper()
+
+    def setAppRoot(self):
+        # Determine the application root directory associated with the package
+        # name used by the Fennec APK.
+        self.appRoot = None
+        packageName = None
+        if self.options.localAPK:
+            try:
+                packageName = self.localAPKContents.read("package-name.txt")
+                if packageName:
+                    self.appRoot = self.device.getAppRoot(packageName.strip())
+            except Exception as detail:
+                print "unable to determine app root: " + str(detail)
+                pass
+        return None
+
+    def setupUtilities(self):
+        if (not self.device.dirExists(self.remoteBinDir)):
+            # device.mkDir may fail here where shellCheckOutput may succeed -- see bug 817235
+            self.device.shellCheckOutput(["mkdir", self.remoteBinDir]);
+
+        remotePrefDir = remoteJoin(self.remoteBinDir, "defaults/pref")
+        if (self.device.dirExists(self.remoteTmpDir)):
+            self.device.removeDir(self.remoteTmpDir)
+        self.device.mkDir(self.remoteTmpDir)
+        if (not self.device.dirExists(remotePrefDir)):
+            self.device.mkDirs(remoteJoin(remotePrefDir, "extra"))
+        if (not self.device.dirExists(self.remoteScriptsDir)):
+            self.device.mkDir(self.remoteScriptsDir)
+        if (not self.device.dirExists(self.remoteComponentsDir)):
+            self.device.mkDir(self.remoteComponentsDir)
+
+        local = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'head.js')
+        remoteFile = remoteJoin(self.remoteScriptsDir, "head.js")
+        self.device.pushFile(local, remoteFile)
+
+        local = os.path.join(self.localBin, "xpcshell")
+        remoteFile = remoteJoin(self.remoteBinDir, "xpcshell")
+        self.device.pushFile(local, remoteFile)
+
+        local = os.path.join(self.localBin, "components/httpd.js")
+        remoteFile = remoteJoin(self.remoteComponentsDir, "httpd.js")
+        self.device.pushFile(local, remoteFile)
+
+        local = os.path.join(self.localBin, "components/httpd.manifest")
+        remoteFile = remoteJoin(self.remoteComponentsDir, "httpd.manifest")
+        self.device.pushFile(local, remoteFile)
+
+        local = os.path.join(self.localBin, "components/test_necko.xpt")
+        remoteFile = remoteJoin(self.remoteComponentsDir, "test_necko.xpt")
+        self.device.pushFile(local, remoteFile)
+
+        if self.options.localAPK:
+            remoteFile = remoteJoin(self.remoteBinDir, os.path.basename(self.options.localAPK))
+            self.device.pushFile(self.options.localAPK, remoteFile)
+
+        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 = remoteJoin(self.remoteBinDir, os.path.basename(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)
+            return
+
+        for file in os.listdir(self.localLib):
+            if (file.endswith(".so")):
+                print >> sys.stderr, "Pushing %s.." % file
+                if 'libxul' in file:
+                    print >> sys.stderr, "This is a big file, it could take a while."
+                remoteFile = remoteJoin(self.remoteBinDir, file)
+                self.device.pushFile(os.path.join(self.localLib, file), remoteFile)
+
+        # Additional libraries may be found in a sub-directory such as "lib/armeabi-v7a"
+        localArmLib = os.path.join(self.localLib, "lib")
+        if os.path.exists(localArmLib):
+            for root, dirs, files in os.walk(localArmLib):
+                for file in files:
+                    if (file.endswith(".so")):
+                        print >> sys.stderr, "Pushing %s.." % file
+                        remoteFile = remoteJoin(self.remoteBinDir, file)
+                        self.device.pushFile(os.path.join(root, file), remoteFile)
+
+    def setupModules(self):
+        if self.testingModulesDir:
+            self.device.pushDir(self.testingModulesDir, self.remoteModulesDir)
+
+    def setupTestDir(self):
+        print 'pushing %s' % self.xpcDir
+        try:
+            self.device.pushDir(self.xpcDir, self.remoteScriptsDir, retryLimit=10)
+        except TypeError:
+            # Foopies have an older mozdevice ver without retryLimit
+            self.device.pushDir(self.xpcDir, self.remoteScriptsDir)
+
+    def buildTestList(self):
+        xpcshell.XPCShellTests.buildTestList(self)
+        uniqueTestPaths = set([])
+        for test in self.alltests:
+            uniqueTestPaths.add(test['here'])
+        for testdir in uniqueTestPaths:
+            abbrevTestDir = os.path.relpath(testdir, self.xpcDir)
+            remoteScriptDir = remoteJoin(self.remoteScriptsDir, abbrevTestDir)
+            self.pathMapping.append(PathMapping(testdir, remoteScriptDir))
+
 class RemoteXPCShellOptions(xpcshell.XPCShellOptions):
 
     def __init__(self):
@@ -522,8 +532,13 @@ def main():
 
     xpcsh = XPCShellRemote(dm, options, args)
 
+    # we don't run concurrent tests on mobile
+    options.sequential = True
+
     if not xpcsh.runTests(xpcshell='xpcshell',
+                          testClass=RemoteXPCShellTestThread,
                           testdirs=args[0:],
+                          mobileArgs=xpcsh.mobileArgs,
                           **options.__dict__):
         sys.exit(1)
 
diff --git a/testing/xpcshell/runtestsb2g.py b/testing/xpcshell/runtestsb2g.py
index 6809089819c..04fc24bc626 100644
--- a/testing/xpcshell/runtestsb2g.py
+++ b/testing/xpcshell/runtestsb2g.py
@@ -9,7 +9,7 @@ import os
 sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
 
 import traceback
-from remotexpcshelltests import XPCShellRemote, RemoteXPCShellOptions
+from remotexpcshelltests import RemoteXPCShellTestThread, XPCShellRemote, RemoteXPCShellOptions
 from mozdevice import devicemanagerADB, DMError
 
 DEVICE_TEST_ROOT = '/data/local/tests'
@@ -17,8 +17,30 @@ DEVICE_TEST_ROOT = '/data/local/tests'
 
 from marionette import Marionette
 
-class B2GXPCShellRemote(XPCShellRemote):
+class B2GXPCShellTestThread(RemoteXPCShellTestThread):
+    # Overridden
+    def setLD_LIBRARY_PATH(self, env):
+        if self.options.use_device_libs:
+            env['LD_LIBRARY_PATH'] = '/system/b2g'
+            env['LD_PRELOAD'] = '/system/b2g/libmozglue.so'
+        else:
+            XPCShellRemote.setLD_LIBRARY_PATH(self, env)
 
+    # Overridden
+    def launchProcess(self, cmd, stdout, stderr, env, cwd):
+        try:
+            # This returns 1 even when tests pass - hardcode returncode to 0 (bug 773703)
+            outputFile = RemoteXPCShellTestThread.launchProcess(self, cmd, stdout, stderr, env, cwd)
+            self.shellReturnCode = 0
+        except DMError:
+            self.shellReturnCode = -1
+            outputFile = "xpcshelloutput"
+            f = open(outputFile, "a")
+            f.write("\n%s" % traceback.format_exc())
+            f.close()
+        return outputFile
+
+class B2GXPCShellRemote(XPCShellRemote):
     # Overridden
     def setupUtilities(self):
         if self.options.clean:
@@ -49,28 +71,6 @@ class B2GXPCShellRemote(XPCShellRemote):
         if not self.options.use_device_libs:
             XPCShellRemote.pushLibs(self)
 
-    # Overridden
-    def setLD_LIBRARY_PATH(self, env):
-        if self.options.use_device_libs:
-            env['LD_LIBRARY_PATH'] = '/system/b2g'
-            env['LD_PRELOAD'] = '/system/b2g/libmozglue.so'
-        else:
-            XPCShellRemote.setLD_LIBRARY_PATH(self, env)
-
-    # Overridden
-    def launchProcess(self, cmd, stdout, stderr, env, cwd):
-        try:
-            # This returns 1 even when tests pass - hardcode returncode to 0 (bug 773703)
-            outputFile = XPCShellRemote.launchProcess(self, cmd, stdout, stderr, env, cwd)
-            self.shellReturnCode = 0
-        except DMError:
-            self.shellReturnCode = -1
-            outputFile = "xpcshelloutput"
-            f = open(outputFile, "a")
-            f.write("\n%s" % traceback.format_exc())
-            f.close()
-        return outputFile
-
 class B2GOptions(RemoteXPCShellOptions):
 
     def __init__(self):
@@ -192,8 +192,14 @@ def main():
         options.remoteTestRoot = dm.getDeviceRoot()
     xpcsh = B2GXPCShellRemote(dm, options, args)
 
+    # we don't run concurrent tests on mobile
+    options.sequential = True
+
     try:
-        success = xpcsh.runTests(xpcshell='xpcshell', testdirs=args[0:], **options.__dict__)
+        success = xpcsh.runTests(xpcshell='xpcshell', testdirs=args[0:],
+                                 testClass=B2GXPCShellTestThread,
+                                 mobileArgs=xpcsh.mobileArgs,
+                                 **options.__dict__)
     except:
         print "Automation Error: Exception caught while running tests"
         traceback.print_exc()
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index d16446d8dab..e2632aa5e4e 100644
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -4,23 +4,36 @@
 # License, v. 2.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 re, sys, os, os.path, logging, shutil, signal, math, time, traceback
+import copy
+import re, sys, os, os.path, logging, shutil, math, time, traceback
 import xml.dom.minidom
+from collections import deque
 from distutils import dir_util
 from glob import glob
+from multiprocessing import cpu_count
 from optparse import OptionParser
 from subprocess import Popen, PIPE, STDOUT
 from tempfile import mkdtemp, gettempdir
-from threading import Timer
+from threading import Timer, Thread, Event
 import random
+import signal
 import socket
 import time
 
+try:
+    import psutil
+    HAVE_PSUTIL = True
+except ImportError:
+    HAVE_PSUTIL = False
+
 from automation import Automation, getGlobalLog, resetGlobalLog
 from automationutils import *
 
 HARNESS_TIMEOUT = 5 * 60
 
+# benchmarking on tbpl revealed that this works best for now
+NUM_THREADS = int(cpu_count() * 4)
+
 # --------------------------------------------------------------
 # TODO: this is a hack for mozbase without virtualenv, remove with bug 849900
 #
@@ -49,6 +62,504 @@ def markGotSIGINT(signum, stackFrame):
     global gotSIGINT
     gotSIGINT = True
 
+class XPCShellTestThread(Thread):
+    def __init__(self, test_object, event, cleanup_dir_list, tests_root_dir=None,
+            app_dir_key=None, interactive=False, verbose=False, pStdout=None,
+            pStderr=None, keep_going=False, log=None, **kwargs):
+        Thread.__init__(self)
+        self.daemon = True
+
+        self.test_object = test_object
+        self.cleanup_dir_list = cleanup_dir_list
+
+        self.appPath = kwargs.get('appPath')
+        self.xrePath = kwargs.get('xrePath')
+        self.testingModulesDir = kwargs.get('testingModulesDir')
+        self.debuggerInfo = kwargs.get('debuggerInfo')
+        self.pluginsPath = kwargs.get('pluginsPath')
+        self.httpdManifest = kwargs.get('httpdManifest')
+        self.httpdJSPath = kwargs.get('httpdJSPath')
+        self.headJSPath = kwargs.get('headJSPath')
+        self.testharnessdir = kwargs.get('testharnessdir')
+        self.profileName = kwargs.get('profileName')
+        self.singleFile = kwargs.get('singleFile')
+        self.env = copy.deepcopy(kwargs.get('env'))
+        self.symbolsPath = kwargs.get('symbolsPath')
+        self.logfiles = kwargs.get('logfiles')
+        self.xpcshell = kwargs.get('xpcshell')
+        self.xpcsRunArgs = kwargs.get('xpcsRunArgs')
+
+        self.tests_root_dir = tests_root_dir
+        self.app_dir_key = app_dir_key
+        self.interactive = interactive
+        self.verbose = verbose
+        self.pStdout = pStdout
+        self.pStderr = pStderr
+        self.keep_going = keep_going
+        self.log = log
+
+        # only one of these will be set to 1. adding them to the totals in
+        # the harness
+        self.passCount = 0
+        self.todoCount = 0
+        self.failCount = 0
+
+        # event from main thread to signal work done
+        self.event = event
+
+    def run(self):
+        try:
+            self.run_test()
+        except Exception as e:
+            self.exception = e
+            self.traceback = traceback.format_exc()
+        else:
+            self.exception = None
+            self.traceback = None
+        self.event.set()
+
+    def kill(self, proc):
+        """
+          Simple wrapper to kill a process.
+          On a remote system, this is overloaded to handle remote process communication.
+        """
+        return proc.kill()
+
+    def removeDir(self, dirname):
+        """
+          Simple wrapper to remove (recursively) a given directory.
+          On a remote system, we need to overload this to work on the remote filesystem.
+        """
+        shutil.rmtree(dirname)
+
+    def poll(self, proc):
+        """
+          Simple wrapper to check if a process has terminated.
+          On a remote system, this is overloaded to handle remote process communication.
+        """
+        return proc.poll()
+
+    def createLogFile(self, test_file, stdout):
+        """
+          For a given test file and stdout buffer, create a log file.
+          On a remote system we have to fix the test name since it can contain directories.
+        """
+        with open(test_file + ".log", "w") as f:
+            f.write(stdout)
+
+    def getReturnCode(self, proc):
+        """
+          Simple wrapper to get the return code for a given process.
+          On a remote system we overload this to work with the remote process management.
+        """
+        return proc.returncode
+
+    def communicate(self, proc):
+        """
+          Simple wrapper to communicate with a process.
+          On a remote system, this is overloaded to handle remote process communication.
+        """
+        return proc.communicate()
+
+    def launchProcess(self, cmd, stdout, stderr, env, cwd):
+        """
+          Simple wrapper to launch a process.
+          On a remote system, this is more complex and we need to overload this function.
+        """
+        if HAVE_PSUTIL:
+            popen_func = psutil.Popen
+        else:
+            popen_func = Popen
+        proc = popen_func(cmd, stdout=stdout, stderr=stderr,
+                    env=env, cwd=cwd)
+        return proc
+
+    def logCommand(self, name, completeCmd, testdir):
+        self.log.info("TEST-INFO | %s | full command: %r" % (name, completeCmd))
+        self.log.info("TEST-INFO | %s | current directory: %r" % (name, testdir))
+        # Show only those environment variables that are changed from
+        # the ambient environment.
+        changedEnv = (set("%s=%s" % i for i in self.env.iteritems())
+                      - set("%s=%s" % i for i in os.environ.iteritems()))
+        self.log.info("TEST-INFO | %s | environment: %s" % (name, list(changedEnv)))
+
+    def testTimeout(self, test_file, processPID):
+        self.log.error("TEST-UNEXPECTED-FAIL | %s | Test timed out" % test_file)
+        Automation().killAndGetStackNoScreenshot(processPID, self.appPath, self.debuggerInfo)
+
+    def buildCmdTestFile(self, name):
+        """
+          Build the command line arguments for the test file.
+          On a remote system, this may be overloaded to use a remote path structure.
+        """
+        return ['-e', 'const _TEST_FILE = ["%s"];' %
+                  replaceBackSlashes(name)]
+
+    def setupTempDir(self):
+        tempDir = mkdtemp()
+        self.env["XPCSHELL_TEST_TEMP_DIR"] = tempDir
+        if self.interactive:
+            self.log.info("TEST-INFO | temp dir is %s" % tempDir)
+        return tempDir
+
+    def setupPluginsDir(self):
+        if not os.path.isdir(self.pluginsPath):
+            return None
+
+        pluginsDir = mkdtemp()
+        # shutil.copytree requires dst to not exist. Deleting the tempdir
+        # would make a race condition possible in a concurrent environment,
+        # so we are using dir_utils.copy_tree which accepts an existing dst
+        dir_util.copy_tree(self.pluginsPath, pluginsDir)
+        if self.interactive:
+            self.log.info("TEST-INFO | plugins dir is %s" % pluginsDir)
+        return pluginsDir
+
+    def setupProfileDir(self):
+        """
+          Create a temporary folder for the profile and set appropriate environment variables.
+          When running check-interactive and check-one, the directory is well-defined and
+          retained for inspection once the tests complete.
+
+          On a remote system, this may be overloaded to use a remote path structure.
+        """
+        if self.interactive or self.singleFile:
+            profileDir = os.path.join(gettempdir(), self.profileName, "xpcshellprofile")
+            try:
+                # This could be left over from previous runs
+                self.removeDir(profileDir)
+            except:
+                pass
+            os.makedirs(profileDir)
+        else:
+            profileDir = mkdtemp()
+        self.env["XPCSHELL_TEST_PROFILE_DIR"] = profileDir
+        if self.interactive or self.singleFile:
+            self.log.info("TEST-INFO | profile dir is %s" % profileDir)
+        return profileDir
+
+    def buildCmdHead(self, headfiles, tailfiles, xpcscmd):
+        """
+          Build the command line arguments for the head and tail files,
+          along with the address of the webserver which some tests require.
+
+          On a remote system, this is overloaded to resolve quoting issues over a secondary command line.
+        """
+        cmdH = ", ".join(['"' + replaceBackSlashes(f) + '"'
+                       for f in headfiles])
+        cmdT = ", ".join(['"' + replaceBackSlashes(f) + '"'
+                       for f in tailfiles])
+        return xpcscmd + \
+                ['-e', 'const _SERVER_ADDR = "localhost"',
+                 '-e', 'const _HEAD_FILES = [%s];' % cmdH,
+                 '-e', 'const _TAIL_FILES = [%s];' % cmdT]
+
+    def getHeadAndTailFiles(self, test_object):
+        """Obtain the list of head and tail files.
+
+        Returns a 2-tuple. The first element is a list of head files. The second
+        is a list of tail files.
+        """
+        def sanitize_list(s, kind):
+            for f in s.strip().split(' '):
+                f = f.strip()
+                if len(f) < 1:
+                    continue
+
+                path = os.path.normpath(os.path.join(test_object['here'], f))
+                if not os.path.exists(path):
+                    raise Exception('%s file does not exist: %s' % (kind, path))
+
+                if not os.path.isfile(path):
+                    raise Exception('%s file is not a file: %s' % (kind, path))
+
+                yield path
+
+        return (list(sanitize_list(test_object['head'], 'head')),
+                list(sanitize_list(test_object['tail'], 'tail')))
+
+    def buildXpcsCmd(self, testdir):
+        """
+          Load the root head.js file as the first file in our test path, before other head, test, and tail files.
+          On a remote system, we overload this to add additional command line arguments, so this gets overloaded.
+        """
+        # - NOTE: if you rename/add any of the constants set here, update
+        #   do_load_child_test_harness() in head.js
+        if not self.appPath:
+            self.appPath = self.xrePath
+
+        self.xpcsCmd = [
+            self.xpcshell,
+            '-g', self.xrePath,
+            '-a', self.appPath,
+            '-r', self.httpdManifest,
+            '-m',
+            '-n',
+            '-s',
+            '-e', 'const _HTTPD_JS_PATH = "%s";' % self.httpdJSPath,
+            '-e', 'const _HEAD_JS_PATH = "%s";' % self.headJSPath
+        ]
+
+        if self.testingModulesDir:
+            # Escape backslashes in string literal.
+            sanitized = self.testingModulesDir.replace('\\', '\\\\')
+            self.xpcsCmd.extend([
+                '-e',
+                'const _TESTING_MODULES_DIR = "%s";' % sanitized
+            ])
+
+        self.xpcsCmd.extend(['-f', os.path.join(self.testharnessdir, 'head.js')])
+
+        if self.debuggerInfo:
+            self.xpcsCmd = [self.debuggerInfo["path"]] + self.debuggerInfo["args"] + self.xpcsCmd
+
+        # Automation doesn't specify a pluginsPath and xpcshell defaults to
+        # $APPDIR/plugins. We do the same here so we can carry on with
+        # setting up every test with its own plugins directory.
+        if not self.pluginsPath:
+            self.pluginsPath = os.path.join(self.appPath, 'plugins')
+
+        self.pluginsDir = self.setupPluginsDir()
+        if self.pluginsDir:
+            self.xpcsCmd.extend(['-p', self.pluginsDir])
+
+    def print_stdout(self, stdout):
+        """Print stdout line-by-line to avoid overflowing buffers."""
+        self.log.info(">>>>>>>")
+        if stdout:
+            for line in stdout.splitlines():
+                self.log.info(line)
+        self.log.info("<<<<<<<")
+
+    def cleanupDir(self, directory, name, stdout, xunit_result):
+        TRY_LIMIT = 25 # up to TRY_LIMIT attempts (one every second), because
+                       # the Windows filesystem is slow to react to the changes
+        try_count = 0
+        while try_count < TRY_LIMIT:
+            try:
+                self.removeDir(directory)
+            except OSError:
+                self.log.info("TEST-INFO | Failed to remove directory: %s. Waiting." % directory)
+                # We suspect the filesystem may still be making changes. Wait a
+                # little bit and try again.
+                time.sleep(1)
+                try_count += 1
+            else:
+                # removed fine
+                return
+
+        # we try again later at the end of the run for plugin dirs (because windows!)
+        if directory == self.pluginsDir:
+            self.cleanup_dir_list.append(directory)
+            return
+
+        # we couldn't clean up the directory, and it's not the plugins dir,
+        # which means that something wrong has probably happened
+        message = "TEST-UNEXPECTED-FAIL | %s | Failed to clean up directory: %s" % (name, sys.exc_info()[1])
+        self.log.error(message)
+        self.print_stdout(stdout)
+        self.print_stdout(traceback.format_exc())
+
+        self.failCount += 1
+        xunit_result["passed"] = False
+        xunit_result["failure"] = {
+            "type": "TEST-UNEXPECTED-FAIL",
+            "message": message,
+            "text": "%s\n%s" % (stdout, traceback.format_exc())
+        }
+
+    def run_test(self):
+        """Run an individual xpcshell test."""
+        global gotSIGINT
+
+        name = self.test_object['path']
+
+        self.xunit_result = {'name': self.test_object['name'], 'classname': 'xpcshell'}
+
+        # The xUnit package is defined as the path component between the root
+        # dir and the test with path characters replaced with '.' (using Java
+        # class notation).
+        if self.tests_root_dir is not None:
+            self.tests_root_dir = os.path.normpath(self.tests_root_dir)
+            if self.test_object['here'].find(self.tests_root_dir) != 0:
+                raise Exception('tests_root_dir is not a parent path of %s' %
+                    self.test_object['here'])
+            relpath = self.test_object['here'][len(self.tests_root_dir):].lstrip('/\\')
+            self.xunit_result['classname'] = relpath.replace('/', '.').replace('\\', '.')
+
+        # Check for skipped tests
+        if 'disabled' in self.test_object:
+            self.log.info('TEST-INFO | skipping %s | %s' %
+                (name, self.test_object['disabled']))
+
+            self.xunit_result['skipped'] = True
+
+            self.keep_going = True
+            return
+
+        # Check for known-fail tests
+        expected = self.test_object['expected'] == 'pass'
+
+        # By default self.appPath will equal the gre dir. If specified in the
+        # xpcshell.ini file, set a different app dir for this test.
+        if self.app_dir_key and self.app_dir_key in self.test_object:
+            rel_app_dir = self.test_object[self.app_dir_key]
+            rel_app_dir = os.path.join(self.xrePath, rel_app_dir)
+            self.appPath = os.path.abspath(rel_app_dir)
+        else:
+            self.appPath = None
+
+        test_dir = os.path.dirname(name)
+        self.buildXpcsCmd(test_dir)
+        head_files, tail_files = self.getHeadAndTailFiles(self.test_object)
+        cmdH = self.buildCmdHead(head_files, tail_files, self.xpcsCmd)
+
+        # Create a profile and a temp dir that the JS harness can stick
+        # a profile and temporary data in
+        self.profileDir = self.setupProfileDir()
+        self.tempDir = self.setupTempDir()
+
+        # The test file will have to be loaded after the head files.
+        cmdT = self.buildCmdTestFile(name)
+
+        args = self.xpcsRunArgs[:]
+        if 'debug' in self.test_object:
+            args.insert(0, '-d')
+
+        completeCmd = cmdH + cmdT + args
+
+        testTimer = None
+        if not self.interactive and not self.debuggerInfo:
+            testTimer = Timer(HARNESS_TIMEOUT, lambda: self.testTimeout(name, proc.pid))
+            testTimer.start()
+
+        proc = None
+        stdout = None
+        stderr = None
+
+        try:
+            self.log.info("TEST-INFO | %s | running test ..." % name)
+            if self.verbose:
+                self.logCommand(name, completeCmd, test_dir)
+
+            startTime = time.time()
+            proc = self.launchProcess(completeCmd,
+                stdout=self.pStdout, stderr=self.pStderr, env=self.env, cwd=test_dir)
+
+            if self.interactive:
+                self.log.info("TEST-INFO | %s | Process ID: %d" % (name, proc.pid))
+
+            stdout, stderr = self.communicate(proc)
+
+            if self.interactive:
+                # Not sure what else to do here...
+                self.keep_going = True
+                return
+
+            if testTimer:
+                testTimer.cancel()
+
+            result = not ((self.getReturnCode(proc) != 0) or
+                          # if do_throw or do_check failed
+                          (stdout and re.search("^((parent|child): )?TEST-UNEXPECTED-",
+                                                stdout, re.MULTILINE)) or
+                          # if syntax error in xpcshell file
+                          (stdout and re.search(": SyntaxError:", stdout,
+                                                re.MULTILINE)) or
+                          # if e10s test started but never finished (child process crash)
+                          (stdout and re.search("^child: CHILD-TEST-STARTED",
+                                                stdout, re.MULTILINE)
+                                  and not re.search("^child: CHILD-TEST-COMPLETED",
+                                                    stdout, re.MULTILINE)))
+
+            if result != expected:
+                failureType = "TEST-UNEXPECTED-%s" % ("FAIL" if expected else "PASS")
+                message = "%s | %s | test failed (with xpcshell return code: %d), see following log:" % (
+                              failureType, name, self.getReturnCode(proc))
+                self.log.error(message)
+                self.print_stdout(stdout)
+                self.failCount += 1
+                self.xunit_result["passed"] = False
+
+                self.xunit_result["failure"] = {
+                  "type": failureType,
+                  "message": message,
+                  "text": stdout
+                }
+            else:
+                now = time.time()
+                timeTaken = (now - startTime) * 1000
+                self.xunit_result["time"] = now - startTime
+                self.log.info("TEST-%s | %s | test passed (time: %.3fms)" % ("PASS" if expected else "KNOWN-FAIL", name, timeTaken))
+                if self.verbose:
+                    self.print_stdout(stdout)
+
+                self.xunit_result["passed"] = True
+
+                if expected:
+                    self.passCount = 1
+                else:
+                    self.todoCount = 1
+                    self.xunit_result["todo"] = True
+
+            if mozcrash.check_for_crashes(test_dir, self.symbolsPath, test_name=name):
+                message = "PROCESS-CRASH | %s | application crashed" % name
+                self.failCount = 1
+                self.xunit_result["passed"] = False
+                self.xunit_result["failure"] = {
+                    "type": "PROCESS-CRASH",
+                    "message": message,
+                    "text": stdout
+                }
+
+            if self.logfiles and stdout:
+                self.createLogFile(name, stdout)
+
+        finally:
+            # We can sometimes get here before the process has terminated, which would
+            # cause removeDir() to fail - so check for the process & kill it it needed.
+            if proc and self.poll(proc) is None:
+                message = "TEST-UNEXPECTED-FAIL | %s | Process still running after test!" % name
+                self.log.error(message)
+                self.print_stdout(stdout)
+                self.failCount = 1
+                self.xunit_result["passed"] = False
+                self.xunit_result["failure"] = {
+                  "type": "TEST-UNEXPECTED-FAIL",
+                  "message": message,
+                  "text": stdout
+                }
+                self.kill(proc)
+
+
+            # We don't want to delete the profile when running check-interactive
+            # or check-one.
+            if self.profileDir and not self.interactive and not self.singleFile:
+                self.cleanupDir(self.profileDir, name, stdout, self.xunit_result)
+
+            self.cleanupDir(self.tempDir, name, stdout, self.xunit_result)
+
+            if self.pluginsDir:
+                self.cleanupDir(self.pluginsDir, name, stdout, self.xunit_result)
+
+        if gotSIGINT:
+            self.xunit_result["passed"] = False
+            self.xunit_result["time"] = "0.0"
+            self.xunit_result["failure"] = {
+                "type": "SIGINT",
+                "message": "Received SIGINT",
+                "text": "Received SIGINT (control-C) during test execution."
+            }
+
+            self.log.error("TEST-UNEXPECTED-FAIL | Received SIGINT (control-C) during test execution")
+            if self.keep_going:
+                gotSIGINT = False
+            else:
+                self.keep_going = False
+                return
+
+        self.keep_going = True
+
 class XPCShellTests(object):
 
     log = getGlobalLog()
@@ -172,17 +683,6 @@ class XPCShellTests(object):
 
         return self.env
 
-    def buildXpcsRunArgs(self):
-        """
-          Add arguments to run the test or make it interactive.
-        """
-        if self.interactive:
-            self.xpcsRunArgs = [
-            '-e', 'print("To start the test, type |_execute_test();|.");',
-            '-i']
-        else:
-            self.xpcsRunArgs = ['-e', '_execute_test(); quit(0);']
-
     def getPipes(self):
         """
           Determine the value of the stdout and stderr for the test.
@@ -203,51 +703,6 @@ class XPCShellTests(object):
                 pStderr = STDOUT
         return pStdout, pStderr
 
-    def buildXpcsCmd(self, testdir):
-        """
-          Load the root head.js file as the first file in our test path, before other head, test, and tail files.
-          On a remote system, we overload this to add additional command line arguments, so this gets overloaded.
-        """
-        # - NOTE: if you rename/add any of the constants set here, update
-        #   do_load_child_test_harness() in head.js
-        if not self.appPath:
-            self.appPath = self.xrePath
-
-        self.xpcsCmd = [
-            self.xpcshell,
-            '-g', self.xrePath,
-            '-a', self.appPath,
-            '-r', self.httpdManifest,
-            '-m',
-            '-n',
-            '-s',
-            '-e', 'const _HTTPD_JS_PATH = "%s";' % self.httpdJSPath,
-            '-e', 'const _HEAD_JS_PATH = "%s";' % self.headJSPath
-        ]
-
-        if self.testingModulesDir:
-            # Escape backslashes in string literal.
-            sanitized = self.testingModulesDir.replace('\\', '\\\\')
-            self.xpcsCmd.extend([
-                '-e',
-                'const _TESTING_MODULES_DIR = "%s";' % sanitized
-            ])
-
-        self.xpcsCmd.extend(['-f', os.path.join(self.testharnessdir, 'head.js')])
-
-        if self.debuggerInfo:
-            self.xpcsCmd = [self.debuggerInfo["path"]] + self.debuggerInfo["args"] + self.xpcsCmd
-
-        # Automation doesn't specify a pluginsPath and xpcshell defaults to
-        # $APPDIR/plugins. We do the same here so we can carry on with
-        # setting up every test with its own plugins directory.
-        if not self.pluginsPath:
-            self.pluginsPath = os.path.join(self.appPath, 'plugins')
-
-        self.pluginsDir = self.setupPluginsDir()
-        if self.pluginsDir:
-            self.xpcsCmd.extend(['-p', self.pluginsDir])
-
     def buildTestPath(self):
         """
           If we specifiy a testpath, set the self.testPath variable to be the given directory or file.
@@ -273,123 +728,6 @@ class XPCShellTests(object):
                 # Simply remove optional ending separator.
                 self.testPath = self.testPath.rstrip("/")
 
-    def getHeadAndTailFiles(self, test):
-        """Obtain the list of head and tail files.
-
-        Returns a 2-tuple. The first element is a list of head files. The second
-        is a list of tail files.
-        """
-        def sanitize_list(s, kind):
-            for f in s.strip().split(' '):
-                f = f.strip()
-                if len(f) < 1:
-                    continue
-
-                path = os.path.normpath(os.path.join(test['here'], f))
-                if not os.path.exists(path):
-                    raise Exception('%s file does not exist: %s' % (kind, path))
-
-                if not os.path.isfile(path):
-                    raise Exception('%s file is not a file: %s' % (kind, path))
-
-                yield path
-
-        return (list(sanitize_list(test['head'], 'head')),
-                list(sanitize_list(test['tail'], 'tail')))
-
-    def setupPluginsDir(self):
-        if not os.path.isdir(self.pluginsPath):
-            return None
-
-        pluginsDir = mkdtemp()
-        # shutil.copytree requires dst to not exist. Deleting the tempdir
-        # would make a race condition possible in a concurrent environment,
-        # so we are using dir_utils.copy_tree which accepts an existing dst
-        dir_util.copy_tree(self.pluginsPath, pluginsDir)
-        if self.interactive:
-            self.log.info("TEST-INFO | plugins dir is %s" % pluginsDir)
-        return pluginsDir
-
-    def setupProfileDir(self):
-        """
-          Create a temporary folder for the profile and set appropriate environment variables.
-          When running check-interactive and check-one, the directory is well-defined and
-          retained for inspection once the tests complete.
-
-          On a remote system, this may be overloaded to use a remote path structure.
-        """
-        if self.interactive or self.singleFile:
-            profileDir = os.path.join(gettempdir(), self.profileName, "xpcshellprofile")
-            try:
-                # This could be left over from previous runs
-                self.removeDir(profileDir)
-            except:
-                pass
-            os.makedirs(profileDir)
-        else:
-            profileDir = mkdtemp()
-        self.env["XPCSHELL_TEST_PROFILE_DIR"] = profileDir
-        if self.interactive or self.singleFile:
-            self.log.info("TEST-INFO | profile dir is %s" % profileDir)
-        return profileDir
-
-    def setupTempDir(self):
-        tempDir = mkdtemp()
-        self.env["XPCSHELL_TEST_TEMP_DIR"] = tempDir
-        if self.interactive:
-            self.log.info("TEST-INFO | temp dir is %s" % tempDir)
-        return tempDir
-
-    def setupLeakLogging(self):
-        """
-          Enable leaks (only) detection to its own log file and set environment variables.
-
-          On a remote system, this may be overloaded to use a remote filename and path structure
-        """
-        filename = "runxpcshelltests_leaks.log"
-
-        leakLogFile = os.path.join(self.profileDir,  filename)
-        self.env["XPCOM_MEM_LEAK_LOG"] = leakLogFile
-        return leakLogFile
-
-    def launchProcess(self, cmd, stdout, stderr, env, cwd):
-        """
-          Simple wrapper to launch a process.
-          On a remote system, this is more complex and we need to overload this function.
-        """
-        cmd = wrapCommand(cmd)
-        proc = Popen(cmd, stdout=stdout, stderr=stderr,
-                    env=env, cwd=cwd)
-        return proc
-
-    def communicate(self, proc):
-        """
-          Simple wrapper to communicate with a process.
-          On a remote system, this is overloaded to handle remote process communication.
-        """
-        return proc.communicate()
-
-    def poll(self, proc):
-        """
-          Simple wrapper to check if a process has terminated.
-          On a remote system, this is overloaded to handle remote process communication.
-        """
-        return proc.poll()
-
-    def kill(self, proc):
-        """
-          Simple wrapper to kill a process.
-          On a remote system, this is overloaded to handle remote process communication.
-        """
-        return proc.kill()
-
-    def removeDir(self, dirname):
-        """
-          Simple wrapper to remove (recursively) a given directory.
-          On a remote system, we need to overload this to work on the remote filesystem.
-        """
-        shutil.rmtree(dirname)
-
     def verifyDirPath(self, dirname):
         """
           Simple wrapper to get the absolute path for a given directory name.
@@ -397,55 +735,6 @@ class XPCShellTests(object):
         """
         return os.path.abspath(dirname)
 
-    def getReturnCode(self, proc):
-        """
-          Simple wrapper to get the return code for a given process.
-          On a remote system we overload this to work with the remote process management.
-        """
-        return proc.returncode
-
-    def createLogFile(self, test, stdout, leakLogs):
-        """
-          For a given test and stdout buffer, create a log file.  also log any found leaks.
-          On a remote system we have to fix the test name since it can contain directories.
-        """
-        try:
-            f = open(test + ".log", "w")
-            f.write(stdout)
-
-            for leakLog in leakLogs:
-                if os.path.exists(leakLog):
-                    leaks = open(leakLog, "r")
-                    f.write(leaks.read())
-                    leaks.close()
-        finally:
-            if f:
-                f.close()
-
-    def buildCmdHead(self, headfiles, tailfiles, xpcscmd):
-        """
-          Build the command line arguments for the head and tail files,
-          along with the address of the webserver which some tests require.
-
-          On a remote system, this is overloaded to resolve quoting issues over a secondary command line.
-        """
-        cmdH = ", ".join(['"' + replaceBackSlashes(f) + '"'
-                       for f in headfiles])
-        cmdT = ", ".join(['"' + replaceBackSlashes(f) + '"'
-                       for f in tailfiles])
-        return xpcscmd + \
-                ['-e', 'const _SERVER_ADDR = "localhost"',
-                 '-e', 'const _HEAD_FILES = [%s];' % cmdH,
-                 '-e', 'const _TAIL_FILES = [%s];' % cmdT]
-
-    def buildCmdTestFile(self, name):
-        """
-          Build the command line arguments for the test file.
-          On a remote system, this may be overloaded to use a remote path structure.
-        """
-        return ['-e', 'const _TEST_FILE = ["%s"];' %
-                  replaceBackSlashes(name)]
-
     def trySetupNode(self):
         """
           Run node for SPDY tests, if available, and updates mozinfo as appropriate.
@@ -598,10 +887,6 @@ class XPCShellTests(object):
 
         doc.writexml(fh, addindent="  ", newl="\n", encoding="utf-8")
 
-    def testTimeout(self, test, processPID):
-        self.log.error("TEST-UNEXPECTED-FAIL | %s | Test timed out" % test)
-        Automation().killAndGetStackNoScreenshot(processPID, self.appPath, self.debuggerInfo)
-
     def post_to_autolog(self, results, name):
         from moztest.results import TestContext, TestResult, TestResultCollection
         from moztest.output.autolog import AutologOutput
@@ -644,24 +929,32 @@ class XPCShellTests(object):
         out = AutologOutput()
         out.post(out.make_testgroups(collection))
 
-    def logCommand(self, name, completeCmd, testdir):
-        self.log.info("TEST-INFO | %s | full command: %r" % (name, completeCmd))
-        self.log.info("TEST-INFO | %s | current directory: %r" % (name, testdir))
-        # Show only those environment variables that are changed from
-        # the ambient environment.
-        changedEnv = (set("%s=%s" % i for i in self.env.iteritems())
-                      - set("%s=%s" % i for i in os.environ.iteritems()))
-        self.log.info("TEST-INFO | %s | environment: %s" % (name, list(changedEnv)))
+    def buildXpcsRunArgs(self):
+        """
+          Add arguments to run the test or make it interactive.
+        """
+        if self.interactive:
+            self.xpcsRunArgs = [
+            '-e', 'print("To start the test, type |_execute_test();|.");',
+            '-i']
+        else:
+            self.xpcsRunArgs = ['-e', '_execute_test(); quit(0);']
+
+    def addTestResults(self, test):
+        self.passCount += test.passCount
+        self.failCount += test.failCount
+        self.todoCount += test.todoCount
+        self.xunitResults.append(test.xunit_result)
 
     def runTests(self, xpcshell, xrePath=None, appPath=None, symbolsPath=None,
-                 manifest=None, testdirs=None, testPath=None,
+                 manifest=None, testdirs=None, testPath=None, mobileArgs=None,
                  interactive=False, verbose=False, keepGoing=False, logfiles=True,
                  thisChunk=1, totalChunks=1, debugger=None,
                  debuggerArgs=None, debuggerInteractive=False,
-                 profileName=None, mozInfo=None, shuffle=False,
+                 profileName=None, mozInfo=None, sequential=False, shuffle=False,
                  testsRootDir=None, xunitFilename=None, xunitName=None,
                  testingModulesDir=None, autolog=False, pluginsPath=None,
-                 **otherOptions):
+                 testClass=XPCShellTestThread, **otherOptions):
         """Run xpcshell tests.
 
         |xpcshell|, is the xpcshell executable to use to run the tests.
@@ -757,10 +1050,7 @@ class XPCShellTests(object):
         self.mozInfo = mozInfo
         self.testingModulesDir = testingModulesDir
         self.pluginsPath = pluginsPath
-
-        # If we have an interactive debugger, disable ctrl-c.
-        if self.debuggerInfo and self.debuggerInfo["interactive"]:
-            signal.signal(signal.SIGINT, lambda signum, frame: None)
+        self.sequential = sequential
 
         if not testdirs and not manifest:
             # nothing to test!
@@ -776,6 +1066,8 @@ class XPCShellTests(object):
         self.buildXpcsRunArgs()
         self.buildEnvironment()
 
+        self.event = Event()
+
         # Handle filenames in mozInfo
         if not isinstance(self.mozInfo, dict):
             mozInfoFile = self.mozInfo
@@ -804,10 +1096,47 @@ class XPCShellTests(object):
         if shuffle:
             random.shuffle(self.alltests)
 
-        xunitResults = []
+        self.xunitResults = []
+        self.cleanup_dir_list = []
 
-        for test in self.alltests:
-            name = test['path']
+        kwargs = {
+            'appPath': self.appPath,
+            'xrePath': self.xrePath,
+            'testingModulesDir': self.testingModulesDir,
+            'debuggerInfo': self.debuggerInfo,
+            'pluginsPath': self.pluginsPath,
+            'httpdManifest': self.httpdManifest,
+            'httpdJSPath': self.httpdJSPath,
+            'headJSPath': self.headJSPath,
+            'testharnessdir': self.testharnessdir,
+            'profileName': self.profileName,
+            'singleFile': self.singleFile,
+            'env': self.env, # making a copy of this in the testthreads
+            'symbolsPath': self.symbolsPath,
+            'logfiles': self.logfiles,
+            'xpcshell': self.xpcshell,
+            'xpcsRunArgs': self.xpcsRunArgs,
+        }
+
+        if self.sequential:
+            # Allow user to kill hung xpcshell subprocess with SIGINT
+            # when we are only running tests sequentially.
+            signal.signal(signal.SIGINT, markGotSIGINT)
+
+        if self.debuggerInfo:
+            # Force a sequential run
+            self.sequential = True
+
+            # If we have an interactive debugger, disable SIGINT entirely.
+            if self.debuggerInfo["interactive"]:
+                signal.signal(signal.SIGINT, lambda signum, frame: None)
+
+        # create a queue of all tests that will run
+        tests_queue = deque()
+        # also a list for the tests that need to be run sequentially
+        sequential_tests = []
+        for test_object in self.alltests:
+            name = test_object['path']
             if self.singleFile and not name.endswith(self.singleFile):
                 continue
 
@@ -816,17 +1145,99 @@ class XPCShellTests(object):
 
             self.testCount += 1
 
-            keep_going, xunitResult = self.run_test(test,
-                tests_root_dir=testsRootDir, app_dir_key=appDirKey,
-                interactive=interactive, verbose=verbose, pStdout=pStdout,
-                pStderr=pStderr, keep_going=keepGoing)
+            test = testClass(test_object, self.event, self.cleanup_dir_list,
+                    tests_root_dir=testsRootDir, app_dir_key=appDirKey,
+                    interactive=interactive, verbose=verbose, pStdout=pStdout,
+                    pStderr=pStderr, keep_going=keepGoing, log=self.log,
+                    mobileArgs=mobileArgs, **kwargs)
+            if 'run-sequentially' in test_object or self.sequential:
+                sequential_tests.append(test)
+            else:
+                tests_queue.append(test)
 
-            xunitResults.append(xunitResult)
+        if sequential:
+            self.log.info("INFO | Running tests sequentially.")
+        else:
+            self.log.info("INFO | Using at most %d threads." % NUM_THREADS)
 
-            if not keep_going:
+        # keep a set of NUM_THREADS running tests and start running the
+        # tests in the queue at most NUM_THREADS at a time
+        running_tests = set()
+        keep_going = True
+        exceptions = []
+        tracebacks = []
+        while tests_queue or running_tests:
+            # if we're not supposed to continue and all of the running tests
+            # are done, stop
+            if not keep_going and not running_tests:
                 break
 
+            # if there's room to run more tests, start running them
+            while keep_going and tests_queue and (len(running_tests) < NUM_THREADS):
+                test = tests_queue.popleft()
+                running_tests.add(test)
+                test.start()
+
+            # queue is full (for now) or no more new tests,
+            # process the finished tests so far
+
+            # wait for at least one of the tests to finish
+            self.event.wait(1)
+            self.event.clear()
+
+            # find what tests are done (might be more than 1)
+            done_tests = set()
+            for test in running_tests:
+                if not test.is_alive():
+                    done_tests.add(test)
+                    test.join()
+                    # did the test encounter any exception?
+                    if test.exception:
+                        exceptions.append(test.exception)
+                        tracebacks.append(test.traceback)
+                        # we won't add any more tests, will just wait for
+                        # the currently running ones to finish
+                        keep_going = False
+                    keep_going = keep_going and test.keep_going
+                    self.addTestResults(test)
+
+            # make room for new tests to run
+            running_tests.difference_update(done_tests)
+
+        if keep_going:
+            # run the other tests sequentially
+            for test in sequential_tests:
+                if not keep_going:
+                    self.log.error("TEST-UNEXPECTED-FAIL | Received SIGINT (control-C), so stopped run. " \
+                                   "(Use --keep-going to keep running tests after killing one with SIGINT)")
+                    break
+                test.start()
+                test.join()
+                # did the test encounter any exception?
+                if test.exception:
+                    raise test.exception
+                keep_going = test.keep_going
+                self.addTestResults(test)
+
+        # restore default SIGINT behaviour
+        signal.signal(signal.SIGINT, signal.SIG_DFL)
+
         self.shutdownNode()
+        # Clean up any slacker directories that might be lying around (Windows).
+        # Some might fail because of windows taking too long to unlock them.
+        # We don't do anything if this fails because the test slaves will have
+        # their $TEMP dirs cleaned up on reboot anyway.
+        for directory in self.cleanup_dir_list:
+            try:
+                shutil.rmtree(directory)
+            except:
+                self.log.info("INFO | %s could not be cleaned up." % directory)
+
+        if exceptions:
+            self.log.info("INFO | Following exceptions were raised:")
+            for t in tracebacks:
+                self.log.error(t)
+            raise exceptions[0]
 
         if self.testCount == 0:
             self.log.error("TEST-UNEXPECTED-FAIL | runxpcshelltests.py | No tests run. Did you pass an invalid --test-path?")
@@ -838,10 +1249,10 @@ class XPCShellTests(object):
         self.log.info("INFO | Todo: %d" % self.todoCount)
 
         if autolog:
-            self.post_to_autolog(xunitResults, xunitName)
+            self.post_to_autolog(self.xunitResults, xunitName)
 
         if xunitFilename is not None:
-            self.writeXunitResults(filename=xunitFilename, results=xunitResults,
+            self.writeXunitResults(filename=xunitFilename, results=self.xunitResults,
                                    name=xunitName)
 
         if gotSIGINT and not keepGoing:
@@ -851,245 +1262,6 @@ class XPCShellTests(object):
 
         return self.failCount == 0
 
-    def print_stdout(self, stdout):
-        """Print stdout line-by-line to avoid overflowing buffers."""
-        self.log.info(">>>>>>>")
-        if (stdout):
-            for line in stdout.splitlines():
-                self.log.info(line)
-        self.log.info("<<<<<<<")
-
-    def cleanupDir(self, directory, name, stdout, xunit_result):
-        try:
-            self.removeDir(directory)
-        except Exception:
-            self.log.info("TEST-INFO | Failed to remove directory: %s. Waiting." % directory)
-
-            # We suspect the filesystem may still be making changes. Wait a
-            # little bit and try again.
-            time.sleep(5)
-
-            try:
-                self.removeDir(directory)
-            except Exception:
-                message = "TEST-UNEXPECTED-FAIL | %s | Failed to clean up directory: %s" % (name, sys.exc_info()[1])
-                self.log.error(message)
-                self.print_stdout(stdout)
-                self.print_stdout(traceback.format_exc())
-
-                self.failCount += 1
-                xunit_result["passed"] = False
-                xunit_result["failure"] = {
-                    "type": "TEST-UNEXPECTED-FAIL",
-                    "message": message,
-                    "text": "%s\n%s" % (stdout, traceback.format_exc())
-                }
-
-    def run_test(self, test, tests_root_dir=None, app_dir_key=None,
-            interactive=False, verbose=False, pStdout=None, pStderr=None,
-            keep_going=False):
-        """Run an individual xpcshell test."""
-        global gotSIGINT
-
-        name = test['path']
-
-        xunit_result = {'name': test['name'], 'classname': 'xpcshell'}
-
-        # The xUnit package is defined as the path component between the root
-        # dir and the test with path characters replaced with '.' (using Java
-        # class notation).
-        if tests_root_dir is not None:
-            tests_root_dir = os.path.normpath(tests_root_dir)
-            if test['here'].find(tests_root_dir) != 0:
-                raise Exception('tests_root_dir is not a parent path of %s' %
-                    test['here'])
-            relpath = test['here'][len(tests_root_dir):].lstrip('/\\')
-            xunit_result['classname'] = relpath.replace('/', '.').replace('\\', '.')
-
-        # Check for skipped tests
-        if 'disabled' in test:
-            self.log.info('TEST-INFO | skipping %s | %s' %
-                (name, test['disabled']))
-
-            xunit_result['skipped'] = True
-
-            return True, xunit_result
-
-        # Check for known-fail tests
-        expected = test['expected'] == 'pass'
-
-        # By default self.appPath will equal the gre dir. If specified in the
-        # xpcshell.ini file, set a different app dir for this test.
-        if app_dir_key and app_dir_key in test:
-            rel_app_dir = test[app_dir_key]
-            rel_app_dir = os.path.join(self.xrePath, rel_app_dir)
-            self.appPath = os.path.abspath(rel_app_dir)
-        else:
-            self.appPath = None
-
-        test_dir = os.path.dirname(name)
-        self.buildXpcsCmd(test_dir)
-        head_files, tail_files = self.getHeadAndTailFiles(test)
-        cmdH = self.buildCmdHead(head_files, tail_files, self.xpcsCmd)
-
-        # Create a profile and a temp dir that the JS harness can stick
-        # a profile and temporary data in
-        self.profileDir = self.setupProfileDir()
-        self.tempDir = self.setupTempDir()
-        self.leakLogFile = self.setupLeakLogging()
-
-        # The test file will have to be loaded after the head files.
-        cmdT = self.buildCmdTestFile(name)
-
-        args = self.xpcsRunArgs[:]
-        if 'debug' in test:
-            args.insert(0, '-d')
-
-        completeCmd = cmdH + cmdT + args
-
-        testTimer = None
-        if not interactive and not self.debuggerInfo:
-            testTimer = Timer(HARNESS_TIMEOUT, lambda: self.testTimeout(name, proc.pid))
-            testTimer.start()
-
-        proc = None
-
-        try:
-            self.log.info("TEST-INFO | %s | running test ..." % name)
-            if verbose:
-                self.logCommand(name, completeCmd, test_dir)
-
-            startTime = time.time()
-            proc = self.launchProcess(completeCmd,
-                stdout=pStdout, stderr=pStderr, env=self.env, cwd=test_dir)
-
-            if interactive:
-                self.log.info("TEST-INFO | %s | Process ID: %d" % (name, proc.pid))
-
-            # Allow user to kill hung subprocess with SIGINT w/o killing this script
-            # - don't move this line above launchProcess, or child will inherit the SIG_IGN
-            signal.signal(signal.SIGINT, markGotSIGINT)
-            # |stderr == None| as |pStderr| was either |None| or redirected to |stdout|.
-            stdout, stderr = self.communicate(proc)
-            signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-            if interactive:
-                # Not sure what else to do here...
-                return True, xunit_result
-
-            if testTimer:
-                testTimer.cancel()
-
-            result = not ((self.getReturnCode(proc) != 0) or
-                          # if do_throw or do_check failed
-                          (stdout and re.search("^((parent|child): )?TEST-UNEXPECTED-",
-                                                stdout, re.MULTILINE)) or
-                          # if syntax error in xpcshell file
-                          (stdout and re.search(": SyntaxError:", stdout,
-                                                re.MULTILINE)) or
-                          # if e10s test started but never finished (child process crash)
-                          (stdout and re.search("^child: CHILD-TEST-STARTED",
-                                                stdout, re.MULTILINE)
-                                  and not re.search("^child: CHILD-TEST-COMPLETED",
-                                                    stdout, re.MULTILINE)))
-
-            if result != expected:
-                failureType = "TEST-UNEXPECTED-%s" % ("FAIL" if expected else "PASS")
-                message = "%s | %s | test failed (with xpcshell return code: %d), see following log:" % (
-                              failureType, name, self.getReturnCode(proc))
-                self.log.error(message)
-                self.print_stdout(stdout)
-                self.failCount += 1
-                xunit_result["passed"] = False
-
-                xunit_result["failure"] = {
-                  "type": failureType,
-                  "message": message,
-                  "text": stdout
-                }
-            else:
-                now = time.time()
-                timeTaken = (now - startTime) * 1000
-                xunit_result["time"] = now - startTime
-                self.log.info("TEST-%s | %s | test passed (time: %.3fms)" % ("PASS" if expected else "KNOWN-FAIL", name, timeTaken))
-                if verbose:
-                    self.print_stdout(stdout)
-
-                xunit_result["passed"] = True
-
-                if expected:
-                    self.passCount += 1
-                else:
-                    self.todoCount += 1
-                    xunit_result["todo"] = True
-
-            if mozcrash.check_for_crashes(test_dir, self.symbolsPath, test_name=name):
-                message = "PROCESS-CRASH | %s | application crashed" % name
-                self.failCount += 1
-                xunit_result["passed"] = False
-                xunit_result["failure"] = {
-                    "type": "PROCESS-CRASH",
-                    "message": message,
-                    "text": stdout
-                }
-
-            # Find child process(es) leak log(s), if any: See InitLog() in
-            # xpcom/base/nsTraceRefcntImpl.cpp for logfile naming logic
-            leakLogs = [self.leakLogFile]
-            for childLog in glob(os.path.join(self.profileDir, "runxpcshelltests_leaks_*_pid*.log")):
-                if os.path.isfile(childLog):
-                    leakLogs += [childLog]
-            for log in leakLogs:
-                dumpLeakLog(log, True)
-
-            if self.logfiles and stdout:
-                self.createLogFile(name, stdout, leakLogs)
-
-        finally:
-            # We can sometimes get here before the process has terminated, which would
-            # cause removeDir() to fail - so check for the process & kill it it needed.
-            if proc and self.poll(proc) is None:
-                message = "TEST-UNEXPECTED-FAIL | %s | Process still running after test!" % name
-                self.log.error(message)
-                self.print_stdout(stdout)
-                self.failCount += 1
-                xunit_result["passed"] = False
-                xunit_result["failure"] = {
-                  "type": "TEST-UNEXPECTED-FAIL",
-                  "message": message,
-                  "text": stdout
-                }
-                self.kill(proc)
-
-
-            # We don't want to delete the profile when running check-interactive
-            # or check-one.
-            if self.profileDir and not self.interactive and not self.singleFile:
-                self.cleanupDir(self.profileDir, name, stdout, xunit_result)
-
-            self.cleanupDir(self.tempDir, name, stdout, xunit_result)
-
-            if self.pluginsDir:
-                self.cleanupDir(self.pluginsDir, name, stdout, xunit_result)
-
-        if gotSIGINT:
-            xunit_result["passed"] = False
-            xunit_result["time"] = "0.0"
-            xunit_result["failure"] = {
-                "type": "SIGINT",
-                "message": "Received SIGINT",
-                "text": "Received SIGINT (control-C) during test execution."
-            }
-
-            self.log.error("TEST-UNEXPECTED-FAIL | Received SIGINT (control-C) during test execution")
-            if (keep_going):
-                gotSIGINT = False
-            else:
-                return False, xunit_result
-
-        return True, xunit_result
-
-
 class XPCShellOptions(OptionParser):
     def __init__(self):
         """Process command line arguments and call runTests() to do the real work."""
@@ -1120,6 +1292,9 @@ class XPCShellOptions(OptionParser):
         self.add_option("--no-logfiles",
                         action="store_false", dest="logfiles",
                         help="don't create log files")
+        self.add_option("--sequential",
+                        action="store_true", dest="sequential", default=False,
+                        help="Run all tests sequentially")
         self.add_option("--test-path",
                         type="string", dest="testPath", default=None,
                         help="single path and/or test filename to test")
@@ -1173,6 +1348,10 @@ def main():
         print >>sys.stderr, "Error: You must specify a test filename in interactive mode!"
         sys.exit(1)
 
+    # running sequentially for safety reasons for now (in automation)
+    # mach will run tests in parallel by default
+    options.sequential = True
+
     if not xpcsh.runTests(args[0], testdirs=args[1:], **options.__dict__):
         sys.exit(1)
 
diff --git a/testing/xpcshell/selftest.py b/testing/xpcshell/selftest.py
index dda6b55492d..5d91af860cd 100644
--- a/testing/xpcshell/selftest.py
+++ b/testing/xpcshell/selftest.py
@@ -175,7 +175,8 @@ tail =
                                           mozInfo={},
                                           shuffle=shuffle,
                                           testsRootDir=self.tempdir,
-                                          xunitFilename=xunitFilename),
+                                          xunitFilename=xunitFilename,
+                                          sequential=True),
                           msg="""Tests should have %s, log:
 ========
 %s

From d073337ac14a3b015e8d5fe8fe4a4cf53337c976 Mon Sep 17 00:00:00 2001
From: Mihnea Dobrescu-Balaur <mihneadb@gmail.com>
Date: Wed, 14 Aug 2013 10:17:11 -0700
Subject: [PATCH 54/98] Bug 887054 - Part 2: Add parallel warning and support
 for --sequential to mach xpcshell-test. r=gps

---
 testing/xpcshell/mach_commands.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/testing/xpcshell/mach_commands.py b/testing/xpcshell/mach_commands.py
index 36bc88bee0e..cc952c57e0b 100644
--- a/testing/xpcshell/mach_commands.py
+++ b/testing/xpcshell/mach_commands.py
@@ -45,7 +45,7 @@ class XPCShellRunner(MozbuildObject):
         return self._run_xpcshell_harness(manifest=manifest, **kwargs)
 
     def run_test(self, test_file, debug=False, interactive=False,
-        keep_going=False, shuffle=False):
+        keep_going=False, sequential=False, shuffle=False):
         """Runs an individual xpcshell test."""
         # TODO Bug 794506 remove once mach integrates with virtualenv.
         build_path = os.path.join(self.topobjdir, 'build')
@@ -54,7 +54,7 @@ class XPCShellRunner(MozbuildObject):
 
         if test_file == 'all':
             self.run_suite(debug=debug, interactive=interactive,
-                keep_going=keep_going, shuffle=shuffle)
+                keep_going=keep_going, shuffle=shuffle, sequential=sequential)
             return
 
         path_arg = self._wrap_path_argument(test_file)
@@ -81,6 +81,7 @@ class XPCShellRunner(MozbuildObject):
             'interactive': interactive,
             'keep_going': keep_going,
             'shuffle': shuffle,
+            'sequential': sequential,
             'test_dirs': xpcshell_dirs,
         }
 
@@ -91,7 +92,7 @@ class XPCShellRunner(MozbuildObject):
 
     def _run_xpcshell_harness(self, test_dirs=None, manifest=None,
         test_path=None, debug=False, shuffle=False, interactive=False,
-        keep_going=False):
+        keep_going=False, sequential=False):
 
         # Obtain a reference to the xpcshell test runner.
         import runxpcshelltests
@@ -110,6 +111,7 @@ class XPCShellRunner(MozbuildObject):
             'interactive': interactive,
             'keepGoing': keep_going,
             'logfiles': False,
+            'sequential': sequential,
             'shuffle': shuffle,
             'testsRootDir': tests_dir,
             'testingModulesDir': modules_dir,
@@ -149,6 +151,9 @@ class XPCShellRunner(MozbuildObject):
 
         self.log_manager.disable_unstructured()
 
+        if not result and not sequential:
+            print("Tests were run in parallel. Try running with --sequential \
+                   to make sure the failures were not caused by this.")
         return int(not result)
 
 
@@ -165,6 +170,8 @@ class MachCommands(MachCommandBase):
         help='Open an xpcshell prompt before running tests.')
     @CommandArgument('--keep-going', '-k', action='store_true',
         help='Continue running tests after a SIGINT is received.')
+    @CommandArgument('--sequential', action='store_true',
+        help='Run the tests sequentially.')
     @CommandArgument('--shuffle', '-s', action='store_true',
         help='Randomize the execution order of tests.')
     def run_xpcshell_test(self, **params):

From 4c6856205baf0acd9c6086f242a236170827b445 Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Tue, 6 Aug 2013 10:28:29 -0700
Subject: [PATCH 55/98] Bug 887054 - Part 3: Synchronize blocks of output when
 running xpcshell tests in parallel. r=ted

---
 testing/xpcshell/runxpcshelltests.py | 54 +++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 13 deletions(-)

diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index e2632aa5e4e..3e724edbbf0 100644
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -14,7 +14,7 @@ from multiprocessing import cpu_count
 from optparse import OptionParser
 from subprocess import Popen, PIPE, STDOUT
 from tempfile import mkdtemp, gettempdir
-from threading import Timer, Thread, Event
+from threading import Timer, Thread, Event, RLock
 import random
 import signal
 import socket
@@ -29,6 +29,12 @@ except ImportError:
 from automation import Automation, getGlobalLog, resetGlobalLog
 from automationutils import *
 
+# Printing buffered output in case of a failure or verbose mode will result
+# in buffered output interleaved with other threads' output.
+# To prevent his, each call to the logger as well as any blocks of output that
+# are intended to be continuous are protected by the same lock.
+LOG_MUTEX = RLock()
+
 HARNESS_TIMEOUT = 5 * 60
 
 # benchmarking on tbpl revealed that this works best for now
@@ -355,10 +361,11 @@ class XPCShellTestThread(Thread):
 
         # we couldn't clean up the directory, and it's not the plugins dir,
         # which means that something wrong has probably happened
-        message = "TEST-UNEXPECTED-FAIL | %s | Failed to clean up directory: %s" % (name, sys.exc_info()[1])
-        self.log.error(message)
-        self.print_stdout(stdout)
-        self.print_stdout(traceback.format_exc())
+        with LOG_MUTEX:
+            message = "TEST-UNEXPECTED-FAIL | %s | Failed to clean up directory: %s" % (name, sys.exc_info()[1])
+            self.log.error(message)
+            self.print_stdout(stdout)
+            self.print_stdout(traceback.format_exc())
 
         self.failCount += 1
         xunit_result["passed"] = False
@@ -476,8 +483,11 @@ class XPCShellTestThread(Thread):
                 failureType = "TEST-UNEXPECTED-%s" % ("FAIL" if expected else "PASS")
                 message = "%s | %s | test failed (with xpcshell return code: %d), see following log:" % (
                               failureType, name, self.getReturnCode(proc))
-                self.log.error(message)
-                self.print_stdout(stdout)
+
+                with LOG_MUTEX:
+                    self.log.error(message)
+                    self.print_stdout(stdout)
+
                 self.failCount += 1
                 self.xunit_result["passed"] = False
 
@@ -490,9 +500,11 @@ class XPCShellTestThread(Thread):
                 now = time.time()
                 timeTaken = (now - startTime) * 1000
                 self.xunit_result["time"] = now - startTime
-                self.log.info("TEST-%s | %s | test passed (time: %.3fms)" % ("PASS" if expected else "KNOWN-FAIL", name, timeTaken))
-                if self.verbose:
-                    self.print_stdout(stdout)
+
+                with LOG_MUTEX:
+                    self.log.info("TEST-%s | %s | test passed (time: %.3fms)" % ("PASS" if expected else "KNOWN-FAIL", name, timeTaken))
+                    if self.verbose:
+                        self.print_stdout(stdout)
 
                 self.xunit_result["passed"] = True
 
@@ -519,9 +531,11 @@ class XPCShellTestThread(Thread):
             # We can sometimes get here before the process has terminated, which would
             # cause removeDir() to fail - so check for the process & kill it it needed.
             if proc and self.poll(proc) is None:
-                message = "TEST-UNEXPECTED-FAIL | %s | Process still running after test!" % name
-                self.log.error(message)
-                self.print_stdout(stdout)
+                with LOG_MUTEX:
+                    message = "TEST-UNEXPECTED-FAIL | %s | Process still running after test!" % name
+                    self.log.error(message)
+                    self.print_stdout(stdout)
+
                 self.failCount = 1
                 self.xunit_result["passed"] = False
                 self.xunit_result["failure"] = {
@@ -569,6 +583,20 @@ class XPCShellTests(object):
         """ Init logging and node status """
         if log:
             resetGlobalLog(log)
+
+        # Each method of the underlying logger must acquire the log
+        # mutex before writing to stdout.
+        log_funs = ['debug', 'info', 'warning', 'error', 'critical', 'log']
+        for fun_name in log_funs:
+            unwrapped = getattr(self.log, fun_name, None)
+            if unwrapped:
+                def wrap(fn):
+                    def wrapped(*args, **kwargs):
+                        with LOG_MUTEX:
+                            fn(*args, **kwargs)
+                    return wrapped
+                setattr(self.log, fun_name, wrap(unwrapped))
+
         self.nodeProc = None
 
     def buildTestList(self):

From 84ab52c12fa79e89697a968becfa8591482fb8ba Mon Sep 17 00:00:00 2001
From: Mihnea Dobrescu-Balaur <mihneadb@gmail.com>
Date: Wed, 14 Aug 2013 11:31:20 -0700
Subject: [PATCH 56/98] Bug 887054 - Part 4: Mark
 dom/network/tests/unit/test_tcpserversocket.js to run sequentially. r=ahal

---
 dom/network/tests/unit/xpcshell.ini     | 1 +
 dom/network/tests/unit_ipc/xpcshell.ini | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dom/network/tests/unit/xpcshell.ini b/dom/network/tests/unit/xpcshell.ini
index 46b16f4741f..2e52cf54e68 100644
--- a/dom/network/tests/unit/xpcshell.ini
+++ b/dom/network/tests/unit/xpcshell.ini
@@ -5,3 +5,4 @@ tail =
 [test_tcpsocket.js]
 [test_multisend.js]
 [test_tcpserversocket.js]
+run-sequentially = Uses hardcoded port, bug 903830.
diff --git a/dom/network/tests/unit_ipc/xpcshell.ini b/dom/network/tests/unit_ipc/xpcshell.ini
index 1cae63d7895..1aeed237033 100644
--- a/dom/network/tests/unit_ipc/xpcshell.ini
+++ b/dom/network/tests/unit_ipc/xpcshell.ini
@@ -4,3 +4,4 @@ tail =
 
 [test_tcpsocket_ipc.js]
 [test_tcpserversocket_ipc.js]
+run-sequentially = Uses hardcoded port, bug 903830.

From b8270688ec6fb48948769074f732e6da27a87be1 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 14 Aug 2013 16:50:21 -0400
Subject: [PATCH 57/98] Backed out changeset bfa3c469cb74 (bug 666399) for
 bustage on a CLOSED TREE.

---
 js/src/frontend/BytecodeCompiler.cpp          |  11 +-
 js/src/frontend/ParseNode.cpp                 |   6 +-
 js/src/frontend/Parser.cpp                    | 439 ++++++------------
 js/src/frontend/Parser.h                      |  36 +-
 js/src/frontend/SharedContext.h               |  28 +-
 js/src/frontend/TokenStream.cpp               |   8 +-
 js/src/frontend/TokenStream.h                 |   7 -
 .../jit-test/tests/generators/es6-syntax.js   |  38 --
 js/src/jit/AsmJS.cpp                          |   2 +-
 js/src/js.msg                                 |   1 -
 js/src/jsanalyze.cpp                          |   2 +-
 js/src/jsatom.cpp                             |   1 +
 js/src/jsatom.h                               |   1 +
 js/src/jsfun.cpp                              |  17 +-
 js/src/jsfun.h                                |  12 -
 js/src/jsiter.cpp                             |   7 -
 js/src/jsreflect.cpp                          |   1 -
 js/src/jsscript.cpp                           |  26 +-
 js/src/jsscript.h                             |  55 +--
 js/src/tests/ecma_6/Generators/shell.js       |   1 -
 js/src/tests/ecma_6/Generators/syntax.js      |  97 ----
 js/src/vm/CommonPropertyNames.h               |   1 -
 js/src/vm/Keywords.h                          |   8 +-
 23 files changed, 206 insertions(+), 599 deletions(-)
 delete mode 100644 js/src/jit-test/tests/generators/es6-syntax.js
 delete mode 100644 js/src/tests/ecma_6/Generators/shell.js
 delete mode 100644 js/src/tests/ecma_6/Generators/syntax.js

diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index 1a0089b47d6..06af275b017 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -69,7 +69,7 @@ CheckArgumentsWithinEval(JSContext *cx, Parser<FullParseHandler> &parser, Handle
     }
 
     // It's an error to use |arguments| in a legacy generator expression.
-    if (script->isGeneratorExp && script->isLegacyGenerator()) {
+    if (script->isGeneratorExp && script->isLegacyGenerator) {
         parser.report(ParseError, false, NULL, JSMSG_BAD_GENEXP_BODY, js_arguments_str);
         return false;
     }
@@ -293,8 +293,7 @@ frontend::CompileScript(ExclusiveContext *cx, LifoAlloc *alloc, HandleObject sco
              */
             JSFunction *fun = evalCaller->functionOrCallerFunction();
             Directives directives(/* strict = */ fun->strict());
-            ObjectBox *funbox = parser.newFunctionBox(/* fn = */ NULL, fun, pc.addr(),
-                                                      directives, fun->generatorKind());
+            ObjectBox *funbox = parser.newFunctionBox(/* fn = */ NULL, fun, pc.addr(), directives);
             if (!funbox)
                 return NULL;
             bce.objectList.add(funbox);
@@ -414,9 +413,7 @@ frontend::CompileLazyFunction(JSContext *cx, LazyScript *lazy, const jschar *cha
     uint32_t staticLevel = lazy->staticLevel(cx);
 
     Rooted<JSFunction*> fun(cx, lazy->function());
-    JS_ASSERT(!lazy->isLegacyGenerator());
-    ParseNode *pn = parser.standaloneLazyFunction(fun, staticLevel, lazy->strict(),
-                                                  lazy->generatorKind());
+    ParseNode *pn = parser.standaloneLazyFunction(fun, staticLevel, lazy->strict());
     if (!pn)
         return false;
 
@@ -520,7 +517,7 @@ frontend::CompileFunctionBody(JSContext *cx, MutableHandleFunction fun, CompileO
     ParseNode *fn;
     while (true) {
         Directives newDirectives = directives;
-        fn = parser.standaloneFunctionBody(fun, formals, NotGenerator, directives, &newDirectives);
+        fn = parser.standaloneFunctionBody(fun, formals, directives, &newDirectives);
         if (fn)
             break;
 
diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index 55a2c172aa7..59a9dc37dd5 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -384,9 +384,9 @@ Parser<FullParseHandler>::cloneParseTree(ParseNode *opn)
         if (pn->getKind() == PNK_MODULE) {
             MOZ_ASSUME_UNREACHABLE("module nodes cannot be cloned");
         }
-        NULLCHECK(pn->pn_funbox = newFunctionBox(pn, opn->pn_funbox->function(), pc,
-                                                 Directives(/* strict = */ opn->pn_funbox->strict),
-                                                 opn->pn_funbox->generatorKind()));
+        NULLCHECK(pn->pn_funbox =
+                  newFunctionBox(pn, opn->pn_funbox->function(), pc,
+                                 Directives(/* strict = */ opn->pn_funbox->strict)));
         NULLCHECK(pn->pn_body = cloneParseTree(opn->pn_body));
         pn->pn_cookie = opn->pn_cookie;
         pn->pn_dflags = opn->pn_dflags;
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 18174cba8d3..ceed2127464 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -56,6 +56,7 @@ namespace frontend {
 typedef Rooted<StaticBlockObject*> RootedStaticBlockObject;
 typedef Handle<StaticBlockObject*> HandleStaticBlockObject;
 
+typedef MutableHandle<PropertyName*> MutableHandlePropertyName;
 
 /*
  * Insist that the next token be of type tt, or report errno and return null.
@@ -454,14 +455,13 @@ Parser<ParseHandler>::newObjectBox(JSObject *obj)
 template <typename ParseHandler>
 FunctionBox::FunctionBox(ExclusiveContext *cx, ObjectBox* traceListHead, JSFunction *fun,
                          ParseContext<ParseHandler> *outerpc, Directives directives,
-                         bool extraWarnings, GeneratorKind generatorKind)
+                         bool extraWarnings)
   : ObjectBox(fun, traceListHead),
     SharedContext(cx, directives, extraWarnings),
     bindings(),
     bufStart(0),
     bufEnd(0),
     ndefaults(0),
-    generatorKindBits_(GeneratorKindAsBits(generatorKind)),
     inWith(false),                  // initialized below
     inGenexpLambda(false),
     hasDestructuringArgs(false),
@@ -522,7 +522,7 @@ FunctionBox::FunctionBox(ExclusiveContext *cx, ObjectBox* traceListHead, JSFunct
 template <typename ParseHandler>
 FunctionBox *
 Parser<ParseHandler>::newFunctionBox(Node fn, JSFunction *fun, ParseContext<ParseHandler> *outerpc,
-                                     Directives inheritedDirectives, GeneratorKind generatorKind)
+                                     Directives inheritedDirectives)
 {
     JS_ASSERT(fun && !IsPoisonedPtr(fun));
 
@@ -535,8 +535,7 @@ Parser<ParseHandler>::newFunctionBox(Node fn, JSFunction *fun, ParseContext<Pars
      */
     FunctionBox *funbox =
         alloc.new_<FunctionBox>(context, traceListHead, fun, outerpc,
-                                inheritedDirectives, options().extraWarningsOption,
-                                generatorKind);
+                                inheritedDirectives, options().extraWarningsOption);
     if (!funbox) {
         js_ReportOutOfMemory(context);
         return NULL;
@@ -853,7 +852,6 @@ Parser<ParseHandler>::checkStrictBinding(PropertyName *name, Node pn)
 template <>
 ParseNode *
 Parser<FullParseHandler>::standaloneFunctionBody(HandleFunction fun, const AutoNameVector &formals,
-                                                 GeneratorKind generatorKind,
                                                  Directives inheritedDirectives,
                                                  Directives *newDirectives)
 {
@@ -868,8 +866,7 @@ Parser<FullParseHandler>::standaloneFunctionBody(HandleFunction fun, const AutoN
     argsbody->makeEmpty();
     fn->pn_body = argsbody;
 
-    FunctionBox *funbox = newFunctionBox(fn, fun, /* outerpc = */ NULL, inheritedDirectives,
-                                         generatorKind);
+    FunctionBox *funbox = newFunctionBox(fn, fun, /* outerpc = */ NULL, inheritedDirectives);
     if (!funbox)
         return null();
     handler.setFunctionBox(fn, funbox);
@@ -1074,14 +1071,8 @@ Parser<ParseHandler>::functionBody(FunctionSyntaxKind kind, FunctionBodyType typ
             return null();
     }
 
-    switch (pc->generatorKind()) {
-      case NotGenerator:
-        JS_ASSERT(pc->lastYieldOffset == startYieldOffset);
-        break;
-
-      case LegacyGenerator:
-        // FIXME: Catch these errors eagerly, in yieldExpression().
-        JS_ASSERT(pc->lastYieldOffset != startYieldOffset);
+    if (pc->lastYieldOffset != startYieldOffset) {
+        JS_ASSERT(pc->isLegacyGenerator());
         if (kind == Arrow) {
             reportWithOffset(ParseError, false, pc->lastYieldOffset,
                              JSMSG_YIELD_IN_ARROW, js_yield_str);
@@ -1093,12 +1084,9 @@ Parser<ParseHandler>::functionBody(FunctionSyntaxKind kind, FunctionBodyType typ
                             JSMSG_BAD_ANON_GENERATOR_RETURN);
             return null();
         }
-        break;
-
-      case StarGenerator:
-        JS_ASSERT(kind != Arrow);
-        JS_ASSERT(type == StatementListBody);
-        break;
+        pc->sc->asFunctionBox()->setIsLegacyGenerator();
+    } else {
+        JS_ASSERT(!pc->isLegacyGenerator());
     }
 
     /* Check for falling off the end of a function that returns a value. */
@@ -1634,11 +1622,6 @@ Parser<ParseHandler>::functionArguments(FunctionSyntaxKind kind, Node *listp, No
               }
 #endif /* JS_HAS_DESTRUCTURING */
 
-              case TOK_YIELD:
-                if (!checkYieldNameValidity(JSMSG_MISSING_FORMAL))
-                    return false;
-                goto TOK_NAME;
-
               case TOK_TRIPLEDOT:
               {
                 hasRest = true;
@@ -1648,16 +1631,15 @@ Parser<ParseHandler>::functionArguments(FunctionSyntaxKind kind, Node *listp, No
                         report(ParseError, false, null(), JSMSG_NO_REST_NAME);
                     return false;
                 }
-                goto TOK_NAME;
+                /* Fall through */
               }
 
-              TOK_NAME:
               case TOK_NAME:
               {
                 if (parenFreeArrow)
                     funbox->setStart(tokenStream);
 
-                RootedPropertyName name(context, tokenStream.currentName());
+                RootedPropertyName name(context, tokenStream.currentToken().name());
                 bool disallowDuplicateArgs = funbox->hasDestructuringArgs || hasDefaults;
                 if (!defineArg(funcpn, name, disallowDuplicateArgs, &duplicatedArg))
                     return false;
@@ -1708,20 +1690,6 @@ Parser<ParseHandler>::functionArguments(FunctionSyntaxKind kind, Node *listp, No
     return true;
 }
 
-template <typename ParseHandler>
-bool
-Parser<ParseHandler>::checkFunctionName(HandlePropertyName funName)
-{
-    if (pc->isStarGenerator() && funName == context->names().yield) {
-        // The name of a named function expression is specified to be bound in
-        // the outer context as if via "let".  In an ES6 generator, "yield" is
-        // not a valid name for a let-bound variable.
-        report(ParseError, false, null(), JSMSG_RESERVED_ID, "yield");
-        return false;
-    }
-    return true;
-}
-
 template <>
 bool
 Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
@@ -1734,9 +1702,6 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
     /* Function statements add a binding to the enclosing scope. */
     bool bodyLevel = pc->atBodyLevel();
 
-    if (!checkFunctionName(funName))
-        return false;
-
     if (kind == Statement) {
         /*
          * Handle redeclaration and optimize cases where we can statically bind the
@@ -1850,9 +1815,7 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
     // so we can skip over them after accounting for their free variables.
     if (LazyScript *lazyOuter = handler.lazyOuterFunction()) {
         JSFunction *fun = handler.nextLazyInnerFunction();
-        JS_ASSERT(!fun->isLegacyGenerator());
-        FunctionBox *funbox = newFunctionBox(pn, fun, pc, Directives(/* strict = */ false),
-                                             fun->generatorKind());
+        FunctionBox *funbox = newFunctionBox(pn, fun, pc, Directives(/* strict = */ false));
         if (!funbox)
             return false;
 
@@ -1928,9 +1891,6 @@ Parser<SyntaxParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
     /* Function statements add a binding to the enclosing scope. */
     bool bodyLevel = pc->atBodyLevel();
 
-    if (!checkFunctionName(funName))
-        return false;
-
     if (kind == Statement) {
         /*
          * Handle redeclaration and optimize cases where we can statically bind the
@@ -1969,8 +1929,7 @@ Parser<SyntaxParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::functionDef(HandlePropertyName funName, const TokenStream::Position &start,
-                                  FunctionType type, FunctionSyntaxKind kind,
-                                  GeneratorKind generatorKind)
+                                  FunctionType type, FunctionSyntaxKind kind)
 {
     JS_ASSERT_IF(kind == Statement, funName);
 
@@ -1998,7 +1957,7 @@ Parser<ParseHandler>::functionDef(HandlePropertyName funName, const TokenStream:
     Directives newDirectives = directives;
 
     while (true) {
-        if (functionArgsAndBody(pn, fun, type, kind, generatorKind, directives, &newDirectives))
+        if (functionArgsAndBody(pn, fun, type, kind, directives, &newDirectives))
             break;
         if (tokenStream.hadError() || directives == newDirectives)
             return null();
@@ -2102,7 +2061,6 @@ Parser<SyntaxParseHandler>::finishFunctionDefinition(Node pn, FunctionBox *funbo
 
     if (pc->sc->strict)
         lazy->setStrict();
-    lazy->setGeneratorKind(funbox->generatorKind());
     if (funbox->usesArguments && funbox->usesApply)
         lazy->setUsesArgumentsAndApply();
     PropagateTransitiveParseFlags(funbox, lazy);
@@ -2115,14 +2073,13 @@ template <>
 bool
 Parser<FullParseHandler>::functionArgsAndBody(ParseNode *pn, HandleFunction fun,
                                               FunctionType type, FunctionSyntaxKind kind,
-                                              GeneratorKind generatorKind,
                                               Directives inheritedDirectives,
                                               Directives *newDirectives)
 {
     ParseContext<FullParseHandler> *outerpc = pc;
 
     // Create box for fun->object early to protect against last-ditch GC.
-    FunctionBox *funbox = newFunctionBox(pn, fun, pc, inheritedDirectives, generatorKind);
+    FunctionBox *funbox = newFunctionBox(pn, fun, pc, inheritedDirectives);
     if (!funbox)
         return false;
 
@@ -2198,14 +2155,13 @@ template <>
 bool
 Parser<SyntaxParseHandler>::functionArgsAndBody(Node pn, HandleFunction fun,
                                                 FunctionType type, FunctionSyntaxKind kind,
-                                                GeneratorKind generatorKind,
                                                 Directives inheritedDirectives,
                                                 Directives *newDirectives)
 {
     ParseContext<SyntaxParseHandler> *outerpc = pc;
 
     // Create box for fun->object early to protect against last-ditch GC.
-    FunctionBox *funbox = newFunctionBox(pn, fun, pc, inheritedDirectives, generatorKind);
+    FunctionBox *funbox = newFunctionBox(pn, fun, pc, inheritedDirectives);
     if (!funbox)
         return false;
 
@@ -2231,15 +2187,14 @@ Parser<SyntaxParseHandler>::functionArgsAndBody(Node pn, HandleFunction fun,
 template <>
 ParseNode *
 Parser<FullParseHandler>::standaloneLazyFunction(HandleFunction fun, unsigned staticLevel,
-                                                 bool strict, GeneratorKind generatorKind)
+                                                 bool strict)
 {
     Node pn = handler.newFunctionDefinition();
     if (!pn)
         return null();
 
     Directives directives(/* strict = */ strict);
-    FunctionBox *funbox = newFunctionBox(pn, fun, /* outerpc = */ NULL, directives,
-                                         generatorKind);
+    FunctionBox *funbox = newFunctionBox(pn, fun, /* outerpc = */ NULL, directives);
     if (!funbox)
         return null();
 
@@ -2313,10 +2268,6 @@ Parser<ParseHandler>::functionArgsAndBodyGeneric(Node pn, HandleFunction fun, Fu
     // Parse the function body.
     FunctionBodyType bodyType = StatementListBody;
     if (tokenStream.getToken(TokenStream::Operand) != TOK_LC) {
-        if (funbox->isStarGenerator()) {
-            report(ParseError, false, null(), JSMSG_CURLY_BEFORE_BODY);
-            return false;
-        }
         tokenStream.ungetToken();
         bodyType = ExpressionBody;
         fun->setIsExprClosure();
@@ -2354,7 +2305,7 @@ template <>
 ParseNode *
 Parser<FullParseHandler>::moduleDecl()
 {
-    JS_ASSERT(tokenStream.currentName() == context->names().module);
+    JS_ASSERT(tokenStream.currentToken().name() == context->names().module);
     if (!((pc->sc->isGlobalSharedContext() || pc->sc->isModuleBox()) && pc->atBodyLevel()))
     {
         report(ParseError, false, NULL, JSMSG_MODULE_STATEMENT);
@@ -2396,44 +2347,18 @@ Parser<SyntaxParseHandler>::moduleDecl()
     return SyntaxParseHandler::NodeFailure;
 }
 
-template <typename ParseHandler>
-bool
-Parser<ParseHandler>::checkYieldNameValidity(unsigned errorNumber)
-{
-    // In star generators and in JS >= 1.7, yield is a keyword.
-    if (pc->isStarGenerator() || versionNumber() >= JSVERSION_1_7) {
-        report(ParseError, false, null(), errorNumber);
-        return false;
-    }
-    // Otherwise in strict mode, yield is a future reserved word.
-    if (pc->sc->strict) {
-        report(ParseError, false, null(), JSMSG_RESERVED_ID, "yield");
-        return false;
-    }
-    return true;
-}
-
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::functionStmt()
 {
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_FUNCTION));
+    JS_ASSERT(tokenStream.currentToken().type == TOK_FUNCTION);
 
     TokenStream::Position start(keepAtoms);
     tokenStream.tell(&start);
 
     RootedPropertyName name(context);
-    GeneratorKind generatorKind = NotGenerator;
-    TokenKind tt = tokenStream.getToken(TokenStream::KeywordIsName);
-
-    if (tt == TOK_MUL) {
-        tokenStream.tell(&start);
-        tt = tokenStream.getToken(TokenStream::KeywordIsName);
-        generatorKind = StarGenerator;
-    }
-
-    if (tt == TOK_NAME) {
-        name = tokenStream.currentName();
+    if (tokenStream.getToken(TokenStream::KeywordIsName) == TOK_NAME) {
+        name = tokenStream.currentToken().name();
     } else {
         /* Unnamed function expressions are forbidden in statement context. */
         report(ParseError, false, null(), JSMSG_UNNAMED_FUNCTION_STMT);
@@ -2445,34 +2370,22 @@ Parser<ParseHandler>::functionStmt()
         !report(ParseStrictError, pc->sc->strict, null(), JSMSG_STRICT_FUNCTION_STATEMENT))
         return null();
 
-    return functionDef(name, start, Normal, Statement, generatorKind);
+    return functionDef(name, start, Normal, Statement);
 }
 
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::functionExpr()
 {
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_FUNCTION));
-
+    RootedPropertyName name(context);
+    JS_ASSERT(tokenStream.currentToken().type == TOK_FUNCTION);
     TokenStream::Position start(keepAtoms);
     tokenStream.tell(&start);
-
-    RootedPropertyName name(context);
-    GeneratorKind generatorKind = NotGenerator;
-    TokenKind tt = tokenStream.getToken(TokenStream::KeywordIsName);
-
-    if (tt == TOK_MUL) {
-        tokenStream.tell(&start);
-        tt = tokenStream.getToken(TokenStream::KeywordIsName);
-        generatorKind = StarGenerator;
-    }
-
-    if (tt == TOK_NAME)
-        name = tokenStream.currentName();
+    if (tokenStream.getToken(TokenStream::KeywordIsName) == TOK_NAME)
+        name = tokenStream.currentToken().name();
     else
         tokenStream.ungetToken();
-
-    return functionDef(name, start, Normal, Expression, generatorKind);
+    return functionDef(name, start, Normal, Expression);
 }
 
 /*
@@ -2606,7 +2519,7 @@ Parser<ParseHandler>::maybeParseDirective(Node list, Node pn, bool *cont)
                 }
             }
         } else if (directive == context->names().useAsm) {
-            if (pc->sc->isFunctionBox() && !pc->isGenerator())
+            if (pc->sc->isFunctionBox())
                 return asmJS(list);
             return report(ParseWarning, false, pn, JSMSG_USE_ASM_DIRECTIVE_FAIL);
         }
@@ -2688,21 +2601,15 @@ Parser<ParseHandler>::condition()
     return pn;
 }
 
-template <typename ParseHandler>
-bool
-Parser<ParseHandler>::matchLabel(MutableHandle<PropertyName*> label)
+static bool
+MatchLabel(TokenStream &ts, MutableHandlePropertyName label)
 {
-    TokenKind tt = tokenStream.peekTokenSameLine(TokenStream::Operand);
+    TokenKind tt = ts.peekTokenSameLine(TokenStream::Operand);
     if (tt == TOK_ERROR)
         return false;
     if (tt == TOK_NAME) {
-        tokenStream.consumeKnownToken(TOK_NAME);
-        label.set(tokenStream.currentName());
-    } else if (tt == TOK_YIELD) {
-        tokenStream.consumeKnownToken(TOK_YIELD);
-        if (!checkYieldNameValidity())
-            return false;
-        label.set(tokenStream.currentName());
+        (void) ts.getToken();
+        label.set(ts.currentToken().name());
     } else {
         label.set(NULL);
     }
@@ -3328,7 +3235,7 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::letBlock(LetContext letContext)
 {
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_LET));
+    JS_ASSERT(tokenStream.currentToken().type == TOK_LET);
 
     RootedStaticBlockObject blockObj(context, StaticBlockObject::create(context));
     if (!blockObj)
@@ -3418,7 +3325,7 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::blockStatement()
 {
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_LC));
+    JS_ASSERT(tokenStream.currentToken().type == TOK_LC);
 
     StmtInfoPC stmtInfo(context);
     if (!PushBlocklikeStatement(&stmtInfo, STMT_BLOCK, pc))
@@ -3460,6 +3367,7 @@ Parser<ParseHandler>::newBindingNode(PropertyName *name, bool functionScope, Var
     }
 
     /* Make a new node for this declarator name (or destructuring pattern). */
+    JS_ASSERT(tokenStream.currentToken().type == TOK_NAME);
     return newName(name);
 }
 
@@ -3548,17 +3456,12 @@ Parser<ParseHandler>::variables(ParseNodeKind kind, bool *psimple,
 #endif /* JS_HAS_DESTRUCTURING */
 
         if (tt != TOK_NAME) {
-            if (tt == TOK_YIELD) {
-                if (!checkYieldNameValidity(JSMSG_NO_VARIABLE_NAME))
-                    return null();
-            } else {
-                if (tt != TOK_ERROR)
-                    report(ParseError, false, null(), JSMSG_NO_VARIABLE_NAME);
-                return null();
-            }
+            if (tt != TOK_ERROR)
+                report(ParseError, false, null(), JSMSG_NO_VARIABLE_NAME);
+            return null();
         }
 
-        RootedPropertyName name(context, tokenStream.currentName());
+        RootedPropertyName name(context, tokenStream.currentToken().name());
         pn2 = newBindingNode(name, kind == PNK_VAR || kind == PNK_CONST, varContext);
         if (!pn2)
             return null();
@@ -4215,14 +4118,9 @@ Parser<SyntaxParseHandler>::forStatement()
     PushStatementPC(pc, &forStmt, STMT_FOR_LOOP);
 
     /* Don't parse 'for each' loops. */
-    if (allowsForEachIn()) {
-        TokenKind tt = tokenStream.peekToken();
-        // Not all "yield" tokens are names, but the ones that aren't names are
-        // invalid in this context anyway.
-        if (tt == TOK_NAME || tt == TOK_YIELD) {
-            JS_ALWAYS_FALSE(abortIfSyntaxParser());
-            return null();
-        }
+    if (allowsForEachIn() && tokenStream.peekToken() == TOK_NAME) {
+        JS_ALWAYS_FALSE(abortIfSyntaxParser());
+        return null();
     }
 
     MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_AFTER_FOR);
@@ -4424,7 +4322,7 @@ Parser<ParseHandler>::continueStatement()
     uint32_t begin = pos().begin;
 
     RootedPropertyName label(context);
-    if (!matchLabel(&label))
+    if (!MatchLabel(tokenStream, &label))
         return null();
 
     StmtInfoPC *stmt = pc->topStmt;
@@ -4471,7 +4369,7 @@ Parser<ParseHandler>::breakStatement()
     uint32_t begin = pos().begin;
 
     RootedPropertyName label(context);
-    if (!matchLabel(&label))
+    if (!MatchLabel(tokenStream, &label))
         return null();
     StmtInfoPC *stmt = pc->topStmt;
     if (label) {
@@ -4502,45 +4400,98 @@ Parser<ParseHandler>::breakStatement()
 
 template <typename ParseHandler>
 typename ParseHandler::Node
-Parser<ParseHandler>::returnStatement()
+Parser<ParseHandler>::returnStatementOrYieldExpression()
 {
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_RETURN));
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_RETURN) ||
+              tokenStream.isCurrentTokenType(TOK_YIELD));
+    bool isYield = tokenStream.isCurrentTokenType(TOK_YIELD);
     uint32_t begin = pos().begin;
 
     if (!pc->sc->isFunctionBox()) {
-        report(ParseError, false, null(), JSMSG_BAD_RETURN_OR_YIELD, js_return_str);
+        report(ParseError, false, null(), JSMSG_BAD_RETURN_OR_YIELD,
+               isYield ? js_yield_str : js_return_str);
         return null();
     }
 
+    // Legacy generators are identified by the presence of "yield" in their
+    // bodies.  We only see "yield" as TOK_YIELD in JS 1.7+.
+    if (isYield) {
+        JS_ASSERT(tokenStream.versionNumber() >= JSVERSION_1_7);
+        if (!abortIfSyntaxParser())
+            return null();
+
+        if (pc->isLegacyGenerator()) {
+            // We are in a legacy generator: a function that has already seen a
+            // yield.
+            JS_ASSERT(pc->sc->isFunctionBox());
+            JS_ASSERT(pc->lastYieldOffset != ParseContext<ParseHandler>::NoYieldOffset);
+        } else {
+            // We are in a code that has not seen a yield, and in JS 1.8 so
+            // "yield" parsed as TOK_YIELD.  Try to transition to being a legacy
+            // generator.
+            JS_ASSERT(tokenStream.currentToken().type == TOK_YIELD);
+            JS_ASSERT(pc->lastYieldOffset == ParseContext<ParseHandler>::NoYieldOffset);
+
+            if (!pc->sc->isFunctionBox()) {
+                report(ParseError, false, null(), JSMSG_BAD_RETURN_OR_YIELD, js_yield_str);
+                return null();
+            }
+
+            pc->generatorParseMode = ParseContext<ParseHandler>::LegacyGenerator;
+        }
+
+        pc->lastYieldOffset = begin;
+    }
+
     // Parse an optional operand.
     //
-    // This is ugly, but we don't want to require a semicolon.
+    // Checking whether yield has an operand is especially wonky since
+    // there is not a mandatory semicolon.
+    //
+    // ES6 does not permit yield without an operand. We will have to sunset
+    // this extension in order to conform to the ES6 syntax, which treats
+    // "yield \n expr;" as a single ExpressionStatement.
     Node exprNode;
-    switch (tokenStream.peekTokenSameLine(TokenStream::Operand)) {
-      case TOK_ERROR:
+    TokenKind next = tokenStream.peekTokenSameLine(TokenStream::Operand);
+    if (next == TOK_ERROR)
         return null();
-      case TOK_EOF:
-      case TOK_EOL:
-      case TOK_SEMI:
-      case TOK_RC:
+    if (next == TOK_EOF || next == TOK_EOL || next == TOK_SEMI || next == TOK_RC ||
+        (isYield && (next == TOK_RB || next == TOK_RP || next == TOK_COLON || next == TOK_COMMA)))
+    {
+        if (isYield) {
+            if (!reportWithOffset(ParseWarning, false, pos().begin, JSMSG_YIELD_WITHOUT_OPERAND))
+                return null();
+        }
+
         exprNode = null();
-        pc->funHasReturnVoid = true;
-        break;
-      default: {
-        exprNode = expr();
+        if (!isYield)
+            pc->funHasReturnVoid = true;
+    } else {
+        exprNode = isYield ? assignExpr() : expr();
         if (!exprNode)
             return null();
-        pc->funHasReturnExpr = true;
-      }
+        if (!isYield)
+            pc->funHasReturnExpr = true;
     }
 
-    if (!MatchOrInsertSemicolon(tokenStream))
-        return null();
+    if (!isYield) {
+        if (!MatchOrInsertSemicolon(tokenStream))
+            return null();
+    }
 
-    Node pn = handler.newReturnStatement(exprNode, TokenPos(begin, pos().end));
+    Node pn = isYield
+              ? handler.newUnary(PNK_YIELD, JSOP_YIELD, begin, exprNode)
+              : handler.newReturnStatement(exprNode, TokenPos(begin, pos().end));
     if (!pn)
         return null();
 
+    if (pc->funHasReturnExpr && pc->isLegacyGenerator()) {
+        /* As in Python (see PEP-255), disallow return v; in generators. */
+        reportBadReturn(pn, ParseError, JSMSG_BAD_GENERATOR_RETURN,
+                        JSMSG_BAD_ANON_GENERATOR_RETURN);
+        return null();
+    }
+
     if (options().extraWarningsOption && pc->funHasReturnExpr && pc->funHasReturnVoid &&
         !reportBadReturn(pn, ParseExtraWarning,
                          JSMSG_NO_RETURN_VALUE, JSMSG_ANON_NO_RETURN_VALUE))
@@ -4548,108 +4499,9 @@ Parser<ParseHandler>::returnStatement()
         return null();
     }
 
-    if (pc->isLegacyGenerator() && exprNode) {
-        /* Disallow "return v;" in legacy generators. */
-        reportBadReturn(pn, ParseError, JSMSG_BAD_GENERATOR_RETURN,
-                        JSMSG_BAD_ANON_GENERATOR_RETURN);
-        return null();
-    }
-
     return pn;
 }
 
-template <typename ParseHandler>
-typename ParseHandler::Node
-Parser<ParseHandler>::yieldExpression()
-{
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_YIELD));
-    uint32_t begin = pos().begin;
-
-    switch (pc->generatorKind()) {
-      case StarGenerator:
-      {
-        JS_ASSERT(pc->sc->isFunctionBox());
-
-        pc->lastYieldOffset = begin;
-
-        bool isDelegatingYield = tokenStream.matchToken(TOK_MUL);
-
-        // ES6 generators require a value.
-        Node exprNode = assignExpr();
-        if (!exprNode)
-            return null();
-
-        // FIXME: Plumb isDelegatingYield appropriately.
-        (void) isDelegatingYield;
-        return handler.newUnary(PNK_YIELD, JSOP_YIELD, begin, exprNode);
-      }
-
-      case NotGenerator:
-        // We are in code that has not seen a yield, but we are in JS 1.7 or
-        // later.  Try to transition to being a legacy generator.
-        JS_ASSERT(tokenStream.versionNumber() >= JSVERSION_1_7);
-        JS_ASSERT(pc->lastYieldOffset == ParseContext<ParseHandler>::NoYieldOffset);
-
-        if (!abortIfSyntaxParser())
-            return null();
-
-        if (!pc->sc->isFunctionBox()) {
-            report(ParseError, false, null(), JSMSG_BAD_RETURN_OR_YIELD, js_yield_str);
-            return null();
-        }
-
-        pc->sc->asFunctionBox()->setGeneratorKind(LegacyGenerator);
-
-        if (pc->funHasReturnExpr) {
-            /* As in Python (see PEP-255), disallow return v; in generators. */
-            reportBadReturn(null(), ParseError, JSMSG_BAD_GENERATOR_RETURN,
-                            JSMSG_BAD_ANON_GENERATOR_RETURN);
-            return null();
-        }
-        // Fall through.
-
-      case LegacyGenerator:
-      {
-        // We are in a legacy generator: a function that has already seen a
-        // yield, or in a legacy generator comprehension.
-        JS_ASSERT(pc->sc->isFunctionBox());
-
-        pc->lastYieldOffset = begin;
-
-        // Legacy generators do not require a value.
-        Node exprNode;
-        switch (tokenStream.peekTokenSameLine(TokenStream::Operand)) {
-          case TOK_ERROR:
-            return null();
-          case TOK_EOF:
-          case TOK_EOL:
-          case TOK_SEMI:
-          case TOK_RC:
-          case TOK_RB:
-          case TOK_RP:
-          case TOK_COLON:
-          case TOK_COMMA:
-            // No value.
-            exprNode = null();
-            // ES6 does not permit yield without an operand.  We should
-            // encourage users of yield expressions of this kind to pass an
-            // operand, to bring users closer to standard syntax.
-            if (!reportWithOffset(ParseWarning, false, pos().begin, JSMSG_YIELD_WITHOUT_OPERAND))
-                return null();
-            break;
-          default:
-            exprNode = assignExpr();
-            if (!exprNode)
-                return null();
-        }
-
-        return handler.newUnary(PNK_YIELD, JSOP_YIELD, begin, exprNode);
-      }
-    }
-
-    MOZ_ASSUME_UNREACHABLE("yieldExpr");
-}
-
 template <>
 ParseNode *
 Parser<FullParseHandler>::withStatement()
@@ -4719,7 +4571,7 @@ typename ParseHandler::Node
 Parser<ParseHandler>::labeledStatement()
 {
     uint32_t begin = pos().begin;
-    RootedPropertyName label(context, tokenStream.currentName());
+    RootedPropertyName label(context, tokenStream.currentToken().name());
     for (StmtInfoPC *stmt = pc->topStmt; stmt; stmt = stmt->down) {
         if (stmt->type == STMT_LABEL && stmt->label == label) {
             report(ParseError, false, null(), JSMSG_DUPLICATE_LABEL);
@@ -4860,13 +4712,9 @@ Parser<ParseHandler>::tryStatement()
                 break;
 #endif
 
-              case TOK_YIELD:
-                if (!checkYieldNameValidity(JSMSG_CATCH_IDENTIFIER))
-                    return null();
-                // Fall through.
               case TOK_NAME:
               {
-                RootedPropertyName label(context, tokenStream.currentName());
+                RootedPropertyName label(context, tokenStream.currentToken().name());
                 catchName = newBindingNode(label, false);
                 if (!catchName)
                     return null();
@@ -5002,7 +4850,7 @@ Parser<ParseHandler>::statement(bool canHaveDirectives)
       case TOK_BREAK:
         return breakStatement();
       case TOK_RETURN:
-        return returnStatement();
+        return returnStatementOrYieldExpression();
       case TOK_WITH:
         return withStatement();
       case TOK_THROW:
@@ -5033,18 +4881,10 @@ Parser<ParseHandler>::statement(bool canHaveDirectives)
         }
         return expressionStatement();
 
-      case TOK_YIELD:
-        if (tokenStream.peekToken() == TOK_COLON) {
-            if (!checkYieldNameValidity())
-                return null();
-            return labeledStatement();
-        }
-        return expressionStatement();
-
       case TOK_NAME:
         if (tokenStream.peekToken() == TOK_COLON)
             return labeledStatement();
-        if (tokenStream.currentName() == context->names().module
+        if (tokenStream.currentToken().name() == context->names().module
             && tokenStream.peekTokenSameLine() == TOK_STRING)
         {
             return moduleDecl();
@@ -5357,8 +5197,8 @@ Parser<ParseHandler>::assignExpr()
     if (tt == TOK_STRING && tokenStream.nextTokenEndsExpr())
         return stringLiteral();
 
-    if (tt == TOK_YIELD && (versionNumber() >= JSVERSION_1_7 || pc->isGenerator()))
-        return yieldExpression();
+    if (tt == TOK_YIELD)
+        return returnStatementOrYieldExpression();
 
     tokenStream.ungetToken();
 
@@ -5396,7 +5236,7 @@ Parser<ParseHandler>::assignExpr()
             return null();
         tokenStream.ungetToken();
 
-        return functionDef(NullPtr(), start, Normal, Arrow, NotGenerator);
+        return functionDef(NullPtr(), start, Normal, Arrow);
       }
 
       default:
@@ -5817,7 +5657,7 @@ Parser<FullParseHandler>::comprehensionTail(ParseNode *kid, unsigned blockid, bo
     BindData<FullParseHandler> data(context);
     TokenKind tt;
 
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_FOR));
+    JS_ASSERT(tokenStream.currentToken().type == TOK_FOR);
 
     if (kind == PNK_SEMI) {
         /*
@@ -5902,7 +5742,7 @@ Parser<FullParseHandler>::comprehensionTail(ParseNode *kid, unsigned blockid, bo
 #endif
 
           case TOK_NAME:
-            name = tokenStream.currentName();
+            name = tokenStream.currentToken().name();
 
             /*
              * Create a name node with pn_op JSOP_NAME.  We can't set pn_op to
@@ -6110,8 +5950,7 @@ Parser<FullParseHandler>::generatorExpr(ParseNode *kid)
 
         /* Create box for fun->object early to protect against last-ditch GC. */
         Directives directives(/* strict = */ outerpc->sc->strict);
-        FunctionBox *genFunbox = newFunctionBox(genfn, fun, outerpc, directives,
-                                                LegacyGenerator);
+        FunctionBox *genFunbox = newFunctionBox(genfn, fun, outerpc, directives);
         if (!genFunbox)
             return null();
 
@@ -6131,7 +5970,7 @@ Parser<FullParseHandler>::generatorExpr(ParseNode *kid)
         if (outerpc->sc->isFunctionBox())
             genFunbox->funCxFlags = outerpc->sc->asFunctionBox()->funCxFlags;
 
-        JS_ASSERT(genFunbox->isLegacyGenerator());
+        genFunbox->setIsLegacyGenerator();
         genFunbox->inGenexpLambda = true;
         genfn->pn_blockid = genpc.bodyid;
 
@@ -6272,7 +6111,7 @@ Parser<ParseHandler>::memberExpr(TokenKind tt, bool allowCallSyntax)
             if (tt == TOK_ERROR)
                 return null();
             if (tt == TOK_NAME) {
-                PropertyName *field = tokenStream.currentName();
+                PropertyName *field = tokenStream.currentToken().name();
                 nextMember = handler.newPropertyAccess(lhs, field, pos().end);
                 if (!nextMember)
                     return null();
@@ -6347,7 +6186,9 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::identifierName()
 {
-    RootedPropertyName name(context, tokenStream.currentName());
+    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_NAME));
+
+    RootedPropertyName name(context, tokenStream.currentToken().name());
     Node pn = newName(name);
     if (!pn)
         return null();
@@ -6561,7 +6402,7 @@ Parser<ParseHandler>::primaryExpr(TokenKind tt)
                 break;
               case TOK_NAME:
                 {
-                    atom = tokenStream.currentName();
+                    atom = tokenStream.currentToken().name();
                     if (atom == context->names().get) {
                         op = JSOP_INITPROP_GETTER;
                     } else if (atom == context->names().set) {
@@ -6575,7 +6416,7 @@ Parser<ParseHandler>::primaryExpr(TokenKind tt)
 
                     tt = tokenStream.getToken(TokenStream::KeywordIsName);
                     if (tt == TOK_NAME) {
-                        atom = tokenStream.currentName();
+                        atom = tokenStream.currentToken().name();
                         pn3 = newName(atom->asPropertyName());
                         if (!pn3)
                             return null();
@@ -6622,7 +6463,7 @@ Parser<ParseHandler>::primaryExpr(TokenKind tt)
                     TokenStream::Position start(keepAtoms);
                     tokenStream.tell(&start);
                     pn2 = functionDef(funName, start, op == JSOP_INITPROP_GETTER ? Getter : Setter,
-                                      Expression, NotGenerator);
+                                      Expression);
                     if (!pn2)
                         return null();
                     pn2 = handler.newBinary(PNK_COLON, pn3, pn2, op);
@@ -6778,10 +6619,6 @@ Parser<ParseHandler>::primaryExpr(TokenKind tt)
       case TOK_STRING:
         return stringLiteral();
 
-      case TOK_YIELD:
-        if (!checkYieldNameValidity())
-            return null();
-        // Fall through.
       case TOK_NAME:
         return identifierName();
 
@@ -6843,7 +6680,7 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::parenExpr(bool *genexp)
 {
-    JS_ASSERT(tokenStream.isCurrentTokenType(TOK_LP));
+    JS_ASSERT(tokenStream.currentToken().type == TOK_LP);
     uint32_t begin = pos().begin;
 
     if (genexp)
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 711884a77d5..2db7782d99e 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -104,20 +104,18 @@ struct ParseContext : public GenericParseContext
 
     const unsigned  staticLevel;    /* static compilation unit nesting level */
 
+    // Functions start off being parsed as NotGenerator.
+    // NotGenerator transitions to LegacyGenerator on parsing "yield" in JS 1.7.
+    enum GeneratorParseMode { NotGenerator, LegacyGenerator };
+    GeneratorParseMode generatorParseMode;
+
     // lastYieldOffset stores the offset of the last yield that was parsed.
     // NoYieldOffset is its initial value.
     static const uint32_t NoYieldOffset = UINT32_MAX;
     uint32_t         lastYieldOffset;
 
-    // Most functions start off being parsed as non-generators.
-    // Non-generators transition to LegacyGenerator on parsing "yield" in JS 1.7.
-    // An ES6 generator is marked as a "star generator" before its body is parsed.
-    GeneratorKind generatorKind() const {
-        return sc->isFunctionBox() ? sc->asFunctionBox()->generatorKind() : NotGenerator;
-    }
-    bool isGenerator() const { return generatorKind() != NotGenerator; }
-    bool isLegacyGenerator() const { return generatorKind() == LegacyGenerator; }
-    bool isStarGenerator() const { return generatorKind() == StarGenerator; }
+    bool isGenerator() const { return generatorParseMode != NotGenerator; }
+    bool isLegacyGenerator() const { return generatorParseMode == LegacyGenerator; }
 
     Node            blockNode;      /* parse node for a block with let declarations
                                        (block with its own lexical scope)  */
@@ -251,6 +249,7 @@ struct ParseContext : public GenericParseContext
         blockChain(prs->context),
         maybeFunction(maybeFunction),
         staticLevel(staticLevel),
+        generatorParseMode(NotGenerator),
         lastYieldOffset(NoYieldOffset),
         blockNode(ParseHandler::null()),
         decls_(prs->context, prs->alloc),
@@ -400,7 +399,7 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     ObjectBox *newObjectBox(JSObject *obj);
     ModuleBox *newModuleBox(Module *module, ParseContext<ParseHandler> *pc);
     FunctionBox *newFunctionBox(Node fn, JSFunction *fun, ParseContext<ParseHandler> *pc,
-                                Directives directives, GeneratorKind generatorKind);
+                                Directives directives);
 
     /*
      * Create a new function object given parse context (pc) and a name (which
@@ -433,16 +432,13 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     Node statement(bool canHaveDirectives = false);
     bool maybeParseDirective(Node list, Node pn, bool *cont);
 
-    // Parse a function, given only its body. Used for the Function and
-    // Generator constructors.
+    // Parse a function, given only its body. Used for the Function constructor.
     Node standaloneFunctionBody(HandleFunction fun, const AutoNameVector &formals,
-                                GeneratorKind generatorKind,
                                 Directives inheritedDirectives, Directives *newDirectives);
 
     // Parse a function, given only its arguments and body. Used for lazily
     // parsed functions.
-    Node standaloneLazyFunction(HandleFunction fun, unsigned staticLevel, bool strict,
-                                GeneratorKind generatorKind);
+    Node standaloneLazyFunction(HandleFunction fun, unsigned staticLevel, bool strict);
 
     /*
      * Parse a function body.  Pass StatementListBody if the body is a list of
@@ -490,7 +486,7 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     Node switchStatement();
     Node continueStatement();
     Node breakStatement();
-    Node returnStatement();
+    Node returnStatementOrYieldExpression();
     Node withStatement();
     Node labeledStatement();
     Node throwStatement();
@@ -507,7 +503,6 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     Node expr();
     Node assignExpr();
     Node assignExprWithoutYield(unsigned err);
-    Node yieldExpression();
     Node condExpr1();
     Node orExpr1();
     Node unaryExpr();
@@ -521,10 +516,9 @@ class Parser : private AutoGCRooter, public StrictModeGetter
     bool functionArguments(FunctionSyntaxKind kind, Node *list, Node funcpn, bool &hasRest);
 
     Node functionDef(HandlePropertyName name, const TokenStream::Position &start,
-                     FunctionType type, FunctionSyntaxKind kind, GeneratorKind generatorKind);
+                     FunctionType type, FunctionSyntaxKind kind);
     bool functionArgsAndBody(Node pn, HandleFunction fun,
                              FunctionType type, FunctionSyntaxKind kind,
-                             GeneratorKind generatorKind,
                              Directives inheritedDirectives, Directives *newDirectives);
 
     Node unaryOpExpr(ParseNodeKind kind, JSOp op, uint32_t begin);
@@ -541,9 +535,6 @@ class Parser : private AutoGCRooter, public StrictModeGetter
 
     Node identifierName();
 
-    bool matchLabel(MutableHandle<PropertyName*> label);
-    bool checkYieldNameValidity(unsigned errorNumber = JSMSG_SYNTAX_ERROR);
-
     bool allowsForEachIn() {
 #if !JS_HAS_FOR_EACH_IN
         return false;
@@ -564,7 +555,6 @@ class Parser : private AutoGCRooter, public StrictModeGetter
 
     bool checkFunctionArguments();
     bool makeDefIntoUse(Definition *dn, Node pn, JSAtom *atom);
-    bool checkFunctionName(HandlePropertyName funName);
     bool checkFunctionDefinition(HandlePropertyName funName, Node *pn, FunctionSyntaxKind kind,
                                  bool *pbodyProcessed);
     bool finishFunctionDefinition(Node pn, FunctionBox *funbox, Node prelude, Node body);
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 9e36f162933..4c01bd97bef 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -72,6 +72,10 @@ class FunctionContextFlags
     // This class's data is all private and so only visible to these friends.
     friend class FunctionBox;
 
+    // We parsed a yield statement in the function, which can happen in JS1.7+
+    // mode.
+    bool isLegacyGenerator:1;
+
     // The function or a function that encloses it may define new local names
     // at runtime through means other than calling eval.
     bool mightAliasLocals:1;
@@ -125,7 +129,8 @@ class FunctionContextFlags
 
   public:
     FunctionContextFlags()
-     :  mightAliasLocals(false),
+     :  isLegacyGenerator(false),
+        mightAliasLocals(false),
         hasExtensibleScope(false),
         needsDeclEnvObject(false),
         argumentsHasLocalBinding(false),
@@ -259,8 +264,6 @@ class FunctionBox : public ObjectBox, public SharedContext
     uint32_t        startLine;
     uint32_t        startColumn;
     uint16_t        ndefaults;
-
-    uint8_t         generatorKindBits_;     /* The GeneratorKind of this function. */
     bool            inWith:1;               /* some enclosing scope is a with-statement */
     bool            inGenexpLambda:1;       /* lambda from generator expression */
     bool            hasDestructuringArgs:1; /* arguments list contains destructuring expression */
@@ -276,30 +279,21 @@ class FunctionBox : public ObjectBox, public SharedContext
     template <typename ParseHandler>
     FunctionBox(ExclusiveContext *cx, ObjectBox* traceListHead, JSFunction *fun,
                 ParseContext<ParseHandler> *pc, Directives directives,
-                bool extraWarnings, GeneratorKind generatorKind);
+                bool extraWarnings);
 
     ObjectBox *toObjectBox() { return this; }
     JSFunction *function() const { return &object->as<JSFunction>(); }
 
-    GeneratorKind generatorKind() const { return GeneratorKindFromBits(generatorKindBits_); }
-    bool isGenerator() const { return generatorKind() != NotGenerator; }
-    bool isLegacyGenerator() const { return generatorKind() == LegacyGenerator; }
-    bool isStarGenerator() const { return generatorKind() == StarGenerator; }
-
-    void setGeneratorKind(GeneratorKind kind) {
-        // A generator kind can be set at initialization, or when "yield" is
-        // first seen.  In both cases the transition can only happen from
-        // NotGenerator.
-        JS_ASSERT(!isGenerator());
-        generatorKindBits_ = GeneratorKindAsBits(kind);
-    }
-
+    // In the future, isGenerator will also return true for ES6 generators.
+    bool isGenerator()              const { return isLegacyGenerator(); }
+    bool isLegacyGenerator()        const { return funCxFlags.isLegacyGenerator; }
     bool mightAliasLocals()         const { return funCxFlags.mightAliasLocals; }
     bool hasExtensibleScope()       const { return funCxFlags.hasExtensibleScope; }
     bool needsDeclEnvObject()       const { return funCxFlags.needsDeclEnvObject; }
     bool argumentsHasLocalBinding() const { return funCxFlags.argumentsHasLocalBinding; }
     bool definitelyNeedsArgsObj()   const { return funCxFlags.definitelyNeedsArgsObj; }
 
+    void setIsLegacyGenerator()            { funCxFlags.isLegacyGenerator        = true; }
     void setMightAliasLocals()             { funCxFlags.mightAliasLocals         = true; }
     void setHasExtensibleScope()           { funCxFlags.hasExtensibleScope       = true; }
     void setNeedsDeclEnvObject()           { funCxFlags.needsDeclEnvObject       = true; }
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
index 8269b92a188..b725527231c 100644
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -932,10 +932,10 @@ TokenStream::checkForKeyword(const jschar *s, size_t length, TokenKind *ttp)
             return reportError(JSMSG_RESERVED_ID, kw->chars);
         }
 
-        // The keyword is not in this version. Treat it as an identifier, unless
-        // it is let which we treat as TOK_STRICT_RESERVED by falling through to
-        // the code below (ES5 forbids it in strict mode).
-        if (kw->tokentype != TOK_LET)
+        // The keyword is not in this version. Treat it as an identifier,
+        // unless it is let or yield which we treat as TOK_STRICT_RESERVED by
+        // falling through to the code below (ES5 forbids them in strict mode).
+        if (kw->tokentype != TOK_LET && kw->tokentype != TOK_YIELD)
             return true;
     }
 
diff --git a/js/src/frontend/TokenStream.h b/js/src/frontend/TokenStream.h
index 51968f729eb..cb46a52391f 100644
--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.h
@@ -407,13 +407,6 @@ class MOZ_STACK_CLASS TokenStream
     JSVersion versionNumber() const { return VersionNumber(options().version); }
     JSVersion versionWithFlags() const { return options().version; }
 
-    PropertyName *currentName() const {
-        if (isCurrentTokenType(TOK_YIELD))
-            return cx->names().yield;
-        JS_ASSERT(isCurrentTokenType(TOK_NAME));
-        return currentToken().name();
-    }
-
     bool isCurrentTokenAssignment() const {
         return TokenKindIsAssignment(currentToken().type);
     }
diff --git a/js/src/jit-test/tests/generators/es6-syntax.js b/js/src/jit-test/tests/generators/es6-syntax.js
deleted file mode 100644
index 79b9109cead..00000000000
--- a/js/src/jit-test/tests/generators/es6-syntax.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Test interactions between ES6 generators and not-yet-standard
-// features.
-
-function assertSyntaxError(str) {
-    var msg;
-    var evil = eval;
-    try {
-        // Non-direct eval.
-        evil(str);
-    } catch (exc) {
-        if (exc instanceof SyntaxError)
-            return;
-        msg = "Assertion failed: expected SyntaxError, got " + exc;
-    }
-    if (msg === undefined)
-        msg = "Assertion failed: expected SyntaxError, but no exception thrown";
-    throw new Error(msg + " - " + str);
-}
-
-// Destructuring binding.
-assertSyntaxError("function* f(x = yield) {}");
-assertSyntaxError("function* f(x = yield 17) {}");
-assertSyntaxError("function* f([yield]) {}");
-assertSyntaxError("function* f({ yield }) {}");
-assertSyntaxError("function* f(...yield) {}");
-
-// For each.
-assertSyntaxError("for yield");
-assertSyntaxError("for yield (;;) {}");
-assertSyntaxError("for yield (x of y) {}");
-assertSyntaxError("for yield (var i in o) {}");
-
-// Expression bodies.
-assertSyntaxError("function* f() yield 7");
-
-// Asm.js.
-load(libdir + "asm.js");
-assertAsmDirectiveFail("function* f() { 'use asm'; function g() { return 0; } return g; })()")
diff --git a/js/src/jit/AsmJS.cpp b/js/src/jit/AsmJS.cpp
index 54a4002ea23..4ce4628dee6 100644
--- a/js/src/jit/AsmJS.cpp
+++ b/js/src/jit/AsmJS.cpp
@@ -4625,7 +4625,7 @@ ParseFunction(ModuleCompiler &m, ParseNode **fnOut)
     AsmJSParseContext *outerpc = m.parser().pc;
 
     Directives directives(outerpc);
-    FunctionBox *funbox = m.parser().newFunctionBox(fn, fun, outerpc, directives, NotGenerator);
+    FunctionBox *funbox = m.parser().newFunctionBox(fn, fun, outerpc, directives);
     if (!funbox)
         return false;
 
diff --git a/js/src/js.msg b/js/src/js.msg
index cf71af5f763..3f665d8d548 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -409,4 +409,3 @@ MSG_DEF(JSMSG_BINARYDATA_NOT_BINARYSTRUCT,   355, 1, JSEXN_TYPEERR, "{0} is not
 MSG_DEF(JSMSG_BINARYDATA_SUBARRAY_INTEGER_ARG, 356, 1, JSEXN_ERR, "argument {0} must be an integer")
 MSG_DEF(JSMSG_BINARYDATA_STRUCTTYPE_EMPTY_DESCRIPTOR, 357, 0, JSEXN_ERR, "field descriptor cannot be empty")
 MSG_DEF(JSMSG_BINARYDATA_STRUCTTYPE_BAD_FIELD, 358, 1, JSEXN_ERR, "field {0} is not a valid BinaryData Type descriptor")
-MSG_DEF(JSMSG_ES6_UNIMPLEMENTED,      359, 0, JSEXN_ERR, "ES6 functionality not yet implemented")
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index ea1b452a21c..b83a050a5d8 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -1829,7 +1829,7 @@ ScriptAnalysis::needsArgsObj(JSContext *cx)
      *
      * FIXME: Don't build arguments for ES6 generator expressions.
      */
-    if (cx->compartment()->debugMode() || script_->isGenerator())
+    if (cx->compartment()->debugMode() || script_->isGenerator)
         return true;
 
     /*
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index ef358b603a3..d5b90b86e9b 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -104,6 +104,7 @@ const char js_typeof_str[]          = "typeof";
 const char js_void_str[]            = "void";
 const char js_while_str[]           = "while";
 const char js_with_str[]            = "with";
+const char js_yield_str[]           = "yield";
 
 /*
  * For a browser build from 2007-08-09 after the browser starts up there are
diff --git a/js/src/jsatom.h b/js/src/jsatom.h
index 9cd9272f0a3..1769065c100 100644
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@@ -153,6 +153,7 @@ extern const char js_typeof_str[];
 extern const char js_void_str[];
 extern const char js_while_str[];
 extern const char js_with_str[];
+extern const char js_yield_str[];
 
 namespace js {
 
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 4b0ff495095..bce514701de 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -526,7 +526,6 @@ FindBody(JSContext *cx, HandleFunction fun, StableCharPtr chars, size_t length,
     do {
         switch (ts.getToken()) {
           case TOK_NAME:
-          case TOK_YIELD:
             if (nest == 0)
                 onward = false;
             break;
@@ -1229,7 +1228,14 @@ fun_isGenerator(JSContext *cx, unsigned argc, Value *vp)
         return true;
     }
 
-    JS_SET_RVAL(cx, vp, BooleanValue(fun->isGenerator()));
+    bool result = false;
+    if (fun->hasScript()) {
+        JSScript *script = fun->nonLazyScript();
+        JS_ASSERT(script->length != 0);
+        result = script->isGenerator;
+    }
+
+    JS_SET_RVAL(cx, vp, BooleanValue(result));
     return true;
 }
 
@@ -1450,15 +1456,10 @@ js::Function(JSContext *cx, unsigned argc, Value *vp)
                     return false;
                 }
 
-                if (tt == TOK_YIELD && ts.versionNumber() < JSVERSION_1_7)
-                    tt = TOK_NAME;
-
                 if (tt != TOK_NAME) {
                     if (tt == TOK_TRIPLEDOT) {
                         hasRest = true;
                         tt = ts.getToken();
-                        if (tt == TOK_YIELD && ts.versionNumber() < JSVERSION_1_7)
-                            tt = TOK_NAME;
                         if (tt != TOK_NAME) {
                             if (tt != TOK_ERROR)
                                 ts.reportError(JSMSG_NO_REST_NAME);
@@ -1469,7 +1470,7 @@ js::Function(JSContext *cx, unsigned argc, Value *vp)
                     }
                 }
 
-                if (!formals.append(ts.currentName()))
+                if (!formals.append(ts.currentToken().name()))
                     return false;
 
                 /*
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index d3f63f27041..8ac1cd0d683 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -282,18 +282,6 @@ class JSFunction : public JSObject
         return u.i.s.lazy_;
     }
 
-    js::GeneratorKind generatorKind() const {
-        if (!isInterpreted())
-            return js::NotGenerator;
-        return hasScript() ? nonLazyScript()->generatorKind() : lazyScript()->generatorKind();
-    }
-
-    bool isGenerator() const { return generatorKind() != js::NotGenerator; }
-
-    bool isLegacyGenerator() const { return generatorKind() == js::LegacyGenerator; }
-
-    bool isStarGenerator() const { return generatorKind() == js::StarGenerator; }
-
     inline void setScript(JSScript *script_);
     inline void initScript(JSScript *script_);
     void initLazyScript(js::LazyScript *lazy) {
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 844eb4e6cb6..313815242eb 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1475,13 +1475,6 @@ js_NewGenerator(JSContext *cx, const FrameRegs &stackRegs)
     JS_ASSERT(stackRegs.stackDepth() == 0);
     StackFrame *stackfp = stackRegs.fp();
 
-    JS_ASSERT(stackfp->script()->isGenerator());
-
-    if (stackfp->script()->isStarGenerator()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_ES6_UNIMPLEMENTED);
-        return NULL;
-    }
-
     Rooted<GlobalObject*> global(cx, &stackfp->global());
     RootedObject obj(cx);
     {
diff --git a/js/src/jsreflect.cpp b/js/src/jsreflect.cpp
index dc33ff76f84..613fc03c7ff 100644
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -2787,7 +2787,6 @@ ASTSerializer::function(ParseNode *pn, ASTType type, MutableHandleValue dst)
 {
     RootedFunction func(cx, pn->pn_funbox->function());
 
-    // FIXME: Provide more information (legacy generator vs star generator).
     bool isGenerator = pn->pn_funbox->isGenerator();
 
     bool isExpression =
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 34498c3f67a..528f0786fc9 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -407,9 +407,9 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
         FunHasAnyAliasedFormal,
         ArgumentsHasVarBinding,
         NeedsArgsObj,
+        IsGenerator,
         IsGeneratorExp,
         IsLegacyGenerator,
-        IsStarGenerator,
         OwnSource,
         ExplicitUseStrict,
         SelfHosted
@@ -496,12 +496,12 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
             scriptBits |= (1 << NeedsArgsObj);
         if (!enclosingScript || enclosingScript->scriptSource() != script->scriptSource())
             scriptBits |= (1 << OwnSource);
+        if (script->isGenerator)
+            scriptBits |= (1 << IsGenerator);
         if (script->isGeneratorExp)
             scriptBits |= (1 << IsGeneratorExp);
-        if (script->isLegacyGenerator())
+        if (script->isLegacyGenerator)
             scriptBits |= (1 << IsLegacyGenerator);
-        if (script->isStarGenerator())
-            scriptBits |= (1 << IsStarGenerator);
 
         JS_ASSERT(!script->compileAndGo);
         JS_ASSERT(!script->hasSingletons);
@@ -596,14 +596,12 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
             script->setArgumentsHasVarBinding();
         if (scriptBits & (1 << NeedsArgsObj))
             script->setNeedsArgsObj(true);
+        if (scriptBits & (1 << IsGenerator))
+            script->isGenerator = true;
         if (scriptBits & (1 << IsGeneratorExp))
             script->isGeneratorExp = true;
-
-        if (scriptBits & (1 << IsLegacyGenerator)) {
-            JS_ASSERT(!(scriptBits & (1 << IsStarGenerator)));
-            script->setGeneratorKind(LegacyGenerator);
-        } else if (scriptBits & (1 << IsStarGenerator))
-            script->setGeneratorKind(StarGenerator);
+        if (scriptBits & (1 << IsLegacyGenerator))
+            script->isLegacyGenerator = true;
     }
 
     JS_STATIC_ASSERT(sizeof(jsbytecode) == 1);
@@ -1964,8 +1962,9 @@ JSScript::fullyInitFromEmitter(ExclusiveContext *cx, HandleScript script, Byteco
     RootedFunction fun(cx, NULL);
     if (funbox) {
         JS_ASSERT(!bce->script->noScriptRval);
+        script->isGenerator = funbox->isGenerator();
         script->isGeneratorExp = funbox->inGenexpLambda;
-        script->setGeneratorKind(funbox->generatorKind());
+        script->isLegacyGenerator = funbox->isLegacyGenerator();
         script->setFunction(funbox->function());
     }
 
@@ -2474,8 +2473,8 @@ js::CloneScript(JSContext *cx, HandleObject enclosingScope, HandleFunction fun,
     dst->funHasAnyAliasedFormal = src->funHasAnyAliasedFormal;
     dst->hasSingletons = src->hasSingletons;
     dst->treatAsRunOnce = src->treatAsRunOnce;
+    dst->isGenerator = src->isGenerator;
     dst->isGeneratorExp = src->isGeneratorExp;
-    dst->setGeneratorKind(src->generatorKind());
 
     /* Copy over hints. */
     dst->shouldInline = src->shouldInline;
@@ -2916,7 +2915,7 @@ JSScript::argumentsOptimizationFailed(JSContext *cx, HandleScript script)
     if (script->needsArgsObj())
         return true;
 
-    JS_ASSERT(!script->isGenerator());
+    JS_ASSERT(!script->isGenerator);
 
     script->needsArgsObj_ = true;
 
@@ -3008,7 +3007,6 @@ LazyScript::LazyScript(JSFunction *fun, void *table, uint32_t numFreeVariables,
     version_(version),
     numFreeVariables_(numFreeVariables),
     numInnerFunctions_(numInnerFunctions),
-    generatorKindBits_(GeneratorKindAsBits(NotGenerator)),
     strict_(false),
     bindingsAccessedDynamically_(false),
     hasDebuggerStatement_(false),
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 7c338b2b6a1..8152ffeb65e 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -414,19 +414,6 @@ class ScriptSourceObject : public JSObject
     static const uint32_t SOURCE_SLOT = 0;
 };
 
-enum GeneratorKind { NotGenerator, LegacyGenerator, StarGenerator };
-
-static inline unsigned
-GeneratorKindAsBits(GeneratorKind generatorKind) {
-    return static_cast<unsigned>(generatorKind);
-}
-
-static inline GeneratorKind
-GeneratorKindFromBits(unsigned val) {
-    JS_ASSERT(val <= StarGenerator);
-    return static_cast<GeneratorKind>(val);
-}
-
 } /* namespace js */
 
 class JSScript : public js::gc::Cell
@@ -551,9 +538,6 @@ class JSScript : public js::gc::Cell
     // optional arrays in |data|.  See the comments above Create() for details.
     ArrayBitsT      hasArrayBits;
 
-    // The GeneratorKind of the script.
-    uint8_t         generatorKindBits_;
-
     // 1-bit fields.
 
   public:
@@ -605,9 +589,14 @@ class JSScript : public js::gc::Cell
 #endif
     bool            invalidatedIdempotentCache:1; /* idempotent cache has triggered invalidation */
 
+    // All generators have isGenerator set to true.
+    bool            isGenerator:1;
     // If the generator was created implicitly via a generator expression,
     // isGeneratorExp will be true.
     bool            isGeneratorExp:1;
+    // Generators are either legacy-style (JS 1.7+ starless generators with
+    // StopIteration), or ES6-style (function* with boxed return values).
+    bool            isLegacyGenerator:1;
 
     bool            hasScriptCounts:1;/* script has an entry in
                                          JSCompartment::scriptCountsMap */
@@ -658,19 +647,6 @@ class JSScript : public js::gc::Cell
     jsbytecode *argumentsBytecode() const { JS_ASSERT(code[0] == JSOP_ARGUMENTS); return code; }
     void setArgumentsHasVarBinding();
 
-    js::GeneratorKind generatorKind() const {
-        return js::GeneratorKindFromBits(generatorKindBits_);
-    }
-    bool isGenerator() const { return generatorKind() != js::NotGenerator; }
-    bool isLegacyGenerator() const { return generatorKind() == js::LegacyGenerator; }
-    bool isStarGenerator() const { return generatorKind() == js::StarGenerator; }
-    void setGeneratorKind(js::GeneratorKind kind) {
-        // A script only gets its generator kind set as part of initialization,
-        // so it can only transition from not being a generator.
-        JS_ASSERT(!isGenerator());
-        generatorKindBits_ = GeneratorKindAsBits(kind);
-    }
-
     /*
      * As an optimization, even when argsHasLocalBinding, the function prologue
      * may not need to create an arguments object. This is determined by
@@ -1172,9 +1148,7 @@ class LazyScript : public js::gc::Cell
     uint32_t version_ : 8;
 
     uint32_t numFreeVariables_ : 24;
-    uint32_t numInnerFunctions_ : 24;
-
-    uint32_t generatorKindBits_:2;
+    uint32_t numInnerFunctions_ : 26;
 
     // N.B. These are booleans but need to be uint32_t to pack correctly on MSVC.
     uint32_t strict_ : 1;
@@ -1240,23 +1214,6 @@ class LazyScript : public js::gc::Cell
         return (HeapPtrFunction *)&freeVariables()[numFreeVariables()];
     }
 
-    GeneratorKind generatorKind() const { return GeneratorKindFromBits(generatorKindBits_); }
-
-    bool isGenerator() const { return generatorKind() != NotGenerator; }
-
-    bool isLegacyGenerator() const { return generatorKind() == LegacyGenerator; }
-
-    bool isStarGenerator() const { return generatorKind() == StarGenerator; }
-
-    void setGeneratorKind(GeneratorKind kind) {
-        // A script only gets its generator kind set as part of initialization,
-        // so it can only transition from NotGenerator.
-        JS_ASSERT(!isGenerator());
-        // Legacy generators cannot currently be lazy.
-        JS_ASSERT(kind != LegacyGenerator);
-        generatorKindBits_ = GeneratorKindAsBits(kind);
-    }
-
     bool strict() const {
         return strict_;
     }
diff --git a/js/src/tests/ecma_6/Generators/shell.js b/js/src/tests/ecma_6/Generators/shell.js
deleted file mode 100644
index dc4c567ccef..00000000000
--- a/js/src/tests/ecma_6/Generators/shell.js
+++ /dev/null
@@ -1 +0,0 @@
-version(0);
diff --git a/js/src/tests/ecma_6/Generators/syntax.js b/js/src/tests/ecma_6/Generators/syntax.js
deleted file mode 100644
index cf0ddb2e104..00000000000
--- a/js/src/tests/ecma_6/Generators/syntax.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// This file was written by Andy Wingo <wingo@igalia.com> and originally
-// contributed to V8 as generators-parsing.js, available here:
-//
-// http://code.google.com/p/v8/source/browse/branches/bleeding_edge/test/mjsunit/harmony/generators-parsing.js
-
-function assertSyntaxError(str) {
-    var msg;
-    var evil = eval;
-    try {
-        // Non-direct eval.
-        evil(str);
-    } catch (exc) {
-        if (exc instanceof SyntaxError)
-            return;
-        msg = "Assertion failed: expected SyntaxError, got " + exc;
-    }
-    if (msg === undefined)
-        msg = "Assertion failed: expected SyntaxError, but no exception thrown";
-    throw new Error(msg + " - " + str);
-}
-
-// Yield statements.
-function* g() { yield 3; yield 4; }
-
-// Yield expressions.
-function* g() { (yield 3) + (yield 4); }
-
-// You can have a generator in strict mode.
-function* g() { "use strict"; yield 3; yield 4; }
-
-// Generators can have return statements also, which internally parse to a kind
-// of yield expression.
-function* g() { yield 1; return; }
-function* g() { yield 1; return 2; }
-function* g() { yield 1; return 2; yield "dead"; }
-
-// Generator expression.
-(function* () { yield 3; });
-
-// Named generator expression.
-(function* g() { yield 3; });
-
-// Generators do not have to contain yield expressions.
-function* g() { }
-
-// YieldExpressions can occur in the RHS of a YieldExpression.
-function* g() { yield yield 1; }
-function* g() { yield 3 + (yield 4); }
-
-// Generator definitions with a name of "yield" are not specifically ruled out
-// by the spec, as the `yield' name is outside the generator itself.  However,
-// in strict-mode, "yield" is an invalid identifier.
-function* yield() { (yield 3) + (yield 4); }
-assertSyntaxError("function* yield() { 'use strict'; (yield 3) + (yield 4); }");
-
-// In classic mode, yield is a normal identifier, outside of generators.
-function yield(yield) { yield: yield (yield + yield (0)); }
-
-// Yield is always valid as a key in an object literal.
-({ yield: 1 });
-function* g() { yield ({ yield: 1 }) }
-function* g() { yield ({ get yield() { return 1; }}) }
-
-// Yield is a valid property name.
-function* g(obj) { yield obj.yield; }
-
-// Checks that yield is a valid label in classic mode, but not valid in a strict
-// mode or in generators.
-function f() { yield: 1 }
-assertSyntaxError("function f() { 'use strict'; yield: 1 }")
-assertSyntaxError("function* g() { yield: 1 }")
-
-// Yield is only a keyword in the body of the generator, not in nested
-// functions.
-function* g() { function f(yield) { yield (yield + yield (0)); } }
-
-// Yield needs a RHS.
-assertSyntaxError("function* g() { yield; }");
-
-// Yield in a generator is not an identifier.
-assertSyntaxError("function* g() { yield = 10; }");
-
-// Yield binds very loosely, so this parses as "yield (3 + yield 4)", which is
-// invalid.
-assertSyntaxError("function* g() { yield 3 + yield 4; }");
-
-// Yield is still a future-reserved-word in strict mode
-assertSyntaxError("function f() { 'use strict'; var yield = 13; }");
-
-// The name of the NFE is let-bound in G, so is invalid.
-assertSyntaxError("function* g() { yield (function yield() {}); }");
-
-// In generators, yield is invalid as a formal argument name.
-assertSyntaxError("function* g(yield) { yield (10); }");
-
-if (typeof reportCompare == "function")
-    reportCompare(true, true);
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index c3f7cf6ec99..38fdef7236c 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -152,7 +152,6 @@
     macro(void0, void0, "(void 0)") \
     macro(watch, watch, "watch") \
     macro(writable, writable, "writable") \
-    macro(yield, yield, "yield") \
     /* Type names must be contiguous and ordered; see js::TypeName. */ \
     macro(undefined, undefined, "undefined") \
     macro(object, object, "object") \
diff --git a/js/src/vm/Keywords.h b/js/src/vm/Keywords.h
index 8e6a93ece2f..aa250b80a89 100644
--- a/js/src/vm/Keywords.h
+++ b/js/src/vm/Keywords.h
@@ -72,12 +72,8 @@
     macro(protected, protected_, TOK_STRICT_RESERVED, JSVERSION_DEFAULT) \
     macro(public, public_, TOK_STRICT_RESERVED, JSVERSION_DEFAULT) \
     macro(static, static_, TOK_STRICT_RESERVED, JSVERSION_DEFAULT) \
-    /* \
-     * ES5 future reserved keyword in strict mode, keyword in JS1.7 even when \
-     * not strict, keyword inside function* in all versions.  Punt logic to \
-     * parser. \
-     */ \
-    macro(yield, yield, TOK_YIELD, JSVERSION_DEFAULT) \
+    /* ES5 future reserved keyword in strict mode, keyword in JS1.7 even when not strict. */ \
+    macro(yield, yield, TOK_YIELD, JSVERSION_1_7) \
     /* Various conditional keywords. */ \
     FOR_CONST_KEYWORD(macro) \
     FOR_LET_KEYWORD(macro)

From 5ce28e74089f471407b012962510ebb088e1f59b Mon Sep 17 00:00:00 2001
From: Mike Shal <mshal@mozilla.com>
Date: Tue, 13 Aug 2013 15:18:03 -0400
Subject: [PATCH 58/98] Bug 904768 - Print filename when failing to open files
 in libmar; r=netzen

---
 modules/libmar/src/mar_create.c  |  5 ++++-
 modules/libmar/src/mar_extract.c |  5 ++++-
 modules/libmar/src/mar_read.c    | 14 ++++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/modules/libmar/src/mar_create.c b/modules/libmar/src/mar_create.c
index e59e1e31f8c..30dbb0a5d5c 100644
--- a/modules/libmar/src/mar_create.c
+++ b/modules/libmar/src/mar_create.c
@@ -79,8 +79,11 @@ static int mar_concat_file(FILE *fp, const char *path) {
   int rv = 0;
 
   in = fopen(path, "rb");
-  if (!in)
+  if (!in) {
+    fprintf(stderr, "ERROR: could not open file in mar_concat_file()\n");
+    perror(path);
     return -1;
+  }
 
   while ((len = fread(buf, 1, BLOCKSIZE, in)) > 0) {
     if (fwrite(buf, len, 1, fp) != 1) {
diff --git a/modules/libmar/src/mar_extract.c b/modules/libmar/src/mar_extract.c
index 00f058ab9b4..ec1cd6c5344 100644
--- a/modules/libmar/src/mar_extract.c
+++ b/modules/libmar/src/mar_extract.c
@@ -48,8 +48,11 @@ static int mar_test_callback(MarFile *mar, const MarItem *item, void *unused) {
 #else
   fd = creat(item->name, item->flags);
 #endif
-  if (fd == -1)
+  if (fd == -1) {
+    fprintf(stderr, "ERROR: could not create file in mar_test_callback()\n");
+    perror(item->name);
     return -1;
+  }
 
   fp = fdopen(fd, "wb");
   if (!fp)
diff --git a/modules/libmar/src/mar_read.c b/modules/libmar/src/mar_read.c
index 2e68c235e6e..cfa2bad7f39 100644
--- a/modules/libmar/src/mar_read.c
+++ b/modules/libmar/src/mar_read.c
@@ -168,8 +168,11 @@ MarFile *mar_open(const char *path) {
   FILE *fp;
 
   fp = fopen(path, "rb");
-  if (!fp)
+  if (!fp) {
+    fprintf(stderr, "ERROR: could not open file in mar_open()\n");
+    perror(path);
     return NULL;
+  }
 
   return mar_fpopen(fp);
 }
@@ -179,8 +182,11 @@ MarFile *mar_wopen(const wchar_t *path) {
   FILE *fp;
 
   _wfopen_s(&fp, path, L"rb");
-  if (!fp)
+  if (!fp) {
+    fprintf(stderr, "ERROR: could not open file in mar_wopen()\n");
+    _wperror(path);
     return NULL;
+  }
 
   return mar_fpopen(fp);
 }
@@ -367,6 +373,8 @@ read_product_info_block(char *path,
   MarFile mar;
   mar.fp = fopen(path, "rb");
   if (!mar.fp) {
+    fprintf(stderr, "ERROR: could not open file in read_product_info_block()\n");
+    perror(path);
     return -1;
   }
   rv = mar_read_product_info_block(&mar, infoBlock);
@@ -547,6 +555,8 @@ int get_mar_file_info(const char *path,
   int rv;
   FILE *fp = fopen(path, "rb");
   if (!fp) {
+    fprintf(stderr, "ERROR: could not open file in get_mar_file_info()\n");
+    perror(path);
     return -1;
   }
 

From 7f8ef2275df09687e9f6bb558efb947d4c593b3c Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 14 Aug 2013 14:00:02 -0700
Subject: [PATCH 59/98] Bug 903212 - Remove activity tracking from nsJSContext.
 r=smaug

This only has an impact when we enable explict compartmental GCs, which have
been preffed off for a while.
---
 dom/base/nsJSEnvironment.cpp | 36 +-----------------------------------
 dom/base/nsJSEnvironment.h   |  1 -
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 932fe031846..08dd64b3786 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -819,8 +819,7 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
 
 nsJSContext::nsJSContext(JSRuntime *aRuntime, bool aGCOnDestruction,
                          nsIScriptGlobalObject* aGlobalObject)
-  : mActive(false)
-  , mGCOnDestruction(aGCOnDestruction)
+  : mGCOnDestruction(aGCOnDestruction)
   , mGlobalObjectRef(aGlobalObject)
 {
   mNext = sContextList;
@@ -1903,10 +1902,6 @@ nsJSContext::ScriptEvaluated(bool aTerminated)
     JSAutoCompartment ac(mContext, GetNativeGlobal());
     JS_MaybeGC(mContext);
   }
-
-  if (aTerminated) {
-    mActive = true;
-  }
 }
 
 bool
@@ -1995,34 +1990,6 @@ nsJSContext::GarbageCollectNow(JS::gcreason::Reason aReason,
     return;
   }
 
-  // Use zone GC when we're not asked to do a shrinking GC nor
-  // global GC and compartment GC has been called less than
-  // NS_MAX_COMPARTMENT_GC_COUNT times after the previous global GC.
-  if (!sDisableExplicitCompartmentGC &&
-      aShrinking != ShrinkingGC && aCompartment != NonCompartmentGC &&
-      sCompartmentGCCount < NS_MAX_COMPARTMENT_GC_COUNT) {
-    JS::PrepareForFullGC(nsJSRuntime::sRuntime);
-    for (nsJSContext* cx = sContextList; cx; cx = cx->mNext) {
-      if (!cx->mActive && cx->mContext) {
-        if (JSObject* global = cx->GetNativeGlobal()) {
-          JS::SkipZoneForGC(JS::GetObjectZone(global));
-        }
-      }
-      cx->mActive = false;
-    }
-    if (JS::IsGCScheduled(nsJSRuntime::sRuntime)) {
-      if (aIncremental == IncrementalGC) {
-        JS::IncrementalGC(nsJSRuntime::sRuntime, aReason, aSliceMillis);
-      } else {
-        JS::GCForReason(nsJSRuntime::sRuntime, aReason);
-      }
-    }
-    return;
-  }
-
-  for (nsJSContext* cx = sContextList; cx; cx = cx->mNext) {
-    cx->mActive = false;
-  }
   JS::PrepareForFullGC(nsJSRuntime::sRuntime);
   if (aIncremental == IncrementalGC) {
     JS::IncrementalGC(nsJSRuntime::sRuntime, aReason, aSliceMillis);
@@ -2517,7 +2484,6 @@ nsJSContext::KillCCTimer()
 void
 nsJSContext::GC(JS::gcreason::Reason aReason)
 {
-  mActive = true;
   PokeGC(aReason);
 }
 
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index af8a2ef313c..4ffb6c48090 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -167,7 +167,6 @@ private:
   nsrefcnt GetCCRefcnt();
 
   JSContext *mContext;
-  bool mActive;
 
   bool mIsInitialized;
   bool mScriptsEnabled;

From 7282f447c05309ecac0319cdae54d3d5c444a0f0 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 14 Aug 2013 14:00:02 -0700
Subject: [PATCH 60/98] Bug 903212 - Add a GC when popping a script entry
 point. r=mrbkap

I think that this is more or less isomorphic with the MaybeGC we do in
ScriptEvaluated in the cases that matter. And doing it in a spec-defined
place is helpful in getting rid of spec-nonsensical machinery.
---
 js/xpconnect/src/nsCxPusher.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/js/xpconnect/src/nsCxPusher.cpp b/js/xpconnect/src/nsCxPusher.cpp
index 2629ab2161a..eff0148ba6f 100644
--- a/js/xpconnect/src/nsCxPusher.cpp
+++ b/js/xpconnect/src/nsCxPusher.cpp
@@ -146,6 +146,15 @@ AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull) : mScriptIsRunning(fal
 NS_EXPORT
 AutoCxPusher::~AutoCxPusher()
 {
+  // GC when we pop a script entry point. This is a useful heuristic that helps
+  // us out on certain (flawed) benchmarks like sunspider, because it lets us
+  // avoid GCing during the timing loop.
+  //
+  // NB: We need to take care to only do this if we're in a compartment,
+  // otherwise JS_MaybeGC will segfault.
+  if (mScx && !mAutoCompartment.empty())
+    JS_MaybeGC(nsXPConnect::XPConnect()->GetCurrentJSContext());
+
   // Leave the compartment and request before popping.
   mAutoCompartment.destroyIfConstructed();
   mAutoRequest.destroyIfConstructed();

From ecce09df53e61d9c65e02adfe542a25393dbc164 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 14 Aug 2013 14:00:03 -0700
Subject: [PATCH 61/98] Bug 903212 - Remove ScriptEvaluated, and simplify
 callers. r=mrbkap

---
 content/xul/document/src/XULDocument.cpp |  1 -
 dom/base/nsIScriptContext.h              | 17 ++--------------
 dom/base/nsJSEnvironment.cpp             | 26 ++++--------------------
 dom/base/nsJSEnvironment.h               |  1 -
 dom/bindings/CallbackObject.cpp          | 17 ++--------------
 dom/bindings/CallbackObject.h            |  1 -
 js/xpconnect/src/nsCxPusher.cpp          | 19 +----------------
 js/xpconnect/src/nsCxPusher.h            |  1 -
 8 files changed, 9 insertions(+), 74 deletions(-)

diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp
index 2333ea766db..94f21e2605b 100644
--- a/content/xul/document/src/XULDocument.cpp
+++ b/content/xul/document/src/XULDocument.cpp
@@ -3653,7 +3653,6 @@ XULDocument::ExecuteScript(nsIScriptContext * aContext,
     JS::Rooted<JS::Value> unused(cx);
     if (!JS_ExecuteScript(cx, global, aScriptObject, unused.address()))
         nsJSUtils::ReportPendingException(cx);
-    aContext->ScriptEvaluated(true);
     return NS_OK;
 }
 
diff --git a/dom/base/nsIScriptContext.h b/dom/base/nsIScriptContext.h
index b1e4c745ae6..ca657786acf 100644
--- a/dom/base/nsIScriptContext.h
+++ b/dom/base/nsIScriptContext.h
@@ -28,8 +28,8 @@ class nsIDOMWindow;
 class nsIURI;
 
 #define NS_ISCRIPTCONTEXT_IID \
-{ 0xfd05ba99, 0x2906, 0x4c51, \
-  { 0x89, 0xb3, 0xbc, 0xdf, 0xf6, 0x3b, 0xf2, 0xde } }
+{ 0x6219173f, 0x4a61, 0x4c99, \
+  { 0xb1, 0xfd, 0x8e, 0x7a, 0xf0, 0xdc, 0xe0, 0x56 } }
 
 /* This MUST match JSVERSION_DEFAULT.  This version stuff if we don't
    know what language we have is a little silly... */
@@ -130,19 +130,6 @@ public:
    */
   virtual void GC(JS::gcreason::Reason aReason) = 0;
 
-  /**
-   * Inform the context that a script was evaluated.
-   * A GC may be done if "necessary."
-   * This call is necessary if script evaluation is done
-   * without using the EvaluateScript method.
-   * @param aTerminated If true then do script termination handling. Within DOM
-   *     this will always be true, but outside  callers (such as xpconnect) who
-   *     may do script evaluations nested inside inside DOM script evaluations
-   *     can pass false to avoid premature termination handling.
-   * @return NS_OK if the method is successful
-   */
-  virtual void ScriptEvaluated(bool aTerminated) = 0;
-
   virtual nsresult Serialize(nsIObjectOutputStream* aStream,
                              JS::Handle<JSScript*> aScriptObject) = 0;
   
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 08dd64b3786..e45a5be2edb 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -960,22 +960,15 @@ nsJSContext::EvaluateString(const nsAString& aScript,
                             JS::Value* aRetValue)
 {
   NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
-  nsresult rv;
   if (!mScriptsEnabled) {
     return NS_OK;
   }
 
-  {
-    AutoCxPusher pusher(mContext);
-    nsJSUtils::EvaluateOptions evalOptions;
-    evalOptions.setCoerceToString(aCoerceToString);
-    rv = nsJSUtils::EvaluateString(mContext, aScript, aScopeObject,
+  AutoCxPusher pusher(mContext);
+  nsJSUtils::EvaluateOptions evalOptions;
+  evalOptions.setCoerceToString(aCoerceToString);
+  return nsJSUtils::EvaluateString(mContext, aScript, aScopeObject,
                                    aCompileOptions, evalOptions, aRetValue);
-  }
-
-  // ScriptEvaluated needs to come after we pop the stack
-  ScriptEvaluated(true);
-  return rv;
 }
 
 #ifdef DEBUG
@@ -1895,15 +1888,6 @@ nsJSContext::IsContextInitialized()
   return mIsInitialized;
 }
 
-void
-nsJSContext::ScriptEvaluated(bool aTerminated)
-{
-  if (GetNativeGlobal()) {
-    JSAutoCompartment ac(mContext, GetNativeGlobal());
-    JS_MaybeGC(mContext);
-  }
-}
-
 bool
 nsJSContext::GetScriptsEnabled()
 {
@@ -1940,8 +1924,6 @@ nsJSContext::SetProcessingScriptTag(bool aFlag)
 NS_IMETHODIMP
 nsJSContext::ScriptExecuted()
 {
-  ScriptEvaluated(!::JS_IsRunning(mContext));
-
   return NS_OK;
 }
 
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index 4ffb6c48090..0378c2053a2 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -63,7 +63,6 @@ public:
   virtual nsresult InitContext() MOZ_OVERRIDE;
   virtual bool IsContextInitialized() MOZ_OVERRIDE;
 
-  virtual void ScriptEvaluated(bool aTerminated) MOZ_OVERRIDE;
   virtual bool GetScriptsEnabled() MOZ_OVERRIDE;
   virtual void SetScriptsEnabled(bool aEnabled, bool aFireTimeouts) MOZ_OVERRIDE;
 
diff --git a/dom/bindings/CallbackObject.cpp b/dom/bindings/CallbackObject.cpp
index 1673493c591..6632cc807fb 100644
--- a/dom/bindings/CallbackObject.cpp
+++ b/dom/bindings/CallbackObject.cpp
@@ -104,13 +104,6 @@ CallbackObject::CallSetup::CallSetup(JS::Handle<JSObject*> aCallback,
   xpc_UnmarkGrayObject(aCallback);
   mRootedCallable.construct(cx, aCallback);
 
-  // After this point we guarantee calling ScriptEvaluated() if we
-  // have an nsIScriptContext.
-  // XXXbz Why, if, say CheckFunctionAccess fails?  I know that's how
-  // nsJSContext::CallEventHandler used to work, but is it required?
-  // FIXME: Bug 807369.
-  mCtx = ctx;
-
   // Check that it's ok to run this callback at all.
   // FIXME: Bug 807371: we want a less silly check here.
   // Make sure to unwrap aCallback before passing it in, because
@@ -164,10 +157,8 @@ CallbackObject::CallSetup::~CallSetup()
     }
   }
 
-  // If we have an mCtx, we need to call ScriptEvaluated() on it.  But we have
-  // to do that after we pop the JSContext stack (see bug 295983).  And to get
-  // our nesting right we have to destroy our JSAutoCompartment first.  But be
-  // careful: it might not have been constructed at all!
+  // To get our nesting right we have to destroy our JSAutoCompartment first.
+  // But be careful: it might not have been constructed at all!
   mAc.destroyIfConstructed();
 
   // XXXbz For that matter why do we need to manually call ScriptEvaluated at
@@ -178,10 +169,6 @@ CallbackObject::CallSetup::~CallSetup()
 
   // Popping an nsCxPusher is safe even if it never got pushed.
   mCxPusher.Pop();
-
-  if (mCtx) {
-    mCtx->ScriptEvaluated(true);
-  }
 }
 
 already_AddRefed<nsISupports>
diff --git a/dom/bindings/CallbackObject.h b/dom/bindings/CallbackObject.h
index ae816974d19..b9c85f29b67 100644
--- a/dom/bindings/CallbackObject.h
+++ b/dom/bindings/CallbackObject.h
@@ -135,7 +135,6 @@ protected:
 
     // Members which can go away whenever
     JSContext* mCx;
-    nsCOMPtr<nsIScriptContext> mCtx;
 
     // And now members whose construction/destruction order we need to control.
 
diff --git a/js/xpconnect/src/nsCxPusher.cpp b/js/xpconnect/src/nsCxPusher.cpp
index eff0148ba6f..260fe671b53 100644
--- a/js/xpconnect/src/nsCxPusher.cpp
+++ b/js/xpconnect/src/nsCxPusher.cpp
@@ -102,7 +102,7 @@ nsCxPusher::Pop()
 
 namespace mozilla {
 
-AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull) : mScriptIsRunning(false)
+AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull)
 {
   MOZ_ASSERT_IF(!allowNull, cx);
 
@@ -112,15 +112,7 @@ AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull) : mScriptIsRunning(fal
   if (cx)
     mScx = GetScriptContextFromJSContext(cx);
 
-  // NB: The GetDynamicScriptContext is historical and might not be sane.
   XPCJSContextStack *stack = XPCJSRuntime::Get()->GetJSContextStack();
-  if (cx && nsJSUtils::GetDynamicScriptContext(cx) && stack->HasJSContext(cx))
-  {
-    // If the context is on the stack, that means that a script
-    // is running at the moment in the context.
-    mScriptIsRunning = true;
-  }
-
   if (!stack->Push(cx)) {
     MOZ_CRASH();
   }
@@ -169,16 +161,7 @@ AutoCxPusher::~AutoCxPusher()
   DebugOnly<JSContext*> stackTop;
   MOZ_ASSERT(mPushedContext == nsXPConnect::XPConnect()->GetCurrentJSContext());
   XPCJSRuntime::Get()->GetJSContextStack()->Pop();
-
-  if (!mScriptIsRunning && mScx) {
-    // No JS is running in the context, but executing the event handler might have
-    // caused some JS to run. Tell the script context that it's done.
-
-    mScx->ScriptEvaluated(true);
-  }
-
   mScx = nullptr;
-  mScriptIsRunning = false;
 }
 
 AutoJSContext::AutoJSContext(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL)
diff --git a/js/xpconnect/src/nsCxPusher.h b/js/xpconnect/src/nsCxPusher.h
index ffbfd59d021..3fd165c61f7 100644
--- a/js/xpconnect/src/nsCxPusher.h
+++ b/js/xpconnect/src/nsCxPusher.h
@@ -35,7 +35,6 @@ private:
   mozilla::Maybe<JSAutoRequest> mAutoRequest;
   mozilla::Maybe<JSAutoCompartment> mAutoCompartment;
   nsCOMPtr<nsIScriptContext> mScx;
-  bool mScriptIsRunning;
 #ifdef DEBUG
   JSContext* mPushedContext;
   unsigned mCompartmentDepthOnEntry;

From 2ce8f2d13b78b2bdc9fba3d04c5f7ec1a97c862b Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 14 Aug 2013 14:00:03 -0700
Subject: [PATCH 62/98] Bug 903212 - Remove nsIXPCScriptNotify machinery.
 r=mrbkap

---
 dom/base/nsJSEnvironment.cpp            |  9 +--------
 dom/base/nsJSEnvironment.h              |  6 +-----
 dom/workers/WorkerPrivate.cpp           | 19 -------------------
 dom/workers/WorkerPrivate.h             | 11 -----------
 js/xpconnect/idl/moz.build              |  1 -
 js/xpconnect/idl/nsIXPCScriptNotify.idl | 25 -------------------------
 js/xpconnect/src/XPCWrappedJSClass.cpp  | 16 ----------------
 js/xpconnect/src/xpcprivate.h           |  2 --
 8 files changed, 2 insertions(+), 87 deletions(-)
 delete mode 100644 js/xpconnect/idl/nsIXPCScriptNotify.idl

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index e45a5be2edb..5779588a0c6 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -929,8 +929,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSContext)
   NS_INTERFACE_MAP_ENTRY(nsIScriptContext)
-  NS_INTERFACE_MAP_ENTRY(nsIXPCScriptNotify)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptContext)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 
@@ -1921,12 +1920,6 @@ nsJSContext::SetProcessingScriptTag(bool aFlag)
   mProcessingScriptTag = aFlag;
 }
 
-NS_IMETHODIMP
-nsJSContext::ScriptExecuted()
-{
-  return NS_OK;
-}
-
 void
 FullGCTimerFired(nsITimer* aTimer, void* aClosure)
 {
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index 0378c2053a2..a01c6fa2453 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -12,7 +12,6 @@
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "nsIObserver.h"
-#include "nsIXPCScriptNotify.h"
 #include "prtime.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIXPConnect.h"
@@ -32,8 +31,7 @@ template <class> class Maybe;
 // a page) and doing the actual GC.
 #define NS_GC_DELAY                 4000 // ms
 
-class nsJSContext : public nsIScriptContext,
-                    public nsIXPCScriptNotify
+class nsJSContext : public nsIScriptContext
 {
 public:
   nsJSContext(JSRuntime* aRuntime, bool aGCOnDestruction,
@@ -81,8 +79,6 @@ public:
   virtual nsresult Deserialize(nsIObjectInputStream* aStream,
                                JS::MutableHandle<JSScript*> aResult) MOZ_OVERRIDE;
 
-  NS_DECL_NSIXPCSCRIPTNOTIFY
-
   static void LoadStart();
   static void LoadEnd();
 
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index a73ba6cf87a..21c17162850 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -24,7 +24,6 @@
 #include "nsIURI.h"
 #include "nsIURL.h"
 #include "nsIXPConnect.h"
-#include "nsIXPCScriptNotify.h"
 #include "nsPrintfCString.h"
 #include "nsHostObjectProtocolHandler.h"
 
@@ -842,8 +841,6 @@ public:
 
   void PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate, bool aRunResult)
   {
-    // Notify before WorkerRunnable::PostRun, since that can kill aWorkerPrivate
-    NotifyScriptExecutedIfNeeded();
     WorkerRunnable::PostRun(aCx, aWorkerPrivate, aRunResult);
   }
 };
@@ -990,8 +987,6 @@ public:
 
   void PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate, bool aRunResult)
   {
-    // Notify before WorkerRunnable::PostRun, since that can kill aWorkerPrivate
-    NotifyScriptExecutedIfNeeded();
     WorkerRunnable::PostRun(aCx, aWorkerPrivate, aRunResult);
   }
 
@@ -1738,18 +1733,6 @@ WorkerRunnable::PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
   }
 }
 
-void
-WorkerRunnable::NotifyScriptExecutedIfNeeded() const
-{
-  // if we're on the main thread notify about the end of our script execution.
-  if (mTarget == ParentThread && !mWorkerPrivate->GetParent()) {
-    AssertIsOnMainThread();
-    if (mWorkerPrivate->GetScriptNotify()) {
-      mWorkerPrivate->GetScriptNotify()->ScriptExecuted();
-    }
-  }
-}
-
 struct WorkerPrivate::TimeoutInfo
 {
   TimeoutInfo()
@@ -1939,7 +1922,6 @@ WorkerPrivateParent<Derived>::WorkerPrivateParent(
 
   mWindow.swap(aWindow);
   mScriptContext.swap(aScriptContext);
-  mScriptNotify = do_QueryInterface(mScriptContext);
   mBaseURI.swap(aBaseURI);
   mPrincipal.swap(aPrincipal);
   mChannel.swap(aChannel);
@@ -2248,7 +2230,6 @@ WorkerPrivateParent<Derived>::ForgetMainThreadObjects(
 
   SwapToISupportsArray(mWindow, aDoomed);
   SwapToISupportsArray(mScriptContext, aDoomed);
-  SwapToISupportsArray(mScriptNotify, aDoomed);
   SwapToISupportsArray(mBaseURI, aDoomed);
   SwapToISupportsArray(mScriptURI, aDoomed);
   SwapToISupportsArray(mPrincipal, aDoomed);
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
index 25a87307125..e04bd5cf3a2 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -41,7 +41,6 @@ class nsIScriptContext;
 class nsIURI;
 class nsPIDOMWindow;
 class nsITimer;
-class nsIXPCScriptNotify;
 
 namespace JS {
 class RuntimeStats;
@@ -110,8 +109,6 @@ protected:
   virtual void
   PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate, bool aRunResult);
 
-  void NotifyScriptExecutedIfNeeded() const;
-
 public:
   NS_DECL_NSIRUNNABLE
 };
@@ -267,7 +264,6 @@ private:
   // Main-thread things.
   nsCOMPtr<nsPIDOMWindow> mWindow;
   nsCOMPtr<nsIScriptContext> mScriptContext;
-  nsCOMPtr<nsIXPCScriptNotify> mScriptNotify;
   nsCOMPtr<nsIURI> mBaseURI;
   nsCOMPtr<nsIURI> mScriptURI;
   nsCOMPtr<nsIPrincipal> mPrincipal;
@@ -466,13 +462,6 @@ public:
     return mScriptContext;
   }
 
-  nsIXPCScriptNotify*
-  GetScriptNotify() const
-  {
-    AssertIsOnMainThread();
-    return mScriptNotify;
-  }
-
   JSObject*
   GetJSObject() const
   {
diff --git a/js/xpconnect/idl/moz.build b/js/xpconnect/idl/moz.build
index 7661d7f017b..75cc6716171 100644
--- a/js/xpconnect/idl/moz.build
+++ b/js/xpconnect/idl/moz.build
@@ -9,7 +9,6 @@ XPIDL_SOURCES += [
     'nsIJSEngineTelemetryStats.idl',
     'nsIJSRuntimeService.idl',
     'nsIScriptError.idl',
-    'nsIXPCScriptNotify.idl',
     'nsIXPCScriptable.idl',
     'nsIXPCSecurityManager.idl',
     'nsIXPConnect.idl',
diff --git a/js/xpconnect/idl/nsIXPCScriptNotify.idl b/js/xpconnect/idl/nsIXPCScriptNotify.idl
deleted file mode 100644
index 8718316efdc..00000000000
--- a/js/xpconnect/idl/nsIXPCScriptNotify.idl
+++ /dev/null
@@ -1,25 +0,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/. */
-
-/**
- * nsIXPCScriptNotify is an interface that is used for notifying a client
- * that the script has been evaluated by XPConnect. if any JSContext in our 
- * JSRuntime has set the JSOPTION_PRIVATE_IS_NSISUPPORTS option and the 
- * private context supports nsIXPCScriptNotify then this method is invoked
- */
-
-
-#include "nsISupports.idl"
-
-[uuid(13aceb15-812a-476a-9326-2adc00250b76)]
-interface nsIXPCScriptNotify : nsISupports
-{
-    /**
-     * Method invoked when a script has been executed by XPConnect
-     */
-    void ScriptExecuted();
-};
-
diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
index 9a03e08a311..2bdc729e236 100644
--- a/js/xpconnect/src/XPCWrappedJSClass.cpp
+++ b/js/xpconnect/src/XPCWrappedJSClass.cpp
@@ -72,22 +72,6 @@ AutoScriptEvaluate::~AutoScriptEvaluate()
 
     JS_EndRequest(mJSContext);
 
-    // If this is a JSContext that has a private context that provides a
-    // nsIXPCScriptNotify interface, then notify the object the script has
-    // been executed.
-    //
-    // Note: We rely on the rule that if any JSContext in our JSRuntime has
-    // private data that points to an nsISupports subclass, it has also set
-    // the JSOPTION_PRIVATE_IS_NSISUPPORTS option.
-
-    if (JS_GetOptions(mJSContext) & JSOPTION_PRIVATE_IS_NSISUPPORTS) {
-        nsCOMPtr<nsIXPCScriptNotify> scriptNotify =
-            do_QueryInterface(static_cast<nsISupports*>
-                                         (JS_GetContextPrivate(mJSContext)));
-        if (scriptNotify)
-            scriptNotify->ScriptExecuted();
-    }
-
     if (mErrorReporterSet)
         JS_SetErrorReporter(mJSContext, NULL);
 }
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index b077cdf4b1f..0dd6f1e8f28 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -159,8 +159,6 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsNetUtil.h"
 
-#include "nsIXPCScriptNotify.h"  // used to notify: ScriptEvaluated
-
 #include "nsIPrincipal.h"
 #include "nsJSPrincipals.h"
 #include "nsIScriptObjectPrincipal.h"

From c695bf8a824273a93661b052e2d4859205bdc94a Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 14 Aug 2013 14:00:03 -0700
Subject: [PATCH 63/98] Bug 903212 - Remove explicit compartment GC machinery.
 r=smaug

---
 dom/base/nsJSEnvironment.cpp    | 11 -----------
 modules/libpref/src/init/all.js |  1 -
 2 files changed, 12 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 5779588a0c6..663fd31e355 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -104,8 +104,6 @@ static PRLogModuleInfo* gJSDiagnostics;
 
 #define NS_FULL_GC_DELAY            60000 // ms
 
-#define NS_MAX_COMPARTMENT_GC_COUNT 20
-
 // Maximum amount of time that should elapse between incremental GC slices
 #define NS_INTERSLICE_GC_DELAY      100 // ms
 
@@ -167,7 +165,6 @@ static uint32_t sCCollectedWaitingForGC;
 static uint32_t sLikelyShortLivingObjectsNeedingGC;
 static bool sPostGCEventsToConsole;
 static bool sPostGCEventsToObserver;
-static bool sDisableExplicitCompartmentGC;
 static uint32_t sCCTimerFireCount = 0;
 static uint32_t sMinForgetSkippableTime = UINT32_MAX;
 static uint32_t sMaxForgetSkippableTime = 0;
@@ -175,7 +172,6 @@ static uint32_t sTotalForgetSkippableTime = 0;
 static uint32_t sRemovedPurples = 0;
 static uint32_t sForgetSkippableBeforeCC = 0;
 static uint32_t sPreviousSuspectedCount = 0;
-static uint32_t sCompartmentGCCount = NS_MAX_COMPARTMENT_GC_COUNT;
 static uint32_t sCleanupsSinceLastGC = UINT32_MAX;
 static bool sNeedsFullCC = false;
 static nsJSContext *sContextList = nullptr;
@@ -692,8 +688,6 @@ static const char js_typeinfer_str[]          = JS_OPTIONS_DOT_STR "typeinferenc
 static const char js_jit_hardening_str[]      = JS_OPTIONS_DOT_STR "jit_hardening";
 static const char js_memlog_option_str[]      = JS_OPTIONS_DOT_STR "mem.log";
 static const char js_memnotify_option_str[]   = JS_OPTIONS_DOT_STR "mem.notify";
-static const char js_disable_explicit_compartment_gc[] =
-  JS_OPTIONS_DOT_STR "mem.disable_explicit_compartment_gc";
 static const char js_asmjs_content_str[]      = JS_OPTIONS_DOT_STR "asmjs";
 static const char js_baselinejit_content_str[] = JS_OPTIONS_DOT_STR "baselinejit.content";
 static const char js_baselinejit_chrome_str[]  = JS_OPTIONS_DOT_STR "baselinejit.chrome";
@@ -711,8 +705,6 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
 
   sPostGCEventsToConsole = Preferences::GetBool(js_memlog_option_str);
   sPostGCEventsToObserver = Preferences::GetBool(js_memnotify_option_str);
-  sDisableExplicitCompartmentGC =
-    Preferences::GetBool(js_disable_explicit_compartment_gc);
 
   bool strict = Preferences::GetBool(js_strict_option_str);
   if (strict)
@@ -2550,7 +2542,6 @@ DOMGCSliceCallback(JSRuntime *aRt, JS::GCProgress aProgress, const JS::GCDescrip
     nsJSContext::MaybePokeCC();
 
     if (aDesc.isCompartment_) {
-      ++sCompartmentGCCount;
       if (!sFullGCTimer && !sShuttingDown) {
         CallCreateInstance("@mozilla.org/timer;1", &sFullGCTimer);
         JS::gcreason::Reason reason = JS::gcreason::FULL_GC_TIMER;
@@ -2560,7 +2551,6 @@ DOMGCSliceCallback(JSRuntime *aRt, JS::GCProgress aProgress, const JS::GCDescrip
                                            nsITimer::TYPE_ONE_SHOT);
       }
     } else {
-      sCompartmentGCCount = 0;
       nsJSContext::KillFullGCTimer();
 
       // Avoid shrinking during heavy activity, which is suggested by
@@ -2655,7 +2645,6 @@ nsJSRuntime::Startup()
   sCCollectedWaitingForGC = 0;
   sLikelyShortLivingObjectsNeedingGC = 0;
   sPostGCEventsToConsole = false;
-  sDisableExplicitCompartmentGC = false;
   sNeedsFullCC = false;
   gNameSpaceManager = nullptr;
   sRuntimeService = nullptr;
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index bed68772348..900cacc8de5 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -834,7 +834,6 @@ pref("javascript.options.typeinference", true);
 pref("javascript.options.mem.high_water_mark", 128);
 pref("javascript.options.mem.max", -1);
 pref("javascript.options.mem.gc_per_compartment", true);
-pref("javascript.options.mem.disable_explicit_compartment_gc", true);
 pref("javascript.options.mem.gc_incremental", true);
 pref("javascript.options.mem.gc_incremental_slice_ms", 10);
 pref("javascript.options.mem.log", false);

From 3966b7914514b94885de3156ee66519172e2aafd Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Wed, 14 Aug 2013 17:01:16 -0400
Subject: [PATCH 64/98] Bug 905062: Clean up fake source for getUserMedia
 r=padenot

---
 content/media/webrtc/MediaEngineDefault.cpp | 81 ++++++++++-----------
 content/media/webrtc/MediaEngineDefault.h   | 14 ++--
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/content/media/webrtc/MediaEngineDefault.cpp b/content/media/webrtc/MediaEngineDefault.cpp
index 3e801ea7e14..96bb84a5301 100644
--- a/content/media/webrtc/MediaEngineDefault.cpp
+++ b/content/media/webrtc/MediaEngineDefault.cpp
@@ -31,8 +31,9 @@ NS_IMPL_ISUPPORTS1(MediaEngineDefaultVideoSource, nsITimerCallback)
  */
 
 MediaEngineDefaultVideoSource::MediaEngineDefaultVideoSource()
-  : mTimer(nullptr)
+  : mTimer(nullptr), mMonitor("Fake video")
 {
+  mImageContainer = layers::LayerManager::CreateImageContainer();
   mState = kReleased;
 }
 
@@ -120,32 +121,8 @@ MediaEngineDefaultVideoSource::Start(SourceMediaStream* aStream, TrackID aID)
     return NS_ERROR_FAILURE;
   }
 
-  mSource = aStream;
-
-  // Allocate a single blank Image
-  ImageFormat format = PLANAR_YCBCR;
-  mImageContainer = layers::LayerManager::CreateImageContainer();
-
-  nsRefPtr<layers::Image> image = mImageContainer->CreateImage(&format, 1);
-  mImage = static_cast<layers::PlanarYCbCrImage*>(image.get());
-
-  layers::PlanarYCbCrImage::Data data;
-  // Allocate a single blank Image
-  mCb = 16;
-  mCr = 16;
-  AllocateSolidColorFrame(data, mOpts.mWidth, mOpts.mHeight, 0x80, mCb, mCr);
-  // SetData copies data, so we can free the frame
-  mImage->SetData(data);
-  ReleaseFrame(data);
-
-  // AddTrack takes ownership of segment
-  VideoSegment *segment = new VideoSegment();
-  segment->AppendFrame(image.forget(), USECS_PER_S / mOpts.mFPS,
-                       gfxIntSize(mOpts.mWidth, mOpts.mHeight));
-  mSource->AddTrack(aID, VIDEO_RATE, 0, segment);
-
-  // We aren't going to add any more tracks
-  mSource->AdvanceKnownTracksTime(STREAM_TIME_MAX);
+  aStream->AddTrack(aID, VIDEO_RATE, 0, new VideoSegment());
+  aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
 
   // Remember TrackID so we can end it later
   mTrackID = aID;
@@ -238,20 +215,47 @@ MediaEngineDefaultVideoSource::Notify(nsITimer* aTimer)
   // SetData copies data, so we can free the frame
   ReleaseFrame(data);
 
-  // AddTrack takes ownership of segment
-  VideoSegment segment;
-  segment.AppendFrame(ycbcr_image.forget(), USECS_PER_S / mOpts.mFPS,
-                      gfxIntSize(mOpts.mWidth, mOpts.mHeight));
-  mSource->AppendToTrack(mTrackID, &segment);
+  MonitorAutoLock lock(mMonitor);
+
+  // implicitly releases last image
+  mImage = ycbcr_image.forget();
 
   return NS_OK;
 }
 
 void
 MediaEngineDefaultVideoSource::NotifyPull(MediaStreamGraph* aGraph,
-                                          StreamTime aDesiredTime)
+                                          SourceMediaStream *aSource,
+                                          TrackID aID,
+                                          StreamTime aDesiredTime,
+                                          TrackTicks &aLastEndTime)
 {
-  // Ignore - we push video data
+  // AddTrack takes ownership of segment
+  VideoSegment segment;
+  MonitorAutoLock lock(mMonitor);
+  if (mState != kStarted) {
+    return;
+  }
+
+  // Note: we're not giving up mImage here
+  nsRefPtr<layers::Image> image = mImage;
+  TrackTicks target = TimeToTicksRoundUp(USECS_PER_S, aDesiredTime);
+  TrackTicks delta = target - aLastEndTime;
+
+  if (delta > 0) {
+    // NULL images are allowed
+    if (image) {
+      segment.AppendFrame(image.forget(), delta,
+                          gfxIntSize(mOpts.mWidth, mOpts.mHeight));
+    } else {
+      segment.AppendFrame(nullptr, delta, gfxIntSize(0,0));
+    }
+    // This can fail if either a) we haven't added the track yet, or b)
+    // we've removed or finished the track.
+    if (aSource->AppendToTrack(aID, &segment)) {
+      aLastEndTime = target;
+    }
+  }
 }
 
 
@@ -269,13 +273,6 @@ MediaEngineDefaultAudioSource::MediaEngineDefaultAudioSource()
 MediaEngineDefaultAudioSource::~MediaEngineDefaultAudioSource()
 {}
 
-void
-MediaEngineDefaultAudioSource::NotifyPull(MediaStreamGraph* aGraph,
-                                          StreamTime aDesiredTime)
-{
-  // Ignore - we push audio data
-}
-
 void
 MediaEngineDefaultAudioSource::GetName(nsAString& aName)
 {
@@ -335,7 +332,7 @@ MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID)
   // Remember TrackID so we can finish later
   mTrackID = aID;
 
-  // 1 Audio frame per Video frame
+  // 1 Audio frame per 10ms
   mTimer->InitWithCallback(this, MediaEngine::DEFAULT_AUDIO_TIMER_MS,
                            nsITimer::TYPE_REPEATING_SLACK);
   mState = kStarted;
diff --git a/content/media/webrtc/MediaEngineDefault.h b/content/media/webrtc/MediaEngineDefault.h
index 94d2b315d18..e69aba111c7 100644
--- a/content/media/webrtc/MediaEngineDefault.h
+++ b/content/media/webrtc/MediaEngineDefault.h
@@ -10,6 +10,7 @@
 #include "nsCOMPtr.h"
 #include "DOMMediaStream.h"
 #include "nsComponentManagerUtils.h"
+#include "mozilla/Monitor.h"
 
 #include "VideoUtils.h"
 #include "MediaEngine.h"
@@ -48,12 +49,11 @@ public:
   virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
                           bool aAgcOn, uint32_t aAGC,
                           bool aNoiseOn, uint32_t aNoise) { return NS_OK; };
-  virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime);
   virtual void NotifyPull(MediaStreamGraph* aGraph,
                           SourceMediaStream *aSource,
                           TrackID aId,
                           StreamTime aDesiredTime,
-                          TrackTicks &aLastEndTime) {}
+                          TrackTicks &aLastEndTime);
 
   virtual bool IsFake() {
     return true;
@@ -67,10 +67,15 @@ protected:
 
   TrackID mTrackID;
   nsCOMPtr<nsITimer> mTimer;
+  // mMonitor protects mImage access/changes, and transitions of mState
+  // from kStarted to kStopped (which are combined with EndTrack() and
+  // image changes).  Note that mSources is not accessed from other threads
+  // for video and is not protected.
+  Monitor mMonitor;
+  nsRefPtr<layers::Image> mImage;
+
   nsRefPtr<layers::ImageContainer> mImageContainer;
 
-  SourceMediaStream* mSource;
-  layers::PlanarYCbCrImage* mImage;
   MediaEnginePrefs mOpts;
   int mCb;
   int mCr;
@@ -94,7 +99,6 @@ public:
   virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
                           bool aAgcOn, uint32_t aAGC,
                           bool aNoiseOn, uint32_t aNoise) { return NS_OK; };
-  virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime);
   virtual void NotifyPull(MediaStreamGraph* aGraph,
                           SourceMediaStream *aSource,
                           TrackID aId,

From bfbf646b233bf7f37d101b1e3228a3b856b2ed25 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Wed, 14 Aug 2013 08:45:49 -0400
Subject: [PATCH 65/98] Bug 905135 - move zero values to their point of use in
 nsSMILCSSValueType.cpp; r=dholbert

---
 content/smil/nsSMILCSSValueType.cpp | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/content/smil/nsSMILCSSValueType.cpp b/content/smil/nsSMILCSSValueType.cpp
index edad560b23a..60a259d7ef0 100644
--- a/content/smil/nsSMILCSSValueType.cpp
+++ b/content/smil/nsSMILCSSValueType.cpp
@@ -29,22 +29,20 @@ struct ValueWrapper {
   nsStyleAnimation::Value mCSSValue;
 };
 
-// Helper "zero" values of various types
-// -------------------------------------
-static const nsStyleAnimation::Value
-  sZeroCoord(0, nsStyleAnimation::Value::CoordConstructor);
-static const nsStyleAnimation::Value
-  sZeroPercent(0.0f, nsStyleAnimation::Value::PercentConstructor);
-static const nsStyleAnimation::Value
-  sZeroFloat(0.0f,  nsStyleAnimation::Value::FloatConstructor);
-static const nsStyleAnimation::Value
-  sZeroColor(NS_RGB(0,0,0), nsStyleAnimation::Value::ColorConstructor);
-
 // Helper Methods
 // --------------
 static const nsStyleAnimation::Value*
 GetZeroValueForUnit(nsStyleAnimation::Unit aUnit)
 {
+  static const nsStyleAnimation::Value
+    sZeroCoord(0, nsStyleAnimation::Value::CoordConstructor);
+  static const nsStyleAnimation::Value
+    sZeroPercent(0.0f, nsStyleAnimation::Value::PercentConstructor);
+  static const nsStyleAnimation::Value
+    sZeroFloat(0.0f,  nsStyleAnimation::Value::FloatConstructor);
+  static const nsStyleAnimation::Value
+    sZeroColor(NS_RGB(0,0,0), nsStyleAnimation::Value::ColorConstructor);
+
   NS_ABORT_IF_FALSE(aUnit != nsStyleAnimation::eUnit_Null,
                     "Need non-null unit for a zero value");
   switch (aUnit) {
@@ -93,12 +91,14 @@ FinalizeStyleAnimationValues(const nsStyleAnimation::Value*& aValue1,
   // eUnit_Float) mixed with unitless 0 length (parsed as eUnit_Coord).  These
   // won't interoperate in nsStyleAnimation, since their Units don't match.
   // In this case, we replace the eUnit_Coord 0 value with eUnit_Float 0 value.
-  if (*aValue1 == sZeroCoord &&
+  const nsStyleAnimation::Value& zeroCoord =
+    *GetZeroValueForUnit(nsStyleAnimation::eUnit_Coord);
+  if (*aValue1 == zeroCoord &&
       aValue2->GetUnit() == nsStyleAnimation::eUnit_Float) {
-    aValue1 = &sZeroFloat;
-  } else if (*aValue2 == sZeroCoord &&
+    aValue1 = GetZeroValueForUnit(nsStyleAnimation::eUnit_Float);
+  } else if (*aValue2 == zeroCoord &&
              aValue1->GetUnit() == nsStyleAnimation::eUnit_Float) {
-    aValue2 = &sZeroFloat;
+    aValue2 = GetZeroValueForUnit(nsStyleAnimation::eUnit_Float);
   }
 
   return true;

From ad0eb8954ecc9d248b8477657c1f8019bce113be Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 12 Aug 2013 10:13:34 -0400
Subject: [PATCH 66/98] Bug 903543 - eliminate static constructors for SMIL
 type singletons; r=dholbert

Add MOZ_CONSTEXPR to the constructors to inform the compiler the constructors
can be folded away.  Remove protected/private destructors so that static
destructors don't have to be registered with static constructors.
---
 content/smil/SMILBoolType.h                        | 6 ++----
 content/smil/SMILEnumType.h                        | 6 ++----
 content/smil/SMILIntegerType.h                     | 2 +-
 content/smil/SMILStringType.h                      | 6 ++----
 content/smil/nsISMILType.h                         | 8 +-------
 content/smil/nsSMILCSSValueType.h                  | 6 ++----
 content/smil/nsSMILFloatType.h                     | 6 ++----
 content/smil/nsSMILNullType.h                      | 6 ++----
 content/svg/content/src/SVGIntegerPairSMILType.h   | 6 ++----
 content/svg/content/src/SVGLengthListSMILType.h    | 6 ++----
 content/svg/content/src/SVGMotionSMILType.h        | 6 ++----
 content/svg/content/src/SVGNumberListSMILType.h    | 6 ++----
 content/svg/content/src/SVGNumberPairSMILType.h    | 6 ++----
 content/svg/content/src/SVGOrientSMILType.h        | 6 ++----
 content/svg/content/src/SVGPathSegListSMILType.h   | 6 ++----
 content/svg/content/src/SVGPointListSMILType.h     | 6 ++----
 content/svg/content/src/SVGTransformListSMILType.h | 6 ++----
 content/svg/content/src/SVGViewBoxSMILType.h       | 6 ++----
 18 files changed, 34 insertions(+), 72 deletions(-)

diff --git a/content/smil/SMILBoolType.h b/content/smil/SMILBoolType.h
index f90456bb9a8..f05191cf6e2 100644
--- a/content/smil/SMILBoolType.h
+++ b/content/smil/SMILBoolType.h
@@ -40,10 +40,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SMILBoolType()  {}
-  ~SMILBoolType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SMILBoolType() {}
 };
 
 } // namespace mozilla
diff --git a/content/smil/SMILEnumType.h b/content/smil/SMILEnumType.h
index 24438cdd68f..aa731255f3b 100644
--- a/content/smil/SMILEnumType.h
+++ b/content/smil/SMILEnumType.h
@@ -41,10 +41,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SMILEnumType()  {}
-  ~SMILEnumType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SMILEnumType() {}
 };
 
 } // namespace mozilla
diff --git a/content/smil/SMILIntegerType.h b/content/smil/SMILIntegerType.h
index b3593896cfd..08cfbc00f37 100644
--- a/content/smil/SMILIntegerType.h
+++ b/content/smil/SMILIntegerType.h
@@ -37,7 +37,7 @@ public:
   }
 
 private:
-  SMILIntegerType() {}
+  MOZ_CONSTEXPR SMILIntegerType() {}
 };
 
 } // namespace mozilla
diff --git a/content/smil/SMILStringType.h b/content/smil/SMILStringType.h
index c2709509f2d..4deb9d9c5f2 100644
--- a/content/smil/SMILStringType.h
+++ b/content/smil/SMILStringType.h
@@ -41,10 +41,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SMILStringType()  {}
-  ~SMILStringType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SMILStringType() {}
 };
 
 } // namespace mozilla
diff --git a/content/smil/nsISMILType.h b/content/smil/nsISMILType.h
index 57c5bc1a57d..be9fd9708eb 100644
--- a/content/smil/nsISMILType.h
+++ b/content/smil/nsISMILType.h
@@ -6,6 +6,7 @@
 #ifndef NS_ISMILTYPE_H_
 #define NS_ISMILTYPE_H_
 
+#include "mozilla/Attributes.h"
 #include "nscore.h"
 
 class nsSMILValue;
@@ -207,13 +208,6 @@ protected:
                                const nsSMILValue& aEndVal,
                                double aUnitDistance,
                                nsSMILValue& aResult) const = 0;
-
-  /**
-   * Protected destructor, to ensure that no one accidentally deletes an
-   * instance of this class.
-   * (The only instances in existence should be singletons - one per subclass.)
-   */
-  ~nsISMILType() {}
 };
 
 #endif // NS_ISMILTYPE_H_
diff --git a/content/smil/nsSMILCSSValueType.h b/content/smil/nsSMILCSSValueType.h
index 2016bd6f2a5..c04be8ab99e 100644
--- a/content/smil/nsSMILCSSValueType.h
+++ b/content/smil/nsSMILCSSValueType.h
@@ -98,10 +98,8 @@ public:
   static bool ValueToString(const nsSMILValue& aValue, nsAString& aString);
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  nsSMILCSSValueType()  {}
-  ~nsSMILCSSValueType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR nsSMILCSSValueType() {}
 };
 
 #endif // NS_SMILCSSVALUETYPE_H_
diff --git a/content/smil/nsSMILFloatType.h b/content/smil/nsSMILFloatType.h
index 0e4579130de..272af4b4eca 100644
--- a/content/smil/nsSMILFloatType.h
+++ b/content/smil/nsSMILFloatType.h
@@ -39,10 +39,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  nsSMILFloatType()  {}
-  ~nsSMILFloatType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR nsSMILFloatType() {}
 };
 
 #endif // NS_SMILFLOATTYPE_H_
diff --git a/content/smil/nsSMILNullType.h b/content/smil/nsSMILNullType.h
index 3c9172e6da3..2e6a4ef3a2f 100644
--- a/content/smil/nsSMILNullType.h
+++ b/content/smil/nsSMILNullType.h
@@ -42,10 +42,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  nsSMILNullType()  {}
-  ~nsSMILNullType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR nsSMILNullType() {}
 };
 
 #endif // NS_SMILNULLTYPE_H_
diff --git a/content/svg/content/src/SVGIntegerPairSMILType.h b/content/svg/content/src/SVGIntegerPairSMILType.h
index 50ecc4e7e6c..b7e96c731fa 100644
--- a/content/svg/content/src/SVGIntegerPairSMILType.h
+++ b/content/svg/content/src/SVGIntegerPairSMILType.h
@@ -43,10 +43,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGIntegerPairSMILType()  {}
-  ~SVGIntegerPairSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGIntegerPairSMILType() {}
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGLengthListSMILType.h b/content/svg/content/src/SVGLengthListSMILType.h
index 956d0cab0b8..5983de64872 100644
--- a/content/svg/content/src/SVGLengthListSMILType.h
+++ b/content/svg/content/src/SVGLengthListSMILType.h
@@ -91,10 +91,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGLengthListSMILType() {}
-  ~SVGLengthListSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGLengthListSMILType() {}
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGMotionSMILType.h b/content/svg/content/src/SVGMotionSMILType.h
index 561e8e017ae..6e4dccac091 100644
--- a/content/svg/content/src/SVGMotionSMILType.h
+++ b/content/svg/content/src/SVGMotionSMILType.h
@@ -71,10 +71,8 @@ public:
                                         float aRotateAngle);
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGMotionSMILType()  {}
-  ~SVGMotionSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGMotionSMILType() {}
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGNumberListSMILType.h b/content/svg/content/src/SVGNumberListSMILType.h
index 702da074521..7c08ae58589 100644
--- a/content/svg/content/src/SVGNumberListSMILType.h
+++ b/content/svg/content/src/SVGNumberListSMILType.h
@@ -45,10 +45,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGNumberListSMILType() {}
-  ~SVGNumberListSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGNumberListSMILType() {}
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGNumberPairSMILType.h b/content/svg/content/src/SVGNumberPairSMILType.h
index 49ad774f74e..6aad3aadaac 100644
--- a/content/svg/content/src/SVGNumberPairSMILType.h
+++ b/content/svg/content/src/SVGNumberPairSMILType.h
@@ -38,10 +38,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGNumberPairSMILType()  {}
-  ~SVGNumberPairSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGNumberPairSMILType() {}
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGOrientSMILType.h b/content/svg/content/src/SVGOrientSMILType.h
index 8aeeea019b4..2828a0d9127 100644
--- a/content/svg/content/src/SVGOrientSMILType.h
+++ b/content/svg/content/src/SVGOrientSMILType.h
@@ -58,10 +58,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGOrientSMILType()  {}
-  ~SVGOrientSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGOrientSMILType() {}
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGPathSegListSMILType.h b/content/svg/content/src/SVGPathSegListSMILType.h
index e1b6a0d189e..3d22f859738 100644
--- a/content/svg/content/src/SVGPathSegListSMILType.h
+++ b/content/svg/content/src/SVGPathSegListSMILType.h
@@ -49,10 +49,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGPathSegListSMILType() {}
-  ~SVGPathSegListSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGPathSegListSMILType() {}
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGPointListSMILType.h b/content/svg/content/src/SVGPointListSMILType.h
index 36e3c053bab..3086280418f 100644
--- a/content/svg/content/src/SVGPointListSMILType.h
+++ b/content/svg/content/src/SVGPointListSMILType.h
@@ -45,10 +45,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGPointListSMILType() {}
-  ~SVGPointListSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGPointListSMILType() {}
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGTransformListSMILType.h b/content/svg/content/src/SVGTransformListSMILType.h
index 2f3e58c0daf..c09e85f59a8 100644
--- a/content/svg/content/src/SVGTransformListSMILType.h
+++ b/content/svg/content/src/SVGTransformListSMILType.h
@@ -121,10 +121,8 @@ public:
 
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGTransformListSMILType() {}
-  ~SVGTransformListSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGTransformListSMILType() {}
 };
 
 } // end namespace mozilla
diff --git a/content/svg/content/src/SVGViewBoxSMILType.h b/content/svg/content/src/SVGViewBoxSMILType.h
index 53d6229366b..49ceb73f2dc 100644
--- a/content/svg/content/src/SVGViewBoxSMILType.h
+++ b/content/svg/content/src/SVGViewBoxSMILType.h
@@ -38,10 +38,8 @@ protected:
                                nsSMILValue& aResult) const MOZ_OVERRIDE;
 
 private:
-  // Private constructor & destructor: prevent instances beyond my singleton,
-  // and prevent others from deleting my singleton.
-  SVGViewBoxSMILType()  {}
-  ~SVGViewBoxSMILType() {}
+  // Private constructor: prevent instances beyond my singleton.
+  MOZ_CONSTEXPR SVGViewBoxSMILType() {}
 };
 
 } // namespace mozilla

From cad64ad955ecd484a3f508831fb5131f573f7b64 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Wed, 14 Aug 2013 09:43:36 -0400
Subject: [PATCH 67/98] Bug 905149 - make mozilla::CallStack constexpr to avoid
 static constructors; r=ehsan

---
 xpcom/glue/DeadlockDetector.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xpcom/glue/DeadlockDetector.h b/xpcom/glue/DeadlockDetector.h
index 2e3eac77e40..c8a5e9e13e5 100644
--- a/xpcom/glue/DeadlockDetector.h
+++ b/xpcom/glue/DeadlockDetector.h
@@ -31,9 +31,11 @@ private:
     typedef nsTMStackTraceID callstack_id;
     // needs to be a macro to avoid disturbing the backtrace
 #   define NS_GET_BACKTRACE() NS_TraceMallocGetStackTrace()
+#   define NS_DEADLOCK_DETECTOR_CONSTEXPR
 #else
     typedef void* callstack_id;
 #   define NS_GET_BACKTRACE() 0
+#   define NS_DEADLOCK_DETECTOR_CONSTEXPR MOZ_CONSTEXPR
 #endif  // ifdef NS_TRACE_MALLOC
 
     callstack_id mCallStack;
@@ -51,10 +53,12 @@ public:
      * constructor: it *will* construct a backtrace.  This can cause
      * unexpected performance issues.
      */
+    NS_DEADLOCK_DETECTOR_CONSTEXPR
     CallStack(const callstack_id aCallStack = NS_GET_BACKTRACE()) :
         mCallStack(aCallStack)
     {
     }
+    NS_DEADLOCK_DETECTOR_CONSTEXPR
     CallStack(const CallStack& aFrom) :
         mCallStack(aFrom.mCallStack)
     {

From b84528876798817f21ac2ec7d2518faf93b03ebb Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 14 Aug 2013 14:33:44 -0700
Subject: [PATCH 68/98] Bug 902550 - Disable more session restore code in e10s
 (r=ttaubert)

---
 .../components/sessionstore/src/SessionStore.jsm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/browser/components/sessionstore/src/SessionStore.jsm b/browser/components/sessionstore/src/SessionStore.jsm
index 288547ef82c..c1e2db64417 100644
--- a/browser/components/sessionstore/src/SessionStore.jsm
+++ b/browser/components/sessionstore/src/SessionStore.jsm
@@ -375,6 +375,12 @@ let SessionStoreInternal = {
       throw new Error("SessionStore.init() must be called with a valid window.");
     }
 
+    this._disabledForMultiProcess = Services.prefs.getBoolPref("browser.tabs.remote");
+    if (this._disabledForMultiProcess) {
+      this._deferredInitialized.resolve();
+      return;
+    }
+
     TelemetryTimestamps.add("sessionRestoreInitialized");
     OBSERVING.forEach(function(aTopic) {
       Services.obs.addObserver(this, aTopic, true);
@@ -382,7 +388,6 @@ let SessionStoreInternal = {
 
     this._initPrefs();
     this._initialized = true;
-    this._disabledForMultiProcess = this._prefBranch.getBoolPref("tabs.remote");
 
     // this pref is only read at startup, so no need to observe it
     this._sessionhistory_max_entries =
@@ -567,9 +572,6 @@ let SessionStoreInternal = {
    * Handle notifications
    */
   observe: function ssi_observe(aSubject, aTopic, aData) {
-    if (this._disabledForMultiProcess)
-      return;
-
     switch (aTopic) {
       case "domwindowopened": // catch new windows
         this.onOpen(aSubject);
@@ -1487,6 +1489,9 @@ let SessionStoreInternal = {
   },
 
   setNumberOfTabsClosedLast: function ssi_setNumberOfTabsClosedLast(aWindow, aNumber) {
+    if (this._disabledForMultiProcess)
+      return;
+
     if ("__SSi" in aWindow) {
       return NumberOfTabsClosedLastPerWindow.set(aWindow, aNumber);
     }
@@ -1496,6 +1501,9 @@ let SessionStoreInternal = {
 
   /* Used to undo batch tab-close operations. Defaults to 1. */
   getNumberOfTabsClosedLast: function ssi_getNumberOfTabsClosedLast(aWindow) {
+    if (this._disabledForMultiProcess)
+      return 0;
+
     if ("__SSi" in aWindow) {
       // Blank tabs cannot be undo-closed, so the number returned by
       // the NumberOfTabsClosedLastPerWindow can be greater than the

From a293b393e4d0e5e3608337da7ba0bb85703536fc Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 14 Aug 2013 14:48:32 -0700
Subject: [PATCH 69/98] Bug 902208 - Handle SIGINT in child processes (r=ted)

---
 toolkit/xre/nsSigHandlers.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp
index ddc630a5008..b0648b786bf 100644
--- a/toolkit/xre/nsSigHandlers.cpp
+++ b/toolkit/xre/nsSigHandlers.cpp
@@ -246,6 +246,15 @@ void InstallSignalHandlers(const char *ProgramName)
   sigaction(SIGFPE, &sa, &osa);
 #endif
 
+  if (XRE_GetProcessType() == GeckoProcessType_Content) {
+    /*
+     * If the user is debugging a Gecko parent process in gdb and hits ^C to
+     * suspend, a SIGINT signal will be sent to the child. We ignore this signal
+     * so the child isn't killed.
+     */
+    signal(SIGINT, SIG_IGN);
+  }
+
 #if defined(DEBUG) && defined(LINUX)
   const char *memLimit = PR_GetEnv("MOZ_MEM_LIMIT");
   if (memLimit && *memLimit)

From 2e50d1a2ff602f499a3bda90f78e82582459a349 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 14 Aug 2013 14:48:36 -0700
Subject: [PATCH 70/98] Bug 888898 - Avoid shutdown leaks with PC count
 profiling (r=bhackett)

---
 js/src/gc/RootMarking.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index a3491fae5e3..77848e7fbe0 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -713,7 +713,7 @@ js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots)
         }
 
         /* Do not discard scripts with counts while profiling. */
-        if (rt->profilingScripts && !rt->isHeapMinorCollecting()) {
+        if (rt->profilingScripts && rt->hasContexts() && !rt->isHeapMinorCollecting()) {
             for (CellIterUnderGC i(zone, FINALIZE_SCRIPT); !i.done(); i.next()) {
                 JSScript *script = i.get<JSScript>();
                 if (script->hasScriptCounts) {

From 0e9f41a62072c664769c63128e6e7eb2cbab54bc Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 14 Aug 2013 14:48:40 -0700
Subject: [PATCH 71/98] Bug 904282 - Don't mark atoms during last GC (r=jonco)

---
 js/src/gc/RootMarking.cpp | 10 ++++------
 js/src/jsatom.cpp         |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index 77848e7fbe0..88412186dc0 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -687,19 +687,17 @@ js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots)
             MarkScriptRoot(trc, &vec[i].script, "scriptAndCountsVector");
     }
 
-    if (!trc->runtime->isHeapMinorCollecting() &&
+    if (rt->hasContexts() &&
+        !trc->runtime->isHeapMinorCollecting() &&
         (!IS_GC_MARKING_TRACER(trc) || rt->atomsCompartment()->zone()->isCollecting()))
     {
         MarkAtoms(trc);
+        rt->staticStrings.trace(trc);
 #ifdef JS_ION
-        /* Any Ion wrappers survive until the runtime is being torn down. */
-        if (rt->hasContexts())
-            ion::IonRuntime::Mark(trc);
+        ion::IonRuntime::Mark(trc);
 #endif
     }
 
-    rt->staticStrings.trace(trc);
-
     for (ContextIter acx(rt); !acx.done(); acx.next())
         acx->mark(trc);
 
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index d5b90b86e9b..ecf52b03620 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -202,7 +202,7 @@ js::SweepAtoms(JSRuntime *rt)
         bool isDying = IsStringAboutToBeFinalized(&atom);
 
         /* Pinned or interned key cannot be finalized. */
-        JS_ASSERT_IF(entry.isTagged(), !isDying);
+        JS_ASSERT_IF(rt->hasContexts() && entry.isTagged(), !isDying);
 
         if (isDying)
             e.removeFront();

From c6ce65cf2eae81fa8703dbdd9f84ab83e0e033bd Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 14 Aug 2013 18:46:00 -0400
Subject: [PATCH 72/98] Bug 905409 - Minimize the Web Audio #includes; r=roc

---
 content/media/webaudio/AudioBuffer.cpp                   | 4 +---
 content/media/webaudio/AudioBuffer.h                     | 5 +++--
 content/media/webaudio/AudioBufferSourceNode.cpp         | 2 +-
 content/media/webaudio/AudioBufferSourceNode.h           | 4 ++--
 content/media/webaudio/AudioContext.h                    | 8 +++-----
 content/media/webaudio/AudioListener.cpp                 | 1 -
 content/media/webaudio/AudioListener.h                   | 2 --
 content/media/webaudio/AudioNode.cpp                     | 1 -
 content/media/webaudio/AudioNode.h                       | 9 +++------
 content/media/webaudio/AudioParam.cpp                    | 3 +--
 content/media/webaudio/AudioParam.h                      | 3 ---
 content/media/webaudio/AudioProcessingEvent.cpp          | 1 +
 content/media/webaudio/BiquadFilterNode.cpp              | 1 +
 content/media/webaudio/ChannelMergerNode.cpp             | 1 -
 content/media/webaudio/ChannelSplitterNode.cpp           | 1 -
 content/media/webaudio/ConvolverNode.cpp                 | 4 +---
 content/media/webaudio/ConvolverNode.h                   | 3 ++-
 content/media/webaudio/DelayNode.cpp                     | 1 +
 content/media/webaudio/DelayNode.h                       | 2 +-
 content/media/webaudio/FFTBlock.cpp                      | 2 --
 content/media/webaudio/MediaBufferDecoder.cpp            | 3 +--
 content/media/webaudio/MediaBufferDecoder.h              | 2 --
 content/media/webaudio/MediaElementAudioSourceNode.cpp   | 1 -
 content/media/webaudio/MediaElementAudioSourceNode.h     | 2 --
 .../media/webaudio/MediaStreamAudioDestinationNode.cpp   | 1 -
 content/media/webaudio/MediaStreamAudioDestinationNode.h | 2 --
 content/media/webaudio/OfflineAudioCompletionEvent.cpp   | 1 +
 content/media/webaudio/OfflineAudioCompletionEvent.h     | 3 ++-
 content/media/webaudio/PannerNode.cpp                    | 1 +
 content/media/webaudio/PannerNode.h                      | 3 ---
 content/media/webaudio/ScriptProcessorNode.h             | 4 ----
 content/media/webaudio/WaveShaperNode.h                  | 2 +-
 content/media/webaudio/WebAudioUtils.cpp                 | 1 +
 content/media/webaudio/WebAudioUtils.h                   | 6 ++++--
 content/media/webaudio/blink/Biquad.cpp                  | 1 -
 content/media/webaudio/blink/HRTFDatabaseLoader.cpp      | 1 -
 content/media/webaudio/blink/HRTFDatabaseLoader.h        | 8 +++++---
 content/media/webaudio/blink/HRTFPanner.cpp              | 1 +
 content/media/webaudio/blink/HRTFPanner.h                | 3 ++-
 content/media/webaudio/blink/Reverb.cpp                  | 1 +
 content/media/webaudio/blink/Reverb.h                    | 4 ++++
 content/media/webaudio/blink/ReverbConvolver.cpp         | 1 +
 content/media/webaudio/blink/ReverbConvolver.h           | 8 +-------
 content/media/webaudio/blink/ReverbConvolverStage.h      | 5 +++--
 44 files changed, 50 insertions(+), 73 deletions(-)

diff --git a/content/media/webaudio/AudioBuffer.cpp b/content/media/webaudio/AudioBuffer.cpp
index d917f667792..8cf4642d0c6 100644
--- a/content/media/webaudio/AudioBuffer.cpp
+++ b/content/media/webaudio/AudioBuffer.cpp
@@ -7,14 +7,12 @@
 #include "AudioBuffer.h"
 #include "mozilla/dom/AudioBufferBinding.h"
 #include "nsContentUtils.h"
-#include "AudioContext.h"
 #include "jsfriendapi.h"
 #include "mozilla/ErrorResult.h"
 #include "AudioSegment.h"
-#include "nsIScriptError.h"
-#include "nsPIDOMWindow.h"
 #include "AudioChannelFormat.h"
 #include "mozilla/PodOperations.h"
+#include "AudioNodeEngine.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/AudioBuffer.h b/content/media/webaudio/AudioBuffer.h
index 16736d9f433..18b02c63b8d 100644
--- a/content/media/webaudio/AudioBuffer.h
+++ b/content/media/webaudio/AudioBuffer.h
@@ -14,8 +14,6 @@
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 #include "AudioContext.h"
-#include "AudioSegment.h"
-#include "AudioNodeEngine.h"
 
 struct JSContext;
 class JSObject;
@@ -23,9 +21,12 @@ class JSObject;
 namespace mozilla {
 
 class ErrorResult;
+class ThreadSharedFloatArrayBufferList;
 
 namespace dom {
 
+class AudioContext;
+
 /**
  * An AudioBuffer keeps its data either in the mJSChannels objects, which
  * are Float32Arrays, or in mSharedChannels if the mJSChannels objects have
diff --git a/content/media/webaudio/AudioBufferSourceNode.cpp b/content/media/webaudio/AudioBufferSourceNode.cpp
index 90a84f54cac..cedb962e711 100644
--- a/content/media/webaudio/AudioBufferSourceNode.cpp
+++ b/content/media/webaudio/AudioBufferSourceNode.cpp
@@ -10,7 +10,7 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
 #include "AudioDestinationNode.h"
-#include "PannerNode.h"
+#include "AudioParamTimeline.h"
 #include "speex/speex_resampler.h"
 #include <limits>
 
diff --git a/content/media/webaudio/AudioBufferSourceNode.h b/content/media/webaudio/AudioBufferSourceNode.h
index 1c4df241118..0f2b30f4092 100644
--- a/content/media/webaudio/AudioBufferSourceNode.h
+++ b/content/media/webaudio/AudioBufferSourceNode.h
@@ -9,12 +9,12 @@
 
 #include "AudioNode.h"
 #include "AudioBuffer.h"
-#include "AudioParam.h"
-#include "mozilla/dom/BindingUtils.h"
 
 namespace mozilla {
 namespace dom {
 
+class AudioParam;
+
 class AudioBufferSourceNode : public AudioNode,
                               public MainThreadMediaStreamListener
 {
diff --git a/content/media/webaudio/AudioContext.h b/content/media/webaudio/AudioContext.h
index adce5c05bce..7e87703fe90 100644
--- a/content/media/webaudio/AudioContext.h
+++ b/content/media/webaudio/AudioContext.h
@@ -9,9 +9,7 @@
 
 #include "EnableWebAudioCheck.h"
 #include "MediaBufferDecoder.h"
-#include "MediaStreamGraph.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/AudioContextBinding.h"
 #include "mozilla/dom/TypedArray.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
@@ -19,7 +17,6 @@
 #include "nsDOMEventTargetHelper.h"
 #include "nsHashKeys.h"
 #include "nsTHashtable.h"
-#include "StreamBuffer.h"
 
 // X11 has a #define for CurrentTime. Unbelievable :-(.
 // See content/media/DOMMediaStream.h for more fun!
@@ -33,8 +30,10 @@ class nsPIDOMWindow;
 
 namespace mozilla {
 
+class DOMMediaStream;
 class ErrorResult;
-struct WebAudioDecodeJob;
+class MediaStream;
+class MediaStreamGraph;
 
 namespace dom {
 
@@ -55,7 +54,6 @@ class HTMLMediaElement;
 class MediaElementAudioSourceNode;
 class MediaStreamAudioDestinationNode;
 class MediaStreamAudioSourceNode;
-class OfflineRenderSuccessCallback;
 class PannerNode;
 class ScriptProcessorNode;
 class WaveShaperNode;
diff --git a/content/media/webaudio/AudioListener.cpp b/content/media/webaudio/AudioListener.cpp
index e659d9b9502..1d52a41673f 100644
--- a/content/media/webaudio/AudioListener.cpp
+++ b/content/media/webaudio/AudioListener.cpp
@@ -6,7 +6,6 @@
 
 #include "AudioListener.h"
 #include "AudioContext.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioListenerBinding.h"
 
 namespace mozilla {
diff --git a/content/media/webaudio/AudioListener.h b/content/media/webaudio/AudioListener.h
index bb38108cca5..48c9bd17223 100644
--- a/content/media/webaudio/AudioListener.h
+++ b/content/media/webaudio/AudioListener.h
@@ -23,8 +23,6 @@ namespace mozilla {
 
 namespace dom {
 
-class AudioContext;
-
 class AudioListener MOZ_FINAL : public nsWrapperCache,
                                 public EnableWebAudioCheck
 {
diff --git a/content/media/webaudio/AudioNode.cpp b/content/media/webaudio/AudioNode.cpp
index 012382116a2..afc52a58fae 100644
--- a/content/media/webaudio/AudioNode.cpp
+++ b/content/media/webaudio/AudioNode.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioNode.h"
-#include "AudioContext.h"
 #include "mozilla/ErrorResult.h"
 #include "AudioNodeStream.h"
 
diff --git a/content/media/webaudio/AudioNode.h b/content/media/webaudio/AudioNode.h
index 6f7c3a01521..2ee253abbfd 100644
--- a/content/media/webaudio/AudioNode.h
+++ b/content/media/webaudio/AudioNode.h
@@ -10,24 +10,21 @@
 #include "nsDOMEventTargetHelper.h"
 #include "mozilla/dom/AudioNodeBinding.h"
 #include "nsCycleCollectionParticipant.h"
-#include "mozilla/Attributes.h"
 #include "EnableWebAudioCheck.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 #include "AudioContext.h"
-#include "AudioParamTimeline.h"
 #include "MediaStreamGraph.h"
 #include "WebAudioUtils.h"
 
-struct JSContext;
-
 namespace mozilla {
 
-class ErrorResult;
-
 namespace dom {
 
+class AudioContext;
+class AudioBufferSourceNode;
 class AudioParam;
+class AudioParamTimeline;
 struct ThreeDPoint;
 
 template<class T>
diff --git a/content/media/webaudio/AudioParam.cpp b/content/media/webaudio/AudioParam.cpp
index 0b977c5a1bc..03d99698884 100644
--- a/content/media/webaudio/AudioParam.cpp
+++ b/content/media/webaudio/AudioParam.cpp
@@ -5,11 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioParam.h"
-#include "nsIDOMWindow.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioParamBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
+#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/AudioParam.h b/content/media/webaudio/AudioParam.h
index e735b59b22f..353aa96c466 100644
--- a/content/media/webaudio/AudioParam.h
+++ b/content/media/webaudio/AudioParam.h
@@ -10,16 +10,13 @@
 #include "AudioParamTimeline.h"
 #include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsCOMPtr.h"
 #include "EnableWebAudioCheck.h"
 #include "nsAutoPtr.h"
 #include "AudioNode.h"
 #include "mozilla/dom/TypedArray.h"
-#include "mozilla/Util.h"
 #include "WebAudioUtils.h"
 
 struct JSContext;
-class nsIDOMWindow;
 
 namespace mozilla {
 
diff --git a/content/media/webaudio/AudioProcessingEvent.cpp b/content/media/webaudio/AudioProcessingEvent.cpp
index 3da362d4122..34f5d76b74d 100644
--- a/content/media/webaudio/AudioProcessingEvent.cpp
+++ b/content/media/webaudio/AudioProcessingEvent.cpp
@@ -6,6 +6,7 @@
 
 #include "AudioProcessingEvent.h"
 #include "mozilla/dom/AudioProcessingEventBinding.h"
+#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/BiquadFilterNode.cpp b/content/media/webaudio/BiquadFilterNode.cpp
index 8f571004e2d..ca4aa346f70 100644
--- a/content/media/webaudio/BiquadFilterNode.cpp
+++ b/content/media/webaudio/BiquadFilterNode.cpp
@@ -11,6 +11,7 @@
 #include "WebAudioUtils.h"
 #include "blink/Biquad.h"
 #include "mozilla/Preferences.h"
+#include "AudioParamTimeline.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/ChannelMergerNode.cpp b/content/media/webaudio/ChannelMergerNode.cpp
index af78cc14a98..606e060adb2 100644
--- a/content/media/webaudio/ChannelMergerNode.cpp
+++ b/content/media/webaudio/ChannelMergerNode.cpp
@@ -8,7 +8,6 @@
 #include "mozilla/dom/ChannelMergerNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
-#include "mozilla/PodOperations.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/ChannelSplitterNode.cpp b/content/media/webaudio/ChannelSplitterNode.cpp
index 5bee0038ef4..2436f539ee2 100644
--- a/content/media/webaudio/ChannelSplitterNode.cpp
+++ b/content/media/webaudio/ChannelSplitterNode.cpp
@@ -8,7 +8,6 @@
 #include "mozilla/dom/ChannelSplitterNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
-#include "mozilla/PodOperations.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/ConvolverNode.cpp b/content/media/webaudio/ConvolverNode.cpp
index b0f46627fe0..bcd783cff0c 100644
--- a/content/media/webaudio/ConvolverNode.cpp
+++ b/content/media/webaudio/ConvolverNode.cpp
@@ -9,9 +9,7 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
 #include "blink/Reverb.h"
-
-#include <cmath>
-#include "nsMathUtils.h"
+#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/ConvolverNode.h b/content/media/webaudio/ConvolverNode.h
index 60d2ecd8647..3f2a2b870e1 100644
--- a/content/media/webaudio/ConvolverNode.h
+++ b/content/media/webaudio/ConvolverNode.h
@@ -9,11 +9,12 @@
 
 #include "AudioNode.h"
 #include "AudioBuffer.h"
-#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
 
+template <class T> class PlayingRefChangeHandler;
+
 class ConvolverNode : public AudioNode
 {
 public:
diff --git a/content/media/webaudio/DelayNode.cpp b/content/media/webaudio/DelayNode.cpp
index ae768061597..414c8c64766 100644
--- a/content/media/webaudio/DelayNode.cpp
+++ b/content/media/webaudio/DelayNode.cpp
@@ -11,6 +11,7 @@
 #include "AudioDestinationNode.h"
 #include "WebAudioUtils.h"
 #include "DelayProcessor.h"
+#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/DelayNode.h b/content/media/webaudio/DelayNode.h
index 372b9e55f36..923a651b089 100644
--- a/content/media/webaudio/DelayNode.h
+++ b/content/media/webaudio/DelayNode.h
@@ -9,12 +9,12 @@
 
 #include "AudioNode.h"
 #include "AudioParam.h"
-#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
 
 class AudioContext;
+template <class T> class PlayingRefChangeHandler;
 
 class DelayNode : public AudioNode
 {
diff --git a/content/media/webaudio/FFTBlock.cpp b/content/media/webaudio/FFTBlock.cpp
index 2d73fe5f9d5..ee378eb265b 100644
--- a/content/media/webaudio/FFTBlock.cpp
+++ b/content/media/webaudio/FFTBlock.cpp
@@ -30,8 +30,6 @@
 
 #include "FFTBlock.h"
 
-#include "AudioNodeEngine.h"
-
 #include <complex>
 
 namespace mozilla {
diff --git a/content/media/webaudio/MediaBufferDecoder.cpp b/content/media/webaudio/MediaBufferDecoder.cpp
index 1ac22e1bba1..a9133099a1d 100644
--- a/content/media/webaudio/MediaBufferDecoder.cpp
+++ b/content/media/webaudio/MediaBufferDecoder.cpp
@@ -8,6 +8,7 @@
 #include "AbstractMediaDecoder.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ReentrantMonitor.h"
+#include "mozilla/dom/AudioContextBinding.h"
 #include <speex/speex_resampler.h>
 #include "nsXPCOMCIDInternal.h"
 #include "nsComponentManagerUtils.h"
@@ -16,8 +17,6 @@
 #include "DecoderTraits.h"
 #include "AudioContext.h"
 #include "AudioBuffer.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIScriptContext.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIScriptError.h"
 #include "nsMimeTypes.h"
diff --git a/content/media/webaudio/MediaBufferDecoder.h b/content/media/webaudio/MediaBufferDecoder.h
index 0aa4d01a8a1..56bad005bbf 100644
--- a/content/media/webaudio/MediaBufferDecoder.h
+++ b/content/media/webaudio/MediaBufferDecoder.h
@@ -14,11 +14,9 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/dom/TypedArray.h"
-#include <utility>
 
 namespace mozilla {
 
-class MediaDecoderReader;
 namespace dom {
 class AudioBuffer;
 class AudioContext;
diff --git a/content/media/webaudio/MediaElementAudioSourceNode.cpp b/content/media/webaudio/MediaElementAudioSourceNode.cpp
index 4389650c167..e7c21c6972f 100644
--- a/content/media/webaudio/MediaElementAudioSourceNode.cpp
+++ b/content/media/webaudio/MediaElementAudioSourceNode.cpp
@@ -6,7 +6,6 @@
 
 #include "MediaElementAudioSourceNode.h"
 #include "mozilla/dom/MediaElementAudioSourceNodeBinding.h"
-#include "mozilla/dom/HTMLMediaElement.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/MediaElementAudioSourceNode.h b/content/media/webaudio/MediaElementAudioSourceNode.h
index de8d9d583b4..cdf51f62e46 100644
--- a/content/media/webaudio/MediaElementAudioSourceNode.h
+++ b/content/media/webaudio/MediaElementAudioSourceNode.h
@@ -12,8 +12,6 @@
 namespace mozilla {
 namespace dom {
 
-class HTMLMediaElement;
-
 class MediaElementAudioSourceNode : public MediaStreamAudioSourceNode
 {
 public:
diff --git a/content/media/webaudio/MediaStreamAudioDestinationNode.cpp b/content/media/webaudio/MediaStreamAudioDestinationNode.cpp
index c2e2b983200..cfa57bdc845 100644
--- a/content/media/webaudio/MediaStreamAudioDestinationNode.cpp
+++ b/content/media/webaudio/MediaStreamAudioDestinationNode.cpp
@@ -6,7 +6,6 @@
 
 #include "MediaStreamAudioDestinationNode.h"
 #include "nsIDocument.h"
-#include "mozilla/dom/AudioStreamTrack.h"
 #include "mozilla/dom/MediaStreamAudioDestinationNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
diff --git a/content/media/webaudio/MediaStreamAudioDestinationNode.h b/content/media/webaudio/MediaStreamAudioDestinationNode.h
index b9ecfdb4ed3..06d3da34d3b 100644
--- a/content/media/webaudio/MediaStreamAudioDestinationNode.h
+++ b/content/media/webaudio/MediaStreamAudioDestinationNode.h
@@ -10,8 +10,6 @@
 #include "AudioNode.h"
 
 namespace mozilla {
-class DOMMediaStream;
-
 namespace dom {
 
 class MediaStreamAudioDestinationNode : public AudioNode
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.cpp b/content/media/webaudio/OfflineAudioCompletionEvent.cpp
index 7df0f664c44..9687a0f9aee 100644
--- a/content/media/webaudio/OfflineAudioCompletionEvent.cpp
+++ b/content/media/webaudio/OfflineAudioCompletionEvent.cpp
@@ -6,6 +6,7 @@
 
 #include "OfflineAudioCompletionEvent.h"
 #include "mozilla/dom/OfflineAudioCompletionEventBinding.h"
+#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.h b/content/media/webaudio/OfflineAudioCompletionEvent.h
index 669aa4de867..7a8c8b55ebd 100644
--- a/content/media/webaudio/OfflineAudioCompletionEvent.h
+++ b/content/media/webaudio/OfflineAudioCompletionEvent.h
@@ -9,11 +9,12 @@
 
 #include "nsDOMEvent.h"
 #include "AudioBuffer.h"
-#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
 
+class AudioContext;
+
 class OfflineAudioCompletionEvent : public nsDOMEvent,
                                     public EnableWebAudioCheck
 {
diff --git a/content/media/webaudio/PannerNode.cpp b/content/media/webaudio/PannerNode.cpp
index 310fac6b49d..eda79dd31a2 100644
--- a/content/media/webaudio/PannerNode.cpp
+++ b/content/media/webaudio/PannerNode.cpp
@@ -10,6 +10,7 @@
 #include "AudioListener.h"
 #include "AudioBufferSourceNode.h"
 #include "blink/HRTFPanner.h"
+#include "blink/HRTFDatabaseLoader.h"
 
 using WebCore::HRTFDatabaseLoader;
 using WebCore::HRTFPanner;
diff --git a/content/media/webaudio/PannerNode.h b/content/media/webaudio/PannerNode.h
index 065d1d2d1d9..9d06f97191f 100644
--- a/content/media/webaudio/PannerNode.h
+++ b/content/media/webaudio/PannerNode.h
@@ -8,9 +8,6 @@
 #define PannerNode_h_
 
 #include "AudioNode.h"
-#include "AudioParam.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/TypedEnum.h"
 #include "mozilla/dom/PannerNodeBinding.h"
 #include "ThreeDPoint.h"
 #include "mozilla/WeakPtr.h"
diff --git a/content/media/webaudio/ScriptProcessorNode.h b/content/media/webaudio/ScriptProcessorNode.h
index 05e6cd25888..b8dbd358d30 100644
--- a/content/media/webaudio/ScriptProcessorNode.h
+++ b/content/media/webaudio/ScriptProcessorNode.h
@@ -11,13 +11,9 @@
 #include "nsAutoPtr.h"
 
 namespace mozilla {
-
-class AudioNodeStream;
-
 namespace dom {
 
 class AudioContext;
-class ScriptProcessorNodeEngine;
 class SharedBuffers;
 
 class ScriptProcessorNode : public AudioNode
diff --git a/content/media/webaudio/WaveShaperNode.h b/content/media/webaudio/WaveShaperNode.h
index 92fb0b4f623..3e0c7455ff7 100644
--- a/content/media/webaudio/WaveShaperNode.h
+++ b/content/media/webaudio/WaveShaperNode.h
@@ -8,8 +8,8 @@
 #define WaveShaperNode_h_
 
 #include "AudioNode.h"
-#include "AudioParam.h"
 #include "mozilla/dom/WaveShaperNodeBinding.h"
+#include "mozilla/dom/TypedArray.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/WebAudioUtils.cpp b/content/media/webaudio/WebAudioUtils.cpp
index ff4031f9403..f9ae8c26775 100644
--- a/content/media/webaudio/WebAudioUtils.cpp
+++ b/content/media/webaudio/WebAudioUtils.cpp
@@ -6,6 +6,7 @@
 
 #include "WebAudioUtils.h"
 #include "AudioNodeStream.h"
+#include "AudioParamTimeline.h"
 #include "blink/HRTFDatabaseLoader.h"
 
 namespace mozilla {
diff --git a/content/media/webaudio/WebAudioUtils.h b/content/media/webaudio/WebAudioUtils.h
index 4db5aaa02bf..777ce4135af 100644
--- a/content/media/webaudio/WebAudioUtils.h
+++ b/content/media/webaudio/WebAudioUtils.h
@@ -10,16 +10,18 @@
 #include <cmath>
 #include <limits>
 #include "mozilla/TypeTraits.h"
-#include "mozilla/Assertions.h"
-#include "AudioParamTimeline.h"
+#include "mozilla/FloatingPoint.h"
 #include "MediaSegment.h"
 
 namespace mozilla {
 
 class AudioNodeStream;
+class MediaStream;
 
 namespace dom {
 
+class AudioParamTimeline;
+
 struct WebAudioUtils {
   // This is an arbitrary large number used to protect against OOMs.
   // We can adjust it later if needed.
diff --git a/content/media/webaudio/blink/Biquad.cpp b/content/media/webaudio/blink/Biquad.cpp
index 894f82ab5bb..85513c986ac 100644
--- a/content/media/webaudio/blink/Biquad.cpp
+++ b/content/media/webaudio/blink/Biquad.cpp
@@ -30,7 +30,6 @@
 #include "Biquad.h"
 
 #include <algorithm>
-#include <stdio.h>
 
 namespace WebCore {
 
diff --git a/content/media/webaudio/blink/HRTFDatabaseLoader.cpp b/content/media/webaudio/blink/HRTFDatabaseLoader.cpp
index 1719b61d5ff..579810f004d 100644
--- a/content/media/webaudio/blink/HRTFDatabaseLoader.cpp
+++ b/content/media/webaudio/blink/HRTFDatabaseLoader.cpp
@@ -27,7 +27,6 @@
  */
 
 #include "HRTFDatabaseLoader.h"
-
 #include "HRTFDatabase.h"
 
 using namespace mozilla;
diff --git a/content/media/webaudio/blink/HRTFDatabaseLoader.h b/content/media/webaudio/blink/HRTFDatabaseLoader.h
index 004124c0fae..77dc8c93a19 100644
--- a/content/media/webaudio/blink/HRTFDatabaseLoader.h
+++ b/content/media/webaudio/blink/HRTFDatabaseLoader.h
@@ -29,11 +29,13 @@
 #ifndef HRTFDatabaseLoader_h
 #define HRTFDatabaseLoader_h
 
-#include "HRTFDatabase.h"
-#include "nsTHashtable.h"
+#include "nsHashKeys.h"
 #include "mozilla/RefPtr.h"
-#include "nsIThread.h"
 #include "mozilla/Mutex.h"
+#include "HRTFDatabase.h"
+
+template <class EntryType> class nsTHashtable;
+template <class T> class nsAutoRef;
 
 namespace WebCore {
 
diff --git a/content/media/webaudio/blink/HRTFPanner.cpp b/content/media/webaudio/blink/HRTFPanner.cpp
index 85c3fe9f769..a1489370611 100644
--- a/content/media/webaudio/blink/HRTFPanner.cpp
+++ b/content/media/webaudio/blink/HRTFPanner.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "HRTFPanner.h"
+#include "HRTFDatabaseLoader.h"
 
 #include "FFTConvolver.h"
 #include "HRTFDatabase.h"
diff --git a/content/media/webaudio/blink/HRTFPanner.h b/content/media/webaudio/blink/HRTFPanner.h
index 54146b38119..b787dd88d2d 100644
--- a/content/media/webaudio/blink/HRTFPanner.h
+++ b/content/media/webaudio/blink/HRTFPanner.h
@@ -26,7 +26,6 @@
 #define HRTFPanner_h
 
 #include "FFTConvolver.h"
-#include "HRTFDatabaseLoader.h"
 #include "DelayProcessor.h"
 
 namespace mozilla {
@@ -35,6 +34,8 @@ struct AudioChunk;
 
 namespace WebCore {
 
+class HRTFDatabaseLoader;
+
 using mozilla::AudioChunk;
 
 class HRTFPanner {
diff --git a/content/media/webaudio/blink/Reverb.cpp b/content/media/webaudio/blink/Reverb.cpp
index 9006d623cfe..213f38295a1 100644
--- a/content/media/webaudio/blink/Reverb.cpp
+++ b/content/media/webaudio/blink/Reverb.cpp
@@ -27,6 +27,7 @@
  */
 
 #include "Reverb.h"
+#include "ReverbConvolverStage.h"
 
 #include <math.h>
 #include "ReverbConvolver.h"
diff --git a/content/media/webaudio/blink/Reverb.h b/content/media/webaudio/blink/Reverb.h
index 939eeef874b..0c41e1ce7c3 100644
--- a/content/media/webaudio/blink/Reverb.h
+++ b/content/media/webaudio/blink/Reverb.h
@@ -32,6 +32,7 @@
 #include "ReverbConvolver.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
+#include "AudioSegment.h"
 
 namespace mozilla {
 class ThreadSharedFloatArrayBufferList;
@@ -39,6 +40,9 @@ class ThreadSharedFloatArrayBufferList;
 
 namespace WebCore {
 
+class DirectConvolver;
+class FFTConvolver;
+
 // Multi-channel convolution reverb with channel matrixing - one or more ReverbConvolver objects are used internally.
 
 class Reverb {
diff --git a/content/media/webaudio/blink/ReverbConvolver.cpp b/content/media/webaudio/blink/ReverbConvolver.cpp
index f5004e86e9c..891337d823a 100644
--- a/content/media/webaudio/blink/ReverbConvolver.cpp
+++ b/content/media/webaudio/blink/ReverbConvolver.cpp
@@ -27,6 +27,7 @@
  */
 
 #include "ReverbConvolver.h"
+#include "ReverbConvolverStage.h"
 
 using namespace mozilla;
 
diff --git a/content/media/webaudio/blink/ReverbConvolver.h b/content/media/webaudio/blink/ReverbConvolver.h
index abcf3202776..3c353b5fd7c 100644
--- a/content/media/webaudio/blink/ReverbConvolver.h
+++ b/content/media/webaudio/blink/ReverbConvolver.h
@@ -29,14 +29,8 @@
 #ifndef ReverbConvolver_h
 #define ReverbConvolver_h
 
-#include "DirectConvolver.h"
-#include "FFTConvolver.h"
 #include "ReverbAccumulationBuffer.h"
-#include "ReverbConvolverStage.h"
 #include "ReverbInputBuffer.h"
-#include "nsAutoPtr.h"
-#include "nsTArray.h"
-#include "nsCOMPtr.h"
 #ifdef LOG
 #undef LOG
 #endif
@@ -46,7 +40,7 @@
 
 namespace WebCore {
 
-class AudioChannel;
+class ReverbConvolverStage;
 
 class ReverbConvolver {
 public:
diff --git a/content/media/webaudio/blink/ReverbConvolverStage.h b/content/media/webaudio/blink/ReverbConvolverStage.h
index 51f9d2d8466..609e5b71ca6 100644
--- a/content/media/webaudio/blink/ReverbConvolverStage.h
+++ b/content/media/webaudio/blink/ReverbConvolverStage.h
@@ -29,6 +29,9 @@
 #ifndef ReverbConvolverStage_h
 #define ReverbConvolverStage_h
 
+#include "DirectConvolver.h"
+#include "FFTConvolver.h"
+
 #include "nsTArray.h"
 #include "mozilla/FFTBlock.h"
 
@@ -38,8 +41,6 @@ using mozilla::FFTBlock;
 
 class ReverbAccumulationBuffer;
 class ReverbConvolver;
-class FFTConvolver;
-class DirectConvolver;
 
 // A ReverbConvolverStage represents the convolution associated with a sub-section of a large impulse response.
 // It incorporates a delay line to account for the offset of the sub-section within the larger impulse response.

From ff5292b3eb54e33f3a04602f55996aa56c9facf7 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Wed, 14 Aug 2013 17:21:45 -0700
Subject: [PATCH 73/98] Backed out changeset 016fa89e49b0 (bug 905409) on a
 CLOSED TREE

---
 content/media/webaudio/AudioBuffer.cpp                 |  4 +++-
 content/media/webaudio/AudioBuffer.h                   |  5 ++---
 content/media/webaudio/AudioBufferSourceNode.cpp       |  2 +-
 content/media/webaudio/AudioBufferSourceNode.h         |  4 ++--
 content/media/webaudio/AudioContext.h                  |  8 +++++---
 content/media/webaudio/AudioListener.cpp               |  1 +
 content/media/webaudio/AudioListener.h                 |  2 ++
 content/media/webaudio/AudioNode.cpp                   |  1 +
 content/media/webaudio/AudioNode.h                     |  9 ++++++---
 content/media/webaudio/AudioParam.cpp                  |  3 ++-
 content/media/webaudio/AudioParam.h                    |  3 +++
 content/media/webaudio/AudioProcessingEvent.cpp        |  1 -
 content/media/webaudio/BiquadFilterNode.cpp            |  1 -
 content/media/webaudio/ChannelMergerNode.cpp           |  1 +
 content/media/webaudio/ChannelSplitterNode.cpp         |  1 +
 content/media/webaudio/ConvolverNode.cpp               |  4 +++-
 content/media/webaudio/ConvolverNode.h                 |  3 +--
 content/media/webaudio/DelayNode.cpp                   |  1 -
 content/media/webaudio/DelayNode.h                     |  2 +-
 content/media/webaudio/FFTBlock.cpp                    |  2 ++
 content/media/webaudio/MediaBufferDecoder.cpp          |  3 ++-
 content/media/webaudio/MediaBufferDecoder.h            |  2 ++
 content/media/webaudio/MediaElementAudioSourceNode.cpp |  1 +
 content/media/webaudio/MediaElementAudioSourceNode.h   |  2 ++
 .../media/webaudio/MediaStreamAudioDestinationNode.cpp |  1 +
 .../media/webaudio/MediaStreamAudioDestinationNode.h   |  2 ++
 content/media/webaudio/OfflineAudioCompletionEvent.cpp |  1 -
 content/media/webaudio/OfflineAudioCompletionEvent.h   |  3 +--
 content/media/webaudio/PannerNode.cpp                  |  1 -
 content/media/webaudio/PannerNode.h                    |  3 +++
 content/media/webaudio/ScriptProcessorNode.h           |  4 ++++
 content/media/webaudio/WaveShaperNode.h                |  2 +-
 content/media/webaudio/WebAudioUtils.cpp               |  1 -
 content/media/webaudio/WebAudioUtils.h                 |  6 ++----
 content/media/webaudio/blink/Biquad.cpp                |  1 +
 content/media/webaudio/blink/HRTFDatabaseLoader.cpp    |  1 +
 content/media/webaudio/blink/HRTFDatabaseLoader.h      | 10 ++++------
 content/media/webaudio/blink/HRTFPanner.cpp            |  1 -
 content/media/webaudio/blink/HRTFPanner.h              |  3 +--
 content/media/webaudio/blink/Reverb.cpp                |  1 -
 content/media/webaudio/blink/Reverb.h                  |  4 ----
 content/media/webaudio/blink/ReverbConvolver.cpp       |  1 -
 content/media/webaudio/blink/ReverbConvolver.h         |  8 +++++++-
 content/media/webaudio/blink/ReverbConvolverStage.h    |  5 ++---
 44 files changed, 74 insertions(+), 51 deletions(-)

diff --git a/content/media/webaudio/AudioBuffer.cpp b/content/media/webaudio/AudioBuffer.cpp
index 8cf4642d0c6..d917f667792 100644
--- a/content/media/webaudio/AudioBuffer.cpp
+++ b/content/media/webaudio/AudioBuffer.cpp
@@ -7,12 +7,14 @@
 #include "AudioBuffer.h"
 #include "mozilla/dom/AudioBufferBinding.h"
 #include "nsContentUtils.h"
+#include "AudioContext.h"
 #include "jsfriendapi.h"
 #include "mozilla/ErrorResult.h"
 #include "AudioSegment.h"
+#include "nsIScriptError.h"
+#include "nsPIDOMWindow.h"
 #include "AudioChannelFormat.h"
 #include "mozilla/PodOperations.h"
-#include "AudioNodeEngine.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/AudioBuffer.h b/content/media/webaudio/AudioBuffer.h
index 18b02c63b8d..16736d9f433 100644
--- a/content/media/webaudio/AudioBuffer.h
+++ b/content/media/webaudio/AudioBuffer.h
@@ -14,6 +14,8 @@
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 #include "AudioContext.h"
+#include "AudioSegment.h"
+#include "AudioNodeEngine.h"
 
 struct JSContext;
 class JSObject;
@@ -21,12 +23,9 @@ class JSObject;
 namespace mozilla {
 
 class ErrorResult;
-class ThreadSharedFloatArrayBufferList;
 
 namespace dom {
 
-class AudioContext;
-
 /**
  * An AudioBuffer keeps its data either in the mJSChannels objects, which
  * are Float32Arrays, or in mSharedChannels if the mJSChannels objects have
diff --git a/content/media/webaudio/AudioBufferSourceNode.cpp b/content/media/webaudio/AudioBufferSourceNode.cpp
index cedb962e711..90a84f54cac 100644
--- a/content/media/webaudio/AudioBufferSourceNode.cpp
+++ b/content/media/webaudio/AudioBufferSourceNode.cpp
@@ -10,7 +10,7 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
 #include "AudioDestinationNode.h"
-#include "AudioParamTimeline.h"
+#include "PannerNode.h"
 #include "speex/speex_resampler.h"
 #include <limits>
 
diff --git a/content/media/webaudio/AudioBufferSourceNode.h b/content/media/webaudio/AudioBufferSourceNode.h
index 0f2b30f4092..1c4df241118 100644
--- a/content/media/webaudio/AudioBufferSourceNode.h
+++ b/content/media/webaudio/AudioBufferSourceNode.h
@@ -9,12 +9,12 @@
 
 #include "AudioNode.h"
 #include "AudioBuffer.h"
+#include "AudioParam.h"
+#include "mozilla/dom/BindingUtils.h"
 
 namespace mozilla {
 namespace dom {
 
-class AudioParam;
-
 class AudioBufferSourceNode : public AudioNode,
                               public MainThreadMediaStreamListener
 {
diff --git a/content/media/webaudio/AudioContext.h b/content/media/webaudio/AudioContext.h
index 7e87703fe90..adce5c05bce 100644
--- a/content/media/webaudio/AudioContext.h
+++ b/content/media/webaudio/AudioContext.h
@@ -9,7 +9,9 @@
 
 #include "EnableWebAudioCheck.h"
 #include "MediaBufferDecoder.h"
+#include "MediaStreamGraph.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/dom/AudioContextBinding.h"
 #include "mozilla/dom/TypedArray.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
@@ -17,6 +19,7 @@
 #include "nsDOMEventTargetHelper.h"
 #include "nsHashKeys.h"
 #include "nsTHashtable.h"
+#include "StreamBuffer.h"
 
 // X11 has a #define for CurrentTime. Unbelievable :-(.
 // See content/media/DOMMediaStream.h for more fun!
@@ -30,10 +33,8 @@ class nsPIDOMWindow;
 
 namespace mozilla {
 
-class DOMMediaStream;
 class ErrorResult;
-class MediaStream;
-class MediaStreamGraph;
+struct WebAudioDecodeJob;
 
 namespace dom {
 
@@ -54,6 +55,7 @@ class HTMLMediaElement;
 class MediaElementAudioSourceNode;
 class MediaStreamAudioDestinationNode;
 class MediaStreamAudioSourceNode;
+class OfflineRenderSuccessCallback;
 class PannerNode;
 class ScriptProcessorNode;
 class WaveShaperNode;
diff --git a/content/media/webaudio/AudioListener.cpp b/content/media/webaudio/AudioListener.cpp
index 1d52a41673f..e659d9b9502 100644
--- a/content/media/webaudio/AudioListener.cpp
+++ b/content/media/webaudio/AudioListener.cpp
@@ -6,6 +6,7 @@
 
 #include "AudioListener.h"
 #include "AudioContext.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioListenerBinding.h"
 
 namespace mozilla {
diff --git a/content/media/webaudio/AudioListener.h b/content/media/webaudio/AudioListener.h
index 48c9bd17223..bb38108cca5 100644
--- a/content/media/webaudio/AudioListener.h
+++ b/content/media/webaudio/AudioListener.h
@@ -23,6 +23,8 @@ namespace mozilla {
 
 namespace dom {
 
+class AudioContext;
+
 class AudioListener MOZ_FINAL : public nsWrapperCache,
                                 public EnableWebAudioCheck
 {
diff --git a/content/media/webaudio/AudioNode.cpp b/content/media/webaudio/AudioNode.cpp
index afc52a58fae..012382116a2 100644
--- a/content/media/webaudio/AudioNode.cpp
+++ b/content/media/webaudio/AudioNode.cpp
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioNode.h"
+#include "AudioContext.h"
 #include "mozilla/ErrorResult.h"
 #include "AudioNodeStream.h"
 
diff --git a/content/media/webaudio/AudioNode.h b/content/media/webaudio/AudioNode.h
index 2ee253abbfd..6f7c3a01521 100644
--- a/content/media/webaudio/AudioNode.h
+++ b/content/media/webaudio/AudioNode.h
@@ -10,21 +10,24 @@
 #include "nsDOMEventTargetHelper.h"
 #include "mozilla/dom/AudioNodeBinding.h"
 #include "nsCycleCollectionParticipant.h"
+#include "mozilla/Attributes.h"
 #include "EnableWebAudioCheck.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 #include "AudioContext.h"
+#include "AudioParamTimeline.h"
 #include "MediaStreamGraph.h"
 #include "WebAudioUtils.h"
 
+struct JSContext;
+
 namespace mozilla {
 
+class ErrorResult;
+
 namespace dom {
 
-class AudioContext;
-class AudioBufferSourceNode;
 class AudioParam;
-class AudioParamTimeline;
 struct ThreeDPoint;
 
 template<class T>
diff --git a/content/media/webaudio/AudioParam.cpp b/content/media/webaudio/AudioParam.cpp
index 03d99698884..0b977c5a1bc 100644
--- a/content/media/webaudio/AudioParam.cpp
+++ b/content/media/webaudio/AudioParam.cpp
@@ -5,10 +5,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioParam.h"
+#include "nsIDOMWindow.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioParamBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
-#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/AudioParam.h b/content/media/webaudio/AudioParam.h
index 353aa96c466..e735b59b22f 100644
--- a/content/media/webaudio/AudioParam.h
+++ b/content/media/webaudio/AudioParam.h
@@ -10,13 +10,16 @@
 #include "AudioParamTimeline.h"
 #include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsCOMPtr.h"
 #include "EnableWebAudioCheck.h"
 #include "nsAutoPtr.h"
 #include "AudioNode.h"
 #include "mozilla/dom/TypedArray.h"
+#include "mozilla/Util.h"
 #include "WebAudioUtils.h"
 
 struct JSContext;
+class nsIDOMWindow;
 
 namespace mozilla {
 
diff --git a/content/media/webaudio/AudioProcessingEvent.cpp b/content/media/webaudio/AudioProcessingEvent.cpp
index 34f5d76b74d..3da362d4122 100644
--- a/content/media/webaudio/AudioProcessingEvent.cpp
+++ b/content/media/webaudio/AudioProcessingEvent.cpp
@@ -6,7 +6,6 @@
 
 #include "AudioProcessingEvent.h"
 #include "mozilla/dom/AudioProcessingEventBinding.h"
-#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/BiquadFilterNode.cpp b/content/media/webaudio/BiquadFilterNode.cpp
index ca4aa346f70..8f571004e2d 100644
--- a/content/media/webaudio/BiquadFilterNode.cpp
+++ b/content/media/webaudio/BiquadFilterNode.cpp
@@ -11,7 +11,6 @@
 #include "WebAudioUtils.h"
 #include "blink/Biquad.h"
 #include "mozilla/Preferences.h"
-#include "AudioParamTimeline.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/ChannelMergerNode.cpp b/content/media/webaudio/ChannelMergerNode.cpp
index 606e060adb2..af78cc14a98 100644
--- a/content/media/webaudio/ChannelMergerNode.cpp
+++ b/content/media/webaudio/ChannelMergerNode.cpp
@@ -8,6 +8,7 @@
 #include "mozilla/dom/ChannelMergerNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
+#include "mozilla/PodOperations.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/ChannelSplitterNode.cpp b/content/media/webaudio/ChannelSplitterNode.cpp
index 2436f539ee2..5bee0038ef4 100644
--- a/content/media/webaudio/ChannelSplitterNode.cpp
+++ b/content/media/webaudio/ChannelSplitterNode.cpp
@@ -8,6 +8,7 @@
 #include "mozilla/dom/ChannelSplitterNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
+#include "mozilla/PodOperations.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/ConvolverNode.cpp b/content/media/webaudio/ConvolverNode.cpp
index bcd783cff0c..b0f46627fe0 100644
--- a/content/media/webaudio/ConvolverNode.cpp
+++ b/content/media/webaudio/ConvolverNode.cpp
@@ -9,7 +9,9 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
 #include "blink/Reverb.h"
-#include "PlayingRefChangeHandler.h"
+
+#include <cmath>
+#include "nsMathUtils.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/ConvolverNode.h b/content/media/webaudio/ConvolverNode.h
index 3f2a2b870e1..60d2ecd8647 100644
--- a/content/media/webaudio/ConvolverNode.h
+++ b/content/media/webaudio/ConvolverNode.h
@@ -9,12 +9,11 @@
 
 #include "AudioNode.h"
 #include "AudioBuffer.h"
+#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
 
-template <class T> class PlayingRefChangeHandler;
-
 class ConvolverNode : public AudioNode
 {
 public:
diff --git a/content/media/webaudio/DelayNode.cpp b/content/media/webaudio/DelayNode.cpp
index 414c8c64766..ae768061597 100644
--- a/content/media/webaudio/DelayNode.cpp
+++ b/content/media/webaudio/DelayNode.cpp
@@ -11,7 +11,6 @@
 #include "AudioDestinationNode.h"
 #include "WebAudioUtils.h"
 #include "DelayProcessor.h"
-#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/DelayNode.h b/content/media/webaudio/DelayNode.h
index 923a651b089..372b9e55f36 100644
--- a/content/media/webaudio/DelayNode.h
+++ b/content/media/webaudio/DelayNode.h
@@ -9,12 +9,12 @@
 
 #include "AudioNode.h"
 #include "AudioParam.h"
+#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
 
 class AudioContext;
-template <class T> class PlayingRefChangeHandler;
 
 class DelayNode : public AudioNode
 {
diff --git a/content/media/webaudio/FFTBlock.cpp b/content/media/webaudio/FFTBlock.cpp
index ee378eb265b..2d73fe5f9d5 100644
--- a/content/media/webaudio/FFTBlock.cpp
+++ b/content/media/webaudio/FFTBlock.cpp
@@ -30,6 +30,8 @@
 
 #include "FFTBlock.h"
 
+#include "AudioNodeEngine.h"
+
 #include <complex>
 
 namespace mozilla {
diff --git a/content/media/webaudio/MediaBufferDecoder.cpp b/content/media/webaudio/MediaBufferDecoder.cpp
index a9133099a1d..1ac22e1bba1 100644
--- a/content/media/webaudio/MediaBufferDecoder.cpp
+++ b/content/media/webaudio/MediaBufferDecoder.cpp
@@ -8,7 +8,6 @@
 #include "AbstractMediaDecoder.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ReentrantMonitor.h"
-#include "mozilla/dom/AudioContextBinding.h"
 #include <speex/speex_resampler.h>
 #include "nsXPCOMCIDInternal.h"
 #include "nsComponentManagerUtils.h"
@@ -17,6 +16,8 @@
 #include "DecoderTraits.h"
 #include "AudioContext.h"
 #include "AudioBuffer.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIScriptContext.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIScriptError.h"
 #include "nsMimeTypes.h"
diff --git a/content/media/webaudio/MediaBufferDecoder.h b/content/media/webaudio/MediaBufferDecoder.h
index 56bad005bbf..0aa4d01a8a1 100644
--- a/content/media/webaudio/MediaBufferDecoder.h
+++ b/content/media/webaudio/MediaBufferDecoder.h
@@ -14,9 +14,11 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/dom/TypedArray.h"
+#include <utility>
 
 namespace mozilla {
 
+class MediaDecoderReader;
 namespace dom {
 class AudioBuffer;
 class AudioContext;
diff --git a/content/media/webaudio/MediaElementAudioSourceNode.cpp b/content/media/webaudio/MediaElementAudioSourceNode.cpp
index e7c21c6972f..4389650c167 100644
--- a/content/media/webaudio/MediaElementAudioSourceNode.cpp
+++ b/content/media/webaudio/MediaElementAudioSourceNode.cpp
@@ -6,6 +6,7 @@
 
 #include "MediaElementAudioSourceNode.h"
 #include "mozilla/dom/MediaElementAudioSourceNodeBinding.h"
+#include "mozilla/dom/HTMLMediaElement.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/MediaElementAudioSourceNode.h b/content/media/webaudio/MediaElementAudioSourceNode.h
index cdf51f62e46..de8d9d583b4 100644
--- a/content/media/webaudio/MediaElementAudioSourceNode.h
+++ b/content/media/webaudio/MediaElementAudioSourceNode.h
@@ -12,6 +12,8 @@
 namespace mozilla {
 namespace dom {
 
+class HTMLMediaElement;
+
 class MediaElementAudioSourceNode : public MediaStreamAudioSourceNode
 {
 public:
diff --git a/content/media/webaudio/MediaStreamAudioDestinationNode.cpp b/content/media/webaudio/MediaStreamAudioDestinationNode.cpp
index cfa57bdc845..c2e2b983200 100644
--- a/content/media/webaudio/MediaStreamAudioDestinationNode.cpp
+++ b/content/media/webaudio/MediaStreamAudioDestinationNode.cpp
@@ -6,6 +6,7 @@
 
 #include "MediaStreamAudioDestinationNode.h"
 #include "nsIDocument.h"
+#include "mozilla/dom/AudioStreamTrack.h"
 #include "mozilla/dom/MediaStreamAudioDestinationNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
diff --git a/content/media/webaudio/MediaStreamAudioDestinationNode.h b/content/media/webaudio/MediaStreamAudioDestinationNode.h
index 06d3da34d3b..b9ecfdb4ed3 100644
--- a/content/media/webaudio/MediaStreamAudioDestinationNode.h
+++ b/content/media/webaudio/MediaStreamAudioDestinationNode.h
@@ -10,6 +10,8 @@
 #include "AudioNode.h"
 
 namespace mozilla {
+class DOMMediaStream;
+
 namespace dom {
 
 class MediaStreamAudioDestinationNode : public AudioNode
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.cpp b/content/media/webaudio/OfflineAudioCompletionEvent.cpp
index 9687a0f9aee..7df0f664c44 100644
--- a/content/media/webaudio/OfflineAudioCompletionEvent.cpp
+++ b/content/media/webaudio/OfflineAudioCompletionEvent.cpp
@@ -6,7 +6,6 @@
 
 #include "OfflineAudioCompletionEvent.h"
 #include "mozilla/dom/OfflineAudioCompletionEventBinding.h"
-#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.h b/content/media/webaudio/OfflineAudioCompletionEvent.h
index 7a8c8b55ebd..669aa4de867 100644
--- a/content/media/webaudio/OfflineAudioCompletionEvent.h
+++ b/content/media/webaudio/OfflineAudioCompletionEvent.h
@@ -9,12 +9,11 @@
 
 #include "nsDOMEvent.h"
 #include "AudioBuffer.h"
+#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
 
-class AudioContext;
-
 class OfflineAudioCompletionEvent : public nsDOMEvent,
                                     public EnableWebAudioCheck
 {
diff --git a/content/media/webaudio/PannerNode.cpp b/content/media/webaudio/PannerNode.cpp
index eda79dd31a2..310fac6b49d 100644
--- a/content/media/webaudio/PannerNode.cpp
+++ b/content/media/webaudio/PannerNode.cpp
@@ -10,7 +10,6 @@
 #include "AudioListener.h"
 #include "AudioBufferSourceNode.h"
 #include "blink/HRTFPanner.h"
-#include "blink/HRTFDatabaseLoader.h"
 
 using WebCore::HRTFDatabaseLoader;
 using WebCore::HRTFPanner;
diff --git a/content/media/webaudio/PannerNode.h b/content/media/webaudio/PannerNode.h
index 9d06f97191f..065d1d2d1d9 100644
--- a/content/media/webaudio/PannerNode.h
+++ b/content/media/webaudio/PannerNode.h
@@ -8,6 +8,9 @@
 #define PannerNode_h_
 
 #include "AudioNode.h"
+#include "AudioParam.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/TypedEnum.h"
 #include "mozilla/dom/PannerNodeBinding.h"
 #include "ThreeDPoint.h"
 #include "mozilla/WeakPtr.h"
diff --git a/content/media/webaudio/ScriptProcessorNode.h b/content/media/webaudio/ScriptProcessorNode.h
index b8dbd358d30..05e6cd25888 100644
--- a/content/media/webaudio/ScriptProcessorNode.h
+++ b/content/media/webaudio/ScriptProcessorNode.h
@@ -11,9 +11,13 @@
 #include "nsAutoPtr.h"
 
 namespace mozilla {
+
+class AudioNodeStream;
+
 namespace dom {
 
 class AudioContext;
+class ScriptProcessorNodeEngine;
 class SharedBuffers;
 
 class ScriptProcessorNode : public AudioNode
diff --git a/content/media/webaudio/WaveShaperNode.h b/content/media/webaudio/WaveShaperNode.h
index 3e0c7455ff7..92fb0b4f623 100644
--- a/content/media/webaudio/WaveShaperNode.h
+++ b/content/media/webaudio/WaveShaperNode.h
@@ -8,8 +8,8 @@
 #define WaveShaperNode_h_
 
 #include "AudioNode.h"
+#include "AudioParam.h"
 #include "mozilla/dom/WaveShaperNodeBinding.h"
-#include "mozilla/dom/TypedArray.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/media/webaudio/WebAudioUtils.cpp b/content/media/webaudio/WebAudioUtils.cpp
index f9ae8c26775..ff4031f9403 100644
--- a/content/media/webaudio/WebAudioUtils.cpp
+++ b/content/media/webaudio/WebAudioUtils.cpp
@@ -6,7 +6,6 @@
 
 #include "WebAudioUtils.h"
 #include "AudioNodeStream.h"
-#include "AudioParamTimeline.h"
 #include "blink/HRTFDatabaseLoader.h"
 
 namespace mozilla {
diff --git a/content/media/webaudio/WebAudioUtils.h b/content/media/webaudio/WebAudioUtils.h
index 777ce4135af..4db5aaa02bf 100644
--- a/content/media/webaudio/WebAudioUtils.h
+++ b/content/media/webaudio/WebAudioUtils.h
@@ -10,18 +10,16 @@
 #include <cmath>
 #include <limits>
 #include "mozilla/TypeTraits.h"
-#include "mozilla/FloatingPoint.h"
+#include "mozilla/Assertions.h"
+#include "AudioParamTimeline.h"
 #include "MediaSegment.h"
 
 namespace mozilla {
 
 class AudioNodeStream;
-class MediaStream;
 
 namespace dom {
 
-class AudioParamTimeline;
-
 struct WebAudioUtils {
   // This is an arbitrary large number used to protect against OOMs.
   // We can adjust it later if needed.
diff --git a/content/media/webaudio/blink/Biquad.cpp b/content/media/webaudio/blink/Biquad.cpp
index 85513c986ac..894f82ab5bb 100644
--- a/content/media/webaudio/blink/Biquad.cpp
+++ b/content/media/webaudio/blink/Biquad.cpp
@@ -30,6 +30,7 @@
 #include "Biquad.h"
 
 #include <algorithm>
+#include <stdio.h>
 
 namespace WebCore {
 
diff --git a/content/media/webaudio/blink/HRTFDatabaseLoader.cpp b/content/media/webaudio/blink/HRTFDatabaseLoader.cpp
index 579810f004d..1719b61d5ff 100644
--- a/content/media/webaudio/blink/HRTFDatabaseLoader.cpp
+++ b/content/media/webaudio/blink/HRTFDatabaseLoader.cpp
@@ -27,6 +27,7 @@
  */
 
 #include "HRTFDatabaseLoader.h"
+
 #include "HRTFDatabase.h"
 
 using namespace mozilla;
diff --git a/content/media/webaudio/blink/HRTFDatabaseLoader.h b/content/media/webaudio/blink/HRTFDatabaseLoader.h
index 77dc8c93a19..004124c0fae 100644
--- a/content/media/webaudio/blink/HRTFDatabaseLoader.h
+++ b/content/media/webaudio/blink/HRTFDatabaseLoader.h
@@ -29,13 +29,11 @@
 #ifndef HRTFDatabaseLoader_h
 #define HRTFDatabaseLoader_h
 
-#include "nsHashKeys.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/Mutex.h"
 #include "HRTFDatabase.h"
-
-template <class EntryType> class nsTHashtable;
-template <class T> class nsAutoRef;
+#include "nsTHashtable.h"
+#include "mozilla/RefPtr.h"
+#include "nsIThread.h"
+#include "mozilla/Mutex.h"
 
 namespace WebCore {
 
diff --git a/content/media/webaudio/blink/HRTFPanner.cpp b/content/media/webaudio/blink/HRTFPanner.cpp
index a1489370611..85c3fe9f769 100644
--- a/content/media/webaudio/blink/HRTFPanner.cpp
+++ b/content/media/webaudio/blink/HRTFPanner.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "HRTFPanner.h"
-#include "HRTFDatabaseLoader.h"
 
 #include "FFTConvolver.h"
 #include "HRTFDatabase.h"
diff --git a/content/media/webaudio/blink/HRTFPanner.h b/content/media/webaudio/blink/HRTFPanner.h
index b787dd88d2d..54146b38119 100644
--- a/content/media/webaudio/blink/HRTFPanner.h
+++ b/content/media/webaudio/blink/HRTFPanner.h
@@ -26,6 +26,7 @@
 #define HRTFPanner_h
 
 #include "FFTConvolver.h"
+#include "HRTFDatabaseLoader.h"
 #include "DelayProcessor.h"
 
 namespace mozilla {
@@ -34,8 +35,6 @@ struct AudioChunk;
 
 namespace WebCore {
 
-class HRTFDatabaseLoader;
-
 using mozilla::AudioChunk;
 
 class HRTFPanner {
diff --git a/content/media/webaudio/blink/Reverb.cpp b/content/media/webaudio/blink/Reverb.cpp
index 213f38295a1..9006d623cfe 100644
--- a/content/media/webaudio/blink/Reverb.cpp
+++ b/content/media/webaudio/blink/Reverb.cpp
@@ -27,7 +27,6 @@
  */
 
 #include "Reverb.h"
-#include "ReverbConvolverStage.h"
 
 #include <math.h>
 #include "ReverbConvolver.h"
diff --git a/content/media/webaudio/blink/Reverb.h b/content/media/webaudio/blink/Reverb.h
index 0c41e1ce7c3..939eeef874b 100644
--- a/content/media/webaudio/blink/Reverb.h
+++ b/content/media/webaudio/blink/Reverb.h
@@ -32,7 +32,6 @@
 #include "ReverbConvolver.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
-#include "AudioSegment.h"
 
 namespace mozilla {
 class ThreadSharedFloatArrayBufferList;
@@ -40,9 +39,6 @@ class ThreadSharedFloatArrayBufferList;
 
 namespace WebCore {
 
-class DirectConvolver;
-class FFTConvolver;
-
 // Multi-channel convolution reverb with channel matrixing - one or more ReverbConvolver objects are used internally.
 
 class Reverb {
diff --git a/content/media/webaudio/blink/ReverbConvolver.cpp b/content/media/webaudio/blink/ReverbConvolver.cpp
index 891337d823a..f5004e86e9c 100644
--- a/content/media/webaudio/blink/ReverbConvolver.cpp
+++ b/content/media/webaudio/blink/ReverbConvolver.cpp
@@ -27,7 +27,6 @@
  */
 
 #include "ReverbConvolver.h"
-#include "ReverbConvolverStage.h"
 
 using namespace mozilla;
 
diff --git a/content/media/webaudio/blink/ReverbConvolver.h b/content/media/webaudio/blink/ReverbConvolver.h
index 3c353b5fd7c..abcf3202776 100644
--- a/content/media/webaudio/blink/ReverbConvolver.h
+++ b/content/media/webaudio/blink/ReverbConvolver.h
@@ -29,8 +29,14 @@
 #ifndef ReverbConvolver_h
 #define ReverbConvolver_h
 
+#include "DirectConvolver.h"
+#include "FFTConvolver.h"
 #include "ReverbAccumulationBuffer.h"
+#include "ReverbConvolverStage.h"
 #include "ReverbInputBuffer.h"
+#include "nsAutoPtr.h"
+#include "nsTArray.h"
+#include "nsCOMPtr.h"
 #ifdef LOG
 #undef LOG
 #endif
@@ -40,7 +46,7 @@
 
 namespace WebCore {
 
-class ReverbConvolverStage;
+class AudioChannel;
 
 class ReverbConvolver {
 public:
diff --git a/content/media/webaudio/blink/ReverbConvolverStage.h b/content/media/webaudio/blink/ReverbConvolverStage.h
index 609e5b71ca6..51f9d2d8466 100644
--- a/content/media/webaudio/blink/ReverbConvolverStage.h
+++ b/content/media/webaudio/blink/ReverbConvolverStage.h
@@ -29,9 +29,6 @@
 #ifndef ReverbConvolverStage_h
 #define ReverbConvolverStage_h
 
-#include "DirectConvolver.h"
-#include "FFTConvolver.h"
-
 #include "nsTArray.h"
 #include "mozilla/FFTBlock.h"
 
@@ -41,6 +38,8 @@ using mozilla::FFTBlock;
 
 class ReverbAccumulationBuffer;
 class ReverbConvolver;
+class FFTConvolver;
+class DirectConvolver;
 
 // A ReverbConvolverStage represents the convolution associated with a sub-section of a large impulse response.
 // It incorporates a delay line to account for the offset of the sub-section within the larger impulse response.

From c089ae373d868b529b24044f7beda34c80551aa3 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 14 Aug 2013 08:40:25 -0700
Subject: [PATCH 74/98] Bug 850380 - Derecursify and optimize XPIDL processing
 and move into precompile tier; r=glandium

---
 browser/components/places/moz.build           |   4 -
 browser/components/places/src/moz.build       |   4 -
 config/config.mk                              |   9 +-
 config/makefiles/precompile/Makefile.in       |  12 +-
 config/makefiles/xpidl/Makefile.in            |  84 ++++++++++++++
 config/rules.mk                               | 104 +++---------------
 dom/activities/interfaces/moz.build           |   6 -
 dom/alarm/moz.build                           |   4 -
 dom/base/moz.build                            |   5 -
 dom/camera/moz.build                          |   7 --
 dom/cellbroadcast/interfaces/moz.build        |   6 -
 dom/file/moz.build                            |   6 -
 dom/fm/moz.build                              |   4 -
 dom/icc/interfaces/moz.build                  |   6 -
 dom/indexedDB/moz.build                       |   5 -
 dom/interfaces/apps/moz.build                 |   5 -
 dom/interfaces/base/moz.build                 |   4 -
 dom/interfaces/contacts/moz.build             |   5 -
 dom/interfaces/core/moz.build                 |   4 -
 dom/interfaces/css/moz.build                  |   5 -
 dom/interfaces/devicestorage/moz.build        |   5 -
 dom/interfaces/events/moz.build               |   4 -
 dom/interfaces/geolocation/moz.build          |   4 -
 dom/interfaces/html/moz.build                 |   5 -
 dom/interfaces/json/moz.build                 |   4 -
 dom/interfaces/notification/moz.build         |   4 -
 dom/interfaces/offline/moz.build              |   4 -
 dom/interfaces/permission/moz.build           |   4 -
 dom/interfaces/range/moz.build                |   4 -
 dom/interfaces/settings/moz.build             |   5 -
 dom/interfaces/smil/moz.build                 |   7 --
 dom/interfaces/storage/moz.build              |   5 -
 dom/interfaces/stylesheets/moz.build          |   4 -
 dom/interfaces/svg/moz.build                  |   6 -
 dom/interfaces/traversal/moz.build            |   4 -
 dom/interfaces/xbl/moz.build                  |   4 -
 dom/interfaces/xpath/moz.build                |   5 -
 dom/interfaces/xul/moz.build                  |   6 -
 dom/messages/interfaces/moz.build             |   4 -
 dom/mobilemessage/interfaces/moz.build        |   6 -
 dom/network/interfaces/moz.build              |   6 -
 dom/payment/interfaces/moz.build              |   4 -
 dom/system/gonk/moz.build                     |   4 -
 dom/telephony/moz.build                       |   6 -
 dom/voicemail/moz.build                       |   6 -
 dom/wifi/moz.build                            |   7 --
 hal/moz.build                                 |   2 +-
 js/src/config/config.mk                       |   9 +-
 js/src/config/rules.mk                        | 104 +++---------------
 js/xpconnect/tests/idl/Makefile.in            |   2 +-
 netwerk/mime/moz.build                        |   4 -
 netwerk/protocol/file/moz.build               |   4 -
 netwerk/protocol/http/moz.build               |   4 -
 netwerk/protocol/res/moz.build                |   4 -
 netwerk/protocol/viewsource/moz.build         |   4 -
 netwerk/protocol/wyciwyg/moz.build            |   4 -
 netwerk/streamconv/public/moz.build           |   4 -
 .../mozbuild/mozbuild/action/xpidl-process.py |  92 ++++++++++++++++
 python/mozbuild/mozbuild/backend/common.py    |  58 ++++++++++
 .../mozbuild/backend/configenvironment.py     |   4 +-
 .../mozbuild/backend/recursivemake.py         |  91 ++++++++++++++-
 python/mozbuild/mozbuild/frontend/data.py     |  18 +++
 python/mozbuild/mozbuild/frontend/emitter.py  |  41 ++++++-
 .../mozbuild/frontend/sandbox_symbols.py      |  14 +--
 .../mozbuild/mozbuild/test/backend/common.py  |   9 +-
 .../backend/data/variable_passthru/moz.build  |   4 +-
 .../xpidl/config/makefiles/xpidl/Makefile.in  |   0
 .../test/backend/data/xpidl/moz.build         |   6 +
 .../test/backend/test_recursivemake.py        |  41 ++++---
 .../frontend/data/variable-passthru/moz.build |   4 +-
 .../mozbuild/test/frontend/test_emitter.py    |   6 +-
 toolkit/crashreporter/test/Makefile.in        |   1 -
 xpcom/idl-parser/Makefile.in                  |  14 ++-
 73 files changed, 479 insertions(+), 485 deletions(-)
 create mode 100644 config/makefiles/xpidl/Makefile.in
 create mode 100755 python/mozbuild/mozbuild/action/xpidl-process.py
 create mode 100644 python/mozbuild/mozbuild/backend/common.py
 create mode 100644 python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in
 create mode 100644 python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build

diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build
index 003d9ed15d7..3ff7a9666b7 100644
--- a/browser/components/places/moz.build
+++ b/browser/components/places/moz.build
@@ -7,7 +7,3 @@
 DIRS += ['src']
 TEST_DIRS += ['tests']
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/browser/components/',
-]
-
diff --git a/browser/components/places/src/moz.build b/browser/components/places/src/moz.build
index 1648374d569..58c9712f49b 100644
--- a/browser/components/places/src/moz.build
+++ b/browser/components/places/src/moz.build
@@ -4,10 +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/.
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/browser/components',
-]
-
 EXTRA_COMPONENTS += [
     'BrowserPlaces.manifest',
     'PlacesProtocolHandler.js',
diff --git a/config/config.mk b/config/config.mk
index 42fd0423d0a..d9c43946d58 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -364,7 +364,6 @@ MY_RULES	:= $(DEPTH)/config/myrules.mk
 # Default command macros; can be overridden in <arch>.mk.
 #
 CCC = $(CXX)
-XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
@@ -521,12 +520,8 @@ endif
 endif
 
 # Default location of include files
-IDL_DIR		= $(DIST)/idl
-
-XPIDL_FLAGS += -I$(srcdir) -I$(IDL_DIR)
-ifdef LIBXUL_SDK
-XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
-endif
+IDL_PARSER_DIR = $(topsrcdir)/xpcom/idl-parser
+IDL_PARSER_CACHE_DIR = $(DEPTH)/xpcom/idl-parser
 
 SDK_LIB_DIR = $(DIST)/sdk/lib
 SDK_BIN_DIR = $(DIST)/sdk/bin
diff --git a/config/makefiles/precompile/Makefile.in b/config/makefiles/precompile/Makefile.in
index 09355d72d2b..ecfd77095db 100644
--- a/config/makefiles/precompile/Makefile.in
+++ b/config/makefiles/precompile/Makefile.in
@@ -15,17 +15,19 @@ SUPPRESS_DEFAULT_RULES := 1
 
 include $(topsrcdir)/config/rules.mk
 
+# We don't print the build status messages unless we're in a top level build
+# otherwise the output is unexpected and it confuses downstream parsers.
 define make_subtier_dir
 @echo "BUILDSTATUS SUBTIER_START precompile $(1)"
-$(MAKE) -C $(2) $(3)
++$(MAKE) -C $(2) $(3)
 @echo "BUILDSTATUS SUBTIER_FINISH precompile $(1)"
 
 endef
 
 export::
-	@echo "BUILDSTATUS SUBTIERS IPDL WebIDL"
+	@echo "BUILDSTATUS SUBTIERS IPDL WebIDL XPIDL"
 
-export:: ipdl webidl xpidl-parser
+export:: ipdl webidl xpidl-parser xpidl
 
 ipdl:
 	$(call make_subtier_dir,IPDL,$(DEPTH)/ipc/ipdl,ipdl)
@@ -35,3 +37,7 @@ webidl:
 
 xpidl-parser:
 	$(call make_subtier_dir,XPIDLParser,$(DEPTH)/xpcom/idl-parser,xpidl-parser)
+
+xpidl: xpidl-parser
+	$(call py_action,process_install_manifest,$(DIST)/idl $(DEPTH)/_build_manifests/install/dist_idl)
+	$(call make_subtier_dir,XPIDL,$(DEPTH)/config/makefiles/xpidl,xpidl)
diff --git a/config/makefiles/xpidl/Makefile.in b/config/makefiles/xpidl/Makefile.in
new file mode 100644
index 00000000000..fba4c3615dc
--- /dev/null
+++ b/config/makefiles/xpidl/Makefile.in
@@ -0,0 +1,84 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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
+
+SUPPRESS_DEFAULT_RULES := 1
+STANDALONE_MAKEFILE := 1
+
+include $(topsrcdir)/config/rules.mk
+
+# Building XPIDLs effectively consists of two steps:
+#
+#   1) Staging all .idl files to a common directory.
+#   2) Doing everything with the .idl files.
+#
+# Each .idl file is processed into a .h file and typelib information.
+# The .h file shares the same stem as the input file and is installed
+# in the common headers include directory.
+#
+# XPIDL files are logically grouped together by modules. The typelib
+# information for all XPIDLs in the same module is linked together into
+# an .xpt file having the name of the module.
+#
+# As an optimization to reduce overall CPU usage, we process all .idl
+# belonging to a module with a single command invocation. This prevents
+# redundant parsing of .idl files and significantly reduces CPU cycles.
+#
+# Future improvement: Headers are currently written to a local directory then
+# installed in the distribution directory. It is preferable to write headers
+# directly into the distribution directory. However, PGO builds remove the dist
+# directory via rm -rf (with no regards to manifests). Since the cost of
+# processing XPIDL files is not trivial, it is preferrable to cache the headers
+# and reinstall them rather than regenerate them. Ideally the dist pruning is
+# performed with manifests. At that time we can write headers directly to the
+# dist directory.
+
+# For dependency files.
+idl_deps_dir := .deps
+
+# Where generated headers go.
+idl_headers_dir := headers
+
+# Where we put our final, linked .xpt files.
+idl_xpt_dir := xpt
+
+dist_idl_dir := $(DIST)/idl
+dist_include_dir := $(DIST)/include
+process_py := $(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py
+
+# TODO we should use py_action, but that would require extra directories to be
+# in the virtualenv.
+idlprocess := $(PYTHON_PATH) $(PLY_INCLUDE) -I$(IDL_PARSER_DIR) -I$(IDL_PARSER_CACHE_DIR) \
+    $(process_py) --cache-dir $(IDL_PARSER_CACHE_DIR) $(dist_idl_dir) \
+        $(idl_headers_dir) $(idl_xpt_dir) $(idl_deps_dir)
+
+xpidl_headers := @xpidl_headers@
+xpidl_modules := @xpidl_modules@
+
+@xpidl_rules@
+
+dist_headers := $(addprefix $(dist_include_dir)/,$(xpidl_headers))
+linked_xpt_files := $(addprefix $(idl_xpt_dir)/,$(addsuffix .xpt,$(xpidl_modules)))
+depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp)
+
+$(dist_headers): $(dist_include_dir)/%.h: $(idl_headers_dir)/%.h
+	$(INSTALL) $< $(dist_include_dir)
+
+xpidl:: $(linked_xpt_files) $(dist_headers)
+
+$(linked_xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(idl_headers_dir) $(idl_xpt_dir))
+
+ifdef .PYMAKE
+-includedeps $(depends_files)
+else
+-include $(depends_files)
+endif
+
+.PHONY: xpidl
diff --git a/config/rules.mk b/config/rules.mk
index 86b9c71d49f..eb62a762201 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -33,6 +33,10 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   XPIDL_MODULE \
   $(NULL)
 
+_DEPRECATED_VARIABLES := \
+  XPIDL_FLAGS \
+  $(NULL)
+
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
 # Using $(firstword) may not be perfect. But it should be good enough for most
 # scenarios.
@@ -42,6 +46,10 @@ $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES),$(if $($(var)),\
     $(error Variable $(var) is defined in $(_current_makefile). It should only be defined in moz.build files),\
     ))
 
+$(foreach var,$(_DEPRECATED_VARIABLES),$(if $($(var)),\
+    $(error Variable $(var) is defined in $(_current_makefile). This variable has been deprecated. It does nothing. It must be removed in order to build)\
+    ))
+
 ifneq (,$(XPIDLSRCS)$(SDK_XPIDLSRCS))
     $(error XPIDLSRCS and SDK_XPIDLSRCS have been merged and moved to moz.build files as the XPIDL_SOURCES variable. You must move these variables out of $(_current_makefile))
 endif
@@ -417,8 +425,6 @@ ifeq ($(SOLARIS_SUNPRO_CXX),1)
 GARBAGE_DIRS += SunWS_cache
 endif
 
-XPIDL_GEN_DIR		= _xpidlgen
-
 ifdef MOZ_UPDATE_XTERM
 # Its good not to have a newline at the end of the titlebar string because it
 # makes the make -s output easier to read.  Echo -n does not work on all
@@ -1388,98 +1394,23 @@ endif
 endif
 
 ################################################################################
-# Export the elements of $(XPIDLSRCS)
-# generating .h and .xpt files and moving them to the appropriate places.
-
-ifneq ($(XPIDLSRCS),) #{
-
-export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-
-ifndef XPIDL_MODULE
-XPIDL_MODULE		= $(MODULE)
-endif
-
-ifeq ($(XPIDL_MODULE),) # we need $(XPIDL_MODULE) to make $(XPIDL_MODULE).xpt
-export:: FORCE
-	@echo
-	@echo "*** Error processing XPIDLSRCS:"
-	@echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS,"
-	@echo "so we have a module name to use when creating MODULE.xpt."
-	@echo; sleep 2; false
-endif
-
-# generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
-# warn against overriding existing .h file.
-
-XPIDL_DEPS = \
-  $(LIBXUL_DIST)/sdk/bin/header.py \
-  $(LIBXUL_DIST)/sdk/bin/typelib.py \
-  $(LIBXUL_DIST)/sdk/bin/xpidl.py \
-  $(NULL)
-
-xpidl-preqs = \
-  $(call mkdir_deps,$(XPIDL_GEN_DIR)) \
-  $(call mkdir_deps,$(MDDEPDIR)) \
-  $(NULL)
-
-$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
-	$(REPORT_BUILD)
-	$(PYTHON_PATH) \
-	  $(PLY_INCLUDE) \
-	  $(LIBXUL_DIST)/sdk/bin/header.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
-	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
-# into $(XPIDL_MODULE).xpt and export it to $(FINAL_TARGET)/components.
-$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
-	$(REPORT_BUILD)
-	$(PYTHON_PATH) \
-	  $(PLY_INCLUDE) \
-	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-	  $(LIBXUL_DIST)/sdk/bin/typelib.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
-# no need to link together if XPIDLSRCS contains only XPIDL_MODULE
-ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
-XPT_PY = $(filter %/xpt.py,$(XPIDL_LINK))
-
-xpidl-idl2xpt = $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
-xpidl-module-deps = $(xpidl-idl2xpt) $(GLOBAL_DEPS) $(XPT_PY)
-
-$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(xpidl-module-deps)
-	$(XPIDL_LINK) $@ $(xpidl-idl2xpt)
-
-$(XPT_PY):
-	$(MAKE) -C $(DEPTH)/xpcom/typelib/xpt/tools libs
-
-endif # XPIDL_MODULE.xpt != XPIDLSRCS
+# Install a linked .xpt into the appropriate place.
+# This should ideally be performed by the non-recursive idl make file. Some day.
+ifdef XPT_NAME #{
 
 ifndef NO_DIST_INSTALL
-XPIDL_MODULE_FILES := $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
-XPIDL_MODULE_DEST := $(FINAL_TARGET)/components
-INSTALL_TARGETS += XPIDL_MODULE
+_XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
+_XPT_NAME_DEST := $(FINAL_TARGET)/components
+INSTALL_TARGETS += _XPT_NAME
 
 ifndef NO_INTERFACES_MANIFEST
 libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
-	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPT_NAME)"
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest"
 endif
 endif
 
-GARBAGE_DIRS		+= $(XPIDL_GEN_DIR)
-
-ifndef NO_DIST_INSTALL
-XPIDL_HEADERS_FILES := $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-XPIDL_HEADERS_DEST := $(DIST)/include
-XPIDL_HEADERS_TARGET := export
-INSTALL_TARGETS += XPIDL_HEADERS
-
-XPIDLSRCS_FILES := $(XPIDLSRCS)
-XPIDLSRCS_DEST := $(IDL_DIR)
-XPIDLSRCS_TARGET := export
-INSTALL_TARGETS += XPIDLSRCS
-endif
-endif #} XPIDLSRCS
+endif #} XPT_NAME
 
 ################################################################################
 # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
@@ -1691,7 +1622,7 @@ endif
 #   it.
 
 ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
+MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 ifdef .PYMAKE
@@ -1884,7 +1815,6 @@ FREEZE_VARIABLES = \
   CSRCS \
   CPPSRCS \
   EXPORTS \
-  XPIDLSRCS \
   DIRS \
   LIBRARY \
   MODULE \
diff --git a/dom/activities/interfaces/moz.build b/dom/activities/interfaces/moz.build
index e60db2345f0..a35e3a0b146 100644
--- a/dom/activities/interfaces/moz.build
+++ b/dom/activities/interfaces/moz.build
@@ -15,9 +15,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_activities'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build
index 19aa7ad6236..d851490f445 100644
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -13,10 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_alarm'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom.alarm += [
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 05e00740c82..12d09900da0 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -14,11 +14,6 @@ XPIDL_SOURCES += [
     'nsISiteSpecificUserAgent.idl',
 ]
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/camera/moz.build b/dom/camera/moz.build
index 654b8ec5a5c..92d1b845203 100644
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -10,13 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_camera'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-    '-I$(topsrcdir)/dom/media',
-]
-
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/cellbroadcast/interfaces/moz.build b/dom/cellbroadcast/interfaces/moz.build
index 7fe77a410bf..c5d422b0869 100644
--- a/dom/cellbroadcast/interfaces/moz.build
+++ b/dom/cellbroadcast/interfaces/moz.build
@@ -13,9 +13,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_cellbroadcast'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/file/moz.build b/dom/file/moz.build
index 2a38d905071..1f96114fee2 100644
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -13,12 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_file'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/fm/moz.build b/dom/fm/moz.build
index 126a123058d..10de07f9890 100644
--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@@ -11,10 +11,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_fm'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 CPP_SOURCES += [
diff --git a/dom/icc/interfaces/moz.build b/dom/icc/interfaces/moz.build
index b051de4f3e7..ad615b6b935 100644
--- a/dom/icc/interfaces/moz.build
+++ b/dom/icc/interfaces/moz.build
@@ -13,9 +13,3 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'dom_icc'
-
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build
index 7ed4918afd3..679b08068d6 100644
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -14,11 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_indexeddb'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom.indexedDB += [
diff --git a/dom/interfaces/apps/moz.build b/dom/interfaces/apps/moz.build
index 0c327f04341..3d69090e73b 100644
--- a/dom/interfaces/apps/moz.build
+++ b/dom/interfaces/apps/moz.build
@@ -15,10 +15,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_apps'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/base/moz.build b/dom/interfaces/base/moz.build
index f168c5e3217..d7fbec8bc07 100644
--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@@ -59,9 +59,5 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 XPIDL_MODULE = 'dom_base'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/contacts/moz.build b/dom/interfaces/contacts/moz.build
index a2187db7b66..d7fc401f3fe 100644
--- a/dom/interfaces/contacts/moz.build
+++ b/dom/interfaces/contacts/moz.build
@@ -12,10 +12,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_contacts'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/core/moz.build b/dom/interfaces/core/moz.build
index 1827f37716b..7e79afee574 100644
--- a/dom/interfaces/core/moz.build
+++ b/dom/interfaces/core/moz.build
@@ -29,9 +29,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_core'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/css/moz.build b/dom/interfaces/css/moz.build
index 8a295ecdbbd..8fc352b6043 100644
--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@@ -33,10 +33,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_css'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/stylesheets',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/devicestorage/moz.build b/dom/interfaces/devicestorage/moz.build
index e46e202c636..e5e1fdf120f 100644
--- a/dom/interfaces/devicestorage/moz.build
+++ b/dom/interfaces/devicestorage/moz.build
@@ -11,10 +11,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_devicestorage'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/events/moz.build b/dom/interfaces/events/moz.build
index 72da456eb09..911aea314e2 100644
--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@@ -59,9 +59,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_events'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/geolocation/moz.build b/dom/interfaces/geolocation/moz.build
index 8ccf8f3c15d..bd5aef1f702 100644
--- a/dom/interfaces/geolocation/moz.build
+++ b/dom/interfaces/geolocation/moz.build
@@ -15,9 +15,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_geolocation'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/html/moz.build b/dom/interfaces/html/moz.build
index d7655022d30..690b352e9d8 100644
--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@@ -68,10 +68,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_html'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/json/moz.build b/dom/interfaces/json/moz.build
index 14c14336832..cbd82e5dbbd 100644
--- a/dom/interfaces/json/moz.build
+++ b/dom/interfaces/json/moz.build
@@ -10,9 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_json'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/notification/moz.build b/dom/interfaces/notification/moz.build
index 146044bbdae..1a5ba859957 100644
--- a/dom/interfaces/notification/moz.build
+++ b/dom/interfaces/notification/moz.build
@@ -10,9 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_notification'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/offline/moz.build b/dom/interfaces/offline/moz.build
index fd432b0830c..047461e04e2 100644
--- a/dom/interfaces/offline/moz.build
+++ b/dom/interfaces/offline/moz.build
@@ -11,9 +11,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_offline'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/permission/moz.build b/dom/interfaces/permission/moz.build
index 3aa60267341..500cd8d66c4 100644
--- a/dom/interfaces/permission/moz.build
+++ b/dom/interfaces/permission/moz.build
@@ -11,9 +11,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_permissionsettings'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/range/moz.build b/dom/interfaces/range/moz.build
index e2045e69a49..067455ea830 100644
--- a/dom/interfaces/range/moz.build
+++ b/dom/interfaces/range/moz.build
@@ -10,9 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_range'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/settings/moz.build b/dom/interfaces/settings/moz.build
index 86cb302c99a..e901974686a 100644
--- a/dom/interfaces/settings/moz.build
+++ b/dom/interfaces/settings/moz.build
@@ -11,10 +11,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_settings'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/smil/moz.build b/dom/interfaces/smil/moz.build
index 4ecf6f90a8a..ee14741da91 100644
--- a/dom/interfaces/smil/moz.build
+++ b/dom/interfaces/smil/moz.build
@@ -10,12 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_smil'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-    '-I$(topsrcdir)/dom/interfaces/events',
-    '-I$(topsrcdir)/dom/interfaces/svg',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/storage/moz.build b/dom/interfaces/storage/moz.build
index d592ba16862..7ccf5260ea4 100644
--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@@ -14,11 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_storage'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS += [
diff --git a/dom/interfaces/stylesheets/moz.build b/dom/interfaces/stylesheets/moz.build
index 73974e31cf8..45a4aa3dd61 100644
--- a/dom/interfaces/stylesheets/moz.build
+++ b/dom/interfaces/stylesheets/moz.build
@@ -12,9 +12,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_stylesheets'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/svg/moz.build b/dom/interfaces/svg/moz.build
index 1b789a84cff..529082121a2 100644
--- a/dom/interfaces/svg/moz.build
+++ b/dom/interfaces/svg/moz.build
@@ -12,11 +12,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_svg'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/traversal/moz.build b/dom/interfaces/traversal/moz.build
index 038a359cd0c..3b19b9e3bbd 100644
--- a/dom/interfaces/traversal/moz.build
+++ b/dom/interfaces/traversal/moz.build
@@ -12,9 +12,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_traversal'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xbl/moz.build b/dom/interfaces/xbl/moz.build
index d0f14a8a8d8..6330f7f4bbf 100644
--- a/dom/interfaces/xbl/moz.build
+++ b/dom/interfaces/xbl/moz.build
@@ -10,9 +10,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xbl'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xpath/moz.build b/dom/interfaces/xpath/moz.build
index f532abbbb3d..aaeb0011f05 100644
--- a/dom/interfaces/xpath/moz.build
+++ b/dom/interfaces/xpath/moz.build
@@ -15,10 +15,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xpath'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/interfaces/xul/moz.build b/dom/interfaces/xul/moz.build
index 5f229f30cc5..7f8403fd82e 100644
--- a/dom/interfaces/xul/moz.build
+++ b/dom/interfaces/xul/moz.build
@@ -29,11 +29,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xul'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/core',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
diff --git a/dom/messages/interfaces/moz.build b/dom/messages/interfaces/moz.build
index 9d6c27fbb6c..ac40c9bd385 100644
--- a/dom/messages/interfaces/moz.build
+++ b/dom/messages/interfaces/moz.build
@@ -11,7 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_messages'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
diff --git a/dom/mobilemessage/interfaces/moz.build b/dom/mobilemessage/interfaces/moz.build
index 2e7e55c3829..52cc79b9288 100644
--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -29,9 +29,3 @@ if CONFIG['MOZ_B2G_RIL']:
 
 XPIDL_MODULE = 'dom_mobilemessage'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/network/interfaces/moz.build b/dom/network/interfaces/moz.build
index 450f70a45d6..eab9fffd446 100644
--- a/dom/network/interfaces/moz.build
+++ b/dom/network/interfaces/moz.build
@@ -28,9 +28,3 @@ if CONFIG['MOZ_B2G_RIL']:
     ]
 
 XPIDL_MODULE = 'dom_network'
-
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
diff --git a/dom/payment/interfaces/moz.build b/dom/payment/interfaces/moz.build
index 078542e1404..4f5f06310df 100644
--- a/dom/payment/interfaces/moz.build
+++ b/dom/payment/interfaces/moz.build
@@ -13,7 +13,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_payment'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/interfaces/base',
-]
-
diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build
index 0de1dab38f0..8b2558aa6f5 100644
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -29,10 +29,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_system_gonk'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/network/interfaces',
-]
-
 MODULE = 'dom'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build
index 8a06b1bbcc2..5cc738c0376 100644
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -10,12 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_telephony'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 CPP_SOURCES += [
diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build
index ba04d52293e..5d7511145f1 100644
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -13,12 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_voicemail'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-]
-
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom += [
diff --git a/dom/wifi/moz.build b/dom/wifi/moz.build
index cd324f43879..9a112308424 100644
--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -12,13 +12,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_wifi'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/dom/base',
-    '-I$(topsrcdir)/dom/interfaces/base',
-    '-I$(topsrcdir)/dom/interfaces/events',
-    '-I$(topsrcdir)/dom/system/gonk',
-]
-
 MODULE = 'dom'
 
 EXTRA_COMPONENTS += [
diff --git a/hal/moz.build b/hal/moz.build
index 055f38b228a..f8aaf814534 100644
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
-    'nsIRecoveryService.idl',
+    'gonk/nsIRecoveryService.idl',
 ]
 
 MODULE = 'hal'
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 42fd0423d0a..d9c43946d58 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -364,7 +364,6 @@ MY_RULES	:= $(DEPTH)/config/myrules.mk
 # Default command macros; can be overridden in <arch>.mk.
 #
 CCC = $(CXX)
-XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
@@ -521,12 +520,8 @@ endif
 endif
 
 # Default location of include files
-IDL_DIR		= $(DIST)/idl
-
-XPIDL_FLAGS += -I$(srcdir) -I$(IDL_DIR)
-ifdef LIBXUL_SDK
-XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
-endif
+IDL_PARSER_DIR = $(topsrcdir)/xpcom/idl-parser
+IDL_PARSER_CACHE_DIR = $(DEPTH)/xpcom/idl-parser
 
 SDK_LIB_DIR = $(DIST)/sdk/lib
 SDK_BIN_DIR = $(DIST)/sdk/bin
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 86b9c71d49f..eb62a762201 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -33,6 +33,10 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   XPIDL_MODULE \
   $(NULL)
 
+_DEPRECATED_VARIABLES := \
+  XPIDL_FLAGS \
+  $(NULL)
+
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
 # Using $(firstword) may not be perfect. But it should be good enough for most
 # scenarios.
@@ -42,6 +46,10 @@ $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES),$(if $($(var)),\
     $(error Variable $(var) is defined in $(_current_makefile). It should only be defined in moz.build files),\
     ))
 
+$(foreach var,$(_DEPRECATED_VARIABLES),$(if $($(var)),\
+    $(error Variable $(var) is defined in $(_current_makefile). This variable has been deprecated. It does nothing. It must be removed in order to build)\
+    ))
+
 ifneq (,$(XPIDLSRCS)$(SDK_XPIDLSRCS))
     $(error XPIDLSRCS and SDK_XPIDLSRCS have been merged and moved to moz.build files as the XPIDL_SOURCES variable. You must move these variables out of $(_current_makefile))
 endif
@@ -417,8 +425,6 @@ ifeq ($(SOLARIS_SUNPRO_CXX),1)
 GARBAGE_DIRS += SunWS_cache
 endif
 
-XPIDL_GEN_DIR		= _xpidlgen
-
 ifdef MOZ_UPDATE_XTERM
 # Its good not to have a newline at the end of the titlebar string because it
 # makes the make -s output easier to read.  Echo -n does not work on all
@@ -1388,98 +1394,23 @@ endif
 endif
 
 ################################################################################
-# Export the elements of $(XPIDLSRCS)
-# generating .h and .xpt files and moving them to the appropriate places.
-
-ifneq ($(XPIDLSRCS),) #{
-
-export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-
-ifndef XPIDL_MODULE
-XPIDL_MODULE		= $(MODULE)
-endif
-
-ifeq ($(XPIDL_MODULE),) # we need $(XPIDL_MODULE) to make $(XPIDL_MODULE).xpt
-export:: FORCE
-	@echo
-	@echo "*** Error processing XPIDLSRCS:"
-	@echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS,"
-	@echo "so we have a module name to use when creating MODULE.xpt."
-	@echo; sleep 2; false
-endif
-
-# generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
-# warn against overriding existing .h file.
-
-XPIDL_DEPS = \
-  $(LIBXUL_DIST)/sdk/bin/header.py \
-  $(LIBXUL_DIST)/sdk/bin/typelib.py \
-  $(LIBXUL_DIST)/sdk/bin/xpidl.py \
-  $(NULL)
-
-xpidl-preqs = \
-  $(call mkdir_deps,$(XPIDL_GEN_DIR)) \
-  $(call mkdir_deps,$(MDDEPDIR)) \
-  $(NULL)
-
-$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
-	$(REPORT_BUILD)
-	$(PYTHON_PATH) \
-	  $(PLY_INCLUDE) \
-	  $(LIBXUL_DIST)/sdk/bin/header.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
-	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
-# into $(XPIDL_MODULE).xpt and export it to $(FINAL_TARGET)/components.
-$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
-	$(REPORT_BUILD)
-	$(PYTHON_PATH) \
-	  $(PLY_INCLUDE) \
-	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-	  $(LIBXUL_DIST)/sdk/bin/typelib.py $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
-# no need to link together if XPIDLSRCS contains only XPIDL_MODULE
-ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
-XPT_PY = $(filter %/xpt.py,$(XPIDL_LINK))
-
-xpidl-idl2xpt = $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
-xpidl-module-deps = $(xpidl-idl2xpt) $(GLOBAL_DEPS) $(XPT_PY)
-
-$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(xpidl-module-deps)
-	$(XPIDL_LINK) $@ $(xpidl-idl2xpt)
-
-$(XPT_PY):
-	$(MAKE) -C $(DEPTH)/xpcom/typelib/xpt/tools libs
-
-endif # XPIDL_MODULE.xpt != XPIDLSRCS
+# Install a linked .xpt into the appropriate place.
+# This should ideally be performed by the non-recursive idl make file. Some day.
+ifdef XPT_NAME #{
 
 ifndef NO_DIST_INSTALL
-XPIDL_MODULE_FILES := $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
-XPIDL_MODULE_DEST := $(FINAL_TARGET)/components
-INSTALL_TARGETS += XPIDL_MODULE
+_XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
+_XPT_NAME_DEST := $(FINAL_TARGET)/components
+INSTALL_TARGETS += _XPT_NAME
 
 ifndef NO_INTERFACES_MANIFEST
 libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
-	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPT_NAME)"
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest"
 endif
 endif
 
-GARBAGE_DIRS		+= $(XPIDL_GEN_DIR)
-
-ifndef NO_DIST_INSTALL
-XPIDL_HEADERS_FILES := $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-XPIDL_HEADERS_DEST := $(DIST)/include
-XPIDL_HEADERS_TARGET := export
-INSTALL_TARGETS += XPIDL_HEADERS
-
-XPIDLSRCS_FILES := $(XPIDLSRCS)
-XPIDLSRCS_DEST := $(IDL_DIR)
-XPIDLSRCS_TARGET := export
-INSTALL_TARGETS += XPIDLSRCS
-endif
-endif #} XPIDLSRCS
+endif #} XPT_NAME
 
 ################################################################################
 # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
@@ -1691,7 +1622,7 @@ endif
 #   it.
 
 ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
+MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS)),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 ifdef .PYMAKE
@@ -1884,7 +1815,6 @@ FREEZE_VARIABLES = \
   CSRCS \
   CPPSRCS \
   EXPORTS \
-  XPIDLSRCS \
   DIRS \
   LIBRARY \
   MODULE \
diff --git a/js/xpconnect/tests/idl/Makefile.in b/js/xpconnect/tests/idl/Makefile.in
index 9b11528dacb..379d862d400 100644
--- a/js/xpconnect/tests/idl/Makefile.in
+++ b/js/xpconnect/tests/idl/Makefile.in
@@ -13,6 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 componentdir = js/xpconnect/tests/components
-libs:: $(XPIDL_GEN_DIR)/$(MODULE).xpt
+libs:: $(DEPTH)/config/makefiles/xpidl/xpt/$(MODULE).xpt
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/native
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/js
diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build
index e7e5788a540..2f241e7f247 100644
--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -10,10 +10,6 @@ XPIDL_SOURCES += [
     'nsIMIMEService.idl',
 ]
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'mimetype'
 
 EXPORTS += [
diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build
index 984c08adaab..e3eb168ec78 100644
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -11,10 +11,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index 919e952dd88..6add00fed3c 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -20,10 +20,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_http'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 EXPORTS += [
diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build
index c8a643f4e62..9cd1568e6f4 100644
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -10,10 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_res'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build
index cfa0536e957..22a818b54f2 100644
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -10,10 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 CPP_SOURCES += [
diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build
index a93b21ee10a..21c2489d5f6 100644
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -10,10 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_wyciwyg'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
 EXPORTS.mozilla.net += [
diff --git a/netwerk/streamconv/public/moz.build b/netwerk/streamconv/public/moz.build
index c8192430530..3efb0619f9e 100644
--- a/netwerk/streamconv/public/moz.build
+++ b/netwerk/streamconv/public/moz.build
@@ -20,9 +20,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 
 XPIDL_MODULE = 'necko_strconv'
 
-XPIDL_FLAGS += [
-    '-I$(topsrcdir)/netwerk/base/public',
-]
-
 MODULE = 'necko'
 
diff --git a/python/mozbuild/mozbuild/action/xpidl-process.py b/python/mozbuild/mozbuild/action/xpidl-process.py
new file mode 100755
index 00000000000..a61c6d07add
--- /dev/null
+++ b/python/mozbuild/mozbuild/action/xpidl-process.py
@@ -0,0 +1,92 @@
+#!/usr/bin/env 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/.
+
+# This script is used to generate an output header and xpt file for
+# input IDL file(s). It's purpose is to directly support the build
+# system. The API will change to meet the needs of the build system.
+
+import argparse
+import os
+import sys
+
+from io import BytesIO
+
+from header import print_header
+from typelib import write_typelib
+from xpidl import IDLParser
+from xpt import xpt_link
+
+from mozbuild.util import FileAvoidWrite
+
+
+def process(input_dir, cache_dir, header_dir, xpt_dir, deps_dir, module, stems):
+    p = IDLParser(outputdir=cache_dir)
+
+    xpts = {}
+    deps = set()
+
+    # Write out dependencies for Python modules we import. If this list isn't
+    # up to date, we will not re-process XPIDL files if the processor changes.
+    for imported in ('header', 'typelib', 'xpidl', 'xpt'):
+        path = sys.modules[imported].__file__
+
+        if path.endswith('.pyc'):
+            path = path[0:-1]
+
+        deps.add(path)
+
+    for stem in stems:
+        path = os.path.join(input_dir, '%s.idl' % stem)
+        idl_data = open(path).read()
+
+        idl = p.parse(idl_data, filename=path)
+        idl.resolve([input_dir], p)
+
+        header_path = os.path.join(header_dir, '%s.h' % stem)
+        deps_path = os.path.join(deps_dir, '%s.pp' % stem)
+
+        xpt = BytesIO()
+        write_typelib(idl, xpt, path)
+        xpt.seek(0)
+        xpts[stem] = xpt
+
+        deps |= set(dep.replace('\\', '/') for dep in idl.deps)
+
+        with FileAvoidWrite(header_path) as fh:
+            print_header(idl, fh, path)
+
+    # TODO use FileAvoidWrite once it supports binary mode.
+    xpt_path = os.path.join(xpt_dir, '%s.xpt' % module)
+    xpt_link(xpts.values()).write(xpt_path)
+
+    deps_path = os.path.join(deps_dir, '%s.pp' % module)
+    with FileAvoidWrite(deps_path) as fh:
+        # Need output to be consistent to avoid rewrites.
+        s_deps = sorted(deps)
+        fh.write('%s: %s\n' % (xpt_path, ' '.join(s_deps)))
+        for dep in s_deps:
+            fh.write('%s:\n' % dep)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--cache-dir',
+        help='Directory in which to find or write cached lexer data.')
+    parser.add_argument('inputdir',
+        help='Directory in which to find source .idl files.')
+    parser.add_argument('headerdir',
+        help='Directory in which to write header files.')
+    parser.add_argument('xptdir',
+        help='Directory in which to write xpt file.')
+    parser.add_argument('depsdir',
+        help='Directory in which to write dependency files.')
+    parser.add_argument('module',
+        help='Final module name to use for linked output xpt file.')
+    parser.add_argument('idls', nargs='+',
+        help='Source .idl file(s). Specified as stems only.')
+
+    args = parser.parse_args()
+    process(args.inputdir, args.cache_dir, args.headerdir, args.xptdir,
+        args.depsdir, args.module, args.idls)
diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
new file mode 100644
index 00000000000..0cf7cac49a4
--- /dev/null
+++ b/python/mozbuild/mozbuild/backend/common.py
@@ -0,0 +1,58 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 __future__ import unicode_literals
+
+import mozpack.path as mozpath
+
+from .base import BuildBackend
+
+from ..frontend.data import XPIDLFile
+
+
+class XPIDLManager(object):
+    """Helps manage XPCOM IDLs in the context of the build system."""
+    def __init__(self, config):
+        self.config = config
+        self.topsrcdir = config.topsrcdir
+        self.topobjdir = config.topobjdir
+
+        self.idls = {}
+        self.modules = {}
+
+    def register_idl(self, source, module, allow_existing=False):
+        """Registers an IDL file with this instance.
+
+        The IDL file will be built, installed, etc.
+        """
+        basename = mozpath.basename(source)
+        root = mozpath.splitext(basename)[0]
+
+        entry = {
+            'source': source,
+            'module': module,
+            'basename': basename,
+            'root': root,
+        }
+
+        if not allow_existing and entry['basename'] in self.idls:
+            raise Exception('IDL already registered: %' % entry['basename'])
+
+        self.idls[entry['basename']] = entry
+        self.modules.setdefault(entry['module'], set()).add(entry['root'])
+
+
+class CommonBackend(BuildBackend):
+    """Holds logic common to all build backends."""
+
+    def _init(self):
+        self._idl_manager = XPIDLManager(self.environment)
+
+    def consume_object(self, obj):
+        if isinstance(obj, XPIDLFile):
+            self._idl_manager.register_idl(obj.source_path, obj.module)
+
+    def consume_finished(self):
+        if len(self._idl_manager.idls):
+            self._handle_idl_manager(self._idl_manager)
diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
index dc63edcf4ea..4841ec0081c 100644
--- a/python/mozbuild/mozbuild/backend/configenvironment.py
+++ b/python/mozbuild/mozbuild/backend/configenvironment.py
@@ -168,7 +168,7 @@ class ConfigEnvironment(object):
         assert(isinstance(file, basestring))
         return os.path.normpath(os.path.join(self.topsrcdir, "%s.in" % relpath(file, self.topobjdir)))
 
-    def create_config_file(self, path):
+    def create_config_file(self, path, extra=None):
         '''Creates the given config file. A config file is generated by
         taking the corresponding source file and replacing occurences of
         "@VAR@" by the value corresponding to "VAR" in the substs dict.
@@ -185,6 +185,8 @@ class ConfigEnvironment(object):
         pp.context.update(srcdir = self.get_file_srcdir(path))
         pp.context.update(relativesrcdir = self.get_relative_srcdir(path))
         pp.context.update(DEPTH = self.get_depth(path))
+        if extra:
+            pp.context.update(extra)
         pp.do_filter('attemptSubstitution')
         pp.setMarker(None)
 
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index d0c32be566b..3cc306a21d2 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -9,14 +9,14 @@ import logging
 import os
 import types
 
-import mozpack.path
 from mozpack.copier import FilePurger
 from mozpack.manifests import (
     InstallManifest,
     PurgeManifest,
 )
+import mozpack.path as mozpath
 
-from .base import BuildBackend
+from .common import CommonBackend
 from ..frontend.data import (
     ConfigFileSubstitution,
     DirectoryTraversal,
@@ -25,6 +25,7 @@ from ..frontend.data import (
     VariablePassthru,
     Exports,
     Program,
+    XPIDLFile,
     XpcshellManifests,
 )
 from ..util import FileAvoidWrite
@@ -75,6 +76,10 @@ class BackendMakeFile(object):
         self.environment = environment
         self.path = os.path.join(objdir, 'backend.mk')
 
+        # XPIDLFiles attached to this file.
+        self.idls = []
+        self.xpt_name = None
+
         self.fh = FileAvoidWrite(self.path)
         self.fh.write('# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT.\n')
         self.fh.write('\n')
@@ -90,15 +95,24 @@ class BackendMakeFile(object):
         # scan and build, installing the new Makefile.
         self.fh.write('NO_SUBMAKEFILES_RULE := 1\n')
 
-
     def write(self, buf):
         self.fh.write(buf)
 
     def close(self):
+        if self.xpt_name:
+            self.fh.write('XPT_NAME := %s\n' % self.xpt_name)
+
+            self.fh.write('NONRECURSIVE_TARGETS += export\n')
+            self.fh.write('NONRECURSIVE_TARGETS_export += xpidl\n')
+            self.fh.write('NONRECURSIVE_TARGETS_export_xpidl_DIRECTORY = '
+                '$(DEPTH)/config/makefiles/xpidl\n')
+            self.fh.write('NONRECURSIVE_TARGETS_export_xpidl_TARGETS += '
+                'xpt/%s' % self.xpt_name)
+
         return self.fh.close()
 
 
-class RecursiveMakeBackend(BuildBackend):
+class RecursiveMakeBackend(CommonBackend):
     """Backend that integrates with the existing recursive make build system.
 
     This backend facilitates the transition from Makefile.in to moz.build
@@ -114,6 +128,8 @@ class RecursiveMakeBackend(BuildBackend):
     """
 
     def _init(self):
+        CommonBackend._init(self)
+
         self._backend_files = {}
         self._ipdl_sources = set()
 
@@ -140,6 +156,11 @@ class RecursiveMakeBackend(BuildBackend):
             dist_public=PurgeManifest(relpath='dist/public'),
             dist_sdk=PurgeManifest(relpath='dist/sdk'),
             tests=PurgeManifest(relpath='_tests'),
+            xpidl=PurgeManifest(relpath='config/makefiles/xpidl'),
+        )
+
+        self._install_manifests = dict(
+            dist_idl=InstallManifest(),
         )
 
     def _update_from_avoid_write(self, result):
@@ -155,6 +176,8 @@ class RecursiveMakeBackend(BuildBackend):
     def consume_object(self, obj):
         """Write out build files necessary to build with recursive make."""
 
+        CommonBackend.consume_object(self, obj)
+
         if not isinstance(obj, SandboxDerived):
             return
 
@@ -168,6 +191,9 @@ class RecursiveMakeBackend(BuildBackend):
                 backend_file.environment.create_config_file(obj.output_path))
             self.backend_input_files.add(obj.input_path)
             self.summary.managed_count += 1
+        elif isinstance(obj, XPIDLFile):
+            backend_file.idls.append(obj)
+            backend_file.xpt_name = '%s.xpt' % obj.module
         elif isinstance(obj, VariablePassthru):
             # Sorted so output is consistent and we don't bump mtimes.
             for k, v in sorted(obj.variables.items()):
@@ -181,7 +207,7 @@ class RecursiveMakeBackend(BuildBackend):
             self._process_exports(obj.exports, backend_file)
 
         elif isinstance(obj, IPDLFile):
-            self._ipdl_sources.add(mozpack.path.join(obj.srcdir, obj.basename))
+            self._ipdl_sources.add(mozpath.join(obj.srcdir, obj.basename))
 
         elif isinstance(obj, Program):
             self._process_program(obj.program, backend_file)
@@ -192,6 +218,8 @@ class RecursiveMakeBackend(BuildBackend):
         self._backend_files[obj.srcdir] = backend_file
 
     def consume_finished(self):
+        CommonBackend.consume_finished(self)
+
         for srcdir in sorted(self._backend_files.keys()):
             bf = self._backend_files[srcdir]
 
@@ -361,6 +389,59 @@ class RecursiveMakeBackend(BuildBackend):
             self._process_exports(children[subdir], backend_file,
                                   namespace=namespace + subdir)
 
+    def _handle_idl_manager(self, manager):
+        build_files = self._purge_manifests['xpidl']
+
+        for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
+            'headers/.mkdir.done', 'xpt/.mkdir.done'):
+            build_files.add(p)
+
+        for idl in manager.idls.values():
+            self._install_manifests['dist_idl'].add_symlink(idl['source'],
+                idl['basename'])
+            self._purge_manifests['dist_include'].add('%s.h' % idl['root'])
+            build_files.add(mozpath.join('headers', '%s.h' % idl['root']))
+
+        for module in manager.modules:
+            build_files.add(mozpath.join('xpt', '%s.xpt' % module))
+            build_files.add(mozpath.join('.deps', '%s.pp' % module))
+
+        headers = sorted('%s.h' % idl['root'] for idl in manager.idls.values())
+        modules = manager.modules
+        xpt_modules = sorted(modules.keys())
+        rules = []
+
+        for module in xpt_modules:
+            deps = sorted(modules[module])
+            rules.extend([
+                '$(idl_xpt_dir)/%s.xpt:' % module,
+                '\t@echo "$(notdir $@)"',
+                '\t$(idlprocess) $(basename $(notdir $@)) %s' % ' '.join(deps),
+                '',
+            ])
+
+            # Set up linkage so make knows headers come from $(idlprocess).
+            h = ['$(idl_headers_dir)/%s.h' % dep for dep in deps]
+            rules.extend([
+                '%s: $(idl_xpt_dir)/%s.xpt' % (' '.join(h), module),
+                '',
+            ])
+
+        # Create dependency for output header so we force regeneration if the
+        # header was deleted. This ideally should not be necessary. However,
+        # some processes (such as PGO at the time this was implemented) wipe
+        # out dist/include without regard to our install/purge manifests.
+
+        out_path = os.path.join(self.environment.topobjdir, 'config',
+            'makefiles', 'xpidl', 'Makefile')
+        result = self.environment.create_config_file(out_path, extra=dict(
+            xpidl_rules='\n'.join(rules),
+            xpidl_modules=' '.join(xpt_modules),
+            xpidl_headers=' '.join(headers),
+        ))
+        self._update_from_avoid_write(result)
+        self.summary.managed_count += 1
+
     def _process_program(self, program, backend_file):
         backend_file.write('PROGRAM = %s\n' % program)
 
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
index c98a6246a0c..0ca88f36cdf 100644
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@@ -17,6 +17,8 @@ structures.
 
 from __future__ import unicode_literals
 
+import os
+
 from collections import OrderedDict
 
 
@@ -136,6 +138,22 @@ class VariablePassthru(SandboxDerived):
         SandboxDerived.__init__(self, sandbox)
         self.variables = {}
 
+class XPIDLFile(SandboxDerived):
+    """Describes an XPIDL file to be compiled."""
+
+    __slots__ = (
+        'basename',
+        'source_path',
+    )
+
+    def __init__(self, sandbox, source, module):
+        SandboxDerived.__init__(self, sandbox)
+
+        self.source_path = source
+        self.basename = os.path.basename(source)
+        self.module = module
+
+
 class Exports(SandboxDerived):
     """Sandbox container object for EXPORTS, which is a HierarchicalStringList.
 
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index dbb518dc06c..d85d879b326 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -4,8 +4,13 @@
 
 from __future__ import unicode_literals
 
+import logging
 import os
 
+from mach.mixin.logging import LoggingMixin
+
+import mozpack.path as mozpath
+
 from .data import (
     ConfigFileSubstitution,
     DirectoryTraversal,
@@ -14,13 +19,17 @@ from .data import (
     Program,
     ReaderSummary,
     VariablePassthru,
+    XPIDLFile,
     XpcshellManifests,
 )
 
-from .reader import MozbuildSandbox
+from .reader import (
+    MozbuildSandbox,
+    SandboxValidationError,
+)
 
 
-class TreeMetadataEmitter(object):
+class TreeMetadataEmitter(LoggingMixin):
     """Converts the executed mozbuild files into data structures.
 
     This is a bridge between reader.py and data.py. It takes what was read by
@@ -29,6 +38,8 @@ class TreeMetadataEmitter(object):
     """
 
     def __init__(self, config):
+        self.populate_logger()
+
         self.config = config
 
     def emit(self, output):
@@ -74,6 +85,27 @@ class TreeMetadataEmitter(object):
             sub.relpath = path
             yield sub
 
+        # XPIDL source files get processed and turned into .h and .xpt files.
+        # If there are multiple XPIDL files in a directory, they get linked
+        # together into a final .xpt, which has the name defined by either
+        # MODULE or XPIDL_MODULE (if the latter is defined).
+        xpidl_module = sandbox['MODULE']
+        if sandbox['XPIDL_MODULE']:
+            xpidl_module = sandbox['XPIDL_MODULE']
+
+        if sandbox['XPIDL_SOURCES'] and not xpidl_module:
+            raise SandboxValidationError('MODULE or XPIDL_MODULE must be '
+                'defined if XPIDL_SOURCES is defined.')
+
+        if sandbox['XPIDL_SOURCES'] and sandbox['NO_DIST_INSTALL']:
+            self.log(logging.WARN, 'mozbuild_warning', dict(
+                path=sandbox.main_path),
+                '{path}: NO_DIST_INSTALL has no effect on XPIDL_SOURCES.')
+
+        for idl in sandbox['XPIDL_SOURCES']:
+            yield XPIDLFile(sandbox, mozpath.join(sandbox['SRCDIR'], idl),
+                xpidl_module)
+
         # Proxy some variables as-is until we have richer classes to represent
         # them. We should aim to keep this set small because it violates the
         # desired abstraction of the build definition away from makefiles.
@@ -104,10 +136,7 @@ class TreeMetadataEmitter(object):
             SHARED_LIBRARY_LIBS='SHARED_LIBRARY_LIBS',
             SIMPLE_PROGRAMS='SIMPLE_PROGRAMS',
             SSRCS='SSRCS',
-            XPIDL_FLAGS='XPIDL_FLAGS',
-            XPIDL_MODULE='XPIDL_MODULE',
-            XPIDLSRCS='XPIDL_SOURCES',
-            )
+        )
         for mak, moz in varmap.items():
             if sandbox[moz]:
                 passthru.variables[mak] = sandbox[moz]
diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
index fb7086c13af..891bd86aebf 100644
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -295,10 +295,8 @@ VARIABLES = {
         """Module name.
 
         Historically, this variable was used to describe where to install header
-        files, but that feature is now handled by EXPORTS_NAMESPACES. Currently
-        it is used as the XPIDL module name if XPIDL_MODULE is not defined, but
-        using XPIDL_MODULE directly is preferred. MODULE will likely be removed
-        in the future.
+        files, but that feature is now handled by EXPORTS_NAMESPACES. MODULE
+        will likely be removed in the future.
         """),
 
     'EXPORTS': (HierarchicalStringList, list, HierarchicalStringList(),
@@ -355,14 +353,6 @@ VARIABLES = {
         MODULE.
         """),
 
-    'XPIDL_FLAGS': (list, list, [],
-        """XPCOM Interface Definition Module Flags.
-
-        This is a list of extra flags that are passed to the IDL compiler.
-        Typically this is a set of -I flags that denote extra include
-        directories to search for included .idl files.
-        """),
-
     'IPDL_SOURCES': (StrictOrderingOnAppendList, list, [],
         """IPDL source files.
 
diff --git a/python/mozbuild/mozbuild/test/backend/common.py b/python/mozbuild/mozbuild/test/backend/common.py
index 7102b62b09d..e1f44b158cd 100644
--- a/python/mozbuild/mozbuild/test/backend/common.py
+++ b/python/mozbuild/mozbuild/test/backend/common.py
@@ -75,6 +75,11 @@ CONFIGS = {
         'non_global_defines': [],
         'substs': [],
     },
+    'xpidl': {
+        'defines': [],
+        'non_global_defines': [],
+        'substs': [],
+    },
 }
 
 
@@ -95,9 +100,7 @@ class BackendTester(unittest.TestCase):
         return ConfigEnvironment(srcdir, objdir, **config)
 
     def _emit(self, name, env=None):
-        if not env:
-            env = self._get_environment(name)
-
+        env = env or self._get_environment(name)
         reader = BuildReader(env)
         emitter = TreeMetadataEmitter(env)
 
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
index 4acef55d3f6..d349e488cc7 100644
--- a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
@@ -2,9 +2,7 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-XPIDL_SOURCES = ['bar.idl', 'biz.idl', 'foo.idl']
-XPIDL_MODULE = 'module_name'
-XPIDL_FLAGS = ['-Idir1', '-Idir2', '-Idir3']
+MODULE = 'module_name'
 
 ASFILES = ['bar.s', 'foo.asm']
 
diff --git a/python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in b/python/mozbuild/mozbuild/test/backend/data/xpidl/config/makefiles/xpidl/Makefile.in
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build b/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
new file mode 100644
index 00000000000..aa192b84276
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
@@ -0,0 +1,6 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+MODULE = 'my_module'
+XPIDL_SOURCES = ['bar.idl', 'foo.idl']
diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
index 84860da1eeb..86a8d5ba54b 100644
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ -217,19 +217,6 @@ class TestRecursiveMakeBackend(BackendTester):
                 'SSRCS += bar.S',
                 'SSRCS += foo.S',
             ],
-            'XPIDL_FLAGS': [
-                'XPIDL_FLAGS += -Idir1',
-                'XPIDL_FLAGS += -Idir2',
-                'XPIDL_FLAGS += -Idir3',
-            ],
-            'XPIDL_MODULE': [
-                'XPIDL_MODULE := module_name'
-            ],
-            'XPIDLSRCS': [
-                'XPIDLSRCS += bar.idl',
-                'XPIDLSRCS += biz.idl',
-                'XPIDLSRCS += foo.idl',
-            ]
         }
 
         for var, val in expected.items():
@@ -281,6 +268,34 @@ class TestRecursiveMakeBackend(BackendTester):
         expected = ('aa', 'bb', 'cc', 'dd', 'valid_val')
         self.assertEqual(xpclines, ["XPCSHELL_TESTS += %s" % val for val in expected])
 
+    def test_xpidl_generation(self):
+        """Ensure xpidl files and directories are written out."""
+        env = self._consume('xpidl', RecursiveMakeBackend)
+
+        # Purge manifests should contain entries.
+        purge_dir = os.path.join(env.topobjdir, '_build_manifests', 'purge')
+        install_dir = os.path.join(env.topobjdir, '_build_manifests',
+            'install')
+        self.assertTrue(os.path.isfile(os.path.join(purge_dir, 'xpidl')))
+        self.assertTrue(os.path.isfile(os.path.join(install_dir, 'dist_idl')))
+
+        m = PurgeManifest(path=os.path.join(purge_dir, 'xpidl'))
+        self.assertIn('.deps/my_module.pp', m.entries)
+        self.assertIn('xpt/my_module.xpt', m.entries)
+
+        m = InstallManifest(path=os.path.join(install_dir, 'dist_idl'))
+        self.assertEqual(len(m), 2)
+        self.assertIn('bar.idl', m)
+        self.assertIn('foo.idl', m)
+
+        m = PurgeManifest(path=os.path.join(purge_dir, 'dist_include'))
+        self.assertIn('foo.h', m.entries)
+
+        p = os.path.join(env.topobjdir, 'config/makefiles/xpidl')
+        self.assertTrue(os.path.isdir(p))
+
+        self.assertTrue(os.path.isfile(os.path.join(p, 'Makefile')))
+
     def test_xpcshell_master_manifest(self):
         """Ensure that the master xpcshell manifest is written out correctly."""
         env = self._consume('xpcshell_manifests', RecursiveMakeBackend)
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
index 71154d31ec3..1bc40a2aae2 100644
--- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
@@ -2,9 +2,7 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-XPIDL_SOURCES += ['bar.idl', 'biz.idl', 'foo.idl']
-XPIDL_MODULE = 'module_name'
-XPIDL_FLAGS += ['-Idir1', '-Idir2', '-Idir3']
+MODULE = 'module_name'
 
 ASFILES += ['fans.asm', 'tans.s']
 
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
index 5d995929359..6c8d6ede6df 100644
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@@ -144,14 +144,12 @@ class TestEmitterBasic(unittest.TestCase):
             LIBRARY_NAME='lib_name',
             LIBS=['fans.lib', 'tans.lib'],
             NO_DIST_INSTALL='1',
+            MODULE='module_name',
             SDK_LIBRARY=['fans.sdk', 'tans.sdk'],
             SHARED_LIBRARY_LIBS=['fans.sll', 'tans.sll'],
             SIMPLE_PROGRAMS=['fans.x', 'tans.x'],
             SSRCS=['fans.S', 'tans.S'],
-            XPIDLSRCS=['bar.idl', 'biz.idl', 'foo.idl'],
-            XPIDL_MODULE='module_name',
-            XPIDL_FLAGS=['-Idir1', '-Idir2', '-Idir3'],
-            )
+        )
 
         variables = objs[1].variables
         self.assertEqual(len(variables), len(wanted))
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index 6e9668868fe..f65357c33f1 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -20,7 +20,6 @@ VPATH += \
   $(NULL)
 
 LOCAL_INCLUDES += \
-  -I$(XPIDL_GEN_DIR) \
   -I$(srcdir)/../google-breakpad/src/ \
   $(NULL)
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in
index 0f2b5d3fda4..7c48ead0f8b 100644
--- a/xpcom/idl-parser/Makefile.in
+++ b/xpcom/idl-parser/Makefile.in
@@ -18,8 +18,8 @@ PARSER_SRCS = \
 
 SDK_BINARY = \
   $(PARSER_SRCS) \
-  xpidllex.py \
-  xpidlyacc.py \
+  $(IDL_PARSER_CACHE_DIR)/xpidllex.py \
+  $(IDL_PARSER_CACHE_DIR)/xpidlyacc.py \
   $(NULL)
 
 SDK_BINARY_TARGET = xpidl-parser
@@ -39,13 +39,13 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 # Generate the PLY lexer and parser.
-xpidllex.py: $(PARSER_SRCS) $(PLY_FILES)
+$(IDL_PARSER_CACHE_DIR)/xpidllex.py: $(PARSER_SRCS) $(PLY_FILES)
 	$(PYTHON_PATH) \
 	  $(PLY_INCLUDE) \
-	  $(srcdir)/header.py --cachedir=. --regen
+	  $(srcdir)/header.py --cachedir=$(IDL_PARSER_CACHE_DIR) --regen
 
 # generating xpidllex.py generates xpidlyacc.py too
-xpidlyacc.py: xpidllex.py
+$(IDL_PARSER_CACHE_DIR)/xpidlyacc.py: $(IDL_PARSER_CACHE_DIR)/xpidllex.py
 
 check::
 	$(PYTHON_PATH) \
@@ -53,10 +53,12 @@ check::
 	  -I. \
 	  $(srcdir)/runtests.py
 
-GARBAGE += \
+garbage_files := \
   xpidllex.py \
   xpidllex.pyc \
   xpidlyacc.py \
   xpidlyacc.pyc \
   xpidl_debug \
   $(NULL)
+
+GARBAGE += $(addprefix $(IDL_PARSER_CACHE_DIR)/,$(garbage_files))

From 6fef3e645eebf9fca9a57045f4a8135a551f2874 Mon Sep 17 00:00:00 2001
From: John Daggett <jdaggett@mozilla.com>
Date: Thu, 15 Aug 2013 09:37:57 +0900
Subject: [PATCH 75/98] Bug 904263 - don't set disabled subproperties within
 font shorthand parsing. r=dbaron

---
 layout/style/Declaration.cpp |  3 --
 layout/style/nsCSSParser.cpp | 73 ++++++++++++++++++++----------------
 layout/style/nsCSSProps.h    |  3 +-
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/layout/style/Declaration.cpp b/layout/style/Declaration.cpp
index 24001e1733e..ac69e6d13c2 100644
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -179,9 +179,6 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue) const
       // The system-font subproperty and the *-source properties don't count.
       continue;
     }
-    if (!nsCSSProps::IsEnabled(*p)) {
-      continue;
-    }
     ++totalCount;
     const nsCSSValue *val = mData->ValueFor(*p);
     NS_ABORT_IF_FALSE(!val || !mImportantData || !mImportantData->ValueFor(*p),
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 553bff7bff3..7473808389d 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -42,6 +42,7 @@
 #include "CSSCalc.h"
 #include "nsMediaFeatures.h"
 #include "nsLayoutUtils.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla;
 
@@ -8514,6 +8515,8 @@ CSSParserImpl::ParseFont()
     eCSSProperty_font_weight
   };
 
+  bool featuresEnabled =
+    mozilla::Preferences::GetBool("layout.css.font-features.enabled");
   nsCSSValue  family;
   if (ParseVariant(family, VARIANT_HK, nsCSSProps::kFontKTable)) {
     if (ExpectEndProperty()) {
@@ -8530,14 +8533,16 @@ CSSParserImpl::ParseFont()
         AppendValue(eCSSProperty_font_size_adjust, family);
         AppendValue(eCSSProperty_font_feature_settings, family);
         AppendValue(eCSSProperty_font_language_override, family);
-        AppendValue(eCSSProperty_font_kerning, family);
-        AppendValue(eCSSProperty_font_synthesis, family);
-        AppendValue(eCSSProperty_font_variant_alternates, family);
-        AppendValue(eCSSProperty_font_variant_caps, family);
-        AppendValue(eCSSProperty_font_variant_east_asian, family);
-        AppendValue(eCSSProperty_font_variant_ligatures, family);
-        AppendValue(eCSSProperty_font_variant_numeric, family);
-        AppendValue(eCSSProperty_font_variant_position, family);
+        if (featuresEnabled) {
+          AppendValue(eCSSProperty_font_kerning, family);
+          AppendValue(eCSSProperty_font_synthesis, family);
+          AppendValue(eCSSProperty_font_variant_alternates, family);
+          AppendValue(eCSSProperty_font_variant_caps, family);
+          AppendValue(eCSSProperty_font_variant_east_asian, family);
+          AppendValue(eCSSProperty_font_variant_ligatures, family);
+          AppendValue(eCSSProperty_font_variant_numeric, family);
+          AppendValue(eCSSProperty_font_variant_position, family);
+        }
       }
       else {
         AppendValue(eCSSProperty__x_system_font, family);
@@ -8552,14 +8557,16 @@ CSSParserImpl::ParseFont()
         AppendValue(eCSSProperty_font_size_adjust, systemFont);
         AppendValue(eCSSProperty_font_feature_settings, systemFont);
         AppendValue(eCSSProperty_font_language_override, systemFont);
-        AppendValue(eCSSProperty_font_kerning, systemFont);
-        AppendValue(eCSSProperty_font_synthesis, systemFont);
-        AppendValue(eCSSProperty_font_variant_alternates, systemFont);
-        AppendValue(eCSSProperty_font_variant_caps, systemFont);
-        AppendValue(eCSSProperty_font_variant_east_asian, systemFont);
-        AppendValue(eCSSProperty_font_variant_ligatures, systemFont);
-        AppendValue(eCSSProperty_font_variant_numeric, systemFont);
-        AppendValue(eCSSProperty_font_variant_position, systemFont);
+        if (featuresEnabled) {
+          AppendValue(eCSSProperty_font_kerning, systemFont);
+          AppendValue(eCSSProperty_font_synthesis, systemFont);
+          AppendValue(eCSSProperty_font_variant_alternates, systemFont);
+          AppendValue(eCSSProperty_font_variant_caps, systemFont);
+          AppendValue(eCSSProperty_font_variant_east_asian, systemFont);
+          AppendValue(eCSSProperty_font_variant_ligatures, systemFont);
+          AppendValue(eCSSProperty_font_variant_numeric, systemFont);
+          AppendValue(eCSSProperty_font_variant_position, systemFont);
+        }
       }
       return true;
     }
@@ -8624,22 +8631,24 @@ CSSParserImpl::ParseFont()
       AppendValue(eCSSProperty_font_size_adjust, nsCSSValue(eCSSUnit_None));
       AppendValue(eCSSProperty_font_feature_settings, nsCSSValue(eCSSUnit_Normal));
       AppendValue(eCSSProperty_font_language_override, nsCSSValue(eCSSUnit_Normal));
-      AppendValue(eCSSProperty_font_kerning,
-                  nsCSSValue(NS_FONT_KERNING_AUTO, eCSSUnit_Enumerated));
-      AppendValue(eCSSProperty_font_synthesis,
-                  nsCSSValue(NS_FONT_SYNTHESIS_WEIGHT | NS_FONT_SYNTHESIS_STYLE,
-                             eCSSUnit_Enumerated));
-      AppendValue(eCSSProperty_font_variant_alternates,
-                  nsCSSValue(eCSSUnit_Normal));
-      AppendValue(eCSSProperty_font_variant_caps, nsCSSValue(eCSSUnit_Normal));
-      AppendValue(eCSSProperty_font_variant_east_asian,
-                  nsCSSValue(eCSSUnit_Normal));
-      AppendValue(eCSSProperty_font_variant_ligatures,
-                  nsCSSValue(eCSSUnit_Normal));
-      AppendValue(eCSSProperty_font_variant_numeric,
-                  nsCSSValue(eCSSUnit_Normal));
-      AppendValue(eCSSProperty_font_variant_position,
-                  nsCSSValue(eCSSUnit_Normal));
+      if (featuresEnabled) {
+        AppendValue(eCSSProperty_font_kerning,
+                    nsCSSValue(NS_FONT_KERNING_AUTO, eCSSUnit_Enumerated));
+        AppendValue(eCSSProperty_font_synthesis,
+                    nsCSSValue(NS_FONT_SYNTHESIS_WEIGHT | NS_FONT_SYNTHESIS_STYLE,
+                               eCSSUnit_Enumerated));
+        AppendValue(eCSSProperty_font_variant_alternates,
+                    nsCSSValue(eCSSUnit_Normal));
+        AppendValue(eCSSProperty_font_variant_caps, nsCSSValue(eCSSUnit_Normal));
+        AppendValue(eCSSProperty_font_variant_east_asian,
+                    nsCSSValue(eCSSUnit_Normal));
+        AppendValue(eCSSProperty_font_variant_ligatures,
+                    nsCSSValue(eCSSUnit_Normal));
+        AppendValue(eCSSProperty_font_variant_numeric,
+                    nsCSSValue(eCSSUnit_Normal));
+        AppendValue(eCSSProperty_font_variant_position,
+                    nsCSSValue(eCSSUnit_Normal));
+      }
       return true;
     }
   }
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index 1ab32afd7bc..3611cacb4d8 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -418,7 +418,8 @@ public:
 
 #define CSSPROPS_FOR_SHORTHAND_SUBPROPERTIES(iter_, prop_)                    \
   for (const nsCSSProperty* iter_ = nsCSSProps::SubpropertyEntryFor(prop_);   \
-       *iter_ != eCSSProperty_UNKNOWN; ++iter_)
+       *iter_ != eCSSProperty_UNKNOWN; ++iter_) \
+    if (nsCSSProps::IsEnabled(*iter_))
 
   // Keyword/Enum value tables
   static const int32_t kAnimationDirectionKTable[];

From 841b3eb32ba8ac9f96bcc3a415b9863c2340922f Mon Sep 17 00:00:00 2001
From: John Daggett <jdaggett@mozilla.com>
Date: Thu, 15 Aug 2013 09:38:01 +0900
Subject: [PATCH 76/98] Bug 904263 - add tests to assure all properties can be
 removed. r=dbaron

---
 layout/style/test/test_inherit_storage.html | 17 +++++++++++++++++
 layout/style/test/test_initial_storage.html | 17 +++++++++++++++++
 layout/style/test/test_value_storage.html   | 16 ++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/layout/style/test/test_inherit_storage.html b/layout/style/test/test_inherit_storage.html
index 5255b39859c..5fd717a6c30 100644
--- a/layout/style/test/test_inherit_storage.html
+++ b/layout/style/test/test_inherit_storage.html
@@ -79,6 +79,23 @@ function test_property(property)
   if ("subproperties" in info)
     for (var idx in info.subproperties)
       check_final(info.subproperties[idx]);
+
+  // can all properties be removed from the style?
+  function test_remove_all_properties(property, value) {
+    var i, p = [];
+    for (i = 0; i < gDeclaration.length; i++) p.push(gDeclaration[i]);
+    for (i = 0; i < p.length; i++) gDeclaration.removeProperty(p[i]);
+    var errstr = "when setting property " + property + " to " + value;
+    is(gDeclaration.length, 0, "unremovable properties " + errstr);
+    is(gDeclaration.cssText, "", "non-empty serialization after removing all properties " + errstr);
+  }
+
+  // sanity check shorthands to make sure disabled props aren't exposed
+  if (info.type != CSS_TYPE_LONGHAND) {
+    gDeclaration.setProperty(property, "inherit", "");
+    test_remove_all_properties(property, "inherit");
+    gDeclaration.removeProperty(property);
+  }
 }
 
 for (var prop in gCSSProperties)
diff --git a/layout/style/test/test_initial_storage.html b/layout/style/test/test_initial_storage.html
index e10f22e64f6..83d10ef25bf 100644
--- a/layout/style/test/test_initial_storage.html
+++ b/layout/style/test/test_initial_storage.html
@@ -79,6 +79,23 @@ function test_property(property)
   if ("subproperties" in info)
     for (var idx in info.subproperties)
       check_final(info.subproperties[idx]);
+
+  // can all properties be removed from the style?
+  function test_remove_all_properties(property, value) {
+    var i, p = [];
+    for (i = 0; i < gDeclaration.length; i++) p.push(gDeclaration[i]);
+    for (i = 0; i < p.length; i++) gDeclaration.removeProperty(p[i]);
+    var errstr = "when setting property " + property + " to " + value;
+    is(gDeclaration.length, 0, "unremovable properties " + errstr);
+    is(gDeclaration.cssText, "", "non-empty serialization after removing all properties " + errstr);
+  }
+
+  // sanity check shorthands to make sure disabled props aren't exposed
+  if (info.type != CSS_TYPE_LONGHAND) {
+    gDeclaration.setProperty(property, "initial", "");
+    test_remove_all_properties(property, "initial");
+    gDeclaration.removeProperty(property);
+  }
 }
 
 for (var prop in gCSSProperties)
diff --git a/layout/style/test/test_value_storage.html b/layout/style/test/test_value_storage.html
index 5281174719f..f97b51afc0f 100644
--- a/layout/style/test/test_value_storage.html
+++ b/layout/style/test/test_value_storage.html
@@ -109,6 +109,16 @@ function test_property(property)
 
   var test_computed = !("backend_only" in info);
 
+  // can all properties be removed from the style?
+  function test_remove_all_properties(property, value) {
+    var i, p = [];
+    for (i = 0; i < gDeclaration.length; i++) p.push(gDeclaration[i]);
+    for (i = 0; i < p.length; i++) gDeclaration.removeProperty(p[i]);
+    var errstr = "when setting property " + property + " to " + value;
+    is(gDeclaration.length, 0, "unremovable properties " + errstr);
+    is(gDeclaration.cssText, "", "non-empty serialization after removing all properties " + errstr);
+  }
+
   function test_value(value) {
     gDeclaration.setProperty(property, value, "");
 
@@ -222,6 +232,12 @@ function test_property(property)
       }
     }
 
+    // sanity check shorthands to make sure disabled props aren't exposed
+    if (info.type != CSS_TYPE_LONGHAND) {
+      gDeclaration.setProperty(property, value, "");
+      test_remove_all_properties(property, value);
+    }
+
     gDeclaration.removeProperty(property);
   }
 

From 3aa9df8061c3a52c8342db51b689102b5a18aad9 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 14 Aug 2013 17:43:04 -0700
Subject: [PATCH 77/98] Bug 901007 - Don't generate xpcAccEvents.h twice;
 r=mshal

---
 accessible/src/xpcom/Makefile.in | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in
index e048bb5a46c..f484a05ff8e 100644
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -1,4 +1,3 @@
-#
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -47,18 +46,6 @@ ifneq ($(A11Y_LOG),0)
   DEFINES += -DA11Y_LOG
 endif
 
-xpcAccEvents.h: $(srcdir)/AccEvents.conf \
-                   $(srcdir)/AccEventGen.py \
-                   $(LIBXUL_DIST)/sdk/bin/header.py \
-                   $(LIBXUL_DIST)/sdk/bin/xpidl.py \
-                   $(DEPTH)/js/src/js-confdefs.h
-	$(PYTHON) $(topsrcdir)/config/pythonpath.py \
-	  -I$(LIBXUL_DIST)/sdk/bin \
-	  $(srcdir)/AccEventGen.py \
-	  -I $(DEPTH)/dist/idl \
-	  --header-output xpcAccEvents.h \
-	  $(srcdir)/AccEvents.conf
-
 xpcAccEvents.cpp: $(srcdir)/AccEvents.conf \
                      $(srcdir)/AccEventGen.py \
                      $(LIBXUL_DIST)/sdk/bin/header.py \
@@ -73,6 +60,8 @@ xpcAccEvents.cpp: $(srcdir)/AccEvents.conf \
 	  --makedepend-output $(MDDEPDIR)/xpcAccEvents.pp \
 	  $(srcdir)/AccEvents.conf
 
+xpcAccEvents.h: xpcAccEvents.cpp
+
 GARBAGE += \
   xpcAccEvents.cpp \
   xpcAccEvents.h \

From 3239b169ccca8aa925e66c9e68f30f8f4633ec1b Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 14 Aug 2013 17:43:04 -0700
Subject: [PATCH 78/98] Bug 904823 - Discourage use of make for running
 xpcshell tests; r=ted

---
 config/makefiles/xpcshell.mk        | 3 +++
 js/src/config/makefiles/xpcshell.mk | 3 +++
 testing/testsuite-targets.mk        | 1 +
 3 files changed, 7 insertions(+)

diff --git a/config/makefiles/xpcshell.mk b/config/makefiles/xpcshell.mk
index 0a49e2c1c9d..48165341966 100644
--- a/config/makefiles/xpcshell.mk
+++ b/config/makefiles/xpcshell.mk
@@ -36,6 +36,7 @@ endif #} NO_XPCSHELL_MANIFEST_CHECK
 # Execute all tests in the $(XPCSHELL_TESTS) directories.
 # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
+	$(info Please consider running xpcshell tests via |mach xpcshell-test|. mach is more powerful, easier to use, and will be the only supported way to run tests in the future. Consider switching to mach today!)
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
 	  -I$(DEPTH)/build \
 	  -I$(topsrcdir)/build \
@@ -71,6 +72,7 @@ xpcshell-tests-remote:
 # start the test. Instead, present the xpcshell prompt so the user can
 # attach a debugger and then start the test.
 check-interactive:
+	$(info Please consider running xpcshell tests via mach: |mach xpcshell-test --interactive path/to/test|.)
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
 	  -I$(DEPTH)/build \
 	  -I$(topsrcdir)/build \
@@ -88,6 +90,7 @@ check-interactive:
 
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
+	$(info Please consider running xpcshell tests via mach: |mach xpcshell-test path/to/test|.)
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
 	  -I$(DEPTH)/build \
 	  -I$(topsrcdir)/build \
diff --git a/js/src/config/makefiles/xpcshell.mk b/js/src/config/makefiles/xpcshell.mk
index 0a49e2c1c9d..48165341966 100644
--- a/js/src/config/makefiles/xpcshell.mk
+++ b/js/src/config/makefiles/xpcshell.mk
@@ -36,6 +36,7 @@ endif #} NO_XPCSHELL_MANIFEST_CHECK
 # Execute all tests in the $(XPCSHELL_TESTS) directories.
 # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
+	$(info Please consider running xpcshell tests via |mach xpcshell-test|. mach is more powerful, easier to use, and will be the only supported way to run tests in the future. Consider switching to mach today!)
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
 	  -I$(DEPTH)/build \
 	  -I$(topsrcdir)/build \
@@ -71,6 +72,7 @@ xpcshell-tests-remote:
 # start the test. Instead, present the xpcshell prompt so the user can
 # attach a debugger and then start the test.
 check-interactive:
+	$(info Please consider running xpcshell tests via mach: |mach xpcshell-test --interactive path/to/test|.)
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
 	  -I$(DEPTH)/build \
 	  -I$(topsrcdir)/build \
@@ -88,6 +90,7 @@ check-interactive:
 
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
+	$(info Please consider running xpcshell tests via mach: |mach xpcshell-test path/to/test|.)
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
 	  -I$(DEPTH)/build \
 	  -I$(topsrcdir)/build \
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index ff0f84e22ff..361f86e12ee 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -279,6 +279,7 @@ GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser)
 # See also config/rules.mk 'xpcshell-tests' target for local execution.
 # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] xpcshell-tests|.
 xpcshell-tests:
+	$(info Have you considered running xpcshell tests via |mach xpcshell-test|? mach is easier to use and has more features than make and it will eventually be the only way to run xpcshell tests. Please consider using mach today!)
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
 	  -I$(DEPTH)/build \
 	  -I$(topsrcdir)/build \

From 3e0e99e7ca4a43965cfe68c2996203338c560718 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Mon, 12 Aug 2013 17:07:38 -0400
Subject: [PATCH 79/98] bug 902170 - don't log data: PAC URIs to JS console
 r=jduell

---
 netwerk/base/src/ProxyAutoConfig.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/netwerk/base/src/ProxyAutoConfig.cpp b/netwerk/base/src/ProxyAutoConfig.cpp
index 40e49f731e0..4e6f8edbec9 100644
--- a/netwerk/base/src/ProxyAutoConfig.cpp
+++ b/netwerk/base/src/ProxyAutoConfig.cpp
@@ -601,6 +601,11 @@ ProxyAutoConfig::SetupJS()
   JSAutoRequest ar(mJSRuntime->Context());
   JSAutoCompartment ac(mJSRuntime->Context(), mJSRuntime->Global());
 
+  // check if this is a data: uri so that we don't spam the js console with
+  // huge meaningless strings. this is not on the main thread, so it can't
+  // use nsIRUI scheme methods
+  bool isDataURI = nsDependentCSubstring(mPACURI, 0, 5).LowerCaseEqualsASCII("data:", 5);
+
   sRunning = this;
   JSScript *script = JS_CompileScript(mJSRuntime->Context(),
                                       mJSRuntime->Global(),
@@ -609,7 +614,12 @@ ProxyAutoConfig::SetupJS()
   if (!script ||
       !JS_ExecuteScript(mJSRuntime->Context(), mJSRuntime->Global(), script, nullptr)) {
     nsString alertMessage(NS_LITERAL_STRING("PAC file failed to install from "));
-    alertMessage += NS_ConvertUTF8toUTF16(mPACURI);
+    if (isDataURI) {
+      alertMessage += NS_LITERAL_STRING("data: URI");
+    }
+    else {
+      alertMessage += NS_ConvertUTF8toUTF16(mPACURI);
+    }
     PACLogToConsole(alertMessage);
     sRunning = nullptr;
     return NS_ERROR_FAILURE;
@@ -618,7 +628,12 @@ ProxyAutoConfig::SetupJS()
 
   mJSRuntime->SetOK();
   nsString alertMessage(NS_LITERAL_STRING("PAC file installed from "));
-  alertMessage += NS_ConvertUTF8toUTF16(mPACURI);
+  if (isDataURI) {
+    alertMessage += NS_LITERAL_STRING("data: URI");
+  }
+  else {
+    alertMessage += NS_ConvertUTF8toUTF16(mPACURI);
+  }
   PACLogToConsole(alertMessage);
 
   // we don't need these now

From bad912e5c662d12f817f21e0895dc9cbda15dc0f Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 14 Aug 2013 17:58:30 -0700
Subject: [PATCH 80/98] Bug 850380 - Ensure xpidl Makefile is regenerated
 properly; r=glandium

---
 config/makefiles/xpidl/Makefile.in                | 1 +
 python/mozbuild/mozbuild/backend/recursivemake.py | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/config/makefiles/xpidl/Makefile.in b/config/makefiles/xpidl/Makefile.in
index fba4c3615dc..f05374d0484 100644
--- a/config/makefiles/xpidl/Makefile.in
+++ b/config/makefiles/xpidl/Makefile.in
@@ -11,6 +11,7 @@ include $(DEPTH)/config/autoconf.mk
 
 SUPPRESS_DEFAULT_RULES := 1
 STANDALONE_MAKEFILE := 1
+NO_MAKEFILE_RULE := 1
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 3cc306a21d2..04efff3f359 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -442,6 +442,11 @@ class RecursiveMakeBackend(CommonBackend):
         self._update_from_avoid_write(result)
         self.summary.managed_count += 1
 
+        # The Makefile can't regenerate itself because of custom substitution.
+        # We need to list it here to ensure changes cause regeneration.
+        self.backend_input_files.add(os.path.join(self.environment.topsrcdir,
+            'config', 'makefiles', 'xpidl', 'Makefile.in'))
+
     def _process_program(self, program, backend_file):
         backend_file.write('PROGRAM = %s\n' % program)
 

From 25e16753552149a9faa3dcbb77b2e12485c05823 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Wed, 14 Aug 2013 18:11:42 -0700
Subject: [PATCH 81/98] Bug 905271 - Make ICU compile with -jN (except on
 Windows). r=glandium

---
 js/src/Makefile.in | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 5a736a6109a..5b515ed1285 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -238,8 +238,14 @@ LOCAL_INCLUDES += \
 ifdef ENABLE_INTL_API
 
 ifeq ($(OS_ARCH),WINNT)
-  # Parallel gmake is buggy on Windows
-  ICU_GMAKE_OPTIONS="-j1"
+  # ICU doesn't work with pymake, because pymake doesn't support order-only
+  # prerequisites.
+  ifdef .PYMAKE
+    ICU_MAKE = $(GMAKE)
+  else
+    ICU_MAKE = $(MAKE)
+  endif
+
   # Library names: On Windows, ICU uses modified library names for static
   # and debug libraries.
   ifdef MOZ_DEBUG
@@ -247,6 +253,8 @@ ifeq ($(OS_ARCH),WINNT)
   endif
   ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
                      cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;)
+else
+  ICU_MAKE = $(MAKE)
 endif
 
 # - Build ICU as part of the "export" target, so things get built
@@ -257,7 +265,7 @@ endif
 #   will discard all files with a non-standard suffix (bug 857450).
 # - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
 export::
-	$(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
+	+$(ICU_MAKE) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
 	$(ICU_LIB_RENAME)
 
 distclean clean::

From 5d57f750a265109513391a4e7e82a9106ee36b47 Mon Sep 17 00:00:00 2001
From: Simone Carletti <weppos@weppos.net>
Date: Thu, 15 Aug 2013 02:22:57 +0100
Subject: [PATCH 82/98] Bug 901193 - Add ro.com to PSL. r=gerv.

---
 netwerk/dns/effective_tld_names.dat | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat
index 39a947f7cc5..41d8eac6dac 100644
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -6949,6 +6949,10 @@ global.prod.fastly.net
 // Requested by Ben Toews <btoews@github.com> 2013-04-18
 github.io
 
+// GlobeHosting, Inc.
+// Requested by Zoltan Egresi <egresi@globehosting.com> 2013-07-12
+ro.com
+
 // Google, Inc.
 // Requested by Eduardo Vela <evn@google.com> 2012-10-24
 appspot.com

From 618656a126dec3c350d8052391154e2d866d118f Mon Sep 17 00:00:00 2001
From: Simone Carletti <weppos@weppos.net>
Date: Thu, 15 Aug 2013 02:23:47 +0100
Subject: [PATCH 83/98] Bug 901195 - update .sv and .om in PSL. r=gerv.

---
 netwerk/dns/effective_tld_names.dat | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat
index 41d8eac6dac..feda147656c 100644
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -5038,7 +5038,16 @@ nu
 *.nz
 
 // om : http://en.wikipedia.org/wiki/.om
-*.om
+om
+co.om
+com.om
+edu.om
+gov.om
+med.om
+museum.om
+net.om
+org.om
+pro.om
 !mediaphone.om
 !nawrastelecom.om
 !nawras.om
@@ -5742,8 +5751,13 @@ store.st
 // su : http://en.wikipedia.org/wiki/.su
 su
 
-// sv : http://www.svnet.org.sv/svpolicy.html
-*.sv
+// sv : http://www.svnet.org.sv/niveldos.pdf
+sv
+com.sv
+edu.sv
+gob.sv
+org.sv
+red.sv
 
 // sx : http://en.wikipedia.org/wiki/.sx
 // Confirmed by registry <jcvignes@openregistry.com> 2012-05-31

From 8b74818e512d53174e98cd5fdd233de3fa21d522 Mon Sep 17 00:00:00 2001
From: Simone Carletti <weppos@weppos.net>
Date: Thu, 15 Aug 2013 02:25:38 +0100
Subject: [PATCH 84/98] Bug 902785 - add cloudcontrol.com to PSL. r=gerv.
 DONTBUILD.

---
 netwerk/dns/effective_tld_names.dat | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat
index feda147656c..f5346dde84c 100644
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -6659,6 +6659,11 @@ za.com
 // c.la : http://www.c.la/
 c.la
 
+// cloudControl : https://www.cloudcontrol.com/
+// Requested by Tobias Wilken <tw@cloudcontrol.com> 2013-07-23
+cloudcontrolled.com
+cloudcontrolapp.com
+
 // co.ca : http://registry.co.ca/
 co.ca
 

From 988d1ae5e827bc0eb21277283e27bca749ce1c34 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 14 Aug 2013 18:19:24 -0700
Subject: [PATCH 85/98] Bug 905465 - Minor memory reporter manager code style
 clean-ups.  r=jlebar.

--HG--
extra : rebase_source : ff7e494a8a999ccc134460f096f4b5ff08faa282
---
 xpcom/base/nsIMemoryReporter.idl       |  27 ++-
 xpcom/base/nsMemoryReporterManager.cpp | 238 +++++++++++++------------
 2 files changed, 133 insertions(+), 132 deletions(-)

diff --git a/xpcom/base/nsIMemoryReporter.idl b/xpcom/base/nsIMemoryReporter.idl
index b398bc4e3a4..94dc369cae7 100644
--- a/xpcom/base/nsIMemoryReporter.idl
+++ b/xpcom/base/nsIMemoryReporter.idl
@@ -350,11 +350,11 @@ interface nsIMemoryReporterManager : nsISupports
 // that individual reporters should be referenced with |nsIMemoryReporter *|
 // instead of nsCOMPtr<nsIMemoryReporter>.
 
-XPCOM_API(nsresult) NS_RegisterMemoryReporter(nsIMemoryReporter *reporter);
-XPCOM_API(nsresult) NS_RegisterMemoryMultiReporter(nsIMemoryMultiReporter *reporter);
+XPCOM_API(nsresult) NS_RegisterMemoryReporter(nsIMemoryReporter* aReporter);
+XPCOM_API(nsresult) NS_RegisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter);
 
-XPCOM_API(nsresult) NS_UnregisterMemoryReporter(nsIMemoryReporter *reporter);
-XPCOM_API(nsresult) NS_UnregisterMemoryMultiReporter(nsIMemoryMultiReporter *reporter);
+XPCOM_API(nsresult) NS_UnregisterMemoryReporter(nsIMemoryReporter* aReporter);
+XPCOM_API(nsresult) NS_UnregisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter);
 
 #if defined(MOZ_DMD)
 namespace mozilla {
@@ -364,9 +364,6 @@ namespace dmd {
 void RunReporters();
 }
 }
-#endif  // defined(MOZ_DMD)
-
-#if defined(MOZ_DMD)
 
 #if !defined(MOZ_MEMORY)
 #error "MOZ_DMD requires MOZ_MEMORY"
@@ -396,10 +393,10 @@ void RunReporters();
 // best to make it similar to the path used by the relevant memory
 // reporter(s).
 #define NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(fn)                              \
-  static size_t fn(const void *ptr)                                           \
+  static size_t fn(const void* aPtr)                                          \
   {                                                                           \
-      MOZ_REPORT(ptr);                                                        \
-      return moz_malloc_size_of(ptr);                                         \
+      MOZ_REPORT(aPtr);                                                       \
+      return moz_malloc_size_of(aPtr);                                        \
   }
 
 // Functions generated by the next two macros should be used by wrapping
@@ -408,15 +405,15 @@ void RunReporters();
 // where we have third-party code that we cannot modify.  The two functions
 // must always be used in tandem.
 #define NS_MEMORY_REPORTER_MALLOC_SIZEOF_ON_ALLOC_FUN(fn)                     \
-  static size_t fn(const void *ptr)                                           \
+  static size_t fn(const void* aPtr)                                          \
   {                                                                           \
-      MOZ_REPORT_ON_ALLOC(ptr);                                               \
-      return moz_malloc_size_of(ptr);                                         \
+      MOZ_REPORT_ON_ALLOC(aPtr);                                              \
+      return moz_malloc_size_of(aPtr);                                        \
   }
 #define NS_MEMORY_REPORTER_MALLOC_SIZEOF_ON_FREE_FUN(fn)                      \
-  static size_t fn(const void *ptr)                                           \
+  static size_t fn(const void* aPtr)                                          \
   {                                                                           \
-      return moz_malloc_size_of(ptr);                                         \
+      return moz_malloc_size_of(aPtr);                                        \
   }
 
 namespace mozilla {
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 0b990282257..3b35fa6fce7 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -38,19 +38,19 @@ using namespace mozilla;
 #if defined(XP_LINUX)
 
 #include <unistd.h>
-static nsresult GetProcSelfStatmField(int field, int64_t *n)
+static nsresult GetProcSelfStatmField(int aField, int64_t* aN)
 {
     // There are more than two fields, but we're only interested in the first
     // two.
     static const int MAX_FIELD = 2;
     size_t fields[MAX_FIELD];
-    MOZ_ASSERT(field < MAX_FIELD, "bad field number");
-    FILE *f = fopen("/proc/self/statm", "r");
+    MOZ_ASSERT(aField < MAX_FIELD, "bad field number");
+    FILE* f = fopen("/proc/self/statm", "r");
     if (f) {
         int nread = fscanf(f, "%zu %zu", &fields[0], &fields[1]);
         fclose(f);
         if (nread == MAX_FIELD) {
-            *n = fields[field] * getpagesize();
+            *aN = fields[aField] * getpagesize();
             return NS_OK;
         }
     }
@@ -58,19 +58,19 @@ static nsresult GetProcSelfStatmField(int field, int64_t *n)
 }
 
 #define HAVE_VSIZE_AND_RESIDENT_REPORTERS 1
-static nsresult GetVsize(int64_t *n)
+static nsresult GetVsize(int64_t* aN)
 {
-    return GetProcSelfStatmField(0, n);
+    return GetProcSelfStatmField(0, aN);
 }
 
-static nsresult GetResident(int64_t *n)
+static nsresult GetResident(int64_t* aN)
 {
-    return GetProcSelfStatmField(1, n);
+    return GetProcSelfStatmField(1, aN);
 }
 
-static nsresult GetResidentFast(int64_t *n)
+static nsresult GetResidentFast(int64_t* aN)
 {
-    return GetResident(n);
+    return GetResident(aN);
 }
 
 #elif defined(__DragonFly__) || defined(__FreeBSD__) \
@@ -107,7 +107,7 @@ static nsresult GetResidentFast(int64_t *n)
 #define KP_RSS(kp) (kp.p_vm_rssize * getpagesize())
 #endif
 
-static nsresult GetKinfoProcSelf(KINFO_PROC *proc)
+static nsresult GetKinfoProcSelf(KINFO_PROC* aProc)
 {
     int mib[] = {
         CTL_KERN,
@@ -121,36 +121,36 @@ static nsresult GetKinfoProcSelf(KINFO_PROC *proc)
     };
     u_int miblen = sizeof(mib) / sizeof(mib[0]);
     size_t size = sizeof(KINFO_PROC);
-    if (sysctl(mib, miblen, proc, &size, NULL, 0))
+    if (sysctl(mib, miblen, aProc, &size, NULL, 0))
         return NS_ERROR_FAILURE;
 
     return NS_OK;
 }
 
 #define HAVE_VSIZE_AND_RESIDENT_REPORTERS 1
-static nsresult GetVsize(int64_t *n)
+static nsresult GetVsize(int64_t* aN)
 {
     KINFO_PROC proc;
     nsresult rv = GetKinfoProcSelf(&proc);
     if (NS_SUCCEEDED(rv))
-        *n = KP_SIZE(proc);
+        *aN = KP_SIZE(proc);
 
     return rv;
 }
 
-static nsresult GetResident(int64_t *n)
+static nsresult GetResident(int64_t* aN)
 {
     KINFO_PROC proc;
     nsresult rv = GetKinfoProcSelf(&proc);
     if (NS_SUCCEEDED(rv))
-        *n = KP_RSS(proc);
+        *aN = KP_RSS(proc);
 
     return rv;
 }
 
-static nsresult GetResidentFast(int64_t *n)
+static nsresult GetResidentFast(int64_t* aN)
 {
-    return GetResident(n);
+    return GetResident(aN);
 }
 
 #elif defined(SOLARIS)
@@ -165,7 +165,7 @@ static void XMappingIter(int64_t& vsize, int64_t& resident)
     resident = -1;
     int mapfd = open("/proc/self/xmap", O_RDONLY);
     struct stat st;
-    prxmap_t *prmapp = NULL;
+    prxmap_t* prmapp = NULL;
     if (mapfd >= 0) {
         if (!fstat(mapfd, &st)) {
             int nmap = st.st_size / sizeof(prxmap_t);
@@ -201,31 +201,31 @@ static void XMappingIter(int64_t& vsize, int64_t& resident)
 }
 
 #define HAVE_VSIZE_AND_RESIDENT_REPORTERS 1
-static nsresult GetVsize(int64_t *n)
+static nsresult GetVsize(int64_t* aN)
 {
     int64_t vsize, resident;
     XMappingIter(vsize, resident);
     if (vsize == -1) {
         return NS_ERROR_FAILURE;
     }
-    *n = vsize;
+    *aN = vsize;
     return NS_OK;
 }
 
-static nsresult GetResident(int64_t *n)
+static nsresult GetResident(int64_t* aN)
 {
     int64_t vsize, resident;
     XMappingIter(vsize, resident);
     if (resident == -1) {
         return NS_ERROR_FAILURE;
     }
-    *n = resident;
+    *aN = resident;
     return NS_OK;
 }
 
-static nsresult GetResidentFast(int64_t *n)
+static nsresult GetResidentFast(int64_t* aN)
 {
-    return GetResident(n);
+    return GetResident(aN);
 }
 
 #elif defined(XP_MACOSX)
@@ -233,11 +233,11 @@ static nsresult GetResidentFast(int64_t *n)
 #include <mach/mach_init.h>
 #include <mach/task.h>
 
-static bool GetTaskBasicInfo(struct task_basic_info *ti)
+static bool GetTaskBasicInfo(struct task_basic_info* aTi)
 {
     mach_msg_type_number_t count = TASK_BASIC_INFO_COUNT;
     kern_return_t kr = task_info(mach_task_self(), TASK_BASIC_INFO,
-                                 (task_info_t)ti, &count);
+                                 (task_info_t)aTi, &count);
     return kr == KERN_SUCCESS;
 }
 
@@ -245,13 +245,13 @@ static bool GetTaskBasicInfo(struct task_basic_info *ti)
 // absurdly high, eg. 2GB+ even at start-up.  But both 'top' and 'ps' report
 // it, so we might as well too.
 #define HAVE_VSIZE_AND_RESIDENT_REPORTERS 1
-static nsresult GetVsize(int64_t *n)
+static nsresult GetVsize(int64_t* aN)
 {
     task_basic_info ti;
     if (!GetTaskBasicInfo(&ti))
         return NS_ERROR_FAILURE;
 
-    *n = ti.virtual_size;
+    *aN = ti.virtual_size;
     return NS_OK;
 }
 
@@ -262,7 +262,7 @@ static nsresult GetVsize(int64_t *n)
 //
 // Purging these pages can take a long time for some users (see bug 789975),
 // so we provide the option to get the RSS without purging first.
-static nsresult GetResident(int64_t *n, bool aDoPurge)
+static nsresult GetResident(int64_t* aN, bool aDoPurge)
 {
 #ifdef HAVE_JEMALLOC_STATS
     if (aDoPurge) {
@@ -275,18 +275,18 @@ static nsresult GetResident(int64_t *n, bool aDoPurge)
     if (!GetTaskBasicInfo(&ti))
         return NS_ERROR_FAILURE;
 
-    *n = ti.resident_size;
+    *aN = ti.resident_size;
     return NS_OK;
 }
 
-static nsresult GetResidentFast(int64_t *n)
+static nsresult GetResidentFast(int64_t* aN)
 {
-    return GetResident(n, /* doPurge = */ false);
+    return GetResident(aN, /* doPurge = */ false);
 }
 
-static nsresult GetResident(int64_t *n)
+static nsresult GetResident(int64_t* aN)
 {
-    return GetResident(n, /* doPurge = */ true);
+    return GetResident(aN, /* doPurge = */ true);
 }
 
 #elif defined(XP_WIN)
@@ -295,7 +295,7 @@ static nsresult GetResident(int64_t *n)
 #include <psapi.h>
 
 #define HAVE_VSIZE_AND_RESIDENT_REPORTERS 1
-static nsresult GetVsize(int64_t *n)
+static nsresult GetVsize(int64_t* aN)
 {
     MEMORYSTATUSEX s;
     s.dwLength = sizeof(s);
@@ -304,11 +304,11 @@ static nsresult GetVsize(int64_t *n)
         return NS_ERROR_FAILURE;
     }
 
-    *n = s.ullTotalVirtual - s.ullAvailVirtual;
+    *aN = s.ullTotalVirtual - s.ullAvailVirtual;
     return NS_OK;
 }
 
-static nsresult GetResident(int64_t *n)
+static nsresult GetResident(int64_t* aN)
 {
     PROCESS_MEMORY_COUNTERS pmc;
     pmc.cb = sizeof(PROCESS_MEMORY_COUNTERS);
@@ -317,13 +317,13 @@ static nsresult GetResident(int64_t *n)
         return NS_ERROR_FAILURE;
     }
 
-    *n = pmc.WorkingSetSize;
+    *aN = pmc.WorkingSetSize;
     return NS_OK;
 }
 
-static nsresult GetResidentFast(int64_t *n)
+static nsresult GetResidentFast(int64_t* aN)
 {
-    return GetResident(n);
+    return GetResident(aN);
 }
 
 #define HAVE_PRIVATE_REPORTER
@@ -337,7 +337,7 @@ public:
 "pages that have been written to.")
     {}
 
-    NS_IMETHOD GetAmount(int64_t *aAmount)
+    NS_IMETHOD GetAmount(int64_t* aAmount)
     {
         PROCESS_MEMORY_COUNTERS_EX pmcex;
         pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
@@ -370,7 +370,7 @@ public:
 "resources used by the process.")
     {}
 
-    NS_IMETHOD GetAmount(int64_t *aAmount) { return GetVsize(aAmount); }
+    NS_IMETHOD GetAmount(int64_t* aAmount) { return GetVsize(aAmount); }
 };
 
 class ResidentReporter MOZ_FINAL : public MemoryReporterBase
@@ -386,7 +386,7 @@ public:
 "time.")
     {}
 
-    NS_IMETHOD GetAmount(int64_t *aAmount) { return GetResident(aAmount); }
+    NS_IMETHOD GetAmount(int64_t* aAmount) { return GetResident(aAmount); }
 };
 
 class ResidentFastReporter MOZ_FINAL : public MemoryReporterBase
@@ -401,7 +401,7 @@ public:
 "telemetry).  Otherwise you should use 'resident'.")
     {}
 
-    NS_IMETHOD GetAmount(int64_t *aAmount) { return GetResidentFast(aAmount); }
+    NS_IMETHOD GetAmount(int64_t* aAmount) { return GetResidentFast(aAmount); }
 };
 #endif  // HAVE_VSIZE_AND_RESIDENT_REPORTERS
 
@@ -429,7 +429,7 @@ public:
 "they impact performance much less than hard page faults.")
     {}
 
-    NS_IMETHOD GetAmount(int64_t *aAmount)
+    NS_IMETHOD GetAmount(int64_t* aAmount)
     {
         struct rusage usage;
         int err = getrusage(RUSAGE_SELF, &usage);
@@ -458,7 +458,7 @@ public:
 "slowly when it is experiencing more than 100 or so hard page faults a second.")
     {}
 
-    NS_IMETHOD GetAmount(int64_t *aAmount)
+    NS_IMETHOD GetAmount(int64_t* aAmount)
     {
         struct rusage usage;
         int err = getrusage(RUSAGE_SELF, &usage);
@@ -631,14 +631,14 @@ public:
 
   NS_DECL_ISUPPORTS
 
-  NS_IMETHOD GetName(nsACString &name)
+  NS_IMETHOD GetName(nsACString& aName)
   {
-    name.Assign("dmd");
+    aName.Assign("dmd");
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *callback,
-                            nsISupports *closure)
+  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback* aCallback,
+                            nsISupports* aClosure)
   {
     dmd::Sizes sizes;
     dmd::SizeOf(&sizes);
@@ -646,10 +646,10 @@ public:
 #define REPORT(_path, _amount, _desc)                                         \
     do {                                                                      \
       nsresult rv;                                                            \
-      rv = callback->Callback(EmptyCString(), NS_LITERAL_CSTRING(_path),      \
-                              nsIMemoryReporter::KIND_HEAP,                   \
-                              nsIMemoryReporter::UNITS_BYTES, _amount,        \
-                              NS_LITERAL_CSTRING(_desc), closure);            \
+      rv = aCallback->Callback(EmptyCString(), NS_LITERAL_CSTRING(_path),     \
+                               nsIMemoryReporter::KIND_HEAP,                  \
+                               nsIMemoryReporter::UNITS_BYTES, _amount,       \
+                               NS_LITERAL_CSTRING(_desc), aClosure);          \
       NS_ENSURE_SUCCESS(rv, rv);                                              \
     } while (0)
 
@@ -811,7 +811,7 @@ nsMemoryReporterManager::~nsMemoryReporterManager()
 }
 
 NS_IMETHODIMP
-nsMemoryReporterManager::EnumerateReporters(nsISimpleEnumerator **result)
+nsMemoryReporterManager::EnumerateReporters(nsISimpleEnumerator** aResult)
 {
     // Memory reporters are not necessarily threadsafe, so EnumerateReporters()
     // must be called from the main thread.
@@ -823,12 +823,12 @@ nsMemoryReporterManager::EnumerateReporters(nsISimpleEnumerator **result)
 
     nsRefPtr<HashtableEnumerator> enumerator =
         new HashtableEnumerator(mReporters);
-    enumerator.forget(result);
+    enumerator.forget(aResult);
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMemoryReporterManager::EnumerateMultiReporters(nsISimpleEnumerator **result)
+nsMemoryReporterManager::EnumerateMultiReporters(nsISimpleEnumerator** aResult)
 {
     // Memory multi-reporters are not necessarily threadsafe, so
     // EnumerateMultiReporters() must be called from the main thread.
@@ -840,7 +840,7 @@ nsMemoryReporterManager::EnumerateMultiReporters(nsISimpleEnumerator **result)
 
     nsRefPtr<HashtableEnumerator> enumerator =
         new HashtableEnumerator(mMultiReporters);
-    enumerator.forget(result);
+    enumerator.forget(aResult);
     return NS_OK;
 }
 
@@ -857,108 +857,108 @@ DebugAssertRefcountIsNonZero(nsISupports* aObj)
 
 nsresult
 nsMemoryReporterManager::RegisterReporterHelper(
-    nsIMemoryReporter *reporter, bool aForce)
+    nsIMemoryReporter* aReporter, bool aForce)
 {
     // This method is thread-safe.
     mozilla::MutexAutoLock autoLock(mMutex);
 
-    if ((mIsRegistrationBlocked && !aForce) || mReporters.Contains(reporter)) {
+    if ((mIsRegistrationBlocked && !aForce) || mReporters.Contains(aReporter)) {
         return NS_ERROR_FAILURE;
     }
 
-    // This method needs to be safe even if |reporter| has a refcnt of 0, so we
-    // take a kung fu death grip before calling PutEntry.  Otherwise, if
-    // PutEntry addref'ed and released reporter before finally addref'ing it for
-    // good, it would free reporter!
+    // This method needs to be safe even if |aReporter| has a refcnt of 0, so
+    // we take a kung fu death grip before calling PutEntry.  Otherwise, if
+    // PutEntry addref'ed and released |aReporter| before finally addref'ing it
+    // for good, it would free aReporter!
     //
     // The kung fu death grip could itself be problematic if PutEntry didn't
-    // addref |reporter| (because then when the death grip goes out of scope, we
-    // would delete the reporter).  In debug mode, we check that this doesn't
-    // happen.
+    // addref |aReporter| (because then when the death grip goes out of scope,
+    // we would delete the reporter).  In debug mode, we check that this
+    // doesn't happen.
 
     {
-        nsCOMPtr<nsIMemoryReporter> kungFuDeathGrip = reporter;
-        mReporters.PutEntry(reporter);
+        nsCOMPtr<nsIMemoryReporter> kungFuDeathGrip = aReporter;
+        mReporters.PutEntry(aReporter);
     }
 
-    DebugAssertRefcountIsNonZero(reporter);
+    DebugAssertRefcountIsNonZero(aReporter);
 
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMemoryReporterManager::RegisterReporter(nsIMemoryReporter *reporter)
+nsMemoryReporterManager::RegisterReporter(nsIMemoryReporter* aReporter)
 {
-    return RegisterReporterHelper(reporter, /* force = */ false);
+    return RegisterReporterHelper(aReporter, /* force = */ false);
 }
 
 NS_IMETHODIMP
 nsMemoryReporterManager::RegisterReporterEvenIfBlocked(
-    nsIMemoryReporter *reporter)
+    nsIMemoryReporter* aReporter)
 {
-    return RegisterReporterHelper(reporter, /* force = */ true);
+    return RegisterReporterHelper(aReporter, /* force = */ true);
 }
 
 nsresult
 nsMemoryReporterManager::RegisterMultiReporterHelper(
-    nsIMemoryMultiReporter *reporter, bool aForce)
+    nsIMemoryMultiReporter* aReporter, bool aForce)
 {
     // This method is thread-safe.
     mozilla::MutexAutoLock autoLock(mMutex);
 
     if ((mIsRegistrationBlocked && !aForce) ||
-         mMultiReporters.Contains(reporter)) {
+         mMultiReporters.Contains(aReporter)) {
         return NS_ERROR_FAILURE;
     }
 
     {
-        nsCOMPtr<nsIMemoryMultiReporter> kungFuDeathGrip = reporter;
-        mMultiReporters.PutEntry(reporter);
+        nsCOMPtr<nsIMemoryMultiReporter> kungFuDeathGrip = aReporter;
+        mMultiReporters.PutEntry(aReporter);
     }
 
-    DebugAssertRefcountIsNonZero(reporter);
+    DebugAssertRefcountIsNonZero(aReporter);
 
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMemoryReporterManager::RegisterMultiReporter(nsIMemoryMultiReporter *reporter)
+nsMemoryReporterManager::RegisterMultiReporter(nsIMemoryMultiReporter* aReporter)
 {
-    return RegisterMultiReporterHelper(reporter, /* force = */ false);
+    return RegisterMultiReporterHelper(aReporter, /* force = */ false);
 }
 
 NS_IMETHODIMP
 nsMemoryReporterManager::RegisterMultiReporterEvenIfBlocked(
-    nsIMemoryMultiReporter *reporter)
+    nsIMemoryMultiReporter* aReporter)
 {
-    return RegisterMultiReporterHelper(reporter, /* force = */ true);
+    return RegisterMultiReporterHelper(aReporter, /* force = */ true);
 }
 
 NS_IMETHODIMP
-nsMemoryReporterManager::UnregisterReporter(nsIMemoryReporter *reporter)
+nsMemoryReporterManager::UnregisterReporter(nsIMemoryReporter* aReporter)
 {
     // This method is thread-safe.
     mozilla::MutexAutoLock autoLock(mMutex);
 
-    if (!mReporters.Contains(reporter)) {
+    if (!mReporters.Contains(aReporter)) {
         return NS_ERROR_FAILURE;
     }
 
-    mReporters.RemoveEntry(reporter);
+    mReporters.RemoveEntry(aReporter);
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMemoryReporterManager::UnregisterMultiReporter(nsIMemoryMultiReporter *reporter)
+nsMemoryReporterManager::UnregisterMultiReporter(nsIMemoryMultiReporter* aReporter)
 {
     // This method is thread-safe.
     mozilla::MutexAutoLock autoLock(mMutex);
 
-    if (!mMultiReporters.Contains(reporter)) {
+    if (!mMultiReporters.Contains(aReporter)) {
         return NS_ERROR_FAILURE;
     }
 
-    mMultiReporters.RemoveEntry(reporter);
+    mMultiReporters.RemoveEntry(aReporter);
     return NS_OK;
 }
 
@@ -987,7 +987,7 @@ nsMemoryReporterManager::UnblockRegistration()
 }
 
 NS_IMETHODIMP
-nsMemoryReporterManager::GetResident(int64_t *aResident)
+nsMemoryReporterManager::GetResident(int64_t* aResident)
 {
 #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
     return ::GetResident(aResident);
@@ -1012,17 +1012,17 @@ class ExplicitNonHeapCountingCallback MOZ_FINAL : public nsIMemoryMultiReporterC
 public:
     NS_DECL_ISUPPORTS
 
-    NS_IMETHOD Callback(const nsACString &aProcess, const nsACString &aPath,
+    NS_IMETHOD Callback(const nsACString& aProcess, const nsACString& aPath,
                         int32_t aKind, int32_t aUnits, int64_t aAmount,
-                        const nsACString &aDescription,
-                        nsISupports *aWrappedExplicitNonHeap)
+                        const nsACString& aDescription,
+                        nsISupports* aWrappedExplicitNonHeap)
     {
         if (aKind == nsIMemoryReporter::KIND_NONHEAP &&
             PromiseFlatCString(aPath).Find("explicit") == 0 &&
             aAmount != int64_t(-1))
         {
-            Int64Wrapper *wrappedPRInt64 =
-                static_cast<Int64Wrapper *>(aWrappedExplicitNonHeap);
+            Int64Wrapper* wrappedPRInt64 =
+                static_cast<Int64Wrapper*>(aWrappedExplicitNonHeap);
             wrappedPRInt64->mValue += aAmount;
         }
         return NS_OK;
@@ -1034,7 +1034,7 @@ NS_IMPL_ISUPPORTS1(
 )
 
 NS_IMETHODIMP
-nsMemoryReporterManager::GetExplicit(int64_t *aExplicit)
+nsMemoryReporterManager::GetExplicit(int64_t* aExplicit)
 {
     NS_ENSURE_ARG_POINTER(aExplicit);
     *aExplicit = 0;
@@ -1106,9 +1106,9 @@ nsMemoryReporterManager::GetExplicit(int64_t *aExplicit)
 }
 
 NS_IMETHODIMP
-nsMemoryReporterManager::GetHasMozMallocUsableSize(bool *aHas)
+nsMemoryReporterManager::GetHasMozMallocUsableSize(bool* aHas)
 {
-    void *p = malloc(16);
+    void* p = malloc(16);
     if (!p) {
         return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -1191,13 +1191,13 @@ private:
 
 NS_IMETHODIMP
 nsMemoryReporterManager::MinimizeMemoryUsage(nsIRunnable* aCallback,
-                                             nsICancelableRunnable **result)
+                                             nsICancelableRunnable** aResult)
 {
-  NS_ENSURE_ARG_POINTER(result);
+  NS_ENSURE_ARG_POINTER(aResult);
 
   nsRefPtr<nsICancelableRunnable> runnable =
     new MinimizeMemoryUsageRunnable(aCallback);
-  NS_ADDREF(*result = runnable);
+  NS_ADDREF(*aResult = runnable);
 
   return NS_DispatchToMainThread(runnable);
 }
@@ -1208,39 +1208,43 @@ nsMemoryReporterManager::MinimizeMemoryUsage(nsIRunnable* aCallback,
 NS_IMPL_ISUPPORTS1(MemoryReporterBase, nsIMemoryReporter)
 
 nsresult
-NS_RegisterMemoryReporter (nsIMemoryReporter *reporter)
+NS_RegisterMemoryReporter(nsIMemoryReporter* aReporter)
 {
     nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
-    if (mgr == nullptr)
+    if (!mgr) {
         return NS_ERROR_FAILURE;
-    return mgr->RegisterReporter(reporter);
+    }
+    return mgr->RegisterReporter(aReporter);
 }
 
 nsresult
-NS_RegisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter)
+NS_RegisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter)
 {
     nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
-    if (mgr == nullptr)
+    if (!mgr) {
         return NS_ERROR_FAILURE;
-    return mgr->RegisterMultiReporter(reporter);
+    }
+    return mgr->RegisterMultiReporter(aReporter);
 }
 
 nsresult
-NS_UnregisterMemoryReporter (nsIMemoryReporter *reporter)
+NS_UnregisterMemoryReporter(nsIMemoryReporter* aReporter)
 {
     nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
-    if (mgr == nullptr)
+    if (!mgr) {
         return NS_ERROR_FAILURE;
-    return mgr->UnregisterReporter(reporter);
+    }
+    return mgr->UnregisterReporter(aReporter);
 }
 
 nsresult
-NS_UnregisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter)
+NS_UnregisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter)
 {
     nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
-    if (mgr == nullptr)
+    if (!mgr) {
         return NS_ERROR_FAILURE;
-    return mgr->UnregisterMultiReporter(reporter);
+    }
+    return mgr->UnregisterMultiReporter(aReporter);
 }
 
 #if defined(MOZ_DMD)
@@ -1253,10 +1257,10 @@ class NullMultiReporterCallback : public nsIMemoryMultiReporterCallback
 public:
     NS_DECL_ISUPPORTS
 
-    NS_IMETHOD Callback(const nsACString &aProcess, const nsACString &aPath,
+    NS_IMETHOD Callback(const nsACString& aProcess, const nsACString& aPath,
                         int32_t aKind, int32_t aUnits, int64_t aAmount,
-                        const nsACString &aDescription,
-                        nsISupports *aData)
+                        const nsACString& aDescription,
+                        nsISupports* aData)
     {
         // Do nothing;  the reporter has already reported to DMD.
         return NS_OK;

From 8cf4d2c76ba94523787cc47c4a585baeacfbbeb6 Mon Sep 17 00:00:00 2001
From: Joshua Cranmer <Pidgeot18@gmail.com>
Date: Wed, 14 Aug 2013 21:18:42 -0500
Subject: [PATCH 86/98] Bug 884676 - Part 2, Use mozilla::Atomic<int32_t> for
 Runtime::interrupt. r=njn

--HG--
extra : rebase_source : a06218cb913d7340fdfdb537512a13df550baf8b
---
 js/src/jscntxt.cpp        | 2 +-
 js/src/vm/Interpreter.cpp | 2 +-
 js/src/vm/Runtime.cpp     | 6 +-----
 js/src/vm/Runtime.h       | 8 +++++++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index cd985a52b11..d8417a13504 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -1002,7 +1002,7 @@ js_InvokeOperationCallback(JSContext *cx)
      * thread is racing us here we will accumulate another callback request
      * which will be serviced at the next opportunity.
      */
-    JS_ATOMIC_SET(&rt->interrupt, 0);
+    rt->interrupt = 0;
 
     /* IonMonkey sets its stack limit to UINTPTR_MAX to trigger operaton callbacks. */
     rt->resetIonStackLimit();
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 723a159aa17..1b4a189c292 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -1313,7 +1313,7 @@ Interpret(JSContext *cx, RunState &state)
      */
 #define CHECK_BRANCH()                                                        \
     JS_BEGIN_MACRO                                                            \
-        if (cx->runtime()->interrupt && !js_HandleExecutionInterrupt(cx))       \
+        if (cx->runtime()->interrupt && !js_HandleExecutionInterrupt(cx))     \
             goto error;                                                       \
     JS_END_MACRO
 
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
index dbe175f294f..ef0c10adc85 100644
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -527,11 +527,7 @@ JSRuntime::triggerOperationCallback()
      */
     mainThread.setIonStackLimit(-1);
 
-    /*
-     * Use JS_ATOMIC_SET in the hope that it ensures the write will become
-     * immediately visible to other processors polling the flag.
-     */
-    JS_ATOMIC_SET(&interrupt, 1);
+    interrupt = 1;
 
 #ifdef JS_ION
     /* asm.js code uses a separate mechanism to halt running code. */
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 999259b970a..c3c2ca880ab 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -691,7 +691,13 @@ struct JSRuntime : public JS::shadow::Runtime,
      * If non-zero, we were been asked to call the operation callback as soon
      * as possible.
      */
-    volatile int32_t    interrupt;
+#ifdef JS_THREADSAFE
+    mozilla::Atomic<int32_t> interrupt;
+    static_assert(sizeof(interrupt) == sizeof(int32_t),
+                  "|interrupt| must be ABI-compatible with int32_t for JIT.");
+#else
+    int32_t interrupt;
+#endif
 
     /* Branch callback */
     JSOperationCallback operationCallback;

From 8a95df6d82ef906b531f84e345882c16cf2b1fc9 Mon Sep 17 00:00:00 2001
From: Joshua Cranmer <Pidgeot18@gmail.com>
Date: Wed, 14 Aug 2013 22:58:36 -0500
Subject: [PATCH 87/98] Bustage fix for bug 884676/66e1ed80ba05 to fix CLOSED
 TREE.

---
 js/src/vm/Runtime.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index c3c2ca880ab..3f010390672 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -693,8 +693,6 @@ struct JSRuntime : public JS::shadow::Runtime,
      */
 #ifdef JS_THREADSAFE
     mozilla::Atomic<int32_t> interrupt;
-    static_assert(sizeof(interrupt) == sizeof(int32_t),
-                  "|interrupt| must be ABI-compatible with int32_t for JIT.");
 #else
     int32_t interrupt;
 #endif

From f2fb548fceb3821907abb6c6dcfb8a5b3f12333a Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Wed, 14 Aug 2013 21:07:19 -0700
Subject: [PATCH 88/98] Back out cb68113d5052 (bug 901195) for xpcshell bustage
 CLOSED TREE

---
 netwerk/dns/effective_tld_names.dat | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat
index f5346dde84c..7c4a0860964 100644
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -5038,16 +5038,7 @@ nu
 *.nz
 
 // om : http://en.wikipedia.org/wiki/.om
-om
-co.om
-com.om
-edu.om
-gov.om
-med.om
-museum.om
-net.om
-org.om
-pro.om
+*.om
 !mediaphone.om
 !nawrastelecom.om
 !nawras.om
@@ -5751,13 +5742,8 @@ store.st
 // su : http://en.wikipedia.org/wiki/.su
 su
 
-// sv : http://www.svnet.org.sv/niveldos.pdf
-sv
-com.sv
-edu.sv
-gob.sv
-org.sv
-red.sv
+// sv : http://www.svnet.org.sv/svpolicy.html
+*.sv
 
 // sx : http://en.wikipedia.org/wiki/.sx
 // Confirmed by registry <jcvignes@openregistry.com> 2012-05-31

From 1be429f495311d872e857e58db076efa1e7be6af Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 15 Aug 2013 16:23:52 +1200
Subject: [PATCH 89/98] Bug 902320. Prevent untimely destruction of mElement
 during HTMLMediaElement::StreamListener callbacks. r=smaug

---
 content/html/content/src/HTMLMediaElement.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/content/html/content/src/HTMLMediaElement.cpp b/content/html/content/src/HTMLMediaElement.cpp
index 52e59cca5b6..9799fae5e8d 100644
--- a/content/html/content/src/HTMLMediaElement.cpp
+++ b/content/html/content/src/HTMLMediaElement.cpp
@@ -2597,12 +2597,14 @@ public:
   void DoNotifyFinished()
   {
     if (mElement) {
+      nsRefPtr<HTMLMediaElement> deathGrip = mElement;
       mElement->PlaybackEnded();
     }
   }
   void UpdateReadyStateForData()
   {
     if (mElement && mHaveCurrentData) {
+      nsRefPtr<HTMLMediaElement> deathGrip = mElement;
       mElement->UpdateReadyStateForData(
         mBlocked ? MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING :
                    MediaDecoderOwner::NEXT_FRAME_AVAILABLE);
@@ -2625,6 +2627,7 @@ public:
       mPendingNotifyOutput = false;
     }
     if (mElement && mHaveCurrentData) {
+      nsRefPtr<HTMLMediaElement> deathGrip = mElement;
       mElement->FireTimeUpdate(true);
     }
   }
@@ -2632,6 +2635,7 @@ public:
   {
     mHaveCurrentData = true;
     if (mElement) {
+      nsRefPtr<HTMLMediaElement> deathGrip = mElement;
       mElement->FirstFrameLoaded(false);
     }
     UpdateReadyStateForData();

From 3807c1b21eb5e6a5c608da4c2bdbada91616c5e2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 15 Aug 2013 16:24:00 +1200
Subject: [PATCH 90/98] Bug 904926. Remove unnecessary lock. r=cpearce

---
 content/media/MediaDecoder.cpp |  3 +--
 content/media/MediaDecoder.h   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/content/media/MediaDecoder.cpp b/content/media/MediaDecoder.cpp
index 1f85d8d7af1..ead263c6903 100644
--- a/content/media/MediaDecoder.cpp
+++ b/content/media/MediaDecoder.cpp
@@ -364,7 +364,6 @@ MediaDecoder::MediaDecoder() :
   mInitialVolume(0.0),
   mInitialPlaybackRate(1.0),
   mInitialPreservesPitch(true),
-  mRequestedSeekTime(-1.0),
   mDuration(-1),
   mTransportSeekable(true),
   mMediaSeekable(true),
@@ -373,6 +372,7 @@ MediaDecoder::MediaDecoder() :
   mIsDormant(false),
   mPlayState(PLAY_STATE_PAUSED),
   mNextState(PLAY_STATE_PAUSED),
+  mRequestedSeekTime(-1.0),
   mCalledResourceLoaded(false),
   mIgnoreProgressData(false),
   mInfiniteStream(false),
@@ -753,7 +753,6 @@ void MediaDecoder::MetadataLoaded(int aChannels, int aRate, bool aHasAudio, bool
 
   // Only inform the element of FirstFrameLoaded if not doing a load() in order
   // to fulfill a seek, otherwise we'll get multiple loadedfirstframe events.
-  ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
   bool notifyResourceIsLoaded = !mCalledResourceLoaded &&
                                 IsDataCachedToEndOfResource();
   if (mOwner) {
diff --git a/content/media/MediaDecoder.h b/content/media/MediaDecoder.h
index 12494e3b076..8e2ec0aa723 100644
--- a/content/media/MediaDecoder.h
+++ b/content/media/MediaDecoder.h
@@ -945,13 +945,6 @@ public:
   double mInitialPlaybackRate;
   bool mInitialPreservesPitch;
 
-  // Position to seek to when the seek notification is received by the
-  // decode thread. Written by the main thread and read via the
-  // decode thread. Synchronised using mReentrantMonitor. If the
-  // value is negative then no seek has been requested. When a seek is
-  // started this is reset to negative.
-  double mRequestedSeekTime;
-
   // Duration of the media resource. Set to -1 if unknown.
   // Set when the metadata is loaded. Accessed on the main thread
   // only.
@@ -1050,6 +1043,15 @@ public:
   // This can only be PLAY_STATE_PAUSED or PLAY_STATE_PLAYING.
   PlayState mNextState;
 
+  // Position to seek to when the seek notification is received by the
+  // decode thread.
+  // This can only be changed on the main thread while holding the decoder
+  // monitor. Thus, it can be safely read while holding the decoder monitor
+  // OR on the main thread.
+  // If the value is negative then no seek has been requested. When a seek is
+  // started this is reset to negative.
+  double mRequestedSeekTime;
+
   // True when we have fully loaded the resource and reported that
   // to the element (i.e. reached NETWORK_LOADED state).
   // Accessed on the main thread only.

From c6aa3d174a72983433b6f2590347d1e258c2aea6 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 15 Aug 2013 16:25:12 +1200
Subject: [PATCH 91/98] Bug 900875. Part 1: Move DWM APIs to WinUtils. r=avih

---
 widget/windows/TaskbarPreview.cpp | 10 +++---
 widget/windows/WinUtils.cpp       | 54 +++++++++++++++++++++++++------
 widget/windows/WinUtils.h         | 23 +++++++++++++
 widget/windows/nsToolkit.cpp      |  4 +++
 widget/windows/nsUXThemeData.cpp  | 54 +++++++++----------------------
 widget/windows/nsUXThemeData.h    | 31 ++----------------
 widget/windows/nsWindow.cpp       | 12 +++----
 7 files changed, 99 insertions(+), 89 deletions(-)

diff --git a/widget/windows/TaskbarPreview.cpp b/widget/windows/TaskbarPreview.cpp
index 97a084e2ea6..3b50a0dc86b 100644
--- a/widget/windows/TaskbarPreview.cpp
+++ b/widget/windows/TaskbarPreview.cpp
@@ -191,7 +191,7 @@ TaskbarPreview::Invalidate() {
     return NS_OK;
 
   HWND previewWindow = PreviewWindow();
-  return FAILED(nsUXThemeData::dwmInvalidateIconicBitmapsPtr(previewWindow))
+  return FAILED(WinUtils::dwmInvalidateIconicBitmapsPtr(previewWindow))
        ? NS_ERROR_FAILURE
        : NS_OK;
 }
@@ -331,13 +331,13 @@ TaskbarPreview::GetWindowHook() {
 void
 TaskbarPreview::EnableCustomDrawing(HWND aHWND, bool aEnable) {
   BOOL enabled = aEnable;
-  nsUXThemeData::dwmSetWindowAttributePtr(
+  WinUtils::dwmSetWindowAttributePtr(
       aHWND,
       DWMWA_FORCE_ICONIC_REPRESENTATION,
       &enabled,
       sizeof(enabled));
 
-  nsUXThemeData::dwmSetWindowAttributePtr(
+  WinUtils::dwmSetWindowAttributePtr(
       aHWND,
       DWMWA_HAS_ICONIC_BITMAP,
       &enabled,
@@ -383,9 +383,9 @@ TaskbarPreview::DrawBitmap(uint32_t width, uint32_t height, bool isPreview) {
   DWORD flags = drawFrame ? DWM_SIT_DISPLAYFRAME : 0;
   POINT pptClient = { 0, 0 };
   if (isPreview)
-    nsUXThemeData::dwmSetIconicLivePreviewBitmapPtr(PreviewWindow(), hBitmap, &pptClient, flags);
+    WinUtils::dwmSetIconicLivePreviewBitmapPtr(PreviewWindow(), hBitmap, &pptClient, flags);
   else
-    nsUXThemeData::dwmSetIconicThumbnailPtr(PreviewWindow(), hBitmap, flags);
+    WinUtils::dwmSetIconicThumbnailPtr(PreviewWindow(), hBitmap, flags);
 
   ResetRenderingContext();
 }
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index 01ab26afbee..f7bf5e90439 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -36,24 +36,58 @@
 namespace mozilla {
 namespace widget {
 
-  NS_IMPL_ISUPPORTS1(myDownloadObserver, nsIDownloadObserver)
+NS_IMPL_ISUPPORTS1(myDownloadObserver, nsIDownloadObserver)
 #ifdef MOZ_PLACES
-  NS_IMPL_ISUPPORTS1(AsyncFaviconDataReady, nsIFaviconDataCallback)
+NS_IMPL_ISUPPORTS1(AsyncFaviconDataReady, nsIFaviconDataCallback)
 #endif
-  NS_IMPL_ISUPPORTS1(AsyncEncodeAndWriteIcon, nsIRunnable)
-  NS_IMPL_ISUPPORTS1(AsyncDeleteIconFromDisk, nsIRunnable)
-  NS_IMPL_ISUPPORTS1(AsyncDeleteAllFaviconsFromDisk, nsIRunnable)
+NS_IMPL_ISUPPORTS1(AsyncEncodeAndWriteIcon, nsIRunnable)
+NS_IMPL_ISUPPORTS1(AsyncDeleteIconFromDisk, nsIRunnable)
+NS_IMPL_ISUPPORTS1(AsyncDeleteAllFaviconsFromDisk, nsIRunnable)
 
 
-  const char FaviconHelper::kJumpListCacheDir[] = "jumpListCache";
-  const char FaviconHelper::kShortcutCacheDir[] = "shortcutCache";
+const char FaviconHelper::kJumpListCacheDir[] = "jumpListCache";
+const char FaviconHelper::kShortcutCacheDir[] = "shortcutCache";
 
 // apis available on vista and up.
 WinUtils::SHCreateItemFromParsingNamePtr WinUtils::sCreateItemFromParsingName = NULL;
 WinUtils::SHGetKnownFolderPathPtr WinUtils::sGetKnownFolderPath = NULL;
 
-static const PRUnichar kSehllLibraryName[] =  L"shell32.dll";
+// We just leak these DLL HMODULEs. There's no point in calling FreeLibrary
+// on them during shutdown anyway.
+static const PRUnichar kShellLibraryName[] =  L"shell32.dll";
 static HMODULE sShellDll = NULL;
+static const PRUnichar kDwmLibraryName[] = L"dwmapi.dll";
+static HMODULE sDwmDll = NULL;
+
+WinUtils::DwmExtendFrameIntoClientAreaProc WinUtils::dwmExtendFrameIntoClientAreaPtr = NULL;
+WinUtils::DwmIsCompositionEnabledProc WinUtils::dwmIsCompositionEnabledPtr = NULL;
+WinUtils::DwmSetIconicThumbnailProc WinUtils::dwmSetIconicThumbnailPtr = NULL;
+WinUtils::DwmSetIconicLivePreviewBitmapProc WinUtils::dwmSetIconicLivePreviewBitmapPtr = NULL;
+WinUtils::DwmGetWindowAttributeProc WinUtils::dwmGetWindowAttributePtr = NULL;
+WinUtils::DwmSetWindowAttributeProc WinUtils::dwmSetWindowAttributePtr = NULL;
+WinUtils::DwmInvalidateIconicBitmapsProc WinUtils::dwmInvalidateIconicBitmapsPtr = NULL;
+WinUtils::DwmDefWindowProcProc WinUtils::dwmDwmDefWindowProcPtr = NULL;
+
+/* static */
+void
+WinUtils::Initialize()
+{
+  if (!sDwmDll && WinUtils::GetWindowsVersion() >= WinUtils::VISTA_VERSION) {
+    sDwmDll = ::LoadLibraryW(kDwmLibraryName);
+
+    // MSDN: "If the function succeeds, the return value is greater than 31."
+    if (uintptr_t(sDwmDll) > 31) {
+      dwmExtendFrameIntoClientAreaPtr = (DwmExtendFrameIntoClientAreaProc)::GetProcAddress(sDwmDll, "DwmExtendFrameIntoClientArea");
+      dwmIsCompositionEnabledPtr = (DwmIsCompositionEnabledProc)::GetProcAddress(sDwmDll, "DwmIsCompositionEnabled");
+      dwmSetIconicThumbnailPtr = (DwmSetIconicThumbnailProc)::GetProcAddress(sDwmDll, "DwmSetIconicThumbnail");
+      dwmSetIconicLivePreviewBitmapPtr = (DwmSetIconicLivePreviewBitmapProc)::GetProcAddress(sDwmDll, "DwmSetIconicLivePreviewBitmap");
+      dwmGetWindowAttributePtr = (DwmGetWindowAttributeProc)::GetProcAddress(sDwmDll, "DwmGetWindowAttribute");
+      dwmSetWindowAttributePtr = (DwmSetWindowAttributeProc)::GetProcAddress(sDwmDll, "DwmSetWindowAttribute");
+      dwmInvalidateIconicBitmapsPtr = (DwmInvalidateIconicBitmapsProc)::GetProcAddress(sDwmDll, "DwmInvalidateIconicBitmaps");
+      dwmDwmDefWindowProcPtr = (DwmDefWindowProcProc)::GetProcAddress(sDwmDll, "DwmDefWindowProc");
+    }
+  }
+}
 
 /* static */ 
 WinUtils::WinVersion
@@ -466,7 +500,7 @@ WinUtils::SHCreateItemFromParsingName(PCWSTR pszPath, IBindCtx *pbc,
   }
 
   if (!sShellDll) {
-    sShellDll = ::LoadLibraryW(kSehllLibraryName);
+    sShellDll = ::LoadLibraryW(kShellLibraryName);
     if (!sShellDll) {
       return false;
     }
@@ -492,7 +526,7 @@ WinUtils::SHGetKnownFolderPath(REFKNOWNFOLDERID rfid,
   }
 
   if (!sShellDll) {
-    sShellDll = ::LoadLibraryW(kSehllLibraryName);
+    sShellDll = ::LoadLibraryW(kShellLibraryName);
     if (!sShellDll) {
       return false;
     }
diff --git a/widget/windows/WinUtils.h b/widget/windows/WinUtils.h
index cc1badc1bd6..be0c73ace8f 100644
--- a/widget/windows/WinUtils.h
+++ b/widget/windows/WinUtils.h
@@ -9,6 +9,7 @@
 #include "nscore.h"
 #include <windows.h>
 #include <shobjidl.h>
+#include <uxtheme.h>
 #include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsRegion.h"
@@ -275,6 +276,27 @@ public:
   static void SetupKeyModifiersSequence(nsTArray<KeyPair>* aArray,
                                         uint32_t aModifiers);
 
+  // dwmapi.dll function typedefs and declarations
+  typedef HRESULT (WINAPI*DwmExtendFrameIntoClientAreaProc)(HWND hWnd, const MARGINS *pMarInset);
+  typedef HRESULT (WINAPI*DwmIsCompositionEnabledProc)(BOOL *pfEnabled);
+  typedef HRESULT (WINAPI*DwmSetIconicThumbnailProc)(HWND hWnd, HBITMAP hBitmap, DWORD dwSITFlags);
+  typedef HRESULT (WINAPI*DwmSetIconicLivePreviewBitmapProc)(HWND hWnd, HBITMAP hBitmap, POINT *pptClient, DWORD dwSITFlags);
+  typedef HRESULT (WINAPI*DwmGetWindowAttributeProc)(HWND hWnd, DWORD dwAttribute, LPCVOID pvAttribute, DWORD cbAttribute);
+  typedef HRESULT (WINAPI*DwmSetWindowAttributeProc)(HWND hWnd, DWORD dwAttribute, LPCVOID pvAttribute, DWORD cbAttribute);
+  typedef HRESULT (WINAPI*DwmInvalidateIconicBitmapsProc)(HWND hWnd);
+  typedef HRESULT (WINAPI*DwmDefWindowProcProc)(HWND hWnd, UINT msg, LPARAM lParam, WPARAM wParam, LRESULT *aRetValue);
+
+  static DwmExtendFrameIntoClientAreaProc dwmExtendFrameIntoClientAreaPtr;
+  static DwmIsCompositionEnabledProc dwmIsCompositionEnabledPtr;
+  static DwmSetIconicThumbnailProc dwmSetIconicThumbnailPtr;
+  static DwmSetIconicLivePreviewBitmapProc dwmSetIconicLivePreviewBitmapPtr;
+  static DwmGetWindowAttributeProc dwmGetWindowAttributePtr;
+  static DwmSetWindowAttributeProc dwmSetWindowAttributePtr;
+  static DwmInvalidateIconicBitmapsProc dwmInvalidateIconicBitmapsPtr;
+  static DwmDefWindowProcProc dwmDwmDefWindowProcPtr;
+
+  static void Initialize();
+
 private:
   typedef HRESULT (WINAPI * SHCreateItemFromParsingNamePtr)(PCWSTR pszPath,
                                                             IBindCtx *pbc,
@@ -327,6 +349,7 @@ private:
   nsAutoString mIconPath;
   nsAutoCString mMimeTypeOfInputData;
   nsAutoArrayPtr<uint8_t> mBuffer;
+  HMODULE sDwmDLL;
   uint32_t mBufferLength;
   uint32_t mStride;
   uint32_t mWidth;
diff --git a/widget/windows/nsToolkit.cpp b/widget/windows/nsToolkit.cpp
index a66913084f6..9715e622b07 100644
--- a/widget/windows/nsToolkit.cpp
+++ b/widget/windows/nsToolkit.cpp
@@ -14,12 +14,15 @@
 #include "nsComponentManagerUtils.h"
 #include <objbase.h>
 #include <initguid.h>
+#include "WinUtils.h"
 
 #include "nsUXThemeData.h"
 
 // unknwn.h is needed to build with WIN32_LEAN_AND_MEAN
 #include <unknwn.h>
 
+using namespace mozilla::widget;
+
 nsToolkit* nsToolkit::gToolkit = nullptr;
 HINSTANCE nsToolkit::mDllInstance = 0;
 static const unsigned long kD3DUsageDelay = 5000;
@@ -75,6 +78,7 @@ nsToolkit::Startup(HMODULE hModule)
 {
     nsToolkit::mDllInstance = hModule;
     nsUXThemeData::Initialize();
+    WinUtils::Initialize();
 }
 
 void
diff --git a/widget/windows/nsUXThemeData.cpp b/widget/windows/nsUXThemeData.cpp
index 26303af3fa1..4af32c0da6a 100644
--- a/widget/windows/nsUXThemeData.cpp
+++ b/widget/windows/nsUXThemeData.cpp
@@ -10,7 +10,6 @@
 #include "nsUXThemeData.h"
 #include "nsDebug.h"
 #include "nsToolkit.h"
-#include "WinUtils.h"
 #include "nsUXThemeConstants.h"
 
 using namespace mozilla;
@@ -18,16 +17,12 @@ using namespace mozilla::widget;
 
 const PRUnichar
 nsUXThemeData::kThemeLibraryName[] = L"uxtheme.dll";
-const PRUnichar
-nsUXThemeData::kDwmLibraryName[] = L"dwmapi.dll";
 
 HANDLE
 nsUXThemeData::sThemes[eUXNumClasses];
 
 HMODULE
 nsUXThemeData::sThemeDLL = NULL;
-HMODULE
-nsUXThemeData::sDwmDLL = NULL;
 
 bool
 nsUXThemeData::sFlatMenus = false;
@@ -36,22 +31,11 @@ bool nsUXThemeData::sTitlebarInfoPopulatedAero = false;
 bool nsUXThemeData::sTitlebarInfoPopulatedThemed = false;
 SIZE nsUXThemeData::sCommandButtons[4];
 
-nsUXThemeData::DwmExtendFrameIntoClientAreaProc nsUXThemeData::dwmExtendFrameIntoClientAreaPtr = NULL;
-nsUXThemeData::DwmIsCompositionEnabledProc nsUXThemeData::dwmIsCompositionEnabledPtr = NULL;
-nsUXThemeData::DwmSetIconicThumbnailProc nsUXThemeData::dwmSetIconicThumbnailPtr = NULL;
-nsUXThemeData::DwmSetIconicLivePreviewBitmapProc nsUXThemeData::dwmSetIconicLivePreviewBitmapPtr = NULL;
-nsUXThemeData::DwmGetWindowAttributeProc nsUXThemeData::dwmGetWindowAttributePtr = NULL;
-nsUXThemeData::DwmSetWindowAttributeProc nsUXThemeData::dwmSetWindowAttributePtr = NULL;
-nsUXThemeData::DwmInvalidateIconicBitmapsProc nsUXThemeData::dwmInvalidateIconicBitmapsPtr = NULL;
-nsUXThemeData::DwmDefWindowProcProc nsUXThemeData::dwmDwmDefWindowProcPtr = NULL;
-
 void
 nsUXThemeData::Teardown() {
   Invalidate();
   if(sThemeDLL)
     FreeLibrary(sThemeDLL);
-  if(sDwmDLL)
-    FreeLibrary(sDwmDLL);
 }
 
 void
@@ -60,18 +44,7 @@ nsUXThemeData::Initialize()
   ::ZeroMemory(sThemes, sizeof(sThemes));
   NS_ASSERTION(!sThemeDLL, "nsUXThemeData being initialized twice!");
 
-  if (GetDwmDLL()) {
-    dwmExtendFrameIntoClientAreaPtr = (DwmExtendFrameIntoClientAreaProc)::GetProcAddress(sDwmDLL, "DwmExtendFrameIntoClientArea");
-    dwmIsCompositionEnabledPtr = (DwmIsCompositionEnabledProc)::GetProcAddress(sDwmDLL, "DwmIsCompositionEnabled");
-    dwmSetIconicThumbnailPtr = (DwmSetIconicThumbnailProc)::GetProcAddress(sDwmDLL, "DwmSetIconicThumbnail");
-    dwmSetIconicLivePreviewBitmapPtr = (DwmSetIconicLivePreviewBitmapProc)::GetProcAddress(sDwmDLL, "DwmSetIconicLivePreviewBitmap");
-    dwmGetWindowAttributePtr = (DwmGetWindowAttributeProc)::GetProcAddress(sDwmDLL, "DwmGetWindowAttribute");
-    dwmSetWindowAttributePtr = (DwmSetWindowAttributeProc)::GetProcAddress(sDwmDLL, "DwmSetWindowAttribute");
-    dwmInvalidateIconicBitmapsPtr = (DwmInvalidateIconicBitmapsProc)::GetProcAddress(sDwmDLL, "DwmInvalidateIconicBitmaps");
-    dwmDwmDefWindowProcPtr = (DwmDefWindowProcProc)::GetProcAddress(sDwmDLL, "DwmDefWindowProc");
-    CheckForCompositor(true);
-  }
-
+  CheckForCompositor(true);
   Invalidate();
 }
 
@@ -105,13 +78,6 @@ nsUXThemeData::GetThemeDLL() {
   return sThemeDLL;
 }
 
-HMODULE
-nsUXThemeData::GetDwmDLL() {
-  if (!sDwmDLL && WinUtils::GetWindowsVersion() >= WinUtils::VISTA_VERSION)
-    sDwmDLL = ::LoadLibraryW(kDwmLibraryName);
-  return sDwmDLL;
-}
-
 const wchar_t *nsUXThemeData::GetClassName(nsUXThemeClass cls) {
   switch(cls) {
     case eUXButton:
@@ -190,10 +156,10 @@ nsUXThemeData::UpdateTitlebarInfo(HWND aWnd)
 
   if (!sTitlebarInfoPopulatedAero && nsUXThemeData::CheckForCompositor()) {
     RECT captionButtons;
-    if (SUCCEEDED(nsUXThemeData::dwmGetWindowAttributePtr(aWnd,
-                                                          DWMWA_CAPTION_BUTTON_BOUNDS,
-                                                          &captionButtons,
-                                                          sizeof(captionButtons)))) {
+    if (SUCCEEDED(WinUtils::dwmGetWindowAttributePtr(aWnd,
+                                                     DWMWA_CAPTION_BUTTON_BOUNDS,
+                                                     &captionButtons,
+                                                     sizeof(captionButtons)))) {
       sCommandButtons[CMDBUTTONIDX_BUTTONBOX].cx = captionButtons.right - captionButtons.left - 3;
       sCommandButtons[CMDBUTTONIDX_BUTTONBOX].cy = (captionButtons.bottom - captionButtons.top) - 1;
       sTitlebarInfoPopulatedAero = true;
@@ -300,6 +266,16 @@ bool nsUXThemeData::IsDefaultWindowTheme()
   return sIsDefaultWindowsTheme;
 }
 
+// static
+bool nsUXThemeData::CheckForCompositor(bool aUpdateCache)
+{
+  static BOOL sCachedValue = FALSE;
+  if (aUpdateCache && WinUtils::dwmIsCompositionEnabledPtr) {
+    WinUtils::dwmIsCompositionEnabledPtr(&sCachedValue);
+  }
+  return sCachedValue;
+}
+
 // static
 void
 nsUXThemeData::UpdateNativeThemeInfo()
diff --git a/widget/windows/nsUXThemeData.h b/widget/windows/nsUXThemeData.h
index 20310ce3e5a..9486430adc7 100644
--- a/widget/windows/nsUXThemeData.h
+++ b/widget/windows/nsUXThemeData.h
@@ -11,6 +11,7 @@
 
 #include "nscore.h"
 #include "mozilla/LookAndFeel.h"
+#include "WinUtils.h"
 
 #include <dwmapi.h>
 
@@ -79,14 +80,12 @@ enum WindowsThemeColor {
 
 class nsUXThemeData {
   static HMODULE sThemeDLL;
-   static HMODULE sDwmDLL;
   static HANDLE sThemes[eUXNumClasses];
   
   static const wchar_t *GetClassName(nsUXThemeClass);
 
 public:
   static const PRUnichar kThemeLibraryName[];
-   static const PRUnichar kDwmLibraryName[];
   static bool sFlatMenus;
   static bool sTitlebarInfoPopulatedAero;
   static bool sTitlebarInfoPopulatedThemed;
@@ -99,7 +98,6 @@ public:
   static void Invalidate();
   static HANDLE GetTheme(nsUXThemeClass cls);
   static HMODULE GetThemeDLL();
-  static HMODULE GetDwmDLL();
 
   // nsWindow calls this to update desktop settings info
   static void InitTitlebarInfo();
@@ -109,37 +107,12 @@ public:
   static mozilla::LookAndFeel::WindowsTheme GetNativeThemeId();
   static bool IsDefaultWindowTheme();
 
-  // dwmapi.dll function typedefs and declarations
-  typedef HRESULT (WINAPI*DwmExtendFrameIntoClientAreaProc)(HWND hWnd, const MARGINS *pMarInset);
-  typedef HRESULT (WINAPI*DwmIsCompositionEnabledProc)(BOOL *pfEnabled);
-  typedef HRESULT (WINAPI*DwmSetIconicThumbnailProc)(HWND hWnd, HBITMAP hBitmap, DWORD dwSITFlags);
-  typedef HRESULT (WINAPI*DwmSetIconicLivePreviewBitmapProc)(HWND hWnd, HBITMAP hBitmap, POINT *pptClient, DWORD dwSITFlags);
-  typedef HRESULT (WINAPI*DwmGetWindowAttributeProc)(HWND hWnd, DWORD dwAttribute, LPCVOID pvAttribute, DWORD cbAttribute);
-  typedef HRESULT (WINAPI*DwmSetWindowAttributeProc)(HWND hWnd, DWORD dwAttribute, LPCVOID pvAttribute, DWORD cbAttribute);
-  typedef HRESULT (WINAPI*DwmInvalidateIconicBitmapsProc)(HWND hWnd);
-  typedef HRESULT (WINAPI*DwmDefWindowProcProc)(HWND hWnd, UINT msg, LPARAM lParam, WPARAM wParam, LRESULT *aRetValue);
-
-  static DwmExtendFrameIntoClientAreaProc dwmExtendFrameIntoClientAreaPtr;
-  static DwmIsCompositionEnabledProc dwmIsCompositionEnabledPtr;
-  static DwmSetIconicThumbnailProc dwmSetIconicThumbnailPtr;
-  static DwmSetIconicLivePreviewBitmapProc dwmSetIconicLivePreviewBitmapPtr;
-  static DwmGetWindowAttributeProc dwmGetWindowAttributePtr;
-  static DwmSetWindowAttributeProc dwmSetWindowAttributePtr;
-  static DwmInvalidateIconicBitmapsProc dwmInvalidateIconicBitmapsPtr;
-  static DwmDefWindowProcProc dwmDwmDefWindowProcPtr;
-
   // This method returns the cached compositor state. Most
   // callers should call without the argument. The cache
   // should be modified only when the application receives
   // WM_DWMCOMPOSITIONCHANGED. This rule prevents inconsistent
   // results for two or more calls which check the state during
   // composition transition.
-  static bool CheckForCompositor(bool aUpdateCache = false) {
-    static BOOL sCachedValue = FALSE;
-    if(aUpdateCache && dwmIsCompositionEnabledPtr) {
-      dwmIsCompositionEnabledPtr(&sCachedValue);
-    }
-    return (sCachedValue != FALSE);
-  }
+  static bool CheckForCompositor(bool aUpdateCache = false);
 };
 #endif // __UXThemeData_h__
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index 388da10256e..d99afc347aa 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -536,9 +536,9 @@ nsWindow::Create(nsIWidget *aParent,
     return NS_ERROR_FAILURE;
   }
 
-  if (mIsRTL && nsUXThemeData::dwmSetWindowAttributePtr) {
+  if (mIsRTL && WinUtils::dwmSetWindowAttributePtr) {
     DWORD dwAttribute = TRUE;    
-    nsUXThemeData::dwmSetWindowAttributePtr(mWnd, DWMWA_NONCLIENT_RTL_LAYOUT, &dwAttribute, sizeof dwAttribute);
+    WinUtils::dwmSetWindowAttributePtr(mWnd, DWMWA_NONCLIENT_RTL_LAYOUT, &dwAttribute, sizeof dwAttribute);
   }
 
   if (mWindowType != eWindowType_plugin &&
@@ -2645,9 +2645,9 @@ void nsWindow::UpdateGlass()
           margins.cxRightWidth, margins.cyBottomHeight));
 
   // Extends the window frame behind the client area
-  if(nsUXThemeData::CheckForCompositor()) {
-    nsUXThemeData::dwmExtendFrameIntoClientAreaPtr(mWnd, &margins);
-    nsUXThemeData::dwmSetWindowAttributePtr(mWnd, DWMWA_NCRENDERING_POLICY, &policy, sizeof policy);
+  if (nsUXThemeData::CheckForCompositor()) {
+    WinUtils::dwmExtendFrameIntoClientAreaPtr(mWnd, &margins);
+    WinUtils::dwmSetWindowAttributePtr(mWnd, DWMWA_NCRENDERING_POLICY, &policy, sizeof policy);
   }
 }
 #endif
@@ -4487,7 +4487,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam,
   LRESULT dwmHitResult;
   if (mCustomNonClient &&
       nsUXThemeData::CheckForCompositor() &&
-      nsUXThemeData::dwmDwmDefWindowProcPtr(mWnd, msg, wParam, lParam, &dwmHitResult)) {
+      WinUtils::dwmDwmDefWindowProcPtr(mWnd, msg, wParam, lParam, &dwmHitResult)) {
     *aRetValue = dwmHitResult;
     return true;
   }

From aa4ceab34de08997404b382b31b48b630825c6bf Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 15 Aug 2013 16:25:58 +1200
Subject: [PATCH 92/98] Bug 900785. Part 2: Make nsRefreshDriver use the
 WinUtils DWM APIs instead of loading the DLL itself. r=avih

---
 layout/base/nsRefreshDriver.cpp | 57 ++++-----------------------------
 widget/windows/WinUtils.cpp     |  2 ++
 widget/windows/WinUtils.h       |  3 ++
 3 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index c5215d19800..5222bdec576 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -22,9 +22,7 @@
 // mmsystem isn't part of WIN32_LEAN_AND_MEAN, so we have
 // to manually include it
 #include <mmsystem.h>
-
-#include <dwmapi.h>
-typedef HRESULT (WINAPI*DwmGetCompositionTimingInfoProc)(HWND hWnd, DWM_TIMING_INFO *info);
+#include "WinUtils.h"
 #endif
 
 #include "mozilla/Util.h"
@@ -51,10 +49,8 @@ typedef HRESULT (WINAPI*DwmGetCompositionTimingInfoProc)(HWND hWnd, DWM_TIMING_I
 #include "RestyleManager.h"
 #include "Layers.h"
 
-using mozilla::TimeStamp;
-using mozilla::TimeDuration;
-
 using namespace mozilla;
+using namespace mozilla::widget;
 
 #ifdef PR_LOGGING
 static PRLogModuleInfo *gLog = nullptr;
@@ -307,44 +303,15 @@ protected:
 #ifdef XP_WIN
 /*
  * Uses vsync timing on windows with DWM. Falls back dynamically to fixed rate if required.
- * - Call LoadDll() before usage and UnloadDll() when done (static, nesting unsupported)
  */
 class PreciseRefreshDriverTimerWindowsDwmVsync :
   public PreciseRefreshDriverTimer
 {
 public:
-  static void LoadDll()
-  {
-    if (sDwmGetCompositionTimingInfoPtr) {
-      return; // Already loaded.
-    }
-
-    sDwmDll = ::LoadLibraryW(L"dwmapi.dll");
-    if (sDwmDll) {
-      sDwmGetCompositionTimingInfoPtr = (DwmGetCompositionTimingInfoProc)::GetProcAddress(sDwmDll, "DwmGetCompositionTimingInfo");
-    }
-
-    if (!sDwmDll || !sDwmGetCompositionTimingInfoPtr) {
-      UnloadDll();
-    }
-  }
-
   // Checks if the vsync API is accessible.
-  // Return value is meaningful after calling LoadDll() and before UnloadDll(), and false otherwise.
-  // Even when supported, API calls could still fail when DWM is disabled (can change at runtime)
   static bool IsSupported()
   {
-    return sDwmGetCompositionTimingInfoPtr ? true : false;
-  }
-
-  // OK to call even if never loaded and/or if load failed.
-  static void UnloadDll()
-  {
-    if (sDwmDll) {
-      FreeLibrary(sDwmDll);
-    }
-    sDwmDll = nullptr;
-    sDwmGetCompositionTimingInfoPtr = nullptr;
+    return WinUtils::dwmGetCompositionTimingInfoPtr != nullptr;
   }
 
   PreciseRefreshDriverTimerWindowsDwmVsync(double aRate, bool aPreferHwTiming = false)
@@ -360,11 +327,12 @@ protected:
 
   nsresult GetVBlankInfo(mozilla::TimeStamp &aLastVBlank, mozilla::TimeDuration &aInterval)
   {
-    MOZ_ASSERT(sDwmGetCompositionTimingInfoPtr, "DwmGetCompositionTimingInfoPtr is unavailable (windows vsync)");
+    MOZ_ASSERT(WinUtils::dwmGetCompositionTimingInfoPtr,
+               "DwmGetCompositionTimingInfoPtr is unavailable (windows vsync)");
 
     DWM_TIMING_INFO timingInfo;
     timingInfo.cbSize = sizeof(DWM_TIMING_INFO);
-    HRESULT hr = sDwmGetCompositionTimingInfoPtr(0, &timingInfo); // For the desktop window instead of a specific one.
+    HRESULT hr = WinUtils::dwmGetCompositionTimingInfoPtr(0, &timingInfo); // For the desktop window instead of a specific one.
 
     if (FAILED(hr)) {
       // This happens first time this is called.
@@ -444,14 +412,7 @@ protected:
 
     mTargetTime = newTarget;
   }
-
-private:
-  static HMODULE sDwmDll;
-  static DwmGetCompositionTimingInfoProc sDwmGetCompositionTimingInfoPtr;
 };
-
-HMODULE PreciseRefreshDriverTimerWindowsDwmVsync::sDwmDll = nullptr;
-DwmGetCompositionTimingInfoProc PreciseRefreshDriverTimerWindowsDwmVsync::sDwmGetCompositionTimingInfoPtr = nullptr;
 #endif
 
 /*
@@ -612,10 +573,6 @@ static nsITimer *sDisableHighPrecisionTimersTimer = nullptr;
 /* static */ void
 nsRefreshDriver::InitializeStatics()
 {
-#ifdef XP_WIN
-  PreciseRefreshDriverTimerWindowsDwmVsync::LoadDll();
-#endif
-
 #ifdef PR_LOGGING
   if (!gLog) {
     gLog = PR_NewLogModule("nsRefreshDriver");
@@ -634,8 +591,6 @@ nsRefreshDriver::Shutdown()
   sThrottledRateTimer = nullptr;
 
 #ifdef XP_WIN
-  PreciseRefreshDriverTimerWindowsDwmVsync::UnloadDll();
-
   if (sDisableHighPrecisionTimersTimer) {
     sDisableHighPrecisionTimersTimer->Cancel();
     NS_RELEASE(sDisableHighPrecisionTimersTimer);
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index f7bf5e90439..42fa26e6e4e 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -67,6 +67,7 @@ WinUtils::DwmGetWindowAttributeProc WinUtils::dwmGetWindowAttributePtr = NULL;
 WinUtils::DwmSetWindowAttributeProc WinUtils::dwmSetWindowAttributePtr = NULL;
 WinUtils::DwmInvalidateIconicBitmapsProc WinUtils::dwmInvalidateIconicBitmapsPtr = NULL;
 WinUtils::DwmDefWindowProcProc WinUtils::dwmDwmDefWindowProcPtr = NULL;
+WinUtils::DwmGetCompositionTimingInfoProc WinUtils::dwmGetCompositionTimingInfoPtr = NULL;
 
 /* static */
 void
@@ -85,6 +86,7 @@ WinUtils::Initialize()
       dwmSetWindowAttributePtr = (DwmSetWindowAttributeProc)::GetProcAddress(sDwmDll, "DwmSetWindowAttribute");
       dwmInvalidateIconicBitmapsPtr = (DwmInvalidateIconicBitmapsProc)::GetProcAddress(sDwmDll, "DwmInvalidateIconicBitmaps");
       dwmDwmDefWindowProcPtr = (DwmDefWindowProcProc)::GetProcAddress(sDwmDll, "DwmDefWindowProc");
+      dwmGetCompositionTimingInfoPtr = (DwmGetCompositionTimingInfoProc)::GetProcAddress(sDwmDll, "DwmGetCompositionTimingInfo");
     }
   }
 }
diff --git a/widget/windows/WinUtils.h b/widget/windows/WinUtils.h
index be0c73ace8f..e00f37900c2 100644
--- a/widget/windows/WinUtils.h
+++ b/widget/windows/WinUtils.h
@@ -10,6 +10,7 @@
 #include <windows.h>
 #include <shobjidl.h>
 #include <uxtheme.h>
+#include <dwmapi.h>
 #include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsRegion.h"
@@ -285,6 +286,7 @@ public:
   typedef HRESULT (WINAPI*DwmSetWindowAttributeProc)(HWND hWnd, DWORD dwAttribute, LPCVOID pvAttribute, DWORD cbAttribute);
   typedef HRESULT (WINAPI*DwmInvalidateIconicBitmapsProc)(HWND hWnd);
   typedef HRESULT (WINAPI*DwmDefWindowProcProc)(HWND hWnd, UINT msg, LPARAM lParam, WPARAM wParam, LRESULT *aRetValue);
+  typedef HRESULT (WINAPI*DwmGetCompositionTimingInfoProc)(HWND hWnd, DWM_TIMING_INFO *info);
 
   static DwmExtendFrameIntoClientAreaProc dwmExtendFrameIntoClientAreaPtr;
   static DwmIsCompositionEnabledProc dwmIsCompositionEnabledPtr;
@@ -294,6 +296,7 @@ public:
   static DwmSetWindowAttributeProc dwmSetWindowAttributePtr;
   static DwmInvalidateIconicBitmapsProc dwmInvalidateIconicBitmapsPtr;
   static DwmDefWindowProcProc dwmDwmDefWindowProcPtr;
+  static DwmGetCompositionTimingInfoProc dwmGetCompositionTimingInfoPtr;
 
   static void Initialize();
 

From 6fe9d58c2901cf30302fd3986fddc8d5426c1e43 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 14 Aug 2013 21:26:44 -0700
Subject: [PATCH 93/98] Bug 903513: Don't treat GCC "-Wmaybe-uninitialized"
 warnings as errors. r=gps

---
 configure.in        | 3 +++
 js/src/configure.in | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/configure.in b/configure.in
index ac2697a1bb2..0d1680b1925 100644
--- a/configure.in
+++ b/configure.in
@@ -6996,10 +6996,13 @@ if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then
 elif test "$GNU_CC"; then
     # Prevent the following GCC warnings from being treated as errors:
     # -Wuninitialized - too many false positives
+    # -Wmaybe-uninitialized - too many false positives
     # -Wdeprecated-declarations - we don't want our builds held hostage when a
     #   platform-specific API becomes deprecated.
     MOZ_C_SUPPORTS_WARNING(-W, no-error=uninitialized, ac_c_has_noerror_uninitialized)
     MOZ_CXX_SUPPORTS_WARNING(-W, no-error=uninitialized, ac_cxx_has_noerror_uninitialized)
+    MOZ_C_SUPPORTS_WARNING(-W, no-error=maybe-uninitialized, ac_c_has_noerror_maybe_uninitialized)
+    MOZ_CXX_SUPPORTS_WARNING(-W, no-error=maybe-uninitialized, ac_cxx_has_noerror_maybe_uninitialized)
     MOZ_C_SUPPORTS_WARNING(-W, no-error=deprecated-declarations, ac_c_has_noerror_deprecated_declarations)
     MOZ_CXX_SUPPORTS_WARNING(-W, no-error=deprecated-declarations, ac_cxx_has_noerror_deprecated_declarations)
 fi
diff --git a/js/src/configure.in b/js/src/configure.in
index 639ac3ad433..18725935f0d 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -3263,10 +3263,13 @@ if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then
 elif test "$GNU_CC"; then
     # Prevent the following GCC warnings from being treated as errors:
     # -Wuninitialized - too many false positives
+    # -Wmaybe-uninitialized - too many false positives
     # -Wdeprecated-declarations - we don't want our builds held hostage when a
     #   platform-specific API becomes deprecated.
     MOZ_C_SUPPORTS_WARNING(-W, no-error=uninitialized, ac_c_has_noerror_uninitialized)
     MOZ_CXX_SUPPORTS_WARNING(-W, no-error=uninitialized, ac_cxx_has_noerror_uninitialized)
+    MOZ_C_SUPPORTS_WARNING(-W, no-error=maybe-uninitialized, ac_c_has_noerror_maybe_uninitialized)
+    MOZ_CXX_SUPPORTS_WARNING(-W, no-error=maybe-uninitialized, ac_cxx_has_noerror_maybe_uninitialized)
     MOZ_C_SUPPORTS_WARNING(-W, no-error=deprecated-declarations, ac_c_has_noerror_deprecated_declarations)
     MOZ_CXX_SUPPORTS_WARNING(-W, no-error=deprecated-declarations, ac_cxx_has_noerror_deprecated_declarations)
 fi

From ba44a7b46432e5071341668cd1e6efeca34bab0a Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 14 Aug 2013 21:30:44 -0700
Subject: [PATCH 94/98] Bug 905166 - IonMonkey - Handle NaN cases explicitly in
 Range::min and Range::max. r=nbp

---
 js/src/jit-test/tests/ion/bug905166.js |  9 +++++++++
 js/src/jit/RangeAnalysis.cpp           | 28 +++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 js/src/jit-test/tests/ion/bug905166.js

diff --git a/js/src/jit-test/tests/ion/bug905166.js b/js/src/jit-test/tests/ion/bug905166.js
new file mode 100644
index 00000000000..59591b2eb55
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug905166.js
@@ -0,0 +1,9 @@
+function test() {
+  LastIndexOf("hello");
+  LastIndexOf("hello");
+  eval("");
+  function LastIndexOf(s) {
+     x = Math.min(Math.max(Math.pow(-1, 0.5), 0), s.length);
+     0 <= x;
+  }
+} test();
diff --git a/js/src/jit/RangeAnalysis.cpp b/js/src/jit/RangeAnalysis.cpp
index cddcdee8e16..bf9ef37c289 100644
--- a/js/src/jit/RangeAnalysis.cpp
+++ b/js/src/jit/RangeAnalysis.cpp
@@ -693,16 +693,12 @@ Range::abs(const Range *op)
 Range *
 Range::min(const Range *lhs, const Range *rhs)
 {
-    // Get the lower and upper values of the operand, and adjust them
-    // for infinities. Range's constructor treats any value beyond the
-    // int32_t range as infinity.
-    int64_t leftLower = (int64_t)lhs->lower() - lhs->isLowerInfinite();
-    int64_t leftUpper = (int64_t)lhs->upper() + lhs->isUpperInfinite();
-    int64_t rightLower = (int64_t)rhs->lower() - rhs->isLowerInfinite();
-    int64_t rightUpper = (int64_t)rhs->upper() + rhs->isUpperInfinite();
+    // If either operand is NaN (implied by isInfinite here), the result is NaN.
+    if (lhs->isInfinite() || rhs->isInfinite())
+        return new Range();
 
-    return new Range(Min(leftLower, rightLower),
-                     Min(leftUpper, rightUpper),
+    return new Range(Min(lhs->lower(), rhs->lower()),
+                     Min(lhs->upper(), rhs->upper()),
                      lhs->isDecimal() || rhs->isDecimal(),
                      Max(lhs->exponent(), rhs->exponent()));
 }
@@ -710,16 +706,12 @@ Range::min(const Range *lhs, const Range *rhs)
 Range *
 Range::max(const Range *lhs, const Range *rhs)
 {
-    // Get the lower and upper values of the operand, and adjust them
-    // for infinities. Range's constructor treats any value beyond the
-    // int32_t range as infinity.
-    int64_t leftLower = (int64_t)lhs->lower() - lhs->isLowerInfinite();
-    int64_t leftUpper = (int64_t)lhs->upper() + lhs->isUpperInfinite();
-    int64_t rightLower = (int64_t)rhs->lower() - rhs->isLowerInfinite();
-    int64_t rightUpper = (int64_t)rhs->upper() + rhs->isUpperInfinite();
+    // If either operand is NaN (implied by isInfinite here), the result is NaN.
+    if (lhs->isInfinite() || rhs->isInfinite())
+        return new Range();
 
-    return new Range(Max(leftLower, rightLower),
-                     Max(leftUpper, rightUpper),
+    return new Range(Max(lhs->lower(), rhs->lower()),
+                     Max(lhs->upper(), rhs->upper()),
                      lhs->isDecimal() || rhs->isDecimal(),
                      Max(lhs->exponent(), rhs->exponent()));
 }

From 48e99a97818dfa2afb7066cd8a9c18e8888b47e9 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Wed, 14 Aug 2013 21:58:37 -0700
Subject: [PATCH 95/98] Bug 893308:  Move hashtable of @keyframes rules (keyed
 by name) from nsAnimationManager to RuleCascadeData.  r=heycam

---
 layout/base/nsPresContext.cpp       |  1 -
 layout/base/nsPresShell.cpp         |  1 -
 layout/style/nsAnimationManager.cpp | 25 ++-----------------------
 layout/style/nsAnimationManager.h   | 11 -----------
 layout/style/nsCSSRuleProcessor.cpp | 28 ++++++++++++++++++----------
 layout/style/nsCSSRuleProcessor.h   |  4 ++--
 layout/style/nsStyleSet.cpp         | 21 +++++++++++++--------
 layout/style/nsStyleSet.h           |  7 +++----
 8 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 2d313abea6c..6818f946901 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1791,7 +1791,6 @@ nsPresContext::RebuildAllStyleData(nsChangeHint aExtraHint)
   mUsesRootEMUnits = false;
   mUsesViewportUnits = false;
   RebuildUserFontSet();
-  AnimationManager()->KeyframesListIsDirty();
 
   RestyleManager()->RebuildAllStyleData(aExtraHint);
 }
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 09d478655c2..c474967e7d4 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -4216,7 +4216,6 @@ nsIPresShell::ReconstructStyleDataInternal()
 
   if (mPresContext) {
     mPresContext->RebuildUserFontSet();
-    mPresContext->AnimationManager()->KeyframesListIsDirty();
   }
 
   Element* root = mDocument->GetRootElement();
diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index 7c186aa8654..04fc05dfa0c 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -529,7 +529,6 @@ nsAnimationManager::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 
   // Measurement of the following members may be added later if DMD finds it is
   // worthwhile:
-  // - mKeyframesRules
   // - mPendingEvents
 }
 
@@ -765,7 +764,8 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
 
     aDest.mIterationDuration = TimeDuration::FromMilliseconds(aSrc.GetDuration());
 
-    nsCSSKeyframesRule *rule = KeyframesRuleFor(aDest.mName);
+    nsCSSKeyframesRule* rule =
+      mPresContext->StyleSet()->KeyframesRuleForName(mPresContext, aDest.mName);
     if (!rule) {
       // no segments
       continue;
@@ -1088,24 +1088,3 @@ nsAnimationManager::DoDispatchEvents()
     }
   }
 }
-
-nsCSSKeyframesRule*
-nsAnimationManager::KeyframesRuleFor(const nsSubstring& aName)
-{
-  if (mKeyframesListIsDirty) {
-    mKeyframesListIsDirty = false;
-
-    nsTArray<nsCSSKeyframesRule*> rules;
-    mPresContext->StyleSet()->AppendKeyframesRules(mPresContext, rules);
-
-    // Per css3-animations, the last @keyframes rule specified wins.
-    mKeyframesRules.Clear();
-    for (uint32_t i = 0, i_end = rules.Length(); i != i_end; ++i) {
-      nsCSSKeyframesRule *rule = rules[i];
-      mKeyframesRules.Put(rule->GetName(), rule);
-    }
-  }
-
-  return mKeyframesRules.Get(aName);
-}
-
diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h
index f9b6be5fd4e..49b96125f33 100644
--- a/layout/style/nsAnimationManager.h
+++ b/layout/style/nsAnimationManager.h
@@ -195,10 +195,8 @@ class nsAnimationManager MOZ_FINAL
 public:
   nsAnimationManager(nsPresContext *aPresContext)
     : mozilla::css::CommonAnimationManager(aPresContext)
-    , mKeyframesListIsDirty(true)
     , mObservingRefreshDriver(false)
   {
-    mKeyframesRules.Init(16); // FIXME: make infallible!
   }
 
   static ElementAnimations* GetAnimationsForCompositor(nsIContent* aContent,
@@ -262,10 +260,6 @@ public:
   nsIStyleRule* CheckAnimationRule(nsStyleContext* aStyleContext,
                                    mozilla::dom::Element* aElement);
 
-  void KeyframesListIsDirty() {
-    mKeyframesListIsDirty = true;
-  }
-
   /**
    * Dispatch any pending events.  We accumulate animationend and
    * animationiteration events only during refresh driver notifications
@@ -307,14 +301,9 @@ private:
   nsIStyleRule* GetAnimationRule(mozilla::dom::Element* aElement,
                                  nsCSSPseudoElements::Type aPseudoType);
 
-  nsCSSKeyframesRule* KeyframesRuleFor(const nsSubstring& aName);
-
   // The guts of DispatchEvents
   void DoDispatchEvents();
 
-  bool mKeyframesListIsDirty;
-  nsDataHashtable<nsStringHashKey, nsCSSKeyframesRule*> mKeyframesRules;
-
   EventArray mPendingEvents;
 
   bool mObservingRefreshDriver;
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 4b8843039bc..3ec4ceabf1c 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -944,6 +944,7 @@ struct RuleCascadeData {
     PL_DHashTableInit(&mXULTreeRules, &RuleHash_TagTable_Ops, nullptr,
                       sizeof(RuleHashTagTableEntry), 16);
 #endif
+    mKeyframesRuleTable.Init(16); // FIXME: make infallible!
   }
 
   ~RuleCascadeData()
@@ -982,6 +983,8 @@ struct RuleCascadeData {
   nsTArray<nsCSSFontFeatureValuesRule*> mFontFeatureValuesRules;
   nsTArray<nsCSSPageRule*> mPageRules;
 
+  nsDataHashtable<nsStringHashKey, nsCSSKeyframesRule*> mKeyframesRuleTable;
+
   // Looks up or creates the appropriate list in |mAttributeSelectors|.
   // Returns null only on allocation failure.
   nsTArray<nsCSSSelector*>* AttributeListFor(nsIAtom* aAttribute);
@@ -2776,21 +2779,17 @@ nsCSSRuleProcessor::AppendFontFaceRules(
   return true;
 }
 
-// Append all the currently-active keyframes rules to aArray.  Return
-// true for success and false for failure.
-bool
-nsCSSRuleProcessor::AppendKeyframesRules(
-                              nsPresContext *aPresContext,
-                              nsTArray<nsCSSKeyframesRule*>& aArray)
+nsCSSKeyframesRule*
+nsCSSRuleProcessor::KeyframesRuleForName(nsPresContext* aPresContext,
+                                         const nsString& aName)
 {
   RuleCascadeData* cascade = GetRuleCascade(aPresContext);
 
   if (cascade) {
-    if (!aArray.AppendElements(cascade->mKeyframesRules))
-      return false;
+    return cascade->mKeyframesRuleTable.Get(aName);
   }
-  
-  return true;
+
+  return nullptr;
 }
 
 // Append all the currently-active page rules to aArray.  Return
@@ -3298,6 +3297,8 @@ FillWeightArray(PLDHashTable *table, PLDHashEntryHdr *hdr,
 RuleCascadeData*
 nsCSSRuleProcessor::GetRuleCascade(nsPresContext* aPresContext)
 {
+  // FIXME:  Make this infallible!
+
   // If anything changes about the presentation context, we will be
   // notified.  Otherwise, our cache is valid if mLastPresContext
   // matches aPresContext.  (The only rule processors used for multiple
@@ -3374,6 +3375,13 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
         }
       }
 
+      // Build mKeyframesRuleTable.
+      for (nsTArray<nsCSSKeyframesRule*>::size_type i = 0,
+             iEnd = newCascade->mKeyframesRules.Length(); i < iEnd; ++i) {
+        nsCSSKeyframesRule* rule = newCascade->mKeyframesRules[i];
+        newCascade->mKeyframesRuleTable.Put(rule->GetName(), rule);
+      }
+
       // Ensure that the current one is always mRuleCascades.
       newCascade->mNext = mRuleCascades;
       mRuleCascades = newCascade.forget();
diff --git a/layout/style/nsCSSRuleProcessor.h b/layout/style/nsCSSRuleProcessor.h
index c209f3645ee..2388dac4f0e 100644
--- a/layout/style/nsCSSRuleProcessor.h
+++ b/layout/style/nsCSSRuleProcessor.h
@@ -123,8 +123,8 @@ public:
   bool AppendFontFaceRules(nsPresContext* aPresContext,
                            nsTArray<nsFontFaceRuleContainer>& aArray);
 
-  bool AppendKeyframesRules(nsPresContext* aPresContext,
-                            nsTArray<nsCSSKeyframesRule*>& aArray);
+  nsCSSKeyframesRule* KeyframesRuleForName(nsPresContext* aPresContext,
+                                           const nsString& aName);
 
   bool AppendPageRules(nsPresContext* aPresContext,
                        nsTArray<nsCSSPageRule*>& aArray);
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 131a972a686..69069ecd9ea 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -122,6 +122,7 @@ nsDisableTextZoomStyleRule::List(FILE* out, int32_t aIndent) const
 #endif
 
 static const nsStyleSet::sheetType gCSSSheetTypes[] = {
+  // From lowest to highest in cascading order.
   nsStyleSet::eAgentSheet,
   nsStyleSet::eUserSheet,
   nsStyleSet::eDocSheet,
@@ -1551,21 +1552,25 @@ nsStyleSet::AppendFontFaceRules(nsPresContext* aPresContext,
   return true;
 }
 
-bool
-nsStyleSet::AppendKeyframesRules(nsPresContext* aPresContext,
-                                 nsTArray<nsCSSKeyframesRule*>& aArray)
+nsCSSKeyframesRule*
+nsStyleSet::KeyframesRuleForName(nsPresContext* aPresContext,
+                                 const nsString& aName)
 {
-  NS_ENSURE_FALSE(mInShutdown, false);
+  NS_ENSURE_FALSE(mInShutdown, nullptr);
 
-  for (uint32_t i = 0; i < ArrayLength(gCSSSheetTypes); ++i) {
+  for (uint32_t i = ArrayLength(gCSSSheetTypes); i-- != 0; ) {
     if (gCSSSheetTypes[i] == eScopedDocSheet)
       continue;
     nsCSSRuleProcessor *ruleProc = static_cast<nsCSSRuleProcessor*>
                                     (mRuleProcessors[gCSSSheetTypes[i]].get());
-    if (ruleProc && !ruleProc->AppendKeyframesRules(aPresContext, aArray))
-      return false;
+    if (!ruleProc)
+      continue;
+    nsCSSKeyframesRule* result =
+      ruleProc->KeyframesRuleForName(aPresContext, aName);
+    if (result)
+      return result;
   }
-  return true;
+  return nullptr;
 }
 
 bool
diff --git a/layout/style/nsStyleSet.h b/layout/style/nsStyleSet.h
index b36dc0b338f..16ae763d19e 100644
--- a/layout/style/nsStyleSet.h
+++ b/layout/style/nsStyleSet.h
@@ -170,10 +170,9 @@ class nsStyleSet
   bool AppendFontFaceRules(nsPresContext* aPresContext,
                              nsTArray<nsFontFaceRuleContainer>& aArray);
 
-  // Append all the currently-active keyframes rules to aArray.  Return
-  // true for success and false for failure.
-  bool AppendKeyframesRules(nsPresContext* aPresContext,
-                              nsTArray<nsCSSKeyframesRule*>& aArray);
+  // Return the winning (in the cascade) @keyframes rule for the given name.
+  nsCSSKeyframesRule* KeyframesRuleForName(nsPresContext* aPresContext,
+                                           const nsString& aName);
 
   // Fetch object for looking up font feature values
   already_AddRefed<gfxFontFeatureValueSet> GetFontFeatureValuesLookup();

From a08edb8e18fcc2628b8b47954b7b5408b30d7e79 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Tue, 13 Aug 2013 15:34:12 -0700
Subject: [PATCH 96/98] Bug 898274 (part 1) - Fix ordering of various #include
 statements.  r=benjamin.

---
 js/public/CharacterEncoding.h    |  4 ++--
 js/public/RootingAPI.h           |  4 ++--
 js/public/Utility.h              |  2 +-
 js/src/TraceLogging.h            |  2 +-
 js/src/jit/AsmJS.cpp             |  2 +-
 js/src/jit/CodeGenerator.cpp     |  3 +--
 js/src/jit/Ion.cpp               |  2 +-
 js/src/jit/VMFunctions.cpp       |  4 ++--
 js/src/jit/arm/Assembler-arm.cpp |  2 +-
 js/src/jscpucfg.h                |  2 +-
 js/src/jsdate.cpp                | 17 +++++++----------
 js/src/jsfriendapi.h             |  2 +-
 js/src/jsgc.cpp                  | 22 +++++++++-------------
 js/src/jsgc.h                    |  2 +-
 js/src/jsinfer.h                 |  2 +-
 js/src/jsmemorymetrics.cpp       |  2 +-
 js/src/jswatchpoint.h            |  2 +-
 js/src/prmjtime.cpp              |  2 +-
 js/src/shell/js.cpp              |  2 +-
 js/src/vm/ForkJoin.cpp           |  2 +-
 js/src/vm/Interpreter-inl.h      |  2 +-
 js/src/vm/Runtime.cpp            |  2 +-
 js/src/vm/Xdr.cpp                |  4 ++--
 23 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/js/public/CharacterEncoding.h b/js/public/CharacterEncoding.h
index e88e08e1bef..09aad6a3bbb 100644
--- a/js/public/CharacterEncoding.h
+++ b/js/public/CharacterEncoding.h
@@ -9,10 +9,10 @@
 
 #include "mozilla/Range.h"
 
-#include "js/Utility.h"
-
 #include "jspubtd.h"
 
+#include "js/Utility.h"
+
 namespace JS {
 
 /*
diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
index 67c26f0267e..448213d70aa 100644
--- a/js/public/RootingAPI.h
+++ b/js/public/RootingAPI.h
@@ -10,10 +10,10 @@
 #include "mozilla/GuardObjects.h"
 #include "mozilla/TypeTraits.h"
 
-#include "js/Utility.h"
-
 #include "jspubtd.h"
 
+#include "js/Utility.h"
+
 /*
  * Moving GC Stack Rooting
  *
diff --git a/js/public/Utility.h b/js/public/Utility.h
index bc29745fb22..3b1fe3d3d49 100644
--- a/js/public/Utility.h
+++ b/js/public/Utility.h
@@ -18,8 +18,8 @@
 #include <string.h>
 
 #ifdef JS_OOM_DO_BACKTRACES
-#include <stdio.h>
 #include <execinfo.h>
+#include <stdio.h>
 #endif
 
 #include "jstypes.h"
diff --git a/js/src/TraceLogging.h b/js/src/TraceLogging.h
index 8940ae1a71a..92966da04f7 100644
--- a/js/src/TraceLogging.h
+++ b/js/src/TraceLogging.h
@@ -7,8 +7,8 @@
 #ifndef TraceLogging_h
 #define TraceLogging_h
 
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 
 class JSScript;
 
diff --git a/js/src/jit/AsmJS.cpp b/js/src/jit/AsmJS.cpp
index 4ce4628dee6..7b7f4af6aaf 100644
--- a/js/src/jit/AsmJS.cpp
+++ b/js/src/jit/AsmJS.cpp
@@ -13,8 +13,8 @@
 #endif
 
 #include "jsmath.h"
-#include "jsworkers.h"
 #include "jsprf.h"
+#include "jsworkers.h"
 #include "prmjtime.h"
 
 #include "frontend/Parser.h"
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
index aa167865547..9befaf236fd 100644
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -6,13 +6,12 @@
 
 #include "jit/CodeGenerator.h"
 
-#include "jslibmath.h"
-
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Util.h"
 
+#include "jslibmath.h"
 #include "jsmath.h"
 #include "jsnum.h"
 
diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
index d7e2166f939..2246bc786e8 100644
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -15,8 +15,8 @@
 #endif
 
 #include "gc/Marking.h"
-#include "jit/AsmJSModule.h"
 #include "jit/AliasAnalysis.h"
+#include "jit/AsmJSModule.h"
 #include "jit/BacktrackingAllocator.h"
 #include "jit/BaselineCompiler.h"
 #include "jit/BaselineInspector.h"
diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index 807ded2caad..10cf0778fae 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -16,12 +16,12 @@
 #include "vm/Debugger.h"
 #include "vm/Interpreter.h"
 
+#include "jsinferinlines.h"
+
 #include "jit/BaselineFrame-inl.h"
 #include "vm/Interpreter-inl.h"
 #include "vm/StringObject-inl.h"
 
-#include "jsinferinlines.h"
-
 using namespace js;
 using namespace js::ion;
 
diff --git a/js/src/jit/arm/Assembler-arm.cpp b/js/src/jit/arm/Assembler-arm.cpp
index b0010e04b16..a06c637a8e9 100644
--- a/js/src/jit/arm/Assembler-arm.cpp
+++ b/js/src/jit/arm/Assembler-arm.cpp
@@ -14,8 +14,8 @@
 
 #include "assembler/jit/ExecutableAllocator.h"
 #include "gc/Marking.h"
-#include "jit/IonCompartment.h"
 #include "jit/arm/MacroAssembler-arm.h"
+#include "jit/IonCompartment.h"
 
 using namespace js;
 using namespace js::ion;
diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
index c79bd7ad147..50ee635d70a 100644
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.h
@@ -57,8 +57,8 @@
 
 /* BSDs */
 #elif defined(JS_HAVE_MACHINE_ENDIAN_H)
-# include <sys/types.h>
 # include <machine/endian.h>
+# include <sys/types.h>
 
 # if defined(_BYTE_ORDER)
 #  if _BYTE_ORDER == _LITTLE_ENDIAN
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index 76204f643ae..a49dc62837f 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -6,16 +6,7 @@
 
 /*
  * JS date methods.
- */
-
-#include "jsdate.h"
-
-#include "js/Date.h"
-
-#include "mozilla/FloatingPoint.h"
-#include "mozilla/Util.h"
-
-/*
+ *
  * "For example, OS/360 devotes 26 bytes of the permanently
  *  resident date-turnover routine to the proper handling of
  *  December 31 on leap years (when it is Day 366).  That
@@ -24,6 +15,11 @@
  * Frederick Brooks, 'The Second-System Effect'.
  */
 
+#include "jsdate.h"
+
+#include "mozilla/FloatingPoint.h"
+#include "mozilla/Util.h"
+
 #include <ctype.h>
 #include <math.h>
 #include <string.h>
@@ -38,6 +34,7 @@
 #include "jsutil.h"
 #include "prmjtime.h"
 
+#include "js/Date.h"
 #include "vm/DateTime.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index 7c9d83aa2b8..3bdfb809524 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -11,8 +11,8 @@
 #include "mozilla/MemoryReporting.h"
 #endif
 
-#include "jsclass.h"
 #include "jsbytecode.h"
+#include "jsclass.h"
 #include "jspubtd.h"
 
 #include "js/CallArgs.h"
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 6adf2dcba8f..59c3cf7b589 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -4,19 +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/. */
 
-/* JS Mark-and-Sweep Garbage Collector. */
-
-#include "jsgcinlines.h"
-
-#include "mozilla/DebugOnly.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/Move.h"
-#include "mozilla/Util.h"
-
-#include "jsscriptinlines.h"
-
-using mozilla::Swap;
-
 /*
  * This code implements a mark-and-sweep garbage collector. The mark phase is
  * incremental. Most sweeping is done on a background thread. A GC is divided
@@ -46,6 +33,13 @@ using mozilla::Swap;
  * barriers on them.
  */
 
+#include "jsgcinlines.h"
+
+#include "mozilla/DebugOnly.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Move.h"
+#include "mozilla/Util.h"
+
 #include <string.h>     /* for memset used when DEBUG */
 #ifndef XP_WIN
 # include <unistd.h>
@@ -85,6 +79,7 @@ using mozilla::Swap;
 #include "vm/WrapperObject.h"
 
 #include "jsobjinlines.h"
+#include "jsscriptinlines.h"
 
 #include "vm/Runtime-inl.h"
 #include "vm/Stack-inl.h"
@@ -96,6 +91,7 @@ using namespace js::gc;
 using mozilla::ArrayEnd;
 using mozilla::DebugOnly;
 using mozilla::Maybe;
+using mozilla::Swap;
 
 /* Perform a Full GC every 20 seconds if MaybeGC is called */
 static const uint64_t GC_IDLE_FULL_SPAN = 20 * 1000 * 1000;
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 79c9f4192cd..52a4939faa4 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -13,8 +13,8 @@
 #include "mozilla/MemoryReporting.h"
 
 #include "jsapi.h"
-#include "jsobj.h"
 #include "jslock.h"
+#include "jsobj.h"
 
 #include "js/GCAPI.h"
 #include "js/Vector.h"
diff --git a/js/src/jsinfer.h b/js/src/jsinfer.h
index 8889be6b5c5..8049e8b0f6b 100644
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.h
@@ -13,8 +13,8 @@
 
 #include "jsfriendapi.h"
 
-#include "ds/LifoAlloc.h"
 #include "ds/IdValuePair.h"
+#include "ds/LifoAlloc.h"
 #include "gc/Barrier.h"
 #include "js/Utility.h"
 
diff --git a/js/src/jsmemorymetrics.cpp b/js/src/jsmemorymetrics.cpp
index c0b529459de..06172d560fa 100644
--- a/js/src/jsmemorymetrics.cpp
+++ b/js/src/jsmemorymetrics.cpp
@@ -19,8 +19,8 @@
 #include "vm/ArrayObject.h"
 #include "vm/Runtime.h"
 #include "vm/Shape.h"
-#include "vm/WrapperObject.h"
 #include "vm/String.h"
+#include "vm/WrapperObject.h"
 
 #include "vm/ObjectImpl-inl.h"
 
diff --git a/js/src/jswatchpoint.h b/js/src/jswatchpoint.h
index 3124f11b6af..263310470d1 100644
--- a/js/src/jswatchpoint.h
+++ b/js/src/jswatchpoint.h
@@ -8,8 +8,8 @@
 #define jswatchpoint_h
 
 #include "jsalloc.h"
-#include "jsdbgapi.h"
 #include "jsapi.h"
+#include "jsdbgapi.h"
 
 #include "gc/Barrier.h"
 #include "js/HashTable.h"
diff --git a/js/src/prmjtime.cpp b/js/src/prmjtime.cpp
index 8a829b3287e..0942aaba1c0 100644
--- a/js/src/prmjtime.cpp
+++ b/js/src/prmjtime.cpp
@@ -33,8 +33,8 @@
 #define NS_HAVE_INVALID_PARAMETER_HANDLER 1
 #endif
 #ifdef NS_HAVE_INVALID_PARAMETER_HANDLER
-#include <stdlib.h>   /* for _set_invalid_parameter_handler */
 #include <crtdbg.h>   /* for _CrtSetReportMode */
+#include <stdlib.h>   /* for _set_invalid_parameter_handler */
 #endif
 
 #ifdef JS_THREADSAFE
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index c7adfd822b5..5d41069823b 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef XP_UNIX
-# include <sys/wait.h>
 # include <sys/types.h>
+# include <sys/wait.h>
 # include <unistd.h>
 #endif
 
diff --git a/js/src/vm/ForkJoin.cpp b/js/src/vm/ForkJoin.cpp
index b9b59dc4e6e..f307c73c25d 100644
--- a/js/src/vm/ForkJoin.cpp
+++ b/js/src/vm/ForkJoin.cpp
@@ -9,8 +9,8 @@
 #include "jscntxt.h"
 
 #ifdef JS_THREADSAFE
-# include "prthread.h"
 # include "prprf.h"
+# include "prthread.h"
 # include "jit/BaselineJIT.h"
 # include "vm/Monitor.h"
 #endif
diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h
index d2546262c67..1c38633e9c2 100644
--- a/js/src/vm/Interpreter-inl.h
+++ b/js/src/vm/Interpreter-inl.h
@@ -21,8 +21,8 @@
 #include "vm/ForkJoin.h"
 
 #include "jsatominlines.h"
-#include "jsobjinlines.h"
 #include "jsinferinlines.h"
+#include "jsobjinlines.h"
 
 #include "vm/GlobalObject-inl.h"
 #include "vm/Stack-inl.h"
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
index ef0c10adc85..950c07a3ca6 100644
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -24,10 +24,10 @@
 #include "jsscript.h"
 #include "jswrapper.h"
 
-#include "js/MemoryMetrics.h"
 #include "jit/AsmJSSignalHandlers.h"
 #include "jit/IonCompartment.h"
 #include "jit/PcScriptCache.h"
+#include "js/MemoryMetrics.h"
 #include "yarr/BumpPointerAllocator.h"
 
 #include "jscntxtinlines.h"
diff --git a/js/src/vm/Xdr.cpp b/js/src/vm/Xdr.cpp
index 675687f4540..e31159b2bb1 100644
--- a/js/src/vm/Xdr.cpp
+++ b/js/src/vm/Xdr.cpp
@@ -11,10 +11,10 @@
 #include "jsapi.h"
 #include "jsscript.h"
 
-#include "vm/ObjectImpl-inl.h"
-
 #include "vm/Debugger.h"
 
+#include "vm/ObjectImpl-inl.h"
+
 using namespace js;
 
 void

From c614c04e0fb1c40928e99c91a4ce5e3068f6e7f9 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 14 Aug 2013 21:59:57 -0700
Subject: [PATCH 97/98] Bug 898274 (part 2) - Check ordering of #include
 statements in check_spidermonkey_style.py.  r=benjamin.

---
 config/check_spidermonkey_style.py        | 263 ++++++++++++++++++----
 js/src/config/check_spidermonkey_style.py | 263 ++++++++++++++++++----
 js/src/tests/style/BadIncludes.h          |   6 +
 js/src/tests/style/BadIncludesOrder-inl.h |  30 +++
 js/src/tests/style/HeaderCycleB4-inl.h    |   2 +-
 5 files changed, 477 insertions(+), 87 deletions(-)
 create mode 100644 js/src/tests/style/BadIncludesOrder-inl.h

diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py
index eeb22c45fda..93e9e8a6887 100644
--- a/config/check_spidermonkey_style.py
+++ b/config/check_spidermonkey_style.py
@@ -10,15 +10,13 @@
 # We check the following things in headers.
 #
 # - No cyclic dependencies.
-# 
+#
 # - No normal header should #include a inlines.h/-inl.h file.
-# 
+#
 # - #ifndef wrappers should have the right form. (XXX: not yet implemented)
 #   - Every header file should have one.
-#   - It should be in the vanilla form and have no tokens before/after it so
-#     that GCC and clang can avoid multiple-inclusion.
 #   - The guard name used should be appropriate for the filename.
-# 
+#
 # We check the following things in all files.
 #
 # - #includes should have full paths, e.g. "jit/Ion.h", not "Ion.h".
@@ -26,11 +24,15 @@
 # - #includes should use the appropriate form for system headers (<...>) and
 #   local headers ("...").
 #
-# - #includes should be ordered correctly. (XXX: not yet implemented;  see bug
-#   888088)
+# - #includes should be ordered correctly.
 #   - Each one should be in the correct section.
 #   - Alphabetical order should be used within sections.
 #   - Sections should be in the right order.
+#   Note that the presence of #if/#endif blocks complicates things, to the
+#   point that it's not always clear where a conditionally-compiled #include
+#   statement should go, even to a human.  Therefore, we check the #include
+#   statements within each #if/#endif block (including nested ones) in
+#   isolation, but don't try to do any order checking between such blocks.
 #----------------------------------------------------------------------------
 
 from __future__ import print_function
@@ -87,6 +89,16 @@ included_inclnames_to_ignore = set([
     'vtune/VTuneWrapper.h'      # VTune
 ])
 
+# These files have additional constraints on where they are #included, so we
+# ignore #includes of them when checking #include ordering.
+oddly_ordered_inclnames = set([
+    'ctypes/typedefs.h',        # Included multiple times in the body of ctypes/CTypes.h
+    'jsautokw.h',               # Included in the body of frontend/TokenStream.h
+    'jswin.h',                  # Must be #included before <psapi.h>
+    'winbase.h',                # Must precede other system headers(?)
+    'windef.h'                  # Must precede other system headers(?)
+])
+
 # The files in tests/style/ contain code that fails this checking in various
 # ways.  Here is the output we expect.  If the actual output differs from
 # this, one of the following must have happened.
@@ -99,21 +111,42 @@ expected_output = '''\
 js/src/tests/style/BadIncludes2.h:1: error:
     vanilla header includes an inline-header file "tests/style/BadIncludes2-inl.h"
 
-js/src/tests/style/BadIncludes.h:1: error:
+js/src/tests/style/BadIncludes.h:3: error:
     the file includes itself
 
-js/src/tests/style/BadIncludes.h:3: error:
+js/src/tests/style/BadIncludes.h:6: error:
     "BadIncludes2.h" is included using the wrong path;
     did you forget a prefix, or is the file not yet committed?
 
-js/src/tests/style/BadIncludes.h:4: error:
+js/src/tests/style/BadIncludes.h:8: error:
     <tests/style/BadIncludes2.h> should be included using
     the #include "..." form
 
-js/src/tests/style/BadIncludes.h:5: error:
+js/src/tests/style/BadIncludes.h:10: error:
     "stdio.h" is included using the wrong path;
     did you forget a prefix, or is the file not yet committed?
 
+js/src/tests/style/BadIncludesOrder-inl.h:5:6: error:
+    "vm/Interpreter-inl.h" should be included after "jsscriptinlines.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:6:7: error:
+    "jsscriptinlines.h" should be included after "js/Value.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:7:8: error:
+    "js/Value.h" should be included after "ds/LifoAlloc.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:8:9: error:
+    "ds/LifoAlloc.h" should be included after "jsapi.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:9:10: error:
+    "jsapi.h" should be included after <stdio.h>
+
+js/src/tests/style/BadIncludesOrder-inl.h:10:11: error:
+    <stdio.h> should be included after "mozilla/HashFunctions.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:27:28: error:
+    "jsobj.h" should be included after "jsfun.h"
+
 (multiple files): error:
     header files form one or more cycles
 
@@ -143,8 +176,8 @@ def out(*lines):
 
 def error(filename, linenum, *lines):
     location = filename
-    if linenum != None:
-        location += ":" + str(linenum)
+    if linenum is not None:
+        location += ':' + str(linenum)
     out(location + ': error:')
     for line in (lines):
         out('    ' + line)
@@ -163,10 +196,10 @@ class FileKind(object):
     def get(filename):
         if filename.endswith('.c'):
             return FileKind.C
-       
+
         if filename.endswith('.cpp'):
             return FileKind.CPP
-       
+
         if filename.endswith(('inlines.h', '-inl.h')):
             return FileKind.INL_H
 
@@ -183,7 +216,7 @@ class FileKind(object):
 
 
 def get_all_filenames():
-    """Get a list of all the files in the (Mercurial or Git) repository."""
+    '''Get a list of all the files in the (Mercurial or Git) repository.'''
     cmds = [['hg', 'manifest', '-q'], ['git', 'ls-files']]
     for cmd in cmds:
         try:
@@ -263,54 +296,198 @@ def check_style():
     return ok
 
 
+def module_name(name):
+    '''Strip the trailing .cpp, .h, inlines.h or -inl.h from a filename.'''
+
+    return name.replace('inlines.h', '').replace('-inl.h', '').replace('.h', '').replace('.cpp', '')
+
+
+class Include(object):
+    '''Important information for a single #include statement.'''
+
+    def __init__(self, inclname, linenum, is_system):
+        self.inclname = inclname
+        self.linenum = linenum
+        self.is_system = is_system
+
+    def isLeaf(self):
+        return True
+
+    def section(self, module):
+        '''Identify which section inclname belongs to.
+
+        The section numbers are as follows.
+          0. Module header (e.g. jsfoo.h or jsfooinlines.h within jsfoo.cpp)
+          1. mozilla/Foo.h
+          2. <foo.h> or <foo>
+          3. jsfoo.h, prmjtime.h, etc
+          4. foo/Bar.h
+          5. jsfooinlines.h
+          6. foo/Bar-inl.h
+          7. non-.h, e.g. *.tbl, *.msg
+        '''
+
+        if self.is_system:
+            return 2
+
+        if not self.inclname.endswith('.h'):
+            return 7
+
+        # A couple of modules have the .h file in js/ and the .cpp file elsewhere and so need special
+        # handling.
+        if module == module_name(self.inclname) or \
+           module == 'jsmemorymetrics' and self.inclname == 'js/MemoryMetrics.h' or \
+           module == 'vm/PropertyKey' and self.inclname == 'js/PropertyKey.h':
+            return 0
+
+        if '/' in self.inclname:
+            if self.inclname.startswith('mozilla/'):
+                return 1
+
+            if self.inclname.endswith('-inl.h'):
+                return 6
+
+            return 4
+
+        if self.inclname.endswith('inlines.h'):
+            return 5
+
+        return 3
+
+    def quote(self):
+        if self.is_system:
+            return '<' + self.inclname + '>'
+        else:
+            return '"' + self.inclname + '"'
+
+
+class HashIfBlock(object):
+    '''Important information about a #if/#endif block.
+
+    A #if/#endif block is the contents of a #if/#endif (or similar) section.
+    The top-level block, which is not within a #if/#endif pair, is also
+    considered a block.
+
+    Each leaf is either an Include (representing a #include), or another
+    nested HashIfBlock.'''
+    def __init__(self):
+        self.kids = []
+
+    def isLeaf(self):
+        return False
+
+
 def do_file(filename, inclname, file_kind, f, all_inclnames, included_h_inclnames):
+    block_stack = [HashIfBlock()]
+
+    # Extract the #include statements as a tree of IBlocks and IIncludes.
     for linenum, line in enumerate(f, start=1):
         # Look for a |#include "..."| line.
         m = re.match(r'\s*#\s*include\s+"([^"]*)"', line)
         if m is not None:
-            included_inclname = m.group(1)
+            block_stack[-1].kids.append(Include(m.group(1), linenum, False))
 
-            if included_inclname not in included_inclnames_to_ignore:
-                included_kind = FileKind.get(included_inclname)
+        # Look for a |#include <...>| line.
+        m = re.match(r'\s*#\s*include\s+<([^>]*)>', line)
+        if m is not None:
+            block_stack[-1].kids.append(Include(m.group(1), linenum, True))
+
+        # Look for a |#{if,ifdef,ifndef}| line.
+        m = re.match(r'\s*#\s*(if|ifdef|ifndef)\b', line)
+        if m is not None:
+            # Open a new block.
+            new_block = HashIfBlock()
+            block_stack[-1].kids.append(new_block)
+            block_stack.append(new_block)
+
+        # Look for a |#{elif,else}| line.
+        m = re.match(r'\s*#\s*(elif|else)\b', line)
+        if m is not None:
+            # Close the current block, and open an adjacent one.
+            block_stack.pop()
+            new_block = HashIfBlock()
+            block_stack[-1].kids.append(new_block)
+            block_stack.append(new_block)
+
+        # Look for a |#endif| line.
+        m = re.match(r'\s*#\s*endif\b', line)
+        if m is not None:
+            # Close the current block.
+            block_stack.pop()
+
+    def check_include_statement(include):
+        '''Check the style of a single #include statement.'''
+
+        if include.is_system:
+            # Check it is not a known local file (in which case it's probably a system header).
+            if include.inclname in included_inclnames_to_ignore or \
+               include.inclname in all_inclnames:
+                error(filename, include.linenum,
+                      include.quote() + ' should be included using',
+                      'the #include "..." form')
+
+        else:
+            if include.inclname not in included_inclnames_to_ignore:
+                included_kind = FileKind.get(include.inclname)
 
                 # Check the #include path has the correct form.
-                if included_inclname not in all_inclnames:
-                    error(filename, linenum,
-                          '"' + included_inclname + '" is included ' + 'using the wrong path;',
+                if include.inclname not in all_inclnames:
+                    error(filename, include.linenum,
+                          include.quote() + ' is included ' + 'using the wrong path;',
                           'did you forget a prefix, or is the file not yet committed?')
 
                 # Record inclusions of .h files for cycle detection later.
                 # (Exclude .tbl and .msg files.)
                 elif included_kind == FileKind.H or included_kind == FileKind.INL_H:
-                    included_h_inclnames.add(included_inclname)
+                    included_h_inclnames.add(include.inclname)
 
                 # Check a H file doesn't #include an INL_H file.
                 if file_kind == FileKind.H and included_kind == FileKind.INL_H:
-                    error(filename, linenum,
-                          'vanilla header includes an inline-header file "' + included_inclname + '"')
+                    error(filename, include.linenum,
+                          'vanilla header includes an inline-header file ' + include.quote())
 
-                # Check a file doesn't #include itself.  (We do this here because the
-                # cycle detection below doesn't detect this case.)
-                if inclname == included_inclname:
-                    error(filename, linenum, 'the file includes itself')
+                # Check a file doesn't #include itself.  (We do this here because the cycle
+                # detection below doesn't detect this case.)
+                if inclname == include.inclname:
+                    error(filename, include.linenum, 'the file includes itself')
 
-        # Look for a |#include <...>| line.
-        m = re.match(r'\s*#\s*include\s+<([^>]*)>', line)
-        if m is not None:
-            included_inclname = m.group(1)
+    module = module_name(inclname)
 
-            # Check it is not a known local file (in which case it's
-            # probably a system header).
-            if included_inclname in included_inclnames_to_ignore or \
-               included_inclname in all_inclnames:
-                error(filename, linenum,
-                      '<' + included_inclname + '> should be included using',
-                      'the #include "..." form')
+    def check_includes_order(include1, include2):
+        '''Check the ordering of two #include statements.'''
+
+        if include1.inclname in oddly_ordered_inclnames or \
+           include2.inclname in oddly_ordered_inclnames:
+            return
+
+        section1 = include1.section(module)
+        section2 = include2.section(module)
+        if (section1 > section2) or \
+           ((section1 == section2) and (include1.inclname.lower() > include2.inclname.lower())):
+            error(filename, str(include1.linenum) + ':' + str(include2.linenum),
+                  include1.quote() + ' should be included after ' + include2.quote())
+
+    # The #include statements in the files in assembler/ and yarr/ have all manner of implicit
+    # ordering requirements.  Boo.  Ignore them.
+    skip_order_checking = inclname.startswith(('assembler/', 'yarr/'))
+
+    # Check the extracted #include statements, both individually, and the ordering of
+    # adjacent pairs that live in the same block.
+    def pair_traverse(prev, this):
+        if this.isLeaf():
+            check_include_statement(this)
+            if prev is not None and prev.isLeaf() and not skip_order_checking:
+                check_includes_order(prev, this)
+        else:
+            for prev2, this2 in zip([None] + this.kids[0:-1], this.kids):
+                pair_traverse(prev2, this2)
+
+    pair_traverse(None, block_stack[-1])
 
 
 def find_cycles(all_inclnames, edges):
-    """Find and draw any cycles."""
-    
+    '''Find and draw any cycles.'''
+
     SCCs = tarjan(all_inclnames, edges)
 
     # The various sorted() calls below ensure the output is deterministic.
@@ -392,5 +569,5 @@ def main():
     sys.exit(0 if ok else 1)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()
diff --git a/js/src/config/check_spidermonkey_style.py b/js/src/config/check_spidermonkey_style.py
index eeb22c45fda..93e9e8a6887 100644
--- a/js/src/config/check_spidermonkey_style.py
+++ b/js/src/config/check_spidermonkey_style.py
@@ -10,15 +10,13 @@
 # We check the following things in headers.
 #
 # - No cyclic dependencies.
-# 
+#
 # - No normal header should #include a inlines.h/-inl.h file.
-# 
+#
 # - #ifndef wrappers should have the right form. (XXX: not yet implemented)
 #   - Every header file should have one.
-#   - It should be in the vanilla form and have no tokens before/after it so
-#     that GCC and clang can avoid multiple-inclusion.
 #   - The guard name used should be appropriate for the filename.
-# 
+#
 # We check the following things in all files.
 #
 # - #includes should have full paths, e.g. "jit/Ion.h", not "Ion.h".
@@ -26,11 +24,15 @@
 # - #includes should use the appropriate form for system headers (<...>) and
 #   local headers ("...").
 #
-# - #includes should be ordered correctly. (XXX: not yet implemented;  see bug
-#   888088)
+# - #includes should be ordered correctly.
 #   - Each one should be in the correct section.
 #   - Alphabetical order should be used within sections.
 #   - Sections should be in the right order.
+#   Note that the presence of #if/#endif blocks complicates things, to the
+#   point that it's not always clear where a conditionally-compiled #include
+#   statement should go, even to a human.  Therefore, we check the #include
+#   statements within each #if/#endif block (including nested ones) in
+#   isolation, but don't try to do any order checking between such blocks.
 #----------------------------------------------------------------------------
 
 from __future__ import print_function
@@ -87,6 +89,16 @@ included_inclnames_to_ignore = set([
     'vtune/VTuneWrapper.h'      # VTune
 ])
 
+# These files have additional constraints on where they are #included, so we
+# ignore #includes of them when checking #include ordering.
+oddly_ordered_inclnames = set([
+    'ctypes/typedefs.h',        # Included multiple times in the body of ctypes/CTypes.h
+    'jsautokw.h',               # Included in the body of frontend/TokenStream.h
+    'jswin.h',                  # Must be #included before <psapi.h>
+    'winbase.h',                # Must precede other system headers(?)
+    'windef.h'                  # Must precede other system headers(?)
+])
+
 # The files in tests/style/ contain code that fails this checking in various
 # ways.  Here is the output we expect.  If the actual output differs from
 # this, one of the following must have happened.
@@ -99,21 +111,42 @@ expected_output = '''\
 js/src/tests/style/BadIncludes2.h:1: error:
     vanilla header includes an inline-header file "tests/style/BadIncludes2-inl.h"
 
-js/src/tests/style/BadIncludes.h:1: error:
+js/src/tests/style/BadIncludes.h:3: error:
     the file includes itself
 
-js/src/tests/style/BadIncludes.h:3: error:
+js/src/tests/style/BadIncludes.h:6: error:
     "BadIncludes2.h" is included using the wrong path;
     did you forget a prefix, or is the file not yet committed?
 
-js/src/tests/style/BadIncludes.h:4: error:
+js/src/tests/style/BadIncludes.h:8: error:
     <tests/style/BadIncludes2.h> should be included using
     the #include "..." form
 
-js/src/tests/style/BadIncludes.h:5: error:
+js/src/tests/style/BadIncludes.h:10: error:
     "stdio.h" is included using the wrong path;
     did you forget a prefix, or is the file not yet committed?
 
+js/src/tests/style/BadIncludesOrder-inl.h:5:6: error:
+    "vm/Interpreter-inl.h" should be included after "jsscriptinlines.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:6:7: error:
+    "jsscriptinlines.h" should be included after "js/Value.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:7:8: error:
+    "js/Value.h" should be included after "ds/LifoAlloc.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:8:9: error:
+    "ds/LifoAlloc.h" should be included after "jsapi.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:9:10: error:
+    "jsapi.h" should be included after <stdio.h>
+
+js/src/tests/style/BadIncludesOrder-inl.h:10:11: error:
+    <stdio.h> should be included after "mozilla/HashFunctions.h"
+
+js/src/tests/style/BadIncludesOrder-inl.h:27:28: error:
+    "jsobj.h" should be included after "jsfun.h"
+
 (multiple files): error:
     header files form one or more cycles
 
@@ -143,8 +176,8 @@ def out(*lines):
 
 def error(filename, linenum, *lines):
     location = filename
-    if linenum != None:
-        location += ":" + str(linenum)
+    if linenum is not None:
+        location += ':' + str(linenum)
     out(location + ': error:')
     for line in (lines):
         out('    ' + line)
@@ -163,10 +196,10 @@ class FileKind(object):
     def get(filename):
         if filename.endswith('.c'):
             return FileKind.C
-       
+
         if filename.endswith('.cpp'):
             return FileKind.CPP
-       
+
         if filename.endswith(('inlines.h', '-inl.h')):
             return FileKind.INL_H
 
@@ -183,7 +216,7 @@ class FileKind(object):
 
 
 def get_all_filenames():
-    """Get a list of all the files in the (Mercurial or Git) repository."""
+    '''Get a list of all the files in the (Mercurial or Git) repository.'''
     cmds = [['hg', 'manifest', '-q'], ['git', 'ls-files']]
     for cmd in cmds:
         try:
@@ -263,54 +296,198 @@ def check_style():
     return ok
 
 
+def module_name(name):
+    '''Strip the trailing .cpp, .h, inlines.h or -inl.h from a filename.'''
+
+    return name.replace('inlines.h', '').replace('-inl.h', '').replace('.h', '').replace('.cpp', '')
+
+
+class Include(object):
+    '''Important information for a single #include statement.'''
+
+    def __init__(self, inclname, linenum, is_system):
+        self.inclname = inclname
+        self.linenum = linenum
+        self.is_system = is_system
+
+    def isLeaf(self):
+        return True
+
+    def section(self, module):
+        '''Identify which section inclname belongs to.
+
+        The section numbers are as follows.
+          0. Module header (e.g. jsfoo.h or jsfooinlines.h within jsfoo.cpp)
+          1. mozilla/Foo.h
+          2. <foo.h> or <foo>
+          3. jsfoo.h, prmjtime.h, etc
+          4. foo/Bar.h
+          5. jsfooinlines.h
+          6. foo/Bar-inl.h
+          7. non-.h, e.g. *.tbl, *.msg
+        '''
+
+        if self.is_system:
+            return 2
+
+        if not self.inclname.endswith('.h'):
+            return 7
+
+        # A couple of modules have the .h file in js/ and the .cpp file elsewhere and so need special
+        # handling.
+        if module == module_name(self.inclname) or \
+           module == 'jsmemorymetrics' and self.inclname == 'js/MemoryMetrics.h' or \
+           module == 'vm/PropertyKey' and self.inclname == 'js/PropertyKey.h':
+            return 0
+
+        if '/' in self.inclname:
+            if self.inclname.startswith('mozilla/'):
+                return 1
+
+            if self.inclname.endswith('-inl.h'):
+                return 6
+
+            return 4
+
+        if self.inclname.endswith('inlines.h'):
+            return 5
+
+        return 3
+
+    def quote(self):
+        if self.is_system:
+            return '<' + self.inclname + '>'
+        else:
+            return '"' + self.inclname + '"'
+
+
+class HashIfBlock(object):
+    '''Important information about a #if/#endif block.
+
+    A #if/#endif block is the contents of a #if/#endif (or similar) section.
+    The top-level block, which is not within a #if/#endif pair, is also
+    considered a block.
+
+    Each leaf is either an Include (representing a #include), or another
+    nested HashIfBlock.'''
+    def __init__(self):
+        self.kids = []
+
+    def isLeaf(self):
+        return False
+
+
 def do_file(filename, inclname, file_kind, f, all_inclnames, included_h_inclnames):
+    block_stack = [HashIfBlock()]
+
+    # Extract the #include statements as a tree of IBlocks and IIncludes.
     for linenum, line in enumerate(f, start=1):
         # Look for a |#include "..."| line.
         m = re.match(r'\s*#\s*include\s+"([^"]*)"', line)
         if m is not None:
-            included_inclname = m.group(1)
+            block_stack[-1].kids.append(Include(m.group(1), linenum, False))
 
-            if included_inclname not in included_inclnames_to_ignore:
-                included_kind = FileKind.get(included_inclname)
+        # Look for a |#include <...>| line.
+        m = re.match(r'\s*#\s*include\s+<([^>]*)>', line)
+        if m is not None:
+            block_stack[-1].kids.append(Include(m.group(1), linenum, True))
+
+        # Look for a |#{if,ifdef,ifndef}| line.
+        m = re.match(r'\s*#\s*(if|ifdef|ifndef)\b', line)
+        if m is not None:
+            # Open a new block.
+            new_block = HashIfBlock()
+            block_stack[-1].kids.append(new_block)
+            block_stack.append(new_block)
+
+        # Look for a |#{elif,else}| line.
+        m = re.match(r'\s*#\s*(elif|else)\b', line)
+        if m is not None:
+            # Close the current block, and open an adjacent one.
+            block_stack.pop()
+            new_block = HashIfBlock()
+            block_stack[-1].kids.append(new_block)
+            block_stack.append(new_block)
+
+        # Look for a |#endif| line.
+        m = re.match(r'\s*#\s*endif\b', line)
+        if m is not None:
+            # Close the current block.
+            block_stack.pop()
+
+    def check_include_statement(include):
+        '''Check the style of a single #include statement.'''
+
+        if include.is_system:
+            # Check it is not a known local file (in which case it's probably a system header).
+            if include.inclname in included_inclnames_to_ignore or \
+               include.inclname in all_inclnames:
+                error(filename, include.linenum,
+                      include.quote() + ' should be included using',
+                      'the #include "..." form')
+
+        else:
+            if include.inclname not in included_inclnames_to_ignore:
+                included_kind = FileKind.get(include.inclname)
 
                 # Check the #include path has the correct form.
-                if included_inclname not in all_inclnames:
-                    error(filename, linenum,
-                          '"' + included_inclname + '" is included ' + 'using the wrong path;',
+                if include.inclname not in all_inclnames:
+                    error(filename, include.linenum,
+                          include.quote() + ' is included ' + 'using the wrong path;',
                           'did you forget a prefix, or is the file not yet committed?')
 
                 # Record inclusions of .h files for cycle detection later.
                 # (Exclude .tbl and .msg files.)
                 elif included_kind == FileKind.H or included_kind == FileKind.INL_H:
-                    included_h_inclnames.add(included_inclname)
+                    included_h_inclnames.add(include.inclname)
 
                 # Check a H file doesn't #include an INL_H file.
                 if file_kind == FileKind.H and included_kind == FileKind.INL_H:
-                    error(filename, linenum,
-                          'vanilla header includes an inline-header file "' + included_inclname + '"')
+                    error(filename, include.linenum,
+                          'vanilla header includes an inline-header file ' + include.quote())
 
-                # Check a file doesn't #include itself.  (We do this here because the
-                # cycle detection below doesn't detect this case.)
-                if inclname == included_inclname:
-                    error(filename, linenum, 'the file includes itself')
+                # Check a file doesn't #include itself.  (We do this here because the cycle
+                # detection below doesn't detect this case.)
+                if inclname == include.inclname:
+                    error(filename, include.linenum, 'the file includes itself')
 
-        # Look for a |#include <...>| line.
-        m = re.match(r'\s*#\s*include\s+<([^>]*)>', line)
-        if m is not None:
-            included_inclname = m.group(1)
+    module = module_name(inclname)
 
-            # Check it is not a known local file (in which case it's
-            # probably a system header).
-            if included_inclname in included_inclnames_to_ignore or \
-               included_inclname in all_inclnames:
-                error(filename, linenum,
-                      '<' + included_inclname + '> should be included using',
-                      'the #include "..." form')
+    def check_includes_order(include1, include2):
+        '''Check the ordering of two #include statements.'''
+
+        if include1.inclname in oddly_ordered_inclnames or \
+           include2.inclname in oddly_ordered_inclnames:
+            return
+
+        section1 = include1.section(module)
+        section2 = include2.section(module)
+        if (section1 > section2) or \
+           ((section1 == section2) and (include1.inclname.lower() > include2.inclname.lower())):
+            error(filename, str(include1.linenum) + ':' + str(include2.linenum),
+                  include1.quote() + ' should be included after ' + include2.quote())
+
+    # The #include statements in the files in assembler/ and yarr/ have all manner of implicit
+    # ordering requirements.  Boo.  Ignore them.
+    skip_order_checking = inclname.startswith(('assembler/', 'yarr/'))
+
+    # Check the extracted #include statements, both individually, and the ordering of
+    # adjacent pairs that live in the same block.
+    def pair_traverse(prev, this):
+        if this.isLeaf():
+            check_include_statement(this)
+            if prev is not None and prev.isLeaf() and not skip_order_checking:
+                check_includes_order(prev, this)
+        else:
+            for prev2, this2 in zip([None] + this.kids[0:-1], this.kids):
+                pair_traverse(prev2, this2)
+
+    pair_traverse(None, block_stack[-1])
 
 
 def find_cycles(all_inclnames, edges):
-    """Find and draw any cycles."""
-    
+    '''Find and draw any cycles.'''
+
     SCCs = tarjan(all_inclnames, edges)
 
     # The various sorted() calls below ensure the output is deterministic.
@@ -392,5 +569,5 @@ def main():
     sys.exit(0 if ok else 1)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()
diff --git a/js/src/tests/style/BadIncludes.h b/js/src/tests/style/BadIncludes.h
index 6f5ecbe1492..8db124d0e1b 100644
--- a/js/src/tests/style/BadIncludes.h
+++ b/js/src/tests/style/BadIncludes.h
@@ -1,5 +1,11 @@
+// Note:  the #if/#elif conditions are to get past the #include order checking.
+#if A
 #include "tests/style/BadIncludes.h"    // bad: self-include
 #include "tests/style/BadIncludes2.h"   // ok
+#elif B
 #include "BadIncludes2.h"               // bad: not a full path
+#elif C
 #include <tests/style/BadIncludes2.h>   // bad: <> form used for local file
+#elif D
 #include "stdio.h"                      // bad: "" form used for system file
+#endif
diff --git a/js/src/tests/style/BadIncludesOrder-inl.h b/js/src/tests/style/BadIncludesOrder-inl.h
new file mode 100644
index 00000000000..865c845681c
--- /dev/null
+++ b/js/src/tests/style/BadIncludesOrder-inl.h
@@ -0,0 +1,30 @@
+// Note: Each #if scope gets checked separately.
+
+// These are in reverse order!
+#if A
+# include "vm/Interpreter-inl.h"
+# include "jsscriptinlines.h"
+# include "js/Value.h"
+# include "ds/LifoAlloc.h"
+# include "jsapi.h"
+# include <stdio.h>
+# include "mozilla/HashFunctions.h"
+#endif
+
+// These are in reverse order, but it's ok due to the #if scopes.
+#if B
+# include "vm/Interpreter-inl.h"
+# if C
+#  include "js/Value.h"
+#  if D
+#   include "jsapi.h"
+#  endif
+#  include <stdio.h>
+# endif
+# include "mozilla/HashFunctions.h"
+#endif
+
+#include "jsobj.h"
+#include "jsfun.h"      // out of order
+#include "jsscript.h"
+#include "jstypes.h"
diff --git a/js/src/tests/style/HeaderCycleB4-inl.h b/js/src/tests/style/HeaderCycleB4-inl.h
index eb9b20e0dce..23324c6762e 100644
--- a/js/src/tests/style/HeaderCycleB4-inl.h
+++ b/js/src/tests/style/HeaderCycleB4-inl.h
@@ -1,2 +1,2 @@
-#include "tests/style/HeaderCycleB1-inl.h"
 #include "tests/style/jsheadercycleB5inlines.h"
+#include "tests/style/HeaderCycleB1-inl.h"

From 923438e3e3d7e04d1522864d6d08758c7745a9ed Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Wed, 14 Aug 2013 22:36:17 -0700
Subject: [PATCH 98/98] Back out changeset 2454e6a5edbd (Bug 904926) on CLOSED
 TREE for lots of fatal assertions in Windows debug builds in
 MediaDecoder::IsDataCachedToEndOfResource.

---
 content/media/MediaDecoder.cpp |  3 ++-
 content/media/MediaDecoder.h   | 16 +++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/content/media/MediaDecoder.cpp b/content/media/MediaDecoder.cpp
index ead263c6903..1f85d8d7af1 100644
--- a/content/media/MediaDecoder.cpp
+++ b/content/media/MediaDecoder.cpp
@@ -364,6 +364,7 @@ MediaDecoder::MediaDecoder() :
   mInitialVolume(0.0),
   mInitialPlaybackRate(1.0),
   mInitialPreservesPitch(true),
+  mRequestedSeekTime(-1.0),
   mDuration(-1),
   mTransportSeekable(true),
   mMediaSeekable(true),
@@ -372,7 +373,6 @@ MediaDecoder::MediaDecoder() :
   mIsDormant(false),
   mPlayState(PLAY_STATE_PAUSED),
   mNextState(PLAY_STATE_PAUSED),
-  mRequestedSeekTime(-1.0),
   mCalledResourceLoaded(false),
   mIgnoreProgressData(false),
   mInfiniteStream(false),
@@ -753,6 +753,7 @@ void MediaDecoder::MetadataLoaded(int aChannels, int aRate, bool aHasAudio, bool
 
   // Only inform the element of FirstFrameLoaded if not doing a load() in order
   // to fulfill a seek, otherwise we'll get multiple loadedfirstframe events.
+  ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
   bool notifyResourceIsLoaded = !mCalledResourceLoaded &&
                                 IsDataCachedToEndOfResource();
   if (mOwner) {
diff --git a/content/media/MediaDecoder.h b/content/media/MediaDecoder.h
index 8e2ec0aa723..12494e3b076 100644
--- a/content/media/MediaDecoder.h
+++ b/content/media/MediaDecoder.h
@@ -945,6 +945,13 @@ public:
   double mInitialPlaybackRate;
   bool mInitialPreservesPitch;
 
+  // Position to seek to when the seek notification is received by the
+  // decode thread. Written by the main thread and read via the
+  // decode thread. Synchronised using mReentrantMonitor. If the
+  // value is negative then no seek has been requested. When a seek is
+  // started this is reset to negative.
+  double mRequestedSeekTime;
+
   // Duration of the media resource. Set to -1 if unknown.
   // Set when the metadata is loaded. Accessed on the main thread
   // only.
@@ -1043,15 +1050,6 @@ public:
   // This can only be PLAY_STATE_PAUSED or PLAY_STATE_PLAYING.
   PlayState mNextState;
 
-  // Position to seek to when the seek notification is received by the
-  // decode thread.
-  // This can only be changed on the main thread while holding the decoder
-  // monitor. Thus, it can be safely read while holding the decoder monitor
-  // OR on the main thread.
-  // If the value is negative then no seek has been requested. When a seek is
-  // started this is reset to negative.
-  double mRequestedSeekTime;
-
   // True when we have fully loaded the resource and reported that
   // to the element (i.e. reached NETWORK_LOADED state).
   // Accessed on the main thread only.