diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 22:53:07 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 22:53:07 +0000 |
| commit | f4b42e3f06adcc1f0856f5950807f1d78af5ba7b (patch) | |
| tree | 0e003a6afa2da47efafcc7dad42a8bbb35e462f2 | |
| parent | c8ff07f97b94092cb8f147df9534432fccf91413 (diff) | |
| download | chromium_src-f4b42e3f06adcc1f0856f5950807f1d78af5ba7b.zip chromium_src-f4b42e3f06adcc1f0856f5950807f1d78af5ba7b.tar.gz chromium_src-f4b42e3f06adcc1f0856f5950807f1d78af5ba7b.tar.bz2 | |
WebKit merge 94770:94807
BUG=none
TEST=none
TBR=ukai
Review URL: http://codereview.chromium.org/7859010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100291 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 9 |
2 files changed, 1 insertions, 10 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": "94770", + "webkit_revision": "94807", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", "nacl_revision": "6641", diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 1f82137..3c28715 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -7,20 +7,11 @@ // PLEASE DO NOT LEAVE ENTRIES IN THIS FILE FOR MORE THAN 24 HRS. -// rebaselined upstream already! -BUG_LEVIN : http/tests/eventsource/existent-eventsource-status-error-iframe-crash.html = FAIL - BUG_LOISLO WIN GPU : fast/canvas/canvas-text-alignment.html = IMAGE BUG_LOISLO WIN LINUX : inspector/debugger/scripts-sorting.html = TEXT BUG_LOISLO WIN LINUX : fast/css/line-after-floating-div.html = IMAGE+TEXT BUG_LOISLO WIN LINUX : fast/text/hyphenate-limit-lines.html = IMAGE+TEXT -BUG_LOISLO LINUX : svg/W3C-SVG-1.1-SE/filters-image-05-f.svg = IMAGE+TEXT BUG_LOISLO WIN : tables/mozilla_expected_failures/bugs/bug2479-5.html = TEXT BUG_LOISLO MAC : fast/text/hyphenate-limit-lines.html = IMAGE BUG_LOISLO MAC : svg/custom/feComponentTransfer-Table.svg = IMAGE - -BUG_REED : compositing/overflow/overflow-positioning.html = IMAGE -BUG_REED : fast/canvas/canvas-text-baseline.html = IMAGE -BUG_REED : fast/canvas/quadraticCurveTo.xml = IMAGE -BUG_REED : fast/canvas/canvas-lineWidth.html = TEXT |