[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 <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/common/presentation_constants.h"
 #include "content/public/renderer/render_frame.h"
+#include "content/renderer/presentation/presentation_connection_proxy.h"
 #include "mojo/public/cpp/bindings/type_converter.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/WebPresentationConnection.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationConnectionCallbacks.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/WebPresentationSessionInfo.h"
 #include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "url/gurl.h"
 
 namespace mojo {
@@ skipping 183 matching lines @@
   message_request_queue_.push(base::WrapUnique(CreateSendBinaryMessageRequest(
       presentationUrl, presentationId,
       blink::mojom::PresentationMessageType::BINARY, data, length,
       connection_proxy)));
   // Start processing request if only one in the queue.
   if (message_request_queue_.size() == 1)
     DoSendMessage(message_request_queue_.front().get());
 }
 
 void PresentationDispatcher::DoSendMessage(SendMessageRequest* request) {
-  ConnectToPresentationServiceIfNeeded();
-
-  presentation_service_->SendConnectionMessage(
-      std::move(request->session_info), std::move(request->message),
-      base::Bind(&PresentationDispatcher::HandleSendMessageRequests,
-                 base::Unretained(this)));
+  DCHECK(request->connection_proxy);
+  static_cast<const PresentationConnectionProxy*>(request->connection_proxy)

[mark a. foltz, 2017/01/23 22:29:34]

Is the static_cast necessary?  I don't see where request->connection_proxy is
declared.

[zhaobin, 2017/01/24 19:28:46]

It is declared in 4th patch as WebPresentationConnection*.

https://codereview.chromium.org/2471263003/diff/280001/content/renderer/prese...

+      ->SendConnectionMessage(
+          std::move(request->message),
+          base::Bind(&PresentationDispatcher::HandleSendMessageRequests,
+                     base::Unretained(this)));
 }
 
 void PresentationDispatcher::HandleSendMessageRequests(bool success) {
   // In normal cases, message_request_queue_ should not be empty at this point
   // of time, but when DidCommitProvisionalLoad() is invoked before receiving
   // the callback for previous send mojo call, queue would have been emptied.
   if (message_request_queue_.empty())
     return;
 
   if (!success) {
@@ skipping 153 matching lines @@
   UpdateListeningState(status);
 }
 
 void PresentationDispatcher::OnDefaultSessionStarted(
     blink::mojom::PresentationSessionInfoPtr session_info) {
   if (!controller_)
     return;
 
   if (!session_info.is_null()) {
     presentation_service_->ListenForConnectionMessages(session_info.Clone());
-    controller_->didStartDefaultSession(
+    auto* connection = controller_->didStartDefaultSession(
         mojo::ConvertTo<blink::WebPresentationSessionInfo>(session_info));
+
+    auto* controller_connection_proxy =

[mark a. foltz, 2017/01/23 22:29:34]

This block of code is duplicated with L437-442.  Please factor out a common
method.

[zhaobin, 2017/01/24 19:28:46]

Done.

+        new ControllerConnectionProxy(connection);
+    connection->setProxy(base::WrapUnique(controller_connection_proxy));
+    presentation_service_->SetPresentationConnection(
+        session_info.Clone(), controller_connection_proxy->Bind(),
+        controller_connection_proxy->MakeRemoteRequest());
   }
 }
 
 void PresentationDispatcher::OnSessionCreated(
     std::unique_ptr<blink::WebPresentationConnectionCallbacks> 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_->ListenForConnectionMessages(session_info.Clone());
   callback->onSuccess(
       mojo::ConvertTo<blink::WebPresentationSessionInfo>(session_info));
+
+  auto* connection = callback->getConnection();
+  auto* controller_connection_proxy = new ControllerConnectionProxy(connection);
+  connection->setProxy(base::WrapUnique(controller_connection_proxy));
+  presentation_service_->SetPresentationConnection(
+      session_info.Clone(), controller_connection_proxy->Bind(),
+      controller_connection_proxy->MakeRemoteRequest());
 }
 
 void PresentationDispatcher::OnReceiverConnectionAvailable(
     blink::mojom::PresentationSessionInfoPtr session_info,
-    blink::mojom::PresentationConnectionPtr,
-    blink::mojom::PresentationConnectionRequest) {
-  if (!receiver_) {
-    receiver_->onReceiverConnectionAvailable(
-        mojo::ConvertTo<blink::WebPresentationSessionInfo>(session_info));
-  }
+    blink::mojom::PresentationConnectionPtr controller_connection_ptr,
+    blink::mojom::PresentationConnectionRequest receiver_connection_request) {
+  DCHECK(receiver_);
+
+  // Bind receiver_connection_proxy with PresentationConnection
+  // in receiver page.
+  auto* connection = receiver_->onReceiverConnectionAvailable(
+      mojo::ConvertTo<blink::WebPresentationSessionInfo>(session_info));
+  auto* receiver_connection_proxy = new ReceiverConnectionProxy(connection);
+  connection->setProxy(base::WrapUnique(receiver_connection_proxy));
+
+  receiver_connection_proxy->Bind(std::move(receiver_connection_request));
+  receiver_connection_proxy->SetTargetConnection(
+      std::move(controller_connection_ptr));
 }
 
 void PresentationDispatcher::OnConnectionStateChanged(
     blink::mojom::PresentationSessionInfoPtr session_info,
     blink::mojom::PresentationConnectionState state) {
   if (!controller_)
     return;
 
   controller_->didChangeSessionState(
       mojo::ConvertTo<blink::WebPresentationSessionInfo>(session_info),
@@ skipping 128 matching lines @@
 PresentationDispatcher::AvailabilityStatus::AvailabilityStatus(
     const GURL& availability_url)
     : url(availability_url),
       last_known_availability(false),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::AvailabilityStatus::~AvailabilityStatus() {
 }
 
 }  // namespace content