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

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

Issue 180173002: Rename text track methods to make way for audio & video tracks. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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 virtual bool canPlay() const OVERRIDE FINAL; 180 virtual bool canPlay() const OVERRIDE FINAL;
181 181
182 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, const AtomicString& language, ExceptionState&); 182 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, ExceptionState& exceptionState) { return addTextTrack(kind, label, e mptyAtom, exceptionState); } 183 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, ExceptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, exceptionStat e); } 184 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, ExceptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, exceptionStat e); }
185 185
186 TextTrackList* textTracks(); 186 TextTrackList* textTracks();
187 CueList currentlyActiveCues() const { return m_currentlyActiveCues; } 187 CueList currentlyActiveCues() const { return m_currentlyActiveCues; }
188 188
189 void addTrack(TextTrack*); 189 void addTextTrack(TextTrack*);
190 void removeTrack(TextTrack*); 190 void removeTextTrack(TextTrack*);
191 void removeAllInbandTracks(); 191 void removeAllInbandTracks();
192 void closeCaptionTracksChanged(); 192 void closeCaptionTracksChanged();
193 void notifyMediaPlayerOfTextTrackChanges(); 193 void notifyMediaPlayerOfTextTrackChanges();
194 194
195 void didAddTrack(HTMLTrackElement*); 195 void didAddTrackElement(HTMLTrackElement*);
196 void didRemoveTrack(HTMLTrackElement*); 196 void didRemoveTrackElement(HTMLTrackElement*);
197 197
198 virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) OVERRIDE FIN AL; 198 virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL;
199 virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL; 199 virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) OVERR IDE FINAL;
200 // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not d epend on it. 200 // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not d epend on it.
201 virtual KURL mediaPlayerPosterURL() OVERRIDE { return KURL(); } 201 virtual KURL mediaPlayerPosterURL() OVERRIDE { return KURL(); }
202 202
203 struct TrackGroup { 203 struct TrackGroup {
204 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther }; 204 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther };
205 205
206 TrackGroup(GroupKind kind) 206 TrackGroup(GroupKind kind)
207 : visibleTrack(nullptr) 207 : visibleTrack(nullptr)
208 , defaultTrack(nullptr) 208 , defaultTrack(nullptr)
209 , kind(kind) 209 , kind(kind)
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 inline bool isHTMLMediaElement(const Node& node) 595 inline bool isHTMLMediaElement(const Node& node)
596 { 596 {
597 return node.isElementNode() && toElement(node).isMediaElement(); 597 return node.isElementNode() && toElement(node).isMediaElement();
598 } 598 }
599 599
600 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 600 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
601 601
602 } //namespace 602 } //namespace
603 603
604 #endif 604 #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