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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 m_inheritedData.m_listStylePosition = | 366 m_inheritedData.m_listStylePosition = |
367 static_cast<unsigned>(initialListStylePosition()); | 367 static_cast<unsigned>(initialListStylePosition()); |
368 m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign()); | 368 m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign()); |
369 m_inheritedData.m_textTransform = initialTextTransform(); | 369 m_inheritedData.m_textTransform = initialTextTransform(); |
370 m_inheritedData.m_hasSimpleUnderline = false; | 370 m_inheritedData.m_hasSimpleUnderline = false; |
371 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor()); | 371 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor()); |
372 m_inheritedData.m_direction = initialDirection(); | 372 m_inheritedData.m_direction = initialDirection(); |
373 m_inheritedData.m_whiteSpace = static_cast<unsigned>(initialWhiteSpace()); | 373 m_inheritedData.m_whiteSpace = static_cast<unsigned>(initialWhiteSpace()); |
374 m_inheritedData.m_borderCollapse = initialBorderCollapse(); | 374 m_inheritedData.m_borderCollapse = initialBorderCollapse(); |
375 m_inheritedData.m_rtlOrdering = initialRTLOrdering(); | 375 m_inheritedData.m_rtlOrdering = initialRTLOrdering(); |
376 m_inheritedData.m_boxDirection = initialBoxDirection(); | 376 m_inheritedData.m_boxDirection = |
| 377 static_cast<unsigned>(initialBoxDirection()); |
377 m_inheritedData.m_printColorAdjust = | 378 m_inheritedData.m_printColorAdjust = |
378 static_cast<unsigned>(initialPrintColorAdjust()); | 379 static_cast<unsigned>(initialPrintColorAdjust()); |
379 m_inheritedData.m_pointerEvents = initialPointerEvents(); | 380 m_inheritedData.m_pointerEvents = initialPointerEvents(); |
380 m_inheritedData.m_insideLink = NotInsideLink; | 381 m_inheritedData.m_insideLink = NotInsideLink; |
381 m_inheritedData.m_writingMode = initialWritingMode(); | 382 m_inheritedData.m_writingMode = initialWritingMode(); |
382 | 383 |
383 m_nonInheritedData.m_effectiveDisplay = | 384 m_nonInheritedData.m_effectiveDisplay = |
384 m_nonInheritedData.m_originalDisplay = | 385 m_nonInheritedData.m_originalDisplay = |
385 static_cast<unsigned>(initialDisplay()); | 386 static_cast<unsigned>(initialDisplay()); |
386 m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor(); | 387 m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor(); |
(...skipping 1991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2378 } | 2379 } |
2379 TextEmphasisPosition getTextEmphasisPosition() const { | 2380 TextEmphasisPosition getTextEmphasisPosition() const { |
2380 return static_cast<TextEmphasisPosition>( | 2381 return static_cast<TextEmphasisPosition>( |
2381 m_rareInheritedData->textEmphasisPosition); | 2382 m_rareInheritedData->textEmphasisPosition); |
2382 } | 2383 } |
2383 void setTextEmphasisPosition(TextEmphasisPosition position) { | 2384 void setTextEmphasisPosition(TextEmphasisPosition position) { |
2384 SET_VAR(m_rareInheritedData, textEmphasisPosition, position); | 2385 SET_VAR(m_rareInheritedData, textEmphasisPosition, position); |
2385 } | 2386 } |
2386 | 2387 |
2387 // -webkit-box-direction | 2388 // -webkit-box-direction |
2388 static EBoxDirection initialBoxDirection() { return BNORMAL; } | 2389 static EBoxDirection initialBoxDirection() { return EBoxDirection::Normal; } |
2389 EBoxDirection boxDirection() const { | 2390 EBoxDirection boxDirection() const { |
2390 return static_cast<EBoxDirection>(m_inheritedData.m_boxDirection); | 2391 return static_cast<EBoxDirection>(m_inheritedData.m_boxDirection); |
2391 } | 2392 } |
2392 void setBoxDirection(EBoxDirection d) { m_inheritedData.m_boxDirection = d; } | 2393 void setBoxDirection(EBoxDirection d) { |
| 2394 m_inheritedData.m_boxDirection = static_cast<unsigned>(d); |
| 2395 } |
2393 | 2396 |
2394 // -webkit-highlight | 2397 // -webkit-highlight |
2395 static const AtomicString& initialHighlight() { return nullAtom; } | 2398 static const AtomicString& initialHighlight() { return nullAtom; } |
2396 const AtomicString& highlight() const { | 2399 const AtomicString& highlight() const { |
2397 return m_rareInheritedData->highlight; | 2400 return m_rareInheritedData->highlight; |
2398 } | 2401 } |
2399 void setHighlight(const AtomicString& h) { | 2402 void setHighlight(const AtomicString& h) { |
2400 SET_VAR(m_rareInheritedData, highlight, h); | 2403 SET_VAR(m_rareInheritedData, highlight, h); |
2401 } | 2404 } |
2402 | 2405 |
(...skipping 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4103 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); | 4106 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); |
4104 } | 4107 } |
4105 | 4108 |
4106 inline bool ComputedStyle::hasPseudoElementStyle() const { | 4109 inline bool ComputedStyle::hasPseudoElementStyle() const { |
4107 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; | 4110 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; |
4108 } | 4111 } |
4109 | 4112 |
4110 } // namespace blink | 4113 } // namespace blink |
4111 | 4114 |
4112 #endif // ComputedStyle_h | 4115 #endif // ComputedStyle_h |
OLD | NEW |