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

Side by Side Diff: Source/core/html/HTMLMediaElement.h

Issue 790633003: Use TextTrackKind enum in HTMLMediaElement.addTextTrack IDL signature (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Nits. Created 5 years, 11 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 bool togglePlayStateWillPlay() const; 168 bool togglePlayStateWillPlay() const;
169 void togglePlayState(); 169 void togglePlayState();
170 170
171 AudioTrackList& audioTracks(); 171 AudioTrackList& audioTracks();
172 void audioTrackChanged(); 172 void audioTrackChanged();
173 173
174 VideoTrackList& videoTracks(); 174 VideoTrackList& videoTracks();
175 void selectedVideoTrackChanged(blink::WebMediaPlayer::TrackId*); 175 void selectedVideoTrackChanged(blink::WebMediaPlayer::TrackId*);
176 176
177 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, con st AtomicString& label, const AtomicString& language, ExceptionState&); 177 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, con st AtomicString& label, const AtomicString& language, ExceptionState&);
178 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, con st AtomicString& label, ExceptionState& exceptionState) { return addTextTrack(ki nd, label, emptyAtom, exceptionState); }
179 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, Exc eptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, e xceptionState); }
180 178
181 TextTrackList* textTracks(); 179 TextTrackList* textTracks();
182 CueList currentlyActiveCues() const { return m_currentlyActiveCues; } 180 CueList currentlyActiveCues() const { return m_currentlyActiveCues; }
183 181
184 void addTextTrack(TextTrack*); 182 void addTextTrack(TextTrack*);
185 void removeTextTrack(TextTrack*); 183 void removeTextTrack(TextTrack*);
186 void textTracksChanged(); 184 void textTracksChanged();
187 void notifyMediaPlayerOfTextTrackChanges(); 185 void notifyMediaPlayerOfTextTrackChanges();
188 186
189 // Implements the "forget the media element's media-resource-specific tracks " algorithm in the HTML5 spec. 187 // Implements the "forget the media element's media-resource-specific tracks " algorithm in the HTML5 spec.
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 inline bool isHTMLMediaElement(const HTMLElement& element) 629 inline bool isHTMLMediaElement(const HTMLElement& element)
632 { 630 {
633 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 631 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
634 } 632 }
635 633
636 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 634 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
637 635
638 } // namespace blink 636 } // namespace blink
639 637
640 #endif // HTMLMediaElement_h 638 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « LayoutTests/media/track/track-addtrack-kind-expected.txt ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698