diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 20:04:11 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 20:04:11 +0000 |
| commit | 73ba2d3854de8691df351a03de34f2e5261038f4 (patch) | |
| tree | d97826d9e112d13a6c9142d85ea819eac18ebc08 /webkit/tools | |
| parent | 23e891ac1f17ddf3fa4221729b0ebf5fe548a48a (diff) | |
| download | chromium_src-73ba2d3854de8691df351a03de34f2e5261038f4.zip chromium_src-73ba2d3854de8691df351a03de34f2e5261038f4.tar.gz chromium_src-73ba2d3854de8691df351a03de34f2e5261038f4.tar.bz2 | |
Webkit merge from 44668 to 44682.
Fix a the compile by renaming JSONObject to InspectorJSONObject
(upstream r44682) and add a test expection for a new test. The
windows expectation is just a copy of the linux one, I need to
rebaseline it on windows.
Review URL: http://codereview.chromium.org/126148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index f87eeaa..aa30adf2 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2794,3 +2794,5 @@ BUG14014 DEBUG : LayoutTests/fast/events/tabindex-focus-chain.html = FAIL 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 |