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

Bustage fix, attempt #2: So Win32 seemed to like attempt #1, but Mac didn't. Different approach (I don't like this :-/ )

Browse Source
This commit is contained in:
disttsc@bart.nl
2001-03-27 12:39:59 +00:00
parent 9c5fc75ab7
commit f67d5252e9
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -526,8 +526,8 @@ PRInt32 CTextToken::GetTextLength(void) {
* @param aScanner -- controller of underlying input source
* @return error result
*/
nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {;
static nsString theTerminals(NS_LITERAL_STRING("\n\r&<"));
nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {
static nsString theTerminals = NS_ConvertASCIItoUCS2("\n\r&<"); // XXXjag
nsresult result=NS_OK;
PRBool done=PR_FALSE;
nsReadingIterator<PRUnichar> origin, start, end;
@@ -897,7 +897,7 @@ PRInt32 CMarkupDeclToken::GetTokenType(void) {
* @return error result
*/
nsresult CMarkupDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {
static nsString theTerminals(NS_LITERAL_STRING("\n\r'\">"));
static nsString theTerminals = NS_ConvertASCIItoUCS2("\n\r'\">"); // XXXjag
nsresult result=NS_OK;
PRBool done=PR_FALSE;
PRUnichar quote=0;
@@ -1521,7 +1521,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann
*/
static
nsresult ConsumeAttributeValueText(PRUnichar,nsString& aString,nsScanner& aScanner){
static nsString theTerminals(NS_LITERAL_STRING("\b\t\n\r >"));
static nsString theTerminals = NS_ConvertASCIItoUCS2("\b\t\n\r >"); // XXXjag
nsresult result=aScanner.ReadUntil(aString,theTerminals,PR_FALSE);
//Let's force quotes if either the first or last char is quoted.
@@ -1570,7 +1570,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a
}
else {
//If you're here, handle an unquoted key.
static nsAutoString theTerminals(NS_LITERAL_STRING("\b\t\n\r \"=>"));
static nsAutoString theTerminals = NS_ConvertASCIItoUCS2("\b\t\n\r \"=>"); // XXXjag
result=aScanner.ReadUntil(start,end,theTerminals,PR_FALSE);
}
if (!aRetainWhitespace) {