| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv
ed. |
| 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 class PLATFORM_EXPORT FontDescription { | 50 class PLATFORM_EXPORT FontDescription { |
| 51 USING_FAST_MALLOC(FontDescription); | 51 USING_FAST_MALLOC(FontDescription); |
| 52 public: | 52 public: |
| 53 enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFam
ily, | 53 enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFam
ily, |
| 54 MonospaceFamily, CursiveFamily, FantasyFamily, Pict
ographFamily }; | 54 MonospaceFamily, CursiveFamily, FantasyFamily, Pict
ographFamily }; |
| 55 | 55 |
| 56 enum Kerning { AutoKerning, NormalKerning, NoneKerning }; | 56 enum Kerning { AutoKerning, NormalKerning, NoneKerning }; |
| 57 | 57 |
| 58 enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledL
igaturesState }; | 58 enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledL
igaturesState }; |
| 59 | 59 |
| 60 enum FontVariantCaps { CapsNormal, SmallCaps, AllSmallCaps, PetiteCaps, AllP
etiteCaps, Unicase, TitlingCaps }; |
| 61 |
| 60 FontDescription() | 62 FontDescription() |
| 61 : m_specifiedSize(0) | 63 : m_specifiedSize(0) |
| 62 , m_computedSize(0) | 64 , m_computedSize(0) |
| 63 , m_adjustedSize(0) | 65 , m_adjustedSize(0) |
| 64 , m_sizeAdjust(FontSizeAdjustNone) | 66 , m_sizeAdjust(FontSizeAdjustNone) |
| 65 , m_letterSpacing(0) | 67 , m_letterSpacing(0) |
| 66 , m_wordSpacing(0) | 68 , m_wordSpacing(0) |
| 67 { | 69 { |
| 68 m_fieldsAsUnsigned[0] = 0; | 70 m_fieldsAsUnsigned[0] = 0; |
| 69 m_fieldsAsUnsigned[1] = 0; | 71 m_fieldsAsUnsigned[1] = 0; |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 && m_letterSpacing == other.m_letterSpacing | 309 && m_letterSpacing == other.m_letterSpacing |
| 308 && m_wordSpacing == other.m_wordSpacing | 310 && m_wordSpacing == other.m_wordSpacing |
| 309 && m_fieldsAsUnsigned[0] == other.m_fieldsAsUnsigned[0] | 311 && m_fieldsAsUnsigned[0] == other.m_fieldsAsUnsigned[0] |
| 310 && m_fieldsAsUnsigned[1] == other.m_fieldsAsUnsigned[1] | 312 && m_fieldsAsUnsigned[1] == other.m_fieldsAsUnsigned[1] |
| 311 && (m_featureSettings == other.m_featureSettings || (m_featureSettings &
& other.m_featureSettings && *m_featureSettings == *other.m_featureSettings)); | 313 && (m_featureSettings == other.m_featureSettings || (m_featureSettings &
& other.m_featureSettings && *m_featureSettings == *other.m_featureSettings)); |
| 312 } | 314 } |
| 313 | 315 |
| 314 } // namespace blink | 316 } // namespace blink |
| 315 | 317 |
| 316 #endif | 318 #endif |
| OLD | NEW |