[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 dca79dbc47615cbcb9d0b6869b503425d9d333f4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 17 00:37:26 2002 +0000

    	Fix crash on pages with bulleted lists.  Making sure the list
    	item marker doesn't get a layer (which means it has to be
    	painted by hand now by the list item object).
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::setStyle):
            * khtml/rendering/render_list.cpp:
            (RenderListItem::printObject):
            * khtml/rendering/render_list.h:
            * khtml/rendering/render_object.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2348 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 693b19d..ee9e4f6 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-10-16  David Hyatt  <hyatt at apple.com>
+
+	Fix crash on pages with bulleted lists.  Making sure the list
+	item marker doesn't get a layer (which means it has to be
+	painted by hand now by the list item object).
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::printObject):
+        * khtml/rendering/render_list.h:
+        * khtml/rendering/render_object.h:
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3072542 -- double "&" in submit button
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 693b19d..ee9e4f6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-10-16  David Hyatt  <hyatt at apple.com>
+
+	Fix crash on pages with bulleted lists.  Making sure the list
+	item marker doesn't get a layer (which means it has to be
+	painted by hand now by the list item object).
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::printObject):
+        * khtml/rendering/render_list.h:
+        * khtml/rendering/render_object.h:
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3072542 -- double "&" in submit button
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 693b19d..ee9e4f6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-10-16  David Hyatt  <hyatt at apple.com>
+
+	Fix crash on pages with bulleted lists.  Making sure the list
+	item marker doesn't get a layer (which means it has to be
+	painted by hand now by the list item object).
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::printObject):
+        * khtml/rendering/render_list.h:
+        * khtml/rendering/render_object.h:
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3072542 -- double "&" in submit button
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index c965353..70732d0 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -82,7 +82,7 @@ void RenderBox::setStyle(RenderStyle *_style)
             setRelPositioned(true);
     }
     
-    if ((isPositioned() || isRelPositioned() || isFloating()) && !m_layer)
+    if ((isPositioned() || isRelPositioned() || (isFloating() && !isListMarker())) && !m_layer)
         m_layer = new RenderLayer(this);
 }
 
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index 8bdfbfc..472d149 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -252,6 +252,8 @@ void RenderListItem::printObject(QPainter *p, int _x, int _y,
 {
     // ### this should scale with the font size in the body... possible?
     //m_marker->printIcon(p, _tx, _ty);
+    if (m_marker)
+        m_marker->printObject(p,_x,_y,_w,_h,_tx,_ty);
     RenderFlow::printObject(p, _x, _y, _w, _h, _tx, _ty);
 }
 
diff --git a/WebCore/khtml/rendering/render_list.h b/WebCore/khtml/rendering/render_list.h
index 6caafd7..ee4cef3 100644
--- a/WebCore/khtml/rendering/render_list.h
+++ b/WebCore/khtml/rendering/render_list.h
@@ -60,6 +60,8 @@ public:
 
     virtual void calcWidth();
 
+    virtual bool isListMarker() const { return true; }
+    
 protected:
     friend class RenderListItem;
 
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 17a6ab8..a3ed267 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -127,6 +127,7 @@ public:
     virtual bool isFlow() const { return false; }
 
     virtual bool isListItem() const { return false; }
+    virtual bool isListMarker() const { return false; }
     virtual bool isRoot() const { return false; }
     virtual bool isBR() const { return false; }
     virtual bool isHtml() const { return false; }

-- 
WebKit Debian packaging