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

Unified Diff: Source/modules/presentation/PresentationController.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
Index: Source/modules/presentation/PresentationController.cpp
diff --git a/Source/modules/presentation/PresentationController.cpp b/Source/modules/presentation/PresentationController.cpp
index 881aea1c86c7b7ca21bb1734cbb1fe2fac28a9ba..13c7098553ef43920d2c1538ea21b2c8e6e81899 100644
--- a/Source/modules/presentation/PresentationController.cpp
+++ b/Source/modules/presentation/PresentationController.cpp
@@ -64,7 +64,7 @@ DEFINE_TRACE(PresentationController)
void PresentationController::didStartDefaultSession(WebPresentationSessionClient* sessionClient)
{
if (!m_presentation) {
- PresentationSession::dispose(sessionClient);
+ delete sessionClient;
return;
}
@@ -74,18 +74,22 @@ void PresentationController::didStartDefaultSession(WebPresentationSessionClient
void PresentationController::didChangeSessionState(WebPresentationSessionClient* sessionClient, WebPresentationSessionState state)
{
- if (m_presentation)
- m_presentation->didChangeSessionState(sessionClient, state);
- else
- PresentationSession::dispose(sessionClient);
+ if (!m_presentation) {
+ delete sessionClient;
+ return;
+ }
+
+ m_presentation->didChangeSessionState(sessionClient, state);
}
void PresentationController::didReceiveSessionTextMessage(WebPresentationSessionClient* sessionClient, const WebString& message)
{
- if (m_presentation)
- m_presentation->didReceiveSessionTextMessage(sessionClient, message);
- else
- PresentationSession::dispose(sessionClient);
+ if (!m_presentation) {
+ delete sessionClient;
+ return;
+ }
+
+ m_presentation->didReceiveSessionTextMessage(sessionClient, message);
}
void PresentationController::startSession(const String& presentationUrl, const String& presentationId, WebPresentationSessionClientCallbacks* callbacks)
« no previous file with comments | « Source/modules/presentation/PresentationAvailabilityCallback.cpp ('k') | Source/modules/presentation/PresentationError.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698