[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 486f40f66a6c110b95f612293f74ec2e5742988b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 17 11:45:23 2003 +0000

    	Back out my change to exclude text runs from getting a relayout on a style change.  I totally forgot about
    	text zooming.
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5536 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 239d13a..5192eaa 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2003-11-17  David Hyatt  <hyatt at apple.com>
+
+	Back out my change to exclude text runs from getting a relayout on a style change.  I totally forgot about
+	text zooming.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setStyle):
+
 2003-11-16  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 413e83d..32f784a 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1302,14 +1302,12 @@ void RenderObject::setStyle(RenderStyle *style)
     if (affectsParentBlock)
         handleDynamicFloatPositionChange();
     
-    if (!isText()) {
-        // No need to ever schedule relayouts/repaints from a style change of a text run, since
-        // we already did this for the parent of the text run.
-        if (d >= RenderStyle::Position && m_parent)
-            setNeedsLayoutAndMinMaxRecalc();
-        else if (m_parent && d == RenderStyle::Visible)
-            repaint();
-    }
+    // No need to ever schedule repaints from a style change of a text run, since
+    // we already did this for the parent of the text run.
+    if (d >= RenderStyle::Position && m_parent)
+        setNeedsLayoutAndMinMaxRecalc();
+    else if (!isText() && m_parent && d == RenderStyle::Visible)
+        repaint();
 }
 
 void RenderObject::setOverhangingContents(bool p)

-- 
WebKit Debian packaging