Bug 1159659 - Allow tab sharing on XP and OSX 10.6. r=pkerr, a=lizzard
authorMaire Reavy <mreavy@mozilla.com>
Fri, 01 May 2015 08:55:33 -0400
changeset 260411 db14fef19c05
parent 260410 e4e557754405
child 260412 503f9aa61c25
push id775
push userryanvm@gmail.com
push date2015-05-07 00:07 +0000
treeherdermozilla-release@46b968653f4d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspkerr, lizzard
bugs1159659
milestone38.0
Bug 1159659 - Allow tab sharing on XP and OSX 10.6. r=pkerr, a=lizzard
dom/media/MediaManager.cpp
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -1660,16 +1660,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