summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/xmlhttprequest/xmlhttprequest-recursive-sync-event-expected.txt5
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xmlhttprequest/xmlhttprequest-recursive-sync-event-expected.txt5
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt39
4 files changed, 11 insertions, 40 deletions
diff --git a/DEPS b/DEPS
index 3d0a626..de9063b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49043",
+ "webkit_revision": "49050",
"ffmpeg_revision": "27457",
}
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/xmlhttprequest/xmlhttprequest-recursive-sync-event-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/xmlhttprequest/xmlhttprequest-recursive-sync-event-expected.txt
new file mode 100644
index 0000000..68a5646
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/xmlhttprequest/xmlhttprequest-recursive-sync-event-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Uncaught RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: line 1: Uncaught RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: line 1: Uncaught RangeError: Maximum call stack size exceeded.
+This tests that having infinite recursion in XMLHttpRequest event handler does not crash.
+PASS
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xmlhttprequest/xmlhttprequest-recursive-sync-event-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xmlhttprequest/xmlhttprequest-recursive-sync-event-expected.txt
new file mode 100644
index 0000000..68a5646
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xmlhttprequest/xmlhttprequest-recursive-sync-event-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Uncaught RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: line 1: Uncaught RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: line 1: Uncaught RangeError: Maximum call stack size exceeded.
+This tests that having infinite recursion in XMLHttpRequest event handler does not crash.
+PASS
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a9e45be..66491cf 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3071,42 +3071,3 @@ BUG_ATWILSON MAC LINUX : LayoutTests/fast/css/last-of-type-pseudo-class.html = F
// WebKit update: 48994:49006
BUG_ATWILSON LINUX : LayoutTests/animations/transform-origin-vs-functions.html = FAIL
BUG_ATWILSON WIN LINUX : LayoutTests/fast/box-shadow/inset.html = FAIL
-
-// WebKit update: 49033:49039
-// All crashing oddly enough - need to keep the ball rolling for now
-// http://code.google.com/p/chromium/issues/detail?id=23702
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLFrameElement02.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLFrameElement04.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLFrameElement07.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLFrameElement09.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLFrameSetElement02.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLIFrameElement02.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLIFrameElement04.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLIFrameElement06.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLIFrameElement08.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLIFrameElement10.html = CRASH
-BUG_ATWILSON :LayoutTests/dom/html/level2/html/HTMLImageElement01.html = CRASH
-BUG_ATWILSON :LayoutTests/editing/selection/doubleclick-whitespace.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/dom/DOMImplementation/createDocumentType-err.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/dom/Window/orphaned-frame-access.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/dom/null-page-show-modal-dialog-crash.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/dom/onload-open.html = CRASH
-BUG_ATWILSON MAC LINUX :LayoutTests/fast/dom/resource-locations-in-created-html-document.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/encoding/charset-cp1251.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/events/drag-outside-window.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/events/keypress-focus-change.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/events/message-port-constructor-for-deleted-document.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/events/mouseup-from-button2.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/events/tabindex-focus-chain.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/frames/crash-removed-iframe.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/frames/frame-set-same-src.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/frames/iframe-option-crash.xhtml = CRASH
-BUG_ATWILSON :LayoutTests/fast/frames/onload-remove-iframe-crash.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/frames/viewsource-on-image-file.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/frames/viewsource-unfinished-tags.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/overflow/overflow-y-scroll.html = CRASH
-BUG_ATWILSON :LayoutTests/fast/xpath/4XPath/Borrowed/cz_20030217.html = CRASH
-BUG_ATWILSON :LayoutTests/http/tests/loading/gmail-assert-on-load.html = CRASH
-BUG_ATWILSON :LayoutTests/http/tests/misc/onload-remove-iframe-crash-2.html = CRASH
-BUG_ATWILSON :LayoutTests/http/tests/xmlhttprequest/frame-unload-abort-crash.html = CRASH
-BUG_ATWILSON :LayoutTests/svg/custom/frame-getSVGDocument.html = CRASH