Bug 1497598. Stop using GetCurrentJSContext in loadcontext code. r=mccr8

Differential Revision: https://phabricator.services.mozilla.com/D8122
2018-10-09 18:28:17 +00:00
parent e9fe3673ed
commit cc13eb826b
6 changed files with 13 additions and 18 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -13704,12 +13704,10 @@ nsDocShell::GetIsTopLevelContentDocShell(bool* aIsTopLevelContentDocShell)

 // Implements nsILoadContext.originAttributes
 NS_IMETHODIMP
-nsDocShell::GetScriptableOriginAttributes(JS::MutableHandle<JS::Value> aVal)
+nsDocShell::GetScriptableOriginAttributes(JSContext* aCx,
+                                          JS::MutableHandle<JS::Value> aVal)
 {
-  JSContext* cx = nsContentUtils::GetCurrentJSContext();
-  MOZ_ASSERT(cx);
-
-  return GetOriginAttributes(cx, aVal);
+  return GetOriginAttributes(aCx, aVal);
 }

 // Implements nsIDocShell.GetOriginAttributes()