| 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 15 matching lines...) Expand all Loading... |
| 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 namespace WebCore { | 34 namespace WebCore { |
| 35 | 35 |
| 36 TrackBase::TrackBase(Type type, const AtomicString& label, const AtomicString& l
anguage, const AtomicString& id) | 36 static blink::WebMediaPlayer::TrackId nextTrackId() |
| 37 : m_type(type) | 37 { |
| 38 static blink::WebMediaPlayer::TrackId next = 0; |
| 39 return ++next; |
| 40 } |
| 41 |
| 42 TrackBase::TrackBase(Type type, const AtomicString& label, const AtomicString& l
anguage, const String& id) |
| 43 : m_trackId(nextTrackId()) |
| 44 , m_type(type) |
| 38 , m_label(label) | 45 , m_label(label) |
| 39 , m_language(language) | 46 , m_language(language) |
| 40 , m_id(id) | 47 , m_id(id) |
| 48 , m_mediaElement(nullptr) |
| 41 { | 49 { |
| 42 } | 50 } |
| 43 | 51 |
| 44 TrackBase::~TrackBase() | 52 TrackBase::~TrackBase() |
| 45 { | 53 { |
| 54 #if !ENABLE(OILPAN) |
| 55 ASSERT(!m_mediaElement); |
| 56 #endif |
| 46 } | 57 } |
| 47 | 58 |
| 48 void TrackBase::setKind(const AtomicString& kind) | 59 void TrackBase::setKind(const AtomicString& kind) |
| 49 { | 60 { |
| 50 if (isValidKind(kind)) | 61 if (isValidKind(kind)) |
| 51 m_kind = kind; | 62 m_kind = kind; |
| 52 else | 63 else |
| 53 m_kind = defaultKind(); | 64 m_kind = defaultKind(); |
| 54 } | 65 } |
| 55 | 66 |
| 56 } // namespace WebCore | 67 } // namespace WebCore |
| 57 | |
| OLD | NEW |