From 68244f407eb69244c37c40001a200783c73da339 Mon Sep 17 00:00:00 2001 From: "jchaffraix@webkit.org" Date: Tue, 26 Jun 2012 19:40:08 +0000 Subject: [PATCH] Crash in FixedTableLayout::layout https://bugs.webkit.org/show_bug.cgi?id=88676 Unreviewed typo fix, pointed out by Darin Adler. * rendering/AutoTableLayout.cpp: (WebCore::AutoTableLayout::layout): * rendering/FixedTableLayout.cpp: (WebCore::FixedTableLayout::layout): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121279 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 12 ++++++++++++ Source/WebCore/rendering/AutoTableLayout.cpp | 2 +- Source/WebCore/rendering/FixedTableLayout.cpp | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index cfa74b3..4e3d943 100755 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2012-06-26 Julien Chaffraix + + Crash in FixedTableLayout::layout + https://bugs.webkit.org/show_bug.cgi?id=88676 + + Unreviewed typo fix, pointed out by Darin Adler. + + * rendering/AutoTableLayout.cpp: + (WebCore::AutoTableLayout::layout): + * rendering/FixedTableLayout.cpp: + (WebCore::FixedTableLayout::layout): + 2012-06-26 Adam Klein MutationObserver.observe should treat a null or undefined options argument as empty diff --git a/Source/WebCore/rendering/AutoTableLayout.cpp b/Source/WebCore/rendering/AutoTableLayout.cpp index b0a137d..019b11d 100644 --- a/Source/WebCore/rendering/AutoTableLayout.cpp +++ b/Source/WebCore/rendering/AutoTableLayout.cpp @@ -502,7 +502,7 @@ void AutoTableLayout::layout() // This means that our preferred logical widths were not recomputed as expected. if (nEffCols != m_layoutStruct.size()) { fullRecalc(); - // FIXME: Table layout shouldn't modify our table structure (but does due to columns and colum-groups). + // FIXME: Table layout shouldn't modify our table structure (but does due to columns and column-groups). nEffCols = m_table->numEffCols(); } diff --git a/Source/WebCore/rendering/FixedTableLayout.cpp b/Source/WebCore/rendering/FixedTableLayout.cpp index 7b08daf..8649a08 100644 --- a/Source/WebCore/rendering/FixedTableLayout.cpp +++ b/Source/WebCore/rendering/FixedTableLayout.cpp @@ -212,7 +212,7 @@ void FixedTableLayout::layout() // This means that our preferred logical widths were not recomputed as expected. if (nEffCols != m_width.size()) { calcWidthArray(tableLogicalWidth); - // FIXME: Table layout shouldn't modify our table structure (but does due to columns and colum-groups). + // FIXME: Table layout shouldn't modify our table structure (but does due to columns and column-groups). nEffCols = m_table->numEffCols(); } -- 2.7.4