[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 7ed1f1e8901251e0915ebeb0f252b702696b72df
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 7 03:27:47 2003 +0000

    	Fix rollingstone regression.
    
            Reviewed by mjs
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::setLayouted):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index eedb5a1..7fd0bf1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-02-06  David Hyatt  <hyatt at apple.com>
+
+	Fix rollingstone regression.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+
 2003-02-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index eedb5a1..7fd0bf1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-02-06  David Hyatt  <hyatt at apple.com>
+
+	Fix rollingstone regression.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+
 2003-02-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index f5175fb..aecc4eb 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -348,9 +348,9 @@ void RenderObject::setLayouted(bool b)
         }
     }
     else {
-        RenderObject *o = m_parent;
+        RenderObject *o = container();
         RenderObject *root = this;
-        
+
         // If an attempt is made to
         // setLayouted(false) an object inside a clipped (overflow:hidden) object, we 
         // have to make sure to repaint only the clipped rectangle.
@@ -365,7 +365,7 @@ void RenderObject::setLayouted(bool b)
             o->m_layouted = false;
             if (o->style()->overflow() == OHIDDEN && !clippedObj)
                 clippedObj = o;
-            o = o->m_parent;
+            o = o->container();
         }
         
         root->scheduleRelayout(clippedObj);
@@ -824,7 +824,7 @@ void RenderObject::setStyle(RenderStyle *style)
 
     RenderStyle::Diff d = m_style ? m_style->diff( style ) : RenderStyle::Layout;
 
-    if (m_style && m_parent && d == RenderStyle::Visible)
+    if (m_style && m_parent && d == RenderStyle::Visible && !isText())
         // Do a repaint with the old style first, e.g., for example if we go from
         // having an outline to not having an outline.
         repaint();

-- 
WebKit Debian packaging