Render inband text tracks in the media pipeline

media/webm/webm_stream_parser.h

Index: media/webm/webm_stream_parser.h
diff --git a/media/webm/webm_stream_parser.h b/media/webm/webm_stream_parser.h
index 9c3a6d544fc46b418ee3b706561940099fea5cb0..52877763036f072e2b4cd6ee0e79ccff53ca36fc 100644
--- a/media/webm/webm_stream_parser.h
+++ b/media/webm/webm_stream_parser.h
@@ -5,8 +5,6 @@
 #ifndef MEDIA_WEBM_WEBM_STREAM_PARSER_H_
 #define MEDIA_WEBM_WEBM_STREAM_PARSER_H_
 
-#include <map>
-
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder_config.h"
@@ -29,7 +27,7 @@ class WebMStreamParser : public StreamParser {
                     const NewBuffersCB& new_buffers_cb,
                     const NewTextBuffersCB& text_cb,
                     const NeedKeyCB& need_key_cb,
-                    const AddTextTrackCB& add_text_track_cb,
+                    bool enable_text_tracks,

[acolwell GONE FROM CHROMIUM, 2013/10/24 18:57:51]

WDYT about just making text_cb null if text tracks aren't enabled? That would
avoid the need for this extra parameter and also make it impossible for the
parser to transmit text buffers if text tracks are disabled.

[Matthew Heaney (Chromium), 2013/10/25 03:05:38]

Done.

                     const NewMediaSegmentCB& new_segment_cb,
                     const base::Closure& end_of_segment_cb,
                     const LogCB& log_cb) OVERRIDE;
@@ -74,10 +72,7 @@ class WebMStreamParser : public StreamParser {
   NewBuffersCB new_buffers_cb_;
   NewTextBuffersCB text_cb_;
   NeedKeyCB need_key_cb_;
-  AddTextTrackCB add_text_track_cb_;
-
-  typedef std::map<int, TextTrack* > TextTrackMap;
-  TextTrackMap text_track_map_;
+  bool enable_text_tracks_;
 
   NewMediaSegmentCB new_segment_cb_;
   base::Closure end_of_segment_cb_;