[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 05fbf2e37345e70987a5595d24b9071b9d3ad1a3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 26 02:50:14 2002 +0000

    	Fix for the DHTML on hrweb.  With these changes it works
    	except for some odd vertical spacing issues.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::addChildToFlow):
            (RenderFlow::makeChildrenNonInline):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f6e4f2a..901f7be 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for the DHTML on hrweb.  With these changes it works
+	except for some odd vertical spacing issues.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::addChildToFlow):
+        (RenderFlow::makeChildrenNonInline):
+
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
         Tweaked some debugging info.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f6e4f2a..901f7be 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for the DHTML on hrweb.  With these changes it works
+	except for some odd vertical spacing issues.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::addChildToFlow):
+        (RenderFlow::makeChildrenNonInline):
+
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
         Tweaked some debugging info.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f6e4f2a..901f7be 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for the DHTML on hrweb.  With these changes it works
+	except for some odd vertical spacing issues.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::addChildToFlow):
+        (RenderFlow::makeChildrenNonInline):
+
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
         Tweaked some debugging info.
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index de425ea..f23227c 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -2005,32 +2005,8 @@ void RenderFlow::addChildToFlow(RenderObject* newChild, RenderObject* beforeChil
             newChild->setMinMaxKnown( false );
             return;
         }
-        else {
-            // Trying to insert a block child into an anonymous block box which contains only
-            // inline elements... move all of the anonymous box's inline children into other
-            // anonymous boxes which become children of this
-
-            RenderObject *anonBox = beforeChild->parent();
-            KHTMLAssert (anonBox->isFlow()); // ### RenderTableSection the only exception - should never happen here
-
-            if ( anonBox->childrenInline() ) {
-                static_cast<RenderFlow*>(anonBox)->makeChildrenNonInline(beforeChild);
-                madeBoxesNonInline = true;
-            }
-            
-            beforeChild = beforeChild->parent();
-
-            RenderObject *child;
-            while ((child = anonBox->firstChild()) != 0) {
-                anonBox->removeChild(child);
-                addChild(child,anonBox);
-            }
-
-            removeChildNode(anonBox);
-            anonBox->detach(renderArena()); // does necessary cleanup & deletes anonBox
-
-            KHTMLAssert(beforeChild->parent() == this);
-        }
+        else
+            return addChildToFlow(newChild, beforeChild->parent());
     }
 
     // prevent non-layouted elements from getting painted by pushing them far above the top of the
@@ -2156,13 +2132,13 @@ void RenderFlow::makeChildrenNonInline(RenderObject *box2Start)
         next = child->nextSibling();
 
         if (child->isInline()) {
-	    if ( !boxFirst )
-		boxFirst = child;
+            if ( !boxFirst )
+                boxFirst = child;
             boxLast = child;
         }
 
-        if ( boxFirst &&
-	     ( !child->isInline() || !next || child == box2Start ) ) {
+        if (boxFirst &&
+            (!child->isInline() || !next || child == box2Start)) {
             // Create a new anonymous box containing all children starting from boxFirst
             // and up to (but not including) boxLast, and put it in place of the children
             RenderStyle *newStyle = new RenderStyle();
@@ -2184,11 +2160,17 @@ void RenderFlow::makeChildrenNonInline(RenderObject *box2Start)
                 o = no->nextSibling();
                 box->appendChildNode(removeChildNode(no));
             }
-            box->appendChildNode(removeChildNode(boxLast));
+            if (child && child == box2Start && boxLast == child) {
+                boxFirst = boxLast = child;
+                box2Start = 0;
+            }
+            else {
+                box->appendChildNode(removeChildNode(boxLast));
+                boxFirst = boxLast = next;
+            }
             box->close();
             box->setPos(box->xPos(), -500000);
             box->setLayouted(false);
-            boxFirst = boxLast = next;
         }
 
         child = next;

-- 
WebKit Debian packaging