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

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

Issue 7946014: Merge 95461 - Child not placed correctly when beforeChild (table part) (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 // recalc cell info because RenderTable has unguarded pointers 92 // recalc cell info because RenderTable has unguarded pointers
93 // stored that point to this RenderTableSection. 93 // stored that point to this RenderTableSection.
94 if (recalcTable) 94 if (recalcTable)
95 recalcTable->setNeedsSectionRecalc(); 95 recalcTable->setNeedsSectionRecalc();
96 } 96 }
97 97
98 void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild ) 98 void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild )
99 { 99 {
100 // Make sure we don't append things after :after-generated content if we hav e it. 100 // Make sure we don't append things after :after-generated content if we hav e it.
101 if (!beforeChild && isAfterContent(lastChild())) 101 if (!beforeChild) {
102 beforeChild = lastChild(); 102 if (RenderObject* afterContentRenderer = findAfterContentRenderer())
103 beforeChild = anonymousContainer(afterContentRenderer);
104 }
103 105
104 if (!child->isTableRow()) { 106 if (!child->isTableRow()) {
105 RenderObject* last = beforeChild; 107 RenderObject* last = beforeChild;
106 if (!last) 108 if (!last)
107 last = lastChild(); 109 last = lastChild();
108 if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) { 110 if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) {
109 if (beforeChild == last) 111 if (beforeChild == last)
110 beforeChild = last->firstChild(); 112 beforeChild = last->firstChild();
111 last->addChild(child, beforeChild); 113 last->addChild(child, beforeChild);
112 return; 114 return;
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, point InContainer, cellPoint, action)) { 1264 if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, point InContainer, cellPoint, action)) {
1263 updateHitTestResult(result, toLayoutPoint(pointInContainer - cellPoi nt)); 1265 updateHitTestResult(result, toLayoutPoint(pointInContainer - cellPoi nt));
1264 return true; 1266 return true;
1265 } 1267 }
1266 } 1268 }
1267 return false; 1269 return false;
1268 1270
1269 } 1271 }
1270 1272
1271 } // namespace WebCore 1273 } // 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