Bug 1487419 - Save current desktop configuration in ScreenCapturerMac::Init; r=pehrsons a=pascalc
authorDan Minor <dminor@mozilla.com>
Wed, 05 Sep 2018 13:55:27 -0400
changeset 492462 feca63da8d4fc91c004f17c9ca88a8d2d7fc3cd9
parent 492461 9114c6ecda72724ed8a763bb61991347f3f3ad10
child 492463 47094cecc7e14e43940958bc3e4a03fb9e0cfaf7
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspehrsons, pascalc
bugs1487419, 1409018
milestone63.0
Bug 1487419 - Save current desktop configuration in ScreenCapturerMac::Init; r=pehrsons a=pascalc Summary: The fix for Bug 1409018 accidentally removed saving the current desktop configuration during Init() which causes it to not be set when a different screen is selected, meaning that regardless of the choice made, only the first screen is captured. Reviewers: pehrsons Tags: #secure-revision Bug #: 1487419 Differential Revision: https://phabricator.services.mozilla.com/D5062
media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_mac.mm
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_mac.mm
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_mac.mm
@@ -419,16 +419,17 @@ bool ScreenCapturerMac::Init() {
   desktop_config_ = desktop_config_monitor_->desktop_configuration();
   desktop_config_monitor_->Unlock();
   if (!RegisterRefreshAndMoveHandlers()) {
     return false;
   }
   ScreenConfigurationChanged();
 */
   desktop_config_monitor_->Lock();
+  desktop_config_ = desktop_config_monitor_->desktop_configuration();
   update_screen_configuration_ = true;
   desktop_config_monitor_->Unlock();
   return true;
 }
 
 void ScreenCapturerMac::ReleaseBuffers() {
   if (cgl_context_) {
     pixel_buffer_object_.Release();