[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 1f8e5baad30b9df1be9d10f68e97627eaeeadb5f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 20:13:54 2004 +0000

    	Fix for 3716082, assert when you dynamically remove float or position styles.
    
            Reviewed by kevin
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7026 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ebc9101..8c0d281 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-07-14  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3716082, assert when you dynamically remove float or position styles.
+	
+        Reviewed by kevin
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setStyle):
+
+2004-07-14  David Hyatt  <hyatt at apple.com>
+
 	Fix for various table regressions (malumovies.com and cityofheroes.gameamp.com) involving bungling of
 	percentage heights.
 	
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 1b99f92..66397f4 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1522,16 +1522,16 @@ void RenderObject::setStyle(RenderStyle *style)
             // from the positioned objects list.
             removeFromObjectLists();
         
+        affectsParentBlock = m_style && isFloatingOrPositioned() &&
+            (!style->isFloating() && style->position() != ABSOLUTE && style->position() != FIXED)
+            && parent() && (parent()->isBlockFlow() || parent()->isInlineFlow());
+        
         // reset style flags
         m_floating = false;
         m_positioned = false;
         m_relPositioned = false;
         m_paintBackground = false;
         m_hasOverflowClip = false;
-        
-        affectsParentBlock = m_style && isFloatingOrPositioned() &&
-            (!style->isFloating() && style->position() != ABSOLUTE && style->position() != FIXED)
-            && parent() && (parent()->isBlockFlow() || parent()->isInlineFlow());
     }
 
     RenderStyle *oldStyle = m_style;

-- 
WebKit Debian packaging