diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-30 11:32:07 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-07-10 18:28:50 +0000 |
| commit | 0633844f46858135ee62d396829c6292492ca117 (patch) | |
| tree | 051f8c4a50ab5c955f5d4e70e4de0ea50151758e /dom/base/nsFrameMessageManager.cpp | |
| parent | d0126b96cd6527e6dc89530b333fb0c196aba30d (diff) | |
| download | UXP-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 'dom/base/nsFrameMessageManager.cpp')
| -rw-r--r-- | dom/base/nsFrameMessageManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp index bba4232aa..331931f19 100644 --- a/dom/base/nsFrameMessageManager.cpp +++ b/dom/base/nsFrameMessageManager.cpp @@ -19,7 +19,6 @@ #include "nsJSUtils.h" #include "nsJSPrincipals.h" #include "nsNetUtil.h" -#include "nsScriptLoader.h" #include "nsFrameLoader.h" #include "nsIXULRuntime.h" #include "nsIScriptError.h" @@ -38,6 +37,7 @@ #include "mozilla/dom/PermissionMessageUtils.h" #include "mozilla/dom/ProcessGlobal.h" #include "mozilla/dom/SameProcessMessageQueue.h" +#include "mozilla/dom/ScriptLoader.h" #include "mozilla/dom/ScriptSettings.h" #include "mozilla/dom/ipc/BlobChild.h" #include "mozilla/dom/ipc/BlobParent.h" @@ -1786,9 +1786,9 @@ nsMessageManagerScriptExecutor::TryCacheLoadAndCompileScript( if (NS_FAILED(NS_ReadInputStreamToString(input, buffer, avail))) { return; } - nsScriptLoader::ConvertToUTF16(channel, (uint8_t*)buffer.get(), avail, - EmptyString(), nullptr, - dataStringBuf, dataStringLength); + ScriptLoader::ConvertToUTF16(channel, (uint8_t*)buffer.get(), avail, + EmptyString(), nullptr, + dataStringBuf, dataStringLength); } JS::SourceBufferHolder srcBuf(dataStringBuf, dataStringLength, |