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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 while (InlineBox* childBox = box->firstChild()) | 190 while (InlineBox* childBox = box->firstChild()) |
191 childBox->remove(); | 191 childBox->remove(); |
192 } | 192 } |
193 } | 193 } |
194 } else if (parent()) | 194 } else if (parent()) |
195 parent()->dirtyLinesFromChangedChild(this); | 195 parent()->dirtyLinesFromChangedChild(this); |
196 } | 196 } |
197 | 197 |
198 m_lineBoxes.deleteLineBoxes(renderArena()); | 198 m_lineBoxes.deleteLineBoxes(renderArena()); |
199 | 199 |
| 200 if (UNLIKELY(gDelayedUpdateScrollInfoSet != 0)) |
| 201 gDelayedUpdateScrollInfoSet->remove(this); |
| 202 |
200 RenderBox::willBeDestroyed(); | 203 RenderBox::willBeDestroyed(); |
201 } | 204 } |
202 | 205 |
203 void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle* newSt
yle) | 206 void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle* newSt
yle) |
204 { | 207 { |
205 s_canPropagateFloatIntoSibling = style() ? !isFloatingOrPositioned() && !avo
idsFloats() : false; | 208 s_canPropagateFloatIntoSibling = style() ? !isFloatingOrPositioned() && !avo
idsFloats() : false; |
206 | 209 |
207 setReplaced(newStyle->isDisplayInlineType()); | 210 setReplaced(newStyle->isDisplayInlineType()); |
208 | 211 |
209 if (style() && parent() && diff == StyleDifferenceLayout && style()->positio
n() != newStyle->position()) { | 212 if (style() && parent() && diff == StyleDifferenceLayout && style()->positio
n() != newStyle->position()) { |
(...skipping 6680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6890 } | 6893 } |
6891 | 6894 |
6892 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) | 6895 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) |
6893 { | 6896 { |
6894 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); | 6897 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); |
6895 } | 6898 } |
6896 | 6899 |
6897 #endif | 6900 #endif |
6898 | 6901 |
6899 } // namespace WebCore | 6902 } // namespace WebCore |
OLD | NEW |