summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 00:16:19 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 00:16:19 +0000
commit77944a8e0d3cc3b326023752951e7b7d299d2827 (patch)
tree677154bf25985bd856ce6bf29b704a54e9cce0d1
parenta0ef9e131a03fb76aa9b59b4123ceb05bb366cc0 (diff)
downloadchromium_src-77944a8e0d3cc3b326023752951e7b7d299d2827.zip
chromium_src-77944a8e0d3cc3b326023752951e7b7d299d2827.tar.gz
chromium_src-77944a8e0d3cc3b326023752951e7b7d299d2827.tar.bz2
Update computedStyle tests to add color-correction CSS property.
TBR=japhet TEST=none BUG=none Review URL: http://codereview.chromium.org/399017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32130 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt4
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt4
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
7 files changed, 13 insertions, 9 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
index a2bcc99..a3cca02 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
@@ -121,6 +121,7 @@ zoom: 1;
-webkit-box-reflect: none;
-webkit-box-shadow: none;
-webkit-box-sizing: content-box;
+-webkit-color-correction: default;
-webkit-column-break-after: auto;
-webkit-column-break-before: auto;
-webkit-column-break-inside: auto;
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
index 7ae984a..c133b24 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
@@ -120,6 +120,7 @@ Computed style of an element whose parent's 'display' value is 'none':
-webkit-box-reflect: none
-webkit-box-shadow: none
-webkit-box-sizing: content-box
+ -webkit-color-correction: default
-webkit-column-break-after: auto
-webkit-column-break-before: auto
-webkit-column-break-inside: auto
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
index b0cc293..fae4242 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
@@ -240,6 +240,8 @@ 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-color-correction) : default
+rect: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-column-break-after) : auto
rect: style.getPropertyCSSValue(-webkit-column-break-after) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-column-break-before) : auto
@@ -650,6 +652,8 @@ 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-color-correction) : default
+g: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-column-break-after) : auto
g: style.getPropertyCSSValue(-webkit-column-break-after) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-column-break-before) : 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 ab25bb7..f0e52bb 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
@@ -121,6 +121,7 @@ zoom: 1;
-webkit-box-reflect: none;
-webkit-box-shadow: none;
-webkit-box-sizing: content-box;
+-webkit-color-correction: default;
-webkit-column-break-after: auto;
-webkit-column-break-before: auto;
-webkit-column-break-inside: 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 d6ff4d5..9ef65d7 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
@@ -120,6 +120,7 @@ Computed style of an element whose parent's 'display' value is 'none':
-webkit-box-reflect: none
-webkit-box-shadow: none
-webkit-box-sizing: content-box
+ -webkit-color-correction: default
-webkit-column-break-after: auto
-webkit-column-break-before: auto
-webkit-column-break-inside: auto
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 fa996c2..2da69b1 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
@@ -240,6 +240,8 @@ 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-color-correction) : default
+rect: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-column-break-after) : auto
rect: style.getPropertyCSSValue(-webkit-column-break-after) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-column-break-before) : auto
@@ -650,6 +652,8 @@ 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-color-correction) : default
+g: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-column-break-after) : auto
g: style.getPropertyCSSValue(-webkit-column-break-after) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-column-break-before) : auto
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b087d07..20f3e5a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -91,6 +91,7 @@ BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/xmlhttprequest/connection-err
BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/loading/onload-vs-immediate-refresh.pl = PASS
BUG24182 SLOW DEBUG : LayoutTests/editing/selection/extend-selection.html = PASS
BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS
+BUG24182 SLOW DEBUG : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS
// --- collecting results for supported-xml-content-types.html ---
BUG24182 SLOW WIN RELEASE : LayoutTests/http/tests/xmlhttprequest/supported-xml-content-types.html = PASS
@@ -3034,15 +3035,6 @@ BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-host.html =
BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-protocol.html = TEXT
// New tests and regressions related to WebKit r50760 (appeared in WebKit merge 50756:50820).
-BUG27551 WIN DEBUG : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT CRASH
-BUG27551 RELEASE : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT
-BUG27551 LINUX MAC DEBUG : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT
-BUG27551 WIN DEBUG : LayoutTests/fast/css/getComputedStyle/computed-style.html = TEXT CRASH
-BUG27551 RELEASE : LayoutTests/fast/css/getComputedStyle/computed-style.html = TEXT
-BUG27551 LINUX MAC DEBUG : LayoutTests/fast/css/getComputedStyle/computed-style.html = TEXT
-BUG27551 : LayoutTests/svg/css/getComputedStyle-basic.xhtml = TEXT
-// Add this expectation back in when passing again
-// BUG24182 SLOW DEBUG : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS
BUG27551 : LayoutTests/fast/css/color-correction-backgrounds-and-text.html = FAIL
BUG27551 : LayoutTests/fast/css/color-correction-on-backgrounds.html = FAIL
BUG27551 : LayoutTests/fast/css/color-correction-on-text.html = FAIL