Source/core/html/shadow/MediaControls.h - Issue 892963003: Ensure media control goes to transparent(hide) after seek by touch

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

Issue 892963003: Ensure media control goes to transparent(hide) after seek by touch (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 10 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

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 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 explicit MediaControls(HTMLMediaElement&);	78 explicit MediaControls(HTMLMediaElement&);

79	79

80 void initializeControls();	80 void initializeControls();

81	81

82 void makeOpaque();	82 void makeOpaque();

83 void makeTransparent();	83 void makeTransparent();

84	84

85 void updatePlayState();	85 void updatePlayState();

86	86

87 enum HideBehaviorFlags {	87 enum HideBehaviorFlags {

	88 IgnoreNone = 0,

88 IgnoreVideoHover = 1 << 0,	89 IgnoreVideoHover = 1 << 0,

89 IgnoreFocus = 1 << 1,	90 IgnoreFocus = 1 << 1,

90 IgnoreControlsHover = 1 << 2	91 IgnoreControlsHover = 1 << 2

91 };	92 };

92	93

93 bool shouldHideMediaControls(unsigned behaviorFlags = 0) const;	94 bool shouldHideMediaControls(unsigned behaviorFlags = 0) const;

94 void hideMediaControlsTimerFired(Timer<MediaControls>*);	95 void hideMediaControlsTimerFired(Timer<MediaControls>*);

95 void startHideMediaControlsTimer();	96 void startHideMediaControlsTimer();

96 void stopHideMediaControlsTimer();	97 void stopHideMediaControlsTimer();

97 void resetHideMediaControlsTimer();	98 void resetHideMediaControlsTimer();

(...skipping 29 matching lines...) Expand all Loading...
127 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;	128 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;

128 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;	129 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;

129 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;	130 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;

130 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;	131 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;

131 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton;	132 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton;

132 RawPtrWillBeMember<MediaControlCastButtonElement> m_overlayCastButton;	133 RawPtrWillBeMember<MediaControlCastButtonElement> m_overlayCastButton;

133 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;	134 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;

134 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;	135 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;

135	136

136 Timer<MediaControls> m_hideMediaControlsTimer;	137 Timer<MediaControls> m_hideMediaControlsTimer;

	138 unsigned m_hideTimerBehaviorFlags;

137 bool m_isMouseOverControls : 1;	139 bool m_isMouseOverControls : 1;

138 bool m_isPausedForScrubbing : 1;	140 bool m_isPausedForScrubbing : 1;

139 bool m_wasLastEventTouch : 1;	141 bool m_wasLastEventTouch : 1;

140 };	142 };

141	143

142 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());	144 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());

143	145

144 }	146 }

145	147

146 #endif	148 #endif

OLD	NEW