[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 b2caeab2924dc391fdec427850067bc64b3a98d9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 1 01:44:40 2003 +0000

    	Fix for crash on espn.com.  Revert my change to make
    	containingBlock() return 0 for the root.  Put it back to the
    	old behavior, where the root returns itself when you ask for
    	the root's containing block.
    
            Reviewed by rjw
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::containingBlock):
            (RenderObject::setOverhangingContents):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7f3785b..1e6aabe 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2003-01-31  David Hyatt  <hyatt at apple.com>
 
+	Fix for crash on espn.com.  Revert my change to make 
+	containingBlock() return 0 for the root.  Put it back to the
+	old behavior, where the root returns itself when you ask for
+	the root's containing block.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::containingBlock):
+        (RenderObject::setOverhangingContents):
+
+2003-01-31  David Hyatt  <hyatt at apple.com>
+
 	Two whitespace handling fixes that improve <pre> handling, 
 	especially of inline pres.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7f3785b..1e6aabe 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2003-01-31  David Hyatt  <hyatt at apple.com>
 
+	Fix for crash on espn.com.  Revert my change to make 
+	containingBlock() return 0 for the root.  Put it back to the
+	old behavior, where the root returns itself when you ask for
+	the root's containing block.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::containingBlock):
+        (RenderObject::setOverhangingContents):
+
+2003-01-31  David Hyatt  <hyatt at apple.com>
+
 	Two whitespace handling fixes that improve <pre> handling, 
 	especially of inline pres.
 	
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 3f43e7f..72382e5 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -374,8 +374,8 @@ RenderBlock* RenderObject::containingBlock() const
 {
     if(isTableCell())
         return static_cast<const RenderTableCell *>(this)->table();
-    else if (isRoot())
-        return 0; // Ensures termination so you can walk up a containingBlock() chain.
+    if (isRoot())
+        return (RenderBlock*)this;
     
     RenderObject *o = parent();
     if (m_style->position() == FIXED) {
@@ -888,7 +888,7 @@ void RenderObject::setOverhangingContents(bool p)
     if (p)
     {
         m_overhangingContents = true;
-        if (cb)
+        if (cb != this)
             cb->setOverhangingContents();
     }
     else
@@ -907,7 +907,7 @@ void RenderObject::setOverhangingContents(bool p)
         else
         {
             m_overhangingContents = false;
-            if (cb)
+            if (cb != this)
                 cb->setOverhangingContents(false);
         }
     }

-- 
WebKit Debian packaging