diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-11 13:47:30 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-11 13:47:30 +0000 |
| commit | 96edc2459820f0f60ea9b57959c1e5018ef95e28 (patch) | |
| tree | 96c92f8d88e4fbc4168e57f88dcd6b913042f52b /src/effects/SkDisplacementMapEffect.cpp | |
| parent | 968757e17dafee5dc32fb54d5f10c23307aaaca2 (diff) | |
Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
Chrome's side of define changes not easy to figure out quickly. Reverting this for DEPS roll for now.
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/234833003
git-svn-id: http://skia.googlecode.com/svn/trunk@14149 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkDisplacementMapEffect.cpp')
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 39222444d2..0200cabff8 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -205,8 +205,8 @@ bool SkDisplacementMapEffect::onFilterImage(Proxy* proxy, (displInput && !displInput->filterImage(proxy, src, ctx, &displ, &displOffset))) { return false; } - if ((displ.colorType() != kN32_SkColorType) || - (color.colorType() != kN32_SkColorType)) { + if ((displ.colorType() != kPMColor_SkColorType) || + (color.colorType() != kPMColor_SkColorType)) { return false; } SkIRect bounds; |