Backed out changeset 19432abcb3f1 (bug 879717)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 13 Jan 2015 08:47:35 +0100
changeset 223506 627fc1d03b92eeea8c5d8f97c0514e5d02ef28a8
parent 223505 f9662e8dd46c50300deaf5ded4a841f645ef9230
child 223507 73ef38e06f47048c631540dc7d85116685ec8043
push id28095
push usercbook@mozilla.com
push dateTue, 13 Jan 2015 13:24:48 +0000
treeherdermozilla-central@a5700bec72e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs879717
milestone38.0a1
backs out19432abcb3f147ceb08b4d40ee2638069fb89f60
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 19432abcb3f1 (bug 879717)
dom/media/test/manifest.js
dom/media/test/mochitest.ini
dom/media/test/test_video_dimensions.html
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -9,17 +9,17 @@ var gSmallTests = [
   { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 },
   { name:"small-shot.mp3", type:"audio/mpeg", duration:0.27 },
   { name:"small-shot-mp3.mp4", type:"audio/mp4; codecs=mp3", duration:0.34 },
   { name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 },
   { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266 },
   { name:"seek.webm", type:"video/webm", width:320, height:240, duration:3.966 },
   { name:"vp9.webm", type:"video/webm", width:320, height:240, duration:4 },
   { name:"detodos.opus", type:"audio/ogg; codecs=opus", duration:2.9135 },
-  { name:"gizmo.mp4", type:"video/mp4", width:560, height:320, duration:5.56 },
+  { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
   { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 if (SpecialPowers.Services.appinfo.name != "B2G") {
   // We only run mochitests on b2g desktop and b2g emulator. The 3gp codecs
   // aren't present on desktop, and the emulator codecs (which are different
   // from the real device codecs) don't pass all of our tests, so we need
   // to disable them.
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -466,17 +466,16 @@ skip-if = (toolkit == 'android' && proce
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_readyState.html]
 [test_referer.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 [test_replay_metadata.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_reset_events_async.html]
 [test_reset_src.html]
-[test_video_dimensions.html]
 [test_resume.html]
 skip-if = true # bug 1021673
 [test_seek_out_of_range.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_seek-1.html]
 skip-if = android_version == '10' # bug 1059116
 [test_seek-2.html]
 [test_seek-3.html]
deleted file mode 100644
--- a/dom/media/test/test_video_dimensions.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test that a video element has set video dimensions on loadedmetadata</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <script type="text/javascript" src="manifest.js"></script>
-</head>
-<body>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-var manager = new MediaTestManager;
-
-var startTest = function(test, token) {
-  manager.started(token);
-  var v1 = document.createElement('video');
-  var v2 = document.createElement('video');
-  var vout = document.createElement('video');
-
-  // Avoid a race for hardware resources between v1 and v2 on platforms with
-  // a hardware decoder, like B2G.
-  v1.preload = 'none';
-  v2.preload = 'none';
-
-  var numVideoElementsFinished = 0;
-
-  var onloadedmetadata = function(ev) {
-    var v = ev.target;
-    ok(!v.loadedmetadata, v.testName + " should only fire loadedmetadata once");
-    v.loadedmetadata = true;
-    is(v.videoWidth, test.width, v.testName + " video width should be set on loadedmetadata");
-    is(v.videoHeight, test.height, v.testName + " video height should be set on loadedmetadata");
-
-    numVideoElementsFinished += 1;
-    if (v === v1) {
-      removeNodeAndSource(v1);
-      v2.play();
-      vout.play();
-    }
-
-    if (numVideoElementsFinished === 3) {
-      removeNodeAndSource(v2);
-      removeNodeAndSource(vout);
-      manager.finished(token);
-    }
-  };
-  var setupElement = function(v, id) {
-    v.loadedmetadata = false;
-    v.onloadedmetadata = onloadedmetadata;
-    document.body.appendChild(v);
-  };
-
-  v1.testName = test.name;
-  v2.testName = test.name + " (Captured)";
-  vout.testName = test.name + " (Stream)";
-
-  v1.src = test.name;
-  v2.src = test.name;
-  vout.src = URL.createObjectURL(v2.mozCaptureStreamUntilEnded());
-
-  setupElement(v1, "v1");
-  setupElement(v2, "v2");
-  setupElement(vout, "vout");
-
-  v1.play();
-};
-
-manager.runTests(getPlayableVideos(gSmallTests), startTest);
-</script>
-</pre>
-</body>
-</html>