Issue #2692 - Part 6: Don't #include js/SourceBufferHolder.h in jsapi.h.

Instead, require users to do so. This is a minor translation-unit size
improvement for anyone who never has to use SourceBufferHolder other than
by reference.

dom/base/nsFrameMessageManager.cpp

@@ -27,6 +27,7 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsIDOMClassInfo.h"
 #include "xpcpublic.h"
+#include "js/SourceBufferHolder.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/IntentionalCrash.h"
 #include "mozilla/Preferences.h"

dom/base/nsJSUtils.cpp

@@ -13,6 +13,7 @@
 #include "nsJSUtils.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
+#include "js/SourceBufferHolder.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIXPConnect.h"

dom/script/ScriptLoader.cpp

@@ -11,6 +11,7 @@
 #include "prsystem.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
+#include "js/SourceBufferHolder.h"
 #include "xpcpublic.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIContent.h"

dom/workers/ScriptLoader.cpp

@@ -24,6 +24,7 @@
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
+#include "js/SourceBufferHolder.h"
 #include "nsError.h"
 #include "nsContentPolicyUtils.h"
 #include "nsContentUtils.h"

dom/workers/WorkerPrivate.cpp

@@ -37,6 +37,7 @@
 #include "ImageContainer.h"
 #include "jsfriendapi.h"
 #include "js/MemoryMetrics.h"
+#include "js/SourceBufferHolder.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ContentEvents.h"

dom/worklet/Worklet.cpp

@@ -13,6 +13,7 @@
 #include "mozilla/dom/Response.h"
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "js/SourceBufferHolder.h"
 #include "nsIInputStreamPump.h"
 #include "nsIThreadRetargetableRequest.h"
 #include "nsNetUtil.h"

dom/xul/XULDocument.cpp

@@ -88,6 +88,7 @@
 #include "mozilla/Preferences.h"
 #include "nsTextNode.h"
 #include "nsJSUtils.h"
+#include "js/SourceBufferHolder.h"
 #include "mozilla/dom/URL.h"
 #include "nsIContentPolicy.h"
 #include "mozAutoDocUpdate.h"

dom/xul/nsXULElement.cpp

@@ -26,6 +26,7 @@
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
 #include "mozilla/EventStates.h"
+#include "js/SourceBufferHolder.h"
 #include "nsFocusManager.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsNameSpaceManager.h"

ipc/testshell/XPCShellEnvironment.cpp

@@ -15,6 +15,7 @@
 #include "base/basictypes.h"
 
 #include "jsapi.h"
+#include "js/SourceBufferHolder.h"
 
 #include "xpcpublic.h"
 

js/src/NamespaceImports.h

@@ -113,7 +113,6 @@ using JS::IsAcceptableThis;
 using JS::NativeImpl;
 using JS::OwningCompileOptions;
 using JS::ReadOnlyCompileOptions;
-using JS::SourceBufferHolder;
 using JS::TransitiveCompileOptions;
 
 using JS::Rooted;

js/src/builtin/Eval.cpp

@@ -12,6 +12,7 @@
 #include "jshashutil.h"
 
 #include "frontend/BytecodeCompiler.h"
+#include "js/SourceBufferHolder.h"
 #include "vm/Debugger.h"
 #include "vm/GlobalObject.h"
 #include "vm/JSONParser.h"
@@ -25,6 +26,7 @@ using mozilla::HashString;
 using mozilla::RangedPtr;
 
 using JS::AutoCheckCannotGC;
+using JS::SourceBufferHolder;
 
 // We should be able to assert this for *any* fp->environmentChain().
 static void

js/src/frontend/BytecodeCompiler.cpp

@@ -16,6 +16,7 @@
 #include "frontend/FoldConstants.h"
 #include "frontend/NameFunctions.h"
 #include "frontend/Parser.h"
+#include "js/SourceBufferHolder.h"
 #include "vm/GlobalObject.h"
 #include "vm/TraceLogging.h"
 #include "wasm/AsmJS.h"
@@ -27,9 +28,12 @@
 
 using namespace js;
 using namespace js::frontend;
+
 using mozilla::Maybe;
 using mozilla::Nothing;
 
