[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 035051a26e7d333b877b21a12f9c3264a2dd295f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 4 00:17:14 2003 +0000

    	Fix for 3475761, list bullets mislayout after text zooming.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5685 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0963c68..7fa6f0e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-12-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3475761, list bullets mislayout after text zooming.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::setStyle):
+
+2003-12-03  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3493356, table cells didn't repaint properly.
 	
         Reviewed by kocienda
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 78b095c..230d235 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() && child->style()->styleType() == RenderStyle::NOPSEUDO)
+        if (child->isAnonymous() && child->style()->styleType() == RenderStyle::NOPSEUDO && !child->isListMarker())
         {
             RenderStyle* newStyle = new RenderStyle();
             newStyle->inheritFrom(style());

-- 
WebKit Debian packaging