Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1111)

Unified Diff: media/filters/skcanvas_video_renderer_unittest.cc

Issue 16297002: Update media/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/pipeline_integration_test_base.cc ('k') | media/filters/video_frame_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a50f266c62fe5343d5d9b293f9fe93fdd371008b..e5eff5bd23be7b8734ff3881476bd4bcf107c2b5 100644
--- a/media/filters/skcanvas_video_renderer_unittest.cc
+++ b/media/filters/skcanvas_video_renderer_unittest.cc
@@ -58,10 +58,10 @@ class SkCanvasVideoRendererTest : public testing::Test {
void Paint(VideoFrame* video_frame, SkCanvas* canvas, Color color);
// Getters for various frame sizes.
- VideoFrame* natural_frame() { return natural_frame_; }
- VideoFrame* larger_frame() { return larger_frame_; }
- VideoFrame* smaller_frame() { return smaller_frame_; }
- VideoFrame* cropped_frame() { return cropped_frame_; }
+ 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(); }
// Getters for canvases that trigger the various painting paths.
SkCanvas* fast_path_canvas() { return &fast_path_canvas_; }
« no previous file with comments | « media/filters/pipeline_integration_test_base.cc ('k') | media/filters/video_frame_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698