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

Side by Side Diff: Source/core/rendering/RenderObjectChildList.cpp

Issue 639863006: Revert of Convert first letter into a pseudo element. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderTableCell.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 27 matching lines...) Expand all
38 38
39 void RenderObjectChildList::trace(Visitor* visitor) 39 void RenderObjectChildList::trace(Visitor* visitor)
40 { 40 {
41 visitor->trace(m_firstChild); 41 visitor->trace(m_firstChild);
42 visitor->trace(m_lastChild); 42 visitor->trace(m_lastChild);
43 } 43 }
44 44
45 void RenderObjectChildList::destroyLeftoverChildren() 45 void RenderObjectChildList::destroyLeftoverChildren()
46 { 46 {
47 while (firstChild()) { 47 while (firstChild()) {
48 // List markers are owned by their enclosing list and so don't get destr oyed by this container. 48 if (firstChild()->isListMarker() || (firstChild()->style()->styleType() == FIRST_LETTER && !firstChild()->isText())) {
49 if (firstChild()->isListMarker()) { 49 firstChild()->remove(); // List markers are owned by their enclosing list and so don't get destroyed by this container. Similarly, first letters are destroyed by their remaining text fragment.
50 firstChild()->remove(); 50 } else {
51 continue; 51 // Destroy any anonymous children remaining in the render tree, as w ell as implicit (shadow) DOM elements like those used in the engine-based text f ields.
52 if (firstChild()->node())
53 firstChild()->node()->setRenderer(0);
54 firstChild()->destroy();
52 } 55 }
53
54 // 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.
55 if (firstChild()->node())
56 firstChild()->node()->setRenderer(0);
57 firstChild()->destroy();
58 } 56 }
59 } 57 }
60 58
61 RenderObject* RenderObjectChildList::removeChildNode(RenderObject* owner, Render Object* oldChild, bool notifyRenderer) 59 RenderObject* RenderObjectChildList::removeChildNode(RenderObject* owner, Render Object* oldChild, bool notifyRenderer)
62 { 60 {
63 ASSERT(oldChild->parent() == owner); 61 ASSERT(oldChild->parent() == owner);
64 62
65 if (oldChild->isFloatingOrOutOfFlowPositioned()) 63 if (oldChild->isFloatingOrOutOfFlowPositioned())
66 toRenderBox(oldChild)->removeFloatingOrPositionedChildFromBlockLists(); 64 toRenderBox(oldChild)->removeFloatingOrPositionedChildFromBlockLists();
67 65
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 180 }
183 if (oldChild.isText()) { 181 if (oldChild.isText()) {
184 oldChild.parent()->setShouldDoFullPaintInvalidation(); 182 oldChild.parent()->setShouldDoFullPaintInvalidation();
185 return; 183 return;
186 } 184 }
187 DisableCompositingQueryAsserts disabler; 185 DisableCompositingQueryAsserts disabler;
188 oldChild.invalidatePaintUsingContainer(oldChild.containerForPaintInvalidatio n(), oldChild.previousPaintInvalidationRect(), PaintInvalidationRendererRemoval) ; 186 oldChild.invalidatePaintUsingContainer(oldChild.containerForPaintInvalidatio n(), oldChild.previousPaintInvalidationRect(), PaintInvalidationRendererRemoval) ;
189 } 187 }
190 188
191 } // namespace blink 189 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderTableCell.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698