media/filters/skcanvas_video_renderer_unittest.cc - Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/skcanvas_video_renderer_unittest.cc

Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added TODOs Created 7 years, 4 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

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 e5eff5bd23be7b8734ff3881476bd4bcf107c2b5..1550dacc63c29db5a78a6a0117bc608f6269f421 100644

--- a/media/filters/skcanvas_video_renderer_unittest.cc

+++ b/media/filters/skcanvas_video_renderer_unittest.cc

@@ -5,8 +5,8 @@

#include "media/base/video_frame.h"

#include "media/base/video_util.h"

#include "testing/gtest/include/gtest/gtest.h"

+#include "third_party/skia/include/core/SkBitmapDevice.h"

#include "third_party/skia/include/core/SkCanvas.h"

-#include "third_party/skia/include/core/SkDevice.h"

#include "media/filters/skcanvas_video_renderer.h"

using media::VideoFrame;

@@ -75,9 +75,9 @@ class SkCanvasVideoRendererTest : public testing::Test {

scoped_refptr<VideoFrame> smaller_frame_;

scoped_refptr<VideoFrame> cropped_frame_;

- SkDevice fast_path_device_;

+ SkBitmapDevice fast_path_device_;

SkCanvas fast_path_canvas_;

- SkDevice slow_path_device_;

+ SkBitmapDevice slow_path_device_;

SkCanvas slow_path_canvas_;

DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRendererTest);

« no previous file with comments | « media/filters/skcanvas_video_renderer.cc ('k') | printing/emf_win.h » ('j') | no next file with comments »