Skip to content

Commit 31f560c

Browse files
author
Josh Aas
committed
Bug 960648: Consistently mark IPDL methods as MOZ_OVERRIDE. Part 2. r=bent
1 parent 301a4f7 commit 31f560c

14 files changed

+133
-126
lines changed

‎gfx/layers/ipc/CompositorParent.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class CompositorParent : public PCompositorParent,
8686
virtual bool RecvResume() MOZ_OVERRIDE;
8787
virtual bool RecvNotifyChildCreated(const uint64_t& child) MOZ_OVERRIDE;
8888
virtual bool RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot,
89-
SurfaceDescriptor* aOutSnapshot);
89+
SurfaceDescriptor* aOutSnapshot) MOZ_OVERRIDE;
9090
virtual bool RecvFlushRendering() MOZ_OVERRIDE;
9191
virtual bool RecvForceComposite() MOZ_OVERRIDE;
9292

@@ -239,8 +239,8 @@ class CompositorParent : public PCompositorParent,
239239
AllocPLayerTransactionParent(const nsTArray<LayersBackend>& aBackendHints,
240240
const uint64_t& aId,
241241
TextureFactoryIdentifier* aTextureFactoryIdentifier,
242-
bool* aSuccess);
243-
virtual bool DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers);
242+
bool* aSuccess) MOZ_OVERRIDE;
243+
virtual bool DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers) MOZ_OVERRIDE;
244244
virtual void ScheduleTask(CancelableTask*, int);
245245
void Composite();
246246
void CompositeInTransaction();

‎gfx/layers/ipc/ImageBridgeParent.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class ImageBridgeParent : public PImageBridgeParent,
5555
DeallocPGrallocBufferParent(PGrallocBufferParent* actor) MOZ_OVERRIDE;
5656

5757
// PImageBridge
58-
virtual bool RecvUpdate(const EditArray& aEdits, EditReplyArray* aReply);
59-
virtual bool RecvUpdateNoSwap(const EditArray& aEdits);
58+
virtual bool RecvUpdate(const EditArray& aEdits, EditReplyArray* aReply) MOZ_OVERRIDE;
59+
virtual bool RecvUpdateNoSwap(const EditArray& aEdits) MOZ_OVERRIDE;
6060

6161
virtual bool IsAsync() const MOZ_OVERRIDE { return true; }
6262

‎js/ipc/JavaScriptChild.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,49 +25,49 @@ class JavaScriptChild
2525
bool init();
2626
void trace(JSTracer *trc);
2727

28-
bool RecvDropObject(const ObjectId &objId);
28+
bool RecvDropObject(const ObjectId &objId) MOZ_OVERRIDE;
2929

30-
bool AnswerPreventExtensions(const ObjectId &objId, ReturnStatus *rs);
30+
bool AnswerPreventExtensions(const ObjectId &objId, ReturnStatus *rs) MOZ_OVERRIDE;
3131
bool AnswerGetPropertyDescriptor(const ObjectId &objId, const nsString &id,
3232
const uint32_t &flags, ReturnStatus *rs,
33-
PPropertyDescriptor *out);
33+
PPropertyDescriptor *out) MOZ_OVERRIDE;
3434
bool AnswerGetOwnPropertyDescriptor(const ObjectId &objId,
3535
const nsString &id,
3636
const uint32_t &flags,
3737
ReturnStatus *rs,
38-
PPropertyDescriptor *out);
38+
PPropertyDescriptor *out) MOZ_OVERRIDE;
3939
bool AnswerDefineProperty(const ObjectId &objId, const nsString &id,
4040
const PPropertyDescriptor &flags,
41-
ReturnStatus *rs);
41+
ReturnStatus *rs) MOZ_OVERRIDE;
4242
bool AnswerDelete(const ObjectId &objId, const nsString &id,
43-
ReturnStatus *rs, bool *success);
43+
ReturnStatus *rs, bool *success) MOZ_OVERRIDE;
4444

4545
bool AnswerHas(const ObjectId &objId, const nsString &id,
46-
ReturnStatus *rs, bool *bp);
46+
ReturnStatus *rs, bool *bp) MOZ_OVERRIDE;
4747
bool AnswerHasOwn(const ObjectId &objId, const nsString &id,
48-
ReturnStatus *rs, bool *bp);
48+
ReturnStatus *rs, bool *bp) MOZ_OVERRIDE;
4949
bool AnswerGet(const ObjectId &objId, const ObjectId &receiverId,
5050
const nsString &id,
51-
ReturnStatus *rs, JSVariant *result);
51+
ReturnStatus *rs, JSVariant *result) MOZ_OVERRIDE;
5252
bool AnswerSet(const ObjectId &objId, const ObjectId &receiverId,
5353
const nsString &id, const bool &strict,
54-
const JSVariant &value, ReturnStatus *rs, JSVariant *result);
54+
const JSVariant &value, ReturnStatus *rs, JSVariant *result) MOZ_OVERRIDE;
5555

5656
bool AnswerIsExtensible(const ObjectId &objId, ReturnStatus *rs,
57-
bool *result);
57+
bool *result) MOZ_OVERRIDE;
5858
bool AnswerCall(const ObjectId &objId, const nsTArray<JSParam> &argv,
5959
ReturnStatus *rs, JSVariant *result,
60-
nsTArray<JSParam> *outparams);
60+
nsTArray<JSParam> *outparams) MOZ_OVERRIDE;
6161
bool AnswerObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
62-
bool *result);
63-
bool AnswerClassName(const ObjectId &objId, nsString *result);
62+
bool *result) MOZ_OVERRIDE;
63+
bool AnswerClassName(const ObjectId &objId, nsString *result) MOZ_OVERRIDE;
6464

6565
bool AnswerGetPropertyNames(const ObjectId &objId, const uint32_t &flags,
66-
ReturnStatus *rs, nsTArray<nsString> *names);
66+
ReturnStatus *rs, nsTArray<nsString> *names) MOZ_OVERRIDE;
6767
bool AnswerInstanceOf(const ObjectId &objId, const JSIID &iid,
68-
ReturnStatus *rs, bool *instanceof);
68+
ReturnStatus *rs, bool *instanceof) MOZ_OVERRIDE;
6969
bool AnswerDOMInstanceOf(const ObjectId &objId, const int &prototypeID, const int &depth,
70-
ReturnStatus *rs, bool *instanceof);
70+
ReturnStatus *rs, bool *instanceof) MOZ_OVERRIDE;
7171

7272
protected:
7373
JSObject *unwrap(JSContext *cx, ObjectId id);

‎netwerk/dns/DNSRequestParent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class DNSRequestParent
2828
void DoAsyncResolve(const nsACString &hostname, uint32_t flags);
2929

3030
protected:
31-
virtual void ActorDestroy(ActorDestroyReason why);
31+
virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
3232
private:
3333
uint32_t mFlags;
3434
bool mIPCClosed; // true if IPDL channel has been closed (child crash)

