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 Apple Inc. All r
ights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r
ights 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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 while (InlineBox* childBox = box->firstChild()) | 188 while (InlineBox* childBox = box->firstChild()) |
189 childBox->remove(); | 189 childBox->remove(); |
190 } | 190 } |
191 } | 191 } |
192 } else if (parent()) | 192 } else if (parent()) |
193 parent()->dirtyLinesFromChangedChild(this); | 193 parent()->dirtyLinesFromChangedChild(this); |
194 } | 194 } |
195 | 195 |
196 m_lineBoxes.deleteLineBoxes(renderArena()); | 196 m_lineBoxes.deleteLineBoxes(renderArena()); |
197 | 197 |
| 198 if (UNLIKELY(gDelayedUpdateScrollInfoSet != 0)) |
| 199 gDelayedUpdateScrollInfoSet->remove(this); |
| 200 |
198 RenderBox::willBeDestroyed(); | 201 RenderBox::willBeDestroyed(); |
199 } | 202 } |
200 | 203 |
201 void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle* newSt
yle) | 204 void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle* newSt
yle) |
202 { | 205 { |
203 s_canPropagateFloatIntoSibling = style() ? !isFloatingOrPositioned() && !avo
idsFloats() : false; | 206 s_canPropagateFloatIntoSibling = style() ? !isFloatingOrPositioned() && !avo
idsFloats() : false; |
204 | 207 |
205 setReplaced(newStyle->isDisplayInlineType()); | 208 setReplaced(newStyle->isDisplayInlineType()); |
206 | 209 |
207 if (style() && parent() && diff == StyleDifferenceLayout && style()->positio
n() != newStyle->position()) { | 210 if (style() && parent() && diff == StyleDifferenceLayout && style()->positio
n() != newStyle->position()) { |
(...skipping 6393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6601 } | 6604 } |
6602 | 6605 |
6603 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) | 6606 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) |
6604 { | 6607 { |
6605 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); | 6608 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); |
6606 } | 6609 } |
6607 | 6610 |
6608 #endif | 6611 #endif |
6609 | 6612 |
6610 } // namespace WebCore | 6613 } // namespace WebCore |
OLD | NEW |