Diff
Modified: branches/safari-534.53-branch/LayoutTests/ChangeLog (101565 => 101566)
--- branches/safari-534.53-branch/LayoutTests/ChangeLog 2011-12-01 00:08:51 UTC (rev 101565)
+++ branches/safari-534.53-branch/LayoutTests/ChangeLog 2011-12-01 00:09:19 UTC (rev 101566)
@@ -1,5 +1,18 @@
2011-11-30 Lucas Forschler <lforsch...@apple.com>
+ Merge 94595
+
+ 2011-09-06 David Hyatt <hy...@apple.com>
+
+ Update some layout test results following the improved Pair parsing code that landed in r94593.
+
+ * fast/backgrounds/size/parsing-background-size-values-expected.txt:
+ * fast/backgrounds/size/resources/parsing-background-size-values.js:
+ * fast/reflections/reflection-computed-style-expected.txt:
+ * inspector/elements/elements-panel-styles-expected.txt:
+
+2011-11-30 Lucas Forschler <lforsch...@apple.com>
+
Merge 94593
2011-09-06 David Hyatt <hy...@apple.com>
Modified: branches/safari-534.53-branch/LayoutTests/fast/backgrounds/size/parsing-background-size-values-expected.txt (101565 => 101566)
--- branches/safari-534.53-branch/LayoutTests/fast/backgrounds/size/parsing-background-size-values-expected.txt 2011-12-01 00:08:51 UTC (rev 101565)
+++ branches/safari-534.53-branch/LayoutTests/fast/backgrounds/size/parsing-background-size-values-expected.txt 2011-12-01 00:09:19 UTC (rev 101566)
@@ -5,22 +5,22 @@
PASS test("background-size: contain;") is "contain"
PASS test("background-size: cover;") is "cover"
-PASS test("background-size: 100 100;") is "100px 100px"
-PASS test("background-size: 100px 100px;") is "100px 100px"
+PASS test("background-size: 100 100;") is "100px"
+PASS test("background-size: 100px 100px;") is "100px"
PASS test("background-size: auto 50px;") is " 50px"
PASS test("background-size: 50px auto;") is "50px "
PASS test("background-size: auto auto;") is " "
PASS test("background-size: 30% 20%;") is "30% 20%"
PASS test("background-size: 4em auto;") is "4em "
PASS test("background-size: 5em;") is "5em "
-PASS test("-webkit-background-size: 5em ;") is "5em 5em"
+PASS test("-webkit-background-size: 5em ;") is "5em"
PASS test("background-size: 100 100 100;") is null
PASS test("background-size: coconut;") is null
PASS test("background-size: 100px,;") is null
PASS test("background-size: 100px, 50%;") is "100px , 50% "
-PASS test("-webkit-background-size: 100px, 50%;") is "100px 100px, 50% 50%"
+PASS test("-webkit-background-size: 100px, 50%;") is "100px, 50%"
PASS test("background-size: 50% 100px, 2em, 100px 50%;") is "50% 100px, 2em , 100px 50%"
-PASS test("-webkit-background-size: 50% 100px, 2em, 100px 50%;") is "50% 100px, 2em 2em, 100px 50%"
+PASS test("-webkit-background-size: 50% 100px, 2em, 100px 50%;") is "50% 100px, 2em, 100px 50%"
PASS successfullyParsed is true
TEST COMPLETE
Modified: branches/safari-534.53-branch/LayoutTests/fast/backgrounds/size/resources/parsing-background-size-values.js (101565 => 101566)
--- branches/safari-534.53-branch/LayoutTests/fast/backgrounds/size/resources/parsing-background-size-values.js 2011-12-01 00:08:51 UTC (rev 101565)
+++ branches/safari-534.53-branch/LayoutTests/fast/backgrounds/size/resources/parsing-background-size-values.js 2011-12-01 00:09:19 UTC (rev 101566)
@@ -13,23 +13,23 @@
shouldBe('test("background-size: contain;")', '"contain"');
shouldBe('test("background-size: cover;")', '"cover"');
-shouldBe('test("background-size: 100 100;")', '"100px 100px"');
-shouldBe('test("background-size: 100px 100px;")', '"100px 100px"');
+shouldBe('test("background-size: 100 100;")', '"100px"');
+shouldBe('test("background-size: 100px 100px;")', '"100px"');
shouldBe('test("background-size: auto 50px;")', '" 50px"');
shouldBe('test("background-size: 50px auto;")', '"50px "');
shouldBe('test("background-size: auto auto;")', '" "');
shouldBe('test("background-size: 30% 20%;")', '"30% 20%"');
shouldBe('test("background-size: 4em auto;")', '"4em "');
shouldBe('test("background-size: 5em;")', '"5em "');
-shouldBe('test("-webkit-background-size: 5em ;")', '"5em 5em"');
+shouldBe('test("-webkit-background-size: 5em ;")', '"5em"');
shouldBe('test("background-size: 100 100 100;")', 'null');
shouldBe('test("background-size: coconut;")', 'null');
shouldBe('test("background-size: 100px,;")', 'null');
shouldBe('test("background-size: 100px, 50%;")', '"100px , 50% "');
-shouldBe('test("-webkit-background-size: 100px, 50%;")', '"100px 100px, 50% 50%"');
+shouldBe('test("-webkit-background-size: 100px, 50%;")', '"100px, 50%"');
shouldBe('test("background-size: 50% 100px, 2em, 100px 50%;")', '"50% 100px, 2em , 100px 50%"');
-shouldBe('test("-webkit-background-size: 50% 100px, 2em, 100px 50%;")', '"50% 100px, 2em 2em, 100px 50%"');
+shouldBe('test("-webkit-background-size: 50% 100px, 2em, 100px 50%;")', '"50% 100px, 2em, 100px 50%"');
var successfullyParsed = true;
Modified: branches/safari-534.53-branch/LayoutTests/fast/reflections/reflection-computed-style-expected.txt (101565 => 101566)
--- branches/safari-534.53-branch/LayoutTests/fast/reflections/reflection-computed-style-expected.txt 2011-12-01 00:08:51 UTC (rev 101565)
+++ branches/safari-534.53-branch/LayoutTests/fast/reflections/reflection-computed-style-expected.txt 2011-12-01 00:09:19 UTC (rev 101566)
@@ -17,6 +17,6 @@
-webkit-box-reflect: below 5px -webkit-gradient(linear, 0 0, 0 0) 25 25 25 25 stretch stretch;
-webkit-box-reflect
- getPropertyValue: below 5px -webkit-gradient(linear, 0 0, 0 0) 25 fill stretch stretch
+ getPropertyValue: below 5px -webkit-gradient(linear, 0 0, 0 0) 25 fill / auto stretch
getPropertyCSSValue: [object CSSValue]
Modified: branches/safari-534.53-branch/LayoutTests/inspector/elements/elements-panel-styles-expected.txt (101565 => 101566)
--- branches/safari-534.53-branch/LayoutTests/inspector/elements/elements-panel-styles-expected.txt 2011-12-01 00:08:51 UTC (rev 101565)
+++ branches/safari-534.53-branch/LayoutTests/inspector/elements/elements-panel-styles-expected.txt 2011-12-01 00:09:19 UTC (rev 101566)
@@ -2,16 +2,16 @@
[expanded] ()
border-bottom-left-radius: 5px;
- .foo - 5px 5px elements-panel-styles.css:10
+ .foo - 5px elements-panel-styles.css:14
border-bottom-right-radius: 5px;
- .foo - 5px 5px elements-panel-styles.css:10
+ .foo - 5px elements-panel-styles.css:14
border-top-left-radius: 5px;
- .foo - 5px 5px elements-panel-styles.css:10
+ .foo - 5px elements-panel-styles.css:14
border-top-right-radius: 5px;
- .foo - 5px 5px elements-panel-styles.css:10
+ .foo - 5px elements-panel-styles.css:14
color: blue;
- .foo, .foo::before - blue elements-panel-styles.css:16
- /-- overloaded --/ .foo - black elements-panel-styles.css:10
+ .foo, .foo::before - blue elements-panel-styles.css:21
+ /-- overloaded --/ .foo - black elements-panel-styles.css:14
display: none;
element.style - none
/-- overloaded --/ div - block user agent stylesheet
@@ -20,26 +20,34 @@
font-size: 14px;
#container - 14px elements-panel-styles.css:5
/-- overloaded --/ body - 12px elements-panel-styles.css:1
+font-style: italic;
+ #container .foo - italic !important elements-panel-styles.css:10
+ /-- overloaded --/ .foo - normal !important elements-panel-styles.css:14
margin-bottom: 2px;
- .foo - 2px elements-panel-styles.css:10
+ .foo - 2px elements-panel-styles.css:14
margin-left: 0px;
- .foo - 0px elements-panel-styles.css:10
+ .foo - 0px elements-panel-styles.css:14
margin-right: 0px;
- .foo - 0px elements-panel-styles.css:10
+ .foo - 0px elements-panel-styles.css:14
margin-top: 10px;
- .foo - 10px elements-panel-styles.css:10
+ .foo - 10px elements-panel-styles.css:14
+text-align: -webkit-left;
+ div[align=left] - -webkit-left
[expanded] element.style { ()
display: none;
======== Matched CSS Rules ========
-[expanded] .foo { (elements-panel-styles.css:34)
+[expanded] #container .foo { (elements-panel-styles.css:10)
+font-style: italic !important;
-[expanded] .foo, .foo::before { (elements-panel-styles.css:16)
+[expanded] .foo { (elements-panel-styles.css:39)
+
+[expanded] .foo, .foo::before { (elements-panel-styles.css:21)
content: "[before Foo]";
color: blue;
-[expanded] .foo { (elements-panel-styles.css:10)
+[expanded] .foo { (elements-panel-styles.css:14)
/-- overloaded --/ color: black;
margin: 10px 0 2px;
margin-top: 10px;
@@ -47,11 +55,15 @@
margin-bottom: 2px;
margin-left: 0px;
border-radius: 5px;
- border-top-left-radius: 5px 5px;
- border-top-right-radius: 5px 5px;
- border-bottom-right-radius: 5px 5px;
- border-bottom-left-radius: 5px 5px;
+ border-top-left-radius: 5px;
+ border-top-right-radius: 5px;
+ border-bottom-right-radius: 5px;
+ border-bottom-left-radius: 5px;
+/-- overloaded --/ font-style: normal !important;
+[expanded] div[align=left] { ()
+text-align: -webkit-left;
+
[expanded] div { (user agent stylesheet)
/-- overloaded --/ display: block;
@@ -66,22 +78,22 @@
======== Pseudo ::before element ========
-[expanded] .foo::before { (elements-panel-styles.css:38)
+[expanded] .foo::before { (elements-panel-styles.css:43)
-[expanded] .foo::before { (elements-panel-styles.css:21)
+[expanded] .foo::before { (elements-panel-styles.css:26)
color: red;
-[expanded] .foo, .foo::before { (elements-panel-styles.css:16)
+[expanded] .foo, .foo::before { (elements-panel-styles.css:21)
content: "[before Foo]";
/-- overloaded --/ color: blue;
======== Pseudo ::after element ========
-[expanded] .foo::after { (elements-panel-styles.css:29)
+[expanded] .foo::after { (elements-panel-styles.css:34)
font-family: courier;
content: "[after Foo 2]";
-[expanded] .foo::after { (elements-panel-styles.css:25)
+[expanded] .foo::after { (elements-panel-styles.css:30)
/-- overloaded --/ content: "[after Foo]";
color: green;
