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

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

Issue 1544423002: Improve positioned/percentHeight descendant/container tracking (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: virtual destructor Created 4 years, 12 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/LayoutBoxModelObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index a2d6a782ac7c301276d8de6248b86311fd8e0c89..1942d737a767d4d45287caa4a0bdb81d62c1408a 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -1014,7 +1014,7 @@ void LayoutBoxModelObject::moveChildTo(LayoutBoxModelObject* toBoxModelObject, L
}
if (fullRemoveInsert && isLayoutBlock() && child->isBox())
- LayoutBlock::removePercentHeightDescendantIfNeeded(toLayoutBox(child));
+ toLayoutBox(child)->removeFromPercentHeightContainer();
if (fullRemoveInsert && (toBoxModelObject->isLayoutBlock() || toBoxModelObject->isLayoutInline())) {
// Takes care of adding the new child correctly if toBlock and fromBlock
@@ -1033,7 +1033,7 @@ void LayoutBoxModelObject::moveChildrenTo(LayoutBoxModelObject* toBoxModelObject
if (fullRemoveInsert && isLayoutBlock()) {
LayoutBlock* block = toLayoutBlock(this);
block->removePositionedObjects(nullptr);
- LayoutBlock::removePercentHeightDescendantIfNeeded(block);
+ block->removeFromPercentHeightContainer();
if (block->isLayoutBlockFlow())
toLayoutBlockFlow(block)->removeFloatingObjects();
}

Powered by Google App Engine
This is Rietveld 408576698