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: Remove squashed patch Created 5 years, 8 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 7a110df8b54bcaac27aa3d9957b7f95ab8817f2a..87dc9f1b210b96946f1bc2eaa61eeb9a2364d411 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 ComputedStyle& containingBlockStyle = *m_renderer.containingBlock()->style();

WritingMode writingMode = containingBlockStyle.writingMode();

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

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

leviw_travelin_and_unemployed 2015/04/22 01:02:16 Will this still yield the right answer when we hav

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

float shapeImageThreshold = style.shapeImageThreshold();

« no previous file with comments | « Source/core/layout/LayoutBox.h ('k') | no next file » | no next file with comments »