| 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 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 lines); | 974 lines); |
| 975 } | 975 } |
| 976 | 976 |
| 977 // -webkit-box-ordinal-group | 977 // -webkit-box-ordinal-group |
| 978 static unsigned initialBoxOrdinalGroup() { return 1; } | 978 static unsigned initialBoxOrdinalGroup() { return 1; } |
| 979 unsigned boxOrdinalGroup() const { | 979 unsigned boxOrdinalGroup() const { |
| 980 return m_rareNonInheritedData->m_deprecatedFlexibleBox->ordinalGroup; | 980 return m_rareNonInheritedData->m_deprecatedFlexibleBox->ordinalGroup; |
| 981 } | 981 } |
| 982 void setBoxOrdinalGroup(unsigned og) { | 982 void setBoxOrdinalGroup(unsigned og) { |
| 983 SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, | 983 SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, |
| 984 ordinalGroup, og); | 984 ordinalGroup, |
| 985 std::min(std::numeric_limits<unsigned>::max() - 1, og)); |
| 985 } | 986 } |
| 986 | 987 |
| 987 // -webkit-box-orient | 988 // -webkit-box-orient |
| 988 static EBoxOrient initialBoxOrient() { return HORIZONTAL; } | 989 static EBoxOrient initialBoxOrient() { return HORIZONTAL; } |
| 989 EBoxOrient boxOrient() const { | 990 EBoxOrient boxOrient() const { |
| 990 return static_cast<EBoxOrient>( | 991 return static_cast<EBoxOrient>( |
| 991 m_rareNonInheritedData->m_deprecatedFlexibleBox->orient); | 992 m_rareNonInheritedData->m_deprecatedFlexibleBox->orient); |
| 992 } | 993 } |
| 993 void setBoxOrient(EBoxOrient o) { | 994 void setBoxOrient(EBoxOrient o) { |
| 994 SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, orient, o); | 995 SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, orient, o); |
| (...skipping 2819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3814 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); | 3815 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); |
| 3815 } | 3816 } |
| 3816 | 3817 |
| 3817 inline bool ComputedStyle::hasPseudoElementStyle() const { | 3818 inline bool ComputedStyle::hasPseudoElementStyle() const { |
| 3818 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; | 3819 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; |
| 3819 } | 3820 } |
| 3820 | 3821 |
| 3821 } // namespace blink | 3822 } // namespace blink |
| 3822 | 3823 |
| 3823 #endif // ComputedStyle_h | 3824 #endif // ComputedStyle_h |
| OLD | NEW |