From 2bc00efe7bb826d683257264471878c05757f2bb Mon Sep 17 00:00:00 2001
From: adeshkp <adeshkp@users.noreply.github.com>
Date: Sat, 4 Aug 2018 14:22:42 +0530
Subject: Improve nsHtml5AtomTable performance (#693)

* cpp change
* h change
---
 parser/html/nsHtml5AtomTable.cpp | 14 ++++++++++++++
 parser/html/nsHtml5AtomTable.h   |  6 ++++++
 2 files changed, 20 insertions(+)

(limited to 'parser')

diff --git a/parser/html/nsHtml5AtomTable.cpp b/parser/html/nsHtml5AtomTable.cpp
index d523f58b0..d9c18485d 100644
--- a/parser/html/nsHtml5AtomTable.cpp
+++ b/parser/html/nsHtml5AtomTable.cpp
@@ -31,7 +31,11 @@ nsHtml5AtomTable::nsHtml5AtomTable()
 }
 
 nsHtml5AtomTable::~nsHtml5AtomTable()
+  : mRecentlyUsedParserAtoms{}
 {
+#ifdef DEBUG
+  NS_GetMainThread(getter_AddRefs(mPermittedLookupThread));
+#endif
 }
 
 nsIAtom*
@@ -44,13 +48,23 @@ nsHtml5AtomTable::GetAtom(const nsAString& aKey)
     NS_ASSERTION(mPermittedLookupThread == currentThread, "Wrong thread!");
   }
 #endif
+
+  uint32_t index = mozilla::HashString(aKey) % RECENTLY_USED_PARSER_ATOMS_SIZE;
+  nsIAtom* cachedAtom = mRecentlyUsedParserAtoms[index];
+  if (cachedAtom && cachedAtom->Equals(aKey)) {
+    return cachedAtom;
+  }
+
   nsIAtom* atom = NS_GetStaticAtom(aKey);
   if (atom) {
+    mRecentlyUsedParserAtoms[index] = atom;
     return atom;
   }
   nsHtml5AtomEntry* entry = mTable.PutEntry(aKey);
   if (!entry) {
     return nullptr;
   }
+
+  mRecentlyUsedParserAtoms[index] = entry->GetAtom();
   return entry->GetAtom();
 }
diff --git a/parser/html/nsHtml5AtomTable.h b/parser/html/nsHtml5AtomTable.h
index 43f9b5f2f..b0dc2f678 100644
--- a/parser/html/nsHtml5AtomTable.h
+++ b/parser/html/nsHtml5AtomTable.h
@@ -11,6 +11,8 @@
 #include "nsIAtom.h"
 #include "nsIThread.h"
 
+#define RECENTLY_USED_PARSER_ATOMS_SIZE 31
+
 class nsHtml5Atom;
 
 class nsHtml5AtomEntry : public nsStringHashKey
@@ -87,6 +89,9 @@ class nsHtml5AtomTable
      */
     void Clear()
     {
+      for (uint32_t i = 0; i < RECENTLY_USED_PARSER_ATOMS_SIZE; ++i) {
+        mRecentlyUsedParserAtoms[i] = nullptr;
+      }
       mTable.Clear();
     }
     
@@ -99,6 +104,7 @@ class nsHtml5AtomTable
   
   private:
     nsTHashtable<nsHtml5AtomEntry> mTable;
+    nsIAtom* mRecentlyUsedParserAtoms[RECENTLY_USED_PARSER_ATOMS_SIZE];
 #ifdef DEBUG
     nsCOMPtr<nsIThread>            mPermittedLookupThread;
 #endif
-- 
cgit v1.2.3


From 2370b6a532182699a279c22d8804d786f932fc81 Mon Sep 17 00:00:00 2001
From: adeshkp <adeshkp@users.noreply.github.com>
Date: Sat, 4 Aug 2018 11:17:54 +0000
Subject: Fix constructor in nsHtml5AtomTable.cpp

Follow up to 2bc00ef to fix build bustage
---
 parser/html/nsHtml5AtomTable.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'parser')

diff --git a/parser/html/nsHtml5AtomTable.cpp b/parser/html/nsHtml5AtomTable.cpp
index d9c18485d..ae35791f3 100644
--- a/parser/html/nsHtml5AtomTable.cpp
+++ b/parser/html/nsHtml5AtomTable.cpp
@@ -24,6 +24,7 @@ nsHtml5AtomEntry::~nsHtml5AtomEntry()
 }
 
 nsHtml5AtomTable::nsHtml5AtomTable()
+  : mRecentlyUsedParserAtoms{}
 {
 #ifdef DEBUG
   NS_GetMainThread(getter_AddRefs(mPermittedLookupThread));
@@ -31,11 +32,7 @@ nsHtml5AtomTable::nsHtml5AtomTable()
 }
 
 nsHtml5AtomTable::~nsHtml5AtomTable()
-  : mRecentlyUsedParserAtoms{}
 {
-#ifdef DEBUG
-  NS_GetMainThread(getter_AddRefs(mPermittedLookupThread));
-#endif
 }
 
 nsIAtom*
-- 
cgit v1.2.3