diff --git a/mozilla/htmlparser/public/nsHTMLTokens.h b/mozilla/htmlparser/public/nsHTMLTokens.h index c40fc2a38f5..62a5a08155d 100644 --- a/mozilla/htmlparser/public/nsHTMLTokens.h +++ b/mozilla/htmlparser/public/nsHTMLTokens.h @@ -308,7 +308,7 @@ class CCDATASectionToken : public CHTMLToken { CTOKEN_IMPL_SIZEOF public: - CCDATASectionToken(); + CCDATASectionToken(eHTMLTags aTag = eHTMLTag_unknown); CCDATASectionToken(const nsAString& aString); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode); virtual const char* GetClassName(void); diff --git a/mozilla/htmlparser/src/nsDTDUtils.cpp b/mozilla/htmlparser/src/nsDTDUtils.cpp index 23d3b714c9d..c0adb60fa69 100644 --- a/mozilla/htmlparser/src/nsDTDUtils.cpp +++ b/mozilla/htmlparser/src/nsDTDUtils.cpp @@ -1366,7 +1366,7 @@ CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag case eToken_script: result=new(mArenaPool) CScriptToken(); break; case eToken_style: result=new(mArenaPool) CStyleToken(); break; case eToken_instruction: result=new(mArenaPool) CInstructionToken(); break; - case eToken_cdatasection: result=new(mArenaPool) CCDATASectionToken(); break; + case eToken_cdatasection: result=new(mArenaPool) CCDATASectionToken(aTag); break; case eToken_error: result=new(mArenaPool) CErrorToken(); break; case eToken_doctypeDecl: result=new(mArenaPool) CDoctypeDeclToken(aTag); break; case eToken_markupDecl: result=new(mArenaPool) CMarkupDeclToken(); break; diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp index 2939186493b..42a556241a3 100644 --- a/mozilla/htmlparser/src/nsHTMLTokens.cpp +++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp @@ -707,7 +707,7 @@ void CTextToken::Bind(const nsAString& aStr) * @param aName -- string to init token name with * @return */ -CCDATASectionToken::CCDATASectionToken() : CHTMLToken(eHTMLTag_unknown) { +CCDATASectionToken::CCDATASectionToken(eHTMLTags aTag) : CHTMLToken(aTag) { } diff --git a/mozilla/parser/htmlparser/public/nsHTMLTokens.h b/mozilla/parser/htmlparser/public/nsHTMLTokens.h index c40fc2a38f5..62a5a08155d 100644 --- a/mozilla/parser/htmlparser/public/nsHTMLTokens.h +++ b/mozilla/parser/htmlparser/public/nsHTMLTokens.h @@ -308,7 +308,7 @@ class CCDATASectionToken : public CHTMLToken { CTOKEN_IMPL_SIZEOF public: - CCDATASectionToken(); + CCDATASectionToken(eHTMLTags aTag = eHTMLTag_unknown); CCDATASectionToken(const nsAString& aString); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode); virtual const char* GetClassName(void); diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp index 23d3b714c9d..c0adb60fa69 100644 --- a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp +++ b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp @@ -1366,7 +1366,7 @@ CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag case eToken_script: result=new(mArenaPool) CScriptToken(); break; case eToken_style: result=new(mArenaPool) CStyleToken(); break; case eToken_instruction: result=new(mArenaPool) CInstructionToken(); break; - case eToken_cdatasection: result=new(mArenaPool) CCDATASectionToken(); break; + case eToken_cdatasection: result=new(mArenaPool) CCDATASectionToken(aTag); break; case eToken_error: result=new(mArenaPool) CErrorToken(); break; case eToken_doctypeDecl: result=new(mArenaPool) CDoctypeDeclToken(aTag); break; case eToken_markupDecl: result=new(mArenaPool) CMarkupDeclToken(); break; diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp index 2939186493b..42a556241a3 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp @@ -707,7 +707,7 @@ void CTextToken::Bind(const nsAString& aStr) * @param aName -- string to init token name with * @return */ -CCDATASectionToken::CCDATASectionToken() : CHTMLToken(eHTMLTag_unknown) { +CCDATASectionToken::CCDATASectionToken(eHTMLTags aTag) : CHTMLToken(aTag) { }