Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/html/track/InbandTextTrack.h" | 27 #include "core/html/track/InbandTextTrack.h" |
| 28 | 28 |
| 29 #include "bindings/v8/ExceptionStatePlaceholder.h" | 29 #include "bindings/v8/ExceptionStatePlaceholder.h" |
| 30 #include "core/html/HTMLMediaElement.h" | |
| 30 #include "core/html/track/vtt/VTTCue.h" | 31 #include "core/html/track/vtt/VTTCue.h" |
| 31 #include "platform/Logging.h" | 32 #include "platform/Logging.h" |
| 32 #include "public/platform/WebInbandTextTrack.h" | 33 #include "public/platform/WebInbandTextTrack.h" |
| 33 #include "public/platform/WebString.h" | 34 #include "public/platform/WebString.h" |
| 34 #include <math.h> | 35 #include <math.h> |
| 35 | 36 |
| 36 using blink::WebInbandTextTrack; | 37 using blink::WebInbandTextTrack; |
| 37 using blink::WebString; | 38 using blink::WebString; |
| 38 | 39 |
| 39 namespace WebCore { | 40 namespace WebCore { |
| 40 | 41 |
| 41 PassRefPtr<InbandTextTrack> InbandTextTrack::create(Document& document, WebInban dTextTrack* webTrack) | 42 PassRefPtrWillBeRawPtr<InbandTextTrack> InbandTextTrack::create(Document& docume nt, WebInbandTextTrack* webTrack) |
| 42 { | 43 { |
| 43 return adoptRef(new InbandTextTrack(document, webTrack)); | 44 return adoptRefWillBeRefCountedGarbageCollected(new InbandTextTrack(document , webTrack)); |
| 44 } | 45 } |
| 45 | 46 |
| 46 InbandTextTrack::InbandTextTrack(Document& document, WebInbandTextTrack* webTrac k) | 47 InbandTextTrack::InbandTextTrack(Document& document, WebInbandTextTrack* webTrac k) |
| 47 : TextTrack(document, emptyAtom, webTrack->label(), webTrack->language(), we bTrack->id(), InBand) | 48 : TextTrack(document, emptyAtom, webTrack->label(), webTrack->language(), we bTrack->id(), InBand) |
| 48 , m_webTrack(webTrack) | 49 , m_webTrack(webTrack) |
| 49 { | 50 { |
| 50 m_webTrack->setClient(this); | 51 m_webTrack->setClient(this); |
| 51 | 52 |
| 52 switch (m_webTrack->kind()) { | 53 switch (m_webTrack->kind()) { |
| 53 case WebInbandTextTrack::KindSubtitles: | 54 case WebInbandTextTrack::KindSubtitles: |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 if (trackList) | 91 if (trackList) |
| 91 return; | 92 return; |
| 92 | 93 |
| 93 ASSERT(m_webTrack); | 94 ASSERT(m_webTrack); |
| 94 m_webTrack->setClient(0); | 95 m_webTrack->setClient(0); |
| 95 m_webTrack = 0; | 96 m_webTrack = 0; |
| 96 } | 97 } |
| 97 | 98 |
| 98 void InbandTextTrack::addWebVTTCue(double start, double end, const WebString& id , const WebString& content, const WebString& settings) | 99 void InbandTextTrack::addWebVTTCue(double start, double end, const WebString& id , const WebString& content, const WebString& settings) |
| 99 { | 100 { |
| 100 RefPtr<VTTCue> cue = VTTCue::create(document(), start, end, content); | 101 HTMLMediaElement* owner = mediaElement(); |
| 102 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.
| |
| 103 return; | |
| 104 RefPtrWillBeRawPtr<VTTCue> cue = VTTCue::create(owner->document(), start, en d, content); | |
| 101 cue->setId(id); | 105 cue->setId(id); |
| 102 cue->parseSettings(settings); | 106 cue->parseSettings(settings); |
| 103 addCue(cue); | 107 addCue(cue); |
| 104 } | 108 } |
| 105 | 109 |
| 106 } // namespace WebCore | 110 } // namespace WebCore |
| OLD | NEW |