OLD | NEW |
1 /** | 1 /** |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. |
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 , m_marker(0) | 45 , m_marker(0) |
46 , m_hasExplicitValue(false) | 46 , m_hasExplicitValue(false) |
47 , m_isValueUpToDate(false) | 47 , m_isValueUpToDate(false) |
48 , m_notInList(false) | 48 , m_notInList(false) |
49 { | 49 { |
50 setInline(false); | 50 setInline(false); |
51 } | 51 } |
52 | 52 |
53 void RenderListItem::styleDidChange(StyleDifference diff, const RenderStyle* old
Style) | 53 void RenderListItem::styleDidChange(StyleDifference diff, const RenderStyle* old
Style) |
54 { | 54 { |
55 RenderBlock::styleDidChange(diff, oldStyle); | 55 RenderBlockFlow::styleDidChange(diff, oldStyle); |
56 | 56 |
57 if (style()->listStyleType() != NoneListStyle | 57 if (style()->listStyleType() != NoneListStyle |
58 || (style()->listStyleImage() && !style()->listStyleImage()->errorOccurr
ed())) { | 58 || (style()->listStyleImage() && !style()->listStyleImage()->errorOccurr
ed())) { |
59 RefPtr<RenderStyle> newStyle = RenderStyle::create(); | 59 RefPtr<RenderStyle> newStyle = RenderStyle::create(); |
60 // Markers update their own margin style. By copying the existing style
we can | 60 // Markers update their own margin style. By copying the existing style
we can |
61 // avoid an unnecessary layout in setStyle below. | 61 // avoid an unnecessary layout in setStyle below. |
62 if (m_marker) | 62 if (m_marker) |
63 newStyle->copyNonInheritedFrom(m_marker->style()); | 63 newStyle->copyNonInheritedFrom(m_marker->style()); |
64 // The marker always inherits from the list item, regardless of where it
might end | 64 // The marker always inherits from the list item, regardless of where it
might end |
65 // up (e.g., in some deeply nested line box). See CSS3 spec. | 65 // up (e.g., in some deeply nested line box). See CSS3 spec. |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
526 // assume that all the following ones have too. | 526 // assume that all the following ones have too. |
527 // This gives us the opportunity to stop here and avoid | 527 // This gives us the opportunity to stop here and avoid |
528 // marking the same nodes again. | 528 // marking the same nodes again. |
529 break; | 529 break; |
530 } | 530 } |
531 item->updateValue(); | 531 item->updateValue(); |
532 } | 532 } |
533 } | 533 } |
534 | 534 |
535 } // namespace WebCore | 535 } // namespace WebCore |
OLD | NEW |