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 2714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2725 // that needs to be drawn and layer visibility optimization can't be used | 2725 // that needs to be drawn and layer visibility optimization can't be used |
2726 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V
ISIBLE && !hasLayer()) { | 2726 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V
ISIBLE && !hasLayer()) { |
2727 if (!layer) | 2727 if (!layer) |
2728 layer = parent()->enclosingLayer(); | 2728 layer = parent()->enclosingLayer(); |
2729 if (layer) | 2729 if (layer) |
2730 layer->setHasVisibleContent(); | 2730 layer->setHasVisibleContent(); |
2731 } | 2731 } |
2732 | 2732 |
2733 if (!isFloating() && parent()->childrenInline()) | 2733 if (!isFloating() && parent()->childrenInline()) |
2734 parent()->dirtyLinesFromChangedChild(this); | 2734 parent()->dirtyLinesFromChangedChild(this); |
| 2735 |
| 2736 if (RenderFlowThread* flowThread = parent()->flowThreadContainingBlock()) |
| 2737 flowThread->flowThreadDescendantInserted(this); |
2735 } | 2738 } |
2736 | 2739 |
2737 void RenderObject::willBeRemovedFromTree() | 2740 void RenderObject::willBeRemovedFromTree() |
2738 { | 2741 { |
2739 // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removal
s which would need to be fixed first. | 2742 // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removal
s which would need to be fixed first. |
2740 | 2743 |
2741 // If we remove a visible child from an invisible parent, we don't know the
layer visibility any more. | 2744 // If we remove a visible child from an invisible parent, we don't know the
layer visibility any more. |
2742 RenderLayer* layer = 0; | 2745 RenderLayer* layer = 0; |
2743 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V
ISIBLE && !hasLayer()) { | 2746 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V
ISIBLE && !hasLayer()) { |
2744 layer = parent()->enclosingLayer(); | 2747 layer = parent()->enclosingLayer(); |
(...skipping 30 matching lines...) Expand all Loading... |
2775 removeFromRenderFlowThreadRecursive(flowThreadContainingBlock()); | 2778 removeFromRenderFlowThreadRecursive(flowThreadContainingBlock()); |
2776 } | 2779 } |
2777 | 2780 |
2778 void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF
lowThread) | 2781 void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF
lowThread) |
2779 { | 2782 { |
2780 if (const RenderObjectChildList* children = virtualChildren()) { | 2783 if (const RenderObjectChildList* children = virtualChildren()) { |
2781 for (RenderObject* child = children->firstChild(); child; child = child-
>nextSibling()) | 2784 for (RenderObject* child = children->firstChild(); child; child = child-
>nextSibling()) |
2782 child->removeFromRenderFlowThreadRecursive(renderFlowThread); | 2785 child->removeFromRenderFlowThreadRecursive(renderFlowThread); |
2783 } | 2786 } |
2784 | 2787 |
| 2788 if (renderFlowThread) |
| 2789 renderFlowThread->flowThreadRelativeWillBeRemoved(this); |
2785 setFlowThreadState(NotInsideFlowThread); | 2790 setFlowThreadState(NotInsideFlowThread); |
2786 } | 2791 } |
2787 | 2792 |
2788 void RenderObject::destroyAndCleanupAnonymousWrappers() | 2793 void RenderObject::destroyAndCleanupAnonymousWrappers() |
2789 { | 2794 { |
2790 // If the tree is destroyed, there is no need for a clean-up phase. | 2795 // If the tree is destroyed, there is no need for a clean-up phase. |
2791 if (documentBeingDestroyed()) { | 2796 if (documentBeingDestroyed()) { |
2792 destroy(); | 2797 destroy(); |
2793 return; | 2798 return; |
2794 } | 2799 } |
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3459 { | 3464 { |
3460 if (object1) { | 3465 if (object1) { |
3461 const WebCore::RenderObject* root = object1; | 3466 const WebCore::RenderObject* root = object1; |
3462 while (root->parent()) | 3467 while (root->parent()) |
3463 root = root->parent(); | 3468 root = root->parent(); |
3464 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3469 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
3465 } | 3470 } |
3466 } | 3471 } |
3467 | 3472 |
3468 #endif | 3473 #endif |
OLD | NEW |