[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 cca12b27bb245a3d956320ef27e58b6367f16f29
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 6 01:19:59 2004 +0000

    	Fix for first-line inheritance problem caused by incorrectly inheriting first-line into floating
    	blocks.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::firstLineBlock):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6180 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f90c175..8baa41e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-03-05  David Hyatt  <hyatt at apple.com>
+
+	Fix for first-line inheritance problem caused by incorrectly inheriting first-line into floating
+	blocks.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::firstLineBlock):
+
 2004-03-05  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index b565490..5c5c24f 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -2545,8 +2545,8 @@ RenderBlock* RenderBlock::firstLineBlock() const
         if (hasPseudo)
             break;
         RenderObject* parentBlock = firstLineBlock->parent();
-        if (firstLineBlock->isReplaced() || !parentBlock || parentBlock->firstChild() != firstLineBlock || 
-            !parentBlock->isBlockFlow())
+        if (firstLineBlock->isReplaced() || firstLineBlock->isFloating() || 
+            !parentBlock || parentBlock->firstChild() != firstLineBlock || !parentBlock->isBlockFlow())
             break;
         firstLineBlock = parentBlock;
     } 

-- 
WebKit Debian packaging