signalapp/webrtc
signalapp/webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3ff50fba59
webrtc/modules/desktop_capture
History
Henrik Grunell 70294c8eab Revert "Add ScopedAllowBaseSyncPrimitives for DesktopConfigurationMonitor." 
This reverts commit 0a3593c25d.

Reason for revert: breaks WebRTC roll to Chromium. https://chromium-review.googlesource.com/c/chromium/src/+/894164

[19742:771:0130/150628.286256:FATAL:thread_restrictions.cc(67)] Check failed: !g_blocking_disallowed.Get().Get(). To allow //base sync primitives in a scope where blocking is disallowed use ScopedAllowBaseSyncPrimitivesOutsideBlockingScope.
0   browser_tests                       0x0000000108d3682c base::debug::StackTrace::StackTrace(unsigned long) + 28
1   browser_tests                       0x0000000108d5b210 logging::LogMessage::~LogMessage() + 224
2   browser_tests                       0x0000000108e04366 base::ScopedAllowBaseSyncPrimitives::ScopedAllowBaseSyncPrimitives() + 150
3   browser_tests                       0x000000010be59c48 webrtc::DesktopConfigurationMonitor::Lock() + 24
4   browser_tests                       0x0000000106dbf229 webrtc::DesktopCapturer::CreateRawScreenCapturer(webrtc::DesktopCaptureOptions const&) + 313
5   browser_tests                       0x000000010be58725 webrtc::DesktopCapturer::CreateScreenCapturer(webrtc::DesktopCaptureOptions const&) + 21
6   browser_tests                       0x00000001074dc209 content::DesktopCaptureDevice::Create(content::DesktopMediaID const&) + 169
(...)


Original change's description:
> Add ScopedAllowBaseSyncPrimitives for DesktopConfigurationMonitor.
> This is a temporary measure until the synchronization method
> used in the class, gets fixed.
> 
> Bug: chromium:796889, chromium:795340
> Change-Id: Ie3d394ae42f005e8e0f353d04ea9c1d053ea9fd2
> Reviewed-on: https://webrtc-review.googlesource.com/40460
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Commit-Queue: Tommi <tommi@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21812}

TBR=tommi@webrtc.org,sprang@webrtc.org

