mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Force MediaCaptureDevicesDispatcher to be created on UI thread

Browse source
This commit is contained in:
deepak1556 2017-12-07 09:45:17 +05:30
parent 19de41b764
commit 16d96a6ef2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/browser_main_parts.cc
View file

@ -18,6 +18,7 @@
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "brightray/browser/browser_context.h" #include "brightray/browser/browser_context.h"
#include "brightray/browser/devtools_manager_delegate.h" #include "brightray/browser/devtools_manager_delegate.h"
#include "brightray/browser/media/media_capture_devices_dispatcher.h"
#include "brightray/browser/web_ui_controller_factory.h" #include "brightray/browser/web_ui_controller_factory.h"
#include "brightray/common/application_info.h" #include "brightray/common/application_info.h"
#include "brightray/common/main_delegate.h" #include "brightray/common/main_delegate.h"
@ -268,6 +269,9 @@ int BrowserMainParts::PreCreateThreads() {
#endif #endif
#endif #endif
// Force MediaCaptureDevicesDispatcher to be created on UI thread.
MediaCaptureDevicesDispatcher::GetInstance();
if (!views::LayoutProvider::Get()) if (!views::LayoutProvider::Get())
layout_provider_.reset(new views::LayoutProvider()); layout_provider_.reset(new views::LayoutProvider());

3
brightray/browser/media/media_capture_devices_dispatcher.cc
View file

@ -44,8 +44,7 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
: is_device_enumeration_disabled_(false) { : is_device_enumeration_disabled_(false) {
// MediaCaptureDevicesDispatcher is a singleton. It should be created on // MediaCaptureDevicesDispatcher is a singleton. It should be created on
// UI thread. // UI thread.
// FIXME: Ensure the DCHECK doesn't fail and then re-enable DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
} }
MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {} MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}