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

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

Issue 1233313008: Stop calling configureTextTrackDisplay() in clearMediaPlayer() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: proper test Created 5 years, 5 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 void removeVideoTrack(WebMediaPlayer::TrackId); 195 void removeVideoTrack(WebMediaPlayer::TrackId);
196 196
197 void mediaPlayerDidAddTextTrack(WebInbandTextTrack*) final; 197 void mediaPlayerDidAddTextTrack(WebInbandTextTrack*) final;
198 void mediaPlayerDidRemoveTextTrack(WebInbandTextTrack*) final; 198 void mediaPlayerDidRemoveTextTrack(WebInbandTextTrack*) final;
199 // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not d epend on it. 199 // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not d epend on it.
200 KURL mediaPlayerPosterURL() override { return KURL(); } 200 KURL mediaPlayerPosterURL() override { return KURL(); }
201 201
202 void honorUserPreferencesForAutomaticTextTrackSelection(); 202 void honorUserPreferencesForAutomaticTextTrackSelection();
203 203
204 bool textTracksAreReady() const; 204 bool textTracksAreReady() const;
205 enum VisibilityChangeAssumption { 205 void configureTextTrackDisplay();
206 AssumeNoVisibleChange,
207 AssumeVisibleChange
208 };
209 void configureTextTrackDisplay(VisibilityChangeAssumption);
210 void updateTextTrackDisplay(); 206 void updateTextTrackDisplay();
211 double lastSeekTime() const { return m_lastSeekTime; } 207 double lastSeekTime() const { return m_lastSeekTime; }
212 void textTrackReadyStateChanged(TextTrack*); 208 void textTrackReadyStateChanged(TextTrack*);
213 209
214 void textTrackModeChanged(TextTrack*); 210 void textTrackModeChanged(TextTrack*);
215 211
216 // EventTarget function. 212 // EventTarget function.
217 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which 213 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which
218 // causes an ambiguity error at compile time. This class's constructor 214 // causes an ambiguity error at compile time. This class's constructor
219 // ensures that both implementations return document, so return the result 215 // ensures that both implementations return document, so return the result
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 inline bool isHTMLMediaElement(const HTMLElement& element) 574 inline bool isHTMLMediaElement(const HTMLElement& element)
579 { 575 {
580 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 576 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
581 } 577 }
582 578
583 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 579 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
584 580
585 } // namespace blink 581 } // namespace blink
586 582
587 #endif // HTMLMediaElement_h 583 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « LayoutTests/media/track/media-element-move-to-new-document-assert-expected.txt ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698