diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 04:36:55 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 04:36:55 +0000 |
| commit | ab0048db5fe5f64df2c867197209f0bb3bb44106 (patch) | |
| tree | 9d19845c2c044f03b0fc7e2a041352786ef66710 | |
| parent | 165bdceabe65b18a85ac10b318ce2820110d2bdb (diff) | |
| download | chromium_src-ab0048db5fe5f64df2c867197209f0bb3bb44106.zip chromium_src-ab0048db5fe5f64df2c867197209f0bb3bb44106.tar.gz chromium_src-ab0048db5fe5f64df2c867197209f0bb3bb44106.tar.bz2 | |
WebKit roll 72346:72361.
Also remove upstreamed items from test_expectations.
BUG=None
TEST=None
TBR=antonm@chromium.org
Review URL: http://codereview.chromium.org/5100009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66740 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 9 |
2 files changed, 3 insertions, 8 deletions
@@ -4,7 +4,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": "72346", + "webkit_revision": "72361", "skia_revision": "626", "chromium_git": "http://git.chromium.org/git", "swig_revision": "40423", diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 5891e32..11cd1be 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -5,10 +5,5 @@ // Only add expectations here to temporarily suppress messages on the bots // until the changes can be landed upstream. -BUG_LEVIN : fast/dom/StyleSheet/gc-inline-style-cssvalues.html = TEXT -BUG_LEVIN : fast/dom/StyleSheet/gc-styleheet-wrapper.xhtml = TEXT - -// Due to r66721, which reverted a context menu change to attempt to fix -// crashes on Windows. -BUG63460 : editing/selection/context-menu-on-text.html = TEXT -BUG63460 : editing/spelling/context-menu-suggestions.html = TEXT +BUG_LEVIN MAC : fast/ruby/nested-ruby.html = IMAGE +BUG_LEVIN WIN LINUX : fast/ruby/nested-ruby.html = IMAGE+TEXT |