make tests portable by using 565 compatible colors

TBR=reed@google.com

Review URL: https://codereview.chromium.org/1262703002

28 files changed, 51 insertions, 46 deletions

diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp
index 8a0084c047..10733b3283 100644
--- a/gm/aaclip.cpp
+++ b/gm/aaclip.cpp
@@ -225,7 +225,7 @@ protected:
         SkPaint paint;
         paint.setAntiAlias(true);
         
-        paint.setColor(0xFFCCCCCC);
+        paint.setColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
         canvas->drawPath(path, paint);
         
         paint.setColor(SK_ColorRED);
@@ -238,7 +238,7 @@ protected:
 
         SkRect r = SkRect::MakeXYWH(0, H/4, W, H/2);
         SkPaint paint;
-        paint.setColor(0xFF8888FF);
+        paint.setColor(sk_tool_utils::color_to_565(0xFF8888FF));
 
         canvas->drawRect(r, paint);
         this->doDraw(canvas, path);
diff --git a/gm/aarectmodes.cpp b/gm/aarectmodes.cpp
index 205876be46..7cf5a83929 100644
--- a/gm/aarectmodes.cpp
+++ b/gm/aarectmodes.cpp
@@ -110,8 +110,8 @@ static SkShader* make_bg_shader() {
     SkBitmap bm;
     bm.allocN32Pixels(2, 2);
     *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF;
-    *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC,
-                                                             0xCC, 0xCC);
+    *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCE,
+                                                             0xCF, 0xCE);
 
     const SkMatrix m = SkMatrix::MakeScale(SkIntToScalar(6), SkIntToScalar(6));
     SkShader* s = SkShader::CreateBitmapShader(bm,
diff --git a/gm/addarc.cpp b/gm/addarc.cpp
index 742f16fce5..3bfed8d549 100644
--- a/gm/addarc.cpp
+++ b/gm/addarc.cpp
@@ -36,7 +36,7 @@ protected:
 
         SkScalar sign = 1;
         while (r.width() > paint.getStrokeWidth() * 3) {
-            paint.setColor(rand.nextU() | (0xFF << 24));
+            paint.setColor(sk_tool_utils::color_to_565(rand.nextU() | (0xFF << 24)));
             SkScalar startAngle = rand.nextUScalar1() * 360;
 
             SkScalar speed = SkScalarSqrt(16 / r.width()) * 0.5f;
@@ -144,7 +144,7 @@ protected:
             SkAutoCanvasRestore acr(canvas, true);
             canvas->rotate(fRotate * sign);
 
-            paint.setColor(rand.nextU() | (0xFF << 24));
+            paint.setColor(sk_tool_utils::color_to_565(rand.nextU() | (0xFF << 24)));
             canvas->drawOval(r, paint);
             r.inset(delta, delta);
             sign = -sign;
diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index 8c7ba9bd57..bde6a6f10a 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -46,7 +46,7 @@ protected:
     }
 
     void onDraw(SkCanvas* canvas) override {
-        canvas->drawColor(0xFFCCCCCC);
+        canvas->drawColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
 
         const SkIRect src[] = {
             { 0, 0, 32, 32 },
diff --git a/gm/blend.cpp b/gm/blend.cpp
index 90453a5224..a89ecfe46d 100644
--- a/gm/blend.cpp
+++ b/gm/blend.cpp
@@ -29,7 +29,7 @@ DEF_SIMPLE_GM(blend, canvas, 300, 100) {
         p.setColor(SK_ColorRED);
         canvas->drawRect(SkRect::MakeXYWH(2,0,1,1), p);
         canvas->saveLayerAlpha(NULL, 0xFC);
-            p.setColor(0xFF008000);
+            p.setColor(sk_tool_utils::color_to_565(0xFF008000));
             canvas->drawRect(SkRect::MakeXYWH(2,0,1,1), p);
         canvas->restore();
     canvas->restore();
diff --git a/gm/bmpfilterqualityrepeat.cpp b/gm/bmpfilterqualityrepeat.cpp
index 5c19f00aa3..dd7b901b00 100644
--- a/gm/bmpfilterqualityrepeat.cpp
+++ b/gm/bmpfilterqualityrepeat.cpp
@@ -25,11 +25,11 @@ protected:
         colorBmp.allocN32Pixels(20, 20, true);
         colorBmp.eraseColor(0xFFFF0000);
         canvas.drawBitmap(colorBmp, 0, 0);
-        colorBmp.eraseColor(0xFF008200);
+        colorBmp.eraseColor(sk_tool_utils::color_to_565(0xFF008200));
         canvas.drawBitmap(colorBmp, 20, 0);
-        colorBmp.eraseColor(0xFFFF9000);
+        colorBmp.eraseColor(sk_tool_utils::color_to_565(0xFFFF9000));
         canvas.drawBitmap(colorBmp, 0, 20);
-        colorBmp.eraseColor(0xFF2000FF);
+        colorBmp.eraseColor(sk_tool_utils::color_to_565(0xFF2000FF));
         canvas.drawBitmap(colorBmp, 20, 20);
     }
 
diff --git a/gm/colorcube.cpp b/gm/colorcube.cpp
index 59463fcd9e..931dcfaf51 100644
--- a/gm/colorcube.cpp
+++ b/gm/colorcube.cpp
@@ -85,10 +85,11 @@ protected:
         for (int r = 0; r < size; ++r) {
             for (int g = 0; g < size; ++g) {
                 for (int b = 0; b < size; ++b) {
-                    pixels[(size * ((size * b) + g)) + r] = SkColorSetARGB(0xFF,
+                    pixels[(size * ((size * b) + g)) + r] = sk_tool_utils::color_to_565(
+                            SkColorSetARGB(0xFF,
                             invR ? invLut[r] : lut[r],
                             invG ? invLut[g] : lut[g],
-                            invB ? invLut[b] : lut[b]);
+                            invB ? invLut[b] : lut[b]));
                 }
             }
         }
diff --git a/gm/discard.cpp b/gm/discard.cpp
index 106a6becc0..d30e15c316 100644
--- a/gm/discard.cpp
+++ b/gm/discard.cpp
@@ -58,7 +58,7 @@ protected:
             for (int y = 0; y < 10; ++y) {
               surface->getCanvas()->discard();
               // Make something that isn't too close to the background color, black.
-              SkColor color = rand.nextU() | 0xFF404040;
+              SkColor color = sk_tool_utils::color_to_565(rand.nextU() | 0xFF404040);
               switch (rand.nextULessThan(3)) {
                   case 0:
                       surface->getCanvas()->drawColor(color);
diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp
index 756e922ea9..798f04096a 100644
--- a/gm/dstreadshuffle.cpp
+++ b/gm/dstreadshuffle.cpp
@@ -96,12 +96,12 @@ protected:
 
     static SkColor GetColor(SkRandom* random, int i, int nextColor) {
         static SkColor colors[] = { SK_ColorRED,
-                                    0xFFFF7F00, // Orange
+                                    sk_tool_utils::color_to_565(0xFFFF7F00), // Orange
                                     SK_ColorYELLOW,
                                     SK_ColorGREEN,
                                     SK_ColorBLUE,
-                                    0xFF4B0082, // indigo
-                                    0xFF7F00FF }; // violet
+                                    sk_tool_utils::color_to_565(0xFF4B0082), // indigo
+                                    sk_tool_utils::color_to_565(0xFF7F00FF) }; // violet
         SkColor color;
         int index = nextColor % SK_ARRAY_COUNT(colors);
         switch (i) {
diff --git a/gm/fatpathfill.cpp b/gm/fatpathfill.cpp
index 43e10059c1..711d713852 100644
--- a/gm/fatpathfill.cpp
+++ b/gm/fatpathfill.cpp
@@ -21,7 +21,7 @@ static SkSurface* new_surface(int width, int height) {
 
 static void draw_pixel_centers(SkCanvas* canvas) {
     SkPaint paint;
-    paint.setColor(0xFF0088FF);
+    paint.setColor(sk_tool_utils::color_to_565(0xFF0088FF));
     paint.setAntiAlias(true);
 
     for (int y = 0; y < SMALL_H; ++y) {
diff --git a/gm/gradients.cpp b/gm/gradients.cpp
index 523a11211a..2c7036d3b9 100644
--- a/gm/gradients.cpp
+++ b/gm/gradients.cpp
@@ -296,7 +296,7 @@ protected:
     virtual SkISize onISize() { return SkISize::Make(640, 510); }
 
     void drawBG(SkCanvas* canvas) {
-        canvas->drawColor(0xFFDDDDDD);
+        canvas->drawColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
     }
 
     virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/hairmodes.cpp b/gm/hairmodes.cpp
index 06ae7edf55..74eda7b913 100644
--- a/gm/hairmodes.cpp
+++ b/gm/hairmodes.cpp
@@ -62,7 +62,7 @@ static SkShader* make_bg_shader() {
     SkBitmap bm;
     bm.allocN32Pixels(2, 2);
     *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF;
-    *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC, 0xCC, 0xCC);
+    *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCE, 0xCF, 0xCE);
 
     SkMatrix m;
     m.setScale(SkIntToScalar(6), SkIntToScalar(6));
diff --git a/gm/imagefilterscropexpand.cpp b/gm/imagefilterscropexpand.cpp
index 4fe746a1a1..8f90fb14bd 100644
--- a/gm/imagefilterscropexpand.cpp
+++ b/gm/imagefilterscropexpand.cpp
@@ -41,9 +41,9 @@ protected:
         SkCanvas canvas(*bitmap);
         canvas.clear(0xFFFF0000);
         SkPaint darkPaint;
-        darkPaint.setColor(0xFF404040);
+        darkPaint.setColor(sk_tool_utils::color_to_565(0xFF404040));
         SkPaint lightPaint;
-        lightPaint.setColor(0xFFA0A0A0);
+        lightPaint.setColor(sk_tool_utils::color_to_565(0xFFA0A0A0));
         for (int y = 8; y < 48; y += 16) {
             for (int x = 8; x < 48; x += 16) {
                 canvas.save();
diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp
index 929f2fe3fc..c5bef7b3f8 100644
--- a/gm/imagefilterscropped.cpp
+++ b/gm/imagefilterscropped.cpp
@@ -107,9 +107,9 @@ protected:
         SkCanvas canvas(fCheckerboard);
         canvas.clear(SK_ColorTRANSPARENT);
         SkPaint darkPaint;
-        darkPaint.setColor(0xFF404040);
+        darkPaint.setColor(sk_tool_utils::color_to_565(0xFF404040));
         SkPaint lightPaint;
-        lightPaint.setColor(0xFFA0A0A0);
+        lightPaint.setColor(sk_tool_utils::color_to_565(0xFFA0A0A0));
         for (int y = 0; y < 80; y += 16) {
             for (int x = 0; x < 80; x += 16) {
                 canvas.save();
diff --git a/gm/lighting.cpp b/gm/lighting.cpp
index 6df58516b2..b721fef6c3 100644
--- a/gm/lighting.cpp
+++ b/gm/lighting.cpp
@@ -58,9 +58,9 @@ protected:
             make_bitmap();
             fInitialized = true;
         }
-        canvas->clear(0xFF101010);
+        canvas->clear(sk_tool_utils::color_to_565(0xFF101010));
         SkPaint checkPaint;
-        checkPaint.setColor(0xFF202020);
+        checkPaint.setColor(sk_tool_utils::color_to_565(0xFF202020));
         for (int y = 0; y < HEIGHT; y += 16) {
           for (int x = 0; x < WIDTH; x += 16) {
             canvas->save();
diff --git a/gm/matriximagefilter.cpp b/gm/matriximagefilter.cpp
index 419c4199de..b4242a7e60 100644
--- a/gm/matriximagefilter.cpp
+++ b/gm/matriximagefilter.cpp
@@ -41,9 +41,9 @@ protected:
         bitmap->allocN32Pixels(64, 64);
         SkCanvas canvas(*bitmap);
         SkPaint darkPaint;
-        darkPaint.setColor(0xFF404040);
+        darkPaint.setColor(sk_tool_utils::color_to_565(0xFF404040));
         SkPaint lightPaint;
-        lightPaint.setColor(0xFFA0A0A0);
+        lightPaint.setColor(sk_tool_utils::color_to_565(0xFFA0A0A0));
         for (int y = 0; y < 64; y += 32) {
             for (int x = 0; x < 64; x += 32) {
                 canvas.save();
diff --git a/gm/mipmap.cpp b/gm/mipmap.cpp
index ad45a17e86..6163a3ac51 100644
--- a/gm/mipmap.cpp
+++ b/gm/mipmap.cpp
@@ -15,7 +15,7 @@ static SkImage* make_image() {
     const SkImageInfo info = SkImageInfo::MakeN32Premul(319, 52);
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
     SkCanvas* canvas = surface->getCanvas();
-    canvas->drawColor(0xFFF8F8F8);
+    canvas->drawColor(sk_tool_utils::color_to_565(0xFFF8F8F8));
 
     SkPaint paint;
     paint.setAntiAlias(true);
diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp
index 4fea1f1512..f9a3a1042b 100644
--- a/gm/modecolorfilters.cpp
+++ b/gm/modecolorfilters.cpp
@@ -24,7 +24,7 @@ static SkShader* make_color_shader(SkColor color) {
 }
 
 static SkShader* make_solid_shader() {
-    return make_color_shader(SkColorSetARGB(0xFF, 0x40, 0x80, 0x20));
+    return make_color_shader(SkColorSetARGB(0xFF, 0x42, 0x82, 0x21));
 }
 
 static SkShader* make_transparent_shader() {
@@ -40,9 +40,9 @@ static SkShader* make_bg_shader(int checkSize) {
     SkBitmap bmp;
     bmp.allocN32Pixels(2 * checkSize, 2 * checkSize);
     SkCanvas canvas(bmp);
-    canvas.clear(0xFF800000);
+    canvas.clear(sk_tool_utils::color_to_565(0xFF800000));
     SkPaint paint;
-    paint.setColor(0xFF000080);
+    paint.setColor(sk_tool_utils::color_to_565(0xFF000080));
     SkRect rect0 = SkRect::MakeXYWH(0, 0,
                                     SkIntToScalar(checkSize), SkIntToScalar(checkSize));
     SkRect rect1 = SkRect::MakeXYWH(SkIntToScalar(checkSize), SkIntToScalar(checkSize),
@@ -94,7 +94,7 @@ protected:
             SkColorSetARGB(0xFF, 0xFF, 0xFF, 0xFF),
             SkColorSetARGB(0xFF, 0x00, 0x00, 0x00),
             SkColorSetARGB(0x00, 0x00, 0x00, 0x00),
-            SkColorSetARGB(0xFF, 0x10, 0x20, 0x40),
+            SkColorSetARGB(0xFF, 0x10, 0x20, 0x42),
             SkColorSetARGB(0xA0, 0x20, 0x30, 0x90),
         };
 
diff --git a/gm/pathopsinverse.cpp b/gm/pathopsinverse.cpp
index 476eda1991..0c88632d4c 100644
--- a/gm/pathopsinverse.cpp
+++ b/gm/pathopsinverse.cpp
@@ -20,16 +20,16 @@ public:
 
 protected:
     void onOnceBeforeDraw() override {
-        const unsigned oneColor = 0xFF8080FF;
+        const unsigned oneColor = sk_tool_utils::color_to_565(0xFF8080FF);
         const unsigned twoColor = 0x807F1f1f;
         SkColor blendColor = blend(oneColor, twoColor);
         makePaint(&fOnePaint, oneColor);
         makePaint(&fTwoPaint, twoColor);
         makePaint(&fOpPaint[kDifference_SkPathOp], oneColor);
         makePaint(&fOpPaint[kIntersect_SkPathOp], blendColor);
-        makePaint(&fOpPaint[kUnion_SkPathOp], 0xFFc0FFc0);
+        makePaint(&fOpPaint[kUnion_SkPathOp], sk_tool_utils::color_to_565(0xFFc0FFc0));
         makePaint(&fOpPaint[kReverseDifference_SkPathOp], twoColor);
-        makePaint(&fOpPaint[kXOR_SkPathOp], 0xFFa0FFe0);
+        makePaint(&fOpPaint[kXOR_SkPathOp], sk_tool_utils::color_to_565(0xFFa0FFe0));
         makePaint(&fOutlinePaint, 0xFF000000);
         fOutlinePaint.setStyle(SkPaint::kStroke_Style);
     }
diff --git a/gm/repeated_bitmap.cpp b/gm/repeated_bitmap.cpp
index e6b06365e6..bda368b738 100644
--- a/gm/repeated_bitmap.cpp
+++ b/gm/repeated_bitmap.cpp
@@ -10,7 +10,8 @@
 #include "Resources.h"
 
 DEF_SIMPLE_GM(repeated_bitmap, canvas, 576, 576) {
-    sk_tool_utils::draw_checkerboard(canvas, 0xFF999999, SK_ColorWHITE, 12);
+    sk_tool_utils::draw_checkerboard(canvas, sk_tool_utils::color_to_565(0xFF999999),
+            SK_ColorWHITE, 12);
     SkRect rect = SkRect::MakeLTRB(-4.25f, -4.25f, 4.25f, 4.25f);
     SkPaint paint;
     paint.setColor(0xFF333333);
@@ -31,7 +32,8 @@ DEF_SIMPLE_GM(repeated_bitmap, canvas, 576, 576) {
 }
 
 DEF_SIMPLE_GM(repeated_bitmap_jpg, canvas, 576, 576) {
-    sk_tool_utils::draw_checkerboard(canvas, 0xFF999999, SK_ColorWHITE, 12);
+    sk_tool_utils::draw_checkerboard(canvas, sk_tool_utils::color_to_565(0xFF999999),
+            SK_ColorWHITE, 12);
     SkRect rect = SkRect::MakeLTRB(-68.0f, -68.0f, 68.0f, 68.0f);
     SkPaint paint;
     paint.setColor(0xFF333333);
diff --git a/gm/rrect.cpp b/gm/rrect.cpp
index 4c556542c6..5106634728 100644
--- a/gm/rrect.cpp
+++ b/gm/rrect.cpp
@@ -104,7 +104,7 @@ static void draw_rrect_color(SkCanvas* canvas, const SkRRect& rrect) {
     if (rrect.isRect()) {
         paint.setColor(SK_ColorRED);
     } else if (rrect.isOval()) {
-        paint.setColor(0xFF008800);
+        paint.setColor(sk_tool_utils::color_to_565(0xFF008800));
     } else if (rrect.isSimple()) {
         paint.setColor(SK_ColorBLUE);
     } else {
diff --git a/gm/shallowgradient.cpp b/gm/shallowgradient.cpp
index 415ed41489..276ec14f49 100644
--- a/gm/shallowgradient.cpp
+++ b/gm/shallowgradient.cpp
@@ -52,7 +52,8 @@ protected:
     }
 
     void onDraw(SkCanvas* canvas) override {
-        const SkColor colors[] = { 0xFF555555, 0xFF444444 };
+        const SkColor colors[] = { sk_tool_utils::color_to_565(0xFF555555), 
+                sk_tool_utils::color_to_565(0xFF444444) };
         const int colorCount = SK_ARRAY_COUNT(colors);
 
         SkRect r = { 0, 0, this->width(), this->height() };
diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp
index bd9fe2b900..8054a53c61 100644
--- a/gm/simpleaaclip.cpp
+++ b/gm/simpleaaclip.cpp
@@ -148,7 +148,7 @@ protected:
         } gOps[] = {
             { SK_ColorBLACK,    "Difference", SkRegion::kDifference_Op    },
             { SK_ColorRED,      "Intersect",  SkRegion::kIntersect_Op     },
-            { 0xFF008800,       "Union",      SkRegion::kUnion_Op         },
+            { sk_tool_utils::color_to_565(0xFF008800), "Union", SkRegion::kUnion_Op },
             { SK_ColorGREEN,    "Rev Diff",   SkRegion::kReverseDifference_Op },
             { SK_ColorYELLOW,   "Replace",    SkRegion::kReplace_Op       },
             { SK_ColorBLUE,     "XOR",        SkRegion::kXOR_Op           },
diff --git a/gm/skbug1719.cpp b/gm/skbug1719.cpp
index dc5de45b2b..66526295d8 100644
--- a/gm/skbug1719.cpp
+++ b/gm/skbug1719.cpp
@@ -34,7 +34,7 @@ protected:
 
     void onDrawBackground(SkCanvas* canvas) override {
         SkPaint bgPaint;
-        bgPaint.setColor(0xFF303030);
+        bgPaint.setColor(sk_tool_utils::color_to_565(0xFF303030));
         canvas->drawPaint(bgPaint);
     }
 
diff --git a/gm/stringart.cpp b/gm/stringart.cpp
index 7c9a22ee36..d381350e18 100644
--- a/gm/stringart.cpp
+++ b/gm/stringart.cpp
@@ -55,7 +55,7 @@ protected:
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setStyle(SkPaint::kStroke_Style);
-        paint.setColor(0xFF007700);
+        paint.setColor(sk_tool_utils::color_to_565(0xFF007700));
 
         canvas->drawPath(path, paint);
     }
diff --git a/gm/strokes.cpp b/gm/strokes.cpp
index 9de20911ce..77638e4537 100644
--- a/gm/strokes.cpp
+++ b/gm/strokes.cpp
@@ -205,7 +205,7 @@ protected:
         SkPaint fillPaint(origPaint);
         fillPaint.setColor(SK_ColorRED);
         SkPaint strokePaint(origPaint);
-        strokePaint.setColor(0xFF4444FF);
+        strokePaint.setColor(sk_tool_utils::color_to_565(0xFF4444FF));
 
         void (*procs[])(SkPath*, const SkRect&, SkString*) = {
             make0, make1, make2, make3, make4, make5
diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp
index deba9e55e9..0855ac0ea3 100644
--- a/gm/tablecolorfilter.cpp
+++ b/gm/tablecolorfilter.cpp
@@ -110,7 +110,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas* canvas) {
-        canvas->drawColor(0xFFDDDDDD);
+        canvas->drawColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
         canvas->translate(20, 20);
 
 
@@ -222,7 +222,7 @@ protected:
         SkBitmap bm;
         make_bm1(&bm);
 
-        canvas->drawColor(0xFFDDDDDD);
+        canvas->drawColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
 
         const int MODES = MODE_COUNT * COLOR_COUNT;
         SkAutoTUnref<SkColorFilter> filters[MODES];
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index c1a1f6b10e..f9d57a795e 100644
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -29,6 +29,7 @@
         '../src/utils/debugger/SkObjectParser.cpp',
       ],
       'sources!': [
+        '../gm/annotated_text.cpp',
         '../gm/system_preferences_default.cpp',
         '../gm/techtalk1.cpp',
       ],