Backed out changeset 0dca237df7e2 (bug 1160307) for causing bug 1184752.

2015-07-16 20:38:13 -04:00
parent 4eb89db818
commit f9e08f4bc8
15 changed files with 21 additions and 196 deletions
--- a/dom/base/ScriptSettings.cpp
+++ b/dom/base/ScriptSettings.cpp
@@ -564,8 +564,7 @@ AutoEntryScript::DocshellEntryMonitor::DocshellEntryMonitor(JSContext* aCx,

 void
 AutoEntryScript::DocshellEntryMonitor::Entry(JSContext* aCx, JSFunction* aFunction,
-                                             JSScript* aScript, JS::Handle<JS::Value> aAsyncStack,
-                                             JS::Handle<JSString*> aAsyncCause)
+                                             JSScript* aScript)
 {
  JS::Rooted<JSFunction*> rootedFunction(aCx);
  if (aFunction) {
@@ -610,13 +609,10 @@ AutoEntryScript::DocshellEntryMonitor::Entry(JSContext* aCx, JSFunction* aFuncti
    const char16_t* functionNameChars = functionName.isTwoByte() ?
      functionName.twoByteChars() : nullptr;

-    JS::Rooted<JS::Value> asyncCauseValue(aCx, aAsyncCause ? StringValue(aAsyncCause) :
-                                          JS::NullValue());
    docShellForJSRunToCompletion->NotifyJSRunToCompletionStart(mReason,
                                                               functionNameChars,
                                                               filename.BeginReading(),
-                                                               lineNumber, aAsyncStack,
-                                                               asyncCauseValue);
+                                                               lineNumber);
  }
 }