Diff
Modified: trunk/LayoutTests/ChangeLog (159821 => 159822)
--- trunk/LayoutTests/ChangeLog 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/ChangeLog 2013-11-27 20:19:48 UTC (rev 159822)
@@ -1,3 +1,19 @@
+2013-11-27 Bear Travis <betra...@adobe.com>
+
+ [CSS Shapes] Shape-Inside Should Default to 'auto'
+ https://bugs.webkit.org/show_bug.cgi?id=124851
+
+ Reviewed by Alexandru Chiculita.
+
+ 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:
+
2013-11-27 Hans Muller <hmul...@adobe.com>
[CSS Shapes] shape-inside rectangle layout can fail
Modified: trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt (159821 => 159822)
--- trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt 2013-11-27 20:19:48 UTC (rev 159822)
@@ -10,7 +10,7 @@
PASS testInlineStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is null
PASS testComputedStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is "auto"
PASS testInlineStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is null
-PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "outside-shape"
+PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "auto"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/shapes/css-shapes-disabled.html (159821 => 159822)
--- trunk/LayoutTests/fast/shapes/css-shapes-disabled.html 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/css-shapes-disabled.html 2013-11-27 20:19:48 UTC (rev 159822)
@@ -33,7 +33,7 @@
testStyle("-webkit-shape-padding", "10px", "0px");
testStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)", "auto");
-testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "outside-shape");
+testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "auto");
</script>
<script src=""
Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (159821 => 159822)
--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2013-11-27 20:19:48 UTC (rev 159822)
@@ -80,99 +80,99 @@
PASS removeBaseURL(getCSSText("-webkit-shape-inside", "url('image')")) is "url(image)"
PASS removeBaseURL(getComputedStyleValue("-webkit-shape-inside", "url('image')")) is "url(image)"
PASS getCSSText("-webkit-shape-inside", "calc()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "auto"
PASS getCSSText("-webkit-shape-inside", "none") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "none") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "none") is "auto"
PASS getCSSText("-webkit-shape-inside", "rectangle()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is "auto"
PASS getCSSText("-webkit-shape-inside", "rectangle(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "inset-rectangle()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is "auto"
PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(10px 20px 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(10px 20px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(10px at center center 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at center center 10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at center center 10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px at center)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "auto"
PASS getCSSText("-webkit-shape-inside", "circle(at center center 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "ellipse()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "auto"
PASS getCSSText("-webkit-shape-inside", "ellipse(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(nonzero)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(evenodd)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(nonzero,10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(evenodd,12px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is "auto"
PASS getCSSText("-webkit-shape-inside", "content-box content-box") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is "auto"
PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "auto"
PASS getCSSText("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is "auto"
PASS getCSSText("-webkit-shape-inside", "auto content-box") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "auto content-box") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "auto content-box") is "auto"
PASS getCSSText("-webkit-shape-inside", "url('shape.svg') content-box") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "auto"
PASS getCSSText("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "auto"
PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "auto", "rectangle(10px, 20px, 30px, 40px)") is "parent: auto, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "outside-shape", "rectangle(10px, 20px, 30px, 40px)") is "parent: outside-shape, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"
+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"
+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"
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)"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: outside-shape, child: outside-shape"
+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: auto, child: auto"
PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "auto", "inherit") is "parent: auto, child: auto"
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html (159821 => 159822)
--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html 2013-11-27 20:19:48 UTC (rev 159822)
@@ -21,7 +21,7 @@
testLocalURLShapeProperty("-webkit-shape-inside", "url(\'image\')", "url(image)");
invalidShapeValues.forEach(function(value, i, a) {
- testShapePropertyParsingFailure("-webkit-shape-inside", value, "outside-shape")
+ testShapePropertyParsingFailure("-webkit-shape-inside", value, "auto")
});
applyToEachArglist(
@@ -29,10 +29,10 @@
[// [property, parentValue, childValue, expectedValue]
["-webkit-shape-inside", "auto", "rectangle(10px, 20px, 30px, 40px)", "parent: auto, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
["-webkit-shape-inside", "outside-shape", "rectangle(10px, 20px, 30px, 40px)", "parent: outside-shape, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
- ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"],
- ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"],
+ ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"],
+ ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"],
["-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)"],
- ["-webkit-shape-inside", "", "inherit", "parent: outside-shape, child: outside-shape"],
+ ["-webkit-shape-inside", "", "inherit", "parent: auto, child: auto"],
["-webkit-shape-inside", "auto", "inherit", "parent: auto, child: auto"]]
);
</script>
Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt (159821 => 159822)
--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2013-11-27 20:19:48 UTC (rev 159822)
@@ -33,39 +33,39 @@
PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(100%, 100%, 100%, 100%)") is "ellipse(100%, 100%, 100%, 100%)"
PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is "auto"
PASS getStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto"
PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "outside-shape"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html (159821 => 159822)
--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2013-11-27 20:19:48 UTC (rev 159822)
@@ -32,7 +32,7 @@
function testInvalidValue(property, value) {
testStyleValue(value, null);
- testComputedStyleValue(value, 'outside-shape');
+ testComputedStyleValue(value, 'auto');
}
// absolute lengths - number serialization, units
Modified: trunk/Source/WebCore/ChangeLog (159821 => 159822)
--- trunk/Source/WebCore/ChangeLog 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/Source/WebCore/ChangeLog 2013-11-27 20:19:48 UTC (rev 159822)
@@ -1,3 +1,18 @@
+2013-11-27 Bear Travis <betra...@adobe.com>
+
+ [CSS Shapes] Shape-Inside Should Default to 'auto'
+ https://bugs.webkit.org/show_bug.cgi?id=124851
+
+ Reviewed by Alexandru Chiculita.
+
+ 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:
+
2013-11-27 Hans Muller <hmul...@adobe.com>
[CSS Shapes] shape-inside rectangle layout can fail
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (159821 => 159822)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2013-11-27 20:19:48 UTC (rev 159822)
@@ -1854,14 +1854,6 @@
surround.access()->border.m_image.setOutset(outset);
}
-#if ENABLE(CSS_SHAPES)
-ShapeValue* RenderStyle::initialShapeInside()
-{
- static ShapeValue* outsideValue = ShapeValue::createOutsideValue().leakRef();
- return outsideValue;
-}
-#endif
-
void RenderStyle::setColumnStylesFromPaginationMode(const Pagination::Mode& paginationMode)
{
if (paginationMode == Pagination::Unpaginated)
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (159821 => 159822)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-11-27 20:19:48 UTC (rev 159822)
@@ -1532,7 +1532,7 @@
}
ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); }
- static ShapeValue* initialShapeInside();
+ static ShapeValue* initialShapeInside() { return 0; }
static ShapeValue* initialShapeOutside() { return 0; }
const Length& shapePadding() const { return rareNonInheritedData->m_shapePadding; }
