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

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

Issue 406213002: If the media controls are visible they should always grab clicks (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Test added - now looking for LGTM or detailed comments. Created 6 years, 5 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) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 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 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 private: 48 private:
49 explicit MediaControlPanelElement(MediaControls&); 49 explicit MediaControlPanelElement(MediaControls&);
50 50
51 virtual const AtomicString& shadowPseudoId() const OVERRIDE; 51 virtual const AtomicString& shadowPseudoId() const OVERRIDE;
52 virtual void defaultEventHandler(Event*) OVERRIDE; 52 virtual void defaultEventHandler(Event*) OVERRIDE;
53 53
54 void startTimer(); 54 void startTimer();
55 void stopTimer(); 55 void stopTimer();
56 void transitionTimerFired(Timer<MediaControlPanelElement>*); 56 void transitionTimerFired(Timer<MediaControlPanelElement>*);
57 virtual bool keepEventInShadowDOM(Event*) OVERRIDE;
57 58
58 bool m_isDisplayed; 59 bool m_isDisplayed;
59 bool m_opaque; 60 bool m_opaque;
60 61
61 Timer<MediaControlPanelElement> m_transitionTimer; 62 Timer<MediaControlPanelElement> m_transitionTimer;
62 }; 63 };
63 64
64 // ---------------------------- 65 // ----------------------------
65 66
66 class MediaControlPanelEnclosureElement FINAL : public MediaControlDivElement { 67 class MediaControlPanelEnclosureElement FINAL : public MediaControlDivElement {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 public: 122 public:
122 static PassRefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> create(M ediaControls&); 123 static PassRefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> create(M ediaControls&);
123 124
124 virtual void updateDisplayType() OVERRIDE; 125 virtual void updateDisplayType() OVERRIDE;
125 126
126 private: 127 private:
127 explicit MediaControlOverlayPlayButtonElement(MediaControls&); 128 explicit MediaControlOverlayPlayButtonElement(MediaControls&);
128 129
129 virtual const AtomicString& shadowPseudoId() const OVERRIDE; 130 virtual const AtomicString& shadowPseudoId() const OVERRIDE;
130 virtual void defaultEventHandler(Event*) OVERRIDE; 131 virtual void defaultEventHandler(Event*) OVERRIDE;
132 virtual bool keepEventInShadowDOM(Event*) OVERRIDE;
acolwell GONE FROM CHROMIUM 2014/07/29 16:23:26 Perhaps I'm misunderstanding something. Why can't
aberent 2014/07/31 10:52:47 Unfortunately, to support the overlay play button,
131 }; 133 };
132 134
133 // ---------------------------- 135 // ----------------------------
134 136
135 class MediaControlToggleClosedCaptionsButtonElement FINAL : public MediaControlI nputElement { 137 class MediaControlToggleClosedCaptionsButtonElement FINAL : public MediaControlI nputElement {
136 public: 138 public:
137 static PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> create(MediaControls&); 139 static PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> create(MediaControls&);
138 140
139 virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; } 141 virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; }
140 142
(...skipping 17 matching lines...) Expand all
158 // FIXME: An "earliest possible position" will be needed once that concept 160 // FIXME: An "earliest possible position" will be needed once that concept
159 // is supported by HTMLMediaElement, see https://crbug.com/137275 161 // is supported by HTMLMediaElement, see https://crbug.com/137275
160 void setPosition(double); 162 void setPosition(double);
161 void setDuration(double); 163 void setDuration(double);
162 164
163 private: 165 private:
164 explicit MediaControlTimelineElement(MediaControls&); 166 explicit MediaControlTimelineElement(MediaControls&);
165 167
166 virtual const AtomicString& shadowPseudoId() const OVERRIDE; 168 virtual const AtomicString& shadowPseudoId() const OVERRIDE;
167 virtual void defaultEventHandler(Event*) OVERRIDE; 169 virtual void defaultEventHandler(Event*) OVERRIDE;
170 virtual bool keepEventInShadowDOM(Event*) OVERRIDE;
168 }; 171 };
169 172
170 // ---------------------------- 173 // ----------------------------
171 174
172 class MediaControlFullscreenButtonElement FINAL : public MediaControlInputElemen t { 175 class MediaControlFullscreenButtonElement FINAL : public MediaControlInputElemen t {
173 public: 176 public:
174 static PassRefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> create(Me diaControls&); 177 static PassRefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> create(Me diaControls&);
175 178
176 virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; } 179 virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; }
177 180
(...skipping 14 matching lines...) Expand all
192 195
193 virtual bool willRespondToMouseMoveEvents() OVERRIDE; 196 virtual bool willRespondToMouseMoveEvents() OVERRIDE;
194 virtual bool willRespondToMouseClickEvents() OVERRIDE; 197 virtual bool willRespondToMouseClickEvents() OVERRIDE;
195 void setVolume(double); 198 void setVolume(double);
196 199
197 private: 200 private:
198 explicit MediaControlVolumeSliderElement(MediaControls&); 201 explicit MediaControlVolumeSliderElement(MediaControls&);
199 202
200 virtual const AtomicString& shadowPseudoId() const OVERRIDE; 203 virtual const AtomicString& shadowPseudoId() const OVERRIDE;
201 virtual void defaultEventHandler(Event*) OVERRIDE; 204 virtual void defaultEventHandler(Event*) OVERRIDE;
205 virtual bool keepEventInShadowDOM(Event*) OVERRIDE;
202 }; 206 };
203 207
204 // ---------------------------- 208 // ----------------------------
205 209
206 class MediaControlTimeRemainingDisplayElement FINAL : public MediaControlTimeDis playElement { 210 class MediaControlTimeRemainingDisplayElement FINAL : public MediaControlTimeDis playElement {
207 public: 211 public:
208 static PassRefPtrWillBeRawPtr<MediaControlTimeRemainingDisplayElement> creat e(MediaControls&); 212 static PassRefPtrWillBeRawPtr<MediaControlTimeRemainingDisplayElement> creat e(MediaControls&);
209 213
210 private: 214 private:
211 explicit MediaControlTimeRemainingDisplayElement(MediaControls&); 215 explicit MediaControlTimeRemainingDisplayElement(MediaControls&);
(...skipping 28 matching lines...) Expand all
240 virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE; 244 virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE;
241 245
242 IntRect m_videoDisplaySize; 246 IntRect m_videoDisplaySize;
243 float m_fontSize; 247 float m_fontSize;
244 }; 248 };
245 249
246 250
247 } // namespace blink 251 } // namespace blink
248 252
249 #endif // MediaControlElements_h 253 #endif // MediaControlElements_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698