[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit cb91842d74abddfe7f1527492a3e9fdd352b1601
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 20:55:51 2009 +0000

    2009-11-13  Eric Seidel  <eric at webkit.org>
    
            No review, build fix only.
    
            Fix Debug build after http://trac.webkit.org/changeset/50960.
    
            The CounterNode class does not support all methods necessary to efficiently update the counter tree as needed per CSS2.1
            https://bugs.webkit.org/show_bug.cgi?id=31213
    
            * rendering/CounterNode.cpp:
            (WebCore::showTreeAndMark):
            * rendering/RenderCounter.cpp:
            (WebCore::destroyCounterNodeChildren):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fd28c36..7d50f01 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-13  Eric Seidel  <eric at webkit.org>
+
+        No review, build fix only.
+
+        Fix Debug build after http://trac.webkit.org/changeset/50960.
+
+        The CounterNode class does not support all methods necessary to efficiently update the counter tree as needed per CSS2.1
+        https://bugs.webkit.org/show_bug.cgi?id=31213
+
+        * rendering/CounterNode.cpp:
+        (WebCore::showTreeAndMark):
+        * rendering/RenderCounter.cpp:
+        (WebCore::destroyCounterNodeChildren):
+
 2009-11-13  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebCore/rendering/CounterNode.cpp b/WebCore/rendering/CounterNode.cpp
index bf45e04..95a3748 100644
--- a/WebCore/rendering/CounterNode.cpp
+++ b/WebCore/rendering/CounterNode.cpp
@@ -211,7 +211,7 @@ static void showTreeAndMark(const CounterNode* node)
     while (root->parent())
         root = root->parent();
 
-    for (const CounterNode* current = root; current; current = nextInPreOrder(current)) {
+    for (const CounterNode* current = root; current; current = current->nextInPreOrder()) {
         fwrite((current == node) ? "*" : " ", 1, 1, stderr);
         for (const CounterNode* parent = current; parent && parent != root; parent = parent->parent())
             fwrite("  ", 1, 2, stderr);
diff --git a/WebCore/rendering/RenderCounter.cpp b/WebCore/rendering/RenderCounter.cpp
index 39ea620..6a07616 100644
--- a/WebCore/rendering/RenderCounter.cpp
+++ b/WebCore/rendering/RenderCounter.cpp
@@ -262,7 +262,7 @@ static void destroyCounterNodeChildren(const AtomicString& identifier, CounterNo
     for (CounterNode* child = node->lastDescendant(); child && child != node; child = previous) {
         previous = child->previousInPreOrder();
         child->parent()->removeChild(child, identifier);
-        ASSERT(counterMaps().get(child->renderer())->get(identifier->impl()) == child);
+        ASSERT(counterMaps().get(child->renderer())->get(identifier.impl()) == child);
         counterMaps().get(child->renderer())->remove(identifier.impl());
         if (!child->renderer()->documentBeingDestroyed()) {
             RenderObjectChildList* children = child->renderer()->virtualChildren();

-- 
WebKit Debian packaging