| 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 SkTypeface_DEFINED | 8 #ifndef SkTypeface_DEFINED |
| 9 #define SkTypeface_DEFINED | 9 #define SkTypeface_DEFINED |
| 10 | 10 |
| 11 #include "../private/SkBitmaskEnum.h" |
| 11 #include "../private/SkOnce.h" | 12 #include "../private/SkOnce.h" |
| 12 #include "../private/SkWeakRefCnt.h" | 13 #include "../private/SkWeakRefCnt.h" |
| 13 #include "SkFontStyle.h" | 14 #include "SkFontStyle.h" |
| 14 #include "SkRect.h" | 15 #include "SkRect.h" |
| 15 #include "SkString.h" | 16 #include "SkString.h" |
| 16 | 17 |
| 17 class SkDescriptor; | 18 class SkDescriptor; |
| 18 class SkFontData; | 19 class SkFontData; |
| 19 class SkFontDescriptor; | 20 class SkFontDescriptor; |
| 20 class SkScalerContext; | 21 class SkScalerContext; |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 mutable SkRect fBounds; | 415 mutable SkRect fBounds; |
| 415 mutable SkOnce fBoundsOnce; | 416 mutable SkOnce fBoundsOnce; |
| 416 bool fIsFixedPitch; | 417 bool fIsFixedPitch; |
| 417 | 418 |
| 418 friend class SkPaint; | 419 friend class SkPaint; |
| 419 friend class SkGlyphCache; // GetDefaultTypeface | 420 friend class SkGlyphCache; // GetDefaultTypeface |
| 420 | 421 |
| 421 typedef SkWeakRefCnt INHERITED; | 422 typedef SkWeakRefCnt INHERITED; |
| 422 }; | 423 }; |
| 423 | 424 |
| 425 namespace skstd { |
| 426 template <> struct is_bitmask_enum<SkTypeface::PerGlyphInfo> : std::true_type {}
; |
| 427 } |
| 428 |
| 424 #endif | 429 #endif |
| OLD | NEW |