diff options
| author | philipj@opera.com <philipj@opera.com> | 2015-05-20 07:43:27 +0000 |
|---|---|---|
| committer | philipj@opera.com <philipj@opera.com> | 2015-05-20 07:43:27 +0000 |
| commit | 694d15156516a8e9035fa0627ecd1fa1e4c126ad (patch) | |
| tree | 9f4c9bb24a19322084a6f9ae933171a5013252ce | |
| parent | 7e8aee92b7950d65ad9fc1e7dc132707af0cbfcb (diff) | |
| download | chromium_src-694d15156516a8e9035fa0627ecd1fa1e4c126ad.zip chromium_src-694d15156516a8e9035fa0627ecd1fa1e4c126ad.tar.gz chromium_src-694d15156516a8e9035fa0627ecd1fa1e4c126ad.tar.bz2 | |
Drop the document.charset part of fast/encoding/external-script-charset.xhtml
Simplify to only test the inheritance, but use the koi8-r for the XHTML
document to ensure that it's not just the default encoding being used to
decode the script.
The bots cannot apply this patch because of the encoding of
LayoutTests/fast/encoding/external-script-charset-koi-8.js.
BUG=438392
R=pdr@chromium.org
Review URL: https://codereview.chromium.org/1144913002
git-svn-id: svn://svn.chromium.org/blink/trunk@195595 bbb929c8-8fbe-4397-9dbb-9b2b20218538
4 files changed, 8 insertions, 14 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset-expected.txt b/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset-expected.txt index d1c2fa5..6575759 100644 --- a/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset-expected.txt @@ -1,6 +1,3 @@ -CONSOLE WARNING: Setting 'Document.charset' is deprecated. Please use '<meta charset="UTF-8">' instead. Test that external scripts in XHTML documents inherit document charset. -Javascript 1 (original document charset): PASS - -Javascript 2 (after document.charset was set): PASS +PASS diff --git a/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset-koi-8.js b/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset-koi-8.js index 141c931..5af84de 100644 --- a/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset-koi-8.js +++ b/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset-koi-8.js @@ -1 +1,4 @@ -document.getElementById("result2").innerHTML += ("ó" == "\u0421") ? "PASS" : "FAIL"; +if (window.testRunner) + testRunner.dumpAsText(); + +document.getElementById("result").textContent = ("ó" == "\u0421") ? "PASS" : "FAIL"; diff --git a/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset.js b/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset.js deleted file mode 100644 index bf7a2a4..0000000 --- a/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset.js +++ /dev/null @@ -1,4 +0,0 @@ -if (window.testRunner) - testRunner.dumpAsText(); - -document.getElementById("result1").innerHTML += ("Я" == "\u042F") ? "PASS" : "FAIL"; diff --git a/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset.xhtml b/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset.xhtml index f6e8bf3..07be091 100644 --- a/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset.xhtml +++ b/third_party/WebKit/LayoutTests/fast/encoding/external-script-charset.xhtml @@ -1,10 +1,8 @@ -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" dir="ltr"> +<?xml version="1.0" encoding="koi8-r"?> +<html xmlns="http://www.w3.org/1999/xhtml"> <body> <p>Test that external scripts in XHTML documents inherit document charset.</p> - <p id="result1">Javascript 1 (original document charset): </p> - <p id="result2">Javascript 2 (after document.charset was set): </p> - <script type="text/javascript" src="external-script-charset.js"></script> - <script>document.charset = "koi8-r";</script> + <p id="result"></p> <script type="text/javascript" src="external-script-charset-koi-8.js"></script> </body> </html> |