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

Side by Side Diff: Source/WebCore/rendering/RenderTable.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/RenderRuby.cpp ('k') | Source/WebCore/rendering/RenderTableRow.cpp » ('j') | 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, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 return; 106 return;
107 RenderObject* o = before->previousSibling(); 107 RenderObject* o = before->previousSibling();
108 while (o && o != ptr) 108 while (o && o != ptr)
109 o = o->previousSibling(); 109 o = o->previousSibling();
110 if (!o) 110 if (!o)
111 ptr = 0; 111 ptr = 0;
112 } 112 }
113 113
114 void RenderTable::addChild(RenderObject* child, RenderObject* beforeChild) 114 void RenderTable::addChild(RenderObject* child, RenderObject* beforeChild)
115 { 115 {
116 // Make sure we don't append things after :after-generated content if we hav e it.
117 if (!beforeChild)
118 beforeChild = afterPseudoElementRenderer();
119
120 bool wrapInAnonymousSection = !child->isOutOfFlowPositioned(); 116 bool wrapInAnonymousSection = !child->isOutOfFlowPositioned();
121 117
122 if (child->isTableCaption()) 118 if (child->isTableCaption())
123 wrapInAnonymousSection = false; 119 wrapInAnonymousSection = false;
124 else if (child->isRenderTableCol()) { 120 else if (child->isRenderTableCol()) {
125 m_hasColElements = true; 121 m_hasColElements = true;
126 wrapInAnonymousSection = false; 122 wrapInAnonymousSection = false;
127 } else if (child->isTableSection()) { 123 } else if (child->isTableSection()) {
128 switch (child->style()->display()) { 124 switch (child->style()->display()) {
129 case TABLE_HEADER_GROUP: 125 case TABLE_HEADER_GROUP:
(...skipping 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1381 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1386 { 1382 {
1387 ASSERT(cell->isFirstOrLastCellInRow()); 1383 ASSERT(cell->isFirstOrLastCellInRow());
1388 if (hasSameDirectionAs(cell->row())) 1384 if (hasSameDirectionAs(cell->row()))
1389 return style()->borderEnd(); 1385 return style()->borderEnd();
1390 1386
1391 return style()->borderStart(); 1387 return style()->borderStart();
1392 } 1388 }
1393 1389
1394 } 1390 }
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderRuby.cpp ('k') | Source/WebCore/rendering/RenderTableRow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698