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

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: Addressed Mounir's comments Created 4 years, 2 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"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // TODO(avayvod): implement steps 4, 5, 8, 9 of the algorithm. 86 // TODO(avayvod): implement steps 4, 5, 8, 9 of the algorithm.
87 // https://crbug.com/647441 87 // https://crbug.com/647441
88 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 88 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
89 ScriptPromise promise = resolver->promise(); 89 ScriptPromise promise = resolver->promise();
90 90
91 if (m_mediaElement->fastHasAttribute(HTMLNames::disableremoteplaybackAttr)) { 91 if (m_mediaElement->fastHasAttribute(HTMLNames::disableremoteplaybackAttr)) {
92 resolver->reject(DOMException::create(InvalidStateError, "disableRemoteP layback attribute is present.")); 92 resolver->reject(DOMException::create(InvalidStateError, "disableRemoteP layback attribute is present."));
93 return promise; 93 return promise;
94 } 94 }
95 95
96 // TODO(avayvod): should we have a separate flag to disable the user gesture 96 if (m_promptPromiseResolver) {
97 // requirement (for tests) or reuse the one for the PresentationRequest::sta rt()? 97 resolver->reject(DOMException::create(OperationError, "A prompt is alrea dy being shown for this media element."));
98 return promise;
99 }
100
98 if (!UserGestureIndicator::utilizeUserGesture()) { 101 if (!UserGestureIndicator::utilizeUserGesture()) {
99 resolver->reject(DOMException::create(InvalidAccessError, "RemotePlaybac k::prompt() requires user gesture.")); 102 resolver->reject(DOMException::create(InvalidAccessError, "RemotePlaybac k::prompt() requires user gesture."));
100 return promise; 103 return promise;
101 } 104 }
102 105
103 if (m_state == WebRemotePlaybackState::Disconnected) { 106 if (m_state == WebRemotePlaybackState::Disconnected) {
104 m_promptPromiseResolvers.append(resolver); 107 m_promptPromiseResolver = resolver;
105 m_mediaElement->requestRemotePlayback(); 108 m_mediaElement->requestRemotePlayback();
106 } else { 109 } else {
107 m_mediaElement->requestRemotePlaybackControl(); 110 m_mediaElement->requestRemotePlaybackControl();
108 // TODO(avayvod): Need to keep the resolver until user chooses to stop 111 // TODO(avayvod): Need to keep the resolver until user chooses to stop
109 // the remote playback (resolve) or dismisses the UI (reject). 112 // the remote playback (resolve) or dismisses the UI (reject).
110 // Steps 11 and 12 of the prompt() algorithm. 113 // Steps 11 and 12 of the prompt() algorithm.
111 // https://crbug.com/647441 114 // https://crbug.com/647441
112 resolver->resolve(); 115 resolver->resolve();
113 } 116 }
114 117
115 return promise; 118 return promise;
116 } 119 }
117 120
118 String RemotePlayback::state() const 121 String RemotePlayback::state() const
119 { 122 {
120 return remotePlaybackStateToString(m_state); 123 return remotePlaybackStateToString(m_state);
121 } 124 }
122 125
123 bool RemotePlayback::hasPendingActivity() const 126 bool RemotePlayback::hasPendingActivity() const
124 { 127 {
125 return hasEventListeners() 128 return hasEventListeners()
126 || !m_availabilityObjects.isEmpty() 129 || !m_availabilityObjects.isEmpty()
127 || !m_promptPromiseResolvers.isEmpty(); 130 || m_promptPromiseResolver;
128 } 131 }
129 132
130 void RemotePlayback::stateChanged(WebRemotePlaybackState state) 133 void RemotePlayback::stateChanged(WebRemotePlaybackState state)
131 { 134 {
132 // We may get a "disconnected" state change while in the "disconnected" 135 // We may get a "disconnected" state change while in the "disconnected"
133 // state if initiated connection fails. So cleanup the promise resolvers 136 // state if initiated connection fails. So cleanup the promise resolvers
134 // before checking if anything changed. 137 // before checking if anything changed.
135 // TODO(avayvod): cleanup this logic when we implementing the "connecting" 138 // TODO(avayvod): cleanup this logic when we implementing the "connecting"
136 // state. 139 // state.
137 if (state != WebRemotePlaybackState::Disconnected) { 140 if (m_promptPromiseResolver) {
138 for (auto& resolver : m_promptPromiseResolvers) 141 if (state != WebRemotePlaybackState::Disconnected)
139 resolver->resolve(); 142 m_promptPromiseResolver->resolve();
140 } else { 143 else
141 for (auto& resolver : m_promptPromiseResolvers) 144 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.")); 145 m_promptPromiseResolver = nullptr;
143 } 146 }
144 m_promptPromiseResolvers.clear();
145 147
146 if (m_state == state) 148 if (m_state == state)
147 return; 149 return;
148 150
149 m_state = state; 151 m_state = state;
150 dispatchEvent(Event::create(EventTypeNames::statechange)); 152 dispatchEvent(Event::create(EventTypeNames::statechange));
151 } 153 }
152 154
153 void RemotePlayback::availabilityChanged(bool available) 155 void RemotePlayback::availabilityChanged(bool available)
154 { 156 {
155 if (m_availability == available) 157 if (m_availability == available)
156 return; 158 return;
157 159
158 m_availability = available; 160 m_availability = available;
159 for (auto& availabilityObject : m_availabilityObjects) 161 for (auto& availabilityObject : m_availabilityObjects)
160 availabilityObject->availabilityChanged(available); 162 availabilityObject->availabilityChanged(available);
161 } 163 }
162 164
163 void RemotePlayback::promptCancelled() 165 void RemotePlayback::promptCancelled()
164 { 166 {
165 for (auto& resolver : m_promptPromiseResolvers) 167 if (!m_promptPromiseResolver)
166 resolver->resolve(); 168 return;
167 m_promptPromiseResolvers.clear(); 169
170 m_promptPromiseResolver->resolve();
171 m_promptPromiseResolver = nullptr;
168 } 172 }
169 173
170 DEFINE_TRACE(RemotePlayback) 174 DEFINE_TRACE(RemotePlayback)
171 { 175 {
172 visitor->trace(m_availabilityObjects); 176 visitor->trace(m_availabilityObjects);
173 visitor->trace(m_promptPromiseResolvers); 177 visitor->trace(m_promptPromiseResolver);
174 visitor->trace(m_mediaElement); 178 visitor->trace(m_mediaElement);
175 EventTargetWithInlineData::trace(visitor); 179 EventTargetWithInlineData::trace(visitor);
176 } 180 }
177 181
178 } // namespace blink 182 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698