aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
diff options
context:
space:
mode:
authorMatthias Wolf <matthias@rheinwolf.de>2021-04-27 14:25:26 +0000
committerRene Ladan <rene@FreeBSD.org>2021-04-27 14:29:47 +0000
commitbe6259aac7b38bb3129be18e4ca60d42078cca3e (patch)
treec751b3c98ce06f6217fb44fc88ad582a05327926 /www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
parent87e8477cb34d4fb1ff6173aaf66407e580f894ab (diff)
downloadports-be6259aac7b38bb3129be18e4ca60d42078cca3e.tar.gz
ports-be6259aac7b38bb3129be18e4ca60d42078cca3e.zip
www/chromium: update to 90.0.4430.85
Tested by: Matthias Wolf, rene MFH: 2021Q2 Security: http://vuxml.freebsd.org/freebsd/cb13a765-a277-11eb-97a0-e09467587c17.html
Diffstat (limited to 'www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc')
-rw-r--r--www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
index a571dd530e6f..5d462771fef8 100644
--- a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
+++ b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
@@ -1,4 +1,4 @@
---- media/capture/video/create_video_capture_device_factory.cc.orig 2021-03-12 23:57:26 UTC
+--- media/capture/video/create_video_capture_device_factory.cc.orig 2021-04-14 18:41:05 UTC
+++ media/capture/video/create_video_capture_device_factory.cc
@@ -11,7 +11,7 @@
#include "media/capture/video/fake_video_capture_device_factory.h"
@@ -8,8 +8,8 @@
+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
#include "media/capture/video/linux/video_capture_device_factory_linux.h"
#elif BUILDFLAG(IS_CHROMEOS_ASH)
- #include "media/capture/video/chromeos/camera_app_device_bridge_impl.h"
-@@ -83,7 +83,7 @@ CreateChromeOSVideoCaptureDeviceFactory(
+ #include "media/capture/video/chromeos/public/cros_features.h"
+@@ -80,7 +80,7 @@ CreateChromeOSVideoCaptureDeviceFactory(
std::unique_ptr<VideoCaptureDeviceFactory>
CreatePlatformSpecificVideoCaptureDeviceFactory(
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
@@ -17,4 +17,4 @@
+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
#elif BUILDFLAG(IS_CHROMEOS_ASH)
- return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner, {});
+ return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner);