[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 b7be1131b59742eabab0208be04d517d4ca84514
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 22 19:03:34 2002 +0000

    	Fix for the table/form regressions.  Also landing beginnings
    	of the block/inline work.
    
            * khtml/html/html_tableimpl.cpp:
            (HTMLTableSectionElementImpl::addChild):
            * khtml/html/html_tableimpl.h:
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::RenderFlow):
            * khtml/rendering/render_flow.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2828 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 2732b69..7a3d62f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
+	Fix for the table/form regressions.  Also landing beginnings
+	of the block/inline work.
+	
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableSectionElementImpl::addChild):
+        * khtml/html/html_tableimpl.h:
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::RenderFlow):
+        * khtml/rendering/render_flow.h:
+
 2002-11-22  Darin Adler  <darin at apple.com>
 
         * khtml/ecma/kjs_dom.cpp: (DOMNode::pushEventHandlerScope): Change to push handlers
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2732b69..7a3d62f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
+	Fix for the table/form regressions.  Also landing beginnings
+	of the block/inline work.
+	
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableSectionElementImpl::addChild):
+        * khtml/html/html_tableimpl.h:
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::RenderFlow):
+        * khtml/rendering/render_flow.h:
+
 2002-11-22  Darin Adler  <darin at apple.com>
 
         * khtml/ecma/kjs_dom.cpp: (DOMNode::pushEventHandlerScope): Change to push handlers
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2732b69..7a3d62f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
+	Fix for the table/form regressions.  Also landing beginnings
+	of the block/inline work.
+	
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableSectionElementImpl::addChild):
+        * khtml/html/html_tableimpl.h:
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::RenderFlow):
+        * khtml/rendering/render_flow.h:
+
 2002-11-22  Darin Adler  <darin at apple.com>
 
         * khtml/ecma/kjs_dom.cpp: (DOMNode::pushEventHandlerScope): Change to push handlers
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index a6df87a..939ee07 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -555,6 +555,21 @@ NodeImpl::Id HTMLTableSectionElementImpl::id() const
     return _id;
 }
 
+NodeImpl *HTMLTableSectionElementImpl::addChild(NodeImpl *child)
+{
+#ifdef DEBUG_LAYOUT
+    kdDebug( 6030 ) << nodeName().string() << "(Tbody)::addChild( " << child->nodeName().string() << " )" << endl;
+#endif
+
+    if (child->id() == ID_FORM) {
+        // First add the child.
+        HTMLElementImpl::addChild(child);
+        // Now simply return ourselves as the newnode.  This has the effect of
+        // demoting the form to a leaf and moving it safely out of the way.
+        return this;
+    }
+    return HTMLTablePartElementImpl::addChild(child);
+}
 
 // these functions are rather slow, since we need to get the row at
 // the index... but they aren't used during usual HTML parsing anyway
diff --git a/WebCore/khtml/html/html_tableimpl.h b/WebCore/khtml/html/html_tableimpl.h
index 17a3039..123f4f7 100644
--- a/WebCore/khtml/html/html_tableimpl.h
+++ b/WebCore/khtml/html/html_tableimpl.h
@@ -147,6 +147,8 @@ public:
 
     virtual Id id() const;
 
+    virtual NodeImpl *addChild(NodeImpl *child);
+    
     HTMLElementImpl *insertRow ( long index );
     void deleteRow ( long index );
 
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index a7190ed..d869852 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -58,6 +58,8 @@ RenderFlow::RenderFlow(DOM::NodeImpl* node)
     m_maxTopPosMargin = m_maxTopNegMargin = m_maxBottomPosMargin = m_maxBottomNegMargin = 0;
     m_topMarginQuirk = m_bottomMarginQuirk = false;
     m_overflowHeight = 0;
+    
+    m_continuation = 0;
 }
 
 void RenderFlow::setStyle(RenderStyle *_style)
diff --git a/WebCore/khtml/rendering/render_flow.h b/WebCore/khtml/rendering/render_flow.h
index 7fc88b0..8483b94 100644
--- a/WebCore/khtml/rendering/render_flow.h
+++ b/WebCore/khtml/rendering/render_flow.h
@@ -56,6 +56,9 @@ public:
     virtual bool isRendered() const { return true; }
     virtual void setBlockBidi() { m_blockBidi = true; }
 
+    RenderFlow* continuation() { return m_continuation; }
+    void setContinuation(RenderFlow* c) { m_continuation = c; }
+    
     void makeChildrenNonInline(RenderObject *box2Start = 0);
 
     // overrides RenderObject
@@ -218,6 +221,12 @@ private:
     // How much content overflows out of our block vertically (all we support
     // for now is spillage out of the bottom, which is the common case).
     int m_overflowHeight;
+    
+    // An inline can be split with blocks occurring in between the inline content.
+    // When this occurs we need a pointer to our next object.  We can basically be
+    // split into a sequence of inlines and blocks.  The continuation will either be
+    // an anonymous block (that houses other blocks) or it will be an inline flow.
+    RenderFlow* m_continuation;
 };
 
     

-- 
WebKit Debian packaging