summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 06:07:54 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 06:07:54 +0000
commited23561932b7be119b92366ce9aa6defd9b0ae02 (patch)
treec630615eccf1298feaa7b7e3a61feefe61a18475
parentdcc04f557ba0c524626d0aad24fd15081da042c6 (diff)
downloadchromium_src-ed23561932b7be119b92366ce9aa6defd9b0ae02.zip
chromium_src-ed23561932b7be119b92366ce9aa6defd9b0ae02.tar.gz
chromium_src-ed23561932b7be119b92366ce9aa6defd9b0ae02.tar.bz2
Webkit Roll to r55683 (from r55674)
TBR=japhet TEST=bots BUG=none Review URL: http://codereview.chromium.org/672018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41004 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
2 files changed, 10 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 23b9559..81e8704 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "55674",
+ "webkit_revision": "55683",
"ffmpeg_revision": "40718",
"skia_revision": "504",
"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 7104137..0a4f41a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2864,5 +2864,13 @@ BUG37710 MAC SKIP : media/video-src-change.html = CRASH PASS
BUG_JIANLI : http/tests/local/send-sliced-dragged-file.html = FAIL
// WebKit roll 55670 -> 55674
-BUG_37684 SKIP : http/tests/cookies/third-party-cookie-relaxing.html = FAIL
+BUG37684 SKIP : http/tests/cookies/third-party-cookie-relaxing.html = FAIL
+
+// WebKit roll 55674 -> r55683
+BUG37735 : fast/events/spatial-navigation/snav-table-traversal.html = TEXT
+BUG37735 : fast/events/spatial-navigation/snav-tiny-table-traversal.html = TEXT
+BUG37740 : fast/dom/DOMImplementation/createDocument-with-used-doctype.html = TEXT
+BUG_MICHAELN : fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT
+BUG_MICHAELN : fast/css/getComputedStyle/computed-style.html = TEXT
+BUG_MICHAELN : fast/dom/Window/window-appendages-cleared.html = TEXT