mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Do not open head context if <script> is in the body context. b=194329, r=heikki, sr=jst

This commit is contained in:
harishd%netscape.com 2003-02-27 22:26:00 +00:00
Родитель 4fbe71dec9
Коммит 46a6b1cf15
2 изменённых файлов: 12 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
htmlparser/src/CNavDTD.cpp
Просмотреть файл

@ -120,12 +120,11 @@ static char gShowCRC;
#define NS_DTD_FLAG_HAD_BODY 0x00000010 #define NS_DTD_FLAG_HAD_BODY 0x00000010
#define NS_DTD_FLAG_HAD_FRAMESET 0x00000020 #define NS_DTD_FLAG_HAD_FRAMESET 0x00000020
#define NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE 0x00000040 #define NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE 0x00000040
#define NS_DTD_FLAG_REQUESTED_HEAD 0x00000100 #define NS_DTD_FLAG_SCRIPT_ENABLED 0x00000100
#define NS_DTD_FLAG_SCRIPT_ENABLED 0x00000200 #define NS_DTD_FLAG_FRAMES_ENABLED 0x00000200
#define NS_DTD_FLAG_FRAMES_ENABLED 0x00000400 #define NS_DTD_FLAG_ALTERNATE_CONTENT 0x00000400 // NOFRAMES, NOSCRIPT
#define NS_DTD_FLAG_ALTERNATE_CONTENT 0x00000800 // NOFRAMES, NOSCRIPT #define NS_DTD_FLAG_MISPLACED_CONTENT 0x00000800
#define NS_DTD_FLAG_MISPLACED_CONTENT 0x00001000 #define NS_DTD_FLAG_STOP_PARSING 0x00001000
#define NS_DTD_FLAG_STOP_PARSING 0x00002000
/** /**
* This method gets called as part of our COM-like interfaces. * This method gets called as part of our COM-like interfaces.
@ -1727,7 +1726,6 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
if(mFlags & (NS_DTD_FLAG_HAD_BODY | NS_DTD_FLAG_HAD_FRAMESET)) { if(mFlags & (NS_DTD_FLAG_HAD_BODY | NS_DTD_FLAG_HAD_FRAMESET)) {
result=HandleOmittedTag(aToken,theChildTag,theParent,theNode); result=HandleOmittedTag(aToken,theChildTag,theParent,theNode);
isTokenHandled=PR_TRUE; isTokenHandled=PR_TRUE;
mFlags |= NS_DTD_FLAG_REQUESTED_HEAD;
} }
break; break;
default: default:
@ -1764,8 +1762,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
break; break;
case eHTMLTag_script: case eHTMLTag_script:
theHeadIsParent=(!(mFlags & NS_DTD_FLAG_HAS_OPEN_BODY) || theHeadIsParent = !(mFlags & NS_DTD_FLAG_HAS_OPEN_BODY);
(mFlags & NS_DTD_FLAG_REQUESTED_HEAD));
mFlags |= NS_DTD_FLAG_HAS_OPEN_SCRIPT; mFlags |= NS_DTD_FLAG_HAS_OPEN_SCRIPT;
default: default:
@ -1967,7 +1964,6 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
case eHTMLTag_head: case eHTMLTag_head:
StripWSFollowingTag(theChildTag,mTokenizer, mTokenAllocator, mLineNumber); StripWSFollowingTag(theChildTag,mTokenizer, mTokenAllocator, mLineNumber);
mFlags &= ~NS_DTD_FLAG_REQUESTED_HEAD;
result = CloseContainer(eHTMLTag_head, theChildTag, PR_FALSE); result = CloseContainer(eHTMLTag_head, theChildTag, PR_FALSE);
break; break;

16
parser/htmlparser/src/CNavDTD.cpp
Просмотреть файл

@ -120,12 +120,11 @@ static char gShowCRC;
#define NS_DTD_FLAG_HAD_BODY 0x00000010 #define NS_DTD_FLAG_HAD_BODY 0x00000010
#define NS_DTD_FLAG_HAD_FRAMESET 0x00000020 #define NS_DTD_FLAG_HAD_FRAMESET 0x00000020
#define NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE 0x00000040 #define NS_DTD_FLAG_ENABLE_RESIDUAL_STYLE 0x00000040
#define NS_DTD_FLAG_REQUESTED_HEAD 0x00000100 #define NS_DTD_FLAG_SCRIPT_ENABLED 0x00000100
#define NS_DTD_FLAG_SCRIPT_ENABLED 0x00000200 #define NS_DTD_FLAG_FRAMES_ENABLED 0x00000200
#define NS_DTD_FLAG_FRAMES_ENABLED 0x00000400 #define NS_DTD_FLAG_ALTERNATE_CONTENT 0x00000400 // NOFRAMES, NOSCRIPT
#define NS_DTD_FLAG_ALTERNATE_CONTENT 0x00000800 // NOFRAMES, NOSCRIPT #define NS_DTD_FLAG_MISPLACED_CONTENT 0x00000800
#define NS_DTD_FLAG_MISPLACED_CONTENT 0x00001000 #define NS_DTD_FLAG_STOP_PARSING 0x00001000
#define NS_DTD_FLAG_STOP_PARSING 0x00002000
/** /**
* This method gets called as part of our COM-like interfaces. * This method gets called as part of our COM-like interfaces.
@ -1727,7 +1726,6 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
if(mFlags & (NS_DTD_FLAG_HAD_BODY | NS_DTD_FLAG_HAD_FRAMESET)) { if(mFlags & (NS_DTD_FLAG_HAD_BODY | NS_DTD_FLAG_HAD_FRAMESET)) {
result=HandleOmittedTag(aToken,theChildTag,theParent,theNode); result=HandleOmittedTag(aToken,theChildTag,theParent,theNode);
isTokenHandled=PR_TRUE; isTokenHandled=PR_TRUE;
mFlags |= NS_DTD_FLAG_REQUESTED_HEAD;
} }
break; break;
default: default:
@ -1764,8 +1762,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
break; break;
case eHTMLTag_script: case eHTMLTag_script:
theHeadIsParent=(!(mFlags & NS_DTD_FLAG_HAS_OPEN_BODY) || theHeadIsParent = !(mFlags & NS_DTD_FLAG_HAS_OPEN_BODY);
(mFlags & NS_DTD_FLAG_REQUESTED_HEAD));
mFlags |= NS_DTD_FLAG_HAS_OPEN_SCRIPT; mFlags |= NS_DTD_FLAG_HAS_OPEN_SCRIPT;
default: default:
@ -1967,7 +1964,6 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
case eHTMLTag_head: case eHTMLTag_head:
StripWSFollowingTag(theChildTag,mTokenizer, mTokenAllocator, mLineNumber); StripWSFollowingTag(theChildTag,mTokenizer, mTokenAllocator, mLineNumber);
mFlags &= ~NS_DTD_FLAG_REQUESTED_HEAD;
result = CloseContainer(eHTMLTag_head, theChildTag, PR_FALSE); result = CloseContainer(eHTMLTag_head, theChildTag, PR_FALSE);
break; break;