Skip to content
  • bjonesbe@adobe.com's avatar
    [CSS Shapes] New positioning model: Shape cropped to margin box · 35540830
    bjonesbe@adobe.com authored
    https://bugs.webkit.org/show_bug.cgi?id=118092
    
    Reviewed by Alexandru Chiculita.
    
    Source/WebCore:
    
    Clip the shape to the margin box when it extends out the left or right
    edges. Also added a few local variables to make the code easier to
    read.
    
    Tests: csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref.html
           csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004.html
           csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005.html
           csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006.html
    
    * rendering/shapes/ShapeOutsideInfo.cpp:
    (WebCore::ShapeOutsideInfo::updateDeltasForContainingBlockLine):
    
    LayoutTests:
    
    Add tests for shapes that extend out left/right of the margin box.
    
    Fix polygon and image threshold tests so that they have a large enough
    margin box so the shape isn't clipped.
    
    Also update some of the top/bottom tests to have a better reference,
    they should be more likely to break if the implementation fails now.
    
    * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref-expected.html: Copied from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html.
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref.html: Copied from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html.
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004-expected.html: Copied from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html.
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004.html: Copied from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html.
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005-expected.html: Copied from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html.
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005.html: Copied from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html.
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006-expected.html: Copied from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html.
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006.html: Added.
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log:
    * fast/shapes/shape-outside-floats/shape-outside-floats-image-threshold-001.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157236 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    35540830