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

Backout c034dba7a417

This commit is contained in:
Wes Kocher 2015-01-12 14:46:48 -08:00
Родитель a49543905d
Коммит 4a8e595770
9 изменённых файлов: 65 добавлений и 65 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
caps/nsNullPrincipalURI.h
Просмотреть файл

@ -31,8 +31,8 @@ public:
NS_DECL_NSIURI
// nsISizeOf
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
explicit nsNullPrincipalURI(const nsCString &aSpec);

72
caps/nsPrincipal.h
Просмотреть файл

@ -49,25 +49,25 @@ class nsPrincipal MOZ_FINAL : public nsBasePrincipal
public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSISERIALIZABLE
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD GetHashValue(uint32_t* aHashValue) MOZ_OVERRIDE;
NS_IMETHOD GetURI(nsIURI** aURI) MOZ_OVERRIDE;
NS_IMETHOD GetDomain(nsIURI** aDomain) MOZ_OVERRIDE;
NS_IMETHOD SetDomain(nsIURI* aDomain) MOZ_OVERRIDE;
NS_IMETHOD GetOrigin(char** aOrigin) MOZ_OVERRIDE;
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) MOZ_OVERRIDE;
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) MOZ_OVERRIDE;
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) MOZ_OVERRIDE;
NS_IMETHOD GetAppId(uint32_t* aAppStatus) MOZ_OVERRIDE;
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) MOZ_OVERRIDE;
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) MOZ_OVERRIDE;
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) MOZ_OVERRIDE;
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) MOZ_OVERRIDE;
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval);
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval);
NS_IMETHOD GetHashValue(uint32_t* aHashValue);
NS_IMETHOD GetURI(nsIURI** aURI);
NS_IMETHOD GetDomain(nsIURI** aDomain);
NS_IMETHOD SetDomain(nsIURI* aDomain);
NS_IMETHOD GetOrigin(char** aOrigin);
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval);
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval);
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal);
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix);
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus);
NS_IMETHOD GetAppId(uint32_t* aAppStatus);
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement);
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId);
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal);
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain);
#ifdef DEBUG
virtual void dumpImpl() MOZ_OVERRIDE;
virtual void dumpImpl();
#endif
nsPrincipal();
@ -132,25 +132,25 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIEXPANDEDPRINCIPAL
NS_DECL_NSISERIALIZABLE
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD GetHashValue(uint32_t* aHashValue) MOZ_OVERRIDE;
NS_IMETHOD GetURI(nsIURI** aURI) MOZ_OVERRIDE;
NS_IMETHOD GetDomain(nsIURI** aDomain) MOZ_OVERRIDE;
NS_IMETHOD SetDomain(nsIURI* aDomain) MOZ_OVERRIDE;
NS_IMETHOD GetOrigin(char** aOrigin) MOZ_OVERRIDE;
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) MOZ_OVERRIDE;
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) MOZ_OVERRIDE;
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) MOZ_OVERRIDE;
NS_IMETHOD GetAppId(uint32_t* aAppStatus) MOZ_OVERRIDE;
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) MOZ_OVERRIDE;
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) MOZ_OVERRIDE;
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) MOZ_OVERRIDE;
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) MOZ_OVERRIDE;
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval);
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval);
NS_IMETHOD GetHashValue(uint32_t* aHashValue);
NS_IMETHOD GetURI(nsIURI** aURI);
NS_IMETHOD GetDomain(nsIURI** aDomain);
NS_IMETHOD SetDomain(nsIURI* aDomain);
NS_IMETHOD GetOrigin(char** aOrigin);
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval);
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval);
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal);
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix);
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus);
NS_IMETHOD GetAppId(uint32_t* aAppStatus);
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement);
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId);
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal);
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain);
#ifdef DEBUG
virtual void dumpImpl() MOZ_OVERRIDE;
virtual void dumpImpl();
#endif
virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE;

