Render inband text tracks in the media pipeline

content/renderer/media/texttrack_impl.cc

Index: content/renderer/media/texttrack_impl.cc
diff --git a/content/renderer/media/texttrack_impl.cc b/content/renderer/media/texttrack_impl.cc
index 7acf39a1a488039c5748bfa031ec9e7ece5a83da..0decd99feea8727006aa006bbd3b79cff1a995e4 100644
--- a/content/renderer/media/texttrack_impl.cc
+++ b/content/renderer/media/texttrack_impl.cc
@@ -4,21 +4,31 @@
 
 #include "content/renderer/media/texttrack_impl.h"
 
+#include "base/bind.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "content/renderer/media/webinbandtexttrack_impl.h"
+#include "media/base/bind_to_loop.h"
 #include "third_party/WebKit/public/web/WebInbandTextTrackClient.h"
 #include "third_party/WebKit/public/web/WebMediaPlayerClient.h"
 
 namespace content {
 
-TextTrackImpl::TextTrackImpl(WebKit::WebMediaPlayerClient* client,
-                             WebInbandTextTrackImpl* text_track)
-    : client_(client), text_track_(text_track) {
+TextTrackImpl::TextTrackImpl(
+    const scoped_refptr<base::MessageLoopProxy>& message_loop,
+    WebKit::WebMediaPlayerClient* client,
+    WebInbandTextTrackImpl* text_track)

[acolwell GONE FROM CHROMIUM, 2013/10/21 20:10:40]

nit: make scoped_ptr<WebInbandTextTrackImpl>

[Matthew Heaney (Chromium), 2013/10/23 05:09:01]

Done.

+    : message_loop_(message_loop),
+      client_(client),
+      text_track_(text_track) {
   client_->addTextTrack(text_track_.get());
 }
 
 TextTrackImpl::~TextTrackImpl() {
-  if (text_track_->client())
-    client_->removeTextTrack(text_track_.get());
+  message_loop_->PostTask(
+      FROM_HERE,
+      base::Bind(&TextTrackImpl::OnRemoveTrack,
+                 client_,
+                 text_track_.release()));

[acolwell GONE FROM CHROMIUM, 2013/10/21 20:10:40]

You need to use base::Passed(&text_track_) here to make the compiler happy w/
the scoped_ptr.

[Matthew Heaney (Chromium), 2013/10/23 05:09:01]

Done.

 }
 
 void TextTrackImpl::addWebVTTCue(const base::TimeDelta& start,
@@ -26,12 +36,36 @@ void TextTrackImpl::addWebVTTCue(const base::TimeDelta& start,
                                  const std::string& id,
                                  const std::string& content,
                                  const std::string& settings) {
-  if (WebKit::WebInbandTextTrackClient* client = text_track_->client())
+  message_loop_->PostTask(
+    FROM_HERE,
+    base::Bind(&TextTrackImpl::OnAddCue,
+                text_track_.get(),
+                start, end,
+                id, content, settings));
+}
+
+void TextTrackImpl::OnAddCue(WebInbandTextTrackImpl* text_track,
+                             const base::TimeDelta& start,
+                             const base::TimeDelta& end,
+                             const std::string& id,
+                             const std::string& content,
+                             const std::string& settings) {
+  if (WebKit::WebInbandTextTrackClient* client = text_track->client()) {
     client->addWebVTTCue(start.InSecondsF(),
                          end.InSecondsF(),
                          WebKit::WebString::fromUTF8(id),
                          WebKit::WebString::fromUTF8(content),
                          WebKit::WebString::fromUTF8(settings));
+  }
+}
+
+void TextTrackImpl::OnRemoveTrack(
+    WebKit::WebMediaPlayerClient* client,
+    WebInbandTextTrackImpl* text_track) {
+  scoped_ptr<WebInbandTextTrackImpl> auto_delete(text_track);

[acolwell GONE FROM CHROMIUM, 2013/10/21 20:10:40]

remove.

[Matthew Heaney (Chromium), 2013/10/23 05:09:01]

Done.

+
+  if (text_track->client())
+    client->removeTextTrack(text_track);
 }
 
 }  // namespace content