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, 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 { | 89 { |
90 // Make sure we don't append things after :after-generated content if we hav
e it. | 90 // Make sure we don't append things after :after-generated content if we hav
e it. |
91 if (!beforeChild && isAfterContent(lastChild())) | 91 if (!beforeChild && isAfterContent(lastChild())) |
92 beforeChild = lastChild(); | 92 beforeChild = lastChild(); |
93 | 93 |
94 if (!child->isTableRow()) { | 94 if (!child->isTableRow()) { |
95 RenderObject* last = beforeChild; | 95 RenderObject* last = beforeChild; |
96 if (!last) | 96 if (!last) |
97 last = lastChild(); | 97 last = lastChild(); |
98 if (last && last->isAnonymous()) { | 98 if (last && last->isAnonymous()) { |
99 last->addChild(child); | 99 if (beforeChild == last) |
| 100 beforeChild = last->firstChild(); |
| 101 last->addChild(child, beforeChild); |
100 return; | 102 return; |
101 } | 103 } |
102 | 104 |
103 // If beforeChild is inside an anonymous cell/row, insert into the cell
or into | 105 // If beforeChild is inside an anonymous cell/row, insert into the cell
or into |
104 // the anonymous row containing it, if there is one. | 106 // the anonymous row containing it, if there is one. |
105 RenderObject* lastBox = last; | 107 RenderObject* lastBox = last; |
106 while (lastBox && lastBox->parent()->isAnonymous() && !lastBox->isTableR
ow()) | 108 while (lastBox && lastBox->parent()->isAnonymous() && !lastBox->isTableR
ow()) |
107 lastBox = lastBox->parent(); | 109 lastBox = lastBox->parent(); |
108 if (lastBox && lastBox->isAnonymous()) { | 110 if (lastBox && lastBox->isAnonymous()) { |
109 lastBox->addChild(child, beforeChild); | 111 lastBox->addChild(child, beforeChild); |
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1267 if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, xPos,
yPos, cellPoint.x(), cellPoint.y(), action)) { | 1269 if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, xPos,
yPos, cellPoint.x(), cellPoint.y(), action)) { |
1268 updateHitTestResult(result, IntPoint(xPos - cellPoint.x(), yPos - ce
llPoint.y())); | 1270 updateHitTestResult(result, IntPoint(xPos - cellPoint.x(), yPos - ce
llPoint.y())); |
1269 return true; | 1271 return true; |
1270 } | 1272 } |
1271 } | 1273 } |
1272 return false; | 1274 return false; |
1273 | 1275 |
1274 } | 1276 } |
1275 | 1277 |
1276 } // namespace WebCore | 1278 } // namespace WebCore |
OLD | NEW |