Chromium Code Reviews| Index: media/filters/skcanvas_video_renderer_unittest.cc |
| diff --git a/media/filters/skcanvas_video_renderer_unittest.cc b/media/filters/skcanvas_video_renderer_unittest.cc |
| index 358ce0ab1e03184013e171da84fbd76bf80c0850..70d02b43dfb6b7711f684fe62e80310ce8e51317 100644 |
| --- a/media/filters/skcanvas_video_renderer_unittest.cc |
| +++ b/media/filters/skcanvas_video_renderer_unittest.cc |
| @@ -52,20 +52,22 @@ class SkCanvasVideoRendererTest : public testing::Test { |
| // Paints the |video_frame| to the |canvas| using |renderer_|, setting the |
| // color of |video_frame| to |color| first. |
| - void Paint(VideoFrame* video_frame, SkCanvas* canvas, Color color); |
| - void PaintRotated(VideoFrame* video_frame, |
| + void Paint(const scoped_refptr<VideoFrame> video_frame, |
|
scherkus (not reviewing)
2014/09/09 00:27:05
needs &
|
| + SkCanvas* canvas, |
| + Color color); |
| + void PaintRotated(const scoped_refptr<VideoFrame> video_frame, |
|
scherkus (not reviewing)
2014/09/09 00:27:05
ditto
|
| SkCanvas* canvas, |
| Color color, |
| SkXfermode::Mode mode, |
| VideoRotation video_rotation); |
| - void Copy(VideoFrame* video_frame, SkCanvas* canvas); |
| + void Copy(scoped_refptr<VideoFrame> video_frame, SkCanvas* canvas); |
|
scherkus (not reviewing)
2014/09/09 00:27:05
ditto
|
| // Getters for various frame sizes. |
| - VideoFrame* natural_frame() { return natural_frame_.get(); } |
| - VideoFrame* larger_frame() { return larger_frame_.get(); } |
| - VideoFrame* smaller_frame() { return smaller_frame_.get(); } |
| - VideoFrame* cropped_frame() { return cropped_frame_.get(); } |
| + scoped_refptr<VideoFrame> natural_frame() { return natural_frame_; } |
| + scoped_refptr<VideoFrame> larger_frame() { return larger_frame_; } |
| + scoped_refptr<VideoFrame> smaller_frame() { return smaller_frame_; } |
| + scoped_refptr<VideoFrame> cropped_frame() { return cropped_frame_; } |
| // Standard canvas. |
| SkCanvas* target_canvas() { return &target_canvas_; } |
| @@ -200,18 +202,20 @@ void SkCanvasVideoRendererTest::PaintWithoutFrame(SkCanvas* canvas) { |
| VIDEO_ROTATION_0); |
| } |
| -void SkCanvasVideoRendererTest::Paint(VideoFrame* video_frame, |
| - SkCanvas* canvas, |
| - Color color) { |
| +void SkCanvasVideoRendererTest::Paint( |
| + const scoped_refptr<VideoFrame> video_frame, |
| + SkCanvas* canvas, |
| + Color color) { |
| PaintRotated( |
| video_frame, canvas, color, SkXfermode::kSrcOver_Mode, VIDEO_ROTATION_0); |
| } |
| -void SkCanvasVideoRendererTest::PaintRotated(VideoFrame* video_frame, |
| - SkCanvas* canvas, |
| - Color color, |
| - SkXfermode::Mode mode, |
| - VideoRotation video_rotation) { |
| +void SkCanvasVideoRendererTest::PaintRotated( |
| + scoped_refptr<VideoFrame> video_frame, |
| + SkCanvas* canvas, |
| + Color color, |
| + SkXfermode::Mode mode, |
| + VideoRotation video_rotation) { |
| switch (color) { |
| case kNone: |
| break; |
| @@ -229,8 +233,9 @@ void SkCanvasVideoRendererTest::PaintRotated(VideoFrame* video_frame, |
| video_frame, canvas, kNaturalRect, 0xFF, mode, video_rotation); |
| } |
| -void SkCanvasVideoRendererTest::Copy(VideoFrame* video_frame, |
| - SkCanvas* canvas) { |
| +void SkCanvasVideoRendererTest::Copy( |
| + const scoped_refptr<VideoFrame> video_frame, |
| + SkCanvas* canvas) { |
| renderer_.Copy(video_frame, canvas); |
| } |