aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2021-04-06 08:40:01 +0000
committerRene Ladan <rene@FreeBSD.org>2021-04-06 08:46:52 +0000
commit1227b53ed1c53ea13efeac2bfe3fae5532c529ec (patch)
tree551daaabc2287f94c3b2d7b59c0cc2a235156540 /www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
parenta8416100c4e9b0dd5090c78d09ef6a94293b3c02 (diff)
downloadports-1227b53ed1c53ea13efeac2bfe3fae5532c529ec.tar.gz
ports-1227b53ed1c53ea13efeac2bfe3fae5532c529ec.zip
www/chromium: update to 89.0.4389.114
Submitted by: Matthias Wolf via github Security: https://www.vuxml.org/freebsd/bddadaa4-9227-11eb-99c5-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.cc14
1 files changed, 7 insertions, 7 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 26a92c7f7aa0..a571dd530e6f 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,20 +1,20 @@
---- media/capture/video/create_video_capture_device_factory.cc.orig 2021-01-18 21:29:00 UTC
+--- 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
@@ -11,7 +11,7 @@
#include "media/capture/video/fake_video_capture_device_factory.h"
#include "media/capture/video/file_video_capture_device_factory.h"
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#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_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
#include "media/capture/video/chromeos/camera_app_device_bridge_impl.h"
@@ -83,7 +83,7 @@ CreateChromeOSVideoCaptureDeviceFactory(
std::unique_ptr<VideoCaptureDeviceFactory>
CreatePlatformSpecificVideoCaptureDeviceFactory(
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
- #elif BUILDFLAG(IS_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner, {});