Bug 1485800 - Rename SourceBufferHolder to SourceText, and add a <typename Unit> template parameter to it so it can hold putative UTF-8 or UTF-16 source text. r=tcampbell, r=fitzgen

--HG--
rename : js/public/SourceBufferHolder.h => js/public/SourceText.h
extra : rebase_source : 34df669c2481eaccd6845f53c5ecf656b636f895

Author: jswalden

dom/base/nsFrameMessageManager.cpp

@@ -31,7 +31,7 @@
 #include "xpcpublic.h"
 #include "js/CompilationAndEvaluation.h"
 #include "js/JSON.h"
-#include "js/SourceBufferHolder.h"
+#include "js/SourceText.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/Preferences.h"
@@ -1397,7 +1397,7 @@ nsMessageManagerScriptExecutor::TryCacheLoadAndCompileScript(
 
     JS::UniqueTwoByteChars srcChars(dataStringBuf);
 
-    JS::SourceBufferHolder srcBuf;
+    JS::SourceText<char16_t> srcBuf;
     if (!srcBuf.init(cx, std::move(srcChars), dataStringLength)) {
       return;
     }

dom/base/nsJSUtils.cpp

@@ -16,7 +16,7 @@
 #include "jsfriendapi.h"
 #include "js/CompilationAndEvaluation.h"
 #include "js/OffThreadScriptCompilation.h"
-#include "js/SourceBufferHolder.h"
+#include "js/SourceText.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptElement.h"
 #include "nsIScriptGlobalObject.h"
@@ -98,9 +98,9 @@ nsJSUtils::CompileFunction(AutoJSAPI& jsapi,
   // Compile.
   const nsPromiseFlatString& flatBody = PromiseFlatString(aBody);
 
-  JS::SourceBufferHolder source;
+  JS::SourceText<char16_t> source;
   if (!source.init(cx, flatBody.get(), flatBody.Length(),
-                   JS::SourceBufferHolder::NoOwnership))
+                   JS::SourceOwnership::Borrowed))
   {
     return NS_ERROR_FAILURE;
   }
