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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 m_inheritedData.m_insideLink = NotInsideLink; | 322 m_inheritedData.m_insideLink = NotInsideLink; |
323 m_inheritedData.m_writingMode = initialWritingMode(); | 323 m_inheritedData.m_writingMode = initialWritingMode(); |
324 | 324 |
325 m_nonInheritedData.m_effectiveDisplay = | 325 m_nonInheritedData.m_effectiveDisplay = |
326 m_nonInheritedData.m_originalDisplay = | 326 m_nonInheritedData.m_originalDisplay = |
327 static_cast<unsigned>(initialDisplay()); | 327 static_cast<unsigned>(initialDisplay()); |
328 m_nonInheritedData.m_overflowAnchor = | 328 m_nonInheritedData.m_overflowAnchor = |
329 static_cast<unsigned>(initialOverflowAnchor()); | 329 static_cast<unsigned>(initialOverflowAnchor()); |
330 m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX()); | 330 m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX()); |
331 m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY()); | 331 m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY()); |
332 m_nonInheritedData.m_verticalAlign = initialVerticalAlign(); | 332 m_nonInheritedData.m_verticalAlign = |
| 333 static_cast<unsigned>(initialVerticalAlign()); |
333 m_nonInheritedData.m_clear = initialClear(); | 334 m_nonInheritedData.m_clear = initialClear(); |
334 m_nonInheritedData.m_position = initialPosition(); | 335 m_nonInheritedData.m_position = initialPosition(); |
335 m_nonInheritedData.m_tableLayout = initialTableLayout(); | 336 m_nonInheritedData.m_tableLayout = initialTableLayout(); |
336 m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi(); | 337 m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi(); |
337 m_nonInheritedData.m_breakBefore = initialBreakBefore(); | 338 m_nonInheritedData.m_breakBefore = initialBreakBefore(); |
338 m_nonInheritedData.m_breakAfter = initialBreakAfter(); | 339 m_nonInheritedData.m_breakAfter = initialBreakAfter(); |
339 m_nonInheritedData.m_breakInside = initialBreakInside(); | 340 m_nonInheritedData.m_breakInside = initialBreakInside(); |
340 m_nonInheritedData.m_styleType = PseudoIdNone; | 341 m_nonInheritedData.m_styleType = PseudoIdNone; |
341 m_nonInheritedData.m_pseudoBits = 0; | 342 m_nonInheritedData.m_pseudoBits = 0; |
342 m_nonInheritedData.m_explicitInheritance = false; | 343 m_nonInheritedData.m_explicitInheritance = false; |
(...skipping 1528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1871 } | 1872 } |
1872 | 1873 |
1873 // unicode-bidi | 1874 // unicode-bidi |
1874 static EUnicodeBidi initialUnicodeBidi() { return UBNormal; } | 1875 static EUnicodeBidi initialUnicodeBidi() { return UBNormal; } |
1875 EUnicodeBidi unicodeBidi() const { | 1876 EUnicodeBidi unicodeBidi() const { |
1876 return static_cast<EUnicodeBidi>(m_nonInheritedData.m_unicodeBidi); | 1877 return static_cast<EUnicodeBidi>(m_nonInheritedData.m_unicodeBidi); |
1877 } | 1878 } |
1878 void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; } | 1879 void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; } |
1879 | 1880 |
1880 // vertical-align | 1881 // vertical-align |
1881 static EVerticalAlign initialVerticalAlign() { return VerticalAlignBaseline; } | 1882 static EVerticalAlign initialVerticalAlign() { |
| 1883 return EVerticalAlign::Baseline; |
| 1884 } |
1882 EVerticalAlign verticalAlign() const { | 1885 EVerticalAlign verticalAlign() const { |
1883 return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign); | 1886 return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign); |
1884 } | 1887 } |
1885 const Length& getVerticalAlignLength() const { | 1888 const Length& getVerticalAlignLength() const { |
1886 return m_box->verticalAlign(); | 1889 return m_box->verticalAlign(); |
1887 } | 1890 } |
1888 void setVerticalAlign(EVerticalAlign v) { | 1891 void setVerticalAlign(EVerticalAlign v) { |
1889 m_nonInheritedData.m_verticalAlign = v; | 1892 m_nonInheritedData.m_verticalAlign = static_cast<unsigned>(v); |
1890 } | 1893 } |
1891 void setVerticalAlignLength(const Length& length) { | 1894 void setVerticalAlignLength(const Length& length) { |
1892 setVerticalAlign(VerticalAlignLength); | 1895 setVerticalAlign(EVerticalAlign::Length); |
1893 SET_VAR(m_box, m_verticalAlign, length); | 1896 SET_VAR(m_box, m_verticalAlign, length); |
1894 } | 1897 } |
1895 | 1898 |
1896 // will-change | 1899 // will-change |
1897 const Vector<CSSPropertyID>& willChangeProperties() const { | 1900 const Vector<CSSPropertyID>& willChangeProperties() const { |
1898 return m_rareNonInheritedData->m_willChange->m_properties; | 1901 return m_rareNonInheritedData->m_willChange->m_properties; |
1899 } | 1902 } |
1900 bool willChangeContents() const { | 1903 bool willChangeContents() const { |
1901 return m_rareNonInheritedData->m_willChange->m_contents; | 1904 return m_rareNonInheritedData->m_willChange->m_contents; |
1902 } | 1905 } |
(...skipping 2082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3985 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); | 3988 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); |
3986 } | 3989 } |
3987 | 3990 |
3988 inline bool ComputedStyle::hasPseudoElementStyle() const { | 3991 inline bool ComputedStyle::hasPseudoElementStyle() const { |
3989 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; | 3992 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; |
3990 } | 3993 } |
3991 | 3994 |
3992 } // namespace blink | 3995 } // namespace blink |
3993 | 3996 |
3994 #endif // ComputedStyle_h | 3997 #endif // ComputedStyle_h |
OLD | NEW |