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 * 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 | 170 |
171 if (!beforeChild && lastChild() && lastChild()->isTableSection() && lastChil
d()->isAnonymous()) { | 171 if (!beforeChild && lastChild() && lastChild()->isTableSection() && lastChil
d()->isAnonymous()) { |
172 lastChild()->addChild(child); | 172 lastChild()->addChild(child); |
173 return; | 173 return; |
174 } | 174 } |
175 | 175 |
176 RenderObject* lastBox = beforeChild; | 176 RenderObject* lastBox = beforeChild; |
177 while (lastBox && lastBox->parent()->isAnonymous() && !lastBox->isTableSecti
on() && lastBox->style()->display() != TABLE_CAPTION && lastBox->style()->displa
y() != TABLE_COLUMN_GROUP) | 177 while (lastBox && lastBox->parent()->isAnonymous() && !lastBox->isTableSecti
on() && lastBox->style()->display() != TABLE_CAPTION && lastBox->style()->displa
y() != TABLE_COLUMN_GROUP) |
178 lastBox = lastBox->parent(); | 178 lastBox = lastBox->parent(); |
179 if (lastBox && lastBox->isAnonymous() && !isAfterContent(lastBox)) { | 179 if (lastBox && lastBox->isAnonymous() && !isAfterContent(lastBox)) { |
| 180 if (beforeChild == lastBox) |
| 181 beforeChild = lastBox->firstChild(); |
180 lastBox->addChild(child, beforeChild); | 182 lastBox->addChild(child, beforeChild); |
181 return; | 183 return; |
182 } | 184 } |
183 | 185 |
184 if (beforeChild && !beforeChild->isTableSection() && beforeChild->style()->d
isplay() != TABLE_CAPTION && beforeChild->style()->display() != TABLE_COLUMN_GRO
UP) | 186 if (beforeChild && !beforeChild->isTableSection() && beforeChild->style()->d
isplay() != TABLE_CAPTION && beforeChild->style()->display() != TABLE_COLUMN_GRO
UP) |
185 beforeChild = 0; | 187 beforeChild = 0; |
186 RenderTableSection* section = new (renderArena()) RenderTableSection(documen
t() /* anonymous */); | 188 RenderTableSection* section = new (renderArena()) RenderTableSection(documen
t() /* anonymous */); |
187 RefPtr<RenderStyle> newStyle = RenderStyle::create(); | 189 RefPtr<RenderStyle> newStyle = RenderStyle::create(); |
188 newStyle->inheritFrom(style()); | 190 newStyle->inheritFrom(style()); |
189 newStyle->setDisplay(TABLE_ROW_GROUP); | 191 newStyle->setDisplay(TABLE_ROW_GROUP); |
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1167 if (visibleToHitTesting() && (action == HitTestBlockBackground || action ==
HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(xPos,
yPos))) { | 1169 if (visibleToHitTesting() && (action == HitTestBlockBackground || action ==
HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(xPos,
yPos))) { |
1168 updateHitTestResult(result, flipForWritingMode(IntPoint(xPos - tx, yPos
- ty))); | 1170 updateHitTestResult(result, flipForWritingMode(IntPoint(xPos - tx, yPos
- ty))); |
1169 if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect)
) | 1171 if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect)
) |
1170 return true; | 1172 return true; |
1171 } | 1173 } |
1172 | 1174 |
1173 return false; | 1175 return false; |
1174 } | 1176 } |
1175 | 1177 |
1176 } | 1178 } |
OLD | NEW |