landing string defragmentation patch for bug 231995, r/sr=dbaron,jst,dougt
git-svn-id: svn://10.0.0.236/trunk@152905 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -704,7 +704,7 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
|
||||
|
||||
if(aToken) {
|
||||
// Save the position after '<' for use in recording traling contents. Ref: Bug. 15204.
|
||||
nsReadingIterator<PRUnichar> origin;
|
||||
nsScannerIterator origin;
|
||||
aScanner.CurrentPosition(origin);
|
||||
|
||||
result= aToken->Consume(aChar,aScanner,mFlags); //tell new token to finish consuming text...
|
||||
@@ -1063,9 +1063,9 @@ nsresult nsHTMLTokenizer::ConsumeProcessingInstruction(PRUnichar aChar,CToken*&
|
||||
|
||||
void nsHTMLTokenizer::PreserveToken(CStartToken* aStartToken,
|
||||
nsScanner& aScanner,
|
||||
nsReadingIterator<PRUnichar> aOrigin) {
|
||||
nsScannerIterator aOrigin) {
|
||||
if(aStartToken) {
|
||||
nsReadingIterator<PRUnichar> theCurrentPosition;
|
||||
nsScannerIterator theCurrentPosition;
|
||||
aScanner.CurrentPosition(theCurrentPosition);
|
||||
|
||||
nsString& trailingContent = aStartToken->mTrailingContent;
|
||||
|
||||
Reference in New Issue
Block a user