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(); |