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, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights 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 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
767 } | 767 } |
768 curr = curr->parent(); | 768 curr = curr->parent(); |
769 } | 769 } |
770 } | 770 } |
771 } | 771 } |
772 return columnsBlockAncestor; | 772 return columnsBlockAncestor; |
773 } | 773 } |
774 | 774 |
775 void RenderBlock::addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild,
RenderObject* beforeChild) | 775 void RenderBlock::addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild,
RenderObject* beforeChild) |
776 { | 776 { |
777 // Make sure we don't append things after :after-generated content if we hav
e it. | |
778 if (!beforeChild) | |
779 beforeChild = afterPseudoElementRenderer(); | |
780 | |
781 if (beforeChild && beforeChild->parent() != this) { | 777 if (beforeChild && beforeChild->parent() != this) { |
782 RenderObject* beforeChildContainer = beforeChild->parent(); | 778 RenderObject* beforeChildContainer = beforeChild->parent(); |
783 while (beforeChildContainer->parent() != this) | 779 while (beforeChildContainer->parent() != this) |
784 beforeChildContainer = beforeChildContainer->parent(); | 780 beforeChildContainer = beforeChildContainer->parent(); |
785 ASSERT(beforeChildContainer); | 781 ASSERT(beforeChildContainer); |
786 | 782 |
787 if (beforeChildContainer->isAnonymous()) { | 783 if (beforeChildContainer->isAnonymous()) { |
788 // If the requested beforeChild is not one of our children, then thi
s is because | 784 // If the requested beforeChild is not one of our children, then thi
s is because |
789 // there is an anonymous container within this object that contains
the beforeChild. | 785 // there is an anonymous container within this object that contains
the beforeChild. |
790 RenderObject* beforeChildAnonymousContainer = beforeChildContainer; | 786 RenderObject* beforeChildAnonymousContainer = beforeChildContainer; |
(...skipping 6957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7748 { | 7744 { |
7749 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren
deringStructures); | 7745 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren
deringStructures); |
7750 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor
yTypes::RenderingStructures); | 7746 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor
yTypes::RenderingStructures); |
7751 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe
moryTypes::RenderingStructures); | 7747 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe
moryTypes::RenderingStructures); |
7752 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT
ypes::RenderingStructures); | 7748 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT
ypes::RenderingStructures); |
7753 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo
ryTypes::RenderingStructures); | 7749 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo
ryTypes::RenderingStructures); |
7754 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem
oryTypes::RenderingStructures); | 7750 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem
oryTypes::RenderingStructures); |
7755 } | 7751 } |
7756 | 7752 |
7757 } // namespace WebCore | 7753 } // namespace WebCore |
OLD | NEW |