[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 8cea7fa1e29863ee4bb03a6e4896b80cda43c8f9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 19:42:10 2003 +0000

    	Fix for 3134613, bullets overlapping text on weather.com.  Make
    	sure min/max widths get updated when the marker moves around.
    
            Reviewed by john
    
            * khtml/rendering/render_list.cpp:
            (RenderListItem::updateMarkerLocation):
            (RenderListItem::calcMinMaxWidth):
            (RenderListItem::layout):
            * khtml/rendering/render_list.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f38c9e0..dbca937 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+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.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::updateMarkerLocation):
+        (RenderListItem::calcMinMaxWidth):
+        (RenderListItem::layout):
+        * khtml/rendering/render_list.h:
+
 === Safari-54 ===
 
 2003-01-23  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f38c9e0..dbca937 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+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.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::updateMarkerLocation):
+        (RenderListItem::calcMinMaxWidth):
+        (RenderListItem::layout):
+        * khtml/rendering/render_list.h:
+
 === Safari-54 ===
 
 2003-01-23  Darin Adler  <darin at apple.com>
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index 116e76b..b5151db 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -213,17 +213,8 @@ static RenderObject* getParentOfFirstLineBox(RenderObject* curr, RenderObject* m
     return 0;
 }
 
-void RenderListItem::layout( )
+void RenderListItem::updateMarkerLocation()
 {
-    KHTMLAssert( !layouted() );
-    KHTMLAssert( minMaxKnown() );
-
-    if ( !checkChildren() ) {
-        m_height = 0;
-        //kdDebug(0) << "empty item" << endl;
-        return;
-    }
-    
     // Sanity check the location of our marker.
     if (m_marker) {
         RenderObject* markerPar = m_marker->parent();
@@ -237,9 +228,33 @@ void RenderListItem::layout( )
             if (!lineBoxParent)
                 lineBoxParent = this;
             lineBoxParent->addChild(m_marker, lineBoxParent->firstChild());
+            if (!m_marker->minMaxKnown())
+                m_marker->calcMinMaxWidth();
+            recalcMinMaxWidths();
         }
     }
+}
+
+void RenderListItem::calcMinMaxWidth()
+{
+    // Make sure our marker is in the correct location.
+    updateMarkerLocation();
+    if (!minMaxKnown())
+        RenderFlow::calcMinMaxWidth();
+}
+
+void RenderListItem::layout( )
+{
+    KHTMLAssert( !layouted() );
+    KHTMLAssert( minMaxKnown() );
+
+    if ( !checkChildren() ) {
+        m_height = 0;
+        //kdDebug(0) << "empty item" << endl;
+        return;
+    }
     
+    updateMarkerLocation();    
     RenderFlow::layout();
 }
 
diff --git a/WebCore/khtml/rendering/render_list.h b/WebCore/khtml/rendering/render_list.h
index 90c38f3..3327e91 100644
--- a/WebCore/khtml/rendering/render_list.h
+++ b/WebCore/khtml/rendering/render_list.h
@@ -101,6 +101,9 @@ public:
                        int xoff, int yoff, int paintPhase);
 
     virtual void layout( );
+    virtual void calcMinMaxWidth();
+    
+    void updateMarkerLocation();
     
     void setNotInList(bool notInList) { _notInList = notInList; }
     bool notInList() const { return _notInList; }

-- 
WebKit Debian packaging