Changeset 175631 in webkit


Ignore:
Timestamp:
Nov 5, 2014 12:10:56 PM (10 years ago)
Author:
Bem Jones-Bey
Message:

[CSS Shapes] shape-image-threshold parsing tests have a few failures
https://bugs.webkit.org/show_bug.cgi?id=138060

Reviewed by Dirk Schulze.

Remove testing for inline style from the CSSWG test because it isn't
specified and isn't consistent across browsers. This has been updated
upstream as well.

Add inline style tests to the WebKit test suite to make sure that
WebKIt doesn't lose coverage with this change.

  • TestExpectations:
  • css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt:
  • css3/shapes/shape-outside/values/shape-image-threshold-001.html:
  • fast/shapes/parsing/parsing-shape-image-threshold-expected.txt:
  • fast/shapes/parsing/parsing-shape-image-threshold.html:
Location:
trunk/LayoutTests
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r175622 r175631  
     12014-11-05  Bem Jones-Bey  <bjonesbe@adobe.com>
     2
     3        [CSS Shapes] shape-image-threshold parsing tests have a few failures
     4        https://bugs.webkit.org/show_bug.cgi?id=138060
     5
     6        Reviewed by Dirk Schulze.
     7
     8        Remove testing for inline style from the CSSWG test because it isn't
     9        specified and isn't consistent across browsers. This has been updated
     10        upstream as well.
     11
     12        Add inline style tests to the WebKit test suite to make sure that
     13        WebKIt doesn't lose coverage with this change.
     14
     15        * TestExpectations:
     16        * css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt:
     17        * css3/shapes/shape-outside/values/shape-image-threshold-001.html:
     18        * fast/shapes/parsing/parsing-shape-image-threshold-expected.txt:
     19        * fast/shapes/parsing/parsing-shape-image-threshold.html:
     20
    1212014-11-05  Chris Dumez  <cdumez@apple.com>
    222
  • trunk/LayoutTests/TestExpectations

    r175550 r175631  
    158158webkit.org/b/137788 css3/shapes/shape-outside/shape-image/shape-image-010.html [ ImageOnlyFailure ]
    159159webkit.org/b/137788 css3/shapes/shape-outside/shape-image/shape-image-024.html [ ImageOnlyFailure ]
    160 
    161 webkit.org/b/138060 css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Failure ]
    162160
    163161# border painting diff (Path vs. drawLine)
  • trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt

    r172757 r175631  
    11
    2 PASS calc(10/100) - inline
    3 PASS calc(10/100 + 30/100) - inline
    4 PASS calc(150/100) - inline
    5 PASS calc(150/100 - 2) - inline
    62PASS calc(10/100) - computed
    73PASS calc(10/100 + 30/100) - computed
  • trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html

    r175255 r175631  
    1919            {
    2020              "actual": "calc(10/100)",
    21               "expected_inline": "calc(0.1)",
    2221              "expected_computed": "0.1"
    2322            },
    2423            {
    2524              "actual": "calc(10/100 + 30/100)",
    26               "expected_inline": "calc(0.1 + 0.3)",
    2725              "expected_computed": "0.4"
    2826            },
    2927            {
    3028              "actual": "calc(150/100)",
    31               "expected_inline": "calc(1.5)",
    3229              "expected_computed": "1"
    3330            },
    3431            {
    3532              "actual": "calc(150/100 - 2)",
    36               "expected_inline": "calc(-0.5)",
    3733              "expected_computed": "0"
    3834            }
    3935        ];
    40         generate_tests( ParsingUtils.testShapeThresholdInlineStyle,
    41                         ParsingUtils.buildTestCases(shape_image_threshold_valid_tests, 'inline') );
    4236        generate_tests( ParsingUtils.testShapeThresholdComputedStyle,
    4337                        ParsingUtils.buildTestCases(shape_image_threshold_valid_tests, 'computed') );
  • trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold-expected.txt

    r156814 r175631  
    44
    55
     6PASS getCSSText("-webkit-shape-image-threshold", "0") is "0"
     7PASS getCSSText("-webkit-shape-image-threshold", "0.5") is "0.5"
     8PASS getCSSText("-webkit-shape-image-threshold", "1") is "1"
     9PASS getCSSText("-webkit-shape-image-threshold", "-0.1") is "-0.1"
     10PASS getCSSText("-webkit-shape-image-threshold", "1.1") is "1.1"
     11PASS getCSSText("-webkit-shape-image-threshold", "identifier") is ""
     12PASS getCSSText("-webkit-shape-image-threshold", "'string'") is ""
     13PASS getCSSText("-webkit-shape-image-threshold", "calc(0.1 + 0.4)") is "calc(0.5)"
    614PASS getComputedStyleValue("-webkit-shape-image-threshold", "0") is "0"
    715PASS getComputedStyleValue("-webkit-shape-image-threshold", "0.5") is "0.5"
     
    1119PASS getComputedStyleValue("-webkit-shape-image-threshold", "identifier") is "0"
    1220PASS getComputedStyleValue("-webkit-shape-image-threshold", "'string'") is "0"
     21PASS getComputedStyleValue("-webkit-shape-image-threshold", "calc(0.1 + 0.4)") is "0.5"
    1322PASS getChildComputedStyle("-webkit-shape-image-threshold", "0", "0") is "0"
    1423PASS getChildComputedStyle("-webkit-shape-image-threshold", "0", "1") is "1"
  • trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold.html

    r156851 r175631  
    1212
    1313applyToEachArglist(
     14    testShapeSpecifiedProperty,
     15    [// [property, value, expectedValue]
     16     ["-webkit-shape-image-threshold", "0", "0"],
     17     ["-webkit-shape-image-threshold", "0.5", "0.5"],
     18     ["-webkit-shape-image-threshold", "1", "1"],
     19     ["-webkit-shape-image-threshold", "-0.1", "-0.1"],
     20     ["-webkit-shape-image-threshold", "1.1", "1.1"],
     21     ["-webkit-shape-image-threshold", "identifier", ""],
     22     ["-webkit-shape-image-threshold", "\'string\'", ""],
     23     ["-webkit-shape-image-threshold", "calc(0.1 + 0.4)", "calc(0.5)"]
     24    ]
     25);
     26
     27applyToEachArglist(
    1428    testShapeComputedProperty,
    1529    [// [property, value, expectedValue]
     
    2034     ["-webkit-shape-image-threshold", "1.1", "1"],
    2135     ["-webkit-shape-image-threshold", "identifier", "0"],
    22      ["-webkit-shape-image-threshold", "\'string\'", "0"]
     36     ["-webkit-shape-image-threshold", "\'string\'", "0"],
     37     ["-webkit-shape-image-threshold", "calc(0.1 + 0.4)", "0.5"]
    2338]
    2439
Note: See TracChangeset for help on using the changeset viewer.