Bug 1318214 - enable presentation API for 1-UA mode on Fennec nightly. r=smaug. draft
authorShih-Chiang Chien <schien@mozilla.com>
Mon, 21 Nov 2016 14:49:30 +0800
changeset 441871 8bd1c84042012b79de282acc88e7d68b7ae86c3b
parent 440252 13f49da109ea460665ad27c8497cb1489548450c
child 537647 a0a9d36fff0043db495ed5adb859c99a4aef8cf2
push id36531
push userschien@mozilla.com
push dateMon, 21 Nov 2016 06:53:10 +0000
reviewerssmaug
bugs1318214
milestone53.0a1
Bug 1318214 - enable presentation API for 1-UA mode on Fennec nightly. r=smaug. MozReview-Commit-ID: 37ykiqcaa8d
dom/tests/mochitest/general/test_interfaces.html
mobile/android/app/mobile.js
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -777,31 +777,31 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "PopupBoxObject", xbl: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "Pose", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "PresentationDeviceInfoManager",
      disabled: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "Presentation", disabled: true},
+    {name: "Presentation", desktop: false, release: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PresentationAvailability", disabled: true},
+    {name: "PresentationAvailability", desktop: false, release: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PresentationConnection", disabled: true},
+    {name: "PresentationConnection", desktop: false, release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PresentationConnectionAvailableEvent", disabled: true},
+    {name: "PresentationConnectionAvailableEvent", desktop: false, release: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PresentationConnectionClosedEvent", disabled: true},
+    {name: "PresentationConnectionCloseEvent", desktop: false, release: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PresentationConnectionList", disabled: true},
+    {name: "PresentationConnectionList", desktop: false, release: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PresentationReceiver", disabled: true},
+    {name: "PresentationReceiver", desktop: false, release: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PresentationRequest", disabled: true},
+    {name: "PresentationRequest", desktop: false, release: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ProcessingInstruction",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ProgressEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "PushManager",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "PushSubscription",
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -899,18 +899,23 @@ pref("identity.fxaccounts.remote.webchan
 pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox.com/v1");
 
 // The remote URL of the Firefox Account oauth server.
 pref("identity.fxaccounts.remote.oauth.uri", "https://oauth.accounts.firefox.com/v1");
 
 // Token server used by Firefox Account-authenticated Sync.
 pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sync/1.5");
 
-// Enable Presentation API
-pref("dom.presentation.enabled", false);
+#ifndef RELEASE_OR_BETA
+// Enable Presentation API on Nightly
+pref("dom.presentation.enabled", true);
+pref("dom.presentation.controller.enabled", true); // enable 1-UA mode
+pref("dom.presentation.receiver.enabled", true); // enable 1-UA mode
+#endif
+
 pref("dom.presentation.discovery.enabled", true);
 pref("dom.presentation.discovery.legacy.enabled", true); // for TV 2.5 backward capability
 
 pref("dom.audiochannel.audioCompeting", true);
 pref("dom.audiochannel.mediaControl", true);
 
 // Space separated list of URLS that are allowed to send objects (instead of
 // only strings) through webchannels. This list is duplicated in browser/app/profile/firefox.js