| 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All | 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 6 * rights reserved. | 6 * rights reserved. |
| 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 mutable unsigned m_hasViewportUnits : 1; | 262 mutable unsigned m_hasViewportUnits : 1; |
| 263 | 263 |
| 264 // 32 bits | 264 // 32 bits |
| 265 | 265 |
| 266 unsigned m_styleType : 6; // PseudoId | 266 unsigned m_styleType : 6; // PseudoId |
| 267 unsigned m_pseudoBits : 8; | 267 unsigned m_pseudoBits : 8; |
| 268 unsigned m_explicitInheritance : 1; // Explicitly inherits a non-inherited | 268 unsigned m_explicitInheritance : 1; // Explicitly inherits a non-inherited |
| 269 // property | 269 // property |
| 270 unsigned m_variableReference : 1; // A non-inherited property references a | 270 unsigned m_variableReference : 1; // A non-inherited property references a |
| 271 // variable or @apply is used. | 271 // variable or @apply is used. |
| 272 unsigned m_unique : 1; // Style can not be shared. | |
| 273 | 272 |
| 274 unsigned m_emptyState : 1; | 273 unsigned m_emptyState : 1; |
| 275 | 274 |
| 276 // 64 bits | 275 // 64 bits |
| 277 | 276 |
| 278 unsigned m_isLink : 1; | 277 unsigned m_isLink : 1; |
| 279 | 278 |
| 280 mutable unsigned m_hasRemUnits : 1; | 279 mutable unsigned m_hasRemUnits : 1; |
| 281 | 280 |
| 282 // If you add more style bits here, you will also need to update | 281 // If you add more style bits here, you will also need to update |
| (...skipping 12 matching lines...) Expand all Loading... |
| 295 | 294 |
| 296 m_nonInheritedData.m_effectiveDisplay = | 295 m_nonInheritedData.m_effectiveDisplay = |
| 297 m_nonInheritedData.m_originalDisplay = | 296 m_nonInheritedData.m_originalDisplay = |
| 298 static_cast<unsigned>(initialDisplay()); | 297 static_cast<unsigned>(initialDisplay()); |
| 299 m_nonInheritedData.m_verticalAlign = | 298 m_nonInheritedData.m_verticalAlign = |
| 300 static_cast<unsigned>(initialVerticalAlign()); | 299 static_cast<unsigned>(initialVerticalAlign()); |
| 301 m_nonInheritedData.m_styleType = PseudoIdNone; | 300 m_nonInheritedData.m_styleType = PseudoIdNone; |
| 302 m_nonInheritedData.m_pseudoBits = 0; | 301 m_nonInheritedData.m_pseudoBits = 0; |
| 303 m_nonInheritedData.m_explicitInheritance = false; | 302 m_nonInheritedData.m_explicitInheritance = false; |
| 304 m_nonInheritedData.m_variableReference = false; | 303 m_nonInheritedData.m_variableReference = false; |
| 305 m_nonInheritedData.m_unique = false; | |
| 306 m_nonInheritedData.m_emptyState = false; | 304 m_nonInheritedData.m_emptyState = false; |
| 307 m_nonInheritedData.m_hasViewportUnits = false; | 305 m_nonInheritedData.m_hasViewportUnits = false; |
| 308 m_nonInheritedData.m_isLink = false; | 306 m_nonInheritedData.m_isLink = false; |
| 309 m_nonInheritedData.m_hasRemUnits = false; | 307 m_nonInheritedData.m_hasRemUnits = false; |
| 310 } | 308 } |
| 311 | 309 |
| 312 private: | 310 private: |
| 313 // TODO(sashab): Move these to the bottom of ComputedStyle. | 311 // TODO(sashab): Move these to the bottom of ComputedStyle. |
| 314 ALWAYS_INLINE ComputedStyle(); | 312 ALWAYS_INLINE ComputedStyle(); |
| 315 | 313 |
| (...skipping 3510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3826 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); | 3824 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); |
| 3827 } | 3825 } |
| 3828 | 3826 |
| 3829 inline bool ComputedStyle::hasPseudoElementStyle() const { | 3827 inline bool ComputedStyle::hasPseudoElementStyle() const { |
| 3830 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; | 3828 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; |
| 3831 } | 3829 } |
| 3832 | 3830 |
| 3833 } // namespace blink | 3831 } // namespace blink |
| 3834 | 3832 |
| 3835 #endif // ComputedStyle_h | 3833 #endif // ComputedStyle_h |
| OLD | NEW |