Bug 1187371 - Get rid of dom.broadcastChannel.enabled pref, r=bz

mozilla-spidermonkey · Jul 26, 2015 · 71dc1a3 · 71dc1a3
1 parent 68c3d3f
commit 71dc1a3
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 151 deletions.
diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
@@ -1118,9 +1118,6 @@ pref("services.mobileid.server.uri", "https://msisdn.services.mozilla.com");
 pref("dom.mapped_arraybuffer.enabled", true);
 #endif
 
-// BroadcastChannel API
-pref("dom.broadcastChannel.enabled", true);
-
 // SystemUpdate API
 pref("dom.system_update.enabled", true);
 

diff --git a/dom/broadcastchannel/BroadcastChannel.cpp b/dom/broadcastchannel/BroadcastChannel.cpp
@@ -12,7 +12,6 @@
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/PBackgroundChild.h"
-#include "mozilla/Preferences.h"
 #include "WorkerPrivate.h"
 #include "WorkerRunnable.h"
 
@@ -299,50 +298,8 @@ class BroadcastChannelFeature final : public workers::WorkerFeature
   }
 };
 
-class PrefEnabledRunnable final : public WorkerMainThreadRunnable
-{
-public:
-  explicit PrefEnabledRunnable(WorkerPrivate* aWorkerPrivate)
-    : WorkerMainThreadRunnable(aWorkerPrivate)
-    , mEnabled(false)
-  { }
-
-  bool MainThreadRun() override
-  {
-    AssertIsOnMainThread();
-    mEnabled = Preferences::GetBool("dom.broadcastChannel.enabled", false);
-    return true;
-  }
-
-  bool IsEnabled() const
-  {
-    return mEnabled;
-  }
-
-private:
-  bool mEnabled;
-};
-
 } // namespace
 
