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

Side by Side Diff: third_party/WebKit/Source/core/html/shadow/MediaControlsMediaEventListener.cpp

Issue 2793273002: Use internal hooks for notifying fullscreen changes to media controls (Closed)
Patch Set: update more tests Created 3 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
OLDNEW
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 12 matching lines...) Expand all
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 32
33 // Listen to two different fullscreen events in order to make sure the new and
34 // old APIs are handled.
35 mediaElement().addEventListener(EventTypeNames::webkitfullscreenchange, this,
36 false);
37 m_mediaControls->document().addEventListener(EventTypeNames::fullscreenchange,
38 this, false);
39
40 // TextTracks events. 33 // TextTracks events.
41 TextTrackList* textTracks = mediaElement().textTracks(); 34 TextTrackList* textTracks = mediaElement().textTracks();
42 textTracks->addEventListener(EventTypeNames::addtrack, this, false); 35 textTracks->addEventListener(EventTypeNames::addtrack, this, false);
43 textTracks->addEventListener(EventTypeNames::change, this, false); 36 textTracks->addEventListener(EventTypeNames::change, this, false);
44 textTracks->addEventListener(EventTypeNames::removetrack, this, false); 37 textTracks->addEventListener(EventTypeNames::removetrack, this, false);
45 } 38 }
46 39
47 void MediaControlsMediaEventListener::detach() { 40 void MediaControlsMediaEventListener::detach() {
48 DCHECK(!mediaElement().isConnected()); 41 DCHECK(!mediaElement().isConnected());
49 42
50 m_mediaControls->document().removeEventListener(
51 EventTypeNames::fullscreenchange, this, false);
52
53 TextTrackList* textTracks = mediaElement().textTracks(); 43 TextTrackList* textTracks = mediaElement().textTracks();
54 textTracks->removeEventListener(EventTypeNames::addtrack, this, false); 44 textTracks->removeEventListener(EventTypeNames::addtrack, this, false);
55 textTracks->removeEventListener(EventTypeNames::change, this, false); 45 textTracks->removeEventListener(EventTypeNames::change, this, false);
56 textTracks->removeEventListener(EventTypeNames::removetrack, this, false); 46 textTracks->removeEventListener(EventTypeNames::removetrack, this, false);
57 } 47 }
58 48
59 bool MediaControlsMediaEventListener::operator==( 49 bool MediaControlsMediaEventListener::operator==(
60 const EventListener& other) const { 50 const EventListener& other) const {
61 return this == &other; 51 return this == &other;
62 } 52 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 84 }
95 if (event->type() == EventTypeNames::error) { 85 if (event->type() == EventTypeNames::error) {
96 m_mediaControls->onError(); 86 m_mediaControls->onError();
97 return; 87 return;
98 } 88 }
99 if (event->type() == EventTypeNames::loadedmetadata) { 89 if (event->type() == EventTypeNames::loadedmetadata) {
100 m_mediaControls->onLoadedMetadata(); 90 m_mediaControls->onLoadedMetadata();
101 return; 91 return;
102 } 92 }
103 93
104 // Fullscreen handling.
105 if (event->type() == EventTypeNames::fullscreenchange ||
106 event->type() == EventTypeNames::webkitfullscreenchange) {
107 if (mediaElement().isFullscreen())
108 m_mediaControls->onEnteredFullscreen();
109 else
110 m_mediaControls->onExitedFullscreen();
111 return;
112 }
113
114 // TextTracks events. 94 // TextTracks events.
115 if (event->type() == EventTypeNames::addtrack || 95 if (event->type() == EventTypeNames::addtrack ||
116 event->type() == EventTypeNames::removetrack) { 96 event->type() == EventTypeNames::removetrack) {
117 m_mediaControls->onTextTracksAddedOrRemoved(); 97 m_mediaControls->onTextTracksAddedOrRemoved();
118 return; 98 return;
119 } 99 }
120 if (event->type() == EventTypeNames::change) { 100 if (event->type() == EventTypeNames::change) {
121 m_mediaControls->onTextTracksChanged(); 101 m_mediaControls->onTextTracksChanged();
122 return; 102 return;
123 } 103 }
124 104
125 NOTREACHED(); 105 NOTREACHED();
126 } 106 }
127 107
128 DEFINE_TRACE(MediaControlsMediaEventListener) { 108 DEFINE_TRACE(MediaControlsMediaEventListener) {
129 EventListener::trace(visitor); 109 EventListener::trace(visitor);
130 visitor->trace(m_mediaControls); 110 visitor->trace(m_mediaControls);
131 } 111 }
132 112
133 } // namespace blink 113 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698