Source/core/rendering/RenderEmbeddedObject.cpp - Issue 172753003: Consistently disable the LayoutState for certain layout situations

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: Source/core/rendering/RenderEmbeddedObject.cpp

Issue 172753003: Consistently disable the LayoutState for certain layout situations (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 6 years, 10 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

« no previous file with comments | « Source/core/rendering/RenderDeprecatedFlexibleBox.cpp ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | Source/core/rendering/RenderObject.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderEmbeddedObject.cpp

diff --git a/Source/core/rendering/RenderEmbeddedObject.cpp b/Source/core/rendering/RenderEmbeddedObject.cpp

index cb65f6ca3c75ad17e42a80982577649176506bc2..163e95f29409f99250ea24b04b1b2442bd9041cc 100644

--- a/Source/core/rendering/RenderEmbeddedObject.cpp

+++ b/Source/core/rendering/RenderEmbeddedObject.cpp

@@ -234,7 +234,7 @@ void RenderEmbeddedObject::layout()

// When calling layout() on a child node, a parent must either push a LayoutStateMaintainter, or

// instantiate LayoutStateDisabler. Since using a LayoutStateMaintainer is slightly more efficient,

// and this method will be called many times per second during playback, use a LayoutStateMaintainer:

- LayoutStateMaintainer statePusher(this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());

+ LayoutStateMaintainer statePusher(this, locationOffset());

childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(paddingLeft(), paddingTop()));

childBox->style()->setHeight(Length(newSize.height(), Fixed));