[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 249 matching lines @@
 }
 
 void PresentationDispatcher::closeSession(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId) {
   ConnectToPresentationServiceIfNeeded();
   presentation_service_->CloseConnection(presentationUrl,
                                          presentationId.utf8());
 }
 
-void PresentationDispatcher::terminateSession(
+void PresentationDispatcher::terminateConnection(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId) {
-  ConnectToPresentationServiceIfNeeded();
-  presentation_service_->Terminate(presentationUrl, presentationId.utf8());
+  if (receiver_) {
+    receiver_->terminateConnection();
+    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 96 matching lines @@
 
   // Remove all pending send message requests.
   MessageRequestQueue empty;
   std::swap(message_request_queue_, empty);
 }
 
 void PresentationDispatcher::OnDestruct() {
   delete this;
 }
 
+void PresentationDispatcher::WidgetWillClose() {
+  if (!receiver_)
+    return;
+
+  receiver_->didChangeSessionState(
+      blink::WebPresentationConnectionState::Terminated);
+}
+
 void PresentationDispatcher::OnScreenAvailabilityUpdated(const GURL& url,
                                                          bool available) {
   auto* listening_status = GetListeningStatus(url);
   if (!listening_status)
     return;
 
   if (listening_status->listening_state == ListeningState::WAITING)
     listening_status->listening_state = ListeningState::ACTIVE;
 
   auto new_screen_availability = available ? ScreenAvailability::AVAILABLE
@@ skipping 376 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