Bug 1159659 - Allow tab sharing on XP and OSX 10.6. r=pkerr
authorMaire Reavy <mreavy@mozilla.com>
Fri, 01 May 2015 08:55:33 -0400
changeset 273369 950723ac69a43385b993c997d5805528e2b5057e
parent 273368 35408d0b3835f884edd14e0f90ae2ee4ceb9dedf
child 273370 14c8c3fd403cf01f23fef4cc255b22b06ae3155f
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspkerr
bugs1159659
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1159659 - Allow tab sharing on XP and OSX 10.6. r=pkerr
dom/media/MediaManager.cpp
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -1845,16 +1845,18 @@ MediaManager::GetUserMedia(
       // the requesting document is not from a host on the whitelist, or
       // we're on Mac OSX 10.6 and WinXP until proved that they work
       if (!Preferences::GetBool(((src == dom::MediaSourceEnum::Browser)?
                                 "media.getusermedia.browser.enabled" :
                                 "media.getusermedia.screensharing.enabled"),
                                 false) ||
 #if defined(XP_MACOSX) || defined(XP_WIN)
           (
+            // Allow tab sharing for all platforms including XP and OSX 10.6
+            (src != dom::MediaSourceEnum::Browser) &&
             !Preferences::GetBool("media.getusermedia.screensharing.allow_on_old_platforms",
                                   false) &&
 #if defined(XP_MACOSX)
             !nsCocoaFeatures::OnLionOrLater()
 #endif
 #if defined (XP_WIN)
             !IsVistaOrLater()
 #endif