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) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. |
7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.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 2628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2639 | 2639 |
2640 if (isOutOfFlowPositioned() && parent()->childrenInline()) | 2640 if (isOutOfFlowPositioned() && parent()->childrenInline()) |
2641 parent()->dirtyLinesFromChangedChild(this); | 2641 parent()->dirtyLinesFromChangedChild(this); |
2642 | 2642 |
2643 removeFromRenderFlowThread(); | 2643 removeFromRenderFlowThread(); |
2644 | 2644 |
2645 if (RenderNamedFlowThread* containerFlowThread = parent()->renderNamedFlowTh
readWrapper()) | 2645 if (RenderNamedFlowThread* containerFlowThread = parent()->renderNamedFlowTh
readWrapper()) |
2646 containerFlowThread->removeFlowChild(this); | 2646 containerFlowThread->removeFlowChild(this); |
2647 | 2647 |
2648 // Update cached boundaries in SVG renderers if a child is removed. | 2648 // Update cached boundaries in SVG renderers if a child is removed. |
2649 parent()->setNeedsBoundariesUpdate(); | 2649 if (parent()->isSVG()) |
| 2650 parent()->setNeedsBoundariesUpdate(); |
2650 } | 2651 } |
2651 | 2652 |
2652 void RenderObject::removeFromRenderFlowThread() | 2653 void RenderObject::removeFromRenderFlowThread() |
2653 { | 2654 { |
2654 if (flowThreadState() == NotInsideFlowThread) | 2655 if (flowThreadState() == NotInsideFlowThread) |
2655 return; | 2656 return; |
2656 | 2657 |
2657 // Sometimes we remove the element from the flow, but it's not destroyed at
that time. | 2658 // Sometimes we remove the element from the flow, but it's not destroyed at
that time. |
2658 // It's only until later when we actually destroy it and remove all the chil
dren from it. | 2659 // It's only until later when we actually destroy it and remove all the chil
dren from it. |
2659 // Currently, that happens for firstLetter elements and list markers. | 2660 // Currently, that happens for firstLetter elements and list markers. |
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3390 { | 3391 { |
3391 if (object1) { | 3392 if (object1) { |
3392 const WebCore::RenderObject* root = object1; | 3393 const WebCore::RenderObject* root = object1; |
3393 while (root->parent()) | 3394 while (root->parent()) |
3394 root = root->parent(); | 3395 root = root->parent(); |
3395 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3396 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
3396 } | 3397 } |
3397 } | 3398 } |
3398 | 3399 |
3399 #endif | 3400 #endif |
OLD | NEW |