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

Unified Diff: Source/modules/presentation/Presentation.cpp

Issue 1222623003: Presentation API: implement .getAvalability() (Blink side). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix tests Created 5 years, 5 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
« no previous file with comments | « Source/modules/presentation/Presentation.h ('k') | Source/modules/presentation/Presentation.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/presentation/Presentation.cpp
diff --git a/Source/modules/presentation/Presentation.cpp b/Source/modules/presentation/Presentation.cpp
index 6ef6307c8934a53802f313219dcca8a74892fc89..98cfa5264b8f6032c50c8ac27b33c48db7adc7b1 100644
--- a/Source/modules/presentation/Presentation.cpp
+++ b/Source/modules/presentation/Presentation.cpp
@@ -5,6 +5,7 @@
#include "config.h"
#include "modules/presentation/Presentation.h"
+#include "bindings/core/v8/CallbackPromiseAdapter.h"
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptPromiseResolver.h"
#include "bindings/core/v8/ScriptState.h"
@@ -13,8 +14,8 @@
#include "core/dom/ExceptionCode.h"
#include "core/frame/LocalFrame.h"
#include "modules/EventTargetModules.h"
-#include "modules/presentation/AvailableChangeEvent.h"
#include "modules/presentation/DefaultSessionStartEvent.h"
+#include "modules/presentation/PresentationAvailabilityCallback.h"
#include "modules/presentation/PresentationController.h"
#include "modules/presentation/PresentationSessionClientCallbacks.h"
#include "public/platform/modules/presentation/WebPresentationSessionClient.h"
@@ -95,56 +96,19 @@ ScriptPromise Presentation::joinSession(ScriptState* state, const String& presen
return promise;
}
-bool Presentation::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
+ScriptPromise Presentation::getAvailability(ScriptState* state, const String& presentationUrl)
{
- bool hadEventListeners = hasEventListeners(EventTypeNames::availablechange);
- if (!RefCountedGarbageCollectedEventTargetWithInlineData<Presentation>::addEventListener(eventType, listener, useCapture))
- return false;
-
- if (hasEventListeners(EventTypeNames::availablechange) && !hadEventListeners) {
- PresentationController* controller = presentationController();
- if (controller)
- controller->updateAvailableChangeWatched(true);
- }
-
- return true;
-}
-
-bool Presentation::removeEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
-{
- bool hadEventListeners = hasEventListeners(EventTypeNames::availablechange);
- if (!RefCountedGarbageCollectedEventTargetWithInlineData<Presentation>::removeEventListener(eventType, listener, useCapture))
- return false;
-
- if (hadEventListeners && !hasEventListeners(EventTypeNames::availablechange)) {
- PresentationController* controller = presentationController();
- if (controller)
- controller->updateAvailableChangeWatched(false);
- }
-
- return true;
-}
-
-void Presentation::removeAllEventListeners()
-{
- bool hadEventListeners = hasEventListeners(EventTypeNames::availablechange);
- RefCountedGarbageCollectedEventTargetWithInlineData<Presentation>::removeAllEventListeners();
+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(state);
+ ScriptPromise promise = resolver->promise();
- if (hadEventListeners) {
- PresentationController* controller = presentationController();
- if (controller)
- controller->updateAvailableChangeWatched(false);
+ PresentationController* controller = presentationController();
+ if (!controller) {
+ resolver->reject(DOMException::create(InvalidStateError, "The object is no longer attached to the frame."));
+ return promise;
}
-}
-
-void Presentation::didChangeAvailability(bool available)
-{
- dispatchEvent(AvailableChangeEvent::create(EventTypeNames::availablechange, available));
-}
+ controller->getAvailability(presentationUrl, new PresentationAvailabilityCallback(resolver));
-bool Presentation::isAvailableChangeWatched() const
-{
- return hasEventListeners(EventTypeNames::availablechange);
+ return promise;
}
void Presentation::didStartDefaultSession(PresentationSession* session)
« no previous file with comments | « Source/modules/presentation/Presentation.h ('k') | Source/modules/presentation/Presentation.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698