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

Side by Side Diff: third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.cpp

Issue 2347763002: [Blink, RemotePlayback] Reject the prompt() with OperationError if there's a pending promise for th… (Closed)
Patch Set: Added UserGesture flag for tests, removed some checks in HTMLMediaElement, added layout test Created 4 years, 3 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 "modules/remoteplayback/RemotePlayback.h" 5 #include "modules/remoteplayback/RemotePlayback.h"
6 6
7 #include "bindings/core/v8/ScriptPromiseResolver.h" 7 #include "bindings/core/v8/ScriptPromiseResolver.h"
8 #include "core/HTMLNames.h" 8 #include "core/HTMLNames.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "core/dom/Document.h" 10 #include "core/dom/Document.h"
11 #include "core/events/Event.h" 11 #include "core/events/Event.h"
12 #include "core/frame/Settings.h"
12 #include "core/html/HTMLMediaElement.h" 13 #include "core/html/HTMLMediaElement.h"
13 #include "modules/EventTargetModules.h" 14 #include "modules/EventTargetModules.h"
14 #include "modules/remoteplayback/RemotePlaybackAvailability.h" 15 #include "modules/remoteplayback/RemotePlaybackAvailability.h"
15 #include "platform/UserGestureIndicator.h" 16 #include "platform/UserGestureIndicator.h"
16 17
17 namespace blink { 18 namespace blink {
18 19
19 namespace { 20 namespace {
20 21
21 const AtomicString& remotePlaybackStateToString(WebRemotePlaybackState state) 22 const AtomicString& remotePlaybackStateToString(WebRemotePlaybackState state)
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // TODO(avayvod): implement steps 4, 5, 8, 9 of the algorithm. 87 // TODO(avayvod): implement steps 4, 5, 8, 9 of the algorithm.
87 // https://crbug.com/647441 88 // https://crbug.com/647441
88 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 89 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
89 ScriptPromise promise = resolver->promise(); 90 ScriptPromise promise = resolver->promise();
90 91
91 if (m_mediaElement->fastHasAttribute(HTMLNames::disableremoteplaybackAttr)) { 92 if (m_mediaElement->fastHasAttribute(HTMLNames::disableremoteplaybackAttr)) {
92 resolver->reject(DOMException::create(InvalidStateError, "disableRemoteP layback attribute is present.")); 93 resolver->reject(DOMException::create(InvalidStateError, "disableRemoteP layback attribute is present."));
93 return promise; 94 return promise;
94 } 95 }
95 96
96 // TODO(avayvod): should we have a separate flag to disable the user gesture 97 if (m_promptPromiseResolver) {
97 // requirement (for tests) or reuse the one for the PresentationRequest::sta rt()? 98 resolver->reject(DOMException::create(OperationError, "A prompt is alrea dy being shown for this media element."));
98 if (!UserGestureIndicator::utilizeUserGesture()) { 99 return promise;
100 }
101
102 Settings* contextSettings = m_mediaElement->document().settings();
103 bool isUserGestureRequired = !contextSettings || contextSettings->remotePlay backRequiresUserGesture();
104 if (isUserGestureRequired && !UserGestureIndicator::utilizeUserGesture()) {
99 resolver->reject(DOMException::create(InvalidAccessError, "RemotePlaybac k::prompt() requires user gesture.")); 105 resolver->reject(DOMException::create(InvalidAccessError, "RemotePlaybac k::prompt() requires user gesture."));
100 return promise; 106 return promise;
101 } 107 }
102 108
103 if (m_state == WebRemotePlaybackState::Disconnected) { 109 if (m_state == WebRemotePlaybackState::Disconnected) {
104 m_promptPromiseResolvers.append(resolver); 110 m_promptPromiseResolver = resolver;
105 m_mediaElement->requestRemotePlayback(); 111 m_mediaElement->requestRemotePlayback();
106 } else { 112 } else {
107 m_mediaElement->requestRemotePlaybackControl(); 113 m_mediaElement->requestRemotePlaybackControl();
108 // TODO(avayvod): Need to keep the resolver until user chooses to stop 114 // TODO(avayvod): Need to keep the resolver until user chooses to stop
109 // the remote playback (resolve) or dismisses the UI (reject). 115 // the remote playback (resolve) or dismisses the UI (reject).
110 // Steps 11 and 12 of the prompt() algorithm. 116 // Steps 11 and 12 of the prompt() algorithm.
111 // https://crbug.com/647441 117 // https://crbug.com/647441
112 resolver->resolve(); 118 resolver->resolve();
113 } 119 }
114 120
115 return promise; 121 return promise;
116 } 122 }
117 123
118 String RemotePlayback::state() const 124 String RemotePlayback::state() const
119 { 125 {
120 return remotePlaybackStateToString(m_state); 126 return remotePlaybackStateToString(m_state);
121 } 127 }
122 128
123 bool RemotePlayback::hasPendingActivity() const 129 bool RemotePlayback::hasPendingActivity() const
124 { 130 {
125 return hasEventListeners() 131 return hasEventListeners()
126 || !m_availabilityObjects.isEmpty() 132 || !m_availabilityObjects.isEmpty()
127 || !m_promptPromiseResolvers.isEmpty(); 133 || m_promptPromiseResolver;
128 } 134 }
129 135
130 void RemotePlayback::stateChanged(WebRemotePlaybackState state) 136 void RemotePlayback::stateChanged(WebRemotePlaybackState state)
131 { 137 {
132 // We may get a "disconnected" state change while in the "disconnected" 138 // We may get a "disconnected" state change while in the "disconnected"
133 // state if initiated connection fails. So cleanup the promise resolvers 139 // state if initiated connection fails. So cleanup the promise resolvers
134 // before checking if anything changed. 140 // before checking if anything changed.
135 // TODO(avayvod): cleanup this logic when we implementing the "connecting" 141 // TODO(avayvod): cleanup this logic when we implementing the "connecting"
136 // state. 142 // state.
137 if (state != WebRemotePlaybackState::Disconnected) { 143 if (m_promptPromiseResolver) {
138 for (auto& resolver : m_promptPromiseResolvers) 144 if (state != WebRemotePlaybackState::Disconnected)
139 resolver->resolve(); 145 m_promptPromiseResolver->resolve();
140 } else { 146 else
141 for (auto& resolver : m_promptPromiseResolvers) 147 m_promptPromiseResolver->reject(DOMException::create(AbortError, "Fa iled to connect to the remote device."));
142 resolver->reject(DOMException::create(AbortError, "Failed to connect to the remote device.")); 148 m_promptPromiseResolver = nullptr;
143 } 149 }
144 m_promptPromiseResolvers.clear();
145 150
146 if (m_state == state) 151 if (m_state == state)
147 return; 152 return;
148 153
149 m_state = state; 154 m_state = state;
150 dispatchEvent(Event::create(EventTypeNames::statechange)); 155 dispatchEvent(Event::create(EventTypeNames::statechange));
151 } 156 }
152 157
153 void RemotePlayback::availabilityChanged(bool available) 158 void RemotePlayback::availabilityChanged(bool available)
154 { 159 {
155 if (m_availability == available) 160 if (m_availability == available)
156 return; 161 return;
157 162
158 m_availability = available; 163 m_availability = available;
159 for (auto& availabilityObject : m_availabilityObjects) 164 for (auto& availabilityObject : m_availabilityObjects)
160 availabilityObject->availabilityChanged(available); 165 availabilityObject->availabilityChanged(available);
161 } 166 }
162 167
163 void RemotePlayback::promptCancelled() 168 void RemotePlayback::promptCancelled()
164 { 169 {
165 for (auto& resolver : m_promptPromiseResolvers) 170 if (!m_promptPromiseResolver)
166 resolver->resolve(); 171 return;
167 m_promptPromiseResolvers.clear(); 172
173 m_promptPromiseResolver->resolve();
174 m_promptPromiseResolver = nullptr;
168 } 175 }
169 176
170 DEFINE_TRACE(RemotePlayback) 177 DEFINE_TRACE(RemotePlayback)
171 { 178 {
172 visitor->trace(m_availabilityObjects); 179 visitor->trace(m_availabilityObjects);
173 visitor->trace(m_promptPromiseResolvers); 180 visitor->trace(m_promptPromiseResolver);
174 visitor->trace(m_mediaElement); 181 visitor->trace(m_mediaElement);
175 EventTargetWithInlineData::trace(visitor); 182 EventTargetWithInlineData::trace(visitor);
176 } 183 }
177 184
178 } // namespace blink 185 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698