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 2352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2363 // that needs to be drawn and layer visibility optimization can't be used | 2363 // that needs to be drawn and layer visibility optimization can't be used |
2364 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V
ISIBLE && !hasLayer()) { | 2364 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V
ISIBLE && !hasLayer()) { |
2365 if (!layer) | 2365 if (!layer) |
2366 layer = parent()->enclosingLayer(); | 2366 layer = parent()->enclosingLayer(); |
2367 if (layer) | 2367 if (layer) |
2368 layer->dirtyVisibleContentStatus(); | 2368 layer->dirtyVisibleContentStatus(); |
2369 } | 2369 } |
2370 | 2370 |
2371 if (!isFloating() && parent()->childrenInline()) | 2371 if (!isFloating() && parent()->childrenInline()) |
2372 parent()->dirtyLinesFromChangedChild(this); | 2372 parent()->dirtyLinesFromChangedChild(this); |
| 2373 |
| 2374 if (RenderFlowThread* flowThread = parent()->flowThreadContainingBlock()) |
| 2375 flowThread->flowThreadDescendantWasInserted(this); |
2373 } | 2376 } |
2374 | 2377 |
2375 void RenderObject::willBeRemovedFromTree() | 2378 void RenderObject::willBeRemovedFromTree() |
2376 { | 2379 { |
2377 // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removal
s which would need to be fixed first. | 2380 // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removal
s which would need to be fixed first. |
2378 | 2381 |
2379 // If we remove a visible child from an invisible parent, we don't know the
layer visibility any more. | 2382 // If we remove a visible child from an invisible parent, we don't know the
layer visibility any more. |
2380 RenderLayer* layer = 0; | 2383 RenderLayer* layer = 0; |
2381 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V
ISIBLE && !hasLayer()) { | 2384 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V
ISIBLE && !hasLayer()) { |
2382 layer = parent()->enclosingLayer(); | 2385 layer = parent()->enclosingLayer(); |
(...skipping 29 matching lines...) Expand all Loading... |
2412 // Pass in the flow thread so that we don't have to look it up for all the c
hildren. | 2415 // Pass in the flow thread so that we don't have to look it up for all the c
hildren. |
2413 removeFromRenderFlowThreadRecursive(flowThreadContainingBlock()); | 2416 removeFromRenderFlowThreadRecursive(flowThreadContainingBlock()); |
2414 } | 2417 } |
2415 | 2418 |
2416 void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF
lowThread) | 2419 void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF
lowThread) |
2417 { | 2420 { |
2418 if (const RenderObjectChildList* children = virtualChildren()) { | 2421 if (const RenderObjectChildList* children = virtualChildren()) { |
2419 for (RenderObject* child = children->firstChild(); child; child = child-
>nextSibling()) | 2422 for (RenderObject* child = children->firstChild(); child; child = child-
>nextSibling()) |
2420 child->removeFromRenderFlowThreadRecursive(renderFlowThread); | 2423 child->removeFromRenderFlowThreadRecursive(renderFlowThread); |
2421 } | 2424 } |
2422 | |
2423 setFlowThreadState(NotInsideFlowThread); | 2425 setFlowThreadState(NotInsideFlowThread); |
2424 } | 2426 } |
2425 | 2427 |
2426 void RenderObject::destroyAndCleanupAnonymousWrappers() | 2428 void RenderObject::destroyAndCleanupAnonymousWrappers() |
2427 { | 2429 { |
2428 // If the tree is destroyed, there is no need for a clean-up phase. | 2430 // If the tree is destroyed, there is no need for a clean-up phase. |
2429 if (documentBeingDestroyed()) { | 2431 if (documentBeingDestroyed()) { |
2430 destroy(); | 2432 destroy(); |
2431 return; | 2433 return; |
2432 } | 2434 } |
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3134 { | 3136 { |
3135 if (object1) { | 3137 if (object1) { |
3136 const blink::RenderObject* root = object1; | 3138 const blink::RenderObject* root = object1; |
3137 while (root->parent()) | 3139 while (root->parent()) |
3138 root = root->parent(); | 3140 root = root->parent(); |
3139 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3141 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
3140 } | 3142 } |
3141 } | 3143 } |
3142 | 3144 |
3143 #endif | 3145 #endif |
OLD | NEW |