wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 975747 - Convert gOperatorTable to nsDataHashtable. r=karlt

Browse Source
This commit is contained in:
Anuj Agarwal 2014-03-18 14:25:40 -07:00
parent 9d14962bdc
commit 5bed7c0dd5
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/mathml/nsMathMLOperators.cpp
View File

@ -5,7 +5,8 @@
#include "nsMathMLOperators.h"
#include "nsCOMPtr.h"
#include "nsHashtable.h"
#include "nsDataHashtable.h"
#include "nsHashKeys.h"
#include "nsTArray.h"
#include "nsIPersistentProperties2.h"
@ -31,7 +32,7 @@ struct OperatorData {
static int32_t gTableRefCount = 0;
static uint32_t gOperatorCount = 0;
static OperatorData* gOperatorArray = nullptr;
static nsHashtable* gOperatorTable = nullptr;
static nsDataHashtable<nsStringHashKey, OperatorData*>* gOperatorTable = nullptr;
static bool gGlobalsInitialized = false;
static const char16_t kDashCh = char16_t('#');
@ -164,8 +165,7 @@ SetOperator(OperatorData* aOperatorData,
aOperatorData->mFlags |= aForm;
aOperatorData->mStr.Assign(value);
value.AppendInt(aForm, 10);
nsStringKey key(value);
gOperatorTable->Put(&key, aOperatorData);
gOperatorTable->Put(value, aOperatorData);
#ifdef DEBUG
NS_LossyConvertUTF16toASCII str(aAttributes);
@ -293,7 +293,7 @@ InitGlobals()
{
gGlobalsInitialized = true;
nsresult rv = NS_ERROR_OUT_OF_MEMORY;
gOperatorTable = new nsHashtable();
gOperatorTable = new nsDataHashtable<nsStringHashKey, OperatorData*>();
if (gOperatorTable) {
rv = InitOperators();
}
@ -334,8 +334,7 @@ GetOperatorData(const nsString& aOperator, nsOperatorFlags aForm)
{
nsAutoString key(aOperator);
key.AppendInt(aForm);
nsStringKey hkey(key);
return (OperatorData*)gOperatorTable->Get(&hkey);
return gOperatorTable->Get(key);
}
bool