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

Fixing bug 267854. Make sure parser data listeners get all the data that comes in from necko, no matter what the current parser context is. r=bzbarsky@mit.edu, sr=brendan@mozilla.org, a=brendan@mozilla.org

Browse Source 
git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@164984 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.jstenback.com
2004-11-05 06:42:18 +00:00
parent c974c013a0
commit 100b027c62
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/htmlparser/src/nsScanner.cpp
View File

@@ -339,7 +339,9 @@ nsresult nsScanner::Append(const nsAString& aBuffer) {
* @param
* @return
*/
nsresult nsScanner::Append(const char* aBuffer, PRUint32 aLen){
nsresult nsScanner::Append(const char* aBuffer, PRUint32 aLen,
nsIRequest *aRequest)
{
nsresult res=NS_OK;
PRUnichar *unichars, *start;
if(mUnicodeDecoder) {
@@ -379,7 +381,7 @@ nsresult nsScanner::Append(const char* aBuffer, PRUint32 aLen){
} while (NS_FAILED(res) && (aLen > 0));
buffer->SetDataLength(totalChars);
AppendToBuffer(buffer);
AppendToBuffer(buffer, aRequest);
mTotalRead += totalChars;
// Don't propagate return code of unicode decoder
@@ -388,7 +390,7 @@ nsresult nsScanner::Append(const char* aBuffer, PRUint32 aLen){
res = NS_OK;
}
else {
AppendASCIItoBuffer(aBuffer, aLen);
AppendASCIItoBuffer(aBuffer, aLen, aRequest);
mTotalRead+=aLen;
}
@@ -433,7 +435,7 @@ nsresult nsScanner::FillBuffer(void) {
}
if((0<numread) && (0==result)) {
AppendASCIItoBuffer(buf, numread);
AppendASCIItoBuffer(buf, numread, nsnull);
}
mTotalRead+=numread;
}
@@ -1368,11 +1370,12 @@ void nsScanner::ReplaceCharacter(nsScannerIterator& aPosition,
}
}
void nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf)
void nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf,
nsIRequest *aRequest)
{
if (nsParser::sParserDataListeners && mParser &&
NS_FAILED(mParser->DataAdded(Substring(aBuf->DataStart(),
aBuf->DataEnd())))) {
aBuf->DataEnd()), aRequest))) {
// Don't actually append on failure.
return;
@@ -1410,7 +1413,8 @@ void nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf)
}
}
void nsScanner::AppendASCIItoBuffer(const char* aData, PRUint32 aLen)
void nsScanner::AppendASCIItoBuffer(const char* aData, PRUint32 aLen,
nsIRequest *aRequest)
{
nsScannerString::Buffer* buf = nsScannerString::AllocBuffer(aLen);
if (buf)
@@ -1418,7 +1422,7 @@ void nsScanner::AppendASCIItoBuffer(const char* aData, PRUint32 aLen)
LossyConvertEncoding<char, PRUnichar> converter(buf->DataStart());
converter.write(aData, aLen);
converter.write_terminator();
AppendToBuffer(buf);
AppendToBuffer(buf, aRequest);
}
}