From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- .../implementation-identity-expected.txt | 7 +++++ .../DOMImplementation/implementation-identity.html | 30 +++++++++++++++++++++ .../dom/Geolocation/argument-types-expected.txt | 4 +++ .../dom/Geolocation/script-tests/argument-types.js | 6 +++-- ...ements-after-index-assertion-fail1-expected.txt | 4 +++ ...iated-elements-after-index-assertion-fail1.html | 18 +++++++++++++ ...ements-after-index-assertion-fail2-expected.txt | 4 +++ ...iated-elements-after-index-assertion-fail2.html | 17 ++++++++++++ .../fast/dom/HTMLKeygenElement/keygen-expected.txt | 11 +++++--- LayoutTests/fast/dom/HTMLKeygenElement/keygen.html | 26 +++++++++--------- .../dom/HTMLLinkElement/subresource-expected.txt | 3 +++ .../fast/dom/HTMLLinkElement/subresource.html | 20 ++++++++++++++ LayoutTests/http/tests/resources/slow-script.pl | 23 ++++++++++++++++ LayoutTests/storage/script-tests/TEMPLATE.html | 13 +++++++++ .../script-tests/storageinfo-query-usage.js | 31 ++++++++++++++++++++++ .../storage/storageinfo-query-usage-expected.txt | 11 ++++++++ LayoutTests/storage/storageinfo-query-usage.html | 13 +++++++++ 17 files changed, 222 insertions(+), 19 deletions(-) create mode 100644 LayoutTests/fast/dom/DOMImplementation/implementation-identity-expected.txt create mode 100644 LayoutTests/fast/dom/DOMImplementation/implementation-identity.html create mode 100644 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1-expected.txt create mode 100644 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html create mode 100644 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail2-expected.txt create mode 100644 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail2.html create mode 100644 LayoutTests/fast/dom/HTMLLinkElement/subresource-expected.txt create mode 100644 LayoutTests/fast/dom/HTMLLinkElement/subresource.html create mode 100755 LayoutTests/http/tests/resources/slow-script.pl create mode 100644 LayoutTests/storage/script-tests/TEMPLATE.html create mode 100644 LayoutTests/storage/script-tests/storageinfo-query-usage.js create mode 100644 LayoutTests/storage/storageinfo-query-usage-expected.txt create mode 100644 LayoutTests/storage/storageinfo-query-usage.html (limited to 'LayoutTests') diff --git a/LayoutTests/fast/dom/DOMImplementation/implementation-identity-expected.txt b/LayoutTests/fast/dom/DOMImplementation/implementation-identity-expected.txt new file mode 100644 index 0000000..42bdffd --- /dev/null +++ b/LayoutTests/fast/dom/DOMImplementation/implementation-identity-expected.txt @@ -0,0 +1,7 @@ +This test checks that DOMImplementation object is created per document. + +If the test passes, you should see a few OK lines below. + +OK: Top-level document and iframe document have different DOMImplementation objects +OK: DOMImplementation object is cached + diff --git a/LayoutTests/fast/dom/DOMImplementation/implementation-identity.html b/LayoutTests/fast/dom/DOMImplementation/implementation-identity.html new file mode 100644 index 0000000..2b3c56c --- /dev/null +++ b/LayoutTests/fast/dom/DOMImplementation/implementation-identity.html @@ -0,0 +1,30 @@ + + +

This test checks that DOMImplementation object is created per document.

If the test passes, you should see a few OK lines below.

+ + diff --git a/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt b/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt index 23ea685..6c25000 100644 --- a/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt +++ b/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt @@ -9,6 +9,8 @@ PASS navigator.geolocation.getCurrentPosition(null) threw exception Error: TYPE_ PASS navigator.geolocation.getCurrentPosition({}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. PASS navigator.geolocation.getCurrentPosition(objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. PASS navigator.geolocation.getCurrentPosition(emptyFunction) did not throw exception. +PASS navigator.geolocation.getCurrentPosition(Math.abs) did not throw exception. +PASS navigator.geolocation.getCurrentPosition(layoutTestController.setGeolocationPermission) did not throw exception. PASS navigator.geolocation.getCurrentPosition(true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. PASS navigator.geolocation.getCurrentPosition(42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. PASS navigator.geolocation.getCurrentPosition(Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. @@ -19,6 +21,8 @@ PASS navigator.geolocation.getCurrentPosition(emptyFunction, null) did not throw PASS navigator.geolocation.getCurrentPosition(emptyFunction, {}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. PASS navigator.geolocation.getCurrentPosition(emptyFunction, objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. PASS navigator.geolocation.getCurrentPosition(emptyFunction, emptyFunction) did not throw exception. +PASS navigator.geolocation.getCurrentPosition(emptyFunction, Math.abs) did not throw exception. +PASS navigator.geolocation.getCurrentPosition(emptyFunction, layoutTestController.setGeolocationPermission) did not throw exception. PASS navigator.geolocation.getCurrentPosition(emptyFunction, true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. PASS navigator.geolocation.getCurrentPosition(emptyFunction, 42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. PASS navigator.geolocation.getCurrentPosition(emptyFunction, Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17. diff --git a/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js b/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js index 01c77f5..73ffb41 100644 --- a/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js @@ -40,7 +40,8 @@ test('navigator.geolocation.getCurrentPosition(null)', true); test('navigator.geolocation.getCurrentPosition({})', true); test('navigator.geolocation.getCurrentPosition(objectThrowingException)', true); test('navigator.geolocation.getCurrentPosition(emptyFunction)', false); -//test('navigator.geolocation.getCurrentPosition(Math.abs)', false); +test('navigator.geolocation.getCurrentPosition(Math.abs)', false); +test('navigator.geolocation.getCurrentPosition(layoutTestController.setGeolocationPermission)', false); test('navigator.geolocation.getCurrentPosition(true)', true); test('navigator.geolocation.getCurrentPosition(42)', true); test('navigator.geolocation.getCurrentPosition(Infinity)', true); @@ -52,7 +53,8 @@ test('navigator.geolocation.getCurrentPosition(emptyFunction, null)', false); test('navigator.geolocation.getCurrentPosition(emptyFunction, {})', true); test('navigator.geolocation.getCurrentPosition(emptyFunction, objectThrowingException)', true); test('navigator.geolocation.getCurrentPosition(emptyFunction, emptyFunction)', false); -//test('navigator.geolocation.getCurrentPosition(emptyFunction, Math.abs)', false); +test('navigator.geolocation.getCurrentPosition(emptyFunction, Math.abs)', false); +test('navigator.geolocation.getCurrentPosition(emptyFunction, layoutTestController.setGeolocationPermission)', false); test('navigator.geolocation.getCurrentPosition(emptyFunction, true)', true); test('navigator.geolocation.getCurrentPosition(emptyFunction, 42)', true); test('navigator.geolocation.getCurrentPosition(emptyFunction, Infinity)', true); diff --git a/LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1-expected.txt b/LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1-expected.txt new file mode 100644 index 0000000..02d7cb5 --- /dev/null +++ b/LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1-expected.txt @@ -0,0 +1,4 @@ +This page verifies fix for bug 58247. WebKit should not crash when this page is rendered. + + +PASS diff --git a/LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html b/LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html new file mode 100644 index 0000000..c9d7fe3 --- /dev/null +++ b/LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html @@ -0,0 +1,18 @@ + + + + +

This page verifies fix for bug 58247. WebKit should not crash when this page is rendered.

+ +