Bug 1049087 - Pre-populate the whitelist for screensharing in Fx33. r=jesup, a=sledru
authorEthan Hugg <ethanhugg@gmail.com>
Thu, 04 Sep 2014 13:13:25 -0700
changeset 216804 90713d332601
parent 216803 0cc0faf4524b
child 216805 f14c89b414b6
push id3920
push userryanvm@gmail.com
push date2014-09-19 21:55 +0000
treeherdermozilla-beta@f14c89b414b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, sledru
bugs1049087
milestone33.0
Bug 1049087 - Pre-populate the whitelist for screensharing in Fx33. r=jesup, a=sledru
modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -362,20 +362,20 @@ pref("media.getusermedia.playout_delay",
 #endif
 #endif
 
 #if !defined(ANDROID)
 pref("media.getusermedia.screensharing.enabled", true);
 #endif
 
 #ifdef RELEASE_BUILD
-pref("media.getusermedia.screensharing.allowed_domains", "");
+pref("media.getusermedia.screensharing.allowed_domains", "webex.com,*.webex.com,collaborate.com,*.collaborate.com");
 #else
 // temporary value, not intended for release - bug 1049087
-pref("media.getusermedia.screensharing.allowed_domains", "mozilla.github.io");
+pref("media.getusermedia.screensharing.allowed_domains", "mozilla.github.io,webex.com,*.webex.com,collaborate.com,*.collaborate.com");
 #endif
 
 // TextTrack support
 pref("media.webvtt.enabled", true);
 pref("media.webvtt.regions.enabled", false);
 
 // AudioTrack and VideoTrack support
 pref("media.track.enabled", false);