| Index: Source/core/rendering/shapes/Shape.cpp
|
| diff --git a/Source/core/rendering/shapes/Shape.cpp b/Source/core/rendering/shapes/Shape.cpp
|
| index d2ddc31d7a04e7ef6ee6f37dba499806945edb1d..d013a93ae0a21f8767a6ade261824e7c26837a8b 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, Length padding)
|
| +PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutSize& logicalBoxSize, WritingMode writingMode, Length margin)
|
| {
|
| ASSERT(basicShape);
|
|
|
| @@ -170,12 +170,11 @@ PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutS
|
|
|
| shape->m_writingMode = writingMode;
|
| shape->m_margin = floatValueForLength(margin, 0);
|
| - shape->m_padding = floatValueForLength(padding, 0);
|
|
|
| return shape.release();
|
| }
|
|
|
| -PassOwnPtr<Shape> Shape::createRasterShape(Image* image, float threshold, const LayoutRect& imageR, const LayoutRect& marginR, WritingMode writingMode, Length margin, Length padding)
|
| +PassOwnPtr<Shape> Shape::createRasterShape(Image* image, float threshold, const LayoutRect& imageR, const LayoutRect& marginR, WritingMode writingMode, Length margin)
|
| {
|
| IntRect imageRect = pixelSnappedIntRect(imageR);
|
| IntRect marginRect = pixelSnappedIntRect(marginR);
|
| @@ -213,18 +212,16 @@ 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_padding = floatValueForLength(padding, 0);
|
| return rasterShape.release();
|
| }
|
|
|
| -PassOwnPtr<Shape> Shape::createBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, const Length& margin, const Length& padding)
|
| +PassOwnPtr<Shape> Shape::createLayoutBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, const Length& 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_padding = floatValueForLength(padding, 0);
|
|
|
| return shape.release();
|
| }
|
|
|