Index: Source/core/rendering/shapes/Shape.cpp |
diff --git a/Source/core/rendering/shapes/Shape.cpp b/Source/core/rendering/shapes/Shape.cpp |
index 60925382763bf6d47b74089eac45ee46e5973f2f..7c1f5276af173e433225167f04c3a5ce6f6c6ccd 100644 |
--- a/Source/core/rendering/shapes/Shape.cpp |
+++ b/Source/core/rendering/shapes/Shape.cpp |
@@ -94,7 +94,7 @@ static inline FloatSize physicalSizeToLogical(const FloatSize& size, WritingMode |
return size.transposedSize(); |
} |
-PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutSize& logicalBoxSize, WritingMode writingMode, Length margin) |
+PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutSize& logicalBoxSize, WritingMode writingMode, float margin) |
{ |
ASSERT(basicShape); |
@@ -169,12 +169,12 @@ PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutS |
} |
shape->m_writingMode = writingMode; |
- shape->m_margin = floatValueForLength(margin, 0); |
+ shape->m_margin = margin; |
return shape.release(); |
} |
-PassOwnPtr<Shape> Shape::createRasterShape(Image* image, float threshold, const LayoutRect& imageR, const LayoutRect& marginR, WritingMode writingMode, Length margin) |
+PassOwnPtr<Shape> Shape::createRasterShape(Image* image, float threshold, const LayoutRect& imageR, const LayoutRect& marginR, WritingMode writingMode, float margin) |
{ |
IntRect imageRect = pixelSnappedIntRect(imageR); |
IntRect marginRect = pixelSnappedIntRect(marginR); |
@@ -211,17 +211,17 @@ PassOwnPtr<Shape> Shape::createRasterShape(Image* image, float threshold, const |
OwnPtr<RasterShape> rasterShape = adoptPtr(new RasterShape(intervals.release(), marginRect.size())); |
rasterShape->m_writingMode = writingMode; |
- rasterShape->m_margin = floatValueForLength(margin, 0); |
+ rasterShape->m_margin = margin; |
return rasterShape.release(); |
} |
-PassOwnPtr<Shape> Shape::createLayoutBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, const Length& margin) |
+PassOwnPtr<Shape> Shape::createLayoutBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, float margin) |
{ |
FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height()); |
FloatRoundedRect bounds(rect, roundedRect.radii()); |
OwnPtr<Shape> shape = createInsetShape(bounds); |
shape->m_writingMode = writingMode; |
- shape->m_margin = floatValueForLength(margin, 0); |
+ shape->m_margin = margin; |
return shape.release(); |
} |