summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 14:54:51 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 14:54:51 +0000
commit97c1d6fabc3fb8d8eabbd346afa2148b86a5160d (patch)
tree836e47054cfb6b6366587e1bbcbd6658ae2c849c
parent76d3f0ea18c2b00e46887e375cff1fd5e6ca6d21 (diff)
downloadchromium_src-97c1d6fabc3fb8d8eabbd346afa2148b86a5160d.zip
chromium_src-97c1d6fabc3fb8d8eabbd346afa2148b86a5160d.tar.gz
chromium_src-97c1d6fabc3fb8d8eabbd346afa2148b86a5160d.tar.bz2
WebKit merge 44202:44252
Review URL: http://codereview.chromium.org/113985 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17189 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt23
2 files changed, 20 insertions, 5 deletions
diff --git a/DEPS b/DEPS
index 93d48e7..62de705 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "44202",
+ "webkit_revision": "44252",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 995f314..aa4ee74 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2572,12 +2572,8 @@ BUG11613 WIN : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FA
// These ones seem to be mask/opacity-related:
BUG12002 WIN LINUX : LayoutTests/fast/reflections/reflection-masks-opacity.html = FAIL
BUG12002 WIN LINUX : LayoutTests/fast/reflections/reflection-masks.html = FAIL
-BUG12002 WIN LINUX : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-16-b.svg = FAIL
-BUG12002 WIN : LayoutTests/svg/custom/gradient-stop-corner-cases.svg = FAIL
BUG12002 WIN DEBUG : LayoutTests/svg/custom/grayscale-gradient-mask.svg = FAIL
BUG12002 LINUX : LayoutTests/svg/custom/circular-marker-reference-3.svg = FAIL
-// This one seems to have patterned stroke issues:
-BUG12003 WIN : LayoutTests/svg/custom/js-late-gradient-and-object-creation.svg = FAIL
// This one is flaky on Linux
BUG12004 LINUX : LayoutTests/svg/custom/js-late-marker-creation.svg = FAIL PASS
@@ -2660,3 +2656,22 @@ BUG12477 : LayoutTests/http/tests/security/drag-over-remote-content-iframe.html
BUG12753 : LayoutTests/fast/dynamic/window-resize-scrollbars-test.html = FAIL
BUG12753 : LayoutTests/fast/dynamic/window-scrollbars-test.html = FAIL
+// WebKit 44202:44252 introduced new crashes
+BUG12860 : LayoutTests/http/tests/security/cross-frame-access-document-direct.html = CRASH
+BUG12860 : LayoutTests/http/tests/security/listener/xss-window-onclick-shortcut.html = CRASH
+BUG12860 : LayoutTests/http/tests/xmlhttprequest/event-listener-gc.html = CRASH
+BUG12860 : LayoutTests/http/tests/xmlhttprequest/infoOnProgressEvent.html = CRASH
+BUG12860 : LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-007.html = CRASH
+BUG12860 : LayoutTests/http/tests/xmlhttprequest/web-apps/003.html = CRASH
+
+// WebKit 44202:44252 introduced new tests
+BUG12881 : LayoutTests/fast/js/string-replace-exception-crash.html = FAIL
+BUG12881 : LayoutTests/fast/forms/isindex-placeholder.html = FAIL
+BUG12881 : LayoutTests/fast/box-shadow/border-radius-big.html = FAIL
+BUG12881 : LayoutTests/fast/borders/border-radius-constraints.html = FAIL
+BUG12881 : LayoutTests/fast/borders/border-radius-huge-assert.html = FAIL
+BUG12881 : LayoutTests/fast/borders/border-radius-split-inline.html = FAIL
+
+// WebKit 44202:44252 introduced new failures (old tests)
+BUG12882 : LayoutTests/fast/dom/HTMLObjectElement/object-as-frame.html = FAIL
+BUG12882 : LayoutTests/fast/box-shadow/basic-shadows.html = FAIL