Bug 860338 - Remove MOZ_WEBVTT. r=khuey, r=ted
authorRalph Giles <giles@mozilla.com>
Wed, 10 Apr 2013 16:37:00 -0700
changeset 135519 fe71fc5d82674d31fe6f27f705aeb3ca5410a9aa
parent 135518 42a879409f18b820d9260d1c6098284a65cb2b20
child 135520 7694941e13d8b0dc65e48ca596801a4f7d2264ed
push id3752
push userlsblakk@mozilla.com
push dateMon, 13 May 2013 17:21:10 +0000
treeherdermozilla-aurora@1580544aef0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, ted
bugs860338
milestone23.0a1
Bug 860338 - Remove MOZ_WEBVTT. r=khuey, r=ted The webvtt dom implementation and parser are a small amount of code. Given the tendency of build-time switches to bitrot, it's not worth keeping this one.
configure.in
layout/media/Makefile.in
toolkit/toolkit.mozbuild
--- a/configure.in
+++ b/configure.in
@@ -4214,17 +4214,16 @@ MOZ_WEBRTC_IN_LIBXUL=
 MOZ_WEBRTC_ASSERT_ALWAYS=1
 MOZ_SCTP=
 MOZ_MEDIA_PLUGINS=
 MOZ_MEDIA_NAVIGATOR=
 MOZ_OMX_PLUGIN=
 MOZ_VP8=
 MOZ_VP8_ERROR_CONCEALMENT=
 MOZ_VP8_ENCODER=
-MOZ_WEBVTT=1
 MOZ_WEBSPEECH=1
 VPX_AS=
 VPX_ASFLAGS=
 VPX_AS_DASH_C_FLAG=
 VPX_AS_CONVERSION=
 VPX_ASM_SUFFIX=
 VPX_X86_ASM=
 VPX_ARM_ASM=
@@ -5696,20 +5695,16 @@ fi
 if test -n "$MOZ_TREMOR"; then
     AC_DEFINE(MOZ_TREMOR)
 fi
 
 if test -n "$MOZ_OPUS"; then
     AC_DEFINE(MOZ_OPUS)
 fi
 
-if test -n "$MOZ_WEBVTT"; then
-    AC_DEFINE(MOZ_WEBVTT)
-fi
-
 dnl ========================================================
 dnl = Check alsa availability on Linux if using sydneyaudio
 dnl ========================================================
 
 dnl If using sydneyaudio with Linux, ensure that the alsa library is available
 if test -n "$MOZ_CUBEB" -a "$OS_TARGET" = "Linux"; then
     MOZ_ALSA=1
 fi
@@ -8904,17 +8899,16 @@ AC_SUBST(MOZ_APP_EXTRA_LIBS)
 AC_SUBST(MOZ_SPEEX_RESAMPLER)
 AC_SUBST(MOZ_SOUNDTOUCH)
 AC_SUBST(MOZ_CUBEB)
 AC_SUBST(MOZ_WAVE)
 AC_SUBST(MOZ_VORBIS)
 AC_SUBST(MOZ_TREMOR)
 AC_SUBST(MOZ_OPUS)
 AC_SUBST(MOZ_WEBM)
-AC_SUBST(MOZ_WEBVTT)
 AC_SUBST(MOZ_DASH)
 AC_SUBST(MOZ_WMF)
 AC_SUBST(MOZ_MEDIA_PLUGINS)
 AC_SUBST(MOZ_OMX_PLUGIN)
 AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT)
 AC_SUBST(MOZ_VP8_ENCODER)
 AC_SUBST(MOZ_VP8)
 AC_SUBST(MOZ_OGG)
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -109,21 +109,19 @@ SHARED_LIBRARY_LIBS 	+= \
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/gfx/2d/$(LIB_PREFIX)gfx2d.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifdef MOZ_ENABLE_SKIA
 SHARED_LIBRARY_LIBS += $(MOZ_SKIA_LIBS)
 endif
 
-ifdef MOZ_WEBVTT
 SHARED_LIBRARY_LIBS += \
   $(DEPTH)/media/webvtt/$(LIB_PREFIX)webvtt.$(LIB_SUFFIX) \
   $(NULL)
-endif
 
 ifdef MOZ_WEBRTC
 ifndef MOZ_WEBRTC_IN_LIBXUL
 DEFINES += -DMOZ_WEBRTC_GKMEDIA=1
 include $(topsrcdir)/media/webrtc/shared_libs.mk
 SHARED_LIBRARY_LIBS += $(WEBRTC_LIBS)
 endif
 endif
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -71,18 +71,17 @@ if CONFIG['MOZ_TREMOR']:
     add_tier_dir('platform', 'media/libtremor')
 
 if CONFIG['MOZ_OPUS']:
     add_tier_dir('platform', 'media/libopus')
 
 if CONFIG['MOZ_WEBM']:
     add_tier_dir('platform', 'media/libnestegg')
 
-if CONFIG['MOZ_WEBVTT']:
-    add_tier_dir('platform', 'media/webvtt')
+add_tier_dir('platform', 'media/webvtt')
 
 if CONFIG['MOZ_VP8'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
     add_tier_dir('platform', 'media/libvpx')
 
 if CONFIG['MOZ_OGG']:
     add_tier_dir('platform', ['media/libogg', 'media/libtheora'])
 
 if CONFIG['MOZ_WEBRTC']: