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 /gyp | |
| 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 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 5 | ||||
| -rw-r--r-- | gyp/skia_for_chromium_defines.gypi | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 3cf5a632bc..77a7947f19 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -301,8 +301,9 @@ # Temporary until https:#googleplex-android-review.git.corp.google.com/#/c/442220/ # lands. 'SK_SUPPORT_LEGACY_GETTOTALCLIP', - # Still need to switch Android to the new name for N32. - 'kNative_8888_SkColorType kN32_SkColorType', + # Use a better name for kPMColor_SkColorType until + # https://code.google.com/p/skia/issues/detail?id=2384 is fixed. + 'kNative_8888_SkColorType kPMColor_SkColorType', ], }], diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi index bd59fd0a01..a547f73da0 100644 --- a/gyp/skia_for_chromium_defines.gypi +++ b/gyp/skia_for_chromium_defines.gypi @@ -16,7 +16,6 @@ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOTALCLIP', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', - 'SK_SUPPORT_LEGACY_N32_NAME', ], }, } |