diff options
Diffstat (limited to 'www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h')
| -rw-r--r-- | www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index b17c64b428c9..cd57adab03c9 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2025-05-28 14:55:43 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2025-07-02 06:08:04 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -17,7 +17,7 @@ #include "ui/gfx/generic_shared_memory_id.h" @@ -18,12 +18,30 @@ NATIVE_PIXMAP, #endif #if BUILDFLAG(IS_WIN) -@@ -210,7 +210,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { +@@ -154,7 +154,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { + #if BUILDFLAG(IS_WIN) + explicit GpuMemoryBufferHandle(DXGIHandle handle); + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + explicit GpuMemoryBufferHandle(gfx::NativePixmapHandle native_pixmap_handle); + #endif + #if BUILDFLAG(IS_ANDROID) +@@ -196,7 +196,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { + return std::move(region_); + } - uint32_t offset = 0; - uint32_t stride = 0; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - NativePixmapHandle native_pixmap_handle; - #elif BUILDFLAG(IS_APPLE) - ScopedIOSurface io_surface; + const NativePixmapHandle& native_pixmap_handle() const& { + CHECK_EQ(type, NATIVE_PIXMAP); + return native_pixmap_handle_; +@@ -240,7 +240,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { + // goal is to make `this` an encapsulated class. + base::UnsafeSharedMemoryRegion region_; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + NativePixmapHandle native_pixmap_handle_; + #endif + |