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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBlock.cpp

Issue 1980473002: Move collapseAnonymousBlockChild() to LayoutBlockFlow, and make it non-static. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutBlock.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
index 9245ae6329a98073e1b6a28b078c2a7ed2bd2c7f..80d6baf2258217a93db31a7d4a89eed517ea6fe6 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
@@ -490,29 +490,6 @@ void LayoutBlock::removeLeftoverAnonymousBlock(LayoutBlock* child)
child->destroy();
}
-void LayoutBlock::collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child)
-{
- if (!parent->canCollapseAnonymousBlockChild())
- return;
- // It's possible that this block's destruction may have been triggered by the
- // child's removal. Just bail if the anonymous child block is already being
- // destroyed. See crbug.com/282088
- if (child->beingDestroyed())
- return;
- if (child->continuation())
- return;
- // Ruby elements use anonymous wrappers for ruby runs and ruby bases by design, so we don't remove them.
- if (child->isRubyRun() || child->isRubyBase())
- return;
- parent->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::ChildAnonymousBlockChanged);
-
- child->moveAllChildrenTo(parent, child->nextSibling(), child->hasLayer());
- parent->setChildrenInline(child->childrenInline());
-
- parent->children()->removeChildNode(parent, child, child->hasLayer());
- child->destroy();
-}
-
void LayoutBlock::startDelayUpdateScrollInfo()
{
if (gDelayUpdateScrollInfo == 0) {
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.h ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698