src/core/SkBitmapProcShader.cpp - Issue 234243002: 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/core/SkBitmapProcShader.cpp

Issue 234243002: 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:

Index: src/core/SkBitmapProcShader.cpp

diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp

index a397b78439d6f7854f986565b927f0325f0494db..9c2c77b9506c6fd0f8107df5fe297d845abddaa9 100644

--- a/src/core/SkBitmapProcShader.cpp

+++ b/src/core/SkBitmapProcShader.cpp

@@ -22,7 +22,7 @@

case kAlpha_8_SkColorType:

case kRGB_565_SkColorType:

case kIndex_8_SkColorType:

- case kN32_SkColorType:

+ case kPMColor_SkColorType:

// if (tx == ty && (kClamp_TileMode == tx || kRepeat_TileMode == tx))

return true;

default:

@@ -130,7 +130,7 @@

flags |= (kHasSpan16_Flag | kIntrinsicly16_Flag);

break;

case kIndex_8_SkColorType:

- case kN32_SkColorType:

+ case kPMColor_SkColorType:

if (bitmapIsOpaque) {

flags |= kHasSpan16_Flag;

}

@@ -279,7 +279,7 @@

}

switch (bm.colorType()) {

- case kN32_SkColorType:

+ case kPMColor_SkColorType:

*color = SkUnPreMultiply::PMColorToColor(*bm.getAddr32(0, 0));

return true;

case kRGB_565_SkColorType:

« no previous file with comments | « src/core/SkBitmapFilter.cpp ('k') | src/core/SkBitmapScaler.cpp » ('j') | no next file with comments »