src/utils/SkCanvasStateUtils.cpp - Issue 235523003: Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

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: src/utils/SkCanvasStateUtils.cpp

Issue 235523003: Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 8 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: src/utils/SkCanvasStateUtils.cpp

diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp

index c5b558a1fbb51ea5bcf2d1c10ba08f062bba7320..64f62dd8b190fb507da998294b489438157dd0c7 100644

--- a/src/utils/SkCanvasStateUtils.cpp

+++ b/src/utils/SkCanvasStateUtils.cpp

@@ -223,7 +223,7 @@

layerState->height = bitmap.height();

switch (bitmap.colorType()) {

- case kPMColor_SkColorType:

+ case kN32_SkColorType:

layerState->raster.config = kARGB_8888_RasterConfig;

break;

case kRGB_565_SkColorType:

@@ -281,7 +281,7 @@

SkBitmap bitmap;

SkColorType colorType =

- layerState.raster.config == kARGB_8888_RasterConfig ? kPMColor_SkColorType :

+ layerState.raster.config == kARGB_8888_RasterConfig ? kN32_SkColorType :

layerState.raster.config == kRGB_565_RasterConfig ? kRGB_565_SkColorType :

kUnknown_SkColorType;

« no previous file with comments | « src/utils/SkBitmapHasher.cpp ('k') | src/utils/mac/SkCreateCGImageRef.cpp » ('j') | no next file with comments »