[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 0f6efab4d63679be791cc716bb43dce6a81a921e
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 21 00:00:55 2003 +0000

    	Gah. Fix positioned objects and floating objects so that they
    	don't append themselves to the list of runs in normal flow.
    	An astoundingly basic bug. :(
    
            Reviewed by john
    
            * khtml/rendering/bidi.cpp:
            (appendRunsForObject):
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::addChildToFlow):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3357 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d97f0c0..5b7ad35 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-01-20  David Hyatt  <hyatt at apple.com>
+
+	Gah. Fix positioned objects and floating objects so that they
+	don't append themselves to the list of runs in normal flow.
+	An astoundingly basic bug. :(
+	
+        Reviewed by john
+
+        * khtml/rendering/bidi.cpp:
+        (appendRunsForObject):
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::addChildToFlow):
+
 2003-01-19  David Hyatt  <hyatt at apple.com>
 
 	Fixes for 3150561 (blog articles vanish on stylesheet switch) and
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d97f0c0..5b7ad35 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-01-20  David Hyatt  <hyatt at apple.com>
+
+	Gah. Fix positioned objects and floating objects so that they
+	don't append themselves to the list of runs in normal flow.
+	An astoundingly basic bug. :(
+	
+        Reviewed by john
+
+        * khtml/rendering/bidi.cpp:
+        (appendRunsForObject):
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::addChildToFlow):
+
 2003-01-19  David Hyatt  <hyatt at apple.com>
 
 	Fixes for 3150561 (blog articles vanish on stylesheet switch) and
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index da585df..323ccf9 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -264,7 +264,7 @@ inline QChar::Direction BidiIterator::direction() const
 
 static void appendRunsForObject(int start, int end, RenderObject* obj)
 {
-    if (start > end)
+    if (start > end || obj->isSpecial())
         return;
         
     BidiIterator* nextMidpoint = (smidpoints && smidpoints->count()) ? smidpoints->at(0) : 0;
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 590e740..0d91653 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -2088,7 +2088,7 @@ void RenderFlow::addChildToFlow(RenderObject* newChild, RenderObject* beforeChil
             }
         }
     }
-    else if (!m_childrenInline)
+    else if (!m_childrenInline && !newChild->isSpecial())
     {
         // If we're inserting an inline child but all of our children are blocks, then we have to make sure
         // it is put into an anomyous block box. We try to use an existing anonymous box if possible, otherwise

-- 
WebKit Debian packaging