Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)

Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.

1 files changed, 16 insertions, 4 deletions

diff --git a/Source/WebCore/rendering/RenderTableCol.cpp b/Source/WebCore/rendering/RenderTableCol.cpp
index b569eae42..97cd8cc3e 100644
--- a/Source/WebCore/rendering/RenderTableCol.cpp
+++ b/Source/WebCore/rendering/RenderTableCol.cpp
@@ -71,14 +71,15 @@ void RenderTableCol::updateFromElement()
 
 bool RenderTableCol::isChildAllowed(RenderObject* child, RenderStyle* style) const
 {
-    return child->isTableCol() && style->display() == TABLE_COLUMN;
+    // We cannot use isTableColumn here as style() may return 0.
+    return child->isRenderTableCol() && style->display() == TABLE_COLUMN;
 }
 
 bool RenderTableCol::canHaveChildren() const
 {
     // Cols cannot have children. This is actually necessary to fix a bug
     // with libraries.uc.edu, which makes a <p> be a table-column.
-    return style()->display() == TABLE_COLUMN_GROUP;
+    return isTableColumnGroup();
 }
 
 LayoutRect RenderTableCol::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
@@ -116,6 +117,17 @@ RenderTable* RenderTableCol::table() const
     return table && table->isTable() ? toRenderTable(table) : 0;
 }
 
+RenderTableCol* RenderTableCol::enclosingColumnGroup() const
+{
+    if (!parent()->isRenderTableCol())
+        return 0;
+
+    RenderTableCol* parentColumnGroup = toRenderTableCol(parent());
+    ASSERT(parentColumnGroup->isTableColumnGroup());
+    ASSERT(isTableColumn());
+    return parentColumnGroup;
+}
+
 RenderTableCol* RenderTableCol::nextColumn() const
 {
     // If |this| is a column-group, the next column is the colgroup's first child column.
@@ -126,10 +138,10 @@ RenderTableCol* RenderTableCol::nextColumn() const
     RenderObject* next = nextSibling();
 
     // Failing that, the child is the last column in a column-group, so the next column is the next column/column-group after its column-group.
-    if (!next && parent()->isTableCol())
+    if (!next && parent()->isRenderTableCol())
         next = parent()->nextSibling();
 
-    for (; next && !next->isTableCol(); next = next->nextSibling()) {
+    for (; next && !next->isRenderTableCol(); next = next->nextSibling()) {
         // We allow captions mixed with columns and column-groups.
         if (next->isTableCaption())
             continue;