зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1119268 - Mark virtual overridden functions as MOZ_OVERRIDE in misc code; r=bsmedberg
This commit is contained in:
Родитель
022a23dbec
Коммит
d517a30886
|
@ -31,8 +31,8 @@ public:
|
||||||
NS_DECL_NSIURI
|
NS_DECL_NSIURI
|
||||||
|
|
||||||
// nsISizeOf
|
// nsISizeOf
|
||||||
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
|
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
|
||||||
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
|
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
|
||||||
|
|
||||||
explicit nsNullPrincipalURI(const nsCString &aSpec);
|
explicit nsNullPrincipalURI(const nsCString &aSpec);
|
||||||
|
|
||||||
|
|
|
@ -49,25 +49,25 @@ class nsPrincipal MOZ_FINAL : public nsBasePrincipal
|
||||||
public:
|
public:
|
||||||
NS_DECL_ISUPPORTS_INHERITED
|
NS_DECL_ISUPPORTS_INHERITED
|
||||||
NS_DECL_NSISERIALIZABLE
|
NS_DECL_NSISERIALIZABLE
|
||||||
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval);
|
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval);
|
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetHashValue(uint32_t* aHashValue);
|
NS_IMETHOD GetHashValue(uint32_t* aHashValue) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetURI(nsIURI** aURI);
|
NS_IMETHOD GetURI(nsIURI** aURI) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetDomain(nsIURI** aDomain);
|
NS_IMETHOD GetDomain(nsIURI** aDomain) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD SetDomain(nsIURI* aDomain);
|
NS_IMETHOD SetDomain(nsIURI* aDomain) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetOrigin(char** aOrigin);
|
NS_IMETHOD GetOrigin(char** aOrigin) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval);
|
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval);
|
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal);
|
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix);
|
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus);
|
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetAppId(uint32_t* aAppStatus);
|
NS_IMETHOD GetAppId(uint32_t* aAppStatus) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement);
|
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId);
|
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal);
|
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain);
|
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) MOZ_OVERRIDE;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
virtual void dumpImpl();
|
virtual void dumpImpl() MOZ_OVERRIDE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
nsPrincipal();
|
nsPrincipal();
|
||||||
|
@ -132,25 +132,25 @@ public:
|
||||||
NS_DECL_ISUPPORTS_INHERITED
|
NS_DECL_ISUPPORTS_INHERITED
|
||||||
NS_DECL_NSIEXPANDEDPRINCIPAL
|
NS_DECL_NSIEXPANDEDPRINCIPAL
|
||||||
NS_DECL_NSISERIALIZABLE
|
NS_DECL_NSISERIALIZABLE
|
||||||
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval);
|
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval);
|
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetHashValue(uint32_t* aHashValue);
|
NS_IMETHOD GetHashValue(uint32_t* aHashValue) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetURI(nsIURI** aURI);
|
NS_IMETHOD GetURI(nsIURI** aURI) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetDomain(nsIURI** aDomain);
|
NS_IMETHOD GetDomain(nsIURI** aDomain) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD SetDomain(nsIURI* aDomain);
|
NS_IMETHOD SetDomain(nsIURI* aDomain) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetOrigin(char** aOrigin);
|
NS_IMETHOD GetOrigin(char** aOrigin) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval);
|
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval);
|
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal);
|
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix);
|
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus);
|
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetAppId(uint32_t* aAppStatus);
|
NS_IMETHOD GetAppId(uint32_t* aAppStatus) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement);
|
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId);
|
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal);
|
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain);
|
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) MOZ_OVERRIDE;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
virtual void dumpImpl();
|
virtual void dumpImpl() MOZ_OVERRIDE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE;
|
virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE;
|
||||||
|
|
|
@ -132,14 +132,14 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
|
||||||
|
|
||||||
#define NS_DECL_IHISTORY \
|
#define NS_DECL_IHISTORY \
|
||||||
NS_IMETHOD RegisterVisitedCallback(nsIURI *aURI, \
|
NS_IMETHOD RegisterVisitedCallback(nsIURI *aURI, \
|
||||||
mozilla::dom::Link *aContent); \
|
mozilla::dom::Link *aContent) MOZ_OVERRIDE; \
|
||||||
NS_IMETHOD UnregisterVisitedCallback(nsIURI *aURI, \
|
NS_IMETHOD UnregisterVisitedCallback(nsIURI *aURI, \
|
||||||
mozilla::dom::Link *aContent); \
|
mozilla::dom::Link *aContent) MOZ_OVERRIDE; \
|
||||||
NS_IMETHOD VisitURI(nsIURI *aURI, \
|
NS_IMETHOD VisitURI(nsIURI *aURI, \
|
||||||
nsIURI *aLastVisitedURI, \
|
nsIURI *aLastVisitedURI, \
|
||||||
uint32_t aFlags); \
|
uint32_t aFlags) MOZ_OVERRIDE; \
|
||||||
NS_IMETHOD SetURITitle(nsIURI* aURI, const nsAString& aTitle); \
|
NS_IMETHOD SetURITitle(nsIURI* aURI, const nsAString& aTitle) MOZ_OVERRIDE; \
|
||||||
NS_IMETHOD NotifyVisited(nsIURI* aURI);
|
NS_IMETHOD NotifyVisited(nsIURI* aURI) MOZ_OVERRIDE;
|
||||||
|
|
||||||
} // namespace mozilla
|
} // namespace mozilla
|
||||||
|
|
||||||
|
|
|
@ -103,14 +103,14 @@ public:
|
||||||
return mAgent->SetVisibilityState(visible);
|
return mAgent->SetVisibilityState(visible);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP CanPlayChanged(int32_t canPlay)
|
NS_IMETHODIMP CanPlayChanged(int32_t canPlay) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
mCanPlay = static_cast<AudioChannelState>(canPlay);
|
mCanPlay = static_cast<AudioChannelState>(canPlay);
|
||||||
mWaitCallback = false;
|
mWaitCallback = false;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP WindowVolumeChanged()
|
NS_IMETHODIMP WindowVolumeChanged() MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,7 +193,7 @@ public:
|
||||||
|
|
||||||
// nsIObserver implementation.
|
// nsIObserver implementation.
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
Observe(nsISupports *aSubject, const char *aTopic, const char16_t *data)
|
Observe(nsISupports *aSubject, const char *aTopic, const char16_t *data) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(!nsCRT::strcmp(aTopic, "webapps-clear-data"));
|
MOZ_ASSERT(!nsCRT::strcmp(aTopic, "webapps-clear-data"));
|
||||||
|
|
||||||
|
|
|
@ -29,12 +29,12 @@ class nsXPCOMDetector :
|
||||||
NS_DECL_ISUPPORTS
|
NS_DECL_ISUPPORTS
|
||||||
public:
|
public:
|
||||||
nsXPCOMDetector();
|
nsXPCOMDetector();
|
||||||
NS_IMETHOD Init(nsICharsetDetectionObserver* aObserver);
|
NS_IMETHOD Init(nsICharsetDetectionObserver* aObserver) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen, bool *oDontFeedMe);
|
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen, bool *oDontFeedMe) MOZ_OVERRIDE;
|
||||||
NS_IMETHOD Done();
|
NS_IMETHOD Done() MOZ_OVERRIDE;
|
||||||
protected:
|
protected:
|
||||||
virtual ~nsXPCOMDetector();
|
virtual ~nsXPCOMDetector();
|
||||||
virtual void Report(const char* aCharset);
|
virtual void Report(const char* aCharset) MOZ_OVERRIDE;
|
||||||
private:
|
private:
|
||||||
nsCOMPtr<nsICharsetDetectionObserver> mObserver;
|
nsCOMPtr<nsICharsetDetectionObserver> mObserver;
|
||||||
};
|
};
|
||||||
|
@ -49,10 +49,10 @@ class nsXPCOMStringDetector :
|
||||||
public:
|
public:
|
||||||
nsXPCOMStringDetector();
|
nsXPCOMStringDetector();
|
||||||
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen,
|
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen,
|
||||||
const char** oCharset, nsDetectionConfident &oConf);
|
const char** oCharset, nsDetectionConfident &oConf) MOZ_OVERRIDE;
|
||||||
protected:
|
protected:
|
||||||
virtual ~nsXPCOMStringDetector();
|
virtual ~nsXPCOMStringDetector();
|
||||||
virtual void Report(const char* aCharset);
|
virtual void Report(const char* aCharset) MOZ_OVERRIDE;
|
||||||
private:
|
private:
|
||||||
nsCOMPtr<nsICharsetDetectionObserver> mObserver;
|
nsCOMPtr<nsICharsetDetectionObserver> mObserver;
|
||||||
const char* mResult;
|
const char* mResult;
|
||||||
|
|
|
@ -570,7 +570,7 @@ public:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notify(const NetworkInformation& aNetworkInfo) {
|
void Notify(const NetworkInformation& aNetworkInfo) MOZ_OVERRIDE {
|
||||||
unused << SendNotifyNetworkChange(aNetworkInfo);
|
unused << SendNotifyNetworkChange(aNetworkInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -612,7 +612,7 @@ public:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notify(const ScreenConfiguration& aScreenConfiguration) {
|
void Notify(const ScreenConfiguration& aScreenConfiguration) MOZ_OVERRIDE {
|
||||||
unused << SendNotifyScreenConfigurationChange(aScreenConfiguration);
|
unused << SendNotifyScreenConfigurationChange(aScreenConfiguration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -778,7 +778,7 @@ public:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notify(const SensorData& aSensorData) {
|
void Notify(const SensorData& aSensorData) MOZ_OVERRIDE {
|
||||||
unused << SendNotifySensorChange(aSensorData);
|
unused << SendNotifySensorChange(aSensorData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -817,7 +817,7 @@ public:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notify(const WakeLockInformation& aWakeLockInfo)
|
void Notify(const WakeLockInformation& aWakeLockInfo) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
unused << SendNotifyWakeLockChange(aWakeLockInfo);
|
unused << SendNotifyWakeLockChange(aWakeLockInfo);
|
||||||
}
|
}
|
||||||
|
@ -837,7 +837,7 @@ public:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notify(const SwitchEvent& aSwitchEvent)
|
void Notify(const SwitchEvent& aSwitchEvent) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
unused << SendNotifySwitchChange(aSwitchEvent);
|
unused << SendNotifySwitchChange(aSwitchEvent);
|
||||||
}
|
}
|
||||||
|
@ -850,12 +850,12 @@ public:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notify(const int64_t& aClockDeltaMS)
|
void Notify(const int64_t& aClockDeltaMS) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
unused << SendNotifySystemClockChange(aClockDeltaMS);
|
unused << SendNotifySystemClockChange(aClockDeltaMS);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notify(const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo)
|
void Notify(const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
unused << SendNotifySystemTimezoneChange(aSystemTimezoneChangeInfo);
|
unused << SendNotifySystemTimezoneChange(aSystemTimezoneChangeInfo);
|
||||||
}
|
}
|
||||||
|
@ -938,14 +938,14 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool
|
virtual bool
|
||||||
RecvNotifySystemClockChange(const int64_t& aClockDeltaMS) {
|
RecvNotifySystemClockChange(const int64_t& aClockDeltaMS) MOZ_OVERRIDE {
|
||||||
hal::NotifySystemClockChange(aClockDeltaMS);
|
hal::NotifySystemClockChange(aClockDeltaMS);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool
|
virtual bool
|
||||||
RecvNotifySystemTimezoneChange(
|
RecvNotifySystemTimezoneChange(
|
||||||
const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo) {
|
const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo) MOZ_OVERRIDE {
|
||||||
hal::NotifySystemTimezoneChange(aSystemTimezoneChangeInfo);
|
hal::NotifySystemTimezoneChange(aSystemTimezoneChangeInfo);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ class NextPartObserver : public IProgressObserver
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MOZ_DECLARE_REFCOUNTED_TYPENAME(NextPartObserver)
|
MOZ_DECLARE_REFCOUNTED_TYPENAME(NextPartObserver)
|
||||||
NS_INLINE_DECL_REFCOUNTING(NextPartObserver)
|
NS_INLINE_DECL_REFCOUNTING(NextPartObserver, MOZ_OVERRIDE)
|
||||||
|
|
||||||
explicit NextPartObserver(MultipartImage* aOwner)
|
explicit NextPartObserver(MultipartImage* aOwner)
|
||||||
: mOwner(aOwner)
|
: mOwner(aOwner)
|
||||||
|
|
|
@ -58,7 +58,7 @@ private:
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
NS_IMETHOD HandleResult(mozIStorageResultSet* aResultSet)
|
NS_IMETHOD HandleResult(mozIStorageResultSet* aResultSet) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
sResult = true;
|
sResult = true;
|
||||||
spin_events_loop_until_true(&mCompleted);
|
spin_events_loop_until_true(&mCompleted);
|
||||||
|
@ -68,7 +68,7 @@ public:
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHOD HandleError(mozIStorageError* aError)
|
NS_IMETHOD HandleError(mozIStorageError* aError) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
sError = true;
|
sError = true;
|
||||||
spin_events_loop_until_true(&mCompleted);
|
spin_events_loop_until_true(&mCompleted);
|
||||||
|
@ -78,7 +78,7 @@ public:
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHOD HandleCompletion(uint16_t aReason)
|
NS_IMETHOD HandleCompletion(uint16_t aReason) MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
mCompleted = true;
|
mCompleted = true;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче