| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 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 "SkAdvancedTypefaceMetrics.h" | 8 #include "SkAdvancedTypefaceMetrics.h" |
| 9 #include "SkBitmap.h" | 9 #include "SkBitmap.h" |
| 10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 return; | 108 return; |
| 109 } | 109 } |
| 110 } | 110 } |
| 111 // This should make SkPath::getBounds() queries threadsafe. | 111 // This should make SkPath::getBounds() queries threadsafe. |
| 112 path->updateBoundsCache(); | 112 path->updateBoundsCache(); |
| 113 fPaths[index] = path; | 113 fPaths[index] = path; |
| 114 } | 114 } |
| 115 } | 115 } |
| 116 | 116 |
| 117 SkTestTypeface::SkTestTypeface(SkTestFont* testFont, const SkFontStyle& style) | 117 SkTestTypeface::SkTestTypeface(SkTestFont* testFont, const SkFontStyle& style) |
| 118 : SkTypeface(style, SkTypefaceCache::NewFontID(), false) | 118 : SkTypeface(style, false) |
| 119 , fTestFont(testFont) { | 119 , fTestFont(testFont) { |
| 120 } | 120 } |
| 121 | 121 |
| 122 void SkTestTypeface::getAdvance(SkGlyph* glyph) { | 122 void SkTestTypeface::getAdvance(SkGlyph* glyph) { |
| 123 // TODO(benjaminwagner): Update users to use floats. | 123 // TODO(benjaminwagner): Update users to use floats. |
| 124 glyph->fAdvanceX = SkFixedToFloat(fTestFont->fWidths[glyph->getGlyphID()]); | 124 glyph->fAdvanceX = SkFixedToFloat(fTestFont->fWidths[glyph->getGlyphID()]); |
| 125 glyph->fAdvanceY = 0; | 125 glyph->fAdvanceY = 0; |
| 126 } | 126 } |
| 127 | 127 |
| 128 void SkTestTypeface::getFontMetrics(SkPaint::FontMetrics* metrics) { | 128 void SkTestTypeface::getFontMetrics(SkPaint::FontMetrics* metrics) { |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 | 281 |
| 282 private: | 282 private: |
| 283 SkTestTypeface* fFace; | 283 SkTestTypeface* fFace; |
| 284 SkMatrix fMatrix; | 284 SkMatrix fMatrix; |
| 285 }; | 285 }; |
| 286 | 286 |
| 287 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkScalerContextEffe
cts& effects, | 287 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkScalerContextEffe
cts& effects, |
| 288 const SkDescriptor* desc)
const { | 288 const SkDescriptor* desc)
const { |
| 289 return new SkTestScalerContext(const_cast<SkTestTypeface*>(this), effects, d
esc); | 289 return new SkTestScalerContext(const_cast<SkTestTypeface*>(this), effects, d
esc); |
| 290 } | 290 } |
| OLD | NEW |