Change-Id: I6237c3df7e33918d9fe2e46bad0f6f96cda77cd1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:796889, chromium:795340
Reviewed-on: https://webrtc-review.googlesource.com/46540
Reviewed-by: Henrik Grunell <henrikg@webrtc.org>
Commit-Queue: Henrik Grunell <henrikg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21817}
2018-01-31 08:32:19 +00:00
..
mac Revert "Add ScopedAllowBaseSyncPrimitives for DesktopConfigurationMonitor." 2018-01-31 08:32:19 +00:00
win Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
x11 Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
blank_detector_desktop_capturer_wrapper_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
blank_detector_desktop_capturer_wrapper.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
blank_detector_desktop_capturer_wrapper.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
BUILD.gn Removing useless dependencies on //testing/gmock. 2018-01-26 13:34:12 +00:00
capture_result_desktop_capturer_wrapper.cc Implement DesktopCapturerWrapper and CaptureResultDesktopCapturerWrapper 2017-09-15 18:56:26 +00:00
capture_result_desktop_capturer_wrapper.h Implement DesktopCapturerWrapper and CaptureResultDesktopCapturerWrapper 2017-09-15 18:56:26 +00:00
cropped_desktop_frame_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
cropped_desktop_frame.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
cropped_desktop_frame.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
cropping_window_capturer_win.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
cropping_window_capturer.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
cropping_window_capturer.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
DEPS Disable coregraphics built-in mouse capture in ScreenCapturerMac 2017-12-12 20:01:29 +00:00
desktop_and_cursor_composer_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_and_cursor_composer.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_and_cursor_composer.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_capture_options.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_capture_options.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_capture_types.h Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
desktop_capturer_differ_wrapper_unittest.cc Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
desktop_capturer_differ_wrapper.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_capturer_differ_wrapper.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_capturer_wrapper.cc Implement DesktopCapturerWrapper and CaptureResultDesktopCapturerWrapper 2017-09-15 18:56:26 +00:00
desktop_capturer_wrapper.h Implement DesktopCapturerWrapper and CaptureResultDesktopCapturerWrapper 2017-09-15 18:56:26 +00:00
desktop_capturer.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_capturer.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_frame_generator.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_frame_generator.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_frame_rotation_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_frame_rotation.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_frame_rotation.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_frame_win.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
desktop_frame_win.h Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
desktop_frame.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_frame.h Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
desktop_geometry_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_geometry.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_geometry.h Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
desktop_region_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_region.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
desktop_region.h Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
differ_block_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
differ_block.cc Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
differ_block.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
differ_vector_sse2.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
differ_vector_sse2.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
fake_desktop_capturer.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
fake_desktop_capturer.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
fallback_desktop_capturer_wrapper_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
fallback_desktop_capturer_wrapper.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
fallback_desktop_capturer_wrapper.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
mock_desktop_capturer_callback.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
mock_desktop_capturer_callback.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
mouse_cursor_monitor_mac.mm [Window Capturer] Implement scaling in GetWindowBounds() 2017-11-07 01:49:35 +00:00
mouse_cursor_monitor_null.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
mouse_cursor_monitor_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
mouse_cursor_monitor_win.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
mouse_cursor_monitor_x11.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
mouse_cursor_monitor.h Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
mouse_cursor.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
mouse_cursor.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
OWNERS
resolution_tracker.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
resolution_tracker.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
rgba_color_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
rgba_color.cc Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
rgba_color.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_capture_frame_queue.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_capturer_helper_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_capturer_helper.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_capturer_helper.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_capturer_integration_test.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
screen_capturer_mac_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_capturer_mac.mm Disable coregraphics built-in mouse capture in ScreenCapturerMac 2017-12-12 20:01:29 +00:00
screen_capturer_null.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_capturer_unittest.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
screen_capturer_win.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_capturer_x11.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
screen_drawer_linux.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_drawer_lock_posix.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
screen_drawer_lock_posix.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_drawer_mac.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_drawer_unittest.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
screen_drawer_win.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_drawer.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
screen_drawer.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
shared_desktop_frame.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
shared_desktop_frame.h Add explicit includes of refcountedobject.h where it is used. 2017-10-06 13:00:14 +00:00
shared_memory.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
shared_memory.h Adding NOLINT for typedefs.h and common_types.h 2017-09-15 13:03:51 +00:00
test_utils_unittest.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
test_utils.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
test_utils.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
window_capturer_mac.mm Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
window_capturer_null.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
window_capturer_unittest.cc Disable some flaky screen/desktop capture tests on Linux. 2017-10-13 20:34:12 +00:00
window_capturer_win.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
window_capturer_x11.cc Stop using LOG macros in favor of RTC_ prefixed macros. 2017-11-09 11:56:32 +00:00
window_finder_mac.h [Window Capturer] Implement scaling in GetWindowBounds() 2017-11-07 01:49:35 +00:00
window_finder_mac.mm [Window Capturer] Implement scaling in GetWindowBounds() 2017-11-07 01:49:35 +00:00
window_finder_unittest.cc WindowFinderTest.FindConsoleWindow is flaky on Win32 ASan 2017-11-28 01:21:47 +00:00
window_finder_win.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
window_finder_win.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
window_finder_x11.cc Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
window_finder_x11.h Fixing WebRTC after moving from src/webrtc to src/ 2017-09-15 05:02:56 +00:00
window_finder.cc [Window Capturer] Implement scaling in GetWindowBounds() 2017-11-07 01:49:35 +00:00
window_finder.h [Window Capturer] Implement scaling in GetWindowBounds() 2017-11-07 01:49:35 +00:00