Bug 1342012 - Support import from timeout handlers by associating the initiating script with the compiled JSScript r=smaug

2018-12-06 16:52:18 -05:00
parent fef64a6c90
commit 0d30659e5f
12 changed files with 58 additions and 29 deletions
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
@@ -2570,6 +2570,15 @@ nsresult ScriptLoader::EvaluateScript(ScriptLoadRequest* aRequest) {
  return rv;
 }

+/* static */ LoadedScript* ScriptLoader::GetActiveScript(JSContext* aCx) {
+  JS::Value value = JS::GetScriptedCallerPrivate(aCx);
+  if (value.isUndefined()) {
+    return nullptr;
+  }
+
+  return static_cast<LoadedScript*>(value.toPrivate());
+}
+
 void ScriptLoader::RegisterForBytecodeEncoding(ScriptLoadRequest* aRequest) {
  MOZ_ASSERT(aRequest->mCacheInfo);
  MOZ_ASSERT(aRequest->mScript);