Skip to content
  • bjonesbe@adobe.com's avatar
    [css shapes] Fix support for shape-outside on a float with padding · a1c62398
    bjonesbe@adobe.com authored
    https://bugs.webkit.org/show_bug.cgi?id=123590
    
    Reviewed by Alexandru Chiculita.
    
    Source/WebCore:
    
    The line top was being improperly converted to the coordinates of the
    shape, causing the shape to be positioned incorrectly when the float
    had padding. This fixes that problem.
    
    No new tests, covered by updates to existing ones.
    
    * rendering/shapes/ShapeOutsideInfo.cpp:
    (WebCore::ShapeOutsideInfo::updateDeltasForContainingBlockLine):
    
    LayoutTests:
    
    Fix existing tests that depended on the incorrect behavior so that
    they are now testing the proper thing. Also fix up the tests to make
    them clearer and more robust.
    
    * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-000-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-000.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-005-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-005.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-006-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-006.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-007-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-007.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-008-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-008.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-009-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-009.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000-expected.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html:
    * csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158584 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    a1c62398