update to 124.0.6367.207
This commit is contained in:
parent
687f3acd55
commit
fe9bc9d89b
958 changed files with 7372 additions and 6231 deletions
|
@ -1,30 +1,47 @@
|
|||
Index: media/gpu/buffer_validation.cc
|
||||
--- media/gpu/buffer_validation.cc.orig
|
||||
+++ media/gpu/buffer_validation.cc
|
||||
@@ -15,7 +15,7 @@
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "ui/gfx/geometry/size.h"
|
||||
#include "ui/gfx/gpu_memory_buffer.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include <drm_fourcc.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -23,7 +23,7 @@
|
||||
@@ -29,7 +29,7 @@
|
||||
namespace media {
|
||||
|
||||
namespace {
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#ifndef I915_FORMAT_MOD_4_TILED_MTL_MC_CCS
|
||||
// TODO(b/271455200): Remove this definition once drm_fourcc.h contains it.
|
||||
/*
|
||||
@@ -55,7 +55,7 @@ bool IsIntelMediaCompressedModifier(uint64_t modifier)
|
||||
} // namespace
|
||||
|
||||
bool GetFileSize(const int fd, size_t* size) {
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
if (fd < 0) {
|
||||
VLOG(1) << "Invalid file descriptor";
|
||||
return false;
|
||||
@@ -76,7 +76,7 @@ bool VerifyGpuMemoryBufferHandle(
|
||||
@@ -109,14 +109,14 @@ bool VerifyGpuMemoryBufferHandle(
|
||||
VLOG(1) << "Unsupported: " << pixel_format;
|
||||
return false;
|
||||
}
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
|
||||
if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
|
||||
num_planes == 0) {
|
||||
const uint64_t modifier = gmb_handle.native_pixmap_handle.modifier;
|
||||
const bool is_intel_media_compressed_buffer =
|
||||
IsIntelMediaCompressedModifier(modifier);
|
||||
const bool is_intel_media_compression_enabled =
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression);
|
||||
-#elif BUILDFLAG(IS_LINUX)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
false;
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue