| 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 // Given aspect value, i.e. font-size-adjust. | 235 // Given aspect value, i.e. font-size-adjust. |
| 236 float m_sizeAdjust; | 236 float m_sizeAdjust; |
| 237 | 237 |
| 238 float m_letterSpacing; | 238 float m_letterSpacing; |
| 239 float m_wordSpacing; | 239 float m_wordSpacing; |
| 240 | 240 |
| 241 unsigned m_orientation : static_cast<unsigned>(FontOrientation::BitCount); | 241 unsigned m_orientation : static_cast<unsigned>(FontOrientation::BitCount); |
| 242 | 242 |
| 243 unsigned m_widthVariant : 2; // FontWidthVariant | 243 unsigned m_widthVariant : 2; // FontWidthVariant |
| 244 | 244 |
| 245 unsigned m_style : 1; // FontStyle | 245 unsigned m_style : 2; // FontStyle |
| 246 unsigned m_variant : 1; // FontVariant | 246 unsigned m_variant : 1; // FontVariant |
| 247 unsigned m_isAbsoluteSize : 1; // Whether or not CSS specified an explicit s
ize | 247 unsigned m_isAbsoluteSize : 1; // Whether or not CSS specified an explicit s
ize |
| 248 // (logical sizes like "medium" don't count). | 248 // (logical sizes like "medium" don't count). |
| 249 unsigned m_weight : 4; // FontWeight | 249 unsigned m_weight : 4; // FontWeight |
| 250 unsigned m_stretch : 4; // FontStretch | 250 unsigned m_stretch : 4; // FontStretch |
| 251 unsigned m_genericFamily : 3; // GenericFamilyType | 251 unsigned m_genericFamily : 3; // GenericFamilyType |
| 252 | 252 |
| 253 unsigned m_kerning : 2; // Kerning | 253 unsigned m_kerning : 2; // Kerning |
| 254 | 254 |
| 255 unsigned m_commonLigaturesState : 2; | 255 unsigned m_commonLigaturesState : 2; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 && m_script == other.m_script | 303 && m_script == other.m_script |
| 304 && m_syntheticBold == other.m_syntheticBold | 304 && m_syntheticBold == other.m_syntheticBold |
| 305 && m_syntheticItalic == other.m_syntheticItalic | 305 && m_syntheticItalic == other.m_syntheticItalic |
| 306 && m_featureSettings == other.m_featureSettings | 306 && m_featureSettings == other.m_featureSettings |
| 307 && m_subpixelTextPosition == other.m_subpixelTextPosition; | 307 && m_subpixelTextPosition == other.m_subpixelTextPosition; |
| 308 } | 308 } |
| 309 | 309 |
| 310 } // namespace blink | 310 } // namespace blink |
| 311 | 311 |
| 312 #endif | 312 #endif |
| OLD | NEW |