‎netwerk/ipc/NeckoChild.h

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,40 @@ class NeckoChild :
2828
protected:
2929
virtual PHttpChannelChild*
3030
AllocPHttpChannelChild(PBrowserChild*, const SerializedLoadContext&,
31-
const HttpChannelCreationArgs& aOpenArgs);
32-
virtual bool DeallocPHttpChannelChild(PHttpChannelChild*);
33-
virtual PCookieServiceChild* AllocPCookieServiceChild();
34-
virtual bool DeallocPCookieServiceChild(PCookieServiceChild*);
35-
virtual PWyciwygChannelChild* AllocPWyciwygChannelChild();
36-
virtual bool DeallocPWyciwygChannelChild(PWyciwygChannelChild*);
31+
const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
32+
virtual bool DeallocPHttpChannelChild(PHttpChannelChild*) MOZ_OVERRIDE;
33+
virtual PCookieServiceChild* AllocPCookieServiceChild() MOZ_OVERRIDE;
34+
virtual bool DeallocPCookieServiceChild(PCookieServiceChild*) MOZ_OVERRIDE;
35+
virtual PWyciwygChannelChild* AllocPWyciwygChannelChild() MOZ_OVERRIDE;
36+
virtual bool DeallocPWyciwygChannelChild(PWyciwygChannelChild*) MOZ_OVERRIDE;
3737
virtual PFTPChannelChild*
3838
AllocPFTPChannelChild(PBrowserChild* aBrowser,
3939
const SerializedLoadContext& aSerialized,
40-
const FTPChannelCreationArgs& aOpenArgs);
41-
virtual bool DeallocPFTPChannelChild(PFTPChannelChild*);
42-
virtual PWebSocketChild* AllocPWebSocketChild(PBrowserChild*, const SerializedLoadContext&);
43-
virtual bool DeallocPWebSocketChild(PWebSocketChild*);
44-
virtual PTCPSocketChild* AllocPTCPSocketChild();
45-
virtual bool DeallocPTCPSocketChild(PTCPSocketChild*);
46-
virtual PTCPServerSocketChild* AllocPTCPServerSocketChild(const uint16_t& aLocalPort,
47-
const uint16_t& aBacklog,
48-
const nsString& aBinaryType);
49-
virtual bool DeallocPTCPServerSocketChild(PTCPServerSocketChild*);
40+
const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
41+
virtual bool DeallocPFTPChannelChild(PFTPChannelChild*) MOZ_OVERRIDE;
42+
virtual PWebSocketChild*
43+
AllocPWebSocketChild(PBrowserChild*, const SerializedLoadContext&) MOZ_OVERRIDE;
44+
virtual bool DeallocPWebSocketChild(PWebSocketChild*) MOZ_OVERRIDE;
45+
virtual PTCPSocketChild* AllocPTCPSocketChild() MOZ_OVERRIDE;
46+
virtual bool DeallocPTCPSocketChild(PTCPSocketChild*) MOZ_OVERRIDE;
47+
virtual PTCPServerSocketChild*
48+
AllocPTCPServerSocketChild(const uint16_t& aLocalPort,
49+
const uint16_t& aBacklog,
50+
const nsString& aBinaryType) MOZ_OVERRIDE;
51+
virtual bool DeallocPTCPServerSocketChild(PTCPServerSocketChild*) MOZ_OVERRIDE;
5052
virtual PUDPSocketChild* AllocPUDPSocketChild(const nsCString& aHost,
5153
const uint16_t& aPort,
52-
const nsCString& aFilter);
53-
virtual bool DeallocPUDPSocketChild(PUDPSocketChild*);
54+
const nsCString& aFilter) MOZ_OVERRIDE;
55+
virtual bool DeallocPUDPSocketChild(PUDPSocketChild*) MOZ_OVERRIDE;
5456
virtual PDNSRequestChild* AllocPDNSRequestChild(const nsCString& aHost,
55-
const uint32_t& aFlags);
56-
virtual bool DeallocPDNSRequestChild(PDNSRequestChild*);
57-
virtual PRemoteOpenFileChild* AllocPRemoteOpenFileChild(const URIParams&,
58-
const OptionalURIParams&);
59-
virtual bool DeallocPRemoteOpenFileChild(PRemoteOpenFileChild*);
60-
virtual PRtspControllerChild* AllocPRtspControllerChild();
61-
virtual bool DeallocPRtspControllerChild(PRtspControllerChild*);
57+
const uint32_t& aFlags) MOZ_OVERRIDE;
58+
virtual bool DeallocPDNSRequestChild(PDNSRequestChild*) MOZ_OVERRIDE;
59+
virtual PRemoteOpenFileChild*
60+
AllocPRemoteOpenFileChild(const URIParams&,
61+
const OptionalURIParams&) MOZ_OVERRIDE;
62+
virtual bool DeallocPRemoteOpenFileChild(PRemoteOpenFileChild*) MOZ_OVERRIDE;
63+
virtual PRtspControllerChild* AllocPRtspControllerChild() MOZ_OVERRIDE;
64+
virtual bool DeallocPRtspControllerChild(PRtspControllerChild*) MOZ_OVERRIDE;
6265
};
6366

