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

bug 1122100 - more MOZ_OVERRIDE in xpcomish stuff r=froydnj

This commit is contained in:
Trevor Saunders 2015-01-15 11:36:10 -05:00
Родитель 85227ffecb
Коммит 6c486b0407
12 изменённых файлов: 70 добавлений и 57 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
intl/unicharutil/util/nsUnicharUtils.h
Просмотреть файл

@ -45,7 +45,7 @@ public:
virtual int32_t operator() (const char16_t*,
const char16_t*,
uint32_t,
uint32_t) const;
uint32_t) const MOZ_OVERRIDE;
};
class nsCaseInsensitiveUTF8StringComparator : public nsCStringComparator
@ -54,7 +54,7 @@ public:
virtual int32_t operator() (const char*,
const char*,
uint32_t,
uint32_t) const;
uint32_t) const MOZ_OVERRIDE;
};
class nsCaseInsensitiveStringArrayComparator
@ -73,7 +73,7 @@ public:
virtual int operator() (const char16_t*,
const char16_t*,
uint32_t,
uint32_t) const;
uint32_t) const MOZ_OVERRIDE;
};
inline bool

4
js/xpconnect/idl/nsIXPCScriptable.idl
Просмотреть файл

@ -156,8 +156,8 @@ class NS_NO_VTABLE nsXPCClassInfo : public nsIClassInfo,
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_XPCCLASSINFO_IID)
NS_IMETHOD_(MozExternalRefCountType) AddRef() = 0;
NS_IMETHOD_(MozExternalRefCountType) Release() = 0;
NS_IMETHOD_(MozExternalRefCountType) AddRef() MOZ_OVERRIDE = 0;
NS_IMETHOD_(MozExternalRefCountType) Release() MOZ_OVERRIDE = 0;
virtual void PreserveWrapper(nsISupports *aNative) = 0;
};

22
xpcom/base/CycleCollectedJSRuntime.h
Просмотреть файл

@ -29,27 +29,28 @@ namespace mozilla {
class JSGCThingParticipant: public nsCycleCollectionParticipant
{
public:
NS_IMETHOD_(void) Root(void*)
NS_IMETHOD_(void) Root(void*) MOZ_OVERRIDE
{
MOZ_ASSERT(false, "Don't call Root on GC things");
}
NS_IMETHOD_(void) Unlink(void*)
NS_IMETHOD_(void) Unlink(void*) MOZ_OVERRIDE
{
MOZ_ASSERT(false, "Don't call Unlink on GC things, as they may be dead");
}
NS_IMETHOD_(void) Unroot(void*)
NS_IMETHOD_(void) Unroot(void*) MOZ_OVERRIDE
{
MOZ_ASSERT(false, "Don't call Unroot on GC things, as they may be dead");
}
NS_IMETHOD_(void) DeleteCycleCollectable(void* aPtr)
NS_IMETHOD_(void) DeleteCycleCollectable(void* aPtr) MOZ_OVERRIDE
{
MOZ_ASSERT(false, "Can't directly delete a cycle collectable GC thing");
}
NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb);
NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb)
MOZ_OVERRIDE;
};
class JSZoneParticipant : public nsCycleCollectionParticipant
@ -59,27 +60,28 @@ public:
{
}
NS_IMETHOD_(void) Root(void*)
NS_IMETHOD_(void) Root(void*) MOZ_OVERRIDE
{
MOZ_ASSERT(false, "Don't call Root on GC things");
}
NS_IMETHOD_(void) Unlink(void*)
NS_IMETHOD_(void) Unlink(void*) MOZ_OVERRIDE
{
MOZ_ASSERT(false, "Don't call Unlink on GC things, as they may be dead");
}
NS_IMETHOD_(void) Unroot(void*)
NS_IMETHOD_(void) Unroot(void*) MOZ_OVERRIDE
{
MOZ_ASSERT(false, "Don't call Unroot on GC things, as they may be dead");
}
NS_IMETHOD_(void) DeleteCycleCollectable(void*)
NS_IMETHOD_(void) DeleteCycleCollectable(void*) MOZ_OVERRIDE
{
MOZ_ASSERT(false, "Can't directly delete a cycle collectable GC thing");
}
NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb);
NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb)
MOZ_OVERRIDE;
};
class IncrementalFinalizeRunnable;

2
xpcom/base/nsAutoPtr.h
Просмотреть файл

@ -771,7 +771,7 @@ public:
}
virtual nsresult NS_FASTCALL operator()(const nsIID& aIID,
void** aResult) const
void** aResult) const MOZ_OVERRIDE
{
nsresult status = mRawPtr ? mRawPtr->QueryInterface(aIID, aResult)
: NS_ERROR_NULL_POINTER;

3
xpcom/ds/nsICollection.idl
Просмотреть файл

@ -42,7 +42,8 @@ class MOZ_STACK_CLASS nsQueryElementAt : public nsCOMPtr_helper
// nothing else to do here
}
virtual nsresult NS_FASTCALL operator()( const nsIID& aIID, void** ) const;
virtual nsresult NS_FASTCALL operator()( const nsIID& aIID, void** )
const MOZ_OVERRIDE;
private:
nsICollection* MOZ_NON_OWNING_REF mCollection;

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

