| 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 | 228 |
| 229 // don't inherit | 229 // don't inherit |
| 230 struct NonInheritedData { | 230 struct NonInheritedData { |
| 231 NonInheritedData() | 231 NonInheritedData() |
| 232 : m_effectiveDisplay(static_cast<unsigned>(initialDisplay())), | 232 : m_effectiveDisplay(static_cast<unsigned>(initialDisplay())), |
| 233 m_originalDisplay(static_cast<unsigned>(initialDisplay())), | 233 m_originalDisplay(static_cast<unsigned>(initialDisplay())), |
| 234 m_verticalAlign(static_cast<unsigned>(initialVerticalAlign())), | 234 m_verticalAlign(static_cast<unsigned>(initialVerticalAlign())), |
| 235 m_hasViewportUnits(false), | 235 m_hasViewportUnits(false), |
| 236 m_styleType(PseudoIdNone), | 236 m_styleType(PseudoIdNone), |
| 237 m_pseudoBits(0), | 237 m_pseudoBits(0), |
| 238 m_emptyState(false), | |
| 239 m_hasRemUnits(false) {} | 238 m_hasRemUnits(false) {} |
| 240 | 239 |
| 241 // Compare computed styles, differences in inherited bits or other flags | 240 // Compare computed styles, differences in inherited bits or other flags |
| 242 // should not cause an inequality. | 241 // should not cause an inequality. |
| 243 bool operator==(const NonInheritedData& other) const { | 242 bool operator==(const NonInheritedData& other) const { |
| 244 // Generated properties are compared in ComputedStyleBase | 243 // Generated properties are compared in ComputedStyleBase |
| 245 return m_effectiveDisplay == other.m_effectiveDisplay && | 244 return m_effectiveDisplay == other.m_effectiveDisplay && |
| 246 m_originalDisplay == other.m_originalDisplay && | 245 m_originalDisplay == other.m_originalDisplay && |
| 247 m_verticalAlign == other.m_verticalAlign; | 246 m_verticalAlign == other.m_verticalAlign; |
| 248 // Differences in the following fields do not cause inequality: | 247 // Differences in the following fields do not cause inequality: |
| (...skipping 22 matching lines...) Expand all Loading... |
| 271 // This is set if we used viewport units when resolving a length. | 270 // This is set if we used viewport units when resolving a length. |
| 272 // It is mutable so we can pass around const ComputedStyles to resolve | 271 // It is mutable so we can pass around const ComputedStyles to resolve |
| 273 // lengths. | 272 // lengths. |
| 274 mutable unsigned m_hasViewportUnits : 1; | 273 mutable unsigned m_hasViewportUnits : 1; |
| 275 | 274 |
| 276 // 32 bits | 275 // 32 bits |
| 277 | 276 |
| 278 unsigned m_styleType : 6; // PseudoId | 277 unsigned m_styleType : 6; // PseudoId |
| 279 unsigned m_pseudoBits : 8; | 278 unsigned m_pseudoBits : 8; |
| 280 | 279 |
| 281 unsigned m_emptyState : 1; | |
| 282 | |
| 283 // 64 bits | 280 // 64 bits |
| 284 | 281 |
| 285 mutable unsigned m_hasRemUnits : 1; | 282 mutable unsigned m_hasRemUnits : 1; |
| 286 | 283 |
| 287 // If you add more style bits here, you will also need to update | 284 // If you add more style bits here, you will also need to update |
| 288 // ComputedStyle::copyNonInheritedFromCached() 68 bits | 285 // ComputedStyle::copyNonInheritedFromCached() 68 bits |
| 289 } m_nonInheritedData; | 286 } m_nonInheritedData; |
| 290 | 287 |
| 291 // !END SYNC! | 288 // !END SYNC! |
| 292 | 289 |
| (...skipping 3494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3787 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId); | 3784 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId); |
| 3788 } | 3785 } |
| 3789 | 3786 |
| 3790 inline bool ComputedStyle::hasPseudoElementStyle() const { | 3787 inline bool ComputedStyle::hasPseudoElementStyle() const { |
| 3791 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; | 3788 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; |
| 3792 } | 3789 } |
| 3793 | 3790 |
| 3794 } // namespace blink | 3791 } // namespace blink |
| 3795 | 3792 |
| 3796 #endif // ComputedStyle_h | 3793 #endif // ComputedStyle_h |
| OLD | NEW |