| OLD | NEW |
| 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 } | 195 } |
| 196 | 196 |
| 197 int SkGTypeface::onCountGlyphs() const { | 197 int SkGTypeface::onCountGlyphs() const { |
| 198 return fProxy->countGlyphs(); | 198 return fProxy->countGlyphs(); |
| 199 } | 199 } |
| 200 | 200 |
| 201 int SkGTypeface::onGetUPEM() const { | 201 int SkGTypeface::onGetUPEM() const { |
| 202 return fProxy->getUnitsPerEm(); | 202 return fProxy->getUnitsPerEm(); |
| 203 } | 203 } |
| 204 | 204 |
| 205 SkTypeface::LocalizedStrings* SkGTypeface::onGetFamilyNames() const { | 205 SkTypeface::LocalizedStrings* SkGTypeface::onCreateFamilyNameIterator() const { |
| 206 return fProxy->getFamilyNames(); | 206 return fProxy->createFamilyNameIterator(); |
| 207 } | 207 } |
| 208 | 208 |
| 209 int SkGTypeface::onGetTableTags(SkFontTableTag tags[]) const { | 209 int SkGTypeface::onGetTableTags(SkFontTableTag tags[]) const { |
| 210 return fProxy->getTableTags(tags); | 210 return fProxy->getTableTags(tags); |
| 211 } | 211 } |
| 212 | 212 |
| 213 size_t SkGTypeface::onGetTableData(SkFontTableTag tag, size_t offset, | 213 size_t SkGTypeface::onGetTableData(SkFontTableTag tag, size_t offset, |
| 214 size_t length, void* data) const { | 214 size_t length, void* data) const { |
| 215 return fProxy->getTableData(tag, offset, length, data); | 215 return fProxy->getTableData(tag, offset, length, data); |
| 216 } | 216 } |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 | 258 |
| 259 friend class SkGFontBuilder; | 259 friend class SkGFontBuilder; |
| 260 SkGFont(int count, Glyph* array); | 260 SkGFont(int count, Glyph* array); |
| 261 }; | 261 }; |
| 262 | 262 |
| 263 class SkGFontBuilder { | 263 class SkGFontBuilder { |
| 264 public: | 264 public: |
| 265 | 265 |
| 266 }; | 266 }; |
| 267 #endif | 267 #endif |
| OLD | NEW |