commit 7b41b9d5e739c896adaf4450c45e81de674a09b5
author hyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 30 05:32:40 2007 +0000
committer hyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 30 05:32:40 2007 +0000
tree a314044c5107a958fd6f12535c7eb1c4c0d5af62
parent b4cc524be5aefe6659dd1324b40ed20db49e5391

        Fold the invalidateVerticalPositions crawl into the bidi iteration.
        This makes it more correct (since we won't drill into elements that
        did not need to be reset) and cuts out an extra walk of all our children.
        We're still O(n^2) as new content streams in, but this at least cuts
        out one separate O(n^2) crawl.

        Reviewed by olliej

        * rendering/RenderObject.cpp:
        * rendering/RenderObject.h:
        (WebCore::RenderObject::invalidateVerticalPosition):
        * rendering/bidi.cpp:
        (WebCore::RenderBlock::layoutInlineChildren):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@21879 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/rendering/bidi.cpp

diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 726fea3..1d5f011 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -1575,10 +1575,10 @@
 
     bool useRepaintBounds = false;
 
+    invalidateVerticalPosition();
+    
     m_overflowHeight = 0;
-    
-    invalidateVerticalPositions();
-    
+        
     m_height = borderTop() + paddingTop();
     int toAdd = borderBottom() + paddingBottom() + horizontalScrollbarHeight();
     
@@ -1603,9 +1603,10 @@
     if (firstChild()) {
         // layout replaced elements
         bool endOfInline = false;
-        RenderObject *o = bidiFirst(this, bidi, false);
+        RenderObject* o = bidiFirst(this, bidi, false);
         bool hasFloat = false;
         while (o) {
+            o->invalidateVerticalPosition();
             if (o->isReplaced() || o->isFloating() || o->isPositioned()) {
                 if (relayoutChildren || o->style()->width().isPercent() || o->style()->height().isPercent())
                     o->setChildNeedsLayout(true, false);