| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 
| 3  * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 3  * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 
| 4  * | 4  * | 
| 5  * Redistribution and use in source and binary forms, with or without | 5  * Redistribution and use in source and binary forms, with or without | 
| 6  * modification, are permitted provided that the following conditions | 6  * modification, are permitted provided that the following conditions | 
| 7  * are met: | 7  * are met: | 
| 8  * 1. Redistributions of source code must retain the above copyright | 8  * 1. Redistributions of source code must retain the above copyright | 
| 9  *    notice, this list of conditions and the following disclaimer. | 9  *    notice, this list of conditions and the following disclaimer. | 
| 10  * 2. Redistributions in binary form must reproduce the above copyright | 10  * 2. Redistributions in binary form must reproduce the above copyright | 
| 11  *    notice, this list of conditions and the following disclaimer in the | 11  *    notice, this list of conditions and the following disclaimer in the | 
| 12  *    documentation and/or other materials provided with the distribution. | 12  *    documentation and/or other materials provided with the distribution. | 
| 13  * | 13  * | 
| 14  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 
| 15  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
| 16  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 
| 17  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 
| 18  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 
| 19  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 
| 20  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 
| 21  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 
| 22  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 23  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 24  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 25  */ | 25  */ | 
| 26 | 26 | 
| 27 #include "config.h" | 27 #include "config.h" | 
| 28 #include "RenderObjectChildList.h" | 28 #include "RenderObjectChildList.h" | 
| 29 | 29 | 
| 30 #include "AXObjectCache.h" |  | 
| 31 #include "RenderCounter.h" | 30 #include "RenderCounter.h" | 
| 32 #include "RenderObject.h" | 31 #include "RenderObject.h" | 
| 33 #include "RenderStyle.h" | 32 #include "RenderStyle.h" | 
| 34 #include "RenderView.h" | 33 #include "RenderView.h" | 
|  | 34 #include "core/accessibility/AXObjectCache.h" | 
| 35 | 35 | 
| 36 namespace WebCore { | 36 namespace WebCore { | 
| 37 | 37 | 
| 38 void RenderObjectChildList::destroyLeftoverChildren() | 38 void RenderObjectChildList::destroyLeftoverChildren() | 
| 39 { | 39 { | 
| 40     while (firstChild()) { | 40     while (firstChild()) { | 
| 41         if (firstChild()->isListMarker() || (firstChild()->style()->styleType() 
     == FIRST_LETTER && !firstChild()->isText())) | 41         if (firstChild()->isListMarker() || (firstChild()->style()->styleType() 
     == FIRST_LETTER && !firstChild()->isText())) | 
| 42             firstChild()->remove();  // List markers are owned by their enclosin
     g list and so don't get destroyed by this container. Similarly, first letters ar
     e destroyed by their remaining text fragment. | 42             firstChild()->remove();  // List markers are owned by their enclosin
     g list and so don't get destroyed by this container. Similarly, first letters ar
     e destroyed by their remaining text fragment. | 
| 43         else if (firstChild()->isRunIn() && firstChild()->node()) { | 43         else if (firstChild()->isRunIn() && firstChild()->node()) { | 
| 44             firstChild()->node()->setRenderer(0); | 44             firstChild()->node()->setRenderer(0); | 
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 159 | 159 | 
| 160     newChild->setNeedsLayoutAndPrefWidthsRecalc(); | 160     newChild->setNeedsLayoutAndPrefWidthsRecalc(); | 
| 161     if (!owner->normalChildNeedsLayout()) | 161     if (!owner->normalChildNeedsLayout()) | 
| 162         owner->setChildNeedsLayout(true); // We may supply the static position f
     or an absolute positioned child. | 162         owner->setChildNeedsLayout(true); // We may supply the static position f
     or an absolute positioned child. | 
| 163 | 163 | 
| 164     if (AXObjectCache* cache = owner->document()->axObjectCache()) | 164     if (AXObjectCache* cache = owner->document()->axObjectCache()) | 
| 165         cache->childrenChanged(owner); | 165         cache->childrenChanged(owner); | 
| 166 } | 166 } | 
| 167 | 167 | 
| 168 } // namespace WebCore | 168 } // namespace WebCore | 
| OLD | NEW | 
|---|