[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 8f77e45b07d6a8ab533d7c39c5cdecea989e6fb8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 21 20:49:08 2004 +0000

    	Fix for hiermenus bug.  Absolutely positioned images should not contribute to their containing block's
    	max width.  Make sure to disregard positioned elements when computing min/max width.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_block.cpp:
            (khtml::InlineMinMaxIterator::next):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 03c4d5e..453b155 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,8 +1,16 @@
+2004-04-21  David Hyatt  <hyatt at apple.com>
+
+	Fix for hiermenus bug.  Absolutely positioned images should not contribute to their containing block's
+	max width.  Make sure to disregard positioned elements when computing min/max width.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::InlineMinMaxIterator::next):
+
 2004-04-21  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
-        
-        A small collection of fixups.
 
         * khtml/editing/htmlediting_impl.cpp:
         (DeleteSelectionCommandImpl::doApply): Do not shift ending selection downstream
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index fe830b8..0ff1e58 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -2229,9 +2229,9 @@ RenderObject* InlineMinMaxIterator::next()
 
         if (!result) break;
 
-        if (result->isText() || result->isBR() ||
+        if (!result->isPositioned() && (result->isText() || result->isBR() ||
             result->isFloating() || result->isReplaced() ||
-            result->isInlineFlow())
+            result->isInlineFlow()))
             break;
         
         current = result;

-- 
WebKit Debian packaging