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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 default: | 155 default: |
156 ASSERT_NOT_REACHED(); | 156 ASSERT_NOT_REACHED(); |
157 } | 157 } |
158 } else if (child->isTableCell() || child->isTableRow()) | 158 } else if (child->isTableCell() || child->isTableRow()) |
159 wrapInAnonymousSection = true; | 159 wrapInAnonymousSection = true; |
160 else | 160 else |
161 wrapInAnonymousSection = true; | 161 wrapInAnonymousSection = true; |
162 | 162 |
163 if (!wrapInAnonymousSection) { | 163 if (!wrapInAnonymousSection) { |
164 // If the next renderer is actually wrapped in an anonymous table sectio
n, we need to go up and find that. | 164 // If the next renderer is actually wrapped in an anonymous table sectio
n, we need to go up and find that. |
165 while (beforeChild && !beforeChild->isTableSection() && !beforeChild->is
TableCol() && beforeChild->style()->display() != TABLE_CAPTION) | 165 while (beforeChild && beforeChild->parent() != this) |
166 beforeChild = beforeChild->parent(); | 166 beforeChild = beforeChild->parent(); |
167 | 167 |
168 RenderBox::addChild(child, beforeChild); | 168 RenderBox::addChild(child, beforeChild); |
169 return; | 169 return; |
170 } | 170 } |
171 | 171 |
172 if (!beforeChild && lastChild() && lastChild()->isTableSection() && lastChil
d()->isAnonymous()) { | 172 if (!beforeChild && lastChild() && lastChild()->isTableSection() && lastChil
d()->isAnonymous()) { |
173 lastChild()->addChild(child); | 173 lastChild()->addChild(child); |
174 return; | 174 return; |
175 } | 175 } |
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1184 if (visibleToHitTesting() && (action == HitTestBlockBackground || action ==
HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(xPos,
yPos))) { | 1184 if (visibleToHitTesting() && (action == HitTestBlockBackground || action ==
HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(xPos,
yPos))) { |
1185 updateHitTestResult(result, flipForWritingMode(IntPoint(xPos - tx, yPos
- ty))); | 1185 updateHitTestResult(result, flipForWritingMode(IntPoint(xPos - tx, yPos
- ty))); |
1186 if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect)
) | 1186 if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect)
) |
1187 return true; | 1187 return true; |
1188 } | 1188 } |
1189 | 1189 |
1190 return false; | 1190 return false; |
1191 } | 1191 } |
1192 | 1192 |
1193 } | 1193 } |
OLD | NEW |