summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 22:01:14 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 22:01:14 +0000
commit247d30b530b4294c0f18181d9f5041a768851bb9 (patch)
treea44611f4aebb1ff4c275cb59e60803e704dda613
parentd742d2f41fd7035ef040a1b76bd5bcd93ae9b0ac (diff)
downloadchromium_src-247d30b530b4294c0f18181d9f5041a768851bb9.zip
chromium_src-247d30b530b4294c0f18181d9f5041a768851bb9.tar.gz
chromium_src-247d30b530b4294c0f18181d9f5041a768851bb9.tar.bz2
WebKit merge 49640:49597
Review URL: http://codereview.chromium.org/267126 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29198 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
2 files changed, 11 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 949936a..a99b4ae 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49597",
+ "webkit_revision": "49640",
"ffmpeg_revision": "28488",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 2def537..c1d34bb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3181,3 +3181,13 @@ BUG24862 LINUX : LayoutTests/fast/replaced/border-radius-clip.html = FAIL
// WebKit roll 49583:49597
BUG24865 WIN : LayoutTests/fast/css/large-number-round-trip.html = FAIL
BUG24930 MAC LINUX : LayoutTests/editing/selection/editable-html-element.html = FAIL
+
+// WebKit Roll 49597:49640
+BUG24959 : LayoutTests/fast/block/float/float-in-float-hit-testing.html = FAIL
+BUG24961 : LayoutTests/fast/events/clientXY-in-zoom-and-scroll.html = FAIL
+BUG24962 WIN LINUX : LayoutTests/fast/events/click-focus-anchor.html = FAIL
+BUG24963 MAC : LayoutTests/fast/inline/dirtyLinesForInline.html = FAIL
+BUG24964 MAC : LayoutTests/fast/backgrounds/svg-as-background-6.html = FAIL
+BUG24964 WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = FAIL
+BUG24965 LINUX : LayoutTests/fast/forms/preserveFormDuringResidualStyle.html = CRASH
+BUG24966 MAC : LayoutTests/fast/frames/calculate-fixed.html = CRASH