Rebaselines animations/keyframes-rule-expected.txt . The upstream test

changed slightly.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/16427

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7387 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 66 insertions, 63 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/animations/keyframes-rule-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/animations/keyframes-rule-expected.txt
index 64907c8..f5719a0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/animations/keyframes-rule-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/animations/keyframes-rule-expected.txt
@@ -1,62 +1,64 @@
-This tests the WebKitCSSKeyframeRule and WebKitCSSKeyframesRule interfaces.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS WEBKIT_KEYFRAME_RULE exists on Window object
-PASS WEBKIT_KEYFRAMES_RULE exists on Window object
-
-PASS keyframes1.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE
-PASS keyframes1.name is 'test1'
-
-PASS rules1.length is 2
-PASS rules1.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
-PASS rules1.item(0).cssText is '0% { left: 10px; }'
-PASS rules1.item(1).cssText is '100% { left: 20px; }'
-
-Insert three new rules
-PASS rules1.length is 5
-PASS rules1.item(0).cssText is '0% { left: 10px; }'
-PASS rules1.item(1).cssText is '100% { left: 20px; }'
-PASS rules1.item(2).cssText is '30% { left: 30px; }'
-PASS rules1.item(3).cssText is '60% { left: 60px; }'
-PASS rules1.item(4).cssText is '20% { left: 50px; }'
-
-PASS keyframes2.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE
-PASS keyframes2.name is 'test2'
-
-PASS rules2.length is 3
-PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
-PASS rules2.item(0).keyText is '0%'
-PASS rules2.item(1).keyText is '50%'
-PASS rules2.item(2).keyText is '100%'
-PASS rules2.item(0).cssText is '0% { left: 10px; }'
-PASS rules2.item(1).cssText is '50% { left: 30px; }'
-PASS rules2.item(2).cssText is '100% { left: 20px; }'
-
-FAIL typeof(rules2.item(0).style) should be function. Was object.
-PASS rules2.item(0).style.length is 1
-
-Find a rule
-PASS rule.type is window.CSSRule.WEBKIT_KEYFRAME_RULE
-PASS rule.cssText is '50% { left: 30px; }'
-
-Try to find a rule that doesn't exist
-PASS Non-existent rule was not found
-
-Delete a rule
-PASS rules2.length is 2
-PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
-PASS rules2.item(0).keyText is '0%'
-PASS rules2.item(1).keyText is '100%'
-
-Delete a rule that doesn't exist
-PASS rules2.length is 2
-PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
-PASS rules2.item(0).keyText is '0%'
-PASS rules2.item(1).keyText is '100%'
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
+This tests the WebKitCSSKeyframeRule and WebKitCSSKeyframesRule interfaces.

+

+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

+

+

+PASS WebKitCSSKeyframeRule exists on Window object

+PASS WebKitCSSKeyframesRule exists on Window object

+PASS WEBKIT_KEYFRAME_RULE exists on Window.CSSRule object

+PASS WEBKIT_KEYFRAMES_RULE exists on Window.CSSRule object

+

+PASS keyframes1.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE

+PASS keyframes1.name is 'test1'

+

+PASS rules1.length is 2

+PASS rules1.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE

+PASS rules1.item(0).cssText is '0% { left: 10px; }'

+PASS rules1.item(1).cssText is '100% { left: 20px; }'

+

+Insert three new rules

+PASS rules1.length is 5

+PASS rules1.item(0).cssText is '0% { left: 10px; }'

+PASS rules1.item(1).cssText is '100% { left: 20px; }'

+PASS rules1.item(2).cssText is '30% { left: 30px; }'

+PASS rules1.item(3).cssText is '60% { left: 60px; }'

+PASS rules1.item(4).cssText is '20% { left: 50px; }'

+

+PASS keyframes2.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE

+PASS keyframes2.name is 'test2'

+

+PASS rules2.length is 3

+PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE

+PASS rules2.item(0).keyText is '0%'

+PASS rules2.item(1).keyText is '50%'

+PASS rules2.item(2).keyText is '100%'

+PASS rules2.item(0).cssText is '0% { left: 10px; }'

+PASS rules2.item(1).cssText is '50% { left: 30px; }'

+PASS rules2.item(2).cssText is '100% { left: 20px; }'

+

+FAIL typeof(rules2.item(0).style) should be function. Was object.

+PASS rules2.item(0).style.length is 1

+

+Find a rule

+PASS rule.type is window.CSSRule.WEBKIT_KEYFRAME_RULE

+PASS rule.cssText is '50% { left: 30px; }'

+

+Try to find a rule that doesn't exist

+PASS Non-existent rule was not found

+

+Delete a rule

+PASS rules2.length is 2

+PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE

+PASS rules2.item(0).keyText is '0%'

+PASS rules2.item(1).keyText is '100%'

+

+Delete a rule that doesn't exist

+PASS rules2.length is 2

+PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE

+PASS rules2.item(0).keyText is '0%'

+PASS rules2.item(1).keyText is '100%'

+

+PASS successfullyParsed is true

+

+TEST COMPLETE

+

diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 94aa168..292f409 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1735,7 +1735,8 @@ WIN : LayoutTests/svg/custom/stroke-fallback.svg = FAIL
 // Merge 39143:39309
 // This test needs to be rebaselined on Mac/Linux.
 LINUX MAC : LayoutTests/animations/animation-drt-api-multiple-keyframes.html = FAIL
-LayoutTests/animations/keyframes-rule.html = FAIL
+// This test needs to be rebaselined on Mac/Linux.
+LINUX MAC : LayoutTests/animations/keyframes-rule.html = FAIL
 LayoutTests/fast/dom/object-embed-plugin-scripting.html = FAIL
 LayoutTests/fast/js/regexp-no-extensions.html = FAIL
 LayoutTests/fast/regex/quantified-assertions.html = FAIL