-
bjonesbe@adobe.com authored
https://bugs.webkit.org/show_bug.cgi?id=121701 Reviewed by Dirk Schulze. The import script was previously importing the tests into an incorrect path. This change uses the latest import script to import all of the shapes tests to the right location. There are also some small changes in the tests since they had some more metadata added upstream, but there are no functional changes in the tests with this change. * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/rounded-rectangle.js: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js. (ellipseXIntercept): (scanConvertRoundedRectangleOutside): (genLeftRightRoundedRectFloatShapeOutsideRefTest): (genLeftRoundedRectFloatShapeOutsideRefTest): (genRightRoundedRectFloatShapeOutsideRefTest): * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/subpixel-utils.js: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js. (SubPixelLayout): (SubPixelLayout.): * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log: Added. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html: Copied from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-001-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-001-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-001.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-001.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000-expected.html: Renamed from LayoutTests/csswg/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: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-stacked-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-stacked-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html: Renamed from LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html. * csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log: Added. * csswg/submitted/shapes/shape-outside/w3c-import.log: Removed. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156194 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2eea3b59