mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
04083ef9b4
- Bug 1235261 - Part 1: Rename nsAutoTArray to AutoTArray. r=froydnj (0662c2ac56)
- Bug 1235261 - Part 2: Switch some uses of AutoFallibleTArray to AutoTArray. r=froydnj (ab52085f2a)
- Bug 1235261 - Part 3: Switch remaining uses of AutoFallibleTArray to AutoTArray. r=froydnj (3763b16ddd)
- Bug 1235261 - Part 4: Remove AutoFallibleTArray. r=froydnj (5480b0d786)
- Bug 1235261 - Part 5: Merge nsAutoArrayBase into AutoTArray. r=froydnj (6c64e73e3b)
- Bug 1235261 - Part 7: Remove AutoInfallibleTArray. r=froydnj (acf266464e)
- Bug 1222624: Make xpath document() function use nsIPrincipals and nsIURIs rather than strings. r=peterv (5ee694d132)
- Bug 1235261 - Part 6: Rename AutoInfallibleTArray to AutoTArray. r=froydnj (d282f7df6c)
- Bug 1241394 - Hit testing with 3d transforms should use fuzzy when comparing depths. r=thinker (6c3f50670f)
- Bug 1241394 - Follow up to fix windows build bustage. (02ab2600af)
- Bug 1241394 - Check clip for the children of the establisher. r=mattwoodrow (46f151ea55)
- bug 1241453 - allow caching proxies in xpcAccessibleDocuments r=davidb (f5d41ad2ee)
- Bug 1247364 - use AllChildrenIterator::Seek by a11y tree walker, r=davidb (0ec230908e)
- Bug 1248840 - rename TreeWalker::NextChild, r=yzen (c89ecc5a29)
- Bug 1249927 - devirtualize CanHavaAnonymousChildren, r=davdib (89e8088e63)
- Bug 1206598 - Use universal reference to reduce the redundant copy. r=nfroyd (bae4ad6dd1)
- Bug 1247364 - add AllChildrenIterator::Seek, r=bz (215abebf12)
- bug 1241453 - allow storing proxies in xpcAccessibleGeneric::mIntl r=davidb (dd5e6c896b)
- bug 1241453 - allow constructing xpcAccessibles with proxies r=davidb (d0258122be)
- bug 1241453 - fixup xpcAccessible Intl() methods to not assume mIntl is always an Accessible r=davidb (168f71fdf5)
- bug 1241453 - allow xpcAccessibleDocument::mCache to use proxies as keys r=davidb (85b7eec81c)
- bug 1241453 - assert accessibles are only added to non remote xpcAccessibleDocuments r=davidb (7731b21d17)
- bug 1243077 - add ToXPC{,Document} overloads for proxied accessibles r=davidb (7bc085f1b5)
- bug 1243077 - add AccessibleOrProxy xpcAccessible::IntlGeneric() r=davidb (006a635992)
- Bug 1245464 - initialize with 0 mSupportedIfaces in xpcAccessibleGeneric in order to avoid corrupted result after bit-wise operation. r=surkov (ae41bafcef)
- bug 1241453 - allow caching xpc documents for remote documents r=davidb (a357630690)
- bug 1241453 - factor dispatching nsIAccessibleEvents out of HandleAccEvent() r=davidb (091073d981)
- Bug 1249183 - Suppress GC harder, r=terrence (2185ccb4dd)
- Bug 1248420 - Handle JSObject::getGroup OOM in js::ArraySetLength. r=jandem (04b67c8d31)
- Bug 1242270 - Add SPS pseudo frames for the Array.prototype methods; r=shu (f5e5871439)
- Bug 1247701 - Bail from ArrayShiftDenseKernel if the array is used by for-in iteration. r=jandem (41eff38954)
- Bug 1247701 followup - Change ArrayShiftDenseKernel to receive handle. r=bz (b29ce0c555)
297 lines
6.7 KiB
C++
297 lines
6.7 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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();
|
|
|
|
nsresult Initialize();
|
|
|
|
protected:
|
|
nsControllerCommandGroup::GroupsHashtable& mHashTable;
|
|
int32_t mIndex;
|
|
const 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;
|
|
}
|
|
|
|
const 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);
|
|
}
|
|
|
|
nsresult
|
|
nsGroupsEnumerator::Initialize()
|
|
{
|
|
if (mInitted) {
|
|
return NS_OK;
|
|
}
|
|
|
|
mGroupNames = new const char*[mHashTable.Count()];
|
|
if (!mGroupNames) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
mIndex = 0;
|
|
for (auto iter = mHashTable.Iter(); !iter.Done(); iter.Next()) {
|
|
mGroupNames[mIndex] = iter.Key().Data();
|
|
mIndex++;
|
|
}
|
|
|
|
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 AutoTArray<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)
|
|
{
|
|
RefPtr<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
|
|
|
|
RefPtr<nsNamedGroupEnumerator> theGroupEnum =
|
|
new nsNamedGroupEnumerator(commandList);
|
|
|
|
theGroupEnum.forget(aResult);
|
|
return NS_OK;
|
|
}
|