OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1203 // The removal has knocked us down to containing only a single anonymous | 1203 // The removal has knocked us down to containing only a single anonymous |
1204 // box. We can go ahead and pull the content right back up into our | 1204 // box. We can go ahead and pull the content right back up into our |
1205 // box. | 1205 // box. |
1206 collapseAnonymousBoxChild(this, child); | 1206 collapseAnonymousBoxChild(this, child); |
1207 } else if (((prev && prev->isAnonymousBlock()) || (next && next->isAnonymous
Block())) && !isFlexibleBoxIncludingDeprecated()) { | 1207 } else if (((prev && prev->isAnonymousBlock()) || (next && next->isAnonymous
Block())) && !isFlexibleBoxIncludingDeprecated()) { |
1208 // It's possible that the removal has knocked us down to a single anonym
ous | 1208 // It's possible that the removal has knocked us down to a single anonym
ous |
1209 // block with pseudo-style element siblings (e.g. first-letter). If thes
e | 1209 // block with pseudo-style element siblings (e.g. first-letter). If thes
e |
1210 // are floating, then we need to pull the content up also. | 1210 // are floating, then we need to pull the content up also. |
1211 RenderBlock* anonBlock = toRenderBlock((prev && prev->isAnonymousBlock()
) ? prev : next); | 1211 RenderBlock* anonBlock = toRenderBlock((prev && prev->isAnonymousBlock()
) ? prev : next); |
1212 if ((anonBlock->previousSibling() || anonBlock->nextSibling()) | 1212 if ((anonBlock->previousSibling() || anonBlock->nextSibling()) |
1213 && (!anonBlock->previousSibling() || (anonBlock->previousSibling()->
style()->styleType() != NOPSEUDO && anonBlock->previousSibling()->isFloating())) | 1213 && (!anonBlock->previousSibling() || (anonBlock->previousSibling()->
style()->styleType() != NOPSEUDO && anonBlock->previousSibling()->isFloating() &
& !anonBlock->previousSibling()->previousSibling())) |
1214 && (!anonBlock->nextSibling() || (anonBlock->nextSibling()->style()-
>styleType() != NOPSEUDO && anonBlock->nextSibling()->isFloating()))) { | 1214 && (!anonBlock->nextSibling() || (anonBlock->nextSibling()->style()-
>styleType() != NOPSEUDO && anonBlock->nextSibling()->isFloating() && !anonBlock
->nextSibling()->nextSibling()))) { |
1215 collapseAnonymousBoxChild(this, anonBlock); | 1215 collapseAnonymousBoxChild(this, anonBlock); |
1216 } | 1216 } |
1217 } | 1217 } |
1218 | 1218 |
1219 if (!firstChild() && !documentBeingDestroyed()) { | 1219 if (!firstChild() && !documentBeingDestroyed()) { |
1220 // If this was our last child be sure to clear out our line boxes. | 1220 // If this was our last child be sure to clear out our line boxes. |
1221 if (childrenInline()) | 1221 if (childrenInline()) |
1222 deleteLineBoxTree(); | 1222 deleteLineBoxTree(); |
1223 } | 1223 } |
1224 } | 1224 } |
(...skipping 5953 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7178 } | 7178 } |
7179 | 7179 |
7180 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) | 7180 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) |
7181 { | 7181 { |
7182 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); | 7182 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); |
7183 } | 7183 } |
7184 | 7184 |
7185 #endif | 7185 #endif |
7186 | 7186 |
7187 } // namespace WebCore | 7187 } // namespace WebCore |
OLD | NEW |