@@ -224,7 +224,7 @@ nsJSUtils::ExecutionContext::JoinAndExec(JS::OffThreadToken** aOffThreadToken,
 
 nsresult
 nsJSUtils::ExecutionContext::CompileAndExec(JS::CompileOptions& aCompileOptions,
-                                            JS::SourceBufferHolder& aSrcBuf,
+                                            JS::SourceText<char16_t>& aSrcBuf,
                                             JS::MutableHandle<JSScript*> aScript)
 {
   if (mSkip) {
@@ -277,9 +277,9 @@ nsJSUtils::ExecutionContext::CompileAndExec(JS::CompileOptions& aCompileOptions,
   }
 
   const nsPromiseFlatString& flatScript = PromiseFlatString(aScript);
-  JS::SourceBufferHolder srcBuf;
+  JS::SourceText<char16_t> srcBuf;
   if (!srcBuf.init(mCx, flatScript.get(), flatScript.Length(),
-                   JS::SourceBufferHolder::NoOwnership))
+                   JS::SourceOwnership::Borrowed))
   {
     mSkip = true;
     mRv = EvaluationExceptionToNSResult(mCx);
@@ -487,7 +487,7 @@ nsJSUtils::ExecutionContext::ExtractReturnValue(JS::MutableHandle<JS::Value> aRe
 
 nsresult
 nsJSUtils::CompileModule(JSContext* aCx,
-                       JS::SourceBufferHolder& aSrcBuf,
+                       JS::SourceText<char16_t>& aSrcBuf,
                        JS::Handle<JSObject*> aEvaluationGlobal,
                        JS::CompileOptions &aCompileOptions,
                        JS::MutableHandle<JSObject*> aModule)

dom/base/nsJSUtils.h

@@ -20,6 +20,7 @@
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "js/Conversions.h"
+#include "js/SourceText.h"
 #include "js/StableStringChars.h"
 #include "nsString.h"
 
@@ -157,9 +158,9 @@ class nsJSUtils
     MOZ_MUST_USE nsresult JoinAndExec(JS::OffThreadToken** aOffThreadToken,
                                       JS::MutableHandle<JSScript*> aScript);
 
-    // Compile a script contained in a SourceBuffer, and execute it.
+    // Compile a script contained in a SourceText, and execute it.
     nsresult CompileAndExec(JS::CompileOptions& aCompileOptions,
-                            JS::SourceBufferHolder& aSrcBuf,
+                            JS::SourceText<char16_t>& aSrcBuf,
                             JS::MutableHandle<JSScript*> aScript);
 
     // Compile a script contained in a string, and execute it.
@@ -186,7 +187,7 @@ class nsJSUtils
   };
 
   static nsresult CompileModule(JSContext* aCx,
-                                JS::SourceBufferHolder& aSrcBuf,
+                                JS::SourceText<char16_t>& aSrcBuf,
                                 JS::Handle<JSObject*> aEvaluationGlobal,
                                 JS::CompileOptions &aCompileOptions,
                                 JS::MutableHandle<JSObject*> aModule);

dom/script/ScriptLoader.cpp

@@ -16,7 +16,7 @@
 #include "jsfriendapi.h"
 #include "js/CompilationAndEvaluation.h"
 #include "js/OffThreadScriptCompilation.h"
-#include "js/SourceBufferHolder.h"
+#include "js/SourceText.h"
 #include "js/Utility.h"
 #include "xpcpublic.h"
 #include "nsCycleCollectionParticipant.h"
@@ -68,7 +68,7 @@
 #include "nsIScriptError.h"
 #include "nsIOutputStream.h"
 
-using JS::SourceBufferHolder;
+using JS::SourceText;
 
 using mozilla::Telemetry::LABELS_DOM_SCRIPT_PRELOAD_RESULT;
 
@@ -1933,11 +1933,11 @@ ScriptLoader::CompileOffThreadOrProcessRequest(ScriptLoadRequest* aRequest)
   return ProcessRequest(aRequest);
 }
 
-mozilla::Maybe<SourceBufferHolder>
+mozilla::Maybe<SourceText<char16_t>>
 ScriptLoader::GetScriptSource(JSContext* aCx, ScriptLoadRequest* aRequest)
 {
-  // Return a SourceBufferHolder object holding the script's source text.
-  // Ownership of the buffer is transferred to the resulting SourceBufferHolder.
+  // Return a SourceText<char16_t> object holding the script's source text.
+  // Ownership of the buffer is transferred to the resulting holder.
 
   // If there's no script text, we try to get it from the element
   if (aRequest->mIsInline) {
@@ -1952,12 +1952,12 @@ ScriptLoader::GetScriptSource(JSContext* aCx, ScriptLoadRequest* aRequest)
 
     memcpy(chars.get(), inlineData.get(), nbytes);
 
-    SourceBufferHolder srcBuf;
+    SourceText<char16_t> srcBuf;
     if (!srcBuf.init(aCx, std::move(chars), inlineData.Length())) {
       return Nothing();
     }
 
-    return Some(SourceBufferHolder(std::move(srcBuf)));
+    return Some(SourceText<char16_t>(std::move(srcBuf)));
   }
 
   size_t length = aRequest->ScriptText().length();
@@ -1967,12 +1967,12 @@ ScriptLoader::GetScriptSource(JSContext* aCx, ScriptLoadRequest* aRequest)
     return Nothing();
   }
 
-  SourceBufferHolder srcBuf;
+  SourceText<char16_t> srcBuf;
   if (!srcBuf.init(aCx, std::move(chars), length)) {
     return Nothing();
   }
 
-  return Some(SourceBufferHolder(std::move(srcBuf)));
+  return Some(SourceText<char16_t>(std::move(srcBuf)));
 }
 
 nsresult

dom/script/ScriptLoader.h

