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

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

Issue 1079323002: Support text track selection in video controls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments from fs Created 4 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
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 void honorUserPreferencesForAutomaticTextTrackSelection(); 183 void honorUserPreferencesForAutomaticTextTrackSelection();
184 184
185 bool textTracksAreReady() const; 185 bool textTracksAreReady() const;
186 void configureTextTrackDisplay(); 186 void configureTextTrackDisplay();
187 void updateTextTrackDisplay(); 187 void updateTextTrackDisplay();
188 double lastSeekTime() const { return m_lastSeekTime; } 188 double lastSeekTime() const { return m_lastSeekTime; }
189 void textTrackReadyStateChanged(TextTrack*); 189 void textTrackReadyStateChanged(TextTrack*);
190 190
191 void textTrackModeChanged(TextTrack*); 191 void textTrackModeChanged(TextTrack*);
192 void disableAutomaticTextTrackSelection();
192 193
193 // EventTarget function. 194 // EventTarget function.
194 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which 195 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which
195 // causes an ambiguity error at compile time. This class's constructor 196 // causes an ambiguity error at compile time. This class's constructor
196 // ensures that both implementations return document, so return the result 197 // ensures that both implementations return document, so return the result
197 // of one of them here. 198 // of one of them here.
198 using HTMLElement::executionContext; 199 using HTMLElement::executionContext;
199 200
200 bool hasSingleSecurityOrigin() const { return webMediaPlayer() && webMediaPl ayer()->hasSingleSecurityOrigin(); } 201 bool hasSingleSecurityOrigin() const { return webMediaPlayer() && webMediaPl ayer()->hasSingleSecurityOrigin(); }
201 202
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 // data has not been loaded since sending a "stalled" event 530 // data has not been loaded since sending a "stalled" event
530 bool m_sentStalledEvent : 1; 531 bool m_sentStalledEvent : 1;
531 532
532 // time has not changed since sending an "ended" event 533 // time has not changed since sending an "ended" event
533 bool m_sentEndEvent : 1; 534 bool m_sentEndEvent : 1;
534 535
535 bool m_closedCaptionsVisible : 1; 536 bool m_closedCaptionsVisible : 1;
536 537
537 bool m_havePreparedToPlay : 1; 538 bool m_havePreparedToPlay : 1;
538 539
540 bool m_didPerformAutomaticTrackSelection : 1;
541
539 bool m_tracksAreReady : 1; 542 bool m_tracksAreReady : 1;
540 bool m_processingPreferenceChange : 1; 543 bool m_processingPreferenceChange : 1;
541 bool m_remoteRoutesAvailable : 1; 544 bool m_remoteRoutesAvailable : 1;
542 bool m_playingRemotely : 1; 545 bool m_playingRemotely : 1;
543 bool m_isFinalizing : 1; 546 bool m_isFinalizing : 1;
544 bool m_initialPlayWithoutUserGesture : 1; 547 bool m_initialPlayWithoutUserGesture : 1;
545 bool m_autoplayMediaCounted : 1; 548 bool m_autoplayMediaCounted : 1;
546 // Whether this element is in overlay fullscreen mode. 549 // Whether this element is in overlay fullscreen mode.
547 bool m_inOverlayFullscreenVideo : 1; 550 bool m_inOverlayFullscreenVideo : 1;
548 551
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 inline bool isHTMLMediaElement(const HTMLElement& element) 623 inline bool isHTMLMediaElement(const HTMLElement& element)
621 { 624 {
622 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 625 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
623 } 626 }
624 627
625 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 628 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
626 629
627 } // namespace blink 630 } // namespace blink
628 631
629 #endif // HTMLMediaElement_h 632 #endif // HTMLMediaElement_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698