Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1343715 - Remove nsA[C]String::SetDataFlags. r=dmajor

Browse Source 
MozReview-Commit-ID: EDQbH9pZKtZ

--HG--
extra : transplant_source : %FA%16%DC%A2C%DAM%F8%AC9%B6%F3d%DF%9E%5B%80%99%7E%B3
This commit is contained in:
L. David Baron 2017-07-10 12:23:11 -07:00
parent 715cb90c8e
commit 57e3e8641f
5 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xpcom/string/nsTDependentString.cpp
View File

@ -29,8 +29,7 @@ nsTDependentString_CharT::Rebind(const string_type& str, uint32_t startPos)
mData = const_cast<char_type*>(static_cast<const char_type*>(str.Data())) + startPos;
mLength = strLength - startPos;
SetDataFlags(str.GetDataFlags() & (DataFlags::TERMINATED | DataFlags::LITERAL));
mDataFlags = str.GetDataFlags() & (DataFlags::TERMINATED | DataFlags::LITERAL);
}
void

5
xpcom/string/nsTDependentSubstring.cpp
View File

@ -19,8 +19,7 @@ nsTDependentSubstring_CharT::Rebind(const substring_type& str,
mData = const_cast<char_type*>(static_cast<const char_type*>(str.Data())) + startPos;
mLength = XPCOM_MIN(length, strLength - startPos);
SetDataFlags(DataFlags(0));
mDataFlags = DataFlags(0);
}
void
@ -33,7 +32,7 @@ nsTDependentSubstring_CharT::Rebind(const char_type* data, size_type length)
mData = const_cast<char_type*>(static_cast<const char_type*>(data));
mLength = length;
SetDataFlags(DataFlags(0));
mDataFlags = DataFlags(0);
}
void

4
xpcom/string/nsTString.cpp
View File

@ -20,7 +20,7 @@ nsTAdoptingString_CharT::operator=(const self_type& str)
Finalize();
mData = str.mData;
mLength = str.mLength;
SetDataFlags(DataFlags::TERMINATED | DataFlags::OWNED);
mDataFlags = DataFlags::TERMINATED | DataFlags::OWNED;
// Make str forget the buffer we just took ownership of.
new (mutable_str) self_type();
@ -41,7 +41,7 @@ nsTString_CharT::Rebind(const char_type* data, size_type length)
mData = const_cast<char_type*>(data);
mLength = length;
SetDataFlags(DataFlags::TERMINATED);
mDataFlags = DataFlags::TERMINATED;
AssertValidDependentString();
}

10
xpcom/string/nsTSubstring.cpp
View File

@ -170,7 +170,7 @@ nsTSubstring_CharT::MutatePrep(size_type aCapacity, char_type** aOldData,
*aOldDataFlags = mDataFlags;
mData = newData;
SetDataFlags(newDataFlags);
mDataFlags = newDataFlags;
// mLength does not change
@ -413,7 +413,7 @@ nsTSubstring_CharT::AssignLiteral(const char_type* aData, size_type aLength)
::ReleaseData(mData, mDataFlags);
mData = const_cast<char_type*>(aData);
mLength = aLength;
SetDataFlags(DataFlags::TERMINATED | DataFlags::LITERAL);
mDataFlags = DataFlags::TERMINATED | DataFlags::LITERAL;
}
void
@ -450,7 +450,7 @@ nsTSubstring_CharT::Assign(const self_type& aStr, const fallible_t& aFallible)
mData = aStr.mData;
mLength = aStr.mLength;
SetDataFlags(DataFlags::TERMINATED | DataFlags::SHARED);
mDataFlags = DataFlags::TERMINATED | DataFlags::SHARED;
// get an owning reference to the mData
nsStringBuffer::FromData(mData)->AddRef();
@ -516,7 +516,7 @@ nsTSubstring_CharT::Adopt(char_type* aData, size_type aLength)
mData = aData;
mLength = aLength;
SetDataFlags(DataFlags::TERMINATED | DataFlags::OWNED);
mDataFlags = DataFlags::TERMINATED | DataFlags::OWNED;
STRING_STAT_INCREMENT(Adopt);
// Treat this as construction of a "StringAdopt" object for leak
@ -690,7 +690,7 @@ nsTSubstring_CharT::SetCapacity(size_type aCapacity, const fallible_t&)
::ReleaseData(mData, mDataFlags);
mData = char_traits::sEmptyBuffer;
mLength = 0;
SetDataFlags(DataFlags::TERMINATED);
mDataFlags = DataFlags::TERMINATED;
return true;
}

10
xpcom/string/nsTSubstring.h
View File

@ -995,7 +995,7 @@ public:
if (mDataFlags & DataFlags::SHARED) {
mData = char_traits::sEmptyBuffer;
mLength = 0;
SetDataFlags(DataFlags::TERMINATED);
mDataFlags = DataFlags::TERMINATED;
}
}
@ -1164,14 +1164,6 @@ protected:
return true;
}
/**
* this helper function stores the specified dataFlags in mDataFlags
*/
void SetDataFlags(DataFlags aDataFlags)
{
mDataFlags = aDataFlags;
}
void NS_FASTCALL ReplaceLiteral(index_type aCutStart, size_type aCutLength,
const char_type* aData, size_type aLength);