Source/modules/presentation/PresentationAvailabilityCallback.cpp - Issue 1212423003: Presentation API: Blink changes to allow getAvailability() to be rejected.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1212423003: Presentation API: Blink changes to allow getAvailability() to be rejected. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@presentation-availability-cleanups

Patch Set: 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/PresentationAvailabilityCallback.h ('k') | Source/modules/presentation/PresentationController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/presentation/PresentationAvailabilityCallback.cpp

diff --git a/Source/modules/presentation/PresentationAvailabilityCallback.cpp b/Source/modules/presentation/PresentationAvailabilityCallback.cpp

index fe5afe68a37f45472f3890b4fed45030ad92a5a7..8f9be6fcc8417c021e6798119c1570aebd57d225 100644

--- a/Source/modules/presentation/PresentationAvailabilityCallback.cpp

+++ b/Source/modules/presentation/PresentationAvailabilityCallback.cpp

@@ -6,7 +6,9 @@

#include "modules/presentation/PresentationAvailabilityCallback.h"

#include "bindings/core/v8/ScriptPromiseResolver.h"

+#include "core/dom/DOMException.h"

#include "modules/presentation/PresentationAvailability.h"

+#include "modules/presentation/PresentationError.h"

namespace blink {

@@ -24,11 +26,12 @@ void PresentationAvailabilityCallback::onSuccess(bool* result)

m_resolver->resolve(PresentationAvailability::take(m_resolver.get(), *availability));

}

-void PresentationAvailabilityCallback::onError()

+void PresentationAvailabilityCallback::onError(WebPresentationError* result)

{

+ OwnPtr<WebPresentationError> error = adoptPtr(result);

if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())

return;

- m_resolver->reject();

+ m_resolver->reject(PresentationError::take(*error));

}

} // namespace blink