Remove shape-padding

Source/core/rendering/shapes/ShapeInfo.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 95 matching lines @@
 }
 
 template<class RenderType>
 const Shape& ShapeInfo<RenderType>::computedShape() const
 {
     if (Shape* shape = m_shape.get())
         return *shape;
 
     WritingMode writingMode = this->styleForWritingMode()->writingMode();
     Length margin = m_renderer.style()->shapeMargin();
-    Length padding = m_renderer.style()->shapePadding();
     float shapeImageThreshold = m_renderer.style()->shapeImageThreshold();
     const ShapeValue* shapeValue = this->shapeValue();
     ASSERT(shapeValue);
 
     switch (shapeValue->type()) {
     case ShapeValue::Shape:
         ASSERT(shapeValue->shape());
-        m_shape = Shape::createShape(shapeValue->shape(), m_referenceBoxLogicalSize, writingMode, margin, padding);
+        m_shape = Shape::createShape(shapeValue->shape(), m_referenceBoxLogicalSize, writingMode, margin);
         break;
     case ShapeValue::Image: {
         Image* image;
         LayoutRect imageRect;
         getShapeImageAndRect(shapeValue, &m_renderer, m_referenceBoxLogicalSize, image, imageRect);
         const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_referenceBoxLogicalSize);
-        m_shape = Shape::createRasterShape(image, shapeImageThreshold, imageRect, marginRect, writingMode, margin, padding);
+        m_shape = Shape::createRasterShape(image, shapeImageThreshold, imageRect, marginRect, writingMode, margin);
         break;
     }
     case ShapeValue::Box: {
         const RoundedRect& shapeRect = m_renderer.style()->getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer.view());
-        m_shape = Shape::createBoxShape(shapeRect, writingMode, margin, padding);
+        m_shape = Shape::createLayoutBoxShape(shapeRect, writingMode, margin);
         break;
     }
     case ShapeValue::Outside:
         // Outside should have already resolved to a different shape value.
         ASSERT_NOT_REACHED();
     }
 
     ASSERT(m_shape);
     return *m_shape;
 }
@@ skipping 98 matching lines @@
     case BoxMissing: break;
     }
 
     ASSERT_NOT_REACHED();
     return LayoutUnit();
 }
 
 template class ShapeInfo<RenderBlock>;
 template class ShapeInfo<RenderBox>;
 }