Bug 1286738 - part4-fixWebMAudio: audio/webm doesn't need the IsWebMForced() check. r=jya draft
authorbechen <bechen@mozilla.com>
Wed, 26 Oct 2016 17:31:22 +0800
changeset 429655 b834c1f767b35036928c3d59663b62ead7482ea9
parent 429654 85ed47735c51281053b409d25bdebd6dad3aa1bc
child 535023 a3b354b37013b5d4b279a6f652b86edf42a66219
push id33627
push userbechen@mozilla.com
push dateWed, 26 Oct 2016 09:48:18 +0000
reviewersjya
bugs1286738
milestone52.0a1
Bug 1286738 - part4-fixWebMAudio: audio/webm doesn't need the IsWebMForced() check. r=jya MozReview-Commit-ID: 1BWpKvT3XTs
dom/media/mediasource/MediaSource.cpp
--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -116,18 +116,17 @@ MediaSource::IsTypeSupported(const nsASt
     if (!(Preferences::GetBool("media.mediasource.webm.enabled", false) ||
           IsWebMForced(aDiagnostics))) {
       return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
     }
     return NS_OK;
   }
   if (mimeType.EqualsASCII("audio/webm")) {
     if (!(Preferences::GetBool("media.mediasource.webm.enabled", false) ||
-          Preferences::GetBool("media.mediasource.webm.audio.enabled", true) ||
-          IsWebMForced(aDiagnostics))) {
+          Preferences::GetBool("media.mediasource.webm.audio.enabled", true))) {
       return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
     }
     return NS_OK;
   }
 
   return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
 }