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

Only allocate and copy a string in CAttributeToken::GetStringValue if the string spans multiple buffers. Otherwise, just wrap it with a nsDependentSubstring. Bug 268932, r=bzbarsky, sr=darin.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@165246 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2004-11-11 03:46:51 +00:00
parent 2d1d00b7e3
commit 0da729e8f7
6 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/parser/htmlparser/src/nsScannerString.cpp
View File

@@ -235,17 +235,34 @@ nsScannerSubstring::Rebind( const nsAString& aString )
acquire_ownership_of_buffer_list();
}
const nsString&
const nsSubstring&
nsScannerSubstring::AsString() const
{
if (mIsDirty)
{
nsScannerSubstring* mutable_this = NS_CONST_CAST(nsScannerSubstring*, this);
nsScannerIterator start, end;
CopyUnicodeTo(BeginReading(start), EndReading(end), mutable_this->mFlattenedRep);
if (mStart.mBuffer == mEnd.mBuffer) {
// We only have a single fragment to deal with, so just return it
// as a substring. We take advantage of the fact that |nsString| and
// |nsDependentSubstring| don't have any members that aren't on
// |nsSubstring|, so that have same same layout. Furthermore,
// we know that the implementation of ~nsString() will not try
// to free the data if the string was constructed as a
// |nsDependentSubstring|.
mFlattenedRep.~nsString(); // in case we have a buffer currently
new (&mutable_this->mFlattenedRep)
nsDependentSubstring(mStart.mPosition, mEnd.mPosition);
} else {
// Otherwise, we need to copy the data into a flattened buffer.
nsScannerIterator start, end;
CopyUnicodeTo(BeginReading(start), EndReading(end), mutable_this->mFlattenedRep);
}
mutable_this->mIsDirty = PR_FALSE;
}
return mFlattenedRep;
}