diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 22:36:34 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 22:36:34 +0000 |
| commit | 757ebd20ef284b6428eb9f4b9b69826cc3640a82 (patch) | |
| tree | f1cbb4b5a361fee8c24f685c01953dc06cee4ed6 /src/utils/SkCanvasStateUtils.cpp | |
| parent | 4770a3b7a290ee5e44662b8dfbc0bc9196f00930 (diff) | |
Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
breaking the Chrome deps roll.
http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
Original issue's description:
> Rename kPMColor_SkColorType to kN32_SkColorType.
>
> The new name better represents what this flag means.
>
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14117
R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384
Author: bensong@google.com
Review URL: https://codereview.chromium.org/234243002
git-svn-id: http://skia.googlecode.com/svn/trunk@14144 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils/SkCanvasStateUtils.cpp')
| -rw-r--r-- | src/utils/SkCanvasStateUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp index 64f62dd8b1..c5b558a1fb 100644 --- a/src/utils/SkCanvasStateUtils.cpp +++ b/src/utils/SkCanvasStateUtils.cpp @@ -223,7 +223,7 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) { layerState->height = bitmap.height(); switch (bitmap.colorType()) { - case kN32_SkColorType: + case kPMColor_SkColorType: layerState->raster.config = kARGB_8888_RasterConfig; break; case kRGB_565_SkColorType: @@ -281,7 +281,7 @@ static SkCanvas* create_canvas_from_canvas_layer(const SkCanvasLayerState& layer SkBitmap bitmap; SkColorType colorType = - layerState.raster.config == kARGB_8888_RasterConfig ? kN32_SkColorType : + layerState.raster.config == kARGB_8888_RasterConfig ? kPMColor_SkColorType : layerState.raster.config == kRGB_565_RasterConfig ? kRGB_565_SkColorType : kUnknown_SkColorType; |