Changeset 159822 in webkit
- Timestamp:
- Nov 27, 2013 12:19:48 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r159821 r159822 1 2013-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 1 17 2013-11-27 Hans Muller <hmuller@adobe.com> 2 18 -
trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt
r152800 r159822 11 11 PASS testComputedStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is "auto" 12 12 PASS testInlineStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is null 13 PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is " outside-shape"13 PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "auto" 14 14 PASS successfullyParsed is true 15 15 -
trunk/LayoutTests/fast/shapes/css-shapes-disabled.html
r155272 r159822 34 34 35 35 testStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)", "auto"); 36 testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", " outside-shape");36 testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "auto"); 37 37 38 38 </script> -
trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt
r159585 r159822 81 81 PASS removeBaseURL(getComputedStyleValue("-webkit-shape-inside", "url('image')")) is "url(image)" 82 82 PASS getCSSText("-webkit-shape-inside", "calc()") is "" 83 PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is " outside-shape"83 PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "auto" 84 84 PASS getCSSText("-webkit-shape-inside", "none") is "" 85 PASS getComputedStyleValue("-webkit-shape-inside", "none") is " outside-shape"85 PASS getComputedStyleValue("-webkit-shape-inside", "none") is "auto" 86 86 PASS getCSSText("-webkit-shape-inside", "rectangle()") is "" 87 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is " outside-shape"87 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is "auto" 88 88 PASS getCSSText("-webkit-shape-inside", "rectangle(10px)") is "" 89 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is " outside-shape"89 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is "auto" 90 90 PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 10px)") is "" 91 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is " outside-shape"91 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is "auto" 92 92 PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "" 93 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is " outside-shape"93 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "auto" 94 94 PASS getCSSText("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "" 95 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is " outside-shape"95 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "auto" 96 96 PASS 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"97 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto" 98 98 PASS getCSSText("-webkit-shape-inside", "inset-rectangle()") is "" 99 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is " outside-shape"99 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is "auto" 100 100 PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px)") is "" 101 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is " outside-shape"101 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is "auto" 102 102 PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "" 103 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is " outside-shape"103 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "auto" 104 104 PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "" 105 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is " outside-shape"105 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "auto" 106 106 PASS 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"107 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is "auto" 108 108 PASS 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"109 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto" 110 110 PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px)") is "" 111 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is " outside-shape"111 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is "auto" 112 112 PASS getCSSText("-webkit-shape-inside", "circle(10px 20px 30px)") is "" 113 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is " outside-shape"113 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is "auto" 114 114 PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "" 115 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is " outside-shape"115 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "auto" 116 116 PASS getCSSText("-webkit-shape-inside", "circle(10px 20px)") is "" 117 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is " outside-shape"117 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is "auto" 118 118 PASS 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"119 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is "auto" 120 120 PASS 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"121 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is "auto" 122 122 PASS 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"123 PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at center center 10px)") is "auto" 124 124 PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "" 125 PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is " outside-shape"125 PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "auto" 126 126 PASS 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"127 PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "auto" 128 128 PASS getCSSText("-webkit-shape-inside", "circle(at center center 10px)") is "" 129 PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is " outside-shape"129 PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "auto" 130 130 PASS getCSSText("-webkit-shape-inside", "ellipse()") is "" 131 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is " outside-shape"131 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "auto" 132 132 PASS getCSSText("-webkit-shape-inside", "ellipse(10px)") is "" 133 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is " outside-shape"133 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is "auto" 134 134 PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px)") is "" 135 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is " outside-shape"135 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is "auto" 136 136 PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "" 137 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is " outside-shape"137 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "auto" 138 138 PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "" 139 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is " outside-shape"139 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "auto" 140 140 PASS getCSSText("-webkit-shape-inside", "polygon()") is "" 141 PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is " outside-shape"141 PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is "auto" 142 142 PASS 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"143 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is "auto" 144 144 PASS 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"145 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is "auto" 146 146 PASS getCSSText("-webkit-shape-inside", "polygon(nonzero)") is "" 147 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is " outside-shape"147 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is "auto" 148 148 PASS getCSSText("-webkit-shape-inside", "polygon(evenodd)") is "" 149 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is " outside-shape"149 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is "auto" 150 150 PASS getCSSText("-webkit-shape-inside", "polygon(10px)") is "" 151 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is " outside-shape"151 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is "auto" 152 152 PASS getCSSText("-webkit-shape-inside", "polygon(nonzero,10px)") is "" 153 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is " outside-shape"153 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is "auto" 154 154 PASS getCSSText("-webkit-shape-inside", "polygon(evenodd,12px)") is "" 155 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is " outside-shape"155 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is "auto" 156 156 PASS 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"157 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is "auto" 158 158 PASS getCSSText("-webkit-shape-inside", "content-box content-box") is "" 159 PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is " outside-shape"159 PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is "auto" 160 160 PASS 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"161 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "auto" 162 162 PASS 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"163 PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is "auto" 164 164 PASS getCSSText("-webkit-shape-inside", "auto content-box") is "" 165 PASS getComputedStyleValue("-webkit-shape-inside", "auto content-box") is " outside-shape"165 PASS getComputedStyleValue("-webkit-shape-inside", "auto content-box") is "auto" 166 166 PASS getCSSText("-webkit-shape-inside", "url('shape.svg') content-box") is "" 167 PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is " outside-shape"167 PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "auto" 168 168 PASS 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"169 PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "auto" 170 170 PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "auto", "rectangle(10px, 20px, 30px, 40px)") is "parent: auto, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)" 171 171 PASS 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"172 PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto" 173 PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto" 174 174 PASS 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"175 PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: auto, child: auto" 176 176 PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "auto", "inherit") is "parent: auto, child: auto" 177 177 PASS successfullyParsed is true -
trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html
r159526 r159822 22 22 23 23 invalidShapeValues.forEach(function(value, i, a) { 24 testShapePropertyParsingFailure("-webkit-shape-inside", value, " outside-shape")24 testShapePropertyParsingFailure("-webkit-shape-inside", value, "auto") 25 25 }); 26 26 … … 30 30 ["-webkit-shape-inside", "auto", "rectangle(10px, 20px, 30px, 40px)", "parent: auto, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"], 31 31 ["-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"], 34 34 ["-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"], 36 36 ["-webkit-shape-inside", "auto", "inherit", "parent: auto, child: auto"]] 37 37 ); -
trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt
r152800 r159822 34 34 PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)" 35 35 PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is null 36 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is " outside-shape"36 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is "auto" 37 37 PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is null 38 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is " outside-shape"38 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is "auto" 39 39 PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is null 40 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is " outside-shape"40 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "auto" 41 41 PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is null 42 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is " outside-shape"42 PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is "auto" 43 43 PASS 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"44 PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "auto" 45 45 PASS 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"46 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto" 47 47 PASS 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"48 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto" 49 49 PASS 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"50 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto" 51 51 PASS 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"52 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto" 53 53 PASS 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"54 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "auto" 55 55 PASS 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"56 PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "auto" 57 57 PASS 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"58 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto" 59 59 PASS 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"60 PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto" 61 61 PASS 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"62 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "auto" 63 63 PASS 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"64 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "auto" 65 65 PASS 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"66 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto" 67 67 PASS 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"68 PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto" 69 69 PASS successfullyParsed is true 70 70 -
trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html
r156851 r159822 33 33 function testInvalidValue(property, value) { 34 34 testStyleValue(value, null); 35 testComputedStyleValue(value, ' outside-shape');35 testComputedStyleValue(value, 'auto'); 36 36 } 37 37 -
trunk/Source/WebCore/ChangeLog
r159821 r159822 1 2013-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 1 16 2013-11-27 Hans Muller <hmuller@adobe.com> 2 17 -
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
r159591 r159822 1855 1855 } 1856 1856 1857 #if ENABLE(CSS_SHAPES)1858 ShapeValue* RenderStyle::initialShapeInside()1859 {1860 static ShapeValue* outsideValue = ShapeValue::createOutsideValue().leakRef();1861 return outsideValue;1862 }1863 #endif1864 1865 1857 void RenderStyle::setColumnStylesFromPaginationMode(const Pagination::Mode& paginationMode) 1866 1858 { -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r159591 r159822 1533 1533 ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); } 1534 1534 1535 static ShapeValue* initialShapeInside() ;1535 static ShapeValue* initialShapeInside() { return 0; } 1536 1536 static ShapeValue* initialShapeOutside() { return 0; } 1537 1537
Note: See TracChangeset
for help on using the changeset viewer.