[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 385c772243919f9d9f2813bbf9149a6e719c613a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 21 00:55:40 2002 +0000

    	Fix for 3133081, slashdot messed up when changing font sizes.
    	setStyle in RenderFlow was messed up for continuations.  A
    	block in the middle of a continuation incorrectly propagated
    	its style to the following inlines.
    
            Reviewed by darin
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index aced580..eaeee7a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-20  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3133081, slashdot messed up when changing font sizes.
+	setStyle in RenderFlow was messed up for continuations.  A
+	block in the middle of a continuation incorrectly propagated
+	its style to the following inlines.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::setStyle):
+
 2002-12-20  Richard Williamson   <rjw at apple.com>
 
         Fix for 3133601.  Play the same trick we do in
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index aced580..eaeee7a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-20  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3133081, slashdot messed up when changing font sizes.
+	setStyle in RenderFlow was messed up for continuations.  A
+	block in the middle of a continuation incorrectly propagated
+	its style to the following inlines.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::setStyle):
+
 2002-12-20  Richard Williamson   <rjw at apple.com>
 
         Fix for 3133601.  Play the same trick we do in
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index b91cd0f..32dd49e 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -102,16 +102,23 @@ void RenderFlow::setStyle(RenderStyle *_style)
         child = child->nextSibling();
     }
     
-    // Ensure that all of the split inlines pick up the new style.
-    RenderFlow* currCont = continuation();
-    while (currCont) {
-        if (currCont->isInline()) {
-            RenderFlow* nextCont = currCont->continuation();
-            currCont->setContinuation(0);
-            currCont->setStyle(style());
-            currCont->setContinuation(nextCont);
+    // Ensure that all of the split inlines pick up the new style. We
+    // only do this if we're an inline, since we don't want to propagate
+    // a block's style to the other inlines.
+    // e.g., <font>foo <h4>goo</h4> moo</font>.  The <font> inlines before
+    // and after the block share the same style, but the block doesn't
+    // need to pass its style on to anyone else.
+    if (isInline()) {
+        RenderFlow* currCont = continuation();
+        while (currCont) {
+            if (currCont->isInline()) {
+                RenderFlow* nextCont = currCont->continuation();
+                currCont->setContinuation(0);
+                currCont->setStyle(style());
+                currCont->setContinuation(nextCont);
+            }
+            currCont = currCont->continuation();
         }
-        currCont = currCont->continuation();
     }
 }
 

-- 
WebKit Debian packaging