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

Side by Side Diff: Source/WebCore/rendering/RenderTableSection.cpp

Issue 11856005: Merge 138850 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 unified diff | Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderTableRow.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 { 123 {
124 RenderBox::willBeRemovedFromTree(); 124 RenderBox::willBeRemovedFromTree();
125 125
126 // Preventively invalidate our cells as we may be re-inserted into 126 // Preventively invalidate our cells as we may be re-inserted into
127 // a new table which would require us to rebuild our structure. 127 // a new table which would require us to rebuild our structure.
128 setNeedsCellRecalc(); 128 setNeedsCellRecalc();
129 } 129 }
130 130
131 void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild ) 131 void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild )
132 { 132 {
133 // Make sure we don't append things after :after-generated content if we hav e it.
134 if (!beforeChild)
135 beforeChild = afterPseudoElementRenderer();
136
137 if (!child->isTableRow()) { 133 if (!child->isTableRow()) {
138 RenderObject* last = beforeChild; 134 RenderObject* last = beforeChild;
139 if (!last) 135 if (!last)
140 last = lastChild(); 136 last = lastChild();
141 if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) { 137 if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) {
142 if (beforeChild == last) 138 if (beforeChild == last)
143 beforeChild = last->firstChild(); 139 beforeChild = last->firstChild();
144 last->addChild(child, beforeChild); 140 last->addChild(child, beforeChild);
145 return; 141 return;
146 } 142 }
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1459 info.addMember(rowRenderer); 1455 info.addMember(rowRenderer);
1460 } 1456 }
1461 1457
1462 void RenderTableSection::CellStruct::reportMemoryUsage(MemoryObjectInfo* memoryO bjectInfo) const 1458 void RenderTableSection::CellStruct::reportMemoryUsage(MemoryObjectInfo* memoryO bjectInfo) const
1463 { 1459 {
1464 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 1460 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1465 info.addMember(cells); 1461 info.addMember(cells);
1466 } 1462 }
1467 1463
1468 } // namespace WebCore 1464 } // namespace WebCore
OLDNEW
« 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