Source/WebCore/rendering/RenderBox.cpp - Issue 12039074: Merge 140721

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

Issue 12039074: Merge 140721 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1393/

Patch Set: Created 7 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:

Index: Source/WebCore/rendering/RenderBox.cpp

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

--- Source/WebCore/rendering/RenderBox.cpp (revision 140726)

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

@@ -305,12 +305,6 @@

#if ENABLE(CSS_EXCLUSIONS)

updateExclusionShapeOutsideInfoAfterStyleChange(style()->shapeOutside(), oldStyle ? oldStyle->shapeOutside() : 0);

#endif

- if (oldStyle && (newStyle->boxSizing() == BORDER_BOX || oldStyle->boxSizing() == BORDER_BOX)

- && (newStyle->paddingBox() != oldStyle->paddingBox() || newStyle->border() != oldStyle->border())) {

- for (RenderObject* child = firstChild(); child; child = child->nextSibling())

- child->setChildNeedsLayout(true, MarkOnlyThis);

- }

}

#if ENABLE(CSS_EXCLUSIONS)

« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »