corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 960648: Consistently mark IPDL methods as MOZ_OVERRIDE. Part 2. r=bent

Browse Source
This commit is contained in:
Josh Aas
2014-01-17 13:49:39 -06:00
parent 38a4cae5ec
commit 3d9ebbdeae
14 changed files with 133 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/layers/ipc/CompositorParent.h
View File

@@ -86,7 +86,7 @@ public:
virtual bool RecvResume() MOZ_OVERRIDE; virtual bool RecvResume() MOZ_OVERRIDE;
virtual bool RecvNotifyChildCreated(const uint64_t& child) MOZ_OVERRIDE; virtual bool RecvNotifyChildCreated(const uint64_t& child) MOZ_OVERRIDE;
virtual bool RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot, virtual bool RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot,
SurfaceDescriptor* aOutSnapshot); SurfaceDescriptor* aOutSnapshot) MOZ_OVERRIDE;
virtual bool RecvFlushRendering() MOZ_OVERRIDE; virtual bool RecvFlushRendering() MOZ_OVERRIDE;
virtual bool RecvForceComposite() MOZ_OVERRIDE; virtual bool RecvForceComposite() MOZ_OVERRIDE;
@@ -239,8 +239,8 @@ protected:
AllocPLayerTransactionParent(const nsTArray<LayersBackend>& aBackendHints, AllocPLayerTransactionParent(const nsTArray<LayersBackend>& aBackendHints,
const uint64_t& aId, const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier, TextureFactoryIdentifier* aTextureFactoryIdentifier,
bool* aSuccess); bool* aSuccess) MOZ_OVERRIDE;
virtual bool DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers); virtual bool DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers) MOZ_OVERRIDE;
virtual void ScheduleTask(CancelableTask*, int); virtual void ScheduleTask(CancelableTask*, int);
void Composite(); void Composite();
void CompositeInTransaction(); void CompositeInTransaction();

4
gfx/layers/ipc/ImageBridgeParent.h
View File

@@ -55,8 +55,8 @@ public:
DeallocPGrallocBufferParent(PGrallocBufferParent* actor) MOZ_OVERRIDE; DeallocPGrallocBufferParent(PGrallocBufferParent* actor) MOZ_OVERRIDE;
// PImageBridge // PImageBridge
virtual bool RecvUpdate(const EditArray& aEdits, EditReplyArray* aReply); virtual bool RecvUpdate(const EditArray& aEdits, EditReplyArray* aReply) MOZ_OVERRIDE;
virtual bool RecvUpdateNoSwap(const EditArray& aEdits); virtual bool RecvUpdateNoSwap(const EditArray& aEdits) MOZ_OVERRIDE;
virtual bool IsAsync() const MOZ_OVERRIDE { return true; } virtual bool IsAsync() const MOZ_OVERRIDE { return true; }

34
js/ipc/JavaScriptChild.h
View File

