Minimal changes to not crash GPU with color fonts.

src/gpu/SkGrFontScaler.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 "GrTemplates.h"
@@ skipping 67 matching lines @@
 
 GrMaskFormat SkGrFontScaler::getMaskFormat() {
     SkMask::Format format = fStrike->getMaskFormat();
     switch (format) {
         case SkMask::kBW_Format:
             // fall through to kA8 -- we store BW glyphs in our 8-bit cache
         case SkMask::kA8_Format:
             return kA8_GrMaskFormat;
         case SkMask::kLCD16_Format:
             return kA565_GrMaskFormat;
+        case SkMask::kARGB32_Format:

[reed1, 2013/11/26 19:58:03]

This may have us not crash, but its not logically correct, yes? A888 is 3 alpha
channels, not 1 (I think).

[bungeman-skia, 2013/11/26 20:43:43]

Done. Added comment that this is temporary. These two are the same size, so it
works out. The gpu will draw the colors wrong, but this is already less wrong
than it is without this change.

         case SkMask::kLCD32_Format:
             return kA888_GrMaskFormat;
         default:
             SkDEBUGFAIL("unsupported SkMask::Format");
             return kA8_GrMaskFormat;
     }
 }
 
 const GrKey* SkGrFontScaler::getKey() {
     if (NULL == fKey) {
@@ skipping 94 matching lines @@
 bool SkGrFontScaler::getGlyphPath(uint16_t glyphID, SkPath* path) {
 
     const SkGlyph& glyph = fStrike->getGlyphIDMetrics(glyphID);
     const SkPath* skPath = fStrike->findPath(glyph);
     if (skPath) {
         *path = *skPath;
         return true;
     }
     return false;
 }