diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-30 11:32:07 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-30 11:51:11 +0000 |
| commit | c45b7ee3a985b2b4862fb182cdb34f644f737048 (patch) | |
| tree | 53da33f85383ce934145da45b1ad4963b8e94f35 /js/xpconnect/src | |
| parent | c7330b5eb48cdd69b06e5f55643ea4c94303381f (diff) | |
| download | UXP-c45b7ee3a985b2b4862fb182cdb34f644f737048.tar UXP-c45b7ee3a985b2b4862fb182cdb34f644f737048.tar.gz UXP-c45b7ee3a985b2b4862fb182cdb34f644f737048.tar.lz UXP-c45b7ee3a985b2b4862fb182cdb34f644f737048.tar.xz UXP-c45b7ee3a985b2b4862fb182cdb34f644f737048.zip | |
Issue #1603 - Part 1: Reorganize ScriptLoader/ScriptElement
- Moves scripting parts of DOM into 'dom/script'
- Renames nsScript{Loader/Element} to Script{Loader/Element}
- Adjusts all callers
Diffstat (limited to 'js/xpconnect/src')
| -rw-r--r-- | js/xpconnect/src/XPCJSContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp index bde949a96..511bc8a98 100644 --- a/js/xpconnect/src/XPCJSContext.cpp +++ b/js/xpconnect/src/XPCJSContext.cpp @@ -35,13 +35,13 @@ #include "nsCCUncollectableMarker.h" #include "nsCycleCollectionNoteRootCallback.h" #include "nsCycleCollector.h" -#include "nsScriptLoader.h" #include "jsapi.h" #include "jsprf.h" #include "js/MemoryMetrics.h" #include "mozilla/dom/GeneratedAtomList.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/Element.h" +#include "mozilla/dom/ScriptLoader.h" #include "mozilla/dom/WindowBinding.h" #include "mozilla/jsipc/CrossProcessObjectWrappers.h" #include "mozilla/Atomics.h" @@ -3035,8 +3035,8 @@ ReadSourceFromFilename(JSContext* cx, const char* filename, char16_t** src, size ptr += bytesRead; } - rv = nsScriptLoader::ConvertToUTF16(scriptChannel, buf.get(), rawLen, EmptyString(), - nullptr, *src, *len); + rv = ScriptLoader::ConvertToUTF16(scriptChannel, buf.get(), rawLen, EmptyString(), + nullptr, *src, *len); NS_ENSURE_SUCCESS(rv, rv); if (!*src) |