Bug 711839 - --disable-ogg configure option breaks build after bug 689834. r=bz

This commit is contained in:
aceman 2012-01-20 19:23:58 +00:00
parent eda2919da2
commit f08eba2139
3 changed files with 16 additions and 6 deletions

View File

@ -802,8 +802,10 @@ SinkContext::OpenContainer(const nsIParserNode& aNode)
break;
case eHTMLTag_button:
#ifdef MOZ_MEDIA
case eHTMLTag_audio:
case eHTMLTag_video:
#endif
content->DoneCreatingElement();
break;

View File

@ -1071,9 +1071,13 @@ nsXMLContentSink::HandleStartElement(const PRUnichar *aName,
if (nodeInfo->NamespaceID() == kNameSpaceID_XHTML) {
if (nodeInfo->NameAtom() == nsGkAtoms::input ||
nodeInfo->NameAtom() == nsGkAtoms::button ||
nodeInfo->NameAtom() == nsGkAtoms::menuitem ||
nodeInfo->NameAtom() == nsGkAtoms::menuitem
#ifdef MOZ_MEDIA
||
nodeInfo->NameAtom() == nsGkAtoms::audio ||
nodeInfo->NameAtom() == nsGkAtoms::video) {
nodeInfo->NameAtom() == nsGkAtoms::video
#endif
) {
content->DoneCreatingElement();
} else if (nodeInfo->NameAtom() == nsGkAtoms::head && !mCurrentHead) {
mCurrentHead = content;

View File

@ -338,9 +338,13 @@ txMozillaXMLOutput::endElement()
} else if (ns == kNameSpaceID_XHTML &&
(localName == nsGkAtoms::input ||
localName == nsGkAtoms::button ||
localName == nsGkAtoms::menuitem ||
localName == nsGkAtoms::menuitem
#ifdef MOZ_MEDIA
||
localName == nsGkAtoms::audio ||
localName == nsGkAtoms::video )) {
localName == nsGkAtoms::video
#endif
)) {
element->DoneCreatingElement();
}
}