Bug 981280 - Disable WebVTT support on 29 r=bz,cpearce a=sledru
authorRick Eyre <rick.eyre@hotmail.com>
Mon, 07 Apr 2014 08:48:00 -0700
changeset 183755 3a3224245147f2c9775ada56229f5c93cad5c69a
parent 183754 2ab3be04316ae3d1178ed7ea5870b201e2716f8c
child 183756 3960907890b7dbcd94a9afb9d3c1dc851f16f8df
push id3472
push userrgiles@mozilla.com
push dateMon, 14 Apr 2014 18:21:03 +0000
treeherdermozilla-beta@3a3224245147 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, cpearce, sledru
bugs981280
milestone29.0
Bug 981280 - Disable WebVTT support on 29 r=bz,cpearce a=sledru Also adds pushPrefEnv() call to test_texttracklist.html, needed now that we're disabling media.webvtt.enabled by default on 29 and 30.
content/media/test/test_texttracklist.html
dom/imptests/failures/html/microdata/microdata-dom-api/test_001.html.json
dom/tests/mochitest/general/test_interfaces.html
modules/libpref/src/init/all.js
--- a/content/media/test/test_texttracklist.html
+++ b/content/media/test/test_texttracklist.html
@@ -6,34 +6,39 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Media test: TextTrackList change event</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
   SimpleTest.waitForExplicitFinish();
-  video = document.createElement("video");
+  SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
+    function() {
 
-  isnot(video.textTracks, null, "Video should have a list of TextTracks.");
+      video = document.createElement("video");
 
-  video.addTextTrack("subtitles", "", "");
+      isnot(video.textTracks, null, "Video should have a list of TextTracks.");
 
-  track = video.textTracks[0];
-  video.textTracks.addEventListener("change", changed);
+      video.addTextTrack("subtitles", "", "");
+
+      track = video.textTracks[0];
+      video.textTracks.addEventListener("change", changed);
 
-  is(track.mode, "hidden", "New TextTrack's mode should be hidden.");
-  track.mode = "showing";
+      is(track.mode, "hidden", "New TextTrack's mode should be hidden.");
+      track.mode = "showing";
 
-  function changed(event) {
-    is(event.target, video.textTracks, "change event's target should be video.textTracks.");
-    ok(event instanceof window.Event, "change event should be a simple event.");
-    ok(!event.bubbles, "change event should not bubble.");
-    ok(event.isTrusted, "change event should be trusted.");
-    ok(!event.cancelable, "change event should not be cancelable.");
+      function changed(event) {
+        is(event.target, video.textTracks, "change event's target should be video.textTracks.");
+        ok(event instanceof window.Event, "change event should be a simple event.");
+        ok(!event.bubbles, "change event should not bubble.");
+        ok(event.isTrusted, "change event should be trusted.");
+        ok(!event.cancelable, "change event should not be cancelable.");
 
-    SimpleTest.finish();
-  }
+        SimpleTest.finish();
+      }
+
+  }); // end pushPrefEnv.
   </script>
 </head>
 <body>
 </body>
 </html>
--- a/dom/imptests/failures/html/microdata/microdata-dom-api/test_001.html.json
+++ b/dom/imptests/failures/html/microdata/microdata-dom-api/test_001.html.json
@@ -13,10 +13,11 @@
   "itemProp.add should normalize \\r as a space": true,
   "itemProp.add should normalize \\n as a space": true,
   "itemProp.add should normalize \\f as a space": true,
   "itemRef.remove must remove useless whitespace when removing tokens": true,
   "itemRef.add must remove whitespace and duplicate when the token already exists": true,
   "itemRef.add should normalize \\t as a space": true,
   "itemRef.add should normalize \\r as a space": true,
   "itemRef.add should normalize \\n as a space": true,
-  "itemRef.add should normalize \\f as a space": true
+  "itemRef.add should normalize \\f as a space": true,
+  "itemValue must reflect the src attribute on track elements": true
 }
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -512,18 +512,16 @@ var interfaceNamesInGlobalScope =
     "HTMLTemplateElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLTextAreaElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLTimeElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLTitleElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    "HTMLTrackElement",
-// IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLUListElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLUnknownElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLVideoElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "IccChangeEvent", b2g: true, pref: "dom.icc.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -1068,22 +1066,16 @@ var interfaceNamesInGlobalScope =
     "Text",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TextDecoder",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TextEncoder",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TextMetrics",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    "TextTrack",
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    "TextTrackCueList",
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    "TextTrackList",
-// IMPORTANT: Do not change this list without review from a DOM peer!
     "TimeEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TimeRanges",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Touch",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TouchEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -1116,22 +1108,16 @@ var interfaceNamesInGlobalScope =
     "UserProximityEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "USSDReceivedEvent", b2g: true, pref: "dom.mobileconnection.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ValidityState",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "VideoStreamTrack",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    "VTTCue",
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "VTTRegion", pref: "media.webvtt.regions.enabled"},
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    "VTTRegionList",
-// IMPORTANT: Do not change this list without review from a DOM peer!
     "WaveShaperNode",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "WebGLActiveInfo",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "WebGLBuffer",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "WebGLFramebuffer",
 // IMPORTANT: Do not change this list without review from a DOM peer!
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -272,17 +272,17 @@ pref("media.navigator.enabled", true);
 #endif
 #endif
 
 pref("media.tabstreaming.width", 320);
 pref("media.tabstreaming.height", 240);
 pref("media.tabstreaming.time_per_frame", 40);
 
 // TextTrack support
-pref("media.webvtt.enabled", true);
+pref("media.webvtt.enabled", false);
 pref("media.webvtt.regions.enabled", false);
 
 // Whether to enable MediaSource support
 pref("media.mediasource.enabled", false);
 
 #ifdef MOZ_WEBSPEECH
 pref("media.webspeech.recognition.enable", false);
 #endif