| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 Intercept* fIntercept; | 49 Intercept* fIntercept; |
| 50 SkPath* fPath; | 50 SkPath* fPath; |
| 51 }; | 51 }; |
| 52 | 52 |
| 53 public: | 53 public: |
| 54 static const SkFixed kSubpixelRound = SK_FixedHalf >> SkGlyph::kSubBits; | 54 static const SkFixed kSubpixelRound = SK_FixedHalf >> SkGlyph::kSubBits; |
| 55 // A value that can never be generated by MakeID. | 55 // A value that can never be generated by MakeID. |
| 56 static const uint32_t kImpossibleID = ~0; | 56 static const uint32_t kImpossibleID = ~0; |
| 57 void* fImage; | 57 void* fImage; |
| 58 PathData* fPathData; | 58 PathData* fPathData; |
| 59 SkFixed fAdvanceX, fAdvanceY; | 59 float fAdvanceX, fAdvanceY; |
| 60 | 60 |
| 61 uint16_t fWidth, fHeight; | 61 uint16_t fWidth, fHeight; |
| 62 int16_t fTop, fLeft; | 62 int16_t fTop, fLeft; |
| 63 | 63 |
| 64 uint8_t fMaskFormat; | 64 uint8_t fMaskFormat; |
| 65 int8_t fRsbDelta, fLsbDelta; // used by auto-kerning | 65 int8_t fRsbDelta, fLsbDelta; // used by auto-kerning |
| 66 int8_t fForceBW; | 66 int8_t fForceBW; |
| 67 | 67 |
| 68 void initWithGlyphID(uint32_t glyph_id) { | 68 void initWithGlyphID(uint32_t glyph_id) { |
| 69 this->initCommon(MakeID(glyph_id)); | 69 this->initCommon(MakeID(glyph_id)); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 // FIXME - This is needed because the Android frame work directly | 202 // FIXME - This is needed because the Android frame work directly |
| 203 // accesses fID. Remove when fID accesses are cleaned up. | 203 // accesses fID. Remove when fID accesses are cleaned up. |
| 204 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 204 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
| 205 public: | 205 public: |
| 206 #endif | 206 #endif |
| 207 uint32_t fID; | 207 uint32_t fID; |
| 208 }; | 208 }; |
| 209 SK_END_REQUIRE_DENSE | 209 SK_END_REQUIRE_DENSE |
| 210 | 210 |
| 211 #endif | 211 #endif |
| OLD | NEW |