summaryrefslogtreecommitdiffstats
path: root/js/xpconnect
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-06-30 11:32:07 +0000
committerMoonchild <moonchild@palemoon.org>2020-07-10 18:28:50 +0000
commit0633844f46858135ee62d396829c6292492ca117 (patch)
tree051f8c4a50ab5c955f5d4e70e4de0ea50151758e /js/xpconnect
parentd0126b96cd6527e6dc89530b333fb0c196aba30d (diff)
downloadUXP-0633844f46858135ee62d396829c6292492ca117.tar
UXP-0633844f46858135ee62d396829c6292492ca117.tar.gz
UXP-0633844f46858135ee62d396829c6292492ca117.tar.lz
UXP-0633844f46858135ee62d396829c6292492ca117.tar.xz
UXP-0633844f46858135ee62d396829c6292492ca117.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')
-rw-r--r--js/xpconnect/loader/mozJSSubScriptLoader.cpp12
-rw-r--r--js/xpconnect/src/XPCJSContext.cpp6
2 files changed, 9 insertions, 9 deletions
diff --git a/js/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/xpconnect/loader/mozJSSubScriptLoader.cpp
index f23e5833a..baf7a9392 100644
--- a/js/xpconnect/loader/mozJSSubScriptLoader.cpp
+++ b/js/xpconnect/loader/mozJSSubScriptLoader.cpp
@@ -15,7 +15,6 @@
#include "nsNetCID.h"
#include "nsNetUtil.h"
#include "nsIFileURL.h"
-#include "nsScriptLoader.h"
#include "nsIScriptSecurityManager.h"
#include "nsThreadUtils.h"
@@ -26,6 +25,7 @@
#include "jswrapper.h"
#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/ScriptLoader.h"
#include "mozilla/dom/ToJSValue.h"
#include "mozilla/HoldDropJSObjects.h"
#include "mozilla/scache/StartupCache.h"
@@ -139,8 +139,8 @@ PrepareScript(nsIURI* uri,
size_t scriptLength = 0;
nsresult rv =
- nsScriptLoader::ConvertToUTF16(nullptr, reinterpret_cast<const uint8_t*>(buf), len,
- charset, nullptr, scriptBuf, scriptLength);
+ ScriptLoader::ConvertToUTF16(nullptr, reinterpret_cast<const uint8_t*>(buf), len,
+ charset, nullptr, scriptBuf, scriptLength);
JS::SourceBufferHolder srcBuf(scriptBuf, scriptLength,
JS::SourceBufferHolder::GiveOwnership);
@@ -826,9 +826,9 @@ ScriptPrecompiler::OnStreamComplete(nsIIncrementalStreamLoader* aLoader,
// Convert data to char16_t* and prepare to call CompileOffThread.
nsAutoString hintCharset;
nsresult rv =
- nsScriptLoader::ConvertToUTF16(mChannel, aString, aLength,
- hintCharset, nullptr,
- mScriptBuf, mScriptLength);
+ ScriptLoader::ConvertToUTF16(mChannel, aString, aLength,
+ hintCharset, nullptr,
+ mScriptBuf, mScriptLength);
NS_ENSURE_SUCCESS(rv, NS_OK);
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)