Backed out 2 changesets (bug 1352532) for causing some regressions. CLOSED TREE

Backed out changeset e2dd95957747 (bug 1352532)
Backed out changeset 1a3be3ef674c (bug 1352532)

dom/base/nsWrapperCache.cpp

@@ -33,16 +33,11 @@ void nsWrapperCache::HoldJSObjects(void* aScriptObjectHolder,
   }
 }
 
-static inline bool IsNurseryWrapper(JSObject* aWrapper) {
-  return aWrapper && !JS::ObjectIsTenured(aWrapper);
-}
-
-void nsWrapperCache::SetWrapperJSObject(JSObject* aNewWrapper) {
-  JSObject* oldWrapper = mWrapper;
-  mWrapper = aNewWrapper;
+void nsWrapperCache::SetWrapperJSObject(JSObject* aWrapper) {
+  mWrapper = aWrapper;
   UnsetWrapperFlags(kWrapperFlagsMask);
 
-  if (IsNurseryWrapper(aNewWrapper) && !IsNurseryWrapper(oldWrapper)) {
+  if (aWrapper && !JS::ObjectIsTenured(aWrapper)) {
     CycleCollectedJSRuntime::Get()->NurseryWrapperAdded(this);
   }
 }

dom/webidl/HTMLDivElement.webidl

@@ -11,7 +11,7 @@
  * and create derivative works of this document.
  */
 
-[Exposed=Window, ProbablyShortLivingWrapper]
+[Exposed=Window]
 interface HTMLDivElement : HTMLElement {
   [HTMLConstructor] constructor();
 };

dom/webidl/HTMLSpanElement.webidl

@@ -12,7 +12,7 @@
  */
 
 // http://www.whatwg.org/specs/web-apps/current-work/#the-span-element
-[Exposed=Window, ProbablyShortLivingWrapper]
+[Exposed=Window]
 interface HTMLSpanElement : HTMLElement {
   [HTMLConstructor] constructor();
 };

dom/webidl/Text.webidl

@@ -10,7 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-[Exposed=Window, ProbablyShortLivingWrapper]
+[Exposed=Window]
 interface Text : CharacterData {
   [Throws]
   constructor(optional DOMString data = "");