Bug 1146086: Properly marking overridden member with override keyword. a=bustage
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 11 Aug 2015 16:24:59 +1000
changeset 291472 ed7bf9f0cc9246745ccfbbb6d86c77b984082500
parent 291471 062c4849e766cf3db6c5dc0eea8296dc7f7973b8
child 291473 7042219cf7f332ce97605958506557a9ae7e9402
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1146086
milestone43.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 1146086: Properly marking overridden member with override keyword. a=bustage Interesting that it was never picked up, until only one was done.
dom/media/webm/AudioDecoder.cpp
--- a/dom/media/webm/AudioDecoder.cpp
+++ b/dom/media/webm/AudioDecoder.cpp
@@ -43,23 +43,23 @@ ogg_packet InitOggPacket(const unsigned 
   packet.packetno = aPacketNo;
   return packet;
 }
 
 class VorbisDecoder : public WebMAudioDecoder
 {
 public:
   nsRefPtr<InitPromise> Init() override;
-  void Shutdown();
-  nsresult ResetDecode();
-  nsresult DecodeHeader(const unsigned char* aData, size_t aLength);
-  nsresult FinishInit(AudioInfo& aInfo);
+  void Shutdown() override;
+  nsresult ResetDecode() override;
+  nsresult DecodeHeader(const unsigned char* aData, size_t aLength) override;
+  nsresult FinishInit(AudioInfo& aInfo) override;
   bool Decode(const unsigned char* aData, size_t aLength,
               int64_t aOffset, uint64_t aTstampUsecs,
-              int64_t aDiscardPadding, int32_t* aTotalFrames);
+              int64_t aDiscardPadding, int32_t* aTotalFrames) override;
   explicit VorbisDecoder(WebMReader* aReader);
   ~VorbisDecoder();
 private:
   nsRefPtr<WebMReader> mReader;
 
   // Vorbis decoder state
   vorbis_info mVorbisInfo;
   vorbis_comment mVorbisComment;
@@ -225,23 +225,23 @@ VorbisDecoder::Decode(const unsigned cha
 }
 
 // ------------------------------------------------------------------------
 
 class OpusDecoder : public WebMAudioDecoder
 {
 public:
   nsRefPtr<InitPromise> Init() override;
-  void Shutdown();
-  nsresult ResetDecode();
-  nsresult DecodeHeader(const unsigned char* aData, size_t aLength);
+  void Shutdown() override;
+  nsresult ResetDecode() override;
+  nsresult DecodeHeader(const unsigned char* aData, size_t aLength) override;
   nsresult FinishInit(AudioInfo& aInfo);
   bool Decode(const unsigned char* aData, size_t aLength,
               int64_t aOffset, uint64_t aTstampUsecs,
-              int64_t aDiscardPadding, int32_t* aTotalFrames);
+              int64_t aDiscardPadding, int32_t* aTotalFrames) override;
   explicit OpusDecoder(WebMReader* aReader);
   ~OpusDecoder();
 private:
   nsRefPtr<WebMReader> mReader;
 
   // Opus decoder state
   nsAutoPtr<OpusParser> mOpusParser;
   OpusMSDecoder* mOpusDecoder;