10
docshell/base/IHistory.h
Просмотреть файл

@ -132,14 +132,14 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
#define NS_DECL_IHISTORY \
NS_IMETHOD RegisterVisitedCallback(nsIURI *aURI, \
mozilla::dom::Link *aContent) MOZ_OVERRIDE; \
mozilla::dom::Link *aContent); \
NS_IMETHOD UnregisterVisitedCallback(nsIURI *aURI, \
mozilla::dom::Link *aContent) MOZ_OVERRIDE; \
mozilla::dom::Link *aContent); \
NS_IMETHOD VisitURI(nsIURI *aURI, \
nsIURI *aLastVisitedURI, \
uint32_t aFlags) MOZ_OVERRIDE; \
NS_IMETHOD SetURITitle(nsIURI* aURI, const nsAString& aTitle) MOZ_OVERRIDE; \
NS_IMETHOD NotifyVisited(nsIURI* aURI) MOZ_OVERRIDE;
uint32_t aFlags); \
NS_IMETHOD SetURITitle(nsIURI* aURI, const nsAString& aTitle); \
NS_IMETHOD NotifyVisited(nsIURI* aURI);
} // namespace mozilla

4
dom/audiochannel/tests/TestAudioChannelService.cpp
Просмотреть файл

@ -103,14 +103,14 @@ public:
return mAgent->SetVisibilityState(visible);
}
NS_IMETHODIMP CanPlayChanged(int32_t canPlay) MOZ_OVERRIDE
NS_IMETHODIMP CanPlayChanged(int32_t canPlay)
{
mCanPlay = static_cast<AudioChannelState>(canPlay);
mWaitCallback = false;
return NS_OK;
}
NS_IMETHODIMP WindowVolumeChanged() MOZ_OVERRIDE
NS_IMETHODIMP WindowVolumeChanged()
{
return NS_OK;
}

2
extensions/cookie/nsPermissionManager.cpp
Просмотреть файл

@ -193,7 +193,7 @@ public:
// nsIObserver implementation.
NS_IMETHODIMP
Observe(nsISupports *aSubject, const char *aTopic, const char16_t *data) MOZ_OVERRIDE
Observe(nsISupports *aSubject, const char *aTopic, const char16_t *data)
{
MOZ_ASSERT(!nsCRT::strcmp(aTopic, "webapps-clear-data"));

12
extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.h
Просмотреть файл

@ -29,12 +29,12 @@ class nsXPCOMDetector :
NS_DECL_ISUPPORTS
public:
nsXPCOMDetector();
NS_IMETHOD Init(nsICharsetDetectionObserver* aObserver) MOZ_OVERRIDE;
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen, bool *oDontFeedMe) MOZ_OVERRIDE;
NS_IMETHOD Done() MOZ_OVERRIDE;
NS_IMETHOD Init(nsICharsetDetectionObserver* aObserver);
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen, bool *oDontFeedMe);
NS_IMETHOD Done();
protected:
virtual ~nsXPCOMDetector();
virtual void Report(const char* aCharset) MOZ_OVERRIDE;
virtual void Report(const char* aCharset);
private:
nsCOMPtr<nsICharsetDetectionObserver> mObserver;
};
@ -49,10 +49,10 @@ class nsXPCOMStringDetector :
public:
nsXPCOMStringDetector();
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen,
const char** oCharset, nsDetectionConfident &oConf) MOZ_OVERRIDE;
const char** oCharset, nsDetectionConfident &oConf);
protected:
virtual ~nsXPCOMStringDetector();
virtual void Report(const char* aCharset) MOZ_OVERRIDE;
virtual void Report(const char* aCharset);
private:
nsCOMPtr<nsICharsetDetectionObserver> mObserver;
const char* mResult;

18
hal/sandbox/SandboxHal.cpp
Просмотреть файл

