Bug 1073081 - Fix -Woverloaded-virtual warnings in the MediaDecoder hierarchy. r=cpearce

--HG--
extra : source : 9aba1a2b1b23b0640867501b1b92f96fb6d0b13a

dom/media/omx/MediaCodecDecoder.cpp

@@ -24,7 +24,7 @@ MediaCodecDecoder::CreateReader()
 }
 
 MediaDecoderStateMachine*
-MediaCodecDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
+MediaCodecDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
 {
   return new MediaDecoderStateMachine(this, aReader);
 }

dom/media/omx/MediaCodecDecoder.h

@@ -20,7 +20,7 @@ public:
 
   virtual MediaOmxCommonReader* CreateReader();
 
-  virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader);
+  virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader);
 };
 
 } // namespace mozilla

dom/media/omx/MediaOmxCommonDecoder.cpp

@@ -265,7 +265,7 @@ MediaOmxCommonDecoder::CreateStateMachine()
   if (mReader != nullptr) {
     mReader->SetAudioChannel(GetAudioChannel());
   }
-  return CreateStateMachine(mReader);
+  return CreateStateMachineFromReader(mReader);
 }
 
 } // namespace mozilla

dom/media/omx/MediaOmxCommonDecoder.h

@@ -41,7 +41,7 @@ public:
   virtual MediaDecoderStateMachine* CreateStateMachine();
 
   virtual MediaOmxCommonReader* CreateReader() = 0;
-  virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader) = 0;
+  virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader) = 0;
 
 protected:
   virtual ~MediaOmxCommonDecoder();

dom/media/omx/MediaOmxDecoder.cpp

@@ -25,7 +25,7 @@ MediaOmxDecoder::CreateReader()
 }
 
 MediaDecoderStateMachine*
-MediaOmxDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
+MediaOmxDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
 {
   return new MediaDecoderStateMachine(this, aReader);
 }

dom/media/omx/MediaOmxDecoder.h

@@ -15,7 +15,7 @@ class MediaOmxDecoder : public MediaOmxCommonDecoder
 public:
   virtual MediaDecoder* Clone();
   virtual MediaOmxCommonReader* CreateReader();
-  virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader);
+  virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader);
 };
 
 } // namespace mozilla

dom/media/omx/RtspMediaCodecDecoder.cpp

@@ -25,7 +25,7 @@ RtspMediaCodecDecoder::CreateReader()
 }
 
 MediaDecoderStateMachine*
-RtspMediaCodecDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
+RtspMediaCodecDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
 {
   return new MediaDecoderStateMachine(this, aReader,
                                       mResource->IsRealTime());

dom/media/omx/RtspMediaCodecDecoder.h

@@ -18,7 +18,7 @@ public:
 
   virtual MediaOmxCommonReader* CreateReader() MOZ_OVERRIDE;
 
-  virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader) MOZ_OVERRIDE;
+  virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader) MOZ_OVERRIDE;
 
   virtual void ApplyStateToStateMachine(PlayState aState) MOZ_OVERRIDE;
 };