Bug 1272697 - Part 2: Add runtime pref to enable streams. r=baku,jonco

MozReview-Commit-ID: 5OSxbcd3jQB

dom/base/nsFrameMessageManager.cpp

@@ -1713,6 +1713,10 @@ nsMessageManagerScriptExecutor::InitChildGlobalInternal(
     options.creationOptions().setSharedMemoryAndAtomicsEnabled(true);
   }
 
+  if (xpc::DOMStreamsEnabled()) {
+    options.creationOptions().setStreamsEnabled(true);
+  }
+
   nsCOMPtr<nsIXPConnectJSObjectHolder> globalHolder;
   nsresult rv =
     xpc->InitClassesWithNewWrappedGlobal(cx, aScope, mPrincipal,

dom/bindings/BindingUtils.h

@@ -3106,6 +3106,9 @@ CreateGlobal(JSContext* aCx, T* aNative, nsWrapperCache* aCache,
   if (xpc::SharedMemoryEnabled()) {
     aOptions.creationOptions().setSharedMemoryAndAtomicsEnabled(true);
   }
+  if (xpc::DOMStreamsEnabled()) {
+    aOptions.creationOptions().setStreamsEnabled(true);
+  }
 
   aGlobal.set(JS_NewGlobalObject(aCx, aClass, aPrincipal,
                                  JS::DontFireOnNewGlobalHook, aOptions));

dom/ipc/ContentPrefs.cpp

@@ -58,6 +58,7 @@ const char* mozilla::dom::ContentPrefs::gInitPrefs[] = {
   "dom.performance.enable_notify_performance_timing",
   "dom.performance.enable_user_timing_logging",
   "dom.storage.testing",
+  "dom.streams.enabled",
   "dom.url.encode_decode_hash",
   "dom.url.getters_decode_hash",
   "dom.use_watchdog",

dom/workers/WorkerScope.cpp

@@ -545,9 +545,11 @@ DedicatedWorkerGlobalScope::WrapGlobalObject(JSContext* aCx,
            .extraWarningsOverride().set(extraWarnings);
 
   const bool sharedMemoryEnabled = xpc::SharedMemoryEnabled();
+  const bool domStreamsEnabled = xpc::DOMStreamsEnabled();
 
   JS::CompartmentCreationOptions& creationOptions = options.creationOptions();
   creationOptions.setSharedMemoryAndAtomicsEnabled(sharedMemoryEnabled);
+  creationOptions.setStreamsEnabled(domStreamsEnabled);
 
   return DedicatedWorkerGlobalScopeBinding::Wrap(aCx, this, this,
                                                  options,

ipc/testshell/XPCShellEnvironment.cpp

@@ -455,6 +455,8 @@ XPCShellEnvironment::Init()
     options.behaviors().setVersion(JSVERSION_LATEST);
     if (xpc::SharedMemoryEnabled())
         options.creationOptions().setSharedMemoryAndAtomicsEnabled(true);
+    if (xpc::DOMStreamsEnabled())
+        options.creationOptions().setStreamsEnabled(true);
 
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
     rv = xpc->InitClassesWithNewWrappedGlobal(cx,

js/src/jsapi.cpp

@@ -1897,6 +1897,25 @@ JS::CompartmentCreationOptions::setSharedMemoryAndAtomicsEnabled(bool flag)
     return *this;
 }
 
+bool
+JS::CompartmentCreationOptions::getStreamsEnabled() const
+{
+#if defined(ENABLE_STREAMS)
+    return streamsEnabled_;
+#else
+    return false;
+#endif
+}
+
+JS::CompartmentCreationOptions&
+JS::CompartmentCreationOptions::setStreamsEnabled(bool flag)
+{
+#if defined(ENABLE_STREAMS)
+    streamsEnabled_ = flag;
+#endif
+    return *this;
+}
+
 JS::CompartmentBehaviors&
 JS::CompartmentBehaviorsRef(JSCompartment* compartment)
 {

js/src/jsapi.h

@@ -2325,6 +2325,7 @@ class JS_PUBLIC_API(CompartmentCreationOptions)
         cloneSingletons_(false),
         experimentalNumberFormatFormatToPartsEnabled_(false),
         sharedMemoryAndAtomics_(false),
+        streamsEnabled_(false),
         secureContext_(false)
     {}
 
@@ -2408,6 +2409,9 @@ class JS_PUBLIC_API(CompartmentCreationOptions)
     bool getSharedMemoryAndAtomicsEnabled() const;
     CompartmentCreationOptions& setSharedMemoryAndAtomicsEnabled(bool flag);
 
+    bool getStreamsEnabled() const;
+    CompartmentCreationOptions& setStreamsEnabled(bool flag);
+
     // This flag doesn't affect JS engine behavior.  It is used by Gecko to
     // mark whether content windows and workers are "Secure Context"s. See
     // https://w3c.github.io/webappsec-secure-contexts/
@@ -2429,6 +2433,7 @@ class JS_PUBLIC_API(CompartmentCreationOptions)
     bool cloneSingletons_;
     bool experimentalNumberFormatFormatToPartsEnabled_;
     bool sharedMemoryAndAtomics_;
+    bool streamsEnabled_;
     bool secureContext_;
 };
 

js/src/shell/js.cpp

@@ -265,6 +265,7 @@ static bool enableWasm = false;
 static bool enableNativeRegExp = false;
 static bool enableUnboxedArrays = false;
 static bool enableSharedMemory = SHARED_MEMORY_DEFAULT;
+static bool enableStreams = true;
 static bool enableWasmAlwaysBaseline = false;
 static bool enableAsyncStacks = false;
 #ifdef JS_GC_ZEAL
@@ -3146,6 +3147,7 @@ SetStandardCompartmentOptions(JS::CompartmentOptions& options)
 {
     options.behaviors().setVersion(JSVERSION_DEFAULT);
     options.creationOptions().setSharedMemoryAndAtomicsEnabled(enableSharedMemory);
+    options.creationOptions().setStreamsEnabled(enableStreams);
 }
 
 static JSObject*
@@ -8030,6 +8032,17 @@ SetContextOptions(JSContext* cx, const OptionParser& op)
     }
 #endif
 
+#ifdef ENABLE_STREAMS
+    if (const char* str = op.getStringOption("streams")) {
+        if (strcmp(str, "off") == 0)
+            enableStreams = false;
+        else if (strcmp(str, "on") == 0)
+            enableStreams = true;
+        else
+            return OptionFailure("streams", str);
+    }
+#endif
+
 #if defined(JS_CODEGEN_ARM)
     if (const char* str = op.getStringOption("arm-hwcap"))
         jit::ParseARMHwCapFlags(str);
@@ -8313,6 +8326,12 @@ main(int argc, char** argv, char** envp)
                                "(default: off, on to enable)"
 #  endif
             )
+#endif
+#ifdef ENABLE_STREAMS
+        || !op.addStringOption('\0', "streams", "on/off",
+                               "WHATWG Streams "
+                               "(default: on, off to disable)"
+            )
 #endif
         || !op.addStringOption('\0', "cache-ir-stubs", "on/off",
                                "Use CacheIR stubs (default: on, off to disable)")

js/xpconnect/loader/mozJSComponentLoader.cpp

@@ -473,6 +473,9 @@ mozJSComponentLoader::CreateLoaderGlobal(JSContext* aCx,
     if (xpc::SharedMemoryEnabled())
         options.creationOptions().setSharedMemoryAndAtomicsEnabled(true);
 
+    if (xpc::DOMStreamsEnabled())
+        options.creationOptions().setStreamsEnabled(true);
+
     // Defer firing OnNewGlobalObject until after the __URI__ property has
     // been defined so the JS debugger can tell what module the global is
     // for

js/xpconnect/src/Sandbox.cpp

@@ -1072,6 +1072,9 @@ xpc::CreateSandboxObject(JSContext* cx, MutableHandleValue vp, nsISupports* prin
     if (xpc::SharedMemoryEnabled())
         creationOptions.setSharedMemoryAndAtomicsEnabled(true);
 
+    if (xpc::DOMStreamsEnabled())
+        creationOptions.setStreamsEnabled(true);
+
     if (options.sameZoneAs)
         creationOptions.setExistingZone(js::UncheckedUnwrap(options.sameZoneAs));
     else if (options.freshZone)

js/xpconnect/src/XPCJSContext.cpp

@@ -599,6 +599,11 @@ static mozilla::Atomic<bool> sSharedMemoryEnabled(false);
 bool
 xpc::SharedMemoryEnabled() { return sSharedMemoryEnabled; }
 
+static mozilla::Atomic<bool> sDOMStreamsEnabled(false);
+
+bool
+xpc::DOMStreamsEnabled() { return sDOMStreamsEnabled; }
+
 static void
 ReloadPrefsCallback(const char* pref, void* data)
 {
@@ -648,6 +653,7 @@ ReloadPrefsCallback(const char* pref, void* data)
     bool extraWarnings = Preferences::GetBool(JS_OPTIONS_DOT_STR "strict");
 
     sSharedMemoryEnabled = Preferences::GetBool(JS_OPTIONS_DOT_STR "shared_memory");
+    sDOMStreamsEnabled = Preferences::GetBool("dom.streams.enabled");
 
 #ifdef DEBUG
     sExtraWarningsForSystemJS = Preferences::GetBool(JS_OPTIONS_DOT_STR "strict.debug");

js/xpconnect/src/XPCShellImpl.cpp

@@ -1435,6 +1435,8 @@ XRE_XPCShellMain(int argc, char** argv, char** envp,
         options.creationOptions().setNewZoneInSystemZoneGroup();
         if (xpc::SharedMemoryEnabled())
             options.creationOptions().setSharedMemoryAndAtomicsEnabled(true);
+        if (xpc::DOMStreamsEnabled())
+            options.creationOptions().setStreamsEnabled(true);
         options.behaviors().setVersion(JSVERSION_LATEST);
         nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
         rv = nsXPConnect::XPConnect()->

js/xpconnect/src/XPCWrappedNative.cpp

@@ -180,6 +180,8 @@ XPCWrappedNative::WrapNewGlobal(xpcObjectHelper& nativeHelper,
     aOptions.creationOptions().setTrace(XPCWrappedNative::Trace);
     if (xpc::SharedMemoryEnabled())
         aOptions.creationOptions().setSharedMemoryAndAtomicsEnabled(true);
+    if (xpc::DOMStreamsEnabled())
+        aOptions.creationOptions().setStreamsEnabled(true);
     RootedObject global(cx, xpc::CreateGlobalObject(cx, clasp, principal, aOptions));
     if (!global)
         return NS_ERROR_FAILURE;

js/xpconnect/src/xpcpublic.h

@@ -483,6 +483,9 @@ ShouldDiscardSystemSource();
 bool
 SharedMemoryEnabled();
 
+bool
+DOMStreamsEnabled();
+
 bool
 SetAddonInterposition(const nsACString& addonId, nsIAddonInterposition* interposition);
 

modules/libpref/init/all.js

@@ -1480,6 +1480,9 @@ pref("javascript.options.shared_memory", true);
 pref("javascript.options.throw_on_debuggee_would_run", false);
 pref("javascript.options.dump_stack_on_debuggee_would_run", false);
 
+// Streams API
+pref("dom.streams.enabled", false);
+
 // advanced prefs
 pref("advanced.mailftp",                    false);
 pref("image.animation_mode",                "normal");