Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2026-01-23 06:16:35 +00:00
Code Issues Projects Releases Wiki Activity

#565: M1358297 parts 3 and 4

Browse Source
This commit is contained in:
Cameron Kaiser
2019-08-17 10:42:19 -07:00
parent 9ab5bb0ed4
commit 3fd15a87ad
12 changed files with 141 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
xpcom/string/nsTSubstring.cpp
View File

@@ -4,6 +4,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsASCIIMask.h"
#include "mozilla/CheckedInt.h"
#include "mozilla/double-conversion.h"
#include "mozilla/MemoryReporting.h"
@@ -821,7 +822,8 @@ nsTSubstring_CharT::FindChar(char_type aChar, index_type aOffset) const
void
nsTSubstring_CharT::StripChar(char_type aChar, int32_t aOffset)
{
if (mLength == 0 || aOffset >= int32_t(mLength)) {
// Note that this implicitly guarantees mLength > 0
if (aOffset >= int32_t(mLength)) {
return;
}
@@ -848,6 +850,7 @@ nsTSubstring_CharT::StripChar(char_type aChar, int32_t aOffset)
void
nsTSubstring_CharT::StripChars(const char_type* aChars, uint32_t aOffset)
{
// Note that this implicitly guarantees mLength > 0
if (aOffset >= uint32_t(mLength)) {
return;
}
@@ -877,6 +880,45 @@ nsTSubstring_CharT::StripChars(const char_type* aChars, uint32_t aOffset)
mLength = to - mData;
}
void
nsTSubstring_CharT::StripTaggedASCII(const ASCIIMaskArray& aToStrip,
uint32_t aOffset)
{
// Note that this implicitly guarantees mLength > 0
if (aOffset >= uint32_t(mLength)) {
return;
}
if (!EnsureMutable()) {
AllocFailed(mLength);
}
char_type* to = mData + aOffset;
char_type* from = mData + aOffset;
char_type* end = mData + mLength;
while (from < end) {
uint32_t theChar = (uint32_t)*from++;
// Replacing this with a call to ASCIIMask::IsMasked
// regresses performance somewhat, so leaving it inlined.
if (!mozilla::ASCIIMask::IsMasked(aToStrip, theChar)) {
// Not stripped, copy this char.
*to++ = (char_type)theChar;
}
}
*to = char_type(0); // add the null
mLength = to - mData;
}
void
nsTSubstring_CharT::StripCRLF(uint32_t aOffset)
{
// Expanding this call to copy the code from StripTaggedASCII
// instead of just calling it does somewhat help with performance
// but it is not worth it given the duplicated code.
StripTaggedASCII(mozilla::ASCIIMask::MaskCRLF(), aOffset);
}
int
nsTSubstring_CharT::AppendFunc(void* aArg, const char* aStr, uint32_t aLen)
{