Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: Source/core/html/track/TrackBase.cpp

Issue 170233009: Initial implementation of AudioTrack, AudioTrackList, VideoTrack, and VideoTrackList. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@blink-master
Patch Set: Addressed IDL comments. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 TrackBase::TrackBase(Type type, const AtomicString& label, const AtomicString& l anguage, const String& id)
37 : m_type(type) 37 : m_type(type)
38 , m_label(label) 38 , m_label(label)
39 , m_language(language) 39 , m_language(language)
40 , m_id(id) 40 , m_id(id)
41 , m_mediaElement(0)
41 { 42 {
42 } 43 }
43 44
44 TrackBase::~TrackBase() 45 TrackBase::~TrackBase()
45 { 46 {
47 ASSERT(!m_mediaElement);
46 } 48 }
47 49
48 void TrackBase::setKind(const AtomicString& kind) 50 void TrackBase::setKind(const AtomicString& kind)
49 { 51 {
50 if (isValidKind(kind)) 52 if (isValidKind(kind))
51 m_kind = kind; 53 m_kind = kind;
52 else 54 else
53 m_kind = defaultKind(); 55 m_kind = defaultKind();
54 } 56 }
55 57
56 } // namespace WebCore 58 } // namespace WebCore
57
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698