Source/core/html/shadow/MediaControls.h - Issue 1082533002: Support text track selection in video controls

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

Issue 1082533002: Support text track selection in video controls (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 5 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

« Source/core/html/shadow/MediaControlElements.cpp ('K') | « Source/core/html/shadow/MediaControlElements.cpp ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | Source/core/html/shadow/MediaControls.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 Loading...
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 showOverlayCastButton();	70 void showOverlayCastButton();

70	71

71 void mediaElementFocused();	72 void mediaElementFocused();

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
116	117

117 // Media control elements.	118 // Media control elements.

118 RawPtrWillBeMember<MediaControlOverlayPlayButtonElement> m_overlayPlayButton ;	119 RawPtrWillBeMember<MediaControlOverlayPlayButtonElement> m_overlayPlayButton ;

119 RawPtrWillBeMember<MediaControlOverlayEnclosureElement> m_overlayEnclosure;	120 RawPtrWillBeMember<MediaControlOverlayEnclosureElement> m_overlayEnclosure;

120 RawPtrWillBeMember<MediaControlPlayButtonElement> m_playButton;	121 RawPtrWillBeMember<MediaControlPlayButtonElement> m_playButton;

121 RawPtrWillBeMember<MediaControlCurrentTimeDisplayElement> m_currentTimeDispl ay;	122 RawPtrWillBeMember<MediaControlCurrentTimeDisplayElement> m_currentTimeDispl ay;

122 RawPtrWillBeMember<MediaControlTimelineElement> m_timeline;	123 RawPtrWillBeMember<MediaControlTimelineElement> m_timeline;

123 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;	124 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;

124 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;	125 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;

125 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;	126 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;

	127 RawPtrWillBeMember<MediaControlTextTrackListElement> m_textTrackList;

126 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;	128 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;

127 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton;	129 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton;

128 RawPtrWillBeMember<MediaControlCastButtonElement> m_overlayCastButton;	130 RawPtrWillBeMember<MediaControlCastButtonElement> m_overlayCastButton;

129 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;	131 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;

130 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;	132 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;

131	133

132 Timer<MediaControls> m_hideMediaControlsTimer;	134 Timer<MediaControls> m_hideMediaControlsTimer;

133 unsigned m_hideTimerBehaviorFlags;	135 unsigned m_hideTimerBehaviorFlags;

134 bool m_isMouseOverControls : 1;	136 bool m_isMouseOverControls : 1;

135 bool m_isPausedForScrubbing : 1;	137 bool m_isPausedForScrubbing : 1;

136 };	138 };

137	139

138 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());	140 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());

139	141

140 }	142 }

141	143

142 #endif	144 #endif

OLD	NEW