6467
/**

‎netwerk/ipc/NeckoParent.h

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -70,32 +70,33 @@ class NeckoParent :
7070
protected:
7171
virtual PHttpChannelParent*
7272
AllocPHttpChannelParent(PBrowserParent*, const SerializedLoadContext&,
73-
const HttpChannelCreationArgs& aOpenArgs);
73+
const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
7474
virtual bool
7575
RecvPHttpChannelConstructor(
7676
PHttpChannelParent* aActor,
7777
PBrowserParent* aBrowser,
7878
const SerializedLoadContext& aSerialized,
79-
const HttpChannelCreationArgs& aOpenArgs);
80-
virtual bool DeallocPHttpChannelParent(PHttpChannelParent*);
81-
virtual bool DeallocPCookieServiceParent(PCookieServiceParent*);
82-
virtual PWyciwygChannelParent* AllocPWyciwygChannelParent();
83-
virtual bool DeallocPWyciwygChannelParent(PWyciwygChannelParent*);
79+
const HttpChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
80+
virtual bool DeallocPHttpChannelParent(PHttpChannelParent*) MOZ_OVERRIDE;
81+
virtual bool DeallocPCookieServiceParent(PCookieServiceParent*) MOZ_OVERRIDE;
82+
virtual PWyciwygChannelParent* AllocPWyciwygChannelParent() MOZ_OVERRIDE;
83+
virtual bool DeallocPWyciwygChannelParent(PWyciwygChannelParent*) MOZ_OVERRIDE;
8484
virtual PFTPChannelParent*
8585
AllocPFTPChannelParent(PBrowserParent* aBrowser,
8686
const SerializedLoadContext& aSerialized,
87-
const FTPChannelCreationArgs& aOpenArgs);
87+
const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
8888
virtual bool
8989
RecvPFTPChannelConstructor(
9090
PFTPChannelParent* aActor,
9191
PBrowserParent* aBrowser,
9292
const SerializedLoadContext& aSerialized,
93-
const FTPChannelCreationArgs& aOpenArgs);
94-
virtual bool DeallocPFTPChannelParent(PFTPChannelParent*);
95-
virtual PWebSocketParent* AllocPWebSocketParent(PBrowserParent* browser,
96-
const SerializedLoadContext& aSerialized);
97-
virtual bool DeallocPWebSocketParent(PWebSocketParent*);
98-
virtual PTCPSocketParent* AllocPTCPSocketParent();
93+
const FTPChannelCreationArgs& aOpenArgs) MOZ_OVERRIDE;
94+
virtual bool DeallocPFTPChannelParent(PFTPChannelParent*) MOZ_OVERRIDE;
95+
virtual PWebSocketParent*
96+
AllocPWebSocketParent(PBrowserParent* browser,
97+
const SerializedLoadContext& aSerialized) MOZ_OVERRIDE;
98+
virtual bool DeallocPWebSocketParent(PWebSocketParent*) MOZ_OVERRIDE;
99+
virtual PTCPSocketParent* AllocPTCPSocketParent() MOZ_OVERRIDE;
99100

100101
virtual PRemoteOpenFileParent* AllocPRemoteOpenFileParent(const URIParams& aFileURI,
101102
const OptionalURIParams& aAppURI)
@@ -107,40 +108,41 @@ class NeckoParent :
107108
virtual bool DeallocPRemoteOpenFileParent(PRemoteOpenFileParent* aActor)
108109
MOZ_OVERRIDE;
109110

110-
virtual bool DeallocPTCPSocketParent(PTCPSocketParent*);
111-
virtual PTCPServerSocketParent* AllocPTCPServerSocketParent(const uint16_t& aLocalPort,
112-
const uint16_t& aBacklog,
113-
const nsString& aBinaryType);
111+
virtual bool DeallocPTCPSocketParent(PTCPSocketParent*) MOZ_OVERRIDE;
112+
virtual PTCPServerSocketParent*
113+
AllocPTCPServerSocketParent(const uint16_t& aLocalPort,
114+
const uint16_t& aBacklog,
115+
const nsString& aBinaryType) MOZ_OVERRIDE;
114116
virtual bool RecvPTCPServerSocketConstructor(PTCPServerSocketParent*,
115117
const uint16_t& aLocalPort,
116118
const uint16_t& aBacklog,
117-
const nsString& aBinaryType);
118-
virtual bool DeallocPTCPServerSocketParent(PTCPServerSocketParent*);
119+
const nsString& aBinaryType) MOZ_OVERRIDE;
120+
virtual bool DeallocPTCPServerSocketParent(PTCPServerSocketParent*) MOZ_OVERRIDE;
119121
virtual PUDPSocketParent* AllocPUDPSocketParent(const nsCString& aHost,
120122
const uint16_t& aPort,
121-
const nsCString& aFilter);
123+
const nsCString& aFilter) MOZ_OVERRIDE;
122124
virtual bool RecvPUDPSocketConstructor(PUDPSocketParent*,
123125
const nsCString& aHost,
124126
const uint16_t& aPort,
125-
const nsCString& aFilter);
126-
virtual bool DeallocPUDPSocketParent(PUDPSocketParent*);
127+
const nsCString& aFilter) MOZ_OVERRIDE;
128+
virtual bool DeallocPUDPSocketParent(PUDPSocketParent*) MOZ_OVERRIDE;
127129
virtual PDNSRequestParent* AllocPDNSRequestParent(const nsCString& aHost,
128-
const uint32_t& aFlags);
130+
const uint32_t& aFlags) MOZ_OVERRIDE;
129131
virtual bool RecvPDNSRequestConstructor(PDNSRequestParent* actor,
130132
const nsCString& hostName,
131-
const uint32_t& flags);
132-
virtual bool DeallocPDNSRequestParent(PDNSRequestParent*);
133+
const uint32_t& flags) MOZ_OVERRIDE;
134+
virtual bool DeallocPDNSRequestParent(PDNSRequestParent*) MOZ_OVERRIDE;
133135
virtual bool RecvHTMLDNSPrefetch(const nsString& hostname,
134-
const uint16_t& flags);
136+
const uint16_t& flags) MOZ_OVERRIDE;
135137
virtual bool RecvCancelHTMLDNSPrefetch(const nsString& hostname,
136138
const uint16_t& flags,
137-
const nsresult& reason);
139+
const nsresult& reason) MOZ_OVERRIDE;
138140

139141
virtual mozilla::ipc::IProtocol*
140142
CloneProtocol(Channel* aChannel,
141143
mozilla::ipc::ProtocolCloneContext* aCtx) MOZ_OVERRIDE;
142-
virtual PRtspControllerParent* AllocPRtspControllerParent();
143-
virtual bool DeallocPRtspControllerParent(PRtspControllerParent*);
144+
virtual PRtspControllerParent* AllocPRtspControllerParent() MOZ_OVERRIDE;
145+
virtual bool DeallocPRtspControllerParent(PRtspControllerParent*) MOZ_OVERRIDE;
144146

145147
private:
146148
nsCString mCoreAppsBasePath;

‎netwerk/protocol/http/HttpChannelChild.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,25 @@ class HttpChannelChild : public PHttpChannelChild
100100
const nsCString& cachedCharset,
101101
const nsCString& securityInfoSerialization,
102102
const NetAddr& selfAddr,
103-
const NetAddr& peerAddr);
103+
const NetAddr& peerAddr) MOZ_OVERRIDE;
104104
bool RecvOnTransportAndData(const nsresult& status,
105105
const uint64_t& progress,
106106
const uint64_t& progressMax,
107107
const nsCString& data,
108108
const uint64_t& offset,
109-
const uint32_t& count);
109+
const uint32_t& count) MOZ_OVERRIDE;
110110
bool RecvOnStopRequest(const nsresult& statusCode);
111-
bool RecvOnProgress(const uint64_t& progress, const uint64_t& progressMax);
112-
bool RecvOnStatus(const nsresult& status);
113-
bool RecvFailedAsyncOpen(const nsresult& status);
111+
bool RecvOnProgress(const uint64_t& progress, const uint64_t& progressMax) MOZ_OVERRIDE;
112+
bool RecvOnStatus(const nsresult& status) MOZ_OVERRIDE;
113+
bool RecvFailedAsyncOpen(const nsresult& status) MOZ_OVERRIDE;
114114
bool RecvRedirect1Begin(const uint32_t& newChannel,
115115
const URIParams& newURI,
116116
const uint32_t& redirectFlags,
117-
const nsHttpResponseHead& responseHead);
118-
bool RecvRedirect3Complete();
117+
const nsHttpResponseHead& responseHead) MOZ_OVERRIDE;
118+
bool RecvRedirect3Complete() MOZ_OVERRIDE;
119119
bool RecvAssociateApplicationCache(const nsCString& groupID,
120-
const nsCString& clientID);
121-
bool RecvDeleteSelf();
120+
const nsCString& clientID) MOZ_OVERRIDE;
121+
bool RecvDeleteSelf() MOZ_OVERRIDE;
122122

123123
bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr);
124124
virtual void DoNotifyListenerCleanup();

0 commit comments

Comments
 (0)