wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 484305 - Worker scripts should always be decoded as UTF-8. r=bent

Browse Source
This commit is contained in:
Nikhil Marathe 2013-10-09 18:23:47 -04:00
parent 0716f0c2b0
commit 9e68ff11c1
4 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/workers/ScriptLoader.cpp
View File

@ -440,8 +440,10 @@ public:
// Use the regular nsScriptLoader for this grunt work! Should be just fine
// because we're running on the main thread.
// Unlike <script> tags, Worker scripts are always decoded as UTF-8,
// per spec. So we explicitly pass in the charset hint.
rv = nsScriptLoader::ConvertToUTF16(aLoadInfo.mChannel, aString, aStringLen,
EmptyString(), parentDoc,
NS_LITERAL_STRING("UTF-8"), parentDoc,
aLoadInfo.mScriptText);
if (NS_FAILED(rv)) {
return rv;

7
dom/workers/test/loadEncoding_worker.js Normal file
View File

@ -0,0 +1,7 @@
/*
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
*/
// Bug 484305 - Load workers as UTF-8.
postMessage({ encoding: "KOI8-R", text: "ðÒÉ×ÅÔ" });
postMessage({ encoding: "UTF-8", text: "Привет" });

2
dom/workers/test/mochitest.ini
View File

@ -20,6 +20,7 @@ support-files =
importScripts_worker_imported4.js
instanceof_worker.js
json_worker.js
loadEncoding_worker.js
location_worker.js
longThread_worker.js
multi_sharedWorker_frame.html
@ -73,6 +74,7 @@ support-files =
[test_importScripts.html]
[test_instanceof.html]
[test_json.html]
[test_loadEncoding.html]
[test_loadError.html]
[test_location.html]
[test_longThread.html]

50
dom/workers/test/test_loadEncoding.html Normal file
View File

@ -0,0 +1,50 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 484305 - Load workers as UTF-8</title>
<meta http-equiv="content-type" content="text/html; charset=KOI8-R">
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=484305">Bug 484305 - Load workers as UTF-8</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
var canonical = String.fromCharCode(0x41F, 0x440, 0x438, 0x432, 0x435, 0x442);
ok(document.inputEncoding === "KOI8-R", "Document encoding is KOI8-R");
// Worker sends two strings, one with `canonical` encoded in KOI8-R and one as UTF-8.
// Since Worker scripts should always be decoded using UTF-8, even if the owning document's charset is different, the UTF-8 decode should match, while KOI8-R should fail.
var counter = 0;
var worker = new Worker("loadEncoding_worker.js");
worker.onmessage = function(e) {
if (e.data.encoding === "KOI8-R") {
ok(e.data.text !== canonical, "KOI8-R decoded text should not match");
} else if (e.data.encoding === "UTF-8") {
ok(e.data.text === canonical, "UTF-8 decoded text should match");
}
counter++;
if (counter === 2)
SimpleTest.finish();
}
worker.onerror = function(e) {
ok(false, "Worker error");
SimpleTest.finish();
}
</script>
</pre>
</body>
</html>