summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaming4JC <g4jc@hyperbola.info>2019-06-08 21:29:59 -0400
committerGaming4JC <g4jc@hyperbola.info>2019-07-18 22:38:25 -0400
commitfcfaa4fbee917f821806a70b2000a91a97948c11 (patch)
treeb59bad340a49ba5aacadee70df12a88c71b060a0
parent93335c3120968fac165a95978ef0dbdffe7900b4 (diff)
downloadUXP-fcfaa4fbee917f821806a70b2000a91a97948c11.tar
UXP-fcfaa4fbee917f821806a70b2000a91a97948c11.tar.gz
UXP-fcfaa4fbee917f821806a70b2000a91a97948c11.tar.lz
UXP-fcfaa4fbee917f821806a70b2000a91a97948c11.tar.xz
UXP-fcfaa4fbee917f821806a70b2000a91a97948c11.zip
1320408 - Change JSScript::sourceDataWithPrelude to static method
UXP Interdiff
-rw-r--r--js/src/jsscript.cpp8
-rw-r--r--js/src/jsscript.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 36060e4c0..ddc98ef3f 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -1442,11 +1442,11 @@ JSScript::sourceData(JSContext* cx, HandleScript script)
return script->scriptSource()->substring(cx, script->sourceStart(), script->sourceEnd());
}
-JSFlatString*
-JSScript::sourceDataWithPrelude(JSContext* cx)
+/* static */ JSFlatString*
+JSScript::sourceDataWithPrelude(JSContext* cx, HandleScript script)
{
- MOZ_ASSERT(scriptSource()->hasSourceData());
- return scriptSource()->substring(cx, preludeStart(), sourceEnd());
+ MOZ_ASSERT(script->scriptSource()->hasSourceData());
+ return script->scriptSource()->substring(cx, script->preludeStart(), script->sourceEnd());
}
UncompressedSourceCache::AutoHoldEntry::AutoHoldEntry()
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 74cefea07..62502a3c7 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -1519,7 +1519,7 @@ class JSScript : public js::gc::TenuredCell
bool mayReadFrameArgsDirectly();
static JSFlatString* sourceData(JSContext* cx, JS::HandleScript script);
- JSFlatString* sourceDataWithPrelude(JSContext* cx);
+ static JSFlatString* sourceDataWithPrelude(JSContext* cx, JS::HandleScript script);
static bool loadSource(JSContext* cx, js::ScriptSource* ss, bool* worked);