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

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

Issue 540853003: Rename HTMLMediaElement::closeCaptionTracksChanged to textTracksChanged (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.cpp » ('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) 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 179
180 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, con st AtomicString& label, const AtomicString& language, ExceptionState&); 180 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, con st AtomicString& label, const AtomicString& language, ExceptionState&);
181 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, con st AtomicString& label, ExceptionState& exceptionState) { return addTextTrack(ki nd, label, emptyAtom, exceptionState); } 181 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, con st AtomicString& label, ExceptionState& exceptionState) { return addTextTrack(ki nd, label, emptyAtom, exceptionState); }
182 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, Exc eptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, e xceptionState); } 182 PassRefPtrWillBeRawPtr<TextTrack> addTextTrack(const AtomicString& kind, Exc eptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, e xceptionState); }
183 183
184 TextTrackList* textTracks(); 184 TextTrackList* textTracks();
185 CueList currentlyActiveCues() const { return m_currentlyActiveCues; } 185 CueList currentlyActiveCues() const { return m_currentlyActiveCues; }
186 186
187 void addTextTrack(TextTrack*); 187 void addTextTrack(TextTrack*);
188 void removeTextTrack(TextTrack*); 188 void removeTextTrack(TextTrack*);
189 void closeCaptionTracksChanged(); 189 void textTracksChanged();
190 void notifyMediaPlayerOfTextTrackChanges(); 190 void notifyMediaPlayerOfTextTrackChanges();
191 191
192 // Implements the "forget the media element's media-resource-specific tracks " algorithm in the HTML5 spec. 192 // Implements the "forget the media element's media-resource-specific tracks " algorithm in the HTML5 spec.
193 void forgetResourceSpecificTracks(); 193 void forgetResourceSpecificTracks();
194 194
195 void didAddTrackElement(HTMLTrackElement*); 195 void didAddTrackElement(HTMLTrackElement*);
196 void didRemoveTrackElement(HTMLTrackElement*); 196 void didRemoveTrackElement(HTMLTrackElement*);
197 197
198 blink::WebMediaPlayer::TrackId addAudioTrack(const String& id, blink::WebMed iaPlayerClient::AudioTrackKind, const AtomicString& label, const AtomicString& l anguage, bool enabled); 198 blink::WebMediaPlayer::TrackId addAudioTrack(const String& id, blink::WebMed iaPlayerClient::AudioTrackKind, const AtomicString& label, const AtomicString& l anguage, bool enabled);
199 void removeAudioTrack(blink::WebMediaPlayer::TrackId); 199 void removeAudioTrack(blink::WebMediaPlayer::TrackId);
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 inline bool isHTMLMediaElement(const HTMLElement& element) 632 inline bool isHTMLMediaElement(const HTMLElement& element)
633 { 633 {
634 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 634 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
635 } 635 }
636 636
637 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 637 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
638 638
639 } // namespace blink 639 } // namespace blink
640 640
641 #endif // HTMLMediaElement_h 641 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698