Skip to content
  • hmuller@adobe.com's avatar
    [CSS Shapes] Support for shape-margin in BoxShape · 08a6c595
    hmuller@adobe.com authored
    https://bugs.webkit.org/show_bug.cgi?id=124788
    
    Source/WebCore:
    
    Reviewed by Andreas Kling.
    
    Corrected BoxShape's internal shape-margin/padding bounds FloatRoundedRect
    initialization. Tests for the padding bounds will be added when the rest of
    shape-padding for box shapes implementation is ready.
    
    Tests: fast/shapes/shape-outside-floats/shape-outside-margin-boxes-001.html
           fast/shapes/shape-outside-floats/shape-outside-margin-boxes-002.html
    
    * rendering/shapes/BoxShape.cpp: Use constructor shape-margin,shape-padding parameters.
    (WebCore::BoxShape::BoxShape):
    * rendering/shapes/BoxShape.h:
    * rendering/shapes/Shape.cpp:
    (WebCore::createBoxShape): Pass the shape-margin and shape-padding values along to the BoxShape constructor.
    (WebCore::Shape::createShape): Ditto.
    
    LayoutTests:
    
    Verify that shape-margin has the expected effect on the four possible shape-outside box values
    for left and right floats.
    
    Reviewed by Andreas Kling.
    
    * fast/shapes/shape-outside-floats/shape-outside-margin-boxes-001-expected.html: Added.
    * fast/shapes/shape-outside-floats/shape-outside-margin-boxes-001.html: Added.
    * fast/shapes/shape-outside-floats/shape-outside-margin-boxes-002-expected.html: Added.
    * fast/shapes/shape-outside-floats/shape-outside-margin-boxes-002.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159787 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    08a6c595