OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 13 matching lines...) Expand all Loading... | |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/html/track/TrackBase.h" | 32 #include "core/html/track/TrackBase.h" |
33 | 33 |
34 #include "core/html/HTMLMediaElement.h" | |
35 | |
34 namespace WebCore { | 36 namespace WebCore { |
35 | 37 |
36 TrackBase::TrackBase(Type type, const AtomicString& label, const AtomicString& l anguage, const AtomicString& id) | 38 static blink::WebMediaPlayer::TrackId nextTrackId() |
37 : m_type(type) | 39 { |
40 static blink::WebMediaPlayer::TrackId next = 0; | |
41 return ++next; | |
42 } | |
43 | |
44 TrackBase::TrackBase(Type type, const AtomicString& label, const AtomicString& l anguage, const String& id) | |
45 : m_trackId(nextTrackId()) | |
46 , m_type(type) | |
38 , m_label(label) | 47 , m_label(label) |
39 , m_language(language) | 48 , m_language(language) |
40 , m_id(id) | 49 , m_id(id) |
50 , m_mediaElement(nullptr) | |
41 { | 51 { |
42 } | 52 } |
43 | 53 |
44 TrackBase::~TrackBase() | 54 TrackBase::~TrackBase() |
45 { | 55 { |
56 #if !ENABLE(OILPAN) | |
57 ASSERT(!m_mediaElement); | |
58 #endif | |
59 } | |
60 | |
61 | |
62 Node* TrackBase::owner() const | |
acolwell GONE FROM CHROMIUM
2014/06/13 17:43:57
nit: Is there a reason not to inline this like you
philipj_slow
2014/06/14 13:51:03
Yeah, the compiler can't cast from HTMLMediaElemen
| |
63 { | |
64 return m_mediaElement; | |
65 } | |
66 | |
67 void TrackBase::trace(Visitor* visitor) | |
68 { | |
69 visitor->trace(m_mediaElement); | |
46 } | 70 } |
47 | 71 |
48 void TrackBase::setKind(const AtomicString& kind) | 72 void TrackBase::setKind(const AtomicString& kind) |
49 { | 73 { |
50 if (isValidKind(kind)) | 74 if (isValidKind(kind)) |
51 m_kind = kind; | 75 m_kind = kind; |
52 else | 76 else |
53 m_kind = defaultKind(); | 77 m_kind = defaultKind(); |
54 } | 78 } |
55 | 79 |
56 } // namespace WebCore | 80 } // namespace WebCore |
57 | |
OLD | NEW |