From 345714ca5e59bf3241eebdba59579fceeb9d4b36 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Thu, 13 Nov 2014 11:48:21 +0100
Subject: [PATCH] Backed out changeset b1f8365b8a92 (bug 1081038) for dt Test
 Failures on a CLOSED TREE

---
 dom/base/ScriptSettings.cpp | 8 --------
 dom/base/ScriptSettings.h   | 1 -
 2 files changed, 9 deletions(-)

diff --git a/dom/base/ScriptSettings.cpp b/dom/base/ScriptSettings.cpp
index e02d1fc288f..d7c26096da1 100644
--- a/dom/base/ScriptSettings.cpp
+++ b/dom/base/ScriptSettings.cpp
@@ -463,22 +463,14 @@ AutoEntryScript::AutoEntryScript(nsIGlobalObject* aGlobalObject,
               aCx ? aCx : FindJSContext(aGlobalObject))
   , ScriptSettingsStackEntry(aGlobalObject, /* aCandidate = */ true)
   , mWebIDLCallerPrincipal(nullptr)
-  , mIsMainThread(aIsMainThread)
 {
   MOZ_ASSERT(aGlobalObject);
   MOZ_ASSERT_IF(!aCx, aIsMainThread); // cx is mandatory off-main-thread.
   MOZ_ASSERT_IF(aCx && aIsMainThread, aCx == FindJSContext(aGlobalObject));
-  if (aIsMainThread) {
-    nsContentUtils::EnterMicroTask();
-  }
 }
 
 AutoEntryScript::~AutoEntryScript()
 {
-  if (mIsMainThread) {
-    nsContentUtils::LeaveMicroTask();
-  }
-
   // GC when we pop a script entry point. This is a useful heuristic that helps
   // us out on certain (flawed) benchmarks like sunspider, because it lets us
   // avoid GCing during the timing loop.
diff --git a/dom/base/ScriptSettings.h b/dom/base/ScriptSettings.h
index ffb78ae6f73..f6559a447e0 100644
--- a/dom/base/ScriptSettings.h
+++ b/dom/base/ScriptSettings.h
@@ -330,7 +330,6 @@ private:
   // bit up the stack, and which will outlive us.  So we know the principal
   // can't go away until then either.
   nsIPrincipal* mWebIDLCallerPrincipal;
-  bool mIsMainThread;
   friend nsIPrincipal* GetWebIDLCallerPrincipal();
 };