[Presentation API] (5th) (1-UA) integrate controller and receiver side for 1-UA messaging

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 <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/common/presentation_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/renderer/presentation/presentation_connection_client.h"
+#include "content/renderer/presentation/presentation_connection_proxy.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationAvailabilityObserver.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationController.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationError.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationReceiver.h"
 #include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ skipping 42 matching lines @@
     case blink::mojom::PresentationConnectionCloseReason::CLOSED:
       return blink::WebPresentationConnectionCloseReason::Closed;
     case blink::mojom::PresentationConnectionCloseReason::WENT_AWAY:
       return blink::WebPresentationConnectionCloseReason::WentAway;
     default:
       NOTREACHED();
       return blink::WebPresentationConnectionCloseReason::Error;
   }
 }
 
+blink::mojom::SessionMessagePtr ToMojoTextMessage(

[mark a. foltz, 2016/11/16 01:25:37]

We should really implement Mojo type traits for session messages before landing
this so we're not adding new manual type conversion code.

+    const blink::WebString& message) {
+  blink::mojom::SessionMessagePtr session_message =
+      blink::mojom::SessionMessage::New();
+  session_message->type = blink::mojom::PresentationMessageType::TEXT;
+  session_message->message = message.utf8();
+  return session_message;
+}
+
+blink::mojom::SessionMessagePtr ToMojoBinaryMessage(
+    blink::mojom::PresentationMessageType type,
+    const uint8_t* data,
+    size_t length) {

[mark a. foltz, 2016/11/16 01:25:37]

We'd have to implement a converter between blink::mojom::SessionMessage and
WebVector<uint_8> or some single type.

+  blink::mojom::SessionMessagePtr session_message =
+      blink::mojom::SessionMessage::New();
+  session_message->type = type;
+  session_message->data = std::vector<uint8_t>(data, data + length);
+  return session_message;
+}
+
 }  // namespace
 
 namespace content {
 
 PresentationDispatcher::PresentationDispatcher(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame),
       controller_(nullptr),
-      binding_(this) {
-}
+      receiver_(nullptr),
+      binding_(this) {}
 
 PresentationDispatcher::~PresentationDispatcher() {
   // Controller should be destroyed before the dispatcher when frame is
   // destroyed.
   DCHECK(!controller_);
 }
 
 void PresentationDispatcher::setController(
     blink::WebPresentationController* controller) {
   // There shouldn't be any swapping from one non-null controller to another.
@@ skipping 272 matching lines @@
   }
   status->availability_callbacks.Clear();
   UpdateListeningState(status);
 }
 
 void PresentationDispatcher::OnDefaultSessionStarted(
     blink::mojom::PresentationSessionInfoPtr session_info) {
   if (!controller_)
     return;
 
-  if (!session_info.is_null()) {
+  if (session_info.is_null())
+    return;
+
+  if (!session_info->is_offscreen)
     presentation_service_->ListenForSessionMessages(session_info.Clone());
-    controller_->didStartDefaultSession(
-        new PresentationConnectionClient(std::move(session_info)));
-  }
+
+  controller_->didStartDefaultSession(new PresentationConnectionClient(
+      session_info.Clone(),
+      CreateAndSetControllerConnectionProxy(session_info.Clone())));
 }
 
 void PresentationDispatcher::OnSessionCreated(
     blink::WebPresentationConnectionClientCallbacks* callback,
     blink::mojom::PresentationSessionInfoPtr session_info,
     blink::mojom::PresentationErrorPtr error) {
   DCHECK(callback);
   if (!error.is_null()) {
     DCHECK(session_info.is_null());
     callback->onError(blink::WebPresentationError(
         GetWebPresentationErrorTypeFromMojo(error->error_type),
         blink::WebString::fromUTF8(error->message)));
     return;
   }
 
   DCHECK(!session_info.is_null());
-  presentation_service_->ListenForSessionMessages(session_info.Clone());
-  callback->onSuccess(
-      base::MakeUnique<PresentationConnectionClient>(std::move(session_info)));
+  if (!session_info->is_offscreen)
+    presentation_service_->ListenForSessionMessages(session_info.Clone());
+
+  callback->onSuccess(base::MakeUnique<PresentationConnectionClient>(
+      session_info.Clone(),
+      CreateAndSetControllerConnectionProxy(session_info.Clone())));
 }
 
 void PresentationDispatcher::OnReceiverConnectionAvailable(
-    blink::mojom::PresentationSessionInfoPtr session_info) {
-  if (receiver_) {
-    receiver_->onReceiverConnectionAvailable(
-        new PresentationConnectionClient(std::move(session_info)));
-  }
+    blink::mojom::PresentationSessionInfoPtr session_info,
+    blink::mojom::PresentationConnectionPtr controller) {
+  DCHECK(receiver_);
+
+  std::unique_ptr<PresentationConnectionProxy> receiver_connection_proxy =
+      base::MakeUnique<PresentationConnectionProxy>();
+
+  controller->SetTargetConnection(receiver_connection_proxy->Bind());
+  receiver_connection_proxy->SetTargetConnection(std::move(controller));
+  // Bind receiver_connection_proxy with PresentationConnection
+  // in receiver page.
+  receiver_->onReceiverConnectionAvailable(new PresentationConnectionClient(
+      std::move(session_info), std::move(receiver_connection_proxy)));
 }
 
 void PresentationDispatcher::OnConnectionStateChanged(
     blink::mojom::PresentationSessionInfoPtr connection,
     blink::mojom::PresentationConnectionState state) {
   if (!controller_)
     return;
 
   DCHECK(!connection.is_null());
   controller_->didChangeSessionState(
@@ skipping 69 matching lines @@
   ConnectToPresentationServiceIfNeeded();
   if (should_listen) {
     status->listening_state = ListeningState::WAITING;
     presentation_service_->ListenForScreenAvailability(status->url);
   } else {
     status->listening_state = ListeningState::INACTIVE;
     presentation_service_->StopListeningForScreenAvailability(status->url);
   }
 }
 
+std::unique_ptr<PresentationConnectionProxy>
+PresentationDispatcher::CreateAndSetControllerConnectionProxy(
+    blink::mojom::PresentationSessionInfoPtr session_info) {
+  if (!session_info->is_offscreen)
+    return nullptr;
+
+  std::unique_ptr<PresentationConnectionProxy> controller_connection_proxy =
+      base::MakeUnique<PresentationConnectionProxy>();
+  // Pass controller_connection_proxy to PSImpl and register
+  // it with OffscreenPresentationManager.
+  presentation_service_->SetPresentationConnection(
+      session_info.Clone(), controller_connection_proxy->Bind());
+
+  return controller_connection_proxy;
+}
+
 PresentationDispatcher::SendMessageRequest::SendMessageRequest(
     blink::mojom::PresentationSessionInfoPtr session_info,
     blink::mojom::SessionMessagePtr message)
     : session_info(std::move(session_info)), message(std::move(message)) {}
 
 PresentationDispatcher::SendMessageRequest::~SendMessageRequest() {}
 
 // static
 PresentationDispatcher::SendMessageRequest*
 PresentationDispatcher::CreateSendTextMessageRequest(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     const blink::WebString& message) {
   blink::mojom::PresentationSessionInfoPtr session_info =
       blink::mojom::PresentationSessionInfo::New();
   session_info->url = presentationUrl;
   session_info->id = presentationId.utf8();
 
-  blink::mojom::SessionMessagePtr session_message =
-      blink::mojom::SessionMessage::New();
-  session_message->type = blink::mojom::PresentationMessageType::TEXT;
-  session_message->message = message.utf8();
   return new SendMessageRequest(std::move(session_info),
-                                std::move(session_message));
+                                ToMojoTextMessage(message));
 }
 
 // static
 PresentationDispatcher::SendMessageRequest*
 PresentationDispatcher::CreateSendBinaryMessageRequest(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     blink::mojom::PresentationMessageType type,
     const uint8_t* data,
     size_t length) {
   blink::mojom::PresentationSessionInfoPtr session_info =
       blink::mojom::PresentationSessionInfo::New();
   session_info->url = presentationUrl;
   session_info->id = presentationId.utf8();
 
-  blink::mojom::SessionMessagePtr session_message =
-      blink::mojom::SessionMessage::New();
-  session_message->type = type;
-  session_message->data = std::vector<uint8_t>(data, data + length);
   return new SendMessageRequest(std::move(session_info),
-                                std::move(session_message));
+                                ToMojoBinaryMessage(type, data, length));
 }
 
 PresentationDispatcher::AvailabilityStatus::AvailabilityStatus(
     const GURL& availability_url)
     : url(availability_url),
       last_known_availability(false),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::AvailabilityStatus::~AvailabilityStatus() {
 }
 
 }  // namespace content