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

Backed out changeset 2dcce82f9d66 because of mochitest failures

Browse Source
This commit is contained in:
Ehsan Akhgari 2010-06-16 22:14:11 -04:00
parent 540508e5de
commit 59ce9793d3
14 changed files with 85 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/base/src/nsGkAtomList.h
View File

@ -110,9 +110,7 @@ GK_ATOM(applyImports, "apply-imports")
GK_ATOM(applyTemplates, "apply-templates")
GK_ATOM(archive, "archive")
GK_ATOM(area, "area")
GK_ATOM(article, "article")
GK_ATOM(ascending, "ascending")
GK_ATOM(aside, "aside")
GK_ATOM(aspectRatio, "aspect-ratio")
GK_ATOM(assign, "assign")
GK_ATOM(async, "async")
@ -381,7 +379,6 @@ GK_ATOM(followingSibling, "following-sibling")
GK_ATOM(font, "font")
GK_ATOM(fontWeight, "font-weight")
GK_ATOM(fontpicker, "fontpicker")
GK_ATOM(footer, "footer")
GK_ATOM(_for, "for")
GK_ATOM(forEach, "for-each")
GK_ATOM(form, "form")
@ -415,10 +412,8 @@ GK_ATOM(HARD, "HARD")
GK_ATOM(hasSameNode, "has-same-node")
GK_ATOM(hbox, "hbox")
GK_ATOM(head, "head")
GK_ATOM(header, "header")
GK_ATOM(headers, "headers")
GK_ATOM(height, "height")
GK_ATOM(hgroup, "hgroup")
GK_ATOM(hidden, "hidden")
GK_ATOM(hidechrome, "hidechrome")
GK_ATOM(highest, "highest")
@ -572,7 +567,6 @@ GK_ATOM(_namespace, "namespace")
GK_ATOM(namespaceAlias, "namespace-alias")
GK_ATOM(namespaceUri, "namespace-uri")
GK_ATOM(NaN, "NaN")
GK_ATOM(nav, "nav")
GK_ATOM(negate, "negate")
GK_ATOM(never, "never")
GK_ATOM(_new, "new")
@ -825,7 +819,6 @@ GK_ATOM(scrollbarbutton, "scrollbarbutton")
GK_ATOM(scrollbox, "scrollbox")
GK_ATOM(scrollcorner, "scrollcorner")
GK_ATOM(scrolling, "scrolling")
GK_ATOM(section, "section")
GK_ATOM(select, "select")
GK_ATOM(selectPopupList, "selectPopupList")
GK_ATOM(selectable, "selectable")

1
content/html/content/src/Makefile.in
View File

@ -59,7 +59,6 @@ CPPSRCS = \
nsFormSubmission.cpp \
nsImageMapUtils.cpp \
nsTextEditorState.cpp \
nsHTMLElement.cpp \
nsHTMLAnchorElement.cpp \
nsHTMLAreaElement.cpp \
nsHTMLBRElement.cpp \

2
content/html/content/src/nsGenericHTMLElement.h
View File

