summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 18:03:29 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 18:03:29 +0000
commit32eabb7b8313f302e09015789f6ab79b41e7dbb2 (patch)
tree3b69a55be535c552e5f6172d6fdc38989114f59a
parent088f191d57adff03bad6b2e870bf880bd0970cef (diff)
downloadchromium_src-32eabb7b8313f302e09015789f6ab79b41e7dbb2.zip
chromium_src-32eabb7b8313f302e09015789f6ab79b41e7dbb2.tar.gz
chromium_src-32eabb7b8313f302e09015789f6ab79b41e7dbb2.tar.bz2
WebKit roll 51310:51325.
BUG=28646 TEST=none Review URL: http://codereview.chromium.org/437029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32940 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 474513dc..ee1829a 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51310",
+ "webkit_revision": "51325",
"ffmpeg_revision": "30374",
"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 4dcbbdd..33f9fac 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3050,3 +3050,6 @@ BUG28605 : LayoutTests/plugins/reloadplugins-and-pages.html = TIMEOUT
BUG28605 WIN LINUX : LayoutTests/svg/filters/big-sized-filter.svg = IMAGE
BUG28605 : LayoutTests/svg/filters/big-sized-filter-2.svg = MISSING
BUG28605 WIN LINUX : LayoutTests/svg/filters/filterRes.svg = IMAGE
+
+// New tests. Failures from merge 51210:51325.
+BUG28646 : LayoutTests/editing/selection/transformed-selection-rects.html = FAIL