diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
| commit | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (patch) | |
| tree | b7abd9f49ae1d4d2e426a5883bfccd42b8e2ee12 /Source/WebCore/rendering/RenderObject.cpp | |
| parent | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (diff) | |
| download | qtwebkit-a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd.tar.gz | |
Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)
Diffstat (limited to 'Source/WebCore/rendering/RenderObject.cpp')
| -rwxr-xr-x | Source/WebCore/rendering/RenderObject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp index 8a3094443..4eb16b835 100755 --- a/Source/WebCore/rendering/RenderObject.cpp +++ b/Source/WebCore/rendering/RenderObject.cpp @@ -150,11 +150,9 @@ RenderObject* RenderObject::createObject(Node* node, RenderStyle* style) return new (arena) RenderRubyText(node); switch (style->display()) { -#if ENABLE(CSS_GRID_LAYOUT) // For now, we don't show grid elements. case GRID: case INLINE_GRID: -#endif case NONE: return 0; case INLINE: @@ -273,8 +271,10 @@ void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild) bool needsTable = false; - if (newChild->isTableCol() && newChild->style()->display() == TABLE_COLUMN_GROUP) + if (newChild->style()->display() == TABLE_COLUMN_GROUP) needsTable = !isTable(); + else if (newChild->style()->display() == TABLE_COLUMN) + needsTable = !isTable() && style()->display() != TABLE_COLUMN_GROUP; else if (newChild->isTableCaption()) needsTable = !isTable(); else if (newChild->isTableSection()) |