From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 16 May 2011 16:25:10 +0100 Subject: Merge WebKit at r76408: Initial merge by git. Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53 --- .../fast/dom/HTMLKeygenElement/keygen-expected.txt | 8 +++++ .../keygen-option-select-expected.txt | 6 ---- .../HTMLKeygenElement/keygen-option-select.html | 40 ---------------------- LayoutTests/fast/dom/HTMLKeygenElement/keygen.html | 27 +++++++++++++++ 4 files changed, 35 insertions(+), 46 deletions(-) create mode 100644 LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt delete mode 100644 LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt delete mode 100644 LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html create mode 100644 LayoutTests/fast/dom/HTMLKeygenElement/keygen.html (limited to 'LayoutTests/fast') diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt new file mode 100644 index 0000000..4d7e1f0 --- /dev/null +++ b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt @@ -0,0 +1,8 @@ + +Tests the keygen element. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS document.getElementById("keys").options is undefined + diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt deleted file mode 100644 index a6f14fb..0000000 --- a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ - -This test verifies that list-box-style select form control for keygen works properly when selecting from option element. - -You should see the word "SUCCESS" below - -SUCCESS diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html deleted file mode 100644 index 2667715..0000000 --- a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - -

This test verifies that list-box-style select form control for keygen works properly when selecting from option element. -

You should see the word "SUCCESS" below

- -

FAILED

- - - - - diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html b/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html new file mode 100644 index 0000000..59196ac --- /dev/null +++ b/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html @@ -0,0 +1,27 @@ + + + + + + + + +

+ + + + + -- cgit v1.1