diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-11-11 15:37:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-16 09:14:19 +0000 |
| commit | 06b43dda48b45fd3ed264114400d7040eaa039d2 (patch) | |
| tree | 68e2cdbf3caa323c638220dab277700d6db86190 | |
| parent | 6e6144b33f415855cc780b23ef8baeca767e56a1 (diff) | |
| download | qtwebengine-chromium-06b43dda48b45fd3ed264114400d7040eaa039d2.tar.gz | |
FIXUP: Bring enable_webrtc back
Change-Id: I4356c579eed6d522f3b0642344b7af1a7870655c
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/442877
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/chrome/test/BUILD.gn | 3 | ||||
| -rw-r--r-- | chromium/content/renderer/media/media_factory.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn index d93332142fd..788e3a791a9 100644 --- a/chromium/chrome/test/BUILD.gn +++ b/chromium/chrome/test/BUILD.gn @@ -6557,9 +6557,6 @@ test("unit_tests") { "../browser/media/webrtc/webrtc_event_log_manager_unittest_helpers.cc", "../browser/media/webrtc/webrtc_event_log_manager_unittest_helpers.h", "../browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc", - "../browser/media/webrtc/webrtc_log_uploader_unittest.cc", - "../browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc", - "../browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc", "../browser/media_galleries/fileapi/native_media_file_util_unittest.cc", "../browser/media_galleries/gallery_watch_manager_unittest.cc", "../browser/media_galleries/media_file_system_registry_unittest.cc", diff --git a/chromium/content/renderer/media/media_factory.cc b/chromium/content/renderer/media/media_factory.cc index bf3f888d184..e608c213efd 100644 --- a/chromium/content/renderer/media/media_factory.cc +++ b/chromium/content/renderer/media/media_factory.cc @@ -764,6 +764,8 @@ blink::WebMediaPlayer* MediaFactory::CreateWebMediaPlayerForMediaStream( main_thread_compositor_task_runner, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) { #if BUILDFLAG(ENABLE_WEBRTC) + RenderThreadImpl* const render_thread = RenderThreadImpl::current(); + std::vector<std::unique_ptr<BatchingMediaLog::EventHandler>> handlers; handlers.push_back( std::make_unique<InspectorMediaEventHandler>(inspector_context)); |