Source/core/rendering/RenderBox.cpp - Issue 692563005: Merge 184123 "Don't delete objects from the floating list during..."

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/RenderBox.cpp

Issue 692563005: Merge 184123 "Don't delete objects from the floating list during..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2171/

Patch Set: Created 6 years, 1 month 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: Source/core/rendering/RenderBox.cpp

===================================================================

--- Source/core/rendering/RenderBox.cpp (revision 184800)

+++ Source/core/rendering/RenderBox.cpp (working copy)

@@ -1265,7 +1265,7 @@

}

ShapeValue* shapeOutsideValue = style()->shapeOutside();

- if (isFloating() && shapeOutsideValue && shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) {

+ if (!frameView()->isInPerformLayout() && isFloating() && shapeOutsideValue && shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) {

ShapeOutsideInfo& info = ShapeOutsideInfo::ensureInfo(*this);

if (!info.isComputingShape()) {

info.markShapeAsDirty();

« no previous file with comments | « no previous file | no next file » | no next file with comments »