diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-04-24 14:47:16 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-24 19:19:01 +0000 |
| commit | 6cdb7d3a4ca932d1564ffea1602d5c39c5e046a2 (patch) | |
| tree | 59bde1b72f8317024053f25ea43c8d4c4c41d8cd | |
| parent | fb20ac4578582f31b807d3c27be46b0102c048cc (diff) | |
prepare to remove obsolete macros
SkColorSetARGBMacro and SkColorSetARGBInline
are macros which will be deleted. Replace them
with a standard equivalent.
R=scroggo@google.com
Bug: skia:6898
Change-Id: I16e010776e991c19a375d0686ecd1b1cc4c59a9b
Reviewed-on: https://skia-review.googlesource.com/123501
Auto-Submit: Cary Clark <caryclark@skia.org>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
| -rw-r--r-- | bench/TileBench.cpp | 2 | ||||
| -rw-r--r-- | gm/gammaencodedpremul.cpp | 7 | ||||
| -rw-r--r-- | src/effects/SkLightingImageFilter.cpp | 7 | ||||
| -rw-r--r-- | tests/HSVRoundTripTest.cpp | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/bench/TileBench.cpp b/bench/TileBench.cpp index cd2654611b..4a69ccbb2f 100644 --- a/bench/TileBench.cpp +++ b/bench/TileBench.cpp @@ -83,7 +83,7 @@ protected: paint.setFilterQuality(fDoFilter ? kLow_SkFilterQuality : kNone_SkFilterQuality); if (fDoTrans) { - paint.setColor(SkColorSetARGBMacro(0x80, 0xFF, 0xFF, 0xFF)); + paint.setColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF)); } SkRect r; diff --git a/gm/gammaencodedpremul.cpp b/gm/gammaencodedpremul.cpp index 4322807e27..1d7bb5702f 100644 --- a/gm/gammaencodedpremul.cpp +++ b/gm/gammaencodedpremul.cpp @@ -37,10 +37,9 @@ public: for (int r = 0; r < kColorSteps; r++) { for (int g = 0; g < kColorSteps; g++) { for (int b = 0; b < kColorSteps; b++) { - fColors[i++] = SkColorSetARGBInline(0xFF, - r * kColorScale, - g * kColorScale, - b * kColorScale); + fColors[i++] = SkColorSetRGB(r * kColorScale, + g * kColorScale, + b * kColorScale); } } } diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index a55b3e37dc..0a1330583a 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -824,10 +824,9 @@ class GrGLLight; /////////////////////////////////////////////////////////////////////////////// static SkColor xform_color(const SkPoint3& color, SkColorSpaceXformer* xformer) { - SkColor origColor = SkColorSetARGBInline(0xFF, - SkScalarRoundToInt(color.fX), - SkScalarRoundToInt(color.fY), - SkScalarRoundToInt(color.fZ)); + SkColor origColor = SkColorSetRGB(SkScalarRoundToInt(color.fX), + SkScalarRoundToInt(color.fY), + SkScalarRoundToInt(color.fZ)); return xformer->apply(origColor); } diff --git a/tests/HSVRoundTripTest.cpp b/tests/HSVRoundTripTest.cpp index 4d25895a9a..ab4d400b9c 100644 --- a/tests/HSVRoundTripTest.cpp +++ b/tests/HSVRoundTripTest.cpp @@ -14,7 +14,7 @@ DEF_TEST(ColorToHSVRoundTrip, reporter) { for (U8CPU r = 0; r <= 255; r++) { for (U8CPU g = 0; g <= 255; g++) { for (U8CPU b = 0; b <= 255; b++) { - SkColor color = SkColorSetARGBInline(0xFF, r, g, b); + SkColor color = SkColorSetRGB(r, g, b); SkColorToHSV(color, hsv); SkColor result = SkHSVToColor(0xFF, hsv); if (result != color) { |