wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 908347 - SinkContext::OpenContainer() only needs a tag r=mrbkap

Browse Source
This commit is contained in:
Trevor Saunders 2013-08-16 20:45:39 -04:00
parent b13117d008
commit bef3c298f9
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
content/html/document/src/nsHTMLContentSink.cpp
View File

@ -251,7 +251,7 @@ public:
nsresult Begin(nsHTMLTag aNodeType, nsGenericHTMLElement* aRoot,
uint32_t aNumFlushed, int32_t aInsertionPoint);
nsresult OpenContainer(const nsIParserNode& aNode);
nsresult OpenContainer(nsHTMLTag aNodeType);
nsresult CloseContainer(const nsHTMLTag aTag);
nsresult AddLeaf(const nsIParserNode& aNode);
nsresult AddLeaf(nsIContent* aContent);
@ -513,13 +513,13 @@ SinkContext::DidAddContent(nsIContent* aContent)
}
nsresult
SinkContext::OpenContainer(const nsIParserNode& aNode)
SinkContext::OpenContainer(nsHTMLTag aNodeType)
{
FlushTextAndRelease();
SINK_TRACE_NODE(SINK_TRACE_CALLS,
"SinkContext::OpenContainer",
nsHTMLTag(aNode.GetNodeType()),
aNodeType,
mStackPos,
mSink);
@ -538,25 +538,24 @@ SinkContext::OpenContainer(const nsIParserNode& aNode)
}
// Create new container content object
nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
nsGenericHTMLElement* content =
mSink->CreateContentObject(nodeType).get();
mSink->CreateContentObject(aNodeType).get();
if (!content) {
return NS_ERROR_OUT_OF_MEMORY;
}
mStack[mStackPos].mType = nodeType;
mStack[mStackPos].mType = aNodeType;
mStack[mStackPos].mContent = content;
mStack[mStackPos].mNumFlushed = 0;
mStack[mStackPos].mInsertionPoint = -1;
++mStackPos;
mStack[mStackPos - 2].Add(content);
if (mSink->IsMonolithicContainer(nodeType)) {
if (mSink->IsMonolithicContainer(aNodeType)) {
mSink->mInMonolithicContainer++;
}
// Special handling for certain tags
switch (nodeType) {
switch (aNodeType) {
case eHTMLTag_form:
MOZ_CRASH("Must not use HTMLContentSink for forms.");
@ -1519,7 +1518,7 @@ HTMLContentSink::OpenBody(const nsIParserNode& aNode)
return NS_OK;
}
nsresult rv = mCurrentContext->OpenContainer(aNode);
nsresult rv = mCurrentContext->OpenContainer(nsHTMLTag(aNode.GetNodeType()));
if (NS_FAILED(rv)) {
return rv;
@ -1632,7 +1631,7 @@ HTMLContentSink::OpenContainer(const nsIParserNode& aNode)
MOZ_CRASH("Must not use HTMLContentSink for forms.");
default:
rv = mCurrentContext->OpenContainer(aNode);
rv = mCurrentContext->OpenContainer(nsHTMLTag(aNode.GetNodeType()));
break;
}