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

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

Issue 92763002: Rename addTrack and removeTrack functions to addTextTrack and removeTextTrack. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased to apply cleanly Created 6 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
« 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 double percentLoaded() const; 181 double percentLoaded() const;
182 182
183 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, const AtomicString& language, ExceptionState&); 183 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, const AtomicString& language, ExceptionState&);
184 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, ExceptionState& exceptionState) { return addTextTrack(kind, label, e mptyAtom, exceptionState); } 184 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, ExceptionState& exceptionState) { return addTextTrack(kind, label, e mptyAtom, exceptionState); }
185 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, ExceptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, exceptionStat e); } 185 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, ExceptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, exceptionStat e); }
186 186
187 TextTrackList* textTracks(); 187 TextTrackList* textTracks();
188 CueList currentlyActiveCues() const { return m_currentlyActiveCues; } 188 CueList currentlyActiveCues() const { return m_currentlyActiveCues; }
189 189
190 void addTrack(TextTrack*); 190 void addTextTrack(PassRefPtr<TextTrack>);
191 void removeTrack(TextTrack*); 191 void removeTextTrack(TextTrack*);
192 void removeAllInbandTracks(); 192 void removeAllInbandTracks();
193 void closeCaptionTracksChanged(); 193 void closeCaptionTracksChanged();
194 void notifyMediaPlayerOfTextTrackChanges(); 194 void notifyMediaPlayerOfTextTrackChanges();
195 195
196 void didAddTrack(HTMLTrackElement*); 196 void didAddTrack(HTMLTrackElement*);
197 void didRemoveTrack(HTMLTrackElement*); 197 void didRemoveTrack(HTMLTrackElement*);
198 198
199 virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) OVERRIDE FIN AL; 199 virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL;
200 virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL; 200 virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) OVERR IDE FINAL;
201 201
202 struct TrackGroup { 202 struct TrackGroup {
203 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther }; 203 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther };
204 204
205 TrackGroup(GroupKind kind) 205 TrackGroup(GroupKind kind)
206 : visibleTrack(0) 206 : visibleTrack(0)
207 , defaultTrack(0) 207 , defaultTrack(0)
208 , kind(kind) 208 , kind(kind)
209 , hasSrcLang(false) 209 , hasSrcLang(false)
210 { 210 {
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 inline bool isHTMLMediaElement(const Node& node) 587 inline bool isHTMLMediaElement(const Node& node)
588 { 588 {
589 return node.isElementNode() && toElement(node).isMediaElement(); 589 return node.isElementNode() && toElement(node).isMediaElement();
590 } 590 }
591 591
592 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 592 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
593 593
594 } //namespace 594 } //namespace
595 595
596 #endif 596 #endif
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