Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 13 insertions, 3 deletions

diff --git a/webkit/glue/media/web_video_renderer.h b/webkit/glue/media/web_video_renderer.h
index 8bafb1a..d8b47ad 100644
--- a/webkit/glue/media/web_video_renderer.h
+++ b/webkit/glue/media/web_video_renderer.h
@@ -1,10 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.  Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #ifndef WEBKIT_GLUE_MEDIA_WEB_VIDEO_RENDERER_H_
 #define WEBKIT_GLUE_MEDIA_WEB_VIDEO_RENDERER_H_
 
+#include "media/base/video_frame.h"
 #include "media/filters/video_renderer_base.h"
 
 namespace webkit_glue {
@@ -30,6 +31,15 @@ class WebVideoRenderer : public media::VideoRendererBase {
   virtual void Paint(skia::PlatformCanvas* canvas,
                      const gfx::Rect& dest_rect) = 0;
 
+  // Clients of this class (painter/compositor) should use GetCurrentFrame()
+  // obtain ownership of VideoFrame, it should always relinquish the ownership
+  // by use PutCurrentFrame(). Current frame is not guaranteed to be non-NULL.
+  // It expects clients to use color-fill the background if current frame
+  // is NULL. This could happen when before pipeline is pre-rolled or during
+  // pause/flush/seek.
+  virtual void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out) {}
+  virtual void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame) {}
+
  private:
   DISALLOW_COPY_AND_ASSIGN(WebVideoRenderer);
 };