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

Unified Diff: components/nacl/renderer/manifest_service_channel.cc

Issue 249183004: Implement open_resource in non-SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 8 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: components/nacl/renderer/manifest_service_channel.cc
diff --git a/components/nacl/renderer/manifest_service_channel.cc b/components/nacl/renderer/manifest_service_channel.cc
index f0f4adb8f940a261a4116c1f6fe9b1f292e0e4e2..606be616a1ab230db7da7c4c6f22b9860227eda6 100644
--- a/components/nacl/renderer/manifest_service_channel.cc
+++ b/components/nacl/renderer/manifest_service_channel.cc
@@ -4,6 +4,7 @@
#include "components/nacl/renderer/manifest_service_channel.h"
+#include "base/bind.h"
#include "base/callback.h"
#include "base/callback_helpers.h"
#include "content/public/renderer/render_thread.h"
@@ -24,7 +25,8 @@ ManifestServiceChannel::ManifestServiceChannel(
channel_(new IPC::SyncChannel(
handle, IPC::Channel::MODE_CLIENT, this,
content::RenderThread::Get()->GetIOMessageLoopProxy(),
- true, waitable_event)) {
+ true, waitable_event)),
+ weak_ptr_factory_(this) {
}
ManifestServiceChannel::~ManifestServiceChannel() {
@@ -32,12 +34,17 @@ ManifestServiceChannel::~ManifestServiceChannel() {
base::ResetAndReturn(&connected_callback_).Run(PP_ERROR_FAILED);
}
+void ManifestServiceChannel::Send(IPC::Message* message) {
+ channel_->Send(message);
+}
+
bool ManifestServiceChannel::OnMessageReceived(const IPC::Message& message) {
- // TODO(hidehiko): Implement OpenResource.
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(ManifestServiceChannel, message)
IPC_MESSAGE_HANDLER(PpapiHostMsg_StartupInitializationComplete,
OnStartupInitializationComplete)
+ IPC_MESSAGE_HANDLER_DELAY_REPLY(PpapiHostMsg_OpenResource,
+ OnOpenResource)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -57,4 +64,33 @@ void ManifestServiceChannel::OnStartupInitializationComplete() {
delegate_->StartupInitializationComplete();
}
+void ManifestServiceChannel::OnOpenResource(
+ const std::string& key, IPC::Message* reply) {
+ // Currently this is used only for non-SFI mode, which is not supported on
+ // windows.
+#if !defined(OS_WIN)
+ delegate_->OpenResource(
+ key,
+ base::Bind(&ManifestServiceChannel::DidOpenResource,
+ weak_ptr_factory_.GetWeakPtr(), reply));
+#else
+ PpapiHostMsg_OpenResource::WriteReplyParams(
+ reply, ppapi::proxy::SerializedHandle());
+ Send(reply);
+#endif
+}
+
+#if !defined(OS_WIN)
+void ManifestServiceChannel::DidOpenResource(
+ IPC::Message* reply, const base::PlatformFile& platform_file) {
+ // Here, PlatformFileForTransit is alias of base::FileDescriptor.
+ PpapiHostMsg_OpenResource::WriteReplyParams(
+ reply,
+ ppapi::proxy::SerializedHandle(
+ ppapi::proxy::SerializedHandle::FILE,
+ base::FileDescriptor(platform_file, true)));
+ Send(reply);
+}
+#endif
+
} // namespace nacl
« no previous file with comments | « components/nacl/renderer/manifest_service_channel.h ('k') | components/nacl/renderer/ppb_nacl_private_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698