From c6fbe9fc52f3f48463073db2feec4c9bb9a93751 Mon Sep 17 00:00:00 2001 From: Josh Aas Date: Fri, 17 Jan 2014 13:49:39 -0600 Subject: [PATCH] Bug 960648: Consistently mark IPDL methods as MOZ_OVERRIDE. Part 2. r=bent --- gfx/layers/ipc/CompositorParent.h | 6 +- gfx/layers/ipc/ImageBridgeParent.h | 4 +- js/ipc/JavaScriptChild.h | 34 +++++------ netwerk/dns/DNSRequestParent.h | 2 +- netwerk/ipc/NeckoChild.h | 53 ++++++++-------- netwerk/ipc/NeckoParent.h | 60 ++++++++++--------- netwerk/protocol/http/HttpChannelChild.h | 18 +++--- netwerk/protocol/http/HttpChannelParent.h | 20 +++---- .../websocket/WebSocketChannelChild.h | 12 ++-- .../websocket/WebSocketChannelParent.h | 14 ++--- .../protocol/wyciwyg/WyciwygChannelChild.h | 8 +-- .../protocol/wyciwyg/WyciwygChannelParent.h | 18 +++--- uriloader/exthandler/ExternalHelperAppChild.h | 2 +- .../exthandler/ExternalHelperAppParent.h | 8 ++- 14 files changed, 133 insertions(+), 126 deletions(-) diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h index 1f96ca2824f..8f1abf92f6f 100644 --- a/gfx/layers/ipc/CompositorParent.h +++ b/gfx/layers/ipc/CompositorParent.h @@ -86,7 +86,7 @@ public: virtual bool RecvResume() MOZ_OVERRIDE; virtual bool RecvNotifyChildCreated(const uint64_t& child) MOZ_OVERRIDE; virtual bool RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot, - SurfaceDescriptor* aOutSnapshot); + SurfaceDescriptor* aOutSnapshot) MOZ_OVERRIDE; virtual bool RecvFlushRendering() MOZ_OVERRIDE; virtual bool RecvForceComposite() MOZ_OVERRIDE; @@ -239,8 +239,8 @@ protected: AllocPLayerTransactionParent(const nsTArray& aBackendHints, const uint64_t& aId, TextureFactoryIdentifier* aTextureFactoryIdentifier, - bool* aSuccess); - virtual bool DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers); + bool* aSuccess) MOZ_OVERRIDE; + virtual bool DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers) MOZ_OVERRIDE; virtual void ScheduleTask(CancelableTask*, int); void Composite(); void CompositeInTransaction(); diff --git a/gfx/layers/ipc/ImageBridgeParent.h b/gfx/layers/ipc/ImageBridgeParent.h index ac92617bcc5..508cde3b335 100644 --- a/gfx/layers/ipc/ImageBridgeParent.h +++ b/gfx/layers/ipc/ImageBridgeParent.h @@ -55,8 +55,8 @@ public: DeallocPGrallocBufferParent(PGrallocBufferParent* actor) MOZ_OVERRIDE; // PImageBridge - virtual bool RecvUpdate(const EditArray& aEdits, EditReplyArray* aReply); - virtual bool RecvUpdateNoSwap(const EditArray& aEdits); + virtual bool RecvUpdate(const EditArray& aEdits, EditReplyArray* aReply) MOZ_OVERRIDE; + virtual bool RecvUpdateNoSwap(const EditArray& aEdits) MOZ_OVERRIDE; virtual bool IsAsync() const MOZ_OVERRIDE { return true; } diff --git a/js/ipc/JavaScriptChild.h b/js/ipc/JavaScriptChild.h index 4c098189769..21d325950d7 100644 --- a/js/ipc/JavaScriptChild.h +++ b/js/ipc/JavaScriptChild.h @@ -25,49 +25,49 @@ class JavaScriptChild bool init(); void trace(JSTracer *trc); - bool RecvDropObject(const ObjectId &objId); + bool RecvDropObject(const ObjectId &objId) MOZ_OVERRIDE; - bool AnswerPreventExtensions(const ObjectId &objId, ReturnStatus *rs); + bool AnswerPreventExtensions(const ObjectId &objId, ReturnStatus *rs) MOZ_OVERRIDE; bool AnswerGetPropertyDescriptor(const ObjectId &objId, const nsString &id, const uint32_t &flags, ReturnStatus *rs, - PPropertyDescriptor *out); + PPropertyDescriptor *out) MOZ_OVERRIDE; bool AnswerGetOwnPropertyDescriptor(const ObjectId &objId, const nsString &id, const uint32_t &flags, ReturnStatus *rs, - PPropertyDescriptor *out); + PPropertyDescriptor *out) MOZ_OVERRIDE; bool AnswerDefineProperty(const ObjectId &objId, const nsString &id, const PPropertyDescriptor &flags, - ReturnStatus *rs); + ReturnStatus *rs) MOZ_OVERRIDE; bool AnswerDelete(const ObjectId &objId, const nsString &id, - ReturnStatus *rs, bool *success); + ReturnStatus *rs, bool *success) MOZ_OVERRIDE; bool AnswerHas(const ObjectId &objId, const nsString &id, - ReturnStatus *rs, bool *bp); + ReturnStatus *rs, bool *bp) MOZ_OVERRIDE; bool AnswerHasOwn(const ObjectId &objId, const nsString &id, - ReturnStatus *rs, bool *bp); + ReturnStatus *rs, bool *bp) MOZ_OVERRIDE; bool AnswerGet(const ObjectId &objId, const ObjectId &receiverId, const nsString &id, - ReturnStatus *rs, JSVariant *result); + ReturnStatus *rs, JSVariant *result) MOZ_OVERRIDE; bool AnswerSet(const ObjectId &objId, const ObjectId &receiverId, const nsString &id, const bool &strict, - const JSVariant &value, ReturnStatus *rs, JSVariant *result); + const JSVariant &value, ReturnStatus *rs, JSVariant *result) MOZ_OVERRIDE; bool AnswerIsExtensible(const ObjectId &objId, ReturnStatus *rs, - bool *result); + bool *result) MOZ_OVERRIDE; bool AnswerCall(const ObjectId &objId, const nsTArray &argv, ReturnStatus *rs, JSVariant *result, - nsTArray *outparams); + nsTArray *outparams) MOZ_OVERRIDE; bool AnswerObjectClassIs(const ObjectId &objId, const uint32_t &classValue, - bool *result); - bool AnswerClassName(const ObjectId &objId, nsString *result); + bool *result) MOZ_OVERRIDE; + bool AnswerClassName(const ObjectId &objId, nsString *result) MOZ_OVERRIDE; bool AnswerGetPropertyNames(const ObjectId &objId, const uint32_t &flags, - ReturnStatus *rs, nsTArray *names); + ReturnStatus *rs, nsTArray *names) MOZ_OVERRIDE; bool AnswerInstanceOf(const ObjectId &objId, const JSIID &iid, - ReturnStatus *rs, bool *instanceof); + ReturnStatus *rs, bool *instanceof) MOZ_OVERRIDE; bool AnswerDOMInstanceOf(const ObjectId &objId, const int &prototypeID, const int &depth, - ReturnStatus *rs, bool *instanceof); + ReturnStatus *rs, bool *instanceof) MOZ_OVERRIDE; protected: JSObject *unwrap(JSContext *cx, ObjectId id); diff --git a/netwerk/dns/DNSRequestParent.h b/netwerk/dns/DNSRequestParent.h index cfb4ecbb4cb..ce325d2d275 100644 --- a/netwerk/dns/DNSRequestParent.h +++ b/netwerk/dns/DNSRequestParent.h @@ -28,7 +28,7 @@ public: void DoAsyncResolve(const nsACString &hostname, uint32_t flags); protected: - virtual void ActorDestroy(ActorDestroyReason why); + virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE; private: uint32_t mFlags; bool mIPCClosed; // true if IPDL channel has been closed (child crash) diff --git a/netwerk/ipc/NeckoChild.h b/netwerk/ipc/NeckoChild.h index 8cacf36614a..d57238307df 100644 --- a/netwerk/ipc/NeckoChild.h +++ b/netwerk/ipc/NeckoChild.h @@ -28,37 +28,40 @@ public: protected: virtual PHttpChannelChild* AllocPHttpChannelChild(PBrowserChild*, const SerializedLoadContext&, - const HttpChannelCreationArgs& aOpenArgs); - virtual bool DeallocPHttpChannelChild(PHttpChannelChild*); - virtual PCookieServiceChild* AllocPCookieServiceChild(); - virtual bool DeallocPCookieServiceChild(PCookieServiceChild*); - virtual PWyciwygChannelChild* AllocPWyciwygChannelChild(); - virtual bool DeallocPWyciwygChannelChild(PWyciwygChannelChild*); + const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE; + virtual bool DeallocPHttpChannelChild(PHttpChannelChild*) MOZ_OVERRIDE; + virtual PCookieServiceChild* AllocPCookieServiceChild() MOZ_OVERRIDE; + virtual bool DeallocPCookieServiceChild(PCookieServiceChild*) MOZ_OVERRIDE; + virtual PWyciwygChannelChild* AllocPWyciwygChannelChild() MOZ_OVERRIDE; + virtual bool DeallocPWyciwygChannelChild(PWyciwygChannelChild*) MOZ_OVERRIDE; virtual PFTPChannelChild* AllocPFTPChannelChild(PBrowserChild* aBrowser, const SerializedLoadContext& aSerialized, - const FTPChannelCreationArgs& aOpenArgs); - virtual bool DeallocPFTPChannelChild(PFTPChannelChild*); - virtual PWebSocketChild* AllocPWebSocketChild(PBrowserChild*, const SerializedLoadContext&); - virtual bool DeallocPWebSocketChild(PWebSocketChild*); - virtual PTCPSocketChild* AllocPTCPSocketChild(); - virtual bool DeallocPTCPSocketChild(PTCPSocketChild*); - virtual PTCPServerSocketChild* AllocPTCPServerSocketChild(const uint16_t& aLocalPort, - const uint16_t& aBacklog, - const nsString& aBinaryType); - virtual bool DeallocPTCPServerSocketChild(PTCPServerSocketChild*); + const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE; + virtual bool DeallocPFTPChannelChild(PFTPChannelChild*) MOZ_OVERRIDE; + virtual PWebSocketChild* + AllocPWebSocketChild(PBrowserChild*, const SerializedLoadContext&) MOZ_OVERRIDE; + virtual bool DeallocPWebSocketChild(PWebSocketChild*) MOZ_OVERRIDE; + virtual PTCPSocketChild* AllocPTCPSocketChild() MOZ_OVERRIDE; + virtual bool DeallocPTCPSocketChild(PTCPSocketChild*) MOZ_OVERRIDE; + virtual PTCPServerSocketChild* + AllocPTCPServerSocketChild(const uint16_t& aLocalPort, + const uint16_t& aBacklog, + const nsString& aBinaryType) MOZ_OVERRIDE; + virtual bool DeallocPTCPServerSocketChild(PTCPServerSocketChild*) MOZ_OVERRIDE; virtual PUDPSocketChild* AllocPUDPSocketChild(const nsCString& aHost, const uint16_t& aPort, - const nsCString& aFilter); - virtual bool DeallocPUDPSocketChild(PUDPSocketChild*); + const nsCString& aFilter) MOZ_OVERRIDE; + virtual bool DeallocPUDPSocketChild(PUDPSocketChild*) MOZ_OVERRIDE; virtual PDNSRequestChild* AllocPDNSRequestChild(const nsCString& aHost, - const uint32_t& aFlags); - virtual bool DeallocPDNSRequestChild(PDNSRequestChild*); - virtual PRemoteOpenFileChild* AllocPRemoteOpenFileChild(const URIParams&, - const OptionalURIParams&); - virtual bool DeallocPRemoteOpenFileChild(PRemoteOpenFileChild*); - virtual PRtspControllerChild* AllocPRtspControllerChild(); - virtual bool DeallocPRtspControllerChild(PRtspControllerChild*); + const uint32_t& aFlags) MOZ_OVERRIDE; + virtual bool DeallocPDNSRequestChild(PDNSRequestChild*) MOZ_OVERRIDE; + virtual PRemoteOpenFileChild* + AllocPRemoteOpenFileChild(const URIParams&, + const OptionalURIParams&) MOZ_OVERRIDE; + virtual bool DeallocPRemoteOpenFileChild(PRemoteOpenFileChild*) MOZ_OVERRIDE; + virtual PRtspControllerChild* AllocPRtspControllerChild() MOZ_OVERRIDE; + virtual bool DeallocPRtspControllerChild(PRtspControllerChild*) MOZ_OVERRIDE; }; /** diff --git a/netwerk/ipc/NeckoParent.h b/netwerk/ipc/NeckoParent.h index 35d51c22c08..0e55e35418c 100644 --- a/netwerk/ipc/NeckoParent.h +++ b/netwerk/ipc/NeckoParent.h @@ -70,32 +70,33 @@ public: protected: virtual PHttpChannelParent* AllocPHttpChannelParent(PBrowserParent*, const SerializedLoadContext&, - const HttpChannelCreationArgs& aOpenArgs); + const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE; virtual bool RecvPHttpChannelConstructor( PHttpChannelParent* aActor, PBrowserParent* aBrowser, const SerializedLoadContext& aSerialized, - const HttpChannelCreationArgs& aOpenArgs); - virtual bool DeallocPHttpChannelParent(PHttpChannelParent*); - virtual bool DeallocPCookieServiceParent(PCookieServiceParent*); - virtual PWyciwygChannelParent* AllocPWyciwygChannelParent(); - virtual bool DeallocPWyciwygChannelParent(PWyciwygChannelParent*); + const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE; + virtual bool DeallocPHttpChannelParent(PHttpChannelParent*) MOZ_OVERRIDE; + virtual bool DeallocPCookieServiceParent(PCookieServiceParent*) MOZ_OVERRIDE; + virtual PWyciwygChannelParent* AllocPWyciwygChannelParent() MOZ_OVERRIDE; + virtual bool DeallocPWyciwygChannelParent(PWyciwygChannelParent*) MOZ_OVERRIDE; virtual PFTPChannelParent* AllocPFTPChannelParent(PBrowserParent* aBrowser, const SerializedLoadContext& aSerialized, - const FTPChannelCreationArgs& aOpenArgs); + const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE; virtual bool RecvPFTPChannelConstructor( PFTPChannelParent* aActor, PBrowserParent* aBrowser, const SerializedLoadContext& aSerialized, - const FTPChannelCreationArgs& aOpenArgs); - virtual bool DeallocPFTPChannelParent(PFTPChannelParent*); - virtual PWebSocketParent* AllocPWebSocketParent(PBrowserParent* browser, - const SerializedLoadContext& aSerialized); - virtual bool DeallocPWebSocketParent(PWebSocketParent*); - virtual PTCPSocketParent* AllocPTCPSocketParent(); + const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE; + virtual bool DeallocPFTPChannelParent(PFTPChannelParent*) MOZ_OVERRIDE; + virtual PWebSocketParent* + AllocPWebSocketParent(PBrowserParent* browser, + const SerializedLoadContext& aSerialized) MOZ_OVERRIDE; + virtual bool DeallocPWebSocketParent(PWebSocketParent*) MOZ_OVERRIDE; + virtual PTCPSocketParent* AllocPTCPSocketParent() MOZ_OVERRIDE; virtual PRemoteOpenFileParent* AllocPRemoteOpenFileParent(const URIParams& aFileURI, const OptionalURIParams& aAppURI) @@ -107,40 +108,41 @@ protected: virtual bool DeallocPRemoteOpenFileParent(PRemoteOpenFileParent* aActor) MOZ_OVERRIDE; - virtual bool DeallocPTCPSocketParent(PTCPSocketParent*); - virtual PTCPServerSocketParent* AllocPTCPServerSocketParent(const uint16_t& aLocalPort, - const uint16_t& aBacklog, - const nsString& aBinaryType); + virtual bool DeallocPTCPSocketParent(PTCPSocketParent*) MOZ_OVERRIDE; + virtual PTCPServerSocketParent* + AllocPTCPServerSocketParent(const uint16_t& aLocalPort, + const uint16_t& aBacklog, + const nsString& aBinaryType) MOZ_OVERRIDE; virtual bool RecvPTCPServerSocketConstructor(PTCPServerSocketParent*, const uint16_t& aLocalPort, const uint16_t& aBacklog, - const nsString& aBinaryType); - virtual bool DeallocPTCPServerSocketParent(PTCPServerSocketParent*); + const nsString& aBinaryType) MOZ_OVERRIDE; + virtual bool DeallocPTCPServerSocketParent(PTCPServerSocketParent*) MOZ_OVERRIDE; virtual PUDPSocketParent* AllocPUDPSocketParent(const nsCString& aHost, const uint16_t& aPort, - const nsCString& aFilter); + const nsCString& aFilter) MOZ_OVERRIDE; virtual bool RecvPUDPSocketConstructor(PUDPSocketParent*, const nsCString& aHost, const uint16_t& aPort, - const nsCString& aFilter); - virtual bool DeallocPUDPSocketParent(PUDPSocketParent*); + const nsCString& aFilter) MOZ_OVERRIDE; + virtual bool DeallocPUDPSocketParent(PUDPSocketParent*) MOZ_OVERRIDE; virtual PDNSRequestParent* AllocPDNSRequestParent(const nsCString& aHost, - const uint32_t& aFlags); + const uint32_t& aFlags) MOZ_OVERRIDE; virtual bool RecvPDNSRequestConstructor(PDNSRequestParent* actor, const nsCString& hostName, - const uint32_t& flags); - virtual bool DeallocPDNSRequestParent(PDNSRequestParent*); + const uint32_t& flags) MOZ_OVERRIDE; + virtual bool DeallocPDNSRequestParent(PDNSRequestParent*) MOZ_OVERRIDE; virtual bool RecvHTMLDNSPrefetch(const nsString& hostname, - const uint16_t& flags); + const uint16_t& flags) MOZ_OVERRIDE; virtual bool RecvCancelHTMLDNSPrefetch(const nsString& hostname, const uint16_t& flags, - const nsresult& reason); + const nsresult& reason) MOZ_OVERRIDE; virtual mozilla::ipc::IProtocol* CloneProtocol(Channel* aChannel, mozilla::ipc::ProtocolCloneContext* aCtx) MOZ_OVERRIDE; - virtual PRtspControllerParent* AllocPRtspControllerParent(); - virtual bool DeallocPRtspControllerParent(PRtspControllerParent*); + virtual PRtspControllerParent* AllocPRtspControllerParent() MOZ_OVERRIDE; + virtual bool DeallocPRtspControllerParent(PRtspControllerParent*) MOZ_OVERRIDE; private: nsCString mCoreAppsBasePath; diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h index f7aaf0cc697..d5046381f8f 100644 --- a/netwerk/protocol/http/HttpChannelChild.h +++ b/netwerk/protocol/http/HttpChannelChild.h @@ -100,25 +100,25 @@ protected: const nsCString& cachedCharset, const nsCString& securityInfoSerialization, const NetAddr& selfAddr, - const NetAddr& peerAddr); + const NetAddr& peerAddr) MOZ_OVERRIDE; bool RecvOnTransportAndData(const nsresult& status, const uint64_t& progress, const uint64_t& progressMax, const nsCString& data, const uint64_t& offset, - const uint32_t& count); + const uint32_t& count) MOZ_OVERRIDE; bool RecvOnStopRequest(const nsresult& statusCode); - bool RecvOnProgress(const uint64_t& progress, const uint64_t& progressMax); - bool RecvOnStatus(const nsresult& status); - bool RecvFailedAsyncOpen(const nsresult& status); + bool RecvOnProgress(const uint64_t& progress, const uint64_t& progressMax) MOZ_OVERRIDE; + bool RecvOnStatus(const nsresult& status) MOZ_OVERRIDE; + bool RecvFailedAsyncOpen(const nsresult& status) MOZ_OVERRIDE; bool RecvRedirect1Begin(const uint32_t& newChannel, const URIParams& newURI, const uint32_t& redirectFlags, - const nsHttpResponseHead& responseHead); - bool RecvRedirect3Complete(); + const nsHttpResponseHead& responseHead) MOZ_OVERRIDE; + bool RecvRedirect3Complete() MOZ_OVERRIDE; bool RecvAssociateApplicationCache(const nsCString& groupID, - const nsCString& clientID); - bool RecvDeleteSelf(); + const nsCString& clientID) MOZ_OVERRIDE; + bool RecvDeleteSelf() MOZ_OVERRIDE; bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr); virtual void DoNotifyListenerCleanup(); diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h index e0be2bcfd4a..2a1a237e07b 100644 --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -77,20 +77,20 @@ protected: const nsCString& appCacheClientID, const bool& allowSpdy); - virtual bool RecvSetPriority(const uint16_t& priority); - virtual bool RecvSetCacheTokenCachedCharset(const nsCString& charset); - virtual bool RecvSuspend(); - virtual bool RecvResume(); - virtual bool RecvCancel(const nsresult& status); + virtual bool RecvSetPriority(const uint16_t& priority) MOZ_OVERRIDE; + virtual bool RecvSetCacheTokenCachedCharset(const nsCString& charset) MOZ_OVERRIDE; + virtual bool RecvSuspend() MOZ_OVERRIDE; + virtual bool RecvResume() MOZ_OVERRIDE; + virtual bool RecvCancel(const nsresult& status) MOZ_OVERRIDE; virtual bool RecvRedirect2Verify(const nsresult& result, const RequestHeaderTuples& changedHeaders, - const OptionalURIParams& apiRedirectUri); + const OptionalURIParams& apiRedirectUri) MOZ_OVERRIDE; virtual bool RecvUpdateAssociatedContentSecurity(const int32_t& broken, - const int32_t& no); - virtual bool RecvDocumentChannelCleanup(); - virtual bool RecvMarkOfflineCacheEntryAsForeign(); + const int32_t& no) MOZ_OVERRIDE; + virtual bool RecvDocumentChannelCleanup() MOZ_OVERRIDE; + virtual bool RecvMarkOfflineCacheEntryAsForeign() MOZ_OVERRIDE; - virtual void ActorDestroy(ActorDestroyReason why); + virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE; protected: friend class HttpChannelParentListener; diff --git a/netwerk/protocol/websocket/WebSocketChannelChild.h b/netwerk/protocol/websocket/WebSocketChannelChild.h index b49fd2161d0..153bbee56d9 100644 --- a/netwerk/protocol/websocket/WebSocketChannelChild.h +++ b/netwerk/protocol/websocket/WebSocketChannelChild.h @@ -39,12 +39,12 @@ class WebSocketChannelChild : public BaseWebSocketChannel, void ReleaseIPDLReference(); private: - bool RecvOnStart(const nsCString& aProtocol, const nsCString& aExtensions); - bool RecvOnStop(const nsresult& aStatusCode); - bool RecvOnMessageAvailable(const nsCString& aMsg); - bool RecvOnBinaryMessageAvailable(const nsCString& aMsg); - bool RecvOnAcknowledge(const uint32_t& aSize); - bool RecvOnServerClose(const uint16_t& aCode, const nsCString &aReason); + bool RecvOnStart(const nsCString& aProtocol, const nsCString& aExtensions) MOZ_OVERRIDE; + bool RecvOnStop(const nsresult& aStatusCode) MOZ_OVERRIDE; + bool RecvOnMessageAvailable(const nsCString& aMsg) MOZ_OVERRIDE; + bool RecvOnBinaryMessageAvailable(const nsCString& aMsg) MOZ_OVERRIDE; + bool RecvOnAcknowledge(const uint32_t& aSize) MOZ_OVERRIDE; + bool RecvOnServerClose(const uint16_t& aCode, const nsCString &aReason) MOZ_OVERRIDE; bool RecvAsyncOpenFailed(); void OnStart(const nsCString& aProtocol, const nsCString& aExtensions); diff --git a/netwerk/protocol/websocket/WebSocketChannelParent.h b/netwerk/protocol/websocket/WebSocketChannelParent.h index 907ba69c839..ea1f0adcd4c 100644 --- a/netwerk/protocol/websocket/WebSocketChannelParent.h +++ b/netwerk/protocol/websocket/WebSocketChannelParent.h @@ -42,15 +42,15 @@ class WebSocketChannelParent : public PWebSocketParent, const uint32_t& aPingInterval, const bool& aClientSetPingInterval, const uint32_t& aPingTimeout, - const bool& aClientSetPingTimeout); - bool RecvClose(const uint16_t & code, const nsCString & reason); - bool RecvSendMsg(const nsCString& aMsg); - bool RecvSendBinaryMsg(const nsCString& aMsg); + const bool& aClientSetPingTimeout) MOZ_OVERRIDE; + bool RecvClose(const uint16_t & code, const nsCString & reason) MOZ_OVERRIDE; + bool RecvSendMsg(const nsCString& aMsg) MOZ_OVERRIDE; + bool RecvSendBinaryMsg(const nsCString& aMsg) MOZ_OVERRIDE; bool RecvSendBinaryStream(const InputStreamParams& aStream, - const uint32_t& aLength); - bool RecvDeleteSelf(); + const uint32_t& aLength) MOZ_OVERRIDE; + bool RecvDeleteSelf() MOZ_OVERRIDE; - void ActorDestroy(ActorDestroyReason why); + void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE; nsCOMPtr mAuthProvider; nsCOMPtr mChannel; diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelChild.h b/netwerk/protocol/wyciwyg/WyciwygChannelChild.h index 8574f6e6a41..875d10e4651 100644 --- a/netwerk/protocol/wyciwyg/WyciwygChannelChild.h +++ b/netwerk/protocol/wyciwyg/WyciwygChannelChild.h @@ -60,11 +60,11 @@ protected: const int64_t& contentLength, const int32_t& source, const nsCString& charset, - const nsCString& securityInfo); + const nsCString& securityInfo) MOZ_OVERRIDE; bool RecvOnDataAvailable(const nsCString& data, - const uint64_t& offset); - bool RecvOnStopRequest(const nsresult& statusCode); - bool RecvCancelEarly(const nsresult& statusCode); + const uint64_t& offset) MOZ_OVERRIDE; + bool RecvOnStopRequest(const nsresult& statusCode) MOZ_OVERRIDE; + bool RecvCancelEarly(const nsresult& statusCode) MOZ_OVERRIDE; void OnStartRequest(const nsresult& statusCode, const int64_t& contentLength, diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelParent.h b/netwerk/protocol/wyciwyg/WyciwygChannelParent.h index 52e3917afd5..14523ddc86c 100644 --- a/netwerk/protocol/wyciwyg/WyciwygChannelParent.h +++ b/netwerk/protocol/wyciwyg/WyciwygChannelParent.h @@ -34,21 +34,21 @@ public: virtual ~WyciwygChannelParent(); protected: - virtual bool RecvInit(const URIParams& uri); + virtual bool RecvInit(const URIParams& uri) MOZ_OVERRIDE; virtual bool RecvAsyncOpen(const URIParams& original, const uint32_t& loadFlags, const IPC::SerializedLoadContext& loadContext, - PBrowserParent* parent); - virtual bool RecvWriteToCacheEntry(const nsString& data); - virtual bool RecvCloseCacheEntry(const nsresult& reason); + PBrowserParent* parent) MOZ_OVERRIDE; + virtual bool RecvWriteToCacheEntry(const nsString& data) MOZ_OVERRIDE; + virtual bool RecvCloseCacheEntry(const nsresult& reason) MOZ_OVERRIDE; virtual bool RecvSetCharsetAndSource(const int32_t& source, - const nsCString& charset); - virtual bool RecvSetSecurityInfo(const nsCString& securityInfo); - virtual bool RecvCancel(const nsresult& statusCode); + const nsCString& charset) MOZ_OVERRIDE; + virtual bool RecvSetSecurityInfo(const nsCString& securityInfo) MOZ_OVERRIDE; + virtual bool RecvCancel(const nsresult& statusCode) MOZ_OVERRIDE; virtual bool RecvAppData(const IPC::SerializedLoadContext& loadContext, - PBrowserParent* parent); + PBrowserParent* parent) MOZ_OVERRIDE; - virtual void ActorDestroy(ActorDestroyReason why); + virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE; bool SetupAppData(const IPC::SerializedLoadContext& loadContext, PBrowserParent* aParent); diff --git a/uriloader/exthandler/ExternalHelperAppChild.h b/uriloader/exthandler/ExternalHelperAppChild.h index 730e68c2839..6b58a8b7e3d 100644 --- a/uriloader/exthandler/ExternalHelperAppChild.h +++ b/uriloader/exthandler/ExternalHelperAppChild.h @@ -28,7 +28,7 @@ public: // the child. void SetHandler(nsIStreamListener *handler) { mHandler = handler; } - virtual bool RecvCancel(const nsresult& aStatus); + virtual bool RecvCancel(const nsresult& aStatus) MOZ_OVERRIDE; private: nsCOMPtr mHandler; nsresult mStatus; diff --git a/uriloader/exthandler/ExternalHelperAppParent.h b/uriloader/exthandler/ExternalHelperAppParent.h index ccdb98777b1..90af98b7ada 100644 --- a/uriloader/exthandler/ExternalHelperAppParent.h +++ b/uriloader/exthandler/ExternalHelperAppParent.h @@ -40,9 +40,11 @@ public: NS_DECL_NSIMULTIPARTCHANNEL NS_DECL_NSIRESUMABLECHANNEL - bool RecvOnStartRequest(const nsCString& entityID); - bool RecvOnDataAvailable(const nsCString& data, const uint64_t& offset, const uint32_t& count); - bool RecvOnStopRequest(const nsresult& code); + bool RecvOnStartRequest(const nsCString& entityID) MOZ_OVERRIDE; + bool RecvOnDataAvailable(const nsCString& data, + const uint64_t& offset, + const uint32_t& count) MOZ_OVERRIDE; + bool RecvOnStopRequest(const nsresult& code) MOZ_OVERRIDE; ExternalHelperAppParent(const OptionalURIParams& uri, const int64_t& contentLength); void Init(ContentParent *parent,