diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-07-01 12:57:29 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-07-01 12:57:29 +0000 |
| commit | fd602fbffbaf8e7d7e58c9ffe9b0b188cb7c65de (patch) | |
| tree | 29ef38e1656883879b306f750dfec5a3281f5c94 /dom/workers/ServiceWorkerScriptCache.cpp | |
| parent | c7330b5eb48cdd69b06e5f55643ea4c94303381f (diff) | |
| parent | 9056191e67055c5e96ecc352e592ea9ae94a2236 (diff) | |
| download | UXP-fd602fbffbaf8e7d7e58c9ffe9b0b188cb7c65de.tar UXP-fd602fbffbaf8e7d7e58c9ffe9b0b188cb7c65de.tar.gz UXP-fd602fbffbaf8e7d7e58c9ffe9b0b188cb7c65de.tar.lz UXP-fd602fbffbaf8e7d7e58c9ffe9b0b188cb7c65de.tar.xz UXP-fd602fbffbaf8e7d7e58c9ffe9b0b188cb7c65de.zip | |
Merge branch 'es-modules-work'
Diffstat (limited to 'dom/workers/ServiceWorkerScriptCache.cpp')
| -rw-r--r-- | dom/workers/ServiceWorkerScriptCache.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dom/workers/ServiceWorkerScriptCache.cpp b/dom/workers/ServiceWorkerScriptCache.cpp index f44bb673c..707b689e8 100644 --- a/dom/workers/ServiceWorkerScriptCache.cpp +++ b/dom/workers/ServiceWorkerScriptCache.cpp @@ -11,6 +11,7 @@ #include "mozilla/dom/cache/Cache.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/PromiseWorkerProxy.h" +#include "mozilla/dom/ScriptLoader.h" #include "mozilla/ipc/BackgroundUtils.h" #include "mozilla/ipc/PBackgroundSharedTypes.h" #include "nsICacheInfoChannel.h" @@ -23,7 +24,6 @@ #include "nsIScriptError.h" #include "nsContentUtils.h" #include "nsNetUtil.h" -#include "nsScriptLoader.h" #include "ServiceWorkerManager.h" #include "Workers.h" #include "nsStringStream.h" @@ -801,9 +801,9 @@ CompareNetwork::OnStreamComplete(nsIStreamLoader* aLoader, nsISupports* aContext char16_t* buffer = nullptr; size_t len = 0; - rv = nsScriptLoader::ConvertToUTF16(httpChannel, aString, aLen, - NS_LITERAL_STRING("UTF-8"), nullptr, - buffer, len); + rv = ScriptLoader::ConvertToUTF16(httpChannel, aString, aLen, + NS_LITERAL_STRING("UTF-8"), nullptr, + buffer, len); if (NS_WARN_IF(NS_FAILED(rv))) { mManager->NetworkFinished(rv); return rv; @@ -855,9 +855,9 @@ CompareCache::OnStreamComplete(nsIStreamLoader* aLoader, nsISupports* aContext, char16_t* buffer = nullptr; size_t len = 0; - nsresult rv = nsScriptLoader::ConvertToUTF16(nullptr, aString, aLen, - NS_LITERAL_STRING("UTF-8"), - nullptr, buffer, len); + nsresult rv = ScriptLoader::ConvertToUTF16(nullptr, aString, aLen, + NS_LITERAL_STRING("UTF-8"), + nullptr, buffer, len); if (NS_WARN_IF(NS_FAILED(rv))) { mManager->CacheFinished(rv, false); return rv; |