1 files changed, 0 insertions, 74 deletions
diff --git a/devel/electron7/files/patch-media_base_video__frame.cc b/devel/electron7/files/patch-media_base_video__frame.cc
deleted file mode 100644
index 29b8bca174c6..000000000000
--- a/devel/electron7/files/patch-media_base_video__frame.cc
+++ /dev/null
@@ -1,74 +0,0 @@
---- media/base/video_frame.cc.orig	2019-12-12 12:39:49 UTC
-+++ media/base/video_frame.cc
-@@ -52,7 +52,7 @@ static std::string StorageTypeToString(
-       return "OWNED_MEMORY";
-     case VideoFrame::STORAGE_SHMEM:
-       return "SHMEM";
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     case VideoFrame::STORAGE_DMABUFS:
-       return "DMABUFS";
- #endif
-@@ -67,7 +67,7 @@ static std::string StorageTypeToString(
- // static
- bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
-   return
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-       // This is not strictly needed but makes explicit that, at VideoFrame
-       // level, DmaBufs are not mappable from userspace.
-       storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -185,7 +185,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
-   return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
- // thus to have several VideoFrames share the same set of DMABUF FDs.
- class VideoFrame::DmabufHolder
-@@ -203,7 +203,7 @@ class VideoFrame::DmabufHolder
-   friend class base::RefCountedThreadSafe<DmabufHolder>;
-   ~DmabufHolder() = default;
- };
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
- 
- // static
- bool VideoFrame::IsValidConfig(VideoPixelFormat format,
-@@ -468,7 +468,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
-   return frame;
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // static
- scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
-     const VideoFrameLayout& layout,
-@@ -604,7 +604,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
-     }
-   }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   DCHECK(frame.dmabuf_fds_);
-   // If there are any |dmabuf_fds_| plugged in, we should refer them too.
-   wrapping_frame->dmabuf_fds_ = frame.dmabuf_fds_;
-@@ -911,7 +911,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const
-   return mailbox_holders_[texture_index];
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
-   DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
- 
-@@ -986,7 +986,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
-       storage_type_(storage_type),
-       visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
-       natural_size_(natural_size),
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-       dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()),
- #endif
-       timestamp_(timestamp),