| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/texttrack_impl.h" | 5 #include "content/renderer/media/texttrack_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" |
| 8 #include "base/location.h" |
| 9 #include "base/message_loop/message_loop_proxy.h" |
| 7 #include "content/renderer/media/webinbandtexttrack_impl.h" | 10 #include "content/renderer/media/webinbandtexttrack_impl.h" |
| 11 #include "media/base/bind_to_loop.h" |
| 8 #include "third_party/WebKit/public/platform/WebInbandTextTrackClient.h" | 12 #include "third_party/WebKit/public/platform/WebInbandTextTrackClient.h" |
| 9 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 13 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
| 10 | 14 |
| 11 namespace content { | 15 namespace content { |
| 12 | 16 |
| 13 TextTrackImpl::TextTrackImpl(blink::WebMediaPlayerClient* client, | 17 TextTrackImpl::TextTrackImpl( |
| 14 WebInbandTextTrackImpl* text_track) | 18 const scoped_refptr<base::MessageLoopProxy>& message_loop, |
| 15 : client_(client), text_track_(text_track) { | 19 blink::WebMediaPlayerClient* client, |
| 20 scoped_ptr<WebInbandTextTrackImpl> text_track) |
| 21 : message_loop_(message_loop), |
| 22 client_(client), |
| 23 text_track_(text_track.Pass()) { |
| 16 client_->addTextTrack(text_track_.get()); | 24 client_->addTextTrack(text_track_.get()); |
| 17 } | 25 } |
| 18 | 26 |
| 19 TextTrackImpl::~TextTrackImpl() { | 27 TextTrackImpl::~TextTrackImpl() { |
| 20 if (text_track_->client()) | 28 message_loop_->PostTask( |
| 21 client_->removeTextTrack(text_track_.get()); | 29 FROM_HERE, |
| 30 base::Bind(&TextTrackImpl::OnRemoveTrack, |
| 31 client_, |
| 32 base::Passed(&text_track_))); |
| 22 } | 33 } |
| 23 | 34 |
| 24 void TextTrackImpl::addWebVTTCue(const base::TimeDelta& start, | 35 void TextTrackImpl::addWebVTTCue(const base::TimeDelta& start, |
| 25 const base::TimeDelta& end, | 36 const base::TimeDelta& end, |
| 26 const std::string& id, | 37 const std::string& id, |
| 27 const std::string& content, | 38 const std::string& content, |
| 28 const std::string& settings) { | 39 const std::string& settings) { |
| 29 if (blink::WebInbandTextTrackClient* client = text_track_->client()) | 40 message_loop_->PostTask( |
| 41 FROM_HERE, |
| 42 base::Bind(&TextTrackImpl::OnAddCue, |
| 43 text_track_.get(), |
| 44 start, end, |
| 45 id, content, settings)); |
| 46 } |
| 47 |
| 48 void TextTrackImpl::OnAddCue(WebInbandTextTrackImpl* text_track, |
| 49 const base::TimeDelta& start, |
| 50 const base::TimeDelta& end, |
| 51 const std::string& id, |
| 52 const std::string& content, |
| 53 const std::string& settings) { |
| 54 if (blink::WebInbandTextTrackClient* client = text_track->client()) { |
| 30 client->addWebVTTCue(start.InSecondsF(), | 55 client->addWebVTTCue(start.InSecondsF(), |
| 31 end.InSecondsF(), | 56 end.InSecondsF(), |
| 32 blink::WebString::fromUTF8(id), | 57 blink::WebString::fromUTF8(id), |
| 33 blink::WebString::fromUTF8(content), | 58 blink::WebString::fromUTF8(content), |
| 34 blink::WebString::fromUTF8(settings)); | 59 blink::WebString::fromUTF8(settings)); |
| 60 } |
| 61 } |
| 62 |
| 63 void TextTrackImpl::OnRemoveTrack( |
| 64 blink::WebMediaPlayerClient* client, |
| 65 scoped_ptr<WebInbandTextTrackImpl> text_track) { |
| 66 if (text_track->client()) |
| 67 client->removeTextTrack(text_track.get()); |
| 35 } | 68 } |
| 36 | 69 |
| 37 } // namespace content | 70 } // namespace content |
| OLD | NEW |