Source/core/rendering/RenderBox.h - Issue 185723005: Use correct container width as base for percentage margins.

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.h

Issue 185723005: Use correct container width as base for percentage margins. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

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

« LayoutTests/fast/css/bfc-percentage-margin-expected.html ('K') | « LayoutTests/fast/css/bfc-percentage-margin-expected.html ('k') | Source/core/rendering/RenderBox.cpp » ('j') | Source/core/rendering/RenderBox.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBox.h

diff --git a/Source/core/rendering/RenderBox.h b/Source/core/rendering/RenderBox.h

index 112c7b1adb4d5c6a11eb98baea69757766dd36dd..10d0cba6a71f5c787fe2212e24682cc9cf4348e5 100644

--- a/Source/core/rendering/RenderBox.h

+++ b/Source/core/rendering/RenderBox.h

@@ -389,7 +389,7 @@ public:

};

// Resolve auto margins in the inline direction of the containing block so that objects can be pushed to the start, middle or end

// of the containing block.

- void computeInlineDirectionMargins(RenderBlock* containingBlock, LayoutUnit containerWidth, LayoutUnit childWidth, LayoutUnit& marginStart, LayoutUnit& marginEnd) const;

+ void computeInlineDirectionMargins(RenderBlock* containingBlock, LayoutUnit containerWidth, LayoutUnit availableWidth, LayoutUnit childWidth, LayoutUnit& marginStart, LayoutUnit& marginEnd) const;

// Used to resolve margins in the containing block's block-flow direction.

void computeBlockDirectionMargins(const RenderBlock* containingBlock, LayoutUnit& marginBefore, LayoutUnit& marginAfter) const;