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

Bug 595797 - Add the attributes of an <html> start tag to the root element if the <html> tag is seen after a frameset. rs=jonas, a=blocking2.0-betaN.

Browse Source
This commit is contained in:
Henri Sivonen
2010-09-15 11:37:55 +03:00
parent 89ac4b0c22
commit a4a9e6e96b
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
parser/html/javasrc/TreeBuilder.java
View File

@@ -2877,6 +2877,13 @@ public abstract class TreeBuilder<T> implements TokenHandler,
} }
case AFTER_AFTER_FRAMESET: case AFTER_AFTER_FRAMESET:
switch (group) { switch (group) {
case HTML:
err("Stray \u201Chtml\u201D start tag.");
if (!fragment) {
addAttributesToHtml(attributes);
attributes = null; // CPP
}
break starttagloop;
case NOFRAMES: case NOFRAMES:
appendToCurrentNodeAndPushElementMayFoster( appendToCurrentNodeAndPushElementMayFoster(
"http://www.w3.org/1999/xhtml", "http://www.w3.org/1999/xhtml",

8
parser/html/nsHtml5TreeBuilder.cpp
View File

@@ -1774,6 +1774,14 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
} }
case NS_HTML5TREE_BUILDER_AFTER_AFTER_FRAMESET: { case NS_HTML5TREE_BUILDER_AFTER_AFTER_FRAMESET: {
switch(group) { switch(group) {
case NS_HTML5TREE_BUILDER_HTML: {
if (!fragment) {
addAttributesToHtml(attributes);
attributes = nsnull;
}
NS_HTML5_BREAK(starttagloop);
}
case NS_HTML5TREE_BUILDER_NOFRAMES: { case NS_HTML5TREE_BUILDER_NOFRAMES: {
appendToCurrentNodeAndPushElementMayFoster(kNameSpaceID_XHTML, elementName, attributes); appendToCurrentNodeAndPushElementMayFoster(kNameSpaceID_XHTML, elementName, attributes);
originalMode = mode; originalMode = mode;