mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 22:28:36 +00:00
ae2cd1d073
- Bug 1165982 - part 1 - provide fallible initialization of nsDOMIterator from an nsRange; r=ehsan (e8f817ee7) - Bug 1165982 - part 2 - validate an nsRange::SelectNode call in nsHTMLTMLEditRules::Init; r=ehsan (182e07bf6) - Bug 1180118 - Part 1: Add a method to match a single nsCSSSelector (without pseudo-elements) against an Element. r=bzbarsky (26f9fe8c3) - Partial port of Bug 1151829 - Unbreak build on non-SPS platforms after bug 1093934 (a9414f6b3) - Bug 1180118 - Part 2: Add eRestyle_SomeDescendants restyle hint and pass associated restyle hint data into restyle methods. r=bzbarsky (7a6fc4bd2) - Bug 1180118 - Part 3: Convert eRestyle_SomeDescendants into eRestyle_Self for elements that match selectors. r=bzbarsky (d4581f146) - Bug 1180118 - Part 4: Store pointer to the rightmost selector for class, ID and attribute selectors in the rule cascade. r=bzbarsky (aca8878f8) - Bug 1164366 - Need to fix an issue on unified build in dom/base. r=ehsan (8fcfb182f) - Bug 1121760 (part 2) - Remove PL_DHashTableAdd(). r=poiru. (e9d140a4b) - Bug 1121760 (part 3) - Remove PL_DHashTableRemove(). r=poiru. (588aeeaae) - Bug 1181445 (part 1) - Implement iterators for nsTHashtable and nsBaseHashtable. r=froydnj. (55a19598d) - Bug 1154053 - Limit concurrency of e10s memory reporting. r=erahm (88530ebb2) - Bug 1181445 (part 2) - Use nsTHashTable::Iterator in nsMemoryReporterManager. r=froydnj. (70df14b26) - Bug 1150916 - Be sure we aren't iterating over a hashtable while it is modified in nsObserverService::UnmarkGrayStrongObservers(). r=froydnj (572b31ed2) - Bug 1153373 - Move AppendStrongObservers() function definition behind #ifndef MOZILLA_XPCOMRT_API. r=froydnj (cebafb6b7) - Bug 1181445 (part 3) - Use nsTHashTable::Iterator in nsObserverService. r=froydnj. (1018c3526) - Bug 1181445 (part 4) - Use nsTHashTable::Iterator in nsCategoryManager. r=froydnj. (a04fcf96b) - Bug 1181445 (part 5) - Use nsTHashTable::Iterator in nsTHashtable.h. r=mccr8. (51bf669a0) - Bug 1181445 (part 6) - Use nsBaseHashTable::Iterator in xpcom/components/. r=froydnj. (e2e75de6c) - Bug 1167378 - Mark ArrayAndPrefix as MOZ_STACK_CLASS and array member as MOZ_NON_OWNING_REF. r=froydnj (e2d727c94) - Bug 1181445 (part 7) - Use nsBaseHashTable::Iterator in xpcom/reflect/. r=froydnj. (f6b9290a0) - Bug 1181445 (part 8) - Use nsBaseHashTable::Iterator in SystemMemoryReporter. r=froydnj. (69b81c209) - Bug 1181445 (part 9) - Use nsBaseHashTable::Iterator in nsConsoleService. r=froydnj. (ce4183330) - Bug 1154403 - Reduce incremental finalize slice time to 5ms. r=smaug (edbfd02e0) - Bug 1181445 (part 10) - Use nsBaseHashTable::Iterator in CycleCollectedJSRuntime. r=mccr8. (35d9be72e) - Bug 1181445 (part 11) - Use nsBaseHashTable::Iterator in xpcom/glue/. r=froydnj. (a08b703fe) - Backout change 39e167bbd14c, a80140872ea5, adae9be2294d and b71ccef9c674 (bug 970307). (9ce474689) - Bug 1158320 - rename nsThread::mRunningEvent to mNestedEventLoopDepth; r=bsmedberg (06d59a7e2) - Bug 1181445 (part 12) - Use nsBaseHashTable::Iterator in xpcom/threads/. r=froydnj. (48edb8226) - Bug 1181445 (part 13) - Use nsBaseHashTable::Iterator in xpcom/ds/. r=froydnj. (6d16d7670) - Bug 1173634 - Report pending async shutdowns in shutdown hangs. r=cpearce (c806e4b3f) - Bug 1183433 - Implement centralized crash report annotations, so that all async-shutdown hangs use only one key, and keeping track of all states each plugin has been through. r=cpearce (1d0284c70) - Bug 1184432 - Use nsClassHashtable::ConstIter in GeckoMediaPluginServiceParent::AsyncShutdownPluginStates. r=cpearce (7c92e3363) - Bug 1182318 - Part 1: Remove Closure::mCb. r=smaug (f28311ccd) - Bug 1182318 - Part 2: Remove Closure from CycleCollectedJSRuntime. r=smaug (454f3b85b) - Bug 1185470: Remove 'Get' prefixes from hashtable iterator methods. r (8ce896a26)
209 lines
5.8 KiB
C++
209 lines
5.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* 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/. */
|
|
|
|
#include "mozilla/ArrayUtils.h"
|
|
|
|
#include "nsHTMLEntities.h"
|
|
|
|
#include "nsString.h"
|
|
#include "nsCRT.h"
|
|
#include "pldhash.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
struct EntityNode {
|
|
const char* mStr; // never owns buffer
|
|
int32_t mUnicode;
|
|
};
|
|
|
|
struct EntityNodeEntry : public PLDHashEntryHdr
|
|
{
|
|
const EntityNode* node;
|
|
};
|
|
|
|
static bool
|
|
matchNodeString(PLDHashTable*, const PLDHashEntryHdr* aHdr,
|
|
const void* key)
|
|
{
|
|
const EntityNodeEntry* entry = static_cast<const EntityNodeEntry*>(aHdr);
|
|
const char* str = static_cast<const char*>(key);
|
|
return (nsCRT::strcmp(entry->node->mStr, str) == 0);
|
|
}
|
|
|
|
static bool
|
|
matchNodeUnicode(PLDHashTable*, const PLDHashEntryHdr* aHdr,
|
|
const void* key)
|
|
{
|
|
const EntityNodeEntry* entry = static_cast<const EntityNodeEntry*>(aHdr);
|
|
const int32_t ucode = NS_PTR_TO_INT32(key);
|
|
return (entry->node->mUnicode == ucode);
|
|
}
|
|
|
|
static PLDHashNumber
|
|
hashUnicodeValue(PLDHashTable*, const void* key)
|
|
{
|
|
// key is actually the unicode value
|
|
return PLDHashNumber(NS_PTR_TO_INT32(key));
|
|
}
|
|
|
|
|
|
static const PLDHashTableOps EntityToUnicodeOps = {
|
|
PL_DHashStringKey,
|
|
matchNodeString,
|
|
PL_DHashMoveEntryStub,
|
|
PL_DHashClearEntryStub,
|
|
nullptr,
|
|
};
|
|
|
|
static const PLDHashTableOps UnicodeToEntityOps = {
|
|
hashUnicodeValue,
|
|
matchNodeUnicode,
|
|
PL_DHashMoveEntryStub,
|
|
PL_DHashClearEntryStub,
|
|
nullptr,
|
|
};
|
|
|
|
static PLDHashTable* gEntityToUnicode;
|
|
static PLDHashTable* gUnicodeToEntity;
|
|
static nsrefcnt gTableRefCnt = 0;
|
|
|
|
#define HTML_ENTITY(_name, _value) { #_name, _value },
|
|
static const EntityNode gEntityArray[] = {
|
|
#include "nsHTMLEntityList.h"
|
|
};
|
|
#undef HTML_ENTITY
|
|
|
|
#define NS_HTML_ENTITY_COUNT ((int32_t)ArrayLength(gEntityArray))
|
|
|
|
nsresult
|
|
nsHTMLEntities::AddRefTable(void)
|
|
{
|
|
if (!gTableRefCnt) {
|
|
gEntityToUnicode = new PLDHashTable(&EntityToUnicodeOps,
|
|
sizeof(EntityNodeEntry),
|
|
NS_HTML_ENTITY_COUNT);
|
|
gUnicodeToEntity = new PLDHashTable(&UnicodeToEntityOps,
|
|
sizeof(EntityNodeEntry),
|
|
NS_HTML_ENTITY_COUNT);
|
|
for (const EntityNode *node = gEntityArray,
|
|
*node_end = ArrayEnd(gEntityArray);
|
|
node < node_end; ++node) {
|
|
|
|
// add to Entity->Unicode table
|
|
auto entry = static_cast<EntityNodeEntry*>
|
|
(gEntityToUnicode->Add(node->mStr, fallible));
|
|
NS_ASSERTION(entry, "Error adding an entry");
|
|
// Prefer earlier entries when we have duplication.
|
|
if (!entry->node)
|
|
entry->node = node;
|
|
|
|
// add to Unicode->Entity table
|
|
entry = static_cast<EntityNodeEntry*>
|
|
(gUnicodeToEntity->Add(NS_INT32_TO_PTR(node->mUnicode),
|
|
fallible));
|
|
NS_ASSERTION(entry, "Error adding an entry");
|
|
// Prefer earlier entries when we have duplication.
|
|
if (!entry->node)
|
|
entry->node = node;
|
|
}
|
|
#ifdef DEBUG
|
|
PL_DHashMarkTableImmutable(gUnicodeToEntity);
|
|
PL_DHashMarkTableImmutable(gEntityToUnicode);
|
|
#endif
|
|
}
|
|
++gTableRefCnt;
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
nsHTMLEntities::ReleaseTable(void)
|
|
{
|
|
if (--gTableRefCnt != 0)
|
|
return;
|
|
|
|
delete gEntityToUnicode;
|
|
delete gUnicodeToEntity;
|
|
gEntityToUnicode = nullptr;
|
|
gUnicodeToEntity = nullptr;
|
|
}
|
|
|
|
int32_t
|
|
nsHTMLEntities::EntityToUnicode(const nsCString& aEntity)
|
|
{
|
|
NS_ASSERTION(gEntityToUnicode, "no lookup table, needs addref");
|
|
if (!gEntityToUnicode)
|
|
return -1;
|
|
|
|
//this little piece of code exists because entities may or may not have the terminating ';'.
|
|
//if we see it, strip if off for this test...
|
|
|
|
if(';'==aEntity.Last()) {
|
|
nsAutoCString temp(aEntity);
|
|
temp.Truncate(aEntity.Length()-1);
|
|
return EntityToUnicode(temp);
|
|
}
|
|
|
|
auto entry =
|
|
static_cast<EntityNodeEntry*>(gEntityToUnicode->Search(aEntity.get()));
|
|
|
|
return entry ? entry->node->mUnicode : -1;
|
|
}
|
|
|
|
|
|
int32_t
|
|
nsHTMLEntities::EntityToUnicode(const nsAString& aEntity) {
|
|
nsAutoCString theEntity; theEntity.AssignWithConversion(aEntity);
|
|
if(';'==theEntity.Last()) {
|
|
theEntity.Truncate(theEntity.Length()-1);
|
|
}
|
|
|
|
return EntityToUnicode(theEntity);
|
|
}
|
|
|
|
|
|
const char*
|
|
nsHTMLEntities::UnicodeToEntity(int32_t aUnicode)
|
|
{
|
|
NS_ASSERTION(gUnicodeToEntity, "no lookup table, needs addref");
|
|
auto entry =
|
|
static_cast<EntityNodeEntry*>
|
|
(gUnicodeToEntity->Search(NS_INT32_TO_PTR(aUnicode)));
|
|
|
|
return entry ? entry->node->mStr : nullptr;
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
#include <stdio.h>
|
|
|
|
class nsTestEntityTable {
|
|
public:
|
|
nsTestEntityTable() {
|
|
int32_t value;
|
|
nsHTMLEntities::AddRefTable();
|
|
|
|
// Make sure we can find everything we are supposed to
|
|
for (int i = 0; i < NS_HTML_ENTITY_COUNT; ++i) {
|
|
nsAutoString entity; entity.AssignWithConversion(gEntityArray[i].mStr);
|
|
|
|
value = nsHTMLEntities::EntityToUnicode(entity);
|
|
NS_ASSERTION(value != -1, "can't find entity");
|
|
NS_ASSERTION(value == gEntityArray[i].mUnicode, "bad unicode value");
|
|
|
|
entity.AssignWithConversion(nsHTMLEntities::UnicodeToEntity(value));
|
|
NS_ASSERTION(entity.EqualsASCII(gEntityArray[i].mStr), "bad entity name");
|
|
}
|
|
|
|
// Make sure we don't find things that aren't there
|
|
value = nsHTMLEntities::EntityToUnicode(nsAutoCString("@"));
|
|
NS_ASSERTION(value == -1, "found @");
|
|
value = nsHTMLEntities::EntityToUnicode(nsAutoCString("zzzzz"));
|
|
NS_ASSERTION(value == -1, "found zzzzz");
|
|
nsHTMLEntities::ReleaseTable();
|
|
}
|
|
};
|
|
//nsTestEntityTable validateEntityTable;
|
|
#endif
|
|
|