@@ -25,49 +25,49 @@ class JavaScriptChild
bool init(); bool init();
void trace(JSTracer *trc); 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, bool AnswerGetPropertyDescriptor(const ObjectId &objId, const nsString &id,
const uint32_t &flags, ReturnStatus *rs, const uint32_t &flags, ReturnStatus *rs,
PPropertyDescriptor *out); PPropertyDescriptor *out) MOZ_OVERRIDE;
bool AnswerGetOwnPropertyDescriptor(const ObjectId &objId, bool AnswerGetOwnPropertyDescriptor(const ObjectId &objId,
const nsString &id, const nsString &id,
const uint32_t &flags, const uint32_t &flags,
ReturnStatus *rs, ReturnStatus *rs,
PPropertyDescriptor *out); PPropertyDescriptor *out) MOZ_OVERRIDE;
bool AnswerDefineProperty(const ObjectId &objId, const nsString &id, bool AnswerDefineProperty(const ObjectId &objId, const nsString &id,
const PPropertyDescriptor &flags, const PPropertyDescriptor &flags,
ReturnStatus *rs); ReturnStatus *rs) MOZ_OVERRIDE;
bool AnswerDelete(const ObjectId &objId, const nsString &id, 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, 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, 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, bool AnswerGet(const ObjectId &objId, const ObjectId &receiverId,
const nsString &id, const nsString &id,
ReturnStatus *rs, JSVariant *result); ReturnStatus *rs, JSVariant *result) MOZ_OVERRIDE;
bool AnswerSet(const ObjectId &objId, const ObjectId &receiverId, bool AnswerSet(const ObjectId &objId, const ObjectId &receiverId,
const nsString &id, const bool &strict, 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 AnswerIsExtensible(const ObjectId &objId, ReturnStatus *rs,
bool *result); bool *result) MOZ_OVERRIDE;
bool AnswerCall(const ObjectId &objId, const nsTArray<JSParam> &argv, bool AnswerCall(const ObjectId &objId, const nsTArray<JSParam> &argv,
ReturnStatus *rs, JSVariant *result, ReturnStatus *rs, JSVariant *result,
nsTArray<JSParam> *outparams); nsTArray<JSParam> *outparams) MOZ_OVERRIDE;
bool AnswerObjectClassIs(const ObjectId &objId, const uint32_t &classValue, bool AnswerObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
bool *result); bool *result) MOZ_OVERRIDE;
bool AnswerClassName(const ObjectId &objId, nsString *result); bool AnswerClassName(const ObjectId &objId, nsString *result) MOZ_OVERRIDE;
bool AnswerGetPropertyNames(const ObjectId &objId, const uint32_t &flags, bool AnswerGetPropertyNames(const ObjectId &objId, const uint32_t &flags,
ReturnStatus *rs, nsTArray<nsString> *names); ReturnStatus *rs, nsTArray<nsString> *names) MOZ_OVERRIDE;
bool AnswerInstanceOf(const ObjectId &objId, const JSIID &iid, 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, bool AnswerDOMInstanceOf(const ObjectId &objId, const int &prototypeID, const int &depth,
ReturnStatus *rs, bool *instanceof); ReturnStatus *rs, bool *instanceof) MOZ_OVERRIDE;
protected: protected:
JSObject *unwrap(JSContext *cx, ObjectId id); JSObject *unwrap(JSContext *cx, ObjectId id);

2
netwerk/dns/DNSRequestParent.h
View File

@@ -28,7 +28,7 @@ public:
void DoAsyncResolve(const nsACString &hostname, uint32_t flags); void DoAsyncResolve(const nsACString &hostname, uint32_t flags);
protected: protected:
virtual void ActorDestroy(ActorDestroyReason why); virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
private: private:
uint32_t mFlags; uint32_t mFlags;
bool mIPCClosed; // true if IPDL channel has been closed (child crash) bool mIPCClosed; // true if IPDL channel has been closed (child crash)

51
netwerk/ipc/NeckoChild.h
View File

