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

Side by Side Diff: src/core/SkScalerContext.h

Issue 14940018: we only need one fontmetrics, since the paint (and fontcache) now know explicitly (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 7 months 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/core/SkPaint.cpp ('k') | src/core/SkScalerContext.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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 #ifndef SkScalerContext_DEFINED 8 #ifndef SkScalerContext_DEFINED
9 #define SkScalerContext_DEFINED 9 #define SkScalerContext_DEFINED
10 10
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 /** Map the glyphID to its glyph index, and then to its char code. Unmapped 173 /** Map the glyphID to its glyph index, and then to its char code. Unmapped
174 glyphs return zero. 174 glyphs return zero.
175 */ 175 */
176 SkUnichar glyphIDToChar(uint16_t glyphID); 176 SkUnichar glyphIDToChar(uint16_t glyphID);
177 177
178 unsigned getGlyphCount() { return this->generateGlyphCount(); } 178 unsigned getGlyphCount() { return this->generateGlyphCount(); }
179 void getAdvance(SkGlyph*); 179 void getAdvance(SkGlyph*);
180 void getMetrics(SkGlyph*); 180 void getMetrics(SkGlyph*);
181 void getImage(const SkGlyph&); 181 void getImage(const SkGlyph&);
182 void getPath(const SkGlyph&, SkPath*); 182 void getPath(const SkGlyph&, SkPath*);
183 void getFontMetrics(SkPaint::FontMetrics* mX, 183 void getFontMetrics(SkPaint::FontMetrics*);
184 SkPaint::FontMetrics* mY);
185 184
186 #ifdef SK_BUILD_FOR_ANDROID 185 #ifdef SK_BUILD_FOR_ANDROID
187 unsigned getBaseGlyphCount(SkUnichar charCode); 186 unsigned getBaseGlyphCount(SkUnichar charCode);
188 187
189 // This function must be public for SkTypeface_android.h, but should not be 188 // This function must be public for SkTypeface_android.h, but should not be
190 // called by other callers 189 // called by other callers
191 SkFontID findTypefaceIdForChar(SkUnichar uni); 190 SkFontID findTypefaceIdForChar(SkUnichar uni);
192 #endif 191 #endif
193 192
194 static inline void MakeRec(const SkPaint&, const SkDeviceProperties* deviceP roperties, 193 static inline void MakeRec(const SkPaint&, const SkDeviceProperties* deviceP roperties,
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 return static_cast<SkPaint::Hinting>(hint); 287 return static_cast<SkPaint::Hinting>(hint);
289 } 288 }
290 289
291 void SkScalerContextRec::setHinting(SkPaint::Hinting hinting) { 290 void SkScalerContextRec::setHinting(SkPaint::Hinting hinting) {
292 fFlags = (fFlags & ~SkScalerContext::kHinting_Mask) | 291 fFlags = (fFlags & ~SkScalerContext::kHinting_Mask) |
293 (hinting << SkScalerContext::kHinting_Shift); 292 (hinting << SkScalerContext::kHinting_Shift);
294 } 293 }
295 294
296 295
297 #endif 296 #endif
OLDNEW
« no previous file with comments | « src/core/SkPaint.cpp ('k') | src/core/SkScalerContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698