OLD | NEW |
1 /** | 1 /** |
2 * Copyright (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 2 * Copyright (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
3 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. | 3 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 { | 418 { |
419 setTextInternal(originalText()); | 419 setTextInternal(originalText()); |
420 } | 420 } |
421 | 421 |
422 void RenderCounter::invalidate() | 422 void RenderCounter::invalidate() |
423 { | 423 { |
424 m_counterNode->removeRenderer(this); | 424 m_counterNode->removeRenderer(this); |
425 ASSERT(!m_counterNode); | 425 ASSERT(!m_counterNode); |
426 if (documentBeingDestroyed()) | 426 if (documentBeingDestroyed()) |
427 return; | 427 return; |
428 setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint(); | 428 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
429 } | 429 } |
430 | 430 |
431 static void destroyCounterNodeWithoutMapRemoval(const AtomicString& identifier,
CounterNode* node) | 431 static void destroyCounterNodeWithoutMapRemoval(const AtomicString& identifier,
CounterNode* node) |
432 { | 432 { |
433 CounterNode* previous; | 433 CounterNode* previous; |
434 for (RefPtr<CounterNode> child = node->lastDescendant(); child && child != n
ode; child = previous) { | 434 for (RefPtr<CounterNode> child = node->lastDescendant(); child && child != n
ode; child = previous) { |
435 previous = child->previousInPreOrder(); | 435 previous = child->previousInPreOrder(); |
436 child->parent()->removeChild(child.get()); | 436 child->parent()->removeChild(child.get()); |
437 ASSERT(counterMaps().get(&child->owner())->get(identifier) == child); | 437 ASSERT(counterMaps().get(&child->owner())->get(identifier) == child); |
438 counterMaps().get(&child->owner())->remove(identifier); | 438 counterMaps().get(&child->owner())->remove(identifier); |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
609 fprintf(stderr, " "); | 609 fprintf(stderr, " "); |
610 fprintf(stderr, "%p N:%p P:%p PS:%p NS:%p C:%p\n", | 610 fprintf(stderr, "%p N:%p P:%p PS:%p NS:%p C:%p\n", |
611 current, current->node(), current->parent(), current->previousSiblin
g(), | 611 current, current->node(), current->parent(), current->previousSiblin
g(), |
612 current->nextSibling(), current->hasCounterNodeMap() ? | 612 current->nextSibling(), current->hasCounterNodeMap() ? |
613 counterName ? WebCore::counterMaps().get(current)->get(identifier) :
(WebCore::CounterNode*)1 : (WebCore::CounterNode*)0); | 613 counterName ? WebCore::counterMaps().get(current)->get(identifier) :
(WebCore::CounterNode*)1 : (WebCore::CounterNode*)0); |
614 } | 614 } |
615 fflush(stderr); | 615 fflush(stderr); |
616 } | 616 } |
617 | 617 |
618 #endif // NDEBUG | 618 #endif // NDEBUG |
OLD | NEW |