From 59adf29bb1aa58578f9692f4599481b84ff00026 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 25 Jan 2012 08:50:03 +0100 Subject: [PATCH] Bug 720124 - Remove dead code from HTMLContentSink: mInsideNoXXXTag; r=hsivonen --- .../html/document/src/nsHTMLContentSink.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp index ce1eacf8210b..8032276f1da8 100644 --- a/content/html/document/src/nsHTMLContentSink.cpp +++ b/content/html/document/src/nsHTMLContentSink.cpp @@ -250,9 +250,6 @@ protected: SinkContext* mCurrentContext; SinkContext* mHeadContext; - // depth of containment within , <noframes> etc - PRInt32 mInsideNoXXXTag; - // Boolean indicating whether we've seen a <head> tag that might have had // attributes once already. bool mHaveSeenHead; @@ -469,7 +466,7 @@ MaybeSetForm(nsGenericHTMLElement* aContent, nsHTMLTag aNodeType, { nsGenericHTMLElement* form = aSink->mCurrentForm; - if (!form || aSink->mInsideNoXXXTag) { + if (!form) { return; } @@ -750,7 +747,7 @@ SinkContext::OpenContainer(const nsIParserNode& aNode) case eHTMLTag_noembed: case eHTMLTag_noframes: - mSink->mInsideNoXXXTag++; + MOZ_NOT_REACHED("Must not use HTMLContentSink for noembed/noframes."); break; case eHTMLTag_script: @@ -864,13 +861,9 @@ SinkContext::CloseContainer(const nsHTMLTag aTag) switch (nodeType) { case eHTMLTag_noembed: case eHTMLTag_noframes: - // Fix bug 40216 - NS_ASSERTION((mSink->mInsideNoXXXTag > 0), "mInsideNoXXXTag underflow"); - if (mSink->mInsideNoXXXTag > 0) { - mSink->mInsideNoXXXTag--; - } - + MOZ_NOT_REACHED("Must not use HTMLContentSink for noembed/noframes."); break; + case eHTMLTag_form: { mSink->mFormOnStack = false; @@ -962,9 +955,7 @@ SinkContext::AddLeaf(const nsIParserNode& aNode) case eHTMLTag_meta: // XXX It's just not sufficient to check if the parent is head. Also // check for the preference. - if (!mSink->mInsideNoXXXTag) { - rv = mSink->ProcessMETATag(content); - } + rv = mSink->ProcessMETATag(content); break; case eHTMLTag_input: