corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 569528 - Make <p> not close implicitly across a <button> on stack. rs=jonas, a=blocking2.0-final.

Browse Source
This commit is contained in:
Henri Sivonen
2010-09-08 19:31:22 +03:00
parent a193a4a140
commit 805ba079f4
6 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parser/html/nsHtml5TreeBuilder.cpp
View File

@@ -2305,7 +2305,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
NS_HTML5_BREAK(endtagloop);
}
case NS_HTML5TREE_BUILDER_P: {
eltPos = findLastInScope(nsHtml5Atoms::p);
eltPos = findLastInButtonScope(nsHtml5Atoms::p);
if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
if (inForeign) {
@@ -2736,6 +2736,19 @@ nsHtml5TreeBuilder::findLastInTableScope(nsIAtom* name)
return NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK;
}
PRInt32
nsHtml5TreeBuilder::findLastInButtonScope(nsIAtom* name)
{
for (PRInt32 i = currentPtr; i > 0; i--) {
if (stack[i]->name == name) {
return i;
} else if (stack[i]->scoping || stack[i]->name == nsHtml5Atoms::button) {
return NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK;
}
}
return NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK;
}
PRInt32
nsHtml5TreeBuilder::findLastInScope(nsIAtom* name)
{
@@ -3006,7 +3019,7 @@ nsHtml5TreeBuilder::resetTheInsertionMode()
void
nsHtml5TreeBuilder::implicitlyCloseP()
{
PRInt32 eltPos = findLastInScope(nsHtml5Atoms::p);
PRInt32 eltPos = findLastInButtonScope(nsHtml5Atoms::p);
if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
return;
}