diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-11 17:15:40 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-11 17:15:40 +0000 |
| commit | 28fcae2ec77eb16a79e155f8d788b20457f1c951 (patch) | |
| tree | a79e8015d2dd76f5a2677ffcc19d2aede4c6b8bb /gyp | |
| parent | 4bffdf2a1034b4e8ae8c1b484769154f9d382a00 (diff) | |
Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/)
Reason for revert:
Want to reland the original CL.
Original issue's description:
> 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
>
> TBR=reed@google.com,scroggo@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14144
R=reed@google.com, bensong@google.com
TBR=bensong@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/235523003
git-svn-id: http://skia.googlecode.com/svn/trunk@14156 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 77a7947f19..3cf5a632bc 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -301,9 +301,8 @@ # Temporary until https:#googleplex-android-review.git.corp.google.com/#/c/442220/ # lands. 'SK_SUPPORT_LEGACY_GETTOTALCLIP', - # 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', + # Still need to switch Android to the new name for N32. + 'kNative_8888_SkColorType kN32_SkColorType', ], }], diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi index 6eaa5945f4..1bbd0c3054 100644 --- a/gyp/skia_for_chromium_defines.gypi +++ b/gyp/skia_for_chromium_defines.gypi @@ -15,6 +15,7 @@ 'skia_for_chromium_defines': [ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', + 'SK_SUPPORT_LEGACY_N32_NAME', ], }, } |