[Presentation API] (alternative) 1-UA: send message between controller and receiver page

content/renderer/presentation/presentation_dispatcher.cc

Index: content/renderer/presentation/presentation_dispatcher.cc
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc
index 1299a45e107df015ec592635507dd02a293c60d4..82c9d81795c1ad31ebf11f141cd34261dd2e7b19 100644
--- a/content/renderer/presentation/presentation_dispatcher.cc
+++ b/content/renderer/presentation/presentation_dispatcher.cc
@@ -13,6 +13,7 @@
 #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"
@@ -81,8 +82,8 @@ 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
@@ -375,11 +376,14 @@ void PresentationDispatcher::OnDefaultSessionStarted(
   if (!controller_)
     return;
 
-  if (!session_info.is_null()) {
-    presentation_service_->ListenForSessionMessages(session_info.Clone());
-    controller_->didStartDefaultSession(
-        new PresentationConnectionClient(std::move(session_info)));
-  }
+  if (session_info.is_null())
+    return;
+
+  presentation_service_->ListenForSessionMessages(session_info.Clone());

[imcheng, 2016/11/01 17:20:30]

It seems we shouldn't be listening for messages from MR for 1-ua presentations.

[zhaobin, 2016/11/02 03:55:48]

Done.

+
+  controller_->didStartDefaultSession(new PresentationConnectionClient(
+      session_info.Clone(),
+      CreateAndSetControllerConnectionProxy(session_info.Clone())));
 }
 
 void PresentationDispatcher::OnSessionCreated(
@@ -397,16 +401,26 @@ void PresentationDispatcher::OnSessionCreated(
 
   DCHECK(!session_info.is_null());
   presentation_service_->ListenForSessionMessages(session_info.Clone());

[imcheng, 2016/11/01 17:20:30]

ditto

[zhaobin, 2016/11/02 03:55:48]

Done.

-  callback->onSuccess(
-      base::MakeUnique<PresentationConnectionClient>(std::move(session_info)));
+
+  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(
@@ -496,6 +510,44 @@ void PresentationDispatcher::UpdateListeningState(AvailabilityStatus* status) {
   }
 }
 
+std::unique_ptr<PresentationConnectionProxy>
+PresentationDispatcher::CreateAndSetControllerConnectionProxy(
+    blink::mojom::PresentationSessionInfoPtr session_info) {
+  if (session_info->is_offscreen) {
+    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;
+  }
+  return nullptr;
+}
+
+// static
+blink::mojom::SessionMessagePtr PresentationDispatcher::ToMojoTextMessage(
+    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;
+}
+
+// static
+blink::mojom::SessionMessagePtr PresentationDispatcher::ToMojoBinaryMessage(
+    blink::mojom::PresentationMessageType type,
+    const uint8_t* data,
+    size_t length) {
+  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;
+}
+
 PresentationDispatcher::SendMessageRequest::SendMessageRequest(
     blink::mojom::PresentationSessionInfoPtr session_info,
     blink::mojom::SessionMessagePtr message)
@@ -514,12 +566,8 @@ PresentationDispatcher::CreateSendTextMessageRequest(
   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
@@ -535,12 +583,8 @@ PresentationDispatcher::CreateSendBinaryMessageRequest(
   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(