cc/test/skia_common.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: cc/test/skia_common.cc

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

Patch Set: Minor cleanup 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: cc/test/skia_common.cc

diff --git a/cc/test/skia_common.cc b/cc/test/skia_common.cc

index 5c83f131028201e295041c4bf957ad028c679173..67c72f47c3bce4ec58ebadf6f849715120bee198 100644

--- a/cc/test/skia_common.cc

+++ b/cc/test/skia_common.cc

@@ -6,7 +6,7 @@

#include "cc/resources/picture.h"

#include "skia/ext/refptr.h"

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

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

#include "ui/gfx/rect.h"

#include "ui/gfx/skia_util.h"

@@ -65,7 +65,7 @@ void DrawPicture(unsigned char* buffer,

layer_rect.width(),

layer_rect.height());

bitmap.setPixels(buffer);

- SkDevice device(bitmap);

+ SkBitmapDevice device(bitmap);

SkCanvas canvas(&device);

canvas.clipRect(gfx::RectToSkRect(layer_rect));

picture->Raster(&canvas, NULL, layer_rect, 1.0f);

« cc/resources/raster_worker_pool.h ('K') | « cc/resources/raster_worker_pool_unittest.cc ('k') | cc/trees/layer_tree_host_pixeltest_readback.cc » ('j') | skia/ext/analysis_canvas.h » ('J')