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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 } | 250 } |
251 | 251 |
252 return 0; | 252 return 0; |
253 } | 253 } |
254 | 254 |
255 void RenderListItem::updateValue() | 255 void RenderListItem::updateValue() |
256 { | 256 { |
257 if (!m_hasExplicitValue) { | 257 if (!m_hasExplicitValue) { |
258 m_isValueUpToDate = false; | 258 m_isValueUpToDate = false; |
259 if (m_marker) | 259 if (m_marker) |
260 m_marker->setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint(); | 260 m_marker->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(
); |
261 } | 261 } |
262 } | 262 } |
263 | 263 |
264 static RenderObject* firstNonMarkerChild(RenderObject* parent) | 264 static RenderObject* firstNonMarkerChild(RenderObject* parent) |
265 { | 265 { |
266 RenderObject* result = parent->slowFirstChild(); | 266 RenderObject* result = parent->slowFirstChild(); |
267 while (result && result->isListMarker()) | 267 while (result && result->isListMarker()) |
268 result = result->nextSibling(); | 268 result = result->nextSibling(); |
269 return result; | 269 return result; |
270 } | 270 } |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 const String& RenderListItem::markerText() const | 441 const String& RenderListItem::markerText() const |
442 { | 442 { |
443 if (m_marker) | 443 if (m_marker) |
444 return m_marker->text(); | 444 return m_marker->text(); |
445 return nullAtom.string(); | 445 return nullAtom.string(); |
446 } | 446 } |
447 | 447 |
448 void RenderListItem::explicitValueChanged() | 448 void RenderListItem::explicitValueChanged() |
449 { | 449 { |
450 if (m_marker) | 450 if (m_marker) |
451 m_marker->setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint(); | 451 m_marker->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
452 Node* listNode = enclosingList(this); | 452 Node* listNode = enclosingList(this); |
453 for (RenderListItem* item = this; item; item = nextListItem(listNode, item)) | 453 for (RenderListItem* item = this; item; item = nextListItem(listNode, item)) |
454 item->updateValue(); | 454 item->updateValue(); |
455 } | 455 } |
456 | 456 |
457 void RenderListItem::setExplicitValue(int value) | 457 void RenderListItem::setExplicitValue(int value) |
458 { | 458 { |
459 ASSERT(node()); | 459 ASSERT(node()); |
460 | 460 |
461 if (m_hasExplicitValue && m_explicitValue == value) | 461 if (m_hasExplicitValue && m_explicitValue == value) |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 // assume that all the following ones have too. | 512 // assume that all the following ones have too. |
513 // This gives us the opportunity to stop here and avoid | 513 // This gives us the opportunity to stop here and avoid |
514 // marking the same nodes again. | 514 // marking the same nodes again. |
515 break; | 515 break; |
516 } | 516 } |
517 item->updateValue(); | 517 item->updateValue(); |
518 } | 518 } |
519 } | 519 } |
520 | 520 |
521 } // namespace WebCore | 521 } // namespace WebCore |
OLD | NEW |