@@ -28,37 +28,40 @@ public:
protected: protected:
virtual PHttpChannelChild* virtual PHttpChannelChild*
AllocPHttpChannelChild(PBrowserChild*, const SerializedLoadContext&, AllocPHttpChannelChild(PBrowserChild*, const SerializedLoadContext&,
const HttpChannelCreationArgs& aOpenArgs); const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
virtual bool DeallocPHttpChannelChild(PHttpChannelChild*); virtual bool DeallocPHttpChannelChild(PHttpChannelChild*) MOZ_OVERRIDE;
virtual PCookieServiceChild* AllocPCookieServiceChild(); virtual PCookieServiceChild* AllocPCookieServiceChild() MOZ_OVERRIDE;
virtual bool DeallocPCookieServiceChild(PCookieServiceChild*); virtual bool DeallocPCookieServiceChild(PCookieServiceChild*) MOZ_OVERRIDE;
virtual PWyciwygChannelChild* AllocPWyciwygChannelChild(); virtual PWyciwygChannelChild* AllocPWyciwygChannelChild() MOZ_OVERRIDE;
virtual bool DeallocPWyciwygChannelChild(PWyciwygChannelChild*); virtual bool DeallocPWyciwygChannelChild(PWyciwygChannelChild*) MOZ_OVERRIDE;
virtual PFTPChannelChild* virtual PFTPChannelChild*
AllocPFTPChannelChild(PBrowserChild* aBrowser, AllocPFTPChannelChild(PBrowserChild* aBrowser,
const SerializedLoadContext& aSerialized, const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs); const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
virtual bool DeallocPFTPChannelChild(PFTPChannelChild*); virtual bool DeallocPFTPChannelChild(PFTPChannelChild*) MOZ_OVERRIDE;
virtual PWebSocketChild* AllocPWebSocketChild(PBrowserChild*, const SerializedLoadContext&); virtual PWebSocketChild*
virtual bool DeallocPWebSocketChild(PWebSocketChild*); AllocPWebSocketChild(PBrowserChild*, const SerializedLoadContext&) MOZ_OVERRIDE;
virtual PTCPSocketChild* AllocPTCPSocketChild(); virtual bool DeallocPWebSocketChild(PWebSocketChild*) MOZ_OVERRIDE;
virtual bool DeallocPTCPSocketChild(PTCPSocketChild*); virtual PTCPSocketChild* AllocPTCPSocketChild() MOZ_OVERRIDE;
virtual PTCPServerSocketChild* AllocPTCPServerSocketChild(const uint16_t& aLocalPort, virtual bool DeallocPTCPSocketChild(PTCPSocketChild*) MOZ_OVERRIDE;
virtual PTCPServerSocketChild*
AllocPTCPServerSocketChild(const uint16_t& aLocalPort,
const uint16_t& aBacklog, const uint16_t& aBacklog,
const nsString& aBinaryType); const nsString& aBinaryType) MOZ_OVERRIDE;
virtual bool DeallocPTCPServerSocketChild(PTCPServerSocketChild*); virtual bool DeallocPTCPServerSocketChild(PTCPServerSocketChild*) MOZ_OVERRIDE;
virtual PUDPSocketChild* AllocPUDPSocketChild(const nsCString& aHost, virtual PUDPSocketChild* AllocPUDPSocketChild(const nsCString& aHost,
const uint16_t& aPort, const uint16_t& aPort,
const nsCString& aFilter); const nsCString& aFilter) MOZ_OVERRIDE;
virtual bool DeallocPUDPSocketChild(PUDPSocketChild*); virtual bool DeallocPUDPSocketChild(PUDPSocketChild*) MOZ_OVERRIDE;
virtual PDNSRequestChild* AllocPDNSRequestChild(const nsCString& aHost, virtual PDNSRequestChild* AllocPDNSRequestChild(const nsCString& aHost,
const uint32_t& aFlags); const uint32_t& aFlags) MOZ_OVERRIDE;
virtual bool DeallocPDNSRequestChild(PDNSRequestChild*); virtual bool DeallocPDNSRequestChild(PDNSRequestChild*) MOZ_OVERRIDE;
virtual PRemoteOpenFileChild* AllocPRemoteOpenFileChild(const URIParams&, virtual PRemoteOpenFileChild*
const OptionalURIParams&); AllocPRemoteOpenFileChild(const URIParams&,
virtual bool DeallocPRemoteOpenFileChild(PRemoteOpenFileChild*); const OptionalURIParams&) MOZ_OVERRIDE;
virtual PRtspControllerChild* AllocPRtspControllerChild(); virtual bool DeallocPRemoteOpenFileChild(PRemoteOpenFileChild*) MOZ_OVERRIDE;
virtual bool DeallocPRtspControllerChild(PRtspControllerChild*); virtual PRtspControllerChild* AllocPRtspControllerChild() MOZ_OVERRIDE;
virtual bool DeallocPRtspControllerChild(PRtspControllerChild*) MOZ_OVERRIDE;
}; };
/** /**

58
netwerk/ipc/NeckoParent.h
View File

@@ -70,32 +70,33 @@ public:
protected: protected:
virtual PHttpChannelParent* virtual PHttpChannelParent*
AllocPHttpChannelParent(PBrowserParent*, const SerializedLoadContext&, AllocPHttpChannelParent(PBrowserParent*, const SerializedLoadContext&,
const HttpChannelCreationArgs& aOpenArgs); const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
virtual bool virtual bool
RecvPHttpChannelConstructor( RecvPHttpChannelConstructor(
PHttpChannelParent* aActor, PHttpChannelParent* aActor,
PBrowserParent* aBrowser, PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized, const SerializedLoadContext& aSerialized,
const HttpChannelCreationArgs& aOpenArgs); const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
virtual bool DeallocPHttpChannelParent(PHttpChannelParent*); virtual bool DeallocPHttpChannelParent(PHttpChannelParent*) MOZ_OVERRIDE;
virtual bool DeallocPCookieServiceParent(PCookieServiceParent*); virtual bool DeallocPCookieServiceParent(PCookieServiceParent*) MOZ_OVERRIDE;
virtual PWyciwygChannelParent* AllocPWyciwygChannelParent(); virtual PWyciwygChannelParent* AllocPWyciwygChannelParent() MOZ_OVERRIDE;
virtual bool DeallocPWyciwygChannelParent(PWyciwygChannelParent*); virtual bool DeallocPWyciwygChannelParent(PWyciwygChannelParent*) MOZ_OVERRIDE;
virtual PFTPChannelParent* virtual PFTPChannelParent*
AllocPFTPChannelParent(PBrowserParent* aBrowser, AllocPFTPChannelParent(PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized, const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs); const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
virtual bool virtual bool
RecvPFTPChannelConstructor( RecvPFTPChannelConstructor(
PFTPChannelParent* aActor, PFTPChannelParent* aActor,
PBrowserParent* aBrowser, PBrowserParent* aBrowser,
const SerializedLoadContext& aSerialized, const SerializedLoadContext& aSerialized,
const FTPChannelCreationArgs& aOpenArgs); const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
virtual bool DeallocPFTPChannelParent(PFTPChannelParent*); virtual bool DeallocPFTPChannelParent(PFTPChannelParent*) MOZ_OVERRIDE;
virtual PWebSocketParent* AllocPWebSocketParent(PBrowserParent* browser, virtual PWebSocketParent*
const SerializedLoadContext& aSerialized); AllocPWebSocketParent(PBrowserParent* browser,
virtual bool DeallocPWebSocketParent(PWebSocketParent*); const SerializedLoadContext& aSerialized) MOZ_OVERRIDE;
virtual PTCPSocketParent* AllocPTCPSocketParent(); virtual bool DeallocPWebSocketParent(PWebSocketParent*) MOZ_OVERRIDE;
virtual PTCPSocketParent* AllocPTCPSocketParent() MOZ_OVERRIDE;
virtual PRemoteOpenFileParent* AllocPRemoteOpenFileParent(const URIParams& aFileURI, virtual PRemoteOpenFileParent* AllocPRemoteOpenFileParent(const URIParams& aFileURI,
const OptionalURIParams& aAppURI) const OptionalURIParams& aAppURI)
@@ -107,40 +108,41 @@ protected:
virtual bool DeallocPRemoteOpenFileParent(PRemoteOpenFileParent* aActor) virtual bool DeallocPRemoteOpenFileParent(PRemoteOpenFileParent* aActor)
MOZ_OVERRIDE; MOZ_OVERRIDE;
virtual bool DeallocPTCPSocketParent(PTCPSocketParent*); virtual bool DeallocPTCPSocketParent(PTCPSocketParent*) MOZ_OVERRIDE;
virtual PTCPServerSocketParent* AllocPTCPServerSocketParent(const uint16_t& aLocalPort, virtual PTCPServerSocketParent*
AllocPTCPServerSocketParent(const uint16_t& aLocalPort,
const uint16_t& aBacklog, const uint16_t& aBacklog,
const nsString& aBinaryType); const nsString& aBinaryType) MOZ_OVERRIDE;
virtual bool RecvPTCPServerSocketConstructor(PTCPServerSocketParent*, virtual bool RecvPTCPServerSocketConstructor(PTCPServerSocketParent*,
const uint16_t& aLocalPort, const uint16_t& aLocalPort,
const uint16_t& aBacklog, const uint16_t& aBacklog,
const nsString& aBinaryType); const nsString& aBinaryType) MOZ_OVERRIDE;
virtual bool DeallocPTCPServerSocketParent(PTCPServerSocketParent*); virtual bool DeallocPTCPServerSocketParent(PTCPServerSocketParent*) MOZ_OVERRIDE;
virtual PUDPSocketParent* AllocPUDPSocketParent(const nsCString& aHost, virtual PUDPSocketParent* AllocPUDPSocketParent(const nsCString& aHost,
const uint16_t& aPort, const uint16_t& aPort,
const nsCString& aFilter); const nsCString& aFilter) MOZ_OVERRIDE;
virtual bool RecvPUDPSocketConstructor(PUDPSocketParent*, virtual bool RecvPUDPSocketConstructor(PUDPSocketParent*,
const nsCString& aHost, const nsCString& aHost,
const uint16_t& aPort, const uint16_t& aPort,
const nsCString& aFilter); const nsCString& aFilter) MOZ_OVERRIDE;
virtual bool DeallocPUDPSocketParent(PUDPSocketParent*); virtual bool DeallocPUDPSocketParent(PUDPSocketParent*) MOZ_OVERRIDE;
virtual PDNSRequestParent* AllocPDNSRequestParent(const nsCString& aHost, virtual PDNSRequestParent* AllocPDNSRequestParent(const nsCString& aHost,
const uint32_t& aFlags); const uint32_t& aFlags) MOZ_OVERRIDE;
virtual bool RecvPDNSRequestConstructor(PDNSRequestParent* actor, virtual bool RecvPDNSRequestConstructor(PDNSRequestParent* actor,
const nsCString& hostName, const nsCString& hostName,
const uint32_t& flags); const uint32_t& flags) MOZ_OVERRIDE;
virtual bool DeallocPDNSRequestParent(PDNSRequestParent*); virtual bool DeallocPDNSRequestParent(PDNSRequestParent*) MOZ_OVERRIDE;
virtual bool RecvHTMLDNSPrefetch(const nsString& hostname, virtual bool RecvHTMLDNSPrefetch(const nsString& hostname,
const uint16_t& flags); const uint16_t& flags) MOZ_OVERRIDE;
virtual bool RecvCancelHTMLDNSPrefetch(const nsString& hostname, virtual bool RecvCancelHTMLDNSPrefetch(const nsString& hostname,
const uint16_t& flags, const uint16_t& flags,
const nsresult& reason); const nsresult& reason) MOZ_OVERRIDE;
virtual mozilla::ipc::IProtocol* virtual mozilla::ipc::IProtocol*
CloneProtocol(Channel* aChannel, CloneProtocol(Channel* aChannel,
mozilla::ipc::ProtocolCloneContext* aCtx) MOZ_OVERRIDE; mozilla::ipc::ProtocolCloneContext* aCtx) MOZ_OVERRIDE;
virtual PRtspControllerParent* AllocPRtspControllerParent(); virtual PRtspControllerParent* AllocPRtspControllerParent() MOZ_OVERRIDE;
virtual bool DeallocPRtspControllerParent(PRtspControllerParent*); virtual bool DeallocPRtspControllerParent(PRtspControllerParent*) MOZ_OVERRIDE;
private: private:
nsCString mCoreAppsBasePath; nsCString mCoreAppsBasePath;

18
netwerk/protocol/http/HttpChannelChild.h
View File

@@ -100,25 +100,25 @@ protected:
const nsCString& cachedCharset, const nsCString& cachedCharset,
const nsCString& securityInfoSerialization, const nsCString& securityInfoSerialization,
const NetAddr& selfAddr, const NetAddr& selfAddr,
const NetAddr& peerAddr); const NetAddr& peerAddr) MOZ_OVERRIDE;
bool RecvOnTransportAndData(const nsresult& status, bool RecvOnTransportAndData(const nsresult& status,
const uint64_t& progress, const uint64_t& progress,
const uint64_t& progressMax, const uint64_t& progressMax,
const nsCString& data, const nsCString& data,
const uint64_t& offset, const uint64_t& offset,
const uint32_t& count); const uint32_t& count) MOZ_OVERRIDE;
bool RecvOnStopRequest(const nsresult& statusCode); bool RecvOnStopRequest(const nsresult& statusCode);
bool RecvOnProgress(const uint64_t& progress, const uint64_t& progressMax); bool RecvOnProgress(const uint64_t& progress, const uint64_t& progressMax) MOZ_OVERRIDE;
bool RecvOnStatus(const nsresult& status); bool RecvOnStatus(const nsresult& status) MOZ_OVERRIDE;
bool RecvFailedAsyncOpen(const nsresult& status); bool RecvFailedAsyncOpen(const nsresult& status) MOZ_OVERRIDE;
bool RecvRedirect1Begin(const uint32_t& newChannel, bool RecvRedirect1Begin(const uint32_t& newChannel,
const URIParams& newURI, const URIParams& newURI,
const uint32_t& redirectFlags, const uint32_t& redirectFlags,
const nsHttpResponseHead& responseHead); const nsHttpResponseHead& responseHead) MOZ_OVERRIDE;
bool RecvRedirect3Complete(); bool RecvRedirect3Complete() MOZ_OVERRIDE;
bool RecvAssociateApplicationCache(const nsCString& groupID, bool RecvAssociateApplicationCache(const nsCString& groupID,
const nsCString& clientID); const nsCString& clientID) MOZ_OVERRIDE;
bool RecvDeleteSelf(); bool RecvDeleteSelf() MOZ_OVERRIDE;
bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr); bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr);
virtual void DoNotifyListenerCleanup(); virtual void DoNotifyListenerCleanup();

20
netwerk/protocol/http/HttpChannelParent.h
View File

@@ -77,20 +77,20 @@ protected:
const nsCString& appCacheClientID, const nsCString& appCacheClientID,
const bool& allowSpdy); const bool& allowSpdy);
virtual bool RecvSetPriority(const uint16_t& priority); virtual bool RecvSetPriority(const uint16_t& priority) MOZ_OVERRIDE;
virtual bool RecvSetCacheTokenCachedCharset(const nsCString& charset); virtual bool RecvSetCacheTokenCachedCharset(const nsCString& charset) MOZ_OVERRIDE;
virtual bool RecvSuspend(); virtual bool RecvSuspend() MOZ_OVERRIDE;
virtual bool RecvResume(); virtual bool RecvResume() MOZ_OVERRIDE;
virtual bool RecvCancel(const nsresult& status); virtual bool RecvCancel(const nsresult& status) MOZ_OVERRIDE;
virtual bool RecvRedirect2Verify(const nsresult& result, virtual bool RecvRedirect2Verify(const nsresult& result,
const RequestHeaderTuples& changedHeaders, const RequestHeaderTuples& changedHeaders,
const OptionalURIParams& apiRedirectUri); const OptionalURIParams& apiRedirectUri) MOZ_OVERRIDE;
virtual bool RecvUpdateAssociatedContentSecurity(const int32_t& broken, virtual bool RecvUpdateAssociatedContentSecurity(const int32_t& broken,
const int32_t& no); const int32_t& no) MOZ_OVERRIDE;
virtual bool RecvDocumentChannelCleanup(); virtual bool RecvDocumentChannelCleanup() MOZ_OVERRIDE;
virtual bool RecvMarkOfflineCacheEntryAsForeign(); virtual bool RecvMarkOfflineCacheEntryAsForeign() MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why); virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
protected: protected:
friend class HttpChannelParentListener; friend class HttpChannelParentListener;

12
netwerk/protocol/websocket/WebSocketChannelChild.h
View File

@@ -39,12 +39,12 @@ class WebSocketChannelChild : public BaseWebSocketChannel,
void ReleaseIPDLReference(); void ReleaseIPDLReference();
private: private:
bool RecvOnStart(const nsCString& aProtocol, const nsCString& aExtensions); bool RecvOnStart(const nsCString& aProtocol, const nsCString& aExtensions) MOZ_OVERRIDE;
bool RecvOnStop(const nsresult& aStatusCode); bool RecvOnStop(const nsresult& aStatusCode) MOZ_OVERRIDE;
bool RecvOnMessageAvailable(const nsCString& aMsg); bool RecvOnMessageAvailable(const nsCString& aMsg) MOZ_OVERRIDE;
bool RecvOnBinaryMessageAvailable(const nsCString& aMsg); bool RecvOnBinaryMessageAvailable(const nsCString& aMsg) MOZ_OVERRIDE;
bool RecvOnAcknowledge(const uint32_t& aSize); bool RecvOnAcknowledge(const uint32_t& aSize) MOZ_OVERRIDE;
bool RecvOnServerClose(const uint16_t& aCode, const nsCString &aReason); bool RecvOnServerClose(const uint16_t& aCode, const nsCString &aReason) MOZ_OVERRIDE;
bool RecvAsyncOpenFailed(); bool RecvAsyncOpenFailed();
void OnStart(const nsCString& aProtocol, const nsCString& aExtensions); void OnStart(const nsCString& aProtocol, const nsCString& aExtensions);

14
netwerk/protocol/websocket/WebSocketChannelParent.h
View File

@@ -42,15 +42,15 @@ class WebSocketChannelParent : public PWebSocketParent,
const uint32_t& aPingInterval, const uint32_t& aPingInterval,
const bool& aClientSetPingInterval, const bool& aClientSetPingInterval,
const uint32_t& aPingTimeout, const uint32_t& aPingTimeout,
const bool& aClientSetPingTimeout); const bool& aClientSetPingTimeout) MOZ_OVERRIDE;
bool RecvClose(const uint16_t & code, const nsCString & reason); bool RecvClose(const uint16_t & code, const nsCString & reason) MOZ_OVERRIDE;
bool RecvSendMsg(const nsCString& aMsg); bool RecvSendMsg(const nsCString& aMsg) MOZ_OVERRIDE;
bool RecvSendBinaryMsg(const nsCString& aMsg); bool RecvSendBinaryMsg(const nsCString& aMsg) MOZ_OVERRIDE;
bool RecvSendBinaryStream(const InputStreamParams& aStream, bool RecvSendBinaryStream(const InputStreamParams& aStream,
const uint32_t& aLength); const uint32_t& aLength) MOZ_OVERRIDE;
bool RecvDeleteSelf(); bool RecvDeleteSelf() MOZ_OVERRIDE;
void ActorDestroy(ActorDestroyReason why); void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
nsCOMPtr<nsIAuthPromptProvider> mAuthProvider; nsCOMPtr<nsIAuthPromptProvider> mAuthProvider;
nsCOMPtr<nsIWebSocketChannel> mChannel; nsCOMPtr<nsIWebSocketChannel> mChannel;

8
netwerk/protocol/wyciwyg/WyciwygChannelChild.h
View File

@@ -60,11 +60,11 @@ protected:
const int64_t& contentLength, const int64_t& contentLength,
const int32_t& source, const int32_t& source,
const nsCString& charset, const nsCString& charset,
const nsCString& securityInfo); const nsCString& securityInfo) MOZ_OVERRIDE;
bool RecvOnDataAvailable(const nsCString& data, bool RecvOnDataAvailable(const nsCString& data,
const uint64_t& offset); const uint64_t& offset) MOZ_OVERRIDE;
bool RecvOnStopRequest(const nsresult& statusCode); bool RecvOnStopRequest(const nsresult& statusCode) MOZ_OVERRIDE;
bool RecvCancelEarly(const nsresult& statusCode); bool RecvCancelEarly(const nsresult& statusCode) MOZ_OVERRIDE;
void OnStartRequest(const nsresult& statusCode, void OnStartRequest(const nsresult& statusCode,
const int64_t& contentLength, const int64_t& contentLength,

18
netwerk/protocol/wyciwyg/WyciwygChannelParent.h
View File

@@ -34,21 +34,21 @@ public:
virtual ~WyciwygChannelParent(); virtual ~WyciwygChannelParent();
protected: protected:
virtual bool RecvInit(const URIParams& uri); virtual bool RecvInit(const URIParams& uri) MOZ_OVERRIDE;
virtual bool RecvAsyncOpen(const URIParams& original, virtual bool RecvAsyncOpen(const URIParams& original,
const uint32_t& loadFlags, const uint32_t& loadFlags,
const IPC::SerializedLoadContext& loadContext, const IPC::SerializedLoadContext& loadContext,
PBrowserParent* parent); PBrowserParent* parent) MOZ_OVERRIDE;
virtual bool RecvWriteToCacheEntry(const nsString& data); virtual bool RecvWriteToCacheEntry(const nsString& data) MOZ_OVERRIDE;
virtual bool RecvCloseCacheEntry(const nsresult& reason); virtual bool RecvCloseCacheEntry(const nsresult& reason) MOZ_OVERRIDE;
virtual bool RecvSetCharsetAndSource(const int32_t& source, virtual bool RecvSetCharsetAndSource(const int32_t& source,
const nsCString& charset); const nsCString& charset) MOZ_OVERRIDE;
virtual bool RecvSetSecurityInfo(const nsCString& securityInfo); virtual bool RecvSetSecurityInfo(const nsCString& securityInfo) MOZ_OVERRIDE;
virtual bool RecvCancel(const nsresult& statusCode); virtual bool RecvCancel(const nsresult& statusCode) MOZ_OVERRIDE;
virtual bool RecvAppData(const IPC::SerializedLoadContext& loadContext, 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, bool SetupAppData(const IPC::SerializedLoadContext& loadContext,
PBrowserParent* aParent); PBrowserParent* aParent);

2
uriloader/exthandler/ExternalHelperAppChild.h
View File

@@ -28,7 +28,7 @@ public:
// the child. // the child.
void SetHandler(nsIStreamListener *handler) { mHandler = handler; } void SetHandler(nsIStreamListener *handler) { mHandler = handler; }
virtual bool RecvCancel(const nsresult& aStatus); virtual bool RecvCancel(const nsresult& aStatus) MOZ_OVERRIDE;
private: private:
nsCOMPtr<nsIStreamListener> mHandler; nsCOMPtr<nsIStreamListener> mHandler;
nsresult mStatus; nsresult mStatus;

8
uriloader/exthandler/ExternalHelperAppParent.h
View File

@@ -40,9 +40,11 @@ public:
NS_DECL_NSIMULTIPARTCHANNEL NS_DECL_NSIMULTIPARTCHANNEL
NS_DECL_NSIRESUMABLECHANNEL NS_DECL_NSIRESUMABLECHANNEL
bool RecvOnStartRequest(const nsCString& entityID); bool RecvOnStartRequest(const nsCString& entityID) MOZ_OVERRIDE;
bool RecvOnDataAvailable(const nsCString& data, const uint64_t& offset, const uint32_t& count); bool RecvOnDataAvailable(const nsCString& data,
bool RecvOnStopRequest(const nsresult& code); 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); ExternalHelperAppParent(const OptionalURIParams& uri, const int64_t& contentLength);
void Init(ContentParent *parent, void Init(ContentParent *parent,