Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/gpu/SkGrFontScaler.cpp

Issue 88993003: Minimal changes to not crash GPU with color fonts. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Add TODO. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/fonts/SkGScalerContext.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "GrTemplates.h" 10 #include "GrTemplates.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 GrMaskFormat SkGrFontScaler::getMaskFormat() { 79 GrMaskFormat SkGrFontScaler::getMaskFormat() {
80 SkMask::Format format = fStrike->getMaskFormat(); 80 SkMask::Format format = fStrike->getMaskFormat();
81 switch (format) { 81 switch (format) {
82 case SkMask::kBW_Format: 82 case SkMask::kBW_Format:
83 // fall through to kA8 -- we store BW glyphs in our 8-bit cache 83 // fall through to kA8 -- we store BW glyphs in our 8-bit cache
84 case SkMask::kA8_Format: 84 case SkMask::kA8_Format:
85 return kA8_GrMaskFormat; 85 return kA8_GrMaskFormat;
86 case SkMask::kLCD16_Format: 86 case SkMask::kLCD16_Format:
87 return kA565_GrMaskFormat; 87 return kA565_GrMaskFormat;
88 // TODO: properly support kARGB32_Format.
89 case SkMask::kARGB32_Format:
88 case SkMask::kLCD32_Format: 90 case SkMask::kLCD32_Format:
89 return kA888_GrMaskFormat; 91 return kA888_GrMaskFormat;
90 default: 92 default:
91 SkDEBUGFAIL("unsupported SkMask::Format"); 93 SkDEBUGFAIL("unsupported SkMask::Format");
92 return kA8_GrMaskFormat; 94 return kA8_GrMaskFormat;
93 } 95 }
94 } 96 }
95 97
96 const GrKey* SkGrFontScaler::getKey() { 98 const GrKey* SkGrFontScaler::getKey() {
97 if (NULL == fKey) { 99 if (NULL == fKey) {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 bool SkGrFontScaler::getGlyphPath(uint16_t glyphID, SkPath* path) { 194 bool SkGrFontScaler::getGlyphPath(uint16_t glyphID, SkPath* path) {
193 195
194 const SkGlyph& glyph = fStrike->getGlyphIDMetrics(glyphID); 196 const SkGlyph& glyph = fStrike->getGlyphIDMetrics(glyphID);
195 const SkPath* skPath = fStrike->findPath(glyph); 197 const SkPath* skPath = fStrike->findPath(glyph);
196 if (skPath) { 198 if (skPath) {
197 *path = *skPath; 199 *path = *skPath;
198 return true; 200 return true;
199 } 201 }
200 return false; 202 return false;
201 } 203 }
OLDNEW
« no previous file with comments | « src/fonts/SkGScalerContext.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698