| OLD | NEW |
| 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 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 | 81 |
| 82 const BorderValue& RenderTableRow::borderAdjoiningEndCell(const RenderTableCell*
cell) const | 82 const BorderValue& RenderTableRow::borderAdjoiningEndCell(const RenderTableCell*
cell) const |
| 83 { | 83 { |
| 84 ASSERT_UNUSED(cell, cell->isFirstOrLastCellInRow()); | 84 ASSERT_UNUSED(cell, cell->isFirstOrLastCellInRow()); |
| 85 // FIXME: https://webkit.org/b/79272 - Add support for mixed directionality
at the cell level. | 85 // FIXME: https://webkit.org/b/79272 - Add support for mixed directionality
at the cell level. |
| 86 return style()->borderEnd(); | 86 return style()->borderEnd(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild) | 89 void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild) |
| 90 { | 90 { |
| 91 // Make sure we don't append things after :after-generated content if we hav
e it. | |
| 92 if (!beforeChild) | |
| 93 beforeChild = afterPseudoElementRenderer(); | |
| 94 | |
| 95 if (!child->isTableCell()) { | 91 if (!child->isTableCell()) { |
| 96 RenderObject* last = beforeChild; | 92 RenderObject* last = beforeChild; |
| 97 if (!last) | 93 if (!last) |
| 98 last = lastChild(); | 94 last = lastChild(); |
| 99 if (last && last->isAnonymous() && last->isTableCell() && !last->isBefor
eOrAfterContent()) { | 95 if (last && last->isAnonymous() && last->isTableCell() && !last->isBefor
eOrAfterContent()) { |
| 100 if (beforeChild == last) | 96 if (beforeChild == last) |
| 101 beforeChild = last->firstChild(); | 97 beforeChild = last->firstChild(); |
| 102 last->addChild(child, beforeChild); | 98 last->addChild(child, beforeChild); |
| 103 return; | 99 return; |
| 104 } | 100 } |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 } | 255 } |
| 260 | 256 |
| 261 void RenderTableRow::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | 257 void RenderTableRow::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
| 262 { | 258 { |
| 263 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering)
; | 259 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering)
; |
| 264 RenderBox::reportMemoryUsage(memoryObjectInfo); | 260 RenderBox::reportMemoryUsage(memoryObjectInfo); |
| 265 info.addMember(m_children); | 261 info.addMember(m_children); |
| 266 } | 262 } |
| 267 | 263 |
| 268 } // namespace WebCore | 264 } // namespace WebCore |
| OLD | NEW |