third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp - Issue 1544423002: Improve positioned/percentHeight descendant/container tracking

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fix windows build break Created 4 years, 11 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

« third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('K') | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutRubyRun.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 4c941fcbe273ec5013828e021dc19c6b1f5e2bd9..3ccbd74a59ad2b5d5470a12eefa11519433c1e35 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();

}