[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 b49717492d16840fe9976d6795104ae675912c90
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 26 21:39:58 2003 +0000

    	Fix for 3179109. containingBlock() had a big old bug in it.
    	For ABSOLUTE positioned elements, it would return inline relative
    	positioned parents (when it should only be returning blocks).
    
            Reviewed by john
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::containingBlock):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3705 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 43e70e3..11d4abf 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-02-26  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3179109. containingBlock() had a big old bug in it.
+	For ABSOLUTE positioned elements, it would return inline relative
+	positioned parents (when it should only be returning blocks).
+	
+        Reviewed by john
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::containingBlock):
+
 2003-02-25  David Hyatt  <hyatt at apple.com>
 
 	Fix for findNextLayer problems.  There was nothing wrong with
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 43e70e3..11d4abf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-02-26  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3179109. containingBlock() had a big old bug in it.
+	For ABSOLUTE positioned elements, it would return inline relative
+	positioned parents (when it should only be returning blocks).
+	
+        Reviewed by john
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::containingBlock):
+
 2003-02-25  David Hyatt  <hyatt at apple.com>
 
 	Fix for findNextLayer problems.  There was nothing wrong with
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index 2e974e0..cc7ef8d 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -94,22 +94,9 @@ Q:after  {
 }
 
 IFRAME {
-	display: block;
-        width: 300px; height:150px;
-}
-
-OBJECT { 
-	display: block;
-} 
-
-OBJECT[type^="image/"] {
-	display: inline;
+	width: 300px; height:150px;
 }
 
-APPLET { 
-	display: block;
-} 
-      
 CENTER { 
 	display: block;
 	/* special centering to be able to emulate the html4/netscape behaviour */
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index c25e368..76e8431 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -400,7 +400,8 @@ RenderBlock* RenderObject::containingBlock() const
             o = o->parent();
     }
     else if (m_style->position() == ABSOLUTE) {
-        while (o && o->style()->position() == STATIC && !o->isHtml() && !o->isRoot())
+        while (o && (o->style()->position() == STATIC || (o->isInline() && !o->isReplaced()))
+               && !o->isHtml() && !o->isRoot())
             o = o->parent();
     } else {
         while (o && ((o->isInline() && !o->isReplaced()) || o->isTableRow() || o->isTableSection()

-- 
WebKit Debian packaging