mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for bug 839529 (Remove various CC participants that don't do anything). r=smaug. 

--HG--
extra : rebase_source : 8a272905c79396e7ae08aaaf83566ac450c45be0
This commit is contained in:
Peter Van der Beken 2013-02-07 10:19:08 +00:00
Родитель 6925dca3e0
Коммит c1b3c1ac36
27 изменённых файлов: 36 добавлений и 110 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
content/base/src/nsDOMFile.cpp
Просмотреть файл

@ -453,7 +453,10 @@ NS_IMPL_THREADSAFE_RELEASE(nsDOMFile)
////////////////////////////////////////////////////////////////////////////
// nsDOMFileCC implementation
NS_IMPL_CYCLE_COLLECTION_0(nsDOMFileCC)
NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsDOMFileCC)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMFileCC)
// We don't have anything to traverse, but some of our subclasses do.
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMFileCC)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFile)

9
content/media/DOMMediaStream.cpp
Просмотреть файл

@ -22,13 +22,8 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMMediaStream)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMMediaStream)
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMMediaStream, mWindow)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMLocalMediaStream)
NS_INTERFACE_MAP_ENTRY(nsIDOMLocalMediaStream)
NS_INTERFACE_MAP_END_INHERITING(DOMMediaStream)
NS_IMPL_ADDREF_INHERITED(DOMLocalMediaStream, DOMMediaStream)
NS_IMPL_RELEASE_INHERITED(DOMLocalMediaStream, DOMMediaStream)
NS_IMPL_CYCLE_COLLECTION_INHERITED_0(DOMLocalMediaStream, DOMMediaStream)
NS_IMPL_ISUPPORTS_INHERITED1(DOMLocalMediaStream, DOMMediaStream,
nsIDOMLocalMediaStream)
DOMMediaStream::~DOMMediaStream()
{

1
content/media/DOMMediaStream.h
Просмотреть файл

@ -118,7 +118,6 @@ public:
virtual ~DOMLocalMediaStream();
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DOMLocalMediaStream, DOMMediaStream)
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap);

4
dom/base/nsScreen.cpp
Просмотреть файл

@ -90,10 +90,8 @@ nsScreen::~nsScreen()
DOMCI_DATA(Screen, nsScreen)
NS_IMPL_CYCLE_COLLECTION_INHERITED_0(nsScreen, nsDOMEventTargetHelper)
// QueryInterface implementation for nsScreen
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsScreen)
NS_INTERFACE_MAP_BEGIN(nsScreen)
NS_INTERFACE_MAP_ENTRY(nsIDOMScreen)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Screen)
NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)

4
dom/bluetooth/BluetoothManager.cpp
Просмотреть файл

@ -25,9 +25,7 @@ USING_BLUETOOTH_NAMESPACE
DOMCI_DATA(BluetoothManager, BluetoothManager)
NS_IMPL_CYCLE_COLLECTION_INHERITED_0(BluetoothManager, nsDOMEventTargetHelper)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(BluetoothManager)
NS_INTERFACE_MAP_BEGIN(BluetoothManager)
NS_INTERFACE_MAP_ENTRY(nsIDOMBluetoothManager)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(BluetoothManager)
NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)

3
dom/bluetooth/BluetoothManager.h
Просмотреть файл

@ -28,9 +28,6 @@ public:
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(BluetoothManager,
nsDOMEventTargetHelper)
static already_AddRefed<BluetoothManager>
Create(nsPIDOMWindow* aWindow);
void Notify(const BluetoothSignal& aData);

8
dom/camera/DOMCameraCapabilities.cpp
Просмотреть файл

@ -17,16 +17,14 @@ using namespace mozilla::dom;
DOMCI_DATA(CameraCapabilities, nsICameraCapabilities)
NS_IMPL_CYCLE_COLLECTION_0(DOMCameraCapabilities)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMCameraCapabilities)
NS_INTERFACE_MAP_BEGIN(DOMCameraCapabilities)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_ENTRY(nsICameraCapabilities)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CameraCapabilities)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMCameraCapabilities)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMCameraCapabilities)
NS_IMPL_ADDREF(DOMCameraCapabilities)
NS_IMPL_RELEASE(DOMCameraCapabilities)
static nsresult
ParseZoomRatioItemAndAdd(JSContext* aCx, JSObject* aArray, uint32_t aIndex, const char* aStart, char** aEnd)

