Bug 1364821 - Fix merge bustage. a=RyanVM
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 04 Aug 2017 15:33:53 -0400
changeset 422461 4cfb674227051e22bab651e5759f3de503a50560
parent 422460 bc829569880635c52d6e3d54f51cd7d3df180186
child 422482 e5428f10f1f7ce21f3d218d00e909b59bc154069
child 422541 a5331535e6604c8eb81e0281d353cbf00c5899b2
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1364821
milestone57.0a1
first release with
nightly linux32
4cfb67422705 / 57.0a1 / 20170804193726 / files
nightly linux64
4cfb67422705 / 57.0a1 / 20170804193726 / files
nightly mac
4cfb67422705 / 57.0a1 / 20170804193726 / files
nightly win32
4cfb67422705 / 57.0a1 / 20170804193726 / files
nightly win64
4cfb67422705 / 57.0a1 / 20170804193726 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1364821 - Fix merge bustage. a=RyanVM A line was accidentally dropped when resolving merge conflicts between inbound and autoland. CI wasn't amused. This just adds it back.
dom/media/mediasource/MediaSourceDecoder.cpp
--- a/dom/media/mediasource/MediaSourceDecoder.cpp
+++ b/dom/media/mediasource/MediaSourceDecoder.cpp
@@ -199,16 +199,17 @@ MediaSourceDecoder::DetachMediaSource()
   mMediaSource = nullptr;
 }
 
 void
 MediaSourceDecoder::Ended(bool aEnded)
 {
   MOZ_ASSERT(NS_IsMainThread());
   AbstractThread::AutoEnter context(AbstractMainThread());
+  mResource->SetEnded(aEnded);
   if (aEnded) {
     // We want the MediaSourceReader to refresh its buffered range as it may
     // have been modified (end lined up).
     NotifyDataArrived();
   }
   mEnded = aEnded;
 }