summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 00:37:10 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 00:37:10 +0000
commit08cab28426c9edac22a1052db13c5200f525e542 (patch)
treed390fd2193eaa293d14f04e33434398e2222f7af /webkit
parent1b301a7260940d5376bdfd0eac2011ee55c30434 (diff)
downloadchromium_src-08cab28426c9edac22a1052db13c5200f525e542.zip
chromium_src-08cab28426c9edac22a1052db13c5200f525e542.tar.gz
chromium_src-08cab28426c9edac22a1052db13c5200f525e542.tar.bz2
Update test expectations corresponding to changes made upstream.
Corresponding to http://trac.webkit.org/changeset/46281: fast/overflow/overflow-with-local-attachment.html Corresponding to http://trac.webkit.org/changeset/46287: fast/css/getComputedStyle/computed-style.html fast/css/getComputedStyle/computed-style-without-renderer.html svg/css/getComputedStyle-basic.xhtml TBR=pkasting BUG=none TEST=none Review URL: http://codereview.chromium.org/160075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.pngbin0 -> 48292 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.txt60
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/css/getComputedStyle-basic-expected.txt12
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.pngbin0 -> 44027 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.txt60
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt12
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
13 files changed, 146 insertions, 20 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
index c5cdd48..1781062 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
@@ -21,6 +21,7 @@ border-top-color: rgb(0, 0, 0);
border-top-style: none;
border-top-width: 0px;
bottom: auto;
+box-shadow: none;
caption-side: top;
clear: none;
clip: auto;
@@ -73,6 +74,7 @@ text-align: auto;
text-decoration: none;
text-indent: 0px;
text-shadow: none;
+text-overflow: clip;
text-transform: none;
top: auto;
unicode-bidi: normal;
@@ -115,7 +117,6 @@ zoom: 1;
-webkit-box-orient: horizontal;
-webkit-box-pack: start;
-webkit-box-reflect: none;
--webkit-box-shadow: none;
-webkit-box-sizing: content-box;
-webkit-column-break-after: auto;
-webkit-column-break-before: auto;
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
index 3c4cd3b..b54377f 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
@@ -20,6 +20,7 @@ Computed style of an element whose parent's 'display' value is 'none':
border-top-style: solid
border-top-width: 16px
bottom: auto
+ box-shadow: none
caption-side: top
clear: none
clip: auto
@@ -72,6 +73,7 @@ Computed style of an element whose parent's 'display' value is 'none':
text-decoration: none
text-indent: 0px
text-shadow: none
+ text-overflow: clip
text-transform: none
top: auto
unicode-bidi: normal
@@ -114,7 +116,6 @@ Computed style of an element whose parent's 'display' value is 'none':
-webkit-box-orient: horizontal
-webkit-box-pack: start
-webkit-box-reflect: none
- -webkit-box-shadow: none
-webkit-box-sizing: content-box
-webkit-column-break-after: auto
-webkit-column-break-before: auto
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.checksum
new file mode 100644
index 0000000..3cca88d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.checksum
@@ -0,0 +1 @@
+bdc9b04c09cc367a8873959f3e272aef \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.png
new file mode 100644
index 0000000..fab563b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.txt
new file mode 100644
index 0000000..5b40c80
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.txt
@@ -0,0 +1,60 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x298
+ RenderBlock {HTML} at (0,0) size 800x298
+ RenderBody {BODY} at (8,16) size 784x274
+ RenderBlock {UL} at (0,0) size 784x60 [color=#000080]
+ RenderListItem {LI} at (40,0) size 744x20
+ RenderListMarker at (-18,0) size 7x19: bullet
+ RenderText {#text} at (0,0) size 323x19
+ text run at (0,0) width 323: "You should not see the background under the border."
+ RenderListItem {LI} at (40,20) size 744x20
+ RenderListMarker at (-18,0) size 7x19: bullet
+ RenderText {#text} at (0,0) size 326x19
+ text run at (0,0) width 326: "As you scroll the element below the cats should move."
+ RenderListItem {LI} at (40,40) size 744x20
+ RenderListMarker at (-18,0) size 7x19: bullet
+ RenderText {#text} at (0,0) size 281x19
+ text run at (0,0) width 281: "The cats should be on a light grey background."
+layer at (8,92) size 390x198 clip at (38,122) size 315x138 scrollHeight 399
+ RenderBlock {DIV} at (0,76) size 390x198 [bgcolor=#C0C0C0] [border: (30px dotted #000000)]
+ RenderText {#text} at (30,30) size 32x399
+ text run at (30,30) width 20: " 1"
+ text run at (50,30) width 0: " "
+ text run at (30,50) width 20: " 2"
+ text run at (50,50) width 0: " "
+ text run at (30,70) width 20: " 3"
+ text run at (50,70) width 0: " "
+ text run at (30,90) width 20: " 4"
+ text run at (50,90) width 0: " "
+ text run at (30,110) width 20: " 5"
+ text run at (50,110) width 0: " "
+ text run at (30,130) width 20: " 6"
+ text run at (50,130) width 0: " "
+ text run at (30,150) width 20: " 7"
+ text run at (50,150) width 0: " "
+ text run at (30,170) width 20: " 8"
+ text run at (50,170) width 0: " "
+ text run at (30,190) width 20: " 9"
+ text run at (50,190) width 0: " "
+ text run at (30,210) width 24: " 10"
+ text run at (54,210) width 0: " "
+ text run at (30,230) width 24: " 11"
+ text run at (54,230) width 0: " "
+ text run at (30,250) width 24: " 12"
+ text run at (54,250) width 0: " "
+ text run at (30,270) width 24: " 13"
+ text run at (54,270) width 0: " "
+ text run at (30,290) width 24: " 14"
+ text run at (54,290) width 0: " "
+ text run at (30,310) width 24: " 15"
+ text run at (54,310) width 0: " "
+ text run at (30,330) width 24: " 16"
+ text run at (54,330) width 0: " "
+ text run at (30,350) width 24: " 17"
+ text run at (54,350) width 0: " "
+ text run at (30,370) width 24: " 18"
+ text run at (54,370) width 0: " "
+ text run at (30,390) width 24: " 19"
+ text run at (54,390) width 0: " "
+ text run at (30,410) width 32: " 20 "
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/css/getComputedStyle-basic-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
index 358a0d1..247930b 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
@@ -40,6 +40,8 @@ rect: style.getPropertyValue(border-top-width) : 0px
rect: style.getPropertyCSSValue(border-top-width) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(bottom) : auto
rect: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(box-shadow) : none
+rect: style.getPropertyCSSValue(box-shadow) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(caption-side) : top
rect: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(clear) : none
@@ -144,6 +146,8 @@ rect: style.getPropertyValue(text-indent) : 0px
rect: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(text-shadow) : none
rect: style.getPropertyCSSValue(text-shadow) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(text-overflow) : clip
+rect: style.getPropertyCSSValue(text-overflow) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(text-transform) : none
rect: style.getPropertyCSSValue(text-transform) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(top) : auto
@@ -228,8 +232,6 @@ rect: style.getPropertyValue(-webkit-box-pack) : start
rect: style.getPropertyCSSValue(-webkit-box-pack) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-box-reflect) : none
rect: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-box-shadow) : none
-rect: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-box-sizing) : content-box
rect: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-column-break-after) : auto
@@ -440,6 +442,8 @@ g: style.getPropertyValue(border-top-width) : 0px
g: style.getPropertyCSSValue(border-top-width) : [object CSSPrimitiveValue]
g: style.getPropertyValue(bottom) : auto
g: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(box-shadow) : none
+g: style.getPropertyCSSValue(box-shadow) : [object CSSPrimitiveValue]
g: style.getPropertyValue(caption-side) : top
g: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
g: style.getPropertyValue(clear) : none
@@ -544,6 +548,8 @@ g: style.getPropertyValue(text-indent) : 0px
g: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
g: style.getPropertyValue(text-shadow) : none
g: style.getPropertyCSSValue(text-shadow) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(text-overflow) : clip
+g: style.getPropertyCSSValue(text-overflow) : [object CSSPrimitiveValue]
g: style.getPropertyValue(text-transform) : none
g: style.getPropertyCSSValue(text-transform) : [object CSSPrimitiveValue]
g: style.getPropertyValue(top) : auto
@@ -628,8 +634,6 @@ g: style.getPropertyValue(-webkit-box-pack) : start
g: style.getPropertyCSSValue(-webkit-box-pack) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-box-reflect) : none
g: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-box-shadow) : none
-g: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-box-sizing) : content-box
g: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-column-break-after) : auto
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
index c5cdd48..1781062 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
@@ -21,6 +21,7 @@ border-top-color: rgb(0, 0, 0);
border-top-style: none;
border-top-width: 0px;
bottom: auto;
+box-shadow: none;
caption-side: top;
clear: none;
clip: auto;
@@ -73,6 +74,7 @@ text-align: auto;
text-decoration: none;
text-indent: 0px;
text-shadow: none;
+text-overflow: clip;
text-transform: none;
top: auto;
unicode-bidi: normal;
@@ -115,7 +117,6 @@ zoom: 1;
-webkit-box-orient: horizontal;
-webkit-box-pack: start;
-webkit-box-reflect: none;
--webkit-box-shadow: none;
-webkit-box-sizing: content-box;
-webkit-column-break-after: auto;
-webkit-column-break-before: auto;
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
index 3c4cd3b..b54377f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
@@ -20,6 +20,7 @@ Computed style of an element whose parent's 'display' value is 'none':
border-top-style: solid
border-top-width: 16px
bottom: auto
+ box-shadow: none
caption-side: top
clear: none
clip: auto
@@ -72,6 +73,7 @@ Computed style of an element whose parent's 'display' value is 'none':
text-decoration: none
text-indent: 0px
text-shadow: none
+ text-overflow: clip
text-transform: none
top: auto
unicode-bidi: normal
@@ -114,7 +116,6 @@ Computed style of an element whose parent's 'display' value is 'none':
-webkit-box-orient: horizontal
-webkit-box-pack: start
-webkit-box-reflect: none
- -webkit-box-shadow: none
-webkit-box-sizing: content-box
-webkit-column-break-after: auto
-webkit-column-break-before: auto
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.checksum
new file mode 100644
index 0000000..63b677b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.checksum
@@ -0,0 +1 @@
+9149d9d255e7481ade72f1ec7adb91dc \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.png
new file mode 100644
index 0000000..72be637
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.txt
new file mode 100644
index 0000000..5b40c80
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-with-local-background-attachment-expected.txt
@@ -0,0 +1,60 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x298
+ RenderBlock {HTML} at (0,0) size 800x298
+ RenderBody {BODY} at (8,16) size 784x274
+ RenderBlock {UL} at (0,0) size 784x60 [color=#000080]
+ RenderListItem {LI} at (40,0) size 744x20
+ RenderListMarker at (-18,0) size 7x19: bullet
+ RenderText {#text} at (0,0) size 323x19
+ text run at (0,0) width 323: "You should not see the background under the border."
+ RenderListItem {LI} at (40,20) size 744x20
+ RenderListMarker at (-18,0) size 7x19: bullet
+ RenderText {#text} at (0,0) size 326x19
+ text run at (0,0) width 326: "As you scroll the element below the cats should move."
+ RenderListItem {LI} at (40,40) size 744x20
+ RenderListMarker at (-18,0) size 7x19: bullet
+ RenderText {#text} at (0,0) size 281x19
+ text run at (0,0) width 281: "The cats should be on a light grey background."
+layer at (8,92) size 390x198 clip at (38,122) size 315x138 scrollHeight 399
+ RenderBlock {DIV} at (0,76) size 390x198 [bgcolor=#C0C0C0] [border: (30px dotted #000000)]
+ RenderText {#text} at (30,30) size 32x399
+ text run at (30,30) width 20: " 1"
+ text run at (50,30) width 0: " "
+ text run at (30,50) width 20: " 2"
+ text run at (50,50) width 0: " "
+ text run at (30,70) width 20: " 3"
+ text run at (50,70) width 0: " "
+ text run at (30,90) width 20: " 4"
+ text run at (50,90) width 0: " "
+ text run at (30,110) width 20: " 5"
+ text run at (50,110) width 0: " "
+ text run at (30,130) width 20: " 6"
+ text run at (50,130) width 0: " "
+ text run at (30,150) width 20: " 7"
+ text run at (50,150) width 0: " "
+ text run at (30,170) width 20: " 8"
+ text run at (50,170) width 0: " "
+ text run at (30,190) width 20: " 9"
+ text run at (50,190) width 0: " "
+ text run at (30,210) width 24: " 10"
+ text run at (54,210) width 0: " "
+ text run at (30,230) width 24: " 11"
+ text run at (54,230) width 0: " "
+ text run at (30,250) width 24: " 12"
+ text run at (54,250) width 0: " "
+ text run at (30,270) width 24: " 13"
+ text run at (54,270) width 0: " "
+ text run at (30,290) width 24: " 14"
+ text run at (54,290) width 0: " "
+ text run at (30,310) width 24: " 15"
+ text run at (54,310) width 0: " "
+ text run at (30,330) width 24: " 16"
+ text run at (54,330) width 0: " "
+ text run at (30,350) width 24: " 17"
+ text run at (54,350) width 0: " "
+ text run at (30,370) width 24: " 18"
+ text run at (54,370) width 0: " "
+ text run at (30,390) width 24: " 19"
+ text run at (54,390) width 0: " "
+ text run at (30,410) width 32: " 20 "
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
index 358a0d1..247930b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
@@ -40,6 +40,8 @@ rect: style.getPropertyValue(border-top-width) : 0px
rect: style.getPropertyCSSValue(border-top-width) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(bottom) : auto
rect: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(box-shadow) : none
+rect: style.getPropertyCSSValue(box-shadow) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(caption-side) : top
rect: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(clear) : none
@@ -144,6 +146,8 @@ rect: style.getPropertyValue(text-indent) : 0px
rect: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(text-shadow) : none
rect: style.getPropertyCSSValue(text-shadow) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(text-overflow) : clip
+rect: style.getPropertyCSSValue(text-overflow) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(text-transform) : none
rect: style.getPropertyCSSValue(text-transform) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(top) : auto
@@ -228,8 +232,6 @@ rect: style.getPropertyValue(-webkit-box-pack) : start
rect: style.getPropertyCSSValue(-webkit-box-pack) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-box-reflect) : none
rect: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-box-shadow) : none
-rect: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-box-sizing) : content-box
rect: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-column-break-after) : auto
@@ -440,6 +442,8 @@ g: style.getPropertyValue(border-top-width) : 0px
g: style.getPropertyCSSValue(border-top-width) : [object CSSPrimitiveValue]
g: style.getPropertyValue(bottom) : auto
g: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(box-shadow) : none
+g: style.getPropertyCSSValue(box-shadow) : [object CSSPrimitiveValue]
g: style.getPropertyValue(caption-side) : top
g: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
g: style.getPropertyValue(clear) : none
@@ -544,6 +548,8 @@ g: style.getPropertyValue(text-indent) : 0px
g: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
g: style.getPropertyValue(text-shadow) : none
g: style.getPropertyCSSValue(text-shadow) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(text-overflow) : clip
+g: style.getPropertyCSSValue(text-overflow) : [object CSSPrimitiveValue]
g: style.getPropertyValue(text-transform) : none
g: style.getPropertyCSSValue(text-transform) : [object CSSPrimitiveValue]
g: style.getPropertyValue(top) : auto
@@ -628,8 +634,6 @@ g: style.getPropertyValue(-webkit-box-pack) : start
g: style.getPropertyCSSValue(-webkit-box-pack) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-box-reflect) : none
g: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-box-shadow) : none
-g: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-box-sizing) : content-box
g: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-column-break-after) : auto
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c3aacf8..22271ce 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2987,11 +2987,3 @@ BUG17499 MAC : LayoutTests/platform/mac/fast/loader/non-html-load-event.html = C
BUG17509 LINUX : LayoutTests/fast/loader/local-CSS-from-local.html = FAIL
BUG17509 LINUX : LayoutTests/fast/loader/local-JavaScript-from-local.html = FAIL TIMEOUT
BUG17509 LINUX : LayoutTests/fast/loader/local-image-from-local.html = FAIL
-
-// These need new baselines for the merge r46270:46282.
-BUG_DARIN WIN LINUX : LayoutTests/fast/overflow/overflow-with-local-background-attachment.html = FAIL
-
-// These need new baselines for the merge r46282:46288.
-BUG_DARIN WIN LINUX : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/fast/css/getComputedStyle/computed-style.html = FAIL
-BUG_DARIN WIN LINUX : LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL