Index: Source/core/rendering/shapes/ShapeOutsideInfo.cpp |
diff --git a/Source/core/rendering/shapes/ShapeOutsideInfo.cpp b/Source/core/rendering/shapes/ShapeOutsideInfo.cpp |
index ed3beb1933a8a4bbd2ab21571e50b4f69481aba4..3e807fb28c60405c8132273f861203ab96b4905d 100644 |
--- a/Source/core/rendering/shapes/ShapeOutsideInfo.cpp |
+++ b/Source/core/rendering/shapes/ShapeOutsideInfo.cpp |
@@ -35,6 +35,8 @@ |
#include "core/rendering/RenderBox.h" |
#include "core/rendering/RenderImage.h" |
leviw_travelin_and_unemployed
2014/04/11 21:04:17
supernit: why this empty space? I'm only used to s
|
+#include "platform/LengthFunctions.h" |
+ |
namespace WebCore { |
CSSBoxType referenceBox(const ShapeValue& shapeValue) |
@@ -123,7 +125,9 @@ const Shape& ShapeOutsideInfo::computedShape() const |
const RenderStyle& containingBlockStyle = *m_renderer.containingBlock()->style(); |
WritingMode writingMode = containingBlockStyle.writingMode(); |
- Length margin = style.shapeMargin(); |
+ LayoutUnit maximumValue = m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : LayoutUnit(); |
+ float margin = floatValueForLength(m_renderer.style()->shapeMargin(), maximumValue.toFloat()); |
+ |
float shapeImageThreshold = style.shapeImageThreshold(); |
ASSERT(style.shapeOutside()); |
const ShapeValue& shapeValue = *style.shapeOutside(); |