Changeset 175755 in webkit
- Timestamp:
- Nov 7, 2014 12:02:58 PM (9 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 4 added
- 4 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r175744 r175755 1 2014-11-07 Bem Jones-Bey <bjonesbe@adobe.com> 2 3 [CSS Shapes] the sandbag JS utility code isn't producing the correct expected result in the shape-image gradient tests 4 https://bugs.webkit.org/show_bug.cgi?id=135923 5 6 Reviewed by Dirk Schulze. 7 8 Import tests from upstream. They have been modified so that they use 9 testharness to validate success or failure instead of being reftests, 10 allowing for fuzziness in matching to get around small variances 11 between implementations. 12 13 * TestExpectations: 14 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html: Removed. 15 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.txt: Added. 16 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html: 17 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html: Removed. 18 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.txt: Added. 19 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html: 20 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html: Removed. 21 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.txt: Added. 22 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html: 23 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html: Removed. 24 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.txt: Added. 25 * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html: 26 * css3/shapes/shape-outside/shape-image/gradients/w3c-import.log: 27 * css3/shapes/shape-outside/supported-shapes/support/test-utils.js: 28 (verifyTextPoints): 29 1 30 2014-11-07 Mark Lam <mark.lam@apple.com> 2 31 -
trunk/LayoutTests/TestExpectations
r175740 r175755 132 132 133 133 # Various failures from the W3C CSS Shapes test suite import 134 135 webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html [ ImageOnlyFailure ]136 webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html [ ImageOnlyFailure ]137 webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html [ ImageOnlyFailure ]138 webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html [ ImageOnlyFailure ]139 134 140 135 webkit.org/b/137788 css3/shapes/shape-outside/shape-image/shape-image-010.html [ ImageOnlyFailure ] -
trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html
r172733 r175755 49 49 x<br/> 50 50 </div> 51 <div id="log"></div> 52 <script src="../../../../../resources/testharness.js"></script> 53 <script src="../../../../../resources/testharnessreport.js"></script> 51 54 <script src="../../supported-shapes/support/rounded-rectangle.js"></script> 52 55 <script src="../../supported-shapes/support/subpixel-utils.js"></script> -
trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html
r172733 r175755 7 7 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> 8 8 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/> 9 <link rel="match" href="reference/shape-outside-radial-gradient-001-ref.html"/>10 9 <meta name="flags" content="ahem dom"/> 11 10 <meta name="assert" content="This test verifies that shape-outside respects a … … 52 51 x<br/> 53 52 </div> 53 <div id="log"></div> 54 <script src="../../../../../resources/testharness.js"></script> 55 <script src="../../../../../resources/testharnessreport.js"></script> 54 56 <script src="../../supported-shapes/support/rounded-rectangle.js"></script> 55 57 <script src="../../supported-shapes/support/subpixel-utils.js"></script> … … 61 63 containerHeight: 200, 62 64 lineHeight: 10 63 }, 10 );65 }, 10, 1); 64 66 </script> 65 67 </body> -
trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html
r172733 r175755 8 8 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/> 9 9 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-image-threshold-property"/> 10 <link rel="match" href="reference/shape-outside-radial-gradient-001-ref.html"/>11 10 <meta name="flags" content="ahem dom"/> 12 11 <meta name="assert" content="This test verifies that shape-outside respects a … … 54 53 x<br/> 55 54 </div> 55 <div id="log"></div> 56 <script src="../../../../../resources/testharness.js"></script> 57 <script src="../../../../../resources/testharnessreport.js"></script> 56 58 <script src="../../supported-shapes/support/rounded-rectangle.js"></script> 57 59 <script src="../../supported-shapes/support/subpixel-utils.js"></script> -
trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html
r172733 r175755 7 7 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> 8 8 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-image-threshold-property"/> 9 <link rel="match" href="reference/shape-outside-radial-gradient-001-ref.html"/>10 9 <meta name="flags" content="ahem dom"/> 11 10 <meta name="assert" content="This test verifies that shape-outside respects a … … 53 52 x<br/> 54 53 </div> 54 <div id="log"></div> 55 <script src="../../../../../resources/testharness.js"></script> 56 <script src="../../../../../resources/testharnessreport.js"></script> 55 57 <script src="../../supported-shapes/support/rounded-rectangle.js"></script> 56 58 <script src="../../supported-shapes/support/subpixel-utils.js"></script> -
trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/w3c-import.log
r175255 r175755 11 11 12 12 ------------------------------------------------------------------------ 13 Last Import: 2014-1 0-27 11:2313 Last Import: 2014-11-07 10:20 14 14 ------------------------------------------------------------------------ 15 15 Properties requiring vendor prefixes: … … 21 21 ------------------------------------------------------------------------ 22 22 List of files: 23 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001-expected.html 24 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html 25 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002-expected.html 26 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html 27 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003-expected.html 28 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html 29 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004-expected.html 30 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004.html 31 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html 32 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html 33 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html 34 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html 35 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html 36 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html 37 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html 38 /LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html 23 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001-expected.html 24 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html 25 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002-expected.html 26 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html 27 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003-expected.html 28 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html 29 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004-expected.html 30 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004.html 31 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html 32 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html 33 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html 34 /LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html -
trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/support/test-utils.js
r172733 r175755 1 1 function verifyTextPoints(shape, numLines, tolerance, side) { 2 var failed = false; 2 3 if (tolerance === undefined) 3 4 tolerance = 0.5; … … 15 16 if (side === "right") 16 17 actual = shape.containerWidth - (actual + line.getBoundingClientRect().width); 17 18 18 19 if( Math.abs( (actual - expected[i])) > tolerance ){ 19 20 line.style.setProperty('color', 'red'); 20 21 console.log('diff: ' + Math.abs(actual - expected[i])); 22 failed = true; 21 23 } 22 24 } 25 if (window.done) { 26 assert_false(failed, "Lines positioned properly around the shape."); 27 done(); 28 } 23 29 }
Note: See TracChangeset
for help on using the changeset viewer.