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

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

Issue 1079323002: Support text track selection in video controls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and Philip's comments Created 4 years, 8 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) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 void beginScrubbing(); 53 void beginScrubbing();
54 void endScrubbing(); 54 void endScrubbing();
55 55
56 void updateCurrentTimeDisplay(); 56 void updateCurrentTimeDisplay();
57 57
58 void updateVolume(); 58 void updateVolume();
59 59
60 void changedClosedCaptionsVisibility(); 60 void changedClosedCaptionsVisibility();
61 void refreshClosedCaptionsButtonVisibility(); 61 void refreshClosedCaptionsButtonVisibility();
62 void toggleTextTrackList();
62 63
63 void enteredFullscreen(); 64 void enteredFullscreen();
64 void exitedFullscreen(); 65 void exitedFullscreen();
65 66
66 void startedCasting(); 67 void startedCasting();
67 void stoppedCasting(); 68 void stoppedCasting();
68 void refreshCastButtonVisibility(); 69 void refreshCastButtonVisibility();
69 void showOverlayCastButtonIfNeeded(); 70 void showOverlayCastButtonIfNeeded();
70 // Update cast button visibility, but don't try to update our panel 71 // Update cast button visibility, but don't try to update our panel
71 // button visibility for space. 72 // button visibility for space.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 Member<MediaControlCastButtonElement> m_overlayCastButton; 135 Member<MediaControlCastButtonElement> m_overlayCastButton;
135 Member<MediaControlPanelEnclosureElement> m_enclosure; 136 Member<MediaControlPanelEnclosureElement> m_enclosure;
136 Member<MediaControlPanelElement> m_panel; 137 Member<MediaControlPanelElement> m_panel;
137 Member<MediaControlPlayButtonElement> m_playButton; 138 Member<MediaControlPlayButtonElement> m_playButton;
138 Member<MediaControlTimelineElement> m_timeline; 139 Member<MediaControlTimelineElement> m_timeline;
139 Member<MediaControlCurrentTimeDisplayElement> m_currentTimeDisplay; 140 Member<MediaControlCurrentTimeDisplayElement> m_currentTimeDisplay;
140 Member<MediaControlTimeRemainingDisplayElement> m_durationDisplay; 141 Member<MediaControlTimeRemainingDisplayElement> m_durationDisplay;
141 Member<MediaControlMuteButtonElement> m_muteButton; 142 Member<MediaControlMuteButtonElement> m_muteButton;
142 Member<MediaControlVolumeSliderElement> m_volumeSlider; 143 Member<MediaControlVolumeSliderElement> m_volumeSlider;
143 Member<MediaControlToggleClosedCaptionsButtonElement> m_toggleClosedCaptions Button; 144 Member<MediaControlToggleClosedCaptionsButtonElement> m_toggleClosedCaptions Button;
145 Member<MediaControlTextTrackListElement> m_textTrackList;
144 Member<MediaControlCastButtonElement> m_castButton; 146 Member<MediaControlCastButtonElement> m_castButton;
145 Member<MediaControlFullscreenButtonElement> m_fullScreenButton; 147 Member<MediaControlFullscreenButtonElement> m_fullScreenButton;
146 148
147 Timer<MediaControls> m_hideMediaControlsTimer; 149 Timer<MediaControls> m_hideMediaControlsTimer;
148 unsigned m_hideTimerBehaviorFlags; 150 unsigned m_hideTimerBehaviorFlags;
149 bool m_isMouseOverControls : 1; 151 bool m_isMouseOverControls : 1;
150 bool m_isPausedForScrubbing : 1; 152 bool m_isPausedForScrubbing : 1;
151 153
152 Timer<MediaControls> m_panelWidthChangedTimer; 154 Timer<MediaControls> m_panelWidthChangedTimer;
153 int m_panelWidth; 155 int m_panelWidth;
154 156
155 bool m_allowHiddenVolumeControls : 1; 157 bool m_allowHiddenVolumeControls : 1;
156 }; 158 };
157 159
158 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); 160 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());
159 161
160 } // namespace blink 162 } // namespace blink
161 163
162 #endif 164 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698