@ -22,7 +22,8 @@ public:
{
}
virtual nsresult NS_FASTCALL operator()(const nsIID& aIID, void**) const;
virtual nsresult NS_FASTCALL operator()(const nsIID& aIID, void**) const
MOZ_OVERRIDE;
private:
nsIArray* MOZ_NON_OWNING_REF mArray;

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

@ -37,7 +37,8 @@ public:
{
}
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const;
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const
MOZ_OVERRIDE;
private:
const nsCID& mCID;
@ -56,7 +57,7 @@ public:
{
}
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const;
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const MOZ_OVERRIDE;
private:
const char* mContractID;
@ -75,7 +76,7 @@ public:
{
}
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const;
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const MOZ_OVERRIDE;
private:
nsIFactory* MOZ_NON_OWNING_REF mFactory;
@ -132,7 +133,7 @@ public:
{
}
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const;
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const MOZ_OVERRIDE;
private:
const nsCID& mCID;
@ -148,7 +149,7 @@ public:
{
}
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const;
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const MOZ_OVERRIDE;
private:
const char* mContractID;

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

@ -182,7 +182,7 @@ public:
}
NS_IMETHOD_(void) Trace(void* aPtr, const TraceCallbacks& aCb,
void* aClosure) = 0;
void* aClosure) MOZ_OVERRIDE = 0;
static void NoteJSChild(JS::GCCellPtr aGCThing, const char* aName,
void* aClosure);
@ -202,11 +202,11 @@ public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_XPCOMCYCLECOLLECTIONPARTICIPANT_IID)
NS_IMETHOD_(void) Root(void* aPtr);
NS_IMETHOD_(void) Unroot(void* aPtr);
NS_IMETHOD_(void) Root(void* aPtr) MOZ_OVERRIDE;
NS_IMETHOD_(void) Unroot(void* aPtr) MOZ_OVERRIDE;
NS_IMETHOD_(void) Trace(void* aPtr, const TraceCallbacks& aCb,
void* aClosure);
void* aClosure) MOZ_OVERRIDE;
static bool CheckForRightISupports(nsISupports* aSupports);
};
@ -507,8 +507,9 @@ DowncastCCParticipant(void* aPtr)
#define NS_DECL_CYCLE_COLLECTION_CLASS_BODY_NO_UNLINK(_class, _base) \
public: \
NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb); \
NS_IMETHOD_(void) DeleteCycleCollectable(void *p) \
NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb) \
MOZ_OVERRIDE; \
NS_IMETHOD_(void) DeleteCycleCollectable(void *p) MOZ_OVERRIDE \
{ \
DowncastCCParticipant<_class>(p)->DeleteCycleCollectable(); \
} \
@ -526,7 +527,7 @@ public: \
#define NS_DECL_CYCLE_COLLECTION_CLASS_BODY(_class, _base) \
NS_DECL_CYCLE_COLLECTION_CLASS_BODY_NO_UNLINK(_class, _base) \
NS_IMETHOD_(void) Unlink(void *p);
NS_IMETHOD_(void) Unlink(void *p) MOZ_OVERRIDE;
#define NS_PARTICIPANT_AS(type, participant) \
const_cast<type*>(reinterpret_cast<const type*>(participant))
@ -573,9 +574,9 @@ public:
: nsXPCOMCycleCollectionParticipant(true) {} \
private: \
NS_DECL_CYCLE_COLLECTION_CLASS_BODY(_class, _base) \
NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed); \
NS_IMETHOD_(bool) CanSkipInCCReal(void *p); \
NS_IMETHOD_(bool) CanSkipThisReal(void *p); \
NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed) MOZ_OVERRIDE; \
NS_IMETHOD_(bool) CanSkipInCCReal(void *p) MOZ_OVERRIDE; \
NS_IMETHOD_(bool) CanSkipThisReal(void *p) MOZ_OVERRIDE; \
NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \
}; \
NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \
@ -590,7 +591,8 @@ class NS_CYCLE_COLLECTION_INNERCLASS
: public nsXPCOMCycleCollectionParticipant \
{ \
NS_DECL_CYCLE_COLLECTION_CLASS_BODY(_class, _base) \
NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure); \
NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure) \
MOZ_OVERRIDE; \
NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \
}; \
NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \
@ -606,10 +608,10 @@ public:
: nsXPCOMCycleCollectionParticipant(true) {} \
private: \
NS_DECL_CYCLE_COLLECTION_CLASS_BODY(_class, _base) \
NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure); \
NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed); \
NS_IMETHOD_(bool) CanSkipInCCReal(void *p); \
NS_IMETHOD_(bool) CanSkipThisReal(void *p); \
NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure) MOZ_OVERRIDE; \
NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed) MOZ_OVERRIDE; \
NS_IMETHOD_(bool) CanSkipInCCReal(void *p) MOZ_OVERRIDE; \
NS_IMETHOD_(bool) CanSkipThisReal(void *p) MOZ_OVERRIDE; \
NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \
}; \
NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \
@ -640,7 +642,8 @@ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME;
#define NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_BODY_NO_UNLINK(_class, \
_base_class) \
public: \
NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb); \
NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb) \
MOZ_OVERRIDE; \
static _class* Downcast(nsISupports* s) \
{ \
return static_cast<_class*>(static_cast<_base_class*>( \
@ -649,7 +652,7 @@ public: \
#define NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_BODY(_class, _base_class) \
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_BODY_NO_UNLINK(_class, _base_class) \
NS_IMETHOD_(void) Unlink(void *p);
NS_IMETHOD_(void) Unlink(void *p) MOZ_OVERRIDE;
#define NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(_class, _base_class) \
class NS_CYCLE_COLLECTION_INNERCLASS \
@ -680,7 +683,8 @@ class NS_CYCLE_COLLECTION_INNERCLASS
: public NS_CYCLE_COLLECTION_CLASSNAME(_base_class) \
{ \
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_BODY(_class, _base_class) \
NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure); \
NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure) \
MOZ_OVERRIDE; \
NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \
}; \
NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL_INHERITED(_class) \
@ -690,11 +694,12 @@ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME;
#define NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS_BODY(_class) \
public: \
NS_IMETHOD_(void) Root(void *n); \
NS_IMETHOD_(void) Unlink(void *n); \
NS_IMETHOD_(void) Unroot(void *n); \
NS_IMETHOD Traverse(void *n, nsCycleCollectionTraversalCallback &cb); \
NS_IMETHOD_(void) DeleteCycleCollectable(void *n) \
NS_IMETHOD_(void) Root(void *n) MOZ_OVERRIDE; \
NS_IMETHOD_(void) Unlink(void *n) MOZ_OVERRIDE; \
NS_IMETHOD_(void) Unroot(void *n) MOZ_OVERRIDE; \
NS_IMETHOD Traverse(void *n, nsCycleCollectionTraversalCallback &cb) \
MOZ_OVERRIDE; \
NS_IMETHOD_(void) DeleteCycleCollectable(void *n) MOZ_OVERRIDE \
{ \
DowncastCCParticipant<_class>(n)->DeleteCycleCollectable(); \
} \
@ -736,9 +741,9 @@ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME;
: nsCycleCollectionParticipant(true) {} \
private: \
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS_BODY(_class) \
NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed); \
NS_IMETHOD_(bool) CanSkipInCCReal(void *p); \
NS_IMETHOD_(bool) CanSkipThisReal(void *p); \
NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed) MOZ_OVERRIDE;\
NS_IMETHOD_(bool) CanSkipInCCReal(void *p) MOZ_OVERRIDE; \
NS_IMETHOD_(bool) CanSkipThisReal(void *p) MOZ_OVERRIDE; \
static nsCycleCollectionParticipant* GetParticipant() \
{ \
return &_class::NS_CYCLE_COLLECTION_INNERNAME; \
@ -755,9 +760,9 @@ public: \
: nsCycleCollectionParticipant(true) {} \
private: \
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS_BODY(_class) \
NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed); \
NS_IMETHOD_(bool) CanSkipInCCReal(void *p); \
NS_IMETHOD_(bool) CanSkipThisReal(void *p); \
NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed) MOZ_OVERRIDE; \
NS_IMETHOD_(bool) CanSkipInCCReal(void *p) MOZ_OVERRIDE; \
NS_IMETHOD_(bool) CanSkipThisReal(void *p) MOZ_OVERRIDE; \
static nsCycleCollectionParticipant* GetParticipant() \
{ \
return &_class::NS_CYCLE_COLLECTION_INNERNAME; \
@ -774,7 +779,8 @@ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME;
: public nsScriptObjectTracer \
{ \
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS_BODY(_class) \
NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure); \
NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure) \
MOZ_OVERRIDE; \
static MOZ_CONSTEXPR nsScriptObjectTracer* GetParticipant() \
{ \
return &_class::NS_CYCLE_COLLECTION_INNERNAME; \

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

@ -39,7 +39,8 @@ public:
{
}
virtual nsresult NS_FASTCALL operator()(const nsIID& aIID, void**) const;
virtual nsresult NS_FASTCALL operator()(const nsIID& aIID, void**) const
MOZ_OVERRIDE;
private:
nsIWeakReference* MOZ_NON_OWNING_REF mWeakPtr;

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

@ -45,7 +45,8 @@ public:
{
}
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const;
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const
MOZ_OVERRIDE;
protected:
const char* mCategory;
const char* mEntry;

2
xpcom/string/nsAString.h
Просмотреть файл

@ -43,7 +43,7 @@ public:
typedef char char_type;
virtual int operator()(const char_type*, const char_type*,
uint32_t, uint32_t) const;
uint32_t, uint32_t) const MOZ_OVERRIDE;
};
class nsCaseInsensitiveCStringArrayComparator

2
xpcom/string/nsTSubstring.h
Просмотреть файл

@ -43,7 +43,7 @@ public:
}
virtual int operator()(const char_type*, const char_type*,
uint32_t, uint32_t) const;
uint32_t, uint32_t) const MOZ_OVERRIDE;
};
/**