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) 2006, 2007, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 addPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleT
ype, CSSValueDecimal); | 62 addPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleT
ype, CSSValueDecimal); |
63 else | 63 else |
64 addPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleT
ype, value); | 64 addPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleT
ype, value); |
65 } else | 65 } else |
66 HTMLElement::collectStyleForPresentationAttribute(name, value, style); | 66 HTMLElement::collectStyleForPresentationAttribute(name, value, style); |
67 } | 67 } |
68 | 68 |
69 void HTMLLIElement::parseAttribute(const QualifiedName& name, const AtomicString
& value) | 69 void HTMLLIElement::parseAttribute(const QualifiedName& name, const AtomicString
& value) |
70 { | 70 { |
71 if (name == valueAttr) { | 71 if (name == valueAttr) { |
72 if (renderer() && renderer()->isListItem()) | 72 if (layoutObject() && layoutObject()->isListItem()) |
73 parseValue(value); | 73 parseValue(value); |
74 } else | 74 } else |
75 HTMLElement::parseAttribute(name, value); | 75 HTMLElement::parseAttribute(name, value); |
76 } | 76 } |
77 | 77 |
78 void HTMLLIElement::attach(const AttachContext& context) | 78 void HTMLLIElement::attach(const AttachContext& context) |
79 { | 79 { |
80 HTMLElement::attach(context); | 80 HTMLElement::attach(context); |
81 | 81 |
82 if (renderer() && renderer()->isListItem()) { | 82 if (layoutObject() && layoutObject()->isListItem()) { |
83 LayoutListItem* listItemLayoutObject = toLayoutListItem(renderer()); | 83 LayoutListItem* listItemLayoutObject = toLayoutListItem(layoutObject()); |
84 | 84 |
85 ASSERT(!document().childNeedsDistributionRecalc()); | 85 ASSERT(!document().childNeedsDistributionRecalc()); |
86 | 86 |
87 // Find the enclosing list node. | 87 // Find the enclosing list node. |
88 Element* listNode = 0; | 88 Element* listNode = 0; |
89 Element* current = this; | 89 Element* current = this; |
90 while (!listNode) { | 90 while (!listNode) { |
91 current = NodeRenderingTraversal::parentElement(*current); | 91 current = NodeRenderingTraversal::parentElement(*current); |
92 if (!current) | 92 if (!current) |
93 break; | 93 break; |
94 if (isHTMLUListElement(*current) || isHTMLOListElement(*current)) | 94 if (isHTMLUListElement(*current) || isHTMLOListElement(*current)) |
95 listNode = current; | 95 listNode = current; |
96 } | 96 } |
97 | 97 |
98 // If we are not in a list, tell the renderer so it can position us insi
de. | 98 // If we are not in a list, tell the renderer so it can position us insi
de. |
99 // We don't want to change our style to say "inside" since that would af
fect nested nodes. | 99 // We don't want to change our style to say "inside" since that would af
fect nested nodes. |
100 if (!listNode) | 100 if (!listNode) |
101 listItemLayoutObject->setNotInList(true); | 101 listItemLayoutObject->setNotInList(true); |
102 | 102 |
103 parseValue(fastGetAttribute(valueAttr)); | 103 parseValue(fastGetAttribute(valueAttr)); |
104 } | 104 } |
105 } | 105 } |
106 | 106 |
107 inline void HTMLLIElement::parseValue(const AtomicString& value) | 107 inline void HTMLLIElement::parseValue(const AtomicString& value) |
108 { | 108 { |
109 ASSERT(renderer() && renderer()->isListItem()); | 109 ASSERT(layoutObject() && layoutObject()->isListItem()); |
110 | 110 |
111 bool valueOK; | 111 bool valueOK; |
112 int requestedValue = value.toInt(&valueOK); | 112 int requestedValue = value.toInt(&valueOK); |
113 if (valueOK) | 113 if (valueOK) |
114 toLayoutListItem(renderer())->setExplicitValue(requestedValue); | 114 toLayoutListItem(layoutObject())->setExplicitValue(requestedValue); |
115 else | 115 else |
116 toLayoutListItem(renderer())->clearExplicitValue(); | 116 toLayoutListItem(layoutObject())->clearExplicitValue(); |
117 } | 117 } |
118 | 118 |
119 } | 119 } |
OLD | NEW |