[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 3f25eb7ba91104bcc768e86e0e6bbdaf2d20bd5a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 12 18:30:32 2003 +0000

    	Fix for 3374566, list bullets don't display if list-style-type is none but a list-style-image
    	is specified.  The spec says list-style-type: none does not apply to list-style-image,
    	and this fixes Microsoft's list bullet on their security pages.
    
            Reviewed by john
    
            * khtml/rendering/render_list.cpp:
            (RenderListItem::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4808 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index cc8179c..bb9ee44 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-08-12  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3374566, list bullets don't display if list-style-type is none but a list-style-image
+	is specified.  The spec says list-style-type: none does not apply to list-style-image,
+	and this fixes Microsoft's list bullet on their security pages.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::setStyle):
+
 2003-08-12  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cc8179c..bb9ee44 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-08-12  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3374566, list bullets don't display if list-style-type is none but a list-style-image
+	is specified.  The spec says list-style-type: none does not apply to list-style-image,
+	and this fixes Microsoft's list bullet on their security pages.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::setStyle):
+
 2003-08-12  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index 47b76d2..a68c93e 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -134,25 +134,24 @@ void RenderListItem::setStyle(RenderStyle *_style)
 {
     RenderBlock::setStyle(_style);
 
-    RenderStyle *newStyle = new RenderStyle();
-    newStyle->ref();
-    
-    newStyle->inheritFrom(style());
-   
-    if (!m_marker && style()->listStyleType() != LNONE) {
-        m_marker = new (renderArena()) RenderListMarker();
-        m_marker->setStyle(newStyle);
-        m_marker->setListItem(this);
-        _markerInstalledInParent = false;
-    } else if ( m_marker && style()->listStyleType() == LNONE) {
+    if (style()->listStyleType() != LNONE ||
+        (style()->listStyleImage() && !style()->listStyleImage()->isErrorImage())) {
+        RenderStyle *newStyle = new RenderStyle();
+        newStyle->ref();
+        newStyle->inheritFrom(style());
+        if (!m_marker) {
+            m_marker = new (renderArena()) RenderListMarker();
+            m_marker->setStyle(newStyle);
+            m_marker->setListItem(this);
+            _markerInstalledInParent = false;
+        }
+        else
+            m_marker->setStyle(newStyle);
+        newStyle->deref();
+    } else if (m_marker) {
         m_marker->detach(renderArena());
         m_marker = 0;
     }
-    else if ( m_marker ) {
-        m_marker->setStyle(newStyle);
-    }
-
-    newStyle->deref();
 }
 
 RenderListItem::~RenderListItem()

-- 
WebKit Debian packaging