-/* static */ bool
-BroadcastChannel::IsEnabled(JSContext* aCx, JSObject* aGlobal)
-{
-  if (NS_IsMainThread()) {
-    return Preferences::GetBool("dom.broadcastChannel.enabled", false);
-  }
-
-  WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
-  MOZ_ASSERT(workerPrivate);
-  workerPrivate->AssertIsOnWorkerThread();
-
-  nsRefPtr<PrefEnabledRunnable> runnable =
-    new PrefEnabledRunnable(workerPrivate);
-  runnable->Dispatch(workerPrivate->GetJSContext());
-
-  return runnable->IsEnabled();
-}
-
 BroadcastChannel::BroadcastChannel(nsPIDOMWindow* aWindow,
                                    const PrincipalInfo& aPrincipalInfo,
                                    const nsACString& aOrigin,

diff --git a/dom/broadcastchannel/BroadcastChannel.h b/dom/broadcastchannel/BroadcastChannel.h
@@ -47,8 +47,6 @@ class BroadcastChannel final
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(BroadcastChannel,
                                            DOMEventTargetHelper)
 
-  static bool IsEnabled(JSContext* aCx, JSObject* aGlobal);
-
   virtual JSObject*
   WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 

diff --git a/dom/broadcastchannel/tests/broadcastchannel_pref_worker.js b/dom/broadcastchannel/tests/broadcastchannel_pref_worker.js
diff --git a/dom/broadcastchannel/tests/mochitest.ini b/dom/broadcastchannel/tests/mochitest.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 support-files =
   iframe_broadcastchannel.html
-  broadcastchannel_pref_worker.js
   broadcastchannel_sharedWorker.js
   broadcastchannel_worker.js
   broadcastchannel_worker_alive.js
@@ -17,7 +16,6 @@ support-files =
 [test_broadcastchannel_basic.html]
 [test_broadcastchannel_close.html]
 [test_broadcastchannel_self.html]
-[test_broadcastchannel_pref.html]
 [test_broadcastchannel_sharedWorker.html]
 [test_broadcastchannel_worker.html]
 [test_broadcastchannel_worker_alive.html]

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_any.html b/dom/broadcastchannel/tests/test_broadcastchannel_any.html
@@ -130,7 +130,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true]]}, runTest);
+runTest();
 
 </script>
 </body>

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_basic.html b/dom/broadcastchannel/tests/test_broadcastchannel_basic.html
@@ -55,7 +55,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true]]}, runTest);
+runTest();
 
 </script>
 </body>

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_close.html b/dom/broadcastchannel/tests/test_broadcastchannel_close.html
@@ -54,7 +54,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true]]}, runTest);
+runTest();
 
 </script>
 </body>

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_mozbrowser.html b/dom/broadcastchannel/tests/test_broadcastchannel_mozbrowser.html
@@ -84,8 +84,7 @@
   },
 
   function() {
-    SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true],
-                                       ["network.disable.ipc.security", true],
+    SpecialPowers.pushPrefEnv({"set": [["network.disable.ipc.security", true],
                                        ["browser.pagethumbnails.capturing_disabled", true],
                                        ["dom.mozBrowserFramesEnabled", true],
                                        ["dom.ipc.browser_frames.oop_by_default", false],

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_mozbrowser2.html b/dom/broadcastchannel/tests/test_broadcastchannel_mozbrowser2.html
@@ -84,8 +84,7 @@
   },
 
   function() {
-    SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true],
-                                       ["network.disable.ipc.security", true],
+    SpecialPowers.pushPrefEnv({"set": [["network.disable.ipc.security", true],
                                        ["browser.pagethumbnails.capturing_disabled", true],
                                        ["dom.mozBrowserFramesEnabled", true],
                                        ["dom.ipc.browser_frames.oop_by_default", false],

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_pref.html b/dom/broadcastchannel/tests/test_broadcastchannel_pref.html
diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_private_browsing.html b/dom/broadcastchannel/tests/test_broadcastchannel_private_browsing.html
@@ -109,7 +109,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true]]}, runTest);
+runTest();
 
 </script>
 </body>

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_self.html b/dom/broadcastchannel/tests/test_broadcastchannel_self.html
@@ -30,7 +30,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true]]}, runTest);
+runTest();
 
 </script>
 </body>

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_sharedWorker.html b/dom/broadcastchannel/tests/test_broadcastchannel_sharedWorker.html
@@ -44,8 +44,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true],
-                                   ["dom.workers.sharedWorkers.enabled", true]]}, runTests);
+SpecialPowers.pushPrefEnv({"set": [["dom.workers.sharedWorkers.enabled", true]]}, runTests);
 
 </script>
 </pre>

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_worker.html b/dom/broadcastchannel/tests/test_broadcastchannel_worker.html
@@ -54,7 +54,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true]]}, runTests);
+runTests();
 
 </script>
 </pre>

diff --git a/dom/broadcastchannel/tests/test_broadcastchannel_worker_alive.html b/dom/broadcastchannel/tests/test_broadcastchannel_worker_alive.html
@@ -48,7 +48,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [["dom.broadcastChannel.enabled", true]]}, runTests);
+runTests();
 
 </script>
 </pre>

diff --git a/dom/webidl/BroadcastChannel.webidl b/dom/webidl/BroadcastChannel.webidl
@@ -8,8 +8,7 @@
  */
 
 [Constructor(DOMString channel),
- Exposed=(Window,Worker),
- Func="BroadcastChannel::IsEnabled"]
+ Exposed=(Window,Worker)]
 interface BroadcastChannel : EventTarget {
   readonly attribute DOMString name;
 

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
@@ -4717,9 +4717,6 @@ pref("dom.voicemail.enabled", false);
 // parameter omitted.
 pref("dom.voicemail.defaultServiceId", 0);
 
-// DOM BroadcastChannel API.
-pref("dom.broadcastChannel.enabled", true);
-
 // DOM Inter-App Communication API.
 pref("dom.inter-app-communication-api.enabled", false);