Bug 912627 - Remove spurious assertion. r=cpearce, a=sledru
authorRandy Lin <rlin@mozilla.com>
Wed, 02 Apr 2014 09:59:31 +0800
changeset 191531 dd673979ea7219027929f5dda3215b68b89074bc
parent 191530 80baa5d5bb1335846dbce633c1a525f8fc150ca8
child 191532 8b29be28b7616b0d4f63fc4ea22f8976f1a57fef
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce, sledru
bugs912627
milestone30.0a2
Bug 912627 - Remove spurious assertion. r=cpearce, a=sledru
content/media/MediaDecoder.cpp
--- a/content/media/MediaDecoder.cpp
+++ b/content/media/MediaDecoder.cpp
@@ -750,17 +750,16 @@ void MediaDecoder::QueueMetadata(int64_t
   NS_ASSERTION(OnDecodeThread(), "Should be on decode thread.");
   GetReentrantMonitor().AssertCurrentThreadIn();
   mDecoderStateMachine->QueueMetadata(aPublishTime, aChannels, aRate, aHasAudio, aHasVideo, aTags);
 }
 
 bool
 MediaDecoder::IsDataCachedToEndOfResource()
 {
-  NS_ASSERTION(!mShuttingDown, "Don't call during shutdown!");
   ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
   return (mResource &&
           mResource->IsDataCachedToEndOfResource(mDecoderPosition));
 }
 
 void MediaDecoder::MetadataLoaded(int aChannels, int aRate, bool aHasAudio, bool aHasVideo, MetadataTags* aTags)
 {
   MOZ_ASSERT(NS_IsMainThread());