+using JS::SourceBufferHolder;
+
 class MOZ_STACK_CLASS AutoCompilationTraceLogger
 {
   public:

js/src/frontend/BytecodeCompiler.h

@@ -28,7 +28,7 @@ namespace frontend {
 JSScript*
 CompileGlobalScript(ExclusiveContext* cx, LifoAlloc& alloc, ScopeKind scopeKind,
                     const ReadOnlyCompileOptions& options,
-                    SourceBufferHolder& srcBuf,
+                    JS::SourceBufferHolder& srcBuf,
                     SourceCompressionTask* extraSct = nullptr,
                     ScriptSourceObject** sourceObjectOut = nullptr);
 
@@ -36,17 +36,17 @@ JSScript*
 CompileEvalScript(ExclusiveContext* cx, LifoAlloc& alloc,
                   HandleObject scopeChain, HandleScope enclosingScope,
                   const ReadOnlyCompileOptions& options,
-                  SourceBufferHolder& srcBuf,
+                  JS::SourceBufferHolder& srcBuf,
                   SourceCompressionTask* extraSct = nullptr,
                   ScriptSourceObject** sourceObjectOut = nullptr);
 
 ModuleObject*
 CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
-              SourceBufferHolder& srcBuf);
+              JS::SourceBufferHolder& srcBuf);
 
 ModuleObject*
 CompileModule(ExclusiveContext* cx, const ReadOnlyCompileOptions& options,
-              SourceBufferHolder& srcBuf, LifoAlloc& alloc,
+              JS::SourceBufferHolder& srcBuf, LifoAlloc& alloc,
               ScriptSourceObject** sourceObjectOut = nullptr);
 
 MOZ_MUST_USE bool

js/src/jsapi-tests/testJSEvaluateScript.cpp

@@ -1,6 +1,7 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  */
 
+#include "js/SourceBufferHolder.h"
 #include "jsapi-tests/tests.h"
 
 using mozilla::ArrayLength;

js/src/jsapi-tests/testMutedErrors.cpp

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsfriendapi.h"
+#include "js/SourceBufferHolder.h"
 #include "jsapi-tests/tests.h"
 
 BEGIN_TEST(testMutedErrors)

js/src/jsapi-tests/testScriptObject.cpp

@@ -4,6 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "js/SourceBufferHolder.h"
 #include "jsapi-tests/tests.h"
 
 struct ScriptObjectFixture : public JSAPITest {

js/src/jsapi.cpp

@@ -63,6 +63,7 @@
 #include "js/Initialization.h"
 #include "js/Proxy.h"
 #include "js/SliceBudget.h"
+#include "js/SourceBufferHolder.h"
 #include "js/StructuredClone.h"
 #include "js/Utility.h"
 #include "vm/AsyncFunction.h"
@@ -106,6 +107,7 @@ using mozilla::PodZero;
 using mozilla::Some;
 
 using JS::AutoGCRooter;
+using JS::SourceBufferHolder;
 using JS::ToInt32;
 using JS::ToInteger;
 using JS::ToUint32;

js/src/jsapi.h

@@ -38,7 +38,6 @@
 #include "js/Principals.h"
 #include "js/Realm.h"
 #include "js/RootingAPI.h"
-#include "js/SourceBufferHolder.h"
 #include "js/Stream.h"
 #include "js/TracingAPI.h"
 #include "js/Transcoding.h"

js/src/jsfun.cpp

@@ -39,6 +39,7 @@
 #include "jit/JitFrameIterator.h"
 #include "js/CallNonGenericMethod.h"
 #include "js/Proxy.h"
+#include "js/SourceBufferHolder.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
 #include "vm/Debugger.h"
@@ -67,6 +68,7 @@ using mozilla::PodCopy;
 using mozilla::RangedPtr;
 using mozilla::Some;
 
+using JS::SourceBufferHolder;
 static bool
 fun_enumerate(JSContext* cx, HandleObject obj)
 {

js/src/jsscript.cpp

@@ -41,6 +41,7 @@
 #include "jit/Ion.h"
 #include "jit/IonCode.h"
 #include "js/MemoryMetrics.h"
+#include "js/SourceBufferHolder.h"
 #include "js/Utility.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/Compression.h"
@@ -68,6 +69,8 @@ using mozilla::PodCopy;
 using mozilla::PodZero;
 using mozilla::RotateLeft;
 
+using JS::SourceBufferHolder;
+
 template<XDRMode mode>
 bool
 js::XDRScriptConst(XDRState<mode>* xdr, MutableHandleValue vp)

js/src/shell/js.cpp

@@ -74,6 +74,7 @@
 #include "js/Equality.h"  // JS::SameValue
 #include "js/GCAPI.h"
 #include "js/Initialization.h"
+#include "js/SourceBufferHolder.h"
 #include "js/StructuredClone.h"
 #include "js/TrackedOptimizationInfo.h"
 #include "perf/jsperf.h"
@@ -4062,8 +4063,8 @@ ParseModule(JSContext* cx, unsigned argc, Value* vp)
         return false;
 
     const char16_t* chars = stableChars.twoByteRange().begin().get();
-    SourceBufferHolder srcBuf(chars, scriptContents->length(),
-                              SourceBufferHolder::NoOwnership);
+    JS::SourceBufferHolder srcBuf(chars, scriptContents->length(),
+                                  SourceBufferHolder::NoOwnership);
 
     RootedObject module(cx, frontend::CompileModule(cx, options, srcBuf));
     if (!module)

js/src/vm/Debugger.cpp

@@ -27,6 +27,7 @@
 #include "jit/BaselineJIT.h"
 #include "js/Date.h"
 #include "js/GCAPI.h"
+#include "js/SourceBufferHolder.h"
 #include "js/UbiNodeBreadthFirst.h"
 #include "js/Vector.h"
 #include "proxy/ScriptedProxyHandler.h"
@@ -51,6 +52,7 @@ using namespace js;
 using JS::dbg::AutoEntryMonitor;
 using JS::dbg::Builder;
 using js::frontend::IsIdentifier;
+using JS::SourceBufferHolder;
 using mozilla::ArrayLength;
 using mozilla::DebugOnly;
 using mozilla::MakeScopeExit;

js/src/vm/HelperThreads.cpp

@@ -10,6 +10,7 @@
 
 #include "jsnativestack.h"
 #include "jsnum.h" // For FIX_FPU()
+#include "js/SourceBufferHolder.h"
 
 #include "builtin/Promise.h"
 #include "frontend/BytecodeCompiler.h"
@@ -33,6 +34,8 @@ using mozilla::DebugOnly;
 using mozilla::Unused;
 using mozilla::TimeDuration;
 
+using JS::SourceBufferHolder;
+
 namespace js {
 
 GlobalHelperThreadState* gHelperThreadState = nullptr;

js/src/vm/HelperThreads.h

@@ -21,6 +21,7 @@
 
 #include "frontend/TokenStream.h"
 #include "jit/Ion.h"
+#include "js/SourceBufferHolder.h"
 #include "threading/ConditionVariable.h"
 #include "vm/MutexIDs.h"
 

js/src/wasm/AsmJS.cpp

@@ -33,6 +33,7 @@
 #include "frontend/Parser.h"
 #include "gc/Policy.h"
 #include "js/MemoryMetrics.h"
+#include "js/SourceBufferHolder.h"
 #include "vm/SelfHosting.h"
 #include "vm/StringBuffer.h"
 #include "vm/Time.h"
@@ -67,6 +68,7 @@ using mozilla::PodZero;
 using mozilla::PositiveInfinity;
 using JS::AsmJSOption;
 using JS::GenericNaN;
+using JS::SourceBufferHolder;
 
 /*****************************************************************************/
 

js/xpconnect/loader/mozJSComponentLoader.cpp

@@ -17,6 +17,7 @@
 #endif
 
 #include "jsapi.h"
+#include "js/SourceBufferHolder.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsIComponentManager.h"

js/xpconnect/loader/mozJSSubScriptLoader.cpp

@@ -19,6 +19,7 @@
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
+#include "js/SourceBufferHolder.h"
 #include "nsJSPrincipals.h"
 #include "xpcprivate.h" // For xpc::OptionsBase
 #include "jswrapper.h"

js/xpconnect/src/Sandbox.cpp

@@ -10,6 +10,7 @@
 #include "AccessCheck.h"
 #include "jsfriendapi.h"
 #include "js/Proxy.h"
+#include "js/SourceBufferHolder.h"
 #include "js/StructuredClone.h"
 #include "nsContentUtils.h"
 #include "nsGlobalWindow.h"