aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-media_gpu_buffer__validation.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-media_gpu_buffer__validation.cc')
-rw-r--r--www/chromium/files/patch-media_gpu_buffer__validation.cc27
1 files changed, 4 insertions, 23 deletions
diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc
index 5163b5907ae4..8e76b441fbeb 100644
--- a/www/chromium/files/patch-media_gpu_buffer__validation.cc
+++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc
@@ -1,6 +1,6 @@
---- media/gpu/buffer_validation.cc.orig 2021-04-14 18:41:05 UTC
+--- media/gpu/buffer_validation.cc.orig 2022-02-07 13:39:41 UTC
+++ media/gpu/buffer_validation.cc
-@@ -12,15 +12,15 @@
+@@ -12,7 +12,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/gpu_memory_buffer.h"
@@ -8,9 +8,8 @@
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include <sys/types.h>
#include <unistd.h>
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-
+ #endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
+@@ -20,7 +20,7 @@
namespace media {
bool GetFileSize(const int fd, size_t* size) {
@@ -19,15 +18,6 @@
if (fd < 0) {
VLOGF(1) << "Invalid file descriptor";
return false;
-@@ -46,7 +46,7 @@ bool GetFileSize(const int fd, size_t* size) {
- #else
- NOTIMPLEMENTED();
- return false;
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- }
-
- bool VerifyGpuMemoryBufferHandle(media::VideoPixelFormat pixel_format,
@@ -56,7 +56,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm
VLOGF(1) << "Unexpected GpuMemoryBufferType: " << gmb_handle.type;
return false;
@@ -37,12 +27,3 @@
const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
num_planes == 0) {
-@@ -108,7 +108,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm
- #else
- NOTIMPLEMENTED();
- return false;
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- }
-
- } // namespace media