[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 04420ca44c7dd9b42dc4301872cc6d73f0d3366d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 00:05:42 2004 +0000

    	Fix for 3625611, images offset on first visit to page.  The method for determining the last clean line was
    	flawed and would incorrectly miss dirty lines that occurred after the first clean line.
    
            Reviewed by john
    
            * khtml/rendering/bidi.cpp:
            (khtml::RenderBlock::determineEndPosition):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 585978f..866c188 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-07-15  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3625611, images offset on first visit to page.  The method for determining the last clean line was
+	flawed and would incorrectly miss dirty lines that occurred after the first clean line.
+	
+        Reviewed by john
+
+        * khtml/rendering/bidi.cpp:
+        (khtml::RenderBlock::determineEndPosition):
+
 2004-07-15  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 576ba79..c84d5f4 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1650,12 +1650,15 @@ RootInlineBox* RenderBlock::determineEndPosition(RootInlineBox* startLine, BidiI
                                                  int& yPos)
 {
     RootInlineBox* last = 0;
-    if (m_linesAppended)
+    if (m_linesAppended || !startLine)
         last = 0;
     else {
-        for (RootInlineBox* curr = startLine; curr; curr = curr->nextRootBox())
-            if (curr->isDirty() && curr->nextRootBox() && !curr->nextRootBox()->isDirty())
-                last = curr->nextRootBox();
+        for (RootInlineBox* curr = startLine->nextRootBox(); curr; curr = curr->nextRootBox()) {
+            if (curr->isDirty())
+                last = 0;
+            else if (!last)
+                last = curr;
+        }
     }
     
     if (!last)

-- 
WebKit Debian packaging