[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 c77c3788280df83fb6d6673b3a0cbdf6683a85b4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 20:45:18 2003 +0000

    	Fix for 3146066, messed up lists on dictionary.com.  Make
    	sure that a marker in an anonymous box with no other line box
    	parent available just stays where it is, rather than removing
    	itself from the anonymous box (causing that box to be deleted
    	and recreated ad infinitum).
    
            Reviewed by darin
    
            * khtml/rendering/render_list.cpp:
            (RenderListItem::updateMarkerLocation):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9c7971b..9f306ff 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-01-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3146066, messed up lists on dictionary.com.  Make
+	sure that a marker in an anonymous box with no other line box
+	parent available just stays where it is, rather than removing
+	itself from the anonymous box (causing that box to be deleted
+	and recreated ad infinitum).
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::updateMarkerLocation):
+
 2003-01-24  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
@@ -17,6 +30,7 @@
 
         * kwq/WebCoreBridge.h: Added incomingReferrer.
 
+>>>>>>> 1.1315
 2003-01-24  Trey Matteson  <trey at apple.com>
 
 	3155162 - cursor changes to I-beam after dragging image	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9c7971b..9f306ff 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-01-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3146066, messed up lists on dictionary.com.  Make
+	sure that a marker in an anonymous box with no other line box
+	parent available just stays where it is, rather than removing
+	itself from the anonymous box (causing that box to be deleted
+	and recreated ad infinitum).
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::updateMarkerLocation):
+
 2003-01-24  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
@@ -17,6 +30,7 @@
 
         * kwq/WebCoreBridge.h: Added incomingReferrer.
 
+>>>>>>> 1.1315
 2003-01-24  Trey Matteson  <trey at apple.com>
 
 	3155162 - cursor changes to I-beam after dragging image	
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index cd58690..e9ca99a 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -219,8 +219,16 @@ void RenderListItem::updateMarkerLocation()
     if (m_marker) {
         RenderObject* markerPar = m_marker->parent();
         RenderObject* lineBoxParent = getParentOfFirstLineBox(this, m_marker);
-        if (!lineBoxParent)
-            lineBoxParent = this;
+        if (!lineBoxParent) {
+            // If the marker is currently contained inside an anonymous box,
+            // then we are the only item in that anonymous box (since no line box
+            // parent was found).  It's ok to just leave the marker where it is
+            // in this case.
+            if (markerPar && markerPar->isAnonymousBox())
+                lineBoxParent = markerPar;
+            else
+                lineBoxParent = this;
+        }
         if (markerPar != lineBoxParent)
         {
             if (markerPar)

-- 
WebKit Debian packaging