Bug 1293117 (part 3) - Remove some unnecessary |virtual| annotations. r=froydnj.
authorNicholas Nethercote <nnethercote@mozilla.com>
Mon, 08 Aug 2016 10:45:56 +1000
changeset 309105 4db4249540773fabd59acb0e3fe883c95d3213f4
parent 309104 2764e29be7dce8539f6194f11d479345577db2c5
child 309106 babe907f527681f351d62d689230d23e55d6a729
push id30557
push userkwierso@gmail.com
push dateFri, 12 Aug 2016 20:45:15 +0000
treeherdermozilla-central@ef3a50774180 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1293117
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1293117 (part 3) - Remove some unnecessary |virtual| annotations. r=froydnj. This patch changes |virtual NS_IMETHODIMP| occurrences to |NS_IMETHOD|, which is equivalent and the more standard way of marking in-class virtual XPCOM methods.
media/webrtc/signaling/test/FakePCObserver.h
--- a/media/webrtc/signaling/test/FakePCObserver.h
+++ b/media/webrtc/signaling/test/FakePCObserver.h
@@ -70,38 +70,38 @@ public:
   std::string lastString;
   mozilla::PeerConnectionImpl::Error lastStatusCode;
   mozilla::dom::PCObserverStateType lastStateType;
   int addIceSuccessCount;
   bool onAddStreamCalled;
   std::string name;
   std::vector<std::string> candidates;
 
-  virtual NS_IMETHODIMP OnCreateOfferSuccess(const char* offer, ER&) = 0;
-  virtual NS_IMETHODIMP OnCreateOfferError(uint32_t code, const char *msg, ER&) = 0;
-  virtual NS_IMETHODIMP OnCreateAnswerSuccess(const char* answer, ER&) = 0;
-  virtual NS_IMETHODIMP OnCreateAnswerError(uint32_t code, const char *msg, ER&) = 0;
-  virtual NS_IMETHODIMP OnSetLocalDescriptionSuccess(ER&) = 0;
-  virtual NS_IMETHODIMP OnSetRemoteDescriptionSuccess(ER&) = 0;
-  virtual NS_IMETHODIMP OnSetLocalDescriptionError(uint32_t code, const char *msg, ER&) = 0;
-  virtual NS_IMETHODIMP OnSetRemoteDescriptionError(uint32_t code, const char *msg, ER&) = 0;
-  virtual NS_IMETHODIMP NotifyDataChannel(nsIDOMDataChannel *channel, ER&) = 0;
-  virtual NS_IMETHODIMP OnStateChange(mozilla::dom::PCObserverStateType state_type, ER&,
+  NS_IMETHOD OnCreateOfferSuccess(const char* offer, ER&) = 0;
+  NS_IMETHOD OnCreateOfferError(uint32_t code, const char *msg, ER&) = 0;
+  NS_IMETHOD OnCreateAnswerSuccess(const char* answer, ER&) = 0;
+  NS_IMETHOD OnCreateAnswerError(uint32_t code, const char *msg, ER&) = 0;
+  NS_IMETHOD OnSetLocalDescriptionSuccess(ER&) = 0;
+  NS_IMETHOD OnSetRemoteDescriptionSuccess(ER&) = 0;
+  NS_IMETHOD OnSetLocalDescriptionError(uint32_t code, const char *msg, ER&) = 0;
+  NS_IMETHOD OnSetRemoteDescriptionError(uint32_t code, const char *msg, ER&) = 0;
+  NS_IMETHOD NotifyDataChannel(nsIDOMDataChannel *channel, ER&) = 0;
+  NS_IMETHOD OnStateChange(mozilla::dom::PCObserverStateType state_type, ER&,
                                       void* = nullptr) = 0;
-  virtual NS_IMETHODIMP OnAddStream(mozilla::DOMMediaStream &stream, ER&) = 0;
-  virtual NS_IMETHODIMP OnRemoveStream(mozilla::DOMMediaStream &stream, ER&) = 0;
-  virtual NS_IMETHODIMP OnAddTrack(mozilla::dom::MediaStreamTrack &track, ER&) = 0;
-  virtual NS_IMETHODIMP OnRemoveTrack(mozilla::dom::MediaStreamTrack &track, ER&) = 0;
-  virtual NS_IMETHODIMP OnReplaceTrackSuccess(ER&) = 0;
-  virtual NS_IMETHODIMP OnReplaceTrackError(uint32_t code, const char *msg, ER&) = 0;
-  virtual NS_IMETHODIMP OnAddIceCandidateSuccess(ER&) = 0;
-  virtual NS_IMETHODIMP OnAddIceCandidateError(uint32_t code, const char *msg, ER&) = 0;
-  virtual NS_IMETHODIMP OnIceCandidate(uint16_t level, const char *mid,
+  NS_IMETHOD OnAddStream(mozilla::DOMMediaStream &stream, ER&) = 0;
+  NS_IMETHOD OnRemoveStream(mozilla::DOMMediaStream &stream, ER&) = 0;
+  NS_IMETHOD OnAddTrack(mozilla::dom::MediaStreamTrack &track, ER&) = 0;
+  NS_IMETHOD OnRemoveTrack(mozilla::dom::MediaStreamTrack &track, ER&) = 0;
+  NS_IMETHOD OnReplaceTrackSuccess(ER&) = 0;
+  NS_IMETHOD OnReplaceTrackError(uint32_t code, const char *msg, ER&) = 0;
+  NS_IMETHOD OnAddIceCandidateSuccess(ER&) = 0;
+  NS_IMETHOD OnAddIceCandidateError(uint32_t code, const char *msg, ER&) = 0;
+  NS_IMETHOD OnIceCandidate(uint16_t level, const char *mid,
                                        const char *candidate, ER&) = 0;
-  virtual NS_IMETHODIMP OnNegotiationNeeded(ER&) = 0;
+  NS_IMETHOD OnNegotiationNeeded(ER&) = 0;
 protected:
   mozilla::PeerConnectionImpl *pc;
   std::vector<mozilla::DOMMediaStream *> streams;
 };
 }
 
 namespace mozilla {
 namespace dom {