Changeset 228704 in webkit
- Timestamp:
- Feb 19, 2018 11:55:04 AM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r228703 r228704 1 2018-02-19 Zalan Bujtas <zalan@apple.com> 2 3 [RenderTreeBuilder] Rename RenderTreeBuilder::removeAndDestroyChild() -> removeAndDestroy() 4 https://bugs.webkit.org/show_bug.cgi?id=182934 5 <rdar://problem/37678241> 6 7 Reviewed by Antti Koivisto. 8 9 No change in functionality. 10 11 * dom/Document.cpp: 12 (WebCore::Document::setFullScreenRenderer): 13 * rendering/RenderBoxModelObject.cpp: 14 (WebCore::RenderBoxModelObject::removeAndDestroyAllContinuations): 15 * rendering/RenderButton.cpp: 16 (WebCore::RenderButton::setText): 17 * rendering/RenderFullScreen.cpp: 18 (WebCore::RenderFullScreen::willBeDestroyed): 19 (WebCore::RenderFullScreen::unwrapRenderer): 20 * rendering/RenderListItem.cpp: 21 (WebCore::RenderListItem::willBeDestroyed): 22 * rendering/RenderTextFragment.cpp: 23 (WebCore::RenderTextFragment::willBeDestroyed): 24 (WebCore::RenderTextFragment::setText): 25 * rendering/RenderView.cpp: 26 (WebCore::RenderView::willBeDestroyed): 27 * rendering/updating/RenderTreeBuilder.cpp: 28 (WebCore::RenderTreeBuilder::removeAndDestroy): 29 (WebCore::RenderTreeBuilder::removeFromParentAndDestroyCleaningUpAnonymousWrappers): 30 (WebCore::RenderTreeBuilder::removeAndDestroyChild): Deleted. 31 * rendering/updating/RenderTreeBuilder.h: 32 * rendering/updating/RenderTreeBuilderBlock.cpp: 33 (WebCore::RenderTreeBuilder::Block::takeChild): 34 * rendering/updating/RenderTreeBuilderFirstLetter.cpp: 35 (WebCore::RenderTreeBuilder::FirstLetter::updateStyle): 36 (WebCore::RenderTreeBuilder::FirstLetter::createRenderers): 37 * rendering/updating/RenderTreeBuilderList.cpp: 38 (WebCore::RenderTreeBuilder::List::updateItemMarker): 39 * rendering/updating/RenderTreeBuilderMultiColumn.cpp: 40 (WebCore::RenderTreeBuilder::MultiColumn::destroyFragmentedFlow): 41 (WebCore::RenderTreeBuilder::MultiColumn::handleSpannerRemoval): 42 * rendering/updating/RenderTreeBuilderRuby.cpp: 43 (WebCore::RenderTreeBuilder::Ruby::moveBlockChildren): 44 (WebCore::RenderTreeBuilder::Ruby::takeChild): 45 1 46 2018-02-19 Daniel Bates <dabates@apple.com> 2 47 -
trunk/Source/WebCore/dom/Document.cpp
r228701 r228704 6316 6316 6317 6317 if (m_fullScreenRenderer) 6318 builder.removeAndDestroy Child(*m_fullScreenRenderer);6318 builder.removeAndDestroy(*m_fullScreenRenderer); 6319 6319 ASSERT(!m_fullScreenRenderer); 6320 6320 -
trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp
r228701 r228704 2559 2559 auto& continuationChainNode = *continuationChainNodeMap().get(this); 2560 2560 while (continuationChainNode.next) 2561 builder.removeAndDestroy Child(*continuationChainNode.next->renderer);2561 builder.removeAndDestroy(*continuationChainNode.next->renderer); 2562 2562 removeFromContinuationChain(); 2563 2563 } -
trunk/Source/WebCore/rendering/RenderButton.cpp
r228701 r228704 118 118 } 119 119 if (RenderTreeBuilder::current()) 120 RenderTreeBuilder::current()->removeAndDestroy Child(*m_buttonText);120 RenderTreeBuilder::current()->removeAndDestroy(*m_buttonText); 121 121 else 122 RenderTreeBuilder(*document().renderView()).removeAndDestroy Child(*m_buttonText);122 RenderTreeBuilder(*document().renderView()).removeAndDestroy(*m_buttonText); 123 123 } 124 124 -
trunk/Source/WebCore/rendering/RenderFullScreen.cpp
r228701 r228704 62 62 { 63 63 if (m_placeholder) { 64 builder.removeAndDestroy Child(*m_placeholder);64 builder.removeAndDestroy(*m_placeholder); 65 65 ASSERT(!m_placeholder); 66 66 } … … 170 170 child = nonAnonymousChild; 171 171 else { 172 builder.removeAndDestroy Child(*child);172 builder.removeAndDestroy(*child); 173 173 continue; 174 174 } … … 185 185 } 186 186 if (placeholder()) 187 builder.removeAndDestroy Child(*placeholder());187 builder.removeAndDestroy(*placeholder()); 188 188 ASSERT(!placeholder()); 189 189 190 builder.removeAndDestroy Child(*this);190 builder.removeAndDestroy(*this); 191 191 } 192 192 -
trunk/Source/WebCore/rendering/RenderListItem.cpp
r228701 r228704 59 59 { 60 60 if (m_marker) 61 builder.removeAndDestroy Child(*m_marker);61 builder.removeAndDestroy(*m_marker); 62 62 RenderBlockFlow::willBeDestroyed(builder); 63 63 } -
trunk/Source/WebCore/rendering/RenderTextFragment.cpp
r228701 r228704 78 78 { 79 79 if (m_firstLetter) 80 builder.removeAndDestroy Child(*m_firstLetter);80 builder.removeAndDestroy(*m_firstLetter); 81 81 RenderText::willBeDestroyed(builder); 82 82 } … … 90 90 return; 91 91 if (RenderTreeBuilder::current()) 92 RenderTreeBuilder::current()->removeAndDestroy Child(*m_firstLetter);92 RenderTreeBuilder::current()->removeAndDestroy(*m_firstLetter); 93 93 else 94 RenderTreeBuilder(*document().renderView()).removeAndDestroy Child(*m_firstLetter);94 RenderTreeBuilder(*document().renderView()).removeAndDestroy(*m_firstLetter); 95 95 ASSERT(!m_firstLetter); 96 96 ASSERT(!textNode() || textNode()->renderer() == this); -
trunk/Source/WebCore/rendering/RenderView.cpp
r228683 r228704 617 617 // FIXME: This is a workaround for leftover content (see webkit.org/b/182547). 618 618 while (firstChild()) 619 builder.removeAndDestroy Child(*firstChild());619 builder.removeAndDestroy(*firstChild()); 620 620 621 621 ASSERT_WITH_MESSAGE(m_rendererCount == 1, "All other renderers in this render tree should have been destroyed"); -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
r228701 r228704 140 140 } 141 141 142 void RenderTreeBuilder::removeAndDestroy Child(RenderObject& child)142 void RenderTreeBuilder::removeAndDestroy(RenderObject& child) 143 143 { 144 144 ASSERT(child.parent()); … … 155 155 if (auto* node = firstChild.node()) 156 156 node->setRenderer(nullptr); 157 removeAndDestroy Child(firstChild);157 removeAndDestroy(firstChild); 158 158 } 159 159 } … … 647 647 // If the tree is destroyed, there is no need for a clean-up phase. 648 648 if (child.renderTreeBeingDestroyed()) { 649 removeAndDestroy Child(child);649 removeAndDestroy(child); 650 650 return; 651 651 } … … 659 659 660 660 auto& destroyRootParent = *destroyRoot.parent(); 661 removeAndDestroy Child(destroyRoot);661 removeAndDestroy(destroyRoot); 662 662 removeAnonymousWrappersForInlineChildrenIfNeeded(destroyRootParent); 663 663 -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.h
r228683 r228704 45 45 void insertChild(RenderElement& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr); 46 46 47 void removeAndDestroy Child(RenderObject& child);47 void removeAndDestroy(RenderObject& child); 48 48 RenderPtr<RenderObject> takeChild(RenderElement&, RenderObject&) WARN_UNUSED_RETURN; 49 49 -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp
r228701 r228704 320 320 // Delete the now-empty block's lines and nuke it. 321 321 nextBlock.deleteLines(); 322 m_builder.removeAndDestroy Child(nextBlock);322 m_builder.removeAndDestroy(nextBlock); 323 323 next = nullptr; 324 324 } -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp
r228683 r228704 186 186 newFirstLetter->setFirstLetterRemainingText(*remainingText); 187 187 } 188 m_builder.removeAndDestroy Child(*firstLetter);188 m_builder.removeAndDestroy(*firstLetter); 189 189 m_builder.insertChild(*firstLetterContainer, WTFMove(newFirstLetter), nextSibling); 190 190 return; … … 242 242 auto* textNode = currentTextChild.textNode(); 243 243 auto* beforeChild = currentTextChild.nextSibling(); 244 m_builder.removeAndDestroy Child(currentTextChild);244 m_builder.removeAndDestroy(currentTextChild); 245 245 246 246 // Construct a text fragment for the text after the first letter. -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderList.cpp
r228701 r228704 81 81 if (style.listStyleType() == NoneListStyle && (!style.listStyleImage() || style.listStyleImage()->errorOccurred())) { 82 82 if (auto* marker = listItemRenderer.markerRenderer()) 83 m_builder.removeAndDestroy Child(*marker);83 m_builder.removeAndDestroy(*marker); 84 84 return; 85 85 } … … 122 122 // If current parent is an anonymous block that has lost all its children, destroy it. 123 123 if (currentParent && currentParent->isAnonymousBlock() && !currentParent->firstChild() && !downcast<RenderBlock>(*currentParent).continuation()) 124 m_builder.removeAndDestroy Child(*currentParent);124 m_builder.removeAndDestroy(*currentParent); 125 125 } 126 126 -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.cpp
r228701 r228704 213 213 } 214 214 while (auto* columnSet = multiColumnFlow.firstMultiColumnSet()) 215 m_builder.removeAndDestroy Child(*columnSet);215 m_builder.removeAndDestroy(*columnSet); 216 216 217 217 flow.clearMultiColumnFlow(); 218 218 m_builder.moveAllChildrenTo(multiColumnFlow, flow, RenderTreeBuilder::NormalizeAfterInsertion::Yes); 219 m_builder.removeAndDestroy Child(multiColumnFlow);219 m_builder.removeAndDestroy(multiColumnFlow); 220 220 for (auto& parentAndSpanner : parentAndSpannerList) 221 221 m_builder.insertChild(*parentAndSpanner.first, WTFMove(parentAndSpanner.second)); … … 373 373 // The placeholder may already have been removed, but if it hasn't, do so now. 374 374 if (auto placeholder = flow.spannerMap().take(&downcast<RenderBox>(spanner))) 375 m_builder.removeAndDestroy Child(*placeholder);375 m_builder.removeAndDestroy(*placeholder); 376 376 377 377 if (auto* next = spanner.nextSibling()) { … … 379 379 if (previous->isRenderMultiColumnSet() && next->isRenderMultiColumnSet()) { 380 380 // Merge two sets that no longer will be separated by a spanner. 381 m_builder.removeAndDestroy Child(*next);381 m_builder.removeAndDestroy(*next); 382 382 previous->setNeedsLayout(); 383 383 } -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp
r228701 r228704 167 167 m_builder.moveAllChildrenTo(*anonBlockHere, *anonBlockThere, RenderTreeBuilder::NormalizeAfterInsertion::Yes); 168 168 anonBlockHere->deleteLines(); 169 m_builder.removeAndDestroy Child(*anonBlockHere);169 m_builder.removeAndDestroy(*anonBlockHere); 170 170 } 171 171 // Move all remaining children normally. … … 394 394 auto& parent = *child.parent(); 395 395 auto takenChild = m_builder.takeChild(parent, child); 396 m_builder.removeAndDestroy Child(parent);396 m_builder.removeAndDestroy(parent); 397 397 return takenChild; 398 398 } … … 418 418 auto& parent = *child.parent(); 419 419 auto takenChild = m_builder.takeChild(parent, child); 420 m_builder.removeAndDestroy Child(parent);420 m_builder.removeAndDestroy(parent); 421 421 return takenChild; 422 422 }
Note: See TracChangeset
for help on using the changeset viewer.