diff options
| author | caseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 13:13:25 +0000 |
|---|---|---|
| committer | caseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 13:13:25 +0000 |
| commit | d1eb9488278abb41cdea240162aec3daae50cecd (patch) | |
| tree | e0c9c4a8bc528ef82043a15c0692b58b8cc3c300 | |
| parent | c68b65499f302ff9c361c2bb67b2841b1cadc91f (diff) | |
| download | chromium_src-d1eb9488278abb41cdea240162aec3daae50cecd.zip chromium_src-d1eb9488278abb41cdea240162aec3daae50cecd.tar.gz chromium_src-d1eb9488278abb41cdea240162aec3daae50cecd.tar.bz2 | |
Roll WebKit 68215:68248
Dropped upstreamed test expectations.
BUG=none
TEST=none
TBR=senorblanco
Review URL: http://codereview.chromium.org/3416025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60462 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 10 |
2 files changed, 1 insertions, 11 deletions
@@ -2,7 +2,7 @@ vars = { "googlecode_url": "http://%s.googlecode.com/svn", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "68215", + "webkit_revision": "68248", "ffmpeg_revision": "58574", "skia_revision": "599", "chromium_git": "http://src.chromium.org/git", diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index cd676f0..4fcbc92 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -11,15 +11,5 @@ BUGJOHNNYG LINUX : plugins/embed-attributes-style.html = IMAGE // atwilson will upstream BUGATWILSON : svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE CRASH - -// atwilson will remove once we roll past 68193 -BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-dom-in-attr.html = IMAGE -BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-dom-operator-attr.html = IMAGE -BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-dom-radius-attr.html = IMAGE -BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-svgdom-in-prop.html = IMAGE -BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-svgdom-operator-prop.html = IMAGE -BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-svgdom-radius-call.html = IMAGE - -// atwilson will upstream BUGATWILSON : storage/indexeddb/transaction-basics.html = CRASH |