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

Side by Side Diff: src/fonts/SkGScalerContext.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 | « no previous file | src/gpu/SkGrFontScaler.cpp » ('j') | 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 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkGScalerContext.h" 8 #include "SkGScalerContext.h"
9 #include "SkGlyph.h" 9 #include "SkGlyph.h"
10 #include "SkPath.h" 10 #include "SkPath.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 fProxy->unref(); 169 fProxy->unref();
170 } 170 }
171 171
172 SkScalerContext* SkGTypeface::onCreateScalerContext( 172 SkScalerContext* SkGTypeface::onCreateScalerContext(
173 const SkDescriptor* desc) const { 173 const SkDescriptor* desc) const {
174 return SkNEW_ARGS(SkGScalerContext, (const_cast<SkGTypeface*>(this), desc)); 174 return SkNEW_ARGS(SkGScalerContext, (const_cast<SkGTypeface*>(this), desc));
175 } 175 }
176 176
177 void SkGTypeface::onFilterRec(SkScalerContextRec* rec) const { 177 void SkGTypeface::onFilterRec(SkScalerContextRec* rec) const {
178 fProxy->filterRec(rec); 178 fProxy->filterRec(rec);
179 rec->setHinting(SkPaint::kNo_Hinting);
180 rec->fMaskFormat = SkMask::kARGB32_Format;
179 } 181 }
180 182
181 SkAdvancedTypefaceMetrics* SkGTypeface::onGetAdvancedTypefaceMetrics( 183 SkAdvancedTypefaceMetrics* SkGTypeface::onGetAdvancedTypefaceMetrics(
182 SkAdvancedTypefaceMetrics::PerGlyphInfo info, 184 SkAdvancedTypefaceMetrics::PerGlyphInfo info,
183 const uint32_t* glyphIDs, 185 const uint32_t* glyphIDs,
184 uint32_t glyphIDsCount) const { 186 uint32_t glyphIDsCount) const {
185 return fProxy->getAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount); 187 return fProxy->getAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
186 } 188 }
187 189
188 SkStream* SkGTypeface::onOpenStream(int* ttcIndex) const { 190 SkStream* SkGTypeface::onOpenStream(int* ttcIndex) const {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 256
255 friend class SkGFontBuilder; 257 friend class SkGFontBuilder;
256 SkGFont(int count, Glyph* array); 258 SkGFont(int count, Glyph* array);
257 }; 259 };
258 260
259 class SkGFontBuilder { 261 class SkGFontBuilder {
260 public: 262 public:
261 263
262 }; 264 };
263 #endif 265 #endif
OLDNEW
« no previous file with comments | « no previous file | src/gpu/SkGrFontScaler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698