From 650f6b5eb31dfe6c60da16d1498f8cc3efac4dfa Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Sat, 18 Jan 2020 14:04:17 -0500
Subject: Bug 1355479 - Flatten attribute storage in the HTML parser to
 AutoTArray to avoid malloc.

- Removes nsHtml5ReleasableAttributeName
- Adds nsHtml5AttributeEntry.h
- Makes nsHtml5HtmlAttributes no longer gentered.

Tag UXP Issue #1344
---
 parser/html/nsHtml5AttributeEntry.h | 91 +++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 parser/html/nsHtml5AttributeEntry.h

(limited to 'parser/html/nsHtml5AttributeEntry.h')

diff --git a/parser/html/nsHtml5AttributeEntry.h b/parser/html/nsHtml5AttributeEntry.h
new file mode 100644
index 000000000..75dd10842
--- /dev/null
+++ b/parser/html/nsHtml5AttributeEntry.h
@@ -0,0 +1,91 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+#ifndef nsHtml5AttributeEntry_h
+#define nsHtml5AttributeEntry_h
+
+#include "nsHtml5AttributeName.h"
+
+class nsHtml5AttributeEntry final
+{
+public:
+  nsHtml5AttributeEntry(nsHtml5AttributeName* aName,
+                        nsHtml5String aValue,
+                        int32_t aLine)
+    : mLine(aLine)
+    , mValue(aValue)
+  {
+    // Let's hope the compiler coalesces the following as appropriate.
+    mLocals[0] = aName->getLocal(0);
+    mLocals[1] = aName->getLocal(1);
+    mLocals[2] = aName->getLocal(2);
+    mPrefixes[0] = aName->getPrefix(0);
+    mPrefixes[1] = aName->getPrefix(1);
+    mPrefixes[2] = aName->getPrefix(2);
+    mUris[0] = aName->getUri(0);
+    mUris[1] = aName->getUri(1);
+    mUris[2] = aName->getUri(2);
+  }
+
+  // Isindex-only so doesn't need to deal with SVG and MathML
+  nsHtml5AttributeEntry(nsIAtom* aName, nsHtml5String aValue, int32_t aLine)
+    : mLine(aLine)
+    , mValue(aValue)
+  {
+    // Let's hope the compiler coalesces the following as appropriate.
+    mLocals[0] = aName;
+    mLocals[1] = aName;
+    mLocals[2] = aName;
+    mPrefixes[0] = nullptr;
+    mPrefixes[1] = nullptr;
+    mPrefixes[2] = nullptr;
+    mUris[0] = kNameSpaceID_None;
+    mUris[1] = kNameSpaceID_None;
+    mUris[2] = kNameSpaceID_None;
+  }
+
+  inline nsIAtom* GetLocal(int32_t aMode) { return mLocals[aMode]; }
+
+  inline nsIAtom* GetPrefix(int32_t aMode) { return mPrefixes[aMode]; }
+
+  inline int32_t GetUri(int32_t aMode) { return mUris[aMode]; }
+
+  inline nsHtml5String GetValue() { return mValue; }
+
+  inline int32_t GetLine() { return mLine; }
+
+  inline void ReleaseValue() { mValue.Release(); }
+
+  inline nsHtml5AttributeEntry Clone(nsHtml5AtomTable* aInterner)
+  {
+    // Copy the memory
+    nsHtml5AttributeEntry clone(*this);
+    // Increment refcount for value
+    clone.mValue = this->mValue.Clone();
+    if (aInterner) {
+      // Now if we have an interner, we'll need to rewrite non-static atoms.
+      // Only the local names may be non-static, in which case all three
+      // are the same.
+      nsIAtom* local = GetLocal(0);
+      if (!local->IsStaticAtom()) {
+        nsAutoString str;
+        local->ToString(str);
+        local = aInterner->GetAtom(str);
+        clone.mLocals[0] = local;
+        clone.mLocals[1] = local;
+        clone.mLocals[2] = local;
+      }
+    }
+    return clone;
+  }
+
+private:
+  nsIAtom* mLocals[3];
+  nsIAtom* mPrefixes[3];
+  int32_t mUris[3];
+  int32_t mLine;
+  nsHtml5String mValue;
+};
+
+#endif // nsHtml5AttributeEntry_h
-- 
cgit v1.2.3