Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

Unified Diff: content/browser/presentation/presentation_service_impl.cc

Issue 1037483003: [PresentationAPI] Implementing send() from WebPresentationClient to the PresentationService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: No (c) in new files Copyright message. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/presentation/presentation_service_impl.cc
diff --git a/content/browser/presentation/presentation_service_impl.cc b/content/browser/presentation/presentation_service_impl.cc
index 6b62c5f509bd50fe01cd5882fac0e8b715e68065..1143ddd065b430f5d136d889b9cbe62894fe3dff 100644
--- a/content/browser/presentation/presentation_service_impl.cc
+++ b/content/browser/presentation/presentation_service_impl.cc
@@ -16,6 +16,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_client.h"
#include "content/public/common/frame_navigate_params.h"
+#include "content/public/common/presentation_constants.h"
namespace {
@@ -39,7 +40,43 @@ presentation::SessionMessagePtr ToMojoSessionMessage(
return output.Pass();
}
-} // namespace
+scoped_ptr<content::PresentationSessionMessage> GetPresentationSessionMessage(
+ presentation::SessionMessagePtr input) {
+ DCHECK(!input.is_null());
+ scoped_ptr<content::PresentationSessionMessage> output;
+ if (input->type == presentation::PresentationMessageType::
+ PRESENTATION_MESSAGE_TYPE_TEXT) {
+ DCHECK(!input->message.is_null());
+ DCHECK(input->data.is_null());
+ // Return null PresentationSessionMessage if size exceeds.
+ if (input->message.size() > content::kMaxPresentationSessionMessageSize)
+ return output.Pass();
+
+ output = content::PresentationSessionMessage::CreateStringMessage(
+ input->presentation_url,
+ input->presentation_id,
+ make_scoped_ptr(new std::string));
+ input->message.Swap(output->message.get());
+
+ } else if (input->type == presentation::PresentationMessageType::
+ PRESENTATION_MESSAGE_TYPE_ARRAY_BUFFER) {
+ DCHECK(!input->data.is_null());
+ DCHECK(input->message.is_null());
+ // Return null PresentationSessionMessage if size exceeds.
+ if (input->data.size() > content::kMaxPresentationSessionMessageSize)
+ return output.Pass();
+
+ output = content::PresentationSessionMessage::CreateBinaryMessage(
+ input->presentation_url,
+ input->presentation_id,
+ make_scoped_ptr(new std::vector<uint8_t>));
+ input->data.Swap(output->data.get());
+ }
+
+ return output.Pass();
+}
+
+} // namespace
namespace content {
@@ -338,6 +375,37 @@ void PresentationServiceImpl::SetDefaultPresentationURL(
DoSetDefaultPresentationUrl(new_default_url, default_presentation_id);
}
+
+void PresentationServiceImpl::SendSessionMessage(
+ presentation::SessionMessagePtr session_message,
+ const SendMessageMojoCallback& callback) {
+ DVLOG(2) << "SendSessionMessage";
+ DCHECK(!session_message.is_null());
+ // send_message_callback_ should be null by now, otherwise resetting of
+ // send_message_callback_ with new callback will drop the old callback.
+ if (!delegate_ || send_message_callback_) {
+ callback.Run(false);
+ return;
+ }
+
+ send_message_callback_.reset(new SendMessageMojoCallback(callback));
+ delegate_->SendMessage(
+ render_process_id_,
+ render_frame_id_,
+ GetPresentationSessionMessage(session_message.Pass()),
+ base::Bind(&PresentationServiceImpl::OnSendMessageCallback,
+ weak_factory_.GetWeakPtr()));
+}
+
+void PresentationServiceImpl::OnSendMessageCallback() {
+ // It is possible that Reset() is invoked before receiving this callback.
+ // So, always check send_message_callback_ for non-null.
+ if (send_message_callback_) {
+ send_message_callback_->Run(true);
+ send_message_callback_.reset();
+ }
+}
+
void PresentationServiceImpl::CloseSession(
const mojo::String& presentation_url,
const mojo::String& presentation_id) {
@@ -448,6 +516,12 @@ void PresentationServiceImpl::Reset() {
mojo::Array<presentation::SessionMessagePtr>());
on_session_messages_callback_.reset();
}
+ if (send_message_callback_) {
+ // Run the callback with false, indicating the renderer to stop sending
+ // the requests and invalidate all pending requests.
+ send_message_callback_->Run(false);
+ send_message_callback_.reset();
+ }
}
// static

Powered by Google App Engine
This is Rietveld 408576698