Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the results of javascript: URLs stay UTF-16 rather than removing the high byte of the characters, and set the encoding on the channel to UTF-16. b=335298 r=darin sr=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@195360 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org 2006-04-25 16:49:47 +00:00
parent 0f83155974
commit 8a51623b15
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
View File

@ -294,9 +294,9 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel)
rv = NS_ERROR_DOM_RETVAL_UNDEFINED;
}
else {
// NS_NewStringInputStream calls ToNewCString
// XXXbe this should not decimate! pass back UCS-2 to necko
rv = NS_NewStringInputStream(getter_AddRefs(mInnerStream), result);
rv = NS_NewByteInputStream(getter_AddRefs(mInnerStream),
NS_REINTERPRET_CAST(const char*, result.get()),
result.Length() * sizeof(PRUnichar), NS_ASSIGNMENT_COPY);
}
return rv;
}
@ -402,8 +402,16 @@ nsresult nsJSChannel::Init(nsIURI *aURI)
// If the resultant script evaluation actually does return a value, we
// treat it as html.
NS_NAMED_LITERAL_CSTRING(contentType, "text/html");
// Use ifdefs so things won't compile if the macros aren't set up right.
#ifdef IS_LITTLE_ENDIAN
NS_NAMED_LITERAL_CSTRING(contentCharset, "UTF-16LE");
#endif
#ifdef IS_BIG_ENDIAN
NS_NAMED_LITERAL_CSTRING(contentCharset, "UTF-16BE");
#endif
rv = NS_NewInputStreamChannel(getter_AddRefs(channel), aURI, mIOThunk,
NS_LITERAL_CSTRING("text/html"));
contentType, contentCharset);
if (NS_FAILED(rv)) return rv;
rv = mIOThunk->Init(aURI);