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>

1 files changed, 3 insertions, 4 deletions

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);
                 }
             }
         }