improve bitmap font support (FreeType only)

gm/coloremoji.cpp

 /*
  * Copyright 2013 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 "SkStream.h"
@@ skipping 32 matching lines @@
     virtual SkISize onISize() {
         return make_isize(640, 480);
     }
 
     virtual void onDraw(SkCanvas* canvas) {
 
         canvas->drawColor(SK_ColorGRAY);
 
         SkPaint paint;
         paint.setTypeface(fTypeface);
-        paint.setEmbeddedBitmapText(true);

[bungeman-skia, 2013/12/09 22:13:34]

The 'embedded bitmap' flag was intended to be used to control whether embedded
bitmaps in scalable fonts should be used. This could be thought of as a
legibility vs artistic trade-off. This flag really shouldn't matter to bitmap
only fonts, as there is no such trade-off anymore. The code in the ScalerContext
has been updated to reflect this in PS15.

 
         const char* text = "hamburgerfons";
 
         // draw text at different point sizes
         const int textSize[] = { 10, 30, 50 };
         const int textYOffset[] = { 10, 40, 100};
         SkASSERT(sizeof(textSize) == sizeof(textYOffset));
         for (size_t y = 0; y < sizeof(textSize) / sizeof(int); ++y) {
             paint.setTextSize(SkIntToScalar(textSize[y]));
             canvas->drawText(text, strlen(text), 10, SkIntToScalar(textYOffset[y]), paint);
@@ skipping 46 matching lines @@
 
 //////////////////////////////////////////////////////////////////////////////
 
 #if !defined(SK_BUILD_FOR_ANDROID)
 // fail for now until the appropriate freetype changes are submitted
 static GM* MyFactory(void*) { return new ColorEmojiGM; }
 static GMRegistry reg(MyFactory);
 #endif
 
 }