зеркало из https://github.com/mozilla/gecko-dev.git
fix bug 20570. r=harishd a=jar. Compare against PRUnichar instead of the first byte.
This commit is contained in:
Родитель
c5cf5503c3
Коммит
1fe64703c6
|
@ -448,7 +448,7 @@ void nsExpatTokenizer::HandleCharacterData(void *userData, const XML_Char *s, in
|
||||||
} else {
|
} else {
|
||||||
CToken* newToken = 0;
|
CToken* newToken = 0;
|
||||||
|
|
||||||
switch(s[0]){
|
switch(((PRUnichar*)s)[0]){
|
||||||
case kNewLine:
|
case kNewLine:
|
||||||
case CR:
|
case CR:
|
||||||
newToken = state->tokenRecycler->CreateTokenOfType(eToken_newline,eHTMLTag_unknown);
|
newToken = state->tokenRecycler->CreateTokenOfType(eToken_newline,eHTMLTag_unknown);
|
||||||
|
@ -462,7 +462,7 @@ void nsExpatTokenizer::HandleCharacterData(void *userData, const XML_Char *s, in
|
||||||
}
|
}
|
||||||
|
|
||||||
if(newToken) {
|
if(newToken) {
|
||||||
if ((s[0] != (XML_Char)kNewLine) && (s[0] != (XML_Char)kCR)) {
|
if ((((PRUnichar*)s)[0] != (XML_Char)kNewLine) && (((PRUnichar*)s)[0] != (XML_Char)kCR)) {
|
||||||
nsString& theString=newToken->GetStringValueXXX();
|
nsString& theString=newToken->GetStringValueXXX();
|
||||||
theString.Append((PRUnichar *) s,len);
|
theString.Append((PRUnichar *) s,len);
|
||||||
}
|
}
|
||||||
|
|
|
@ -448,7 +448,7 @@ void nsExpatTokenizer::HandleCharacterData(void *userData, const XML_Char *s, in
|
||||||
} else {
|
} else {
|
||||||
CToken* newToken = 0;
|
CToken* newToken = 0;
|
||||||
|
|
||||||
switch(s[0]){
|
switch(((PRUnichar*)s)[0]){
|
||||||
case kNewLine:
|
case kNewLine:
|
||||||
case CR:
|
case CR:
|
||||||
newToken = state->tokenRecycler->CreateTokenOfType(eToken_newline,eHTMLTag_unknown);
|
newToken = state->tokenRecycler->CreateTokenOfType(eToken_newline,eHTMLTag_unknown);
|
||||||
|
@ -462,7 +462,7 @@ void nsExpatTokenizer::HandleCharacterData(void *userData, const XML_Char *s, in
|
||||||
}
|
}
|
||||||
|
|
||||||
if(newToken) {
|
if(newToken) {
|
||||||
if ((s[0] != (XML_Char)kNewLine) && (s[0] != (XML_Char)kCR)) {
|
if ((((PRUnichar*)s)[0] != (XML_Char)kNewLine) && (((PRUnichar*)s)[0] != (XML_Char)kCR)) {
|
||||||
nsString& theString=newToken->GetStringValueXXX();
|
nsString& theString=newToken->GetStringValueXXX();
|
||||||
theString.Append((PRUnichar *) s,len);
|
theString.Append((PRUnichar *) s,len);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче