From d163c367d9ee5f13769b8580b97bcc511fdd13cd Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 19 Jan 2020 09:57:36 -0500 Subject: Bug 483155 - Put content creator function pointers onto nsHtml5ElementName. This is all the manual work for Bug 483155, minus the added functionality to disable SVG and MathML which can be done at any time and are out of scope. Tag UXP Issue #1344 --- dom/html/nsHTMLContentSink.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'dom/html/nsHTMLContentSink.cpp') diff --git a/dom/html/nsHTMLContentSink.cpp b/dom/html/nsHTMLContentSink.cpp index 87ae2a4ac..2827f5ff6 100644 --- a/dom/html/nsHTMLContentSink.cpp +++ b/dom/html/nsHTMLContentSink.cpp @@ -84,10 +84,6 @@ using namespace mozilla::dom; //---------------------------------------------------------------------- -typedef nsGenericHTMLElement* - (*contentCreatorCallback)(already_AddRefed&&, - FromParser aFromParser); - nsGenericHTMLElement* NS_NewHTMLNOTUSEDElement(already_AddRefed&& aNodeInfo, FromParser aFromParser) @@ -98,7 +94,7 @@ NS_NewHTMLNOTUSEDElement(already_AddRefed&& aNodeInfo, #define HTML_TAG(_tag, _classname, _interfacename) NS_NewHTML##_classname##Element, #define HTML_OTHER(_tag) NS_NewHTMLNOTUSEDElement, -static const contentCreatorCallback sContentCreatorCallbacks[] = { +static const HTMLContentCreatorFunction sHTMLContentCreatorFunctions[] = { NS_NewHTMLUnknownElement, #include "nsHTMLTagList.h" #undef HTML_TAG @@ -383,7 +379,7 @@ CreateHTMLElement(uint32_t aNodeType, aNodeType == eHTMLTag_userdefined, "aNodeType is out of bounds"); - contentCreatorCallback cb = sContentCreatorCallbacks[aNodeType]; + HTMLContentCreatorFunction cb = sHTMLContentCreatorFunctions[aNodeType]; NS_ASSERTION(cb != NS_NewHTMLNOTUSEDElement, "Don't know how to construct tag element!"); -- cgit v1.2.3