[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 d9a7334c4821ed1cb5c36089766479c2ddbab1d3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 19:54:06 2003 +0000

    	Fix for 3147995, empty <li> tags don't render bullets.
    
            Reviewed by john.
    
            * khtml/rendering/render_list.cpp:
            (RenderListItem::layout):
            * khtml/rendering/render_list.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index dbca937..889083f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2003-01-23  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3147995, empty <li> tags don't render bullets.
+	
+        Reviewed by john.
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::layout):
+        * khtml/rendering/render_list.h:
+
+2003-01-23  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3134613, bullets overlapping text on weather.com.  Make
 	sure min/max widths get updated when the marker moves around.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index dbca937..889083f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-01-23  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3147995, empty <li> tags don't render bullets.
+	
+        Reviewed by john.
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::layout):
+        * khtml/rendering/render_list.h:
+
+2003-01-23  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3134613, bullets overlapping text on weather.com.  Make
 	sure min/max widths get updated when the marker moves around.
 	
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index b5151db..44b3c4f 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -248,50 +248,10 @@ void RenderListItem::layout( )
     KHTMLAssert( !layouted() );
     KHTMLAssert( minMaxKnown() );
 
-    if ( !checkChildren() ) {
-        m_height = 0;
-        //kdDebug(0) << "empty item" << endl;
-        return;
-    }
-    
     updateMarkerLocation();    
     RenderFlow::layout();
 }
 
-// this function checks if there is other rendered contents in the list item than a marker. If not, the whole
-// list item will not get printed.
-bool RenderListItem::checkChildren() const
-{
-    //kdDebug(0) << " checkCildren" << endl;
-    if(!firstChild())
-        return false;
-    RenderObject *o = firstChild();
-    while(o->firstChild())
-        o = o->firstChild();
-    while (!o->nextSibling() && o->parent() != static_cast<const RenderObject*>(this))
-        o = o->parent();
-    //o = o->nextSibling();
-    while( o ) {
-        //kdDebug(0) << "checking " << renderName() << endl;
-        if ( o->isText() || o->isReplaced() ) {
-            //kdDebug(0) << "found" << endl;
-            return true;
-        }
-        RenderObject *next = o->firstChild();
-        if ( !next )
-            next = o->nextSibling();
-        while ( !next && o->parent() != static_cast<const RenderObject*>(this) ) {
-            o = o->parent();
-            next =  o->nextSibling();
-        }
-        if( !next )
-            break;
-        o = next;
-    }
-    //kdDebug(0) << "not found" << endl;
-    return false;
-}
-
 void RenderListItem::paint(QPainter *p, int _x, int _y, int _w, int _h,
                            int _tx, int _ty, int paintPhase)
 {
diff --git a/WebCore/khtml/rendering/render_list.h b/WebCore/khtml/rendering/render_list.h
index 3327e91..9a5522a 100644
--- a/WebCore/khtml/rendering/render_list.h
+++ b/WebCore/khtml/rendering/render_list.h
@@ -93,8 +93,7 @@ public:
     long value() const { return m_marker->m_value; }
     void setValue( long v ) { predefVal = v; }
     void calcListValue();
-    bool checkChildren() const;
-
+    
     virtual void paint(QPainter *p, int x, int y, int w, int h,
                        int xoff, int yoff, int paintPhase);
     virtual void paintObject(QPainter *p, int x, int y, int w, int h,

-- 
WebKit Debian packaging