Chromium Code Reviews| Index: Source/core/html/track/InbandTextTrack.cpp |
| diff --git a/Source/core/html/track/InbandTextTrack.cpp b/Source/core/html/track/InbandTextTrack.cpp |
| index 1d5cbe37213f0f0a9376ec1d22de0e71bab7f858..f128799a7197802d76c4241cf1d99b8479601997 100644 |
| --- a/Source/core/html/track/InbandTextTrack.cpp |
| +++ b/Source/core/html/track/InbandTextTrack.cpp |
| @@ -27,6 +27,7 @@ |
| #include "core/html/track/InbandTextTrack.h" |
| #include "bindings/v8/ExceptionStatePlaceholder.h" |
| +#include "core/html/HTMLMediaElement.h" |
| #include "core/html/track/vtt/VTTCue.h" |
| #include "platform/Logging.h" |
| #include "public/platform/WebInbandTextTrack.h" |
| @@ -38,9 +39,9 @@ using blink::WebString; |
| namespace WebCore { |
| -PassRefPtr<InbandTextTrack> InbandTextTrack::create(Document& document, WebInbandTextTrack* webTrack) |
| +PassRefPtrWillBeRawPtr<InbandTextTrack> InbandTextTrack::create(Document& document, WebInbandTextTrack* webTrack) |
| { |
| - return adoptRef(new InbandTextTrack(document, webTrack)); |
| + return adoptRefWillBeRefCountedGarbageCollected(new InbandTextTrack(document, webTrack)); |
| } |
| InbandTextTrack::InbandTextTrack(Document& document, WebInbandTextTrack* webTrack) |
| @@ -97,7 +98,10 @@ void InbandTextTrack::setTrackList(TextTrackList* trackList) |
| void InbandTextTrack::addWebVTTCue(double start, double end, const WebString& id, const WebString& content, const WebString& settings) |
| { |
| - RefPtr<VTTCue> cue = VTTCue::create(document(), start, end, content); |
| + HTMLMediaElement* owner = mediaElement(); |
| + if (!owner) |
|
haraken
2014/04/22 02:37:47
Can this happen? In non-oilpan builds, it doesn't
sof
2014/04/22 06:27:52
Right, let's keep the behavior the exact-same.
|
| + return; |
| + RefPtrWillBeRawPtr<VTTCue> cue = VTTCue::create(owner->document(), start, end, content); |
| cue->setId(id); |
| cue->parseSettings(settings); |
| addCue(cue); |