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

Bug 551344 part 5 - Address more sicking's review comments in the Java parts of the HTML5 parser. r=jonas.

Browse Source
This commit is contained in:
Henri Sivonen
2010-04-16 13:52:06 +03:00
parent a4d809db26
commit ac559f05b8
5 changed files with 360 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
parser/html/nsHtml5Tokenizer.cpp
View File

@@ -108,68 +108,68 @@ nsHtml5Tokenizer::~nsHtml5Tokenizer()
}
void
nsHtml5Tokenizer::setContentModelFlag(PRInt32 contentModelFlag, nsIAtom* contentModelElement)
nsHtml5Tokenizer::setStateAndEndTagExpectation(PRInt32 specialTokenizerState, nsIAtom* endTagExpectation)
{
this->stateSave = contentModelFlag;
if (contentModelFlag == NS_HTML5TOKENIZER_DATA) {
this->stateSave = specialTokenizerState;
if (specialTokenizerState == NS_HTML5TOKENIZER_DATA) {
return;
}
jArray<PRUnichar,PRInt32> asArray = nsHtml5Portability::newCharArrayFromLocal(contentModelElement);
this->contentModelElement = nsHtml5ElementName::elementNameByBuffer(asArray, 0, asArray.length, interner);
jArray<PRUnichar,PRInt32> asArray = nsHtml5Portability::newCharArrayFromLocal(endTagExpectation);
this->endTagExpectation = nsHtml5ElementName::elementNameByBuffer(asArray, 0, asArray.length, interner);
asArray.release();
contentModelElementToArray();
endTagExpectationToArray();
}
void
nsHtml5Tokenizer::setContentModelFlag(PRInt32 contentModelFlag, nsHtml5ElementName* contentModelElement)
nsHtml5Tokenizer::setStateAndEndTagExpectation(PRInt32 specialTokenizerState, nsHtml5ElementName* endTagExpectation)
{
this->stateSave = contentModelFlag;
this->contentModelElement = contentModelElement;
contentModelElementToArray();
this->stateSave = specialTokenizerState;
this->endTagExpectation = endTagExpectation;
endTagExpectationToArray();
}
void
nsHtml5Tokenizer::contentModelElementToArray()
nsHtml5Tokenizer::endTagExpectationToArray()
{
switch(contentModelElement->group) {
switch(endTagExpectation->group) {
case NS_HTML5TREE_BUILDER_TITLE: {
contentModelElementNameAsArray = TITLE_ARR;
endTagExpectationAsArray = TITLE_ARR;
return;
}
case NS_HTML5TREE_BUILDER_SCRIPT: {
contentModelElementNameAsArray = SCRIPT_ARR;
endTagExpectationAsArray = SCRIPT_ARR;
return;
}
case NS_HTML5TREE_BUILDER_STYLE: {
contentModelElementNameAsArray = STYLE_ARR;
endTagExpectationAsArray = STYLE_ARR;
return;
}
case NS_HTML5TREE_BUILDER_PLAINTEXT: {
contentModelElementNameAsArray = PLAINTEXT_ARR;
endTagExpectationAsArray = PLAINTEXT_ARR;
return;
}
case NS_HTML5TREE_BUILDER_XMP: {
contentModelElementNameAsArray = XMP_ARR;
endTagExpectationAsArray = XMP_ARR;
return;
}
case NS_HTML5TREE_BUILDER_TEXTAREA: {
contentModelElementNameAsArray = TEXTAREA_ARR;
endTagExpectationAsArray = TEXTAREA_ARR;
return;
}
case NS_HTML5TREE_BUILDER_IFRAME: {
contentModelElementNameAsArray = IFRAME_ARR;
endTagExpectationAsArray = IFRAME_ARR;
return;
}
case NS_HTML5TREE_BUILDER_NOEMBED: {
contentModelElementNameAsArray = NOEMBED_ARR;
endTagExpectationAsArray = NOEMBED_ARR;
return;
}
case NS_HTML5TREE_BUILDER_NOSCRIPT: {
contentModelElementNameAsArray = NOSCRIPT_ARR;
endTagExpectationAsArray = NOSCRIPT_ARR;
return;
}
case NS_HTML5TREE_BUILDER_NOFRAMES: {
contentModelElementNameAsArray = NOFRAMES_ARR;
endTagExpectationAsArray = NOFRAMES_ARR;
return;
}
default: {
@@ -191,26 +191,6 @@ nsHtml5Tokenizer::emptyAttributes()
return nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES;
}
void
nsHtml5Tokenizer::clearStrBufAndAppendCurrentC(PRUnichar c)
{
strBuf[0] = c;
strBufLen = 1;
}
void
nsHtml5Tokenizer::clearStrBufAndAppendForceWrite(PRUnichar c)
{
strBuf[0] = c;
strBufLen = 1;
}
void
nsHtml5Tokenizer::clearStrBufForNextState()
{
strBufLen = 0;
}
void
nsHtml5Tokenizer::appendStrBuf(PRUnichar c)
{
@@ -243,32 +223,6 @@ nsHtml5Tokenizer::emitStrBuf()
}
}
void
nsHtml5Tokenizer::clearLongStrBufForNextState()
{
longStrBufLen = 0;
}
void
nsHtml5Tokenizer::clearLongStrBuf()
{
longStrBufLen = 0;
}
void
nsHtml5Tokenizer::clearLongStrBufAndAppendCurrentC(PRUnichar c)
{
longStrBuf[0] = c;
longStrBufLen = 1;
}
void
nsHtml5Tokenizer::clearLongStrBufAndAppendToComment(PRUnichar c)
{
longStrBuf[0] = c;
longStrBufLen = 1;
}
void
nsHtml5Tokenizer::appendLongStrBuf(PRUnichar c)
{
@@ -281,19 +235,6 @@ nsHtml5Tokenizer::appendLongStrBuf(PRUnichar c)
longStrBuf[longStrBufLen++] = c;
}
void
nsHtml5Tokenizer::appendSecondHyphenToBogusComment()
{
appendLongStrBuf('-');
}
void
nsHtml5Tokenizer::adjustDoubleHyphenAndAppendToLongStrBufAndErr(PRUnichar c)
{
appendLongStrBuf(c);
}
void
nsHtml5Tokenizer::appendLongStrBuf(jArray<PRUnichar,PRInt32> buffer, PRInt32 offset, PRInt32 length)
{
@@ -308,18 +249,6 @@ nsHtml5Tokenizer::appendLongStrBuf(jArray<PRUnichar,PRInt32> buffer, PRInt32 off
longStrBufLen = reqLen;
}
void
nsHtml5Tokenizer::appendLongStrBuf(jArray<PRUnichar,PRInt32> arr)
{
appendLongStrBuf(arr, 0, arr.length);
}
void
nsHtml5Tokenizer::appendStrBufToLongStrBuf()
{
appendLongStrBuf(strBuf, 0, strBufLen);
}
nsString*
nsHtml5Tokenizer::longStrBufToString()
{
@@ -339,7 +268,7 @@ nsHtml5Tokenizer::flushChars(PRUnichar* buf, PRInt32 pos)
if (pos > cstart) {
tokenHandler->characters(buf, cstart, pos - cstart);
}
cstart = 0x7fffffff;
cstart = PR_INT32_MAX;
}
void
@@ -408,11 +337,6 @@ nsHtml5Tokenizer::addAttributeWithValue()
}
}
void
nsHtml5Tokenizer::startErrorReporting()
{
}
void
nsHtml5Tokenizer::start()
{
@@ -483,8 +407,8 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
switch(c) {
case '&': {
flushChars(buf, pos);
clearStrBufAndAppendCurrentC(c);
rememberAmpersandLocation('\0');
clearStrBufAndAppend(c);
setAdditionalAndRememberAmpersandLocation('\0');
returnState = state;
state = NS_HTML5TOKENIZER_CONSUME_CHARACTER_REFERENCE;
goto stateloop;
@@ -520,12 +444,12 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
c = checkChar(buf, pos);
if (c >= 'A' && c <= 'Z') {
endTag = PR_FALSE;
clearStrBufAndAppendForceWrite((PRUnichar) (c + 0x20));
clearStrBufAndAppend((PRUnichar) (c + 0x20));
state = NS_HTML5TOKENIZER_TAG_NAME;
goto tagopenloop_end;
} else if (c >= 'a' && c <= 'z') {
endTag = PR_FALSE;
clearStrBufAndAppendCurrentC(c);
clearStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_TAG_NAME;
goto tagopenloop_end;
}
@@ -540,7 +464,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
}
case '\?': {
clearLongStrBufAndAppendToComment(c);
clearLongStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_BOGUS_COMMENT;
goto stateloop;
}
@@ -658,7 +582,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
if (c >= 'A' && c <= 'Z') {
c += 0x20;
}
clearStrBufAndAppendCurrentC(c);
clearStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_ATTRIBUTE_NAME;
goto beforeattributenameloop_end;
}
@@ -746,7 +670,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
continue;
}
case '\"': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_ATTRIBUTE_VALUE_DOUBLE_QUOTED;
goto beforeattributevalueloop_end;
}
@@ -758,7 +682,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop;
}
case '\'': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_ATTRIBUTE_VALUE_SINGLE_QUOTED;
goto stateloop;
}
@@ -778,7 +702,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
case '=':
case '`':
default: {
clearLongStrBufAndAppendCurrentC(c);
clearLongStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_ATTRIBUTE_VALUE_UNQUOTED;
goto stateloop;
@@ -804,8 +728,8 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto attributevaluedoublequotedloop_end;
}
case '&': {
clearStrBufAndAppendCurrentC(c);
rememberAmpersandLocation('\"');
clearStrBufAndAppend(c);
setAdditionalAndRememberAmpersandLocation('\"');
returnState = state;
state = NS_HTML5TOKENIZER_CONSUME_CHARACTER_REFERENCE;
goto stateloop;
@@ -920,8 +844,8 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop;
}
case '&': {
clearStrBufAndAppendCurrentC(c);
rememberAmpersandLocation('>');
clearStrBufAndAppend(c);
setAdditionalAndRememberAmpersandLocation('>');
returnState = state;
state = NS_HTML5TOKENIZER_CONSUME_CHARACTER_REFERENCE;
goto stateloop;
@@ -997,7 +921,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
if (c >= 'A' && c <= 'Z') {
c += 0x20;
}
clearStrBufAndAppendCurrentC(c);
clearStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_ATTRIBUTE_NAME;
goto stateloop;
}
@@ -1090,20 +1014,20 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
c = checkChar(buf, pos);
switch(c) {
case '-': {
clearLongStrBufAndAppendToComment(c);
clearLongStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_MARKUP_DECLARATION_HYPHEN;
goto markupdeclarationopenloop_end;
}
case 'd':
case 'D': {
clearLongStrBufAndAppendToComment(c);
clearLongStrBufAndAppend(c);
index = 0;
state = NS_HTML5TOKENIZER_MARKUP_DECLARATION_OCTYPE;
goto stateloop;
}
case '[': {
if (tokenHandler->inForeign()) {
clearLongStrBufAndAppendToComment(c);
clearLongStrBufAndAppend(c);
index = 0;
state = NS_HTML5TOKENIZER_CDATA_START;
goto stateloop;
@@ -1132,7 +1056,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop_end;
}
case '-': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_COMMENT_START;
goto markupdeclarationhyphenloop_end;
}
@@ -1519,7 +1443,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
if (c >= 'A' && c <= 'Z') {
c += 0x20;
}
clearStrBufAndAppendCurrentC(c);
clearStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_DOCTYPE_NAME;
goto beforedoctypenameloop_end;
}
@@ -1669,13 +1593,13 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
}
case '\"': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED;
goto stateloop;
}
case '\'': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED;
goto stateloop;
}
@@ -1715,12 +1639,12 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
continue;
}
case '\"': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED;
goto beforedoctypepublicidentifierloop_end;
}
case '\'': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED;
goto stateloop;
}
@@ -1807,13 +1731,13 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
}
case '\"': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED;
goto stateloop;
}
case '\'': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED;
goto stateloop;
}
@@ -1851,12 +1775,12 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop;
}
case '\"': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED;
goto betweendoctypepublicandsystemidentifiersloop_end;
}
case '\'': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED;
goto stateloop;
}
@@ -2024,13 +1948,13 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
}
case '\"': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED;
goto stateloop;
}
case '\'': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED;
goto stateloop;
}
@@ -2070,12 +1994,12 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
continue;
}
case '\"': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED;
goto stateloop;
}
case '\'': {
clearLongStrBufForNextState();
clearLongStrBuf();
state = NS_HTML5TOKENIZER_DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED;
goto beforedoctypesystemidentifierloop_end;
}
@@ -2289,8 +2213,8 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop;
}
case '&': {
clearStrBufAndAppendCurrentC(c);
rememberAmpersandLocation('\'');
clearStrBufAndAppend(c);
setAdditionalAndRememberAmpersandLocation('\'');
returnState = state;
state = NS_HTML5TOKENIZER_CONSUME_CHARACTER_REFERENCE;
goto attributevaluesinglequotedloop_end;
@@ -2331,7 +2255,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
case '<':
case '&': {
emitOrAppendStrBuf(returnState);
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = returnState;
@@ -2357,7 +2281,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
} else {
emitOrAppendStrBuf(returnState);
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = returnState;
@@ -2388,7 +2312,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
if (!hilo) {
emitOrAppendStrBuf(returnState);
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = returnState;
@@ -2457,7 +2381,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
if (candidate == -1) {
emitOrAppendStrBuf(returnState);
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = returnState;
@@ -2466,7 +2390,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
} else {
jArray<PRInt8,PRInt32> candidateArr = nsHtml5NamedCharacters::NAMES[candidate];
if (!candidateArr.length || candidateArr[candidateArr.length - 1] != ';') {
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
PRUnichar ch;
if (strBufMark == strBufLen) {
ch = c;
@@ -2481,7 +2405,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop;
}
}
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
} else {
@@ -2494,7 +2418,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
emitOrAppendOne(val, returnState);
}
if (strBufMark < strBufLen) {
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
for (PRInt32 i = strBufMark; i < strBufLen; i++) {
appendLongStrBuf(strBuf[i]);
}
@@ -2502,7 +2426,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
tokenHandler->characters(strBuf, strBufMark, strBufLen - strBufMark);
}
}
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = returnState;
@@ -2552,7 +2476,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
continue;
} else if (c == ';') {
if (seenDigits) {
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos + 1;
}
state = NS_HTML5TOKENIZER_HANDLE_NCR_VALUE;
@@ -2561,7 +2485,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
appendStrBuf(';');
emitOrAppendStrBuf(returnState);
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos + 1;
}
state = returnState;
@@ -2571,7 +2495,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
if (!seenDigits) {
emitOrAppendStrBuf(returnState);
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = returnState;
@@ -2579,7 +2503,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop;
} else {
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = NS_HTML5TOKENIZER_HANDLE_NCR_VALUE;
@@ -2622,7 +2546,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
continue;
} else if (c == ';') {
if (seenDigits) {
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos + 1;
}
state = NS_HTML5TOKENIZER_HANDLE_NCR_VALUE;
@@ -2631,7 +2555,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
appendStrBuf(';');
emitOrAppendStrBuf(returnState);
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos + 1;
}
state = returnState;
@@ -2641,7 +2565,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
if (!seenDigits) {
emitOrAppendStrBuf(returnState);
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = returnState;
@@ -2649,7 +2573,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop;
} else {
if (!(returnState & (~1))) {
if (!(returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
cstart = pos;
}
state = NS_HTML5TOKENIZER_HANDLE_NCR_VALUE;
@@ -2732,7 +2656,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
switch(c) {
case '/': {
index = 0;
clearStrBufForNextState();
clearStrBuf();
state = NS_HTML5TOKENIZER_NON_DATA_END_TAG_NAME;
goto stateloop;
}
@@ -2917,7 +2841,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
switch(c) {
case '/': {
index = 0;
clearStrBufForNextState();
clearStrBuf();
returnState = NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPED;
state = NS_HTML5TOKENIZER_NON_DATA_END_TAG_NAME;
goto stateloop;
@@ -3180,14 +3104,14 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
case '\r': {
silentCarriageReturn();
clearLongStrBufAndAppendToComment('\n');
clearLongStrBufAndAppend('\n');
state = NS_HTML5TOKENIZER_BOGUS_COMMENT;
goto stateloop_end;
}
case '\n': {
silentLineFeed();
clearLongStrBufAndAppendToComment('\n');
clearLongStrBufAndAppend('\n');
state = NS_HTML5TOKENIZER_BOGUS_COMMENT;
goto stateloop;
}
@@ -3200,12 +3124,12 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
}
if (c >= 'a' && c <= 'z') {
endTag = PR_TRUE;
clearStrBufAndAppendCurrentC(c);
clearStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_TAG_NAME;
goto stateloop;
} else {
clearLongStrBufAndAppendToComment(c);
clearLongStrBufAndAppend(c);
state = NS_HTML5TOKENIZER_BOGUS_COMMENT;
goto stateloop;
}
@@ -3225,7 +3149,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
switch(c) {
case '&': {
flushChars(buf, pos);
clearStrBufAndAppendCurrentC(c);
clearStrBufAndAppend(c);
additional = '\0';
returnState = state;
state = NS_HTML5TOKENIZER_CONSUME_CHARACTER_REFERENCE;
@@ -3299,7 +3223,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
switch(c) {
case '/': {
index = 0;
clearStrBufForNextState();
clearStrBuf();
state = NS_HTML5TOKENIZER_NON_DATA_END_TAG_NAME;
goto rawtextrcdatalessthansignloop_end;
}
@@ -3320,8 +3244,8 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
goto stateloop_end;
}
c = checkChar(buf, pos);
if (index < contentModelElementNameAsArray.length) {
PRUnichar e = contentModelElementNameAsArray[index];
if (index < endTagExpectationAsArray.length) {
PRUnichar e = endTagExpectationAsArray[index];
PRUnichar folded = c;
if (c >= 'A' && c <= 'Z') {
folded += 0x20;
@@ -3339,7 +3263,7 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
continue;
} else {
endTag = PR_TRUE;
tagName = contentModelElement;
tagName = endTagExpectation;
switch(c) {
case '\r': {
silentCarriageReturn();
@@ -3425,7 +3349,7 @@ nsHtml5Tokenizer::emitReplacementCharacter(PRUnichar* buf, PRInt32 pos)
}
void
nsHtml5Tokenizer::rememberAmpersandLocation(PRUnichar add)
nsHtml5Tokenizer::setAdditionalAndRememberAmpersandLocation(PRUnichar add)
{
additional = add;
}
@@ -3447,7 +3371,7 @@ nsHtml5Tokenizer::bogusDoctypeWithoutQuirks()
void
nsHtml5Tokenizer::emitOrAppendStrBuf(PRInt32 returnState)
{
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
appendStrBufToLongStrBuf();
} else {
emitStrBuf();
@@ -3724,7 +3648,7 @@ nsHtml5Tokenizer::eof()
} else {
jArray<PRInt8,PRInt32> candidateArr = nsHtml5NamedCharacters::NAMES[candidate];
if (!candidateArr.length || candidateArr[candidateArr.length - 1] != ';') {
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
PRUnichar ch;
if (strBufMark == strBufLen) {
ch = '\0';
@@ -3738,7 +3662,7 @@ nsHtml5Tokenizer::eof()
goto eofloop;
}
}
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
} else {
@@ -3751,7 +3675,7 @@ nsHtml5Tokenizer::eof()
emitOrAppendOne(val, returnState);
}
if (strBufMark < strBufLen) {
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
for (PRInt32 i = strBufMark; i < strBufLen; i++) {
appendLongStrBuf(strBuf[i]);
}
@@ -3813,7 +3737,7 @@ nsHtml5Tokenizer::internalEncodingDeclaration(nsString* internalCharset)
void
nsHtml5Tokenizer::emitOrAppendTwo(const PRUnichar* val, PRInt32 returnState)
{
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
appendLongStrBuf(val[0]);
appendLongStrBuf(val[1]);
} else {
@@ -3824,7 +3748,7 @@ nsHtml5Tokenizer::emitOrAppendTwo(const PRUnichar* val, PRInt32 returnState)
void
nsHtml5Tokenizer::emitOrAppendOne(const PRUnichar* val, PRInt32 returnState)
{
if ((returnState & (~1))) {
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
appendLongStrBuf(val[0]);
} else {
tokenHandler->characters(val, 0, 1);
@@ -3870,36 +3794,6 @@ nsHtml5Tokenizer::requestSuspension()
shouldSuspend = PR_TRUE;
}
void
nsHtml5Tokenizer::becomeConfident()
{
confident = PR_TRUE;
}
PRBool
nsHtml5Tokenizer::isNextCharOnNewLine()
{
return PR_FALSE;
}
PRBool
nsHtml5Tokenizer::isPrevCR()
{
return lastCR;
}
PRInt32
nsHtml5Tokenizer::getLine()
{
return -1;
}
PRInt32
nsHtml5Tokenizer::getCol()
{
return -1;
}
PRBool
nsHtml5Tokenizer::isInDataState()
{
@@ -3959,8 +3853,8 @@ nsHtml5Tokenizer::loadState(nsHtml5Tokenizer* other)
nsHtml5ArrayCopy::arraycopy(other->longStrBuf, longStrBuf, longStrBufLen);
stateSave = other->stateSave;
returnStateSave = other->returnStateSave;
contentModelElement = other->contentModelElement;
contentModelElementNameAsArray = other->contentModelElementNameAsArray;
endTagExpectation = other->endTagExpectation;
endTagExpectationAsArray = other->endTagExpectationAsArray;
lastCR = other->lastCR;
index = other->index;
forceQuirks = other->forceQuirks;