1 files changed, 54 insertions, 3 deletions

diff --git a/chromium/third_party/blink/renderer/modules/webcodecs/video_frame_handle.h b/chromium/third_party/blink/renderer/modules/webcodecs/video_frame_handle.h
index 49a2e995251..50b84b84a13 100644
--- a/chromium/third_party/blink/renderer/modules/webcodecs/video_frame_handle.h
+++ b/chromium/third_party/blink/renderer/modules/webcodecs/video_frame_handle.h
@@ -6,35 +6,86 @@
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBCODECS_VIDEO_FRAME_HANDLE_H_
 
 #include "base/memory/scoped_refptr.h"
-#include "media/base/video_frame.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
+#include "third_party/blink/renderer/modules/webcodecs/video_frame_logger.h"
 #include "third_party/blink/renderer/platform/wtf/thread_safe_ref_counted.h"
 #include "third_party/blink/renderer/platform/wtf/threading_primitives.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
+
+// Note: Don't include "media/base/video_frame.h" here without good reason,
+// since it includes a lot of non-blink types which can pollute the namespace.
+
+class SkImage;
+
+namespace media {
+class VideoFrame;
+}
 
 namespace blink {
 
+class ExecutionContext;
+
 // Wrapper class that allows sharing a single |frame_| reference across
 // multiple VideoFrames, which can be invalidated for all frames at once.
+//
+// If Invalidate() is not called before the handle's destructor runs, this means
+// that none of the VideoFrames sharing this handle were closed, and they were
+// all GC'ed instead. This can lead to stalls, since frames are not released
+// fast enough through the GC to keep a pipeline running smoothly. In that case
+// report an unclosed frame through |close_auditor_|.
 class MODULES_EXPORT VideoFrameHandle
     : public WTF::ThreadSafeRefCounted<VideoFrameHandle> {
  public:
-  explicit VideoFrameHandle(scoped_refptr<media::VideoFrame>);
+  VideoFrameHandle(scoped_refptr<media::VideoFrame>, ExecutionContext*);
+  VideoFrameHandle(scoped_refptr<media::VideoFrame>,
+                   sk_sp<SkImage> sk_image,
+                   ExecutionContext*);
+  VideoFrameHandle(scoped_refptr<media::VideoFrame>,
+                   sk_sp<SkImage> sk_image,
+                   scoped_refptr<VideoFrameLogger::VideoFrameCloseAuditor>);
+  VideoFrameHandle(scoped_refptr<media::VideoFrame>, sk_sp<SkImage> sk_image);
 
   // Returns a copy of |frame_|, which should be re-used throughout the scope
   // of a function call, instead of calling frame() multiple times. Otherwise
   // the frame could be destroyed between calls.
   scoped_refptr<media::VideoFrame> frame();
 
+  // Returns a copy of |sk_image_| which may be nullptr if this isn't an SkImage
+  // backed VideoFrame.
+  sk_sp<SkImage> sk_image();
+
   // Releases the underlying media::VideoFrame reference, affecting all
   // blink::VideoFrames and blink::Planes that hold a reference to |this|.
   void Invalidate();
 
+  // Temporary workaround for crbug.com/1182497.
+  // Overrides the next call to Clone() to return |this| without adding a new
+  // reference. This prevents cloning handles when internally posting frames to
+  // a transferred stream, which cannot be cleared.
+  void SetCloseOnClone();
+
+  // Clones this VideoFrameHandle into a new VideoFrameHandle object.
+  scoped_refptr<VideoFrameHandle> Clone();
+
+  // Same as above, but for internal (non-garbage-collected) usage. Drops the
+  // close auditor so warning messages aren't created for unclosed frames.
+  scoped_refptr<VideoFrameHandle> CloneForInternalUse();
+
  private:
   friend class WTF::ThreadSafeRefCounted<VideoFrameHandle>;
-  ~VideoFrameHandle() = default;
+  ~VideoFrameHandle();
+
+  // |mutex_| must be held before calling into this.
+  void InvalidateLocked();
+
+  // Flag that prevents the creation of a new handle during the next Clone()
+  // call. Used as a temporary workaround for crbug.com/1182497.
+  bool close_on_clone_ = false;
 
   WTF::Mutex mutex_;
+  sk_sp<SkImage> sk_image_;
   scoped_refptr<media::VideoFrame> frame_;
+  scoped_refptr<VideoFrameLogger::VideoFrameCloseAuditor> close_auditor_;
 };
 
 }  // namespace blink