зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1118606 - Mark virtual overridden functions as MOZ_OVERRIDE in uriloader; r=bzbarsky
This commit is contained in:
Ehsan Akhgari
Родитель
33ab8e9b66
Коммит
8fea2fbf3f
|
|
@ -37,29 +37,29 @@ class nsMIMEInfoBase : public nsIMIMEInfo {
|
|||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
|
||||
// I'd use NS_DECL_NSIMIMEINFO, but I don't want GetHasDefaultHandler
|
||||
NS_IMETHOD GetFileExtensions(nsIUTF8StringEnumerator **_retval);
|
||||
NS_IMETHOD SetFileExtensions(const nsACString & aExtensions);
|
||||
NS_IMETHOD ExtensionExists(const nsACString & aExtension, bool *_retval);
|
||||
NS_IMETHOD AppendExtension(const nsACString & aExtension);
|
||||
NS_IMETHOD GetPrimaryExtension(nsACString & aPrimaryExtension);
|
||||
NS_IMETHOD SetPrimaryExtension(const nsACString & aPrimaryExtension);
|
||||
NS_IMETHOD GetType(nsACString & aType);
|
||||
NS_IMETHOD GetMIMEType(nsACString & aMIMEType);
|
||||
NS_IMETHOD GetDescription(nsAString & aDescription);
|
||||
NS_IMETHOD SetDescription(const nsAString & aDescription);
|
||||
NS_IMETHOD Equals(nsIMIMEInfo *aMIMEInfo, bool *_retval);
|
||||
NS_IMETHOD GetPreferredApplicationHandler(nsIHandlerApp * *aPreferredAppHandler);
|
||||
NS_IMETHOD SetPreferredApplicationHandler(nsIHandlerApp * aPreferredAppHandler);
|
||||
NS_IMETHOD GetPossibleApplicationHandlers(nsIMutableArray * *aPossibleAppHandlers);
|
||||
NS_IMETHOD GetDefaultDescription(nsAString & aDefaultDescription);
|
||||
NS_IMETHOD LaunchWithFile(nsIFile *aFile);
|
||||
NS_IMETHOD GetFileExtensions(nsIUTF8StringEnumerator **_retval) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetFileExtensions(const nsACString & aExtensions) MOZ_OVERRIDE;
|
||||
NS_IMETHOD ExtensionExists(const nsACString & aExtension, bool *_retval) MOZ_OVERRIDE;
|
||||
NS_IMETHOD AppendExtension(const nsACString & aExtension) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPrimaryExtension(nsACString & aPrimaryExtension) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetPrimaryExtension(const nsACString & aPrimaryExtension) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetType(nsACString & aType) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetMIMEType(nsACString & aMIMEType) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetDescription(nsAString & aDescription) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetDescription(const nsAString & aDescription) MOZ_OVERRIDE;
|
||||
NS_IMETHOD Equals(nsIMIMEInfo *aMIMEInfo, bool *_retval) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPreferredApplicationHandler(nsIHandlerApp * *aPreferredAppHandler) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetPreferredApplicationHandler(nsIHandlerApp * aPreferredAppHandler) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPossibleApplicationHandlers(nsIMutableArray * *aPossibleAppHandlers) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetDefaultDescription(nsAString & aDefaultDescription) MOZ_OVERRIDE;
|
||||
NS_IMETHOD LaunchWithFile(nsIFile *aFile) MOZ_OVERRIDE;
|
||||
NS_IMETHOD LaunchWithURI(nsIURI *aURI,
|
||||
nsIInterfaceRequestor *aWindowContext);
|
||||
NS_IMETHOD GetPreferredAction(nsHandlerInfoAction *aPreferredAction);
|
||||
NS_IMETHOD SetPreferredAction(nsHandlerInfoAction aPreferredAction);
|
||||
NS_IMETHOD GetAlwaysAskBeforeHandling(bool *aAlwaysAskBeforeHandling);
|
||||
NS_IMETHOD SetAlwaysAskBeforeHandling(bool aAlwaysAskBeforeHandling);
|
||||
NS_IMETHOD GetPossibleLocalHandlers(nsIArray **_retval);
|
||||
nsIInterfaceRequestor *aWindowContext) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPreferredAction(nsHandlerInfoAction *aPreferredAction) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetPreferredAction(nsHandlerInfoAction aPreferredAction) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetAlwaysAskBeforeHandling(bool *aAlwaysAskBeforeHandling) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetAlwaysAskBeforeHandling(bool aAlwaysAskBeforeHandling) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPossibleLocalHandlers(nsIArray **_retval) MOZ_OVERRIDE;
|
||||
|
||||
enum HandlerClass {
|
||||
eMIMEInfo,
|
||||
|
|
|
|||
|
|
@ -23,19 +23,19 @@ namespace docshell {
|
|||
// Schedule
|
||||
// Init
|
||||
#define NS_ADJUSTED_FORWARD_NSIOFFLINECACHEUPDATE(_to) \
|
||||
NS_IMETHOD GetStatus(uint16_t *aStatus) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetStatus(aStatus); } \
|
||||
NS_IMETHOD GetPartial(bool *aPartial) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetPartial(aPartial); } \
|
||||
NS_IMETHOD GetIsUpgrade(bool *aIsUpgrade) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetIsUpgrade(aIsUpgrade); } \
|
||||
NS_IMETHOD GetUpdateDomain(nsACString & aUpdateDomain) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetUpdateDomain(aUpdateDomain); } \
|
||||
NS_IMETHOD GetManifestURI(nsIURI **aManifestURI) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetManifestURI(aManifestURI); } \
|
||||
NS_IMETHOD GetSucceeded(bool *aSucceeded) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetSucceeded(aSucceeded); } \
|
||||
NS_IMETHOD InitPartial(nsIURI *aManifestURI, const nsACString & aClientID, nsIURI *aDocumentURI) { return !_to ? NS_ERROR_NULL_POINTER : _to->InitPartial(aManifestURI, aClientID, aDocumentURI); } \
|
||||
NS_IMETHOD InitForUpdateCheck(nsIURI *aManifestURI, uint32_t aAppID, bool aInBrowser, nsIObserver *aObserver) { return !_to ? NS_ERROR_NULL_POINTER : _to->InitForUpdateCheck(aManifestURI, aAppID, aInBrowser, aObserver); } \
|
||||
NS_IMETHOD AddDynamicURI(nsIURI *aURI) { return !_to ? NS_ERROR_NULL_POINTER : _to->AddDynamicURI(aURI); } \
|
||||
NS_IMETHOD AddObserver(nsIOfflineCacheUpdateObserver *aObserver, bool aHoldWeak) { return !_to ? NS_ERROR_NULL_POINTER : _to->AddObserver(aObserver, aHoldWeak); } \
|
||||
NS_IMETHOD RemoveObserver(nsIOfflineCacheUpdateObserver *aObserver) { return !_to ? NS_ERROR_NULL_POINTER : _to->RemoveObserver(aObserver); } \
|
||||
NS_IMETHOD GetByteProgress(uint64_t * _result) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetByteProgress(_result); } \
|
||||
NS_IMETHOD Cancel() { return !_to ? NS_ERROR_NULL_POINTER : _to->Cancel(); }
|
||||
NS_IMETHOD GetStatus(uint16_t *aStatus) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->GetStatus(aStatus); } \
|
||||
NS_IMETHOD GetPartial(bool *aPartial) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->GetPartial(aPartial); } \
|
||||
NS_IMETHOD GetIsUpgrade(bool *aIsUpgrade) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->GetIsUpgrade(aIsUpgrade); } \
|
||||
NS_IMETHOD GetUpdateDomain(nsACString & aUpdateDomain) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->GetUpdateDomain(aUpdateDomain); } \
|
||||
NS_IMETHOD GetManifestURI(nsIURI **aManifestURI) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->GetManifestURI(aManifestURI); } \
|
||||
NS_IMETHOD GetSucceeded(bool *aSucceeded) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->GetSucceeded(aSucceeded); } \
|
||||
NS_IMETHOD InitPartial(nsIURI *aManifestURI, const nsACString & aClientID, nsIURI *aDocumentURI) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->InitPartial(aManifestURI, aClientID, aDocumentURI); } \
|
||||
NS_IMETHOD InitForUpdateCheck(nsIURI *aManifestURI, uint32_t aAppID, bool aInBrowser, nsIObserver *aObserver) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->InitForUpdateCheck(aManifestURI, aAppID, aInBrowser, aObserver); } \
|
||||
NS_IMETHOD AddDynamicURI(nsIURI *aURI) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->AddDynamicURI(aURI); } \
|
||||
NS_IMETHOD AddObserver(nsIOfflineCacheUpdateObserver *aObserver, bool aHoldWeak) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->AddObserver(aObserver, aHoldWeak); } \
|
||||
NS_IMETHOD RemoveObserver(nsIOfflineCacheUpdateObserver *aObserver) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->RemoveObserver(aObserver); } \
|
||||
NS_IMETHOD GetByteProgress(uint64_t * _result) MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->GetByteProgress(_result); } \
|
||||
NS_IMETHOD Cancel() MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->Cancel(); }
|
||||
|
||||
class OfflineCacheUpdateGlue MOZ_FINAL : public nsSupportsWeakReference
|
||||
, public nsIOfflineCacheUpdate
|
||||
|
|
@ -49,13 +49,13 @@ private:
|
|||
|
||||
public:
|
||||
NS_ADJUSTED_FORWARD_NSIOFFLINECACHEUPDATE(EnsureUpdate())
|
||||
NS_IMETHOD Schedule(void);
|
||||
NS_IMETHOD Schedule(void) MOZ_OVERRIDE;
|
||||
NS_IMETHOD Init(nsIURI *aManifestURI,
|
||||
nsIURI *aDocumentURI,
|
||||
nsIDOMDocument *aDocument,
|
||||
nsIFile *aCustomProfileDir,
|
||||
uint32_t aAppID,
|
||||
bool aInBrowser);
|
||||
bool aInBrowser) MOZ_OVERRIDE;
|
||||
|
||||
NS_DECL_NSIOFFLINECACHEUPDATEOBSERVER
|
||||
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ public:
|
|||
bool IsForGroupID(const nsCSubstring &groupID);
|
||||
bool IsForProfile(nsIFile* aCustomProfileDir);
|
||||
|
||||
virtual nsresult UpdateFinished(nsOfflineCacheUpdate *aUpdate);
|
||||
virtual nsresult UpdateFinished(nsOfflineCacheUpdate *aUpdate) MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
~nsOfflineCacheUpdate();
|
||||
|
|
@ -349,7 +349,7 @@ public:
|
|||
bool aInBrowser,
|
||||
nsIOfflineCacheUpdate **aUpdate);
|
||||
|
||||
virtual nsresult UpdateFinished(nsOfflineCacheUpdate *aUpdate);
|
||||
virtual nsresult UpdateFinished(nsOfflineCacheUpdate *aUpdate) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Returns the singleton nsOfflineCacheUpdateService without an addref, or
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче