From 10e2d6434bee3cf44f92683437a676762fae2fe5 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Wed, 17 May 2017 16:04:33 +0800
Subject: [PATCH] Bug 1365520. P2 - remove mMetadataTags for we can pass
 |aMetadata->mTags| without storing it. r=kaku

MozReview-Commit-ID: BcPwBTmXMZS

--HG--
extra : rebase_source : 35b563c330f3b380b81f330d30a8b6b3b144180d
---
 dom/media/MediaDecoderStateMachine.cpp | 3 +--
 dom/media/MediaDecoderStateMachine.h   | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 384547dd7515..c999b10d6fc0 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -2138,7 +2138,6 @@ DecodeMetadataState::OnMetadataRead(MetadataHolder* aMetadata)
   Resource()->SetReadMode(MediaCacheStream::MODE_PLAYBACK);
 
   mMaster->mInfo.emplace(aMetadata->mInfo);
-  mMaster->mMetadataTags = aMetadata->mTags.forget();
   mMaster->mMediaSeekable = Info().mMediaSeekable;
   mMaster->mMediaSeekableOnlyInBufferedRanges =
     Info().mMediaSeekableOnlyInBufferedRanges;
@@ -2168,7 +2167,7 @@ DecodeMetadataState::OnMetadataRead(MetadataHolder* aMetadata)
 
   mMaster->mMetadataLoadedEvent.Notify(
     nsAutoPtr<MediaInfo>(new MediaInfo(aMetadata->mInfo)),
-    Move(mMaster->mMetadataTags),
+    Move(aMetadata->mTags),
     MediaDecoderEventVisibility::Observable);
 
   if (Info().IsEncrypted() && !mMaster->mCDMProxy) {
diff --git a/dom/media/MediaDecoderStateMachine.h b/dom/media/MediaDecoderStateMachine.h
index 507f97b38d73..1f17b54ffac9 100644
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@@ -631,8 +631,6 @@ private:
   // Stores presentation info required for playback.
   Maybe<MediaInfo> mInfo;
 
-  nsAutoPtr<MetadataTags> mMetadataTags;
-
   mozilla::MediaMetadataManager mMetadataManager;
 
   // True if we've decoded first frames (thus having the start time) and