@ -978,6 +978,7 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo, PRUint32 aFromParser)\
return new nsHTML##_elementName##Element(aNodeInfo, aFromParser); \
}
/**
* A macro to implement the getter and setter for a given string
* valued content property. The method uses the generic GetAttr and
@ -1314,7 +1315,6 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo, \
return NS_NewHTMLSharedElement(aNodeInfo, aFromParser); \
}
NS_DECLARE_NS_NEW_HTML_ELEMENT() // HTMLElement
NS_DECLARE_NS_NEW_HTML_ELEMENT(Shared)
NS_DECLARE_NS_NEW_HTML_ELEMENT(SharedList)
NS_DECLARE_NS_NEW_HTML_ELEMENT(SharedObject)

87
content/html/content/src/nsHTMLElement.cpp
View File

@ -1,87 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Mozilla Foundation
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Mounir Lamouri <mounir.lamouri@mozilla.com> (original author)
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLElement.h"
class nsHTMLElement : public nsGenericHTMLElement,
public nsIDOMHTMLElement
{
public:
nsHTMLElement(nsINodeInfo *aNodeInfo);
virtual ~nsHTMLElement();
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
// nsIDOMNode
NS_FORWARD_NSIDOMNODE(nsGenericHTMLElement::)
// nsIDOMElement
NS_FORWARD_NSIDOMELEMENT(nsGenericHTMLElement::)
// nsIDOMHTMLElement
NS_FORWARD_NSIDOMHTMLELEMENT(nsGenericHTMLElement::)
nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
};
NS_IMPL_NS_NEW_HTML_ELEMENT() // HTMLElement
nsHTMLElement::nsHTMLElement(nsINodeInfo* aNodeInfo)
: nsGenericHTMLElement(aNodeInfo)
{
}
nsHTMLElement::~nsHTMLElement()
{
}
NS_IMPL_ADDREF_INHERITED(nsHTMLElement, nsGenericElement)
NS_IMPL_RELEASE_INHERITED(nsHTMLElement, nsGenericElement)
DOMCI_DATA(HTMLElement, nsHTMLElement)
NS_INTERFACE_TABLE_HEAD(nsHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE0(nsHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLElement)
NS_IMPL_ELEMENT_CLONE(nsHTMLElement)

1
content/html/content/test/Makefile.in
View File

@ -162,6 +162,7 @@ _TEST_FILES = test_bug589.html \
test_bug536895.html \
test_bug458037.xhtml \
test_bug556645.html \
test_bug559284.html \
test_bug551670.html \
test_bug346485.html \
test_bug555567.html \

8
content/html/content/test/test_bug389797.html
View File

@ -111,15 +111,12 @@ objectIfaces2.push("nsIImageLoadingContent");
head
html
*/
HTML_TAG("a", "Anchor", [ "nsIDOMNSHTMLAnchorElement2" ]);
HTML_TAG("abbr", "Span");
HTML_TAG("acronym", "Span");
HTML_TAG("address", "Span");
HTML_TAG("applet", "Applet", [], objectIfaces);
HTML_TAG("area", "Area", [ "nsIDOMNSHTMLAreaElement2" ]);
HTML_TAG("article", ""); // HTMLElement
HTML_TAG("aside", ""); // HTMLElement
HTML_TAG("b", "Span");
HTML_TAG("base", "Base");
HTML_TAG("bdo", "Span");
@ -148,7 +145,6 @@ HTML_TAG("em", "Span");
HTML_TAG("embed", "Embed", [ "nsIDOMGetSVGDocument" ], objectIfaces);
HTML_TAG("fieldset", "FieldSet");
HTML_TAG("font", "Font");
HTML_TAG("footer", "") // HTMLElement
HTML_TAG("form", "Form", [], [ "nsIWebProgressListener" ]);
HTML_TAG("frame", "Frame", [], [ "nsIFrameLoaderOwner" ]);
HTML_TAG("frameset", "FrameSet");
@ -159,8 +155,6 @@ HTML_TAG("h4", "Heading");
HTML_TAG("h5", "Heading");
HTML_TAG("h6", "Heading");
HTML_TAG("head", "Head");
HTML_TAG("header", "") // HTMLElement
HTML_TAG("hgroup", "") // HTMLElement
HTML_TAG("hr", "HR");
HTML_TAG("html", "Html");
HTML_TAG("i", "Span");
@ -186,7 +180,6 @@ HTML_TAG("marquee", "Div");
HTML_TAG("menu", "Menu");
HTML_TAG("meta", "Meta");
HTML_TAG("multicol", "Span");
HTML_TAG("nav", "") // HTMLElement
HTML_TAG("nobr", "Span");
HTML_TAG("noembed", "Div");
HTML_TAG("noframes", "Div");
@ -204,7 +197,6 @@ HTML_TAG("q", "Quote");
HTML_TAG("s", "Span");
HTML_TAG("samp", "Span");
HTML_TAG("script", "Script", [], [ "nsIScriptLoaderObserver" ]);
HTML_TAG("section", "") // HTMLElement
HTML_TAG("select", "Select");
HTML_TAG("small", "Span");
HTML_TAG("spacer", "Spacer");

74
content/html/content/test/test_bug559284.html Normal file
View File

