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

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

Issue 453493002: Improve detection of touch events when hiding media controls. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@autoHideControls
Patch Set: Added multimodal tests and NotFromInput synthetic type. Created 6 years, 4 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 void mediaElementFocused(); 69 void mediaElementFocused();
70 70
71 virtual void trace(Visitor*) OVERRIDE; 71 virtual void trace(Visitor*) OVERRIDE;
72 72
73 private: 73 private:
74 explicit MediaControls(HTMLMediaElement&); 74 explicit MediaControls(HTMLMediaElement&);
75 75
76 bool initializeControls(); 76 bool initializeControls();
77 77
78 void makeOpaque(); 78 void makeOpaque();
79 void makeOpaqueIfNeeded(Event*);
79 void makeTransparent(); 80 void makeTransparent();
80 81
81 void updatePlayState(); 82 void updatePlayState();
82 83
83 enum HideBehaviorFlags { 84 enum HideBehaviorFlags {
84 IgnoreVideoHover = 1 << 0, 85 IgnoreVideoHover = 1 << 0,
85 IgnoreFocus = 1 << 1, 86 IgnoreFocus = 1 << 1,
86 IgnoreControlsHover = 1 << 2 87 IgnoreControlsHover = 1 << 2
87 }; 88 };
88 89
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton; 122 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;
122 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider; 123 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;
123 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton; 124 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;
124 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton; 125 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;
125 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y; 126 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;
126 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure; 127 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;
127 128
128 Timer<MediaControls> m_hideMediaControlsTimer; 129 Timer<MediaControls> m_hideMediaControlsTimer;
129 bool m_isMouseOverControls : 1; 130 bool m_isMouseOverControls : 1;
130 bool m_isPausedForScrubbing : 1; 131 bool m_isPausedForScrubbing : 1;
132 bool m_wasLastEventTouch : 1;
131 }; 133 };
132 134
133 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); 135 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());
134 136
135 } 137 }
136 138
137 #endif 139 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698