update complexclip to portable

gm/complexclip.cpp

 
 /*
  * Copyright 2011 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 "SkCanvas.h"
 //#include "SkParsePath.h"
 #include "SkPath.h"
 //#include "SkRandom.h"
 
 namespace skiagm {
 
 static const SkColor gPathColor = SK_ColorBLACK;
 static const SkColor gClipAColor = SK_ColorBLUE;
 static const SkColor gClipBColor = SK_ColorRED;
 
 class ComplexClipGM : public GM {
 public:
     ComplexClipGM(bool aaclip, bool saveLayer, bool invertDraw)
     : fDoAAClip(aaclip)
     , fDoSaveLayer(saveLayer)
     , fInvertDraw(invertDraw) {
-        this->setBGColor(0xFFDDDDDD);
+        this->setBGColor(0xFFDEDFDE);
     }
 
 protected:
 
 
     SkString onShortName() {
         SkString str;
         str.printf("complexclip_%s%s%s",
                    fDoAAClip ? "aa" : "bw",
                    fDoSaveLayer ? "_layer" : "",
@@ skipping 39 matching lines @@
         SkPath clipB;
         clipB.moveTo(SkIntToScalar(40),  SkIntToScalar(10));
         clipB.lineTo(SkIntToScalar(190), SkIntToScalar(15));
         clipB.lineTo(SkIntToScalar(195), SkIntToScalar(190));
         clipB.lineTo(SkIntToScalar(40),  SkIntToScalar(185));
         clipB.lineTo(SkIntToScalar(155), SkIntToScalar(100));
         clipB.close();
 
         SkPaint paint;
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
+        sk_tool_utils::set_portable_typeface_always(&paint);
         paint.setTextSize(SkIntToScalar(20));
 
         static const struct {
             SkRegion::Op fOp;
             const char*  fName;
         } gOps[] = { //extra spaces in names for measureText
             {SkRegion::kIntersect_Op,         "Isect "},
             {SkRegion::kDifference_Op,        "Diff " },
             {SkRegion::kUnion_Op,             "Union "},
             {SkRegion::kXOR_Op,               "Xor "  },
@@ skipping 106 matching lines @@
 DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, false, false)); )
 DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, false, true));  )
 DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, true,  false)); )
 DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, true,  true));  )
 DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true,  false, false)); )
 DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true,  false, true));  )
 DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true,  true,  false)); )
 DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true,  true,  true));  )
 
 }