[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 7464405920e07ab9925d1a1bf6e78a3e79bb270d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 18 09:55:06 2003 +0000

    	Fix for 3478122, crash using first-letter and zooming, and also the fix for 3478078, generated content
    	does not get removed properly on w3c site.  The root cause of these two bugs was the same, namely my
    	change to meld the concept of generated anonymous content and anonymous blocks created by the layout
    	engine together.  RenderBlock's setStyle method was incorrectly updating before/after/first-letter content
    	and wiping out its style in random (and bad) ways.
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e3f3166..4680907 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-11-18  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3478122, crash using first-letter and zooming, and also the fix for 3478078, generated content
+	does not get removed properly on w3c site.  The root cause of these two bugs was the same, namely my
+	change to meld the concept of generated anonymous content and anonymous blocks created by the layout
+	engine together.  RenderBlock's setStyle method was incorrectly updating before/after/first-letter content
+	and wiping out its style in random (and bad) ways.
+	
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::setStyle):
+
+2003-11-18  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3487424, images not painting because of dropped layouts.  When replaced elements dirtied
 	themselves during line layout, they only needed to do a local dirty and not walk up the parent chain.
 	
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 53b869f..3491ecf 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -78,7 +78,7 @@ void RenderBlock::setStyle(RenderStyle* _style)
     RenderObject *child = firstChild();
     while (child != 0)
     {
-        if (child->isAnonymous())
+        if (child->isAnonymous() && child->style()->styleType() == RenderStyle::NOPSEUDO)
         {
             RenderStyle* newStyle = new RenderStyle();
             newStyle->inheritFrom(style());

-- 
WebKit Debian packaging