summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 02:09:29 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 02:09:29 +0000
commitcef873ec6a0c09b0b2a1118e3d32de1ef44cf515 (patch)
tree7f7b769cd0bf6c7d4115e851515001f343ff7c2d
parent96ed7bbdbd62a60edbdb982154bc64a418ceaa45 (diff)
downloadchromium_src-cef873ec6a0c09b0b2a1118e3d32de1ef44cf515.zip
chromium_src-cef873ec6a0c09b0b2a1118e3d32de1ef44cf515.tar.gz
chromium_src-cef873ec6a0c09b0b2a1118e3d32de1ef44cf515.tar.bz2
Roll WebKit deps to pull in a fix. roll to 47854
TBR=ojan TEST=none BUG=none Review URL: http://codereview.chromium.org/181004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24716 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 1 insertions, 5 deletions
diff --git a/DEPS b/DEPS
index 6d8a7e0..2181ea7 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "47846",
+ "webkit_revision": "47854",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 10cefb3..6ad6708 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2762,7 +2762,3 @@ BUG_JORLOW : LayoutTests/editing/pasteboard/files-during-page-drags.html = FAIL
// This newly added test times out on Mac:
BUG20438 MAC : chrome/plugins/get-url-with-iframe-target.html = TIMEOUT
BUG20438 MAC : chrome/plugins/get-url-with-iframe-target-no-crash.html = TIMEOUT
-
-// WebKit 47837:47846
-BUG_JORLOW LINUX : LayoutTests/fast/backgrounds/animated-gif-as-background.html = CRASH
-BUG_JORLOW : LayoutTests/fast/canvas/change-context.html = CRASH