@ -570,7 +570,7 @@ public:
return true;
}
void Notify(const NetworkInformation& aNetworkInfo) MOZ_OVERRIDE {
void Notify(const NetworkInformation& aNetworkInfo) {
unused << SendNotifyNetworkChange(aNetworkInfo);
}
@ -612,7 +612,7 @@ public:
return true;
}
void Notify(const ScreenConfiguration& aScreenConfiguration) MOZ_OVERRIDE {
void Notify(const ScreenConfiguration& aScreenConfiguration) {
unused << SendNotifyScreenConfigurationChange(aScreenConfiguration);
}
@ -778,7 +778,7 @@ public:
return true;
}
void Notify(const SensorData& aSensorData) MOZ_OVERRIDE {
void Notify(const SensorData& aSensorData) {
unused << SendNotifySensorChange(aSensorData);
}
@ -817,7 +817,7 @@ public:
return true;
}
void Notify(const WakeLockInformation& aWakeLockInfo) MOZ_OVERRIDE
void Notify(const WakeLockInformation& aWakeLockInfo)
{
unused << SendNotifyWakeLockChange(aWakeLockInfo);
}
@ -837,7 +837,7 @@ public:
return true;
}
void Notify(const SwitchEvent& aSwitchEvent) MOZ_OVERRIDE
void Notify(const SwitchEvent& aSwitchEvent)
{
unused << SendNotifySwitchChange(aSwitchEvent);
}
@ -850,12 +850,12 @@ public:
return true;
}
void Notify(const int64_t& aClockDeltaMS) MOZ_OVERRIDE
void Notify(const int64_t& aClockDeltaMS)
{
unused << SendNotifySystemClockChange(aClockDeltaMS);
}
void Notify(const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo) MOZ_OVERRIDE
void Notify(const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo)
{
unused << SendNotifySystemTimezoneChange(aSystemTimezoneChangeInfo);
}
@ -938,14 +938,14 @@ public:
}
virtual bool
RecvNotifySystemClockChange(const int64_t& aClockDeltaMS) MOZ_OVERRIDE {
RecvNotifySystemClockChange(const int64_t& aClockDeltaMS) {
hal::NotifySystemClockChange(aClockDeltaMS);
return true;
}
virtual bool
RecvNotifySystemTimezoneChange(
const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo) MOZ_OVERRIDE {
const SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo) {
hal::NotifySystemTimezoneChange(aSystemTimezoneChangeInfo);
return true;
}

2
image/src/MultipartImage.cpp
Просмотреть файл

@ -18,7 +18,7 @@ class NextPartObserver : public IProgressObserver
{
public:
MOZ_DECLARE_REFCOUNTED_TYPENAME(NextPartObserver)
NS_INLINE_DECL_REFCOUNTING(NextPartObserver, MOZ_OVERRIDE)
NS_INLINE_DECL_REFCOUNTING(NextPartObserver)
explicit NextPartObserver(MultipartImage* aOwner)
: mOwner(aOwner)

6
storage/test/test_async_callbacks_with_spun_event_loops.cpp
Просмотреть файл

@ -58,7 +58,7 @@ private:
}
public:
NS_IMETHOD HandleResult(mozIStorageResultSet* aResultSet) MOZ_OVERRIDE
NS_IMETHOD HandleResult(mozIStorageResultSet* aResultSet)
{
sResult = true;
spin_events_loop_until_true(&mCompleted);
@ -68,7 +68,7 @@ public:
return NS_OK;
}
NS_IMETHOD HandleError(mozIStorageError* aError) MOZ_OVERRIDE
NS_IMETHOD HandleError(mozIStorageError* aError)
{
sError = true;
spin_events_loop_until_true(&mCompleted);
@ -78,7 +78,7 @@ public:
return NS_OK;
}
NS_IMETHOD HandleCompletion(uint16_t aReason) MOZ_OVERRIDE
NS_IMETHOD HandleCompletion(uint16_t aReason)
{
mCompleted = true;
return NS_OK;