Bug 1378304. P2 - replace GetResource() with mResource in MediaDecoder sub-classes. r=jya

MozReview-Commit-ID: GRIBp3y0Cb7

--HG--
extra : rebase_source : c80386b223d90e8a9a7fb285a09edc526227bde8
extra : source : b74c63131f6ed873726519eed1a308aaaf35a6a9

dom/media/ADTSDecoder.cpp

@@ -26,7 +26,7 @@ MediaDecoderStateMachine*
 ADTSDecoder::CreateStateMachine()
 {
   RefPtr<MediaDecoderReader> reader =
-      new MediaFormatReader(this, new ADTSDemuxer(GetResource()));
+    new MediaFormatReader(this, new ADTSDemuxer(mResource));
   return new MediaDecoderStateMachine(this, reader);
 }
 

dom/media/flac/FlacDecoder.cpp

@@ -27,7 +27,7 @@ MediaDecoderStateMachine*
 FlacDecoder::CreateStateMachine()
 {
   RefPtr<MediaDecoderReader> reader =
-      new MediaFormatReader(this, new FlacDemuxer(GetResource()));
+    new MediaFormatReader(this, new FlacDemuxer(mResource));
   return new MediaDecoderStateMachine(this, reader);
 }
 

dom/media/fmp4/MP4Decoder.cpp

@@ -32,10 +32,8 @@ MP4Decoder::MP4Decoder(MediaDecoderInit& aInit)
 
 MediaDecoderStateMachine* MP4Decoder::CreateStateMachine()
 {
-  mReader =
-    new MediaFormatReader(this,
-                          new MP4Demuxer(GetResource()),
-                          GetVideoFrameContainer());
+  mReader = new MediaFormatReader(
+    this, new MP4Demuxer(mResource), GetVideoFrameContainer());
 
   return new MediaDecoderStateMachine(this, mReader);
 }

dom/media/mediasource/MediaSourceDecoder.cpp

@@ -188,7 +188,7 @@ void
 MediaSourceDecoder::Ended(bool aEnded)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  static_cast<MediaSourceResource*>(GetResource())->SetEnded(aEnded);
+  static_cast<MediaSourceResource*>(mResource.get())->SetEnded(aEnded);
   if (aEnded) {
     // We want the MediaSourceReader to refresh its buffered range as it may
     // have been modified (end lined up).

dom/media/mp3/MP3Decoder.cpp

@@ -27,7 +27,7 @@ MP3Decoder::Clone(MediaDecoderInit& aInit)
 MediaDecoderStateMachine*
 MP3Decoder::CreateStateMachine() {
   RefPtr<MediaDecoderReader> reader =
-      new MediaFormatReader(this, new MP3Demuxer(GetResource()));
+    new MediaFormatReader(this, new MP3Demuxer(mResource));
   return new MediaDecoderStateMachine(this, reader);
 }
 

dom/media/ogg/OggDecoder.cpp

@@ -15,7 +15,7 @@ namespace mozilla {
 
 MediaDecoderStateMachine* OggDecoder::CreateStateMachine()
 {
-  RefPtr<OggDemuxer> demuxer = new OggDemuxer(GetResource());
+  RefPtr<OggDemuxer> demuxer = new OggDemuxer(mResource);
   RefPtr<MediaFormatReader> reader =
     new MediaFormatReader(this, demuxer, GetVideoFrameContainer());
   demuxer->SetChainingEvents(&reader->TimedMetadataProducer(),

dom/media/wave/WaveDecoder.cpp

@@ -23,7 +23,7 @@ MediaDecoderStateMachine*
 WaveDecoder::CreateStateMachine()
 {
   return new MediaDecoderStateMachine(
-    this, new MediaFormatReader(this, new WAVDemuxer(GetResource())));
+    this, new MediaFormatReader(this, new WAVDemuxer(mResource)));
 }
 
 /* static */ bool

dom/media/webm/WebMDecoder.cpp

@@ -18,8 +18,8 @@ namespace mozilla {
 
 MediaDecoderStateMachine* WebMDecoder::CreateStateMachine()
 {
-  mReader =
-    new MediaFormatReader(this, new WebMDemuxer(GetResource()), GetVideoFrameContainer());
+  mReader = new MediaFormatReader(
+    this, new WebMDemuxer(mResource), GetVideoFrameContainer());
   return new MediaDecoderStateMachine(this, mReader);
 }