diff --git a/accessible/jsat/EventManager.jsm b/accessible/jsat/EventManager.jsm
index c9f72ec6f3b..b074469c740 100644
--- a/accessible/jsat/EventManager.jsm
+++ b/accessible/jsat/EventManager.jsm
@@ -266,7 +266,8 @@ this.EventManager.prototype = {
       case Events.DOCUMENT_LOAD_COMPLETE:
       {
         let position = this.contentControl.vc.position;
-        if (position && Utils.isInSubtree(position, aEvent.accessible)) {
+        if (aEvent.accessible === aEvent.accessibleDocument ||
+            (position && Utils.isInSubtree(position, aEvent.accessible))) {
           // Do not automove into the document if the virtual cursor is already
           // positioned inside it.
           break;
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 9ebd42bcc2a..bfa5180cf92 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -4834,7 +4834,8 @@
                   class="tab-content" align="center">
           <xul:image xbl:inherits="fadein,pinned,busy,progress,selected"
                      class="tab-throbber"
-                     role="presentation"/>
+                     role="presentation"
+                     layer="true" />
           <xul:image xbl:inherits="src=image,fadein,pinned,selected"
                      anonid="tab-icon-image"
                      class="tab-icon-image"
diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
index dc2c2e336ff..84c9774e316 100644
--- a/browser/components/loop/MozLoopAPI.jsm
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -474,6 +474,13 @@ function injectLoopAPI(targetWindow) {
       }
     },
 
+    fxAEnabled: {
+      enumerable: true,
+      get: function() {
+        return MozLoopService.fxAEnabled;
+      },
+    },
+
     logInToFxA: {
       enumerable: true,
       writable: true,
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 52f9a834e46..653515308e1 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -85,6 +85,7 @@ let gPushHandler = null;
 let gHawkClient = null;
 let gLocalizedStrings =  null;
 let gInitializeTimer = null;
+let gFxAEnabled = true;
 let gFxAOAuthClientPromise = null;
 let gFxAOAuthClient = null;
 let gFxAOAuthTokenData = null;
@@ -1073,6 +1074,13 @@ this.MozLoopService = {
       return;
     }
 
+    if (Services.prefs.getPrefType("loop.fxa.enabled") == Services.prefs.PREF_BOOL) {
+      gFxAEnabled = Services.prefs.getBoolPref("loop.fxa.enabled");
+      if (!gFxAEnabled) {
+        this.logOutFromFxA();
+      }
+    }
+
     // If expiresTime is in the future then kick-off registration.
     if (MozLoopServiceInternal.urlExpiryTimeIsInFuture()) {
       gInitializeTimerFunc();
@@ -1260,6 +1268,10 @@ this.MozLoopService = {
     MozLoopServiceInternal.doNotDisturb = aFlag;
   },
 
+  get fxAEnabled() {
+    return gFxAEnabled;
+  },
+
   get userProfile() {
     return gFxAOAuthProfile;
   },
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 134747ecbb4..3562c476331 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -230,6 +230,12 @@ loop.panel = (function(_, mozL10n) {
 
     render: function() {
       var cx = React.addons.classSet;
+
+      // For now all of the menu entries require FxA so hide the whole gear if FxA is disabled.
+      if (!navigator.mozLoop.fxAEnabled) {
+        return null;
+      }
+
       return (
         React.DOM.div({className: "settings-menu dropdown"}, 
           React.DOM.a({className: "button-settings", onClick: this.showDropdownMenu, 
@@ -248,6 +254,7 @@ loop.panel = (function(_, mozL10n) {
                                           __("settings_menu_item_signout") :
                                           __("settings_menu_item_signin"), 
                                    onClick: this.handleClickAuthEntry, 
+                                   displayed: navigator.mozLoop.fxAEnabled, 
                                    icon: this._isSignedIn() ? "signout" : "signin"})
           )
         )
@@ -405,7 +412,7 @@ loop.panel = (function(_, mozL10n) {
     },
 
     render: function() {
-      if (navigator.mozLoop.userProfile) {
+      if (!navigator.mozLoop.fxAEnabled || navigator.mozLoop.userProfile) {
         return null;
       }
       return (
@@ -582,6 +589,7 @@ loop.panel = (function(_, mozL10n) {
   return {
     init: init,
     UserIdentity: UserIdentity,
+    AuthLink: AuthLink,
     AvailabilityDropdown: AvailabilityDropdown,
     CallUrlResult: CallUrlResult,
     PanelView: PanelView,
diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx
index def5147c96f..255c78b4eca 100644
--- a/browser/components/loop/content/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -230,6 +230,12 @@ loop.panel = (function(_, mozL10n) {
 
     render: function() {
       var cx = React.addons.classSet;
+
+      // For now all of the menu entries require FxA so hide the whole gear if FxA is disabled.
+      if (!navigator.mozLoop.fxAEnabled) {
+        return null;
+      }
+
       return (
         <div className="settings-menu dropdown">
           <a className="button-settings" onClick={this.showDropdownMenu}
@@ -248,6 +254,7 @@ loop.panel = (function(_, mozL10n) {
                                           __("settings_menu_item_signout") :
                                           __("settings_menu_item_signin")}
                                    onClick={this.handleClickAuthEntry}
+                                   displayed={navigator.mozLoop.fxAEnabled}
                                    icon={this._isSignedIn() ? "signout" : "signin"} />
           </ul>
         </div>
@@ -405,7 +412,7 @@ loop.panel = (function(_, mozL10n) {
     },
 
     render: function() {
-      if (navigator.mozLoop.userProfile) {
+      if (!navigator.mozLoop.fxAEnabled || navigator.mozLoop.userProfile) {
         return null;
       }
       return (
@@ -582,6 +589,7 @@ loop.panel = (function(_, mozL10n) {
   return {
     init: init,
     UserIdentity: UserIdentity,
+    AuthLink: AuthLink,
     AvailabilityDropdown: AvailabilityDropdown,
     CallUrlResult: CallUrlResult,
     PanelView: PanelView,
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 0d805ea75af..8888dc43b65 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -25,6 +25,7 @@ describe("loop.panel", function() {
 
     navigator.mozLoop = {
       doNotDisturb: true,
+      fxAEnabled: true,
       getStrings: function() {
         return JSON.stringify({textContent: "fakeText"});
       },
@@ -177,8 +178,19 @@ describe("loop.panel", function() {
 
           sinon.assert.calledOnce(navigator.mozLoop.logInToFxA);
         });
+
+      it("should be hidden if FxA is not enabled",
+        function() {
+          navigator.mozLoop.fxAEnabled = false;
+          var view = TestUtils.renderIntoDocument(loop.panel.AuthLink());
+          expect(view.getDOMNode()).to.be.null;
       });
 
+      afterEach(function() {
+        navigator.mozLoop.fxAEnabled = true;
+      });
+    });
+
     describe("SettingsDropdown", function() {
       var view;
 
@@ -188,6 +200,17 @@ describe("loop.panel", function() {
         navigator.mozLoop.openFxASettings = sandbox.stub();
       });
 
+      afterEach(function() {
+        navigator.mozLoop.fxAEnabled = true;
+      });
+
+      it("should be hidden if FxA is not enabled",
+        function() {
+          navigator.mozLoop.fxAEnabled = false;
+          var view = TestUtils.renderIntoDocument(loop.panel.SettingsDropdown());
+          expect(view.getDOMNode()).to.be.null;
+      });
+
       it("should show a signin entry when user is not authenticated",
         function() {
           navigator.mozLoop.loggedInToFxA = false;
diff --git a/browser/devtools/debugger/test/browser.ini b/browser/devtools/debugger/test/browser.ini
index 1222b822c96..52f369a6784 100644
--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -139,6 +139,7 @@ skip-if = os == "mac" || e10s # Bug 895426
 [browser_dbg_breakpoints-other-tabs.js]
 [browser_dbg_breakpoints-pane.js]
 [browser_dbg_breakpoints-reload.js]
+skip-if = (os == "linux") && debug # Bug 1076830
 [browser_dbg_chrome-create.js]
 [browser_dbg_chrome-debugging.js]
 [browser_dbg_clean-exit-window.js]
diff --git a/browser/themes/linux/tabbrowser/connecting.png b/browser/themes/linux/tabbrowser/connecting.png
index 33075734e9e..e564fb5708f 100644
Binary files a/browser/themes/linux/tabbrowser/connecting.png and b/browser/themes/linux/tabbrowser/connecting.png differ
diff --git a/browser/themes/linux/tabbrowser/loading.png b/browser/themes/linux/tabbrowser/loading.png
index a59c531602b..a2f9b797098 100644
Binary files a/browser/themes/linux/tabbrowser/loading.png and b/browser/themes/linux/tabbrowser/loading.png differ
diff --git a/browser/themes/osx/tabbrowser/connecting.png b/browser/themes/osx/tabbrowser/connecting.png
index 33075734e9e..e564fb5708f 100644
Binary files a/browser/themes/osx/tabbrowser/connecting.png and b/browser/themes/osx/tabbrowser/connecting.png differ
diff --git a/browser/themes/osx/tabbrowser/connecting@2x.png b/browser/themes/osx/tabbrowser/connecting@2x.png
index 439cfc39a5b..97e2b2eb67e 100644
Binary files a/browser/themes/osx/tabbrowser/connecting@2x.png and b/browser/themes/osx/tabbrowser/connecting@2x.png differ
diff --git a/browser/themes/osx/tabbrowser/loading.png b/browser/themes/osx/tabbrowser/loading.png
index 30bce927b44..b886c73eff9 100644
Binary files a/browser/themes/osx/tabbrowser/loading.png and b/browser/themes/osx/tabbrowser/loading.png differ
diff --git a/browser/themes/osx/tabbrowser/loading@2x.png b/browser/themes/osx/tabbrowser/loading@2x.png
index cf2ceb08bcf..ac928c58537 100644
Binary files a/browser/themes/osx/tabbrowser/loading@2x.png and b/browser/themes/osx/tabbrowser/loading@2x.png differ
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index b3360d3c960..db768b88d81 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -76,30 +76,12 @@
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
-@keyframes throbber-loading {
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes throbber-connecting {
-  from {
-    transform: rotate(360deg);
-  }
-}
-
 .tab-throbber[busy] {
   list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
-  animation-duration: 960ms;
-  animation-iteration-count: infinite;
-  animation-name: throbber-connecting;
-  animation-timing-function: linear;
 }
 
 .tab-throbber[progress] {
   list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
-  animation-duration: 800ms;
-  animation-name: throbber-loading;
 }
 
 .tab-throbber:not([pinned]),
diff --git a/browser/themes/windows/tabbrowser/connecting.png b/browser/themes/windows/tabbrowser/connecting.png
index b9e04449a16..e564fb5708f 100644
Binary files a/browser/themes/windows/tabbrowser/connecting.png and b/browser/themes/windows/tabbrowser/connecting.png differ
diff --git a/browser/themes/windows/tabbrowser/loading.png b/browser/themes/windows/tabbrowser/loading.png
index 5e36ba32a18..ba54836e983 100644
Binary files a/browser/themes/windows/tabbrowser/loading.png and b/browser/themes/windows/tabbrowser/loading.png differ
diff --git a/content/base/public/FragmentOrElement.h b/content/base/public/FragmentOrElement.h
index 0f6996fb28a..c53bf789467 100644
--- a/content/base/public/FragmentOrElement.h
+++ b/content/base/public/FragmentOrElement.h
@@ -51,7 +51,6 @@ public:
   explicit nsChildContentList(nsINode* aNode)
     : mNode(aNode)
   {
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/content/base/public/nsDOMFile.h b/content/base/public/nsDOMFile.h
index c6e3416629c..968317d4e25 100644
--- a/content/base/public/nsDOMFile.h
+++ b/content/base/public/nsDOMFile.h
@@ -754,7 +754,6 @@ class nsDOMFileList MOZ_FINAL : public nsIDOMFileList,
 public:
   explicit nsDOMFileList(nsISupports *aParent) : mParent(aParent)
   {
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index 3d20dfae834..9ea6b369d5b 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -320,7 +320,6 @@ public:
     mSubtreeRoot(MOZ_THIS_IN_INITIALIZER_LIST()),
     mSlots(nullptr)
   {
-    SetIsDOMBinding();
   }
 #endif
 
@@ -381,11 +380,7 @@ protected:
    * does some additional checks and fix-up that's common to all nodes. WrapNode
    * should just call the DOM binding's Wrap function.
    */
-  virtual JSObject* WrapNode(JSContext *aCx)
-  {
-    MOZ_ASSERT(!IsDOMBinding(), "Someone forgot to override WrapNode");
-    return nullptr;
-  }
+  virtual JSObject* WrapNode(JSContext *aCx) = 0;
 
   // Subclasses that wish to override the parent behavior should return the
   // result of GetParentObjectIntenral, which handles the XBL scope stuff.
diff --git a/content/base/src/Attr.cpp b/content/base/src/Attr.cpp
index 78f359038ab..b1f92f06eef 100644
--- a/content/base/src/Attr.cpp
+++ b/content/base/src/Attr.cpp
@@ -54,8 +54,6 @@ Attr::Attr(nsDOMAttributeMap *aAttrMap,
 
   // We don't add a reference to our content. It will tell us
   // to drop our reference when it goes away.
-
-  SetIsDOMBinding();
 }
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(Attr)
@@ -388,7 +386,7 @@ Attr::Shutdown()
 }
 
 JSObject*
-Attr::WrapObject(JSContext* aCx)
+Attr::WrapNode(JSContext* aCx)
 {
   return AttrBinding::Wrap(aCx, this);
 }
diff --git a/content/base/src/Attr.h b/content/base/src/Attr.h
index 756c260df65..3305a9e7519 100644
--- a/content/base/src/Attr.h
+++ b/content/base/src/Attr.h
@@ -82,7 +82,7 @@ public:
   virtual nsIDOMNode* AsDOMNode() { return this; }
 
   // WebIDL
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
 
   // XPCOM GetName() is OK
   // XPCOM GetValue() is OK
diff --git a/content/base/src/DOMImplementation.h b/content/base/src/DOMImplementation.h
index fb986b55674..1dd114cbb42 100644
--- a/content/base/src/DOMImplementation.h
+++ b/content/base/src/DOMImplementation.h
@@ -42,7 +42,6 @@ public:
     , mBaseURI(aBaseURI)
   {
     MOZ_ASSERT(aOwner);
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/content/base/src/DOMMatrix.h b/content/base/src/DOMMatrix.h
index ade2b5b6d5b..184f68d6644 100644
--- a/content/base/src/DOMMatrix.h
+++ b/content/base/src/DOMMatrix.h
@@ -28,7 +28,6 @@ public:
   explicit DOMMatrixReadOnly(nsISupports* aParent)
     : mParent(aParent), mMatrix2D(new gfx::Matrix())
   {
-    SetIsDOMBinding();
   }
 
   DOMMatrixReadOnly(nsISupports* aParent, const DOMMatrixReadOnly& other)
@@ -39,8 +38,6 @@ public:
     } else {
       mMatrix3D = new gfx::Matrix4x4(*other.mMatrix3D);
     }
-
-    SetIsDOMBinding();
   }
 
 #define GetMatrixMember(entry2D, entry3D, default) \
diff --git a/content/base/src/DOMParser.cpp b/content/base/src/DOMParser.cpp
index 01032cbc69c..04d169424ce 100644
--- a/content/base/src/DOMParser.cpp
+++ b/content/base/src/DOMParser.cpp
@@ -25,7 +25,6 @@ using namespace mozilla::dom;
 DOMParser::DOMParser()
   : mAttemptedInit(false)
 {
-  SetIsDOMBinding();
 }
 
 DOMParser::~DOMParser()
diff --git a/content/base/src/DOMParser.h b/content/base/src/DOMParser.h
index b9002086a12..287426d4d3a 100644
--- a/content/base/src/DOMParser.h
+++ b/content/base/src/DOMParser.h
@@ -84,7 +84,6 @@ private:
   explicit DOMParser(nsISupports* aOwner) : mOwner(aOwner), mAttemptedInit(false)
   {
     MOZ_ASSERT(aOwner);
-    SetIsDOMBinding();
   }
 
   nsresult InitInternal(nsISupports* aOwner, nsIPrincipal* prin,
diff --git a/content/base/src/DOMPoint.h b/content/base/src/DOMPoint.h
index b5c1631f45d..f89d4598656 100644
--- a/content/base/src/DOMPoint.h
+++ b/content/base/src/DOMPoint.h
@@ -31,7 +31,6 @@ public:
     , mZ(aZ)
     , mW(aW)
   {
-    SetIsDOMBinding();
   }
 
   double X() const { return mX; }
diff --git a/content/base/src/DOMQuad.cpp b/content/base/src/DOMQuad.cpp
index 8435781c29d..2f0b912cdf2 100644
--- a/content/base/src/DOMQuad.cpp
+++ b/content/base/src/DOMQuad.cpp
@@ -23,7 +23,6 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMQuad, Release)
 DOMQuad::DOMQuad(nsISupports* aParent, CSSPoint aPoints[4])
   : mParent(aParent)
 {
-  SetIsDOMBinding();
   for (uint32_t i = 0; i < 4; ++i) {
     mPoints[i] = new DOMPoint(aParent, aPoints[i].x, aPoints[i].y);
   }
@@ -32,7 +31,6 @@ DOMQuad::DOMQuad(nsISupports* aParent, CSSPoint aPoints[4])
 DOMQuad::DOMQuad(nsISupports* aParent)
   : mParent(aParent)
 {
-  SetIsDOMBinding();
 }
 
 DOMQuad::~DOMQuad()
diff --git a/content/base/src/DOMRect.h b/content/base/src/DOMRect.h
index 61146b4a3d0..a3f8510f911 100644
--- a/content/base/src/DOMRect.h
+++ b/content/base/src/DOMRect.h
@@ -36,7 +36,6 @@ public:
   explicit DOMRectReadOnly(nsISupports* aParent)
     : mParent(aParent)
   {
-    SetIsDOMBinding();
   }
 
   nsISupports* GetParentObject() const
@@ -155,7 +154,6 @@ class DOMRectList MOZ_FINAL : public nsIDOMClientRectList,
 public:
   explicit DOMRectList(nsISupports *aParent) : mParent(aParent)
   {
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/content/base/src/DOMStringList.h b/content/base/src/DOMStringList.h
index bad5db70faf..87e9fd9c429 100644
--- a/content/base/src/DOMStringList.h
+++ b/content/base/src/DOMStringList.h
@@ -21,11 +21,6 @@ protected:
   virtual ~DOMStringList();
 
 public:
-  DOMStringList()
-  {
-    SetIsDOMBinding();
-  }
-
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMStringList)
 
diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp
index 072bfb9af6a..99c32e4f5e3 100644
--- a/content/base/src/Element.cpp
+++ b/content/base/src/Element.cpp
@@ -876,8 +876,6 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(DestinationInsertionPointList)
 DestinationInsertionPointList::DestinationInsertionPointList(Element* aElement)
   : mParent(aElement)
 {
-  SetIsDOMBinding();
-
   nsTArray<nsIContent*>* destPoints = aElement->GetExistingDestInsertionPoints();
   if (destPoints) {
     for (uint32_t i = 0; i < destPoints->Length(); i++) {
diff --git a/content/base/src/StyleSheetList.h b/content/base/src/StyleSheetList.h
index 88badb55ede..be0006cb54f 100644
--- a/content/base/src/StyleSheetList.h
+++ b/content/base/src/StyleSheetList.h
@@ -20,11 +20,6 @@ class StyleSheetList : public nsIDOMStyleSheetList
                      , public nsWrapperCache
 {
 public:
-  StyleSheetList()
-  {
-    SetIsDOMBinding();
-  }
-
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(StyleSheetList)
   NS_DECL_NSIDOMSTYLESHEETLIST
diff --git a/content/base/src/nsContentList.h b/content/base/src/nsContentList.h
index 41223052863..30c8aef99a5 100644
--- a/content/base/src/nsContentList.h
+++ b/content/base/src/nsContentList.h
@@ -39,11 +39,6 @@ class Element;
 class nsBaseContentList : public nsINodeList
 {
 public:
-  nsBaseContentList()
-  {
-    SetIsDOMBinding();
-  }
-
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
 
   // nsIDOMNodeList
diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp
index 7310e2ecb9a..1d63af7d778 100644
--- a/content/base/src/nsDOMAttributeMap.cpp
+++ b/content/base/src/nsDOMAttributeMap.cpp
@@ -34,7 +34,6 @@ nsDOMAttributeMap::nsDOMAttributeMap(Element* aContent)
 {
   // We don't add a reference to our content. If it goes away,
   // we'll be told to drop our reference
-  SetIsDOMBinding();
 }
 
 /**
diff --git a/content/base/src/nsDOMCaretPosition.cpp b/content/base/src/nsDOMCaretPosition.cpp
index faaee946ec5..cbf68be7e19 100644
--- a/content/base/src/nsDOMCaretPosition.cpp
+++ b/content/base/src/nsDOMCaretPosition.cpp
@@ -13,7 +13,6 @@ using namespace mozilla::dom;
 nsDOMCaretPosition::nsDOMCaretPosition(nsINode* aNode, uint32_t aOffset)
   : mOffset(aOffset), mOffsetNode(aNode), mAnonymousContentNode(nullptr)
 {
-  SetIsDOMBinding();
 }
 
 nsDOMCaretPosition::~nsDOMCaretPosition()
diff --git a/content/base/src/nsDOMFileReader.cpp b/content/base/src/nsDOMFileReader.cpp
index 0a622bb7441..f7f12d00280 100644
--- a/content/base/src/nsDOMFileReader.cpp
+++ b/content/base/src/nsDOMFileReader.cpp
@@ -87,7 +87,6 @@ nsDOMFileReader::nsDOMFileReader()
     mResultArrayBuffer(nullptr)
 {
   SetDOMStringToNull(mResult);
-  SetIsDOMBinding();
 }
 
 nsDOMFileReader::~nsDOMFileReader()
diff --git a/content/base/src/nsDOMMutationObserver.h b/content/base/src/nsDOMMutationObserver.h
index 0020807b6e3..2fa0934231c 100644
--- a/content/base/src/nsDOMMutationObserver.h
+++ b/content/base/src/nsDOMMutationObserver.h
@@ -37,7 +37,6 @@ public:
   nsDOMMutationRecord(nsIAtom* aType, nsISupports* aOwner)
   : mType(aType), mAttrNamespace(NullString()), mPrevValue(NullString()), mOwner(aOwner)
   {
-    SetIsDOMBinding();
   }
 
   nsISupports* GetParentObject() const
@@ -347,7 +346,6 @@ public:
   : mOwner(aOwner), mLastPendingMutation(nullptr), mPendingMutationCount(0),
     mCallback(&aCb), mWaitingForRun(false), mId(++sCount)
   {
-    SetIsDOMBinding();
   }
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsDOMMutationObserver)
diff --git a/content/base/src/nsDOMSerializer.cpp b/content/base/src/nsDOMSerializer.cpp
index 8998a8347a7..cb26fb24538 100644
--- a/content/base/src/nsDOMSerializer.cpp
+++ b/content/base/src/nsDOMSerializer.cpp
@@ -18,7 +18,6 @@ using namespace mozilla;
 
 nsDOMSerializer::nsDOMSerializer()
 {
-  SetIsDOMBinding();
 }
 
 nsDOMSerializer::~nsDOMSerializer()
diff --git a/content/base/src/nsDOMSerializer.h b/content/base/src/nsDOMSerializer.h
index 27c4d0877bc..b8459593829 100644
--- a/content/base/src/nsDOMSerializer.h
+++ b/content/base/src/nsDOMSerializer.h
@@ -59,7 +59,6 @@ private:
   explicit nsDOMSerializer(nsISupports* aOwner) : mOwner(aOwner)
   {
     MOZ_ASSERT(aOwner);
-    SetIsDOMBinding();
   }
 
   nsCOMPtr<nsISupports> mOwner;
diff --git a/content/base/src/nsDOMTokenList.cpp b/content/base/src/nsDOMTokenList.cpp
index 9a2d87bc595..856718566f5 100644
--- a/content/base/src/nsDOMTokenList.cpp
+++ b/content/base/src/nsDOMTokenList.cpp
@@ -24,7 +24,6 @@ nsDOMTokenList::nsDOMTokenList(Element* aElement, nsIAtom* aAttrAtom)
 {
   // We don't add a reference to our element. If it goes away,
   // we'll be told to drop our reference
-  SetIsDOMBinding();
 }
 
 nsDOMTokenList::~nsDOMTokenList() { }
diff --git a/content/base/src/nsFormData.cpp b/content/base/src/nsFormData.cpp
index c5bd9edba32..b327a833623 100644
--- a/content/base/src/nsFormData.cpp
+++ b/content/base/src/nsFormData.cpp
@@ -16,7 +16,6 @@ nsFormData::nsFormData(nsISupports* aOwner)
   : nsFormSubmission(NS_LITERAL_CSTRING("UTF-8"), nullptr)
   , mOwner(aOwner)
 {
-  SetIsDOMBinding();
 }
 
 // -------------------------------------------------------------------------
diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp
index 8e3a95c5567..f559e98a05d 100644
--- a/content/base/src/nsINode.cpp
+++ b/content/base/src/nsINode.cpp
@@ -2674,8 +2674,6 @@ nsINode::GetElementById(const nsAString& aId)
 JSObject*
 nsINode::WrapObject(JSContext *aCx)
 {
-  MOZ_ASSERT(IsDOMBinding());
-
   // Make sure one of these is true
   // (1) our owner document has a script handling object,
   // (2) Our owner document has had a script handling object, or has been marked
diff --git a/content/base/src/nsInProcessTabChildGlobal.cpp b/content/base/src/nsInProcessTabChildGlobal.cpp
index a80a5b2506c..04500690f86 100644
--- a/content/base/src/nsInProcessTabChildGlobal.cpp
+++ b/content/base/src/nsInProcessTabChildGlobal.cpp
@@ -103,6 +103,7 @@ nsInProcessTabChildGlobal::nsInProcessTabChildGlobal(nsIDocShell* aShell,
 : mDocShell(aShell), mInitialized(false), mLoadingScript(false),
   mOwner(aOwner), mChromeMessageManager(aChrome)
 {
+  SetIsNotDOMBinding();
   mozilla::HoldJSObjects(this);
 
   // If owner corresponds to an <iframe mozbrowser> or <iframe mozapp>, we'll
diff --git a/content/base/src/nsInProcessTabChildGlobal.h b/content/base/src/nsInProcessTabChildGlobal.h
index dfd0db42930..220dfbfa98b 100644
--- a/content/base/src/nsInProcessTabChildGlobal.h
+++ b/content/base/src/nsInProcessTabChildGlobal.h
@@ -154,6 +154,10 @@ public:
 
     return mGlobal->GetJSObject();
   }
+  virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE
+  {
+    MOZ_CRASH("nsInProcessTabChildGlobal doesn't use DOM bindings!");
+  }
 protected:
   virtual ~nsInProcessTabChildGlobal();
 
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 251f1283f04..96759265835 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -3451,9 +3451,6 @@ void
 nsObjectLoadingContent::SetupProtoChain(JSContext* aCx,
                                         JS::Handle<JSObject*> aObject)
 {
-  MOZ_ASSERT(nsCOMPtr<nsIContent>(do_QueryInterface(
-    static_cast<nsIObjectLoadingContent*>(this)))->IsDOMBinding());
-
   if (mType != eType_Plugin) {
     return;
   }
diff --git a/content/base/src/nsRange.h b/content/base/src/nsRange.h
index c93a9217bd6..0b4da9356d5 100644
--- a/content/base/src/nsRange.h
+++ b/content/base/src/nsRange.h
@@ -57,7 +57,6 @@ public:
     , mAssertNextInsertOrAppendNode(nullptr)
 #endif
   {
-    SetIsDOMBinding();
     MOZ_ASSERT(aNode, "range isn't in a document!");
     mOwner = aNode->OwnerDoc();
   }
diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp
index 80d05325431..9f9126acee6 100644
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -307,7 +307,6 @@ nsXMLHttpRequest::nsXMLHttpRequest()
     mIsMappedArrayBuffer(false),
     mXPCOMifier(nullptr)
 {
-  SetIsDOMBinding();
 #ifdef DEBUG
   StaticAssertions();
 #endif
diff --git a/content/base/test/chrome/cpows_child.js b/content/base/test/chrome/cpows_child.js
index 3617a69410e..8dc79bd497a 100644
--- a/content/base/test/chrome/cpows_child.js
+++ b/content/base/test/chrome/cpows_child.js
@@ -115,6 +115,21 @@ function xray_test()
   sendSyncMessage("cpows:xray_test", {}, {element: element});
 }
 
+function symbol_test()
+{
+  let iterator = Symbol.iterator;
+  let named = Symbol.for("cpow-test");
+  // let unique = Symbol();
+
+  let object = {
+    [iterator]: iterator,
+    [named]: named,
+    // [unique]: unique,
+    // "unique": unique
+  };
+  sendSyncMessage("cpows:symbol_test", {}, object);
+}
+
 // Parent->Child references should go X->parent.privilegedJunkScope->child.privilegedJunkScope->Y
 // Child->Parent references should go X->child.privilegedJunkScope->parent.unprivilegedJunkScope->Y
 function compartment_test()
diff --git a/content/base/test/chrome/cpows_parent.xul b/content/base/test/chrome/cpows_parent.xul
index 6c11ca5721a..74c5437c297 100644
--- a/content/base/test/chrome/cpows_parent.xul
+++ b/content/base/test/chrome/cpows_parent.xul
@@ -205,6 +205,13 @@
       is(element.foo, undefined, "DOM element does not expose content properties");
     }
 
+    function recvSymbolTest(message) {
+      let object = message.objects;
+      is(object[Symbol.iterator], Symbol.iterator, "Should use Symbol.iterator");
+      is(Symbol.keyFor(object[Symbol.for("cpow-test")]), "cpow-test", "Symbols aren't registered correctly");
+      // is(object.unique, object[object.unique], "Unique symbols as ids and values don't seem to work");
+    }
+
     let systemGlobal = this;
     function recvCompartmentTest(message) {
       let getUnprivilegedObject = message.objects.getUnprivilegedObject;
@@ -300,6 +307,7 @@
       mm.addMessageListener("cpows:dom_test", recvDomTest);
       mm.addMessageListener("cpows:dom_test_after_gc", recvDomTestAfterGC);
       mm.addMessageListener("cpows:xray_test", recvXrayTest);
+      mm.addMessageListener("cpows:symbol_test", recvSymbolTest);
       mm.addMessageListener("cpows:compartment_test", recvCompartmentTest);
       mm.addMessageListener("cpows:regexp_test", recvRegExpTest);
       mm.addMessageListener("cpows:lifetime_test_1", recvLifetimeTest1);
diff --git a/content/base/test/chrome/test_bug765993.html b/content/base/test/chrome/test_bug765993.html
index 650b1bee165..26c39d0f2c3 100644
--- a/content/base/test/chrome/test_bug765993.html
+++ b/content/base/test/chrome/test_bug765993.html
@@ -46,7 +46,7 @@ window.onload = function () {
             });
             ok(scripts.length > 0, "Should be able to find script");
 
-            is(scripts[0].sourceMapURL, "foo.js.map");
+            is(scripts[0].source.sourceMapURL, "foo.js.map");
             SimpleTest.finish();
         }
 
diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp
index 6baeb719074..3ddbf7f5557 100644
--- a/content/html/content/src/HTMLCanvasElement.cpp
+++ b/content/html/content/src/HTMLCanvasElement.cpp
@@ -64,7 +64,6 @@ HTMLCanvasPrintState::HTMLCanvasPrintState(HTMLCanvasElement* aCanvas,
   : mIsDone(false), mPendingNotify(false), mCanvas(aCanvas),
     mContext(aContext), mCallback(aCallback)
 {
-  SetIsDOMBinding();
 }
 
 HTMLCanvasPrintState::~HTMLCanvasPrintState()
diff --git a/content/html/content/src/HTMLContentElement.cpp b/content/html/content/src/HTMLContentElement.cpp
index c09fa64c518..9e75d788dee 100644
--- a/content/html/content/src/HTMLContentElement.cpp
+++ b/content/html/content/src/HTMLContentElement.cpp
@@ -24,7 +24,6 @@ using namespace mozilla::dom;
 HTMLContentElement::HTMLContentElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
   : nsGenericHTMLElement(aNodeInfo), mValidSelector(true), mIsInsertionPoint(false)
 {
-  SetIsDOMBinding();
 }
 
 HTMLContentElement::~HTMLContentElement()
@@ -312,7 +311,6 @@ DistributedContentList::DistributedContentList(HTMLContentElement* aHostElement)
   : mParent(aHostElement)
 {
   MOZ_COUNT_CTOR(DistributedContentList);
-  SetIsDOMBinding();
 
   if (aHostElement->IsInsertionPoint()) {
     if (aHostElement->MatchedNodes().IsEmpty()) {
diff --git a/content/html/content/src/HTMLFormControlsCollection.cpp b/content/html/content/src/HTMLFormControlsCollection.cpp
index 21e24539c78..dea2bee9e11 100644
--- a/content/html/content/src/HTMLFormControlsCollection.cpp
+++ b/content/html/content/src/HTMLFormControlsCollection.cpp
@@ -76,7 +76,6 @@ HTMLFormControlsCollection::HTMLFormControlsCollection(HTMLFormElement* aForm)
   , mElements(8)
   , mNameLookupTable(HTMLFormElement::FORM_CONTROL_LIST_HASHTABLE_LENGTH)
 {
-  SetIsDOMBinding();
 }
 
 HTMLFormControlsCollection::~HTMLFormControlsCollection()
diff --git a/content/html/content/src/HTMLFormElement.cpp b/content/html/content/src/HTMLFormElement.cpp
index 4b931f5329b..d10a1194024 100644
--- a/content/html/content/src/HTMLFormElement.cpp
+++ b/content/html/content/src/HTMLFormElement.cpp
@@ -2067,14 +2067,15 @@ HTMLFormElement::GetNextRadioButton(const nsAString& aName,
       index = 0;
     }
     radio = HTMLInputElement::FromContentOrNull(radioGroup->Item(index));
-    if (!radio)
+    isRadio = radio && radio->GetType() == NS_FORM_INPUT_RADIO;
+    if (!isRadio) {
       continue;
+    }
 
-    isRadio = radio->GetType() == NS_FORM_INPUT_RADIO;
-    if (!isRadio)
-      continue;
-
-  } while ((radio->Disabled() && radio != currentRadio) || !isRadio);
+    nsAutoString name;
+    radio->GetName(name);
+    isRadio = aName.Equals(name);
+  } while (!isRadio || (radio->Disabled() && radio != currentRadio));
 
   NS_IF_ADDREF(*aRadioOut = radio);
   return NS_OK;
diff --git a/content/html/content/src/HTMLOptionsCollection.cpp b/content/html/content/src/HTMLOptionsCollection.cpp
index 3a4eb248208..08f986b5b1f 100644
--- a/content/html/content/src/HTMLOptionsCollection.cpp
+++ b/content/html/content/src/HTMLOptionsCollection.cpp
@@ -35,8 +35,6 @@ namespace dom {
 
 HTMLOptionsCollection::HTMLOptionsCollection(HTMLSelectElement* aSelect)
 {
-  SetIsDOMBinding();
-
   // Do not maintain a reference counted reference. When
   // the select goes away, it will let us know.
   mSelect = aSelect;
diff --git a/content/html/content/src/HTMLPropertiesCollection.cpp b/content/html/content/src/HTMLPropertiesCollection.cpp
index 92dcc709269..c8653b207a4 100644
--- a/content/html/content/src/HTMLPropertiesCollection.cpp
+++ b/content/html/content/src/HTMLPropertiesCollection.cpp
@@ -46,7 +46,6 @@ HTMLPropertiesCollection::HTMLPropertiesCollection(nsGenericHTMLElement* aRoot)
   , mDoc(aRoot->GetUncomposedDoc())
   , mIsDirty(true)
 {
-  SetIsDOMBinding();
   mNames = new PropertyStringList(this);
   if (mDoc) {
     mDoc->AddMutationObserver(this);
@@ -311,7 +310,6 @@ PropertyNodeList::PropertyNodeList(HTMLPropertiesCollection* aCollection,
     mParent(aParent),
     mIsDirty(true)
 {
-  SetIsDOMBinding();
   if (mDoc) {
     mDoc->AddMutationObserver(this);
   }
diff --git a/content/html/content/src/HTMLShadowElement.cpp b/content/html/content/src/HTMLShadowElement.cpp
index 87f6accc8f5..abde9eee8b7 100644
--- a/content/html/content/src/HTMLShadowElement.cpp
+++ b/content/html/content/src/HTMLShadowElement.cpp
@@ -17,7 +17,6 @@ using namespace mozilla::dom;
 HTMLShadowElement::HTMLShadowElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
   : nsGenericHTMLElement(aNodeInfo), mIsInsertionPoint(false)
 {
-  SetIsDOMBinding();
 }
 
 HTMLShadowElement::~HTMLShadowElement()
diff --git a/content/html/content/src/HTMLTableElement.cpp b/content/html/content/src/HTMLTableElement.cpp
index b12020f404c..a3c2579b458 100644
--- a/content/html/content/src/HTMLTableElement.cpp
+++ b/content/html/content/src/HTMLTableElement.cpp
@@ -73,7 +73,6 @@ TableRowsCollection::TableRowsCollection(HTMLTableElement *aParent)
                                   nsGkAtoms::tr,
                                   false))
 {
-  SetIsDOMBinding();
 }
 
 TableRowsCollection::~TableRowsCollection()
diff --git a/content/html/content/src/MediaError.cpp b/content/html/content/src/MediaError.cpp
index 6b82ace4bd1..543305d3d1d 100644
--- a/content/html/content/src/MediaError.cpp
+++ b/content/html/content/src/MediaError.cpp
@@ -25,7 +25,6 @@ MediaError::MediaError(HTMLMediaElement* aParent, uint16_t aCode)
   : mParent(aParent)
   , mCode(aCode)
 {
-  SetIsDOMBinding();
 }
 
 NS_IMETHODIMP MediaError::GetCode(uint16_t* aCode)
diff --git a/content/html/content/src/UndoManager.cpp b/content/html/content/src/UndoManager.cpp
index 7c12f3a900b..e507e17ecc8 100644
--- a/content/html/content/src/UndoManager.cpp
+++ b/content/html/content/src/UndoManager.cpp
@@ -841,7 +841,6 @@ NS_INTERFACE_MAP_END
 UndoManager::UndoManager(nsIContent* aNode)
   : mHostNode(aNode), mInTransaction(false), mIsDisconnected(false)
 {
-  SetIsDOMBinding();
   mTxnManager = new nsTransactionManager();
 }
 
diff --git a/content/html/content/src/ValidityState.cpp b/content/html/content/src/ValidityState.cpp
index ed9304d1786..9b76e555d7f 100644
--- a/content/html/content/src/ValidityState.cpp
+++ b/content/html/content/src/ValidityState.cpp
@@ -24,7 +24,6 @@ NS_INTERFACE_MAP_END
 ValidityState::ValidityState(nsIConstraintValidation* aConstraintValidation)
   : mConstraintValidation(aConstraintValidation)
 {
-  SetIsDOMBinding();
 }
 
 NS_IMETHODIMP
diff --git a/content/html/content/src/nsDOMStringMap.cpp b/content/html/content/src/nsDOMStringMap.cpp
index 6d2cfee7efd..afe1cd69f16 100644
--- a/content/html/content/src/nsDOMStringMap.cpp
+++ b/content/html/content/src/nsDOMStringMap.cpp
@@ -55,8 +55,6 @@ nsDOMStringMap::nsDOMStringMap(nsGenericHTMLElement* aElement)
   : mElement(aElement),
     mRemovingProp(false)
 {
-  SetIsDOMBinding();
-
   mElement->AddMutationObserver(this);
 }
 
diff --git a/content/html/content/src/nsHTMLDNSPrefetch.cpp b/content/html/content/src/nsHTMLDNSPrefetch.cpp
index a9dc8c15bc4..711795ed5be 100644
--- a/content/html/content/src/nsHTMLDNSPrefetch.cpp
+++ b/content/html/content/src/nsHTMLDNSPrefetch.cpp
@@ -94,6 +94,10 @@ nsHTMLDNSPrefetch::Shutdown()
 bool
 nsHTMLDNSPrefetch::IsAllowed (nsIDocument *aDocument)
 {
+  if (NS_IsAppOffline(aDocument->NodePrincipal())) {
+    return false;
+  }
+
   // There is no need to do prefetch on non UI scenarios such as XMLHttpRequest.
   return aDocument->IsDNSPrefetchAllowed() && aDocument->GetWindow();
 }
diff --git a/content/html/content/test/forms/test_input_radio_radiogroup.html b/content/html/content/test/forms/test_input_radio_radiogroup.html
index 8494eacb5d7..f1606b094df 100644
--- a/content/html/content/test/forms/test_input_radio_radiogroup.html
+++ b/content/html/content/test/forms/test_input_radio_radiogroup.html
@@ -14,16 +14,30 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=343444
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=343444">Mozilla Bug 343444</a>
 <p id="display"></p>
 <form>
-  <input type="radio" name="testradio" id="start"></input>
-  <input type="text"  name="testradio"></input>
-  <input type="text"  name="testradio"></input>
-  <input type="radio" name="testradio"></input>
-  <input type="text"  name="testradio"></input>
-  <input type="radio" name="testradio"></input>
-  <input type="text"  name="testradio"></input>
-  <input type="radio" name="testradio"></input>
-  <input type="radio" name="testradio"></input>
-  <input type="text"  name="testradio"></input>
+  <fieldset id="testradio">
+    <input type="radio" name="testradio" id="start"></input>
+    <input type="text"  name="testradio"></input>
+    <input type="text"  name="testradio"></input>
+    <input type="radio" name="testradio"></input>
+    <input type="text"  name="testradio"></input>
+    <input type="radio" name="testradio"></input>
+    <input type="text"  name="testradio"></input>
+    <input type="radio" name="testradio"></input>
+    <input type="radio" name="testradio"></input>
+    <input type="text"  name="testradio"></input>
+  </fieldset>
+
+  <fieldset>
+    <input type="radio" name="testtwo" id="start2"></input>
+    <input type="radio" name="testtwo"></input>
+    <input type="radio" name="error" id="testtwo"></input>
+    <input type="radio" name="testtwo" id="end"></input>
+  </fieldset>
+
+  <fieldset>
+    <input type="radio" name="testthree" id="start3"></input>
+    <input type="radio" name="errorthree" id="testthree"></input>
+  </fieldset>
 </form>
 <script class="testbody" type="text/javascript">
 /** Test for Bug 343444 **/
@@ -31,11 +45,24 @@ document.getElementById("start").focus();
 var count=0;
 while (count < 2) {
   sendKey("DOWN");
-  ok(document.activeElement.type == "radio", "radioGroup should ignore non-radio input fields");
+  is(document.activeElement.type, "radio", "radioGroup should ignore non-radio input fields");
   if (document.activeElement.id == "start") {
     count++;
   }
 }
+
+document.getElementById("start2").focus();
+count = 0;
+while (count < 3) {
+  is(document.activeElement.name, "testtwo",
+     "radioGroup should only contain elements with the same @name")
+  sendKey("DOWN");
+  count++;
+}
+
+document.getElementById("start3").focus();
+sendKey("DOWN");
+is(document.activeElement.name, "testthree", "we don't have an infinite-loop");
 </script>
 </pre>
 </body>
diff --git a/content/html/document/src/HTMLAllCollection.cpp b/content/html/document/src/HTMLAllCollection.cpp
index dab2589c261..83f32dbf374 100644
--- a/content/html/document/src/HTMLAllCollection.cpp
+++ b/content/html/document/src/HTMLAllCollection.cpp
@@ -18,7 +18,6 @@ HTMLAllCollection::HTMLAllCollection(nsHTMLDocument* aDocument)
   : mDocument(aDocument)
 {
   MOZ_ASSERT(mDocument);
-  SetIsDOMBinding();
 }
 
 HTMLAllCollection::~HTMLAllCollection()
diff --git a/content/media/DOMMediaStream.cpp b/content/media/DOMMediaStream.cpp
index 206859df940..24c40f3b0c9 100644
--- a/content/media/DOMMediaStream.cpp
+++ b/content/media/DOMMediaStream.cpp
@@ -127,7 +127,6 @@ DOMMediaStream::DOMMediaStream()
     mStream(nullptr), mHintContents(0), mTrackTypesAvailable(0),
     mNotifiedOfMediaStreamGraphShutdown(false)
 {
-  SetIsDOMBinding();
 }
 
 DOMMediaStream::~DOMMediaStream()
diff --git a/content/media/MediaStreamTrack.cpp b/content/media/MediaStreamTrack.cpp
index 30ede6419b6..0461b044168 100644
--- a/content/media/MediaStreamTrack.cpp
+++ b/content/media/MediaStreamTrack.cpp
@@ -15,8 +15,6 @@ namespace dom {
 MediaStreamTrack::MediaStreamTrack(DOMMediaStream* aStream, TrackID aTrackID)
   : mStream(aStream), mTrackID(aTrackID), mEnded(false), mEnabled(true)
 {
-  SetIsDOMBinding();
-
   memset(&mID, 0, sizeof(mID));
 
   nsresult rv;
diff --git a/content/media/MediaTrack.cpp b/content/media/MediaTrack.cpp
index 85228d0c83f..f178acf6dd6 100644
--- a/content/media/MediaTrack.cpp
+++ b/content/media/MediaTrack.cpp
@@ -43,7 +43,6 @@ void
 MediaTrack::Init(nsPIDOMWindow* aOwnerWindow)
 {
   BindToOwner(aOwnerWindow);
-  SetIsDOMBinding();
 }
 
 } // namespace dom
diff --git a/content/media/TextTrackCueList.cpp b/content/media/TextTrackCueList.cpp
index c2309b7bf73..94f41ac15a0 100644
--- a/content/media/TextTrackCueList.cpp
+++ b/content/media/TextTrackCueList.cpp
@@ -35,7 +35,6 @@ NS_INTERFACE_MAP_END
 
 TextTrackCueList::TextTrackCueList(nsISupports* aParent) : mParent(aParent)
 {
-  SetIsDOMBinding();
 }
 
 TextTrackCueList::~TextTrackCueList()
diff --git a/content/media/TextTrackRegion.cpp b/content/media/TextTrackRegion.cpp
index 6b3b4487600..f8b57d50799 100644
--- a/content/media/TextTrackRegion.cpp
+++ b/content/media/TextTrackRegion.cpp
@@ -46,7 +46,6 @@ TextTrackRegion::TextTrackRegion(nsISupports* aGlobal)
   , mViewportAnchorX(0)
   , mViewportAnchorY(100)
 {
-  SetIsDOMBinding();
 }
 
 void
diff --git a/content/media/VideoPlaybackQuality.cpp b/content/media/VideoPlaybackQuality.cpp
index 1601ec18832..f455815c30f 100644
--- a/content/media/VideoPlaybackQuality.cpp
+++ b/content/media/VideoPlaybackQuality.cpp
@@ -25,7 +25,6 @@ VideoPlaybackQuality::VideoPlaybackQuality(HTMLMediaElement* aElement,
   , mDroppedFrames(aDroppedFrames)
   , mCorruptedFrames(aCorruptedFrames)
 {
-  SetIsDOMBinding();
 }
 
 HTMLMediaElement*
diff --git a/content/media/eme/MediaKeyError.cpp b/content/media/eme/MediaKeyError.cpp
index b9b80571095..20b63f580a1 100644
--- a/content/media/eme/MediaKeyError.cpp
+++ b/content/media/eme/MediaKeyError.cpp
@@ -15,7 +15,6 @@ MediaKeyError::MediaKeyError(EventTarget* aOwner, uint32_t aSystemCode)
   : Event(aOwner, nullptr, nullptr)
   , mSystemCode(aSystemCode)
 {
-  SetIsDOMBinding();
   InitEvent(NS_LITERAL_STRING("error"), false, false);
 }
 
diff --git a/content/media/eme/MediaKeys.cpp b/content/media/eme/MediaKeys.cpp
index e9713f02f74..fe37b1b431b 100644
--- a/content/media/eme/MediaKeys.cpp
+++ b/content/media/eme/MediaKeys.cpp
@@ -41,7 +41,6 @@ MediaKeys::MediaKeys(nsPIDOMWindow* aParent, const nsAString& aKeySystem)
   , mKeySystem(aKeySystem)
   , mCreatePromiseId(0)
 {
-  SetIsDOMBinding();
 }
 
 static PLDHashOperator
diff --git a/content/media/webaudio/AudioBuffer.cpp b/content/media/webaudio/AudioBuffer.cpp
index 7afbb6fedcb..04d6136224f 100644
--- a/content/media/webaudio/AudioBuffer.cpp
+++ b/content/media/webaudio/AudioBuffer.cpp
@@ -48,7 +48,6 @@ AudioBuffer::AudioBuffer(AudioContext* aContext, uint32_t aNumberOfChannels,
     mSampleRate(aSampleRate)
 {
   mJSChannels.SetCapacity(aNumberOfChannels);
-  SetIsDOMBinding();
   mozilla::HoldJSObjects(this);
 }
 
diff --git a/content/media/webaudio/AudioListener.cpp b/content/media/webaudio/AudioListener.cpp
index e376c9d6da2..ff9e1b4c674 100644
--- a/content/media/webaudio/AudioListener.cpp
+++ b/content/media/webaudio/AudioListener.cpp
@@ -26,7 +26,6 @@ AudioListener::AudioListener(AudioContext* aContext)
   , mSpeedOfSound(343.3) // meters/second
 {
   MOZ_ASSERT(aContext);
-  SetIsDOMBinding();
 }
 
 JSObject*
diff --git a/content/media/webaudio/AudioNode.cpp b/content/media/webaudio/AudioNode.cpp
index fa799d2551b..e103f3089c2 100644
--- a/content/media/webaudio/AudioNode.cpp
+++ b/content/media/webaudio/AudioNode.cpp
@@ -72,7 +72,6 @@ AudioNode::AudioNode(AudioContext* aContext,
 {
   MOZ_ASSERT(aContext);
   DOMEventTargetHelper::BindToOwner(aContext->GetParentObject());
-  SetIsDOMBinding();
   aContext->UpdateNodeCount(1);
 }
 
diff --git a/content/media/webaudio/AudioParam.cpp b/content/media/webaudio/AudioParam.cpp
index 7f6f960bbc9..8e389b47af0 100644
--- a/content/media/webaudio/AudioParam.cpp
+++ b/content/media/webaudio/AudioParam.cpp
@@ -51,7 +51,6 @@ AudioParam::AudioParam(AudioNode* aNode,
   , mCallback(aCallback)
   , mDefaultValue(aDefaultValue)
 {
-  SetIsDOMBinding();
 }
 
 AudioParam::~AudioParam()
diff --git a/content/media/webaudio/AudioProcessingEvent.cpp b/content/media/webaudio/AudioProcessingEvent.cpp
index aa5bb55c46c..5e7c9121d17 100644
--- a/content/media/webaudio/AudioProcessingEvent.cpp
+++ b/content/media/webaudio/AudioProcessingEvent.cpp
@@ -28,7 +28,6 @@ AudioProcessingEvent::AudioProcessingEvent(ScriptProcessorNode* aOwner,
   , mPlaybackTime(0.0)
   , mNode(aOwner)
 {
-  SetIsDOMBinding();
 }
 
 AudioProcessingEvent::~AudioProcessingEvent()
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.cpp b/content/media/webaudio/OfflineAudioCompletionEvent.cpp
index 6b4bf03ff71..15a094d7d24 100644
--- a/content/media/webaudio/OfflineAudioCompletionEvent.cpp
+++ b/content/media/webaudio/OfflineAudioCompletionEvent.cpp
@@ -25,7 +25,6 @@ OfflineAudioCompletionEvent::OfflineAudioCompletionEvent(AudioContext* aOwner,
                                                          WidgetEvent* aEvent)
   : Event(aOwner, aPresContext, aEvent)
 {
-  SetIsDOMBinding();
 }
 
 OfflineAudioCompletionEvent::~OfflineAudioCompletionEvent()
diff --git a/content/media/webaudio/PeriodicWave.cpp b/content/media/webaudio/PeriodicWave.cpp
index cace17c219c..1d0e9a74a12 100644
--- a/content/media/webaudio/PeriodicWave.cpp
+++ b/content/media/webaudio/PeriodicWave.cpp
@@ -24,7 +24,6 @@ PeriodicWave::PeriodicWave(AudioContext* aContext,
   : mContext(aContext)
 {
   MOZ_ASSERT(aContext);
-  SetIsDOMBinding();
 
   // Caller should have checked this and thrown.
   MOZ_ASSERT(aLength > 0);
diff --git a/content/media/webspeech/recognition/SpeechGrammar.cpp b/content/media/webspeech/recognition/SpeechGrammar.cpp
index efbdd6af524..e8b096d8cc4 100644
--- a/content/media/webspeech/recognition/SpeechGrammar.cpp
+++ b/content/media/webspeech/recognition/SpeechGrammar.cpp
@@ -23,7 +23,6 @@ NS_INTERFACE_MAP_END
 SpeechGrammar::SpeechGrammar(nsISupports* aParent)
   : mParent(aParent)
 {
-  SetIsDOMBinding();
 }
 
 SpeechGrammar::~SpeechGrammar()
diff --git a/content/media/webspeech/recognition/SpeechGrammarList.cpp b/content/media/webspeech/recognition/SpeechGrammarList.cpp
index 44a76b869fb..70094214444 100644
--- a/content/media/webspeech/recognition/SpeechGrammarList.cpp
+++ b/content/media/webspeech/recognition/SpeechGrammarList.cpp
@@ -27,7 +27,6 @@ SpeechGrammarList::SpeechGrammarList(nsISupports* aParent, nsISpeechRecognitionS
   : mParent(aParent)
 {
   this->mRecognitionService = aRecognitionService;
-  SetIsDOMBinding();
 }
 
 SpeechGrammarList::~SpeechGrammarList()
diff --git a/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp b/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
index 55c64a53398..524aa24db36 100644
--- a/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
+++ b/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
@@ -26,7 +26,6 @@ SpeechRecognitionAlternative::SpeechRecognitionAlternative(SpeechRecognition* aP
   , mConfidence(0)
   , mParent(aParent)
 {
-  SetIsDOMBinding();
 }
 
 SpeechRecognitionAlternative::~SpeechRecognitionAlternative()
diff --git a/content/media/webspeech/recognition/SpeechRecognitionResult.cpp b/content/media/webspeech/recognition/SpeechRecognitionResult.cpp
index 7bcc2328a4f..159f0b7f072 100644
--- a/content/media/webspeech/recognition/SpeechRecognitionResult.cpp
+++ b/content/media/webspeech/recognition/SpeechRecognitionResult.cpp
@@ -23,7 +23,6 @@ NS_INTERFACE_MAP_END
 SpeechRecognitionResult::SpeechRecognitionResult(SpeechRecognition* aParent)
   : mParent(aParent)
 {
-  SetIsDOMBinding();
 }
 
 SpeechRecognitionResult::~SpeechRecognitionResult()
diff --git a/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp b/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp
index 4a72ddff765..f31a06fa54b 100644
--- a/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp
+++ b/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp
@@ -24,7 +24,6 @@ NS_INTERFACE_MAP_END
 SpeechRecognitionResultList::SpeechRecognitionResultList(SpeechRecognition* aParent)
   : mParent(aParent)
 {
-  SetIsDOMBinding();
 }
 
 SpeechRecognitionResultList::~SpeechRecognitionResultList()
diff --git a/content/media/webspeech/synth/SpeechSynthesis.cpp b/content/media/webspeech/synth/SpeechSynthesis.cpp
index 297ad5c3080..3c5ffa25b73 100644
--- a/content/media/webspeech/synth/SpeechSynthesis.cpp
+++ b/content/media/webspeech/synth/SpeechSynthesis.cpp
@@ -77,7 +77,6 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechSynthesis)
 SpeechSynthesis::SpeechSynthesis(nsPIDOMWindow* aParent)
   : mParent(aParent)
 {
-  SetIsDOMBinding();
 }
 
 SpeechSynthesis::~SpeechSynthesis()
diff --git a/content/media/webspeech/synth/SpeechSynthesisUtterance.cpp b/content/media/webspeech/synth/SpeechSynthesisUtterance.cpp
index 28db4d27efa..5c5b364fef7 100644
--- a/content/media/webspeech/synth/SpeechSynthesisUtterance.cpp
+++ b/content/media/webspeech/synth/SpeechSynthesisUtterance.cpp
@@ -35,7 +35,6 @@ SpeechSynthesisUtterance::SpeechSynthesisUtterance(nsPIDOMWindow* aOwnerWindow,
   , mState(STATE_NONE)
   , mPaused(false)
 {
-  SetIsDOMBinding();
 }
 
 SpeechSynthesisUtterance::~SpeechSynthesisUtterance() {}
diff --git a/content/media/webspeech/synth/SpeechSynthesisVoice.cpp b/content/media/webspeech/synth/SpeechSynthesisVoice.cpp
index 6b2437eda9c..83b81e007e0 100644
--- a/content/media/webspeech/synth/SpeechSynthesisVoice.cpp
+++ b/content/media/webspeech/synth/SpeechSynthesisVoice.cpp
@@ -24,7 +24,6 @@ SpeechSynthesisVoice::SpeechSynthesisVoice(nsISupports* aParent,
   : mParent(aParent)
   , mUri(aUri)
 {
-  SetIsDOMBinding();
 }
 
 SpeechSynthesisVoice::~SpeechSynthesisVoice()
diff --git a/content/svg/content/src/DOMSVGAnimatedLengthList.h b/content/svg/content/src/DOMSVGAnimatedLengthList.h
index 9833618bb83..7e0b6b4846e 100644
--- a/content/svg/content/src/DOMSVGAnimatedLengthList.h
+++ b/content/svg/content/src/DOMSVGAnimatedLengthList.h
@@ -177,7 +177,6 @@ private:
     , mAttrEnum(aAttrEnum)
     , mAxis(aAxis)
   {
-    SetIsDOMBinding();
   }
 
   ~DOMSVGAnimatedLengthList();
diff --git a/content/svg/content/src/DOMSVGAnimatedNumberList.h b/content/svg/content/src/DOMSVGAnimatedNumberList.h
index 67652ecc0e6..373e3483c85 100644
--- a/content/svg/content/src/DOMSVGAnimatedNumberList.h
+++ b/content/svg/content/src/DOMSVGAnimatedNumberList.h
@@ -107,7 +107,6 @@ private:
     , mElement(aElement)
     , mAttrEnum(aAttrEnum)
   {
-    SetIsDOMBinding();
   }
 
   ~DOMSVGAnimatedNumberList();
diff --git a/content/svg/content/src/DOMSVGLength.cpp b/content/svg/content/src/DOMSVGLength.cpp
index af92b017bc4..f50d1f9ee90 100644
--- a/content/svg/content/src/DOMSVGLength.cpp
+++ b/content/svg/content/src/DOMSVGLength.cpp
@@ -112,8 +112,6 @@ DOMSVGLength::DOMSVGLength(DOMSVGLengthList *aList,
                     aListIndex <= MaxListIndex(), "bad arg");
 
   NS_ABORT_IF_FALSE(IndexIsValid(), "Bad index for DOMSVGNumber!");
-
-  SetIsDOMBinding();
 }
 
 DOMSVGLength::DOMSVGLength()
@@ -125,7 +123,6 @@ DOMSVGLength::DOMSVGLength()
   , mValue(0.0f)
   , mVal(nullptr)
 {
-  SetIsDOMBinding();
 }
 
 DOMSVGLength::DOMSVGLength(nsSVGLength2* aVal, nsSVGElement* aSVGElement,
@@ -139,7 +136,6 @@ DOMSVGLength::DOMSVGLength(nsSVGLength2* aVal, nsSVGElement* aSVGElement,
   , mVal(aVal)
   , mSVGElement(aSVGElement)
 {
-  SetIsDOMBinding();
 }
 
 DOMSVGLength::~DOMSVGLength()
diff --git a/content/svg/content/src/DOMSVGLengthList.h b/content/svg/content/src/DOMSVGLengthList.h
index f1e692cd9a6..1f9eba6e13e 100644
--- a/content/svg/content/src/DOMSVGLengthList.h
+++ b/content/svg/content/src/DOMSVGLengthList.h
@@ -61,8 +61,6 @@ public:
                    const SVGLengthList &aInternalList)
     : mAList(aAList)
   {
-    SetIsDOMBinding();
-
     // aInternalList must be passed in explicitly because we can't use
     // InternalList() here. (Because it depends on IsAnimValList, which depends
     // on this object having been assigned to aAList's mBaseVal or mAnimVal,
diff --git a/content/svg/content/src/DOMSVGNumber.cpp b/content/svg/content/src/DOMSVGNumber.cpp
index 28245e384e1..9ebd941e8de 100644
--- a/content/svg/content/src/DOMSVGNumber.cpp
+++ b/content/svg/content/src/DOMSVGNumber.cpp
@@ -98,8 +98,6 @@ DOMSVGNumber::DOMSVGNumber(DOMSVGNumberList *aList,
                     aListIndex <= MaxListIndex(), "bad arg");
 
   NS_ABORT_IF_FALSE(IndexIsValid(), "Bad index for DOMSVGNumber!");
-
-  SetIsDOMBinding();
 }
 
 DOMSVGNumber::DOMSVGNumber(nsISupports* aParent)
@@ -110,7 +108,6 @@ DOMSVGNumber::DOMSVGNumber(nsISupports* aParent)
   , mIsAnimValItem(false)
   , mValue(0.0f)
 {
-  SetIsDOMBinding();
 }
 
 /* static */ already_AddRefed<DOMSVGNumber>
diff --git a/content/svg/content/src/DOMSVGNumberList.h b/content/svg/content/src/DOMSVGNumberList.h
index 91c1c5f467f..974b75b2a1f 100644
--- a/content/svg/content/src/DOMSVGNumberList.h
+++ b/content/svg/content/src/DOMSVGNumberList.h
@@ -61,8 +61,6 @@ public:
                    const SVGNumberList &aInternalList)
     : mAList(aAList)
   {
-    SetIsDOMBinding();
-
     // aInternalList must be passed in explicitly because we can't use
     // InternalList() here. (Because it depends on IsAnimValList, which depends
     // on this object having been assigned to aAList's mBaseVal or mAnimVal,
diff --git a/content/svg/content/src/DOMSVGPathSeg.cpp b/content/svg/content/src/DOMSVGPathSeg.cpp
index c0f785fff65..258f8a50baa 100644
--- a/content/svg/content/src/DOMSVGPathSeg.cpp
+++ b/content/svg/content/src/DOMSVGPathSeg.cpp
@@ -79,7 +79,6 @@ DOMSVGPathSeg::DOMSVGPathSeg(DOMSVGPathSegList *aList,
   , mListIndex(aListIndex)
   , mIsAnimValItem(aIsAnimValItem)
 {
-  SetIsDOMBinding();
   // These shifts are in sync with the members in the header.
   NS_ABORT_IF_FALSE(aList &&
                     aListIndex <= MaxListIndex(), "bad arg");
@@ -92,7 +91,6 @@ DOMSVGPathSeg::DOMSVGPathSeg()
   , mListIndex(0)
   , mIsAnimValItem(false)
 {
-  SetIsDOMBinding();
 }
 
 void
diff --git a/content/svg/content/src/DOMSVGPathSegList.h b/content/svg/content/src/DOMSVGPathSegList.h
index 1db4fe75f25..d6c3031368d 100644
--- a/content/svg/content/src/DOMSVGPathSegList.h
+++ b/content/svg/content/src/DOMSVGPathSegList.h
@@ -170,8 +170,6 @@ private:
     : mElement(aElement)
     , mIsAnimValList(aIsAnimValList)
   {
-    SetIsDOMBinding();
-
     InternalListWillChangeTo(InternalList()); // Sync mItems
   }
 
diff --git a/content/svg/content/src/DOMSVGPointList.h b/content/svg/content/src/DOMSVGPointList.h
index e9aa29422bb..42793674e72 100644
--- a/content/svg/content/src/DOMSVGPointList.h
+++ b/content/svg/content/src/DOMSVGPointList.h
@@ -172,8 +172,6 @@ private:
     : mElement(aElement)
     , mIsAnimValList(aIsAnimValList)
   {
-    SetIsDOMBinding();
-
     InternalListWillChangeTo(InternalList()); // Sync mItems
   }
 
diff --git a/content/svg/content/src/DOMSVGStringList.h b/content/svg/content/src/DOMSVGStringList.h
index d192670a65a..5eebea5e5a7 100644
--- a/content/svg/content/src/DOMSVGStringList.h
+++ b/content/svg/content/src/DOMSVGStringList.h
@@ -100,7 +100,6 @@ private:
     , mAttrEnum(aAttrEnum)
     , mIsConditionalProcessingAttribute(aIsConditionalProcessingAttribute)
   {
-    SetIsDOMBinding();
   }
 
   ~DOMSVGStringList();
diff --git a/content/svg/content/src/DOMSVGTransformList.h b/content/svg/content/src/DOMSVGTransformList.h
index 30a6d28a17d..0cc31d5a13e 100644
--- a/content/svg/content/src/DOMSVGTransformList.h
+++ b/content/svg/content/src/DOMSVGTransformList.h
@@ -56,8 +56,6 @@ public:
                       const SVGTransformList &aInternalList)
     : mAList(aAList)
   {
-    SetIsDOMBinding();
-
     // aInternalList must be passed in explicitly because we can't use
     // InternalList() here. (Because it depends on IsAnimValList, which depends
     // on this object having been assigned to aAList's mBaseVal or mAnimVal,
diff --git a/content/svg/content/src/SVGAngle.h b/content/svg/content/src/SVGAngle.h
index 1c3f0e69b49..fbb6042e593 100644
--- a/content/svg/content/src/SVGAngle.h
+++ b/content/svg/content/src/SVGAngle.h
@@ -30,7 +30,6 @@ public:
   SVGAngle(nsSVGAngle* aVal, nsSVGElement *aSVGElement, AngleType aType)
     : mVal(aVal), mSVGElement(aSVGElement), mType(aType)
   {
-    SetIsDOMBinding();
   }
 
   // WebIDL
diff --git a/content/svg/content/src/SVGAnimatedAngle.h b/content/svg/content/src/SVGAnimatedAngle.h
index f387300d3bc..79b34917dd0 100644
--- a/content/svg/content/src/SVGAnimatedAngle.h
+++ b/content/svg/content/src/SVGAnimatedAngle.h
@@ -26,7 +26,6 @@ public:
   SVGAnimatedAngle(nsSVGAngle* aVal, nsSVGElement *aSVGElement)
     : mVal(aVal), mSVGElement(aSVGElement)
   {
-    SetIsDOMBinding();
   }
 
   // WebIDL
diff --git a/content/svg/content/src/SVGAnimatedBoolean.h b/content/svg/content/src/SVGAnimatedBoolean.h
index c44764f0f49..7e2e62d2b0b 100644
--- a/content/svg/content/src/SVGAnimatedBoolean.h
+++ b/content/svg/content/src/SVGAnimatedBoolean.h
@@ -22,7 +22,6 @@ class SVGAnimatedBoolean MOZ_FINAL : public nsWrapperCache
   SVGAnimatedBoolean(nsSVGBoolean* aVal, nsSVGElement *aSVGElement)
     : mVal(aVal), mSVGElement(aSVGElement)
   {
-    SetIsDOMBinding();
   }
 
   // WebIDL
diff --git a/content/svg/content/src/SVGAnimatedEnumeration.h b/content/svg/content/src/SVGAnimatedEnumeration.h
index be2a80b76de..738c7bcd119 100644
--- a/content/svg/content/src/SVGAnimatedEnumeration.h
+++ b/content/svg/content/src/SVGAnimatedEnumeration.h
@@ -37,7 +37,6 @@ protected:
   explicit SVGAnimatedEnumeration(nsSVGElement* aSVGElement)
     : mSVGElement(aSVGElement)
   {
-    SetIsDOMBinding();
   }
   virtual ~SVGAnimatedEnumeration() {};
 
diff --git a/content/svg/content/src/SVGAnimatedInteger.h b/content/svg/content/src/SVGAnimatedInteger.h
index 5e484875f38..76e927aac24 100644
--- a/content/svg/content/src/SVGAnimatedInteger.h
+++ b/content/svg/content/src/SVGAnimatedInteger.h
@@ -37,7 +37,6 @@ protected:
   explicit SVGAnimatedInteger(nsSVGElement* aSVGElement)
     : mSVGElement(aSVGElement)
   {
-    SetIsDOMBinding();
   }
   virtual ~SVGAnimatedInteger() {};
 
diff --git a/content/svg/content/src/SVGAnimatedLength.h b/content/svg/content/src/SVGAnimatedLength.h
index 43e19fbdb1f..70c30ebadca 100644
--- a/content/svg/content/src/SVGAnimatedLength.h
+++ b/content/svg/content/src/SVGAnimatedLength.h
@@ -25,7 +25,8 @@ public:
 
   SVGAnimatedLength(nsSVGLength2* aVal, nsSVGElement *aSVGElement)
     : mVal(aVal), mSVGElement(aSVGElement)
-  { SetIsDOMBinding(); }
+  {
+  }
 
   // WebIDL
   nsSVGElement* GetParentObject() { return mSVGElement; }
diff --git a/content/svg/content/src/SVGAnimatedNumber.h b/content/svg/content/src/SVGAnimatedNumber.h
index 02e7b38b576..336671df6c0 100644
--- a/content/svg/content/src/SVGAnimatedNumber.h
+++ b/content/svg/content/src/SVGAnimatedNumber.h
@@ -38,7 +38,6 @@ protected:
   explicit SVGAnimatedNumber(nsSVGElement* aSVGElement)
     : mSVGElement(aSVGElement)
   {
-    SetIsDOMBinding();
   }
   virtual ~SVGAnimatedNumber() {};
 
diff --git a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
index 66550696cf9..3096ff915d1 100644
--- a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
+++ b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
@@ -124,7 +124,6 @@ class DOMSVGAnimatedPreserveAspectRatio MOZ_FINAL : public nsISupports,
                                     nsSVGElement *aSVGElement)
     : mVal(aVal), mSVGElement(aSVGElement)
   {
-    SetIsDOMBinding();
   }
 
   // WebIDL
diff --git a/content/svg/content/src/SVGAnimatedRect.cpp b/content/svg/content/src/SVGAnimatedRect.cpp
index 2cc8c02c1f6..47555df4bf5 100644
--- a/content/svg/content/src/SVGAnimatedRect.cpp
+++ b/content/svg/content/src/SVGAnimatedRect.cpp
@@ -21,7 +21,6 @@ SVGAnimatedRect::SVGAnimatedRect(nsSVGViewBox* aVal, nsSVGElement* aSVGElement)
   : mVal(aVal)
   , mSVGElement(aSVGElement)
 {
-  SetIsDOMBinding();
 }
 
 SVGAnimatedRect::~SVGAnimatedRect()
diff --git a/content/svg/content/src/SVGAnimatedString.h b/content/svg/content/src/SVGAnimatedString.h
index 05ab034bf1e..4e889eb7236 100644
--- a/content/svg/content/src/SVGAnimatedString.h
+++ b/content/svg/content/src/SVGAnimatedString.h
@@ -18,7 +18,6 @@ public:
   explicit SVGAnimatedString(nsSVGElement* aSVGElement)
     : mSVGElement(aSVGElement)
   {
-    SetIsDOMBinding();
   }
 
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
diff --git a/content/svg/content/src/SVGAnimatedTransformList.h b/content/svg/content/src/SVGAnimatedTransformList.h
index 6104d0aee22..5ce89bbbb76 100644
--- a/content/svg/content/src/SVGAnimatedTransformList.h
+++ b/content/svg/content/src/SVGAnimatedTransformList.h
@@ -106,7 +106,6 @@ private:
     , mAnimVal(nullptr)
     , mElement(aElement)
   {
-    SetIsDOMBinding();
   }
 
   ~SVGAnimatedTransformList();
diff --git a/content/svg/content/src/SVGIRect.h b/content/svg/content/src/SVGIRect.h
index ffdeaa31cab..69a5835e777 100644
--- a/content/svg/content/src/SVGIRect.h
+++ b/content/svg/content/src/SVGIRect.h
@@ -22,11 +22,6 @@ class SVGIRect : public nsISupports,
                  public nsWrapperCache
 {
 public:
-  SVGIRect()
-  {
-    SetIsDOMBinding();
-  }
-
   virtual ~SVGIRect()
   {
   }
diff --git a/content/svg/content/src/SVGMatrix.h b/content/svg/content/src/SVGMatrix.h
index d4b662ed14f..74eb5b6ecdd 100644
--- a/content/svg/content/src/SVGMatrix.h
+++ b/content/svg/content/src/SVGMatrix.h
@@ -59,21 +59,15 @@ public:
   /**
    * Ctor for SVGMatrix objects that belong to a SVGTransform.
    */
-  explicit SVGMatrix(SVGTransform& aTransform) : mTransform(&aTransform) {
-    SetIsDOMBinding();
-  }
+  explicit SVGMatrix(SVGTransform& aTransform) : mTransform(&aTransform) {}
 
   /**
    * Ctors for SVGMatrix objects created independently of a SVGTransform.
    */
   // Default ctor for gfxMatrix will produce identity mx
-  SVGMatrix() {
-    SetIsDOMBinding();
-  }
+  SVGMatrix() {}
 
-  explicit SVGMatrix(const gfxMatrix &aMatrix) : mMatrix(aMatrix) {
-    SetIsDOMBinding();
-  }
+  explicit SVGMatrix(const gfxMatrix &aMatrix) : mMatrix(aMatrix) {}
 
   const gfxMatrix& GetMatrix() const {
     return mTransform ? mTransform->Matrixgfx() : mMatrix;
diff --git a/content/svg/content/src/SVGPreserveAspectRatio.h b/content/svg/content/src/SVGPreserveAspectRatio.h
index 879ccc357d7..e1e6a5cbb3e 100644
--- a/content/svg/content/src/SVGPreserveAspectRatio.h
+++ b/content/svg/content/src/SVGPreserveAspectRatio.h
@@ -125,7 +125,6 @@ public:
                             bool aIsBaseValue)
     : mVal(aVal), mSVGElement(aSVGElement), mIsBaseValue(aIsBaseValue)
   {
-    SetIsDOMBinding();
   }
 
   // WebIDL
diff --git a/content/svg/content/src/SVGTransform.cpp b/content/svg/content/src/SVGTransform.cpp
index da84ed97085..1a99d20058b 100644
--- a/content/svg/content/src/SVGTransform.cpp
+++ b/content/svg/content/src/SVGTransform.cpp
@@ -112,7 +112,6 @@ SVGTransform::SVGTransform(DOMSVGTransformList *aList,
   , mIsAnimValItem(aIsAnimValItem)
   , mTransform(nullptr)
 {
-  SetIsDOMBinding();
   // These shifts are in sync with the members in the header.
   NS_ABORT_IF_FALSE(aList &&
                     aListIndex <= MaxListIndex(), "bad arg");
@@ -128,7 +127,6 @@ SVGTransform::SVGTransform()
                                      // initialises to matrix type with identity
                                      // matrix
 {
-  SetIsDOMBinding();
 }
 
 SVGTransform::SVGTransform(const gfxMatrix &aMatrix)
@@ -137,7 +135,6 @@ SVGTransform::SVGTransform(const gfxMatrix &aMatrix)
   , mIsAnimValItem(false)
   , mTransform(new nsSVGTransform(aMatrix))
 {
-  SetIsDOMBinding();
 }
 
 SVGTransform::SVGTransform(const nsSVGTransform &aTransform)
@@ -146,7 +143,6 @@ SVGTransform::SVGTransform(const nsSVGTransform &aTransform)
   , mIsAnimValItem(false)
   , mTransform(new nsSVGTransform(aTransform))
 {
-  SetIsDOMBinding();
 }
 
 SVGTransform::~SVGTransform()
diff --git a/content/svg/content/src/nsISVGPoint.h b/content/svg/content/src/nsISVGPoint.h
index 997d2492bdb..c33f1e157e1 100644
--- a/content/svg/content/src/nsISVGPoint.h
+++ b/content/svg/content/src/nsISVGPoint.h
@@ -50,7 +50,6 @@ public:
     , mIsAnimValItem(false)
     , mIsTranslatePoint(false)
   {
-    SetIsDOMBinding();
   }
 
   explicit nsISVGPoint(SVGPoint* aPt, bool aIsTranslatePoint)
@@ -60,7 +59,6 @@ public:
     , mIsAnimValItem(false)
     , mIsTranslatePoint(aIsTranslatePoint)
   {
-    SetIsDOMBinding();
     mPt.mX = aPt->GetX();
     mPt.mY = aPt->GetY();
   }
diff --git a/dom/activities/Activity.cpp b/dom/activities/Activity.cpp
index 41360a15f73..12f246f10c5 100644
--- a/dom/activities/Activity.cpp
+++ b/dom/activities/Activity.cpp
@@ -85,6 +85,5 @@ Activity::~Activity()
 Activity::Activity(nsPIDOMWindow* aWindow)
   : DOMRequest(aWindow)
 {
-  MOZ_ASSERT(IsDOMBinding());
 }
 
diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h
index fcc756656c7..73ac5df825d 100644
--- a/dom/animation/Animation.h
+++ b/dom/animation/Animation.h
@@ -143,7 +143,6 @@ public:
     , mPseudoType(aPseudoType)
   {
     MOZ_ASSERT(aTarget, "null animation target is not yet supported");
-    SetIsDOMBinding();
   }
 
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(Animation)
diff --git a/dom/animation/AnimationEffect.h b/dom/animation/AnimationEffect.h
index d4228012da2..55abb7b6cf4 100644
--- a/dom/animation/AnimationEffect.h
+++ b/dom/animation/AnimationEffect.h
@@ -21,7 +21,6 @@ public:
   explicit AnimationEffect(Animation* aAnimation)
     : mAnimation(aAnimation)
   {
-    SetIsDOMBinding();
   }
 
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(AnimationEffect)
diff --git a/dom/animation/AnimationPlayer.h b/dom/animation/AnimationPlayer.h
index 159df06b5bc..c47a38d8ba1 100644
--- a/dom/animation/AnimationPlayer.h
+++ b/dom/animation/AnimationPlayer.h
@@ -36,7 +36,6 @@ public:
     , mIsRunningOnCompositor(false)
     , mTimeline(aTimeline)
   {
-    SetIsDOMBinding();
   }
 
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(AnimationPlayer)
diff --git a/dom/animation/AnimationTimeline.h b/dom/animation/AnimationTimeline.h
index dd26ccf4132..d37f4002989 100644
--- a/dom/animation/AnimationTimeline.h
+++ b/dom/animation/AnimationTimeline.h
@@ -24,7 +24,6 @@ public:
   explicit AnimationTimeline(nsIDocument* aDocument)
     : mDocument(aDocument)
   {
-    SetIsDOMBinding();
   }
 
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(AnimationTimeline)
diff --git a/dom/archivereader/ArchiveReader.cpp b/dom/archivereader/ArchiveReader.cpp
index a0d1fec8a48..2ff6e56e503 100644
--- a/dom/archivereader/ArchiveReader.cpp
+++ b/dom/archivereader/ArchiveReader.cpp
@@ -56,8 +56,6 @@ ArchiveReader::ArchiveReader(nsIDOMBlob* aBlob, nsPIDOMWindow* aWindow,
 {
   MOZ_ASSERT(aBlob);
   MOZ_ASSERT(aWindow);
-
-  SetIsDOMBinding();
 }
 
 ArchiveReader::~ArchiveReader()
diff --git a/dom/base/BarProps.cpp b/dom/base/BarProps.cpp
index bcb893bdff6..3816946ff46 100644
--- a/dom/base/BarProps.cpp
+++ b/dom/base/BarProps.cpp
@@ -21,7 +21,6 @@ BarProp::BarProp(nsGlobalWindow* aWindow)
   : mDOMWindow(aWindow)
 {
   MOZ_ASSERT(aWindow->IsInnerWindow());
-  SetIsDOMBinding();
 }
 
 BarProp::~BarProp()
diff --git a/dom/base/CompositionStringSynthesizer.cpp b/dom/base/CompositionStringSynthesizer.cpp
index 728e45bfc5a..1c57ffab843 100644
--- a/dom/base/CompositionStringSynthesizer.cpp
+++ b/dom/base/CompositionStringSynthesizer.cpp
@@ -135,18 +135,18 @@ CompositionStringSynthesizer::DispatchEvent(bool* aDefaultPrevented)
     mClauses->AppendElement(mCaret);
   }
 
-  WidgetTextEvent textEvent(true, NS_TEXT_TEXT, widget);
-  textEvent.time = PR_IntervalNow();
-  textEvent.theText = mString;
+  WidgetCompositionEvent compChangeEvent(true, NS_COMPOSITION_CHANGE, widget);
+  compChangeEvent.time = PR_IntervalNow();
+  compChangeEvent.mData = mString;
   if (!mClauses->IsEmpty()) {
-    textEvent.mRanges = mClauses;
+    compChangeEvent.mRanges = mClauses;
   }
 
   // XXX How should we set false for this on b2g?
-  textEvent.mFlags.mIsSynthesizedForTests = true;
+  compChangeEvent.mFlags.mIsSynthesizedForTests = true;
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  nsresult rv = widget->DispatchEvent(&textEvent, status);
+  nsresult rv = widget->DispatchEvent(&compChangeEvent, status);
   *aDefaultPrevented = (status == nsEventStatus_eConsumeNoDefault);
 
   ClearInternal();
diff --git a/dom/base/Console.cpp b/dom/base/Console.cpp
index 3c201c45e8f..5179d7f3f8d 100644
--- a/dom/base/Console.cpp
+++ b/dom/base/Console.cpp
@@ -560,7 +560,6 @@ Console::Console(nsPIDOMWindow* aWindow)
     }
   }
 
-  SetIsDOMBinding();
   mozilla::HoldJSObjects(this);
 }
 
diff --git a/dom/base/Crypto.cpp b/dom/base/Crypto.cpp
index 52cfb880936..5b13cfad0b2 100644
--- a/dom/base/Crypto.cpp
+++ b/dom/base/Crypto.cpp
@@ -32,7 +32,6 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Crypto, mWindow, mSubtle)
 Crypto::Crypto()
 {
   MOZ_COUNT_CTOR(Crypto);
-  SetIsDOMBinding();
 }
 
 Crypto::~Crypto()
diff --git a/dom/base/DOMError.cpp b/dom/base/DOMError.cpp
index 370f6033d98..c956c82e788 100644
--- a/dom/base/DOMError.cpp
+++ b/dom/base/DOMError.cpp
@@ -24,7 +24,6 @@ NS_INTERFACE_MAP_END
 DOMError::DOMError(nsPIDOMWindow* aWindow)
   : mWindow(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 DOMError::DOMError(nsPIDOMWindow* aWindow, nsresult aValue)
@@ -35,15 +34,12 @@ DOMError::DOMError(nsPIDOMWindow* aWindow, nsresult aValue)
 
   CopyUTF8toUTF16(name, mName);
   CopyUTF8toUTF16(message, mMessage);
-
-  SetIsDOMBinding();
 }
 
 DOMError::DOMError(nsPIDOMWindow* aWindow, const nsAString& aName)
   : mWindow(aWindow)
   , mName(aName)
 {
-  SetIsDOMBinding();
 }
 
 DOMError::DOMError(nsPIDOMWindow* aWindow, const nsAString& aName,
@@ -52,7 +48,6 @@ DOMError::DOMError(nsPIDOMWindow* aWindow, const nsAString& aName,
   , mName(aName)
   , mMessage(aMessage)
 {
-  SetIsDOMBinding();
 }
 
 DOMError::~DOMError()
diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp
index 5693d9c05d8..c684d2cf668 100644
--- a/dom/base/DOMException.cpp
+++ b/dom/base/DOMException.cpp
@@ -200,8 +200,6 @@ Exception::Exception(const nsACString& aMessage,
   mInitialized(false),
   mHoldingJSVal(false)
 {
-  SetIsDOMBinding();
-
   // A little hack... The nsIGenericModule nsIClassInfo scheme relies on there
   // having been at least one instance made via the factory. Otherwise, the
   // shared factory/classinsance object never gets created and our QI getter
@@ -600,7 +598,6 @@ DOMException::DOMException(nsresult aRv, const nsACString& aMessage,
     mMessage(aMessage),
     mCode(aCode)
 {
-  SetIsDOMBinding();
 }
 
 NS_IMETHODIMP
diff --git a/dom/base/MessageChannel.cpp b/dom/base/MessageChannel.cpp
index 4c92c25ad8b..d04edf4e947 100644
--- a/dom/base/MessageChannel.cpp
+++ b/dom/base/MessageChannel.cpp
@@ -67,7 +67,6 @@ MessageChannel::MessageChannel(nsPIDOMWindow* aWindow)
   : mWindow(aWindow)
 {
   MOZ_COUNT_CTOR(MessageChannel);
-  SetIsDOMBinding();
 
   mPort1 = new MessagePort(mWindow);
   mPort2 = new MessagePort(mWindow);
diff --git a/dom/base/MessagePort.cpp b/dom/base/MessagePort.cpp
index 87202409362..806383a49ea 100644
--- a/dom/base/MessagePort.cpp
+++ b/dom/base/MessagePort.cpp
@@ -314,12 +314,10 @@ PostMessageRunnable::Run()
 MessagePortBase::MessagePortBase(nsPIDOMWindow* aWindow)
   : DOMEventTargetHelper(aWindow)
 {
-  // SetIsDOMBinding() is called by DOMEventTargetHelper's ctor.
 }
 
 MessagePortBase::MessagePortBase()
 {
-  SetIsDOMBinding();
 }
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(MessagePort)
diff --git a/dom/base/MessagePortList.h b/dom/base/MessagePortList.h
index de72131050c..fa852f73259 100644
--- a/dom/base/MessagePortList.h
+++ b/dom/base/MessagePortList.h
@@ -32,7 +32,6 @@ public:
     : mOwner(aOwner)
     , mPorts(aPorts)
   {
-    SetIsDOMBinding();
   }
 
   nsISupports*
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index 17568810041..67dc2314b83 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -139,7 +139,6 @@ Navigator::Navigator(nsPIDOMWindow* aWindow)
   : mWindow(aWindow)
 {
   MOZ_ASSERT(aWindow->IsInnerWindow(), "Navigator must get an inner window!");
-  SetIsDOMBinding();
 }
 
 Navigator::~Navigator()
@@ -585,6 +584,11 @@ Navigator::CookieEnabled()
 bool
 Navigator::OnLine()
 {
+  if (mWindow && mWindow->GetDoc()) {
+    return !NS_IsOffline() &&
+      !NS_IsAppOffline(mWindow->GetDoc()->NodePrincipal());
+  }
+
   return !NS_IsOffline();
 }
 
@@ -1721,8 +1725,7 @@ Navigator::GetConnection(ErrorResult& aRv)
       aRv.Throw(NS_ERROR_UNEXPECTED);
       return nullptr;
     }
-    mConnection = new network::Connection();
-    mConnection->Init(mWindow);
+    mConnection = new network::Connection(mWindow);
   }
 
   return mConnection;
diff --git a/dom/base/PerformanceEntry.cpp b/dom/base/PerformanceEntry.cpp
index 9607e9cee01..f52a0e79766 100644
--- a/dom/base/PerformanceEntry.cpp
+++ b/dom/base/PerformanceEntry.cpp
@@ -23,7 +23,6 @@ PerformanceEntry::PerformanceEntry(nsPerformance* aPerformance)
 : mPerformance(aPerformance)
 {
   MOZ_ASSERT(aPerformance, "Parent performance object should be provided");
-  SetIsDOMBinding();
 }
 
 PerformanceEntry::~PerformanceEntry()
diff --git a/dom/base/SubtleCrypto.cpp b/dom/base/SubtleCrypto.cpp
index 05ac300ec4c..21f03786920 100644
--- a/dom/base/SubtleCrypto.cpp
+++ b/dom/base/SubtleCrypto.cpp
@@ -26,7 +26,6 @@ NS_INTERFACE_MAP_END
 SubtleCrypto::SubtleCrypto(nsPIDOMWindow* aWindow)
   : mWindow(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 JSObject*
diff --git a/dom/base/URLSearchParams.cpp b/dom/base/URLSearchParams.cpp
index 8115e8d3921..79beb55dff6 100644
--- a/dom/base/URLSearchParams.cpp
+++ b/dom/base/URLSearchParams.cpp
@@ -21,7 +21,6 @@ NS_INTERFACE_MAP_END
 
 URLSearchParams::URLSearchParams()
 {
-  SetIsDOMBinding();
 }
 
 URLSearchParams::~URLSearchParams()
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index 3988ceb280e..8bb074063ac 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -2118,7 +2118,7 @@ nsDOMWindowUtils::SendCompositionEvent(const nsAString& aType,
     msg = NS_COMPOSITION_END;
   } else if (aType.EqualsLiteral("compositionupdate")) {
     // Now we don't support manually dispatching composition update with this
-    // API.  compositionupdate is dispatched when text event modifies
+    // API.  A compositionupdate is dispatched when a DOM text event modifies
     // composition string automatically.  For backward compatibility, this
     // shouldn't return error in this case.
     NS_WARNING("Don't call nsIDOMWindowUtils.sendCompositionEvent() for "
@@ -2132,7 +2132,7 @@ nsDOMWindowUtils::SendCompositionEvent(const nsAString& aType,
   WidgetCompositionEvent compositionEvent(true, msg, widget);
   InitEvent(compositionEvent);
   if (msg != NS_COMPOSITION_START) {
-    compositionEvent.data = aData;
+    compositionEvent.mData = aData;
   }
 
   compositionEvent.mFlags.mIsSynthesizedForTests = true;
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 3ed57bdf821..23d44f08ecc 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1095,7 +1095,7 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
     mHadOriginalOpener(false),
     mIsPopupSpam(false),
     mBlockScriptedClosingFlag(false),
-    mFireOfflineStatusChangeEventOnThaw(false),
+    mWasOffline(false),
     mNotifyIdleObserversIdleOnThaw(false),
     mNotifyIdleObserversActiveOnThaw(false),
     mCreatingInnerWindow(false),
@@ -1141,8 +1141,6 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
   // Initialize the PRCList (this).
   PR_INIT_CLIST(this);
 
-  SetIsDOMBinding();
-
   if (aOuterWindow) {
     // |this| is an inner window, add this inner window to the outer
     // window list of inners.
@@ -2461,11 +2459,11 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
       newInnerGlobal = newInnerWindow->GetWrapperPreserveColor();
     } else {
       if (thisChrome) {
-        newInnerWindow = new nsGlobalChromeWindow(this);
+        newInnerWindow = nsGlobalChromeWindow::Create(this);
       } else if (mIsModalContentWindow) {
-        newInnerWindow = new nsGlobalModalWindow(this);
+        newInnerWindow = nsGlobalModalWindow::Create(this);
       } else {
-        newInnerWindow = new nsGlobalWindow(this);
+        newInnerWindow = nsGlobalWindow::Create(this);
       }
 
       // Freeze the outer window and null out the inner window so
@@ -10740,12 +10738,22 @@ nsGlobalWindow::GetInterface(JSContext* aCx, nsIJSID* aIID,
 }
 
 void
-nsGlobalWindow::FireOfflineStatusEvent()
+nsGlobalWindow::FireOfflineStatusEventIfChanged()
 {
   if (!IsCurrentInnerWindow())
     return;
+
+  bool isOffline = NS_IsOffline() || NS_IsAppOffline(GetPrincipal());
+
+  // Don't fire an event if the status hasn't changed
+  if (mWasOffline == isOffline) {
+    return;
+  }
+
+  mWasOffline = isOffline;
+
   nsAutoString name;
-  if (NS_IsOffline()) {
+  if (isOffline) {
     name.AssignLiteral("offline");
   } else {
     name.AssignLiteral("online");
@@ -11301,13 +11309,11 @@ nsresult
 nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
                         const char16_t* aData)
 {
-  if (!nsCRT::strcmp(aTopic, NS_IOSERVICE_OFFLINE_STATUS_TOPIC)) {
-    if (IsFrozen()) {
-      // if an even number of notifications arrive while we're frozen,
-      // we don't need to fire.
-      mFireOfflineStatusChangeEventOnThaw = !mFireOfflineStatusChangeEventOnThaw;
-    } else {
-      FireOfflineStatusEvent();
+  if (!nsCRT::strcmp(aTopic, NS_IOSERVICE_OFFLINE_STATUS_TOPIC) ||
+      !nsCRT::strcmp(aTopic, NS_IOSERVICE_APP_OFFLINE_STATUS_TOPIC)) {
+    if (!IsFrozen()) {
+        // Fires an offline status event if the offline status has changed
+        FireOfflineStatusEventIfChanged();
     }
     return NS_OK;
   }
@@ -11582,10 +11588,8 @@ nsGlobalWindow::FireDelayedDOMEvents()
     static_cast<nsDOMOfflineResourceList*>(mApplicationCache.get())->FirePendingEvents();
   }
 
-  if (mFireOfflineStatusChangeEventOnThaw) {
-    mFireOfflineStatusChangeEventOnThaw = false;
-    FireOfflineStatusEvent();
-  }
+  // Fires an offline status event if the offline status has changed
+  FireOfflineStatusEventIfChanged();
 
   if (mNotifyIdleObserversIdleOnThaw) {
     mNotifyIdleObserversIdleOnThaw = false;
@@ -13363,6 +13367,14 @@ NS_INTERFACE_MAP_END_INHERITING(nsGlobalWindow)
 NS_IMPL_ADDREF_INHERITED(nsGlobalChromeWindow, nsGlobalWindow)
 NS_IMPL_RELEASE_INHERITED(nsGlobalChromeWindow, nsGlobalWindow)
 
+/* static */ already_AddRefed<nsGlobalChromeWindow>
+nsGlobalChromeWindow::Create(nsGlobalWindow *aOuterWindow)
+{
+  nsRefPtr<nsGlobalChromeWindow> window = new nsGlobalChromeWindow(aOuterWindow);
+  window->InitWasOffline();
+  return window.forget();
+}
+
 NS_IMETHODIMP
 nsGlobalChromeWindow::GetWindowState(uint16_t* aWindowState)
 {
@@ -13787,6 +13799,14 @@ nsGlobalWindow::GetDialogArguments(JSContext* aCx,
                         aRetval, aError);
 }
 
+/* static */ already_AddRefed<nsGlobalModalWindow>
+nsGlobalModalWindow::Create(nsGlobalWindow *aOuterWindow)
+{
+  nsRefPtr<nsGlobalModalWindow> window = new nsGlobalModalWindow(aOuterWindow);
+  window->InitWasOffline();
+  return window.forget();
+}
+
 NS_IMETHODIMP
 nsGlobalModalWindow::GetDialogArguments(nsIVariant **aArguments)
 {
@@ -13798,6 +13818,20 @@ nsGlobalModalWindow::GetDialogArguments(nsIVariant **aArguments)
   return mDialogArguments->Get(nsContentUtils::SubjectPrincipal(), aArguments);
 }
 
+/* static */ already_AddRefed<nsGlobalWindow>
+nsGlobalWindow::Create(nsGlobalWindow *aOuterWindow)
+{
+  nsRefPtr<nsGlobalWindow> window = new nsGlobalWindow(aOuterWindow);
+  window->InitWasOffline();
+  return window.forget();
+}
+
+void
+nsGlobalWindow::InitWasOffline()
+{
+  mWasOffline = NS_IsOffline() || NS_IsAppOffline(GetPrincipal());
+}
+
 void
 nsGlobalWindow::GetReturnValue(JSContext* aCx,
                                JS::MutableHandle<JS::Value> aReturnValue,
@@ -13970,7 +14004,6 @@ void
 nsGlobalWindow::ClearDocumentDependentSlots(JSContext* aCx)
 {
   MOZ_ASSERT(IsInnerWindow());
-  MOZ_ASSERT(IsDOMBinding());
   WindowBinding::ClearCachedDocumentValue(aCx, this);
   WindowBinding::ClearCachedPerformanceValue(aCx, this);
 }
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index a86310630a8..860390be880 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -490,7 +490,7 @@ public:
                            mozilla::ErrorResult& aRv);
 
   // Object Management
-  explicit nsGlobalWindow(nsGlobalWindow *aOuterWindow);
+  static already_AddRefed<nsGlobalWindow> Create(nsGlobalWindow *aOuterWindow);
 
   static nsGlobalWindow *FromSupports(nsISupports *supports)
   {
@@ -823,7 +823,10 @@ public:
     return top.forget();
   }
 protected:
+  explicit nsGlobalWindow(nsGlobalWindow *aOuterWindow);
   nsIDOMWindow* GetOpenerWindow(mozilla::ErrorResult& aError);
+  // Initializes the mWasOffline member variable
+  void InitWasOffline();
 public:
   void GetOpener(JSContext* aCx, JS::MutableHandle<JS::Value> aRetval,
                  mozilla::ErrorResult& aError);
@@ -1246,7 +1249,7 @@ public:
                            const nsAString &aPopupURL,
                            const nsAString &aPopupWindowName,
                            const nsAString &aPopupWindowFeatures);
-  void FireOfflineStatusEvent();
+  void FireOfflineStatusEventIfChanged();
 
   // Inner windows only.
   nsresult ScheduleNextIdleObserverCallback();
@@ -1449,8 +1452,10 @@ protected:
   // Indicates whether scripts are allowed to close this window.
   bool                          mBlockScriptedClosingFlag : 1;
 
+  // Window offline status. Checked to see if we need to fire offline event
+  bool                          mWasOffline : 1;
+
   // Track what sorts of events we need to fire when thawed
-  bool                          mFireOfflineStatusChangeEventOnThaw : 1;
   bool                          mNotifyIdleObserversIdleOnThaw : 1;
   bool                          mNotifyIdleObserversActiveOnThaw : 1;
 
@@ -1657,13 +1662,7 @@ public:
   // nsIDOMChromeWindow interface
   NS_DECL_NSIDOMCHROMEWINDOW
 
-  explicit nsGlobalChromeWindow(nsGlobalWindow *aOuterWindow)
-    : nsGlobalWindow(aOuterWindow),
-      mGroupMessageManagers(1)
-  {
-    mIsChrome = true;
-    mCleanMessageManager = true;
-  }
+  static already_AddRefed<nsGlobalChromeWindow> Create(nsGlobalWindow *aOuterWindow);
 
   static PLDHashOperator
   DisconnectGroupMessageManager(const nsAString& aKey,
@@ -1677,6 +1676,14 @@ public:
   }
 
 protected:
+  explicit nsGlobalChromeWindow(nsGlobalWindow *aOuterWindow)
+    : nsGlobalWindow(aOuterWindow),
+      mGroupMessageManagers(1)
+  {
+    mIsChrome = true;
+    mCleanMessageManager = true;
+  }
+
   ~nsGlobalChromeWindow()
   {
     NS_ABORT_IF_FALSE(mCleanMessageManager,
@@ -1724,16 +1731,18 @@ class nsGlobalModalWindow : public nsGlobalWindow,
                             public nsIDOMModalContentWindow
 {
 public:
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIDOMMODALCONTENTWINDOW
+
+  static already_AddRefed<nsGlobalModalWindow> Create(nsGlobalWindow *aOuterWindow);
+
+protected:
   explicit nsGlobalModalWindow(nsGlobalWindow *aOuterWindow)
     : nsGlobalWindow(aOuterWindow)
   {
     mIsModalContentWindow = true;
   }
 
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIDOMMODALCONTENTWINDOW
-
-protected:
   ~nsGlobalModalWindow() {}
 };
 
@@ -1744,11 +1753,11 @@ NS_NewScriptGlobalObject(bool aIsChrome, bool aIsModalContentWindow)
   nsRefPtr<nsGlobalWindow> global;
 
   if (aIsChrome) {
-    global = new nsGlobalChromeWindow(nullptr);
+    global = nsGlobalChromeWindow::Create(nullptr);
   } else if (aIsModalContentWindow) {
-    global = new nsGlobalModalWindow(nullptr);
+    global = nsGlobalModalWindow::Create(nullptr);
   } else {
-    global = new nsGlobalWindow(nullptr);
+    global = nsGlobalWindow::Create(nullptr);
   }
 
   return global.forget();
diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp
index 9ec76e65a70..2f1701005c9 100644
--- a/dom/base/nsHistory.cpp
+++ b/dom/base/nsHistory.cpp
@@ -46,7 +46,6 @@ NS_INTERFACE_MAP_END
 nsHistory::nsHistory(nsPIDOMWindow* aInnerWindow)
   : mInnerWindow(do_GetWeakReference(aInnerWindow))
 {
-  SetIsDOMBinding();
 }
 
 nsHistory::~nsHistory()
diff --git a/dom/base/nsLocation.cpp b/dom/base/nsLocation.cpp
index 2c9a92d4f33..4080adab5c7 100644
--- a/dom/base/nsLocation.cpp
+++ b/dom/base/nsLocation.cpp
@@ -55,7 +55,6 @@ nsLocation::nsLocation(nsPIDOMWindow* aWindow, nsIDocShell *aDocShell)
 {
   MOZ_ASSERT(aDocShell);
   MOZ_ASSERT(mInnerWindow->IsInnerWindow());
-  SetIsDOMBinding();
 
   mDocShell = do_GetWeakReference(aDocShell);
 }
diff --git a/dom/base/nsMimeTypeArray.cpp b/dom/base/nsMimeTypeArray.cpp
index faef9a0135e..257abf6f569 100644
--- a/dom/base/nsMimeTypeArray.cpp
+++ b/dom/base/nsMimeTypeArray.cpp
@@ -33,7 +33,6 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsMimeTypeArray,
 nsMimeTypeArray::nsMimeTypeArray(nsPIDOMWindow* aWindow)
   : mWindow(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 nsMimeTypeArray::~nsMimeTypeArray()
@@ -233,7 +232,6 @@ nsMimeType::nsMimeType(nsPIDOMWindow* aWindow, nsPluginElement* aPluginElement,
     mPluginTagMimeIndex(aPluginTagMimeIndex),
     mType(aType)
 {
-  SetIsDOMBinding();
 }
 
 nsMimeType::nsMimeType(nsPIDOMWindow* aWindow, const nsAString& aType)
@@ -242,7 +240,6 @@ nsMimeType::nsMimeType(nsPIDOMWindow* aWindow, const nsAString& aType)
     mPluginTagMimeIndex(0),
     mType(aType)
 {
-  SetIsDOMBinding();
 }
 
 nsMimeType::~nsMimeType()
diff --git a/dom/base/nsPerformance.cpp b/dom/base/nsPerformance.cpp
index 1a300eb9dcf..dbb611986eb 100644
--- a/dom/base/nsPerformance.cpp
+++ b/dom/base/nsPerformance.cpp
@@ -40,7 +40,6 @@ nsPerformanceTiming::nsPerformanceTiming(nsPerformance* aPerformance,
     mReportCrossOriginRedirect(true)
 {
   MOZ_ASSERT(aPerformance, "Parent performance object should be provided");
-  SetIsDOMBinding();
 
   if (!nsContentUtils::IsPerformanceTimingEnabled()) {
     mZeroTime = 0;
@@ -368,7 +367,6 @@ nsPerformanceNavigation::nsPerformanceNavigation(nsPerformance* aPerformance)
   : mPerformance(aPerformance)
 {
   MOZ_ASSERT(aPerformance, "Parent performance object should be provided");
-  SetIsDOMBinding();
 }
 
 nsPerformanceNavigation::~nsPerformanceNavigation()
@@ -401,7 +399,6 @@ nsPerformance::nsPerformance(nsPIDOMWindow* aWindow,
     mPrimaryBufferSize(kDefaultBufferSize)
 {
   MOZ_ASSERT(aWindow, "Parent window object should be provided");
-  SetIsDOMBinding();
 }
 
 nsPerformance::~nsPerformance()
diff --git a/dom/base/nsPluginArray.cpp b/dom/base/nsPluginArray.cpp
index 15e73868b8b..1dcd55182e5 100644
--- a/dom/base/nsPluginArray.cpp
+++ b/dom/base/nsPluginArray.cpp
@@ -27,7 +27,6 @@ using namespace mozilla::dom;
 nsPluginArray::nsPluginArray(nsPIDOMWindow* aWindow)
   : mWindow(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 void
@@ -386,7 +385,6 @@ nsPluginElement::nsPluginElement(nsPIDOMWindow* aWindow,
   : mWindow(aWindow),
     mPluginTag(aPluginTag)
 {
-  SetIsDOMBinding();
 }
 
 nsPluginElement::~nsPluginElement()
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index 65c53951d06..1f43f8dd6bf 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -33,6 +33,7 @@ using namespace mozilla::dom;
 nsWindowRoot::nsWindowRoot(nsPIDOMWindow* aWindow)
 {
   mWindow = aWindow;
+  SetIsNotDOMBinding();
 }
 
 nsWindowRoot::~nsWindowRoot()
diff --git a/dom/base/nsWindowRoot.h b/dom/base/nsWindowRoot.h
index d798b77a484..034dd2d2172 100644
--- a/dom/base/nsWindowRoot.h
+++ b/dom/base/nsWindowRoot.h
@@ -61,6 +61,11 @@ public:
   virtual mozilla::dom::EventTarget* GetParentTarget() MOZ_OVERRIDE { return mParent; }
   virtual nsIDOMWindow* GetOwnerGlobal() MOZ_OVERRIDE;
 
+  virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE
+  {
+    MOZ_CRASH("nsWindowRoot doesn't use DOM bindings!");
+  }
+
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsWindowRoot,
                                                          nsIDOMEventTarget)
 
diff --git a/dom/base/nsWrapperCache.h b/dom/base/nsWrapperCache.h
index 75224af6975..c65c710781b 100644
--- a/dom/base/nsWrapperCache.h
+++ b/dom/base/nsWrapperCache.h
@@ -14,6 +14,14 @@
 #include "js/RootingAPI.h"
 #include "js/TracingAPI.h"
 
+namespace mozilla {
+namespace dom {
+class TabChildGlobal;
+} // namespace dom
+} // namespace mozilla
+class SandboxPrivate;
+class nsInProcessTabChildGlobal;
+class nsWindowRoot;
 class XPCWrappedNativeScope;
 
 #define NS_WRAPPERCACHE_IID \
@@ -37,10 +45,10 @@ class XPCWrappedNativeScope;
  *
  * The cache can store 2 types of objects:
  *
- *  If WRAPPER_IS_DOM_BINDING is not set (IsDOMBinding() returns false):
- *    - a slim wrapper or the JSObject of an XPCWrappedNative wrapper
+ *  If WRAPPER_IS_NOT_DOM_BINDING is set (IsDOMBinding() returns false):
+ *    - the JSObject of an XPCWrappedNative wrapper
  *
- *  If WRAPPER_IS_DOM_BINDING is set (IsDOMBinding() returns true):
+ *  If WRAPPER_IS_NOT_DOM_BINDING is not set (IsDOMBinding() returns true):
  *    - a DOM binding object (regular JS object or proxy)
  *
  * The finalizer for the wrapper clears the cache.
@@ -134,27 +142,16 @@ public:
     return HasWrapperFlag(WRAPPER_BIT_PRESERVED);
   }
 
-  void SetIsDOMBinding()
-  {
-    MOZ_ASSERT(!mWrapper && !(GetWrapperFlags() & ~WRAPPER_IS_DOM_BINDING),
-               "This flag should be set before creating any wrappers.");
-    SetWrapperFlags(WRAPPER_IS_DOM_BINDING);
-  }
-
   bool IsDOMBinding() const
   {
-    return HasWrapperFlag(WRAPPER_IS_DOM_BINDING);
+    return !HasWrapperFlag(WRAPPER_IS_NOT_DOM_BINDING);
   }
 
   /**
    * Wrap the object corresponding to this wrapper cache. If non-null is
    * returned, the object has already been stored in the wrapper cache.
    */
-  virtual JSObject* WrapObject(JSContext* cx)
-  {
-    MOZ_ASSERT(!IsDOMBinding(), "Someone forgot to override WrapObject");
-    return nullptr;
-  }
+  virtual JSObject* WrapObject(JSContext* cx) = 0;
 
   /**
    * Returns true if the object has a non-gray wrapper.
@@ -265,6 +262,17 @@ protected:
   }
 
 private:
+  friend class mozilla::dom::TabChildGlobal;
+  friend class SandboxPrivate;
+  friend class nsInProcessTabChildGlobal;
+  friend class nsWindowRoot;
+  void SetIsNotDOMBinding()
+  {
+    MOZ_ASSERT(!mWrapper && !(GetWrapperFlags() & ~WRAPPER_IS_NOT_DOM_BINDING),
+               "This flag should be set before creating any wrappers.");
+    SetWrapperFlags(WRAPPER_IS_NOT_DOM_BINDING);
+  }
+
   JSObject *GetWrapperJSObject() const
   {
     return mWrapper;
@@ -273,7 +281,7 @@ private:
   void SetWrapperJSObject(JSObject* aWrapper)
   {
     mWrapper = aWrapper;
-    UnsetWrapperFlags(kWrapperFlagsMask & ~WRAPPER_IS_DOM_BINDING);
+    UnsetWrapperFlags(kWrapperFlagsMask & ~WRAPPER_IS_NOT_DOM_BINDING);
   }
 
   void TraceWrapperJSObject(JSTracer* aTrc, const char* aName);
@@ -323,12 +331,12 @@ private:
   enum { WRAPPER_BIT_PRESERVED = 1 << 0 };
 
   /**
-   * If this bit is set then the wrapper for the native object is a DOM binding
-   * (regular JS object or proxy).
+   * If this bit is set then the wrapper for the native object is not a DOM
+   * binding.
    */
-  enum { WRAPPER_IS_DOM_BINDING = 1 << 1 };
+  enum { WRAPPER_IS_NOT_DOM_BINDING = 1 << 1 };
 
-  enum { kWrapperFlagsMask = (WRAPPER_BIT_PRESERVED | WRAPPER_IS_DOM_BINDING) };
+  enum { kWrapperFlagsMask = (WRAPPER_BIT_PRESERVED | WRAPPER_IS_NOT_DOM_BINDING) };
 
   JS::Heap<JSObject*> mWrapper;
   FlagsType           mFlags;
diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index c83c7c7b2df..d8c0779e5cd 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -2868,7 +2868,6 @@ CreateGlobal(JSContext* aCx, T* aNative, nsWrapperCache* aCache,
     js::SetReservedSlot(aGlobal, DOM_OBJECT_SLOT, PRIVATE_TO_JSVAL(aNative));
     NS_ADDREF(aNative);
 
-    aCache->SetIsDOMBinding();
     aCache->SetWrapper(aGlobal);
 
     dom::AllocateProtoAndIfaceCache(aGlobal,
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index ca31a131a28..fea94dc1154 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -13023,20 +13023,16 @@ class CGExampleClass(CGBindingImplClass):
 
     def define(self):
         # Just override CGClass and do our own thing
-        if self.descriptor.wrapperCache:
-            setDOMBinding = "  SetIsDOMBinding();\n"
-        else:
-            setDOMBinding = ""
         if self.refcounted:
             ctordtor = dedent("""
                 ${nativeType}::${nativeType}()
                 {
-                %s}
+                }
 
                 ${nativeType}::~${nativeType}()
                 {
                 }
-                """) % setDOMBinding
+                """)
         else:
             ctordtor = dedent("""
                 ${nativeType}::${nativeType}()
@@ -13341,7 +13337,7 @@ class CGJSImplClass(CGBindingImplClass):
             constructorBody = dedent("""
                 // Make sure we're an nsWrapperCache already
                 MOZ_ASSERT(static_cast<nsWrapperCache*>(this));
-                // And that our ancestor has called SetIsDOMBinding()
+                // And that our ancestor has not called SetIsNotDOMBinding()
                 MOZ_ASSERT(IsDOMBinding());
                 """)
             extradefinitions = fill(
@@ -13360,7 +13356,6 @@ class CGJSImplClass(CGBindingImplClass):
             isupportsDecl = "NS_DECL_CYCLE_COLLECTING_ISUPPORTS\n"
             ccDecl = ("NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(%s)\n" %
                       descriptor.name)
-            constructorBody = "SetIsDOMBinding();\n"
             extradefinitions = fill(
                 """
                 NS_IMPL_CYCLE_COLLECTION_CLASS(${ifaceName})
@@ -13429,8 +13424,7 @@ class CGJSImplClass(CGBindingImplClass):
             [Argument("JS::Handle<JSObject*>", "aJSImplObject"),
              Argument("nsPIDOMWindow*", "aParent")],
             visibility="public",
-            baseConstructors=baseConstructors,
-            body=constructorBody)
+            baseConstructors=baseConstructors)
 
         self.methodDecls.append(
             ClassMethod("_Create",
diff --git a/dom/bluetooth/BluetoothAdapter.cpp b/dom/bluetooth/BluetoothAdapter.cpp
index 5468efc6fec..6d541c4f95d 100644
--- a/dom/bluetooth/BluetoothAdapter.cpp
+++ b/dom/bluetooth/BluetoothAdapter.cpp
@@ -169,7 +169,6 @@ BluetoothAdapter::BluetoothAdapter(nsPIDOMWindow* aWindow,
   , mIsRooted(false)
 {
   MOZ_ASSERT(aWindow);
-  MOZ_ASSERT(IsDOMBinding());
 
   const InfallibleTArray<BluetoothNamedValue>& values =
     aValue.get_ArrayOfBluetoothNamedValue();
diff --git a/dom/bluetooth/BluetoothDevice.cpp b/dom/bluetooth/BluetoothDevice.cpp
index 07ade8bb49f..f0e71a1e007 100644
--- a/dom/bluetooth/BluetoothDevice.cpp
+++ b/dom/bluetooth/BluetoothDevice.cpp
@@ -56,7 +56,6 @@ BluetoothDevice::BluetoothDevice(nsPIDOMWindow* aWindow,
   , mIsRooted(false)
 {
   MOZ_ASSERT(aWindow);
-  MOZ_ASSERT(IsDOMBinding());
 
   const InfallibleTArray<BluetoothNamedValue>& values =
     aValue.get_ArrayOfBluetoothNamedValue();
diff --git a/dom/bluetooth/BluetoothManager.cpp b/dom/bluetooth/BluetoothManager.cpp
index 798e4639021..97dcc98fae2 100644
--- a/dom/bluetooth/BluetoothManager.cpp
+++ b/dom/bluetooth/BluetoothManager.cpp
@@ -100,7 +100,6 @@ BluetoothManager::BluetoothManager(nsPIDOMWindow *aWindow)
   , BluetoothPropertyContainer(BluetoothObjectType::TYPE_MANAGER)
 {
   MOZ_ASSERT(aWindow);
-  MOZ_ASSERT(IsDOMBinding());
 
   mPath.Assign('/');
 
diff --git a/dom/bluetooth2/BluetoothAdapter.cpp b/dom/bluetooth2/BluetoothAdapter.cpp
index 83814b0e0db..71edd7b466b 100644
--- a/dom/bluetooth2/BluetoothAdapter.cpp
+++ b/dom/bluetooth2/BluetoothAdapter.cpp
@@ -195,7 +195,6 @@ BluetoothAdapter::BluetoothAdapter(nsPIDOMWindow* aWindow,
   , mDiscoveryHandleInUse(nullptr)
 {
   MOZ_ASSERT(aWindow);
-  MOZ_ASSERT(IsDOMBinding());
 
   mPairingReqs = BluetoothPairingListener::Create(aWindow);
 
diff --git a/dom/bluetooth2/BluetoothClassOfDevice.cpp b/dom/bluetooth2/BluetoothClassOfDevice.cpp
index 03d63a1d596..6c19a2e18e4 100644
--- a/dom/bluetooth2/BluetoothClassOfDevice.cpp
+++ b/dom/bluetooth2/BluetoothClassOfDevice.cpp
@@ -44,7 +44,6 @@ BluetoothClassOfDevice::BluetoothClassOfDevice(nsPIDOMWindow* aOwner)
   : mOwnerWindow(aOwner)
 {
   MOZ_ASSERT(aOwner);
-  SetIsDOMBinding();
 
   Reset();
 }
diff --git a/dom/bluetooth2/BluetoothDevice.cpp b/dom/bluetooth2/BluetoothDevice.cpp
index ea720e7940a..2317c241d36 100644
--- a/dom/bluetooth2/BluetoothDevice.cpp
+++ b/dom/bluetooth2/BluetoothDevice.cpp
@@ -78,7 +78,6 @@ BluetoothDevice::BluetoothDevice(nsPIDOMWindow* aWindow,
   , mType(BluetoothDeviceType::Unknown)
 {
   MOZ_ASSERT(aWindow);
-  MOZ_ASSERT(IsDOMBinding());
 
   mCod = BluetoothClassOfDevice::Create(aWindow);
 
diff --git a/dom/bluetooth2/BluetoothDiscoveryHandle.cpp b/dom/bluetooth2/BluetoothDiscoveryHandle.cpp
index a93ce232d18..089fa88b5b6 100644
--- a/dom/bluetooth2/BluetoothDiscoveryHandle.cpp
+++ b/dom/bluetooth2/BluetoothDiscoveryHandle.cpp
@@ -24,7 +24,6 @@ BluetoothDiscoveryHandle::BluetoothDiscoveryHandle(nsPIDOMWindow* aWindow)
   : DOMEventTargetHelper(aWindow)
 {
   MOZ_ASSERT(aWindow);
-  MOZ_ASSERT(IsDOMBinding());
 }
 
 BluetoothDiscoveryHandle::~BluetoothDiscoveryHandle()
diff --git a/dom/bluetooth2/BluetoothManager.cpp b/dom/bluetooth2/BluetoothManager.cpp
index 8f38101c8e6..b0c527b08e2 100644
--- a/dom/bluetooth2/BluetoothManager.cpp
+++ b/dom/bluetooth2/BluetoothManager.cpp
@@ -91,7 +91,6 @@ BluetoothManager::BluetoothManager(nsPIDOMWindow *aWindow)
   , mDefaultAdapterIndex(-1)
 {
   MOZ_ASSERT(aWindow);
-  MOZ_ASSERT(IsDOMBinding());
 
   ListenToBluetoothSignal(true);
   BT_API2_LOGR("aWindow %p", aWindow);
diff --git a/dom/bluetooth2/BluetoothPairingHandle.cpp b/dom/bluetooth2/BluetoothPairingHandle.cpp
index 7412c554af0..3552b70f775 100644
--- a/dom/bluetooth2/BluetoothPairingHandle.cpp
+++ b/dom/bluetooth2/BluetoothPairingHandle.cpp
@@ -43,8 +43,6 @@ BluetoothPairingHandle::BluetoothPairingHandle(nsPIDOMWindow* aOwner,
   } else {
     MOZ_ASSERT(aPasskey.IsEmpty());
   }
-
-  SetIsDOMBinding();
 }
 
 BluetoothPairingHandle::~BluetoothPairingHandle()
diff --git a/dom/bluetooth2/BluetoothPairingListener.cpp b/dom/bluetooth2/BluetoothPairingListener.cpp
index a34765e79d1..305cf9fe292 100644
--- a/dom/bluetooth2/BluetoothPairingListener.cpp
+++ b/dom/bluetooth2/BluetoothPairingListener.cpp
@@ -21,7 +21,6 @@ BluetoothPairingListener::BluetoothPairingListener(nsPIDOMWindow* aWindow)
   : DOMEventTargetHelper(aWindow)
 {
   MOZ_ASSERT(aWindow);
-  MOZ_ASSERT(IsDOMBinding());
 }
 
 already_AddRefed<BluetoothPairingListener>
diff --git a/dom/camera/DOMCameraCapabilities.cpp b/dom/camera/DOMCameraCapabilities.cpp
index 0c9c2cf3b31..5d9907eea79 100644
--- a/dom/camera/DOMCameraCapabilities.cpp
+++ b/dom/camera/DOMCameraCapabilities.cpp
@@ -57,7 +57,6 @@ CameraCapabilities::CameraCapabilities(nsPIDOMWindow* aWindow)
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
   MOZ_COUNT_CTOR(CameraCapabilities);
   mozilla::HoldJSObjects(this);
-  SetIsDOMBinding();
 }
 
 CameraCapabilities::~CameraCapabilities()
diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp
index 969c04077ee..897af7bd8f5 100644
--- a/dom/camera/DOMCameraControl.cpp
+++ b/dom/camera/DOMCameraControl.cpp
@@ -180,7 +180,6 @@ nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId,
   mInput = new CameraPreviewMediaStream(this);
 
   BindToOwner(aWindow);
-  SetIsDOMBinding();
 
   nsRefPtr<DOMCameraConfiguration> initialConfig =
     new DOMCameraConfiguration(aInitialConfig);
diff --git a/dom/camera/DOMCameraDetectedFace.cpp b/dom/camera/DOMCameraDetectedFace.cpp
index ae12e8751a7..77405d45d27 100644
--- a/dom/camera/DOMCameraDetectedFace.cpp
+++ b/dom/camera/DOMCameraDetectedFace.cpp
@@ -52,6 +52,4 @@ DOMCameraDetectedFace::DOMCameraDetectedFace(nsISupports* aParent,
   if (aFace.hasMouth) {
     mMouth = new DOMPoint(this, aFace.mouth.x, aFace.mouth.y);
   }
-
-  SetIsDOMBinding();
 }
diff --git a/dom/camera/DOMCameraManager.cpp b/dom/camera/DOMCameraManager.cpp
index e949fb568b2..d7c3b6f53b2 100644
--- a/dom/camera/DOMCameraManager.cpp
+++ b/dom/camera/DOMCameraManager.cpp
@@ -61,7 +61,6 @@ nsDOMCameraManager::nsDOMCameraManager(nsPIDOMWindow* aWindow)
   /* member initializers and constructor code */
   DOM_CAMERA_LOGT("%s:%d : this=%p, windowId=%llx\n", __func__, __LINE__, this, mWindowId);
   MOZ_COUNT_CTOR(nsDOMCameraManager);
-  SetIsDOMBinding();
 }
 
 nsDOMCameraManager::~nsDOMCameraManager()
diff --git a/dom/canvas/CanvasGradient.h b/dom/canvas/CanvasGradient.h
index b22f3b61b80..00fbb257e27 100644
--- a/dom/canvas/CanvasGradient.h
+++ b/dom/canvas/CanvasGradient.h
@@ -66,7 +66,6 @@ protected:
     : mContext(aContext)
     , mType(aType)
   {
-    SetIsDOMBinding();
   }
 
   nsRefPtr<CanvasRenderingContext2D> mContext;
diff --git a/dom/canvas/CanvasPattern.h b/dom/canvas/CanvasPattern.h
index f87ae8d5dd8..9fc171d3cef 100644
--- a/dom/canvas/CanvasPattern.h
+++ b/dom/canvas/CanvasPattern.h
@@ -50,7 +50,6 @@ public:
     , mCORSUsed(CORSUsed)
     , mRepeat(aRepeat)
   {
-    SetIsDOMBinding();
   }
 
   JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 0140a89b124..983fcaaa50c 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -832,7 +832,6 @@ CanvasRenderingContext2D::CanvasRenderingContext2D()
   , mInvalidateCount(0)
 {
   sNumLivingContexts++;
-  SetIsDOMBinding();
 
   // The default is to use OpenGL mode
   if (!gfxPlatform::GetPlatform()->UseAcceleratedSkiaCanvas()) {
@@ -4950,16 +4949,12 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(CanvasPath, mParent)
 CanvasPath::CanvasPath(nsISupports* aParent)
   : mParent(aParent)
 {
-  SetIsDOMBinding();
-
   mPathBuilder = gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget()->CreatePathBuilder();
 }
 
 CanvasPath::CanvasPath(nsISupports* aParent, TemporaryRef<PathBuilder> aPathBuilder)
   : mParent(aParent), mPathBuilder(aPathBuilder)
 {
-  SetIsDOMBinding();
-
   if (!mPathBuilder) {
     mPathBuilder = gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget()->CreatePathBuilder();
   }
diff --git a/dom/canvas/WebGLBuffer.cpp b/dom/canvas/WebGLBuffer.cpp
index f7c434ce980..5e9386909ac 100644
--- a/dom/canvas/WebGLBuffer.cpp
+++ b/dom/canvas/WebGLBuffer.cpp
@@ -17,7 +17,6 @@ WebGLBuffer::WebGLBuffer(WebGLContext *context)
     , WebGLContextBoundObject(context)
     , mByteLength(0)
 {
-    SetIsDOMBinding();
     mContext->MakeContextCurrent();
     mContext->gl->fGenBuffers(1, &mGLName);
     mContext->mBuffers.insertBack(this);
diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
index bfbee4787cc..f016b8e99bc 100644
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -229,8 +229,6 @@ WebGLContext::WebGLContext()
     : gl(nullptr)
     , mNeedsFakeNoAlpha(false)
 {
-    SetIsDOMBinding();
-
     mGeneration = 0;
     mInvalidated = false;
     mShouldPresent = true;
diff --git a/dom/canvas/WebGLExtensionBase.cpp b/dom/canvas/WebGLExtensionBase.cpp
index cc1e9f4d9a7..b6f35e79269 100644
--- a/dom/canvas/WebGLExtensionBase.cpp
+++ b/dom/canvas/WebGLExtensionBase.cpp
@@ -12,7 +12,6 @@ WebGLExtensionBase::WebGLExtensionBase(WebGLContext* context)
     : WebGLContextBoundObject(context)
     , mIsLost(false)
 {
-    SetIsDOMBinding();
 }
 
 WebGLExtensionBase::~WebGLExtensionBase()
diff --git a/dom/canvas/WebGLFramebuffer.cpp b/dom/canvas/WebGLFramebuffer.cpp
index 55973fabf20..4f97364b617 100644
--- a/dom/canvas/WebGLFramebuffer.cpp
+++ b/dom/canvas/WebGLFramebuffer.cpp
@@ -34,7 +34,6 @@ WebGLFramebuffer::WebGLFramebuffer(WebGLContext* context)
     , mStencilAttachment(LOCAL_GL_STENCIL_ATTACHMENT)
     , mDepthStencilAttachment(LOCAL_GL_DEPTH_STENCIL_ATTACHMENT)
 {
-    SetIsDOMBinding();
     mContext->MakeContextCurrent();
     mContext->gl->fGenFramebuffers(1, &mGLName);
     mContext->mFramebuffers.insertBack(this);
diff --git a/dom/canvas/WebGLProgram.cpp b/dom/canvas/WebGLProgram.cpp
index d94b0b273e4..0c5aecc7b46 100644
--- a/dom/canvas/WebGLProgram.cpp
+++ b/dom/canvas/WebGLProgram.cpp
@@ -60,7 +60,6 @@ WebGLProgram::WebGLProgram(WebGLContext *context)
     , mUniformInfoMap(new CStringToUniformInfoMap)
     , mAttribMaxNameLength(0)
 {
-    SetIsDOMBinding();
     mContext->MakeContextCurrent();
     mGLName = mContext->gl->fCreateProgram();
     mContext->mPrograms.insertBack(this);
diff --git a/dom/canvas/WebGLQuery.cpp b/dom/canvas/WebGLQuery.cpp
index 37199abc69c..096aa211ac0 100644
--- a/dom/canvas/WebGLQuery.cpp
+++ b/dom/canvas/WebGLQuery.cpp
@@ -21,7 +21,6 @@ WebGLQuery::WebGLQuery(WebGLContext* context)
     , mGLName(0)
     , mType(0)
 {
-    SetIsDOMBinding();
     mContext->mQueries.insertBack(this);
 
     mContext->MakeContextCurrent();
diff --git a/dom/canvas/WebGLRenderbuffer.cpp b/dom/canvas/WebGLRenderbuffer.cpp
index 2f0096f09b7..0ea4cdfa186 100644
--- a/dom/canvas/WebGLRenderbuffer.cpp
+++ b/dom/canvas/WebGLRenderbuffer.cpp
@@ -51,7 +51,6 @@ WebGLRenderbuffer::WebGLRenderbuffer(WebGLContext *context)
     , mInternalFormatForGL(0)
     , mImageDataStatus(WebGLImageDataStatus::NoImageData)
 {
-    SetIsDOMBinding();
     mContext->MakeContextCurrent();
 
     mContext->gl->fGenRenderbuffers(1, &mPrimaryRB);
diff --git a/dom/canvas/WebGLSampler.cpp b/dom/canvas/WebGLSampler.cpp
index 7d577398390..fb4d40e8f72 100644
--- a/dom/canvas/WebGLSampler.cpp
+++ b/dom/canvas/WebGLSampler.cpp
@@ -15,7 +15,6 @@ using namespace mozilla;
 WebGLSampler::WebGLSampler(WebGLContext* context)
     : WebGLContextBoundObject(context)
 {
-    SetIsDOMBinding();
     MOZ_CRASH("Not Implemented.");
 }
 
diff --git a/dom/canvas/WebGLShader.cpp b/dom/canvas/WebGLShader.cpp
index 57cf2d94abd..cbe0ace5f04 100644
--- a/dom/canvas/WebGLShader.cpp
+++ b/dom/canvas/WebGLShader.cpp
@@ -24,7 +24,6 @@ WebGLShader::WebGLShader(WebGLContext *context, GLenum stype)
     , mAttribMaxNameLength(0)
     , mCompileStatus(false)
 {
-    SetIsDOMBinding();
     mContext->MakeContextCurrent();
     mGLName = mContext->gl->fCreateShader(mType);
     mContext->mShaders.insertBack(this);
diff --git a/dom/canvas/WebGLTexture.cpp b/dom/canvas/WebGLTexture.cpp
index 9cbf8d7d0c9..6e75ad8277e 100644
--- a/dom/canvas/WebGLTexture.cpp
+++ b/dom/canvas/WebGLTexture.cpp
@@ -35,7 +35,6 @@ WebGLTexture::WebGLTexture(WebGLContext *context)
     , mImmutable(false)
     , mFakeBlackStatus(WebGLTextureFakeBlackStatus::IncompleteTexture)
 {
-    SetIsDOMBinding();
     mContext->MakeContextCurrent();
     mContext->gl->fGenTextures(1, &mGLName);
     mContext->mTextures.insertBack(this);
diff --git a/dom/canvas/WebGLTransformFeedback.cpp b/dom/canvas/WebGLTransformFeedback.cpp
index 4e1ca978500..1494b65b0c3 100644
--- a/dom/canvas/WebGLTransformFeedback.cpp
+++ b/dom/canvas/WebGLTransformFeedback.cpp
@@ -15,7 +15,6 @@ using namespace mozilla;
 WebGLTransformFeedback::WebGLTransformFeedback(WebGLContext* context)
     : WebGLContextBoundObject(context)
 {
-    SetIsDOMBinding();
     MOZ_CRASH("Not Implemented.");
 }
 
diff --git a/dom/canvas/WebGLVertexArray.cpp b/dom/canvas/WebGLVertexArray.cpp
index 211dcbeb77d..93d519f0eac 100644
--- a/dom/canvas/WebGLVertexArray.cpp
+++ b/dom/canvas/WebGLVertexArray.cpp
@@ -23,7 +23,6 @@ WebGLVertexArray::WebGLVertexArray(WebGLContext* context)
     : WebGLBindableName<VAOBinding>()
     , WebGLContextBoundObject(context)
 {
-    SetIsDOMBinding();
     context->mVertexArrays.insertBack(this);
 }
 
diff --git a/dom/cellbroadcast/CellBroadcastMessage.cpp b/dom/cellbroadcast/CellBroadcastMessage.cpp
index 261b64b0ba3..c8e90b52608 100644
--- a/dom/cellbroadcast/CellBroadcastMessage.cpp
+++ b/dom/cellbroadcast/CellBroadcastMessage.cpp
@@ -97,8 +97,6 @@ CellBroadcastMessage::CellBroadcastMessage(nsPIDOMWindow* aWindow,
   if (aCdmaServiceCategory <= 0xFFFFU) {
     mCdmaServiceCategory.SetValue(static_cast<uint16_t>(aCdmaServiceCategory));
   }
-
-  SetIsDOMBinding();
 }
 
 JSObject*
@@ -140,8 +138,6 @@ CellBroadcastEtwsInfo::CellBroadcastEtwsInfo(nsPIDOMWindow* aWindow,
     mWarningType.SetValue(
       ToWebidlEnum<CellBroadcastEtwsWarningType>(aWarningType));
   }
-
-  SetIsDOMBinding();
 }
 
 JSObject*
diff --git a/dom/crypto/CryptoKey.cpp b/dom/crypto/CryptoKey.cpp
index 3647ecb27b4..002fdf9521d 100644
--- a/dom/crypto/CryptoKey.cpp
+++ b/dom/crypto/CryptoKey.cpp
@@ -55,7 +55,6 @@ CryptoKey::CryptoKey(nsIGlobalObject* aGlobal)
   , mPrivateKey(nullptr)
   , mPublicKey(nullptr)
 {
-  SetIsDOMBinding();
 }
 
 CryptoKey::~CryptoKey()
diff --git a/dom/events/CompositionEvent.cpp b/dom/events/CompositionEvent.cpp
index 68e2dca6269..496352a773d 100644
--- a/dom/events/CompositionEvent.cpp
+++ b/dom/events/CompositionEvent.cpp
@@ -32,7 +32,8 @@ CompositionEvent::CompositionEvent(EventTarget* aOwner,
     mEvent->mFlags.mCancelable = false;
   }
 
-  mData = mEvent->AsCompositionEvent()->data;
+  // XXX Do we really need to duplicate the data value?
+  mData = mEvent->AsCompositionEvent()->mData;
   // TODO: Native event should have locale information.
 }
 
diff --git a/dom/events/DOMEventTargetHelper.h b/dom/events/DOMEventTargetHelper.h
index 5995dd306f1..f41eb577130 100644
--- a/dom/events/DOMEventTargetHelper.h
+++ b/dom/events/DOMEventTargetHelper.h
@@ -42,8 +42,6 @@ public:
     , mHasOrHasHadOwnerWindow(false)
   {
     BindToOwner(aWindow);
-    // All objects coming through here are WebIDL objects
-    SetIsDOMBinding();
   }
   explicit DOMEventTargetHelper(DOMEventTargetHelper* aOther)
     : mParentObject(nullptr)
@@ -51,8 +49,6 @@ public:
     , mHasOrHasHadOwnerWindow(false)
   {
     BindToOwner(aOther);
-    // All objects coming through here are WebIDL objects
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/dom/events/DataTransfer.cpp b/dom/events/DataTransfer.cpp
index 6ce6c5ad3cd..193ccec4fee 100644
--- a/dom/events/DataTransfer.cpp
+++ b/dom/events/DataTransfer.cpp
@@ -83,7 +83,6 @@ DataTransfer::DataTransfer(nsISupports* aParent, uint32_t aEventType,
     mDragImageY(0)
 {
   MOZ_ASSERT(mParent);
-  SetIsDOMBinding();
   // For these events, we want to be able to add data to the data transfer, so
   // clear the readonly state. Otherwise, the data is already present. For
   // external usage, cache the data from the native clipboard or drag.
@@ -129,7 +128,6 @@ DataTransfer::DataTransfer(nsISupports* aParent,
     mDragImageY(aDragImageY)
 {
   MOZ_ASSERT(mParent);
-  SetIsDOMBinding();
   // The items are copied from aItems into mItems. There is no need to copy
   // the actual data in the items as the data transfer will be read only. The
   // draggesture and dragstart events are the only times when items are
diff --git a/dom/events/DeviceMotionEvent.cpp b/dom/events/DeviceMotionEvent.cpp
index 5ec72db4353..8e9b1dfc076 100644
--- a/dom/events/DeviceMotionEvent.cpp
+++ b/dom/events/DeviceMotionEvent.cpp
@@ -109,7 +109,6 @@ DeviceAcceleration::DeviceAcceleration(DeviceMotionEvent* aOwner,
   , mY(aY)
   , mZ(aZ)
 {
-  SetIsDOMBinding();
 }
 
 DeviceAcceleration::~DeviceAcceleration()
@@ -134,7 +133,6 @@ DeviceRotationRate::DeviceRotationRate(DeviceMotionEvent* aOwner,
   , mBeta(aBeta)
   , mGamma(aGamma)
 {
-  SetIsDOMBinding();
 }
 
 DeviceRotationRate::~DeviceRotationRate()
diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp
index ff96b4acfde..cebeeffad75 100644
--- a/dom/events/Event.cpp
+++ b/dom/events/Event.cpp
@@ -62,7 +62,6 @@ Event::ConstructorInit(EventTarget* aOwner,
                        nsPresContext* aPresContext,
                        WidgetEvent* aEvent)
 {
-  SetIsDOMBinding();
   SetOwner(aOwner);
   mIsMainThreadEvent = mOwner || NS_IsMainThread();
   if (mIsMainThreadEvent) {
diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp
index 16ec46a3d53..1388fa29bc9 100644
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -722,9 +722,6 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
     case eDragEventClass:
       return NS_NewDOMDragEvent(aDOMEvent, aOwner, aPresContext,
                                 aEvent->AsDragEvent());
-    case eTextEventClass:
-      return NS_NewDOMUIEvent(aDOMEvent, aOwner, aPresContext,
-                              aEvent->AsTextEvent());
     case eClipboardEventClass:
       return NS_NewDOMClipboardEvent(aDOMEvent, aOwner, aPresContext,
                                      aEvent->AsClipboardEvent());
@@ -772,14 +769,14 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
   if (aEventType.LowerCaseEqualsLiteral("keyboardevent") ||
       aEventType.LowerCaseEqualsLiteral("keyevents"))
     return NS_NewDOMKeyboardEvent(aDOMEvent, aOwner, aPresContext, nullptr);
-  if (aEventType.LowerCaseEqualsLiteral("compositionevent"))
+  if (aEventType.LowerCaseEqualsLiteral("compositionevent") ||
+      aEventType.LowerCaseEqualsLiteral("textevent") ||
+      aEventType.LowerCaseEqualsLiteral("textevents")) {
     return NS_NewDOMCompositionEvent(aDOMEvent, aOwner, aPresContext, nullptr);
+  }
   if (aEventType.LowerCaseEqualsLiteral("mutationevent") ||
         aEventType.LowerCaseEqualsLiteral("mutationevents"))
     return NS_NewDOMMutationEvent(aDOMEvent, aOwner, aPresContext, nullptr);
-  if (aEventType.LowerCaseEqualsLiteral("textevent") ||
-      aEventType.LowerCaseEqualsLiteral("textevents"))
-    return NS_NewDOMUIEvent(aDOMEvent, aOwner, aPresContext, nullptr);
   if (aEventType.LowerCaseEqualsLiteral("deviceorientationevent")) {
     DeviceOrientationEventInit init;
     nsRefPtr<DeviceOrientationEvent> event =
diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
index 607ce7b3246..4864ab98cba 100644
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -651,10 +651,14 @@ NON_IDL_EVENT(speakerforcedchange,
               eBasicEventClass)
 
 // Events that only have on* attributes on XUL elements
+
+ // "text" event is legacy event for modifying composition string in nsEditor.
+ // This shouldn't be used by web/xul apps.  "compositionupdate" should be
+ // used instead.
 NON_IDL_EVENT(text,
-              NS_TEXT_TEXT,
+              NS_COMPOSITION_CHANGE,
               EventNameType_XUL,
-              eTextEventClass)
+              eCompositionEventClass)
 NON_IDL_EVENT(compositionstart,
               NS_COMPOSITION_START,
               EventNameType_XUL,
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index dc5e5b98d7b..785ade495ea 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -796,18 +796,6 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
       DoContentCommandScrollEvent(aEvent->AsContentCommandEvent());
     }
     break;
-  case NS_TEXT_TEXT:
-    {
-      WidgetTextEvent *textEvent = aEvent->AsTextEvent();
-      if (IsTargetCrossProcess(textEvent)) {
-        // Will not be handled locally, remote the event
-        if (GetCrossProcessTarget()->SendTextEvent(*textEvent)) {
-          // Cancel local dispatching
-          aEvent->mFlags.mPropagationStopped = true;
-        }
-      }
-    }
-    break;
   case NS_COMPOSITION_START:
     if (aEvent->mFlags.mIsTrusted) {
       // If the event is trusted event, set the selected text to data of
@@ -817,10 +805,11 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
                                            compositionEvent->widget);
       DoQuerySelectedText(&selectedText);
       NS_ASSERTION(selectedText.mSucceeded, "Failed to get selected text");
-      compositionEvent->data = selectedText.mReply.mString;
+      compositionEvent->mData = selectedText.mReply.mString;
     }
     // through to compositionend handling
   case NS_COMPOSITION_END:
+  case NS_COMPOSITION_CHANGE:
     {
       WidgetCompositionEvent* compositionEvent = aEvent->AsCompositionEvent();
       if (IsTargetCrossProcess(compositionEvent)) {
diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp
index 1f99df00bac..7c47231e025 100644
--- a/dom/events/IMEStateManager.cpp
+++ b/dom/events/IMEStateManager.cpp
@@ -130,19 +130,6 @@ GetIMEStateSetOpenName(IMEState::Open aOpen)
   }
 }
 
-static const char*
-GetEventClassIDName(EventClassID aEventClassID)
-{
-  switch (aEventClassID) {
-    case eCompositionEventClass:
-      return "eCompositionEventClass";
-    case eTextEventClass:
-      return "eTextEventClass";
-    default:
-      return "unacceptable event struct type";
-  }
-}
-
 static const char*
 GetEventMessageName(uint32_t aMessage)
 {
@@ -153,8 +140,8 @@ GetEventMessageName(uint32_t aMessage)
       return "NS_COMPOSITION_END";
     case NS_COMPOSITION_UPDATE:
       return "NS_COMPOSITION_UPDATE";
-    case NS_TEXT_TEXT:
-      return "NS_TEXT_TEXT";
+    case NS_COMPOSITION_CHANGE:
+      return "NS_COMPOSITION_CHANGE";
     default:
       return "unacceptable event message";
   }
@@ -883,40 +870,37 @@ IMEStateManager::EnsureTextCompositionArray()
 
 // static
 void
-IMEStateManager::DispatchCompositionEvent(nsINode* aEventTargetNode,
-                                          nsPresContext* aPresContext,
-                                          WidgetEvent* aEvent,
-                                          nsEventStatus* aStatus,
-                                          EventDispatchingCallback* aCallBack,
-                                          bool aIsSynthesized)
+IMEStateManager::DispatchCompositionEvent(
+                   nsINode* aEventTargetNode,
+                   nsPresContext* aPresContext,
+                   WidgetCompositionEvent* aCompositionEvent,
+                   nsEventStatus* aStatus,
+                   EventDispatchingCallback* aCallBack,
+                   bool aIsSynthesized)
 {
   PR_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::DispatchCompositionEvent(aNode=0x%p, "
-     "aPresContext=0x%p, aEvent={ mClass=%s, message=%s, "
+     "aPresContext=0x%p, aCompositionEvent={ message=%s, "
      "mFlags={ mIsTrusted=%s, mPropagationStopped=%s } }, "
      "aIsSynthesized=%s)",
      aEventTargetNode, aPresContext,
-     GetEventClassIDName(aEvent->mClass),
-     GetEventMessageName(aEvent->message),
-     GetBoolName(aEvent->mFlags.mIsTrusted),
-     GetBoolName(aEvent->mFlags.mPropagationStopped),
+     GetEventMessageName(aCompositionEvent->message),
+     GetBoolName(aCompositionEvent->mFlags.mIsTrusted),
+     GetBoolName(aCompositionEvent->mFlags.mPropagationStopped),
      GetBoolName(aIsSynthesized)));
 
-  MOZ_ASSERT(aEvent->mClass == eCompositionEventClass ||
-             aEvent->mClass == eTextEventClass);
-  if (!aEvent->mFlags.mIsTrusted || aEvent->mFlags.mPropagationStopped) {
+  if (!aCompositionEvent->mFlags.mIsTrusted ||
+      aCompositionEvent->mFlags.mPropagationStopped) {
     return;
   }
 
-  MOZ_ASSERT(aEvent->message != NS_COMPOSITION_UPDATE,
+  MOZ_ASSERT(aCompositionEvent->message != NS_COMPOSITION_UPDATE,
              "compositionupdate event shouldn't be dispatched manually");
 
   EnsureTextCompositionArray();
 
-  WidgetGUIEvent* GUIEvent = aEvent->AsGUIEvent();
-
   nsRefPtr<TextComposition> composition =
-    sTextCompositions->GetCompositionFor(GUIEvent->widget);
+    sTextCompositions->GetCompositionFor(aCompositionEvent->widget);
   if (!composition) {
     // If synthesized event comes after delayed native composition events
     // for request of commit or cancel, we should ignore it.
@@ -926,18 +910,20 @@ IMEStateManager::DispatchCompositionEvent(nsINode* aEventTargetNode,
     PR_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::DispatchCompositionEvent(), "
        "adding new TextComposition to the array"));
-    MOZ_ASSERT(GUIEvent->message == NS_COMPOSITION_START);
-    composition = new TextComposition(aPresContext, aEventTargetNode, GUIEvent);
+    MOZ_ASSERT(aCompositionEvent->message == NS_COMPOSITION_START);
+    composition =
+      new TextComposition(aPresContext, aEventTargetNode, aCompositionEvent);
     sTextCompositions->AppendElement(composition);
   }
 #ifdef DEBUG
   else {
-    MOZ_ASSERT(GUIEvent->message != NS_COMPOSITION_START);
+    MOZ_ASSERT(aCompositionEvent->message != NS_COMPOSITION_START);
   }
 #endif // #ifdef DEBUG
 
   // Dispatch the event on composing target.
-  composition->DispatchEvent(GUIEvent, aStatus, aCallBack, aIsSynthesized);
+  composition->DispatchCompositionEvent(aCompositionEvent, aStatus, aCallBack,
+                                        aIsSynthesized);
 
   // WARNING: the |composition| might have been destroyed already.
 
@@ -953,9 +939,9 @@ IMEStateManager::DispatchCompositionEvent(nsINode* aEventTargetNode,
   //       destroy the TextComposition with synthesized compositionend event.
   if ((!aIsSynthesized ||
        composition->WasNativeCompositionEndEventDiscarded()) &&
-      aEvent->message == NS_COMPOSITION_END) {
+      aCompositionEvent->message == NS_COMPOSITION_END) {
     TextCompositionArray::index_type i =
-      sTextCompositions->IndexOf(GUIEvent->widget);
+      sTextCompositions->IndexOf(aCompositionEvent->widget);
     if (i != TextCompositionArray::NoIndex) {
       PR_LOG(sISMLog, PR_LOG_DEBUG,
         ("ISM:   IMEStateManager::DispatchCompositionEvent(), "
@@ -969,34 +955,31 @@ IMEStateManager::DispatchCompositionEvent(nsINode* aEventTargetNode,
 
 // static
 void
-IMEStateManager::OnCompositionEventDiscarded(WidgetEvent* aEvent)
+IMEStateManager::OnCompositionEventDiscarded(
+                   const WidgetCompositionEvent* aCompositionEvent)
 {
   // Note that this method is never called for synthesized events for emulating
   // commit or cancel composition.
 
   PR_LOG(sISMLog, PR_LOG_ALWAYS,
-    ("ISM: IMEStateManager::OnCompositionEventDiscarded(aEvent={ mClass=%s, "
+    ("ISM: IMEStateManager::OnCompositionEventDiscarded(aCompositionEvent={ "
      "message=%s, mFlags={ mIsTrusted=%s } })",
-     GetEventClassIDName(aEvent->mClass),
-     GetEventMessageName(aEvent->message),
-     GetBoolName(aEvent->mFlags.mIsTrusted)));
+     GetEventMessageName(aCompositionEvent->message),
+     GetBoolName(aCompositionEvent->mFlags.mIsTrusted)));
 
-  MOZ_ASSERT(aEvent->mClass == eCompositionEventClass ||
-             aEvent->mClass == eTextEventClass);
-  if (!aEvent->mFlags.mIsTrusted) {
+  if (!aCompositionEvent->mFlags.mIsTrusted) {
     return;
   }
 
   // Ignore compositionstart for now because sTextCompositions may not have
   // been created yet.
-  if (aEvent->message == NS_COMPOSITION_START) {
+  if (aCompositionEvent->message == NS_COMPOSITION_START) {
     return;
   }
 
-  WidgetGUIEvent* GUIEvent = aEvent->AsGUIEvent();
   nsRefPtr<TextComposition> composition =
-    sTextCompositions->GetCompositionFor(GUIEvent->widget);
-  composition->OnCompositionEventDiscarded(GUIEvent);
+    sTextCompositions->GetCompositionFor(aCompositionEvent->widget);
+  composition->OnCompositionEventDiscarded(aCompositionEvent);
 }
 
 // static
@@ -1231,13 +1214,11 @@ IMEStateManager::GetTextCompositionFor(nsIWidget* aWidget)
 
 // static
 already_AddRefed<TextComposition>
-IMEStateManager::GetTextCompositionFor(WidgetGUIEvent* aEvent)
+IMEStateManager::GetTextCompositionFor(WidgetGUIEvent* aGUIEvent)
 {
-  MOZ_ASSERT(aEvent->AsCompositionEvent() || aEvent->AsTextEvent() ||
-             aEvent->AsKeyboardEvent(),
-             "aEvent has to be WidgetCompositionEvent, WidgetTextEvent or "
-             "WidgetKeyboardEvent");
-  return GetTextCompositionFor(aEvent->widget);
+  MOZ_ASSERT(aGUIEvent->AsCompositionEvent() || aGUIEvent->AsKeyboardEvent(),
+    "aGUIEvent has to be WidgetCompositionEvent or WidgetKeyboardEvent");
+  return GetTextCompositionFor(aGUIEvent->widget);
 }
 
 } // namespace mozilla
diff --git a/dom/events/IMEStateManager.h b/dom/events/IMEStateManager.h
index 0a1b3fd0e71..665edcc2d0f 100644
--- a/dom/events/IMEStateManager.h
+++ b/dom/events/IMEStateManager.h
@@ -92,24 +92,25 @@ public:
                               nsIContent* aContent);
 
   /**
-   * All DOM composition events and DOM text events must be dispatched via
-   * DispatchCompositionEvent() for storing the composition target
-   * and ensuring a set of composition events must be fired the stored target.
-   * If the stored composition event target is destroying, this removes the
-   * stored composition automatically.
+   * All composition events must be dispatched via DispatchCompositionEvent()
+   * for storing the composition target and ensuring a set of composition
+   * events must be fired the stored target.  If the stored composition event
+   * target is destroying, this removes the stored composition automatically.
    */
-  static void DispatchCompositionEvent(nsINode* aEventTargetNode,
-                                       nsPresContext* aPresContext,
-                                       WidgetEvent* aEvent,
-                                       nsEventStatus* aStatus,
-                                       EventDispatchingCallback* aCallBack,
-                                       bool aIsSynthesized = false);
+  static void DispatchCompositionEvent(
+                nsINode* aEventTargetNode,
+                nsPresContext* aPresContext,
+                WidgetCompositionEvent* aCompositionEvent,
+                nsEventStatus* aStatus,
+                EventDispatchingCallback* aCallBack,
+                bool aIsSynthesized = false);
 
   /**
-   * This is called when PresShell ignores composition event or text event due
-   * to not safe to dispatch events.
+   * This is called when PresShell ignores a composition event due to not safe
+   * to dispatch events.
    */
-  static void OnCompositionEventDiscarded(WidgetEvent* aEvent);
+  static void OnCompositionEventDiscarded(
+                const WidgetCompositionEvent* aCompositionEvent);
 
   /**
    * Get TextComposition from widget.
@@ -120,11 +121,10 @@ public:
   /**
    * Returns TextComposition instance for the event.
    *
-   * @param aEvent      Should be a composition event or a text event which is
-   *                    being dispatched.
+   * @param aGUIEvent Should be a composition event which is being dispatched.
    */
   static already_AddRefed<TextComposition>
-    GetTextCompositionFor(WidgetGUIEvent* aEvent);
+    GetTextCompositionFor(WidgetGUIEvent* aGUIEvent);
 
   /**
    * Send a notification to IME.  It depends on the IME or platform spec what
diff --git a/dom/events/ImageCaptureError.cpp b/dom/events/ImageCaptureError.cpp
index d81d39093ef..8e8ea4f4d99 100644
--- a/dom/events/ImageCaptureError.cpp
+++ b/dom/events/ImageCaptureError.cpp
@@ -24,7 +24,6 @@ ImageCaptureError::ImageCaptureError(nsISupports* aParent,
   , mMessage(aMessage)
   , mCode(aCode)
 {
-  SetIsDOMBinding();
 }
 
 ImageCaptureError::~ImageCaptureError()
diff --git a/dom/events/PaintRequest.h b/dom/events/PaintRequest.h
index b22a51ca074..3d957c807f0 100644
--- a/dom/events/PaintRequest.h
+++ b/dom/events/PaintRequest.h
@@ -25,7 +25,6 @@ public:
     : mParent(aParent)
   {
     mRequest.mFlags = 0;
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -61,7 +60,6 @@ class PaintRequestList MOZ_FINAL : public nsISupports,
 public:
   explicit PaintRequestList(nsIDOMEvent *aParent) : mParent(aParent)
   {
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/dom/events/TextComposition.cpp b/dom/events/TextComposition.cpp
index 5651f521c7b..e9e2a0c84b4 100644
--- a/dom/events/TextComposition.cpp
+++ b/dom/events/TextComposition.cpp
@@ -29,13 +29,14 @@ namespace mozilla {
 
 TextComposition::TextComposition(nsPresContext* aPresContext,
                                  nsINode* aNode,
-                                 WidgetGUIEvent* aEvent)
+                                 WidgetCompositionEvent* aCompositionEvent)
   : mPresContext(aPresContext)
   , mNode(aNode)
-  , mNativeContext(aEvent->widget->GetInputContext().mNativeIMEContext)
+  , mNativeContext(
+      aCompositionEvent->widget->GetInputContext().mNativeIMEContext)
   , mCompositionStartOffset(0)
   , mCompositionTargetOffset(0)
-  , mIsSynthesizedForTests(aEvent->mFlags.mIsSynthesizedForTests)
+  , mIsSynthesizedForTests(aCompositionEvent->mFlags.mIsSynthesizedForTests)
   , mIsComposing(false)
   , mIsEditorHandlingEvent(false)
   , mIsRequestingCommit(false)
@@ -61,48 +62,48 @@ TextComposition::MatchesNativeContext(nsIWidget* aWidget) const
 }
 
 bool
-TextComposition::MaybeDispatchCompositionUpdate(const WidgetTextEvent* aEvent)
+TextComposition::MaybeDispatchCompositionUpdate(
+                   const WidgetCompositionEvent* aCompositionEvent)
 {
   if (Destroyed()) {
     return false;
   }
 
-  if (mLastData == aEvent->theText) {
+  if (mLastData == aCompositionEvent->mData) {
     return true;
   }
 
-  WidgetCompositionEvent compositionUpdate(aEvent->mFlags.mIsTrusted,
+  WidgetCompositionEvent compositionUpdate(aCompositionEvent->mFlags.mIsTrusted,
                                            NS_COMPOSITION_UPDATE,
-                                           aEvent->widget);
-  compositionUpdate.time = aEvent->time;
-  compositionUpdate.timeStamp = aEvent->timeStamp;
-  compositionUpdate.data = aEvent->theText;
+                                           aCompositionEvent->widget);
+  compositionUpdate.time = aCompositionEvent->time;
+  compositionUpdate.timeStamp = aCompositionEvent->timeStamp;
+  compositionUpdate.mData = aCompositionEvent->mData;
   compositionUpdate.mFlags.mIsSynthesizedForTests =
-    aEvent->mFlags.mIsSynthesizedForTests;
+    aCompositionEvent->mFlags.mIsSynthesizedForTests;
 
   nsEventStatus status = nsEventStatus_eConsumeNoDefault;
-  mLastData = compositionUpdate.data;
+  mLastData = compositionUpdate.mData;
   EventDispatcher::Dispatch(mNode, mPresContext,
                             &compositionUpdate, nullptr, &status, nullptr);
   return !Destroyed();
 }
 
 void
-TextComposition::OnCompositionEventDiscarded(const WidgetGUIEvent* aEvent)
+TextComposition::OnCompositionEventDiscarded(
+                   const WidgetCompositionEvent* aCompositionEvent)
 {
   // Note that this method is never called for synthesized events for emulating
   // commit or cancel composition.
 
-  MOZ_ASSERT(aEvent->mFlags.mIsTrusted,
+  MOZ_ASSERT(aCompositionEvent->mFlags.mIsTrusted,
              "Shouldn't be called with untrusted event");
-  MOZ_ASSERT(aEvent->mClass == eCompositionEventClass ||
-             aEvent->mClass == eTextEventClass);
 
   // XXX If composition events are discarded, should we dispatch them with
   //     runnable event?  However, even if we do so, it might make native IME
   //     confused due to async modification.  Especially when native IME is
   //     TSF.
-  if (aEvent->message != NS_COMPOSITION_END) {
+  if (aCompositionEvent->message != NS_COMPOSITION_END) {
     return;
   }
 
@@ -110,10 +111,11 @@ TextComposition::OnCompositionEventDiscarded(const WidgetGUIEvent* aEvent)
 }
 
 void
-TextComposition::DispatchEvent(WidgetGUIEvent* aEvent,
-                               nsEventStatus* aStatus,
-                               EventDispatchingCallback* aCallBack,
-                               bool aIsSynthesized)
+TextComposition::DispatchCompositionEvent(
+                   WidgetCompositionEvent* aCompositionEvent,
+                   nsEventStatus* aStatus,
+                   EventDispatchingCallback* aCallBack,
+                   bool aIsSynthesized)
 {
   if (Destroyed()) {
     *aStatus = nsEventStatus_eConsumeNoDefault;
@@ -144,12 +146,10 @@ TextComposition::DispatchEvent(WidgetGUIEvent* aEvent,
   // 2. non-empty string is committed at requesting cancel.
   if (!aIsSynthesized && (mIsRequestingCommit || mIsRequestingCancel)) {
     nsString* committingData = nullptr;
-    switch (aEvent->message) {
+    switch (aCompositionEvent->message) {
       case NS_COMPOSITION_END:
-        committingData = &aEvent->AsCompositionEvent()->data;
-        break;
-      case NS_TEXT_TEXT:
-        committingData = &aEvent->AsTextEvent()->theText;
+      case NS_COMPOSITION_CHANGE:
+        committingData = &aCompositionEvent->mData;
         break;
       default:
         NS_WARNING("Unexpected event comes during committing or "
@@ -166,46 +166,47 @@ TextComposition::DispatchEvent(WidgetGUIEvent* aEvent,
     }
   }
 
-  if (aEvent->message == NS_TEXT_TEXT) {
-    if (!MaybeDispatchCompositionUpdate(aEvent->AsTextEvent())) {
+  if (aCompositionEvent->message == NS_COMPOSITION_CHANGE) {
+    if (!MaybeDispatchCompositionUpdate(aCompositionEvent)) {
       return;
     }
   }
 
   EventDispatcher::Dispatch(mNode, mPresContext,
-                            aEvent, nullptr, aStatus, aCallBack);
+                            aCompositionEvent, nullptr, aStatus, aCallBack);
 
   if (NS_WARN_IF(Destroyed())) {
     return;
   }
 
-  // Emulate editor behavior of text event handler if no editor handles
-  // composition/text events.
-  if (aEvent->message == NS_TEXT_TEXT && !HasEditor()) {
-    EditorWillHandleTextEvent(aEvent->AsTextEvent());
-    EditorDidHandleTextEvent();
+  // Emulate editor behavior of compositionchange event (DOM text event) handler
+  // if no editor handles composition events.
+  if (aCompositionEvent->message == NS_COMPOSITION_CHANGE && !HasEditor()) {
+    EditorWillHandleCompositionChangeEvent(aCompositionEvent);
+    EditorDidHandleCompositionChangeEvent();
   }
 
 #ifdef DEBUG
-  else if (aEvent->message == NS_COMPOSITION_END) {
+  else if (aCompositionEvent->message == NS_COMPOSITION_END) {
     MOZ_ASSERT(!mIsComposing, "Why is the editor still composing?");
     MOZ_ASSERT(!HasEditor(), "Why does the editor still keep to hold this?");
   }
 #endif // #ifdef DEBUG
 
   // Notify composition update to widget if possible
-  NotityUpdateComposition(aEvent);
+  NotityUpdateComposition(aCompositionEvent);
 }
 
 void
-TextComposition::NotityUpdateComposition(WidgetGUIEvent* aEvent)
+TextComposition::NotityUpdateComposition(
+                   const WidgetCompositionEvent* aCompositionEvent)
 {
   nsEventStatus status;
 
   // When compositon start, notify the rect of first offset character.
   // When not compositon start, notify the rect of selected composition
-  // string if text event.
-  if (aEvent->message == NS_COMPOSITION_START) {
+  // string if compositionchange event.
+  if (aCompositionEvent->message == NS_COMPOSITION_START) {
     nsCOMPtr<nsIWidget> widget = mPresContext->GetRootWidget();
     // Update composition start offset
     WidgetQueryContentEvent selectedTextEvent(true,
@@ -220,11 +221,11 @@ TextComposition::NotityUpdateComposition(WidgetGUIEvent* aEvent)
       mCompositionStartOffset = 0;
     }
     mCompositionTargetOffset = mCompositionStartOffset;
-  } else if (aEvent->mClass != eTextEventClass) {
-    return;
-  } else {
+  } else if (aCompositionEvent->message == NS_COMPOSITION_CHANGE) {
     mCompositionTargetOffset =
-      mCompositionStartOffset + aEvent->AsTextEvent()->TargetClauseOffset();
+      mCompositionStartOffset + aCompositionEvent->TargetClauseOffset();
+  } else {
+    return;
   }
 
   NotifyIME(NOTIFY_IME_OF_COMPOSITION_UPDATE);
@@ -265,9 +266,8 @@ TextComposition::RequestToCommit(nsIWidget* aWidget, bool aDiscard)
       mIsRequestingCommit = true;
     }
     if (!mIsSynthesizedForTests) {
-      // FYI: CompositionEvent and TextEvent caused by a call of NotifyIME()
-      //      may be discarded by PresShell if it's not safe to dispatch the
-      //      event.
+      // FYI: CompositionEvents caused by a call of NotifyIME() may be
+      //      discarded by PresShell if it's not safe to dispatch the event.
       nsresult rv =
         aWidget->NotifyIME(IMENotification(aDiscard ?
                                              REQUEST_TO_CANCEL_COMPOSITION :
@@ -286,25 +286,25 @@ TextComposition::RequestToCommit(nsIWidget* aWidget, bool aDiscard)
       nsAutoString commitData(aDiscard ? EmptyString() : lastData);
       bool changingData = lastData != commitData;
 
-      WidgetTextEvent textEvent(true, NS_TEXT_TEXT, widget);
-      textEvent.theText = commitData;
-      textEvent.mFlags.mIsSynthesizedForTests = true;
+      WidgetCompositionEvent changeEvent(true, NS_COMPOSITION_CHANGE, widget);
+      changeEvent.mData = commitData;
+      changeEvent.mFlags.mIsSynthesizedForTests = true;
 
-      MaybeDispatchCompositionUpdate(&textEvent);
+      MaybeDispatchCompositionUpdate(&changeEvent);
 
       // If changing the data or committing string isn't empty, we need to
-      // dispatch text event for setting the composition string without
-      // IME selection.
+      // dispatch compositionchange event for setting the composition string
+      // without IME selection.
       if (!Destroyed() && !widget->Destroyed() &&
           (changingData || !commitData.IsEmpty())) {
         nsEventStatus status = nsEventStatus_eIgnore;
-        widget->DispatchEvent(&textEvent, status);
+        widget->DispatchEvent(&changeEvent, status);
       }
 
       if (!Destroyed() && !widget->Destroyed()) {
         nsEventStatus status = nsEventStatus_eIgnore;
         WidgetCompositionEvent endEvent(true, NS_COMPOSITION_END, widget);
-        endEvent.data = commitData;
+        endEvent.mData = commitData;
         endEvent.mFlags.mIsSynthesizedForTests = true;
         widget->DispatchEvent(&endEvent, status);
       }
@@ -321,11 +321,11 @@ TextComposition::RequestToCommit(nsIWidget* aWidget, bool aDiscard)
   // Otherwise, synthesize the commit in content.
   nsAutoString data(aDiscard ? EmptyString() : lastData);
   // If the last composition string and new data are different, we need to
-  // dispatch text event for removing IME selection.  However, if the commit
-  // string is empty string and it's not changed from the last data, we don't
-  // need to dispatch text event.
+  // dispatch compositionchange event for removing IME selection.  However, if
+  // the commit string is empty string and it's not changed from the last data,
+  // we don't need to dispatch compositionchange event.
   if (lastData != data || !data.IsEmpty()) {
-    DispatchCompositionEventRunnable(NS_TEXT_TEXT, data, true);
+    DispatchCompositionEventRunnable(NS_COMPOSITION_CHANGE, data, true);
   }
   DispatchCompositionEventRunnable(NS_COMPOSITION_END, data, true);
 
@@ -340,19 +340,20 @@ TextComposition::NotifyIME(IMEMessage aMessage)
 }
 
 void
-TextComposition::EditorWillHandleTextEvent(const WidgetTextEvent* aTextEvent)
+TextComposition::EditorWillHandleCompositionChangeEvent(
+                   const WidgetCompositionEvent* aCompositionChangeEvent)
 {
-  mIsComposing = aTextEvent->IsComposing();
-  mRanges = aTextEvent->mRanges;
+  mIsComposing = aCompositionChangeEvent->IsComposing();
+  mRanges = aCompositionChangeEvent->mRanges;
   mIsEditorHandlingEvent = true;
 
-  MOZ_ASSERT(mLastData == aTextEvent->theText,
-    "The text of a text event must be same as previous data attribute value "
-    "of the latest compositionupdate event");
+  MOZ_ASSERT(mLastData == aCompositionChangeEvent->mData,
+    "The text of a compositionchange event must be same as previous data "
+    "attribute value of the latest compositionupdate event");
 }
 
 void
-TextComposition::EditorDidHandleTextEvent()
+TextComposition::EditorDidHandleCompositionChangeEvent()
 {
   mString = mLastData;
   mIsEditorHandlingEvent = false;
@@ -435,7 +436,7 @@ TextComposition::CompositionEventDispatcher::Run()
       ContentEventHandler handler(presContext);
       handler.OnQuerySelectedText(&selectedText);
       NS_ASSERTION(selectedText.mSucceeded, "Failed to get selected text");
-      compStart.data = selectedText.mReply.mString;
+      compStart.mData = selectedText.mReply.mString;
       compStart.mFlags.mIsSynthesizedForTests =
         mTextComposition->IsSynthesizedForTests();
       IMEStateManager::DispatchCompositionEvent(mEventTarget, presContext,
@@ -443,9 +444,10 @@ TextComposition::CompositionEventDispatcher::Run()
                                                 mIsSynthesizedEvent);
       break;
     }
-    case NS_COMPOSITION_END: {
+    case NS_COMPOSITION_END:
+    case NS_COMPOSITION_CHANGE: {
       WidgetCompositionEvent compEvent(true, mEventMessage, widget);
-      compEvent.data = mData;
+      compEvent.mData = mData;
       compEvent.mFlags.mIsSynthesizedForTests =
         mTextComposition->IsSynthesizedForTests();
       IMEStateManager::DispatchCompositionEvent(mEventTarget, presContext,
@@ -453,16 +455,6 @@ TextComposition::CompositionEventDispatcher::Run()
                                                 mIsSynthesizedEvent);
       break;
     }
-    case NS_TEXT_TEXT: {
-      WidgetTextEvent textEvent(true, NS_TEXT_TEXT, widget);
-      textEvent.theText = mData;
-      textEvent.mFlags.mIsSynthesizedForTests =
-        mTextComposition->IsSynthesizedForTests();
-      IMEStateManager::DispatchCompositionEvent(mEventTarget, presContext,
-                                                &textEvent, &status, nullptr,
-                                                mIsSynthesizedEvent);
-      break;
-    }
     default:
       MOZ_CRASH("Unsupported event");
   }
diff --git a/dom/events/TextComposition.h b/dom/events/TextComposition.h
index db0d847ffe6..a9efc9c2087 100644
--- a/dom/events/TextComposition.h
+++ b/dom/events/TextComposition.h
@@ -40,7 +40,7 @@ class TextComposition MOZ_FINAL
 public:
   TextComposition(nsPresContext* aPresContext,
                   nsINode* aNode,
-                  WidgetGUIEvent* aEvent);
+                  WidgetCompositionEvent* aCompositionEvent);
 
   bool Destroyed() const { return !mPresContext; }
   nsPresContext* GetPresContext() const { return mPresContext; }
@@ -50,12 +50,13 @@ public:
   const nsString& LastData() const { return mLastData; }
   // The composition string which is already handled by the focused editor.
   // I.e., this value must be same as the composition string on the focused
-  // editor.  This value is modified at a call of EditorDidHandleTextEvent().
+  // editor.  This value is modified at a call of
+  // EditorDidHandleCompositionChangeEvent().
   // Note that mString and mLastData are different between dispatcing
-  // compositionupdate and text event handled by focused editor.
+  // compositionupdate and compositionchange event handled by focused editor.
   const nsString& String() const { return mString; }
   // Returns the clauses and/or caret range of the composition string.
-  // This is modified at a call of EditorWillHandleTextEvent().
+  // This is modified at a call of EditorWillHandleCompositionChangeEvent().
   // This may return null if there is no clauses and caret.
   // XXX We should return |const TextRangeArray*| here, but it causes compile
   //     error due to inaccessible Release() method.
@@ -124,29 +125,33 @@ public:
   void EndHandlingComposition(nsIEditor* aEditor);
 
   /**
-   * TextEventHandlingMarker class should be created at starting to handle text
-   * event in focused editor.  This calls EditorWillHandleTextEvent() and
-   * EditorDidHandleTextEvent() automatically.
+   * CompositionChangeEventHandlingMarker class should be created at starting
+   * to handle text event in focused editor.  This calls
+   * EditorWillHandleCompositionChangeEvent() and
+   * EditorDidHandleCompositionChangeEvent() automatically.
    */
-  class MOZ_STACK_CLASS TextEventHandlingMarker
+  class MOZ_STACK_CLASS CompositionChangeEventHandlingMarker
   {
   public:
-    TextEventHandlingMarker(TextComposition* aComposition,
-                            const WidgetTextEvent* aTextEvent)
+    CompositionChangeEventHandlingMarker(
+      TextComposition* aComposition,
+      const WidgetCompositionEvent* aCompositionChangeEvent)
       : mComposition(aComposition)
     {
-      mComposition->EditorWillHandleTextEvent(aTextEvent);
+      mComposition->EditorWillHandleCompositionChangeEvent(
+                      aCompositionChangeEvent);
     }
 
-    ~TextEventHandlingMarker()
+    ~CompositionChangeEventHandlingMarker()
     {
-      mComposition->EditorDidHandleTextEvent();
+      mComposition->EditorDidHandleCompositionChangeEvent();
     }
 
   private:
     nsRefPtr<TextComposition> mComposition;
-    TextEventHandlingMarker();
-    TextEventHandlingMarker(const TextEventHandlingMarker& aOther);
+    CompositionChangeEventHandlingMarker();
+    CompositionChangeEventHandlingMarker(
+      const CompositionChangeEventHandlingMarker& aOther);
   };
 
 private:
@@ -232,33 +237,35 @@ private:
   bool HasEditor() const;
 
   /**
-   * EditorWillHandleTextEvent() must be called before the focused editor
-   * handles the text event.
+   * EditorWillHandleCompositionChangeEvent() must be called before the focused
+   * editor handles the compositionchange event.
    */
-  void EditorWillHandleTextEvent(const WidgetTextEvent* aTextEvent);
+  void EditorWillHandleCompositionChangeEvent(
+         const WidgetCompositionEvent* aCompositionChangeEvent);
 
   /**
-   * EditorDidHandleTextEvent() must be called after the focused editor handles
-   * a text event.
+   * EditorDidHandleCompositionChangeEvent() must be called after the focused
+   * editor handles a compositionchange event.
    */
-  void EditorDidHandleTextEvent();
+  void EditorDidHandleCompositionChangeEvent();
 
   /**
-   * DispatchEvent() dispatches the aEvent to the mContent synchronously.
-   * The caller must ensure that it's safe to dispatch the event.
+   * DispatchCompositionEvent() dispatches the aCompositionEvent to the mContent
+   * synchronously. The caller must ensure that it's safe to dispatch the event.
    */
-  void DispatchEvent(WidgetGUIEvent* aEvent,
-                     nsEventStatus* aStatus,
-                     EventDispatchingCallback* aCallBack,
-                     bool aIsSynthesized);
+  void DispatchCompositionEvent(WidgetCompositionEvent* aCompositionEvent,
+                                nsEventStatus* aStatus,
+                                EventDispatchingCallback* aCallBack,
+                                bool aIsSynthesized);
 
   /**
    * MaybeDispatchCompositionUpdate() may dispatch a compositionupdate event
-   * if aEvent changes composition string.
+   * if aCompositionEvent changes composition string.
    * @return Returns false if dispatching the compositionupdate event caused
    *         destroying this composition.
    */
-  bool MaybeDispatchCompositionUpdate(const WidgetTextEvent* aEvent);
+  bool MaybeDispatchCompositionUpdate(
+         const WidgetCompositionEvent* aCompositionEvent);
 
   /**
    * If IME has already dispatched compositionend event but it was discarded
@@ -271,15 +278,16 @@ private:
 
   /**
    * OnCompositionEventDiscarded() is called when PresShell discards
-   * compositionupdate, compositionend or text event due to not safe to
-   * dispatch event.
+   * compositionupdate, compositionend or compositionchange event due to not
+   * safe to dispatch event.
    */
-  void OnCompositionEventDiscarded(const WidgetGUIEvent* aEvent);
+  void OnCompositionEventDiscarded(
+         const WidgetCompositionEvent* aCompositionEvent);
 
   /**
    * Calculate composition offset then notify composition update to widget
    */
-  void NotityUpdateComposition(WidgetGUIEvent* aEvent);
+  void NotityUpdateComposition(const WidgetCompositionEvent* aCompositionEvent);
 
   /**
    * CompositionEventDispatcher dispatches the specified composition (or text)
@@ -306,17 +314,14 @@ private:
   };
 
   /**
-   * DispatchCompositionEventRunnable() dispatches a composition or text event
-   * to the content.  Be aware, if you use this method, nsPresShellEventCB
-   * isn't used.  That means that nsIFrame::HandleEvent() is never called.
+   * DispatchCompositionEventRunnable() dispatches a composition event to the
+   * content.  Be aware, if you use this method, nsPresShellEventCB isn't used.
+   * That means that nsIFrame::HandleEvent() is never called.
    * WARNING: The instance which is managed by IMEStateManager may be
    *          destroyed by this method call.
    *
-   * @param aEventMessage       Must be one of composition event or text event.
-   * @param aData               Used for data value if aEventMessage is
-   *                            NS_COMPOSITION_END.
-   *                            Used for theText value if aEventMessage is
-   *                            NS_TEXT_TEXT.
+   * @param aEventMessage       Must be one of composition events.
+   * @param aData               Used for mData value.
    * @param aIsSynthesizingCommit   true if this is called for synthesizing
    *                                commit or cancel composition.  Otherwise,
    *                                false.
diff --git a/dom/events/Touch.cpp b/dom/events/Touch.cpp
index ade644cdb4a..6e2074f204a 100644
--- a/dom/events/Touch.cpp
+++ b/dom/events/Touch.cpp
@@ -28,7 +28,6 @@ Touch::Touch(EventTarget* aTarget,
              float aRotationAngle,
              float aForce)
 {
-  SetIsDOMBinding();
   mTarget = aTarget;
   mIdentifier = aIdentifier;
   mPagePoint = CSSIntPoint(aPageX, aPageY);
@@ -52,7 +51,6 @@ Touch::Touch(int32_t aIdentifier,
              float aRotationAngle,
              float aForce)
 {
-  SetIsDOMBinding();
   mIdentifier = aIdentifier;
   mPagePoint = CSSIntPoint(0, 0);
   mScreenPoint = nsIntPoint(0, 0);
diff --git a/dom/events/TouchEvent.h b/dom/events/TouchEvent.h
index 3cf8d39f03b..030da9ba418 100644
--- a/dom/events/TouchEvent.h
+++ b/dom/events/TouchEvent.h
@@ -29,7 +29,6 @@ public:
   explicit TouchList(nsISupports* aParent)
     : mParent(aParent)
   {
-    SetIsDOMBinding();
     nsJSContext::LikelyShortLivingObjectCreated();
   }
   TouchList(nsISupports* aParent,
@@ -37,7 +36,6 @@ public:
     : mParent(aParent)
     , mPoints(aTouches)
   {
-    SetIsDOMBinding();
     nsJSContext::LikelyShortLivingObjectCreated();
   }
 
diff --git a/dom/events/UIEvent.cpp b/dom/events/UIEvent.cpp
index 3ea084d21d8..a0637afa577 100644
--- a/dom/events/UIEvent.cpp
+++ b/dom/events/UIEvent.cpp
@@ -344,11 +344,7 @@ bool
 UIEvent::IsChar() const
 {
   WidgetKeyboardEvent* keyEvent = mEvent->AsKeyboardEvent();
-  if (keyEvent) {
-    return keyEvent->isChar;
-  }
-  WidgetTextEvent* textEvent = mEvent->AsTextEvent();
-  return textEvent ? textEvent->isChar : false;
+  return keyEvent ? keyEvent->isChar : false;
 }
 
 NS_IMETHODIMP
diff --git a/dom/fetch/Headers.cpp b/dom/fetch/Headers.cpp
index 9109bc95d7e..ee7ad0c09ea 100644
--- a/dom/fetch/Headers.cpp
+++ b/dom/fetch/Headers.cpp
@@ -109,7 +109,6 @@ Headers::Headers(const Headers& aOther)
   : mOwner(aOther.mOwner)
   , mGuard(aOther.mGuard)
 {
-  SetIsDOMBinding();
   ErrorResult result;
   Fill(aOther, result);
   MOZ_ASSERT(!result.Failed());
diff --git a/dom/fetch/Headers.h b/dom/fetch/Headers.h
index 612d7198f9a..aa945581ae1 100644
--- a/dom/fetch/Headers.h
+++ b/dom/fetch/Headers.h
@@ -53,7 +53,6 @@ public:
     : mOwner(aOwner)
     , mGuard(aGuard)
   {
-    SetIsDOMBinding();
   }
 
   explicit Headers(const Headers& aOther);
diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp
index 8bab8bce5e6..963072c854e 100644
--- a/dom/fetch/Request.cpp
+++ b/dom/fetch/Request.cpp
@@ -44,7 +44,6 @@ Request::Request(nsIGlobalObject* aOwner, InternalRequest* aRequest)
   , mRequest(aRequest)
   , mBodyUsed(false)
 {
-  SetIsDOMBinding();
 }
 
 Request::~Request()
diff --git a/dom/fetch/Response.cpp b/dom/fetch/Response.cpp
index a3d147f613a..385553de708 100644
--- a/dom/fetch/Response.cpp
+++ b/dom/fetch/Response.cpp
@@ -29,7 +29,6 @@ Response::Response(nsISupports* aOwner)
   : mOwner(aOwner)
   , mHeaders(new Headers(aOwner))
 {
-  SetIsDOMBinding();
 }
 
 Response::~Response()
diff --git a/dom/filesystem/Directory.cpp b/dom/filesystem/Directory.cpp
index b3a05c7b69f..39a93e98192 100644
--- a/dom/filesystem/Directory.cpp
+++ b/dom/filesystem/Directory.cpp
@@ -63,8 +63,6 @@ Directory::Directory(FileSystemBase* aFileSystem,
   MOZ_ASSERT(aFileSystem, "aFileSystem should not be null.");
   // Remove the trailing "/".
   mPath.Trim(FILESYSTEM_DOM_PATH_SEPARATOR, false, true);
-
-  SetIsDOMBinding();
 }
 
 Directory::~Directory()
diff --git a/dom/fmradio/FMRadio.cpp b/dom/fmradio/FMRadio.cpp
index 54b62a9ca69..d172c29228f 100644
--- a/dom/fmradio/FMRadio.cpp
+++ b/dom/fmradio/FMRadio.cpp
@@ -112,8 +112,6 @@ FMRadio::FMRadio()
   , mIsShutdown(false)
 {
   LOG("FMRadio is initialized.");
-
-  SetIsDOMBinding();
 }
 
 FMRadio::~FMRadio()
diff --git a/dom/gamepad/Gamepad.cpp b/dom/gamepad/Gamepad.cpp
index f2cff65d2ea..7f4368ad40a 100644
--- a/dom/gamepad/Gamepad.cpp
+++ b/dom/gamepad/Gamepad.cpp
@@ -33,7 +33,6 @@ Gamepad::Gamepad(nsISupports* aParent,
     mButtons(aNumButtons),
     mAxes(aNumAxes)
 {
-  SetIsDOMBinding();
   for (unsigned i = 0; i < aNumButtons; i++) {
     mButtons.InsertElementAt(i, new GamepadButton(mParent));
   }
diff --git a/dom/gamepad/GamepadButton.h b/dom/gamepad/GamepadButton.h
index a6e7d1bf6c2..1ac42111295 100644
--- a/dom/gamepad/GamepadButton.h
+++ b/dom/gamepad/GamepadButton.h
@@ -20,7 +20,6 @@ public:
                                                  mPressed(false),
                                                  mValue(0)
   {
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/dom/geolocation/nsGeoPosition.cpp b/dom/geolocation/nsGeoPosition.cpp
index ec8bf70515f..b9228078416 100644
--- a/dom/geolocation/nsGeoPosition.cpp
+++ b/dom/geolocation/nsGeoPosition.cpp
@@ -158,7 +158,6 @@ Position::Position(nsISupports* aParent, nsIDOMGeoPosition* aGeoPosition)
   : mParent(aParent)
   , mGeoPosition(aGeoPosition)
 {
-  SetIsDOMBinding();
 }
 
 Position::~Position()
@@ -212,7 +211,6 @@ Coordinates::Coordinates(Position* aPosition, nsIDOMGeoPositionCoords* aCoords)
   : mPosition(aPosition)
   , mCoords(aCoords)
 {
-  SetIsDOMBinding();
 }
 
 Coordinates::~Coordinates()
diff --git a/dom/geolocation/nsGeolocation.cpp b/dom/geolocation/nsGeolocation.cpp
index f5f7f7e61db..85eee5bd61f 100644
--- a/dom/geolocation/nsGeolocation.cpp
+++ b/dom/geolocation/nsGeolocation.cpp
@@ -243,7 +243,6 @@ PositionError::PositionError(Geolocation* aParent, int16_t aCode)
   : mCode(aCode)
   , mParent(aParent)
 {
-  SetIsDOMBinding();
 }
 
 PositionError::~PositionError(){}
@@ -1019,7 +1018,6 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Geolocation,
 Geolocation::Geolocation()
 : mLastWatchId(0)
 {
-  SetIsDOMBinding();
 }
 
 Geolocation::~Geolocation()
diff --git a/dom/icc/Icc.cpp b/dom/icc/Icc.cpp
index 75856a5fa52..a950f37f0b2 100644
--- a/dom/icc/Icc.cpp
+++ b/dom/icc/Icc.cpp
@@ -29,7 +29,6 @@ Icc::Icc(nsPIDOMWindow* aWindow, long aClientId, nsIIccInfo* aIccInfo)
   : mLive(true)
   , mClientId(aClientId)
 {
-  SetIsDOMBinding();
   BindToOwner(aWindow);
 
   mProvider = do_GetService(NS_RILCONTENTHELPER_CONTRACTID);
diff --git a/dom/icc/IccInfo.cpp b/dom/icc/IccInfo.cpp
index 5080262ec5e..07f534aa511 100644
--- a/dom/icc/IccInfo.cpp
+++ b/dom/icc/IccInfo.cpp
@@ -35,7 +35,6 @@ NS_INTERFACE_MAP_END
 IccInfo::IccInfo(nsPIDOMWindow* aWindow)
   : mWindow(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 void
@@ -149,7 +148,6 @@ NS_IMPL_RELEASE_INHERITED(GsmIccInfo, IccInfo)
 GsmIccInfo::GsmIccInfo(nsPIDOMWindow* aWindow)
   : IccInfo(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 void
@@ -189,7 +187,6 @@ NS_IMPL_RELEASE_INHERITED(CdmaIccInfo, IccInfo)
 CdmaIccInfo::CdmaIccInfo(nsPIDOMWindow* aWindow)
   : IccInfo(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 void
diff --git a/dom/indexedDB/IDBCursor.cpp b/dom/indexedDB/IDBCursor.cpp
index af9594773d1..62423aa40e4 100644
--- a/dom/indexedDB/IDBCursor.cpp
+++ b/dom/indexedDB/IDBCursor.cpp
@@ -60,8 +60,6 @@ IDBCursor::IDBCursor(Type aType,
   MOZ_ASSERT(!aKey.IsUnset());
   MOZ_ASSERT(mScriptOwner);
 
-  SetIsDOMBinding();
-
   if (mScriptOwner) {
     mozilla::HoldJSObjects(this);
     mRooted = true;
diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp
index bd23e72f9d3..9ec6ebc4150 100644
--- a/dom/indexedDB/IDBDatabase.cpp
+++ b/dom/indexedDB/IDBDatabase.cpp
@@ -205,8 +205,6 @@ IDBDatabase::IDBDatabase(IDBWrapperCache* aOwnerCache,
   aFactory->AssertIsOnOwningThread();
   MOZ_ASSERT(aActor);
   MOZ_ASSERT(aSpec);
-
-  SetIsDOMBinding();
 }
 
 IDBDatabase::~IDBDatabase()
diff --git a/dom/indexedDB/IDBEvents.h b/dom/indexedDB/IDBEvents.h
index c4844c7ee7e..d5fa469605c 100644
--- a/dom/indexedDB/IDBEvents.h
+++ b/dom/indexedDB/IDBEvents.h
@@ -111,7 +111,6 @@ private:
     : Event(aOwner, nullptr, nullptr)
     , mOldVersion(aOldVersion)
   {
-    SetIsDOMBinding();
   }
 
   ~IDBVersionChangeEvent()
diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp
index a7a3ece57f6..0bdf8908fb1 100644
--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -118,8 +118,6 @@ IDBFactory::IDBFactory()
   mOwningThread = PR_GetCurrentThread();
 #endif
   AssertIsOnOwningThread();
-
-  SetIsDOMBinding();
 }
 
 IDBFactory::~IDBFactory()
diff --git a/dom/indexedDB/IDBFileHandle.cpp b/dom/indexedDB/IDBFileHandle.cpp
index eb043e829a1..6b439b6679d 100644
--- a/dom/indexedDB/IDBFileHandle.cpp
+++ b/dom/indexedDB/IDBFileHandle.cpp
@@ -32,7 +32,6 @@ IDBFileHandle::IDBFileHandle(FileMode aMode,
   : FileHandleBase(aMode, aRequestMode)
   , mMutableFile(aMutableFile)
 {
-  SetIsDOMBinding();
 }
 
 IDBFileHandle::~IDBFileHandle()
diff --git a/dom/indexedDB/IDBIndex.cpp b/dom/indexedDB/IDBIndex.cpp
index 1d0cda77033..a8a3e74bc67 100644
--- a/dom/indexedDB/IDBIndex.cpp
+++ b/dom/indexedDB/IDBIndex.cpp
@@ -56,8 +56,6 @@ IDBIndex::IDBIndex(IDBObjectStore* aObjectStore, const IndexMetadata* aMetadata)
   MOZ_ASSERT(aObjectStore);
   aObjectStore->AssertIsOnOwningThread();
   MOZ_ASSERT(aMetadata);
-
-  SetIsDOMBinding();
 }
 
 IDBIndex::~IDBIndex()
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index 9170b071c68..63dab1c8c89 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -869,8 +869,6 @@ IDBObjectStore::IDBObjectStore(IDBTransaction* aTransaction,
   MOZ_ASSERT(aTransaction);
   aTransaction->AssertIsOnOwningThread();
   MOZ_ASSERT(aSpec);
-
-  SetIsDOMBinding();
 }
 
 IDBObjectStore::~IDBObjectStore()
diff --git a/dom/interfaces/events/nsIDOMEvent.idl b/dom/interfaces/events/nsIDOMEvent.idl
index f808bc95b3a..7904bfe4203 100644
--- a/dom/interfaces/events/nsIDOMEvent.idl
+++ b/dom/interfaces/events/nsIDOMEvent.idl
@@ -288,11 +288,6 @@ NS_NewDOMDeviceMotionEvent(nsIDOMEvent** aResult,
                            nsPresContext* aPresContext,
                            mozilla::WidgetEvent* aEvent);
 nsresult
-NS_NewDOMTextEvent(nsIDOMEvent** aResult,
-                   mozilla::dom::EventTarget* aOwner,
-                   nsPresContext* aPresContext,
-                   mozilla::WidgetTextEvent* aEvent);
-nsresult
 NS_NewDOMBeforeUnloadEvent(nsIDOMEvent** aResult,
                            mozilla::dom::EventTarget* aOwner,
                            nsPresContext* aPresContext,
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 22691ead746..174232f15a6 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -44,7 +44,6 @@ using class mozilla::WidgetMouseEvent from "ipc/nsGUIEventIPC.h";
 using class mozilla::WidgetWheelEvent from "ipc/nsGUIEventIPC.h";
 using struct nsRect from "nsRect.h";
 using class mozilla::WidgetSelectionEvent from "ipc/nsGUIEventIPC.h";
-using class mozilla::WidgetTextEvent from "ipc/nsGUIEventIPC.h";
 using class mozilla::WidgetTouchEvent from "ipc/nsGUIEventIPC.h";
 using struct mozilla::dom::RemoteDOMEvent from "mozilla/dom/TabMessageUtils.h";
 using mozilla::dom::ScreenOrientation from "mozilla/dom/ScreenOrientation.h";
@@ -479,8 +478,6 @@ child:
 
     CompositionEvent(WidgetCompositionEvent event);
 
-    TextEvent(WidgetTextEvent event);
-
     SelectionEvent(WidgetSelectionEvent event);
 
     /**
@@ -542,6 +539,11 @@ child:
      */
     UIResolutionChanged();
 
+    /**
+     * Tell the child of an app's offline status
+     */
+    AppOfflineStatus(uint32_t id, bool offline);
+
 /*
  * FIXME: write protocol!
 
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 102333e89a9..cbdc23ffdfa 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -80,6 +80,7 @@
 #include "UnitTransforms.h"
 #include "ClientLayerManager.h"
 #include "LayersLogging.h"
+#include "nsIOService.h"
 
 #include "nsColorPickerProxy.h"
 
@@ -2388,15 +2389,6 @@ TabChild::RecvCompositionEvent(const WidgetCompositionEvent& event)
   return true;
 }
 
-bool
-TabChild::RecvTextEvent(const WidgetTextEvent& event)
-{
-  WidgetTextEvent localEvent(event);
-  localEvent.widget = mWidget;
-  DispatchWidgetEvent(localEvent);
-  return true;
-}
-
 bool
 TabChild::RecvSelectionEvent(const WidgetSelectionEvent& event)
 {
@@ -2581,6 +2573,18 @@ TabChild::RecvAsyncMessage(const nsString& aMessage,
   return true;
 }
 
+bool
+TabChild::RecvAppOfflineStatus(const uint32_t& aId, const bool& aOffline)
+{
+  // Instantiate the service to make sure gIOService is initialized
+  nsCOMPtr<nsIIOService> ioService = mozilla::services::GetIOService();
+  if (gIOService && ioService) {
+    gIOService->SetAppOfflineInternal(aId, aOffline ?
+      nsIAppOfflineInfo::OFFLINE : nsIAppOfflineInfo::ONLINE);
+  }
+  return true;
+}
+
 class UnloadScriptEvent : public nsRunnable
 {
 public:
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index 2442882eb8c..e81be611479 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -138,6 +138,11 @@ public:
   virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE;
   virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE;
 
+  virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE
+  {
+    MOZ_CRASH("TabChildGlobal doesn't use DOM bindings!");
+  }
+
   nsCOMPtr<nsIContentFrameMessageManager> mMessageManager;
   nsRefPtr<TabChildBase> mTabChild;
 
@@ -360,7 +365,6 @@ public:
                               const int32_t&  aModifiers,
                               const bool&     aPreventDefault) MOZ_OVERRIDE;
     virtual bool RecvCompositionEvent(const mozilla::WidgetCompositionEvent& event) MOZ_OVERRIDE;
-    virtual bool RecvTextEvent(const mozilla::WidgetTextEvent& event) MOZ_OVERRIDE;
     virtual bool RecvSelectionEvent(const mozilla::WidgetSelectionEvent& event) MOZ_OVERRIDE;
     virtual bool RecvActivateFrameEvent(const nsString& aType, const bool& capture) MOZ_OVERRIDE;
     virtual bool RecvLoadRemoteScript(const nsString& aURL,
@@ -370,6 +374,8 @@ public:
                                   const InfallibleTArray<CpowEntry>& aCpows,
                                   const IPC::Principal& aPrincipal) MOZ_OVERRIDE;
 
+    virtual bool RecvAppOfflineStatus(const uint32_t& aId, const bool& aOffline) MOZ_OVERRIDE;
+
     virtual PDocumentRendererChild*
     AllocPDocumentRendererChild(const nsRect& documentRect, const gfx::Matrix& transform,
                                 const nsString& bgcolor,
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 724fa612203..5aa5bfb69c8 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -240,6 +240,7 @@ TabParent::TabParent(nsIContentParent* aManager, const TabContext& aContext, uin
   , mMarkedDestroying(false)
   , mIsDestroyed(false)
   , mAppPackageFileDescriptorSent(false)
+  , mSendOfflineStatus(true)
   , mChromeFlags(aChromeFlags)
 {
   MOZ_ASSERT(aManager);
@@ -499,6 +500,14 @@ TabParent::LoadURL(nsIURI* aURI)
         return;
     }
 
+    uint32_t appId = OwnOrContainingAppId();
+    if (mSendOfflineStatus && NS_IsAppOffline(appId)) {
+      // If the app is offline in the parent process
+      // pass that state to the child process as well
+      unused << SendAppOfflineStatus(appId, true);
+    }
+    mSendOfflineStatus = false;
+
     unused << SendLoadURL(spec);
 
     // If this app is a packaged app then we can speed startup by sending over
@@ -1565,6 +1574,11 @@ TabParent::SendCompositionEvent(WidgetCompositionEvent& event)
   if (mIsDestroyed) {
     return false;
   }
+
+  if (event.message == NS_COMPOSITION_CHANGE) {
+    return SendCompositionChangeEvent(event);
+  }
+
   mIMEComposing = event.message != NS_COMPOSITION_END;
   mIMECompositionStart = std::min(mIMESelectionAnchor, mIMESelectionFocus);
   if (mIMECompositionEnding)
@@ -1575,20 +1589,17 @@ TabParent::SendCompositionEvent(WidgetCompositionEvent& event)
 
 /**
  * During REQUEST_TO_COMMIT_COMPOSITION or REQUEST_TO_CANCEL_COMPOSITION,
- * widget usually sends a NS_TEXT_TEXT event to finalize or clear the
- * composition, respectively
+ * widget usually sends a NS_COMPOSITION_CHANGE event to finalize or
+ * clear the composition, respectively
  *
  * Because the event will not reach content in time, we intercept it
  * here and pass the text as the EndIMEComposition return value
  */
 bool
-TabParent::SendTextEvent(WidgetTextEvent& event)
+TabParent::SendCompositionChangeEvent(WidgetCompositionEvent& event)
 {
-  if (mIsDestroyed) {
-    return false;
-  }
   if (mIMECompositionEnding) {
-    mIMECompositionText = event.theText;
+    mIMECompositionText = event.mData;
     return true;
   }
 
@@ -1598,10 +1609,10 @@ TabParent::SendTextEvent(WidgetTextEvent& event)
     mIMECompositionStart = std::min(mIMESelectionAnchor, mIMESelectionFocus);
   }
   mIMESelectionAnchor = mIMESelectionFocus =
-      mIMECompositionStart + event.theText.Length();
+      mIMECompositionStart + event.mData.Length();
 
   event.mSeqno = ++mIMESeqno;
-  return PBrowserParent::SendTextEvent(event);
+  return PBrowserParent::SendCompositionEvent(event);
 }
 
 bool
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 33fcb6b4a40..9b4c60dc4df 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -318,7 +318,6 @@ public:
     static TabParent *GetIMETabParent() { return mIMETabParent; }
     bool HandleQueryContentEvent(mozilla::WidgetQueryContentEvent& aEvent);
     bool SendCompositionEvent(mozilla::WidgetCompositionEvent& event);
-    bool SendTextEvent(mozilla::WidgetTextEvent& event);
     bool SendSelectionEvent(mozilla::WidgetSelectionEvent& event);
 
     static TabParent* GetFrom(nsFrameLoader* aFrameLoader);
@@ -364,6 +363,8 @@ protected:
 
     virtual bool RecvRemotePaintIsReady() MOZ_OVERRIDE;
 
+    bool SendCompositionChangeEvent(mozilla::WidgetCompositionEvent& event);
+
     // IME
     static TabParent *mIMETabParent;
     nsString mIMECacheText;
@@ -427,6 +428,10 @@ private:
     // Whether we have already sent a FileDescriptor for the app package.
     bool mAppPackageFileDescriptorSent;
 
+    // Whether we need to send the offline status to the TabChild
+    // This is true, until the first call of LoadURL
+    bool mSendOfflineStatus;
+
     uint32_t mChromeFlags;
 
     nsCOMPtr<nsILoadContext> mLoadContext;
diff --git a/dom/media/GetUserMediaRequest.cpp b/dom/media/GetUserMediaRequest.cpp
index d884ac828d6..21ceba791d5 100644
--- a/dom/media/GetUserMediaRequest.cpp
+++ b/dom/media/GetUserMediaRequest.cpp
@@ -23,7 +23,6 @@ GetUserMediaRequest::GetUserMediaRequest(
   , mConstraints(new MediaStreamConstraints(aConstraints))
   , mIsSecure(aIsSecure)
 {
-  SetIsDOMBinding();
 }
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(GetUserMediaRequest)
diff --git a/dom/media/PeerConnection.js b/dom/media/PeerConnection.js
index a30d7da003b..dc0fbddd06e 100644
--- a/dom/media/PeerConnection.js
+++ b/dom/media/PeerConnection.js
@@ -150,6 +150,15 @@ GlobalPCList.prototype = {
       } else if (data == "online") {
         this._networkdown = false;
       }
+    } else if (topic == "network:app-offline-status-changed") {
+      // App just went offline. The subject also contains the appId,
+      // but navigator.onLine checks that for us
+      if (!this._networkdown && !this._win.navigator.onLine) {
+        for (let winId in this._list) {
+          cleanupWinId(this._list, winId);
+        }
+      }
+      this._networkdown = !this._win.navigator.onLine;
     } else if (topic == "gmp-plugin-crash") {
       // a plugin crashed; if it's associated with any of our PCs, fire an
       // event to the DOM window
@@ -332,7 +341,7 @@ RTCPeerConnection.prototype = {
     }
     this._mustValidateRTCConfiguration(rtcConfig,
         "RTCPeerConnection constructor passed invalid RTCConfiguration");
-    if (_globalPCList._networkdown) {
+    if (_globalPCList._networkdown || !this._win.navigator.onLine) {
       throw new this._win.DOMError("",
           "Can't create RTCPeerConnections when the network is down");
     }
diff --git a/dom/mobileconnection/MobileCellInfo.cpp b/dom/mobileconnection/MobileCellInfo.cpp
index 589652a14bc..75d9fae423b 100644
--- a/dom/mobileconnection/MobileCellInfo.cpp
+++ b/dom/mobileconnection/MobileCellInfo.cpp
@@ -30,7 +30,6 @@ MobileCellInfo::MobileCellInfo(nsPIDOMWindow* aWindow)
   , mCdmaSystemId(-1)
   , mCdmaNetworkId(-1)
 {
-  SetIsDOMBinding();
 }
 
 MobileCellInfo::MobileCellInfo(int32_t aGsmLocationAreaCode,
@@ -49,9 +48,8 @@ MobileCellInfo::MobileCellInfo(int32_t aGsmLocationAreaCode,
   , mCdmaNetworkId(aCdmaNetworkId)
 {
   // The instance created by this way is only used for IPC stuff. It won't be
-  // expose to JS directly, we will clone this instance to the one that is
-  // maintained in MobileConnectionChild. So we don't need SetIsDOMBinding()
-  // here.
+  // exposed to JS directly, we will clone this instance to the one that is
+  // maintained in MobileConnectionChild.
 }
 
 void
@@ -73,7 +71,6 @@ MobileCellInfo::Update(nsIMobileCellInfo* aInfo)
 JSObject*
 MobileCellInfo::WrapObject(JSContext* aCx)
 {
-  MOZ_ASSERT(IsDOMBinding());
   return MozMobileCellInfoBinding::Wrap(aCx, this);
 }
 
diff --git a/dom/mobileconnection/MobileConnection.cpp b/dom/mobileconnection/MobileConnection.cpp
index 139e1e21b49..ccd1e848e12 100644
--- a/dom/mobileconnection/MobileConnection.cpp
+++ b/dom/mobileconnection/MobileConnection.cpp
@@ -107,8 +107,6 @@ NS_IMPL_RELEASE_INHERITED(MobileConnection, DOMEventTargetHelper)
 MobileConnection::MobileConnection(nsPIDOMWindow* aWindow, uint32_t aClientId)
   : DOMEventTargetHelper(aWindow)
 {
-  SetIsDOMBinding();
-
   nsCOMPtr<nsIMobileConnectionService> service =
     do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID);
 
diff --git a/dom/mobileconnection/MobileConnectionArray.cpp b/dom/mobileconnection/MobileConnectionArray.cpp
index 19e7789cd46..3ef195a5ca7 100644
--- a/dom/mobileconnection/MobileConnectionArray.cpp
+++ b/dom/mobileconnection/MobileConnectionArray.cpp
@@ -34,7 +34,6 @@ MobileConnectionArray::MobileConnectionArray(nsPIDOMWindow* aWindow)
   : mLengthInitialized(false)
   , mWindow(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 MobileConnectionArray::~MobileConnectionArray()
diff --git a/dom/mobileconnection/MobileConnectionInfo.cpp b/dom/mobileconnection/MobileConnectionInfo.cpp
index aa0019199ca..257fc8b7e09 100644
--- a/dom/mobileconnection/MobileConnectionInfo.cpp
+++ b/dom/mobileconnection/MobileConnectionInfo.cpp
@@ -58,7 +58,6 @@ MobileConnectionInfo::MobileConnectionInfo(nsPIDOMWindow* aWindow)
   , mRoaming(false)
   , mWindow(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 MobileConnectionInfo::MobileConnectionInfo(const nsAString& aState,
@@ -77,9 +76,8 @@ MobileConnectionInfo::MobileConnectionInfo(const nsAString& aState,
   , mRelSignalStrength(aRelSignalStrength)
 {
   // The instance created by this way is only used for IPC stuff. It won't be
-  // expose to JS directly, we will clone this instance to the one that is
-  // maintained in MobileConnectionChild. So we don't need SetIsDOMBinding()
-  // here.
+  // exposed to JS directly, we will clone this instance to the one that is
+  // maintained in MobileConnectionChild.
 
   // Update mState and mType
   CONVERT_STRING_TO_NULLABLE_ENUM(aState, MobileConnectionState, mState);
@@ -166,7 +164,6 @@ MobileConnectionInfo::Update(nsIMobileConnectionInfo* aInfo)
 JSObject*
 MobileConnectionInfo::WrapObject(JSContext* aCx)
 {
-  MOZ_ASSERT(IsDOMBinding());
   return MozMobileConnectionInfoBinding::Wrap(aCx, this);
 }
 
diff --git a/dom/mobileconnection/MobileNetworkInfo.cpp b/dom/mobileconnection/MobileNetworkInfo.cpp
index 241dd3ade91..8b3a274f519 100644
--- a/dom/mobileconnection/MobileNetworkInfo.cpp
+++ b/dom/mobileconnection/MobileNetworkInfo.cpp
@@ -22,7 +22,6 @@ NS_INTERFACE_MAP_END
 MobileNetworkInfo::MobileNetworkInfo(nsPIDOMWindow* aWindow)
   : mWindow(aWindow)
 {
-  SetIsDOMBinding();
 }
 
 MobileNetworkInfo::MobileNetworkInfo(const nsAString& aShortName,
@@ -38,7 +37,6 @@ MobileNetworkInfo::MobileNetworkInfo(const nsAString& aShortName,
 {
   // The parent object is nullptr when MobileNetworkInfo is created by this way.
   // And it won't be exposed to web content.
-  SetIsDOMBinding();
 }
 
 void
diff --git a/dom/network/Connection.cpp b/dom/network/Connection.cpp
index cde8f36ac04..74491229675 100644
--- a/dom/network/Connection.cpp
+++ b/dom/network/Connection.cpp
@@ -28,19 +28,12 @@ NS_IMPL_QUERY_INTERFACE_INHERITED(Connection, DOMEventTargetHelper,
 NS_IMPL_ADDREF_INHERITED(dom::network::Connection, DOMEventTargetHelper)
 NS_IMPL_RELEASE_INHERITED(dom::network::Connection, DOMEventTargetHelper)
 
-Connection::Connection()
-  : mType(static_cast<ConnectionType>(kDefaultType))
+Connection::Connection(nsPIDOMWindow* aWindow)
+  : DOMEventTargetHelper(aWindow)
+  , mType(static_cast<ConnectionType>(kDefaultType))
   , mIsWifi(kDefaultIsWifi)
   , mDHCPGateway(kDefaultDHCPGateway)
 {
-  SetIsDOMBinding();
-}
-
-void
-Connection::Init(nsPIDOMWindow* aWindow)
-{
-  BindToOwner(aWindow);
-
   hal::RegisterNetworkObserver(this);
 
   hal::NetworkInformation networkInfo;
diff --git a/dom/network/Connection.h b/dom/network/Connection.h
index 2638af9c085..6b1a1d20be1 100644
--- a/dom/network/Connection.h
+++ b/dom/network/Connection.h
@@ -32,9 +32,8 @@ public:
 
   NS_REALLY_FORWARD_NSIDOMEVENTTARGET(DOMEventTargetHelper)
 
-  Connection();
+  Connection(nsPIDOMWindow *aWindow);
 
-  void Init(nsPIDOMWindow *aWindow);
   void Shutdown();
 
   // For IObserver
diff --git a/dom/network/TCPSocketParent.cpp b/dom/network/TCPSocketParent.cpp
index 632cfc4cf5b..ba3c3987c38 100644
--- a/dom/network/TCPSocketParent.cpp
+++ b/dom/network/TCPSocketParent.cpp
@@ -68,14 +68,60 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(TCPSocketParentBase)
 TCPSocketParentBase::TCPSocketParentBase()
 : mIPCOpen(false)
 {
+  mObserver = new mozilla::net::OfflineObserver(this);
   mozilla::HoldJSObjects(this);
 }
 
 TCPSocketParentBase::~TCPSocketParentBase()
 {
+  if (mObserver) {
+    mObserver->RemoveObserver();
+  }
   mozilla::DropJSObjects(this);
 }
 
+uint32_t
+TCPSocketParent::GetAppId()
+{
+  uint32_t appId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
+  const PContentParent *content = Manager()->Manager();
+  const InfallibleTArray<PBrowserParent*>& browsers = content->ManagedPBrowserParent();
+  if (browsers.Length() > 0) {
+    TabParent *tab = static_cast<TabParent*>(browsers[0]);
+    appId = tab->OwnAppId();
+  }
+  return appId;
+};
+
+nsresult
+TCPSocketParent::OfflineNotification(nsISupports *aSubject)
+{
+  nsCOMPtr<nsIAppOfflineInfo> info(do_QueryInterface(aSubject));
+  if (!info) {
+    return NS_OK;
+  }
+
+  uint32_t targetAppId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
+  info->GetAppId(&targetAppId);
+
+  // Obtain App ID
+  uint32_t appId = GetAppId();
+  if (appId != targetAppId) {
+    return NS_OK;
+  }
+
+  // If the app is offline, close the socket
+  if (mSocket && NS_IsAppOffline(appId)) {
+    mSocket->Close();
+    mSocket = nullptr;
+    mIntermediaryObj = nullptr;
+    mIntermediary = nullptr;
+  }
+
+  return NS_OK;
+}
+
+
 void
 TCPSocketParentBase::ReleaseIPDLReference()
 {
@@ -115,12 +161,12 @@ TCPSocketParent::RecvOpen(const nsString& aHost, const uint16_t& aPort, const bo
   }
 
   // Obtain App ID
-  uint32_t appId = nsIScriptSecurityManager::NO_APP_ID;
-  const PContentParent *content = Manager()->Manager();
-  const InfallibleTArray<PBrowserParent*>& browsers = content->ManagedPBrowserParent();
-  if (browsers.Length() > 0) {
-    TabParent *tab = static_cast<TabParent*>(browsers[0]);
-    appId = tab->OwnAppId();
+  uint32_t appId = GetAppId();
+
+  if (NS_IsAppOffline(appId)) {
+    NS_ERROR("Can't open socket because app is offline");
+    FireInteralError(this, __LINE__);
+    return true;
   }
 
   nsresult rv;
diff --git a/dom/network/TCPSocketParent.h b/dom/network/TCPSocketParent.h
index 778938a18b4..44b3e674902 100644
--- a/dom/network/TCPSocketParent.h
+++ b/dom/network/TCPSocketParent.h
@@ -11,6 +11,7 @@
 #include "nsCOMPtr.h"
 #include "nsIDOMTCPSocket.h"
 #include "js/TypeDecls.h"
+#include "mozilla/net/OfflineObserver.h"
 
 #define TCPSOCKETPARENT_CID \
   { 0x4e7246c6, 0xa8b3, 0x426d, { 0x9c, 0x17, 0x76, 0xda, 0xb1, 0xe1, 0xe1, 0x4a } }
@@ -21,6 +22,7 @@ namespace dom {
 class PBrowserParent;
 
 class TCPSocketParentBase : public nsITCPSocketParent
+                          , public mozilla::net::DisconnectableParent
 {
 public:
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(TCPSocketParentBase)
@@ -36,6 +38,7 @@ protected:
   JS::Heap<JSObject*> mIntermediaryObj;
   nsCOMPtr<nsITCPSocketIntermediary> mIntermediary;
   nsCOMPtr<nsIDOMTCPSocket> mSocket;
+  nsRefPtr<mozilla::net::OfflineObserver> mObserver;
   bool mIPCOpen;
 };
 
@@ -58,6 +61,8 @@ public:
   virtual bool RecvData(const SendableData& aData,
                         const uint32_t& aTrackingNumber) MOZ_OVERRIDE;
   virtual bool RecvRequestDelete() MOZ_OVERRIDE;
+  virtual nsresult OfflineNotification(nsISupports *) MOZ_OVERRIDE;
+  virtual uint32_t GetAppId() MOZ_OVERRIDE;
 
 private:
   virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
diff --git a/dom/network/UDPSocketParent.cpp b/dom/network/UDPSocketParent.cpp
index a202f183f3b..a14d34f0e72 100644
--- a/dom/network/UDPSocketParent.cpp
+++ b/dom/network/UDPSocketParent.cpp
@@ -15,14 +15,64 @@
 #include "mozilla/net/DNS.h"
 #include "mozilla/net/NeckoCommon.h"
 #include "mozilla/net/PNeckoParent.h"
+#include "nsNetUtil.h"
+#include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/TabParent.h"
 
 namespace mozilla {
 namespace dom {
 
 NS_IMPL_ISUPPORTS(UDPSocketParent, nsIUDPSocketListener)
 
+UDPSocketParent::UDPSocketParent()
+  : mIPCOpen(true)
+{
+  mObserver = new mozilla::net::OfflineObserver(this);
+}
+
 UDPSocketParent::~UDPSocketParent()
 {
+  if (mObserver) {
+    mObserver->RemoveObserver();
+  }
+}
+
+nsresult
+UDPSocketParent::OfflineNotification(nsISupports *aSubject)
+{
+  nsCOMPtr<nsIAppOfflineInfo> info(do_QueryInterface(aSubject));
+  if (!info) {
+    return NS_OK;
+  }
+
+  uint32_t targetAppId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
+  info->GetAppId(&targetAppId);
+
+  // Obtain App ID
+  uint32_t appId = GetAppId();
+  if (appId != targetAppId) {
+    return NS_OK;
+  }
+
+  // If the app is offline, close the socket
+  if (mSocket && NS_IsAppOffline(appId)) {
+    mSocket->Close();
+  }
+
+  return NS_OK;
+}
+
+uint32_t
+UDPSocketParent::GetAppId()
+{
+  uint32_t appId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
+  const PContentParent *content = Manager()->Manager();
+  const InfallibleTArray<PBrowserParent*>& browsers = content->ManagedPBrowserParent();
+  if (browsers.Length() > 0) {
+    TabParent *tab = static_cast<TabParent*>(browsers[0]);
+    appId = tab->OwnAppId();
+  }
+  return appId;
 }
 
 bool
diff --git a/dom/network/UDPSocketParent.h b/dom/network/UDPSocketParent.h
index 3a27fd09ba0..e09cb0c2c01 100644
--- a/dom/network/UDPSocketParent.h
+++ b/dom/network/UDPSocketParent.h
@@ -11,19 +11,20 @@
 #include "nsCOMPtr.h"
 #include "nsIUDPSocket.h"
 #include "nsIUDPSocketFilter.h"
+#include "mozilla/net/OfflineObserver.h"
 
 namespace mozilla {
 namespace dom {
 
 class UDPSocketParent : public mozilla::net::PUDPSocketParent
                       , public nsIUDPSocketListener
+                      , public mozilla::net::DisconnectableParent
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIUDPSOCKETLISTENER
 
-  UDPSocketParent() :
-    mIPCOpen(true) {}
+  UDPSocketParent();
 
   bool Init(const nsACString& aFilter);
 
@@ -39,6 +40,8 @@ public:
                                  const nsCString& aInterface) MOZ_OVERRIDE;
   virtual bool RecvLeaveMulticast(const nsCString& aMulticastAddress,
                                   const nsCString& aInterface) MOZ_OVERRIDE;
+  virtual nsresult OfflineNotification(nsISupports *) MOZ_OVERRIDE;
+  virtual uint32_t GetAppId() MOZ_OVERRIDE;
 
 private:
   virtual ~UDPSocketParent();
@@ -54,6 +57,7 @@ private:
   bool mIPCOpen;
   nsCOMPtr<nsIUDPSocket> mSocket;
   nsCOMPtr<nsIUDPSocketFilter> mFilter;
+  nsRefPtr<mozilla::net::OfflineObserver> mObserver;
 };
 
 } // namespace dom
diff --git a/dom/nfc/MozNDEFRecord.cpp b/dom/nfc/MozNDEFRecord.cpp
index 9a8ca3e3476..66b9cce7a10 100644
--- a/dom/nfc/MozNDEFRecord.cpp
+++ b/dom/nfc/MozNDEFRecord.cpp
@@ -150,7 +150,6 @@ MozNDEFRecord::MozNDEFRecord(JSContext* aCx, nsPIDOMWindow* aWindow,
     mPayload = Uint8Array::Create(aCx, this, payload.Length(), payload.Data());
   }
 
-  SetIsDOMBinding();
   HoldData();
 }
 
diff --git a/dom/notification/DesktopNotification.h b/dom/notification/DesktopNotification.h
index ea1d9d2c851..d02d146b8ac 100644
--- a/dom/notification/DesktopNotification.h
+++ b/dom/notification/DesktopNotification.h
@@ -51,8 +51,6 @@ public:
 
     mPrincipal = sop->GetPrincipal();
     MOZ_ASSERT(mPrincipal);
-
-    SetIsDOMBinding();
   }
 
   void Shutdown() {
diff --git a/dom/power/PowerManager.h b/dom/power/PowerManager.h
index 640113e0749..7098dc31c98 100644
--- a/dom/power/PowerManager.h
+++ b/dom/power/PowerManager.h
@@ -29,11 +29,6 @@ public:
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(PowerManager)
   NS_DECL_NSIDOMMOZWAKELOCKLISTENER
 
-  PowerManager()
-  {
-    SetIsDOMBinding();
-  }
-
   nsresult Init(nsIDOMWindow *aWindow);
   nsresult Shutdown();
 
diff --git a/dom/power/WakeLock.cpp b/dom/power/WakeLock.cpp
index b0cefa433d4..19cb5771419 100644
--- a/dom/power/WakeLock.cpp
+++ b/dom/power/WakeLock.cpp
@@ -39,7 +39,6 @@ WakeLock::WakeLock()
   , mHidden(true)
   , mContentParentID(CONTENT_PROCESS_ID_UNKNOWN)
 {
-  SetIsDOMBinding();
 }
 
 WakeLock::~WakeLock()
diff --git a/dom/promise/Promise.cpp b/dom/promise/Promise.cpp
index 7d747e536b3..908ddb20d77 100644
--- a/dom/promise/Promise.cpp
+++ b/dom/promise/Promise.cpp
@@ -307,7 +307,6 @@ Promise::Promise(nsIGlobalObject* aGlobal)
   MOZ_ASSERT(mGlobal);
 
   mozilla::HoldJSObjects(this);
-  SetIsDOMBinding();
 }
 
 Promise::~Promise()
diff --git a/dom/smil/TimeEvent.cpp b/dom/smil/TimeEvent.cpp
index 70897097a91..c2df3a2f96b 100644
--- a/dom/smil/TimeEvent.cpp
+++ b/dom/smil/TimeEvent.cpp
@@ -19,7 +19,6 @@ TimeEvent::TimeEvent(EventTarget* aOwner,
           aEvent ? aEvent : new InternalSMILTimeEvent(false, 0))
   , mDetail(mEvent->AsSMILTimeEvent()->detail)
 {
-  SetIsDOMBinding();
   if (aEvent) {
     mEventIsInternal = false;
   } else {
diff --git a/dom/speakermanager/SpeakerManager.cpp b/dom/speakermanager/SpeakerManager.cpp
index 1506df2f3aa..472f914c431 100644
--- a/dom/speakermanager/SpeakerManager.cpp
+++ b/dom/speakermanager/SpeakerManager.cpp
@@ -25,7 +25,6 @@ SpeakerManager::SpeakerManager()
   : mForcespeaker(false)
   , mVisible(false)
 {
-  SetIsDOMBinding();
   SpeakerManagerService *service =
     SpeakerManagerService::GetOrCreateSpeakerManagerService();
   MOZ_ASSERT(service);
diff --git a/dom/storage/DOMStorage.cpp b/dom/storage/DOMStorage.cpp
index 6683b2296d4..121ed5486da 100644
--- a/dom/storage/DOMStorage.cpp
+++ b/dom/storage/DOMStorage.cpp
@@ -52,7 +52,6 @@ DOMStorage::DOMStorage(nsIDOMWindow* aWindow,
 , mIsSessionOnly(false)
 {
   mCache->Preload();
-  SetIsDOMBinding();
 }
 
 DOMStorage::~DOMStorage()
diff --git a/dom/system/gonk/AudioChannelManager.cpp b/dom/system/gonk/AudioChannelManager.cpp
index 462a8d189da..904b5a1b148 100644
--- a/dom/system/gonk/AudioChannelManager.cpp
+++ b/dom/system/gonk/AudioChannelManager.cpp
@@ -30,7 +30,6 @@ AudioChannelManager::AudioChannelManager()
 {
   RegisterSwitchObserver(SWITCH_HEADPHONES, this);
   mState = GetCurrentSwitchState(SWITCH_HEADPHONES);
-  SetIsDOMBinding();
 }
 
 AudioChannelManager::~AudioChannelManager()
diff --git a/dom/telephony/CallsList.cpp b/dom/telephony/CallsList.cpp
index 68607d9f63a..e69b3954243 100644
--- a/dom/telephony/CallsList.cpp
+++ b/dom/telephony/CallsList.cpp
@@ -29,8 +29,6 @@ CallsList::CallsList(Telephony* aTelephony, TelephonyCallGroup* aGroup)
 : mTelephony(aTelephony), mGroup(aGroup)
 {
   MOZ_ASSERT(mTelephony);
-
-  SetIsDOMBinding();
 }
 
 CallsList::~CallsList()
diff --git a/dom/telephony/TelephonyCallId.cpp b/dom/telephony/TelephonyCallId.cpp
index 1c75f77c287..ced3905d940 100644
--- a/dom/telephony/TelephonyCallId.cpp
+++ b/dom/telephony/TelephonyCallId.cpp
@@ -19,7 +19,6 @@ TelephonyCallId::TelephonyCallId(nsPIDOMWindow* aWindow,
 : mWindow(aWindow), mNumber(aNumber), mNumberPresentation(aNumberPresentation),
   mName(aName), mNamePresentation(aNamePresentation)
 {
-  SetIsDOMBinding();
 }
 
 TelephonyCallId::~TelephonyCallId()
diff --git a/dom/time/TimeManager.h b/dom/time/TimeManager.h
index 801153fa304..b9dcb21fbea 100644
--- a/dom/time/TimeManager.h
+++ b/dom/time/TimeManager.h
@@ -36,7 +36,6 @@ public:
   explicit TimeManager(nsPIDOMWindow* aWindow)
     : mWindow(aWindow)
   {
-    SetIsDOMBinding();
   }
 
   nsPIDOMWindow* GetParentObject() const
diff --git a/dom/voicemail/VoicemailStatus.cpp b/dom/voicemail/VoicemailStatus.cpp
index 12c471dc23c..99c17d51f65 100644
--- a/dom/voicemail/VoicemailStatus.cpp
+++ b/dom/voicemail/VoicemailStatus.cpp
@@ -31,8 +31,6 @@ VoicemailStatus::VoicemailStatus(nsISupports* aParent,
 {
   MOZ_ASSERT(mParent);
   MOZ_ASSERT(mProvider);
-
-  SetIsDOMBinding();
 }
 
 JSObject*
diff --git a/dom/workers/Location.h b/dom/workers/Location.h
index 8054505e130..4ece8486c6e 100644
--- a/dom/workers/Location.h
+++ b/dom/workers/Location.h
@@ -44,7 +44,6 @@ class WorkerLocation MOZ_FINAL : public nsWrapperCache
     , mOrigin(aOrigin)
   {
     MOZ_COUNT_CTOR(WorkerLocation);
-    SetIsDOMBinding();
   }
 
   ~WorkerLocation()
diff --git a/dom/workers/MessagePort.cpp b/dom/workers/MessagePort.cpp
index a062b68a351..b8f8c3aed8d 100644
--- a/dom/workers/MessagePort.cpp
+++ b/dom/workers/MessagePort.cpp
@@ -81,14 +81,12 @@ MessagePort::MessagePort(nsPIDOMWindow* aWindow, SharedWorker* aSharedWorker,
 {
   AssertIsOnMainThread();
   MOZ_ASSERT(aSharedWorker);
-  SetIsDOMBinding();
 }
 
 MessagePort::MessagePort(WorkerPrivate* aWorkerPrivate, uint64_t aSerial)
 : mWorkerPrivate(aWorkerPrivate), mSerial(aSerial), mStarted(false)
 {
   aWorkerPrivate->AssertIsOnWorkerThread();
-  SetIsDOMBinding();
 }
 
 MessagePort::~MessagePort()
diff --git a/dom/workers/Navigator.h b/dom/workers/Navigator.h
index 900903f69bb..64beb36f7cb 100644
--- a/dom/workers/Navigator.h
+++ b/dom/workers/Navigator.h
@@ -36,7 +36,6 @@ class WorkerNavigator MOZ_FINAL : public nsWrapperCache
     , mOnline(aOnline)
   {
     MOZ_COUNT_CTOR(WorkerNavigator);
-    SetIsDOMBinding();
   }
 
   ~WorkerNavigator()
diff --git a/dom/workers/Performance.cpp b/dom/workers/Performance.cpp
index 352a01bd95c..366e3abaf78 100644
--- a/dom/workers/Performance.cpp
+++ b/dom/workers/Performance.cpp
@@ -18,7 +18,6 @@ Performance::Performance(WorkerPrivate* aWorkerPrivate)
   : mWorkerPrivate(aWorkerPrivate)
 {
   mWorkerPrivate->AssertIsOnWorkerThread();
-  SetIsDOMBinding();
 }
 
 Performance::~Performance()
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 0981cf84c3c..9d6aa574c75 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -2600,6 +2600,12 @@ RuntimeService::Observe(nsISupports* aSubject, const char* aTopic,
     SendOfflineStatusChangeEventToAllWorkers(NS_IsOffline());
     return NS_OK;
   }
+  if (!strcmp(aTopic, NS_IOSERVICE_APP_OFFLINE_STATUS_TOPIC)) {
+    BROADCAST_ALL_WORKERS(OfflineStatusChangeEvent,
+                          NS_IsOffline() ||
+                          NS_IsAppOffline(workers[index]->GetPrincipal()));
+    return NS_OK;
+  }
 
   NS_NOTREACHED("Unknown observer topic!");
   return NS_OK;
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index 648a2412d74..4d27fc32a0d 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -2135,8 +2135,6 @@ WorkerPrivateParent<Derived>::WorkerPrivateParent(
   mWorkerType(aWorkerType),
   mCreationTimeStamp(TimeStamp::Now())
 {
-  SetIsDOMBinding();
-
   MOZ_ASSERT_IF(!IsDedicatedWorker(),
                 !aSharedWorkerName.IsVoid() && NS_IsMainThread());
   MOZ_ASSERT_IF(IsDedicatedWorker(), aSharedWorkerName.IsEmpty());
@@ -3030,6 +3028,11 @@ WorkerPrivate::OfflineStatusChangeEventInternal(JSContext* aCx, bool aIsOffline)
 {
   AssertIsOnWorkerThread();
 
+  // The worker is already in this state. No need to dispatch an event.
+  if (mOnLine == !aIsOffline) {
+    return;
+  }
+
   for (uint32_t index = 0; index < mChildWorkers.Length(); ++index) {
     mChildWorkers[index]->OfflineStatusChangeEvent(aCx, aIsOffline);
   }
@@ -3582,7 +3585,7 @@ WorkerPrivate::WorkerPrivate(JSContext* aCx,
   else {
     AssertIsOnMainThread();
     RuntimeService::GetDefaultPreferences(mPreferences);
-    mOnLine = !NS_IsOffline();
+    mOnLine = !NS_IsOffline() && !NS_IsAppOffline(aLoadInfo.mPrincipal);
   }
 }
 
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
index 3e63247261a..46d9019e499 100644
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -47,8 +47,6 @@ WorkerGlobalScope::WorkerGlobalScope(WorkerPrivate* aWorkerPrivate)
 : mWorkerPrivate(aWorkerPrivate)
 {
   mWorkerPrivate->AssertIsOnWorkerThread();
-
-  SetIsDOMBinding();
 }
 
 WorkerGlobalScope::~WorkerGlobalScope()
diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp
index 79cdba0c775..2d2e0ebe46c 100644
--- a/dom/workers/XMLHttpRequest.cpp
+++ b/dom/workers/XMLHttpRequest.cpp
@@ -1575,8 +1575,6 @@ XMLHttpRequest::XMLHttpRequest(WorkerPrivate* aWorkerPrivate)
 {
   mWorkerPrivate->AssertIsOnWorkerThread();
 
-  SetIsDOMBinding();
-
   mozilla::HoldJSObjects(this);
 }
 
diff --git a/dom/workers/XMLHttpRequestUpload.cpp b/dom/workers/XMLHttpRequestUpload.cpp
index 37297cb3eef..bb539173ea1 100644
--- a/dom/workers/XMLHttpRequestUpload.cpp
+++ b/dom/workers/XMLHttpRequestUpload.cpp
@@ -14,7 +14,6 @@ USING_WORKERS_NAMESPACE
 XMLHttpRequestUpload::XMLHttpRequestUpload(XMLHttpRequest* aXHR)
 : mXHR(aXHR)
 {
-  SetIsDOMBinding();
 }
 
 XMLHttpRequestUpload::~XMLHttpRequestUpload()
diff --git a/dom/xbl/XBLChildrenElement.h b/dom/xbl/XBLChildrenElement.h
index 2b9c905efec..d4b33cdcaf6 100644
--- a/dom/xbl/XBLChildrenElement.h
+++ b/dom/xbl/XBLChildrenElement.h
@@ -152,7 +152,6 @@ public:
     : mParent(aParent)
   {
     MOZ_COUNT_CTOR(nsAnonymousContentList);
-    SetIsDOMBinding();
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/dom/xslt/xpath/XPathResult.cpp b/dom/xslt/xpath/XPathResult.cpp
index 5e54ba4de03..2cd4769fb57 100644
--- a/dom/xslt/xpath/XPathResult.cpp
+++ b/dom/xslt/xpath/XPathResult.cpp
@@ -29,7 +29,6 @@ XPathResult::XPathResult(nsINode* aParent)
       mBooleanResult(false),
       mNumberResult(0)
 {
-    SetIsDOMBinding();
 }
 
 XPathResult::XPathResult(const XPathResult &aResult)
@@ -42,7 +41,6 @@ XPathResult::XPathResult(const XPathResult &aResult)
       mResultType(aResult.mResultType),
       mInvalidIteratorState(aResult.mInvalidIteratorState)
 {
-    SetIsDOMBinding();
     if (mDocument) {
         mDocument->AddMutationObserver(this);
     }
diff --git a/editor/libeditor/nsEditor.cpp b/editor/libeditor/nsEditor.cpp
index 0228dcffc3b..13ebc2a2ae6 100644
--- a/editor/libeditor/nsEditor.cpp
+++ b/editor/libeditor/nsEditor.cpp
@@ -973,7 +973,7 @@ nsEditor::EndPlaceHolderTransaction()
         // For now just removing the assert.
       }
       // notify editor observers of action but if composing, it's done by
-      // text event handler.
+      // compositionchange event handler.
       if (!mComposition) {
         NotifyEditorObservers(eNotifyEditorObserversOfEnd);
       }
@@ -5097,9 +5097,9 @@ nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent)
     }
   }
 
-  // If composition event or text event isn't dispatched via widget,
-  // we need to ignore them since they cannot be managed by TextComposition.
-  // E.g., the event was created by chrome JS.
+  // If a composition event isn't dispatched via widget, we need to ignore them
+  // since they cannot be managed by TextComposition. E.g., the event was
+  // created by chrome JS.
   // Note that if we allow to handle such events, editor may be confused by
   // strange event order.
   bool needsWidget = false;
@@ -5109,15 +5109,10 @@ nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent)
       // If events are not created with proper event interface, their message
       // are initialized with NS_USER_DEFINED_EVENT.  Let's ignore such event.
       return false;
-    case NS_TEXT_TEXT:
-      // Don't allow text events whose internal event are not
-      // WidgetTextEvent.
-      widgetGUIEvent = aEvent->GetInternalNSEvent()->AsTextEvent();
-      needsWidget = true;
-      break;
     case NS_COMPOSITION_START:
     case NS_COMPOSITION_END:
     case NS_COMPOSITION_UPDATE:
+    case NS_COMPOSITION_CHANGE:
       // Don't allow composition events whose internal event are not
       // WidgetCompositionEvent.
       widgetGUIEvent = aEvent->GetInternalNSEvent()->AsCompositionEvent();
diff --git a/editor/libeditor/nsEditor.h b/editor/libeditor/nsEditor.h
index 9d95d9c98a3..5da57f57961 100644
--- a/editor/libeditor/nsEditor.h
+++ b/editor/libeditor/nsEditor.h
@@ -417,9 +417,8 @@ protected:
   }
 
   /**
-   * EnsureComposition() should be composition event handlers or text event
-   * handler.  This tries to get the composition for the event and set it to
-   * mComposition.
+   * EnsureComposition() should be called by composition event handlers.  This
+   * tries to get the composition for the event and set it to mComposition.
    */
   void EnsureComposition(mozilla::WidgetGUIEvent* aEvent);
 
diff --git a/editor/libeditor/nsEditorEventListener.cpp b/editor/libeditor/nsEditorEventListener.cpp
index 7a81a89b92f..78d2a4e7951 100644
--- a/editor/libeditor/nsEditorEventListener.cpp
+++ b/editor/libeditor/nsEditorEventListener.cpp
@@ -456,7 +456,7 @@ nsEditorEventListener::HandleEvent(nsIDOMEvent* aEvent)
     case NS_BLUR_CONTENT:
       return Blur(aEvent);
     // text
-    case NS_TEXT_TEXT:
+    case NS_COMPOSITION_CHANGE:
       return HandleText(aEvent);
     // compositionstart
     case NS_COMPOSITION_START:
diff --git a/editor/libeditor/nsPlaintextEditor.cpp b/editor/libeditor/nsPlaintextEditor.cpp
index 97bbb1a9193..fe3284b9118 100644
--- a/editor/libeditor/nsPlaintextEditor.cpp
+++ b/editor/libeditor/nsPlaintextEditor.cpp
@@ -846,11 +846,13 @@ nsPlaintextEditor::UpdateIMEComposition(nsIDOMEvent* aDOMTextEvent)
 {
   NS_ABORT_IF_FALSE(aDOMTextEvent, "aDOMTextEvent must not be nullptr");
 
-  WidgetTextEvent* widgetTextEvent =
-    aDOMTextEvent->GetInternalNSEvent()->AsTextEvent();
-  NS_ENSURE_TRUE(widgetTextEvent, NS_ERROR_INVALID_ARG);
+  WidgetCompositionEvent* compositionChangeEvent =
+    aDOMTextEvent->GetInternalNSEvent()->AsCompositionEvent();
+  NS_ENSURE_TRUE(compositionChangeEvent, NS_ERROR_INVALID_ARG);
+  MOZ_ASSERT(compositionChangeEvent->message == NS_COMPOSITION_CHANGE,
+             "The internal event should be NS_COMPOSITION_CHANGE");
 
-  EnsureComposition(widgetTextEvent);
+  EnsureComposition(compositionChangeEvent);
 
   nsCOMPtr<nsIPresShell> ps = GetPresShell();
   NS_ENSURE_TRUE(ps, NS_ERROR_NOT_INITIALIZED);
@@ -860,17 +862,17 @@ nsPlaintextEditor::UpdateIMEComposition(nsIDOMEvent* aDOMTextEvent)
   NS_ENSURE_SUCCESS(rv, rv);
 
   // NOTE: TextComposition should receive selection change notification before
-  //       TextEventHandlingMarker notifies TextComposition of the end of
-  //       handling TextEvent because TextComposition may need to ignore
-  //       selection changes caused by composition.  Therefore,
-  //       TextEventHandlingMarker must be destroyed after a call of
-  //       NotifiyEditorObservers(eNotifyEditorObserversOfEnd) or
+  //       CompositionChangeEventHandlingMarker notifies TextComposition of the
+  //       end of handling compositionchange event because TextComposition may
+  //       need to ignore selection changes caused by composition.  Therefore,
+  //       CompositionChangeEventHandlingMarker must be destroyed after a call
+  //       of NotifiyEditorObservers(eNotifyEditorObserversOfEnd) or
   //       NotifiyEditorObservers(eNotifyEditorObserversOfCancel) which notifies
   //       TextComposition of a selection change.
   MOZ_ASSERT(!mPlaceHolderBatch,
     "UpdateIMEComposition() must be called without place holder batch");
-  TextComposition::TextEventHandlingMarker
-    textEventHandlingMarker(mComposition, widgetTextEvent);
+  TextComposition::CompositionChangeEventHandlingMarker
+    compositionChangeEventHandlingMarker(mComposition, compositionChangeEvent);
 
   NotifyEditorObservers(eNotifyEditorObserversOfBefore);
 
@@ -879,7 +881,7 @@ nsPlaintextEditor::UpdateIMEComposition(nsIDOMEvent* aDOMTextEvent)
   {
     nsAutoPlaceHolderBatch batch(this, nsGkAtoms::IMETxnName);
 
-    rv = InsertText(widgetTextEvent->theText);
+    rv = InsertText(compositionChangeEvent->mData);
 
     if (caretP) {
       caretP->SetSelection(selection);
diff --git a/editor/libeditor/tests/test_bug1026397.html b/editor/libeditor/tests/test_bug1026397.html
index 35261128844..e48d8d01e04 100644
--- a/editor/libeditor/tests/test_bug1026397.html
+++ b/editor/libeditor/tests/test_bug1026397.html
@@ -47,7 +47,7 @@ function runTests()
     }
 
     synthesizeComposition({ type: "compositionstart" });
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": aInsertString,
           "clauses":
@@ -60,7 +60,7 @@ function runTests()
     is(input.value, aExpectedValueDuringComposition,
        "The value of input whose maxlength is " + maxLengthStr + " should be "
          + aExpectedValueDuringComposition + " during composition" + aAdditionalExplanation);
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": aInsertString,
           "clauses":
diff --git a/editor/libeditor/tests/test_bug697842.html b/editor/libeditor/tests/test_bug697842.html
index ac1ee8f59e6..d814a5c5764 100644
--- a/editor/libeditor/tests/test_bug697842.html
+++ b/editor/libeditor/tests/test_bug697842.html
@@ -53,7 +53,7 @@ function runTests()
 
     // input first character
     composingString = "\u306B";
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": composingString,
           "clauses":
@@ -66,7 +66,7 @@ function runTests()
 
     // input second character
     composingString = "\u306B\u3085";
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": composingString,
           "clauses":
@@ -78,7 +78,7 @@ function runTests()
       });
 
     // convert them
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": composingString,
           "clauses":
@@ -91,7 +91,7 @@ function runTests()
       });
 
     // commit
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": composingString,
           "clauses":
diff --git a/editor/libeditor/tests/test_bug795785.html b/editor/libeditor/tests/test_bug795785.html
index 1b311a8b09e..443e0639211 100644
--- a/editor/libeditor/tests/test_bug795785.html
+++ b/editor/libeditor/tests/test_bug795785.html
@@ -122,7 +122,7 @@ function doCompositionTest(aElement, aElementDescription, aCallback)
               "\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u3088\u308a" +
               "\u77ed\u6642\u9593\u3067\u7c21\u5358\u306b\u4f5c\u6210\u3067" +
               "\u304d\u307e\u3059\u3002";
-    synthesizeText({
+    synthesizeCompositionChange({
         composition: {
           string: str,
           clauses: [
@@ -134,7 +134,7 @@ function doCompositionTest(aElement, aElementDescription, aCallback)
     hitEventLoop(function () {
       isnot(aElement.scrollTop, 0,
             aElementDescription + " was not scrolled by composition");
-      synthesizeText({
+      synthesizeCompositionChange({
         composition: { string: "", clauses: [ { length: 0, attr: 0 } ] },
         caret: { start: 0, length: 0 }
       });
diff --git a/editor/libeditor/tests/test_contenteditable_text_input_handling.html b/editor/libeditor/tests/test_contenteditable_text_input_handling.html
index 31c9054bbe9..06db744de26 100644
--- a/editor/libeditor/tests/test_contenteditable_text_input_handling.html
+++ b/editor/libeditor/tests/test_contenteditable_text_input_handling.html
@@ -222,7 +222,7 @@ function runTests()
     // start composition
     synthesizeComposition({ type: "compositionstart" });
     // input first character
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": "\u3089",
           "clauses":
@@ -257,7 +257,7 @@ function runTests()
     is(querySelectedText.text, "",
        "query selected text event returns wrong selected text" + when);
     // commit composition
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": "\u3089",
           "clauses":
diff --git a/gfx/2d/FilterNodeSoftware.cpp b/gfx/2d/FilterNodeSoftware.cpp
index c8bd40add58..babef9039b3 100644
--- a/gfx/2d/FilterNodeSoftware.cpp
+++ b/gfx/2d/FilterNodeSoftware.cpp
@@ -1156,7 +1156,7 @@ FilterNodeTransformSoftware::Render(const IntRect& aRect)
   IntRect srcRect = SourceRectForOutputRect(aRect);
 
   RefPtr<DataSourceSurface> input =
-    GetInputDataSourceSurface(IN_TRANSFORM_IN, srcRect, NEED_COLOR_CHANNELS);
+    GetInputDataSourceSurface(IN_TRANSFORM_IN, srcRect);
 
   if (!input) {
     return nullptr;
@@ -1168,8 +1168,18 @@ FilterNodeTransformSoftware::Render(const IntRect& aRect)
     return input.forget();
   }
 
+  RefPtr<DataSourceSurface> surf =
+    Factory::CreateDataSourceSurface(aRect.Size(), input->GetFormat());
+
+  DataSourceSurface::MappedSurface mapping;
+  surf->Map(DataSourceSurface::MapType::WRITE, &mapping);
+
   RefPtr<DrawTarget> dt =
-    Factory::CreateDrawTarget(BackendType::CAIRO, aRect.Size(), input->GetFormat());
+    Factory::CreateDrawTargetForData(BackendType::CAIRO,
+                                     mapping.mData,
+                                     surf->GetSize(),
+                                     mapping.mStride,
+                                     surf->GetFormat());
   if (!dt) {
     return nullptr;
   }
@@ -1178,9 +1188,9 @@ FilterNodeTransformSoftware::Render(const IntRect& aRect)
   dt->SetTransform(transform);
   dt->DrawSurface(input, r, r, DrawSurfaceOptions(mFilter));
 
-  RefPtr<SourceSurface> result = dt->Snapshot();
-  RefPtr<DataSourceSurface> resultData = result->GetDataSurface();
-  return resultData.forget();
+  dt->Flush();
+  surf->Unmap();
+  return surf.forget();
 }
 
 void
diff --git a/gfx/gl/GLConsts.h b/gfx/gl/GLConsts.h
index 26ef72c90ad..dc3269d9772 100644
--- a/gfx/gl/GLConsts.h
+++ b/gfx/gl/GLConsts.h
@@ -5187,6 +5187,8 @@
 #define LOCAL_EGL_COVERAGE_SAMPLE_RESOLVE_NONE_NV            0x3133
 #define LOCAL_EGL_COVERAGE_SAMPLE_RESOLVE_NV                 0x3131
 #define LOCAL_EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE          0x3200
+#define LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE              ((EGLNativeDisplayType)-2)
+#define LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE                   ((EGLNativeDisplayType)-3)
 #define LOCAL_EGL_DEFAULT_DISPLAY                            ((EGLNativeDisplayType)0)
 #define LOCAL_EGL_DEPTH_ENCODING_NONE_NV                     0
 #define LOCAL_EGL_DEPTH_ENCODING_NONLINEAR_NV                0x30E3
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index f072effe25f..b56117f459c 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -1740,10 +1740,9 @@ GLContext::UpdatePixelFormat()
     MOZ_ASSERT(caps.color == !!format.green);
     MOZ_ASSERT(caps.color == !!format.blue);
 
-    MOZ_ASSERT(caps.alpha == !!format.alpha);
-
     // These we either must have if they're requested, or
     // we can have if they're not.
+    MOZ_ASSERT(caps.alpha == !!format.alpha || !caps.alpha);
     MOZ_ASSERT(caps.depth == !!format.depth || !caps.depth);
     MOZ_ASSERT(caps.stencil == !!format.stencil || !caps.stencil);
 
diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
index a5ee2056f97..ce699f34de9 100644
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -232,7 +232,29 @@ GLLibraryEGL::EnsureInitialized()
                        "Couldn't find eglQueryStringImplementationANDROID");
 #endif
 
-    mEGLDisplay = fGetDisplay(EGL_DEFAULT_DISPLAY);
+    mEGLDisplay = nullptr;
+
+#ifdef XP_WIN
+    // XXX we have no way of knowing if this is ANGLE, or if we're just using
+    // a native EGL on windows.  We don't really do the latter right now, so
+    // let's assume it is ANGLE, and try our special types.
+
+    // D3D11 ANGLE only works with OMTC; there's a bug in the non-OMTC layer
+    // manager, and it's pointless to try to fix it.  We also don't try D3D11
+    // ANGLE if the layer manager is prefering D3D9 (hrm, do we care?)
+    if (gfxPrefs::LayersOffMainThreadCompositionEnabled() &&
+        !gfxPrefs::LayersPreferD3D9())
+    {
+        if (gfxPrefs::WebGLANGLEForceD3D11()) {
+            mEGLDisplay = fGetDisplay(LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE);
+        } else if (gfxPrefs::WebGLANGLETryD3D11()) {
+            mEGLDisplay = fGetDisplay(LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE);
+        }
+    }
+#endif
+
+    if (!mEGLDisplay)
+        mEGLDisplay = fGetDisplay(EGL_DEFAULT_DISPLAY);
     if (!fInitialize(mEGLDisplay, nullptr, nullptr))
         return false;
 
diff --git a/gfx/layers/Compositor.h b/gfx/layers/Compositor.h
index 0132300770d..035bae51308 100644
--- a/gfx/layers/Compositor.h
+++ b/gfx/layers/Compositor.h
@@ -123,7 +123,7 @@ struct EffectChain;
 class Image;
 class ISurfaceAllocator;
 class Layer;
-class NewTextureSource;
+class TextureSource;
 class DataTextureSource;
 class CompositingRenderTarget;
 class PCompositorParent;
diff --git a/gfx/layers/RotatedBuffer.cpp b/gfx/layers/RotatedBuffer.cpp
index adbe8a222f9..f0c678db1a5 100644
--- a/gfx/layers/RotatedBuffer.cpp
+++ b/gfx/layers/RotatedBuffer.cpp
@@ -727,11 +727,11 @@ RotatedContentBuffer::BorrowDrawTargetForPainting(PaintState& aPaintState,
   }
 
   if (aPaintState.mMode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
-    MOZ_ASSERT(mDTBuffer && mDTBufferOnWhite);
     if (!mDTBuffer || !mDTBufferOnWhite) {
       // This can happen in release builds if allocating one of the two buffers
       // failed. This is pretty bad and the reason for the failure is already
       // reported through gfxCriticalError.
+      MOZ_ASSERT(false);
       return nullptr;
     }
     nsIntRegionRectIterator iter(*drawPtr);
diff --git a/gfx/layers/TextureDIB.cpp b/gfx/layers/TextureDIB.cpp
index 80d3420f188..497a2c9c570 100644
--- a/gfx/layers/TextureDIB.cpp
+++ b/gfx/layers/TextureDIB.cpp
@@ -128,7 +128,7 @@ DIBTextureHost::DIBTextureHost(TextureFlags aFlags,
     gfxPlatform::GetPlatform()->OptimalFormatForContent(mSurface->GetContentType()));
 }
 
-NewTextureSource*
+TextureSource*
 DIBTextureHost::GetTextureSources()
 {
   if (!mTextureSource) {
diff --git a/gfx/layers/TextureDIB.h b/gfx/layers/TextureDIB.h
index bfdb51bf365..f093405c5ce 100644
--- a/gfx/layers/TextureDIB.h
+++ b/gfx/layers/TextureDIB.h
@@ -70,7 +70,7 @@ public:
   DIBTextureHost(TextureFlags aFlags,
                  const SurfaceDescriptorDIB& aDescriptor);
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE;
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE;
 
   virtual void DeallocateDeviceData() MOZ_OVERRIDE;
 
diff --git a/gfx/layers/basic/BasicColorLayer.cpp b/gfx/layers/basic/BasicColorLayer.cpp
index bcca4656a71..9631f1d317a 100644
--- a/gfx/layers/basic/BasicColorLayer.cpp
+++ b/gfx/layers/basic/BasicColorLayer.cpp
@@ -62,9 +62,12 @@ public:
       snapped = mat.TransformBounds(snapped);
     }
 
+    // Clip drawing in case we're using (unbounded) operator source.
+    aDT->PushClipRect(snapped);
     FillRectWithMask(aDT, aDeviceOffset, snapped, ToColor(mColor),
                      DrawOptions(GetEffectiveOpacity(), GetEffectiveOperator(this)),
                      aMaskLayer);
+    aDT->PopClip();
   }
 
 protected:
diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp
index 36093415b48..861d7647d8f 100644
--- a/gfx/layers/basic/BasicLayerManager.cpp
+++ b/gfx/layers/basic/BasicLayerManager.cpp
@@ -795,18 +795,16 @@ BasicLayerManager::PaintLayer(gfxContext* aTarget,
   RenderTraceScope trace("BasicLayerManager::PaintLayer", "707070");
 
   const nsIntRect* clipRect = aLayer->GetEffectiveClipRect();
-  // aLayer might not be a container layer, but if so we take care not to use
-  // the container variable
-  BasicContainerLayer* container = static_cast<BasicContainerLayer*>(aLayer);
-  bool needsGroup = aLayer->GetFirstChild() &&
-                    container->UseIntermediateSurface();
+  BasicContainerLayer* container =
+    static_cast<BasicContainerLayer*>(aLayer->AsContainerLayer());
+  bool needsGroup = container && container->UseIntermediateSurface();
   BasicImplData* data = ToData(aLayer);
   bool needsClipToVisibleRegion =
     data->GetClipToVisibleRegion() && !aLayer->AsPaintedLayer();
-  NS_ASSERTION(needsGroup || !aLayer->GetFirstChild() ||
+  NS_ASSERTION(needsGroup || !container ||
                container->GetOperator() == CompositionOp::OP_OVER,
                "non-OVER operator should have forced UseIntermediateSurface");
-  NS_ASSERTION(!aLayer->GetFirstChild() || !aLayer->GetMaskLayer() ||
+  NS_ASSERTION(!container || !aLayer->GetMaskLayer() ||
                container->UseIntermediateSurface(),
                "ContainerLayer with mask layer should force UseIntermediateSurface");
 
@@ -814,7 +812,7 @@ BasicLayerManager::PaintLayer(gfxContext* aTarget,
   gfxMatrix transform;
   // Will return an identity matrix for 3d transforms, and is handled separately below.
   bool is2D = paintLayerContext.Setup2DTransform();
-  NS_ABORT_IF_FALSE(is2D || needsGroup || !aLayer->GetFirstChild(), "Must PushGroup for 3d transforms!");
+  NS_ABORT_IF_FALSE(is2D || needsGroup || !container, "Must PushGroup for 3d transforms!");
 
   bool needsSaveRestore =
     needsGroup || clipRect || needsClipToVisibleRegion || !is2D;
diff --git a/gfx/layers/basic/MacIOSurfaceTextureHostBasic.h b/gfx/layers/basic/MacIOSurfaceTextureHostBasic.h
index 2239b43c027..46a71e51923 100644
--- a/gfx/layers/basic/MacIOSurfaceTextureHostBasic.h
+++ b/gfx/layers/basic/MacIOSurfaceTextureHostBasic.h
@@ -23,7 +23,7 @@ class BasicCompositor;
  */
 class MacIOSurfaceTextureSourceBasic
   : public TextureSourceBasic,
-    public NewTextureSource
+    public TextureSource
 {
 public:
   MacIOSurfaceTextureSourceBasic(BasicCompositor* aCompositor,
@@ -63,7 +63,7 @@ public:
 
   virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE;
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE
   {
     return mTextureSource;
   }
diff --git a/gfx/layers/basic/X11TextureSourceBasic.h b/gfx/layers/basic/X11TextureSourceBasic.h
index 25b5ace9314..7a774da4254 100644
--- a/gfx/layers/basic/X11TextureSourceBasic.h
+++ b/gfx/layers/basic/X11TextureSourceBasic.h
@@ -17,7 +17,7 @@ class BasicCompositor;
 // TextureSource for Xlib-backed surfaces.
 class X11TextureSourceBasic
   : public TextureSourceBasic
-  , public NewTextureSource
+  , public TextureSource
 {
 public:
   X11TextureSourceBasic(BasicCompositor* aCompositor, gfxXlibSurface* aSurface);
diff --git a/gfx/layers/composite/ContentHost.cpp b/gfx/layers/composite/ContentHost.cpp
index dde15802265..09b0a0550b8 100644
--- a/gfx/layers/composite/ContentHost.cpp
+++ b/gfx/layers/composite/ContentHost.cpp
@@ -49,8 +49,8 @@ ContentHostBase::Composite(EffectChain& aEffectChain,
     return;
   }
 
-  RefPtr<NewTextureSource> source = GetTextureSource();
-  RefPtr<NewTextureSource> sourceOnWhite = GetTextureSourceOnWhite();
+  RefPtr<TextureSource> source = GetTextureSource();
+  RefPtr<TextureSource> sourceOnWhite = GetTextureSourceOnWhite();
 
   if (!source) {
     return;
@@ -208,8 +208,8 @@ ContentHostBase::Composite(EffectChain& aEffectChain,
 TemporaryRef<TexturedEffect>
 ContentHostBase::GenEffect(const gfx::Filter& aFilter)
 {
-  RefPtr<NewTextureSource> source = GetTextureSource();
-  RefPtr<NewTextureSource> sourceOnWhite = GetTextureSourceOnWhite();
+  RefPtr<TextureSource> source = GetTextureSource();
+  RefPtr<TextureSource> sourceOnWhite = GetTextureSourceOnWhite();
   if (!source) {
     return nullptr;
   }
@@ -439,14 +439,14 @@ ContentHostIncremental::ProcessTextureUpdates()
   mUpdateList.Clear();
 }
 
-NewTextureSource*
+TextureSource*
 ContentHostIncremental::GetTextureSource()
 {
   MOZ_ASSERT(mLocked);
   return mSource;
 }
 
-NewTextureSource*
+TextureSource*
 ContentHostIncremental::GetTextureSourceOnWhite()
 {
   MOZ_ASSERT(mLocked);
diff --git a/gfx/layers/composite/ContentHost.h b/gfx/layers/composite/ContentHost.h
index 5a98e7a93d6..b445287ef20 100644
--- a/gfx/layers/composite/ContentHost.h
+++ b/gfx/layers/composite/ContentHost.h
@@ -103,8 +103,8 @@ public:
                          const gfx::Rect& aClipRect,
                          const nsIntRegion* aVisibleRegion = nullptr);
 
-  virtual NewTextureSource* GetTextureSource() = 0;
-  virtual NewTextureSource* GetTextureSourceOnWhite() = 0;
+  virtual TextureSource* GetTextureSource() = 0;
+  virtual TextureSource* GetTextureSourceOnWhite() = 0;
 
   virtual TemporaryRef<TexturedEffect> GenEffect(const gfx::Filter& aFilter) MOZ_OVERRIDE;
 
@@ -173,11 +173,11 @@ public:
     mLocked = false;
   }
 
-  virtual NewTextureSource* GetTextureSource() MOZ_OVERRIDE {
+  virtual TextureSource* GetTextureSource() MOZ_OVERRIDE {
     MOZ_ASSERT(mLocked);
     return mTextureHost->GetTextureSources();
   }
-  virtual NewTextureSource* GetTextureSourceOnWhite() MOZ_OVERRIDE {
+  virtual TextureSource* GetTextureSourceOnWhite() MOZ_OVERRIDE {
     MOZ_ASSERT(mLocked);
     if (mTextureHostOnWhite) {
       return mTextureHostOnWhite->GetTextureSources();
@@ -291,8 +291,8 @@ public:
     mLocked = false;
   }
 
-  virtual NewTextureSource* GetTextureSource() MOZ_OVERRIDE;
-  virtual NewTextureSource* GetTextureSourceOnWhite() MOZ_OVERRIDE;
+  virtual TextureSource* GetTextureSource() MOZ_OVERRIDE;
+  virtual TextureSource* GetTextureSourceOnWhite() MOZ_OVERRIDE;
 
 private:
 
diff --git a/gfx/layers/composite/ImageHost.cpp b/gfx/layers/composite/ImageHost.cpp
index bb523513e99..6fd06a4d8a0 100644
--- a/gfx/layers/composite/ImageHost.cpp
+++ b/gfx/layers/composite/ImageHost.cpp
@@ -104,7 +104,7 @@ ImageHost::Composite(EffectChain& aEffectChain,
     NS_WARNING("failed to lock front buffer");
     return;
   }
-  RefPtr<NewTextureSource> source = GetTextureSource();
+  RefPtr<TextureSource> source = GetTextureSource();
   if (!source) {
     return;
   }
@@ -273,7 +273,7 @@ ImageHost::Unlock()
   mLocked = false;
 }
 
-TemporaryRef<NewTextureSource>
+TemporaryRef<TextureSource>
 ImageHost::GetTextureSource()
 {
   MOZ_ASSERT(mLocked);
@@ -283,7 +283,7 @@ ImageHost::GetTextureSource()
 TemporaryRef<TexturedEffect>
 ImageHost::GenEffect(const gfx::Filter& aFilter)
 {
-  RefPtr<NewTextureSource> source = GetTextureSource();
+  RefPtr<TextureSource> source = GetTextureSource();
   if (!source) {
     return nullptr;
   }
diff --git a/gfx/layers/composite/ImageHost.h b/gfx/layers/composite/ImageHost.h
index d8586444efe..ad12d229f04 100644
--- a/gfx/layers/composite/ImageHost.h
+++ b/gfx/layers/composite/ImageHost.h
@@ -84,7 +84,7 @@ public:
 
   virtual void Unlock() MOZ_OVERRIDE;
 
-  virtual TemporaryRef<NewTextureSource> GetTextureSource();
+  virtual TemporaryRef<TextureSource> GetTextureSource();
 
   virtual TemporaryRef<TexturedEffect> GenEffect(const gfx::Filter& aFilter) MOZ_OVERRIDE;
 
diff --git a/gfx/layers/composite/TextureHost.cpp b/gfx/layers/composite/TextureHost.cpp
index 2bcc3a711e2..3fb9e63ff8e 100644
--- a/gfx/layers/composite/TextureHost.cpp
+++ b/gfx/layers/composite/TextureHost.cpp
@@ -367,7 +367,7 @@ BufferTextureHost::SetCompositor(Compositor* aCompositor)
   if (mCompositor == aCompositor) {
     return;
   }
-  RefPtr<NewTextureSource> it = mFirstSource;
+  RefPtr<TextureSource> it = mFirstSource;
   while (it) {
     it->SetCompositor(aCompositor);
     it = it->GetNextSibling();
@@ -378,7 +378,7 @@ BufferTextureHost::SetCompositor(Compositor* aCompositor)
 void
 BufferTextureHost::DeallocateDeviceData()
 {
-  RefPtr<NewTextureSource> it = mFirstSource;
+  RefPtr<TextureSource> it = mFirstSource;
   while (it) {
     it->DeallocateDeviceData();
     it = it->GetNextSibling();
@@ -403,7 +403,7 @@ BufferTextureHost::Unlock()
   mLocked = false;
 }
 
-NewTextureSource*
+TextureSource*
 BufferTextureHost::GetTextureSources()
 {
   MOZ_ASSERT(mLocked);
@@ -865,7 +865,7 @@ StreamTextureHost::Lock()
       break;
   }
 
-  RefPtr<NewTextureSource> newTexSource;
+  RefPtr<TextureSource> newTexSource;
   if (compositorSupportsShSurfType) {
     gfx::SurfaceFormat format = abstractSurf->mHasAlpha ? gfx::SurfaceFormat::R8G8B8A8
                                                         : gfx::SurfaceFormat::R8G8B8X8;
diff --git a/gfx/layers/composite/TextureHost.h b/gfx/layers/composite/TextureHost.h
index b3683c2084f..ceae69abdab 100644
--- a/gfx/layers/composite/TextureHost.h
+++ b/gfx/layers/composite/TextureHost.h
@@ -88,14 +88,18 @@ public:
  */
 class TextureSource
 {
-protected:
-  virtual ~TextureSource();
-
 public:
   NS_INLINE_DECL_REFCOUNTING(TextureSource)
 
   TextureSource();
 
+  /**
+   * Should be overridden in order to deallocate the data that is associated
+   * with the rendering backend, such as GL textures.
+   */
+  virtual void DeallocateDeviceData() {}
+
+
   /**
    * Return the size of the texture in texels.
    * If this is a tile iterator, GetSize must return the size of the current tile.
@@ -114,63 +118,28 @@ public:
   virtual TextureSourceD3D9* AsSourceD3D9() { return nullptr; }
   virtual TextureSourceD3D11* AsSourceD3D11() { return nullptr; }
   virtual TextureSourceBasic* AsSourceBasic() { return nullptr; }
-
   /**
    * Cast to a DataTextureSurce.
    */
   virtual DataTextureSource* AsDataTextureSource() { return nullptr; }
 
-  /**
-   * In some rare cases we currently need to consider a group of textures as one
-   * TextureSource, that can be split in sub-TextureSources.
-   */
-  virtual TextureSource* GetSubSource(int index) { return nullptr; }
-
   /**
    * Overload this if the TextureSource supports big textures that don't fit in
    * one device texture and must be tiled internally.
    */
   virtual BigImageIterator* AsBigImageIterator() { return nullptr; }
-};
-
-/**
- * XXX - merge this class with TextureSource when deprecated texture classes
- * are completely removed.
- */
-class NewTextureSource : public TextureSource
-{
-public:
-  NewTextureSource()
-  {
-    MOZ_COUNT_CTOR(NewTextureSource);
-  }
-protected:
-  virtual ~NewTextureSource()
-  {
-    MOZ_COUNT_DTOR(NewTextureSource);
-  }
-
-public:
-  /**
-   * Should be overridden in order to deallocate the data that is associated
-   * with the rendering backend, such as GL textures.
-   */
-  virtual void DeallocateDeviceData() = 0;
 
   virtual void SetCompositor(Compositor* aCompositor) {}
 
-  void SetNextSibling(NewTextureSource* aTexture)
-  {
-    mNextSibling = aTexture;
-  }
+  void SetNextSibling(TextureSource* aTexture) { mNextSibling = aTexture; }
 
-  NewTextureSource* GetNextSibling() const
-  {
-    return mNextSibling;
-  }
+  TextureSource* GetNextSibling() const { return mNextSibling; }
 
-  // temporary adapter to use the same SubSource API as the old TextureSource
-  virtual TextureSource* GetSubSource(int index) MOZ_OVERRIDE
+  /**
+   * In some rare cases we currently need to consider a group of textures as one
+   * TextureSource, that can be split in sub-TextureSources.
+   */
+  TextureSource* GetSubSource(int index)
   {
     switch (index) {
       case 0: return this;
@@ -181,7 +150,9 @@ public:
   }
 
 protected:
-  RefPtr<NewTextureSource> mNextSibling;
+  virtual ~TextureSource();
+
+  RefPtr<TextureSource> mNextSibling;
 };
 
 /**
@@ -189,7 +160,7 @@ protected:
  *
  * All backend should implement at least one DataTextureSource.
  */
-class DataTextureSource : public NewTextureSource
+class DataTextureSource : public TextureSource
 {
 public:
   DataTextureSource()
@@ -328,7 +299,7 @@ public:
    * so as to not upload textures while the main thread is blocked.
    * Must not be called while this TextureHost is not sucessfully Locked.
    */
-  virtual NewTextureSource* GetTextureSources() = 0;
+  virtual TextureSource* GetTextureSources() = 0;
 
   /**
    * Is called before compositing if the shared data has changed since last
@@ -499,7 +470,7 @@ public:
 
   virtual void Unlock() MOZ_OVERRIDE;
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE;
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE;
 
   virtual void DeallocateDeviceData() MOZ_OVERRIDE;
 
@@ -621,7 +592,7 @@ public:
 
   virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE;
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE
   {
     return mTextureSource;
   }
@@ -640,7 +611,7 @@ public:
 protected:
   Compositor* mCompositor;
   gl::SurfaceStream* mStream;
-  RefPtr<NewTextureSource> mTextureSource;
+  RefPtr<TextureSource> mTextureSource;
   RefPtr<DataTextureSource> mDataTextureSource;
 };
 
@@ -671,9 +642,10 @@ private:
  * This can be used as an offscreen rendering target by the compositor, and
  * subsequently can be used as a source by the compositor.
  */
-class CompositingRenderTarget : public TextureSource
+class CompositingRenderTarget: public TextureSource
 {
 public:
+
   explicit CompositingRenderTarget(const gfx::IntPoint& aOrigin)
     : mOrigin(aOrigin)
   {}
diff --git a/gfx/layers/composite/TiledContentHost.cpp b/gfx/layers/composite/TiledContentHost.cpp
index 5ff9e5b8049..615ebabc14e 100644
--- a/gfx/layers/composite/TiledContentHost.cpp
+++ b/gfx/layers/composite/TiledContentHost.cpp
@@ -486,8 +486,8 @@ TiledContentHost::RenderTile(const TileHost& aTile,
     NS_WARNING("Failed to lock tile");
     return;
   }
-  RefPtr<NewTextureSource> source = aTile.mTextureHost->GetTextureSources();
-  RefPtr<NewTextureSource> sourceOnWhite =
+  RefPtr<TextureSource> source = aTile.mTextureHost->GetTextureSources();
+  RefPtr<TextureSource> sourceOnWhite =
     aTile.mTextureHostOnWhite ? aTile.mTextureHostOnWhite->GetTextureSources() : nullptr;
   if (!source || (aTile.mTextureHostOnWhite && !sourceOnWhite)) {
     return;
diff --git a/gfx/layers/composite/X11TextureHost.h b/gfx/layers/composite/X11TextureHost.h
index 01dfb8e3ad6..1bb639b77b8 100644
--- a/gfx/layers/composite/X11TextureHost.h
+++ b/gfx/layers/composite/X11TextureHost.h
@@ -30,7 +30,7 @@ public:
 
   virtual gfx::IntSize GetSize() const MOZ_OVERRIDE;
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE
   {
     return mTextureSource;
   }
@@ -46,7 +46,7 @@ public:
 
 protected:
   Compositor* mCompositor;
-  RefPtr<NewTextureSource> mTextureSource;
+  RefPtr<TextureSource> mTextureSource;
   RefPtr<gfxXlibSurface> mSurface;
 };
 
diff --git a/gfx/layers/d3d11/TextureD3D11.cpp b/gfx/layers/d3d11/TextureD3D11.cpp
index 6e124202356..6b9a82aa281 100644
--- a/gfx/layers/d3d11/TextureD3D11.cpp
+++ b/gfx/layers/d3d11/TextureD3D11.cpp
@@ -485,7 +485,7 @@ DXGITextureHostD3D11::Unlock()
   mIsLocked = false;
 }
 
-NewTextureSource*
+TextureSource*
 DXGITextureHostD3D11::GetTextureSources()
 {
   MOZ_ASSERT(mIsLocked);
diff --git a/gfx/layers/d3d11/TextureD3D11.h b/gfx/layers/d3d11/TextureD3D11.h
index 6ec5fb25f68..da9975b56e0 100644
--- a/gfx/layers/d3d11/TextureD3D11.h
+++ b/gfx/layers/d3d11/TextureD3D11.h
@@ -176,7 +176,7 @@ public:
   DXGITextureHostD3D11(TextureFlags aFlags,
                        const SurfaceDescriptorD3D10& aDescriptor);
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE;
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE;
 
   virtual void DeallocateDeviceData() MOZ_OVERRIDE {}
 
diff --git a/gfx/layers/d3d9/TextureD3D9.cpp b/gfx/layers/d3d9/TextureD3D9.cpp
index 8d1045651db..e2fe0db27df 100644
--- a/gfx/layers/d3d9/TextureD3D9.cpp
+++ b/gfx/layers/d3d9/TextureD3D9.cpp
@@ -889,7 +889,7 @@ TextureHostD3D9::SetCompositor(Compositor* aCompositor)
   }
 }
 
-NewTextureSource*
+TextureSource*
 TextureHostD3D9::GetTextureSources()
 {
   MOZ_ASSERT(mIsLocked);
@@ -965,7 +965,7 @@ DXGITextureHostD3D9::OpenSharedHandle()
   return;
 }
 
-NewTextureSource*
+TextureSource*
 DXGITextureHostD3D9::GetTextureSources()
 {
   MOZ_ASSERT(mIsLocked);
diff --git a/gfx/layers/d3d9/TextureD3D9.h b/gfx/layers/d3d9/TextureD3D9.h
index 349b9f482dc..76b80b092b3 100644
--- a/gfx/layers/d3d9/TextureD3D9.h
+++ b/gfx/layers/d3d9/TextureD3D9.h
@@ -292,7 +292,7 @@ public:
   TextureHostD3D9(TextureFlags aFlags,
                   const SurfaceDescriptorD3D9& aDescriptor);
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE;
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE;
 
   virtual void DeallocateDeviceData() MOZ_OVERRIDE;
 
@@ -333,7 +333,7 @@ public:
   DXGITextureHostD3D9(TextureFlags aFlags,
     const SurfaceDescriptorD3D10& aDescriptor);
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE;
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE;
 
   virtual void DeallocateDeviceData() MOZ_OVERRIDE;
 
diff --git a/gfx/layers/opengl/GrallocTextureHost.cpp b/gfx/layers/opengl/GrallocTextureHost.cpp
index 0931005a952..dca0cf47b14 100644
--- a/gfx/layers/opengl/GrallocTextureHost.cpp
+++ b/gfx/layers/opengl/GrallocTextureHost.cpp
@@ -295,7 +295,7 @@ void
 GrallocTextureSourceOGL::DeallocateDeviceData()
 {
   if (mEGLImage) {
-    MOZ_ASSERT(gl());
+    MOZ_ASSERT(mCompositor);
     if (!gl() || !gl()->MakeCurrent()) {
       return;
     }
diff --git a/gfx/layers/opengl/GrallocTextureHost.h b/gfx/layers/opengl/GrallocTextureHost.h
index f977c9aa25a..c1dfe552960 100644
--- a/gfx/layers/opengl/GrallocTextureHost.h
+++ b/gfx/layers/opengl/GrallocTextureHost.h
@@ -16,7 +16,7 @@ namespace layers {
 
 class GrallocTextureHostOGL;
 
-class GrallocTextureSourceOGL : public NewTextureSource
+class GrallocTextureSourceOGL : public TextureSource
                               , public TextureSourceOGL
 {
 public:
@@ -116,7 +116,7 @@ public:
 
   virtual LayerRenderState GetRenderState() MOZ_OVERRIDE;
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE
   {
     return mTextureSource;
   }
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h b/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h
index 723520883a4..5ffa143631c 100644
--- a/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h
+++ b/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h
@@ -19,7 +19,7 @@ namespace layers {
  * It does not own any GL texture, and attaches its shared handle to one of
  * the compositor's temporary textures when binding.
  */
-class MacIOSurfaceTextureSourceOGL : public NewTextureSource
+class MacIOSurfaceTextureSourceOGL : public TextureSource
                                    , public TextureSourceOGL
 {
 public:
@@ -73,7 +73,7 @@ public:
 
   virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE;
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE
   {
     return mTextureSource;
   }
diff --git a/gfx/layers/opengl/TextureHostOGL.h b/gfx/layers/opengl/TextureHostOGL.h
index 3d345e89ce7..b574cb0f58e 100644
--- a/gfx/layers/opengl/TextureHostOGL.h
+++ b/gfx/layers/opengl/TextureHostOGL.h
@@ -368,7 +368,7 @@ protected:
  *
  * The shared texture handle is owned by the TextureHost.
  */
-class GLTextureSource : public NewTextureSource
+class GLTextureSource : public TextureSource
                       , public TextureSourceOGL
 {
 public:
@@ -411,7 +411,7 @@ protected:
 
 #ifdef MOZ_WIDGET_ANDROID
 
-class SurfaceTextureSource : public NewTextureSource
+class SurfaceTextureSource : public TextureSource
                            , public TextureSourceOGL
 {
 public:
@@ -474,7 +474,7 @@ public:
 
   virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE;
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE
   {
     return mTextureSource;
   }
@@ -502,7 +502,7 @@ protected:
 ////////////////////////////////////////////////////////////////////////
 // EGLImage
 
-class EGLImageTextureSource : public NewTextureSource
+class EGLImageTextureSource : public TextureSource
                             , public TextureSourceOGL
 {
 public:
@@ -565,7 +565,7 @@ public:
 
   virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE;
 
-  virtual NewTextureSource* GetTextureSources() MOZ_OVERRIDE
+  virtual TextureSource* GetTextureSources() MOZ_OVERRIDE
   {
     return mTextureSource;
   }
diff --git a/gfx/layers/opengl/X11TextureSourceOGL.h b/gfx/layers/opengl/X11TextureSourceOGL.h
index 5032b2c48ae..849f3c5a964 100644
--- a/gfx/layers/opengl/X11TextureSourceOGL.h
+++ b/gfx/layers/opengl/X11TextureSourceOGL.h
@@ -17,7 +17,7 @@ namespace layers {
 // TextureSource for Xlib-backed surfaces.
 class X11TextureSourceOGL
   : public TextureSourceOGL
-  , public NewTextureSource
+  , public TextureSource
 {
 public:
   X11TextureSourceOGL(CompositorOGL* aCompositor, gfxXlibSurface* aSurface);
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index 4a5ee27adf9..24c5e011ab8 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -304,6 +304,8 @@ private:
   DECL_GFX_PREF(Live, "ui.click_hold_context_menus.delay",     UiClickHoldContextMenusDelay, int32_t, 500);
 
   DECL_GFX_PREF(Once, "webgl.force-layers-readback",           WebGLForceLayersReadback, bool, false);
+  DECL_GFX_PREF(Once, "webgl.angle.try-d3d11",                 WebGLANGLETryD3D11, bool, false);
+  DECL_GFX_PREF(Once, "webgl.angle.force-d3d11",               WebGLANGLEForceD3D11, bool, false);
 
   DECL_GFX_PREF(Once, "layers.stereo-video.enabled",           StereoVideoEnabled, bool, false);
 public:
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index 84d085c8755..51427ba9859 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -477,6 +477,10 @@ gfxWindowsPlatform::CreateDevice(nsRefPtr<IDXGIAdapter1> &adapter1,
   nsRefPtr<ID3D10Device1> device;
   HRESULT hr =
     createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, nullptr,
+#ifdef DEBUG
+                    // This isn't set because of bug 1078411
+                    // D3D10_CREATE_DEVICE_DEBUG |
+#endif
                     D3D10_CREATE_DEVICE_BGRA_SUPPORT |
                     D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
                     static_cast<D3D10_FEATURE_LEVEL1>(kSupportedFeatureLevels[featureLevelIndex]),
diff --git a/js/ipc/JavaScriptBase.h b/js/ipc/JavaScriptBase.h
index 6754d5bb088..cc91cd91ddc 100644
--- a/js/ipc/JavaScriptBase.h
+++ b/js/ipc/JavaScriptBase.h
@@ -38,42 +38,42 @@ class JavaScriptBase : public WrapperOwner, public WrapperAnswer, public Base
     bool AnswerPreventExtensions(const uint64_t &objId, ReturnStatus *rs) {
         return Answer::AnswerPreventExtensions(ObjectId::deserialize(objId), rs);
     }
-    bool AnswerGetPropertyDescriptor(const uint64_t &objId, const nsString &id,
+    bool AnswerGetPropertyDescriptor(const uint64_t &objId, const JSIDVariant &id,
                                      ReturnStatus *rs,
                                      PPropertyDescriptor *out) {
         return Answer::AnswerGetPropertyDescriptor(ObjectId::deserialize(objId), id, rs, out);
     }
     bool AnswerGetOwnPropertyDescriptor(const uint64_t &objId,
-                                        const nsString &id,
+                                        const JSIDVariant &id,
                                         ReturnStatus *rs,
                                         PPropertyDescriptor *out) {
         return Answer::AnswerGetOwnPropertyDescriptor(ObjectId::deserialize(objId), id, rs, out);
     }
-    bool AnswerDefineProperty(const uint64_t &objId, const nsString &id,
+    bool AnswerDefineProperty(const uint64_t &objId, const JSIDVariant &id,
                               const PPropertyDescriptor &flags,
                               ReturnStatus *rs) {
         return Answer::AnswerDefineProperty(ObjectId::deserialize(objId), id, flags, rs);
     }
-    bool AnswerDelete(const uint64_t &objId, const nsString &id,
+    bool AnswerDelete(const uint64_t &objId, const JSIDVariant &id,
                       ReturnStatus *rs, bool *success) {
         return Answer::AnswerDelete(ObjectId::deserialize(objId), id, rs, success);
     }
 
-    bool AnswerHas(const uint64_t &objId, const nsString &id,
+    bool AnswerHas(const uint64_t &objId, const JSIDVariant &id,
                    ReturnStatus *rs, bool *bp) {
         return Answer::AnswerHas(ObjectId::deserialize(objId), id, rs, bp);
     }
-    bool AnswerHasOwn(const uint64_t &objId, const nsString &id,
+    bool AnswerHasOwn(const uint64_t &objId, const JSIDVariant &id,
                       ReturnStatus *rs, bool *bp) {
         return Answer::AnswerHasOwn(ObjectId::deserialize(objId), id, rs, bp);
     }
     bool AnswerGet(const uint64_t &objId, const ObjectVariant &receiverVar,
-                   const nsString &id,
+                   const JSIDVariant &id,
                    ReturnStatus *rs, JSVariant *result) {
         return Answer::AnswerGet(ObjectId::deserialize(objId), receiverVar, id, rs, result);
     }
     bool AnswerSet(const uint64_t &objId, const ObjectVariant &receiverVar,
-                   const nsString &id, const bool &strict,
+                   const JSIDVariant &id, const bool &strict,
                    const JSVariant &value, ReturnStatus *rs, JSVariant *result) {
         return Answer::AnswerSet(ObjectId::deserialize(objId), receiverVar, id, strict, value, rs, result);
     }
@@ -134,42 +134,42 @@ class JavaScriptBase : public WrapperOwner, public WrapperAnswer, public Base
     bool CallPreventExtensions(const ObjectId &objId, ReturnStatus *rs) {
         return Base::CallPreventExtensions(objId.serialize(), rs);
     }
-    bool CallGetPropertyDescriptor(const ObjectId &objId, const nsString &id,
+    bool CallGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id,
                                      ReturnStatus *rs,
                                      PPropertyDescriptor *out) {
         return Base::CallGetPropertyDescriptor(objId.serialize(), id, rs, out);
     }
     bool CallGetOwnPropertyDescriptor(const ObjectId &objId,
-                                      const nsString &id,
+                                      const JSIDVariant &id,
                                       ReturnStatus *rs,
                                       PPropertyDescriptor *out) {
         return Base::CallGetOwnPropertyDescriptor(objId.serialize(), id, rs, out);
     }
-    bool CallDefineProperty(const ObjectId &objId, const nsString &id,
+    bool CallDefineProperty(const ObjectId &objId, const JSIDVariant &id,
                             const PPropertyDescriptor &flags,
                               ReturnStatus *rs) {
         return Base::CallDefineProperty(objId.serialize(), id, flags, rs);
     }
-    bool CallDelete(const ObjectId &objId, const nsString &id,
+    bool CallDelete(const ObjectId &objId, const JSIDVariant &id,
                     ReturnStatus *rs, bool *success) {
         return Base::CallDelete(objId.serialize(), id, rs, success);
     }
 
-    bool CallHas(const ObjectId &objId, const nsString &id,
+    bool CallHas(const ObjectId &objId, const JSIDVariant &id,
                    ReturnStatus *rs, bool *bp) {
         return Base::CallHas(objId.serialize(), id, rs, bp);
     }
-    bool CallHasOwn(const ObjectId &objId, const nsString &id,
+    bool CallHasOwn(const ObjectId &objId, const JSIDVariant &id,
                     ReturnStatus *rs, bool *bp) {
         return Base::CallHasOwn(objId.serialize(), id, rs, bp);
     }
     bool CallGet(const ObjectId &objId, const ObjectVariant &receiverVar,
-                 const nsString &id,
+                 const JSIDVariant &id,
                  ReturnStatus *rs, JSVariant *result) {
         return Base::CallGet(objId.serialize(), receiverVar, id, rs, result);
     }
     bool CallSet(const ObjectId &objId, const ObjectVariant &receiverVar,
-                 const nsString &id, const bool &strict,
+                 const JSIDVariant &id, const bool &strict,
                  const JSVariant &value, ReturnStatus *rs, JSVariant *result) {
         return Base::CallSet(objId.serialize(), receiverVar, id, strict, value, rs, result);
     }
diff --git a/js/ipc/JavaScriptLogging.h b/js/ipc/JavaScriptLogging.h
index eeb47a1a9d3..1ba2036b21b 100644
--- a/js/ipc/JavaScriptLogging.h
+++ b/js/ipc/JavaScriptLogging.h
@@ -49,6 +49,12 @@ struct OutVariant
     explicit OutVariant(const JSVariant &variant) : variant(variant) {}
 };
 
+struct Identifier
+{
+    JSIDVariant variant;
+    explicit Identifier(const JSIDVariant &variant) : variant(variant) {}
+};
+
 class Logging
 {
   public:
@@ -165,6 +171,10 @@ class Logging
                   formatObject(incoming, false, ObjectId::deserialize(ovar.get_RemoteObject().serializedId()), out);
               break;
           }
+          case JSVariant::TSymbolVariant: {
+              out = "<Symbol>";
+              break;
+          }
           case JSVariant::Tdouble: {
               out = nsPrintfCString("%.0f", value.get_double());
               break;
@@ -184,6 +194,29 @@ class Logging
         }
     }
 
+    void format(const Identifier &id, nsCString &out) {
+        switch (id.variant.type()) {
+          case JSIDVariant::TSymbolVariant: {
+              out = "<Symbol>";
+              break;
+          }
+          case JSIDVariant::TnsString: {
+              nsAutoCString tmp;
+              format(id.variant.get_nsString(), tmp);
+              out = nsPrintfCString("\"%s\"", tmp.get());
+              break;
+          }
+          case JSIDVariant::Tint32_t: {
+              out = nsPrintfCString("%d", id.variant.get_int32_t());
+              break;
+          }
+          default: {
+              out = "Unknown";
+              break;
+          }
+      }
+    }
+
   private:
     JavaScriptShared *shared;
     JSContext *cx;
diff --git a/js/ipc/JavaScriptShared.cpp b/js/ipc/JavaScriptShared.cpp
index 882be465929..cff04a71961 100644
--- a/js/ipc/JavaScriptShared.cpp
+++ b/js/ipc/JavaScriptShared.cpp
@@ -267,6 +267,17 @@ JavaScriptShared::toVariant(JSContext *cx, JS::HandleValue from, JSVariant *to)
         return true;
       }
 
+      case JSTYPE_SYMBOL:
+      {
+        RootedSymbol sym(cx, from.toSymbol());
+
+        SymbolVariant symVar;
+        if (!toSymbolVariant(cx, sym, &symVar))
+            return false;
+        *to = symVar;
+        return true;
+      }
+
       case JSTYPE_STRING:
       {
         nsAutoJSString autoStr;
@@ -314,6 +325,15 @@ JavaScriptShared::fromVariant(JSContext *cx, const JSVariant &from, MutableHandl
           return true;
         }
 
+        case JSVariant::TSymbolVariant:
+        {
+          Symbol *sym = fromSymbolVariant(cx, from.get_SymbolVariant());
+          if (!sym)
+              return false;
+          to.setSymbol(sym);
+          return true;
+        }
+
         case JSVariant::Tdouble:
           to.set(JS_NumberValue(from.get_double()));
           return true;
@@ -348,10 +368,107 @@ JavaScriptShared::fromVariant(JSContext *cx, const JSVariant &from, MutableHandl
         }
 
         default:
+          MOZ_CRASH("NYI");
           return false;
     }
 }
 
+bool
+JavaScriptShared::toJSIDVariant(JSContext *cx, HandleId from, JSIDVariant *to)
+{
+    if (JSID_IS_STRING(from)) {
+        nsAutoJSString autoStr;
+        if (!autoStr.init(cx, JSID_TO_STRING(from)))
+            return false;
+        *to = autoStr;
+        return true;
+    }
+    if (JSID_IS_INT(from)) {
+        *to = JSID_TO_INT(from);
+        return true;
+    }
+    if (JSID_IS_SYMBOL(from)) {
+        SymbolVariant symVar;
+        if (!toSymbolVariant(cx, JSID_TO_SYMBOL(from), &symVar))
+            return false;
+        *to = symVar;
+        return true;
+    }
+    MOZ_ASSERT(false);
+    return false;
+}
+
+bool
+JavaScriptShared::fromJSIDVariant(JSContext *cx, const JSIDVariant &from, MutableHandleId to)
+{
+    switch (from.type()) {
+      case JSIDVariant::TSymbolVariant: {
+        Symbol *sym = fromSymbolVariant(cx, from.get_SymbolVariant());
+        if (!sym)
+            return false;
+        to.set(SYMBOL_TO_JSID(sym));
+        return true;
+      }
+
+      case JSIDVariant::TnsString:
+        return convertGeckoStringToId(cx, from.get_nsString(), to);
+
+      case JSIDVariant::Tint32_t:
+        to.set(INT_TO_JSID(from.get_int32_t()));
+        return true;
+
+      default:
+        return false;
+    }
+}
+
+bool
+JavaScriptShared::toSymbolVariant(JSContext *cx, JS::Symbol *symArg, SymbolVariant *symVarp)
+{
+    RootedSymbol sym(cx, symArg);
+    MOZ_ASSERT(sym);
+
+    SymbolCode code = GetSymbolCode(sym);
+    if (static_cast<uint32_t>(code) < WellKnownSymbolLimit) {
+        *symVarp = WellKnownSymbol(static_cast<uint32_t>(code));
+        return true;
+    }
+    if (code == SymbolCode::InSymbolRegistry) {
+        nsAutoJSString autoStr;
+        if (!autoStr.init(cx, GetSymbolDescription(sym)))
+            return false;
+        *symVarp = RegisteredSymbol(autoStr);
+        return true;
+    }
+    MOZ_CRASH("unique symbols not yet implemented");
+    return false;
+}
+
+JS::Symbol *
+JavaScriptShared::fromSymbolVariant(JSContext *cx, SymbolVariant symVar)
+{
+    switch (symVar.type()) {
+      case SymbolVariant::TWellKnownSymbol: {
+        uint32_t which = symVar.get_WellKnownSymbol().which();
+        if (which < WellKnownSymbolLimit)
+            return GetWellKnownSymbol(cx, static_cast<SymbolCode>(which));
+        MOZ_ASSERT(false, "bad child data");
+        return nullptr;
+      }
+
+      case SymbolVariant::TRegisteredSymbol: {
+        nsString key = symVar.get_RegisteredSymbol().key();
+        RootedString str(cx, JS_NewUCStringCopyN(cx, key.get(), key.Length()));
+        if (!str)
+            return nullptr;
+        return GetSymbolFor(cx, str);
+      }
+
+      default:
+        return nullptr;
+    }
+}
+
 /* static */ void
 JavaScriptShared::ConvertID(const nsID &from, JSIID *to)
 {
diff --git a/js/ipc/JavaScriptShared.h b/js/ipc/JavaScriptShared.h
index 3c0cd766105..7b182cd026b 100644
--- a/js/ipc/JavaScriptShared.h
+++ b/js/ipc/JavaScriptShared.h
@@ -158,6 +158,12 @@ class JavaScriptShared
     bool toVariant(JSContext *cx, JS::HandleValue from, JSVariant *to);
     bool fromVariant(JSContext *cx, const JSVariant &from, JS::MutableHandleValue to);
 
+    bool toJSIDVariant(JSContext *cx, JS::HandleId from, JSIDVariant *to);
+    bool fromJSIDVariant(JSContext *cx, const JSIDVariant &from, JS::MutableHandleId to);
+
+    bool toSymbolVariant(JSContext *cx, JS::Symbol *sym, SymbolVariant *symVarp);
+    JS::Symbol *fromSymbolVariant(JSContext *cx, SymbolVariant symVar);
+
     bool fromDescriptor(JSContext *cx, JS::Handle<JSPropertyDescriptor> desc,
                         PPropertyDescriptor *out);
     bool toDescriptor(JSContext *cx, const PPropertyDescriptor &in,
diff --git a/js/ipc/JavaScriptTypes.ipdlh b/js/ipc/JavaScriptTypes.ipdlh
index 07b359f29c1..53b2cf65a24 100644
--- a/js/ipc/JavaScriptTypes.ipdlh
+++ b/js/ipc/JavaScriptTypes.ipdlh
@@ -43,6 +43,22 @@ union ObjectVariant
     RemoteObject;
 };
 
+struct WellKnownSymbol
+{
+    uint32_t which;
+};
+
+struct RegisteredSymbol
+{
+    nsString key;
+};
+
+union SymbolVariant
+{
+    WellKnownSymbol;
+    RegisteredSymbol;
+};
+
 struct UndefinedVariant {};
 struct NullVariant {};
 
@@ -51,12 +67,20 @@ union JSVariant
     UndefinedVariant;
     NullVariant;
     ObjectVariant;
+    SymbolVariant;
     nsString;   /* StringValue(x) */
     double;     /* NumberValue(x) */
     bool;       /* BooleanValue(x) */
     JSIID;      /* XPC nsIID */
 };
 
+union JSIDVariant
+{
+    SymbolVariant;
+    nsString;
+    int32_t;
+};
+
 struct ReturnSuccess
 {
 };
diff --git a/js/ipc/PJavaScript.ipdl b/js/ipc/PJavaScript.ipdl
index 6efb0a8b06a..f4c29e07457 100644
--- a/js/ipc/PJavaScript.ipdl
+++ b/js/ipc/PJavaScript.ipdl
@@ -25,15 +25,15 @@ both:
 
     // These roughly map to the ProxyHandler hooks that CPOWs need.
     rpc PreventExtensions(uint64_t objId) returns (ReturnStatus rs);
-    rpc GetPropertyDescriptor(uint64_t objId, nsString id) returns (ReturnStatus rs, PPropertyDescriptor result);
-    rpc GetOwnPropertyDescriptor(uint64_t objId, nsString id) returns (ReturnStatus rs, PPropertyDescriptor result);
-    rpc DefineProperty(uint64_t objId, nsString id, PPropertyDescriptor descriptor) returns (ReturnStatus rs);
-    rpc Delete(uint64_t objId, nsString id) returns (ReturnStatus rs, bool successful);
+    rpc GetPropertyDescriptor(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, PPropertyDescriptor result);
+    rpc GetOwnPropertyDescriptor(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, PPropertyDescriptor result);
+    rpc DefineProperty(uint64_t objId, JSIDVariant id, PPropertyDescriptor descriptor) returns (ReturnStatus rs);
+    rpc Delete(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, bool successful);
 
-    rpc Has(uint64_t objId, nsString id) returns (ReturnStatus rs, bool has);
-    rpc HasOwn(uint64_t objId, nsString id) returns (ReturnStatus rs, bool has);
-    rpc Get(uint64_t objId, ObjectVariant receiver, nsString id) returns (ReturnStatus rs, JSVariant result);
-    rpc Set(uint64_t objId, ObjectVariant receiver, nsString id, bool strict, JSVariant value) returns (ReturnStatus rs, JSVariant result);
+    rpc Has(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, bool has);
+    rpc HasOwn(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, bool has);
+    rpc Get(uint64_t objId, ObjectVariant receiver, JSIDVariant id) returns (ReturnStatus rs, JSVariant result);
+    rpc Set(uint64_t objId, ObjectVariant receiver, JSIDVariant id, bool strict, JSVariant value) returns (ReturnStatus rs, JSVariant result);
 
     rpc IsExtensible(uint64_t objId) returns (ReturnStatus rs, bool result);
     rpc CallOrConstruct(uint64_t objId, JSParam[] argv, bool construct) returns (ReturnStatus rs, JSVariant result, JSParam[] outparams);
diff --git a/js/ipc/WrapperAnswer.cpp b/js/ipc/WrapperAnswer.cpp
index 5fb3e45040d..9fb1fa3bbbc 100644
--- a/js/ipc/WrapperAnswer.cpp
+++ b/js/ipc/WrapperAnswer.cpp
@@ -87,8 +87,8 @@ EmptyDesc(PPropertyDescriptor *desc)
 }
 
 bool
-WrapperAnswer::AnswerGetPropertyDescriptor(const ObjectId &objId, const nsString &id,
-					   ReturnStatus *rs, PPropertyDescriptor *out)
+WrapperAnswer::AnswerGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &idVar,
+                                           ReturnStatus *rs, PPropertyDescriptor *out)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -101,14 +101,14 @@ WrapperAnswer::AnswerGetPropertyDescriptor(const ObjectId &objId, const nsString
 
     JSAutoCompartment comp(cx, obj);
 
-    LOG("%s.getPropertyDescriptor(%s)", ReceiverObj(objId), id);
+    LOG("%s.getPropertyDescriptor(%s)", ReceiverObj(objId), Identifier(idVar));
 
-    RootedId internedId(cx);
-    if (!convertGeckoStringToId(cx, id, &internedId))
+    RootedId id(cx);
+    if (!fromJSIDVariant(cx, idVar, &id))
         return fail(cx, rs);
 
     Rooted<JSPropertyDescriptor> desc(cx);
-    if (!JS_GetPropertyDescriptorById(cx, obj, internedId, &desc))
+    if (!JS_GetPropertyDescriptorById(cx, obj, id, &desc))
         return fail(cx, rs);
 
     if (!desc.object())
@@ -121,8 +121,8 @@ WrapperAnswer::AnswerGetPropertyDescriptor(const ObjectId &objId, const nsString
 }
 
 bool
-WrapperAnswer::AnswerGetOwnPropertyDescriptor(const ObjectId &objId, const nsString &id,
-					      ReturnStatus *rs, PPropertyDescriptor *out)
+WrapperAnswer::AnswerGetOwnPropertyDescriptor(const ObjectId &objId, const JSIDVariant &idVar,
+                                              ReturnStatus *rs, PPropertyDescriptor *out)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -135,14 +135,14 @@ WrapperAnswer::AnswerGetOwnPropertyDescriptor(const ObjectId &objId, const nsStr
 
     JSAutoCompartment comp(cx, obj);
 
-    LOG("%s.getOwnPropertyDescriptor(%s)", ReceiverObj(objId), id);
+    LOG("%s.getOwnPropertyDescriptor(%s)", ReceiverObj(objId), Identifier(idVar));
 
-    RootedId internedId(cx);
-    if (!convertGeckoStringToId(cx, id, &internedId))
+    RootedId id(cx);
+    if (!fromJSIDVariant(cx, idVar, &id))
         return fail(cx, rs);
 
     Rooted<JSPropertyDescriptor> desc(cx);
-    if (!JS_GetPropertyDescriptorById(cx, obj, internedId, &desc))
+    if (!JS_GetPropertyDescriptorById(cx, obj, id, &desc))
         return fail(cx, rs);
 
     if (desc.object() != obj)
@@ -155,8 +155,8 @@ WrapperAnswer::AnswerGetOwnPropertyDescriptor(const ObjectId &objId, const nsStr
 }
 
 bool
-WrapperAnswer::AnswerDefineProperty(const ObjectId &objId, const nsString &id,
-				    const PPropertyDescriptor &descriptor, ReturnStatus *rs)
+WrapperAnswer::AnswerDefineProperty(const ObjectId &objId, const JSIDVariant &idVar,
+                                    const PPropertyDescriptor &descriptor, ReturnStatus *rs)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -167,23 +167,23 @@ WrapperAnswer::AnswerDefineProperty(const ObjectId &objId, const nsString &id,
 
     JSAutoCompartment comp(cx, obj);
 
-    LOG("define %s[%s]", ReceiverObj(objId), id);
+    LOG("define %s[%s]", ReceiverObj(objId), Identifier(idVar));
 
-    RootedId internedId(cx);
-    if (!convertGeckoStringToId(cx, id, &internedId))
+    RootedId id(cx);
+    if (!fromJSIDVariant(cx, idVar, &id))
         return fail(cx, rs);
 
     Rooted<JSPropertyDescriptor> desc(cx);
     if (!toDescriptor(cx, descriptor, &desc))
         return fail(cx, rs);
 
-    if (!js::CheckDefineProperty(cx, obj, internedId, desc.value(), desc.attributes(),
+    if (!js::CheckDefineProperty(cx, obj, id, desc.value(), desc.attributes(),
                                  desc.getter(), desc.setter()))
     {
         return fail(cx, rs);
     }
 
-    if (!JS_DefinePropertyById(cx, obj, internedId, desc.value(), desc.attributes(),
+    if (!JS_DefinePropertyById(cx, obj, id, desc.value(), desc.attributes(),
                                desc.getter(), desc.setter()))
     {
         return fail(cx, rs);
@@ -193,8 +193,8 @@ WrapperAnswer::AnswerDefineProperty(const ObjectId &objId, const nsString &id,
 }
 
 bool
-WrapperAnswer::AnswerDelete(const ObjectId &objId, const nsString &id, ReturnStatus *rs,
-			    bool *success)
+WrapperAnswer::AnswerDelete(const ObjectId &objId, const JSIDVariant &idVar, ReturnStatus *rs,
+                            bool *success)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -207,20 +207,20 @@ WrapperAnswer::AnswerDelete(const ObjectId &objId, const nsString &id, ReturnSta
 
     JSAutoCompartment comp(cx, obj);
 
-    LOG("delete %s[%s]", ReceiverObj(objId), id);
+    LOG("delete %s[%s]", ReceiverObj(objId), Identifier(idVar));
 
-    RootedId internedId(cx);
-    if (!convertGeckoStringToId(cx, id, &internedId))
+    RootedId id(cx);
+    if (!fromJSIDVariant(cx, idVar, &id))
         return fail(cx, rs);
 
-    if (!JS_DeletePropertyById2(cx, obj, internedId, success))
+    if (!JS_DeletePropertyById2(cx, obj, id, success))
         return fail(cx, rs);
 
     return ok(rs);
 }
 
 bool
-WrapperAnswer::AnswerHas(const ObjectId &objId, const nsString &id, ReturnStatus *rs, bool *bp)
+WrapperAnswer::AnswerHas(const ObjectId &objId, const JSIDVariant &idVar, ReturnStatus *rs, bool *bp)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -233,14 +233,14 @@ WrapperAnswer::AnswerHas(const ObjectId &objId, const nsString &id, ReturnStatus
 
     JSAutoCompartment comp(cx, obj);
 
-    LOG("%s.has(%s)", ReceiverObj(objId), id);
+    LOG("%s.has(%s)", ReceiverObj(objId), Identifier(idVar));
 
-    RootedId internedId(cx);
-    if (!convertGeckoStringToId(cx, id, &internedId))
+    RootedId id(cx);
+    if (!fromJSIDVariant(cx, idVar, &id))
         return fail(cx, rs);
 
     bool found;
-    if (!JS_HasPropertyById(cx, obj, internedId, &found))
+    if (!JS_HasPropertyById(cx, obj, id, &found))
         return fail(cx, rs);
     *bp = !!found;
 
@@ -248,7 +248,8 @@ WrapperAnswer::AnswerHas(const ObjectId &objId, const nsString &id, ReturnStatus
 }
 
 bool
-WrapperAnswer::AnswerHasOwn(const ObjectId &objId, const nsString &id, ReturnStatus *rs, bool *bp)
+WrapperAnswer::AnswerHasOwn(const ObjectId &objId, const JSIDVariant &idVar, ReturnStatus *rs,
+                            bool *bp)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -261,14 +262,14 @@ WrapperAnswer::AnswerHasOwn(const ObjectId &objId, const nsString &id, ReturnSta
 
     JSAutoCompartment comp(cx, obj);
 
-    LOG("%s.hasOwn(%s)", ReceiverObj(objId), id);
+    LOG("%s.hasOwn(%s)", ReceiverObj(objId), Identifier(idVar));
 
-    RootedId internedId(cx);
-    if (!convertGeckoStringToId(cx, id, &internedId))
+    RootedId id(cx);
+    if (!fromJSIDVariant(cx, idVar, &id))
         return fail(cx, rs);
 
     Rooted<JSPropertyDescriptor> desc(cx);
-    if (!JS_GetPropertyDescriptorById(cx, obj, internedId, &desc))
+    if (!JS_GetPropertyDescriptorById(cx, obj, id, &desc))
         return fail(cx, rs);
     *bp = (desc.object() == obj);
 
@@ -276,8 +277,8 @@ WrapperAnswer::AnswerHasOwn(const ObjectId &objId, const nsString &id, ReturnSta
 }
 
 bool
-WrapperAnswer::AnswerGet(const ObjectId &objId, const ObjectVariant &receiverVar, const nsString &id,
-			 ReturnStatus *rs, JSVariant *result)
+WrapperAnswer::AnswerGet(const ObjectId &objId, const ObjectVariant &receiverVar,
+                         const JSIDVariant &idVar, ReturnStatus *rs, JSVariant *result)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -296,26 +297,26 @@ WrapperAnswer::AnswerGet(const ObjectId &objId, const ObjectVariant &receiverVar
     if (!receiver)
         return fail(cx, rs);
 
-    RootedId internedId(cx);
-    if (!convertGeckoStringToId(cx, id, &internedId))
+    RootedId id(cx);
+    if (!fromJSIDVariant(cx, idVar, &id))
         return fail(cx, rs);
 
     JS::RootedValue val(cx);
-    if (!JS_ForwardGetPropertyTo(cx, obj, internedId, receiver, &val))
+    if (!JS_ForwardGetPropertyTo(cx, obj, id, receiver, &val))
         return fail(cx, rs);
 
     if (!toVariant(cx, val, result))
         return fail(cx, rs);
 
-    LOG("get %s.%s = %s", ReceiverObj(objId), id, OutVariant(*result));
+    LOG("get %s.%s = %s", ReceiverObj(objId), Identifier(idVar), OutVariant(*result));
 
     return ok(rs);
 }
 
 bool
-WrapperAnswer::AnswerSet(const ObjectId &objId, const ObjectVariant &receiverVar, const nsString &id,
-			 const bool &strict, const JSVariant &value, ReturnStatus *rs,
-			 JSVariant *result)
+WrapperAnswer::AnswerSet(const ObjectId &objId, const ObjectVariant &receiverVar,
+                         const JSIDVariant &idVar, const bool &strict, const JSVariant &value,
+                         ReturnStatus *rs, JSVariant *result)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -334,10 +335,10 @@ WrapperAnswer::AnswerSet(const ObjectId &objId, const ObjectVariant &receiverVar
     if (!receiver)
         return fail(cx, rs);
 
-    LOG("set %s[%s] = %s", ReceiverObj(objId), id, InVariant(value));
+    LOG("set %s[%s] = %s", ReceiverObj(objId), Identifier(idVar), InVariant(value));
 
-    RootedId internedId(cx);
-    if (!convertGeckoStringToId(cx, id, &internedId))
+    RootedId id(cx);
+    if (!fromJSIDVariant(cx, idVar, &id))
         return fail(cx, rs);
 
     MOZ_ASSERT(obj == receiver);
@@ -346,7 +347,7 @@ WrapperAnswer::AnswerSet(const ObjectId &objId, const ObjectVariant &receiverVar
     if (!fromVariant(cx, value, &val))
         return fail(cx, rs);
 
-    if (!JS_SetPropertyById(cx, obj, internedId, val))
+    if (!JS_SetPropertyById(cx, obj, id, val))
         return fail(cx, rs);
 
     if (!toVariant(cx, val, result))
@@ -512,7 +513,7 @@ WrapperAnswer::AnswerHasInstance(const ObjectId &objId, const JSVariant &vVar, R
 
 bool
 WrapperAnswer::AnswerObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
-				   bool *result)
+                                   bool *result)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -579,7 +580,7 @@ WrapperAnswer::AnswerRegExpToShared(const ObjectId &objId, ReturnStatus *rs,
 
 bool
 WrapperAnswer::AnswerGetPropertyNames(const ObjectId &objId, const uint32_t &flags,
-				      ReturnStatus *rs, nsTArray<nsString> *names)
+                                      ReturnStatus *rs, nsTArray<nsString> *names)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -609,7 +610,7 @@ WrapperAnswer::AnswerGetPropertyNames(const ObjectId &objId, const uint32_t &fla
 
 bool
 WrapperAnswer::AnswerInstanceOf(const ObjectId &objId, const JSIID &iid, ReturnStatus *rs,
-				bool *instanceof)
+                                bool *instanceof)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
@@ -636,8 +637,7 @@ WrapperAnswer::AnswerInstanceOf(const ObjectId &objId, const JSIID &iid, ReturnS
 
 bool
 WrapperAnswer::AnswerDOMInstanceOf(const ObjectId &objId, const int &prototypeID,
-				   const int &depth,
-				   ReturnStatus *rs, bool *instanceof)
+                                   const int &depth, ReturnStatus *rs, bool *instanceof)
 {
     AutoSafeJSContext cx;
     JSAutoRequest request(cx);
diff --git a/js/ipc/WrapperAnswer.h b/js/ipc/WrapperAnswer.h
index 9bc998c078d..330c5d662d1 100644
--- a/js/ipc/WrapperAnswer.h
+++ b/js/ipc/WrapperAnswer.h
@@ -19,28 +19,28 @@ class WrapperAnswer : public virtual JavaScriptShared
     explicit WrapperAnswer(JSRuntime *rt) : JavaScriptShared(rt) {}
 
     bool AnswerPreventExtensions(const ObjectId &objId, ReturnStatus *rs);
-    bool AnswerGetPropertyDescriptor(const ObjectId &objId, const nsString &id,
+    bool AnswerGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id,
                                      ReturnStatus *rs,
                                      PPropertyDescriptor *out);
     bool AnswerGetOwnPropertyDescriptor(const ObjectId &objId,
-                                        const nsString &id,
+                                        const JSIDVariant &id,
                                         ReturnStatus *rs,
                                         PPropertyDescriptor *out);
-    bool AnswerDefineProperty(const ObjectId &objId, const nsString &id,
+    bool AnswerDefineProperty(const ObjectId &objId, const JSIDVariant &id,
                               const PPropertyDescriptor &flags,
                               ReturnStatus *rs);
-    bool AnswerDelete(const ObjectId &objId, const nsString &id,
+    bool AnswerDelete(const ObjectId &objId, const JSIDVariant &id,
                       ReturnStatus *rs, bool *success);
 
-    bool AnswerHas(const ObjectId &objId, const nsString &id,
+    bool AnswerHas(const ObjectId &objId, const JSIDVariant &id,
                        ReturnStatus *rs, bool *bp);
-    bool AnswerHasOwn(const ObjectId &objId, const nsString &id,
+    bool AnswerHasOwn(const ObjectId &objId, const JSIDVariant &id,
                           ReturnStatus *rs, bool *bp);
     bool AnswerGet(const ObjectId &objId, const ObjectVariant &receiverVar,
-                       const nsString &id,
+                       const JSIDVariant &id,
                        ReturnStatus *rs, JSVariant *result);
     bool AnswerSet(const ObjectId &objId, const ObjectVariant &receiverVar,
-                   const nsString &id, const bool &strict,
+                   const JSIDVariant &id, const bool &strict,
                    const JSVariant &value, ReturnStatus *rs, JSVariant *result);
 
     bool AnswerIsExtensible(const ObjectId &objId, ReturnStatus *rs,
diff --git a/js/ipc/WrapperOwner.cpp b/js/ipc/WrapperOwner.cpp
index 906f7a55a9d..33e48cc89ea 100644
--- a/js/ipc/WrapperOwner.cpp
+++ b/js/ipc/WrapperOwner.cpp
@@ -145,13 +145,13 @@ WrapperOwner::getPropertyDescriptor(JSContext *cx, HandleObject proxy, HandleId
 {
     ObjectId objId = idOf(proxy);
 
-    nsString idstr;
-    if (!convertIdToGeckoString(cx, id, &idstr))
+    JSIDVariant idVar;
+    if (!toJSIDVariant(cx, id, &idVar))
         return false;
 
     ReturnStatus status;
     PPropertyDescriptor result;
-    if (!CallGetPropertyDescriptor(objId, idstr, &status, &result))
+    if (!CallGetPropertyDescriptor(objId, idVar, &status, &result))
         return ipcfail(cx);
 
     LOG_STACK();
@@ -175,13 +175,13 @@ WrapperOwner::getOwnPropertyDescriptor(JSContext *cx, HandleObject proxy, Handle
 {
     ObjectId objId = idOf(proxy);
 
-    nsString idstr;
-    if (!convertIdToGeckoString(cx, id, &idstr))
+    JSIDVariant idVar;
+    if (!toJSIDVariant(cx, id, &idVar))
         return false;
 
     ReturnStatus status;
     PPropertyDescriptor result;
-    if (!CallGetOwnPropertyDescriptor(objId, idstr, &status, &result))
+    if (!CallGetOwnPropertyDescriptor(objId, idVar, &status, &result))
         return ipcfail(cx);
 
     LOG_STACK();
@@ -205,8 +205,8 @@ WrapperOwner::defineProperty(JSContext *cx, HandleObject proxy, HandleId id,
 {
     ObjectId objId = idOf(proxy);
 
-    nsString idstr;
-    if (!convertIdToGeckoString(cx, id, &idstr))
+    JSIDVariant idVar;
+    if (!toJSIDVariant(cx, id, &idVar))
         return false;
 
     PPropertyDescriptor descriptor;
@@ -214,7 +214,7 @@ WrapperOwner::defineProperty(JSContext *cx, HandleObject proxy, HandleId id,
         return false;
 
     ReturnStatus status;
-    if (!CallDefineProperty(objId, idstr, descriptor, &status))
+    if (!CallDefineProperty(objId, idVar, descriptor, &status))
         return ipcfail(cx);
 
     LOG_STACK();
@@ -246,12 +246,12 @@ WrapperOwner::delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp)
 {
     ObjectId objId = idOf(proxy);
 
-    nsString idstr;
-    if (!convertIdToGeckoString(cx, id, &idstr))
+    JSIDVariant idVar;
+    if (!toJSIDVariant(cx, id, &idVar))
         return false;
 
     ReturnStatus status;
-    if (!CallDelete(objId, idstr, &status, bp))
+    if (!CallDelete(objId, idVar, &status, bp))
         return ipcfail(cx);
 
     LOG_STACK();
@@ -282,12 +282,12 @@ WrapperOwner::has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp)
 {
     ObjectId objId = idOf(proxy);
 
-    nsString idstr;
-    if (!convertIdToGeckoString(cx, id, &idstr))
+    JSIDVariant idVar;
+    if (!toJSIDVariant(cx, id, &idVar))
         return false;
 
     ReturnStatus status;
-    if (!CallHas(objId, idstr, &status, bp))
+    if (!CallHas(objId, idVar, &status, bp))
         return ipcfail(cx);
 
     LOG_STACK();
@@ -306,12 +306,12 @@ WrapperOwner::hasOwn(JSContext *cx, HandleObject proxy, HandleId id, bool *bp)
 {
     ObjectId objId = idOf(proxy);
 
-    nsString idstr;
-    if (!convertIdToGeckoString(cx, id, &idstr))
+    JSIDVariant idVar;
+    if (!toJSIDVariant(cx, id, &idVar))
         return false;
 
     ReturnStatus status;
-    if (!CallHasOwn(objId, idstr, &status, bp))
+    if (!CallHasOwn(objId, idVar, &status, bp))
         return ipcfail(cx);
 
     LOG_STACK();
@@ -382,7 +382,7 @@ WrapperOwner::toString(JSContext *cx, HandleObject cpow, JS::CallArgs &args)
 
 bool
 WrapperOwner::get(JSContext *cx, HandleObject proxy, HandleObject receiver,
-		  HandleId id, MutableHandleValue vp)
+                  HandleId id, MutableHandleValue vp)
 {
     ObjectId objId = idOf(proxy);
 
@@ -390,13 +390,13 @@ WrapperOwner::get(JSContext *cx, HandleObject proxy, HandleObject receiver,
     if (!toObjectVariant(cx, receiver, &receiverVar))
         return false;
 
-    nsString idstr;
-    if (!convertIdToGeckoString(cx, id, &idstr))
+    JSIDVariant idVar;
+    if (!toJSIDVariant(cx, id, &idVar))
         return false;
 
     JSVariant val;
     ReturnStatus status;
-    if (!CallGet(objId, receiverVar, idstr, &status, &val))
+    if (!CallGet(objId, receiverVar, idVar, &status, &val))
         return ipcfail(cx);
 
     LOG_STACK();
@@ -407,7 +407,8 @@ WrapperOwner::get(JSContext *cx, HandleObject proxy, HandleObject receiver,
     if (!fromVariant(cx, val, vp))
         return false;
 
-    if (idstr.EqualsLiteral("toString")) {
+    if (idVar.type() == JSIDVariant::TnsString &&
+        idVar.get_nsString().EqualsLiteral("toString")) {
         RootedFunction toString(cx, JS_NewFunction(cx, CPOWToString, 0, 0, proxy, "toString"));
         if (!toString)
             return false;
@@ -432,7 +433,7 @@ CPOWProxyHandler::set(JSContext *cx, JS::HandleObject proxy, JS::HandleObject re
 
 bool
 WrapperOwner::set(JSContext *cx, JS::HandleObject proxy, JS::HandleObject receiver,
-		  JS::HandleId id, bool strict, JS::MutableHandleValue vp)
+                  JS::HandleId id, bool strict, JS::MutableHandleValue vp)
 {
     ObjectId objId = idOf(proxy);
 
@@ -440,8 +441,8 @@ WrapperOwner::set(JSContext *cx, JS::HandleObject proxy, JS::HandleObject receiv
     if (!toObjectVariant(cx, receiver, &receiverVar))
         return false;
 
-    nsString idstr;
-    if (!convertIdToGeckoString(cx, id, &idstr))
+    JSIDVariant idVar;
+    if (!toJSIDVariant(cx, id, &idVar))
         return false;
 
     JSVariant val;
@@ -450,7 +451,7 @@ WrapperOwner::set(JSContext *cx, JS::HandleObject proxy, JS::HandleObject receiv
 
     ReturnStatus status;
     JSVariant result;
-    if (!CallSet(objId, receiverVar, idstr, strict, val, &status, &result))
+    if (!CallSet(objId, receiverVar, idVar, strict, val, &status, &result))
         return ipcfail(cx);
 
     LOG_STACK();
diff --git a/js/ipc/WrapperOwner.h b/js/ipc/WrapperOwner.h
index 98e55355d02..5e6060f7e63 100644
--- a/js/ipc/WrapperOwner.h
+++ b/js/ipc/WrapperOwner.h
@@ -108,28 +108,28 @@ class WrapperOwner : public virtual JavaScriptShared
   public:
     virtual bool SendDropObject(const ObjectId &objId) = 0;
     virtual bool CallPreventExtensions(const ObjectId &objId, ReturnStatus *rs) = 0;
-    virtual bool CallGetPropertyDescriptor(const ObjectId &objId, const nsString &id,
+    virtual bool CallGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id,
                                            ReturnStatus *rs,
                                            PPropertyDescriptor *out) = 0;
     virtual bool CallGetOwnPropertyDescriptor(const ObjectId &objId,
-                                              const nsString &id,
+                                              const JSIDVariant &id,
                                               ReturnStatus *rs,
                                               PPropertyDescriptor *out) = 0;
-    virtual bool CallDefineProperty(const ObjectId &objId, const nsString &id,
+    virtual bool CallDefineProperty(const ObjectId &objId, const JSIDVariant &id,
                                     const PPropertyDescriptor &flags,
                                     ReturnStatus *rs) = 0;
-    virtual bool CallDelete(const ObjectId &objId, const nsString &id,
+    virtual bool CallDelete(const ObjectId &objId, const JSIDVariant &id,
                             ReturnStatus *rs, bool *success) = 0;
 
-    virtual bool CallHas(const ObjectId &objId, const nsString &id,
+    virtual bool CallHas(const ObjectId &objId, const JSIDVariant &id,
                          ReturnStatus *rs, bool *bp) = 0;
-    virtual bool CallHasOwn(const ObjectId &objId, const nsString &id,
+    virtual bool CallHasOwn(const ObjectId &objId, const JSIDVariant &id,
                             ReturnStatus *rs, bool *bp) = 0;
     virtual bool CallGet(const ObjectId &objId, const ObjectVariant &receiverVar,
-                         const nsString &id,
+                         const JSIDVariant &id,
                          ReturnStatus *rs, JSVariant *result) = 0;
     virtual bool CallSet(const ObjectId &objId, const ObjectVariant &receiverVar,
-                         const nsString &id, const bool &strict,
+                         const JSIDVariant &id, const bool &strict,
                          const JSVariant &value, ReturnStatus *rs, JSVariant *result) = 0;
 
     virtual bool CallIsExtensible(const ObjectId &objId, ReturnStatus *rs,
diff --git a/js/src/builtin/Eval.cpp b/js/src/builtin/Eval.cpp
index 5fd8fcea2c0..760a9339824 100644
--- a/js/src/builtin/Eval.cpp
+++ b/js/src/builtin/Eval.cpp
@@ -10,10 +10,10 @@
 #include "mozilla/Range.h"
 
 #include "jscntxt.h"
-#include "jsonparser.h"
 
 #include "frontend/BytecodeCompiler.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSONParser.h"
 
 #include "vm/Interpreter-inl.h"
 
diff --git a/js/src/doc/Debugger/Debugger.Script.md b/js/src/doc/Debugger/Debugger.Script.md
index b0bd786c51f..80ac2fd009a 100644
--- a/js/src/doc/Debugger/Debugger.Script.md
+++ b/js/src/doc/Debugger/Debugger.Script.md
@@ -115,17 +115,6 @@ from its prototype:
 :   This is `true` if this script's code is ECMAScript strict mode code, and
     `false` otherwise.
 
-`sourceMapURL`
-:   If this script was produced by a minimizer or translated from some other
-    language, and we know the URL of a <b>source map</b> document relating
-    the source positions in this script to the corresponding source
-    positions in the original source, then this property's value is that
-    URL. Otherwise, this is `null`.
-
-    (On the web, the translator may provide the source map URL in a
-    specially formatted comment in the JavaScript source code, or via a
-    header in the HTTP reply that carried the generated JavaScript.)
-
 ## Function Properties of the Debugger.Script Prototype Object
 
 The functions described below may only be called with a `this` value
diff --git a/js/src/doc/Debugger/Debugger.Source.md b/js/src/doc/Debugger/Debugger.Source.md
index 70e80ffd442..91e6a4ae31b 100644
--- a/js/src/doc/Debugger/Debugger.Source.md
+++ b/js/src/doc/Debugger/Debugger.Source.md
@@ -74,6 +74,17 @@ from its prototype:
     `url` accessor on `Debugger.Source` instances for such sources should
     return `undefined`.)
 
+`sourceMapURL`
+:   If this source was produced by a minimizer or translated from some other
+    language, and we know the URL of a <b>source map</b> document relating
+    the source positions in this source to the corresponding source
+    positions in the original source, then this property's value is that
+    URL. Otherwise, this is `null`.
+
+    (On the web, the translator may provide the source map URL in a
+    specially formatted comment in the JavaScript source code, or via a
+    header in the HTTP reply that carried the generated JavaScript.)
+
 `element`
 :   The [`Debugger.Object`][object] instance referring to the DOM element to which
     this source code belongs, if any, or `undefined` if it belongs to no DOM
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index b23941ce97f..99208772dd7 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -12,7 +12,6 @@
 
 #include "jscntxt.h"
 #include "jsgc.h"
-#include "jsonparser.h"
 #include "jsprf.h"
 #include "jstypes.h"
 #include "jswatchpoint.h"
@@ -25,6 +24,7 @@
 #include "jit/IonMacroAssembler.h"
 #include "js/HashTable.h"
 #include "vm/Debugger.h"
+#include "vm/JSONParser.h"
 #include "vm/PropDesc.h"
 
 #include "jsgcinlines.h"
diff --git a/js/src/jit-test/tests/debug/Source-displayURL.js b/js/src/jit-test/tests/debug/Source-displayURL.js
index 51536d81388..a16a761860a 100644
--- a/js/src/jit-test/tests/debug/Source-displayURL.js
+++ b/js/src/jit-test/tests/debug/Source-displayURL.js
@@ -78,7 +78,7 @@ var capturedSourceMapURL;
 dbg.onNewScript = function (script) {
   capturedScript = script;
   capturedDisplayURL = script.source.displayURL;
-  capturedSourceMapURL = script.sourceMapURL;
+  capturedSourceMapURL = script.source.sourceMapURL;
   dbg.onNewScript = undefined;
 };
 var fun = gw.makeDebuggeeValue(g.Function('//# sourceURL=munge.js\n//# sourceMappingURL=grunge.map\n'));
@@ -87,5 +87,5 @@ assertEq(capturedScript, fun.script);
 assertEq(capturedDisplayURL, fun.script.source.displayURL);
 assertEq(capturedDisplayURL, 'munge.js');
 
-assertEq(capturedSourceMapURL, fun.script.sourceMapURL);
+assertEq(capturedSourceMapURL, fun.script.source.sourceMapURL);
 assertEq(capturedSourceMapURL, 'grunge.map');
diff --git a/js/src/jit-test/tests/debug/Script-sourceMapURL-deprecated.js b/js/src/jit-test/tests/debug/Source-sourceMapURL-deprecated.js
similarity index 92%
rename from js/src/jit-test/tests/debug/Script-sourceMapURL-deprecated.js
rename to js/src/jit-test/tests/debug/Source-sourceMapURL-deprecated.js
index 7e9e59971f4..fb01ccb0a67 100644
--- a/js/src/jit-test/tests/debug/Script-sourceMapURL-deprecated.js
+++ b/js/src/jit-test/tests/debug/Source-sourceMapURL-deprecated.js
@@ -1,4 +1,4 @@
-// Script.prototype.sourceMapURL can be a string or null.
+// Source.prototype.sourceMapURL can be a string or null.
 
 let g = newGlobal();
 let dbg = new Debugger;
@@ -6,7 +6,7 @@ let gw = dbg.addDebuggee(g);
 
 function getSourceMapURL() {
     let fw = gw.makeDebuggeeValue(g.f);
-    return fw.script.sourceMapURL;
+    return fw.script.source.sourceMapURL;
 }
 
 // Without a source map
@@ -21,7 +21,7 @@ assertEq(getSourceMapURL(), 'file:///var/foo.js.map');
 let fired = false;
 dbg.onDebuggerStatement = function (frame) {
     fired = true;
-    assertEq(frame.script.sourceMapURL, 'file:///var/bar.js.map');
+    assertEq(frame.script.source.sourceMapURL, 'file:///var/bar.js.map');
 };
 g.evaluate('(function () { (function () { debugger; })(); })();',
            {sourceMapURL: 'file:///var/bar.js.map'});
diff --git a/js/src/jit-test/tests/debug/Script-sourceMapURL.js b/js/src/jit-test/tests/debug/Source-sourceMapURL.js
similarity index 92%
rename from js/src/jit-test/tests/debug/Script-sourceMapURL.js
rename to js/src/jit-test/tests/debug/Source-sourceMapURL.js
index 512b5205dc3..c14004e9431 100644
--- a/js/src/jit-test/tests/debug/Script-sourceMapURL.js
+++ b/js/src/jit-test/tests/debug/Source-sourceMapURL.js
@@ -1,4 +1,4 @@
-// Script.prototype.sourceMapURL can be a string or null.
+// Source.prototype.sourceMapURL can be a string or null.
 
 let g = newGlobal();
 let dbg = new Debugger;
@@ -6,7 +6,7 @@ let gw = dbg.addDebuggee(g);
 
 function getSourceMapURL() {
     let fw = gw.makeDebuggeeValue(g.f);
-    return fw.script.sourceMapURL;
+    return fw.script.source.sourceMapURL;
 }
 
 // Without a source map
@@ -21,7 +21,7 @@ assertEq(getSourceMapURL(), 'file:///var/foo.js.map');
 let fired = false;
 dbg.onDebuggerStatement = function (frame) {
     fired = true;
-    assertEq(frame.script.sourceMapURL, 'file:///var/bar.js.map');
+    assertEq(frame.script.source.sourceMapURL, 'file:///var/bar.js.map');
 };
 g.evaluate('(function () { (function () { debugger; })(); })();',
            {sourceMapURL: 'file:///var/bar.js.map'});
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 3e5f1cff8bd..a3932c5ffb8 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -14,12 +14,12 @@
 #include "jscntxt.h"
 #include "jsnum.h"
 #include "jsobj.h"
-#include "jsonparser.h"
 #include "jsstr.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
 #include "vm/Interpreter.h"
+#include "vm/JSONParser.h"
 #include "vm/StringBuffer.h"
 
 #include "jsatominlines.h"
diff --git a/js/src/moz.build b/js/src/moz.build
index 8c7f51b61ea..1bb2f001def 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -215,7 +215,6 @@ UNIFIED_SOURCES += [
     'jsnum.cpp',
     'jsobj.cpp',
     'json.cpp',
-    'jsonparser.cpp',
     'jsopcode.cpp',
     'jsprf.cpp',
     'jspropertytree.cpp',
@@ -249,6 +248,7 @@ UNIFIED_SOURCES += [
     'vm/HelperThreads.cpp',
     'vm/Id.cpp',
     'vm/Interpreter.cpp',
+    'vm/JSONParser.cpp',
     'vm/MemoryMetrics.cpp',
     'vm/Monitor.cpp',
     'vm/ObjectImpl.cpp',
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 3d136fd9952..29e4bc57391 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -3261,26 +3261,6 @@ DebuggerScript_getStaticLevel(JSContext *cx, unsigned argc, Value *vp)
     return true;
 }
 
-static bool
-DebuggerScript_getSourceMapUrl(JSContext *cx, unsigned argc, Value *vp)
-{
-    THIS_DEBUGSCRIPT_SCRIPT(cx, argc, vp, "(get sourceMapURL)", args, obj, script);
-
-    ScriptSource *source = script->scriptSource();
-    MOZ_ASSERT(source);
-
-    if (source->hasSourceMapURL()) {
-        JSString *str = JS_NewUCStringCopyZ(cx, source->sourceMapURL());
-        if (!str)
-            return false;
-        args.rval().setString(str);
-    } else {
-        args.rval().setNull();
-    }
-
-    return true;
-}
-
 static bool
 DebuggerScript_getGlobal(JSContext *cx, unsigned argc, Value *vp)
 {
@@ -4011,7 +3991,6 @@ static const JSPropertySpec DebuggerScript_properties[] = {
     JS_PSG("sourceStart", DebuggerScript_getSourceStart, 0),
     JS_PSG("sourceLength", DebuggerScript_getSourceLength, 0),
     JS_PSG("staticLevel", DebuggerScript_getStaticLevel, 0),
-    JS_PSG("sourceMapURL", DebuggerScript_getSourceMapUrl, 0),
     JS_PSG("global", DebuggerScript_getGlobal, 0),
     JS_PS_END
 };
@@ -4280,6 +4259,26 @@ DebuggerSource_getIntroductionType(JSContext *cx, unsigned argc, Value *vp)
     return true;
 }
 
+static bool
+DebuggerSource_getSourceMapUrl(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_DEBUGSOURCE_REFERENT(cx, argc, vp, "(get sourceMapURL)", args, obj, sourceObject);
+
+    ScriptSource *ss = sourceObject->source();
+    MOZ_ASSERT(ss);
+
+    if (ss->hasSourceMapURL()) {
+        JSString *str = JS_NewUCStringCopyZ(cx, ss->sourceMapURL());
+        if (!str)
+            return false;
+        args.rval().setString(str);
+    } else {
+        args.rval().setNull();
+    }
+
+    return true;
+}
+
 static const JSPropertySpec DebuggerSource_properties[] = {
     JS_PSG("text", DebuggerSource_getText, 0),
     JS_PSG("url", DebuggerSource_getUrl, 0),
@@ -4289,6 +4288,7 @@ static const JSPropertySpec DebuggerSource_properties[] = {
     JS_PSG("introductionOffset", DebuggerSource_getIntroductionOffset, 0),
     JS_PSG("introductionType", DebuggerSource_getIntroductionType, 0),
     JS_PSG("elementAttributeName", DebuggerSource_getElementProperty, 0),
+    JS_PSG("sourceMapURL", DebuggerSource_getSourceMapUrl, 0),
     JS_PS_END
 };
 
diff --git a/js/src/jsonparser.cpp b/js/src/vm/JSONParser.cpp
similarity index 99%
rename from js/src/jsonparser.cpp
rename to js/src/vm/JSONParser.cpp
index 125960e7b36..f318a7629bc 100644
--- a/js/src/jsonparser.cpp
+++ b/js/src/vm/JSONParser.cpp
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsonparser.h"
+#include "vm/JSONParser.h"
 
 #include "mozilla/Range.h"
 #include "mozilla/RangedPtr.h"
diff --git a/js/src/jsonparser.h b/js/src/vm/JSONParser.h
similarity index 98%
rename from js/src/jsonparser.h
rename to js/src/vm/JSONParser.h
index 24c4b7d02a0..faf75aa4598 100644
--- a/js/src/jsonparser.h
+++ b/js/src/vm/JSONParser.h
@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsonparser_h
-#define jsonparser_h
+#ifndef vm_JSONParser_h
+#define vm_JSONParser_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Range.h"
@@ -237,4 +237,4 @@ class MOZ_STACK_CLASS JSONParser : public JSONParserBase
 
 } /* namespace js */
 
-#endif /* jsonparser_h */
+#endif /* vm_JSONParser_h */
diff --git a/js/xpconnect/public/SandboxPrivate.h b/js/xpconnect/public/SandboxPrivate.h
index b344b88fb2b..97da588e597 100644
--- a/js/xpconnect/public/SandboxPrivate.h
+++ b/js/xpconnect/public/SandboxPrivate.h
@@ -27,6 +27,7 @@ public:
     SandboxPrivate(nsIPrincipal *principal, JSObject *global)
         : mPrincipal(principal)
     {
+        SetIsNotDOMBinding();
         SetWrapper(global);
     }
 
@@ -49,6 +50,11 @@ public:
         ClearWrapper();
     }
 
+    virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE
+    {
+        MOZ_CRASH("SandboxPrivate doesn't use DOM bindings!");
+    }
+
 private:
     virtual ~SandboxPrivate() { }
 
diff --git a/layout/base/TouchCaret.cpp b/layout/base/TouchCaret.cpp
index 5229d8da579..98822a8895c 100644
--- a/layout/base/TouchCaret.cpp
+++ b/layout/base/TouchCaret.cpp
@@ -88,6 +88,29 @@ TouchCaret::~TouchCaret()
   }
 }
 
+nsIFrame*
+TouchCaret::GetCaretFocusFrame(nsRect* aOutRect)
+{
+  nsCOMPtr<nsIPresShell> presShell = do_QueryReferent(mPresShell);
+  if (!presShell) {
+    return nullptr;
+  }
+
+  nsRefPtr<nsCaret> caret = presShell->GetCaret();
+  if (!caret) {
+    return nullptr;
+  }
+
+  nsRect rect;
+  nsIFrame* frame = caret->GetGeometry(&rect);
+
+  if (aOutRect) {
+    *aOutRect = rect;
+  }
+
+  return frame;
+}
+
 nsIFrame*
 TouchCaret::GetCanvasFrame()
 {
@@ -152,16 +175,12 @@ TouchCaret::GetTouchFrameRect()
 nsRect
 TouchCaret::GetContentBoundary()
 {
-  nsCOMPtr<nsIPresShell> presShell = do_QueryReferent(mPresShell);
-  if (!presShell) {
+  nsIFrame* focusFrame = GetCaretFocusFrame();
+  nsIFrame* canvasFrame = GetCanvasFrame();
+  if (!focusFrame || !canvasFrame) {
     return nsRect();
   }
 
-  nsRefPtr<nsCaret> caret = presShell->GetCaret();
-  nsRect focusRect;
-  nsIFrame* focusFrame = caret->GetGeometry(&focusRect);
-  nsIFrame* canvasFrame = GetCanvasFrame();
-
   // Get the editing host to determine the touch caret dragable boundary.
   dom::Element* editingHost = focusFrame->GetContent()->GetEditingHost();
   if (!editingHost) {
@@ -196,16 +215,10 @@ TouchCaret::GetContentBoundary()
 nscoord
 TouchCaret::GetCaretYCenterPosition()
 {
-  nsCOMPtr<nsIPresShell> presShell = do_QueryReferent(mPresShell);
-  if (!presShell) {
-    return 0;
-  }
+  nsRect caretRect;
+  nsIFrame* focusFrame = GetCaretFocusFrame(&caretRect);
+  nsIFrame* canvasFrame = GetCanvasFrame();
 
-  nsRefPtr<nsCaret> caret = presShell->GetCaret();
-  nsRect focusRect;
-  nsIFrame* focusFrame = caret->GetGeometry(&focusRect);
-  nsRect caretRect = focusFrame->GetRectRelativeToSelf();
-  nsIFrame *canvasFrame = GetCanvasFrame();
   nsLayoutUtils::TransformRect(focusFrame, canvasFrame, caretRect);
 
   return (caretRect.y + caretRect.height / 2);
@@ -245,23 +258,16 @@ TouchCaret::SetTouchFramePos(const nsPoint& aOrigin)
 void
 TouchCaret::MoveCaret(const nsPoint& movePoint)
 {
-  nsCOMPtr<nsIPresShell> presShell = do_QueryReferent(mPresShell);
-  if (!presShell) {
+  nsIFrame* focusFrame = GetCaretFocusFrame();
+  nsIFrame* canvasFrame = GetCanvasFrame();
+  if (!focusFrame && !canvasFrame) {
     return;
   }
 
-  // Get scrollable frame.
-  nsRefPtr<nsCaret> caret = presShell->GetCaret();
-  nsRect focusRect;
-  nsIFrame* focusFrame = caret->GetGeometry(&focusRect);
   nsIFrame* scrollable =
     nsLayoutUtils::GetClosestFrameOfType(focusFrame, nsGkAtoms::scrollFrame);
 
   // Convert touch/mouse position to frame coordinates.
-  nsIFrame* canvasFrame = GetCanvasFrame();
-  if (!canvasFrame) {
-    return;
-  }
   nsPoint offsetToCanvasFrame = nsPoint(0,0);
   nsLayoutUtils::TransformPoint(scrollable, canvasFrame, offsetToCanvasFrame);
   nsPoint pt = movePoint - offsetToCanvasFrame;
@@ -415,16 +421,11 @@ TouchCaret::UpdatePosition()
 {
   MOZ_ASSERT(mVisible);
 
-  nsCOMPtr<nsIPresShell> presShell = do_QueryReferent(mPresShell);
-  if (!presShell) {
-    return;
-  }
-  nsRefPtr<nsCaret> caret = presShell->GetCaret();
-
-  // Caret is visible and shown, update touch caret.
   nsRect focusRect;
-  nsIFrame* focusFrame = caret->GetGeometry(&focusRect);
-  if (!focusFrame || focusRect.IsEmpty()) {
+  nsIFrame* focusFrame = GetCaretFocusFrame(&focusRect);
+  nsIFrame* canvasFrame = GetCanvasFrame();
+
+  if (!focusFrame || !canvasFrame || focusRect.IsEmpty()) {
     return;
   }
 
@@ -433,10 +434,6 @@ TouchCaret::UpdatePosition()
                         focusRect.y + focusRect.height);
 
   // Transform the position to make it relative to canvas frame.
-  nsIFrame* canvasFrame = GetCanvasFrame();
-  if (!canvasFrame) {
-    return;
-  }
   nsLayoutUtils::TransformPoint(focusFrame, canvasFrame, pos);
 
   // Clamp the touch caret position to the scrollframe boundary.
@@ -498,14 +495,11 @@ TouchCaret::CancelExpirationTimer()
 void
 TouchCaret::SetSelectionDragState(bool aState)
 {
-  nsCOMPtr<nsIPresShell> presShell = do_QueryReferent(mPresShell);
-  if (!presShell) {
+  nsIFrame* caretFocusFrame = GetCaretFocusFrame();
+  if (!caretFocusFrame) {
     return;
   }
 
-  nsRefPtr<nsCaret> caret = presShell->GetCaret();
-  nsRect focusRect;
-  nsIFrame* caretFocusFrame = caret->GetGeometry(&focusRect);
   nsRefPtr<nsFrameSelection> fs = caretFocusFrame->GetFrameSelection();
   fs->SetDragState(aState);
 }
diff --git a/layout/base/TouchCaret.h b/layout/base/TouchCaret.h
index 5d46bd99a27..ab3d4ef94e3 100644
--- a/layout/base/TouchCaret.h
+++ b/layout/base/TouchCaret.h
@@ -76,6 +76,11 @@ private:
    */
   void SetVisibility(bool aVisible);
 
+  /**
+   * Helper function to get caret's focus frame and caret's bounding rect.
+   */
+  nsIFrame* GetCaretFocusFrame(nsRect* aOutRect = nullptr);
+
   /**
    * Find the nsCanvasFrame which holds the touch caret.
    */
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index b780580cb9f..2ca41c4571a 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -6942,9 +6942,9 @@ PresShell::HandleEvent(nsIFrame* aFrame,
 
   if (!nsContentUtils::IsSafeToRunScript() &&
       aEvent->IsAllowedToDispatchDOMEvent()) {
-    if (aEvent->mClass == eCompositionEventClass ||
-        aEvent->mClass == eTextEventClass) {
-      IMEStateManager::OnCompositionEventDiscarded(aEvent);
+    if (aEvent->mClass == eCompositionEventClass) {
+      IMEStateManager::OnCompositionEventDiscarded(
+        aEvent->AsCompositionEvent());
     }
 #ifdef DEBUG
     if (aEvent->IsIMERelatedEvent()) {
@@ -7859,10 +7859,10 @@ PresShell::HandleEventInternal(WidgetEvent* aEvent, nsEventStatus* aStatus)
             }
           }
           if (eventTarget) {
-            if (aEvent->mClass == eCompositionEventClass ||
-                aEvent->mClass == eTextEventClass) {
+            if (aEvent->mClass == eCompositionEventClass) {
               IMEStateManager::DispatchCompositionEvent(eventTarget,
-                mPresContext, aEvent, aStatus, eventCBPtr);
+                mPresContext, aEvent->AsCompositionEvent(), aStatus,
+                eventCBPtr);
             } else {
               EventDispatcher::Dispatch(eventTarget, mPresContext,
                                         aEvent, nullptr, aStatus, eventCBPtr);
diff --git a/layout/base/tests/bug613807-1.html b/layout/base/tests/bug613807-1.html
index 08f516f890b..6b89013f3af 100644
--- a/layout/base/tests/bug613807-1.html
+++ b/layout/base/tests/bug613807-1.html
@@ -50,7 +50,7 @@
     synthesizeComposition({ type: "compositionstart" });
 
     // input raw characters
-    synthesizeText(
+    synthesizeCompositionChange(
       { composition:
         { string: "\u306D",
           clauses: [
@@ -59,7 +59,7 @@
         },
         caret: { start: 1, length: 0 }
       });
-    synthesizeText(
+    synthesizeCompositionChange(
       { composition:
         { string: "\u306D\u3053",
           clauses: [
@@ -70,7 +70,7 @@
       });
 
     // convert
-    synthesizeText(
+    synthesizeCompositionChange(
       { composition:
         { string: "\u732B",
           clauses: [
@@ -81,7 +81,7 @@
       });
 
     // commit
-    synthesizeText(
+    synthesizeCompositionChange(
       { composition:
         { string: "\u732B",
           clauses: [
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index f58f0117ff6..c89fd58d242 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -3110,7 +3110,6 @@ Selection::Selection()
   , mType(nsISelectionController::SELECTION_NORMAL)
   , mApplyUserSelectStyle(false)
 {
-  SetIsDOMBinding();
 }
 
 Selection::Selection(nsFrameSelection* aList)
@@ -3120,7 +3119,6 @@ Selection::Selection(nsFrameSelection* aList)
   , mType(nsISelectionController::SELECTION_NORMAL)
   , mApplyUserSelectStyle(false)
 {
-  SetIsDOMBinding();
 }
 
 Selection::~Selection()
diff --git a/layout/style/CSSRuleList.h b/layout/style/CSSRuleList.h
index e87b05b7425..3a8d60ac16f 100644
--- a/layout/style/CSSRuleList.h
+++ b/layout/style/CSSRuleList.h
@@ -24,11 +24,6 @@ class CSSRuleList : public nsIDOMCSSRuleList
                   , public nsWrapperCache
 {
 public:
-  CSSRuleList()
-  {
-    SetIsDOMBinding();
-  }
-
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICSSRULELIST_IID)
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff --git a/layout/style/CSSStyleSheet.cpp b/layout/style/CSSStyleSheet.cpp
index f418e969e76..cbdac0aafaa 100644
--- a/layout/style/CSSStyleSheet.cpp
+++ b/layout/style/CSSStyleSheet.cpp
@@ -490,7 +490,6 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(nsMediaList)
 nsMediaList::nsMediaList()
   : mStyleSheet(nullptr)
 {
-  SetIsDOMBinding();
 }
 
 nsMediaList::~nsMediaList()
@@ -984,8 +983,6 @@ CSSStyleSheet::CSSStyleSheet(CORSMode aCORSMode)
     mRuleProcessors(nullptr)
 {
   mInner = new CSSStyleSheetInner(this, aCORSMode);
-
-  SetIsDOMBinding();
 }
 
 CSSStyleSheet::CSSStyleSheet(const CSSStyleSheet& aCopy,
@@ -1018,8 +1015,6 @@ CSSStyleSheet::CSSStyleSheet(const CSSStyleSheet& aCopy,
     // sheets in sync!
     mMedia = aCopy.mMedia->Clone();
   }
-
-  SetIsDOMBinding();
 }
 
 CSSStyleSheet::~CSSStyleSheet()
diff --git a/layout/style/FontFace.cpp b/layout/style/FontFace.cpp
index 25a50ebb1b2..49eb8c4d6f8 100644
--- a/layout/style/FontFace.cpp
+++ b/layout/style/FontFace.cpp
@@ -224,8 +224,6 @@ FontFace::FontFace(nsISupports* aParent, nsPresContext* aPresContext)
 {
   MOZ_COUNT_CTOR(FontFace);
 
-  SetIsDOMBinding();
-
   nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(aParent);
 
   if (global) {
diff --git a/layout/style/MediaQueryList.cpp b/layout/style/MediaQueryList.cpp
index 049c1e2744a..a12215916ee 100644
--- a/layout/style/MediaQueryList.cpp
+++ b/layout/style/MediaQueryList.cpp
@@ -22,8 +22,6 @@ MediaQueryList::MediaQueryList(nsPresContext *aPresContext,
 {
   PR_INIT_CLIST(this);
 
-  SetIsDOMBinding();
-
   nsCSSParser parser;
   parser.ParseMediaList(aMediaQueryList, nullptr, 0, mMediaList, false);
 }
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index 31803d68bc9..be210c29bfb 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -210,11 +210,6 @@ public:
     MOZ_OVERRIDE;
   using nsICSSDeclaration::GetPropertyCSSValue;
 
-  nsCSSFontFaceStyleDecl()
-  {
-    SetIsDOMBinding();
-  }
-
   virtual nsINode *GetParentObject() MOZ_OVERRIDE;
   virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName) MOZ_OVERRIDE;
 
diff --git a/layout/style/nsDOMCSSDeclaration.h b/layout/style/nsDOMCSSDeclaration.h
index f7868f8d258..eed8389b55a 100644
--- a/layout/style/nsDOMCSSDeclaration.h
+++ b/layout/style/nsDOMCSSDeclaration.h
@@ -148,10 +148,6 @@ protected:
 
 protected:
   virtual ~nsDOMCSSDeclaration();
-  nsDOMCSSDeclaration()
-  {
-    SetIsDOMBinding();
-  }
 };
 
 bool IsCSSPropertyExposedToJS(nsCSSProperty aProperty, JSContext* cx, JSObject* obj);
diff --git a/layout/style/nsDOMCSSRGBColor.cpp b/layout/style/nsDOMCSSRGBColor.cpp
index d683acb1f99..96b349e13f6 100644
--- a/layout/style/nsDOMCSSRGBColor.cpp
+++ b/layout/style/nsDOMCSSRGBColor.cpp
@@ -19,7 +19,6 @@ nsDOMCSSRGBColor::nsDOMCSSRGBColor(nsROCSSPrimitiveValue* aRed,
   : mRed(aRed), mGreen(aGreen), mBlue(aBlue), mAlpha(aAlpha)
   , mHasAlpha(aHasAlpha)
 {
-  SetIsDOMBinding();
 }
 
 nsDOMCSSRGBColor::~nsDOMCSSRGBColor(void)
diff --git a/layout/style/nsDOMCSSRect.cpp b/layout/style/nsDOMCSSRect.cpp
index f80274249ea..0691665a2ed 100644
--- a/layout/style/nsDOMCSSRect.cpp
+++ b/layout/style/nsDOMCSSRect.cpp
@@ -17,7 +17,6 @@ nsDOMCSSRect::nsDOMCSSRect(nsROCSSPrimitiveValue* aTop,
                            nsROCSSPrimitiveValue* aLeft)
   : mTop(aTop), mRight(aRight), mBottom(aBottom), mLeft(aLeft)
 {
-  SetIsDOMBinding();
 }
 
 nsDOMCSSRect::~nsDOMCSSRect(void)
diff --git a/layout/style/nsDOMCSSValueList.cpp b/layout/style/nsDOMCSSValueList.cpp
index cd8f3ed9910..3cbf0a62aa5 100644
--- a/layout/style/nsDOMCSSValueList.cpp
+++ b/layout/style/nsDOMCSSValueList.cpp
@@ -13,7 +13,6 @@ using namespace mozilla;
 nsDOMCSSValueList::nsDOMCSSValueList(bool aCommaDelimited, bool aReadonly)
   : CSSValue(), mCommaDelimited(aCommaDelimited), mReadonly(aReadonly)
 {
-  SetIsDOMBinding();
 }
 
 nsDOMCSSValueList::~nsDOMCSSValueList()
diff --git a/layout/style/nsROCSSPrimitiveValue.cpp b/layout/style/nsROCSSPrimitiveValue.cpp
index 310d18275cc..900b5841699 100644
--- a/layout/style/nsROCSSPrimitiveValue.cpp
+++ b/layout/style/nsROCSSPrimitiveValue.cpp
@@ -21,7 +21,6 @@ nsROCSSPrimitiveValue::nsROCSSPrimitiveValue()
   : CSSValue(), mType(CSS_PX)
 {
   mValue.mAppUnits = 0;
-  SetIsDOMBinding();
 }
 
 
diff --git a/layout/xul/tree/nsTreeColumns.cpp b/layout/xul/tree/nsTreeColumns.cpp
index fafc043a809..3edfd3140e9 100644
--- a/layout/xul/tree/nsTreeColumns.cpp
+++ b/layout/xul/tree/nsTreeColumns.cpp
@@ -348,7 +348,6 @@ nsTreeColumns::nsTreeColumns(nsTreeBodyFrame* aTree)
   : mTree(aTree),
     mFirstColumn(nullptr)
 {
-  SetIsDOMBinding();
 }
 
 nsTreeColumns::~nsTreeColumns()
diff --git a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
index 01aef6898ee..d3f8a53e89c 100644
--- a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
@@ -20,7 +20,6 @@ MediaStreamList::MediaStreamList(sipcc::PeerConnectionImpl* peerConnection,
   : mPeerConnection(peerConnection),
     mType(type)
 {
-  SetIsDOMBinding();
 }
 
 MediaStreamList::~MediaStreamList()
diff --git a/netwerk/base/public/nsIIOService.idl b/netwerk/base/public/nsIIOService.idl
index d383926e712..d028829f5d6 100644
--- a/netwerk/base/public/nsIIOService.idl
+++ b/netwerk/base/public/nsIIOService.idl
@@ -19,7 +19,7 @@ interface nsIFile;
  * as a convenience to the programmer and in some cases to improve performance
  * by eliminating intermediate data structures and interfaces.
  */
-[scriptable, uuid(bddeda3f-9020-4d12-8c70-984ee9f7935e)]
+[scriptable, uuid(2d19475d-7557-43f7-9682-0c44417b6c0f)]
 interface nsIIOService : nsISupports
 {
     /**
@@ -88,6 +88,30 @@ interface nsIIOService : nsISupports
      */
     attribute boolean offline;
 
+    /**
+     * Set whether network appears to be offline for network connections from
+     * a given appID.
+     *
+     * Calling this function may fire the "network:app-offline-status-changed"
+     * notification, which is also sent to child processes containing this appId.
+     * 'state' must one of nsIAppOfflineInfo::{ONLINE|OFFLINE|WIFI_ONLY}.
+     */
+    void setAppOffline(in uint32_t appId, in long state);
+
+    /**
+     * Returns true if given appId is currently not allowed to make network
+     * connections. It will return true if the app is in the wifi-only state
+     * and we are currently on a 3G connection.
+     * The returned value does not depend on the offline state of the browser.
+     */
+    boolean isAppOffline(in uint32_t appId);
+
+    /**
+     * Returns the state of the app with the given appId.
+     * returns nsIAppOfflineInfo::{ONLINE,OFFLINE,WIFI_ONLY}
+     */
+    long getAppOfflineState(in uint32_t appId);
+
     /**
      * Checks if a port number is banned. This involves consulting a list of
      * unsafe ports, corresponding to network services that may be easily
@@ -117,6 +141,18 @@ interface nsIIOService : nsISupports
     ACString extractScheme(in AUTF8String urlString);
 };
 
+[scriptable, uuid(4ac296a0-ca1b-44f4-8787-117a88cb70fb)]
+interface nsIAppOfflineInfo : nsISupports
+{
+    readonly attribute unsigned long appId;
+
+    const long ONLINE = 1;
+    const long OFFLINE = 2;
+    const long WIFI_ONLY = 3;
+
+    readonly attribute long mode;
+};
+
 %{C++
 /**
  * We send notifications through nsIObserverService with topic
@@ -136,4 +172,10 @@ interface nsIIOService : nsISupports
 #define NS_IOSERVICE_OFFLINE_STATUS_TOPIC "network:offline-status-changed"
 #define NS_IOSERVICE_OFFLINE              "offline"
 #define NS_IOSERVICE_ONLINE               "online"
+
+/**
+ * When network:app-offline-status-changed is fired,
+ * the 'Subject' argument is a nsIOfflineAppInfo.
+ */
+#define NS_IOSERVICE_APP_OFFLINE_STATUS_TOPIC "network:app-offline-status-changed"
 %}
diff --git a/netwerk/base/public/nsISocketTransport.idl b/netwerk/base/public/nsISocketTransport.idl
index 8b75e39ccc7..7df679cf495 100644
--- a/netwerk/base/public/nsISocketTransport.idl
+++ b/netwerk/base/public/nsISocketTransport.idl
@@ -16,6 +16,7 @@ union NetAddr;
 }
 %}
 native NetAddr(mozilla::net::NetAddr);
+[ptr] native NetAddrPtr(mozilla::net::NetAddr);
 
 /**
  * nsISocketTransport
@@ -27,7 +28,7 @@ native NetAddr(mozilla::net::NetAddr);
  * NOTE: This is a free-threaded interface, meaning that the methods on
  * this interface may be called from any thread.
  */
-[scriptable, uuid(3F41704C-CD5D-4537-8C4C-7B2EBFC5D972)]
+[scriptable, uuid(a0b3b547-d6f0-4b65-a3de-a99ffa368840)]
 interface nsISocketTransport : nsITransport 
 {
     /**
@@ -55,6 +56,11 @@ interface nsISocketTransport : nsITransport
      */
     [noscript] NetAddr getSelfAddr();
 
+    /**
+     * Bind to a specific local address.
+     */
+    [noscript] void bind(in NetAddrPtr aLocalAddr);
+
     /**
      * Returns a scriptable version of getPeerAddr. This attribute is defined
      * only once a connection has been established.
diff --git a/netwerk/base/public/nsNetUtil.h b/netwerk/base/public/nsNetUtil.h
index a27d01f1961..5233547d203 100644
--- a/netwerk/base/public/nsNetUtil.h
+++ b/netwerk/base/public/nsNetUtil.h
@@ -75,6 +75,7 @@
 #include "nsIRedirectChannelRegistrar.h"
 #include "nsIMIMEHeaderParam.h"
 #include "nsILoadContext.h"
+#include "nsIScriptSecurityManager.h"
 #include "mozilla/Services.h"
 #include "nsIPrivateBrowsingChannel.h"
 #include "mozIApplicationClearPrivateDataParams.h"
@@ -1900,6 +1901,30 @@ NS_IsOffline()
     return offline;
 }
 
+inline bool
+NS_IsAppOffline(uint32_t appId)
+{
+    bool appOffline = false;
+    nsCOMPtr<nsIIOService> io(
+        do_GetService("@mozilla.org/network/io-service;1"));
+    if (io) {
+        io->IsAppOffline(appId, &appOffline);
+    }
+    return appOffline;
+}
+
+inline bool
+NS_IsAppOffline(nsIPrincipal * principal)
+{
+    if (!principal) {
+        return NS_IsOffline();
+    }
+    uint32_t appId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
+    principal->GetAppId(&appId);
+
+    return NS_IsAppOffline(appId);
+}
+
 /**
  * Helper functions for implementing nsINestedURI::innermostURI.
  *
diff --git a/netwerk/base/src/OfflineObserver.cpp b/netwerk/base/src/OfflineObserver.cpp
new file mode 100644
index 00000000000..40b0395cbcc
--- /dev/null
+++ b/netwerk/base/src/OfflineObserver.cpp
@@ -0,0 +1,118 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 ts=8 et tw=80 : */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "OfflineObserver.h"
+#include "nsNetUtil.h"
+#include "nsIOService.h"
+#include "mozilla/net/NeckoCommon.h"
+#include "nsIObserverService.h"
+#include "nsThreadUtils.h"
+namespace mozilla {
+namespace net {
+
+NS_IMPL_ISUPPORTS(OfflineObserver, nsIObserver)
+
+void
+OfflineObserver::RegisterOfflineObserver()
+{
+  if (NS_IsMainThread()) {
+    RegisterOfflineObserverMainThread();
+  } else {
+    nsRefPtr<nsIRunnable> event =
+      NS_NewRunnableMethod(this, &OfflineObserver::RegisterOfflineObserverMainThread);
+    NS_DispatchToMainThread(event);
+  }
+}
+
+void
+OfflineObserver::RemoveOfflineObserver()
+{
+  if (NS_IsMainThread()) {
+    RemoveOfflineObserverMainThread();
+  } else {
+    nsRefPtr<nsIRunnable> event =
+      NS_NewRunnableMethod(this, &OfflineObserver::RemoveOfflineObserverMainThread);
+    NS_DispatchToMainThread(event);
+  }
+}
+
+void
+OfflineObserver::RegisterOfflineObserverMainThread()
+{
+  nsCOMPtr<nsIObserverService> observerService =
+    mozilla::services::GetObserverService();
+  if (!observerService) {
+    return;
+  }
+  nsresult rv = observerService->AddObserver(this,
+    NS_IOSERVICE_APP_OFFLINE_STATUS_TOPIC, false);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to register observer");
+  }
+}
+
+void
+OfflineObserver::RemoveOfflineObserverMainThread()
+{
+  nsCOMPtr<nsIObserverService> observerService =
+    mozilla::services::GetObserverService();
+  if (observerService) {
+    observerService->RemoveObserver(this, NS_IOSERVICE_APP_OFFLINE_STATUS_TOPIC);
+  }
+}
+
+OfflineObserver::OfflineObserver(DisconnectableParent * parent)
+{
+  mParent = parent;
+  RegisterOfflineObserver();
+}
+
+void
+OfflineObserver::RemoveObserver()
+{
+  RemoveOfflineObserver();
+  mParent = nullptr;
+}
+
+NS_IMETHODIMP
+OfflineObserver::Observe(nsISupports *aSubject,
+                         const char *aTopic,
+                         const char16_t *aData)
+{
+  if (mParent &&
+      !strcmp(aTopic, NS_IOSERVICE_APP_OFFLINE_STATUS_TOPIC)) {
+    mParent->OfflineNotification(aSubject);
+  }
+  return NS_OK;
+}
+
+nsresult
+DisconnectableParent::OfflineNotification(nsISupports *aSubject)
+{
+  nsCOMPtr<nsIAppOfflineInfo> info(do_QueryInterface(aSubject));
+  if (!info) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  uint32_t targetAppId = NECKO_UNKNOWN_APP_ID;
+  info->GetAppId(&targetAppId);
+
+  // Obtain App ID
+  uint32_t appId = GetAppId();
+  if (appId != targetAppId) {
+    return NS_OK;
+  }
+
+  // If the app is offline, close the socket
+  if (NS_IsAppOffline(appId)) {
+    OfflineDisconnect();
+  }
+
+  return NS_OK;
+}
+
+} // net namespace
+} // mozilla namespace
diff --git a/netwerk/base/src/OfflineObserver.h b/netwerk/base/src/OfflineObserver.h
new file mode 100644
index 00000000000..865bc0daa20
--- /dev/null
+++ b/netwerk/base/src/OfflineObserver.h
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 ts=8 et tw=80 : */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsOfflineObserver_h__
+#define nsOfflineObserver_h__
+
+#include "nsIObserver.h"
+
+namespace mozilla {
+namespace net {
+
+/**
+ * Parents should extend this class and have a nsRefPtr<OfflineObserver> member.
+ * The constructor should initialize the member to new OfflineObserver(this)
+ * and the destructor should call RemoveObserver on the member.
+ *
+ * GetAppId and OfflineDisconnect are called from the default implementation
+ * of OfflineNotification. These should be overridden by classes that don't
+ * provide an implementation of OfflineNotification.
+ */
+class DisconnectableParent
+{
+public:
+  // This is called on the main thread, by the OfflineObserver.
+  // aSubject is of type nsAppOfflineInfo and contains appId and offline mode.
+  virtual nsresult OfflineNotification(nsISupports *aSubject);
+
+  // GetAppId returns the appId for the app associated with the parent
+  virtual uint32_t GetAppId() = 0;
+
+  // OfflineDisconnect cancels all existing connections in the parent when
+  // the app becomes offline.
+  virtual void     OfflineDisconnect() { }
+};
+
+/**
+ * This class observes the "network:app-offline-status-changed" topic and calls
+ * OfflineNotification on the DisconnectableParent with the subject.
+ */
+class OfflineObserver
+  : public nsIObserver
+{
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+public:
+  // A nsRefPtr to this object should be kept by the disconnectable parent.
+
+  OfflineObserver(DisconnectableParent * parent);
+  // This method needs to be called in the destructor of the parent
+  // It removes the observer from the nsObserverService list, and it clears
+  // the pointer it holds to the disconnectable parent.
+  void RemoveObserver();
+private:
+
+  // These methods are called to register and unregister the observer.
+  // If they are called on the main thread they register the observer right
+  // away, otherwise they dispatch and event to the main thread
+  void RegisterOfflineObserver();
+  void RemoveOfflineObserver();
+  void RegisterOfflineObserverMainThread();
+  void RemoveOfflineObserverMainThread();
+private:
+  virtual ~OfflineObserver() { }
+  DisconnectableParent * mParent;
+};
+
+} // net namespace
+} // mozilla namespace
+
+#endif // nsOfflineObserver_h__
diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build
index 0fb2fc3a97c..21ffeb00377 100644
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -17,6 +17,7 @@ EXPORTS.mozilla.net += [
     'ChannelDiverterParent.h',
     'Dashboard.h',
     'DashboardTypes.h',
+    'OfflineObserver.h',
 ]
 
 UNIFIED_SOURCES += [
@@ -85,6 +86,7 @@ SOURCES += [
     'nsAsyncRedirectVerifyHelper.cpp',
     'nsSocketTransport2.cpp',
     'nsSocketTransportService2.cpp',
+    'OfflineObserver.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
index 231707ceab3..e89e3062244 100644
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -28,6 +28,7 @@
 #include "nsIConsoleService.h"
 #include "nsIUploadChannel2.h"
 #include "nsXULAppAPI.h"
+#include "nsIScriptSecurityManager.h"
 #include "nsIProtocolProxyCallback.h"
 #include "nsICancelable.h"
 #include "nsINetworkLinkService.h"
@@ -38,12 +39,19 @@
 #include "nsIProtocolProxyService2.h"
 #include "MainThreadUtils.h"
 #include "nsIWidget.h"
+#include "nsThreadUtils.h"
+#include "mozilla/net/NeckoCommon.h"
+
+#ifdef MOZ_WIDGET_GONK
+#include "nsINetworkManager.h"
+#endif
 
 #if defined(XP_WIN)
 #include "nsNativeConnectionHelper.h"
 #endif
 
 using namespace mozilla;
+using mozilla::net::IsNeckoChild;
 
 #define PORT_PREF_PREFIX           "network.security.ports."
 #define PORT_PREF(x)               PORT_PREF_PREFIX x
@@ -133,11 +141,14 @@ int16_t gBadPortList[] = {
 static const char kProfileChangeNetTeardownTopic[] = "profile-change-net-teardown";
 static const char kProfileChangeNetRestoreTopic[] = "profile-change-net-restore";
 static const char kProfileDoChange[] = "profile-do-change";
+static const char kNetworkActiveChanged[] = "network-active-changed";
 
 // Necko buffer defaults
 uint32_t   nsIOService::gDefaultSegmentSize = 4096;
 uint32_t   nsIOService::gDefaultSegmentCount = 24;
 
+NS_IMPL_ISUPPORTS(nsAppOfflineInfo, nsIAppOfflineInfo)
+
 ////////////////////////////////////////////////////////////////////////////////
 
 nsIOService::nsIOService()
@@ -151,6 +162,7 @@ nsIOService::nsIOService()
     , mChannelEventSinks(NS_CHANNEL_EVENT_SINK_CATEGORY)
     , mAutoDialEnabled(false)
     , mNetworkNotifyChanged(true)
+    , mPreviousWifiState(-1)
 {
 }
 
@@ -204,6 +216,7 @@ nsIOService::Init()
         observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, true);
         observerService->AddObserver(this, NS_NETWORK_LINK_TOPIC, true);
         observerService->AddObserver(this, NS_WIDGET_WAKE_OBSERVER_TOPIC, true);
+        observerService->AddObserver(this, kNetworkActiveChanged, true);
     }
     else
         NS_WARNING("failed to get observer service");
@@ -914,6 +927,62 @@ nsIOService::GetPrefBranch(nsIPrefBranch **result)
     CallGetService(NS_PREFSERVICE_CONTRACTID, result);
 }
 
+// This returns true if wifi-only apps should have connectivity.
+// Always returns false in the child process (should not depend on this method)
+static bool
+IsWifiActive()
+{
+    // We don't need to do this check inside the child process
+    if (IsNeckoChild()) {
+        return false;
+    }
+#ifdef MOZ_WIDGET_GONK
+    // On B2G we query the network manager for the active interface
+    nsCOMPtr<nsINetworkManager> networkManager =
+        do_GetService("@mozilla.org/network/manager;1");
+    if (!networkManager) {
+        return false;
+    }
+    nsCOMPtr<nsINetworkInterface> active;
+    networkManager->GetActive(getter_AddRefs(active));
+    if (!active) {
+        return false;
+    }
+    int32_t type;
+    if (NS_FAILED(active->GetType(&type))) {
+        return false;
+    }
+    switch (type) {
+    case nsINetworkInterface::NETWORK_TYPE_WIFI:
+    case nsINetworkInterface::NETWORK_TYPE_WIFI_P2P:
+        return true;
+    default:
+        return false;
+    }
+#else
+    // On anything else than B2G we return true so than wifi-only
+    // apps don't think they are offline.
+    return true;
+#endif
+}
+
+struct EnumeratorParams {
+    nsIOService *service;
+    int32_t     status;
+};
+
+PLDHashOperator
+nsIOService::EnumerateWifiAppsChangingState(const unsigned int &aKey,
+                                            int32_t aValue,
+                                            void *aUserArg)
+{
+    EnumeratorParams *params = reinterpret_cast<EnumeratorParams*>(aUserArg);
+    if (aValue == nsIAppOfflineInfo::WIFI_ONLY) {
+        params->service->NotifyAppOfflineStatus(aKey, params->status);
+    }
+    return PL_DHASH_NEXT;
+}
+
 // nsIObserver interface
 NS_IMETHODIMP
 nsIOService::Observe(nsISupports *subject,
@@ -976,6 +1045,35 @@ nsIOService::Observe(nsISupports *subject,
                                 NS_NETWORK_LINK_TOPIC,
                                 MOZ_UTF16(NS_NETWORK_LINK_DATA_CHANGED));
         }
+    } else if (!strcmp(topic, kNetworkActiveChanged)) {
+#ifdef MOZ_WIDGET_GONK
+        if (IsNeckoChild()) {
+          return NS_OK;
+        }
+        nsCOMPtr<nsINetworkInterface> interface = do_QueryInterface(subject);
+        if (!interface) {
+            return NS_ERROR_FAILURE;
+        }
+        int32_t state;
+        if (NS_FAILED(interface->GetState(&state))) {
+            return NS_ERROR_FAILURE;
+        }
+
+        bool wifiActive = IsWifiActive();
+        int32_t newWifiState = wifiActive ?
+            nsINetworkInterface::NETWORK_TYPE_WIFI :
+            nsINetworkInterface::NETWORK_TYPE_MOBILE;
+        if (mPreviousWifiState != newWifiState) {
+            // Notify wifi-only apps of their new status
+            int32_t status = wifiActive ?
+                nsIAppOfflineInfo::ONLINE : nsIAppOfflineInfo::OFFLINE;
+
+            EnumeratorParams params = {this, status};
+            mAppsOfflineStatus.EnumerateRead(EnumerateWifiAppsChangingState, &params);
+        }
+
+        mPreviousWifiState = newWifiState;
+#endif
     }
 
     return NS_OK;
@@ -1288,3 +1386,167 @@ nsIOService::SpeculativeConnect(nsIURI *aURI,
         new IOServiceProxyCallback(aCallbacks, this);
     return pps->AsyncResolve(aURI, 0, callback, getter_AddRefs(cancelable));
 }
+
+void
+nsIOService::NotifyAppOfflineStatus(uint32_t appId, int32_t state)
+{
+    MOZ_RELEASE_ASSERT(NS_IsMainThread(),
+            "Should be called on the main thread");
+
+    nsCOMPtr<nsIObserverService> observerService =
+        mozilla::services::GetObserverService();
+    MOZ_ASSERT(observerService, "The observer service should not be null");
+
+    if (observerService) {
+        nsRefPtr<nsAppOfflineInfo> info = new nsAppOfflineInfo(appId, state);
+        observerService->NotifyObservers(
+            info,
+            NS_IOSERVICE_APP_OFFLINE_STATUS_TOPIC,
+            MOZ_UTF16("all data in nsIAppOfflineInfo subject argument"));
+    }
+}
+
+namespace {
+
+class SetAppOfflineMainThread : public nsRunnable
+{
+public:
+    SetAppOfflineMainThread(uint32_t aAppId, int32_t aState)
+        : mAppId(aAppId)
+        , mState(aState)
+    {
+    }
+
+    NS_IMETHOD Run()
+    {
+        MOZ_ASSERT(NS_IsMainThread());
+        gIOService->SetAppOfflineInternal(mAppId, mState);
+        return NS_OK;
+    }
+private:
+    uint32_t mAppId;
+    int32_t mState;
+};
+
+}
+
+NS_IMETHODIMP
+nsIOService::SetAppOffline(uint32_t aAppId, int32_t aState)
+{
+    NS_ENSURE_TRUE(!IsNeckoChild(),
+                   NS_ERROR_FAILURE);
+    NS_ENSURE_TRUE(aAppId != nsIScriptSecurityManager::NO_APP_ID,
+                   NS_ERROR_INVALID_ARG);
+    NS_ENSURE_TRUE(aAppId != nsIScriptSecurityManager::UNKNOWN_APP_ID,
+                   NS_ERROR_INVALID_ARG);
+
+    if (!NS_IsMainThread()) {
+        NS_DispatchToMainThread(new SetAppOfflineMainThread(aAppId, aState));
+        return NS_OK;
+    }
+
+    SetAppOfflineInternal(aAppId, aState);
+
+    return NS_OK;
+}
+
+// This method may be called in both the parent and the child process
+// In parent it only gets called in from nsIOService::SetAppOffline
+// and SetAppOfflineMainThread::Run
+// In the child, it may get called from NeckoChild::RecvAppOfflineStatus
+// and TabChild::RecvAppOfflineStatus.
+// Note that in the child process, apps should never be in a WIFI_ONLY
+// because wifi status is not available on the child
+void
+nsIOService::SetAppOfflineInternal(uint32_t aAppId, int32_t aState)
+{
+    MOZ_ASSERT(NS_IsMainThread());
+    NS_ENSURE_TRUE_VOID(NS_IsMainThread());
+
+    int32_t state = nsIAppOfflineInfo::ONLINE;
+    mAppsOfflineStatus.Get(aAppId, &state);
+    if (state == aState) {
+        // The app is already in this state. Nothing needs to be done.
+        return;
+    }
+
+    // wifiActive will always be false in the child process
+    // but it will be true in the parent process on Desktop Firefox as it does
+    // not have wifi-detection capabilities
+    bool wifiActive = IsWifiActive();
+    bool offline = (state == nsIAppOfflineInfo::OFFLINE) ||
+                   (state == nsIAppOfflineInfo::WIFI_ONLY && !wifiActive);
+
+    switch (aState) {
+    case nsIAppOfflineInfo::OFFLINE:
+        mAppsOfflineStatus.Put(aAppId, nsIAppOfflineInfo::OFFLINE);
+        if (!offline) {
+            NotifyAppOfflineStatus(aAppId, nsIAppOfflineInfo::OFFLINE);
+        }
+        break;
+    case nsIAppOfflineInfo::WIFI_ONLY:
+        MOZ_RELEASE_ASSERT(!IsNeckoChild());
+        mAppsOfflineStatus.Put(aAppId, nsIAppOfflineInfo::WIFI_ONLY);
+        if (offline && wifiActive) {
+            NotifyAppOfflineStatus(aAppId, nsIAppOfflineInfo::ONLINE);
+        } else if (!offline && !wifiActive) {
+            NotifyAppOfflineStatus(aAppId, nsIAppOfflineInfo::OFFLINE);
+        }
+        break;
+    case nsIAppOfflineInfo::ONLINE:
+        mAppsOfflineStatus.Remove(aAppId);
+        if (offline) {
+            NotifyAppOfflineStatus(aAppId, nsIAppOfflineInfo::ONLINE);
+        }
+        break;
+    default:
+        break;
+    }
+
+}
+
+NS_IMETHODIMP
+nsIOService::GetAppOfflineState(uint32_t aAppId, int32_t *aResult)
+{
+    NS_ENSURE_ARG(aResult);
+
+    if (aAppId == NECKO_NO_APP_ID ||
+        aAppId == NECKO_UNKNOWN_APP_ID) {
+        return NS_ERROR_NOT_AVAILABLE;
+    }
+
+    *aResult = nsIAppOfflineInfo::ONLINE;
+    mAppsOfflineStatus.Get(aAppId, aResult);
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIOService::IsAppOffline(uint32_t aAppId, bool* aResult)
+{
+    NS_ENSURE_ARG(aResult);
+    *aResult = false;
+
+    if (aAppId == NECKO_NO_APP_ID ||
+        aAppId == NECKO_UNKNOWN_APP_ID) {
+        return NS_ERROR_NOT_AVAILABLE;
+    }
+
+    int32_t state;
+    if (mAppsOfflineStatus.Get(aAppId, &state)) {
+        switch (state) {
+        case nsIAppOfflineInfo::OFFLINE:
+            *aResult = true;
+            break;
+        case nsIAppOfflineInfo::WIFI_ONLY:
+            MOZ_RELEASE_ASSERT(!IsNeckoChild());
+            *aResult = !IsWifiActive();
+            break;
+        default:
+            // The app is online by default
+            break;
+        }
+    }
+
+    return NS_OK;
+}
diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h
index 2839d9b057d..ef1190fb549 100644
--- a/netwerk/base/src/nsIOService.h
+++ b/netwerk/base/src/nsIOService.h
@@ -17,6 +17,7 @@
 #include "nsIChannelEventSink.h"
 #include "nsCategoryCache.h"
 #include "nsISpeculativeConnect.h"
+#include "nsDataHashtable.h"
 #include "mozilla/Attributes.h"
 
 #define NS_N(x) (sizeof(x)/sizeof(*x))
@@ -37,6 +38,12 @@ class nsIProxyInfo;
 class nsPIDNSService;
 class nsPISocketTransportService;
 
+namespace mozilla {
+namespace net {
+    class NeckoChild;
+} // namespace net
+} // namespace mozilla
+
 class nsIOService MOZ_FINAL : public nsIIOService2
                             , public nsIObserver
                             , public nsINetUtil
@@ -74,6 +81,9 @@ public:
       return mOffline && mSettingOffline && !mSetOfflineValue;
     }
 
+    // Should only be called from NeckoChild. Use SetAppOffline instead.
+    void SetAppOfflineInternal(uint32_t appId, int32_t status);
+
 private:
     // These shouldn't be called directly:
     // - construct using GetInstance
@@ -102,6 +112,11 @@ private:
     void LookupProxyInfo(nsIURI *aURI, nsIURI *aProxyURI, uint32_t aProxyFlags,
                          nsCString *aScheme, nsIProxyInfo **outPI);
 
+    // notify content processes of offline status
+    // 'status' must be a nsIAppOfflineInfo mode constant.
+    void NotifyAppOfflineStatus(uint32_t appId, int32_t status);
+    static PLDHashOperator EnumerateWifiAppsChangingState(const unsigned int &, int32_t, void*);
+
 private:
     bool                                 mOffline;
     bool                                 mOfflineForProfileChange;
@@ -130,12 +145,49 @@ private:
 
     bool                                 mAutoDialEnabled;
     bool                                 mNetworkNotifyChanged;
+    int32_t                              mPreviousWifiState;
+    // Hashtable of (appId, nsIAppOffineInfo::mode) pairs
+    // that is used especially in IsAppOffline
+    nsDataHashtable<nsUint32HashKey, int32_t> mAppsOfflineStatus;
 public:
     // Used for all default buffer sizes that necko allocates.
     static uint32_t   gDefaultSegmentSize;
     static uint32_t   gDefaultSegmentCount;
 };
 
+/**
+ * This class is passed as the subject to a NotifyObservers call for the
+ * "network:app-offline-status-changed" topic.
+ * Observers will use the appId and mode to get the offline status of an app.
+ */
+class nsAppOfflineInfo : public nsIAppOfflineInfo
+{
+    NS_DECL_THREADSAFE_ISUPPORTS
+public:
+    nsAppOfflineInfo(uint32_t aAppId, int32_t aMode)
+        : mAppId(aAppId), mMode(aMode)
+    {
+    }
+
+    NS_IMETHODIMP GetMode(int32_t *aMode)
+    {
+        *aMode = mMode;
+        return NS_OK;
+    }
+
+    NS_IMETHODIMP GetAppId(uint32_t *aAppId)
+    {
+        *aAppId = mAppId;
+        return NS_OK;
+    }
+
+private:
+    virtual ~nsAppOfflineInfo() {}
+
+    uint32_t mAppId;
+    int32_t mMode;
+};
+
 /**
  * Reference to the IO service singleton. May be null.
  */
diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp
index 19233f554e0..e6894b9ada3 100644
--- a/netwerk/base/src/nsSocketTransport2.cpp
+++ b/netwerk/base/src/nsSocketTransport2.cpp
@@ -1355,6 +1355,18 @@ nsSocketTransport::InitiateSocket()
     // Initiate the connect() to the host...
     //
     PRNetAddr prAddr;
+    {
+        if (mBindAddr) {
+            MutexAutoLock lock(mLock);
+            NetAddrToPRNetAddr(mBindAddr.get(), &prAddr);
+            status = PR_Bind(fd, &prAddr);
+            if (status != PR_SUCCESS) {
+                return NS_ERROR_FAILURE;
+            }
+            mBindAddr = nullptr;
+        }
+    }
+
     NetAddrToPRNetAddr(&mNetAddr, &prAddr);
 
     MOZ_EVENT_TRACER_EXEC(this, "net::tcp::connect");
@@ -2221,6 +2233,22 @@ nsSocketTransport::GetSelfAddr(NetAddr *addr)
     return rv;
 }
 
+NS_IMETHODIMP
+nsSocketTransport::Bind(NetAddr *aLocalAddr)
+{
+    NS_ENSURE_ARG(aLocalAddr);
+
+    MutexAutoLock lock(mLock);
+    if (mAttached) {
+        return NS_ERROR_FAILURE;
+    }
+
+    mBindAddr = new NetAddr();
+    memcpy(mBindAddr.get(), aLocalAddr, sizeof(NetAddr));
+
+    return NS_OK;
+}
+
 /* nsINetAddr getScriptablePeerAddr (); */
 NS_IMETHODIMP
 nsSocketTransport::GetScriptablePeerAddr(nsINetAddr * *addr)
diff --git a/netwerk/base/src/nsSocketTransport2.h b/netwerk/base/src/nsSocketTransport2.h
index 6bd3d5d85fd..52caccf595a 100644
--- a/netwerk/base/src/nsSocketTransport2.h
+++ b/netwerk/base/src/nsSocketTransport2.h
@@ -305,6 +305,8 @@ private:
     mozilla::net::NetAddr   mNetAddr;
     bool                    mNetAddrIsSet;
 
+    nsAutoPtr<mozilla::net::NetAddr> mBindAddr;
+
     // socket methods (these can only be called on the socket thread):
 
     void     SendStatus(nsresult status);
diff --git a/netwerk/ipc/NeckoChild.cpp b/netwerk/ipc/NeckoChild.cpp
index 6fd1d1694b2..9596c3f4443 100644
--- a/netwerk/ipc/NeckoChild.cpp
+++ b/netwerk/ipc/NeckoChild.cpp
@@ -26,6 +26,7 @@
 #include "mozilla/net/RtspChannelChild.h"
 #endif
 #include "SerializedLoadContext.h"
+#include "nsIOService.h"
 
 using mozilla::dom::TCPSocketChild;
 using mozilla::dom::TCPServerSocketChild;
@@ -317,5 +318,17 @@ NeckoChild::RecvAsyncAuthPromptForNestedFrame(const uint64_t& aNestedFrameId,
   return true;
 }
 
+bool
+NeckoChild::RecvAppOfflineStatus(const uint32_t& aId, const bool& aOffline)
+{
+  // Instantiate the service to make sure gIOService is initialized
+  nsCOMPtr<nsIIOService> ioService = do_GetIOService();
+  if (gIOService) {
+    gIOService->SetAppOfflineInternal(aId, aOffline ?
+      nsIAppOfflineInfo::OFFLINE : nsIAppOfflineInfo::ONLINE);
+  }
+  return true;
+}
+
 }} // mozilla::net
 
diff --git a/netwerk/ipc/NeckoChild.h b/netwerk/ipc/NeckoChild.h
index 5d3f6d0168c..874cf6386ea 100644
--- a/netwerk/ipc/NeckoChild.h
+++ b/netwerk/ipc/NeckoChild.h
@@ -75,6 +75,7 @@ protected:
                                                  const nsCString& aUri,
                                                  const nsString& aRealm,
                                                  const uint64_t& aCallbackId) MOZ_OVERRIDE;
+  virtual bool RecvAppOfflineStatus(const uint32_t& aId, const bool& aOffline) MOZ_OVERRIDE;
 };
 
 /**
diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp
index 002d0625ae9..51cba3f9d05 100644
--- a/netwerk/ipc/NeckoParent.cpp
+++ b/netwerk/ipc/NeckoParent.cpp
@@ -37,6 +37,8 @@
 #include "nsAuthInformationHolder.h"
 #include "nsIAuthPromptCallback.h"
 #include "nsPrincipal.h"
+#include "nsIOService.h"
+#include "mozilla/net/OfflineObserver.h"
 
 using mozilla::dom::ContentParent;
 using mozilla::dom::TabParent;
@@ -74,10 +76,15 @@ NeckoParent::NeckoParent()
     LossyCopyUTF16toASCII(corePath, mCoreAppsBasePath);
     LossyCopyUTF16toASCII(webPath, mWebAppsBasePath);
   }
+
+  mObserver = new OfflineObserver(this);
 }
 
 NeckoParent::~NeckoParent()
 {
+  if (mObserver) {
+    mObserver->RemoveObserver();
+  }
 }
 
 static PBOverrideStatus
@@ -796,4 +803,43 @@ NeckoParent::RecvOnAuthCancelled(const uint64_t& aCallbackId,
   return true;
 }
 
+nsresult
+NeckoParent::OfflineNotification(nsISupports *aSubject)
+{
+  nsCOMPtr<nsIAppOfflineInfo> info(do_QueryInterface(aSubject));
+  if (!info) {
+    return NS_OK;
+  }
+
+  uint32_t targetAppId = NECKO_UNKNOWN_APP_ID;
+  info->GetAppId(&targetAppId);
+
+  for (uint32_t i = 0; i < Manager()->ManagedPBrowserParent().Length(); ++i) {
+    nsRefPtr<TabParent> tabParent =
+      static_cast<TabParent*>(Manager()->ManagedPBrowserParent()[i]);
+    uint32_t appId = tabParent->OwnOrContainingAppId();
+
+    if (appId == targetAppId) {
+      if (gIOService) {
+        bool offline = false;
+        nsresult rv = gIOService->IsAppOffline(appId, &offline);
+        if (NS_FAILED(rv)) {
+          printf_stderr("Unexpected - NeckoParent: "
+                        "appId not found by isAppOffline(): %u\n", appId);
+          break;
+        }
+        if (!SendAppOfflineStatus(appId, offline)) {
+          printf_stderr("NeckoParent: "
+                        "SendAppOfflineStatus failed for appId: %u\n", appId);
+        }
+        // Once we found the targetAppId, we don't need to continue
+        break;
+      }
+    }
+
+  }
+
+  return NS_OK;
+}
+
 }} // mozilla::net
diff --git a/netwerk/ipc/NeckoParent.h b/netwerk/ipc/NeckoParent.h
index 6d033c12c99..bc7023e67f4 100644
--- a/netwerk/ipc/NeckoParent.h
+++ b/netwerk/ipc/NeckoParent.h
@@ -7,6 +7,7 @@
 
 #include "mozilla/net/PNeckoParent.h"
 #include "mozilla/net/NeckoCommon.h"
+#include "mozilla/net/OfflineObserver.h"
 
 #ifndef mozilla_net_NeckoParent_h
 #define mozilla_net_NeckoParent_h
@@ -22,8 +23,9 @@ enum PBOverrideStatus {
 };
 
 // Header file contents
-class NeckoParent :
-  public PNeckoParent
+class NeckoParent
+  : public PNeckoParent
+  , public DisconnectableParent
 {
 public:
   NeckoParent();
@@ -51,7 +53,8 @@ public:
                            nsCOMPtr<nsILoadContext> &aResult);
 
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
-
+  virtual nsresult OfflineNotification(nsISupports *) MOZ_OVERRIDE;
+  virtual uint32_t GetAppId() MOZ_OVERRIDE { return NECKO_UNKNOWN_APP_ID; }
   virtual void
   CloneManagees(ProtocolBase* aSource,
               mozilla::ipc::ProtocolCloneContext* aCtx) MOZ_OVERRIDE;
@@ -201,6 +204,7 @@ protected:
 private:
   nsCString mCoreAppsBasePath;
   nsCString mWebAppsBasePath;
+  nsRefPtr<OfflineObserver> mObserver;
 };
 
 } // namespace net
diff --git a/netwerk/ipc/PNecko.ipdl b/netwerk/ipc/PNecko.ipdl
index cbbc150de1d..b19d0e27239 100644
--- a/netwerk/ipc/PNecko.ipdl
+++ b/netwerk/ipc/PNecko.ipdl
@@ -100,6 +100,8 @@ child:
    */
   AsyncAuthPromptForNestedFrame(uint64_t nestedFrameId, nsCString uri,
                                 nsString realm, uint64_t callbackId);
+  // Notifies child that a given app is now offline (or online)
+  AppOfflineStatus(uint32_t appId, bool offline);
 
 both:
   // Actually we need PTCPSocket() for parent. But ipdl disallows us having different
diff --git a/netwerk/protocol/ftp/FTPChannelParent.cpp b/netwerk/protocol/ftp/FTPChannelParent.cpp
index 3d94e6c1688..4ba9129cbb8 100644
--- a/netwerk/protocol/ftp/FTPChannelParent.cpp
+++ b/netwerk/protocol/ftp/FTPChannelParent.cpp
@@ -18,6 +18,7 @@
 #include "SerializedLoadContext.h"
 #include "nsIContentPolicy.h"
 #include "mozilla/ipc/BackgroundUtils.h"
+#include "nsIOService.h"
 
 using namespace mozilla::ipc;
 
@@ -39,11 +40,16 @@ FTPChannelParent::FTPChannelParent(nsILoadContext* aLoadContext, PBOverrideStatu
   nsIProtocolHandler* handler;
   CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ftp", &handler);
   NS_ASSERTION(handler, "no ftp handler");
+  
+  mObserver = new OfflineObserver(this);
 }
 
 FTPChannelParent::~FTPChannelParent()
 {
   gFtpHandler->Release();
+  if (mObserver) {
+    mObserver->RemoveObserver();
+  }
 }
 
 void
@@ -115,6 +121,17 @@ FTPChannelParent::DoAsyncOpen(const URIParams& aURI,
        this, uriSpec.get()));
 #endif
 
+  bool app_offline = false;
+  uint32_t appId = GetAppId();
+  if (appId != NECKO_UNKNOWN_APP_ID &&
+      appId != NECKO_NO_APP_ID) {
+    gIOService->IsAppOffline(appId, &app_offline);
+    LOG(("FTP app id %u is offline %d\n", appId, app_offline));
+  }
+
+  if (app_offline)
+    return SendFailedAsyncOpen(NS_ERROR_OFFLINE);
+
   nsresult rv;
   nsCOMPtr<nsIIOService> ios(do_GetIOService(&rv));
   if (NS_FAILED(rv))
@@ -196,6 +213,7 @@ FTPChannelParent::RecvCancel(const nsresult& status)
 {
   if (mChannel)
     mChannel->Cancel(status);
+
   return true;
 }
 
@@ -642,6 +660,25 @@ FTPChannelParent::NotifyDiversionFailed(nsresult aErrorCode,
   }
 }
 
+void
+FTPChannelParent::OfflineDisconnect()
+{
+  if (mChannel) {
+    mChannel->Cancel(NS_ERROR_OFFLINE);
+  }
+  mStatus = NS_ERROR_OFFLINE;
+}
+
+uint32_t
+FTPChannelParent::GetAppId()
+{
+  uint32_t appId = NECKO_UNKNOWN_APP_ID;
+  if (mLoadContext) {
+    mLoadContext->GetAppId(&appId);
+  }
+  return appId;
+}
+
 //-----------------------------------------------------------------------------
 // FTPChannelParent::nsIChannelEventSink
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/ftp/FTPChannelParent.h b/netwerk/protocol/ftp/FTPChannelParent.h
index 46a717323f5..fc6471fb8b2 100644
--- a/netwerk/protocol/ftp/FTPChannelParent.h
+++ b/netwerk/protocol/ftp/FTPChannelParent.h
@@ -13,6 +13,7 @@
 #include "mozilla/net/NeckoParent.h"
 #include "nsIParentChannel.h"
 #include "nsIInterfaceRequestor.h"
+#include "OfflineObserver.h"
 
 class nsFtpChannel;
 class nsILoadContext;
@@ -25,6 +26,7 @@ class FTPChannelParent : public PFTPChannelParent
                        , public nsIInterfaceRequestor
                        , public ADivertableParentChannel
                        , public nsIChannelEventSink
+                       , public DisconnectableParent
 {
 public:
   NS_DECL_ISUPPORTS
@@ -82,6 +84,9 @@ protected:
 
   virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 
+  void OfflineDisconnect() MOZ_OVERRIDE;
+  uint32_t GetAppId() MOZ_OVERRIDE;
+
   // if configured to use HTTP proxy for FTP, this can an an HTTP channel.
   nsCOMPtr<nsIChannel> mChannel;
 
@@ -106,6 +111,7 @@ protected:
   // Set if we successfully suspended the nsHttpChannel for diversion. Unset
   // when we call ResumeForDiversion.
   bool mSuspendedForDiversion;
+  nsRefPtr<OfflineObserver> mObserver;
 };
 
 } // namespace net
diff --git a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
index 17e988b4ea6..01026749111 100644
--- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
+++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
@@ -2514,7 +2514,11 @@ nsFtpState::CheckCache()
 
     // Set cache access requested:
     nsCacheAccessMode accessReq;
-    if (NS_IsOffline()) {
+    uint32_t appId;
+    bool isInBrowser;
+    NS_GetAppInfo(mChannel, &appId, &isInBrowser);
+
+    if (NS_IsOffline() || NS_IsAppOffline(appId)) {
         accessReq = nsICache::ACCESS_READ; // can only read
     } else if (mChannel->HasLoadFlag(nsIRequest::LOAD_BYPASS_CACHE)) {
         accessReq = nsICache::ACCESS_WRITE; // replace cache entry
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index fb83eae9dcc..056843fb676 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -29,6 +29,9 @@
 #include "nsIAuthPromptCallback.h"
 #include "nsIContentPolicy.h"
 #include "mozilla/ipc/BackgroundUtils.h"
+#include "nsIOService.h"
+#include "nsICachingChannel.h"
+
 
 using namespace mozilla::dom;
 using namespace mozilla::ipc;
@@ -66,10 +69,15 @@ HttpChannelParent::HttpChannelParent(const PBrowserOrId& iframeEmbedding,
   } else {
     mNestedFrameId = iframeEmbedding.get_uint64_t();
   }
+
+  mObserver = new OfflineObserver(this);
 }
 
 HttpChannelParent::~HttpChannelParent()
 {
+  if (mObserver) {
+    mObserver->RemoveObserver();
+  }
 }
 
 void
@@ -164,7 +172,7 @@ HttpChannelParent::DoAsyncOpen(  const URIParams&           aURI,
                                  const OptionalURIParams&   aDocURI,
                                  const OptionalURIParams&   aReferrerURI,
                                  const OptionalURIParams&   aAPIRedirectToURI,
-                                 const uint32_t&            loadFlags,
+                                 const uint32_t&            aLoadFlags,
                                  const RequestHeaderTuples& requestHeaders,
                                  const nsCString&           requestMethod,
                                  const OptionalInputStreamParams& uploadStream,
@@ -213,6 +221,20 @@ HttpChannelParent::DoAsyncOpen(  const URIParams&           aURI,
     return SendFailedAsyncOpen(rv);
   }
 
+  bool appOffline = false;
+  uint32_t appId = GetAppId();
+  if (appId != NECKO_UNKNOWN_APP_ID &&
+      appId != NECKO_NO_APP_ID) {
+    gIOService->IsAppOffline(appId, &appOffline);
+  }
+
+  uint32_t loadFlags = aLoadFlags;
+  if (appOffline) {
+    loadFlags |= nsICachingChannel::LOAD_ONLY_FROM_CACHE;
+    loadFlags |= nsIRequest::LOAD_FROM_CACHE;
+    loadFlags |= nsICachingChannel::LOAD_NO_NETWORK_IO;
+  }
+
   nsCOMPtr<nsIChannel> channel;
   rv = NS_NewChannel(getter_AddRefs(channel),
                      uri,
@@ -309,10 +331,8 @@ HttpChannelParent::DoAsyncOpen(  const URIParams&           aURI,
 
     if (setChooseApplicationCache) {
       bool inBrowser = false;
-      uint32_t appId = NECKO_NO_APP_ID;
       if (mLoadContext) {
         mLoadContext->GetIsInBrowserElement(&inBrowser);
-        mLoadContext->GetAppId(&appId);
       }
 
       bool chooseAppCache = false;
@@ -357,6 +377,22 @@ HttpChannelParent::ConnectChannel(const uint32_t& channelId)
     }
   }
 
+  bool appOffline = false;
+  uint32_t appId = GetAppId();
+  if (appId != NECKO_UNKNOWN_APP_ID &&
+      appId != NECKO_NO_APP_ID) {
+    gIOService->IsAppOffline(appId, &appOffline);
+  }
+
+  if (appOffline) {
+    uint32_t loadFlags;
+    mChannel->GetLoadFlags(&loadFlags);
+    loadFlags |= nsICachingChannel::LOAD_ONLY_FROM_CACHE;
+    loadFlags |= nsIRequest::LOAD_FROM_CACHE;
+    loadFlags |= nsICachingChannel::LOAD_NO_NETWORK_IO;
+    mChannel->SetLoadFlags(loadFlags);
+  }
+
   return true;
 }
 
@@ -1036,6 +1072,25 @@ HttpChannelParent::NotifyDiversionFailed(nsresult aErrorCode,
   }
 }
 
+void
+HttpChannelParent::OfflineDisconnect()
+{
+  if (mChannel) {
+    mChannel->Cancel(NS_ERROR_OFFLINE);
+  }
+  mStatus = NS_ERROR_OFFLINE;
+}
+
+uint32_t
+HttpChannelParent::GetAppId()
+{
+  uint32_t appId = NECKO_UNKNOWN_APP_ID;
+  if (mLoadContext) {
+    mLoadContext->GetAppId(&appId);
+  }
+  return appId;
+}
+
 NS_IMETHODIMP
 HttpChannelParent::GetAuthPrompt(uint32_t aPromptReason, const nsIID& iid,
                                  void** aResult)
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
index 7e376c4d7f6..f7cfb9cd350 100644
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -13,6 +13,8 @@
 #include "mozilla/net/PHttpChannelParent.h"
 #include "mozilla/net/NeckoCommon.h"
 #include "mozilla/net/NeckoParent.h"
+#include "OfflineObserver.h"
+#include "nsIObserver.h"
 #include "nsIParentRedirectingChannel.h"
 #include "nsIProgressEventSink.h"
 #include "nsHttpChannel.h"
@@ -38,6 +40,7 @@ class HttpChannelParent : public PHttpChannelParent
                         , public nsIInterfaceRequestor
                         , public ADivertableParentChannel
                         , public nsIAuthPromptProvider
+                        , public DisconnectableParent
 {
   virtual ~HttpChannelParent();
 
@@ -129,6 +132,9 @@ protected:
   friend class HttpChannelParentListener;
   nsRefPtr<mozilla::dom::TabParent> mTabParent;
 
+  void OfflineDisconnect() MOZ_OVERRIDE;
+  uint32_t GetAppId() MOZ_OVERRIDE;
+
 private:
   nsRefPtr<nsHttpChannel>       mChannel;
   nsCOMPtr<nsICacheEntry>       mCacheEntry;
@@ -150,6 +156,8 @@ private:
   bool mSentRedirect1BeginFailed    : 1;
   bool mReceivedRedirect2Verify     : 1;
 
+  nsRefPtr<OfflineObserver> mObserver;
+
   PBOverrideStatus mPBOverride;
 
   nsCOMPtr<nsILoadContext> mLoadContext;
diff --git a/netwerk/protocol/http/TunnelUtils.cpp b/netwerk/protocol/http/TunnelUtils.cpp
index 5e369543f4a..bc190a67a85 100644
--- a/netwerk/protocol/http/TunnelUtils.cpp
+++ b/netwerk/protocol/http/TunnelUtils.cpp
@@ -1544,6 +1544,12 @@ SocketTransportShim::SetEventSink(nsITransportEventSink *aSink, nsIEventTarget *
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+NS_IMETHODIMP
+SocketTransportShim::Bind(NetAddr *aLocalAddr)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 #define FWD_TS_PTR(fx, ts) NS_IMETHODIMP \
 SocketTransportShim::fx(ts *arg) { return mWrapped->fx(arg); }
 
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 0e1c40de2d1..87ea5991272 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -2584,8 +2584,16 @@ nsHttpChannel::OpenCacheEntry(bool usingSSL)
         openURI = mURI;
     }
 
+    uint32_t appId = info->AppId();
+    bool appOffline = false;
+
+    if (appId != NECKO_NO_APP_ID) {
+        gIOService->IsAppOffline(appId, &appOffline);
+        LOG(("nsHttpChannel::OpenCacheEntry appId: %u, offline: %d\n", appId, appOffline));
+    }
+
     uint32_t cacheEntryOpenFlags;
-    bool offline = gIOService->IsOffline();
+    bool offline = gIOService->IsOffline() || appOffline;
     if (offline || (mLoadFlags & INHIBIT_CACHING)) {
         if (BYPASS_LOCAL_CACHE(mLoadFlags) && !offline) {
             goto bypassCacheEntryOpen;
diff --git a/netwerk/protocol/websocket/WebSocketChannelParent.cpp b/netwerk/protocol/websocket/WebSocketChannelParent.cpp
index 99dcbb1bf0f..9d50bae5e89 100644
--- a/netwerk/protocol/websocket/WebSocketChannelParent.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannelParent.cpp
@@ -10,6 +10,8 @@
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "SerializedLoadContext.h"
+#include "nsIOService.h"
+#include "mozilla/net/NeckoCommon.h"
 
 using namespace mozilla::ipc;
 
@@ -33,8 +35,15 @@ WebSocketChannelParent::WebSocketChannelParent(nsIAuthPromptProvider* aAuthProvi
   if (!webSocketLog)
     webSocketLog = PR_NewLogModule("nsWebSocket");
 #endif
+  mObserver = new OfflineObserver(this);
 }
 
+WebSocketChannelParent::~WebSocketChannelParent()
+{
+  if (mObserver) {
+    mObserver->RemoveObserver();
+  }
+}
 //-----------------------------------------------------------------------------
 // WebSocketChannelParent::PWebSocketChannelParent
 //-----------------------------------------------------------------------------
@@ -63,6 +72,17 @@ WebSocketChannelParent::RecvAsyncOpen(const URIParams& aURI,
   nsresult rv;
   nsCOMPtr<nsIURI> uri;
 
+
+  bool appOffline = false;
+  uint32_t appId = GetAppId();
+  if (appId != NECKO_UNKNOWN_APP_ID &&
+      appId != NECKO_NO_APP_ID) {
+    gIOService->IsAppOffline(appId, &appOffline);
+    if (appOffline) {
+      goto fail;
+    }
+  }
+
   if (aSecure) {
     mChannel =
       do_CreateInstance("@mozilla.org/network/protocol;1?name=wss", &rv);
@@ -117,6 +137,7 @@ WebSocketChannelParent::RecvClose(const uint16_t& code, const nsCString& reason)
     nsresult rv = mChannel->Close(code, reason);
     NS_ENSURE_SUCCESS(rv, true);
   }
+
   return true;
 }
 
@@ -258,6 +279,24 @@ WebSocketChannelParent::GetInterface(const nsIID & iid, void **result)
   return QueryInterface(iid, result);
 }
 
+void
+WebSocketChannelParent::OfflineDisconnect()
+{
+  if (mChannel) {
+    mChannel->Close(nsIWebSocketChannel::CLOSE_GOING_AWAY,
+                    nsCString("App is offline"));
+  }
+}
+
+uint32_t
+WebSocketChannelParent::GetAppId()
+{
+  uint32_t appId = NECKO_UNKNOWN_APP_ID;
+  if (mLoadContext) {
+    mLoadContext->GetAppId(&appId);
+  }
+  return appId;
+}
 
 } // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/websocket/WebSocketChannelParent.h b/netwerk/protocol/websocket/WebSocketChannelParent.h
index e315d0d816d..b4e9e2fbd63 100644
--- a/netwerk/protocol/websocket/WebSocketChannelParent.h
+++ b/netwerk/protocol/websocket/WebSocketChannelParent.h
@@ -15,6 +15,7 @@
 #include "nsILoadContext.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
+#include "OfflineObserver.h"
 
 class nsIAuthPromptProvider;
 
@@ -23,10 +24,10 @@ namespace net {
 
 class WebSocketChannelParent : public PWebSocketParent,
                                public nsIWebSocketListener,
+                               public DisconnectableParent,
                                public nsIInterfaceRequestor
 {
-  ~WebSocketChannelParent() {}
-
+  ~WebSocketChannelParent();
  public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIWEBSOCKETLISTENER
@@ -54,6 +55,10 @@ class WebSocketChannelParent : public PWebSocketParent,
 
   void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 
+  void OfflineDisconnect() MOZ_OVERRIDE;
+  uint32_t GetAppId() MOZ_OVERRIDE;
+  nsRefPtr<OfflineObserver> mObserver;
+
   nsCOMPtr<nsIAuthPromptProvider> mAuthProvider;
   nsCOMPtr<nsIWebSocketChannel> mChannel;
   nsCOMPtr<nsILoadContext> mLoadContext;
diff --git a/netwerk/test/TestBind.cpp b/netwerk/test/TestBind.cpp
new file mode 100644
index 00000000000..1bd9e42efc2
--- /dev/null
+++ b/netwerk/test/TestBind.cpp
@@ -0,0 +1,214 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "TestCommon.h"
+#include "TestHarness.h"
+#include "nsISocketTransportService.h"
+#include "nsISocketTransport.h"
+#include "nsIServerSocket.h"
+#include "nsIAsyncInputStream.h"
+#include "nsINetAddr.h"
+#include "mozilla/net/DNS.h"
+#include "prerror.h"
+
+using namespace mozilla::net;
+using namespace mozilla;
+
+class ServerListener: public nsIServerSocketListener
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISERVERSOCKETLISTENER
+
+  ServerListener();
+
+  // Port that is got from server side will be store here.
+  uint32_t mClientPort;
+  bool mFailed;
+private:
+  virtual ~ServerListener();
+};
+
+NS_IMPL_ISUPPORTS(ServerListener, nsIServerSocketListener)
+
+ServerListener::ServerListener()
+  : mClientPort(-1)
+  , mFailed(false)
+{
+}
+
+ServerListener::~ServerListener()
+{
+}
+
+NS_IMETHODIMP
+ServerListener::OnSocketAccepted(nsIServerSocket *aServ,
+                                 nsISocketTransport *aTransport)
+{
+  // Run on STS thread.
+  NetAddr peerAddr;
+  nsresult rv = aTransport->GetPeerAddr(&peerAddr);
+  if (NS_FAILED(rv)) {
+    mFailed = true;
+    fail("Server: not able to get peer address.");
+    QuitPumpingEvents();
+    return NS_OK;
+  }
+  mClientPort = PR_ntohs(peerAddr.inet.port);
+  passed("Server: received connection");
+  QuitPumpingEvents();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ServerListener::OnStopListening(nsIServerSocket *aServ,
+                                nsresult aStatus)
+{
+  return NS_OK;
+}
+
+class ClientInputCallback : public nsIInputStreamCallback
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIINPUTSTREAMCALLBACK
+
+  ClientInputCallback();
+
+  bool mFailed;
+private:
+  virtual ~ClientInputCallback();
+};
+
+NS_IMPL_ISUPPORTS(ClientInputCallback, nsIInputStreamCallback)
+
+ClientInputCallback::ClientInputCallback()
+  : mFailed(false)
+{
+}
+
+ClientInputCallback::~ClientInputCallback()
+{
+}
+
+NS_IMETHODIMP
+ClientInputCallback::OnInputStreamReady(nsIAsyncInputStream *aStream)
+{
+  // Server doesn't send. That means if we are here, we probably have run into
+  // an error.
+  uint64_t avail;
+  nsresult rv = aStream->Available(&avail);
+  if (NS_FAILED(rv)) {
+    mFailed = true;
+  }
+  QuitPumpingEvents();
+  return NS_OK;
+}
+
+int
+main(int32_t argc, char *argv[])
+{
+  ScopedXPCOM xpcom("SocketTransport");
+  if (xpcom.failed()) {
+    fail("Unable to initalize XPCOM.");
+    return -1;
+  }
+
+  //
+  // Server side.
+  //
+  nsCOMPtr<nsIServerSocket> server = do_CreateInstance("@mozilla.org/network/server-socket;1");
+  if (!server) {
+    fail("Failed to create server socket.");
+    return -1;
+  }
+
+  nsresult rv = server->Init(-1, true, -1);
+  if (NS_FAILED(rv)) {
+    fail("Failed to initialize server.");
+    return -1;
+  }
+
+  int32_t serverPort;
+  rv = server->GetPort(&serverPort);
+  if (NS_FAILED(rv)) {
+    fail("Unable to get server port.");
+    return -1;
+  }
+
+  // Listening.
+  nsRefPtr<ServerListener> serverListener = new ServerListener();
+  rv = server->AsyncListen(serverListener);
+  if (NS_FAILED(rv)) {
+    fail("Server fail to start listening.");
+    return -1;
+  }
+
+  //
+  // Client side
+  //
+  uint32_t bindingPort = 20000;
+  nsCOMPtr<nsISocketTransportService> sts =
+    do_GetService("@mozilla.org/network/socket-transport-service;1", &rv);
+  if (NS_FAILED(rv)) {
+    fail("Unable to get socket transport service.");
+    return -1;
+  }
+
+  for (int32_t tried = 0; tried < 100; tried++) {
+    nsCOMPtr<nsISocketTransport> client;
+    rv = sts->CreateTransport(nullptr, 0, NS_LITERAL_CSTRING("127.0.0.1"),
+                              serverPort, nullptr, getter_AddRefs(client));
+    if (NS_FAILED(rv)) {
+      fail("Unable to create transport.");
+      return -1;
+    }
+
+    // Bind to a port. It's possible that we are binding to a port that is
+    // currently in use. If we failed to bind, we try next port.
+    NetAddr bindingAddr;
+    bindingAddr.inet.family = AF_INET;
+    bindingAddr.inet.ip = 0;
+    bindingAddr.inet.port = PR_htons(bindingPort);
+    rv = client->Bind(&bindingAddr);
+    if (NS_FAILED(rv)) {
+      fail("Unable to bind a port.");
+      return -1;
+    }
+
+    // Open IO streams, to make client SocketTransport connect to server.
+    nsRefPtr<ClientInputCallback> clientCallback = new ClientInputCallback();
+    nsCOMPtr<nsIInputStream> inputStream;
+    rv = client->OpenInputStream(nsITransport::OPEN_UNBUFFERED,
+                                 0, 0, getter_AddRefs(inputStream));
+    if (NS_FAILED(rv)) {
+      fail("Failed to open an input stream.");
+      return -1;
+    }
+    nsCOMPtr<nsIAsyncInputStream> asyncInputStream = do_QueryInterface(inputStream);
+    rv = asyncInputStream->AsyncWait(clientCallback, 0, 0, nullptr);
+
+    // Wait for server's response or callback of input stream.
+    PumpEvents();
+    if (clientCallback->mFailed) {
+      // if client received error, we likely have bound a port that is in use.
+      // we can try another port.
+      bindingPort++;
+    } else {
+      // We are unlocked by server side, leave the loop and check result.
+      break;
+    }
+  }
+
+  if (serverListener->mFailed) {
+    fail("Server failure.");
+    return -1;
+  }
+  if (serverListener->mClientPort != bindingPort) {
+    fail("Port that server got doesn't match what we are expecting.");
+    return -1;
+  }
+  passed("Port matched");
+  return 0;
+}
diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build
index 75e4ced440d..9d95514b369 100644
--- a/netwerk/test/moz.build
+++ b/netwerk/test/moz.build
@@ -47,6 +47,7 @@ SimplePrograms([
 #]
 
 CppUnitTests([
+    'TestBind',
     'TestCookie',
     'TestSTSParser',
     'TestUDPSocket',
diff --git a/netwerk/test/unit_ipc/child_app_offline.js b/netwerk/test/unit_ipc/child_app_offline.js
new file mode 100644
index 00000000000..6193774000d
--- /dev/null
+++ b/netwerk/test/unit_ipc/child_app_offline.js
@@ -0,0 +1,55 @@
+
+function inChildProcess() {
+  return Cc["@mozilla.org/xre/app-info;1"]
+           .getService(Ci.nsIXULRuntime)
+           .processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
+}
+
+function makeChan(url, appId, inBrowser) {
+  var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+  var chan = ios.newChannel(url, null, null).QueryInterface(Ci.nsIHttpChannel);
+  chan.notificationCallbacks = {
+    appId: appId,
+    isInBrowserElement: inBrowser,
+    QueryInterface: function(iid) {
+      if (iid.equals(Ci.nsILoadContext))
+        return this;
+      throw Cr.NS_ERROR_NO_INTERFACE;
+    },
+    getInterface: function(iid) { return this.QueryInterface(iid); }
+  };
+  return chan;
+}
+
+// Simple online load
+function run_test() {
+  do_test_pending();
+  var chan = makeChan("http://localhost:12345/first", 14, false);
+  chan.asyncOpen(new ChannelListener(checkResponse, "response0"), null);
+}
+
+// Should return cached result
+function test1() {
+  do_test_pending();
+  var chan = makeChan("http://localhost:12345/first", 14, false);
+  chan.asyncOpen(new ChannelListener(checkResponse, "response0"), null);
+}
+
+// This request should fail
+function test2() {
+  do_test_pending();
+  var chan = makeChan("http://localhost:12345/second", 14, false);
+  chan.asyncOpen(new ChannelListener(checkResponse, "", CL_EXPECT_FAILURE), null);
+}
+
+// This request should succeed
+function test3() {
+  do_test_pending();
+  var chan = makeChan("http://localhost:12345/second", 14, false);
+  chan.asyncOpen(new ChannelListener(checkResponse, "response3"), null);
+}
+
+function checkResponse(req, buffer, expected) {
+  do_check_eq(buffer, expected);
+  do_test_finished();
+}
diff --git a/netwerk/test/unit_ipc/test_app_offline_http.js b/netwerk/test/unit_ipc/test_app_offline_http.js
new file mode 100644
index 00000000000..81544728565
--- /dev/null
+++ b/netwerk/test/unit_ipc/test_app_offline_http.js
@@ -0,0 +1,74 @@
+
+Cu.import("resource://testing-common/httpd.js");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+var test_index = 0;
+
+var responses = [
+  "response0", // This should be the first returned value
+  "response1", // This response should not be recevied. Load response0 from cache
+  "response2", // This request should fail
+  "response3", // This request should succeed
+  ];
+
+function http_handler(metadata, response) {
+  response.setHeader("Content-Type", "text/plain", false);
+  response.setHeader("Cache-Control", "no-cache", false);
+  response.setStatusLine(metadata.httpVersion, 200, "OK");
+  var body = responses[test_index];
+  response.bodyOutputStream.write(body, body.length);
+}
+
+
+function set_app_offline(appId, offline) {
+  let ioservice = Cc['@mozilla.org/network/io-service;1'].
+    getService(Ci.nsIIOService);
+
+  ioservice.setAppOffline(appId, offline);
+}
+
+var httpserv;
+
+function setup() {
+  httpserv = new HttpServer();
+  httpserv.registerPathHandler("/first", http_handler);
+  httpserv.registerPathHandler("/second", http_handler);
+  httpserv.start(12345);
+}
+
+function run_test() {
+  setup();
+  test0();
+}
+
+// Test that app 14 can open channel
+function test0() {
+  test_index = 0;
+  run_test_in_child("child_app_offline.js", test1);
+}
+
+// Set app 14 offline and check that it still gets a cached response
+function test1() {
+  test_index = 1;
+  set_app_offline(14, Ci.nsIAppOfflineInfo.OFFLINE);
+  sendCommand('test1();\n', test2);
+}
+
+// Check that app 14 can't open a channel to a new location
+function test2() {
+  test_index = 2;
+  sendCommand('test2();\n', test3);
+}
+
+
+// Set app online and check that it now works
+function test3() {
+  test_index = 3;
+  set_app_offline(14, Ci.nsIAppOfflineInfo.ONLINE);
+  sendCommand('test3();\n', ending);
+}
+
+function ending(val) {
+  do_test_finished();
+}
diff --git a/netwerk/test/unit_ipc/xpcshell.ini b/netwerk/test/unit_ipc/xpcshell.ini
index 90d8dcccb06..61113a33805 100644
--- a/netwerk/test/unit_ipc/xpcshell.ini
+++ b/netwerk/test/unit_ipc/xpcshell.ini
@@ -2,6 +2,7 @@
 head = head_channels_clone.js head_cc.js
 tail =
 support-files = disabled_test_bug528292_wrap.js
+	child_app_offline.js
 
 [test_bug248970_cookie_wrap.js]
 [test_cacheflags_wrap.js]
@@ -35,3 +36,4 @@ skip-if = true
 [test_XHR_redirects.js]
 [test_redirect_history_wrap.js]
 [test_reply_without_content_type_wrap.js]
+[test_app_offline_http.js]
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 05a4f8681ea..2fda0e839d5 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -750,32 +750,27 @@ class TreeMetadataEmitter(LoggingMixin):
         # Keys are variable prefixes and values are tuples describing how these
         # manifests should be handled:
         #
-        #    (flavor, install_prefix, active, package_tests)
+        #    (flavor, install_prefix, package_tests)
         #
         # flavor identifies the flavor of this test.
         # install_prefix is the path prefix of where to install the files in
         #     the tests directory.
-        # active indicates whether to filter out inactive tests from the
-        #     manifest.
         # package_tests indicates whether to package test files into the test
         #     package; suites that compile the test files should not install
         #     them into the test package.
         #
-        # We ideally don't filter out inactive tests. However, not every test
-        # harness can yet deal with test filtering. Once all harnesses can do
-        # this, this feature can be dropped.
         test_manifests = dict(
-            A11Y=('a11y', 'testing/mochitest', 'a11y', True, True),
-            BROWSER_CHROME=('browser-chrome', 'testing/mochitest', 'browser', True, True),
-            ANDROID_INSTRUMENTATION=('instrumentation', 'instrumentation', '.', False, False),
-            JETPACK_PACKAGE=('jetpack-package', 'testing/mochitest', 'jetpack-package', True, True),
-            JETPACK_ADDON=('jetpack-addon', 'testing/mochitest', 'jetpack-addon', True, False),
-            METRO_CHROME=('metro-chrome', 'testing/mochitest', 'metro', True, True),
-            MOCHITEST=('mochitest', 'testing/mochitest', 'tests', True, True),
-            MOCHITEST_CHROME=('chrome', 'testing/mochitest', 'chrome', True, True),
-            MOCHITEST_WEBAPPRT_CHROME=('webapprt-chrome', 'testing/mochitest', 'webapprtChrome', True, True),
-            WEBRTC_SIGNALLING_TEST=('steeplechase', 'steeplechase', '.', True, True),
-            XPCSHELL_TESTS=('xpcshell', 'xpcshell', '.', False, True),
+            A11Y=('a11y', 'testing/mochitest', 'a11y', True),
+            BROWSER_CHROME=('browser-chrome', 'testing/mochitest', 'browser', True),
+            ANDROID_INSTRUMENTATION=('instrumentation', 'instrumentation', '.', False),
+            JETPACK_PACKAGE=('jetpack-package', 'testing/mochitest', 'jetpack-package', True),
+            JETPACK_ADDON=('jetpack-addon', 'testing/mochitest', 'jetpack-addon', False),
+            METRO_CHROME=('metro-chrome', 'testing/mochitest', 'metro', True),
+            MOCHITEST=('mochitest', 'testing/mochitest', 'tests', True),
+            MOCHITEST_CHROME=('chrome', 'testing/mochitest', 'chrome', True),
+            MOCHITEST_WEBAPPRT_CHROME=('webapprt-chrome', 'testing/mochitest', 'webapprtChrome', True),
+            WEBRTC_SIGNALLING_TEST=('steeplechase', 'steeplechase', '.', True),
+            XPCSHELL_TESTS=('xpcshell', 'xpcshell', '.', True),
         )
 
         for prefix, info in test_manifests.items():
@@ -827,7 +822,7 @@ class TreeMetadataEmitter(LoggingMixin):
         return sub
 
     def _process_test_manifest(self, context, info, manifest_path):
-        flavor, install_root, install_subdir, filter_inactive, package_tests = info
+        flavor, install_root, install_subdir, package_tests = info
 
         manifest_path = mozpath.normpath(manifest_path)
         path = mozpath.normpath(mozpath.join(context.srcdir, manifest_path))
@@ -850,12 +845,6 @@ class TreeMetadataEmitter(LoggingMixin):
 
             filtered = m.tests
 
-            if filter_inactive:
-                # We return tests that don't exist because we want manifests
-                # defining tests that don't exist to result in error.
-                filtered = m.active_tests(exists=False, disabled=True,
-                    **self.info)
-
             # Jetpack add-on tests are expected to be generated during the
             # build process so they won't exist here.
             if flavor != 'jetpack-addon':
diff --git a/security/pkix/test/gtest/pkixbuild_tests.cpp b/security/pkix/test/gtest/pkixbuild_tests.cpp
index a7ac7dd4e49..d8390fbc5a1 100644
--- a/security/pkix/test/gtest/pkixbuild_tests.cpp
+++ b/security/pkix/test/gtest/pkixbuild_tests.cpp
@@ -309,7 +309,7 @@ TEST_F(pkixbuild, BeyondMaxAcceptableCertChainLength)
 class ExpiredCertTrustDomain : public TrustDomain
 {
 public:
-  ExpiredCertTrustDomain(ByteString rootDER)
+  explicit ExpiredCertTrustDomain(ByteString rootDER)
     : rootDER(rootDER)
   {
   }
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 1c04982dfb6..79dcc0cb2b2 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -667,10 +667,6 @@ class MochitestUtilsMixin(object):
         continue
       paths.append(test)
 
-    # suite_start message
-    flat_paths = [p['path'] for p in paths]
-    self.message_logger.logger.suite_start(flat_paths)
-
     # Bug 883865 - add this functionality into manifestparser
     with open(os.path.join(SCRIPT_DIR, 'tests.json'), 'w') as manifestFile:
       manifestFile.write(json.dumps({'tests': paths}))
@@ -1621,15 +1617,25 @@ class Mochitest(MochitestUtilsMixin):
 
     return paths
 
+  def logPreamble(self, tests):
+    """Logs a suite_start message and test_start/test_end at the beginning of a run.
+    """
+    self.log.suite_start([t['path'] for t in tests])
+    for test in tests:
+      if 'disabled' in test:
+        self.log.test_start(test['path'])
+        self.log.test_end(test['path'], 'SKIP', message=test['disabled'])
+
   def getTestsToRun(self, options):
     """
       This method makes a list of tests that are to be run. Required mainly for --bisect-chunk.
     """
     tests = self.getActiveTests(options)
+    self.logPreamble(tests)
+
     testsToRun = []
     for test in tests:
       if test.has_key('disabled'):
-        self.log.info('TEST-SKIPPED | %s | %s' % (test['path'], test['disabled']))
         continue
       testsToRun.append(test['path'])
 
diff --git a/testing/mochitest/runtestsb2g.py b/testing/mochitest/runtestsb2g.py
index e4f6a8d5e5a..59e1c90474b 100644
--- a/testing/mochitest/runtestsb2g.py
+++ b/testing/mochitest/runtestsb2g.py
@@ -113,6 +113,7 @@ class B2GMochitest(MochitestUtilsMixin):
         """ Prepare, configure, run tests and cleanup """
 
         manifest = self.build_profile(options)
+        self.logPreamble(self.getActiveTests(options))
 
         # configuring the message logger's buffering
         self.message_logger.buffering = options.quiet
diff --git a/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html b/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html
index 76e32d9d774..e3643d39589 100644
--- a/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html
+++ b/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html
@@ -128,7 +128,7 @@ function starttest() {
 
       check = false;
       window.addEventListener("text", function() { check = true; }, false);
-      synthesizeText(
+      synthesizeCompositionChange(
         { "composition":
           { "string": "a",
             "clauses":
@@ -139,9 +139,9 @@ function starttest() {
           "caret": { "start": 1, "length": 0 }
         }
       );
-      is(check, true, "synthesizeText should dispatch text event");
+      is(check, true, "synthesizeCompositionChange should cause dispatching a DOM text event");
 
-      synthesizeText(
+      synthesizeCompositionChange(
         { "composition":
           { "string": "a",
             "clauses":
diff --git a/testing/mochitest/tests/SimpleTest/EventUtils.js b/testing/mochitest/tests/SimpleTest/EventUtils.js
index 6412cd6d10a..4028bbae2fc 100644
--- a/testing/mochitest/tests/SimpleTest/EventUtils.js
+++ b/testing/mochitest/tests/SimpleTest/EventUtils.js
@@ -889,13 +889,14 @@ function synthesizeComposition(aEvent, aWindow)
                              aEvent.locale ? aEvent.locale : "");
 }
 /**
- * Synthesize a text event.
+ * Synthesize a compositionchange event which causes a DOM text event and
+ * compositionupdate event if it's necessary.
  *
- * @param aEvent   The text event's information, this has |composition|
- *                 and |caret| members.  |composition| has |string| and
- *                 |clauses| members.  |clauses| must be array object.  Each
- *                 object has |length| and |attr|.  And |caret| has |start| and
- *                 |length|.  See the following tree image.
+ * @param aEvent   The compositionchange event's information, this has
+ *                 |composition| and |caret| members.  |composition| has
+ *                 |string| and |clauses| members.  |clauses| must be array
+ *                 object.  Each object has |length| and |attr|.  And |caret|
+ *                 has |start| and |length|.  See the following tree image.
  *
  *                 aEvent
  *                   +-- composition
@@ -928,7 +929,7 @@ function synthesizeComposition(aEvent, aWindow)
  *
  * @param aWindow  Optional (If null, current |window| will be used)
  */
-function synthesizeText(aEvent, aWindow)
+function synthesizeCompositionChange(aEvent, aWindow)
 {
   var utils = _getDOMWindowUtils(aWindow);
   if (!utils) {
diff --git a/testing/mozbase/manifestparser/setup.py b/testing/mozbase/manifestparser/setup.py
index e22e564588d..574d5a5b7a7 100644
--- a/testing/mozbase/manifestparser/setup.py
+++ b/testing/mozbase/manifestparser/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup
 
 PACKAGE_NAME = "manifestparser"
-PACKAGE_VERSION = '0.6'
+PACKAGE_VERSION = '0.7'
 
 setup(name=PACKAGE_NAME,
       version=PACKAGE_VERSION,
diff --git a/toolkit/content/tests/chrome/file_autocomplete_with_composition.js b/toolkit/content/tests/chrome/file_autocomplete_with_composition.js
index d8e67ebe719..f91b4aae4c1 100644
--- a/toolkit/content/tests/chrome/file_autocomplete_with_composition.js
+++ b/toolkit/content/tests/chrome/file_autocomplete_with_composition.js
@@ -88,7 +88,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
       execute: function (aWindow) {
         synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeComposition({ type: "compositionstart" }, aWindow);
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "M",
               "clauses":
@@ -103,7 +103,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "Mo",
               "clauses":
@@ -118,7 +118,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "compositionend should open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "Mo",
               "clauses":
@@ -139,7 +139,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
       execute: function (aWindow) {
         synthesizeKey("z", { type: "keydown" }, aWindow);
         synthesizeComposition({ type: "compositionstart" }, aWindow);
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "z",
               "clauses":
@@ -154,7 +154,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string shouldn't reopen the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "zi",
               "clauses":
@@ -169,7 +169,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "compositionend should research the result and open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "zi",
               "clauses":
@@ -189,7 +189,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
       execute: function (aWindow) {
         synthesizeKey("l", { type: "keydown" }, aWindow);
         synthesizeComposition({ type: "compositionstart" }, aWindow);
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "l",
               "clauses":
@@ -204,7 +204,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string shouldn't reopen the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "ll",
               "clauses":
@@ -219,7 +219,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string to empty string shouldn't reopen the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -234,7 +234,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "cancled compositionend should reopen the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -257,7 +257,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
         synthesizeKey("VK_LEFT", { shiftKey: true }, aWindow);
         synthesizeKey("z", { type: "keydown" }, aWindow);
         synthesizeComposition({ type: "compositionstart" }, aWindow);
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "z",
               "clauses":
@@ -272,7 +272,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string shouldn't reopen the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "zi",
               "clauses":
@@ -287,7 +287,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string to empty string shouldn't reopen the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -302,7 +302,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "canceled compositionend should seach the result with the latest value",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -330,7 +330,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
       execute: function (aWindow) {
         synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeComposition({ type: "compositionstart" }, aWindow);
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "M",
               "clauses":
@@ -345,7 +345,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "Mo",
               "clauses":
@@ -360,7 +360,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string to empty string shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -375,7 +375,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "canceled compositionend shouldn't open the popup if it was closed",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -403,7 +403,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
       execute: function (aWindow) {
         synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeComposition({ type: "compositionstart" }, aWindow);
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "M",
               "clauses":
@@ -418,7 +418,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "Mo",
               "clauses":
@@ -433,7 +433,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string to empty string shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -448,7 +448,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "canceled compositionend should open the popup if it was opened",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -479,7 +479,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
       execute: function (aWindow) {
         synthesizeKey("z", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeComposition({ type: "compositionstart" }, aWindow);
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "z",
               "clauses":
@@ -494,7 +494,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "zi",
               "clauses":
@@ -509,7 +509,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string to empty string shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -524,7 +524,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "canceled compositionend shouldn't open the popup if the popup was closed",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "",
               "clauses":
@@ -552,7 +552,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
       execute: function (aWindow) {
         synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeComposition({ type: "compositionstart" }, aWindow);
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "M",
               "clauses":
@@ -567,7 +567,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "modifying composition string shouldn't open the popup (completeDefaultIndex is true)",
       completeDefaultIndex: true,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "Mo",
               "clauses":
@@ -582,7 +582,7 @@ nsDoTestsForAutoCompleteWithComposition.prototype = {
     { description: "compositionend should open the popup (completeDefaultIndex is true)",
       completeDefaultIndex: true,
       execute: function (aWindow) {
-        synthesizeText(
+        synthesizeCompositionChange(
           { "composition":
             { "string": "Mo",
               "clauses":
diff --git a/toolkit/content/tests/chrome/findbar_window.xul b/toolkit/content/tests/chrome/findbar_window.xul
index fb9d37dcb46..a144d0afacc 100644
--- a/toolkit/content/tests/chrome/findbar_window.xul
+++ b/toolkit/content/tests/chrome/findbar_window.xul
@@ -245,7 +245,7 @@
       var searchStr = "text";
 
       synthesizeComposition({ type: "compositionstart" });
-      synthesizeText(
+      synthesizeCompositionChange(
         { "composition":
           { "string": searchStr,
             "clauses":
@@ -259,7 +259,7 @@
       ok(gBrowser.contentWindow.getSelection().toString().toLowerCase() != searchStr,
          "testNormalFindWithComposition: text shouldn't be found during composition");
 
-      synthesizeText(
+      synthesizeCompositionChange(
         { "composition":
           { "string": searchStr,
             "clauses":
diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index 480f4741925..780720c3612 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -5026,7 +5026,7 @@ ThreadSources.prototype = {
    * of an array of source actors for those.
    */
   sourcesForScript: function (aScript) {
-    if (!this._useSourceMaps || !aScript.sourceMapURL) {
+    if (!this._useSourceMaps || !aScript.source.sourceMapURL) {
       return resolve([this._sourceForScript(aScript)].filter(isNotNull));
     }
 
@@ -5053,8 +5053,8 @@ ThreadSources.prototype = {
    * |aScript| must have a non-null sourceMapURL.
    */
   sourceMap: function (aScript) {
-    dbg_assert(aScript.sourceMapURL, "Script should have a sourceMapURL");
-    let sourceMapURL = this._normalize(aScript.sourceMapURL, aScript.url);
+    dbg_assert(aScript.source.sourceMapURL, "Script should have a sourceMapURL");
+    let sourceMapURL = this._normalize(aScript.source.sourceMapURL, aScript.url);
     let map = this._fetchSourceMap(sourceMapURL, aScript.url)
       .then(aSourceMap => this.saveSourceMap(aSourceMap, aScript.url));
     this._sourceMapsByGeneratedSource[aScript.url] = map;
diff --git a/widget/BasicEvents.h b/widget/BasicEvents.h
index 873882bccda..c380d87b288 100644
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -172,11 +172,16 @@
 #define NS_COMPOSITION_EVENT_START    2200
 #define NS_COMPOSITION_START          (NS_COMPOSITION_EVENT_START)
 #define NS_COMPOSITION_END            (NS_COMPOSITION_EVENT_START + 1)
+// NS_COMPOSITION_UPDATE is the message for DOM compositionupdate event.
+// This event should NOT be dispatched from widget since it will be dispatched
+// by mozilla::TextComposition automatically if NS_COMPOSITION_CHANGE event
+// will change composition string.
 #define NS_COMPOSITION_UPDATE         (NS_COMPOSITION_EVENT_START + 2)
-
-// text events
-#define NS_TEXT_START                 2400
-#define NS_TEXT_TEXT                  (NS_TEXT_START)
+// NS_COMPOSITION_CHANGE is the message for representing a change of
+// composition string.  This should be dispatched from widget even if
+// composition string isn't changed but the ranges are changed.  This causes
+// a DOM "text" event which is a non-standard DOM event.
+#define NS_COMPOSITION_CHANGE         (NS_COMPOSITION_EVENT_START + 3)
 
 // UI events
 #define NS_UI_EVENT_START          2500
diff --git a/widget/EventClassList.h b/widget/EventClassList.h
index 3ed982479f9..e6a160fab86 100644
--- a/widget/EventClassList.h
+++ b/widget/EventClassList.h
@@ -22,7 +22,6 @@ NS_EVENT_CLASS(Internal, UIEvent)
 
 // TextEvents.h
 NS_EVENT_CLASS(Widget, KeyboardEvent)
-NS_EVENT_CLASS(Widget, TextEvent)
 NS_EVENT_CLASS(Widget, CompositionEvent)
 NS_EVENT_CLASS(Widget, QueryContentEvent)
 NS_EVENT_CLASS(Widget, SelectionEvent)
diff --git a/widget/TextEvents.h b/widget/TextEvents.h
index 3bf14367e87..9d5bdc06238 100644
--- a/widget/TextEvents.h
+++ b/widget/TextEvents.h
@@ -194,88 +194,6 @@ public:
   }
 };
 
-/******************************************************************************
- * mozilla::WidgetTextEvent
- *
- * XXX WidgetTextEvent is fired with compositionupdate event almost every time.
- *     This wastes performance and the cost of mantaining each platform's
- *     implementation.  Therefore, we should merge WidgetTextEvent and
- *     WidgetCompositionEvent.  Then, DOM compositionupdate should be fired
- *     from TextComposition automatically.
- ******************************************************************************/
-
-class WidgetTextEvent : public WidgetGUIEvent
-{
-private:
-  friend class dom::PBrowserParent;
-  friend class dom::PBrowserChild;
-  friend class plugins::PPluginInstanceChild;
-
-  WidgetTextEvent()
-    : mSeqno(kLatestSeqno)
-    , isChar(false)
-  {
-  }
-
-public:
-  uint32_t mSeqno;
-
-public:
-  virtual WidgetTextEvent* AsTextEvent() MOZ_OVERRIDE { return this; }
-
-  WidgetTextEvent(bool aIsTrusted, uint32_t aMessage, nsIWidget* aWidget)
-    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eTextEventClass)
-    , mSeqno(kLatestSeqno)
-    , isChar(false)
-  {
-  }
-
-  virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
-  {
-    MOZ_ASSERT(mClass == eTextEventClass,
-               "Duplicate() must be overridden by sub class");
-    // Not copying widget, it is a weak reference.
-    WidgetTextEvent* result = new WidgetTextEvent(false, message, nullptr);
-    result->AssignTextEventData(*this, true);
-    result->mFlags = mFlags;
-    return result;
-  }
-
-  // The composition string or the commit string.
-  nsString theText;
-  // Indicates whether the event signifies printable text.
-  // XXX This is not a standard, and most platforms don't set this properly.
-  //     So, perhaps, we can get rid of this.
-  bool isChar;
-
-  nsRefPtr<TextRangeArray> mRanges;
-
-  void AssignTextEventData(const WidgetTextEvent& aEvent, bool aCopyTargets)
-  {
-    AssignGUIEventData(aEvent, aCopyTargets);
-
-    isChar = aEvent.isChar;
-
-    // Currently, we don't need to copy the other members because they are
-    // for internal use only (not available from JS).
-  }
-
-  bool IsComposing() const
-  {
-    return mRanges && mRanges->IsComposing();
-  }
-
-  uint32_t TargetClauseOffset() const
-  {
-    return mRanges ? mRanges->TargetClauseOffset() : 0;
-  }
-
-  uint32_t RangeCount() const
-  {
-    return mRanges ? mRanges->Length() : 0;
-  }
-};
-
 /******************************************************************************
  * mozilla::WidgetCompositionEvent
  ******************************************************************************/
@@ -326,14 +244,34 @@ public:
   // The composition string or the commit string.  If the instance is a
   // compositionstart event, this is initialized with selected text by
   // TextComposition automatically.
-  nsString data;
+  nsString mData;
+
+  nsRefPtr<TextRangeArray> mRanges;
 
   void AssignCompositionEventData(const WidgetCompositionEvent& aEvent,
                                   bool aCopyTargets)
   {
     AssignGUIEventData(aEvent, aCopyTargets);
 
-    data = aEvent.data;
+    mData = aEvent.mData;
+
+    // Currently, we don't need to copy the other members because they are
+    // for internal use only (not available from JS).
+  }
+
+  bool IsComposing() const
+  {
+    return mRanges && mRanges->IsComposing();
+  }
+
+  uint32_t TargetClauseOffset() const
+  {
+    return mRanges ? mRanges->TargetClauseOffset() : 0;
+  }
+
+  uint32_t RangeCount() const
+  {
+    return mRanges ? mRanges->Length() : 0;
   }
 };
 
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 7be17db0152..cb9443e4880 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -683,9 +683,9 @@ nsWindow::DispatchEvent(WidgetGUIEvent* aEvent)
             mIMEComposingStart = -1;
             mIMEComposingText.Truncate();
             break;
-        case NS_TEXT_TEXT:
+        case NS_COMPOSITION_CHANGE:
             MOZ_ASSERT(mIMEComposing);
-            mIMEComposingText = aEvent->AsTextEvent()->theText;
+            mIMEComposingText = aEvent->AsCompositionEvent()->mData;
             break;
         }
         return status;
@@ -1707,14 +1707,15 @@ nsWindow::RemoveIMEComposition()
     AutoIMEMask selMask(mIMEMaskSelectionUpdate);
     AutoIMEMask textMask(mIMEMaskTextUpdate);
 
-    WidgetTextEvent textEvent(true, NS_TEXT_TEXT, this);
-    InitEvent(textEvent, nullptr);
-    textEvent.theText = mIMEComposingText;
-    DispatchEvent(&textEvent);
+    WidgetCompositionEvent compositionChangeEvent(true, NS_COMPOSITION_CHANGE,
+                                                  this);
+    InitEvent(compositionChangeEvent, nullptr);
+    compositionChangeEvent.mData = mIMEComposingText;
+    DispatchEvent(&compositionChangeEvent);
 
-    WidgetCompositionEvent event(true, NS_COMPOSITION_END, this);
-    InitEvent(event, nullptr);
-    DispatchEvent(&event);
+    WidgetCompositionEvent compEndEvent(true, NS_COMPOSITION_END, this);
+    InitEvent(compEndEvent, nullptr);
+    DispatchEvent(&compEndEvent);
 }
 
 void
@@ -1845,16 +1846,16 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
             }
 
             {
-                WidgetTextEvent event(true, NS_TEXT_TEXT, this);
+                WidgetCompositionEvent event(true, NS_COMPOSITION_CHANGE, this);
                 InitEvent(event, nullptr);
-                event.theText = ae->Characters();
+                event.mData = ae->Characters();
 
                 if (ae->Action() == AndroidGeckoEvent::IME_COMPOSE_TEXT) {
                     // Because we're leaving the composition open, we need to
                     // include proper text ranges to make the editor happy.
                     TextRange range;
                     range.mStartOffset = 0;
-                    range.mEndOffset = event.theText.Length();
+                    range.mEndOffset = event.mData.Length();
                     range.mRangeType = NS_TEXTRANGE_RAWINPUT;
                     event.mRanges = new TextRangeArray();
                     event.mRanges->AppendElement(range);
@@ -1868,7 +1869,7 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
             {
                 WidgetCompositionEvent event(true, NS_COMPOSITION_END, this);
                 InitEvent(event, nullptr);
-                event.data = ae->Characters();
+                event.mData = ae->Characters();
                 DispatchEvent(&event);
             }
 
@@ -1955,7 +1956,7 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
             AutoIMEMask selMask(mIMEMaskSelectionUpdate);
             AutoIMEMask textMask(mIMEMaskTextUpdate);
 
-            WidgetTextEvent event(true, NS_TEXT_TEXT, this);
+            WidgetCompositionEvent event(true, NS_COMPOSITION_CHANGE, this);
             InitEvent(event, nullptr);
 
             event.mRanges = new TextRangeArray();
@@ -1986,7 +1987,7 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
                     InitEvent(queryEvent, nullptr);
                     DispatchEvent(&queryEvent);
                     MOZ_ASSERT(queryEvent.mSucceeded && !queryEvent.mWasAsync);
-                    event.theText = queryEvent.mReply.mString;
+                    event.mData = queryEvent.mReply.mString;
 
                     mIMEComposingStart = queryEvent.mReply.mOffset;
                 }
@@ -2001,14 +2002,14 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
             } else {
                 // If the new composition matches the existing composition,
                 // reuse the old composition.
-                event.theText = mIMEComposingText;
+                event.mData = mIMEComposingText;
             }
 
 #ifdef DEBUG_ANDROID_IME
-            const NS_ConvertUTF16toUTF8 theText8(event.theText);
-            const char* text = theText8.get();
+            const NS_ConvertUTF16toUTF8 data(event.mData);
+            const char* text = data.get();
             ALOGIME("IME: IME_SET_TEXT: text=\"%s\", length=%u, range=%u",
-                    text, event.theText.Length(), event.mRanges->Length());
+                    text, event.mData.Length(), event.mRanges->Length());
 #endif // DEBUG_ANDROID_IME
 
             DispatchEvent(&event);
@@ -2086,14 +2087,15 @@ nsWindow::NotifyIME(const IMENotification& aIMENotification)
             if (mIMEComposing) {
                 nsRefPtr<nsWindow> kungFuDeathGrip(this);
 
-                WidgetTextEvent textEvent(true, NS_TEXT_TEXT, this);
-                InitEvent(textEvent, nullptr);
-                DispatchEvent(&textEvent);
+                WidgetCompositionEvent compositionChangeEvent(
+                                         true, NS_COMPOSITION_CHANGE, this);
+                InitEvent(compositionChangeEvent, nullptr);
+                DispatchEvent(&compositionChangeEvent);
 
-                WidgetCompositionEvent compEvent(true, NS_COMPOSITION_END,
-                                                 this);
-                InitEvent(compEvent, nullptr);
-                DispatchEvent(&compEvent);
+                WidgetCompositionEvent compositionEndEvent(
+                                         true, NS_COMPOSITION_END, this);
+                InitEvent(compositionEndEvent, nullptr);
+                DispatchEvent(&compositionEndEvent);
             }
 
             mozilla::widget::android::GeckoAppShell::NotifyIME(REQUEST_TO_CANCEL_COMPOSITION);
diff --git a/widget/cocoa/TextInputHandler.h b/widget/cocoa/TextInputHandler.h
index 7cb6e4a4047..68eb2a83b1d 100644
--- a/widget/cocoa/TextInputHandler.h
+++ b/widget/cocoa/TextInputHandler.h
@@ -846,7 +846,8 @@ public:
   void OnSelectionChange() { mSelectedRange.location = NSNotFound; }
 
   /**
-   * DispatchTextEvent() dispatches a text event on mWidget.
+   * DispatchCompositionChangeEvent() dispatches a compositionchange event on
+   * mWidget.
    *
    * @param aText                 User text input.
    * @param aAttrString           An NSAttributedString instance which indicates
@@ -855,10 +856,10 @@ public:
    * @param aDoCommit             TRUE if the composition string should be
    *                              committed.  Otherwise, FALSE.
    */
-  bool DispatchTextEvent(const nsString& aText,
-                           NSAttributedString* aAttrString,
-                           NSRange& aSelectedRange,
-                           bool aDoCommit);
+  bool DispatchCompositionChangeEvent(const nsString& aText,
+                                      NSAttributedString* aAttrString,
+                                      NSRange& aSelectedRange,
+                                      bool aDoCommit);
 
   /**
    * SetMarkedText() is a handler of setMarkedText of NSTextInput.
diff --git a/widget/cocoa/TextInputHandler.mm b/widget/cocoa/TextInputHandler.mm
index bb7b295e2fa..54882c442e1 100644
--- a/widget/cocoa/TextInputHandler.mm
+++ b/widget/cocoa/TextInputHandler.mm
@@ -2140,7 +2140,7 @@ TextInputHandler::InsertText(NSAttributedString* aAttrString,
     NS_ENSURE_TRUE_VOID(SetSelection(*aReplacementRange));
   }
 
-  // Dispatch keypress event with char instead of textEvent
+  // Dispatch keypress event with char instead of compositionchange event
   WidgetKeyboardEvent keypressEvent(true, NS_KEY_PRESS, mWidget);
   keypressEvent.isChar = IsPrintableChar(str.CharAt(0));
 
@@ -2697,13 +2697,13 @@ IMEInputHandler::CreateTextRangeArray(NSAttributedString *aAttrString,
 }
 
 bool
-IMEInputHandler::DispatchTextEvent(const nsString& aText,
-                                   NSAttributedString* aAttrString,
-                                   NSRange& aSelectedRange,
-                                   bool aDoCommit)
+IMEInputHandler::DispatchCompositionChangeEvent(const nsString& aText,
+                                                NSAttributedString* aAttrString,
+                                                NSRange& aSelectedRange,
+                                                bool aDoCommit)
 {
   PR_LOG(gLog, PR_LOG_ALWAYS,
-    ("%p IMEInputHandler::DispatchTextEvent, "
+    ("%p IMEInputHandler::DispatchCompositionChangeEvent, "
      "aText=\"%s\", aAttrString=\"%s\", "
      "aSelectedRange={ location=%llu, length=%llu }, "
      "aDoCommit=%s, Destroyed()=%s",
@@ -2716,14 +2716,16 @@ IMEInputHandler::DispatchTextEvent(const nsString& aText,
 
   nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
 
-  WidgetTextEvent textEvent(true, NS_TEXT_TEXT, mWidget);
-  textEvent.time = PR_IntervalNow();
-  textEvent.theText = aText;
+  WidgetCompositionEvent compositionChangeEvent(true, NS_COMPOSITION_CHANGE,
+                                                mWidget);
+  compositionChangeEvent.time = PR_IntervalNow();
+  compositionChangeEvent.mData = aText;
   if (!aDoCommit) {
-    textEvent.mRanges = CreateTextRangeArray(aAttrString, aSelectedRange);
+    compositionChangeEvent.mRanges =
+      CreateTextRangeArray(aAttrString, aSelectedRange);
   }
-  mLastDispatchedCompositionString = textEvent.theText;
-  return DispatchEvent(textEvent);
+  mLastDispatchedCompositionString = compositionChangeEvent.mData;
+  return DispatchEvent(compositionChangeEvent);
 }
 
 void
@@ -2808,11 +2810,11 @@ IMEInputHandler::InsertTextAsCommittingComposition(
   }
 
   NSRange range = NSMakeRange(0, str.Length());
-  DispatchTextEvent(str, aAttrString, range, true);
+  DispatchCompositionChangeEvent(str, aAttrString, range, true);
   if (Destroyed()) {
     PR_LOG(gLog, PR_LOG_ALWAYS,
       ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
-       "destroyed by text event", this));
+       "destroyed by compositionchange event", this));
     return;
   }
 
@@ -2820,7 +2822,7 @@ IMEInputHandler::InsertTextAsCommittingComposition(
 
   WidgetCompositionEvent compEnd(true, NS_COMPOSITION_END, mWidget);
   InitCompositionEvent(compEnd);
-  compEnd.data = mLastDispatchedCompositionString;
+  compEnd.mData = mLastDispatchedCompositionString;
   DispatchEvent(compEnd);
   if (Destroyed()) {
     PR_LOG(gLog, PR_LOG_ALWAYS,
@@ -2918,18 +2920,18 @@ IMEInputHandler::SetMarkedText(NSAttributedString* aAttrString,
     OnUpdateIMEComposition([aAttrString string]);
 
     bool doCommit = str.IsEmpty();
-    DispatchTextEvent(str, aAttrString, aSelectedRange, doCommit);
+    DispatchCompositionChangeEvent(str, aAttrString, aSelectedRange, doCommit);
     if (Destroyed()) {
       PR_LOG(gLog, PR_LOG_ALWAYS,
         ("%p IMEInputHandler::SetMarkedText, "
-         "destroyed by text event", this));
+         "destroyed by compositionchange event", this));
       return;
     }
 
     if (doCommit) {
       WidgetCompositionEvent compEnd(true, NS_COMPOSITION_END, mWidget);
       InitCompositionEvent(compEnd);
-      compEnd.data = mLastDispatchedCompositionString;
+      compEnd.mData = mLastDispatchedCompositionString;
       DispatchEvent(compEnd);
       if (Destroyed()) {
         PR_LOG(gLog, PR_LOG_ALWAYS,
diff --git a/widget/cocoa/VibrancyManager.h b/widget/cocoa/VibrancyManager.h
index a940d8f111c..7a5547a6fdf 100644
--- a/widget/cocoa/VibrancyManager.h
+++ b/widget/cocoa/VibrancyManager.h
@@ -15,6 +15,7 @@
 
 #import <Foundation/NSGeometry.h>
 
+@class NSColor;
 @class NSView;
 class nsChildView;
 class nsIntRegion;
@@ -75,6 +76,14 @@ public:
    */
   void ClearVibrantAreas() const;
 
+  /**
+   * Return the fill color that should be drawn on top of the cleared window
+   * parts. Usually this would be drawn by -[NSVisualEffectView drawRect:].
+   * The returned color is opaque if the system-wide "Reduce transparency"
+   * preference is set.
+   */
+  NSColor* VibrancyFillColorForType(VibrancyType aType);
+
   /**
    * Check whether the operating system supports vibrancy at all.
    * You may only create a VibrancyManager instance if this returns true.
diff --git a/widget/cocoa/VibrancyManager.mm b/widget/cocoa/VibrancyManager.mm
index 97ea2d8c387..937848f00a7 100644
--- a/widget/cocoa/VibrancyManager.mm
+++ b/widget/cocoa/VibrancyManager.mm
@@ -83,6 +83,26 @@ VibrancyManager::ClearVibrantRegion(const VibrantRegion& aVibrantRegion) const
   }
 }
 
+@interface NSView(CurrentFillColor)
+- (NSColor*)_currentFillColor;
+@end
+
+NSColor*
+VibrancyManager::VibrancyFillColorForType(VibrancyType aType)
+{
+  const nsTArray<NSView*>& views =
+    mVibrantRegions.LookupOrAdd(uint32_t(aType))->effectViews;
+
+  if (!views.IsEmpty() &&
+      [views[0] respondsToSelector:@selector(_currentFillColor)]) {
+    // -[NSVisualEffectView _currentFillColor] is the color that our view
+    // would draw during its drawRect implementation, if we hadn't
+    // disabled that.
+    return [views[0] _currentFillColor];
+  }
+  return [NSColor whiteColor];
+}
+
 static void
 DrawRectNothing(id self, SEL _cmd, NSRect aRect)
 {
diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index bf57575f696..6c7bbf089ce 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -329,6 +329,8 @@ typedef NSInteger NSEventGestureAxis;
 
 - (BOOL)isCoveringTitlebar;
 
+- (NSColor*)vibrancyFillColorForWidgetType:(uint8_t)aWidgetType;
+
 // Simple gestures support
 //
 // XXX - The swipeWithEvent, beginGestureWithEvent, magnifyWithEvent,
@@ -573,6 +575,7 @@ public:
 
   void              NotifyDirtyRegion(const nsIntRegion& aDirtyRegion);
   void              ClearVibrantAreas();
+  NSColor*          VibrancyFillColorForWidgetType(uint8_t aWidgetType);
 
   // unit conversion convenience functions
   int32_t           CocoaPointsToDevPixels(CGFloat aPts) const {
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index fba9b1fb458..4d77b5cd1ae 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -2656,6 +2656,17 @@ nsChildView::ClearVibrantAreas()
   }
 }
 
+NSColor*
+nsChildView::VibrancyFillColorForWidgetType(uint8_t aWidgetType)
+{
+  if (VibrancyManager::SystemSupportsVibrancy()) {
+    return EnsureVibrancyManager().VibrancyFillColorForType(
+      aWidgetType == NS_THEME_MAC_VIBRANCY_LIGHT
+        ? VibrancyType::LIGHT : VibrancyType::DARK);
+  }
+  return [NSColor whiteColor];
+}
+
 mozilla::VibrancyManager&
 nsChildView::EnsureVibrancyManager()
 {
@@ -3639,6 +3650,14 @@ NSEvent* gLastDragMouseDownEvent = nil;
          [(BaseWindow*)[self window] drawsContentsIntoWindowFrame];
 }
 
+- (NSColor*)vibrancyFillColorForWidgetType:(uint8_t)aWidgetType
+{
+  if (!mGeckoChild) {
+    return [NSColor whiteColor];
+  }
+  return mGeckoChild->VibrancyFillColorForWidgetType(aWidgetType);
+}
+
 - (nsIntRegion)nativeDirtyRegionWithBoundingRect:(NSRect)aRect
 {
   nsIntRect boundingRect = mGeckoChild->CocoaPointsToDevPixels(aRect);
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 69e83ebc3d5..66ee8eb1693 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -2798,33 +2798,25 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
       
       CGContextFillRect(cgContext, macRect);
 
-      CGContextSetLineWidth(cgContext, 1.0);
-      CGContextSetShouldAntialias(cgContext, false);
-
-      // stroke everything but the top line of the text area
-      CGContextSetRGBStrokeColor(cgContext, 0.6, 0.6, 0.6, 1.0);
-      CGContextBeginPath(cgContext);
-      CGContextMoveToPoint(cgContext, macRect.origin.x, macRect.origin.y + 1);
-      CGContextAddLineToPoint(cgContext, macRect.origin.x, macRect.origin.y + macRect.size.height);
-      CGContextAddLineToPoint(cgContext, macRect.origin.x + macRect.size.width - 1, macRect.origin.y + macRect.size.height);
-      CGContextAddLineToPoint(cgContext, macRect.origin.x + macRect.size.width - 1, macRect.origin.y + 1);
-      CGContextStrokePath(cgContext);
-
-      // stroke the line across the top of the text area
-      CGContextSetRGBStrokeColor(cgContext, 0.4510, 0.4510, 0.4510, 1.0);
-      CGContextBeginPath(cgContext);
-      CGContextMoveToPoint(cgContext, macRect.origin.x, macRect.origin.y + 1);
-      CGContextAddLineToPoint(cgContext, macRect.origin.x + macRect.size.width - 1, macRect.origin.y + 1);
-      CGContextStrokePath(cgContext);
+      // #737373 for the top border, #999999 for the rest.
+      float x = macRect.origin.x, y = macRect.origin.y;
+      float w = macRect.size.width, h = macRect.size.height;
+      CGContextSetRGBFillColor(cgContext, 0.4510, 0.4510, 0.4510, 1.0);
+      CGContextFillRect(cgContext, CGRectMake(x, y, w, 1));
+      CGContextSetRGBFillColor(cgContext, 0.6, 0.6, 0.6, 1.0);
+      CGContextFillRect(cgContext, CGRectMake(x, y + 1, 1, h - 1));
+      CGContextFillRect(cgContext, CGRectMake(x + w - 1, y + 1, 1, h - 1));
+      CGContextFillRect(cgContext, CGRectMake(x + 1, y + h - 1, w - 2, 1));
 
       // draw a focus ring
       if (eventState.HasState(NS_EVENT_STATE_FOCUS)) {
-        // We need to bring the rectangle in by 1 pixel on each side.
-        CGRect cgr = CGRectMake(macRect.origin.x + 1,
-                                macRect.origin.y + 1,
-                                macRect.size.width - 2,
-                                macRect.size.height - 2);
-        HIThemeDrawFocusRect(&cgr, true, cgContext, kHIThemeOrientationNormal);
+        NSGraphicsContext* savedContext = [NSGraphicsContext currentContext];
+        [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES]];
+        CGContextSaveGState(cgContext);
+        NSSetFocusRingStyle(NSFocusRingOnly);
+        NSRectFill(NSRectFromCGRect(macRect));
+        CGContextRestoreGState(cgContext);
+        [NSGraphicsContext setCurrentContext:savedContext];
       }
     }
       break;
@@ -2858,6 +2850,23 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
     case NS_THEME_RESIZER:
       DrawResizer(cgContext, macRect, aFrame);
       break;
+
+    case NS_THEME_MAC_VIBRANCY_LIGHT:
+    case NS_THEME_MAC_VIBRANCY_DARK:
+    {
+      NSWindow* win = NativeWindowForFrame(aFrame);
+      if ([win isKindOfClass:[ToolbarWindow class]]) {
+        NSGraphicsContext* savedContext = [NSGraphicsContext currentContext];
+        [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES]];
+
+        ChildView* childView = [(ToolbarWindow*)win mainChildView];
+        [[childView vibrancyFillColorForWidgetType:aWidgetType] set];
+        NSRectFill(NSRectFromCGRect(macRect));
+
+        [NSGraphicsContext setCurrentContext:savedContext];
+      }
+      break;
+    }
   }
 
   if (hidpi) {
diff --git a/widget/gtk/nsGtkIMModule.cpp b/widget/gtk/nsGtkIMModule.cpp
index 3334e9380f3..0588da1ae53 100644
--- a/widget/gtk/nsGtkIMModule.cpp
+++ b/widget/gtk/nsGtkIMModule.cpp
@@ -439,7 +439,7 @@ nsGtkIMModule::EndIMEComposition(nsWindow* aCaller)
     // forcibly.  Therefore, TextComposition will recompute commit string for
     // the request even if native IME will cause unexpected commit string.
     // So, we don't need to emulate commit or cancel composition with
-    // proper composition events and a text event.
+    // proper composition events.
     // XXX ResetIME() might not enough for finishing compositoin on some
     //     environments.  We should emulate focus change too because some IMEs
     //     may commit or cancel composition at blur.
@@ -775,7 +775,7 @@ nsGtkIMModule::OnChangeCompositionNative(GtkIMContext *aContext)
     }
 
     // Be aware, widget can be gone
-    DispatchTextEvent(compositionString, false);
+    DispatchCompositionChangeEvent(compositionString, false);
 }
 
 /* static */
@@ -921,7 +921,7 @@ nsGtkIMModule::CommitCompositionBy(const nsAString& aString)
          this, NS_ConvertUTF16toUTF8(aString).get(),
          NS_ConvertUTF16toUTF8(mDispatchedCompositionString).get()));
 
-    if (!DispatchTextEvent(aString, true)) {
+    if (!DispatchCompositionChangeEvent(aString, true)) {
         return false;
     }
     // We should dispatch the compositionend event here because some IMEs
@@ -1048,7 +1048,7 @@ nsGtkIMModule::DispatchCompositionEnd()
     WidgetCompositionEvent compEvent(true, NS_COMPOSITION_END,
                                      mLastFocusedWindow);
     InitEvent(compEvent);
-    compEvent.data = mDispatchedCompositionString;
+    compEvent.mData = mDispatchedCompositionString;
     nsEventStatus status;
     nsCOMPtr<nsIWidget> kungFuDeathGrip = mLastFocusedWindow;
     mLastFocusedWindow->DispatchEvent(&compEvent, status);
@@ -1067,11 +1067,12 @@ nsGtkIMModule::DispatchCompositionEnd()
 }
 
 bool
-nsGtkIMModule::DispatchTextEvent(const nsAString &aCompositionString,
-                                 bool aIsCommit)
+nsGtkIMModule::DispatchCompositionChangeEvent(
+                   const nsAString &aCompositionString,
+                   bool aIsCommit)
 {
     PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
-        ("GtkIMModule(%p): DispatchTextEvent, aIsCommit=%s",
+        ("GtkIMModule(%p): DispatchCompositionChangeEvent, aIsCommit=%s",
          this, aIsCommit ? "TRUE" : "FALSE"));
 
     if (!mLastFocusedWindow) {
@@ -1092,10 +1093,11 @@ nsGtkIMModule::DispatchTextEvent(const nsAString &aCompositionString,
     nsEventStatus status;
     nsRefPtr<nsWindow> lastFocusedWindow = mLastFocusedWindow;
 
-    // Store the selected string which will be removed by following text event.
+    // Store the selected string which will be removed by following
+    // compositionchange event.
     if (mCompositionState == eCompositionState_CompositionStartDispatched) {
         // XXX We should assume, for now, any web applications don't change
-        //     selection at handling this text event.
+        //     selection at handling this compositionchange event.
         WidgetQueryContentEvent querySelectedTextEvent(true,
                                                        NS_QUERY_SELECTED_TEXT,
                                                        mLastFocusedWindow);
@@ -1106,29 +1108,32 @@ nsGtkIMModule::DispatchTextEvent(const nsAString &aCompositionString,
         }
     }
 
-    WidgetTextEvent textEvent(true, NS_TEXT_TEXT, mLastFocusedWindow);
-    InitEvent(textEvent);
+    WidgetCompositionEvent compositionChangeEvent(true, NS_COMPOSITION_CHANGE,
+                                                  mLastFocusedWindow);
+    InitEvent(compositionChangeEvent);
 
     uint32_t targetOffset = mCompositionStart;
 
-    textEvent.theText = mDispatchedCompositionString = aCompositionString;
+    compositionChangeEvent.mData =
+      mDispatchedCompositionString = aCompositionString;
 
     if (!aIsCommit) {
         // NOTE: SetTextRangeList() assumes that mDispatchedCompositionString
         //       has been updated already.
-        textEvent.mRanges = CreateTextRangeArray();
-        targetOffset += textEvent.mRanges->TargetClauseOffset();
+        compositionChangeEvent.mRanges = CreateTextRangeArray();
+        targetOffset += compositionChangeEvent.mRanges->TargetClauseOffset();
     }
 
     mCompositionState = aIsCommit ?
-        eCompositionState_CommitTextEventDispatched :
-        eCompositionState_TextEventDispatched;
+        eCompositionState_CommitCompositionChangeEventDispatched :
+        eCompositionState_CompositionChangeEventDispatched;
 
-    mLastFocusedWindow->DispatchEvent(&textEvent, status);
+    mLastFocusedWindow->DispatchEvent(&compositionChangeEvent, status);
     if (lastFocusedWindow->IsDestroyed() ||
         lastFocusedWindow != mLastFocusedWindow) {
         PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
-            ("    NOTE, the focused widget was destroyed/changed by text event"));
+            ("    NOTE, the focused widget was destroyed/changed by "
+             "compositionchange event"));
         return false;
     }
 
@@ -1444,7 +1449,7 @@ nsGtkIMModule::DeleteText(const int32_t aOffset, const uint32_t aNChars)
     if (wasComposing) {
         selOffset = mCompositionStart;
         if (editorHadCompositionString &&
-            !DispatchTextEvent(mSelectedString, false)) {
+            !DispatchCompositionChangeEvent(mSelectedString, false)) {
             PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    FAILED, quitting from DeletText"));
             return NS_ERROR_FAILURE;
@@ -1571,7 +1576,7 @@ nsGtkIMModule::DeleteText(const int32_t aOffset, const uint32_t aNChars)
 
     nsAutoString compositionString;
     GetCompositionString(compositionString);
-    if (!DispatchTextEvent(compositionString, true)) {
+    if (!DispatchCompositionChangeEvent(compositionString, true)) {
         PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, restoring composition string"));
         return NS_ERROR_FAILURE;
diff --git a/widget/gtk/nsGtkIMModule.h b/widget/gtk/nsGtkIMModule.h
index dd4a00e2099..c0e6dcc1959 100644
--- a/widget/gtk/nsGtkIMModule.h
+++ b/widget/gtk/nsGtkIMModule.h
@@ -134,7 +134,7 @@ protected:
     nsString mDispatchedCompositionString;
 
     // mSelectedString is the selected string which was removed by first
-    // text event.
+    // compositionchange event.
     nsString mSelectedString;
 
     // OnKeyEvent() temporarily sets mProcessingKeyEvent to the given native
@@ -148,8 +148,8 @@ protected:
     enum eCompositionState {
         eCompositionState_NotComposing,
         eCompositionState_CompositionStartDispatched,
-        eCompositionState_TextEventDispatched,
-        eCompositionState_CommitTextEventDispatched
+        eCompositionState_CompositionChangeEventDispatched,
+        eCompositionState_CommitCompositionChangeEventDispatched
     };
     eCompositionState mCompositionState;
 
@@ -160,7 +160,8 @@ protected:
 
     bool EditorHasCompositionString()
     {
-        return (mCompositionState == eCompositionState_TextEventDispatched);
+        return (mCompositionState ==
+                    eCompositionState_CompositionChangeEventDispatched);
     }
 
 #ifdef PR_LOGGING
@@ -171,10 +172,10 @@ protected:
                 return "NotComposing";
             case eCompositionState_CompositionStartDispatched:
                 return "CompositionStartDispatched";
-            case eCompositionState_TextEventDispatched:
-                return "TextEventDispatched";
-            case eCompositionState_CommitTextEventDispatched:
-                return "CommitTextEventDispatched";
+            case eCompositionState_CompositionChangeEventDispatched:
+                return "CompositionChangeEventDispatched";
+            case eCompositionState_CommitCompositionChangeEventDispatched:
+                return "CommitCompositionChangeEventDispatched";
             default:
                 return "InvaildState";
         }
@@ -294,7 +295,7 @@ protected:
      *      - CommitCompositionBy
      *      - DispatchCompositionStart
      *      - DispatchCompositionEnd
-     *      - DispatchTextEvent
+     *      - DispatchCompositionChangeEvent
      */
 
     // Commits the current composition by the aString.
@@ -304,10 +305,11 @@ protected:
     bool DispatchCompositionStart();
     bool DispatchCompositionEnd();
 
-    // Dispatches a text event.  If aIsCommit is TRUE, dispatches a committed
-    // text event.  Otherwise, dispatches a composing text event.
-    bool DispatchTextEvent(const nsAString& aCompositionString,
-                           bool aIsCommit);
+    // Dispatches a compositionchange event.  If aIsCommit is TRUE, dispatches
+    // a committed compositionchange event.  Otherwise, dispatches a composing
+    // compositionchange event.
+    bool DispatchCompositionChangeEvent(const nsAString& aCompositionString,
+                                        bool aIsCommit);
 
 };
 
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
index 96a6c063ba1..2734f844b8f 100644
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -3040,19 +3040,21 @@ nsWindow::OnKeyPressEvent(GdkEventKey *aEvent)
     }
     else {
         // If the character code is in the BMP, send the key press event.
-        // Otherwise, send a text event with the equivalent UTF-16 string.
+        // Otherwise, send a compositionchange event with the equivalent UTF-16
+        // string.
         if (IS_IN_BMP(event.charCode)) {
             DispatchEvent(&event, status);
         }
         else {
-            WidgetTextEvent textEvent(true, NS_TEXT_TEXT, this);
+            WidgetCompositionEvent compositionChangeEvent(
+                                     true, NS_COMPOSITION_CHANGE, this);
             char16_t textString[3];
             textString[0] = H_SURROGATE(event.charCode);
             textString[1] = L_SURROGATE(event.charCode);
             textString[2] = 0;
-            textEvent.theText = textString;
-            textEvent.time = event.time;
-            DispatchEvent(&textEvent, status);
+            compositionChangeEvent.mData = textString;
+            compositionChangeEvent.time = event.time;
+            DispatchEvent(&compositionChangeEvent, status);
         }
     }
 
@@ -5997,7 +5999,7 @@ nsWindow::GetIMEUpdatePreference()
         nsIMEUpdatePreference::NOTIFY_SELECTION_CHANGE);
     // We shouldn't notify IME of selection change caused by changes of
     // composition string.  Therefore, we don't need to be notified selection
-    // changes which are caused by text events handled.
+    // changes which are caused by compositionchange events handled.
     updatePreference.DontNotifyChangesCausedByComposition();
     return updatePreference;
 }
diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h
index 3231a38ff0d..cb639b52638 100644
--- a/widget/nsGUIEventIPC.h
+++ b/widget/nsGUIEventIPC.h
@@ -442,16 +442,15 @@ struct ParamTraits<mozilla::TextRangeArray>
 };
 
 template<>
-struct ParamTraits<mozilla::WidgetTextEvent>
+struct ParamTraits<mozilla::WidgetCompositionEvent>
 {
-  typedef mozilla::WidgetTextEvent paramType;
+  typedef mozilla::WidgetCompositionEvent paramType;
 
   static void Write(Message* aMsg, const paramType& aParam)
   {
     WriteParam(aMsg, static_cast<mozilla::WidgetGUIEvent>(aParam));
     WriteParam(aMsg, aParam.mSeqno);
-    WriteParam(aMsg, aParam.theText);
-    WriteParam(aMsg, aParam.isChar);
+    WriteParam(aMsg, aParam.mData);
     bool hasRanges = !!aParam.mRanges;
     WriteParam(aMsg, hasRanges);
     if (hasRanges) {
@@ -465,8 +464,7 @@ struct ParamTraits<mozilla::WidgetTextEvent>
     if (!ReadParam(aMsg, aIter,
                    static_cast<mozilla::WidgetGUIEvent*>(aResult)) ||
         !ReadParam(aMsg, aIter, &aResult->mSeqno) ||
-        !ReadParam(aMsg, aIter, &aResult->theText) ||
-        !ReadParam(aMsg, aIter, &aResult->isChar) ||
+        !ReadParam(aMsg, aIter, &aResult->mData) ||
         !ReadParam(aMsg, aIter, &hasRanges)) {
       return false;
     }
@@ -475,9 +473,6 @@ struct ParamTraits<mozilla::WidgetTextEvent>
       aResult->mRanges = nullptr;
     } else {
       aResult->mRanges = new mozilla::TextRangeArray();
-      if (!aResult->mRanges) {
-        return false;
-      }
       if (!ReadParam(aMsg, aIter, aResult->mRanges.get())) {
         return false;
       }
@@ -486,27 +481,6 @@ struct ParamTraits<mozilla::WidgetTextEvent>
   }
 };
 
-template<>
-struct ParamTraits<mozilla::WidgetCompositionEvent>
-{
-  typedef mozilla::WidgetCompositionEvent paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam)
-  {
-    WriteParam(aMsg, static_cast<mozilla::WidgetGUIEvent>(aParam));
-    WriteParam(aMsg, aParam.mSeqno);
-    WriteParam(aMsg, aParam.data);
-  }
-
-  static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
-  {
-    return ReadParam(aMsg, aIter,
-                     static_cast<mozilla::WidgetGUIEvent*>(aResult)) &&
-           ReadParam(aMsg, aIter, &aResult->mSeqno) &&
-           ReadParam(aMsg, aIter, &aResult->data);
-  }
-};
-
 template<>
 struct ParamTraits<mozilla::WidgetQueryContentEvent>
 {
diff --git a/widget/qt/nsLookAndFeel.cpp b/widget/qt/nsLookAndFeel.cpp
index d1729772730..1a8b24e5299 100644
--- a/widget/qt/nsLookAndFeel.cpp
+++ b/widget/qt/nsLookAndFeel.cpp
@@ -17,6 +17,9 @@
 #include <QGuiApplication>
 #include <QFont>
 #include <QScreen>
+#include <QPalette>
+#include <QStyle>
+#include <QStyleFactory>
 
 #include "nsLookAndFeel.h"
 #include "nsStyleConsts.h"
@@ -26,6 +29,9 @@
 
 static const char16_t UNICODE_BULLET = 0x2022;
 
+#define QCOLOR_TO_NS_RGB(c)                     \
+  ((nscolor)NS_RGB(c.red(),c.green(),c.blue()))
+
 nsLookAndFeel::nsLookAndFeel()
     : nsXPLookAndFeel()
 {
@@ -40,45 +46,33 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor &aColor)
 {
     nsresult rv = NS_OK;
 
-#define BASE_ACTIVE_COLOR     NS_RGB(0xaa,0xaa,0xaa)
-#define BASE_NORMAL_COLOR     NS_RGB(0xff,0xff,0xff)
-#define BASE_SELECTED_COLOR   NS_RGB(0xaa,0xaa,0xaa)
-#define BG_ACTIVE_COLOR       NS_RGB(0xff,0xff,0xff)
-#define BG_INSENSITIVE_COLOR  NS_RGB(0xaa,0xaa,0xaa)
-#define BG_NORMAL_COLOR       NS_RGB(0xff,0xff,0xff)
 #define BG_PRELIGHT_COLOR     NS_RGB(0xee,0xee,0xee)
-#define BG_SELECTED_COLOR     NS_RGB(0x99,0x99,0x99)
-#define DARK_NORMAL_COLOR     NS_RGB(0x88,0x88,0x88)
-#define FG_INSENSITIVE_COLOR  NS_RGB(0x44,0x44,0x44)
-#define FG_NORMAL_COLOR       NS_RGB(0x00,0x00,0x00)
 #define FG_PRELIGHT_COLOR     NS_RGB(0x77,0x77,0x77)
-#define FG_SELECTED_COLOR     NS_RGB(0xaa,0xaa,0xaa)
-#define LIGHT_NORMAL_COLOR    NS_RGB(0xaa,0xaa,0xaa)
-#define TEXT_ACTIVE_COLOR     NS_RGB(0x99,0x99,0x99)
-#define TEXT_NORMAL_COLOR     NS_RGB(0x00,0x00,0x00)
-#define TEXT_SELECTED_COLOR   NS_RGB(0x00,0x00,0x00)
+#define RED_COLOR             NS_RGB(0xff,0x00,0x00)
+
+    QPalette palette = QGuiApplication::palette();
 
     switch (aID) {
         // These colors don't seem to be used for anything anymore in Mozilla
         // (except here at least TextSelectBackground and TextSelectForeground)
         // The CSS2 colors below are used.
     case eColorID_WindowBackground:
-        aColor = BASE_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_WindowForeground:
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::WindowText));
         break;
     case eColorID_WidgetBackground:
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_WidgetForeground:
-        aColor = FG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::WindowText));
         break;
     case eColorID_WidgetSelectBackground:
-        aColor = BG_SELECTED_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_WidgetSelectForeground:
-        aColor = FG_SELECTED_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::WindowText));
         break;
     case eColorID_Widget3DHighlight:
         aColor = NS_RGB(0xa0,0xa0,0xa0);
@@ -88,23 +82,23 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor &aColor)
         break;
     case eColorID_TextBackground:
         // not used?
-        aColor = BASE_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_TextForeground:
         // not used?
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::WindowText));
         break;
     case eColorID_TextSelectBackground:
     case eColorID_IMESelectedRawTextBackground:
     case eColorID_IMESelectedConvertedTextBackground:
         // still used
-        aColor = BASE_SELECTED_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Highlight));
         break;
     case eColorID_TextSelectForeground:
     case eColorID_IMESelectedRawTextForeground:
     case eColorID_IMESelectedConvertedTextForeground:
         // still used
-        aColor = TEXT_SELECTED_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::HighlightedText));
         break;
     case eColorID_IMERawInputBackground:
     case eColorID_IMEConvertedTextBackground:
@@ -123,138 +117,138 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor &aColor)
         aColor = NS_TRANSPARENT;
         break;
     case eColorID_SpellCheckerUnderline:
-      aColor = NS_RGB(0xff, 0, 0);
-      break;
+        aColor = RED_COLOR;
+        break;
 
         // css2  http://www.w3.org/TR/REC-CSS2/ui.html#system-colors
     case eColorID_activeborder:
         // active window border
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_activecaption:
         // active window caption background
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_appworkspace:
         // MDI background color
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_background:
         // desktop background
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_captiontext:
         // text in active window caption, size box, and scrollbar arrow box (!)
-        aColor = FG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
         break;
     case eColorID_graytext:
         // disabled text in windows, menus, etc.
-        aColor = FG_INSENSITIVE_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Disabled, QPalette::Text));
         break;
     case eColorID_highlight:
         // background of selected item
-        aColor = BASE_SELECTED_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Highlight));
         break;
     case eColorID_highlighttext:
         // text of selected item
-        aColor = TEXT_SELECTED_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::HighlightedText));
         break;
     case eColorID_inactiveborder:
         // inactive window border
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Disabled, QPalette::Window));
         break;
     case eColorID_inactivecaption:
         // inactive window caption
-        aColor = BG_INSENSITIVE_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Disabled, QPalette::Window));
         break;
     case eColorID_inactivecaptiontext:
         // text in inactive window caption
-        aColor = FG_INSENSITIVE_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Disabled, QPalette::Text));
         break;
     case eColorID_infobackground:
         // tooltip background color
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::ToolTipBase));
         break;
     case eColorID_infotext:
         // tooltip text color
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::ToolTipText));
         break;
     case eColorID_menu:
         // menu background
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID_menutext:
         // menu text
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
         break;
     case eColorID_scrollbar:
         // scrollbar gray area
-        aColor = BG_ACTIVE_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Mid));
         break;
 
     case eColorID_threedface:
     case eColorID_buttonface:
         // 3-D face color
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Button));
         break;
 
     case eColorID_buttontext:
         // text on push buttons
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::ButtonText));
         break;
 
     case eColorID_buttonhighlight:
         // 3-D highlighted edge color
     case eColorID_threedhighlight:
         // 3-D highlighted outer edge color
-        aColor = LIGHT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Dark));
         break;
 
     case eColorID_threedlightshadow:
         // 3-D highlighted inner edge color
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Light));
         break;
 
     case eColorID_buttonshadow:
         // 3-D shadow edge color
     case eColorID_threedshadow:
         // 3-D shadow inner edge color
-        aColor = DARK_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Dark));
         break;
 
     case eColorID_threeddarkshadow:
         // 3-D shadow outer edge color
-        aColor = NS_RGB(0,0,0);
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Shadow));
         break;
 
     case eColorID_window:
     case eColorID_windowframe:
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
 
     case eColorID_windowtext:
-        aColor = FG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
         break;
 
     case eColorID__moz_eventreerow:
     case eColorID__moz_field:
-        aColor = BASE_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Base));
         break;
     case eColorID__moz_fieldtext:
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
         break;
     case eColorID__moz_dialog:
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID__moz_dialogtext:
-        aColor = FG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::WindowText));
         break;
     case eColorID__moz_dragtargetzone:
-        aColor = BG_SELECTED_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Window));
         break;
     case eColorID__moz_buttondefault:
         // default button border color
-        aColor = NS_RGB(0,0,0);
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Button));
         break;
     case eColorID__moz_buttonhoverface:
         aColor = BG_PRELIGHT_COLOR;
@@ -264,17 +258,17 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor &aColor)
         break;
     case eColorID__moz_cellhighlight:
     case eColorID__moz_html_cellhighlight:
-        aColor = BASE_ACTIVE_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Highlight));
         break;
     case eColorID__moz_cellhighlighttext:
     case eColorID__moz_html_cellhighlighttext:
-        aColor = TEXT_ACTIVE_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::HighlightedText));
         break;
     case eColorID__moz_menuhover:
         aColor = BG_PRELIGHT_COLOR;
         break;
     case eColorID__moz_menuhovertext:
-        aColor = FG_PRELIGHT_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
         break;
     case eColorID__moz_oddtreerow:
         aColor = NS_TRANSPARENT;
@@ -283,16 +277,16 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor &aColor)
         aColor = NS_SAME_AS_FOREGROUND_COLOR;
         break;
     case eColorID__moz_comboboxtext:
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
         break;
     case eColorID__moz_combobox:
-        aColor = BG_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Base));
         break;
     case eColorID__moz_menubartext:
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
         break;
     case eColorID__moz_menubarhovertext:
-        aColor = FG_PRELIGHT_COLOR;
+        aColor = QCOLOR_TO_NS_RGB(palette.color(QPalette::Normal, QPalette::Text));
         break;
     default:
         /* default color is BLACK */
diff --git a/widget/shared/WidgetEventImpl.cpp b/widget/shared/WidgetEventImpl.cpp
index 0639205670d..a963a878311 100644
--- a/widget/shared/WidgetEventImpl.cpp
+++ b/widget/shared/WidgetEventImpl.cpp
@@ -132,10 +132,10 @@ bool
 WidgetEvent::HasIMEEventMessage() const
 {
   switch (message) {
-    case NS_TEXT_TEXT:
     case NS_COMPOSITION_START:
     case NS_COMPOSITION_END:
     case NS_COMPOSITION_UPDATE:
+    case NS_COMPOSITION_CHANGE:
       return true;
     default:
       return false;
diff --git a/widget/tests/TestWinTSF.cpp b/widget/tests/TestWinTSF.cpp
index db0701127a5..c80357975ea 100644
--- a/widget/tests/TestWinTSF.cpp
+++ b/widget/tests/TestWinTSF.cpp
@@ -1965,7 +1965,7 @@ TestApp::TestText(void)
    * Bug in NS_QUERY_TEXT_CONTENT handler
    * nsTextStore::SetText not calling SetSelection or InsertTextAtSelection
    * Bug in SetSelection or InsertTextAtSelection
-   *  NS_SELECTION_SET bug or NS_COMPOSITION_* / NS_TEXT_TEXT bug
+   *  NS_SELECTION_SET bug or NS_COMPOSITION_* / NS_COMPOSITION_CHANGE bug
    */
 
   if (!mMgr->GetFocusedStore()) {
diff --git a/widget/tests/test_assign_event_data.html b/widget/tests/test_assign_event_data.html
index d723be5ffa9..9275f2cab0d 100644
--- a/widget/tests/test_assign_event_data.html
+++ b/widget/tests/test_assign_event_data.html
@@ -176,7 +176,7 @@ const kTests = [
       document.getElementById(this.targetID).focus();
       synthesizeKey("a", { type: "keydown" });
       synthesizeComposition({ type: "compositionstart" });
-      synthesizeText({ "composition":
+      synthesizeCompositionChange({ "composition":
         { "string": "\u306D",
           "clauses":
           [
@@ -186,7 +186,7 @@ const kTests = [
         "caret": { "start": 1, "length": 0 }
       });
       synthesizeKey("a", { type: "keyup" });
-      synthesizeText({ "composition":
+      synthesizeCompositionChange({ "composition":
         { "string": "\u306D",
           "clauses":
           [
@@ -208,7 +208,7 @@ const kTests = [
       document.getElementById(this.targetID).value = "";
       document.getElementById(this.targetID).focus();
       synthesizeComposition({ type: "compositionstart" });
-      synthesizeText({ "composition":
+      synthesizeCompositionChange({ "composition":
         { "string": "\u306D",
           "clauses":
           [
@@ -218,7 +218,7 @@ const kTests = [
         "caret": { "start": 1, "length": 0 }
       });
       synthesizeKey("VK_RETURN", { type: "keydown" });
-      synthesizeText({ "composition":
+      synthesizeCompositionChange({ "composition":
         { "string": "\u306D",
           "clauses":
           [
@@ -288,7 +288,7 @@ const kTests = [
       document.getElementById(this.targetID).value = "";
       document.getElementById(this.targetID).focus();
       synthesizeComposition({ type: "compositionstart" });
-      synthesizeText({ "composition":
+      synthesizeCompositionChange({ "composition":
         { "string": "\u306D",
           "clauses":
           [
@@ -310,7 +310,7 @@ const kTests = [
       document.getElementById(this.targetID).value = "";
       document.getElementById(this.targetID).focus();
       synthesizeComposition({ type: "compositionstart" });
-      synthesizeText({ "composition":
+      synthesizeCompositionChange({ "composition":
         { "string": "\u30E9\u30FC\u30E1\u30F3",
           "clauses":
           [
@@ -345,7 +345,7 @@ const kTests = [
       document.getElementById(this.targetID).value = "";
       document.getElementById(this.targetID).focus();
       synthesizeComposition({ type: "compositionstart" });
-      synthesizeText({ "composition":
+      synthesizeCompositionChange({ "composition":
         { "string": "\u30E9\u30FC\u30E1\u30F3",
           "clauses":
           [
@@ -363,7 +363,7 @@ const kTests = [
   { description: "InternalEditorInputEvent (input at committing)",
     targetID: "input-text", eventType: "input",
     dispatchEvent: function () {
-      synthesizeText({ "composition":
+      synthesizeCompositionChange({ "composition":
         { "string": "\u30E9\u30FC\u30E1\u30F3",
           "clauses":
           [
diff --git a/widget/tests/test_imestate.html b/widget/tests/test_imestate.html
index cdb63e92bbf..a6f29a828e7 100644
--- a/widget/tests/test_imestate.html
+++ b/widget/tests/test_imestate.html
@@ -1236,7 +1236,7 @@ function runEditorFlagChangeTests()
   synthesizeComposition({ type: "compositionstart" });
 
   // input characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3078\u3093\u3057\u3093",
         "clauses":
@@ -1266,7 +1266,7 @@ function runEditorFlagChangeTests()
      description + "#3 IME isn't enabled on HTML editor");
 
   // cancel the composition
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
diff --git a/widget/tests/test_input_events_on_deactive_window.xul b/widget/tests/test_input_events_on_deactive_window.xul
index d7e3f4c7812..7d38ff94fe9 100644
--- a/widget/tests/test_input_events_on_deactive_window.xul
+++ b/widget/tests/test_input_events_on_deactive_window.xul
@@ -159,7 +159,7 @@ function startTests()
     checkCompositionEvents(true, false, false, false, "compositionstart");
     clear();
     // input first character
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": "\u3089",
           "clauses":
@@ -195,7 +195,7 @@ function startTests()
        "query selected text event returns wrong selected text");
     clear();
     // commit composition
-    synthesizeText(
+    synthesizeCompositionChange(
       { "composition":
         { "string": "\u3089",
           "clauses":
diff --git a/widget/tests/window_composition_text_querycontent.xul b/widget/tests/window_composition_text_querycontent.xul
index 3dbbaa7ba56..d6e09592c51 100644
--- a/widget/tests/window_composition_text_querycontent.xul
+++ b/widget/tests/window_composition_text_querycontent.xul
@@ -194,7 +194,7 @@ function runUndoRedoTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input raw characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306D",
         "clauses":
@@ -205,7 +205,7 @@ function runUndoRedoTest()
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306D\u3053",
         "clauses":
@@ -217,7 +217,7 @@ function runUndoRedoTest()
     });
 
   // convert
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u732B",
         "clauses":
@@ -230,7 +230,7 @@ function runUndoRedoTest()
     });
 
   // commit
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u732B",
         "clauses":
@@ -248,7 +248,7 @@ function runUndoRedoTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input raw characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u307E",
         "clauses":
@@ -260,7 +260,7 @@ function runUndoRedoTest()
     });
 
   // cancel the composition
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -278,7 +278,7 @@ function runUndoRedoTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input raw characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3080",
         "clauses":
@@ -289,7 +289,7 @@ function runUndoRedoTest()
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3080\u3059",
         "clauses":
@@ -300,7 +300,7 @@ function runUndoRedoTest()
       "caret": { "start": 2, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3080\u3059\u3081",
         "clauses":
@@ -312,7 +312,7 @@ function runUndoRedoTest()
     });
 
   // convert
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u5A18",
         "clauses":
@@ -325,7 +325,7 @@ function runUndoRedoTest()
     });
 
   // commit
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u5A18",
         "clauses":
@@ -376,7 +376,7 @@ function runUndoRedoTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input raw characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3088",
         "clauses":
@@ -387,7 +387,7 @@ function runUndoRedoTest()
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3088\u3046",
         "clauses":
@@ -398,7 +398,7 @@ function runUndoRedoTest()
       "caret": { "start": 2, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3088\u3046\u304b",
         "clauses":
@@ -409,7 +409,7 @@ function runUndoRedoTest()
       "caret": { "start": 3, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3088\u3046\u304b\u3044",
         "clauses":
@@ -421,7 +421,7 @@ function runUndoRedoTest()
     });
 
   // convert
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u5996\u602a",
         "clauses":
@@ -433,7 +433,7 @@ function runUndoRedoTest()
     });
 
   // commit
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u5996\u602a",
         "clauses":
@@ -631,7 +631,7 @@ function runCompositionTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input first character
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089",
         "clauses":
@@ -655,7 +655,7 @@ function runCompositionTest()
   caretRects[1] = caretRect;
 
   // input second character
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC",
         "clauses":
@@ -688,7 +688,7 @@ function runCompositionTest()
      "runCompositionTest: caret width is wrong (#1-2)");
 
   // input third character
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081",
         "clauses":
@@ -721,7 +721,7 @@ function runCompositionTest()
      "runCompositionTest: caret height is wrong (#1-3)");
 
   // moves the caret left
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081",
         "clauses":
@@ -755,7 +755,7 @@ function runCompositionTest()
      "runCompositionTest: caret rects are different (#1-3-1, height)");
 
   // moves the caret left
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081",
         "clauses":
@@ -788,7 +788,7 @@ function runCompositionTest()
   is(caretRect.height, caretRects[1].height,
      "runCompositionTest: caret rects are different (#1-3-2, height)");
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093",
         "clauses":
@@ -806,7 +806,7 @@ function runCompositionTest()
 
 
   // backspace
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081",
         "clauses":
@@ -823,7 +823,7 @@ function runCompositionTest()
   }
 
   // re-input
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093",
         "clauses":
@@ -839,7 +839,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093\u3055",
         "clauses":
@@ -855,7 +855,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044",
         "clauses":
@@ -871,7 +871,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053",
         "clauses":
@@ -887,7 +887,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053\u3046",
         "clauses":
@@ -905,7 +905,7 @@ function runCompositionTest()
   }
 
   // convert
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8",
         "clauses":
@@ -926,7 +926,7 @@ function runCompositionTest()
   }
 
   // change the selected clause
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8",
         "clauses":
@@ -947,7 +947,7 @@ function runCompositionTest()
   }
 
   // reset clauses
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u30E9\u30FC\u30E1\u30F3\u3055\u884C\u3053\u3046",
         "clauses":
@@ -978,7 +978,7 @@ function runCompositionTest()
   }
 
   // commit the composition string
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u30E9\u30FC\u30E1\u30F3\u3055\u884C\u3053\u3046",
         "clauses":
@@ -1015,7 +1015,7 @@ function runCompositionTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3057",
         "clauses":
@@ -1032,7 +1032,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3058",
         "clauses":
@@ -1049,7 +1049,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3058\u3087",
         "clauses":
@@ -1066,7 +1066,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3058\u3087\u3046",
         "clauses":
@@ -1084,7 +1084,7 @@ function runCompositionTest()
   }
 
   // commit the composition string
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3058\u3087\u3046",
         "clauses":
@@ -1114,7 +1114,7 @@ function runCompositionTest()
   // start composition with selection
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u304A",
         "clauses":
@@ -1132,7 +1132,7 @@ function runCompositionTest()
   }
 
   // remove the composition string
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1150,7 +1150,7 @@ function runCompositionTest()
   }
 
   // re-input the composition string
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3046",
         "clauses":
@@ -1168,7 +1168,7 @@ function runCompositionTest()
   }
 
   // cancel the composition
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1192,7 +1192,7 @@ function runCompositionTest()
   // its candidate window.
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1209,7 +1209,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1226,7 +1226,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u6700",
         "clauses":
@@ -1254,7 +1254,7 @@ function runCompositionTest()
   // testing the canceling case
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1271,7 +1271,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1301,7 +1301,7 @@ function runCompositionTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1318,7 +1318,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u9AD8",
         "clauses":
@@ -1354,7 +1354,7 @@ function runCompositionTest()
   // twice at canceling composition.
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u6700",
         "clauses":
@@ -1371,7 +1371,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1388,7 +1388,7 @@ function runCompositionTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "",
         "clauses":
@@ -1544,7 +1544,7 @@ function runCompositionEventTest()
   initResults();
 
   synthesizeComposition({ type: "compositionstart" });
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089",
         "clauses":
@@ -1595,7 +1595,7 @@ function runCompositionEventTest()
   is(inputEventData["input"], "\u3089",
      kDescription + "value of input element wasn't modified (input) #1");
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC",
         "clauses":
@@ -1639,7 +1639,7 @@ function runCompositionEventTest()
      kDescription + "value of input element wasn't modified (input) #2");
 
   // text event shouldn't cause composition update, e.g., at committing.
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC",
         "clauses":
@@ -1691,7 +1691,7 @@ function runCompositionEventTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089",
         "clauses":
@@ -1702,7 +1702,7 @@ function runCompositionEventTest()
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089",
         "clauses":
@@ -1771,7 +1771,7 @@ function runCompositionEventTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306D",
         "clauses":
@@ -1782,7 +1782,7 @@ function runCompositionEventTest()
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306D",
         "clauses":
@@ -1853,7 +1853,7 @@ function runCompositionEventTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -1864,7 +1864,7 @@ function runCompositionEventTest()
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2238,7 +2238,7 @@ function runForceCommitTest()
   events = [];
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2291,7 +2291,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2336,7 +2336,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2378,7 +2378,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2424,7 +2424,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2470,7 +2470,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2517,7 +2517,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2563,7 +2563,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" }, iframe2.contentWindow);
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2607,7 +2607,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" }, iframe2.contentWindow);
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2656,7 +2656,7 @@ function runForceCommitTest()
 
   synthesizeComposition({ type: "compositionstart" }, iframe2.contentWindow);
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2759,7 +2759,7 @@ function runIsComposingTest()
   synthesizeComposition({ type: "compositionstart" });
   expectedIsComposing = true;
   description = "events after dispatching compositionstart";
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3042",
         "clauses":
@@ -2776,7 +2776,7 @@ function runIsComposingTest()
 
   description = "events for committing composition string";
   synthesizeKey("VK_RETURN", { type: "keydown" });
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3042",
         "clauses":
@@ -2820,7 +2820,7 @@ function runRemoveContentTest(aCallback)
 
   synthesizeComposition({ type: "compositionstart" });
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u306E",
         "clauses":
@@ -2919,7 +2919,7 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName)
   synthesizeComposition({ type: "compositionstart" });
 
   // input characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3078\u3093\u3057\u3093",
         "clauses":
@@ -2936,7 +2936,7 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName)
   }
 
   // convert them #1
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u8FD4\u4FE1",
         "clauses":
@@ -2954,7 +2954,7 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName)
   }
 
   // convert them #2
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u5909\u8EAB",
         "clauses":
@@ -2972,7 +2972,7 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName)
   }
 
   // commit them
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u5909\u8EAB",
         "clauses":
@@ -3072,7 +3072,7 @@ function runMaxLengthTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input first character
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089",
         "clauses":
@@ -3089,7 +3089,7 @@ function runMaxLengthTest()
   }
 
   // input second character
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC",
         "clauses":
@@ -3106,7 +3106,7 @@ function runMaxLengthTest()
   }
 
   // input third character
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081",
         "clauses":
@@ -3123,7 +3123,7 @@ function runMaxLengthTest()
   }
 
   // input fourth character
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093",
         "clauses":
@@ -3141,7 +3141,7 @@ function runMaxLengthTest()
 
 
   // backspace
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081",
         "clauses":
@@ -3158,7 +3158,7 @@ function runMaxLengthTest()
   }
 
   // re-input
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093",
         "clauses":
@@ -3174,7 +3174,7 @@ function runMaxLengthTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093\u3055",
         "clauses":
@@ -3190,7 +3190,7 @@ function runMaxLengthTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044",
         "clauses":
@@ -3206,7 +3206,7 @@ function runMaxLengthTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053",
         "clauses":
@@ -3223,7 +3223,7 @@ function runMaxLengthTest()
     return;
   }
 
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053\u3046",
         "clauses":
@@ -3241,7 +3241,7 @@ function runMaxLengthTest()
   }
 
   // convert
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8",
         "clauses":
@@ -3261,7 +3261,7 @@ function runMaxLengthTest()
   }
 
   // commit the composition string
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8",
         "clauses":
@@ -3284,7 +3284,7 @@ function runMaxLengthTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3057",
         "clauses":
@@ -3301,7 +3301,7 @@ function runMaxLengthTest()
   }
 
   // commit the composition string
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u3058",
         "clauses":
@@ -3358,7 +3358,7 @@ function runMaxLengthTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u9B54",
         "clauses":
@@ -3375,7 +3375,7 @@ function runMaxLengthTest()
   }
 
   // commit the composition string
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u9B54",
         "clauses":
@@ -3399,7 +3399,7 @@ function runMaxLengthTest()
   synthesizeComposition({ type: "compositionstart" });
 
   // input characters
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u9B54\u6CD5",
         "clauses":
@@ -3416,7 +3416,7 @@ function runMaxLengthTest()
   }
 
   // commit the composition string
-  synthesizeText(
+  synthesizeCompositionChange(
     { "composition":
       { "string": "\u9B54\u6CD5",
         "clauses":
diff --git a/widget/windows/nsIMM32Handler.cpp b/widget/windows/nsIMM32Handler.cpp
index ca4b8001262..a74f41d315e 100644
--- a/widget/windows/nsIMM32Handler.cpp
+++ b/widget/windows/nsIMM32Handler.cpp
@@ -152,7 +152,7 @@ nsIMM32Handler::GetIMEUpdatePreference()
   ((lParam) & (GCS_COMPSTR | GCS_COMPATTR | GCS_COMPCLAUSE | GCS_CURSORPOS))
 #define IS_COMMITTING_LPARAM(lParam) ((lParam) & GCS_RESULTSTR)
 // Some IMEs (e.g., the standard IME for Korean) don't have caret position,
-// then, we should not set caret position to text event.
+// then, we should not set caret position to compositionchange event.
 #define NO_IME_CARET -1
 
 nsIMM32Handler::nsIMM32Handler() :
@@ -483,10 +483,10 @@ nsIMM32Handler::OnIMEEndComposition(nsWindow* aWindow,
 
   // Otherwise, e.g., ChangJie doesn't post WM_IME_COMPOSITION before
   // WM_IME_ENDCOMPOSITION when composition string becomes empty.
-  // Then, we should dispatch a compositionupdate event, a text event and
-  // a compositionend event.
-  // XXX Shouldn't we dispatch the text event with actual or latest composition
-  //     string?
+  // Then, we should dispatch a compositionupdate event, a compositionchange
+  // event and a compositionend event.
+  // XXX Shouldn't we dispatch the compositionchange event with actual or
+  //     latest composition string?
   PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEEndComposition, mCompositionString=\"%s\"%s",
      NS_ConvertUTF16toUTF8(mCompositionString).get(),
@@ -495,7 +495,7 @@ nsIMM32Handler::OnIMEEndComposition(nsWindow* aWindow,
   mCompositionString.Truncate();
 
   nsIMEContext IMEContext(aWindow->GetWindowHandle());
-  DispatchTextEvent(aWindow, IMEContext, false);
+  DispatchCompositionChangeEvent(aWindow, IMEContext, false);
 
   HandleEndComposition(aWindow);
 
@@ -512,10 +512,10 @@ nsIMM32Handler::OnIMEChar(nsWindow* aWindow,
     ("IMM32: OnIMEChar, hWnd=%08x, char=%08x\n",
      aWindow->GetWindowHandle(), wParam));
 
-  // We don't need to fire any text events from here. This method will be
-  // called when the composition string of the current IME is not drawn by us
-  // and some characters are committed. In that case, the committed string was
-  // processed in nsWindow::OnIMEComposition already.
+  // We don't need to fire any compositionchange events from here. This method
+  // will be called when the composition string of the current IME is not drawn
+  // by us and some characters are committed. In that case, the committed
+  // string was processed in nsWindow::OnIMEComposition already.
 
   // We need to consume the message so that Windows don't send two WM_CHAR msgs
   aResult.mConsumed = true;
@@ -1020,7 +1020,7 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
     PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleComposition, GCS_RESULTSTR\n"));
 
-    DispatchTextEvent(aWindow, aIMEContext, false);
+    DispatchCompositionChangeEvent(aWindow, aIMEContext, false);
     HandleEndComposition(aWindow);
 
     if (!IS_COMPOSING_LPARAM(lParam)) {
@@ -1059,15 +1059,16 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
 
     // IME may send WM_IME_COMPOSITION without composing lParam values
     // when composition string becomes empty (e.g., using Backspace key).
-    // If composition string is empty, we should dispatch a text event with
-    // empty string.
+    // If composition string is empty, we should dispatch a compositionchange
+    // event with empty string.
     if (mCompositionString.IsEmpty()) {
-      DispatchTextEvent(aWindow, aIMEContext, false);
+      DispatchCompositionChangeEvent(aWindow, aIMEContext, false);
       return ShouldDrawCompositionStringOurselves();
     }
 
     // Otherwise, we cannot trust the lParam value.  We might need to
-    // dispatch text event with the latest composition string information.
+    // dispatch compositionchange event with the latest composition string
+    // information.
   }
 
   // See https://bugzilla.mozilla.org/show_bug.cgi?id=296339
@@ -1199,9 +1200,9 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
      mCursorPosition));
 
   //--------------------------------------------------------
-  // 5. Send the text event
+  // 5. Send the compositionchange event
   //--------------------------------------------------------
-  DispatchTextEvent(aWindow, aIMEContext);
+  DispatchCompositionChangeEvent(aWindow, aIMEContext);
 
   return ShouldDrawCompositionStringOurselves();
 }
@@ -1227,7 +1228,7 @@ nsIMM32Handler::HandleEndComposition(nsWindow* aWindow)
 
   aWindow->InitEvent(event, &point);
   // The last dispatched composition string must be the committed string.
-  event.data = mLastDispatchedCompositionString;
+  event.mData = mLastDispatchedCompositionString;
   aWindow->DispatchWindowEvent(&event);
   mIsComposing = false;
   mComposingWindow = nullptr;
@@ -1515,7 +1516,7 @@ nsIMM32Handler::CommitCompositionOnPreviousWindow(nsWindow* aWindow)
     nsIMEContext IMEContext(mComposingWindow->GetWindowHandle());
     NS_ASSERTION(IMEContext.IsValid(), "IME context must be valid");
 
-    DispatchTextEvent(mComposingWindow, IMEContext, false);
+    DispatchCompositionChangeEvent(mComposingWindow, IMEContext, false);
     HandleEndComposition(mComposingWindow);
     return true;
   }
@@ -1568,18 +1569,18 @@ GetRangeTypeName(uint32_t aRangeType)
 #endif
 
 void
-nsIMM32Handler::DispatchTextEvent(nsWindow* aWindow,
-                                  const nsIMEContext &aIMEContext,
-                                  bool aCheckAttr)
+nsIMM32Handler::DispatchCompositionChangeEvent(nsWindow* aWindow,
+                                               const nsIMEContext &aIMEContext,
+                                               bool aCheckAttr)
 {
   NS_ASSERTION(mIsComposing, "conflict state");
   PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-    ("IMM32: DispatchTextEvent, aCheckAttr=%s\n",
+    ("IMM32: DispatchCompositionChangeEvent, aCheckAttr=%s\n",
      aCheckAttr ? "TRUE": "FALSE"));
 
   // If we don't need to draw composition string ourselves and this is not
-  // commit event (i.e., under composing), we don't need to fire text event
-  // during composing.
+  // commit event (i.e., under composing), we don't need to fire
+  // compositionchange event during composing.
   if (aCheckAttr && !ShouldDrawCompositionStringOurselves()) {
     // But we need to adjust composition window pos and native caret pos, here.
     SetIMERelatedWindowsPos(aWindow, aIMEContext);
@@ -1590,7 +1591,7 @@ nsIMM32Handler::DispatchTextEvent(nsWindow* aWindow,
 
   nsIntPoint point(0, 0);
 
-  WidgetTextEvent event(true, NS_TEXT_TEXT, aWindow);
+  WidgetCompositionEvent event(true, NS_COMPOSITION_CHANGE, aWindow);
 
   aWindow->InitEvent(event, &point);
 
@@ -1598,12 +1599,12 @@ nsIMM32Handler::DispatchTextEvent(nsWindow* aWindow,
     event.mRanges = CreateTextRangeArray();
   }
 
-  event.theText = mLastDispatchedCompositionString = mCompositionString;
+  event.mData = mLastDispatchedCompositionString = mCompositionString;
 
   aWindow->DispatchWindowEvent(&event);
 
   // Calling SetIMERelatedWindowsPos will be failure on e10s at this point.
-  // text event will notify NOTIFY_IME_OF_COMPOSITION_UPDATE, then
+  // compositionchange event will notify NOTIFY_IME_OF_COMPOSITION_UPDATE, then
   // it will call SetIMERelatedWindowsPos.
 }
 
@@ -1615,7 +1616,8 @@ nsIMM32Handler::CreateTextRangeArray()
   // string and attributes) are empty. So, if you want to remove following
   // assertion, be careful.
   NS_ASSERTION(ShouldDrawCompositionStringOurselves(),
-    "CreateTextRangeArray is called when we don't need to fire text event");
+    "CreateTextRangeArray is called when we don't need to fire "
+    "compositionchange event");
 
   nsRefPtr<TextRangeArray> textRangeArray = new TextRangeArray();
 
diff --git a/widget/windows/nsIMM32Handler.h b/widget/windows/nsIMM32Handler.h
index b3a054d44c0..75c476966e5 100644
--- a/widget/windows/nsIMM32Handler.h
+++ b/widget/windows/nsIMM32Handler.h
@@ -290,8 +290,9 @@ protected:
    *  in the composition string, you need to subtract mCompositionStart from it.
    */
   bool GetTargetClauseRange(uint32_t *aOffset, uint32_t *aLength = nullptr);
-  void DispatchTextEvent(nsWindow* aWindow, const nsIMEContext &aIMEContext,
-                         bool aCheckAttr = true);
+  void DispatchCompositionChangeEvent(nsWindow* aWindow,
+                                      const nsIMEContext &aIMEContext,
+                                      bool aCheckAttr = true);
   already_AddRefed<mozilla::TextRangeArray> CreateTextRangeArray();
 
   nsresult EnsureClauseArray(int32_t aCount);
diff --git a/widget/windows/nsTextStore.cpp b/widget/windows/nsTextStore.cpp
index 7edf0e34fec..aa4006242bf 100644
--- a/widget/windows/nsTextStore.cpp
+++ b/widget/windows/nsTextStore.cpp
@@ -1649,19 +1649,20 @@ nsTextStore::FlushPendingActions()
 
         PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions(), "
-                "dispatching text event...", this));
-        WidgetTextEvent textEvent(true, NS_TEXT_TEXT, mWidget);
-        mWidget->InitEvent(textEvent);
-        textEvent.theText = action.mData;
+                "dispatching compositionchange event...", this));
+        WidgetCompositionEvent compositionChange(true, NS_COMPOSITION_CHANGE,
+                                                 mWidget);
+        mWidget->InitEvent(compositionChange);
+        compositionChange.mData = action.mData;
         if (action.mRanges->IsEmpty()) {
           TextRange wholeRange;
           wholeRange.mStartOffset = 0;
-          wholeRange.mEndOffset = textEvent.theText.Length();
+          wholeRange.mEndOffset = compositionChange.mData.Length();
           wholeRange.mRangeType = NS_TEXTRANGE_RAWINPUT;
           action.mRanges->AppendElement(wholeRange);
         }
-        textEvent.mRanges = action.mRanges;
-        mWidget->DispatchWindowEvent(&textEvent);
+        compositionChange.mRanges = action.mRanges;
+        mWidget->DispatchWindowEvent(&compositionChange);
         // Be aware, the mWidget might already have been destroyed.
         break;
       }
@@ -1676,11 +1677,12 @@ nsTextStore::FlushPendingActions()
 
         PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions(), "
-                "dispatching text event...", this));
-        WidgetTextEvent textEvent(true, NS_TEXT_TEXT, mWidget);
-        mWidget->InitEvent(textEvent);
-        textEvent.theText = action.mData;
-        mWidget->DispatchWindowEvent(&textEvent);
+                "dispatching compositionchange event...", this));
+        WidgetCompositionEvent compositionChange(true, NS_COMPOSITION_CHANGE,
+                                                 mWidget);
+        mWidget->InitEvent(compositionChange);
+        compositionChange.mData = action.mData;
+        mWidget->DispatchWindowEvent(&compositionChange);
         if (!mWidget || mWidget->Destroyed()) {
           break;
         }
@@ -1690,7 +1692,7 @@ nsTextStore::FlushPendingActions()
                 "dispatching compositionend event...", this));
         WidgetCompositionEvent compositionEnd(true, NS_COMPOSITION_END,
                                               mWidget);
-        compositionEnd.data = textEvent.theText;
+        compositionEnd.mData = compositionChange.mData;
         mWidget->InitEvent(compositionEnd);
         mWidget->DispatchWindowEvent(&compositionEnd);
         if (!mWidget || mWidget->Destroyed()) {
@@ -2269,7 +2271,7 @@ nsTextStore::RecordCompositionUpdateAction()
   // the attribute, we have to find out all the ranges that have distinct
   // attribute values. Then we query for what the value represents through
   // the display attribute manager and translate that to TextRange to be
-  // sent in NS_TEXT_TEXT
+  // sent in NS_COMPOSITION_CHANGE
 
   nsRefPtr<ITfProperty> attrPropetry;
   HRESULT hr = mContext->GetProperty(GUID_PROP_ATTRIBUTE,
@@ -2318,7 +2320,7 @@ nsTextStore::RecordCompositionUpdateAction()
 
   TextRange newRange;
   // No matter if we have display attribute info or not,
-  // we always pass in at least one range to NS_TEXT_TEXT
+  // we always pass in at least one range to NS_COMPOSITION_CHANGE
   newRange.mStartOffset = 0;
   newRange.mEndOffset = action->mData.Length();
   newRange.mRangeType = NS_TEXTRANGE_RAWINPUT;
@@ -2439,16 +2441,16 @@ nsTextStore::RecordCompositionUpdateAction()
 
 HRESULT
 nsTextStore::SetSelectionInternal(const TS_SELECTION_ACP* pSelection,
-                                  bool aDispatchTextEvent)
+                                  bool aDispatchCompositionChangeEvent)
 {
   PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::SetSelectionInternal(pSelection={ "
           "acpStart=%ld, acpEnd=%ld, style={ ase=%s, fInterimChar=%s} }, "
-          "aDispatchTextEvent=%s), mComposition.IsComposing()=%s",
+          "aDispatchCompositionChangeEvent=%s), mComposition.IsComposing()=%s",
           this, pSelection->acpStart, pSelection->acpEnd,
           GetActiveSelEndName(pSelection->style.ase),
           GetBoolName(pSelection->style.fInterimChar),
-          GetBoolName(aDispatchTextEvent),
+          GetBoolName(aDispatchCompositionChangeEvent),
           GetBoolName(mComposition.IsComposing())));
 
   MOZ_ASSERT(IsReadWriteLocked());
@@ -2462,7 +2464,7 @@ nsTextStore::SetSelectionInternal(const TS_SELECTION_ACP* pSelection,
   }
 
   if (mComposition.IsComposing()) {
-    if (aDispatchTextEvent) {
+    if (aDispatchCompositionChangeEvent) {
       HRESULT hr = RestartCompositionIfNecessary();
       if (FAILED(hr)) {
         PR_LOG(sTextStoreLog, PR_LOG_ERROR,
@@ -2480,7 +2482,7 @@ nsTextStore::SetSelectionInternal(const TS_SELECTION_ACP* pSelection,
     }
     // Emulate selection during compositions
     currentSel.SetSelection(*pSelection);
-    if (aDispatchTextEvent) {
+    if (aDispatchCompositionChangeEvent) {
       HRESULT hr = RecordCompositionUpdateAction();
       if (FAILED(hr)) {
         PR_LOG(sTextStoreLog, PR_LOG_ERROR,
@@ -4875,9 +4877,9 @@ nsTextStore::Content::ReplaceTextWith(LONG aStart, LONG aLength,
     if (mComposition.IsComposing()) {
       // Emulate text insertion during compositions, because during a
       // composition, editor expects the whole composition string to
-      // be sent in NS_TEXT_TEXT, not just the inserted part.
-      // The actual NS_TEXT_TEXT will be sent in SetSelection or
-      // OnUpdateComposition.
+      // be sent in NS_COMPOSITION_CHANGE, not just the inserted part.
+      // The actual NS_COMPOSITION_CHANGE will be sent in SetSelection
+      // or OnUpdateComposition.
       MOZ_ASSERT(aStart >= mComposition.mStart);
       MOZ_ASSERT(aStart + aLength <= mComposition.EndOffset());
       mComposition.mString.Replace(
diff --git a/widget/windows/nsTextStore.h b/widget/windows/nsTextStore.h
index 627ca026c72..85169478ed4 100644
--- a/widget/windows/nsTextStore.h
+++ b/widget/windows/nsTextStore.h
@@ -251,12 +251,13 @@ protected:
   void     DidLockGranted();
 
   bool     GetScreenExtInternal(RECT &aScreenExt);
-  // If aDispatchTextEvent is true, this method will dispatch text event if
-  // this is called during IME composing.  aDispatchTextEvent should be true
-  // only when this is called from SetSelection.  Because otherwise, the text
-  // event should not be sent from here.
+  // If aDispatchCompositionChangeEvent is true, this method will dispatch
+  // compositionchange event if this is called during IME composing.
+  // aDispatchCompositionChangeEvent should be true only when this is called
+  // from SetSelection.  Because otherwise, the compositionchange event should
+  // not be sent from here.
   HRESULT  SetSelectionInternal(const TS_SELECTION_ACP*,
-                                bool aDispatchTextEvent = false);
+                                bool aDispatchCompositionChangeEvent = false);
   bool     InsertTextAtSelectionInternal(const nsAString &aInsertStr,
                                          TS_TEXTCHANGE* aTextChange);
   void     CommitCompositionInternal(bool);
@@ -322,8 +323,8 @@ protected:
     // Current copy of the active composition string. Only mString is
     // changed during a InsertTextAtSelection call if we have a composition.
     // mString acts as a buffer until OnUpdateComposition is called
-    // and mString is flushed to editor through NS_TEXT_TEXT. This
-    // way all changes are updated in batches to avoid
+    // and mString is flushed to editor through NS_COMPOSITION_CHANGE.
+    // This way all changes are updated in batches to avoid
     // inconsistencies/artifacts.
     nsString mString;
 
diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/xpwidgets/PuppetWidget.cpp
index 412579ee6ac..4eebf1ab26e 100644
--- a/widget/xpwidgets/PuppetWidget.cpp
+++ b/widget/xpwidgets/PuppetWidget.cpp
@@ -291,9 +291,6 @@ PuppetWidget::DispatchEvent(WidgetGUIEvent* event, nsEventStatus& aStatus)
   case eCompositionEventClass:
     seqno = event->AsCompositionEvent()->mSeqno;
     break;
-  case eTextEventClass:
-    seqno = event->AsTextEvent()->mSeqno;
-    break;
   case eSelectionEventClass:
     seqno = event->AsSelectionEvent()->mSeqno;
     break;
@@ -382,25 +379,27 @@ PuppetWidget::IMEEndComposition(bool aCancel)
 #endif
 
   nsEventStatus status;
-  WidgetTextEvent textEvent(true, NS_TEXT_TEXT, this);
-  InitEvent(textEvent, nullptr);
-  textEvent.mSeqno = mIMELastReceivedSeqno;
+  WidgetCompositionEvent compositionChangeEvent(true, NS_COMPOSITION_CHANGE,
+                                                this);
+  InitEvent(compositionChangeEvent, nullptr);
+  compositionChangeEvent.mSeqno = mIMELastReceivedSeqno;
   // SendEndIMEComposition is always called since ResetInputState
   // should always be called even if we aren't composing something.
   if (!mTabChild ||
-      !mTabChild->SendEndIMEComposition(aCancel, &textEvent.theText)) {
+      !mTabChild->SendEndIMEComposition(aCancel,
+                                        &compositionChangeEvent.mData)) {
     return NS_ERROR_FAILURE;
   }
 
   if (!mIMEComposing)
     return NS_OK;
 
-  DispatchEvent(&textEvent, status);
+  DispatchEvent(&compositionChangeEvent, status);
 
-  WidgetCompositionEvent compEvent(true, NS_COMPOSITION_END, this);
-  InitEvent(compEvent, nullptr);
-  compEvent.mSeqno = mIMELastReceivedSeqno;
-  DispatchEvent(&compEvent, status);
+  WidgetCompositionEvent compositionEndEvent(true, NS_COMPOSITION_END, this);
+  InitEvent(compositionEndEvent, nullptr);
+  compositionEndEvent.mSeqno = mIMELastReceivedSeqno;
+  DispatchEvent(&compositionEndEvent, status);
   return NS_OK;
 }
 
diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h
index 0173e2874ca..a6c86191947 100644
--- a/xpcom/build/BinaryPath.h
+++ b/xpcom/build/BinaryPath.h
@@ -56,13 +56,29 @@ private:
       return NS_ERROR_FAILURE;
     }
 
+    UInt8 tempBuffer[MAXPATHLEN];
     nsresult rv;
-    if (CFURLGetFileSystemRepresentation(executableURL, false, (UInt8*)aResult,
+    if (CFURLGetFileSystemRepresentation(executableURL, false, tempBuffer,
                                          MAXPATHLEN)) {
       rv = NS_OK;
     } else {
       rv = NS_ERROR_FAILURE;
     }
+
+    // Sanitize path in case the app was launched from Terminal via './firefox'
+    // for example.
+    size_t readPos = 0;
+    size_t writePos = 0;
+    while (tempBuffer[readPos] != '\0') {
+      if (tempBuffer[readPos] == '.' && tempBuffer[readPos + 1] == '/') {
+        readPos += 2;
+      }
+      aResult[writePos] = tempBuffer[readPos];
+      readPos++;
+      writePos++;
+    }
+    aResult[writePos] = '\0';
+
     CFRelease(executableURL);
     return rv;
   }