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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 return SkChecksum::CheapMix(glyphId); | 124 return SkChecksum::CheapMix(glyphId); |
125 } | 125 } |
126 }; | 126 }; |
127 | 127 |
128 private: | 128 private: |
129 // TODO(herb) remove friend statement after SkGlyphCache cleanup. | 129 // TODO(herb) remove friend statement after SkGlyphCache cleanup. |
130 friend class SkGlyphCache; | 130 friend class SkGlyphCache; |
131 | 131 |
132 void initCommon(uint32_t id) { | 132 void initCommon(uint32_t id) { |
133 fID = id; | 133 fID = id; |
134 fImage = NULL; | 134 fImage = nullptr; |
135 fPath = NULL; | 135 fPath = nullptr; |
136 fMaskFormat = MASK_FORMAT_UNKNOWN; | 136 fMaskFormat = MASK_FORMAT_UNKNOWN; |
137 fForceBW = 0; | 137 fForceBW = 0; |
138 } | 138 } |
139 | 139 |
140 static unsigned ID2Code(uint32_t id) { | 140 static unsigned ID2Code(uint32_t id) { |
141 return id & kCodeMask; | 141 return id & kCodeMask; |
142 } | 142 } |
143 | 143 |
144 static unsigned ID2SubX(uint32_t id) { | 144 static unsigned ID2SubX(uint32_t id) { |
145 return id >> (kSubShift + kSubShiftX); | 145 return id >> (kSubShift + kSubShiftX); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 | 177 |
178 // FIXME - This is needed because the Android frame work directly | 178 // FIXME - This is needed because the Android frame work directly |
179 // accesses fID. Remove when fID accesses are cleaned up. | 179 // accesses fID. Remove when fID accesses are cleaned up. |
180 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 180 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
181 public: | 181 public: |
182 #endif | 182 #endif |
183 uint32_t fID; | 183 uint32_t fID; |
184 }; | 184 }; |
185 | 185 |
186 #endif | 186 #endif |
OLD | NEW |