Merge 120801

Source/WebCore/rendering/CounterNode.cpp

 /*
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 243 matching lines @@
         next = refChild->m_nextSibling;
         refChild->m_nextSibling = newChild;
     } else {
         next = m_firstChild;
         m_firstChild = newChild;
     }
 
     newChild->m_parent = this;
     newChild->m_previousSibling = refChild;
 
+    if (next) {
+        ASSERT(next->m_previousSibling == refChild);
+        next->m_previousSibling = newChild;
+        newChild->m_nextSibling = next;
+    } else {
+        ASSERT(m_lastChild == refChild);
+        m_lastChild = newChild;
+    }
+
     if (!newChild->m_firstChild || newChild->m_hasResetType) {
-        newChild->m_nextSibling = next;
-        if (next) {
-            ASSERT(next->m_previousSibling == refChild);
-            next->m_previousSibling = newChild;
-        } else {
-            ASSERT(m_lastChild == refChild);
-            m_lastChild = newChild;
-        }
-
         newChild->m_countInParent = newChild->computeCountInParent();
         newChild->resetThisAndDescendantsRenderers();
         if (next)
             next->recount();
         return;
     }
-    // If the new child is the last in the sibling list we must set the parent's lastChild.
-    if (!newChild->m_nextSibling)
-        m_lastChild = newChild;
 
     // The code below handles the case when a formerly root increment counter is loosing its root position
     // and therefore its children become next siblings.
     CounterNode* last = newChild->m_lastChild;
     CounterNode* first = newChild->m_firstChild;
 
     if (first) {
         ASSERT(last);
         newChild->m_nextSibling = first;
         if (m_lastChild == newChild)
@@ skipping 86 matching lines @@
 
 #ifndef NDEBUG
 
 void showCounterTree(const WebCore::CounterNode* counter)
 {
     if (counter)
         showTreeAndMark(counter);
 }
 
 #endif