corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1324430 - Implement nsTSubstring_CharT::Assign with length for a better string buffer sharing, r=froydnj

Browse Source
This commit is contained in:
Andrea Marchesini
2016-12-23 17:22:21 +01:00
parent 3a0bc35140
commit 3eefb79c84
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
xpcom/string/nsTSubstring.cpp
View File

@@ -417,13 +417,28 @@ nsTSubstring_CharT::AssignLiteral(const char_type* aData, size_type aLength)
void
nsTSubstring_CharT::Assign(const self_type& aStr)
{
if (!Assign(aStr, mozilla::fallible)) {
if (!Assign(aStr, aStr.Length(), mozilla::fallible)) {
AllocFailed(aStr.Length());
}
}
bool
nsTSubstring_CharT::Assign(const self_type& aStr, const fallible_t& aFallible)
{
return Assign(aStr, aStr.Length(), aFallible);
}
void
nsTSubstring_CharT::Assign(const self_type& aStr, size_type aLength)
{
if (!Assign(aStr, aLength, mozilla::fallible)) {
AllocFailed(aLength);
}
}
bool
nsTSubstring_CharT::Assign(const self_type& aStr, size_type aLength,
const fallible_t& aFallible)
{
// |aStr| could be sharable. We need to check its flags to know how to
// deal with it.
@@ -432,7 +447,11 @@ nsTSubstring_CharT::Assign(const self_type& aStr, const fallible_t& aFallible)
return true;
}
if (!aStr.mLength) {
if (aStr.Length() < aLength) {
aLength = aStr.Length();
}
if (!aLength) {
Truncate();
mFlags |= aStr.mFlags & F_VOIDED;
return true;
@@ -447,7 +466,7 @@ nsTSubstring_CharT::Assign(const self_type& aStr, const fallible_t& aFallible)
::ReleaseData(mData, mFlags);
mData = aStr.mData;
mLength = aStr.mLength;
mLength = aLength;
SetDataFlags(F_TERMINATED | F_SHARED);
// get an owning reference to the mData
@@ -456,12 +475,12 @@ nsTSubstring_CharT::Assign(const self_type& aStr, const fallible_t& aFallible)
} else if (aStr.mFlags & F_LITERAL) {
MOZ_ASSERT(aStr.mFlags & F_TERMINATED, "Unterminated literal");
AssignLiteral(aStr.mData, aStr.mLength);
AssignLiteral(aStr.mData, aLength);
return true;
}
// else, treat this like an ordinary assignment.
return Assign(aStr.Data(), aStr.Length(), aFallible);
return Assign(aStr.Data(), aLength, aFallible);
}
void