From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Oct 2012 16:21:14 +0200 Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes --- Source/WebCore/rendering/AutoTableLayout.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/WebCore/rendering/AutoTableLayout.cpp') diff --git a/Source/WebCore/rendering/AutoTableLayout.cpp b/Source/WebCore/rendering/AutoTableLayout.cpp index 36ba164dc..08ecff90e 100644 --- a/Source/WebCore/rendering/AutoTableLayout.cpp +++ b/Source/WebCore/rendering/AutoTableLayout.cpp @@ -49,7 +49,7 @@ void AutoTableLayout::recalcColumn(unsigned effCol) RenderTableCell* fixedContributor = 0; RenderTableCell* maxContributor = 0; - for (RenderObject* child = m_table->firstChild(); child; child = child->nextSibling()) { + for (RenderObject* child = m_table->children()->firstChild(); child; child = child->nextSibling()) { if (child->isRenderTableCol()) toRenderTableCol(child)->computePreferredLogicalWidths(); else if (child->isTableSection()) { @@ -62,7 +62,7 @@ void AutoTableLayout::recalcColumn(unsigned effCol) if (current.inColSpan || !cell) continue; - bool cellHasContent = cell->firstChild() || cell->style()->hasBorder() || cell->style()->hasPadding(); + bool cellHasContent = cell->children()->firstChild() || cell->style()->hasBorder() || cell->style()->hasPadding(); if (cellHasContent) columnLayout.emptyCellsOnly = false; @@ -771,10 +771,10 @@ void AutoTableLayout::layout() int pos = 0; for (size_t i = 0; i < nEffCols; ++i) { - m_table->columnPositions()[i] = pos; + m_table->setColumnPosition(i, pos); pos += m_layoutStruct[i].computedLogicalWidth + m_table->hBorderSpacing(); } - m_table->columnPositions()[m_table->columnPositions().size() - 1] = pos; + m_table->setColumnPosition(m_table->columnPositions().size() - 1, pos); } } -- cgit v1.2.1