update portable fonts

tools/sk_tool_utils.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 "sk_tool_utils.h"
 #include "sk_tool_utils_flags.h"
 
@@ skipping 28 matching lines @@
     if (FLAGS_portableFonts) {
         face = create_font(name, style);
     } else if (FLAGS_resourceFonts) {
         face = resource_font(name, style);
     } else {
         face = SkTypeface::CreateFromName(name, style);
     }
     return face;
 }
 
+SkTypeface* create_portable_typeface_always(const char* name, SkTypeface::Style style) {
+    return create_font(name, style);
+}
+
 void set_portable_typeface(SkPaint* paint, const char* name, SkTypeface::Style style) {
     SkTypeface* face = create_portable_typeface(name, style);
     SkSafeUnref(paint->setTypeface(face));
 }
 
+void set_portable_typeface_always(SkPaint* paint, const char* name, SkTypeface::Style style) {
+    SkTypeface* face = create_font(name, style);
+    SkSafeUnref(paint->setTypeface(face));
+}
+    
 void write_pixels(SkCanvas* canvas, const SkBitmap& bitmap, int x, int y,
                   SkColorType colorType, SkAlphaType alphaType) {
     SkBitmap tmp(bitmap);
     tmp.lockPixels();
 
     const SkImageInfo info = SkImageInfo::Make(tmp.width(), tmp.height(), colorType, alphaType);
 
     canvas->writePixels(info, tmp.getPixels(), tmp.rowBytes(), x, y);
 }
 
@@ skipping 24 matching lines @@
     paint.textToGlyphs(text, len, glyphs.begin());
 
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
     const SkTextBlobBuilder::RunBuffer& run = builder->allocRun(paint, glyphs.count(), x, y,
                                                                 NULL);
     memcpy(run.glyphs, glyphs.begin(), glyphs.count() * sizeof(uint16_t));
 }
 
 
 }  // namespace sk_tool_utils