| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 #ifndef SkFontDescriptor_DEFINED | 8 #ifndef SkFontDescriptor_DEFINED |
| 9 #define SkFontDescriptor_DEFINED | 9 #define SkFontDescriptor_DEFINED |
| 10 | 10 |
| 11 #include "SkFixed.h" |
| 11 #include "SkStream.h" | 12 #include "SkStream.h" |
| 12 #include "SkString.h" | 13 #include "SkString.h" |
| 13 #include "SkTypeface.h" | 14 #include "SkTypeface.h" |
| 14 | 15 |
| 15 class SkFontData { | 16 class SkFontData { |
| 16 public: | 17 public: |
| 17 /** This takes ownership of 'stream'. Makes a copy of the data in 'axis'. */ | 18 /** This takes ownership of 'stream'. Makes a copy of the data in 'axis'. */ |
| 18 SkFontData(SkStreamAsset* stream, int index, const SkFixed axis[], int axisC
ount) | 19 SkFontData(SkStreamAsset* stream, int index, const SkFixed axis[], int axisC
ount) |
| 19 : fStream(stream), fIndex(index), fAxisCount(axisCount), fAxis(axisCount
) | 20 : fStream(stream), fIndex(index), fAxisCount(axisCount), fAxis(axisCount
) |
| 20 { | 21 { |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 private: | 75 private: |
| 75 SkString fFamilyName; | 76 SkString fFamilyName; |
| 76 SkString fFullName; | 77 SkString fFullName; |
| 77 SkString fPostscriptName; | 78 SkString fPostscriptName; |
| 78 SkAutoTDelete<SkFontData> fFontData; | 79 SkAutoTDelete<SkFontData> fFontData; |
| 79 | 80 |
| 80 SkTypeface::Style fStyle; | 81 SkTypeface::Style fStyle; |
| 81 }; | 82 }; |
| 82 | 83 |
| 83 #endif // SkFontDescriptor_DEFINED | 84 #endif // SkFontDescriptor_DEFINED |
| OLD | NEW |