diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 20:50:17 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 20:50:17 +0000 |
| commit | 9ad79bec5625c9b9492379f2aefd7ec23cf6cccd (patch) | |
| tree | c790fb69e3d94f36419f30b3fd9b93094ba7aa08 /webkit | |
| parent | 658c173725ff824f22a103e2e984ef580260d593 (diff) | |
| download | chromium_src-9ad79bec5625c9b9492379f2aefd7ec23cf6cccd.zip chromium_src-9ad79bec5625c9b9492379f2aefd7ec23cf6cccd.tar.gz chromium_src-9ad79bec5625c9b9492379f2aefd7ec23cf6cccd.tar.bz2 | |
Rebaseline 2 tests from the merge. Update the expectations file.
object-embed-plugin-scripting changed upstream in r44674. nth-child-dynamic is a new test.
TBR=levin
Review URL: http://codereview.chromium.org/126155
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
4 files changed, 2 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.checksum index 554a333..3a2311d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.checksum @@ -1 +1 @@ -408346a8903b361ef608c7ba14363f12
\ No newline at end of file +46e755ace43bee750b7d9adbd21dd1ff
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.png Binary files differindex feeddde8..bb35467 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt index d600515..b91e01a6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt @@ -14,4 +14,4 @@ plugin <embed> nested in empty <object> nested in plugin <object>: should not ha standalone plugin <embed>: should have a plugin and does - + diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 3fa0f1e..eb93e9a 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2794,6 +2794,3 @@ BUG14014 DEBUG : LayoutTests/fast/events/tabindex-focus-chain.html = FAIL // WebKit 44646:44668 BUG14061 : LayoutTests/svg/filters/subRegion-one-effect.svg = FAIL BUG14061 : LayoutTests/svg/filters/subRegion-two-effects.svg = FAIL - -// Webkit 44668:44682 -BUGMERGE REBASELINE WIN : LayoutTests/fast/css/nth-child-dynamic.html = FAIL |
