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

Unified Diff: ppapi/proxy/message_handler.cc

Issue 264303002: PPAPI: Implement synchronous postMessage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: defer some changes Created 6 years, 6 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: ppapi/proxy/message_handler.cc
diff --git a/ppapi/proxy/message_handler.cc b/ppapi/proxy/message_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..704990af3af656780aadd15e236fd4894a991266
--- /dev/null
+++ b/ppapi/proxy/message_handler.cc
@@ -0,0 +1,123 @@
+// Copyright 2014 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 "ppapi/proxy/message_handler.h"
+
+#include "ipc/ipc_message.h"
+#include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/ppb_message_loop_proxy.h"
+#include "ppapi/shared_impl/proxy_lock.h"
+#include "ppapi/shared_impl/scoped_pp_var.h"
+#include "ppapi/thunk/enter.h"
+
+namespace ppapi {
+namespace proxy {
+namespace {
+
+typedef PP_Var (*HandleBlockingMessageFunc)(PP_Instance, void*, PP_Var);
+
+void HandleBlockingMessageWrapper(HandleBlockingMessageFunc function,
+ PP_Instance instance,
+ void* user_data,
+ ScopedPPVar message_data,
+ scoped_ptr<IPC::Message> reply_msg) {
+ PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
+ if (!dispatcher)
+ return;
+ PP_Var return_value = CallWhileUnlocked(function,
+ instance,
+ user_data,
+ message_data.get());
+ PpapiMsg_PPPMessageHandler_HandleBlockingMessage::WriteReplyParams(
+ reply_msg.get(),
+ SerializedVarReturnValue::Convert(dispatcher, return_value),
+ true /* was_handled */);
+ dispatcher->Send(reply_msg.release());
+}
+
+} // namespace
+
+//static
raymes 2014/06/06 06:38:17 nit: // static
+scoped_ptr<MessageHandler> MessageHandler::Create(
+ PP_Instance instance,
+ const PPP_MessageHandler_0_1* handler_if,
+ void* user_data,
+ PP_Resource message_loop,
+ int32_t* error) {
+ scoped_ptr<MessageHandler> result;
+ // The interface and all function pointers must be valid.
+ if (!handler_if ||
+ !handler_if->HandleMessage ||
+ !handler_if->HandleBlockingMessage ||
+ !handler_if->Destroy) {
+ *error = PP_ERROR_BADARGUMENT;
+ return result.Pass();
+ }
+ thunk::EnterResourceNoLock<thunk::PPB_MessageLoop_API>
+ enter_loop(message_loop, true);
+ if (enter_loop.failed()) {
+ *error = PP_ERROR_BADRESOURCE;
+ return result.Pass();
+ }
+ scoped_refptr<MessageLoopResource> message_loop_resource(
+ static_cast<MessageLoopResource*>(enter_loop.object()));
+ if (message_loop_resource->is_main_thread_loop()) {
+ *error = PP_ERROR_WRONG_THREAD;
+ return result.Pass();
+ }
+
+ result.reset(new MessageHandler(
+ instance, handler_if, user_data, message_loop_resource));
+ *error = PP_OK;
+ return result.Pass();
+}
+
+MessageHandler::~MessageHandler() {
+ // It's possible the message_loop_proxy is NULL if that loop has been quit.
+ // In that case, we unfortunately just can't call Destroy, so it might mean
+ // a leak. TODO(dmichael): Should we care about this?
raymes 2014/06/10 04:50:47 Should we update the docs here to document this? O
raymes 2014/06/16 05:33:32 I guess you decided this was useful to keep but I'
dmichael (off chromium) 2014/06/17 18:28:29 I took off the TODO in the latest patchset. I thou
raymes 2014/06/18 07:26:18 What I was really trying to ask is if the Destroy
dmichael (off chromium) 2014/06/18 16:15:32 Ah, good question. My point in having it was that
+ if (message_loop_->message_loop_proxy()) {
+ // The posted task won't have the proxy lock, but that's OK, it doesn't
+ // touch any internal state; it's a direct call on the plugin's function.
+ message_loop_->message_loop_proxy()->PostTask(FROM_HERE,
+ base::Bind(handler_if_->Destroy,
+ instance_,
+ user_data_));
+ }
+}
+
+void MessageHandler::HandleMessage(ScopedPPVar var) {
+ // See note above about the proxy lock.
+ message_loop_->message_loop_proxy()->PostTask(FROM_HERE,
+ base::Bind(handler_if_->HandleMessage,
+ instance_,
+ user_data_,
+ var.Release()));
+}
+
+void MessageHandler::HandleBlockingMessage(ScopedPPVar var,
+ scoped_ptr<IPC::Message> reply_msg) {
+ message_loop_->message_loop_proxy()->PostTask(FROM_HERE,
+ RunWhileLocked(base::Bind(&HandleBlockingMessageWrapper,
+ handler_if_->HandleBlockingMessage,
+ instance_,
+ user_data_,
+ var,
+ base::Passed(reply_msg.Pass()))));
+}
+
+MessageHandler::MessageHandler(
raymes 2014/06/06 06:38:17 nit: I think we usually have the constructor befor
dmichael (off chromium) 2014/06/13 22:01:26 I was matching the order from the header. This is
+ PP_Instance instance,
+ const PPP_MessageHandler_0_1* handler_if,
+ void* user_data,
+ scoped_refptr<MessageLoopResource> message_loop)
+ : instance_(instance),
+ handler_if_(handler_if),
+ user_data_(user_data),
+ message_loop_(message_loop) {
+}
+
+} // namespace proxy
+} // namespace ppapi

Powered by Google App Engine
This is Rietveld 408576698