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 857022 - Remove MOZ_MEDIA from parser. r=smaug

Browse Source 
Enable this code unconditionally.
This commit is contained in:
Ralph Giles 2013-04-04 14:08:00 -07:00
parent 12b1c5bee2
commit 5fc3ee3bb7
4 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "./../../mozilla-config.h" // for MOZ_MEDIA
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/Util.h" // for ArrayLength #include "mozilla/Util.h" // for ArrayLength
#include "mozilla/dom/Element.h" // for Element, nsINode #include "mozilla/dom/Element.h" // for Element, nsINode
@ -623,9 +622,7 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
ELEM(area, false, false, GROUP_MAP_CONTENT, GROUP_NONE), ELEM(area, false, false, GROUP_MAP_CONTENT, GROUP_NONE),
ELEM(article, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT), ELEM(article, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(aside, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT), ELEM(aside, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
#if defined(MOZ_MEDIA)
ELEM(audio, false, false, GROUP_NONE, GROUP_NONE), ELEM(audio, false, false, GROUP_NONE, GROUP_NONE),
#endif
ELEM(b, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT), ELEM(b, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
ELEM(base, false, false, GROUP_HEAD_CONTENT, GROUP_NONE), ELEM(base, false, false, GROUP_HEAD_CONTENT, GROUP_NONE),
ELEM(basefont, false, false, GROUP_SPECIAL, GROUP_NONE), ELEM(basefont, false, false, GROUP_SPECIAL, GROUP_NONE),
@ -735,9 +732,7 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
ELEM(section, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT), ELEM(section, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT),
ELEM(select, true, false, GROUP_FORMCONTROL, GROUP_SELECT_CONTENT), ELEM(select, true, false, GROUP_FORMCONTROL, GROUP_SELECT_CONTENT),
ELEM(small, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT), ELEM(small, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
#if defined(MOZ_MEDIA)
ELEM(source, false, false, GROUP_NONE, GROUP_NONE), ELEM(source, false, false, GROUP_NONE, GROUP_NONE),
#endif
ELEM(span, true, true, GROUP_SPECIAL, GROUP_INLINE_ELEMENT), ELEM(span, true, true, GROUP_SPECIAL, GROUP_INLINE_ELEMENT),
ELEM(strike, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT), ELEM(strike, true, true, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
ELEM(strong, true, true, GROUP_PHRASE, GROUP_INLINE_ELEMENT), ELEM(strong, true, true, GROUP_PHRASE, GROUP_INLINE_ELEMENT),
@ -761,9 +756,7 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
ELEM(ul, true, true, GROUP_BLOCK | GROUP_OL_UL, ELEM(ul, true, true, GROUP_BLOCK | GROUP_OL_UL,
GROUP_LI | GROUP_OL_UL), GROUP_LI | GROUP_OL_UL),
ELEM(var, true, true, GROUP_PHRASE, GROUP_INLINE_ELEMENT), ELEM(var, true, true, GROUP_PHRASE, GROUP_INLINE_ELEMENT),
#if defined(MOZ_MEDIA)
ELEM(video, false, false, GROUP_NONE, GROUP_NONE), ELEM(video, false, false, GROUP_NONE, GROUP_NONE),
#endif
ELEM(wbr, false, false, GROUP_NONE, GROUP_NONE), ELEM(wbr, false, false, GROUP_NONE, GROUP_NONE),
ELEM(xmp, false, false, GROUP_NONE, GROUP_NONE), ELEM(xmp, false, false, GROUP_NONE, GROUP_NONE),

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

@ -43,9 +43,7 @@ HTML_TAG(applet, SharedObject)
HTML_TAG(area, Area) HTML_TAG(area, Area)
HTML_HTMLELEMENT_TAG(article) HTML_HTMLELEMENT_TAG(article)
HTML_HTMLELEMENT_TAG(aside) HTML_HTMLELEMENT_TAG(aside)
#if defined(MOZ_MEDIA)
HTML_TAG(audio, Audio) HTML_TAG(audio, Audio)
#endif
HTML_HTMLELEMENT_TAG(b) HTML_HTMLELEMENT_TAG(b)
HTML_TAG(base, Shared) HTML_TAG(base, Shared)
HTML_TAG(basefont, Span) HTML_TAG(basefont, Span)
@ -138,9 +136,7 @@ HTML_TAG(script, Script)
HTML_HTMLELEMENT_TAG(section) HTML_HTMLELEMENT_TAG(section)
HTML_TAG(select, Select) HTML_TAG(select, Select)
HTML_HTMLELEMENT_TAG(small) HTML_HTMLELEMENT_TAG(small)
#if defined(MOZ_MEDIA)
HTML_TAG(source, Source) HTML_TAG(source, Source)
#endif
HTML_TAG(span, Span) HTML_TAG(span, Span)
HTML_HTMLELEMENT_TAG(strike) HTML_HTMLELEMENT_TAG(strike)
HTML_HTMLELEMENT_TAG(strong) HTML_HTMLELEMENT_TAG(strong)
@ -162,9 +158,7 @@ HTML_HTMLELEMENT_TAG(tt)
HTML_HTMLELEMENT_TAG(u) HTML_HTMLELEMENT_TAG(u)
HTML_TAG(ul, SharedList) HTML_TAG(ul, SharedList)
HTML_HTMLELEMENT_TAG(var) HTML_HTMLELEMENT_TAG(var)
#if defined(MOZ_MEDIA)
HTML_TAG(video, Video) HTML_TAG(video, Video)
#endif
HTML_HTMLELEMENT_TAG(wbr) HTML_HTMLELEMENT_TAG(wbr)
HTML_HTMLELEMENT_TAG(xmp) HTML_HTMLELEMENT_TAG(xmp)

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

@ -43,9 +43,7 @@ DECL_TAG_LIST(gAreaParent,{eHTMLTag_map})
DECL_TAG_LIST(gParamParents,{eHTMLTag_applet COMMA eHTMLTag_object}) DECL_TAG_LIST(gParamParents,{eHTMLTag_applet COMMA eHTMLTag_object})
DECL_TAG_LIST(gTRParents,{eHTMLTag_tbody COMMA eHTMLTag_tfoot COMMA eHTMLTag_thead COMMA eHTMLTag_table}) DECL_TAG_LIST(gTRParents,{eHTMLTag_tbody COMMA eHTMLTag_tfoot COMMA eHTMLTag_thead COMMA eHTMLTag_table})
DECL_TAG_LIST(gTREndParents,{eHTMLTag_tbody COMMA eHTMLTag_tfoot COMMA eHTMLTag_thead COMMA eHTMLTag_table COMMA eHTMLTag_applet}) DECL_TAG_LIST(gTREndParents,{eHTMLTag_tbody COMMA eHTMLTag_tfoot COMMA eHTMLTag_thead COMMA eHTMLTag_table COMMA eHTMLTag_applet})
#ifdef MOZ_MEDIA
DECL_TAG_LIST(gSourceParents,{eHTMLTag_video COMMA eHTMLTag_audio}) DECL_TAG_LIST(gSourceParents,{eHTMLTag_video COMMA eHTMLTag_audio})
#endif
//********************************************************************************************* //*********************************************************************************************
// Next, define the set of taglists for tags with special kids... // Next, define the set of taglists for tags with special kids...
@ -90,10 +88,8 @@ DECL_TAG_LIST(gTableElemKids,{eHTMLTag_form COMMA eHTMLTag_noscript COMMA eHTMLT
DECL_TAG_LIST(gTRKids,{eHTMLTag_td COMMA eHTMLTag_th COMMA eHTMLTag_form COMMA eHTMLTag_script})// Removed INPUT - Ref. Bug 20087, 25382 | Removed MAP to fix 58942 DECL_TAG_LIST(gTRKids,{eHTMLTag_td COMMA eHTMLTag_th COMMA eHTMLTag_form COMMA eHTMLTag_script})// Removed INPUT - Ref. Bug 20087, 25382 | Removed MAP to fix 58942
DECL_TAG_LIST(gTBodyKids,{eHTMLTag_tr COMMA eHTMLTag_form}) // Removed INPUT - Ref. Bug 20087, 25382 DECL_TAG_LIST(gTBodyKids,{eHTMLTag_tr COMMA eHTMLTag_form}) // Removed INPUT - Ref. Bug 20087, 25382
DECL_TAG_LIST(gULKids,{eHTMLTag_li COMMA eHTMLTag_p}) DECL_TAG_LIST(gULKids,{eHTMLTag_li COMMA eHTMLTag_p})
#ifdef MOZ_MEDIA
DECL_TAG_LIST(gVideoKids,{eHTMLTag_source}) DECL_TAG_LIST(gVideoKids,{eHTMLTag_source})
DECL_TAG_LIST(gAudioKids,{eHTMLTag_source}) DECL_TAG_LIST(gAudioKids,{eHTMLTag_source})
#endif
//********************************************************************************************* //*********************************************************************************************
// The following tag lists are used to define common set of root notes for the HTML elements... // The following tag lists are used to define common set of root notes for the HTML elements...
@ -234,7 +230,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ 0,kDefaultPropRange, /*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0, /*special parents,kids*/ 0,0,
}, },
#if defined(MOZ_MEDIA)
{ {
/*tag*/ eHTMLTag_audio, /*tag*/ eHTMLTag_audio,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
@ -244,7 +239,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ 0,kDefaultPropRange, /*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,&gAudioKids, /*special parents,kids*/ 0,&gAudioKids,
}, },
#endif
{ {
/*tag*/ eHTMLTag_b, /*tag*/ eHTMLTag_b,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
@ -1074,7 +1068,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ 0, kDefaultPropRange, /*special props, prop-range*/ 0, kDefaultPropRange,
/*special parents,kids*/ 0,0, /*special parents,kids*/ 0,0,
}, },
#if defined(MOZ_MEDIA)
{ {
/*tag*/ eHTMLTag_source, /*tag*/ eHTMLTag_source,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
@ -1084,7 +1077,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ kNonContainer,kNoPropRange, /*special props, prop-range*/ kNonContainer,kNoPropRange,
/*special parents,kids*/ &gSourceParents,0, /*special parents,kids*/ &gSourceParents,0,
}, },
#endif
{ {
// I made span a special% tag again, (instead of inline). // I made span a special% tag again, (instead of inline).
@ -1282,7 +1274,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ 0,kDefaultPropRange, /*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,0, /*special parents,kids*/ 0,0,
}, },
#if defined(MOZ_MEDIA)
{ {
/*tag*/ eHTMLTag_video, /*tag*/ eHTMLTag_video,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
@ -1292,7 +1283,6 @@ const nsHTMLElement gHTMLElements[] = {
/*special props, prop-range*/ 0,kDefaultPropRange, /*special props, prop-range*/ 0,kDefaultPropRange,
/*special parents,kids*/ 0,&gVideoKids, /*special parents,kids*/ 0,&gVideoKids,
}, },
#endif
{ {
/*tag*/ eHTMLTag_wbr, /*tag*/ eHTMLTag_wbr,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,

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

@ -35,10 +35,8 @@ static const PRUnichar sHTMLTagUnicodeName_article[] =
{'a', 'r', 't', 'i', 'c', 'l', 'e', '\0'}; {'a', 'r', 't', 'i', 'c', 'l', 'e', '\0'};
static const PRUnichar sHTMLTagUnicodeName_aside[] = static const PRUnichar sHTMLTagUnicodeName_aside[] =
{'a', 's', 'i', 'd', 'e', '\0'}; {'a', 's', 'i', 'd', 'e', '\0'};
#if defined(MOZ_MEDIA)
static const PRUnichar sHTMLTagUnicodeName_audio[] = static const PRUnichar sHTMLTagUnicodeName_audio[] =
{'a', 'u', 'd', 'i', 'o', '\0'}; {'a', 'u', 'd', 'i', 'o', '\0'};
#endif
static const PRUnichar sHTMLTagUnicodeName_b[] = static const PRUnichar sHTMLTagUnicodeName_b[] =
{'b', '\0'}; {'b', '\0'};
static const PRUnichar sHTMLTagUnicodeName_base[] = static const PRUnichar sHTMLTagUnicodeName_base[] =
@ -225,10 +223,8 @@ static const PRUnichar sHTMLTagUnicodeName_select[] =
{'s', 'e', 'l', 'e', 'c', 't', '\0'}; {'s', 'e', 'l', 'e', 'c', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_small[] = static const PRUnichar sHTMLTagUnicodeName_small[] =
{'s', 'm', 'a', 'l', 'l', '\0'}; {'s', 'm', 'a', 'l', 'l', '\0'};
#if defined(MOZ_MEDIA)
static const PRUnichar sHTMLTagUnicodeName_source[] = static const PRUnichar sHTMLTagUnicodeName_source[] =
{'s', 'o', 'u', 'r', 'c', 'e', '\0'}; {'s', 'o', 'u', 'r', 'c', 'e', '\0'};
#endif
static const PRUnichar sHTMLTagUnicodeName_spacer[] = static const PRUnichar sHTMLTagUnicodeName_spacer[] =
{'s', 'p', 'a', 'c', 'e', 'r', '\0'}; {'s', 'p', 'a', 'c', 'e', 'r', '\0'};
static const PRUnichar sHTMLTagUnicodeName_span[] = static const PRUnichar sHTMLTagUnicodeName_span[] =
@ -273,10 +269,8 @@ static const PRUnichar sHTMLTagUnicodeName_ul[] =
{'u', 'l', '\0'}; {'u', 'l', '\0'};
static const PRUnichar sHTMLTagUnicodeName_var[] = static const PRUnichar sHTMLTagUnicodeName_var[] =
{'v', 'a', 'r', '\0'}; {'v', 'a', 'r', '\0'};
#if defined(MOZ_MEDIA)
static const PRUnichar sHTMLTagUnicodeName_video[] = static const PRUnichar sHTMLTagUnicodeName_video[] =
{'v', 'i', 'd', 'e', 'o', '\0'}; {'v', 'i', 'd', 'e', 'o', '\0'};
#endif
static const PRUnichar sHTMLTagUnicodeName_wbr[] = static const PRUnichar sHTMLTagUnicodeName_wbr[] =
{'w', 'b', 'r', '\0'}; {'w', 'b', 'r', '\0'};
static const PRUnichar sHTMLTagUnicodeName_xmp[] = static const PRUnichar sHTMLTagUnicodeName_xmp[] =