diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /LayoutTests/fast | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'LayoutTests/fast')
| -rw-r--r-- | LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype-expected.txt | 1 | ||||
| -rw-r--r-- | LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype.html | 5 | ||||
| -rw-r--r-- | LayoutTests/fast/encoding/dumpAsText/utf-16-no-bom-expected.txt | 5 | ||||
| -rw-r--r-- | LayoutTests/fast/encoding/dumpAsText/utf-16-no-bom.xml (renamed from LayoutTests/fast/encoding/utf-16-no-bom.xml) | bin | 236 -> 236 bytes |
4 files changed, 9 insertions, 2 deletions
diff --git a/LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype-expected.txt b/LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype-expected.txt index 7ef22e9..69cfc5a 100644 --- a/LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype-expected.txt +++ b/LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype-expected.txt @@ -1 +1,2 @@ PASS + diff --git a/LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype.html b/LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype.html index ae4a7ae..95990cf 100644 --- a/LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype.html +++ b/LayoutTests/fast/dom/DOMImplementation/createDocument-with-used-doctype.html @@ -1,5 +1,4 @@ <body> -<iframe src="resources/createDocument-with-used-doctype-frame.html" onload="test()"></iframe> <script> if (window.layoutTestController) { layoutTestController.dumpAsText(); @@ -23,10 +22,12 @@ function test() frames[0].history.go(0); } else { gc(); - document.body.textContent = frames[0].document.body.textContent; + document.getElementById("result").innerText = frames[0].document.body.textContent; if (window.layoutTestController) layoutTestController.notifyDone(); } } </script> +<div id="result">FAIL</div> +<iframe src="resources/createDocument-with-used-doctype-frame.html" onload="test()"></iframe> </body> diff --git a/LayoutTests/fast/encoding/dumpAsText/utf-16-no-bom-expected.txt b/LayoutTests/fast/encoding/dumpAsText/utf-16-no-bom-expected.txt new file mode 100644 index 0000000..4aea68a --- /dev/null +++ b/LayoutTests/fast/encoding/dumpAsText/utf-16-no-bom-expected.txt @@ -0,0 +1,5 @@ +This XML file does not appear to have any style information associated with it. The document tree is shown below. +<TEST> +Should be "CYRILLIC SMALL LETTER IO" (like e with diaeresis): ё +</TEST> + diff --git a/LayoutTests/fast/encoding/utf-16-no-bom.xml b/LayoutTests/fast/encoding/dumpAsText/utf-16-no-bom.xml Binary files differindex 17f9367..17f9367 100644 --- a/LayoutTests/fast/encoding/utf-16-no-bom.xml +++ b/LayoutTests/fast/encoding/dumpAsText/utf-16-no-bom.xml |