merge autoland to mozilla-central a=merge

2016-07-20 10:59:12 +02:00
parent 5b7a9a4582 1413fb3408
commit c93296ca04
278 changed files with 7506 additions and 4210 deletions
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -4714,12 +4714,10 @@ void HTMLMediaElement::SuspendOrResumeElement(bool aPauseElement, bool aSuspendE
    UpdateSrcMediaStreamPlaying();
    UpdateAudioChannelPlayingState();
    if (aPauseElement) {
-      if (mMediaSource) {
-        ReportTelemetry();
+      ReportTelemetry();
 #ifdef MOZ_EME
-        ReportEMETelemetry();
+      ReportEMETelemetry();
 #endif
-      }

 #ifdef MOZ_EME
      // For EME content, force destruction of the CDM client (and CDM