@ -0,0 +1,74 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=559284
-->
<head>
<title>Test for Bug 559284</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=559284">Mozilla Bug 559284</a>
<p id="display"></p>
<div id="content" style="display: none">
<section id="section"></section>
<nav id="nav"></nav>
<article id="article"></article>
<aside id="aside"></aside>
<hgroup id="hgroup"></hgroup>
<header id="header"></header>
<footer id="footer"></footer>
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 559284 **/
todo_is($("section").constructor, "[object HTMLElement]",
"Constructor should be section");
todo_is($("section").toString().substring(0, 19), "[object HTMLElement",
"Section should be HTMLElement");
is($("section") instanceof HTMLElement, true,
"Section should be instance of HTMLElement");
todo_is($("nav").constructor, "[object HTMLElement]",
"Constructor should be nav");
todo_is($("nav").toString().substring(0, 19), "[object HTMLElement",
"Nav should be HTMLElement");
is($("nav") instanceof HTMLElement, true,
"Nav should be instance of HTMLElement");
todo_is($("article").constructor, "[object HTMLElement]",
"Constructor should be article");
todo_is($("article").toString().substring(0, 19), "[object HTMLElement",
"Article should be HTMLElement");
is($("article") instanceof HTMLElement, true,
"Article should be instance of HTMLElement");
todo_is($("aside").constructor, "[object HTMLElement]",
"Constructor should be aside");
todo_is($("aside").toString().substring(0, 19), "[object HTMLElement",
"Aside should be HTMLElement");
is($("aside") instanceof HTMLElement, true,
"Aside should be instance of HTMLElement");
todo_is($("hgroup").constructor, "[object HTMLElement]",
"Constructor should be hgroup");
todo_is($("hgroup").toString().substring(0, 19), "[object HTMLElement",
"Hgroup should be HTMLElement");
is($("hgroup") instanceof HTMLElement, true,
"Hgroup should be instance of HTMLElement");
todo_is($("header").constructor, "[object HTMLElement]",
"Constructor should be header");
todo_is($("header").toString().substring(0, 19), "[object HTMLElement",
"Header should be HTMLElement");
is($("header") instanceof HTMLElement, true,
"Header should be instance of HTMLElement");
todo_is($("footer").constructor, "[object HTMLElement]",
"Constructor should be footer");
todo_is($("footer").toString().substring(0, 19), "[object HTMLElement",
"Footer should be HTMLElement");
is($("footer") instanceof HTMLElement, true,
"Footer should be instance of HTMLElement");
</script>
</pre>
</body>
</html>

9
dom/base/nsDOMClassInfo.cpp
View File

@ -245,7 +245,6 @@
#include "nsIDOMLinkStyle.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMNSHTMLDocument.h"
#include "nsIDOMHTMLElement.h"
#include "nsIDOMNSHTMLElement.h"
#include "nsIDOMHTMLAnchorElement.h"
#include "nsIDOMNSHTMLAnchorElement2.h"
@ -721,8 +720,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
ARRAY_SCRIPTABLE_FLAGS)
// HTML element classes
NS_DEFINE_CLASSINFO_DATA(HTMLElement, nsElementSH,
ELEMENT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(HTMLAnchorElement, nsElementSH,
ELEMENT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(HTMLAppletElement, nsHTMLPluginObjElementSH,
@ -2330,12 +2327,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLCollection)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(HTMLElement, nsIDOMHTMLElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLElement)
DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(HTMLAnchorElement, nsIDOMHTMLAnchorElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLAnchorElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLAnchorElement)

1
dom/base/nsDOMClassInfoClasses.h
View File

@ -84,7 +84,6 @@ DOMCI_CLASS(HTMLOptionsCollection)
DOMCI_CLASS(HTMLCollection)
// HTML element classes
DOMCI_CLASS(HTMLElement)
DOMCI_CLASS(HTMLAnchorElement)
DOMCI_CLASS(HTMLAppletElement)
DOMCI_CLASS(HTMLAreaElement)

7
editor/libeditor/base/nsEditPropertyAtomList.h
View File

@ -117,13 +117,6 @@ EDITOR_ATOM(hr, "hr")
EDITOR_ATOM(table, "table")
EDITOR_ATOM(fieldset, "fieldset")
EDITOR_ATOM(address, "address")
EDITOR_ATOM(article, "article")
EDITOR_ATOM(aside, "aside")
EDITOR_ATOM(footer, "footer")
EDITOR_ATOM(header, "header")
EDITOR_ATOM(hgroup, "hgroup")
EDITOR_ATOM(nav, "nav")
EDITOR_ATOM(section, "section")
// Unclear from
// DTD, block?
EDITOR_ATOM(body, "body")

35
editor/libeditor/html/nsHTMLEditUtils.cpp
View File

@ -489,10 +489,9 @@ nsHTMLEditUtils::SupportsAlignAttr(nsIDOMNode * aNode)
// button, form, input, label, select, textarea
#define GROUP_FORMCONTROL (1 << 6)
// address, applet, article, aside, blockquote, button, center, del, dir, div,
// dl, fieldset, footer, form, h1, h2, h3, h4, h5, h6, header, hgroup, hr,
// iframe, ins, isindex, map, menu, nav, noframes, noscript, object, ol, p, pre,
// table, section, ul
// address, applet, blockquote, button, center, del, dir, div, dl, fieldset,
// form, h1, h2, h3, h4, h5, h6, hr, iframe, ins, isindex, map, menu, noframes,
// noscript, object, ol, p, pre, table, ul
#define GROUP_BLOCK (1 << 7)
// frame, frameset
@ -538,9 +537,6 @@ nsHTMLEditUtils::SupportsAlignAttr(nsIDOMNode * aNode)
// ol, ul
#define GROUP_OL_UL (1 << 21)
// h1, h2, h3, h4, h5, h6
#define GROUP_HEADING (1 << 22)
#define GROUP_INLINE_ELEMENT \
(GROUP_FONTSTYLE | GROUP_PHRASE | GROUP_SPECIAL | GROUP_FORMCONTROL | \
GROUP_LEAF)
@ -575,8 +571,6 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
ELEM(applet, PR_TRUE, PR_TRUE, GROUP_SPECIAL | GROUP_BLOCK,
GROUP_FLOW_ELEMENT | GROUP_OBJECT_CONTENT),
ELEM(area, PR_FALSE, PR_FALSE, GROUP_MAP_CONTENT, GROUP_NONE),
ELEM(article, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(aside, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
#if defined(MOZ_MEDIA)
ELEM(audio, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
#endif
@ -611,25 +605,16 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
ELEM(embed, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
ELEM(fieldset, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(font, PR_TRUE, PR_TRUE, GROUP_SPECIAL, GROUP_INLINE_ELEMENT),
ELEM(footer, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(form, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(frame, PR_FALSE, PR_FALSE, GROUP_FRAME, GROUP_NONE),
ELEM(frameset, PR_TRUE, PR_TRUE, GROUP_FRAME, GROUP_FRAME),
ELEM(h1, PR_TRUE, PR_FALSE, GROUP_BLOCK | GROUP_HEADING,
GROUP_INLINE_ELEMENT),
ELEM(h2, PR_TRUE, PR_FALSE, GROUP_BLOCK | GROUP_HEADING,
GROUP_INLINE_ELEMENT),
ELEM(h3, PR_TRUE, PR_FALSE, GROUP_BLOCK | GROUP_HEADING,
GROUP_INLINE_ELEMENT),
ELEM(h4, PR_TRUE, PR_FALSE, GROUP_BLOCK | GROUP_HEADING,
GROUP_INLINE_ELEMENT),
ELEM(h5, PR_TRUE, PR_FALSE, GROUP_BLOCK | GROUP_HEADING,
GROUP_INLINE_ELEMENT),
ELEM(h6, PR_TRUE, PR_FALSE, GROUP_BLOCK | GROUP_HEADING,
GROUP_INLINE_ELEMENT),
ELEM(h1, PR_TRUE, PR_FALSE, GROUP_BLOCK, GROUP_INLINE_ELEMENT),
ELEM(h2, PR_TRUE, PR_FALSE, GROUP_BLOCK, GROUP_INLINE_ELEMENT),
ELEM(h3, PR_TRUE, PR_FALSE, GROUP_BLOCK, GROUP_INLINE_ELEMENT),
ELEM(h4, PR_TRUE, PR_FALSE, GROUP_BLOCK, GROUP_INLINE_ELEMENT),
ELEM(h5, PR_TRUE, PR_FALSE, GROUP_BLOCK, GROUP_INLINE_ELEMENT),
ELEM(h6, PR_TRUE, PR_FALSE, GROUP_BLOCK, GROUP_INLINE_ELEMENT),
ELEM(head, PR_TRUE, PR_FALSE, GROUP_TOPLEVEL, GROUP_HEAD_CONTENT),
ELEM(header, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(hgroup, PR_TRUE, PR_FALSE, GROUP_BLOCK, GROUP_HEADING),
ELEM(hr, PR_FALSE, PR_FALSE, GROUP_BLOCK, GROUP_NONE),
ELEM(html, PR_TRUE, PR_FALSE, GROUP_TOPLEVEL, GROUP_TOPLEVEL),
ELEM(i, PR_TRUE, PR_TRUE, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
@ -653,7 +638,6 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
ELEM(menu, PR_TRUE, PR_FALSE, GROUP_BLOCK, GROUP_LI),
ELEM(meta, PR_FALSE, PR_FALSE, GROUP_HEAD_CONTENT, GROUP_NONE),
ELEM(multicol, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
ELEM(nav, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(nobr, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
ELEM(noembed, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
ELEM(noframes, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
@ -677,7 +661,6 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
ELEM(samp, PR_TRUE, PR_TRUE, GROUP_PHRASE, GROUP_INLINE_ELEMENT),
ELEM(script, PR_TRUE, PR_FALSE, GROUP_HEAD_CONTENT | GROUP_SPECIAL,
GROUP_LEAF),
ELEM(section, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(select, PR_TRUE, PR_FALSE, GROUP_FORMCONTROL, GROUP_SELECT_CONTENT),
ELEM(small, PR_TRUE, PR_TRUE, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
#if defined(MOZ_MEDIA)

7
parser/htmlparser/public/nsHTMLTagList.h
View File

@ -69,8 +69,6 @@ HTML_TAG(acronym, Span)
HTML_TAG(address, Span)
HTML_TAG(applet, SharedObject)
HTML_TAG(area, Area)
HTML_TAG(article, ) // HTMLElement instance
HTML_TAG(aside, ) // HTMLElement instance
#if defined(MOZ_MEDIA)
HTML_TAG(audio, Audio)
#endif
@ -103,7 +101,6 @@ HTML_TAG(em, Span)
HTML_TAG(embed, SharedObject)
HTML_TAG(fieldset, FieldSet)
HTML_TAG(font, Font)
HTML_TAG(footer, ) // HTMLElement instance
HTML_TAG(form, Form)
HTML_TAG(frame, Frame)
HTML_TAG(frameset, FrameSet)
@ -114,8 +111,6 @@ HTML_TAG(h4, Heading)
HTML_TAG(h5, Heading)
HTML_TAG(h6, Heading)
HTML_TAG(head, Shared)
HTML_TAG(header, ) // HTMLElement instance
HTML_TAG(hgroup, ) // HTMLElement instance
HTML_TAG(hr, HR)
HTML_TAG(html, Shared)
HTML_TAG(i, Span)
@ -137,7 +132,6 @@ HTML_TAG(marquee, Div)
HTML_TAG(menu, Shared)
HTML_TAG(meta, Meta)
HTML_TAG(multicol, Span)
HTML_TAG(nav, ) // HTMLElement instance
HTML_TAG(nobr, Span)
HTML_TAG(noembed, Div)
HTML_TAG(noframes, Div)
@ -155,7 +149,6 @@ HTML_TAG(q, Shared)
HTML_TAG(s, Span)
HTML_TAG(samp, Span)
HTML_TAG(script, Script)
HTML_TAG(section, ) // HTMLElement instance
HTML_TAG(select, Select)
HTML_TAG(small, Span)
#if defined(MOZ_MEDIA)

63
parser/htmlparser/src/nsElementTable.cpp
View File

@ -250,24 +250,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ kNonContainer,kDefaultPropRange,
/*special parents,kids*/ &gAreaParent,0,
},
{
/*tag*/ eHTMLTag_article,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,0,
/*parent,incl,exclgroups*/ kBlock, (kSelf|kFlowEntity), kNone,
/*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0,
},
{
/*tag*/ eHTMLTag_aside,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,0,
/*parent,incl,exclgroups*/ kBlock, (kSelf|kFlowEntity), kNone,
/*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0,
},
#if defined(MOZ_MEDIA)
{
/*tag*/ eHTMLTag_audio,
@ -540,15 +522,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ 0, kDefaultPropRange,
/*special parents,kids*/ 0,&gFontKids,
},
{
/*tag*/ eHTMLTag_footer,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,0,
/*parent,incl,exclgroups*/ kBlock, (kSelf|kFlowEntity), kNone,
/*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0,
},
{
/*tag*/ eHTMLTag_form,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
@ -640,24 +613,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ kNoStyleLeaksIn, kDefaultPropRange,
/*special parents,kids*/ &gInHTML,0,
},
{
/*tag*/ eHTMLTag_header,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,0,
/*parent,incl,exclgroups*/ kBlock, (kSelf|kFlowEntity), kNone,
/*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0,
},
{
/*tag*/ eHTMLTag_hgroup,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,0,
/*parent,incl,exclgroups*/ kBlock, (kSelf|kFlowEntity), kNone,
/*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0,
},
{
/*tag*/ eHTMLTag_hr,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
@ -847,15 +802,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0,
},
{
/*tag*/ eHTMLTag_nav,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,0,
/*parent,incl,exclgroups*/ kBlock, (kSelf|kFlowEntity), kNone,
/*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0,
},
{
/*tag*/ eHTMLTag_nobr,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
@ -1009,15 +955,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ kNoStyleLeaksIn|kLegalOpen, kNoPropRange,
/*special parents,kids*/ 0,&gContainsText,
},
{
/*tag*/ eHTMLTag_section,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,0,
/*parent,incl,exclgroups*/ kBlock, (kSelf|kFlowEntity), kNone,
/*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0,
},
{
/*tag*/ eHTMLTag_select,
/*requiredAncestor*/ eHTMLTag_unknown, eHTMLTag_unknown,

14
parser/htmlparser/src/nsHTMLTags.cpp
View File

@ -57,10 +57,6 @@ static const PRUnichar sHTMLTagUnicodeName_applet[] =
{'a', 'p', 'p', 'l', 'e', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_area[] =
{'a', 'r', 'e', 'a', '\0'};
static const PRUnichar sHTMLTagUnicodeName_article[] =
{'a', 'r', 't', 'i', 'c', 'l', 'e', '\0'};
static const PRUnichar sHTMLTagUnicodeName_aside[] =
{'a', 's', 'i', 'd', 'e', '\0'};
#if defined(MOZ_MEDIA)
static const PRUnichar sHTMLTagUnicodeName_audio[] =
{'a', 'u', 'd', 'i', 'o', '\0'};
@ -125,8 +121,6 @@ static const PRUnichar sHTMLTagUnicodeName_fieldset[] =
{'f', 'i', 'e', 'l', 'd', 's', 'e', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_font[] =
{'f', 'o', 'n', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_footer[] =
{'f', 'o', 'o', 't', 'e', 'r', '\0'};
static const PRUnichar sHTMLTagUnicodeName_form[] =
{'f', 'o', 'r', 'm', '\0'};
static const PRUnichar sHTMLTagUnicodeName_frame[] =
@ -147,10 +141,6 @@ static const PRUnichar sHTMLTagUnicodeName_h6[] =
{'h', '6', '\0'};
static const PRUnichar sHTMLTagUnicodeName_head[] =
{'h', 'e', 'a', 'd', '\0'};
static const PRUnichar sHTMLTagUnicodeName_header[] =
{'h', 'e', 'a', 'd', 'e', 'r', '\0'};
static const PRUnichar sHTMLTagUnicodeName_hgroup[] =
{'h', 'g', 'r', 'o', 'u', 'p', '\0'};
static const PRUnichar sHTMLTagUnicodeName_hr[] =
{'h', 'r', '\0'};
static const PRUnichar sHTMLTagUnicodeName_html[] =
@ -193,8 +183,6 @@ static const PRUnichar sHTMLTagUnicodeName_meta[] =
{'m', 'e', 't', 'a', '\0'};
static const PRUnichar sHTMLTagUnicodeName_multicol[] =
{'m', 'u', 'l', 't', 'i', 'c', 'o', 'l', '\0'};
static const PRUnichar sHTMLTagUnicodeName_nav[] =
{'n', 'a', 'v', '\0'};
static const PRUnichar sHTMLTagUnicodeName_nobr[] =
{'n', 'o', 'b', 'r', '\0'};
static const PRUnichar sHTMLTagUnicodeName_noembed[] =
@ -229,8 +217,6 @@ static const PRUnichar sHTMLTagUnicodeName_samp[] =
{'s', 'a', 'm', 'p', '\0'};
static const PRUnichar sHTMLTagUnicodeName_script[] =
{'s', 'c', 'r', 'i', 'p', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_section[] =
{'s', 'e', 'c', 't', 'i', 'o', 'n', '\0'};
static const PRUnichar sHTMLTagUnicodeName_select[] =
{'s', 'e', 'l', 'e', 'c', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_small[] =