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

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

Issue 1115553002: Removing blink::prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 7 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
« no previous file with comments | « Source/core/html/track/TrackBase.h ('k') | Source/core/html/track/TrackListBase.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17 matching lines...) Expand all
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" 34 #include "core/html/HTMLMediaElement.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 static blink::WebMediaPlayer::TrackId nextTrackId() 38 static WebMediaPlayer::TrackId nextTrackId()
39 { 39 {
40 static blink::WebMediaPlayer::TrackId next = 0; 40 static WebMediaPlayer::TrackId next = 0;
41 return ++next; 41 return ++next;
42 } 42 }
43 43
44 TrackBase::TrackBase(Type type, const AtomicString& label, const AtomicString& l anguage, const String& id) 44 TrackBase::TrackBase(Type type, const AtomicString& label, const AtomicString& l anguage, const String& id)
45 : m_trackId(nextTrackId()) 45 : m_trackId(nextTrackId())
46 , m_type(type) 46 , m_type(type)
47 , m_label(label) 47 , m_label(label)
48 , m_language(language) 48 , m_language(language)
49 , m_id(id) 49 , m_id(id)
50 , m_mediaElement(nullptr) 50 , m_mediaElement(nullptr)
(...skipping 20 matching lines...) Expand all
71 71
72 void TrackBase::setKind(const AtomicString& kind) 72 void TrackBase::setKind(const AtomicString& kind)
73 { 73 {
74 if (isValidKind(kind)) 74 if (isValidKind(kind))
75 m_kind = kind; 75 m_kind = kind;
76 else 76 else
77 m_kind = defaultKind(); 77 m_kind = defaultKind();
78 } 78 }
79 79
80 } // namespace blink 80 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/track/TrackBase.h ('k') | Source/core/html/track/TrackListBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698