summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/shorthand-border-transitions-expected.txt29
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 14 insertions, 19 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/shorthand-border-transitions-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/shorthand-border-transitions-expected.txt
index eb39cc7..e173b82 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/shorthand-border-transitions-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/shorthand-border-transitions-expected.txt
@@ -1,15 +1,14 @@
-Tests transitions of the border shorthand properties.
-
-PASS - "border-top-color" property for "box" element at 0.5s saw something close to: 128,0,128
-PASS - "border-right-color" property for "box" element at 0.5s saw something close to: 128,0,128
-PASS - "border-bottom-color" property for "box" element at 0.5s saw something close to: 128,0,128
-PASS - "border-left-color" property for "box" element at 0.5s saw something close to: 128,0,128
-PASS - "border-top-width" property for "box" element at 0.5s saw something close to: 10
-PASS - "border-right-width" property for "box" element at 0.5s saw something close to: 10
-PASS - "border-bottom-width" property for "box" element at 0.5s saw something close to: 10
-PASS - "border-left-width" property for "box" element at 0.5s saw something close to: 10
-PASS - "border-top-width" property for "box1" element at 0.5s saw something close to: 10
-PASS - "border-top-color" property for "box1" element at 0.5s saw something close to: 255,0,255
-PASS - "border-top-width" property for "box2" element at 0.5s saw something close to: 10
-PASS - "border-bottom-width" property for "box2" element at 0.5s saw something close to: 20
-
+Tests transitions of the border shorthand properties.
+
+PASS - "border-top-color" property for "box" element at 0.25s saw something close to: 128,0,128
+PASS - "border-right-color" property for "box" element at 0.25s saw something close to: 128,0,128
+PASS - "border-bottom-color" property for "box" element at 0.25s saw something close to: 128,0,128
+PASS - "border-left-color" property for "box" element at 0.25s saw something close to: 128,0,128
+PASS - "border-top-width" property for "box" element at 0.25s saw something close to: 10
+PASS - "border-right-width" property for "box" element at 0.25s saw something close to: 10
+PASS - "border-bottom-width" property for "box" element at 0.25s saw something close to: 10
+PASS - "border-left-width" property for "box" element at 0.25s saw something close to: 10
+PASS - "border-top-width" property for "box1" element at 0.25s saw something close to: 10
+PASS - "border-top-color" property for "box1" element at 0.25s saw something close to: 255,0,255
+PASS - "border-top-width" property for "box2" element at 0.25s saw something close to: 10
+PASS - "border-bottom-width" property for "box2" element at 0.25s saw something close to: 20
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 82747e6..4954bb7 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2367,9 +2367,6 @@ BUG12361 LINUX MAC DEBUG : http/tests/cookies/double-quoted-value-with-semi-colo
BUG12361 LINUX RELEASE : http/tests/cookies/double-quoted-value-with-semi-colon.html = FAIL
BUG12361 SLOW MAC RELEASE : http/tests/cookies/double-quoted-value-with-semi-colon.html = FAIL
-// WebKit 44286:44342
-BUG13174 WIN : transitions/shorthand-border-transitions.html = PASS FAIL
-
// WebKit 44438:44544
BUG13721 LINUX : fast/dynamic/positioned-movement-with-positioned-children.html = FAIL
@@ -2627,7 +2624,6 @@ BUG27418 MAC DEBUG : plugins/netscape-throw-exception.html = PASS TEXT
BUG27418 MAC DEBUG : plugins/get-url-that-the-resource-load-delegate-will-disallow.html = PASS TEXT
BUG27418 MAC DEBUG : plugins/netscape-identifier-conversion.html = PASS TEXT
BUG27418 MAC DEBUG : plugins/open-and-close-window-with-plugin.html = PASS TEXT
-BUG27418 MAC DEBUG : transitions/shorthand-border-transitions.html = PASS TEXT
// The following upstream patches add -Webkit-color-correction support:
// http://trac.webkit.org/changeset/50760