| 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. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. |
| 8 * All rights reserved. | 8 * All rights reserved. |
| 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 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1308 | 1308 |
| 1309 static void addBorderStyle(LayoutTable::CollapsedBorderValues& borderValues, | 1309 static void addBorderStyle(LayoutTable::CollapsedBorderValues& borderValues, |
| 1310 CollapsedBorderValue borderValue) { | 1310 CollapsedBorderValue borderValue) { |
| 1311 if (!borderValue.isVisible()) | 1311 if (!borderValue.isVisible()) |
| 1312 return; | 1312 return; |
| 1313 size_t count = borderValues.size(); | 1313 size_t count = borderValues.size(); |
| 1314 for (size_t i = 0; i < count; ++i) { | 1314 for (size_t i = 0; i < count; ++i) { |
| 1315 if (borderValues[i].isSameIgnoringColor(borderValue)) | 1315 if (borderValues[i].isSameIgnoringColor(borderValue)) |
| 1316 return; | 1316 return; |
| 1317 } | 1317 } |
| 1318 borderValues.append(borderValue); | 1318 borderValues.push_back(borderValue); |
| 1319 } | 1319 } |
| 1320 | 1320 |
| 1321 void LayoutTableCell::collectBorderValues( | 1321 void LayoutTableCell::collectBorderValues( |
| 1322 LayoutTable::CollapsedBorderValues& borderValues) { | 1322 LayoutTable::CollapsedBorderValues& borderValues) { |
| 1323 CollapsedBorderValues newValues( | 1323 CollapsedBorderValues newValues( |
| 1324 *this, computeCollapsedStartBorder(), computeCollapsedEndBorder(), | 1324 *this, computeCollapsedStartBorder(), computeCollapsedEndBorder(), |
| 1325 computeCollapsedBeforeBorder(), computeCollapsedAfterBorder()); | 1325 computeCollapsedBeforeBorder(), computeCollapsedAfterBorder()); |
| 1326 | 1326 |
| 1327 bool changed = false; | 1327 bool changed = false; |
| 1328 if (!newValues.startBorder().isVisible() && | 1328 if (!newValues.startBorder().isVisible() && |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1492 } | 1492 } |
| 1493 | 1493 |
| 1494 bool LayoutTableCell::hasLineIfEmpty() const { | 1494 bool LayoutTableCell::hasLineIfEmpty() const { |
| 1495 if (node() && hasEditableStyle(*node())) | 1495 if (node() && hasEditableStyle(*node())) |
| 1496 return true; | 1496 return true; |
| 1497 | 1497 |
| 1498 return LayoutBlock::hasLineIfEmpty(); | 1498 return LayoutBlock::hasLineIfEmpty(); |
| 1499 } | 1499 } |
| 1500 | 1500 |
| 1501 } // namespace blink | 1501 } // namespace blink |
| OLD | NEW |