skia/ext/vector_platform_device_emf_win.cc - Issue 374633002: SkBitmap::Config is deprecated, use SkColorType instead

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: skia/ext/vector_platform_device_emf_win.cc

Issue 374633002: SkBitmap::Config is deprecated, use SkColorType instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address comments from #4 Created 6 years, 5 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:

Index: skia/ext/vector_platform_device_emf_win.cc

diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc

index af245cd95e2714141065c3f1b10d8d2302ad13c6..f3063165bfbe9130746acdd932e6aaa83494a7d1 100644

--- a/skia/ext/vector_platform_device_emf_win.cc

+++ b/skia/ext/vector_platform_device_emf_win.cc

@@ -895,7 +895,7 @@ void VectorPlatformDeviceEmf::InternalDrawBitmap(const SkBitmap& bitmap,

bitmap_header.bV4AlphaMask = 0xff000000;

SkAutoLockPixels lock(bitmap);

- SkASSERT(bitmap.config() == SkBitmap::kARGB_8888_Config);

+ SkASSERT(bitmap.colorType() == kN32_SkColorType);

const uint32_t* pixels = static_cast<const uint32_t*>(bitmap.getPixels());

if (pixels == NULL) {

SkASSERT(false);