Mozilla bug 1315460 - Removal of keygen element. r=hsivonen.

Author: Jonathan Kingston

src/nu/validator/htmlparser/impl/ElementName.java

@@ -1172,9 +1172,9 @@ public void destructor() {
 // CPPONLY: NS_NewSVGUnknownElement, 
 TreeBuilder.MI_MO_MN_MS_MTEXT | SCOPING_AS_MATHML);
 public static final ElementName KEYGEN = new ElementName("keygen", "keygen", 
-// CPPONLY: NS_NewHTMLSpanElement,
+// CPPONLY: NS_NewHTMLElement,
 // CPPONLY: NS_NewSVGUnknownElement, 
-TreeBuilder.KEYGEN);
+TreeBuilder.KEYGEN | SPECIAL);
 public static final ElementName MAIN = new ElementName("main", "main", 
 // CPPONLY: NS_NewHTMLElement,
 // CPPONLY: NS_NewSVGUnknownElement, 

src/nu/validator/htmlparser/impl/TreeBuilder.java

@@ -2096,11 +2096,11 @@ public final void startTag(ElementName elementName,
                         case OBJECT:
                         case TABLE:
                         case AREA_OR_WBR:
+                        case KEYGEN:
                         case BR:
                         case EMBED:
                         case IMG:
                         case INPUT:
-                        case KEYGEN:
                         case HR:
                         case TEXTAREA:
                         case XMP:
@@ -2332,6 +2332,7 @@ public final void startTag(ElementName elementName,
                             case BR:
                             case EMBED:
                             case AREA_OR_WBR:
+                            case KEYGEN:
                                 reconstructTheActiveFormattingElements();
                                 // FALL THROUGH to PARAM_OR_SOURCE_OR_TRACK
                                 // CPPONLY: MOZ_FALLTHROUGH;
@@ -2356,7 +2357,6 @@ public final void startTag(ElementName elementName,
                                 elementName = ElementName.IMG;
                                 continue starttagloop;
                             case IMG:
-                            case KEYGEN:
                             case INPUT:
                                 reconstructTheActiveFormattingElements();
                                 appendVoidElementToCurrentMayFoster(
@@ -2740,7 +2740,6 @@ public final void startTag(ElementName elementName,
                             }
                         case INPUT:
                         case TEXTAREA:
-                        case KEYGEN:
                             errStartTagWithSelectOpen(name);
                             eltPos = findLastInTableScope("select");
                             if (eltPos == TreeBuilder.NOT_FOUND_ON_STACK) {
@@ -3802,13 +3801,13 @@ public final void endTag(ElementName elementName) throws SAXException {
                             // fall through to IN_HEAD;
                             break;
                         case AREA_OR_WBR:
+                        case KEYGEN: // XXX??
                         // CPPONLY: case MENUITEM:
                         case PARAM_OR_SOURCE_OR_TRACK:
                         case EMBED:
                         case IMG:
                         case IMAGE:
                         case INPUT:
-                        case KEYGEN: // XXX??
                         case HR:
                         case IFRAME:
                         case NOEMBED: // XXX???