4
dom/camera/DOMCameraCapabilities.h
Просмотреть файл

@ -5,7 +5,6 @@
#ifndef DOM_CAMERA_DOMCAMERACAPABILITIES_H
#define DOM_CAMERA_DOMCAMERACAPABILITIES_H
#include "nsCycleCollectionParticipant.h"
#include "ICameraControl.h"
#include "nsAutoPtr.h"
#include "CameraCommon.h"
@ -17,8 +16,7 @@ typedef nsresult (*ParseItemAndAddFunc)(JSContext* aCx, JSObject* aArray, uint32
class DOMCameraCapabilities MOZ_FINAL : public nsICameraCapabilities
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS(DOMCameraCapabilities)
NS_DECL_ISUPPORTS
NS_DECL_NSICAMERACAPABILITIES
DOMCameraCapabilities(ICameraControl* aCamera)

8
dom/camera/FallbackCameraCapabilities.cpp
Просмотреть файл

@ -11,16 +11,14 @@ using namespace mozilla;
DOMCI_DATA(CameraCapabilities, nsICameraCapabilities)
NS_IMPL_CYCLE_COLLECTION_0(DOMCameraCapabilities)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMCameraCapabilities)
NS_INTERFACE_MAP_BEGIN(DOMCameraCapabilities)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_ENTRY(nsICameraCapabilities)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CameraCapabilities)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMCameraCapabilities)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMCameraCapabilities)
NS_IMPL_ADDREF(DOMCameraCapabilities)
NS_IMPL_RELEASE(DOMCameraCapabilities)
/* [implicit_jscontext] readonly attribute jsval previewSizes; */
NS_IMETHODIMP

8
dom/fm/FMRadio.cpp
Просмотреть файл

@ -64,13 +64,7 @@ FMRadio::~FMRadio()
DOMCI_DATA(FMRadio, FMRadio)
NS_IMPL_CYCLE_COLLECTION_INHERITED_0(FMRadio, nsDOMEventTargetHelper)
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(FMRadio,
nsDOMEventTargetHelper)
NS_IMPL_CYCLE_COLLECTION_TRACE_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FMRadio)
NS_INTERFACE_MAP_BEGIN(FMRadio)
NS_INTERFACE_MAP_ENTRY(nsIFMRadio)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(FMRadio)
NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)

5
dom/fm/FMRadio.h
Просмотреть файл

@ -30,14 +30,11 @@ class FMRadio : public nsDOMEventTargetHelper
, public nsIAudioChannelAgentCallback
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIFMRADIO
NS_DECL_NSIAUDIOCHANNELAGENTCALLBACK
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(
FMRadio,
nsDOMEventTargetHelper)
FMRadio();
virtual void Notify(const hal::FMRadioOperationInformation& info);
virtual void Notify(const hal::SwitchEvent& aEvent);

4
dom/network/src/Connection.cpp
Просмотреть файл

@ -26,9 +26,7 @@ namespace network {
const char* Connection::sMeteredPrefName = "dom.network.metered";
const bool Connection::sMeteredDefaultValue = false;
NS_IMPL_CYCLE_COLLECTION_INHERITED_0(Connection, nsDOMEventTargetHelper)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(Connection)
NS_INTERFACE_MAP_BEGIN(Connection)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozConnection)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozConnection)
NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)

5
dom/network/src/Connection.h
Просмотреть файл

