mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
8a6eb144ac
- Bug 1126544 - Update sixgill to handle more constructs and manage memory better (e487a0cd05) - Bug 1182407 - Use unpack feature of tooltool wherever possible. r=mshal (6bde76a413) - Bug 1123386 - Part 4: Update the tooltool manifests for the OSX and Linux static analysis builds in order to upgrade clang; r=rail (517ae90efa) - Bug 1204722 - Make sure that unboxed arrays created from literals are compatible with the type of the literal's elements, r=jandem. (400663edb4) - Bug 1117259 - Disable the no-unused-local-typedef warning if clang supports it; r=gps (16e2e49fc6) - Bug 1126813 - Turn on the -Wrange-loop-analysis warning if available; r=gps (1c783e1ed2) - Bug 1191688 - Add -nologo option to rc.exe. r=ted (9c5dbe2b89) - Bug 1150312 - Remove MOZ_SHARK. r=glandium (ba6db939d4) - Bug 1186636 - Add a pref to configure -moz prefixed gradients support. r=dholbert (9c41ae7460) - missing parts of Bug 1077282: Cleanup uses of GreD vs GreBinD, introcuded by v2 signature changes on OSX. Based on initial patch by rstrong. r=bsmedberg (af60bfc743) - de-palemoon (d8b7bae74f) - Bug 932100 - Part 1: Remove load-time dependency on user32. r=bsmedberg (9864a0ed0c) - missing part of Bug 932100 - Part 2: Move DLL blocklist code to mozglue. r=bsmedberg, r=glandium (6497ad86bd) - Bug 1194890 - Ensure that any user32 imports to mozglue are delay loaded; r=glandium (afa0a8d14e) - Bug 1082792 - Build firefox.exe with -MD in ASAN builds; r=glandium (89771bb4c0) - missing VPX/WEBM stuff (ec425938c9) - Bug 1184452 - Correctly reject @font-face descriptors that have garbage after them. r=heycam (f530fc858e) - Bug 1189922. Add a preference to enable global whitelisting of the CSSUnprefixingService. r=dholbert (e2997cb125) - Bug 1198732 - IonMonkey: MIPS32: Fix calculate frame size in generateEnterJIT. r=nbp (454d75946d) - Bug 1199057 - IonMonkey: MIPS32: Plumb new.target on the stack and make it accessible to JSNatives. r=nbp (01d5cb04c2) - Bug 1204306 - IonMonkey: MIPS32: Clean up MacroAssembler functions that aliased to Assembler. r=arai (600dc73280) - Bug 1199080 - IonMonkey: MIPS32: Fix treating saved frame bit as part# o the frame type. r=nbp (5e4e5ba250) - Bug 1099448 - Don't accept box properties with invalid calc() or rgb() etc. function values. r=dbaron (5737e8c300) - Bug 1203142 - Insert /**/ separate between two adjacent '-' symbols when serializing token streams. r=simon.sapin (06fb613d6c) - Bug 1057680 - Add support for font-stretch values in the font shorthand. r=jdaggett (8d8e24751d) - Bug 1155485 - Mark nsFrameManagerBase::mPresShell as MOZ_NON_OWNING_REF; r=roc (e79e28bbd0) - Bug 1121760 (part 5) - Remove PL_DHashMarkTableImmutable(). r=poiru. (8d8c7d9d65) - Bug 1121760 (part 6) - Move all remaining PL_DHash*() functions into PLDHashTable. r=poiru. (d36ec167cc)
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 = {
|
|
PLDHashTable::HashStringKey,
|
|
matchNodeString,
|
|
PLDHashTable::MoveEntryStub,
|
|
PLDHashTable::ClearEntryStub,
|
|
nullptr,
|
|
};
|
|
|
|
static const PLDHashTableOps UnicodeToEntityOps = {
|
|
hashUnicodeValue,
|
|
matchNodeUnicode,
|
|
PLDHashTable::MoveEntryStub,
|
|
PLDHashTable::ClearEntryStub,
|
|
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
|
|
gUnicodeToEntity->MarkImmutable();
|
|
gEntityToUnicode->MarkImmutable();
|
|
#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
|
|
|