summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-08-04 13:32:09 +0200
committerGitHub <noreply@github.com>2018-08-04 13:32:09 +0200
commitca87455cc5880897c8b921077819988feede90bd (patch)
treea1e9e1f7e5090ecd6e6677cb67147e2610facb70
parent2bc00efe7bb826d683257264471878c05757f2bb (diff)
downloadUXP-ca87455cc5880897c8b921077819988feede90bd.tar
UXP-ca87455cc5880897c8b921077819988feede90bd.tar.gz
UXP-ca87455cc5880897c8b921077819988feede90bd.tar.lz
UXP-ca87455cc5880897c8b921077819988feede90bd.tar.xz
UXP-ca87455cc5880897c8b921077819988feede90bd.zip
Revert "Improve nsHtml5AtomTable performance (#693)" (#695)
This reverts commit 2bc00efe7bb826d683257264471878c05757f2bb.
-rw-r--r--parser/html/nsHtml5AtomTable.cpp14
-rw-r--r--parser/html/nsHtml5AtomTable.h6
2 files changed, 0 insertions, 20 deletions
diff --git a/parser/html/nsHtml5AtomTable.cpp b/parser/html/nsHtml5AtomTable.cpp
index d9c18485d..d523f58b0 100644
--- a/parser/html/nsHtml5AtomTable.cpp
+++ b/parser/html/nsHtml5AtomTable.cpp
@@ -31,11 +31,7 @@ nsHtml5AtomTable::nsHtml5AtomTable()
}
nsHtml5AtomTable::~nsHtml5AtomTable()
- : mRecentlyUsedParserAtoms{}
{
-#ifdef DEBUG
- NS_GetMainThread(getter_AddRefs(mPermittedLookupThread));
-#endif
}
nsIAtom*
@@ -48,23 +44,13 @@ 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 b0dc2f678..43f9b5f2f 100644
--- a/parser/html/nsHtml5AtomTable.h
+++ b/parser/html/nsHtml5AtomTable.h
@@ -11,8 +11,6 @@
#include "nsIAtom.h"
#include "nsIThread.h"
-#define RECENTLY_USED_PARSER_ATOMS_SIZE 31
-
class nsHtml5Atom;
class nsHtml5AtomEntry : public nsStringHashKey
@@ -89,9 +87,6 @@ class nsHtml5AtomTable
*/
void Clear()
{
- for (uint32_t i = 0; i < RECENTLY_USED_PARSER_ATOMS_SIZE; ++i) {
- mRecentlyUsedParserAtoms[i] = nullptr;
- }
mTable.Clear();
}
@@ -104,7 +99,6 @@ class nsHtml5AtomTable
private:
nsTHashtable<nsHtml5AtomEntry> mTable;
- nsIAtom* mRecentlyUsedParserAtoms[RECENTLY_USED_PARSER_ATOMS_SIZE];
#ifdef DEBUG
nsCOMPtr<nsIThread> mPermittedLookupThread;
#endif