wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-05 15:28:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Avoid unnecessary string creation.

Browse source
This commit is contained in:
wolfbeast 2018-02-07 11:13:44 +01:00 • committed by Roy Tam
commit 9a0997d28b
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dom/base/FileReader.cpp
View file

@ -452,8 +452,8 @@ FileReader::GetAsText(Blob *aBlob,
}
}
nsDependentCSubstring data(aFileData, aDataLen);
return nsContentUtils::ConvertStringFromEncoding(encoding, data, aResult);
return nsContentUtils::ConvertStringFromEncoding(
encoding, aFileData, aDataLen, aResult);
}
nsresult

10
dom/base/nsContentUtils.cpp
View file

@ -4128,9 +4128,15 @@ nsContentUtils::GetSubdocumentWithOuterWindowId(nsIDocument *aDocument,
/* static */
nsresult
nsContentUtils::ConvertStringFromEncoding(const nsACString& aEncoding,
const nsACString& aInput,
const char* aInput,
uint32_t aInputLen,
nsAString& aOutput)
{
CheckedInt32 len = aInputLen;
if (!len.isValid()) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsAutoCString encoding;
if (aEncoding.IsEmpty()) {
encoding.AssignLiteral("UTF-8");
@ -4142,7 +4148,7 @@ nsContentUtils::ConvertStringFromEncoding(const nsACString& aEncoding,
nsAutoPtr<TextDecoder> decoder(new TextDecoder());
decoder->InitWithEncoding(encoding, false);
decoder->Decode(aInput.BeginReading(), aInput.Length(), false,
decoder->Decode(aInput, len.value(), false,,
aOutput, rv);
return rv.StealNSResult();
}

10
dom/base/nsContentUtils.h
View file

@ -554,9 +554,17 @@ public:
* string (meaning UTF-8)
*/
static nsresult ConvertStringFromEncoding(const nsACString& aEncoding,
const nsACString& aInput,
const char* aInput,
uint32_t aInputLen,
nsAString& aOutput);
static nsresult ConvertStringFromEncoding(const nsACString& aEncoding,
const nsACString& aInput,
nsAString& aOutput) {
return ConvertStringFromEncoding(
aEncoding, aInput.BeginReading(), aInput.Length(), aOutput);
}
/**
* Determine whether a buffer begins with a BOM for UTF-8, UTF-16LE,
* UTF-16BE