Bug 1358399. P1 - move "elem.crossOrigin = test.crossOrigin || false" from SetupEME() to LoadTest() to improve cohesion. draft
authorJW Wang <jwwang@mozilla.com>
Fri, 21 Apr 2017 14:29:25 +0800
changeset 568425 3528e39eaadc215db2e35725e2737f1b37722cea
parent 568252 3f0c8da53c5cb015933b10b52ded3f30432b378a
child 568426 41ff35b88232a0d3be3712043fd22a6b0bfc0148
push id55869
push userjwwang@mozilla.com
push dateWed, 26 Apr 2017 06:34:41 +0000
bugs1358399
milestone55.0a1
Bug 1358399. P1 - move "elem.crossOrigin = test.crossOrigin || false" from SetupEME() to LoadTest() to improve cohesion. The attributes are used by MaybeCrossOriginURI() which is called by LoadTest() indirectly. MozReview-Commit-ID: LH2STpONuCE
dom/media/test/eme.js
--- a/dom/media/test/eme.js
+++ b/dom/media/test/eme.js
@@ -234,16 +234,17 @@ function LoadTest(test, elem, token, loa
 {
   if (!test.tracks) {
     ok(false, token + " test does not have a tracks list");
     return Promise.reject();
   }
 
   var ms = new MediaSource();
   elem.src = URL.createObjectURL(ms);
+  elem.crossOrigin = test.crossOrigin || false;
 
   return new Promise(function (resolve, reject) {
     ms.addEventListener("sourceopen", function () {
       Log(token, "sourceopen");
       Promise.all(test.tracks.map(function(track) {
         return AppendTrack(test, ms, track, token, loadParams);
       })).then(function() {
         if (loadParams && loadParams.noEndOfStream) {
@@ -277,17 +278,16 @@ function EMEPromiseAll(v, token, promise
     removeNodeAndSource(v);
     manager.finished(token);
   });
 }
 
 function SetupEME(test, token, params)
 {
   var v = document.createElement("video");
-  v.crossOrigin = test.crossOrigin || false;
   v.sessions = [];
 
   v.closeSessions = function() {
     return Promise.all(v.sessions.map(s => s.close().then(() => s.closed))).then(
       () => {
         v.setMediaKeys(null);
         if (v.parentNode) {
           v.remove();