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

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

Issue 177243018: Prevent 'removetrack' events from firing when all inband text tracks are removed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove console messages Created 6 years, 9 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 addTextTrack(TextTrack*); 189 void addTextTrack(TextTrack*);
190 void removeTextTrack(TextTrack*); 190 void removeTextTrack(TextTrack*);
191 void removeAllInbandTracks();
192 void closeCaptionTracksChanged(); 191 void closeCaptionTracksChanged();
193 void notifyMediaPlayerOfTextTrackChanges(); 192 void notifyMediaPlayerOfTextTrackChanges();
194 193
194 // Implements the "forget the media element's media-resource-specific tracks " algorithm in the HTML5 spec.
195 void forgetResourceSpecificTracks();
196
195 void didAddTrackElement(HTMLTrackElement*); 197 void didAddTrackElement(HTMLTrackElement*);
196 void didRemoveTrackElement(HTMLTrackElement*); 198 void didRemoveTrackElement(HTMLTrackElement*);
197 199
198 virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL; 200 virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL;
199 virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) OVERR IDE FINAL; 201 virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) OVERR IDE FINAL;
200 // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not d epend on it. 202 // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not d epend on it.
201 virtual KURL mediaPlayerPosterURL() OVERRIDE { return KURL(); } 203 virtual KURL mediaPlayerPosterURL() OVERRIDE { return KURL(); }
202 204
203 struct TrackGroup { 205 struct TrackGroup {
204 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther }; 206 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther };
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 inline bool isHTMLMediaElement(const Node& node) 579 inline bool isHTMLMediaElement(const Node& node)
578 { 580 {
579 return node.isElementNode() && toElement(node).isMediaElement(); 581 return node.isElementNode() && toElement(node).isMediaElement();
580 } 582 }
581 583
582 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 584 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
583 585
584 } //namespace 586 } //namespace
585 587
586 #endif 588 #endif
OLDNEW
« no previous file with comments | « LayoutTests/media/track/track-remove-track-expected.txt ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698