[Presentation API] (1-UA) fire PresentationConnection onterminate event if receiver page gets destr…

content/renderer/presentation/presentation_dispatcher.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/presentation/presentation_dispatcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 252 matching lines @@
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId) {
   ConnectToPresentationServiceIfNeeded();
   presentation_service_->CloseConnection(presentationUrl,
                                          presentationId.utf8());
 }
 
 void PresentationDispatcher::terminateSession(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId) {
-  ConnectToPresentationServiceIfNeeded();
-  presentation_service_->Terminate(presentationUrl, presentationId.utf8());
+  if (receiver_) {
+    receiver_->closeWindow();
+    return;
+  }
+
+  if (controller_) {
+    ConnectToPresentationServiceIfNeeded();
+    presentation_service_->Terminate(presentationUrl, presentationId.utf8());
+    return;
+  }
 }
 
 void PresentationDispatcher::getAvailability(
     const blink::WebVector<blink::WebURL>& availabilityUrls,
     std::unique_ptr<blink::WebPresentationAvailabilityCallbacks> callback) {
   DCHECK(!availabilityUrls.isEmpty());
 
   std::vector<GURL> urls;
   for (const auto& availability_url : availabilityUrls)
     urls.push_back(availability_url);
@@ skipping 261 matching lines @@
   connection->bindProxy(base::WrapUnique(receiver_connection_proxy));
 
   receiver_connection_proxy->Bind(std::move(receiver_connection_request));
   receiver_connection_proxy->BindControllerConnection(
       std::move(controller_connection_ptr));
 }
 
 void PresentationDispatcher::OnConnectionStateChanged(
     const PresentationSessionInfo& session_info,
     PresentationConnectionState state) {
   if (!controller_)

[imcheng, 2017/02/24 19:20:33]

this check no longer needed?

[zhaobin, 2017/02/25 01:31:03]

Done.

     return;
 
-  controller_->didChangeSessionState(
-      blink::WebPresentationSessionInfo(
-          session_info.presentation_url,
-          blink::WebString::fromUTF8(session_info.presentation_id)),
-      GetWebPresentationConnectionState(state));
+  if (receiver_) {
+    receiver_->didChangeSessionState(GetWebPresentationConnectionState(state));
+    return;
+  }
+
+  if (controller_) {
+    controller_->didChangeSessionState(
+        blink::WebPresentationSessionInfo(
+            session_info.presentation_url,
+            blink::WebString::fromUTF8(session_info.presentation_id)),
+        GetWebPresentationConnectionState(state));
+  }
 }
 
 void PresentationDispatcher::OnConnectionClosed(
     const PresentationSessionInfo& session_info,
     PresentationConnectionCloseReason reason,
     const std::string& message) {
   if (!controller_)
     return;
 
   controller_->didCloseConnection(
@@ skipping 203 matching lines @@
 
 PresentationDispatcher::ListeningStatus::ListeningStatus(
     const GURL& availability_url)
     : url(availability_url),
       last_known_availability(ScreenAvailability::UNKNOWN),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::ListeningStatus::~ListeningStatus() {}
 
 }  // namespace content