[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 3221ecd469850397dad6d908c6400d65b82c5cf8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 10 22:07:27 2002 +0000

    	Fix for 3058829, assertion caused by table cell with
    	incorrect display type.  Implemented a quirk that forces
    	<td>s of display: block to construct table cells as
    	rendering objects.
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::createObject):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2302 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 00a81fa..193102d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-10-11  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3058829, assertion caused by table cell with
+	incorrect display type.  Implemented a quirk that forces
+	<td>s of display: block to construct table cells as
+	rendering objects. 
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::createObject):
+
 === Alexander-27 ===
 
 2002-10-10  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 00a81fa..193102d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-10-11  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3058829, assertion caused by table cell with
+	incorrect display type.  Implemented a quirk that forces
+	<td>s of display: block to construct table cells as
+	rendering objects. 
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::createObject):
+
 === Alexander-27 ===
 
 2002-10-10  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 00a81fa..193102d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-10-11  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3058829, assertion caused by table cell with
+	incorrect display type.  Implemented a quirk that forces
+	<td>s of display: block to construct table cells as
+	rendering objects. 
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::createObject):
+
 === Alexander-27 ===
 
 2002-10-10  Darin Adler  <darin at apple.com>
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 01c6054..19379f1 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -27,6 +27,7 @@
 #include "rendering/render_list.h"
 #include "rendering/render_root.h"
 #include "xml/dom_elementimpl.h"
+#include "xml/dom_docimpl.h"
 #include "misc/htmlhashes.h"
 #include <kdebug.h>
 #include <qpainter.h>
@@ -45,7 +46,15 @@ RenderObject *RenderObject::createObject(DOM::NodeImpl* node,  RenderStyle* styl
         break;
     case INLINE:
     case BLOCK:
-        o = new RenderFlow(node);
+        // In quirks mode, if <td> has a display of block, build a table cell instead.
+        // This corrects erroneous HTML.  A better fix would be to implement full-blown
+        // CSS2 anonymous table render object construction, but until then, this will have
+        // to suffice. -dwh
+        if (style->display() == BLOCK && node->id() == ID_TD &&
+            node->getDocument()->parseMode() != DocumentImpl::Strict)
+            o = new RenderTableCell(node);
+        else
+            o = new RenderFlow(node);
         break;
     case LIST_ITEM:
         o = new RenderListItem(node);

-- 
WebKit Debian packaging