| 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 Apple Inc. All rights
reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 734 result = chooseBorder(result, CollapsedBorderValue(parent()->style()->border
Before(), includeColor ? parent()->resolveColor(beforeColorProperty) : Color(),
BROW)); | 734 result = chooseBorder(result, CollapsedBorderValue(parent()->style()->border
Before(), includeColor ? parent()->resolveColor(beforeColorProperty) : Color(),
BROW)); |
| 735 if (!result.exists()) | 735 if (!result.exists()) |
| 736 return result; | 736 return result; |
| 737 | 737 |
| 738 // (4) The previous row's after border. | 738 // (4) The previous row's after border. |
| 739 if (prevCell) { | 739 if (prevCell) { |
| 740 RenderObject* prevRow = 0; | 740 RenderObject* prevRow = 0; |
| 741 if (prevCell->section() == section()) | 741 if (prevCell->section() == section()) |
| 742 prevRow = parent()->previousSibling(); | 742 prevRow = parent()->previousSibling(); |
| 743 else | 743 else |
| 744 prevRow = prevCell->section()->lastChild(); | 744 prevRow = prevCell->section()->lastRow(); |
| 745 | 745 |
| 746 if (prevRow) { | 746 if (prevRow) { |
| 747 result = chooseBorder(CollapsedBorderValue(prevRow->style()->borderA
fter(), includeColor ? prevRow->resolveColor(afterColorProperty) : Color(), BROW
), result); | 747 result = chooseBorder(CollapsedBorderValue(prevRow->style()->borderA
fter(), includeColor ? prevRow->resolveColor(afterColorProperty) : Color(), BROW
), result); |
| 748 if (!result.exists()) | 748 if (!result.exists()) |
| 749 return result; | 749 return result; |
| 750 } | 750 } |
| 751 } | 751 } |
| 752 | 752 |
| 753 // Now check row groups. | 753 // Now check row groups. |
| 754 RenderTableSection* currSection = section(); | 754 RenderTableSection* currSection = section(); |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1273 | 1273 |
| 1274 RenderTableCell* RenderTableCell::createAnonymousWithParentRenderer(const Render
Object* parent) | 1274 RenderTableCell* RenderTableCell::createAnonymousWithParentRenderer(const Render
Object* parent) |
| 1275 { | 1275 { |
| 1276 RenderTableCell* newCell = RenderTableCell::createAnonymous(&parent->documen
t()); | 1276 RenderTableCell* newCell = RenderTableCell::createAnonymous(&parent->documen
t()); |
| 1277 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(
parent->style(), TABLE_CELL); | 1277 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(
parent->style(), TABLE_CELL); |
| 1278 newCell->setStyle(newStyle.release()); | 1278 newCell->setStyle(newStyle.release()); |
| 1279 return newCell; | 1279 return newCell; |
| 1280 } | 1280 } |
| 1281 | 1281 |
| 1282 } // namespace WebCore | 1282 } // namespace WebCore |
| OLD | NEW |