Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: Source/WebCore/rendering/RenderTableSection.cpp

Issue 8226006: Merge 97074 - Handle insertion into an anonymous table part that (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderTableRow.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderTableSection.cpp
===================================================================
--- Source/WebCore/rendering/RenderTableSection.cpp (revision 97084)
+++ Source/WebCore/rendering/RenderTableSection.cpp (working copy)
@@ -112,6 +112,15 @@
return;
}
+ if (beforeChild && !beforeChild->isAnonymous() && beforeChild->parent() == this) {
+ RenderObject* row = beforeChild->previousSibling();
+ if (row && row->isTableRow()) {
+ ASSERT(row->isAnonymous());
+ row->addChild(child);
+ return;
+ }
+ }
+
// If beforeChild is inside an anonymous cell/row, insert into the cell or into
// the anonymous row containing it, if there is one.
RenderObject* lastBox = last;
@@ -1173,6 +1182,8 @@
void RenderTableSection::splitColumn(int pos, int first)
{
+ ASSERT(!m_needsCellRecalc);
+
if (m_cCol > pos)
m_cCol++;
for (int row = 0; row < m_gridRows; ++row) {
« no previous file with comments | « Source/WebCore/rendering/RenderTableRow.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698