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 1087733: Make JS callers of ios.newChannel call ios.newChannel2 in intl/ (r=smontagu)

Browse Source
This commit is contained in:
Christoph Kerschbaumer 2014-10-24 14:55:14 -07:00
parent 295e89ab55
commit 7afefdc776
4 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
intl/uconv/tests/unit/test_bug317216.js
View File

@ -9,6 +9,11 @@
* UTF16 character and mid-surrogate pair
*/
const Ci = Components.interfaces;
const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
const test = [
// 0: Valid surrogate pair
["%D8%35%DC%20%00%2D%00%2D",
@ -71,7 +76,14 @@ function testCase(testText, expectedText, bufferLength, charset)
{
var dataURI = "data:text/plain;charset=" + charset + "," + testText;
var channel = ios.newChannel(dataURI, "", null);
var channel = ios.newChannel2(dataURI,
"",
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var testInputStream = channel.open();
var testConverter = new ConverterInputStream(testInputStream,
charset,
@ -79,7 +91,7 @@ function testCase(testText, expectedText, bufferLength, charset)
0xFFFD);
if (!(testConverter instanceof
Components.interfaces.nsIUnicharLineInputStream))
Ci.nsIUnicharLineInputStream))
throw "not line input stream";
var outStr = "";

17
intl/uconv/tests/unit/test_bug340714.js
View File

@ -11,6 +11,11 @@
* is an eight-bit character.
*/
const Ci = Components.interfaces;
const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
const beBOM="%FE%FF";
const leBOM="%FF%FE";
const sampleUTF16BE="%00%22%04%12%04%41%04%35%00%20%04%41%04%47%04%30%04%41%04%42%04%3B%04%38%04%32%04%4B%04%35%00%20%04%41%04%35%04%3C%04%4C%04%38%00%20%04%3F%04%3E%04%45%04%3E%04%36%04%38%00%20%04%34%04%40%04%43%04%33%00%20%04%3D%04%30%00%20%04%34%04%40%04%43%04%33%04%30%00%2C%00%20%04%3A%04%30%04%36%04%34%04%30%04%4F%00%20%04%3D%04%35%04%41%04%47%04%30%04%41%04%42%04%3B%04%38%04%32%04%30%04%4F%00%20%04%41%04%35%04%3C%04%4C%04%4F%00%20%04%3D%04%35%04%41%04%47%04%30%04%41%04%42%04%3B%04%38%04%32%04%30%00%20%04%3F%04%3E%00%2D%04%41%04%32%04%3E%04%35%04%3C%04%43%00%2E%00%22";
@ -43,15 +48,21 @@ function testCase(withBOM, charset, charsetDec, decoder, bufferLength)
"init");
var ios = new IOService();
var channel = ios.newChannel(dataURI, "", null);
var channel = ios.newChannel2(dataURI,
"",
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var testInputStream = channel.open();
var testConverter = new ConverterInputStream(testInputStream,
decoder,
bufferLength,
0xFFFD);
if (!(testConverter instanceof
Components.interfaces.nsIUnicharLineInputStream))
if (!(testConverter instanceof Ci.nsIUnicharLineInputStream))
throw "not line input stream";
var outStr = "";

17
intl/uconv/tests/unit/test_bug563618.js
View File

@ -4,6 +4,11 @@
*
*/
const Ci = Components.interfaces;
const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
const test = [
// 0: 0x8e followed by hi byte, not valid JIS X 0201
["abcdefghijklmnopqrstuvwxyz12test00%8e%80foobar",
@ -34,15 +39,21 @@ function testCase(testText, expectedText, bufferLength, charset)
{
var dataURI = "data:text/plain;charset=" + charset + "," + testText;
var channel = ios.newChannel(dataURI, "", null);
var channel = ios.newChannel2(dataURI,
"",
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var testInputStream = channel.open();
var testConverter = new ConverterInputStream(testInputStream,
charset,
bufferLength,
0xFFFD);
if (!(testConverter instanceof
Components.interfaces.nsIUnicharLineInputStream))
if (!(testConverter instanceof Ci.nsIUnicharLineInputStream))
throw "not line input stream";
var outStr = "";

12
intl/uconv/tests/unit/test_utf8_illegals.js
View File

@ -2,6 +2,9 @@
const Cc = Components.Constructor;
const Ci = Components.interfaces;
const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
const tests = [
{ inStrings: ["%80", // Illegal or incomplete sequences
@ -103,7 +106,14 @@ function testCaseInputStream(inStr, expected)
"init");
var ios = new IOService();
var channel = ios.newChannel(dataURI, "", null);
var channel = ios.newChannel2(dataURI,
"",
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var testInputStream = channel.open();
var testConverter = new ConverterInputStream(testInputStream,
"UTF-8",