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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
86 rb = (rb + 7) >> 3; | 86 rb = (rb + 7) >> 3; |
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 |
bungeman-skia
2016/03/07 23:02:55
I know this has already landed, but the post-revie
| |
97 SK_ATTR_DEPRECATED("Temporary accessor for Android.") | |
98 SkFixed advanceXFixed() const { return fAdvanceX; } | |
99 SK_ATTR_DEPRECATED("Temporary accessor for Android.") | |
100 SkFixed advanceYFixed() const { return fAdvanceY; } | |
101 | |
97 unsigned rowBytes() const { | 102 unsigned rowBytes() const { |
98 return ComputeRowBytes(fWidth, (SkMask::Format)fMaskFormat); | 103 return ComputeRowBytes(fWidth, (SkMask::Format)fMaskFormat); |
99 } | 104 } |
100 | 105 |
101 bool isJustAdvance() const { | 106 bool isJustAdvance() const { |
102 return MASK_FORMAT_JUST_ADVANCE == fMaskFormat; | 107 return MASK_FORMAT_JUST_ADVANCE == fMaskFormat; |
103 } | 108 } |
104 | 109 |
105 bool isFullMetrics() const { | 110 bool isFullMetrics() const { |
106 return MASK_FORMAT_JUST_ADVANCE != fMaskFormat; | 111 return MASK_FORMAT_JUST_ADVANCE != fMaskFormat; |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
195 // FIXME - This is needed because the Android frame work directly | 200 // FIXME - This is needed because the Android frame work directly |
196 // accesses fID. Remove when fID accesses are cleaned up. | 201 // accesses fID. Remove when fID accesses are cleaned up. |
197 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 202 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
198 public: | 203 public: |
199 #endif | 204 #endif |
200 uint32_t fID; | 205 uint32_t fID; |
201 }; | 206 }; |
202 SK_END_REQUIRE_DENSE | 207 SK_END_REQUIRE_DENSE |
203 | 208 |
204 #endif | 209 #endif |
OLD | NEW |