mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 17:55:50 +00:00
5dc21d568c
The inclusions were removed with the following very crude script and the
resulting breakage was fixed up by hand. The manual fixups did either
revert the changes done by the script, replace a generic header with a more
specific one or replace a header with a forward declaration.
find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do
interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2)
if [ -n "$interfaces" ]; then
if [[ "$interfaces" == *$'\n'* ]]; then
regexp="\("
for i in $interfaces; do regexp="$regexp$i\|"; done
regexp="${regexp%%\\\|}\)"
else
regexp="$interfaces"
fi
interface=$(basename "$path")
rg -l "#include.*${interface%%.idl}.h" . | while read path2; do
hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" )
if [ $hits -eq 0 ]; then
echo "Removing ${interface} from ${path2}"
grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp
mv -f "$path2".tmp "$path2"
fi
done
fi
done
Differential Revision: https://phabricator.services.mozilla.com/D55444
--HG--
extra : moz-landing-system : lando
80 lines
2.3 KiB
C++
80 lines
2.3 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/. */
|
|
|
|
#ifndef nsArray_h__
|
|
#define nsArray_h__
|
|
|
|
#include "nsIMutableArray.h"
|
|
#include "nsCOMArray.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsCycleCollectionParticipant.h"
|
|
#include "mozilla/Attributes.h"
|
|
|
|
// {35C66FD1-95E9-4e0a-80C5-C3BD2B375481}
|
|
#define NS_ARRAY_CID \
|
|
{ \
|
|
0x35c66fd1, 0x95e9, 0x4e0a, { \
|
|
0x80, 0xc5, 0xc3, 0xbd, 0x2b, 0x37, 0x54, 0x81 \
|
|
} \
|
|
}
|
|
|
|
// nsArray without any refcounting declarations
|
|
class nsArrayBase : public nsIMutableArray {
|
|
public:
|
|
NS_DECL_NSIARRAY
|
|
NS_DECL_NSIARRAYEXTENSIONS
|
|
NS_DECL_NSIMUTABLEARRAY
|
|
|
|
/* Both of these factory functions create a cycle-collectable array
|
|
on the main thread and a non-cycle-collectable array on other
|
|
threads. */
|
|
static already_AddRefed<nsIMutableArray> Create();
|
|
/* Only for the benefit of the XPCOM module system, use Create()
|
|
instead. */
|
|
static nsresult XPCOMConstructor(nsISupports* aOuter, const nsIID& aIID,
|
|
void** aResult);
|
|
|
|
protected:
|
|
nsArrayBase() {}
|
|
nsArrayBase(const nsArrayBase& aOther);
|
|
explicit nsArrayBase(const nsCOMArray_base& aBaseArray)
|
|
: mArray(aBaseArray) {}
|
|
virtual ~nsArrayBase();
|
|
|
|
nsCOMArray_base mArray;
|
|
};
|
|
|
|
class nsArray final : public nsArrayBase {
|
|
friend class nsArrayBase;
|
|
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
|
|
private:
|
|
nsArray() : nsArrayBase() {}
|
|
nsArray(const nsArray& aOther);
|
|
explicit nsArray(const nsCOMArray_base& aBaseArray)
|
|
: nsArrayBase(aBaseArray) {}
|
|
~nsArray() {}
|
|
};
|
|
|
|
class nsArrayCC final : public nsArrayBase {
|
|
friend class nsArrayBase;
|
|
|
|
public:
|
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
|
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsArrayCC, nsIMutableArray)
|
|
|
|
private:
|
|
nsArrayCC() : nsArrayBase() {}
|
|
nsArrayCC(const nsArrayCC& aOther);
|
|
explicit nsArrayCC(const nsCOMArray_base& aBaseArray)
|
|
: nsArrayBase(aBaseArray) {}
|
|
~nsArrayCC() {}
|
|
};
|
|
|
|
#endif
|