OLD | NEW |
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 SkGlyph_DEFINED | 8 #ifndef SkGlyph_DEFINED |
9 #define SkGlyph_DEFINED | 9 #define SkGlyph_DEFINED |
10 | 10 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 } else if (SkMask::kARGB32_Format == format) { | 87 } else if (SkMask::kARGB32_Format == format) { |
88 rb <<= 2; | 88 rb <<= 2; |
89 } else if (SkMask::kLCD16_Format == format) { | 89 } else if (SkMask::kLCD16_Format == format) { |
90 rb = SkAlign4(rb << 1); | 90 rb = SkAlign4(rb << 1); |
91 } else { | 91 } else { |
92 rb = SkAlign4(rb); | 92 rb = SkAlign4(rb); |
93 } | 93 } |
94 return rb; | 94 return rb; |
95 } | 95 } |
96 | 96 |
97 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | |
98 // Temporary accessor for Android. | |
99 SkFixed advanceXFixed() const { return fAdvanceX; } | |
100 // Temporary accessor for Android. | |
101 SkFixed advanceYFixed() const { return fAdvanceY; } | |
102 #endif | |
103 | |
104 unsigned rowBytes() const { | 97 unsigned rowBytes() const { |
105 return ComputeRowBytes(fWidth, (SkMask::Format)fMaskFormat); | 98 return ComputeRowBytes(fWidth, (SkMask::Format)fMaskFormat); |
106 } | 99 } |
107 | 100 |
108 bool isJustAdvance() const { | 101 bool isJustAdvance() const { |
109 return MASK_FORMAT_JUST_ADVANCE == fMaskFormat; | 102 return MASK_FORMAT_JUST_ADVANCE == fMaskFormat; |
110 } | 103 } |
111 | 104 |
112 bool isFullMetrics() const { | 105 bool isFullMetrics() const { |
113 return MASK_FORMAT_JUST_ADVANCE != fMaskFormat; | 106 return MASK_FORMAT_JUST_ADVANCE != fMaskFormat; |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 // FIXME - This is needed because the Android frame work directly | 195 // FIXME - This is needed because the Android frame work directly |
203 // accesses fID. Remove when fID accesses are cleaned up. | 196 // accesses fID. Remove when fID accesses are cleaned up. |
204 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 197 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
205 public: | 198 public: |
206 #endif | 199 #endif |
207 uint32_t fID; | 200 uint32_t fID; |
208 }; | 201 }; |
209 SK_END_REQUIRE_DENSE | 202 SK_END_REQUIRE_DENSE |
210 | 203 |
211 #endif | 204 #endif |
OLD | NEW |