@@ -32,7 +32,9 @@
 class nsIURI;
 
 namespace JS {
-  class SourceBufferHolder;
+
+template<typename UnitT> class SourceText;
+
 } // namespace JS
 
 namespace mozilla {
@@ -507,8 +509,8 @@ class ScriptLoader final : public nsISupports
 
   void MaybeMoveToLoadedList(ScriptLoadRequest* aRequest);
 
-  mozilla::Maybe<JS::SourceBufferHolder> GetScriptSource(JSContext* aCx,
-                                                         ScriptLoadRequest* aRequest);
+  mozilla::Maybe<JS::SourceText<char16_t>>
+  GetScriptSource(JSContext* aCx, ScriptLoadRequest* aRequest);
 
   void SetModuleFetchStarted(ModuleLoadRequest *aRequest);
   void SetModuleFetchFinishedAndResumeWaitingRequests(ModuleLoadRequest* aRequest,

dom/workers/ScriptLoader.cpp

@@ -28,7 +28,7 @@
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "js/CompilationAndEvaluation.h"
-#include "js/SourceBufferHolder.h"
+#include "js/SourceText.h"
 #include "nsError.h"
 #include "nsContentPolicyUtils.h"
 #include "nsContentUtils.h"
@@ -2134,7 +2134,7 @@ ScriptExecutorRunnable::WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
     std::swap(dataLength, loadInfo.mScriptTextLength);
     std::swap(data, loadInfo.mScriptTextBuf);
 
-    JS::SourceBufferHolder srcBuf;
+    JS::SourceText<char16_t> srcBuf;
     if (!srcBuf.init(aCx, JS::UniqueTwoByteChars(data), dataLength)) {
       mScriptLoader.mRv.StealExceptionFromJSContext(aCx);
       return true;

dom/workers/WorkerPrivate.cpp

@@ -9,7 +9,7 @@
 #include "js/CompilationAndEvaluation.h"
 #include "js/LocaleSensitive.h"
 #include "js/MemoryMetrics.h"
-#include "js/SourceBufferHolder.h"
+#include "js/SourceText.h"
 #include "MessageEventRunnable.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs.h"
@@ -4902,9 +4902,9 @@ WorkerPrivate::RunExpiredTimeouts(JSContext* aCx)
 
       JS::Rooted<JS::Value> unused(aes.cx());
 
-      JS::SourceBufferHolder srcBuf;
+      JS::SourceText<char16_t> srcBuf;
       if (!srcBuf.init(aes.cx(), script.BeginReading(), script.Length(),
-                       JS::SourceBufferHolder::NoOwnership) ||
+                       JS::SourceOwnership::Borrowed) ||
           !JS::Evaluate(aes.cx(), options, srcBuf, &unused))
       {
         if (!JS_IsExceptionPending(aCx)) {

dom/worklet/Worklet.cpp

@@ -17,7 +17,7 @@
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/WorkletImpl.h"
 #include "js/CompilationAndEvaluation.h"
-#include "js/SourceBufferHolder.h"
+#include "js/SourceText.h"
 #include "nsIInputStreamPump.h"
 #include "nsIThreadRetargetableRequest.h"
 #include "nsNetUtil.h"
@@ -402,7 +402,7 @@ ExecutionRunnable::RunOnWorkletThread()
   JSAutoRealm ar(cx, globalObj);
 
   JS::Rooted<JS::Value> unused(cx);
-  JS::SourceBufferHolder buffer;
+  JS::SourceText<char16_t> buffer;
   if (!buffer.init(cx, std::move(mScriptBuffer), mScriptLength) ||
       !JS::Evaluate(cx, compileOptions, buffer, &unused)) {
     ErrorResult error;

dom/xul/XULDocument.cpp

@@ -91,7 +91,7 @@
 #include "nsTextNode.h"
 #include "nsJSUtils.h"
 #include "js/CompilationAndEvaluation.h"
-#include "js/SourceBufferHolder.h"
+#include "js/SourceText.h"
 #include "mozilla/dom/URL.h"
 #include "nsIContentPolicy.h"
 #include "mozAutoDocUpdate.h"
@@ -1295,7 +1295,7 @@ XULDocument::OnStreamComplete(nsIStreamLoader* aLoader,
             std::swap(unitsLength, mOffThreadCompileStringLength);
 
             rv = mCurrentScriptProto->Compile(units, unitsLength,
-                                              JS::SourceBufferHolder::GiveOwnership,
+                                              JS::SourceOwnership::TakeOwnership,
                                               uri, 1, this, this);
             if (NS_SUCCEEDED(rv) && !mCurrentScriptProto->HasScriptObject()) {
                 mOffThreadCompiling = true;

dom/xul/nsXULContentSink.cpp

@@ -507,7 +507,7 @@ XULContentSinkImpl::HandleEndElement(const char16_t *aName)
             script->mOutOfLine = false;
             if (doc) {
                 script->Compile(mText, mTextLength,
-                                JS::SourceBufferHolder::NoOwnership, mDocumentURL,
+                                JS::SourceOwnership::Borrowed, mDocumentURL,
                                 script->mLineNo, doc);
             }
         }