Fix for 3615411, the linesAppended optimization was old and broken, and it's easier...

	made by me, kocienda and harrison to just remove it.

        Reviewed by mjs

        * khtml/rendering/bidi.cpp:
        (khtml::RenderBlock::layoutInlineChildren):
        * khtml/rendering/render_block.cpp:
        (khtml:::RenderFlow):
        * khtml/rendering/render_block.h:
        * khtml/rendering/render_flow.cpp:
        (RenderFlow::dirtyLinesFromChangedChild):

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 07ac771f4747b49934737883f828f1f93808ecd9..c0285ef3aa943b18676e7bb067a9c2a60f33df4c 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2004-12-06  David Hyatt  <hyatt@apple.com>
+
+       Fix for 3615411, the linesAppended optimization was old and broken, and it's easier with the new code fixes
+       made by me, kocienda and harrison to just remove it.
+       
+        Reviewed by mjs
+
+        * khtml/rendering/bidi.cpp:
+        (khtml::RenderBlock::layoutInlineChildren):
+        * khtml/rendering/render_block.cpp:
+        (khtml:::RenderFlow):
+        * khtml/rendering/render_block.h:
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::dirtyLinesFromChangedChild):
+
 2004-12-06  David Hyatt  <hyatt@apple.com>
 
        Fix for 3787133, some web pages print with many blank pages.  Make sure to use the real page print rect and

diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 129fab735cf7304f4ae9e86f2f9b0de7622280a7..6e2d07410b02a62feb45942ff7d75a4c1618081c 100644 (file)
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1591,9 +1591,7 @@ QRect RenderBlock::layoutInlineChildren(bool relayoutChildren)
         if (repaintRect.height() == 0)
             repaintRect.setHeight(kMax(oldLineBottom, m_overflowHeight) - repaintRect.y());
     }
-    
-    setLinesAppended(false);
-    
+
     if (!firstLineBox() && element() && element()->isContentEditable() && element()->rootEditableElement() == element())
         m_height += lineHeight(true);
 
@@ -1676,7 +1674,7 @@ RootInlineBox* RenderBlock::determineEndPosition(RootInlineBox* startLine, BidiI
                                                  int& yPos)
 {
     RootInlineBox* last = 0;
-    if (m_linesAppended || !startLine)
+    if (!startLine)
         last = 0;
     else {
         for (RootInlineBox* curr = startLine->nextRootBox(); curr; curr = curr->nextRootBox()) {

diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 3cbb919deb1862e1199ddfe8c4096f9ebec7b8f8..12cf02f633dbbfb21a7904204778124e22fa18ec 100644 (file)
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -90,7 +90,6 @@ RenderBlock::RenderBlock(DOM::NodeImpl* node)
     m_positionedObjects = 0;
     m_pre = false;
     m_firstLine = false;
-    m_linesAppended = false;
     m_hasMarkupTruncation = false;
     m_selectionState = SelectionNone;
     m_clearStatus = CNONE;

diff --git a/WebCore/khtml/rendering/render_block.h b/WebCore/khtml/rendering/render_block.h
index 54a274f5e7df31119f155df081c107b352fcae26..f85c26333f916fd608080d05f9f0ae941cd22365 100644 (file)
--- a/WebCore/khtml/rendering/render_block.h
+++ b/WebCore/khtml/rendering/render_block.h
@@ -199,9 +199,6 @@ public:
     virtual void updateFirstLetter();
     
     bool inRootBlockContext() const;
-    
-    void setLinesAppended(bool b=true) { m_linesAppended = b; }
-    bool linesAppended() const { return m_linesAppended; }
 
     void setHasMarkupTruncation(bool b=true) { m_hasMarkupTruncation = b; }
     bool hasMarkupTruncation() const { return m_hasMarkupTruncation; }
@@ -403,7 +400,6 @@ protected:
     EClear m_clearStatus  : 2;
     bool m_topMarginQuirk : 1;
     bool m_bottomMarginQuirk : 1;
-    bool m_linesAppended : 1; // Whether or not a block with inline children has had lines appended.
     bool m_hasMarkupTruncation : 1;
     SelectionState m_selectionState : 3;
 

diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 5852345873781cdb6f12f2984857df190aaf4e7e..e8c783836f94b2cd812f3ffb08a8623cc1310d06 100644 (file)
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -223,14 +223,7 @@ void RenderFlow::dirtyLinesFromChangedChild(RenderObject* child, bool adding)
 {
     if (!parent() || selfNeedsLayout() || isTable())
         return;
-    
-    if (adding && !isInline() && (!child->nextSibling() || !firstLineBox())) {
-        // An append onto the end of a block or we don't have any lines anyway.  
-        // In this case we don't have to dirty any specific lines.
-        static_cast<RenderBlock*>(this)->setLinesAppended();
-        return;
-    }
-    
+
     // For an empty inline, go ahead and propagate the check up to our parent.
     if (isInline() && !firstLineBox())
         return parent()->dirtyLinesFromChangedChild(this);