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

Side by Side Diff: Source/core/html/track/VideoTrack.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/TrackListBase.h ('k') | Source/core/html/track/VideoTrackList.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/html/track/VideoTrack.h" 6 #include "core/html/track/VideoTrack.h"
7 7
8 #include "core/html/HTMLMediaElement.h" 8 #include "core/html/HTMLMediaElement.h"
9 9
10 namespace blink { 10 namespace blink {
(...skipping 15 matching lines...) Expand all
26 } 26 }
27 27
28 void VideoTrack::setSelected(bool selected) 28 void VideoTrack::setSelected(bool selected)
29 { 29 {
30 if (selected == m_selected) 30 if (selected == m_selected)
31 return; 31 return;
32 32
33 m_selected = selected; 33 m_selected = selected;
34 34
35 if (mediaElement()) { 35 if (mediaElement()) {
36 blink::WebMediaPlayer::TrackId selectedTrackId = trackId(); 36 WebMediaPlayer::TrackId selectedTrackId = trackId();
37 mediaElement()->selectedVideoTrackChanged(selected ? &selectedTrackId : 0); 37 mediaElement()->selectedVideoTrackChanged(selected ? &selectedTrackId : 0);
38 } 38 }
39 } 39 }
40 40
41 const AtomicString& VideoTrack::alternativeKeyword() 41 const AtomicString& VideoTrack::alternativeKeyword()
42 { 42 {
43 DEFINE_STATIC_LOCAL(const AtomicString, keyword, ("alternative", AtomicStrin g::ConstructFromLiteral)); 43 DEFINE_STATIC_LOCAL(const AtomicString, keyword, ("alternative", AtomicStrin g::ConstructFromLiteral));
44 return keyword; 44 return keyword;
45 } 45 }
46 46
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 || (kind == subtitlesKeyword()) 83 || (kind == subtitlesKeyword())
84 || (kind == commentaryKeyword()) 84 || (kind == commentaryKeyword())
85 || (kind == emptyAtom); 85 || (kind == emptyAtom);
86 } 86 }
87 87
88 AtomicString VideoTrack::defaultKind() const 88 AtomicString VideoTrack::defaultKind() const
89 { 89 {
90 return emptyAtom; 90 return emptyAtom;
91 } 91 }
92 92
93 } 93 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/track/TrackListBase.h ('k') | Source/core/html/track/VideoTrackList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698