OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "core/html/shadow/MediaControlsMediaEventListener.h" | 5 #include "core/html/shadow/MediaControlsMediaEventListener.h" |
6 | 6 |
7 #include "core/events/Event.h" | 7 #include "core/events/Event.h" |
8 #include "core/html/HTMLMediaElement.h" | 8 #include "core/html/HTMLMediaElement.h" |
9 #include "core/html/shadow/MediaControls.h" | 9 #include "core/html/shadow/MediaControls.h" |
10 #include "core/html/track/TextTrackList.h" | 10 #include "core/html/track/TextTrackList.h" |
(...skipping 11 matching lines...) Expand all Loading... | |
22 DCHECK(mediaElement().isConnected()); | 22 DCHECK(mediaElement().isConnected()); |
23 | 23 |
24 mediaElement().addEventListener(EventTypeNames::volumechange, this, false); | 24 mediaElement().addEventListener(EventTypeNames::volumechange, this, false); |
25 mediaElement().addEventListener(EventTypeNames::focusin, this, false); | 25 mediaElement().addEventListener(EventTypeNames::focusin, this, false); |
26 mediaElement().addEventListener(EventTypeNames::timeupdate, this, false); | 26 mediaElement().addEventListener(EventTypeNames::timeupdate, this, false); |
27 mediaElement().addEventListener(EventTypeNames::play, this, false); | 27 mediaElement().addEventListener(EventTypeNames::play, this, false); |
28 mediaElement().addEventListener(EventTypeNames::pause, this, false); | 28 mediaElement().addEventListener(EventTypeNames::pause, this, false); |
29 mediaElement().addEventListener(EventTypeNames::durationchange, this, false); | 29 mediaElement().addEventListener(EventTypeNames::durationchange, this, false); |
30 mediaElement().addEventListener(EventTypeNames::error, this, false); | 30 mediaElement().addEventListener(EventTypeNames::error, this, false); |
31 mediaElement().addEventListener(EventTypeNames::loadedmetadata, this, false); | 31 mediaElement().addEventListener(EventTypeNames::loadedmetadata, this, false); |
32 mediaElement().addEventListener(EventTypeNames::keypress, this, false); | |
33 mediaElement().addEventListener(EventTypeNames::keydown, this, false); | |
34 mediaElement().addEventListener(EventTypeNames::keyup, this, false); | |
mlamouri (slow - plz ping)
2017/03/27 13:02:12
I think keypress should be enough here.
CJ
2017/04/08 00:31:27
Keypress only works for the Enter button. All othe
| |
32 | 35 |
33 // Listen to two different fullscreen events in order to make sure the new and | 36 // Listen to two different fullscreen events in order to make sure the new and |
34 // old APIs are handled. | 37 // old APIs are handled. |
35 mediaElement().addEventListener(EventTypeNames::webkitfullscreenchange, this, | 38 mediaElement().addEventListener(EventTypeNames::webkitfullscreenchange, this, |
36 false); | 39 false); |
37 m_mediaControls->document().addEventListener(EventTypeNames::fullscreenchange, | 40 m_mediaControls->document().addEventListener(EventTypeNames::fullscreenchange, |
38 this, false); | 41 this, false); |
39 | 42 |
40 // TextTracks events. | 43 // TextTracks events. |
41 TextTrackList* textTracks = mediaElement().textTracks(); | 44 TextTrackList* textTracks = mediaElement().textTracks(); |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
115 if (event->type() == EventTypeNames::addtrack || | 118 if (event->type() == EventTypeNames::addtrack || |
116 event->type() == EventTypeNames::removetrack) { | 119 event->type() == EventTypeNames::removetrack) { |
117 m_mediaControls->onTextTracksAddedOrRemoved(); | 120 m_mediaControls->onTextTracksAddedOrRemoved(); |
118 return; | 121 return; |
119 } | 122 } |
120 if (event->type() == EventTypeNames::change) { | 123 if (event->type() == EventTypeNames::change) { |
121 m_mediaControls->onTextTracksChanged(); | 124 m_mediaControls->onTextTracksChanged(); |
122 return; | 125 return; |
123 } | 126 } |
124 | 127 |
128 if (event->type() == EventTypeNames::keypress || EventTypeNames::keydown || | |
129 EventTypeNames::keyup) { | |
mlamouri (slow - plz ping)
2017/03/27 13:02:12
ditto
CJ
2017/04/08 00:31:27
Acknowledged.
| |
130 m_mediaControls->onMediaKeypress(event); | |
131 return; | |
132 } | |
133 | |
125 NOTREACHED(); | 134 NOTREACHED(); |
126 } | 135 } |
127 | 136 |
128 DEFINE_TRACE(MediaControlsMediaEventListener) { | 137 DEFINE_TRACE(MediaControlsMediaEventListener) { |
129 EventListener::trace(visitor); | 138 EventListener::trace(visitor); |
130 visitor->trace(m_mediaControls); | 139 visitor->trace(m_mediaControls); |
131 } | 140 } |
132 | 141 |
133 } // namespace blink | 142 } // namespace blink |
OLD | NEW |