| 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 22 matching lines...) Expand all Loading... |
| 33 #include "core/html/HTMLMediaElement.h" | 33 #include "core/html/HTMLMediaElement.h" |
| 34 | 34 |
| 35 namespace blink { | 35 namespace blink { |
| 36 | 36 |
| 37 static WebMediaPlayer::TrackId nextTrackId() | 37 static WebMediaPlayer::TrackId nextTrackId() |
| 38 { | 38 { |
| 39 static WebMediaPlayer::TrackId next = 0; | 39 static WebMediaPlayer::TrackId next = 0; |
| 40 return ++next; | 40 return ++next; |
| 41 } | 41 } |
| 42 | 42 |
| 43 TrackBase::TrackBase(TrackType type, const AtomicString& label, const AtomicStri
ng& language, const String& id) | 43 TrackBase::TrackBase(WebMediaPlayer::TrackType type, const AtomicString& label,
const AtomicString& language, const String& id) |
| 44 : m_trackId(nextTrackId()) | 44 : m_trackId(nextTrackId()) |
| 45 , m_type(type) | 45 , m_type(type) |
| 46 , m_label(label) | 46 , m_label(label) |
| 47 , m_language(language) | 47 , m_language(language) |
| 48 , m_id(id) | 48 , m_id(id) |
| 49 , m_mediaElement(nullptr) | 49 , m_mediaElement(nullptr) |
| 50 { | 50 { |
| 51 } | 51 } |
| 52 | 52 |
| 53 TrackBase::~TrackBase() | 53 TrackBase::~TrackBase() |
| (...skipping 15 matching lines...) Expand all Loading... |
| 69 | 69 |
| 70 void TrackBase::setKind(const AtomicString& kind) | 70 void TrackBase::setKind(const AtomicString& kind) |
| 71 { | 71 { |
| 72 if (isValidKind(kind)) | 72 if (isValidKind(kind)) |
| 73 m_kind = kind; | 73 m_kind = kind; |
| 74 else | 74 else |
| 75 m_kind = defaultKind(); | 75 m_kind = defaultKind(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace blink | 78 } // namespace blink |
| OLD | NEW |