mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
8fd0c73b26
- test part of Bug 789788 - Revise the don't-use-document-fonts option (1b6a0e6ed)
- Bug 1172782 - Change how nsTHashtable::Clear() works. r=froydnj. (c8c2adc51)
- Bug 1180072 - Remove PL_DHashTableEnumerate(). r=froydnj. (b5448efda)
- Bug 1180122 - Make Chaos Mode affect PLDHashTable's iterators. r=froydnj. (11fd0e222)
- Bug 1182516 - Add Chaos Mode environment variable MOZ_CHAOSMODE. r=roc (d636f6c90)
- Bug 1182516 - Fix mid-air conflict with 3fd2ab6cb762 on a CLOSED TREE. r=bustage (8dec46b7a)
- Bug 1184280 - Remove warning about mDisabledJSAndPlugins being false. r=ehsan (c23e96fc1)
- Bug 1181411 - Test some expected aborts in PLDHashTable. r=glandium. (682788df7)
- Bug 1185399 (part 1) - Remove macros from pldhash.h. r=froydnj. (15001ff2a)
- Bug 1185399 (part 2) - Remove macros from pldhash.cpp. r=froydnj. (afeddcc90)
- Bug 1187197 (part 1) - Move comments from PL_DHashTable* functions to the equivalent methods. r=froydnj. (78921590e)
- Bug 1187197 (part 2) - Put function return types on their own line. r=froydnj. (9aae02f83)
- Bug 1187197 (part 3) - Convert pldhash.{cpp,h} to C++ style comments. r=froydnj. (57afe7e1f)
- Bug 1202526 (part 1) - Add PLDHashTable::RemoveEntry(). r=froydnj. (1b5453695)
- Bug 1202526 (part 2) - Avoid PL_DHashTableRawRemove() in nsLoadGroup. r=mcmanus. (1ad20b17f)
- Bug 1202526 (part 3) - Avoid PL_DHashTableRawRemove() in nsDocument. r=bz. (cdde6eff0)
- Bug 1202526 (part 4) - Avoid PL_DHashTableRawRemove() in nsPropertyTable. r=bz. (ed437f4d6)
- Bug 1202526 (part 5) - Use PLDHashTable::RemoveEntry() in nsSecureBrowserUIImpl. r=dkeeler. (ac1d44066)
- Bug 1202526 (part 6) - Use PLDHashTable::RemoveEntry() in XULDocument. r=bz. (2639a053e)
- Bug 1202526 (part 7) - Use PLDHashTable::RemoveEntry() in prefs code. r=bz. (2eb3b1097)
- Bug 1202526 (part 8) - Use PLDHashTable::RemoveEntry() in the cycle collector. r=mccr8. (ec77d7635)
- Bug 1130096 - Convert embedding/components/commandhandler/ to Gecko style. r=mccr8 (a5aecf9de)
- Bug 1184842. Remove layout.frames.force_resizability pref. r=mats (9226b0caf)
- Bug 1184842. Remove frameset mVisibilityOverride since it's always false now. r=mats (1b439feb8)
- Bug 1184842. Change nsAttrAndChildArray::SetAndTakeAttr to nsAttrAndChildArray::SetAndSwapAttr. r=peterv (1442f0eae)
- Bug 1184842. Make SetAttrAndNotify use the real old value instead of aOldValue when possible. r=bz (bc45970f5)
- Bug 1184842. Add aOldValue parameter to nsNodeUtils::AttributeChanged. r=peterv (31bf8c08e)
- Bug 1184842. Pass aOldValue to all mutation observers. r=peterv (e69daf7f7)
- Bug 1184842. Allow BeforeSetAttr to preparse aValue. r=peterv (9c51655de)
- follow up fix to Bug 1184842. Allow BeforeSetAttr to preparse aValue (fb997a066)
- Bug 1149042 - Call AttributeWillChange before a style="" attribute gets created when touching element.style. r=smaug (41f2ea361)
- Bug 1184842. Pass preparsed attribute values to nsNodeUtils::AttributeWillChange. r=peterv (646622252)
- Bug 1013743, MutationObserver should observe only the subtree it is attached to, r=wchen (ad606eb15)
- Bug 1184842. Add aNewValue to nsIMutationObserver::AttributeWillChange. r=peterv (796042972)
- Bug 1184842. Preparse class attribute values in Element::BeforeSetAttr. r=peterv (e18989b2b)
- Bug 1154149 - Remove nsPresContext arguments from a bunch of nsStyleSBug 1154149 - Remove nsPresContext arguments from a bunch of nsStyleS (b7797ef66)
- Bug 1184842. Route aOldValue/aNewValue to AttributeData. r=heycam (14489941b)
- Bug 1184842. Restyling should consider only the classes that have changed. r=heycam (5a5e670dc)
- Bug 1121760 (part 1) - Remove PL_DHashTableSearch(). r=poiru. (d92813655)
307 lines
7.1 KiB
C++
307 lines
7.1 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 "nsString.h"
|
|
#include "nsReadableUtils.h"
|
|
#include "nsTArray.h"
|
|
#include "nsISimpleEnumerator.h"
|
|
#include "nsXPCOM.h"
|
|
#include "nsSupportsPrimitives.h"
|
|
#include "nsIComponentManager.h"
|
|
#include "nsCommandGroup.h"
|
|
#include "nsIControllerCommand.h"
|
|
#include "nsCRT.h"
|
|
|
|
class nsGroupsEnumerator : public nsISimpleEnumerator
|
|
{
|
|
public:
|
|
explicit nsGroupsEnumerator(
|
|
nsControllerCommandGroup::GroupsHashtable& aInHashTable);
|
|
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSISIMPLEENUMERATOR
|
|
|
|
protected:
|
|
virtual ~nsGroupsEnumerator();
|
|
|
|
static PLDHashOperator HashEnum(const nsACString& aKey,
|
|
nsTArray<nsCString>* aData, void* aClosure);
|
|
nsresult Initialize();
|
|
|
|
protected:
|
|
nsControllerCommandGroup::GroupsHashtable& mHashTable;
|
|
int32_t mIndex;
|
|
char** mGroupNames; // array of pointers to char16_t* in the hash table
|
|
bool mInitted;
|
|
};
|
|
|
|
/* Implementation file */
|
|
NS_IMPL_ISUPPORTS(nsGroupsEnumerator, nsISimpleEnumerator)
|
|
|
|
nsGroupsEnumerator::nsGroupsEnumerator(
|
|
nsControllerCommandGroup::GroupsHashtable& aInHashTable)
|
|
: mHashTable(aInHashTable)
|
|
, mIndex(-1)
|
|
, mGroupNames(nullptr)
|
|
, mInitted(false)
|
|
{
|
|
}
|
|
|
|
nsGroupsEnumerator::~nsGroupsEnumerator()
|
|
{
|
|
delete[] mGroupNames;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsGroupsEnumerator::HasMoreElements(bool* aResult)
|
|
{
|
|
nsresult rv = NS_OK;
|
|
|
|
NS_ENSURE_ARG_POINTER(aResult);
|
|
|
|
if (!mInitted) {
|
|
rv = Initialize();
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
}
|
|
|
|
*aResult = (mIndex < static_cast<int32_t>(mHashTable.Count()) - 1);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsGroupsEnumerator::GetNext(nsISupports** aResult)
|
|
{
|
|
nsresult rv = NS_OK;
|
|
|
|
NS_ENSURE_ARG_POINTER(aResult);
|
|
|
|
if (!mInitted) {
|
|
rv = Initialize();
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
}
|
|
|
|
mIndex++;
|
|
if (mIndex >= static_cast<int32_t>(mHashTable.Count())) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
char* thisGroupName = mGroupNames[mIndex];
|
|
|
|
nsCOMPtr<nsISupportsCString> supportsString =
|
|
do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID, &rv);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
supportsString->SetData(nsDependentCString(thisGroupName));
|
|
return CallQueryInterface(supportsString, aResult);
|
|
}
|
|
|
|
/* static */
|
|
/* return false to stop */
|
|
PLDHashOperator
|
|
nsGroupsEnumerator::HashEnum(const nsACString& aKey, nsTArray<nsCString>* aData,
|
|
void* aClosure)
|
|
{
|
|
nsGroupsEnumerator* groupsEnum = static_cast<nsGroupsEnumerator*>(aClosure);
|
|
groupsEnum->mGroupNames[groupsEnum->mIndex] = (char*)aKey.Data();
|
|
groupsEnum->mIndex++;
|
|
return PL_DHASH_NEXT;
|
|
}
|
|
|
|
nsresult
|
|
nsGroupsEnumerator::Initialize()
|
|
{
|
|
if (mInitted) {
|
|
return NS_OK;
|
|
}
|
|
|
|
mGroupNames = new char*[mHashTable.Count()];
|
|
if (!mGroupNames) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
mIndex = 0;
|
|
mHashTable.EnumerateRead(HashEnum, this);
|
|
|
|
mIndex = -1;
|
|
mInitted = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
class nsNamedGroupEnumerator : public nsISimpleEnumerator
|
|
{
|
|
public:
|
|
explicit nsNamedGroupEnumerator(nsTArray<nsCString>* aInArray);
|
|
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSISIMPLEENUMERATOR
|
|
|
|
protected:
|
|
virtual ~nsNamedGroupEnumerator();
|
|
|
|
nsTArray<nsCString>* mGroupArray;
|
|
int32_t mIndex;
|
|
};
|
|
|
|
nsNamedGroupEnumerator::nsNamedGroupEnumerator(nsTArray<nsCString>* aInArray)
|
|
: mGroupArray(aInArray)
|
|
, mIndex(-1)
|
|
{
|
|
}
|
|
|
|
nsNamedGroupEnumerator::~nsNamedGroupEnumerator()
|
|
{
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(nsNamedGroupEnumerator, nsISimpleEnumerator)
|
|
|
|
NS_IMETHODIMP
|
|
nsNamedGroupEnumerator::HasMoreElements(bool* aResult)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aResult);
|
|
|
|
int32_t arrayLen = mGroupArray ? mGroupArray->Length() : 0;
|
|
*aResult = (mIndex < arrayLen - 1);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsNamedGroupEnumerator::GetNext(nsISupports** aResult)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aResult);
|
|
|
|
if (!mGroupArray) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
mIndex++;
|
|
if (mIndex >= int32_t(mGroupArray->Length())) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
const nsCString& thisGroupName = mGroupArray->ElementAt(mIndex);
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsISupportsCString> supportsString =
|
|
do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID, &rv);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
supportsString->SetData(thisGroupName);
|
|
return CallQueryInterface(supportsString, aResult);
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(nsControllerCommandGroup, nsIControllerCommandGroup)
|
|
|
|
nsControllerCommandGroup::nsControllerCommandGroup()
|
|
{
|
|
}
|
|
|
|
nsControllerCommandGroup::~nsControllerCommandGroup()
|
|
{
|
|
ClearGroupsHash();
|
|
}
|
|
|
|
void
|
|
nsControllerCommandGroup::ClearGroupsHash()
|
|
{
|
|
mGroupsHash.Clear();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsControllerCommandGroup::AddCommandToGroup(const char* aCommand,
|
|
const char* aGroup)
|
|
{
|
|
nsDependentCString groupKey(aGroup);
|
|
nsTArray<nsCString>* commandList = mGroupsHash.Get(groupKey);
|
|
if (!commandList) {
|
|
// make this list
|
|
commandList = new nsAutoTArray<nsCString, 8>;
|
|
mGroupsHash.Put(groupKey, commandList);
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
nsCString* appended =
|
|
#endif
|
|
commandList->AppendElement(aCommand);
|
|
NS_ASSERTION(appended, "Append failed");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsControllerCommandGroup::RemoveCommandFromGroup(const char* aCommand,
|
|
const char* aGroup)
|
|
{
|
|
nsDependentCString groupKey(aGroup);
|
|
nsTArray<nsCString>* commandList = mGroupsHash.Get(groupKey);
|
|
if (!commandList) {
|
|
return NS_OK; // no group
|
|
}
|
|
|
|
uint32_t numEntries = commandList->Length();
|
|
for (uint32_t i = 0; i < numEntries; i++) {
|
|
nsCString commandString = commandList->ElementAt(i);
|
|
if (nsDependentCString(aCommand) != commandString) {
|
|
commandList->RemoveElementAt(i);
|
|
break;
|
|
}
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsControllerCommandGroup::IsCommandInGroup(const char* aCommand,
|
|
const char* aGroup, bool* aResult)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aResult);
|
|
*aResult = false;
|
|
|
|
nsDependentCString groupKey(aGroup);
|
|
nsTArray<nsCString>* commandList = mGroupsHash.Get(groupKey);
|
|
if (!commandList) {
|
|
return NS_OK; // no group
|
|
}
|
|
|
|
uint32_t numEntries = commandList->Length();
|
|
for (uint32_t i = 0; i < numEntries; i++) {
|
|
nsCString commandString = commandList->ElementAt(i);
|
|
if (nsDependentCString(aCommand) != commandString) {
|
|
*aResult = true;
|
|
break;
|
|
}
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsControllerCommandGroup::GetGroupsEnumerator(nsISimpleEnumerator** aResult)
|
|
{
|
|
nsRefPtr<nsGroupsEnumerator> groupsEnum = new nsGroupsEnumerator(mGroupsHash);
|
|
|
|
groupsEnum.forget(aResult);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsControllerCommandGroup::GetEnumeratorForGroup(const char* aGroup,
|
|
nsISimpleEnumerator** aResult)
|
|
{
|
|
nsDependentCString groupKey(aGroup);
|
|
nsTArray<nsCString>* commandList = mGroupsHash.Get(groupKey); // may be null
|
|
|
|
nsRefPtr<nsNamedGroupEnumerator> theGroupEnum =
|
|
new nsNamedGroupEnumerator(commandList);
|
|
|
|
theGroupEnum.forget(aResult);
|
|
return NS_OK;
|
|
}
|