| OLD | NEW | 
|    1  |    1  | 
|    2 /* |    2 /* | 
|    3  * Copyright 2011 Google Inc. |    3  * Copyright 2011 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 #ifndef SkPDFFont_DEFINED |   10 #ifndef SkPDFFont_DEFINED | 
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  187     // Create instances of derived types based on fontInfo. |  187     // Create instances of derived types based on fontInfo. | 
|  188     static SkPDFFont* Create(SkPDFCanon* canon, |  188     static SkPDFFont* Create(SkPDFCanon* canon, | 
|  189                              const SkAdvancedTypefaceMetrics* fontInfo, |  189                              const SkAdvancedTypefaceMetrics* fontInfo, | 
|  190                              SkTypeface* typeface, |  190                              SkTypeface* typeface, | 
|  191                              uint16_t glyphID, |  191                              uint16_t glyphID, | 
|  192                              SkPDFDict* relatedFontDescriptor); |  192                              SkPDFDict* relatedFontDescriptor); | 
|  193  |  193  | 
|  194     static bool Find(uint32_t fontID, uint16_t glyphID, int* index); |  194     static bool Find(uint32_t fontID, uint16_t glyphID, int* index); | 
|  195  |  195  | 
|  196 private: |  196 private: | 
|  197     SkAutoTUnref<SkTypeface> fTypeface; |  197     sk_sp<SkTypeface> fTypeface; | 
|  198  |  198  | 
|  199     // The glyph IDs accessible with this font.  For Type1 (non CID) fonts, |  199     // The glyph IDs accessible with this font.  For Type1 (non CID) fonts, | 
|  200     // this will be a subset if the font has more than 255 glyphs. |  200     // this will be a subset if the font has more than 255 glyphs. | 
|  201     uint16_t fFirstGlyphID; |  201     uint16_t fFirstGlyphID; | 
|  202     uint16_t fLastGlyphID; |  202     uint16_t fLastGlyphID; | 
|  203     SkAutoTUnref<const SkAdvancedTypefaceMetrics> fFontInfo; |  203     sk_sp<const SkAdvancedTypefaceMetrics> fFontInfo; | 
|  204     SkAutoTUnref<SkPDFDict> fDescriptor; |  204     sk_sp<SkPDFDict> fDescriptor; | 
|  205  |  205  | 
|  206     SkAdvancedTypefaceMetrics::FontType fFontType; |  206     SkAdvancedTypefaceMetrics::FontType fFontType; | 
|  207  |  207  | 
|  208     typedef SkPDFDict INHERITED; |  208     typedef SkPDFDict INHERITED; | 
|  209 }; |  209 }; | 
|  210  |  210  | 
|  211 #endif |  211 #endif | 
| OLD | NEW |