Source/core/rendering/shapes/PolygonShape.cpp - Issue 68263018: [CSS Shapes] Empty polygons with non-zero shape-padding cause an ASSERT crash

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

Issue 68263018: [CSS Shapes] Empty polygons with non-zero shape-padding cause an ASSERT crash (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Removed extra shape-outside test file Created 7 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/shapes/PolygonShape.cpp

diff --git a/Source/core/rendering/shapes/PolygonShape.cpp b/Source/core/rendering/shapes/PolygonShape.cpp

index 5b155ed6913b57aed3747c9ec7338eda153f6128..26ddcf3606b2b0883d16fa9f3ec74045ca41248b 100644

--- a/Source/core/rendering/shapes/PolygonShape.cpp

+++ b/Source/core/rendering/shapes/PolygonShape.cpp

@@ -182,7 +182,7 @@ static inline PassOwnPtr<FloatPolygon> computeShapeMarginBounds(const FloatPolyg

const FloatPolygon& PolygonShape::shapePaddingBounds() const

{

ASSERT(shapePadding() >= 0);

- if (!shapePadding())

+ if (!shapePadding() || m_polygon.isEmpty())

return m_polygon;

if (!m_paddingBounds)

@@ -194,7 +194,7 @@ const FloatPolygon& PolygonShape::shapePaddingBounds() const

const FloatPolygon& PolygonShape::shapeMarginBounds() const

{

ASSERT(shapeMargin() >= 0);

- if (!shapeMargin())

+ if (!shapeMargin() || m_polygon.isEmpty())

return m_polygon;

if (!m_marginBounds)

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