Source/core/layout/shapes/ShapeOutsideInfo.cpp - Issue 1036653002: Clamp shape-margin to zero

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/layout/shapes/ShapeOutsideInfo.cpp

Issue 1036653002: Clamp shape-margin to zero (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix compile Created 5 years, 9 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/core/layout/shapes/ShapeOutsideInfo.cpp

diff --git a/Source/core/layout/shapes/ShapeOutsideInfo.cpp b/Source/core/layout/shapes/ShapeOutsideInfo.cpp

index fb0cfaf501405dc27008db8d346776b9395cbfb0..07bc9117a8a4a0e16ab664810e81d1ff26ca6ed8 100644

--- a/Source/core/layout/shapes/ShapeOutsideInfo.cpp

+++ b/Source/core/layout/shapes/ShapeOutsideInfo.cpp

@@ -153,7 +153,7 @@ const Shape& ShapeOutsideInfo::computedShape() const

const LayoutStyle& containingBlockStyle = *m_renderer.containingBlock()->style();

WritingMode writingMode = containingBlockStyle.writingMode();

- LayoutUnit maximumValue = m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : LayoutUnit();

+ LayoutUnit maximumValue = m_renderer.containingBlock() ? std::max(m_renderer.containingBlock()->contentWidth(), LayoutUnit()) : LayoutUnit();

Zoltan 2015/04/13 20:33:08 I think it would be more readable if you just do s

float margin = floatValueForLength(m_renderer.style()->shapeMargin(), maximumValue.toFloat());

float shapeImageThreshold = style.shapeImageThreshold();

« no previous file with comments | « LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-block-width-expected.txt ('k') | no next file » | no next file with comments »