[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 900ac929ff03ba5551660f7a063d5438114da2f7
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 3 23:19:13 2003 +0000

    	Fix for assertion on nasdaq.com.  Patch containingBlock
    	to return 0 when it can't find a containingBlock at all (e.g.,
    	when the object is orphaned).
    
    	Patch setOverhangingContents to deal with a null containingBlock
    	caused by it being called from RenderImage::setStyle().
    
    	The bug # is 3162989.
    
            Reviewed by NOBODY (OOPS!).
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::containingBlock):
            (RenderObject::setOverhangingContents):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 632b326..be052b3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2003-02-03  David Hyatt  <hyatt at apple.com>
+
+	Fix for assertion on nasdaq.com.  Patch containingBlock
+	to return 0 when it can't find a containingBlock at all (e.g.,
+	when the object is orphaned).
+
+	Patch setOverhangingContents to deal with a null containingBlock
+	caused by it being called from RenderImage::setStyle().
+
+	The bug # is 3162989.
+	
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::containingBlock):
+        (RenderObject::setOverhangingContents):
+
 2003-02-02  David Hyatt  <hyatt at apple.com>
 
 	Enable support for the "run-in" and "compact" display types.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 632b326..be052b3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-02-03  David Hyatt  <hyatt at apple.com>
+
+	Fix for assertion on nasdaq.com.  Patch containingBlock
+	to return 0 when it can't find a containingBlock at all (e.g.,
+	when the object is orphaned).
+
+	Patch setOverhangingContents to deal with a null containingBlock
+	caused by it being called from RenderImage::setStyle().
+
+	The bug # is 3162989.
+	
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::containingBlock):
+        (RenderObject::setOverhangingContents):
+
 2003-02-02  David Hyatt  <hyatt at apple.com>
 
 	Enable support for the "run-in" and "compact" display types.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index ea41ca7..2ae0221 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -392,7 +392,10 @@ RenderBlock* RenderObject::containingBlock() const
             o = o->parent();
     }
 
-    KHTMLAssert(o && o->isRenderBlock());
+    if (!o) // This can happen because of setOverhangingContents in RenderImage's setStyle method.
+        return 0;
+    
+    KHTMLAssert(o->isRenderBlock());
     return static_cast<RenderBlock*>(o);
 }
 
@@ -890,7 +893,7 @@ void RenderObject::setOverhangingContents(bool p)
     if (p)
     {
         m_overhangingContents = true;
-        if (cb != this)
+        if (cb && cb != this)
             cb->setOverhangingContents();
     }
     else
@@ -909,7 +912,7 @@ void RenderObject::setOverhangingContents(bool p)
         else
         {
             m_overhangingContents = false;
-            if (cb != this)
+            if (cb && cb != this)
                 cb->setOverhangingContents(false);
         }
     }

-- 
WebKit Debian packaging