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

Unified Diff: third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.cpp

Issue 2415723002: [Blink, RemotePlayback] watchAvailability() implementation. (Closed)
Patch Set: Cleanup after RemotePlaybackAvailability 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.cpp
diff --git a/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.cpp b/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.cpp
index c17d001e919af3572084dd23b764d5f020ac43e5..26d31eee843ed698be30ba19768e30e255bd7119 100644
--- a/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.cpp
+++ b/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.cpp
@@ -5,13 +5,14 @@
#include "modules/remoteplayback/RemotePlayback.h"
#include "bindings/core/v8/ScriptPromiseResolver.h"
+#include "bindings/modules/v8/RemotePlaybackAvailabilityCallback.h"
#include "core/HTMLNames.h"
#include "core/dom/DOMException.h"
#include "core/dom/Document.h"
+#include "core/dom/ExecutionContextTask.h"
#include "core/events/Event.h"
#include "core/html/HTMLMediaElement.h"
#include "modules/EventTargetModules.h"
-#include "modules/remoteplayback/RemotePlaybackAvailability.h"
#include "platform/UserGestureIndicator.h"
namespace blink {
@@ -61,25 +62,87 @@ ExecutionContext* RemotePlayback::getExecutionContext() const {
return &m_mediaElement->document();
}
-ScriptPromise RemotePlayback::getAvailability(ScriptState* scriptState) {
+ScriptPromise RemotePlayback::watchAvailability(
+ ScriptState* scriptState,
+ RemotePlaybackAvailabilityCallback* callback) {
ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
+ if (m_mediaElement->fastHasAttribute(HTMLNames::disableremoteplaybackAttr)) {
+ resolver->reject(DOMException::create(
+ InvalidStateError, "disableRemotePlayback attribute is present."));
+ return promise;
+ }
+
+ // TODO(avayvod): implement steps 4 and 5 of the algorithm.
Zhiqiang Zhang (Slow) 2016/10/13 15:23:11 add a bug number?
whywhat 2016/10/14 19:58:19 Done.
+ int id;
+ do {
+ id = getExecutionContext()->circularSequentialID();
+ } while (!m_availabilityCallbacks.add(id, callback).isNewEntry);
bashi 2016/10/13 00:45:46 |callback| only has a weak reference to v8::Functi
whywhat 2016/10/14 19:58:19 I think I need more info... Should I add Prologue
bashi 2016/10/17 00:11:05 Maybe either is fine. As for removing, it depend
+
+ if (!m_scriptState)
+ m_scriptState = scriptState;
Zhiqiang Zhang (Slow) 2016/10/13 15:23:11 Is this the same scriptState every time? Maybe yes
whywhat 2016/10/14 19:58:19 That's something I'm not 100% sure about. Other pl
haraken 2016/10/15 01:52:45 m_scriptState must be equal to scriptState. You c
whywhat 2016/10/16 03:41:40 Do you mean I should remove the if and just always
haraken 2016/10/17 00:19:52 Yes. You can save the ScriptState in the construct
+
+ // Report the current availability via the callback.
+ getExecutionContext()->postTask(
+ BLINK_FROM_HERE,
+ createSameThreadTask(&RemotePlayback::notifyInitialAvailability,
+ wrapPersistent(this), id),
+ "watchAvailabilityCallback");
+
// TODO(avayvod): Currently the availability is tracked for each media element
// as soon as it's created, we probably want to limit that to when the
// page/element is visible (see https://crbug.com/597281) and has default
// controls. If there are no default controls, we should also start tracking
- // availability on demand meaning the Promise returned by getAvailability()
+ // availability on demand meaning the Promise returned by watchAvailability()
// will be resolved asynchronously.
- RemotePlaybackAvailability* availability =
- RemotePlaybackAvailability::take(resolver, m_availability);
- m_availabilityObjects.append(availability);
- resolver->resolve(availability);
+ resolver->resolve(id);
+ return promise;
+}
+
+ScriptPromise RemotePlayback::cancelWatchAvailability(ScriptState* scriptState,
+ int id) {
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
+ ScriptPromise promise = resolver->promise();
+
+ if (m_mediaElement->fastHasAttribute(HTMLNames::disableremoteplaybackAttr)) {
+ resolver->reject(DOMException::create(
+ InvalidStateError, "disableRemotePlayback attribute is present."));
+ return promise;
+ }
+
+ auto iter = m_availabilityCallbacks.find(id);
+ if (iter == m_availabilityCallbacks.end()) {
+ resolver->reject(DOMException::create(
+ NotFoundError, "A callback with the given id is not found."));
+ return promise;
+ }
+
+ m_availabilityCallbacks.remove(iter);
+
+ resolver->resolve();
+ return promise;
+}
+
+ScriptPromise RemotePlayback::cancelWatchAvailability(
+ ScriptState* scriptState) {
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
+ ScriptPromise promise = resolver->promise();
+
+ if (m_mediaElement->fastHasAttribute(HTMLNames::disableremoteplaybackAttr)) {
+ resolver->reject(DOMException::create(
+ InvalidStateError, "disableRemotePlayback attribute is present."));
+ return promise;
+ }
+
+ m_availabilityCallbacks.clear();
+
+ resolver->resolve();
return promise;
}
ScriptPromise RemotePlayback::prompt(ScriptState* scriptState) {
- // TODO(avayvod): implement steps 4, 5, 8, 9 of the algorithm.
+ // TODO(avayvod): implement steps 5, 8, 9 of the algorithm.
// https://crbug.com/647441
ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
@@ -123,10 +186,19 @@ String RemotePlayback::state() const {
}
bool RemotePlayback::hasPendingActivity() const {
- return hasEventListeners() || !m_availabilityObjects.isEmpty() ||
+ return hasEventListeners() || !m_availabilityCallbacks.isEmpty() ||
m_promptPromiseResolver;
}
+void RemotePlayback::notifyInitialAvailability(int callbackId) {
+ // May not find the callback if the website cancels it fast enough.
+ auto iter = m_availabilityCallbacks.find(callbackId);
+ if (iter == m_availabilityCallbacks.end())
+ return;
+
+ iter->value->call(m_scriptState.get(), this, m_availability);
+}
+
void RemotePlayback::stateChanged(WebRemotePlaybackState state) {
// We may get a "disconnected" state change while in the "disconnected"
// state if initiated connection fails. So cleanup the promise resolvers
@@ -154,8 +226,8 @@ void RemotePlayback::availabilityChanged(bool available) {
return;
m_availability = available;
- for (auto& availabilityObject : m_availabilityObjects)
- availabilityObject->availabilityChanged(available);
+ for (auto& callback : m_availabilityCallbacks.values())
+ callback->call(m_scriptState.get(), this, m_availability);
}
void RemotePlayback::promptCancelled() {
@@ -168,7 +240,7 @@ void RemotePlayback::promptCancelled() {
}
DEFINE_TRACE(RemotePlayback) {
- visitor->trace(m_availabilityObjects);
+ visitor->trace(m_availabilityCallbacks);
visitor->trace(m_promptPromiseResolver);
visitor->trace(m_mediaElement);
EventTargetWithInlineData::trace(visitor);

Powered by Google App Engine
This is Rietveld 408576698