Title: [124533] branches/safari-536.26-branch/Source/WebCore
- Revision
- 124533
- Author
- [email protected]
- Date
- 2012-08-02 16:51:47 -0700 (Thu, 02 Aug 2012)
Log Message
Merged r121279. <rdar://problem/11968288>
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (124532 => 124533)
--- branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-02 23:48:14 UTC (rev 124532)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-02 23:51:47 UTC (rev 124533)
@@ -1,5 +1,21 @@
2012-08-02 Lucas Forschler <[email protected]>
+ Merge 121279
+
+ 2012-06-26 Julien Chaffraix <[email protected]>
+
+ 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-08-02 Lucas Forschler <[email protected]>
+
Merge 121275
2012-06-26 Julien Chaffraix <[email protected]>
Modified: branches/safari-536.26-branch/Source/WebCore/rendering/AutoTableLayout.cpp (124532 => 124533)
--- branches/safari-536.26-branch/Source/WebCore/rendering/AutoTableLayout.cpp 2012-08-02 23:48:14 UTC (rev 124532)
+++ branches/safari-536.26-branch/Source/WebCore/rendering/AutoTableLayout.cpp 2012-08-02 23:51:47 UTC (rev 124533)
@@ -509,7 +509,7 @@
// 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();
}
Modified: branches/safari-536.26-branch/Source/WebCore/rendering/FixedTableLayout.cpp (124532 => 124533)
--- branches/safari-536.26-branch/Source/WebCore/rendering/FixedTableLayout.cpp 2012-08-02 23:48:14 UTC (rev 124532)
+++ branches/safari-536.26-branch/Source/WebCore/rendering/FixedTableLayout.cpp 2012-08-02 23:51:47 UTC (rev 124533)
@@ -234,7 +234,7 @@
// 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();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes