Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: Source/core/layout/LayoutObjectChildList.cpp

Issue 778003003: List marker pseudo elements. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
(...skipping 10 matching lines...) Expand all
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 "core/layout/LayoutObjectChildList.h" 28 #include "core/layout/LayoutObjectChildList.h"
29 29
30 #include "core/dom/AXObjectCache.h" 30 #include "core/dom/AXObjectCache.h"
31 #include "core/dom/MarkerPseudoElement.h"
31 #include "core/layout/LayoutCounter.h" 32 #include "core/layout/LayoutCounter.h"
32 #include "core/layout/LayoutObject.h" 33 #include "core/layout/LayoutObject.h"
33 #include "core/layout/LayoutView.h" 34 #include "core/layout/LayoutView.h"
34 #include "core/style/ComputedStyle.h" 35 #include "core/style/ComputedStyle.h"
35 #include "core/paint/DeprecatedPaintLayer.h" 36 #include "core/paint/DeprecatedPaintLayer.h"
36 37
37 namespace blink { 38 namespace blink {
38 39
39 void LayoutObjectChildList::destroyLeftoverChildren() 40 void LayoutObjectChildList::destroyLeftoverChildren()
40 { 41 {
41 while (firstChild()) { 42 while (firstChild()) {
42 // List markers are owned by their enclosing list and so don't get destr oyed by this container. 43 if (!RuntimeEnabledFeatures::listMarkerPseudoElementEnabled()) {
43 if (firstChild()->isListMarker()) { 44 // List markers are owned by their enclosing list and so don't get d estroyed by this container.
44 firstChild()->remove(); 45 if (firstChild()->isListMarker()) {
45 continue; 46 firstChild()->remove();
47 continue;
48 }
46 } 49 }
47 50
48 // Destroy any anonymous children remaining in the render tree, as well as implicit (shadow) DOM elements like those used in the engine-based text field s. 51 // Destroy any anonymous children remaining in the render tree, as well as implicit (shadow) DOM elements like those used in the engine-based text field s.
49 if (firstChild()->node()) 52 if (firstChild()->node())
50 firstChild()->node()->setLayoutObject(nullptr); 53 firstChild()->node()->setLayoutObject(nullptr);
51 firstChild()->destroy(); 54 firstChild()->destroy();
52 } 55 }
53 } 56 }
54 57
55 LayoutObject* LayoutObjectChildList::removeChildNode(LayoutObject* owner, Layout Object* oldChild, bool notifyRenderer) 58 LayoutObject* LayoutObjectChildList::removeChildNode(LayoutObject* owner, Layout Object* oldChild, bool notifyRenderer)
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 DisableCompositingQueryAsserts disabler; 180 DisableCompositingQueryAsserts disabler;
178 // FIXME: We should not allow paint invalidation out of paint invalidation s tate. crbug.com/457415 181 // FIXME: We should not allow paint invalidation out of paint invalidation s tate. crbug.com/457415
179 DisablePaintInvalidationStateAsserts paintInvalidationAssertDisabler; 182 DisablePaintInvalidationStateAsserts paintInvalidationAssertDisabler;
180 const LayoutBoxModelObject* paintInvalidationContainer = oldChild.containerF orPaintInvalidation(); 183 const LayoutBoxModelObject* paintInvalidationContainer = oldChild.containerF orPaintInvalidation();
181 oldChild.invalidatePaintUsingContainer(paintInvalidationContainer, oldChild. previousPaintInvalidationRect(), PaintInvalidationRendererRemoval); 184 oldChild.invalidatePaintUsingContainer(paintInvalidationContainer, oldChild. previousPaintInvalidationRect(), PaintInvalidationRendererRemoval);
182 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) 185 if (RuntimeEnabledFeatures::slimmingPaintEnabled())
183 oldChild.invalidateDisplayItemClients(*paintInvalidationContainer); 186 oldChild.invalidateDisplayItemClients(*paintInvalidationContainer);
184 } 187 }
185 188
186 } // namespace blink 189 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698