@ -26,7 +26,7 @@ class Connection : public nsDOMEventTargetHelper
, public NetworkObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIDOMMOZCONNECTION
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
@ -39,9 +39,6 @@ public:
// For IObserver
void Notify(const hal::NetworkInformation& aNetworkInfo);
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(Connection,
nsDOMEventTargetHelper)
private:
/**
* Update the connection information stored in the object using a

4
dom/sms/src/SmsManager.cpp
Просмотреть файл

@ -34,9 +34,7 @@ namespace mozilla {
namespace dom {
namespace sms {
NS_IMPL_CYCLE_COLLECTION_INHERITED_0(SmsManager, nsDOMEventTargetHelper)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SmsManager)
NS_INTERFACE_MAP_BEGIN(SmsManager)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsManager)
NS_INTERFACE_MAP_ENTRY(nsIObserver)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozSmsManager)

5
dom/sms/src/SmsManager.h
Просмотреть файл

@ -21,15 +21,12 @@ class SmsManager : public nsDOMEventTargetHelper
, public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIOBSERVER
NS_DECL_NSIDOMMOZSMSMANAGER
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SmsManager,
nsDOMEventTargetHelper)
static already_AddRefed<SmsManager>
CreateInstanceIfAllowed(nsPIDOMWindow *aWindow);

4
dom/voicemail/Voicemail.cpp
Просмотреть файл

@ -20,9 +20,7 @@ DOMCI_DATA(MozVoicemail, mozilla::dom::Voicemail)
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_0(Voicemail, nsDOMEventTargetHelper)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(Voicemail)
NS_INTERFACE_MAP_BEGIN(Voicemail)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozVoicemail)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozVoicemail)
NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)

2
dom/voicemail/Voicemail.h
Просмотреть файл

@ -29,8 +29,6 @@ public:
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(Voicemail, nsDOMEventTargetHelper)
Voicemail(nsPIDOMWindow* aWindow, nsIRILContentHelper* aRIL);
virtual ~Voicemail();

5
editor/libeditor/base/EditTxn.cpp
Просмотреть файл

@ -7,7 +7,10 @@
#include "nsError.h"
#include "nsISupportsBase.h"
NS_IMPL_CYCLE_COLLECTION_0(EditTxn)
NS_IMPL_CYCLE_COLLECTION_UNLINK_0(EditTxn)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(EditTxn)
// We don't have anything to traverse, but some of our subclasses do.
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(EditTxn)
NS_INTERFACE_MAP_ENTRY(nsITransaction)

11
extensions/spellcheck/src/mozGenericWordUtils.cpp
Просмотреть файл

@ -4,16 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozGenericWordUtils.h"
NS_IMPL_CYCLE_COLLECTING_ADDREF(mozGenericWordUtils)
NS_IMPL_CYCLE_COLLECTING_RELEASE(mozGenericWordUtils)
NS_INTERFACE_MAP_BEGIN(mozGenericWordUtils)
NS_INTERFACE_MAP_ENTRY(mozISpellI18NUtil)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozISpellI18NUtil)
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(mozGenericWordUtils)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTION_0(mozGenericWordUtils)
NS_IMPL_ISUPPORTS1(mozGenericWordUtils, mozISpellI18NUtil)
// do something sensible but generic ... eventually. For now whine.

3
extensions/spellcheck/src/mozGenericWordUtils.h
Просмотреть файл

@ -13,9 +13,8 @@
class mozGenericWordUtils : public mozISpellI18NUtil
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_ISUPPORTS
NS_DECL_MOZISPELLI18NUTIL
NS_DECL_CYCLE_COLLECTION_CLASS(mozGenericWordUtils)
mozGenericWordUtils();
virtual ~mozGenericWordUtils();

3
extensions/spellcheck/src/mozInlineSpellChecker.cpp
Просмотреть файл

@ -478,11 +478,10 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(mozInlineSpellChecker)
NS_IMPL_CYCLE_COLLECTING_RELEASE(mozInlineSpellChecker)
NS_IMPL_CYCLE_COLLECTION_5(mozInlineSpellChecker,
NS_IMPL_CYCLE_COLLECTION_4(mozInlineSpellChecker,
mSpellCheck,
mTextServicesDocument,
mTreeWalker,
mConverter,
mCurrentSelectionAnchorNode)
mozInlineSpellChecker::SpellCheckingState

3
extensions/spellcheck/src/mozSpellChecker.cpp
Просмотреть файл

@ -21,8 +21,7 @@ NS_INTERFACE_MAP_BEGIN(mozSpellChecker)
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(mozSpellChecker)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTION_3(mozSpellChecker,
mConverter,
NS_IMPL_CYCLE_COLLECTION_2(mozSpellChecker,
mTsDoc,
mPersonalDictionary)

11
extensions/spellcheck/src/mozSpellI18NManager.cpp
Просмотреть файл

@ -8,16 +8,7 @@
#include "mozGenericWordUtils.h"
#include "nsString.h"
NS_IMPL_CYCLE_COLLECTING_ADDREF(mozSpellI18NManager)
NS_IMPL_CYCLE_COLLECTING_RELEASE(mozSpellI18NManager)
NS_INTERFACE_MAP_BEGIN(mozSpellI18NManager)
NS_INTERFACE_MAP_ENTRY(mozISpellI18NManager)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozISpellI18NManager)
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(mozSpellI18NManager)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTION_0(mozSpellI18NManager)
NS_IMPL_ISUPPORTS1(mozSpellI18NManager, mozISpellI18NManager)
mozSpellI18NManager::mozSpellI18NManager()
{

3
extensions/spellcheck/src/mozSpellI18NManager.h
Просмотреть файл

@ -19,9 +19,8 @@
class mozSpellI18NManager : public mozISpellI18NManager
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_ISUPPORTS
NS_DECL_MOZISPELLI18NMANAGER
NS_DECL_CYCLE_COLLECTION_CLASS(mozSpellI18NManager)
mozSpellI18NManager();
virtual ~mozSpellI18NManager();

8
rdf/datasource/src/nsFileSystemDataSource.cpp
Просмотреть файл

@ -213,13 +213,7 @@ FileSystemDataSource::Create(nsISupports* aOuter, const nsIID& aIID, void **aRes
return self->QueryInterface(aIID, aResult);
}
NS_IMPL_CYCLE_COLLECTION_0(FileSystemDataSource)
NS_IMPL_CYCLE_COLLECTING_ADDREF(FileSystemDataSource)
NS_IMPL_CYCLE_COLLECTING_RELEASE(FileSystemDataSource)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FileSystemDataSource)
NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
NS_IMPL_ISUPPORTS1(FileSystemDataSource, nsIRDFDataSource)
NS_IMETHODIMP
FileSystemDataSource::GetURI(char **uri)

4
rdf/datasource/src/nsFileSystemDataSource.h
Просмотреть файл

@ -13,7 +13,6 @@
#include "nsISupportsArray.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsCycleCollectionParticipant.h"
#include "mozilla/Attributes.h"
#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_WIN)
@ -23,8 +22,7 @@
class FileSystemDataSource MOZ_FINAL : public nsIRDFDataSource
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS(FileSystemDataSource)
NS_DECL_ISUPPORTS
NS_DECL_NSIRDFDATASOURCE
static nsresult Create(nsISupports* aOuter,

12
xpcom/glue/nsCycleCollectionParticipant.h
Просмотреть файл

@ -794,10 +794,8 @@ struct Skippable
return NS_OK; \
}
#define NS_IMPL_CYCLE_COLLECTION_0(_class) \
NS_IMPL_CYCLE_COLLECTION_UNLINK_0(_class) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(_class) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
// NS_IMPL_CYCLE_COLLECTION_0 is not defined because most of the time it doesn't
// make sense to add something to the CC that doesn't traverse to anything.
#define NS_IMPL_CYCLE_COLLECTION_1(_class, _f) \
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(_class) \
@ -943,12 +941,6 @@ struct Skippable
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_f9) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
#define NS_IMPL_CYCLE_COLLECTION_INHERITED_0(_class, _base) \
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(_class, _base) \
NS_IMPL_CYCLE_COLLECTION_UNLINK_END \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(_class, _base) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
#define NS_IMPL_CYCLE_COLLECTION_INHERITED_1(_class, _base, _f1) \
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(_class, _base) \
NS_IMPL_CYCLE_COLLECTION_UNLINK(_f1) \