Attachment 217823 Details for Bug 124851 – Initial patch

[patch] Initial patch

bug-124851-20131125125415.patch (text/plain), 27.71 KB, created by Bear Travis on 2013-11-25 12:54:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Bear Travis

Created: 2013-11-25 12:54:16 PST

Size: 27.71 KB

patch

obsolete

>Subversion Revision: 159759
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a0ba54b6d1de8b8393b02d2ff432448fea2218df..d6d39567f1da00090ea55494da8de044f4dd5917 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2013-11-25  Bear Travis  <betravis@adobe.com>
>+
>+        [CSS Shapes] Shape-Inside Should Default to 'auto'
>+        https://bugs.webkit.org/show_bug.cgi?id=124851
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-25  Robert Hogan  <robert@webkit.org>
> 
>         Remove code now unnecessary after r159575
>diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
>index 21382daa8a3b4f9bb59a3c574f17f3140acc423a..f69d33ce9ca32b57343bded31766b8461a56b08b 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.cpp
>+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
>@@ -1854,14 +1854,6 @@ void RenderStyle::setBorderImageOutset(LengthBox outset)
>     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)
>diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
>index 8f315548ba87b2e73b700fb623def252bcab9c55..e23c08178fc3603933ec3ae24870b1bb78e7b99b 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.h
>+++ b/Source/WebCore/rendering/style/RenderStyle.h
>@@ -1532,7 +1532,7 @@ public:
>     }
>     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; }
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 80277ee721efefcddba5fd40d8df4071e551a63f..0071f288be61925603be118811f05f1ff3fbbc7e 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,19 @@
>+2013-11-25  Bear Travis  <betravis@adobe.com>
>+
>+        [CSS Shapes] Shape-Inside Should Default to 'auto'
>+        https://bugs.webkit.org/show_bug.cgi?id=124851
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-25  Robert Hogan  <robert@webkit.org>
> 
>         Add complex line layout path version of empty-clear-blocks.html
>diff --git a/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt b/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt
>index 5da5aea299851ae0a26e8aac9b9aa5238ca4b10c..a2f9c40e25fa031c0ad292401293e152e6baaba3 100644
>--- a/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt
>+++ b/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt
>@@ -10,7 +10,7 @@ PASS testComputedStyle("-webkit-shape-padding", "10px") is "0px"
> 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
>diff --git a/LayoutTests/fast/shapes/css-shapes-disabled.html b/LayoutTests/fast/shapes/css-shapes-disabled.html
>index ddb734a807e2309fd9acf83fe467befc1cabd0b2..105a2da1f27538b89219d68a7942fd637c0305f4 100644
>--- a/LayoutTests/fast/shapes/css-shapes-disabled.html
>+++ b/LayoutTests/fast/shapes/css-shapes-disabled.html
>@@ -33,7 +33,7 @@ testStyle("-webkit-shape-margin", "10px", "0px");
> 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="../../resources/js-test-post.js"></script>
>diff --git a/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt b/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt
>index 1a4387b22664a93f6c8e057d68c6b744fe0e14fa..785160403d4aa8653f1d586761e6c9d2c42ea5d7 100644
>--- a/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt
>+++ b/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt
>@@ -80,99 +80,99 @@ PASS getComputedStyleValue("-webkit-shape-inside", "outside-shape") is "outside-
> 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
> 
>diff --git a/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html b/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html
>index 3873bb859d4f6a6d781fb78763bbcad08a61bd62..f92f07cc1ced46544b9ce5c146c46e1cf6a95016 100644
>--- a/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html
>+++ b/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html
>@@ -21,7 +21,7 @@ validShapeValues.concat("outside-shape").forEach(function(elt, i, a) {
> 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 @@ applyToEachArglist(
>     [// [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>
>diff --git a/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt b/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt
>index 5bea7d07cb10abac8d4cdb21082cb92bd135924b..91c9a26ee141e7b3ee57094aac4c080f6294de8f 100644
>--- a/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt
>+++ b/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt
>@@ -33,39 +33,39 @@ PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(45%, 45%, 90
> 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
>diff --git a/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html b/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html
>index ac4e48aa35da8f4f1b7a9d54e5cad25a6899b72d..ed6aa6b4d569faa6ef7b9216ba7146f83a518f98 100644
>--- a/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html
>+++ b/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html
>@@ -32,7 +32,7 @@ function testComputedStyleValue(value, expected) {
> 
> function testInvalidValue(property, value) {
>     testStyleValue(value, null);
>-    testComputedStyleValue(value, 'outside-shape');
>+    testComputedStyleValue(value, 'auto');
> }
> 
> // absolute lengths - number serialization, units

Actions: View | Formatted Diff | Diff

Attachments on bug 124851: 217823