diff options
| author | caseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 06:29:42 +0000 |
|---|---|---|
| committer | caseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 06:29:42 +0000 |
| commit | 5ea04528e707df5a74c4a1b88503c113930949b8 (patch) | |
| tree | 2779c9c9989af835644703956893dba08dbc41ed | |
| parent | 259750db9b2a4dbcde07d1e7078974df65c03053 (diff) | |
| download | chromium_src-5ea04528e707df5a74c4a1b88503c113930949b8.zip chromium_src-5ea04528e707df5a74c4a1b88503c113930949b8.tar.gz chromium_src-5ea04528e707df5a74c4a1b88503c113930949b8.tar.bz2 | |
Re-roll WebKit 68100:68178 (Revert 60401)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3423023
TBR=atwilson@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60431 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 12 |
2 files changed, 13 insertions, 1 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": "68100", + "webkit_revision": "68178", "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 e656fdc..cd676f0 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -11,3 +11,15 @@ 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 + |