Enable use of distance fields via SkPaint flag.

src/gpu/GrTextStrike.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlas.h"
 #include "GrGpu.h"
 #include "GrRectanizer.h"
 #include "GrTextStrike.h"
 #include "GrTextStrike_impl.h"
 #include "SkString.h"
 
-#if SK_DISTANCEFIELD_FONTS
 #include "SkDistanceFieldGen.h"
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #define FONT_CACHE_STATS 0
 #if FONT_CACHE_STATS
 static int g_PurgeCount = 0;
 #endif
 
 GrFontCache::GrFontCache(GrGpu* gpu) : fGpu(gpu) {
     gpu->ref();
@@ skipping 163 matching lines @@
     ++gDumpCount;
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
     static int gCounter;
 #endif
 
-#if SK_DISTANCEFIELD_FONTS
 // this acts as the max magnitude for the distance field,
 // as well as the pad we need around the glyph
 #define DISTANCE_FIELD_RANGE   4
-#endif
 
 /*
     The text strike is specific to a given font/style/matrix setup, which is
     represented by the GrHostFontScaler object we are given in getGlyph().
 
     We map a 32bit glyphID to a GrGlyph record, which in turn points to a
     atlas and a position within that texture.
  */
 
 GrTextStrike::GrTextStrike(GrFontCache* cache, const GrKey* key,
@@ skipping 28 matching lines @@
 }
 
 GrGlyph* GrTextStrike::generateGlyph(GrGlyph::PackedID packed,
                                      GrFontScaler* scaler) {
     SkIRect bounds;
     if (!scaler->getPackedGlyphBounds(packed, &bounds)) {
         return NULL;
     }
 
     GrGlyph* glyph = fPool.alloc();
-#if SK_DISTANCEFIELD_FONTS
     // expand bounds to hold full distance field data
     if (fUseDistanceField) {
         bounds.fLeft   -= DISTANCE_FIELD_RANGE;
         bounds.fRight  += DISTANCE_FIELD_RANGE;
         bounds.fTop    -= DISTANCE_FIELD_RANGE;
         bounds.fBottom += DISTANCE_FIELD_RANGE;
     }
-#endif
     glyph->init(packed, bounds);
     fCache.insert(packed, glyph);
     return glyph;
 }
 
 void GrTextStrike::removePlot(const GrPlot* plot) {
     SkTDArray<GrGlyph*>& glyphArray = fCache.getArray();
     for (int i = 0; i < glyphArray.count(); ++i) {
         if (plot == glyphArray[i]->fPlot) {
             glyphArray[i]->fPlot = NULL;
@@ skipping 13 matching lines @@
     SkASSERT(glyph);
     SkASSERT(scaler);
     SkASSERT(fCache.contains(glyph));
     SkASSERT(NULL == glyph->fPlot);
 
     SkAutoRef ar(scaler);
 
     int bytesPerPixel = GrMaskFormatBytesPerPixel(fMaskFormat);
 
     GrPlot* plot;
-#if SK_DISTANCEFIELD_FONTS
     if (fUseDistanceField) {
         // we've already expanded the glyph dimensions to match the final size
         // but must shrink back down to get the packed glyph data
         int dfWidth = glyph->width();
         int dfHeight = glyph->height();
         int width = dfWidth - 2*DISTANCE_FIELD_RANGE;
         int height = dfHeight - 2*DISTANCE_FIELD_RANGE;
         int stride = width*bytesPerPixel;
 
         size_t size = width * height * bytesPerPixel;
@@ skipping 27 matching lines @@
                 dfPtr += dfStride;
                 ptr += stride;
             }
         }
 
         // copy to atlas
         plot = fAtlasMgr->addToAtlas(&fAtlas, dfWidth, dfHeight, dfStorage.get(),
                                      &glyph->fAtlasLocation);
 
     } else {
-#endif
         size_t size = glyph->fBounds.area() * bytesPerPixel;
         SkAutoSMalloc<1024> storage(size);
         if (!scaler->getPackedGlyphImage(glyph->fPackedID, glyph->width(),
                                          glyph->height(),
                                          glyph->width() * bytesPerPixel,
                                          storage.get())) {
             return false;
         }
 
         plot = fAtlasMgr->addToAtlas(&fAtlas, glyph->width(),
                                      glyph->height(), storage.get(),
                                      &glyph->fAtlasLocation);
-#if SK_DISTANCEFIELD_FONTS
     }
-#endif
 
     if (NULL == plot) {
         return false;
     }
 
     glyph->fPlot = plot;
     return true;
 }