summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaming4JC <g4jc@hyperbola.info>2020-07-11 10:57:01 -0400
committerMoonchild <moonchild@palemoon.org>2020-07-12 19:40:18 +0000
commit4950c982e0465d82a726bd01859fb7fd40160d3b (patch)
tree246f7b38e66b5d5bca1d81c5b901726d1c449e1c
parent82faff19e1761797b7a75f9221f0709c5a38bfe6 (diff)
downloadUXP-4950c982e0465d82a726bd01859fb7fd40160d3b.tar
UXP-4950c982e0465d82a726bd01859fb7fd40160d3b.tar.gz
UXP-4950c982e0465d82a726bd01859fb7fd40160d3b.tar.lz
UXP-4950c982e0465d82a726bd01859fb7fd40160d3b.tar.xz
UXP-4950c982e0465d82a726bd01859fb7fd40160d3b.zip
Issue #618 - Remove eager instantiation - Debug follow up
The added debug assertion did not take into account microtask refactoring done in BZ 1405821. Resulting in error: no member named 'IsInMicroTask' in 'nsContentUtils'. This resolves the error.
-rw-r--r--dom/base/nsJSUtils.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
index 5c7e20424..2e6e345a3 100644
--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
@@ -313,7 +313,8 @@ nsJSUtils::ModuleInstantiate(JSContext* aCx, JS::Handle<JSObject*> aModule)
MOZ_ASSERT(aCx == nsContentUtils::GetCurrentJSContext());
MOZ_ASSERT(NS_IsMainThread());
- MOZ_ASSERT(nsContentUtils::IsInMicroTask());
+ MOZ_ASSERT(CycleCollectedJSContext::Get() &&
+ CycleCollectedJSContext::Get()->MicroTaskLevel());
NS_ENSURE_TRUE(xpc::Scriptability::Get(aModule).Allowed(), NS_OK);