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

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

Issue 8666016: Merge 100630 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 years, 1 month 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // recalc cell info because RenderTable has unguarded pointers 97 // recalc cell info because RenderTable has unguarded pointers
98 // stored that point to this RenderTableSection. 98 // stored that point to this RenderTableSection.
99 if (recalcTable) 99 if (recalcTable)
100 recalcTable->setNeedsSectionRecalc(); 100 recalcTable->setNeedsSectionRecalc();
101 } 101 }
102 102
103 void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild ) 103 void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild )
104 { 104 {
105 // Make sure we don't append things after :after-generated content if we hav e it. 105 // Make sure we don't append things after :after-generated content if we hav e it.
106 if (!beforeChild) 106 if (!beforeChild)
107 beforeChild = findAfterContentRenderer(); 107 beforeChild = afterPseudoElementRenderer();
108 108
109 if (!child->isTableRow()) { 109 if (!child->isTableRow()) {
110 RenderObject* last = beforeChild; 110 RenderObject* last = beforeChild;
111 if (!last) 111 if (!last)
112 last = lastChild(); 112 last = lastChild();
113 if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) { 113 if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) {
114 if (beforeChild == last) 114 if (beforeChild == last)
115 beforeChild = last->firstChild(); 115 beforeChild = last->firstChild();
116 last->addChild(child, beforeChild); 116 last->addChild(child, beforeChild);
117 return; 117 return;
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, point InContainer, cellPoint, action)) { 1290 if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, point InContainer, cellPoint, action)) {
1291 updateHitTestResult(result, toLayoutPoint(pointInContainer - cellPoi nt)); 1291 updateHitTestResult(result, toLayoutPoint(pointInContainer - cellPoi nt));
1292 return true; 1292 return true;
1293 } 1293 }
1294 } 1294 }
1295 return false; 1295 return false;
1296 1296
1297 } 1297 }
1298 1298
1299 } // namespace WebCore 1299 } // 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