make convex poly clip portable

gm/convexpolyclip.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkBitmap.h"
 #include "SkGradientShader.h"
 #include "SkTLList.h"
 
 static SkBitmap make_bmp(int w, int h) {
     SkBitmap bmp;
     bmp.allocN32Pixels(w, h, true);
 
     SkCanvas canvas(bmp);
     SkScalar wScalar = SkIntToScalar(w);
     SkScalar hScalar = SkIntToScalar(h);
 
     SkPoint     pt = { wScalar / 2, hScalar / 2 };
 
     SkScalar    radius = 3 * SkMaxScalar(wScalar, hScalar);
 
-    SkColor     colors[] = { SK_ColorDKGRAY, 0xFF222255,
-                             0xFF331133, 0xFF884422,
-                             0xFF000022, SK_ColorWHITE,
-                             0xFFAABBCC};
+    SkColor     colors[] = { sk_tool_utils::color_to_565(SK_ColorDKGRAY),
+                             sk_tool_utils::color_to_565(0xFF222255),
+                             sk_tool_utils::color_to_565(0xFF331133),
+                             sk_tool_utils::color_to_565(0xFF884422),
+                             sk_tool_utils::color_to_565(0xFF000022), SK_ColorWHITE,
+                             sk_tool_utils::color_to_565(0xFFAABBCC) };
 
     SkScalar    pos[] = {0,
                          SK_Scalar1 / 6,
                          2 * SK_Scalar1 / 6,
                          3 * SK_Scalar1 / 6,
                          4 * SK_Scalar1 / 6,
                          5 * SK_Scalar1 / 6,
                          SK_Scalar1};
 
     SkPaint paint;
     SkRect rect = SkRect::MakeWH(wScalar, hScalar);
     SkMatrix mat = SkMatrix::I();
     for (int i = 0; i < 4; ++i) {
         paint.setShader(SkGradientShader::CreateRadial(
                         pt, radius,
                         colors, pos,
                         SK_ARRAY_COUNT(colors),
                         SkShader::kRepeat_TileMode,
                         0, &mat))->unref();
         canvas.drawRect(rect, paint);
         rect.inset(wScalar / 8, hScalar / 8);
         mat.preTranslate(6 * wScalar, 6 * hScalar);
         mat.postScale(SK_Scalar1 / 3, SK_Scalar1 / 3);
     }
 
     paint.setAntiAlias(true);
-    sk_tool_utils::set_portable_typeface(&paint);
+    sk_tool_utils::set_portable_typeface_always(&paint);
     paint.setTextSize(wScalar / 2.2f);
     paint.setShader(0);
-    paint.setColor(SK_ColorLTGRAY);
+    paint.setColor(sk_tool_utils::color_to_565(SK_ColorLTGRAY));
     static const char kTxt[] = "Skia";
     SkPoint texPos = { wScalar / 17, hScalar / 2 + paint.getTextSize() / 2.5f };
     canvas.drawText(kTxt, SK_ARRAY_COUNT(kTxt)-1, texPos.fX, texPos.fY, paint);
     paint.setColor(SK_ColorBLACK);
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(SK_Scalar1);
     canvas.drawText(kTxt, SK_ARRAY_COUNT(kTxt)-1, texPos.fX, texPos.fY, paint);
     return bmp;
 }
 
@@ skipping 72 matching lines @@
         bgPaint.setAlpha(0x15);
         SkISize size = canvas->getDeviceSize();
         SkRect dstRect = SkRect::MakeWH(SkIntToScalar(size.fWidth),
                                         SkIntToScalar(size.fHeight));
         canvas->drawBitmapRectToRect(fBmp, NULL, dstRect, &bgPaint);
 
         static const char kTxt[] = "Clip Me!";
         SkPaint txtPaint;
         txtPaint.setTextSize(23.f);
         txtPaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&txtPaint);
-        txtPaint.setColor(SK_ColorDKGRAY);
+        sk_tool_utils::set_portable_typeface_always(&txtPaint);
+        txtPaint.setColor(sk_tool_utils::color_to_565(SK_ColorDKGRAY));
         SkScalar textW = txtPaint.measureText(kTxt, SK_ARRAY_COUNT(kTxt)-1);
 
         SkScalar startX = 0;
         int testLayers = kBench_Mode != this->getMode();
         for (int doLayer = 0; doLayer <= testLayers; ++doLayer) {
             for (SkTLList<Clip>::Iter iter(fClips, SkTLList<Clip>::Iter::kHead_IterStart);
                  iter.get();
                  iter.next()) {
                 const Clip* clip = iter.get();
                 SkScalar x = startX;
@@ skipping 127 matching lines @@
 
     SkTLList<Clip>   fClips;
     SkBitmap         fBmp;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(ConvexPolyClip); )
 
 }