Backed out 2 changesets (bug 1252565) for windows build bustage CLOSED TREE

Backed out changeset 9de2c10a1cc3 (bug 1252565)
Backed out changeset fc5c4cb02d24 (bug 1252565)

MozReview-Commit-ID: GCQedQwqslg

xpcom/base/CycleCollectedJSRuntime.cpp

@@ -454,12 +454,6 @@ CycleCollectedJSRuntime::~CycleCollectedJSRuntime()
   NS_RELEASE(mOwningThread);
 }
 
-static void
-MozCrashErrorReporter(JSContext*, const char*, JSErrorReport*)
-{
-  MOZ_CRASH("Why is someone touching JSAPI without an AutoJSAPI?");
-}
-
 nsresult
 CycleCollectedJSRuntime::Initialize(JSRuntime* aParentRuntime,
                                     uint32_t aMaxBytes,
@@ -503,15 +497,11 @@ CycleCollectedJSRuntime::Initialize(JSRuntime* aParentRuntime,
   JS_SetContextCallback(mJSRuntime, ContextCallback, this);
   JS_SetDestroyZoneCallback(mJSRuntime, XPCStringConvert::FreeZoneCache);
   JS_SetSweepZoneCallback(mJSRuntime, XPCStringConvert::ClearZoneCache);
-  // XPCJSRuntime currently overrides this because we don't
-  // TakeOwnershipOfErrorReporting everwhere on the main thread yet.
-  JS_SetErrorReporter(mJSRuntime, MozCrashErrorReporter);
 
   static js::DOMCallbacks DOMcallbacks = {
     InstanceClassHasProtoAtDepth
   };
   SetDOMCallbacks(mJSRuntime, &DOMcallbacks);
-  js::SetScriptEnvironmentPreparer(mJSRuntime, &mEnvironmentPreparer);
 
 #ifdef SPIDERMONKEY_PROMISE
   JS::SetEnqueuePromiseJobCallback(mJSRuntime, EnqueuePromiseJobCallback, this);
@@ -1623,28 +1613,3 @@ CycleCollectedJSRuntime::PrepareWaitingZonesForGC()
     mZonesWaitingForGC.Clear();
   }
 }
-
-void
-CycleCollectedJSRuntime::EnvironmentPreparer::invoke(JS::HandleObject scope,
-                                                     js::ScriptEnvironmentPreparer::Closure& closure)
-{
-  nsIGlobalObject* global = xpc::NativeGlobal(scope);
-
-  // Not much we can do if we simply don't have a usable global here...
-  NS_ENSURE_TRUE_VOID(global && global->GetGlobalJSObject());
-
-  bool mainThread = NS_IsMainThread();
-  JSContext* cx =
-    mainThread ? nullptr : nsContentUtils::GetDefaultJSContextForThread();
-  AutoEntryScript aes(global, "JS-engine-initiated execution", mainThread, cx);
-  aes.TakeOwnershipOfErrorReporting();
-
-  MOZ_ASSERT(!JS_IsExceptionPending(aes.cx()));
-
-  DebugOnly<bool> ok = closure(aes.cx());
-
-  MOZ_ASSERT_IF(ok, !JS_IsExceptionPending(aes.cx()));
-
-  // The AutoEntryScript will check for JS_IsExceptionPending on the
-  // JSContext and report it as needed as it comes off the stack.
-}