Changeset 159822 in webkit


Ignore:
Timestamp:
Nov 27, 2013 12:19:48 PM (10 years ago)
Author:
betravis@adobe.com
Message:

[CSS Shapes] Shape-Inside Should Default to 'auto'
https://bugs.webkit.org/show_bug.cgi?id=124851

Reviewed by Alexandru Chiculita.

Source/WebCore:

The current shape-inside specification has the property default to the 'auto'
value, not 'outside-shape'.

Updated tests are under fast/shapes.

  • rendering/style/RenderStyle.cpp:
  • rendering/style/RenderStyle.h:

LayoutTests:

Update tests to reflect a default shape-inside value of 'auto'.

  • fast/shapes/css-shapes-disabled-expected.txt:
  • fast/shapes/css-shapes-disabled.html:
  • fast/shapes/parsing/parsing-shape-inside-expected.txt:
  • fast/shapes/parsing/parsing-shape-inside.html:
  • fast/shapes/parsing/parsing-shape-lengths-expected.txt:
  • fast/shapes/parsing/parsing-shape-lengths.html:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r159821 r159822  
     12013-11-27  Bear Travis  <betravis@adobe.com>
     2
     3        [CSS Shapes] Shape-Inside Should Default to 'auto'
     4        https://bugs.webkit.org/show_bug.cgi?id=124851
     5
     6        Reviewed by Alexandru Chiculita.
     7
     8        Update tests to reflect a default shape-inside value of 'auto'.
     9
     10        * fast/shapes/css-shapes-disabled-expected.txt:
     11        * fast/shapes/css-shapes-disabled.html:
     12        * fast/shapes/parsing/parsing-shape-inside-expected.txt:
     13        * fast/shapes/parsing/parsing-shape-inside.html:
     14        * fast/shapes/parsing/parsing-shape-lengths-expected.txt:
     15        * fast/shapes/parsing/parsing-shape-lengths.html:
     16
    1172013-11-27  Hans Muller  <hmuller@adobe.com>
    218
  • trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt

    r152800 r159822  
    1111PASS testComputedStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is "auto"
    1212PASS testInlineStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is null
    13 PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "outside-shape"
     13PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "auto"
    1414PASS successfullyParsed is true
    1515
  • trunk/LayoutTests/fast/shapes/css-shapes-disabled.html

    r155272 r159822  
    3434
    3535testStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)", "auto");
    36 testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "outside-shape");
     36testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "auto");
    3737
    3838</script>
  • trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt

    r159585 r159822  
    8181PASS removeBaseURL(getComputedStyleValue("-webkit-shape-inside", "url('image')")) is "url(image)"
    8282PASS getCSSText("-webkit-shape-inside", "calc()") is ""
    83 PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "outside-shape"
     83PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "auto"
    8484PASS getCSSText("-webkit-shape-inside", "none") is ""
    85 PASS getComputedStyleValue("-webkit-shape-inside", "none") is "outside-shape"
     85PASS getComputedStyleValue("-webkit-shape-inside", "none") is "auto"
    8686PASS getCSSText("-webkit-shape-inside", "rectangle()") is ""
    87 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is "outside-shape"
     87PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is "auto"
    8888PASS getCSSText("-webkit-shape-inside", "rectangle(10px)") is ""
    89 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is "outside-shape"
     89PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is "auto"
    9090PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 10px)") is ""
    91 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is "outside-shape"
     91PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is "auto"
    9292PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is ""
    93 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "outside-shape"
     93PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "auto"
    9494PASS getCSSText("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is ""
    95 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "outside-shape"
     95PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "auto"
    9696PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
    97 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "outside-shape"
     97PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
    9898PASS getCSSText("-webkit-shape-inside", "inset-rectangle()") is ""
    99 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is "outside-shape"
     99PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is "auto"
    100100PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px)") is ""
    101 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is "outside-shape"
     101PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is "auto"
    102102PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is ""
    103 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "outside-shape"
     103PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "auto"
    104104PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is ""
    105 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "outside-shape"
     105PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "auto"
    106106PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is ""
    107 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is "outside-shape"
     107PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is "auto"
    108108PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
    109 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "outside-shape"
     109PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
    110110PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px)") is ""
    111 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is "outside-shape"
     111PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is "auto"
    112112PASS getCSSText("-webkit-shape-inside", "circle(10px 20px 30px)") is ""
    113 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is "outside-shape"
     113PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is "auto"
    114114PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is ""
    115 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "outside-shape"
     115PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "auto"
    116116PASS getCSSText("-webkit-shape-inside", "circle(10px 20px)") is ""
    117 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is "outside-shape"
     117PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is "auto"
    118118PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is ""
    119 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is "outside-shape"
     119PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is "auto"
    120120PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is ""
    121 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is "outside-shape"
     121PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is "auto"
    122122PASS getCSSText("-webkit-shape-inside", "circle(10px at center center 10px)") is ""
    123 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at center center 10px)") is "outside-shape"
     123PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at center center 10px)") is "auto"
    124124PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px 10px)") is ""
    125 PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "outside-shape"
     125PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "auto"
    126126PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px at center)") is ""
    127 PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "outside-shape"
     127PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "auto"
    128128PASS getCSSText("-webkit-shape-inside", "circle(at center center 10px)") is ""
    129 PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "outside-shape"
     129PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "auto"
    130130PASS getCSSText("-webkit-shape-inside", "ellipse()") is ""
    131 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "outside-shape"
     131PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "auto"
    132132PASS getCSSText("-webkit-shape-inside", "ellipse(10px)") is ""
    133 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is "outside-shape"
     133PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is "auto"
    134134PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px)") is ""
    135 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is "outside-shape"
     135PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is "auto"
    136136PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is ""
    137 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "outside-shape"
     137PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "auto"
    138138PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is ""
    139 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "outside-shape"
     139PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "auto"
    140140PASS getCSSText("-webkit-shape-inside", "polygon()") is ""
    141 PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is "outside-shape"
     141PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is "auto"
    142142PASS getCSSText("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is ""
    143 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is "outside-shape"
     143PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is "auto"
    144144PASS getCSSText("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is ""
    145 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is "outside-shape"
     145PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is "auto"
    146146PASS getCSSText("-webkit-shape-inside", "polygon(nonzero)") is ""
    147 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is "outside-shape"
     147PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is "auto"
    148148PASS getCSSText("-webkit-shape-inside", "polygon(evenodd)") is ""
    149 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is "outside-shape"
     149PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is "auto"
    150150PASS getCSSText("-webkit-shape-inside", "polygon(10px)") is ""
    151 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is "outside-shape"
     151PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is "auto"
    152152PASS getCSSText("-webkit-shape-inside", "polygon(nonzero,10px)") is ""
    153 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is "outside-shape"
     153PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is "auto"
    154154PASS getCSSText("-webkit-shape-inside", "polygon(evenodd,12px)") is ""
    155 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is "outside-shape"
     155PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is "auto"
    156156PASS getCSSText("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is ""
    157 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is "outside-shape"
     157PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is "auto"
    158158PASS getCSSText("-webkit-shape-inside", "content-box content-box") is ""
    159 PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is "outside-shape"
     159PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is "auto"
    160160PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
    161 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "outside-shape"
     161PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "auto"
    162162PASS getCSSText("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is ""
    163 PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is "outside-shape"
     163PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is "auto"
    164164PASS getCSSText("-webkit-shape-inside", "auto content-box") is ""
    165 PASS getComputedStyleValue("-webkit-shape-inside", "auto content-box") is "outside-shape"
     165PASS getComputedStyleValue("-webkit-shape-inside", "auto content-box") is "auto"
    166166PASS getCSSText("-webkit-shape-inside", "url('shape.svg') content-box") is ""
    167 PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "outside-shape"
     167PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "auto"
    168168PASS getCSSText("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
    169 PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "outside-shape"
     169PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "auto"
    170170PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "auto", "rectangle(10px, 20px, 30px, 40px)") is "parent: auto, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
    171171PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "outside-shape", "rectangle(10px, 20px, 30px, 40px)") is "parent: outside-shape, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
    172 PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"
    173 PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"
     172PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"
     173PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"
    174174PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "inherit") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
    175 PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: outside-shape, child: outside-shape"
     175PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: auto, child: auto"
    176176PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "auto", "inherit") is "parent: auto, child: auto"
    177177PASS successfullyParsed is true
  • trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html

    r159526 r159822  
    2222
    2323invalidShapeValues.forEach(function(value, i, a) {
    24     testShapePropertyParsingFailure("-webkit-shape-inside", value, "outside-shape")
     24    testShapePropertyParsingFailure("-webkit-shape-inside", value, "auto")
    2525});
    2626
     
    3030     ["-webkit-shape-inside", "auto", "rectangle(10px, 20px, 30px, 40px)", "parent: auto, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
    3131     ["-webkit-shape-inside", "outside-shape", "rectangle(10px, 20px, 30px, 40px)", "parent: outside-shape, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
    32      ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"],
    33      ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"],
     32     ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"],
     33     ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"],
    3434     ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "inherit", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
    35      ["-webkit-shape-inside", "", "inherit", "parent: outside-shape, child: outside-shape"],
     35     ["-webkit-shape-inside", "", "inherit", "parent: auto, child: auto"],
    3636     ["-webkit-shape-inside", "auto", "inherit", "parent: auto, child: auto"]]
    3737);
  • trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt

    r152800 r159822  
    3434PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
    3535PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is null
    36 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is "outside-shape"
     36PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is "auto"
    3737PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is null
    38 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is "outside-shape"
     38PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is "auto"
    3939PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is null
    40 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "outside-shape"
     40PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "auto"
    4141PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is null
    42 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is "outside-shape"
     42PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is "auto"
    4343PASS getStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is null
    44 PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "outside-shape"
     44PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "auto"
    4545PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
    46 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "outside-shape"
     46PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto"
    4747PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
    48 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "outside-shape"
     48PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto"
    4949PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
    50 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "outside-shape"
     50PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto"
    5151PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
    52 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "outside-shape"
     52PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto"
    5353PASS getStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is null
    54 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "outside-shape"
     54PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "auto"
    5555PASS getStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is null
    56 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "outside-shape"
     56PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "auto"
    5757PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
    58 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "outside-shape"
     58PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto"
    5959PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
    60 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "outside-shape"
     60PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto"
    6161PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is null
    62 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "outside-shape"
     62PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "auto"
    6363PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is null
    64 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "outside-shape"
     64PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "auto"
    6565PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
    66 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "outside-shape"
     66PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto"
    6767PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
    68 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "outside-shape"
     68PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto"
    6969PASS successfullyParsed is true
    7070
  • trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html

    r156851 r159822  
    3333function testInvalidValue(property, value) {
    3434    testStyleValue(value, null);
    35     testComputedStyleValue(value, 'outside-shape');
     35    testComputedStyleValue(value, 'auto');
    3636}
    3737
  • trunk/Source/WebCore/ChangeLog

    r159821 r159822  
     12013-11-27  Bear Travis  <betravis@adobe.com>
     2
     3        [CSS Shapes] Shape-Inside Should Default to 'auto'
     4        https://bugs.webkit.org/show_bug.cgi?id=124851
     5
     6        Reviewed by Alexandru Chiculita.
     7
     8        The current shape-inside specification has the property default to the 'auto'
     9        value, not 'outside-shape'.
     10
     11        Updated tests are under fast/shapes.
     12
     13        * rendering/style/RenderStyle.cpp:
     14        * rendering/style/RenderStyle.h:
     15
    1162013-11-27  Hans Muller  <hmuller@adobe.com>
    217
  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r159591 r159822  
    18551855}
    18561856
    1857 #if ENABLE(CSS_SHAPES)
    1858 ShapeValue* RenderStyle::initialShapeInside()
    1859 {
    1860     static ShapeValue* outsideValue = ShapeValue::createOutsideValue().leakRef();
    1861     return outsideValue;
    1862 }
    1863 #endif
    1864 
    18651857void RenderStyle::setColumnStylesFromPaginationMode(const Pagination::Mode& paginationMode)
    18661858{
  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r159591 r159822  
    15331533    ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); }
    15341534
    1535     static ShapeValue* initialShapeInside();
     1535    static ShapeValue* initialShapeInside() { return 0; }
    15361536    static ShapeValue* initialShapeOutside() { return 0; }
    15371537
Note: See TracChangeset for help on using the changeset viewer.