summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-24 05:25:10 +0000
committerhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-24 05:25:10 +0000
commit5d828d919a53d0d8005488c2b09a4a3c99089cb1 (patch)
treea020d5d90cfd87ed440b4ce7a1b15aad66e952a5
parent117cc827cfcbfe47f934d2aecb43cdcd24c7c88b (diff)
downloadchromium_src-5d828d919a53d0d8005488c2b09a4a3c99089cb1.zip
chromium_src-5d828d919a53d0d8005488c2b09a4a3c99089cb1.tar.gz
chromium_src-5d828d919a53d0d8005488c2b09a4a3c99089cb1.tar.bz2
WebKit roll 52468:52535
TBR=pamg TEST=trybots BUG=none Review URL: http://codereview.chromium.org/518014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35257 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 1f7caed..68a4264 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "52468",
+ "webkit_revision": "52535",
"ffmpeg_revision": "34297",
"skia_revision": "457",
"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 e67acad..7cf4cd3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3129,3 +3129,13 @@ BUG30938 WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE
BUG30939 WIN LINUX : LayoutTests/svg/custom/image-with-transform-clip-filter.svg = IMAGE
BUG30939 : LayoutTests/svg/filters/filter-clip.svg = IMAGE+TEXT
BUG30792 WIN LINUX : LayoutTests/fast/text/fake-italic.html = IMAGE+TEXT
+
+// WebKit roll 52468->52535
+BUG31108 WIN LINUX : LayoutTests/fast/text/international/bidi-layout-across-linebreak.html = TEXT
+BUG31108 : LayoutTests/http/tests/security/listener/xss-inactive-closure.html = TEXT
+BUG31108 : LayoutTests/websocket/tests/bad-sub-protocol.html = TEXT
+BUG31108 : LayoutTests/websocket/tests/url-parsing.html = TEXT
+BUG31108 LINUX LayoutTests/editing/inserting/12882.html = IMAGE
+BUG31108 WIN LINUX : LayoutTests/fast/forms/basic-selects.html = IMAGE+TEXT
+BUG31108 WIN LINUX : LayoutTests/fast/forms/basic-textareas-quirks.html = IMAGE+TEXT
+BUG31108 MAC : LayoutTests/fast/forms/basic-textareas-quirks.html = IMAGE