import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1232902. Update ANGLE to chromium/2592 (89d3d3cfad)
- Bug 1251375. Update to ANGLE/2653 (98691dfd84)
- bits of Bug 1225280. Update ANGLE to chromium/2572. (b5eeadcb4e)
- Bug 1251375 - Cross compilation fixup. r=upstream (737d8f8554)
- fix trivial version mistake (2e40da7404)
- rename back (e1ef46b16a)
- Bug 1265374 - Move check_prog for archive programs into toolkit/moz.configure; r=glandium (ea406d7e6f)
- Bug 1261129: Make VP9 sample data const. r=kentuckyfriedtakahe (811eead31b)
- Bug 1263839 - WebM is now actually a VP9 sample; r=me (c6568d6d98)
- Bug 1263839: P2. Force re-run of VP9 benchmark based on a version check. r=kentuckyfriedtakahe (358409a235)
- Bug 1235503 - Fix -Wunreachable-code warnings in dom/media/. r=jya (dc6bebb141)
- Bug 1251184: [quicktime] P1. Report video/quicktime mimetype when sniffing. r=cpearce (056dda066a)
- Bug 1251184: [quicktime] P2. Use external plugin if available over native playback. r=cpearce (6f34c09ab6)
- Bug 1255050 - [1.1] Restrict media plugin decoder usage to Android ICS. r=snorp (ae801e040c)
- Bug 1229657: [MSE] Returns NotSupportedError if mimetype is invalid or not supported. r=gerald (a81df7babf)
- change errors returns (18b81f684e)
- Bug 1242465 - when defined USING_MOZFFVPX use by default videoCodec in FindAVCodec. r=jya (3a0557f067)
- rearrange to match gecko code (333c4c5f3a)
- Bug 1239607 - Let platform layer decide which codec to support and how to configure it. r=sotaro (63812a44d1)
- Bug 1248507 - p1. Pass DecoderDoctorDiagnostics to PDMs&more - r=jya (4175551833)
- Bug 1248507 - p2. DecoderDoctorDiagnostics boilerplate - r=jya (cb25b71956)
- Bug 1208371 - Forward declare DOMMediaStream in HTMLMediaElement.h. r=jesup (896080a020)
- Bug 1248507 - p3. Use DecoderDoctorDiagnostics - r=jya,bz (181966589e)
- Bug 1248507 - p4. DecoderDoctor base console message - r=bz (c5704ad2fe)
- Bug 1055776 - Move namespaceURI, prefix, localName from Node to Element; r=bz (ba7a18385d)
- Bug 842818 - Expose WebCrypto API to workers r=baku (966e5f3e75)
- Bug 1227790 - Update MediaKeyStatuses to include "released", "output-restricted" and "status-pending". r=bz (d9e7ddb298)
- Bug 1256046 - Hide MozPowerManager from the Web; r=khuey,bzbarsky (ec1da24251)
- Bug 1259581: Remove MOZ_MEDIA_NAVIGATOR. r=jesup (023a114462)
- Bug 1254956 - Implement Node.rootNode. r=Ms2ger,smaug (0133a41059)
- Bug 1264409 - Make last transaction ID available via nsIDOMWindowUtils, and pass transaction ID through MozAfterPaint. r=mattwoodrow,mrbkap (51184de1af)

dom/media/platforms/gonk/GonkDecoderModule.cpp

@@ -31,7 +31,8 @@ GonkDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
                                      mozilla::layers::LayersBackend aLayersBackend,
                                      mozilla::layers::ImageContainer* aImageContainer,
                                      FlushableTaskQueue* aVideoTaskQueue,
-                                     MediaDataDecoderCallback* aCallback)
+                                     MediaDataDecoderCallback* aCallback,
+                                     DecoderDoctorDiagnostics* aDiagnostics)
 {
   RefPtr<MediaDataDecoder> decoder =
   new GonkMediaDataDecoder(new GonkVideoDecoderManager(aImageContainer, aConfig),
@@ -42,7 +43,8 @@ GonkDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
 already_AddRefed<MediaDataDecoder>
 GonkDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
                                       FlushableTaskQueue* aAudioTaskQueue,
-                                      MediaDataDecoderCallback* aCallback)
+                                      MediaDataDecoderCallback* aCallback,
+                                      DecoderDoctorDiagnostics* aDiagnostics)
 {
   RefPtr<MediaDataDecoder> decoder =
   new GonkMediaDataDecoder(new GonkAudioDecoderManager(aConfig),
@@ -61,7 +63,8 @@ GonkDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
 }
 
 bool
-GonkDecoderModule::SupportsMimeType(const nsACString& aMimeType) const
+GonkDecoderModule::SupportsMimeType(const nsACString& aMimeType,
+                                    DecoderDoctorDiagnostics* aDiagnostics) const
 {
   return aMimeType.EqualsLiteral("audio/mp4a-latm") ||
     aMimeType.EqualsLiteral("audio/3gpp") ||