corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 4 changesets (bug 1028588) for build bustage

Browse Source 
Backed out changeset 13a8bae671ca (bug 1028588)
Backed out changeset 19a19833f1d6 (bug 1028588)
Backed out changeset d5fae80054de (bug 1028588)
Backed out changeset 5942ad3859b8 (bug 1028588)
This commit is contained in:
Wes Kocher
2014-06-30 15:50:19 -07:00
parent 6d0ba9e6eb
commit 8d34dc1b3b
73 changed files with 114 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
View File

@@ -996,16 +996,14 @@ public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITOOLTIPTEXTPROVIDER
protected:
~DefaultTooltipTextProvider() {}
nsCOMPtr<nsIAtom> mTag_dialog;
nsCOMPtr<nsIAtom> mTag_dialogheader;
nsCOMPtr<nsIAtom> mTag_window;
};
// NS_IMPL_ISUPPORTS(DefaultTooltipTextProvider, nsITooltipTextProvider)
NS_IMPL_ISUPPORTS(DefaultTooltipTextProvider, nsITooltipTextProvider)
DefaultTooltipTextProvider::DefaultTooltipTextProvider()
{

8
embedding/browser/webBrowser/nsDocShellTreeOwner.h
View File

@@ -146,13 +146,11 @@ protected:
//
class ChromeTooltipListener : public nsIDOMEventListener
{
protected:
virtual ~ChromeTooltipListener ( ) ;
public:
NS_DECL_ISUPPORTS
ChromeTooltipListener ( nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome ) ;
virtual ~ChromeTooltipListener ( ) ;
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
NS_IMETHOD MouseMove(nsIDOMEvent* aMouseEvent);
@@ -220,13 +218,11 @@ private:
//
class ChromeContextMenuListener : public nsIDOMEventListener
{
protected:
virtual ~ChromeContextMenuListener ( ) ;
public:
NS_DECL_ISUPPORTS
ChromeContextMenuListener ( nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome ) ;
virtual ~ChromeContextMenuListener ( ) ;
// nsIDOMContextMenuListener
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);

4
embedding/browser/webBrowser/nsEmbedStream.h
View File

@@ -16,6 +16,7 @@ class nsEmbedStream : public nsISupports
public:
nsEmbedStream();
virtual ~nsEmbedStream();
void InitOwner (nsIWebBrowser *aOwner);
NS_METHOD Init (void);
@@ -26,9 +27,6 @@ class nsEmbedStream : public nsISupports
NS_DECL_ISUPPORTS
protected:
virtual ~nsEmbedStream();
private:
nsIWebBrowser *mOwner;
nsCOMPtr<nsIOutputStream> mOutputStream;

6
embedding/browser/webBrowser/nsWebBrowserContentPolicy.h
View File

@@ -14,12 +14,10 @@
class nsWebBrowserContentPolicy : public nsIContentPolicy
{
protected:
virtual ~nsWebBrowserContentPolicy();
public:
nsWebBrowserContentPolicy();
virtual ~nsWebBrowserContentPolicy();
NS_DECL_ISUPPORTS
NS_DECL_NSICONTENTPOLICY
};

2
embedding/components/appstartup/src/nsAppStartupNotifier.h
View File

@@ -21,8 +21,6 @@ public:
NS_DECL_NSIOBSERVER
nsAppStartupNotifier();
protected:
virtual ~nsAppStartupNotifier();
};

8
embedding/components/commandhandler/src/nsBaseCommandController.h
View File

@@ -27,7 +27,8 @@ class nsBaseCommandController : public nsIController,
{
public:
nsBaseCommandController();
nsBaseCommandController();
virtual ~nsBaseCommandController();
// nsISupports
NS_DECL_ISUPPORTS
@@ -43,10 +44,7 @@ public:
// nsIInterfaceRequestor
NS_DECL_NSIINTERFACEREQUESTOR
protected:
virtual ~nsBaseCommandController();
private:
nsWeakPtr mCommandContextWeakPtr;

6
embedding/components/commandhandler/src/nsCommandGroup.cpp
View File

@@ -19,13 +19,12 @@ class nsGroupsEnumerator : public nsISimpleEnumerator
{
public:
nsGroupsEnumerator(nsControllerCommandGroup::GroupsHashtable &inHashTable);
virtual ~nsGroupsEnumerator();
NS_DECL_ISUPPORTS
NS_DECL_NSISIMPLEENUMERATOR
protected:
virtual ~nsGroupsEnumerator();
static PLDHashOperator HashEnum(const nsACString &aKey, nsTArray<nsCString> *aData, void *aClosure);
nsresult Initialize();
@@ -133,13 +132,12 @@ class nsNamedGroupEnumerator : public nsISimpleEnumerator
{
public:
nsNamedGroupEnumerator(nsTArray<nsCString> *inArray);
virtual ~nsNamedGroupEnumerator();
NS_DECL_ISUPPORTS
NS_DECL_NSISIMPLEENUMERATOR
protected:
virtual ~nsNamedGroupEnumerator();
nsTArray<nsCString> *mGroupArray;
int32_t mIndex;
};

3
embedding/components/commandhandler/src/nsCommandGroup.h
View File

@@ -21,6 +21,7 @@ class nsControllerCommandGroup : public nsIControllerCommandGroup
{
public:
nsControllerCommandGroup();
virtual ~nsControllerCommandGroup();
NS_DECL_ISUPPORTS
NS_DECL_NSICONTROLLERCOMMANDGROUP
@@ -29,8 +30,6 @@ public:
typedef nsClassHashtable<nsCStringHashKey, nsTArray<nsCString>> GroupsHashtable;
protected:
virtual ~nsControllerCommandGroup();
void ClearGroupsHash();
protected:

2
embedding/components/commandhandler/src/nsCommandManager.h
View File

@@ -28,6 +28,7 @@ public:
typedef nsTArray<nsCOMPtr<nsIObserver> > ObserverList;
nsCommandManager();
virtual ~nsCommandManager();
// nsISupports
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -41,7 +42,6 @@ public:
protected:
virtual ~nsCommandManager();
nsresult GetControllerForCommand(const char * aCommand,
nsIDOMWindow *aDirectedToThisWindow,

2
embedding/components/commandhandler/src/nsCommandParams.h
View File

@@ -19,6 +19,7 @@ class nsCommandParams : public nsICommandParams
public:
nsCommandParams();
virtual ~nsCommandParams();
NS_DECL_ISUPPORTS
@@ -27,7 +28,6 @@ public:
nsresult Init();
protected:
virtual ~nsCommandParams();
struct HashEntry : public PLDHashEntryHdr
{

3
embedding/components/commandhandler/src/nsControllerCommandTable.h
View File

@@ -19,6 +19,7 @@ class nsControllerCommandTable : public nsIControllerCommandTable,
public:
nsControllerCommandTable();
virtual ~nsControllerCommandTable();
NS_DECL_ISUPPORTS
@@ -26,8 +27,6 @@ public:
protected:
virtual ~nsControllerCommandTable();
// Hash table of nsIControllerCommands, keyed by command name.
nsInterfaceHashtable<nsCStringHashKey, nsIControllerCommand> mCommandsTable;

9
embedding/components/find/src/nsFind.cpp
View File

@@ -89,6 +89,10 @@ public:
{
}
virtual ~nsFindContentIterator()
{
}
// nsISupports
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS(nsFindContentIterator)
@@ -115,11 +119,6 @@ public:
virtual bool IsDone();
virtual nsresult PositionAt(nsINode* aCurNode);
protected:
virtual ~nsFindContentIterator()
{
}
private:
nsCOMPtr<nsIContentIterator> mOuterIterator;
nsCOMPtr<nsIContentIterator> mInnerIterator;

3
embedding/components/find/src/nsFind.h
View File

@@ -34,12 +34,11 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS(nsFind)
nsFind();
virtual ~nsFind();
static already_AddRefed<nsIDOMRange> CreateRange(nsINode* aNode);
protected:
virtual ~nsFind();
// Parameters set from the interface:
//nsCOMPtr<nsIDOMRange> mRange; // search only in this range
bool mFindBackward;

5
embedding/components/find/src/nsWebBrowserFind.h
View File

@@ -35,6 +35,7 @@ class nsWebBrowserFind : public nsIWebBrowserFind,
{
public:
nsWebBrowserFind();
virtual ~nsWebBrowserFind();
// nsISupports
NS_DECL_ISUPPORTS
@@ -47,9 +48,7 @@ public:
protected:
virtual ~nsWebBrowserFind();
bool CanFindNext()
{ return mSearchString.Length() != 0; }

2
embedding/components/printingui/src/unixshared/nsPrintProgress.h
View File

@@ -25,8 +25,6 @@ public:
NS_DECL_NSIPRINTSTATUSFEEDBACK
nsPrintProgress(nsIPrintSettings* aPrintSettings);
protected:
virtual ~nsPrintProgress();
private:

2
embedding/components/printingui/src/unixshared/nsPrintProgressParams.h
View File

@@ -16,8 +16,6 @@ public:
NS_DECL_NSIPRINTPROGRESSPARAMS
nsPrintProgressParams();
protected:
virtual ~nsPrintProgressParams();
private:

4
embedding/components/printingui/src/unixshared/nsPrintingPromptService.h
View File

@@ -32,6 +32,7 @@ class nsPrintingPromptService: public nsIPrintingPromptService,
public:
nsPrintingPromptService();
virtual ~nsPrintingPromptService();
nsresult Init();
@@ -39,9 +40,6 @@ public:
NS_DECL_NSIWEBPROGRESSLISTENER
NS_DECL_ISUPPORTS
protected:
virtual ~nsPrintingPromptService();
private:
nsresult DoDialog(nsIDOMWindow *aParent,
nsIDialogParamBlock *aParamBlock,

4
embedding/components/windowwatcher/src/nsDialogParamBlock.h
View File

@@ -20,13 +20,11 @@ class nsDialogParamBlock: public nsIDialogParamBlock
{
public:
nsDialogParamBlock();
virtual ~nsDialogParamBlock();
NS_DECL_NSIDIALOGPARAMBLOCK
NS_DECL_ISUPPORTS
protected:
virtual ~nsDialogParamBlock();
private:
enum {kNumInts = 8, kNumStrings = 16};

4
embedding/components/windowwatcher/src/nsWindowWatcher.cpp
View File

@@ -144,14 +144,12 @@ class nsWatcherWindowEnumerator : public nsISimpleEnumerator {
public:
nsWatcherWindowEnumerator(nsWindowWatcher *inWatcher);
virtual ~nsWatcherWindowEnumerator();
NS_IMETHOD HasMoreElements(bool *retval);
NS_IMETHOD GetNext(nsISupports **retval);
NS_DECL_ISUPPORTS
protected:
virtual ~nsWatcherWindowEnumerator();
private:
friend class nsWindowWatcher;

3
embedding/components/windowwatcher/src/nsWindowWatcher.h
View File

@@ -41,6 +41,7 @@ friend class nsWatcherWindowEnumerator;
public:
nsWindowWatcher();
virtual ~nsWindowWatcher();
nsresult Init();
@@ -57,8 +58,6 @@ public:
bool aSizeSpecified);
protected:
virtual ~nsWindowWatcher();
friend class nsPromptService;
bool AddEnumerator(nsWatcherWindowEnumerator* inEnumerator);
bool RemoveEnumerator(nsWatcherWindowEnumerator* inEnumerator);

3
modules/libpref/public/Preferences.h
View File

@@ -50,6 +50,7 @@ public:
NS_DECL_NSIOBSERVER
Preferences();
virtual ~Preferences();
nsresult Init();
@@ -352,8 +353,6 @@ public:
static nsresult SetFloat(const char* aPref, float aValue);
protected:
virtual ~Preferences();
nsresult NotifyServiceObservers(const char *aSubject);
/**
* Reads the default pref file or, if that failed, try to save a new one.

10
modules/libpref/src/Preferences.cpp
View File

@@ -128,10 +128,6 @@ public:
class ValueObserver MOZ_FINAL : public nsIObserver,
public ValueObserverHashKey
{
~ValueObserver() {
Preferences::RemoveObserver(this, mPrefName.get());
}
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
@@ -139,6 +135,10 @@ public:
ValueObserver(const char *aPref, PrefChangedFunc aCallback)
: ValueObserverHashKey(aPref, aCallback) { }
~ValueObserver() {
Preferences::RemoveObserver(this, mPrefName.get());
}
void AppendClosure(void *aClosure) {
mClosures.AppendElement(aClosure);
}
@@ -229,8 +229,6 @@ Preferences::SizeOfIncludingThisAndOtherStuff(mozilla::MallocSizeOf aMallocSizeO
class PreferenceServiceReporter MOZ_FINAL : public nsIMemoryReporter
{
~PreferenceServiceReporter() {}
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIMEMORYREPORTER

15
modules/libpref/src/nsPrefBranch.h
View File

@@ -187,6 +187,7 @@ public:
NS_DECL_NSIOBSERVER
nsPrefBranch(const char *aPrefRoot, bool aDefaultBranch);
virtual ~nsPrefBranch();
int32_t GetRootLength() { return mPrefRootLength; }
@@ -197,8 +198,6 @@ public:
size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf);
protected:
virtual ~nsPrefBranch();
nsPrefBranch() /* disallow use of this constructer */
{ }
@@ -233,6 +232,7 @@ class nsPrefLocalizedString : public nsIPrefLocalizedString,
{
public:
nsPrefLocalizedString();
virtual ~nsPrefLocalizedString();
NS_DECL_ISUPPORTS
NS_FORWARD_NSISUPPORTSSTRING(mUnicodeString->)
@@ -241,8 +241,6 @@ public:
nsresult Init();
private:
virtual ~nsPrefLocalizedString();
NS_IMETHOD GetData(char16_t**);
NS_IMETHOD SetData(const char16_t* aData);
NS_IMETHOD SetDataWithLength(uint32_t aLength, const char16_t *aData);
@@ -256,12 +254,11 @@ class nsRelativeFilePref : public nsIRelativeFilePref
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIRELATIVEFILEPREF
nsRelativeFilePref();
nsRelativeFilePref();
virtual ~nsRelativeFilePref();
private:
virtual ~nsRelativeFilePref();
nsCOMPtr<nsIFile> mFile;
nsCString mRelativeToKey;
};

3
rdf/base/src/nsContainerEnumerator.cpp
View File

@@ -51,10 +51,9 @@ private:
nsCOMPtr<nsIRDFNode> mResult;
int32_t mNextIndex;
virtual ~ContainerEnumeratorImpl();
public:
ContainerEnumeratorImpl(nsIRDFDataSource* ds, nsIRDFResource* container);
virtual ~ContainerEnumeratorImpl();
nsresult Init();

8
rdf/base/src/nsInMemoryDataSource.cpp
View File

@@ -391,8 +391,6 @@ private:
Assertion* mNextAssertion;
nsCOMPtr<nsISupportsArray> mHashArcs;
virtual ~InMemoryAssertionEnumeratorImpl();
public:
InMemoryAssertionEnumeratorImpl(InMemoryDataSource* aDataSource,
nsIRDFResource* aSource,
@@ -400,6 +398,8 @@ public:
nsIRDFNode* aTarget,
bool aTruthValue);
virtual ~InMemoryAssertionEnumeratorImpl();
// nsISupports interface
NS_DECL_ISUPPORTS
@@ -563,13 +563,13 @@ private:
ArcEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr,
uint32_t aNumber, void* aArg);
virtual ~InMemoryArcsEnumeratorImpl();
public:
InMemoryArcsEnumeratorImpl(InMemoryDataSource* aDataSource,
nsIRDFResource* aSource,
nsIRDFNode* aTarget);
virtual ~InMemoryArcsEnumeratorImpl();
// nsISupports interface
NS_DECL_ISUPPORTS

3
rdf/base/src/nsRDFContentSink.cpp
View File

@@ -102,6 +102,7 @@ class RDFContentSinkImpl : public nsIRDFContentSink,
{
public:
RDFContentSinkImpl();
virtual ~RDFContentSinkImpl();
// nsISupports
NS_DECL_ISUPPORTS
@@ -145,8 +146,6 @@ public:
} ContainerInfo;
protected:
virtual ~RDFContentSinkImpl();
// Text management
void ParseText(nsIRDFNode **aResult);

8
rdf/base/src/nsRDFService.cpp
View File

@@ -283,7 +283,6 @@ public:
RDFServiceImpl::gRDFService->RegisterBlob(this);
}
protected:
virtual ~BlobImpl()
{
RDFServiceImpl::gRDFService->UnregisterBlob(this);
@@ -295,7 +294,6 @@ protected:
delete[] mData.mBytes;
}
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIRDFNODE
NS_DECL_NSIRDFBLOB
@@ -522,6 +520,7 @@ LiteralImpl::GetValueConst(const char16_t** aValue)
class DateImpl : public nsIRDFDate {
public:
DateImpl(const PRTime s);
virtual ~DateImpl();
// nsISupports
NS_DECL_ISUPPORTS
@@ -533,8 +532,6 @@ public:
NS_IMETHOD GetValue(PRTime *value);
private:
virtual ~DateImpl();
nsresult EqualsDate(nsIRDFDate* date, bool* result);
PRTime mValue;
};
@@ -629,6 +626,7 @@ DateImpl::EqualsDate(nsIRDFDate* date, bool* result)
class IntImpl : public nsIRDFInt {
public:
IntImpl(int32_t s);
virtual ~IntImpl();
// nsISupports
NS_DECL_ISUPPORTS
@@ -640,8 +638,6 @@ public:
NS_IMETHOD GetValue(int32_t *value);
private:
virtual ~IntImpl();
nsresult EqualsInt(nsIRDFInt* value, bool* result);
int32_t mValue;
};

1
rdf/base/src/nsRDFXMLSerializer.cpp
View File

@@ -1013,7 +1013,6 @@ public:
QNameCollector(nsRDFXMLSerializer* aParent)
: mParent(aParent){}
private:
~QNameCollector() {}
nsRDFXMLSerializer* mParent;
};

1
rdf/base/src/rdfTriplesSerializer.cpp
View File

@@ -28,7 +28,6 @@ public:
NS_DECL_RDFITRIPLEVISITOR
NS_DECL_ISUPPORTS
protected:
~TriplesVisitor() {}
nsresult writeResource(nsIRDFResource* aResource);
nsIOutputStream* mOut;
};

2
rdf/datasource/src/nsFileSystemDataSource.h
View File

@@ -27,11 +27,11 @@ public:
static nsresult Create(nsISupports* aOuter,
const nsIID& aIID, void **aResult);
~FileSystemDataSource() { }
nsresult Init();
private:
FileSystemDataSource() { }
~FileSystemDataSource() { }
// helper methods
bool isFileURI(nsIRDFResource* aResource);

4
rdf/tests/rdfcat/rdfcat.cpp
View File

@@ -56,11 +56,9 @@ static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID);
class ConsoleOutputStreamImpl : public nsIOutputStream
{
protected:
virtual ~ConsoleOutputStreamImpl(void) {}
public:
ConsoleOutputStreamImpl(void) {}
virtual ~ConsoleOutputStreamImpl(void) {}
// nsISupports interface
NS_DECL_ISUPPORTS

4
rdf/tests/rdfpoll/rdfpoll.cpp
View File

@@ -55,11 +55,9 @@ static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID);
class Observer : public nsIRDFObserver
{
protected:
virtual ~Observer() {}
public:
Observer();
virtual ~Observer() {}
// nsISupports interface
NS_DECL_ISUPPORTS

4
rdf/tests/triplescat/triplescat.cpp
View File

@@ -54,11 +54,9 @@
class ConsoleOutputStreamImpl : public nsIOutputStream
{
protected:
virtual ~ConsoleOutputStreamImpl(void) {}
public:
ConsoleOutputStreamImpl(void) {}
virtual ~ConsoleOutputStreamImpl(void) {}
// nsISupports interface
NS_DECL_ISUPPORTS

2
rdf/util/public/nsRDFResource.h
View File

@@ -38,9 +38,9 @@ public:
// nsRDFResource methods:
nsRDFResource(void);
virtual ~nsRDFResource(void);
protected:
virtual ~nsRDFResource(void);
static nsIRDFService* gRDFService;
static nsrefcnt gRDFServiceRefCnt;

4
xpcom/base/AvailableMemoryTracker.cpp
View File

@@ -396,8 +396,6 @@ NS_IMPL_ISUPPORTS(LowEventsReporter, nsIMemoryReporter)
*/
class nsJemallocFreeDirtyPagesRunnable MOZ_FINAL : public nsIRunnable
{
~nsJemallocFreeDirtyPagesRunnable() {}
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIRUNNABLE
@@ -424,8 +422,6 @@ nsJemallocFreeDirtyPagesRunnable::Run()
*/
class nsMemoryPressureWatcher MOZ_FINAL : public nsIObserver
{
~nsMemoryPressureWatcher() {}
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER

2
xpcom/base/SystemMemoryReporter.cpp
View File

@@ -114,8 +114,6 @@ IsAnonymous(const nsACString& aName)
class SystemReporter MOZ_FINAL : public nsIMemoryReporter
{
~SystemReporter() {}
public:
NS_DECL_THREADSAFE_ISUPPORTS

28
xpcom/base/nsCycleCollector.cpp
View File

@@ -1273,11 +1273,9 @@ class nsCycleCollector : public nsIMemoryReporter
JSPurpleBuffer* mJSPurpleBuffer;
private:
virtual ~nsCycleCollector();
public:
nsCycleCollector();
virtual ~nsCycleCollector();
void RegisterJSRuntime(CycleCollectedJSRuntime* aJSRuntime);
void ForgetJSRuntime();
@@ -1707,11 +1705,6 @@ NS_IMPL_ISUPPORTS(nsCycleCollectorLogSinkToFile, nsICycleCollectorLogSink)
class nsCycleCollectorLogger MOZ_FINAL : public nsICycleCollectorListener
{
~nsCycleCollectorLogger()
{
ClearDescribers();
}
public:
nsCycleCollectorLogger()
: mLogSink(nsCycleCollector_createLogSink())
@@ -1722,6 +1715,11 @@ public:
{
}
~nsCycleCollectorLogger()
{
ClearDescribers();
}
NS_DECL_ISUPPORTS
void SetAllTraces()
@@ -2511,13 +2509,6 @@ private:
// removed.
class JSPurpleBuffer
{
~JSPurpleBuffer()
{
MOZ_ASSERT(mValues.IsEmpty());
MOZ_ASSERT(mObjects.IsEmpty());
MOZ_ASSERT(mTenuredObjects.IsEmpty());
}
public:
JSPurpleBuffer(JSPurpleBuffer*& aReferenceToThis)
: mReferenceToThis(aReferenceToThis)
@@ -2527,6 +2518,13 @@ public:
mozilla::HoldJSObjects(this);
}
~JSPurpleBuffer()
{
MOZ_ASSERT(mValues.IsEmpty());
MOZ_ASSERT(mObjects.IsEmpty());
MOZ_ASSERT(mTenuredObjects.IsEmpty());
}
void Destroy()
{
mReferenceToThis = nullptr;

12
xpcom/base/nsDumpUtils.h
View File

@@ -40,12 +40,6 @@ protected:
MessageLoopForIO::FileDescriptorWatcher mReadWatcher;
int mFd;
virtual ~FdWatcher()
{
// StopWatching should have run.
MOZ_ASSERT(mFd == -1);
}
public:
FdWatcher()
: mFd(-1)
@@ -53,6 +47,12 @@ public:
MOZ_ASSERT(NS_IsMainThread());
}
virtual ~FdWatcher()
{
// StopWatching should have run.
MOZ_ASSERT(mFd == -1);
}
/**
* Open the fd to watch. If we encounter an error, return -1.
*/

3
xpcom/base/nsGZFileWriter.h
View File

@@ -15,10 +15,9 @@
*/
class nsGZFileWriter : public nsIGZFileWriter
{
virtual ~nsGZFileWriter();
public:
nsGZFileWriter();
virtual ~nsGZFileWriter();
NS_DECL_ISUPPORTS
NS_DECL_NSIGZFILEWRITER

1
xpcom/base/nsIStatusReporter.idl
View File

@@ -66,7 +66,6 @@ interface nsIStatusReporterManager : nsISupports
*/
#define NS_STATUS_REPORTER_IMPLEMENT(_classname, _name, _desc_Function) \
class StatusReporter_##_classname MOZ_FINAL : public nsIStatusReporter { \
~StatusReporter_##_classname() {} \
public: \
NS_DECL_ISUPPORTS \
NS_IMETHOD GetName(nsACString &name) \

3
xpcom/base/nsInterfaceRequestorAgg.cpp
View File

@@ -29,10 +29,9 @@ public:
mConsumerTarget = NS_GetCurrentThread();
}
}
private:
~nsInterfaceRequestorAgg();
private:
nsCOMPtr<nsIInterfaceRequestor> mFirst, mSecond;
nsCOMPtr<nsIEventTarget> mConsumerTarget;
};

6
xpcom/base/nsMemoryInfoDumper.cpp
View File

@@ -496,8 +496,6 @@ public:
}
private:
~DumpReportCallback() {}
bool mIsFirst;
nsRefPtr<nsGZFileWriter> mWriter;
};
@@ -590,8 +588,6 @@ public:
NS_IMETHOD Callback(nsISupports* aData);
private:
~TempDirMemoryFinishCallback() {}
nsRefPtr<nsGZFileWriter> mrWriter;
nsCOMPtr<nsIFile> mrTmpFile;
nsCString mrFilename;
@@ -827,8 +823,6 @@ public:
}
private:
~FinishReportingCallback() {}
nsCOMPtr<nsIFinishDumpingCallback> mFinishDumping;
nsCOMPtr<nsISupports> mFinishDumpingData;
};

4
xpcom/base/nsMemoryInfoDumper.h
View File

@@ -20,14 +20,14 @@ class nsACString;
*/
class nsMemoryInfoDumper : public nsIMemoryInfoDumper
{
virtual ~nsMemoryInfoDumper();
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIMEMORYINFODUMPER
nsMemoryInfoDumper();
virtual ~nsMemoryInfoDumper();
public:
static void Initialize();
#ifdef MOZ_DMD

18
xpcom/base/nsMemoryReporterManager.cpp
View File

@@ -118,8 +118,6 @@ ResidentUniqueDistinguishedAmount(int64_t* aN)
class ResidentUniqueReporter MOZ_FINAL : public nsIMemoryReporter
{
~ResidentUniqueReporter() {}
public:
NS_DECL_ISUPPORTS
@@ -560,8 +558,6 @@ NS_IMPL_ISUPPORTS(PrivateReporter, nsIMemoryReporter)
#ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
class VsizeReporter MOZ_FINAL : public nsIMemoryReporter
{
~VsizeReporter() {}
public:
NS_DECL_ISUPPORTS
@@ -587,8 +583,6 @@ NS_IMPL_ISUPPORTS(VsizeReporter, nsIMemoryReporter)
class ResidentReporter MOZ_FINAL : public nsIMemoryReporter
{
~ResidentReporter() {}
public:
NS_DECL_ISUPPORTS
@@ -621,8 +615,6 @@ NS_IMPL_ISUPPORTS(ResidentReporter, nsIMemoryReporter)
class PageFaultsSoftReporter MOZ_FINAL : public nsIMemoryReporter
{
~PageFaultsSoftReporter() {}
public:
NS_DECL_ISUPPORTS
@@ -665,8 +657,6 @@ PageFaultsHardDistinguishedAmount(int64_t* aAmount)
class PageFaultsHardReporter MOZ_FINAL : public nsIMemoryReporter
{
~PageFaultsHardReporter() {}
public:
NS_DECL_ISUPPORTS
@@ -714,8 +704,6 @@ HeapOverheadRatio(jemalloc_stats_t* aStats)
class JemallocHeapReporter MOZ_FINAL : public nsIMemoryReporter
{
~JemallocHeapReporter() {}
public:
NS_DECL_ISUPPORTS
@@ -820,8 +808,6 @@ class AtomTablesReporter MOZ_FINAL : public nsIMemoryReporter
{
MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf)
~AtomTablesReporter() {}
public:
NS_DECL_ISUPPORTS
@@ -1457,8 +1443,6 @@ nsMemoryReporterManager::UnblockRegistrationAndRestoreOriginalReporters()
// passed to nsIMemoryReporter::CollectReports.
class Int64Wrapper MOZ_FINAL : public nsISupports
{
~Int64Wrapper() {}
public:
NS_DECL_ISUPPORTS
Int64Wrapper() : mValue(0)
@@ -1471,8 +1455,6 @@ NS_IMPL_ISUPPORTS0(Int64Wrapper)
class ExplicitCallback MOZ_FINAL : public nsIHandleReportCallback
{
~ExplicitCallback() {}
public:
NS_DECL_ISUPPORTS

3
xpcom/base/nsMemoryReporterManager.h
View File

@@ -24,13 +24,12 @@ class MemoryReport;
class nsMemoryReporterManager : public nsIMemoryReporterManager
{
virtual ~nsMemoryReporterManager();
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIMEMORYREPORTERMANAGER
nsMemoryReporterManager();
virtual ~nsMemoryReporterManager();
// Gets the memory reporter manager service.
static nsMemoryReporterManager* GetOrCreate()

8
xpcom/base/nsMessageLoop.cpp
View File

@@ -34,6 +34,9 @@ class MessageLoopIdleTask
public:
MOZ_DECLARE_REFCOUNTED_TYPENAME(MessageLoopIdleTask)
MessageLoopIdleTask(nsIRunnable* aTask, uint32_t aEnsureRunsAfterMS);
virtual ~MessageLoopIdleTask()
{
}
virtual void Run();
private:
@@ -41,8 +44,6 @@ private:
nsCOMPtr<nsIRunnable> mTask;
nsCOMPtr<nsITimer> mTimer;
virtual ~MessageLoopIdleTask() {}
};
/**
@@ -60,14 +61,13 @@ class MessageLoopTimerCallback
{
public:
MessageLoopTimerCallback(MessageLoopIdleTask* aTask);
virtual ~MessageLoopTimerCallback() {};
NS_DECL_ISUPPORTS
NS_DECL_NSITIMERCALLBACK
private:
WeakPtr<MessageLoopIdleTask> mTask;
virtual ~MessageLoopTimerCallback() {}
};
MessageLoopIdleTask::MessageLoopIdleTask(nsIRunnable* aTask,

1
xpcom/base/nsMessageLoop.h
View File

@@ -15,7 +15,6 @@ class nsMessageLoop : public nsIMessageLoop
NS_DECL_ISUPPORTS
NS_DECL_NSIMESSAGELOOP
private:
virtual ~nsMessageLoop()
{
}

9
xpcom/base/nsStatusReporterManager.h
View File

@@ -17,12 +17,12 @@ public:
nsStatusReporter(nsACString& aProcess, nsACString& aDesc);
private:
virtual ~nsStatusReporter();
protected:
nsCString sProcess;
nsCString sName;
nsCString sDesc;
virtual ~nsStatusReporter();
};
@@ -33,9 +33,8 @@ public:
NS_DECL_NSISTATUSREPORTERMANAGER
nsStatusReporterManager();
virtual ~nsStatusReporterManager();
private:
nsCOMArray<nsIStatusReporter> mReporters;
virtual ~nsStatusReporterManager();
};

2
xpcom/base/nsVersionComparatorImpl.h
View File

@@ -10,8 +10,6 @@
class nsVersionComparatorImpl MOZ_FINAL : public nsIVersionComparator
{
~nsVersionComparatorImpl() {}
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIVERSIONCOMPARATOR

8
xpcom/build/nsXPComInit.cpp
View File

@@ -380,8 +380,6 @@ private:
"explicit/icu", KIND_HEAP, UNITS_BYTES, MemoryAllocated(),
"Memory used by ICU, a Unicode and globalization support library.");
}
~ICUReporter() {}
};
NS_IMPL_ISUPPORTS(ICUReporter, nsIMemoryReporter)
@@ -403,8 +401,6 @@ private:
"explicit/media/libogg", KIND_HEAP, UNITS_BYTES, MemoryAllocated(),
"Memory allocated through libogg for Ogg, Theora, and related media files.");
}
~OggReporter() {}
};
NS_IMPL_ISUPPORTS(OggReporter, nsIMemoryReporter)
@@ -427,8 +423,6 @@ private:
"explicit/media/libvpx", KIND_HEAP, UNITS_BYTES, MemoryAllocated(),
"Memory allocated through libvpx for WebM media files.");
}
~VPXReporter() {}
};
NS_IMPL_ISUPPORTS(VPXReporter, nsIMemoryReporter)
@@ -452,8 +446,6 @@ private:
"explicit/media/libnestegg", KIND_HEAP, UNITS_BYTES, MemoryAllocated(),
"Memory allocated through libnestegg for WebM media files.");
}
~NesteggReporter() {}
};
NS_IMPL_ISUPPORTS(NesteggReporter, nsIMemoryReporter)

2
xpcom/components/ModuleUtils.h
View File

@@ -104,8 +104,6 @@ namespace mozilla {
class GenericModule MOZ_FINAL : public nsIModule
{
~GenericModule() {}
public:
GenericModule(const mozilla::Module* aData)
: mData(aData)

10
xpcom/components/nsNativeComponentLoader.h
View File

@@ -13,16 +13,6 @@
#include "mozilla/Module.h"
#include "prlink.h"
class nsNativeModuleLoader;
namespace mozilla {
template<>
struct HasDangerousPublicDestructor<nsNativeModuleLoader>
{
static const bool value = true;
};
}
class nsNativeModuleLoader : public mozilla::ModuleLoader
{
public:

4
xpcom/ds/nsArray.h
View File

@@ -64,8 +64,6 @@ private:
: nsArrayBase(aBaseArray)
{
}
~nsArray() {}
};
class nsArrayCC MOZ_FINAL : public nsArrayBase
@@ -86,8 +84,6 @@ private:
: nsArrayBase(aBaseArray)
{
}
~nsArrayCC() {}
};
#endif

5
xpcom/ds/nsHashPropertyBag.cpp
View File

@@ -93,10 +93,7 @@ nsHashPropertyBag::DeleteProperty(const nsAString& name)
// nsSimpleProperty class and impl; used for GetEnumerator
//
class nsSimpleProperty MOZ_FINAL : public nsIProperty
{
~nsSimpleProperty() {}
class nsSimpleProperty MOZ_FINAL : public nsIProperty {
public:
nsSimpleProperty(const nsAString& aName, nsIVariant* aValue)
: mName(aName), mValue(aValue)

3
xpcom/ds/nsHashPropertyBag.h
View File

@@ -16,6 +16,7 @@ class nsHashPropertyBag : public nsIWritablePropertyBag
{
public:
nsHashPropertyBag() { }
virtual ~nsHashPropertyBag() {}
NS_DECL_THREADSAFE_ISUPPORTS
@@ -30,8 +31,6 @@ public:
protected:
// a hash table of string -> nsIVariant
nsInterfaceHashtable<nsStringHashKey, nsIVariant> mPropertyHash;
virtual ~nsHashPropertyBag() {}
};
// Note: NS_NewHashPropertyBag returns a HPB that

2
xpcom/ds/nsINIParserImpl.cpp
View File

@@ -12,8 +12,6 @@
class nsINIParserImpl MOZ_FINAL :
public nsIINIParser
{
~nsINIParserImpl() {}
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIINIPARSER

2
xpcom/ds/nsINIParserImpl.h
View File

@@ -20,8 +20,6 @@ class nsINIParserFactory MOZ_FINAL :
public nsIINIParserFactory,
public nsIFactory
{
~nsINIParserFactory() {}
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIINIPARSERFACTORY

7
xpcom/ds/nsSupportsArray.h
View File

@@ -13,12 +13,11 @@
static const uint32_t kAutoArraySize = 8;
class nsSupportsArray MOZ_FINAL : public nsISupportsArray
{
~nsSupportsArray(void); // nonvirtual since we're not subclassed
class nsSupportsArray MOZ_FINAL : public nsISupportsArray {
public:
nsSupportsArray(void);
~nsSupportsArray(void); // nonvirtual since we're not subclassed
static nsresult
Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);

2
xpcom/glue/GenericFactory.h
View File

@@ -20,8 +20,6 @@ namespace mozilla {
*/
class GenericFactory MOZ_FINAL : public nsIFactory
{
~GenericFactory() {}
public:
typedef Module::ConstructorProcPtr ConstructorProcPtr;

3
xpcom/glue/nsCategoryCache.h
View File

@@ -24,10 +24,9 @@
class NS_COM_GLUE nsCategoryObserver MOZ_FINAL : public nsIObserver
{
~nsCategoryObserver();
public:
nsCategoryObserver(const char* aCategory);
~nsCategoryObserver();
void ListenerDied();
nsInterfaceHashtable<nsCStringHashKey, nsISupports>& GetHash()

2
xpcom/glue/nsThreadUtils.cpp
View File

@@ -290,8 +290,6 @@ namespace {
class nsNameThreadRunnable MOZ_FINAL : public nsIRunnable
{
~nsNameThreadRunnable() {}
public:
nsNameThreadRunnable(const nsACString& aName) : mName(aName) {}

18
xpcom/io/nsAppFileLocationProvider.cpp
View File

@@ -451,16 +451,17 @@ public:
return *aResult ? NS_OK : NS_ERROR_FAILURE;
}
// Virtual destructor since subclass nsPathsDirectoryEnumerator
// does not re-implement Release()
virtual ~nsAppDirectoryEnumerator()
{
}
protected:
nsIDirectoryServiceProvider* mProvider;
const char** mCurrentKey;
nsCOMPtr<nsIFile> mNext;
// Virtual destructor since subclass nsPathsDirectoryEnumerator
// does not re-implement Release()
virtual ~nsAppDirectoryEnumerator()
{
}
};
NS_IMPL_ISUPPORTS(nsAppDirectoryEnumerator, nsISimpleEnumerator)
@@ -474,11 +475,8 @@ NS_IMPL_ISUPPORTS(nsAppDirectoryEnumerator, nsISimpleEnumerator)
#define PATH_SEPARATOR ':'
#endif
class nsPathsDirectoryEnumerator MOZ_FINAL
: public nsAppDirectoryEnumerator
class nsPathsDirectoryEnumerator : public nsAppDirectoryEnumerator
{
~nsPathsDirectoryEnumerator() {}
public:
/**
* aKeyList is a null-terminated list.

20
xpcom/io/nsBinaryStream.h
View File

@@ -31,6 +31,10 @@ public:
nsBinaryOutputStream()
{
}
// virtual dtor since subclasses call our Release()
virtual ~nsBinaryOutputStream()
{
}
protected:
// nsISupports methods
@@ -50,12 +54,6 @@ protected:
nsCOMPtr<nsIOutputStream> mOutputStream;
nsCOMPtr<nsIStreamBufferAccess> mBufferAccess;
private:
// virtual dtor since subclasses call our Release()
virtual ~nsBinaryOutputStream()
{
}
};
#define NS_BINARYINPUTSTREAM_CID \
@@ -76,6 +74,10 @@ public:
nsBinaryInputStream()
{
}
// virtual dtor since subclasses call our Release()
virtual ~nsBinaryInputStream()
{
}
protected:
// nsISupports methods
@@ -92,12 +94,6 @@ protected:
nsCOMPtr<nsIInputStream> mInputStream;
nsCOMPtr<nsIStreamBufferAccess> mBufferAccess;
private:
// virtual dtor since subclasses call our Release()
virtual ~nsBinaryInputStream()
{
}
};
#endif // nsBinaryStream_h___

3
xpcom/io/nsDirectoryService.h
View File

@@ -37,6 +37,7 @@ public:
NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
nsDirectoryService();
~nsDirectoryService();
static void RealInit();
void RegisterCategoryProviders();
@@ -47,8 +48,6 @@ public:
static nsDirectoryService* gService;
private:
~nsDirectoryService();
nsresult GetCurrentProcessDirectory(nsIFile** aFile);
nsInterfaceHashtable<nsCStringHashKey, nsIFile> mHashtable;

2
xpcom/io/nsIOUtil.h
View File

@@ -17,8 +17,6 @@
class nsIOUtil MOZ_FINAL : public nsIIOUtil
{
~nsIOUtil() {}
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSIIOUTIL

10
xpcom/io/nsStreamUtils.cpp
View File

@@ -233,6 +233,11 @@ public:
{
}
// virtual since subclasses call superclass Release()
virtual ~nsAStreamCopier()
{
}
// kick off the async copy...
nsresult Start(nsIInputStream* aSource,
nsIOutputStream* aSink,
@@ -470,11 +475,6 @@ protected:
bool mCloseSink;
bool mCanceled;
nsresult mCancelStatus;
// virtual since subclasses call superclass Release()
virtual ~nsAStreamCopier()
{
}
};
NS_IMPL_ISUPPORTS(nsAStreamCopier,

2
xpcom/reflect/xptinfo/ShimInterfaceInfo.h
View File

@@ -40,8 +40,6 @@ private:
const char* aName,
const mozilla::dom::NativePropertyHooks* aNativePropHooks);
~ShimInterfaceInfo() {}
private:
nsIID mIID;
nsAutoCString mName;

6
xpcom/tests/TestCOMArray.cpp
View File

@@ -25,11 +25,10 @@ public:
NS_DEFINE_STATIC_IID_ACCESSOR(IFoo, NS_IFOO_IID)
class Foo MOZ_FINAL : public IFoo {
~Foo();
public:
Foo(int32_t aID);
~Foo();
// nsISupports implementation
NS_DECL_ISUPPORTS
@@ -79,6 +78,7 @@ class Bar MOZ_FINAL : public IBar {
public:
explicit Bar(nsCOMArray<IBar>& aArray);
~Bar();
// nsISupports implementation
NS_DECL_ISUPPORTS
@@ -86,8 +86,6 @@ public:
static int32_t sReleaseCalled;
private:
~Bar();
nsCOMArray<IBar>& mArray;
};

1
xpcom/tests/TestCallTemplates.cpp
View File

@@ -36,7 +36,6 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsITestService, NS_ITESTSERVICE_IID)
class nsTestService MOZ_FINAL : public nsITestService,
public nsSupportsWeakReference
{
~nsTestService() {}
public:
NS_DECL_ISUPPORTS
};

6
xpcom/tests/TestRacingServiceManager.cpp
View File

@@ -87,8 +87,6 @@ private:
class Factory MOZ_FINAL : public nsIFactory
{
~Factory() {}
public:
NS_DECL_THREADSAFE_ISUPPORTS
@@ -109,8 +107,6 @@ NS_IMPL_ISUPPORTS(Factory, nsIFactory)
class Component1 MOZ_FINAL : public nsISupports
{
~Component1() {}
public:
NS_DECL_THREADSAFE_ISUPPORTS
@@ -130,8 +126,6 @@ NS_INTERFACE_MAP_END
class Component2 MOZ_FINAL : public nsISupports
{
~Component2() {}
public:
NS_DECL_THREADSAFE_ISUPPORTS

2
xpcom/tests/TestThreadPoolListener.cpp
View File

@@ -47,8 +47,6 @@ static bool gAllThreadsShutDown = false;
class Listener MOZ_FINAL : public nsIThreadPoolListener
{
~Listener() {}
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSITHREADPOOLLISTENER

11
xpcom/tests/TestThreadUtils.cpp
View File

@@ -34,14 +34,6 @@ class nsFoo : public nsISupports {
virtual ~nsFoo() {}
};
namespace mozilla {
template<>
struct HasDangerousPublicDestructor<nsFoo>
{
static const bool value = true;
};
}
NS_IMPL_ISUPPORTS0(nsFoo)
class TestSuicide : public nsRunnable {
@@ -63,9 +55,8 @@ private:
};
class nsBar : public nsISupports {
virtual ~nsBar() {}
public:
NS_DECL_ISUPPORTS
virtual ~nsBar() {}
void DoBar1(void) {
gRunnableExecuted[TEST_CALL_VOID_ARG_VOID_RETURN] = true;
}

2
xpcom/tests/TestTimers.cpp
View File

@@ -92,8 +92,6 @@ public:
return NS_OK;
}
private:
~TimerCallback() {}
nsIThread** mThreadPtr;
ReentrantMonitor* mReentrantMonitor;
};