Bug 1073003 - Fix -Wreorder warnings. r=ehsan

--HG--
extra : rebase_source : 3eb4c247a6dd49b5a9377ddd71a095fda37e1c38

dom/media/omx/AudioOffloadPlayer.cpp

@@ -55,18 +55,18 @@ PRLogModuleInfo* gAudioOffloadPlayerLog;
 static const uint64_t OFFLOAD_PAUSE_MAX_MSECS = 60000ll;
 
 AudioOffloadPlayer::AudioOffloadPlayer(MediaOmxCommonDecoder* aObserver) :
-  mObserver(aObserver),
-  mInputBuffer(nullptr),
-  mSampleRate(0),
-  mSeeking(false),
-  mSeekDuringPause(false),
-  mReachedEOS(false),
-  mSeekTimeUs(0),
-  mStartPosUs(0),
-  mPositionTimeMediaUs(-1),
   mStarted(false),
   mPlaying(false),
-  mIsElementVisible(true)
+  mSeeking(false),
+  mReachedEOS(false),
+  mSeekDuringPause(false),
+  mIsElementVisible(true),
+  mSampleRate(0),
+  mStartPosUs(0),
+  mSeekTimeUs(0),
+  mPositionTimeMediaUs(-1),
+  mInputBuffer(nullptr),
+  mObserver(aObserver)
 {
   MOZ_ASSERT(NS_IsMainThread());
 

dom/media/omx/AudioOutput.cpp

@@ -33,11 +33,11 @@ extern PRLogModuleInfo* gAudioOffloadPlayerLog;
 using namespace android;
 
 AudioOutput::AudioOutput(int aSessionId, int aUid) :
-  mCallback(nullptr),
   mCallbackCookie(nullptr),
+  mCallback(nullptr),
   mCallbackData(nullptr),
-  mSessionId(aSessionId),
-  mUid(aUid)
+  mUid(aUid),
+  mSessionId(aSessionId)
 {
 #ifdef PR_LOGGING
   if (!gAudioOffloadPlayerLog) {

dom/media/omx/MediaOmxReader.cpp

@@ -138,15 +138,15 @@ void MediaOmxReader::CancelProcessCachedData()
 MediaOmxReader::MediaOmxReader(AbstractMediaDecoder *aDecoder)
   : MediaOmxCommonReader(aDecoder)
   , mMutex("MediaOmxReader.Data")
-  , mMP3FrameParser(-1)
   , mHasVideo(false)
   , mHasAudio(false)
   , mVideoSeekTimeUs(-1)
   , mAudioSeekTimeUs(-1)
+  , mLastParserDuration(-1)
   , mSkipCount(0)
   , mUseParserDuration(false)
-  , mLastParserDuration(-1)
   , mIsShutdown(false)
+  , mMP3FrameParser(-1)
   , mIsWaitingResources(false)
 {
 #ifdef PR_LOGGING

dom/media/omx/OMXCodecProxy.cpp

@@ -55,11 +55,11 @@ OMXCodecProxy::OMXCodecProxy(
         const sp<ANativeWindow> &nativeWindow)
     : mOMX(omx),
       mSrcMeta(meta),
-      mIsEncoder(createEncoder),
-      mSource(source),
       mComponentName(nullptr),
+      mIsEncoder(createEncoder),
       mFlags(flags),
       mNativeWindow(nativeWindow),
+      mSource(source),
       mState(MediaResourceManagerClient::CLIENT_STATE_WAIT_FOR_RESOURCE)
 {
 }

dom/media/omx/OMXCodecWrapper.cpp

@@ -592,8 +592,8 @@ public:
     , mInputFlags(aInputFlags)
     , mIndex(0)
     , mData(nullptr)
-    , mOffset(0)
     , mCapicity(0)
+    , mOffset(0)
   {}
 
   ~InputBufferHelper()

dom/media/omx/OmxDecoder.cpp

@@ -65,13 +65,13 @@ OmxDecoder::OmxDecoder(MediaResource *aResource,
   mAudioChannels(-1),
   mAudioSampleRate(-1),
   mDurationUs(-1),
+  mVideoLastFrameTime(-1),
   mVideoBuffer(nullptr),
   mAudioBuffer(nullptr),
   mIsVideoSeeking(false),
   mAudioMetadataRead(false),
   mAudioPaused(false),
-  mVideoPaused(false),
-  mVideoLastFrameTime(-1)
+  mVideoPaused(false)
 {
   mLooper = new ALooper;
   mLooper->setName("OmxDecoder");