1 files changed, 10 insertions, 10 deletions

diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index ebe7e4653e35..3e67bea9ce3d 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,4 +1,4 @@
---- media/base/video_frame.h.orig	2019-10-21 19:06:36 UTC
+--- media/base/video_frame.h.orig	2019-12-16 21:50:49 UTC
 +++ media/base/video_frame.h
 @@ -39,9 +39,9 @@
  #include "base/mac/scoped_cftyperef.h"
@@ -10,9 +10,9 @@
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
- namespace media {
- 
-@@ -76,7 +76,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+ namespace gfx {
+ class GpuMemoryBuffer;
+@@ -80,7 +80,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
      STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
      STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
      STORAGE_SHMEM = 4,         // Backed by unsafe (writable) shared memory.
@@ -21,8 +21,8 @@
      // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
      // based on the idea of using this same enum value for both DMA
      // buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -229,7 +229,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
-       uint8_t* a_data,
+@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+       ReleaseMailboxCB mailbox_holder_release_cb,
        base::TimeDelta timestamp);
  
 -#if defined(OS_LINUX)
@@ -30,7 +30,7 @@
    // Wraps provided dmabufs
    // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
    // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -444,7 +444,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -476,7 +476,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // mailbox, the caller must wait for the included sync point.
    const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
  
@@ -39,9 +39,9 @@
    // Returns a vector containing the backing DmaBufs for this frame. The number
    // of returned DmaBufs will be equal or less than the number of planes of
    // the frame. If there are less, this means that the last FD contains the
-@@ -630,7 +630,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
-   base::UnsafeSharedMemoryRegion owned_shm_region_;
-   base::WritableSharedMemoryMapping owned_shm_mapping_;
+@@ -662,7 +662,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+   // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
+   std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)