media: Refactor SkCanvasVideoRenderer to use SkImages and not SkBitmaps.

media/blink/skcanvas_video_renderer.h

Index: media/blink/skcanvas_video_renderer.h
diff --git a/media/blink/skcanvas_video_renderer.h b/media/blink/skcanvas_video_renderer.h
index 12b909af1bd576424744efb94a8c9a24e7cea480..8958a39a116072ac840b31232950c491b0e63016 100644
--- a/media/blink/skcanvas_video_renderer.h
+++ b/media/blink/skcanvas_video_renderer.h
@@ -9,22 +9,21 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/base/media_export.h"
+#include "media/base/video_frame.h"
 #include "media/base/video_rotation.h"
 #include "media/filters/context_3d.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/geometry/rect.h"
 
 class SkCanvas;
+class SkImage;
 
 namespace media {
-
-class VideoFrame;
 class VideoImageGenerator;
 
-// Handles rendering of VideoFrames to SkCanvases, doing any necessary YUV
-// conversion and caching of resulting RGB bitmaps.
+// Handles rendering of VideoFrames to SkCanvases.
 class MEDIA_EXPORT SkCanvasVideoRenderer {
  public:
   SkCanvasVideoRenderer();
@@ -72,25 +71,20 @@ class MEDIA_EXPORT SkCanvasVideoRenderer {
       bool flip_y);
 
  private:
-  void ResetLastFrame();
-  void ResetAcceleratedLastFrame();
-
-  // An RGB bitmap and corresponding timestamp of the previously converted
-  // video frame data by software color space conversion.
-  SkBitmap last_frame_;
-  base::TimeDelta last_frame_timestamp_;
-  // If |last_frame_| is not used for a while, it's deleted to save memory.
-  base::DelayTimer<SkCanvasVideoRenderer> frame_deleting_timer_;
-
-  // This is a hardware accelerated copy of the frame generated by
-  // |accelerated_generator_|.
-  // It's used when |canvas| parameter in Paint() is Ganesh canvas.
-  // Note: all GrContext in SkCanvas instances are same.
-  scoped_ptr<SkImage> accelerated_last_image_;
-  SkBitmap accelerated_last_frame_;
-  VideoImageGenerator* accelerated_generator_;
-  base::TimeDelta accelerated_last_frame_timestamp_;
-  base::DelayTimer<SkCanvasVideoRenderer> accelerated_frame_deleting_timer_;
+  void ResetCache();
+
+  // Last image used to draw to the canvas.
+  skia::RefPtr<SkImage> last_image_;
+  // Timestamp of the videoframe used to generate |last_image_|.
+  base::TimeDelta last_timestamp_ = media::kNoTimestamp();
+  // If the last videoframe was software |video_generator_| is the generator
+  // used to generate last_image_. SkImage takes ownership of video_generator_,
+  // here we're assuming that video_generator_ is valid as long as the
+  // associated SkImage is not deleted.
+  // https://code.google.com/p/skia/issues/detail?id=3870
+  VideoImageGenerator* video_generator_ = nullptr;
+  // If |last_image_| is not used for a while, it's deleted to save memory.
+  base::DelayTimer<SkCanvasVideoRenderer> last_image_deleting_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRenderer);
 };