From 76a4af34064296177e11a0d3887a5763a6c3a572 Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Sat, 18 Jan 2020 17:17:17 -0500
Subject: Bug 1358037 - Inline the methods of nsHtml5ElementName and
 nsHtml5AttributeName.

HTML Regen.

Tag UXP Issue #1344
---
 parser/html/nsHtml5StackNode.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'parser/html/nsHtml5StackNode.cpp')

diff --git a/parser/html/nsHtml5StackNode.cpp b/parser/html/nsHtml5StackNode.cpp
index 95e51fa1a..be344c386 100644
--- a/parser/html/nsHtml5StackNode.cpp
+++ b/parser/html/nsHtml5StackNode.cpp
@@ -44,12 +44,13 @@
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
+#include "nsHtml5Portability.h"
 
+#include "nsHtml5AttributeName.h"
+#include "nsHtml5ElementName.h"
 #include "nsHtml5Tokenizer.h"
 #include "nsHtml5TreeBuilder.h"
 #include "nsHtml5MetaScanner.h"
-#include "nsHtml5AttributeName.h"
-#include "nsHtml5ElementName.h"
 #include "nsHtml5UTF16Buffer.h"
 #include "nsHtml5StateSnapshot.h"
 #include "nsHtml5Portability.h"
@@ -59,31 +60,31 @@
 int32_t 
 nsHtml5StackNode::getGroup()
 {
-  return flags & NS_HTML5ELEMENT_NAME_GROUP_MASK;
+  return flags & nsHtml5ElementName::GROUP_MASK;
 }
 
 bool 
 nsHtml5StackNode::isScoping()
 {
-  return (flags & NS_HTML5ELEMENT_NAME_SCOPING);
+  return (flags & nsHtml5ElementName::SCOPING);
 }
 
 bool 
 nsHtml5StackNode::isSpecial()
 {
-  return (flags & NS_HTML5ELEMENT_NAME_SPECIAL);
+  return (flags & nsHtml5ElementName::SPECIAL);
 }
 
 bool 
 nsHtml5StackNode::isFosterParenting()
 {
-  return (flags & NS_HTML5ELEMENT_NAME_FOSTER_PARENTING);
+  return (flags & nsHtml5ElementName::FOSTER_PARENTING);
 }
 
 bool 
 nsHtml5StackNode::isHtmlIntegrationPoint()
 {
-  return (flags & NS_HTML5ELEMENT_NAME_HTML_INTEGRATION_POINT);
+  return (flags & nsHtml5ElementName::HTML_INTEGRATION_POINT);
 }
 
 
@@ -169,9 +170,9 @@ nsHtml5StackNode::nsHtml5StackNode(nsHtml5ElementName* elementName, nsIContentHa
 int32_t 
 nsHtml5StackNode::prepareSvgFlags(int32_t flags)
 {
-  flags &= ~(NS_HTML5ELEMENT_NAME_FOSTER_PARENTING | NS_HTML5ELEMENT_NAME_SCOPING | NS_HTML5ELEMENT_NAME_SPECIAL | NS_HTML5ELEMENT_NAME_OPTIONAL_END_TAG);
-  if ((flags & NS_HTML5ELEMENT_NAME_SCOPING_AS_SVG)) {
-    flags |= (NS_HTML5ELEMENT_NAME_SCOPING | NS_HTML5ELEMENT_NAME_SPECIAL | NS_HTML5ELEMENT_NAME_HTML_INTEGRATION_POINT);
+  flags &= ~(nsHtml5ElementName::FOSTER_PARENTING | nsHtml5ElementName::SCOPING | nsHtml5ElementName::SPECIAL | nsHtml5ElementName::OPTIONAL_END_TAG);
+  if ((flags & nsHtml5ElementName::SCOPING_AS_SVG)) {
+    flags |= (nsHtml5ElementName::SCOPING | nsHtml5ElementName::SPECIAL | nsHtml5ElementName::HTML_INTEGRATION_POINT);
   }
   return flags;
 }
@@ -179,12 +180,12 @@ nsHtml5StackNode::prepareSvgFlags(int32_t flags)
 int32_t 
 nsHtml5StackNode::prepareMathFlags(int32_t flags, bool markAsIntegrationPoint)
 {
-  flags &= ~(NS_HTML5ELEMENT_NAME_FOSTER_PARENTING | NS_HTML5ELEMENT_NAME_SCOPING | NS_HTML5ELEMENT_NAME_SPECIAL | NS_HTML5ELEMENT_NAME_OPTIONAL_END_TAG);
-  if ((flags & NS_HTML5ELEMENT_NAME_SCOPING_AS_MATHML)) {
-    flags |= (NS_HTML5ELEMENT_NAME_SCOPING | NS_HTML5ELEMENT_NAME_SPECIAL);
+  flags &= ~(nsHtml5ElementName::FOSTER_PARENTING | nsHtml5ElementName::SCOPING | nsHtml5ElementName::SPECIAL | nsHtml5ElementName::OPTIONAL_END_TAG);
+  if ((flags & nsHtml5ElementName::SCOPING_AS_MATHML)) {
+    flags |= (nsHtml5ElementName::SCOPING | nsHtml5ElementName::SPECIAL);
   }
   if (markAsIntegrationPoint) {
-    flags |= NS_HTML5ELEMENT_NAME_HTML_INTEGRATION_POINT;
+    flags |= nsHtml5ElementName::HTML_INTEGRATION_POINT;
   }
   return flags;
 }
-- 
cgit v1.2.3