corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bugs:

Browse Source 
22485, 20799 ( SCRIPT content processing)
r=vidur,pollmann
Fix for bugs
22260 ( enabling userdifined tags ) - partial fix.
23765 ( handling misplaced newlines/whitespace).
r=rickg
This commit is contained in:
harishd@netscape.com
2000-01-15 20:35:57 +00:00
parent 29f042cbc6
commit 940860b148
28 changed files with 254 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
parser/htmlparser/src/nsHTMLTokens.cpp
View File

@@ -505,7 +505,8 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode)
* @param aScanner -- controller of underlying input source
* @return error result
*/
nsresult CTextToken::ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScanner& aScanner,nsString& aTerminalString,PRInt32 aMode){
nsresult CTextToken::ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScanner& aScanner,
nsString& aTerminalString,PRInt32 aMode,PRBool& aFlushTokens){
PRBool done=PR_FALSE;
nsresult result=NS_OK;
PRUnichar theChar;
@@ -557,12 +558,15 @@ nsresult CTextToken::ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScann
rpos=theRight.RFindChar('<'); //now scan for the '<'
if(-1<rpos) {
rpos=theRight.RFind(aTerminalString,PR_TRUE);
if(-1<rpos && aMode!=eParseMode_noquirks) {
if(-1<rpos) {
nsAutoString temp(theRight);
temp.Cut(0,rpos);
temp.StripWhitespace();
if(aMode!=eParseMode_noquirks) {
temp.StripWhitespace();
}
PRUnichar ch=temp.CharAt(aTerminalString.Length());
rpos=(ch==kGreaterThan)? rpos:kNotFound;
aFlushTokens=(-1<rpos)?PR_TRUE:PR_FALSE; // We found </SCRIPT>...permit flushing -> Ref: Bug 22485
}
}
done=PRBool(-1<rpos);