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

Side by Side Diff: content/browser/renderer_host/pepper/pepper_renderer_connection.cc

Issue 26564009: [PPAPI] It is now possible to pass filesystems from JavaScript to NaCl modules. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: GetConnectionForInstance DCHECKs if in-process. Created 7 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/pepper/pepper_renderer_connection.h" 5 #include "content/browser/renderer_host/pepper/pepper_renderer_connection.h"
6 6
7 #include "content/browser/browser_child_process_host_impl.h" 7 #include "content/browser/browser_child_process_host_impl.h"
8 #include "content/browser/ppapi_plugin_process_host.h" 8 #include "content/browser/ppapi_plugin_process_host.h"
9 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" 9 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
10 #include "content/common/pepper_renderer_instance_data.h" 10 #include "content/common/pepper_renderer_instance_data.h"
11 #include "content/common/view_messages.h" 11 #include "content/common/view_messages.h"
12 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h" 12 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h"
13 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h "
13 #include "content/public/browser/content_browser_client.h" 14 #include "content/public/browser/content_browser_client.h"
14 #include "content/public/common/content_client.h" 15 #include "content/public/common/content_client.h"
15 #include "ipc/ipc_message_macros.h" 16 #include "ipc/ipc_message_macros.h"
16 #include "ppapi/host/resource_host.h" 17 #include "ppapi/host/resource_host.h"
17 #include "ppapi/proxy/ppapi_message_utils.h" 18 #include "ppapi/proxy/ppapi_message_utils.h"
18 #include "ppapi/proxy/ppapi_messages.h" 19 #include "ppapi/proxy/ppapi_messages.h"
19 #include "ppapi/proxy/ppapi_message_utils.h" 20 #include "ppapi/proxy/ppapi_message_utils.h"
20 #include "ppapi/proxy/resource_message_params.h" 21 #include "ppapi/proxy/resource_message_params.h"
21 22
22 namespace content { 23 namespace content {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 const ppapi::proxy::ResourceMessageCallParams& params, 91 const ppapi::proxy::ResourceMessageCallParams& params,
91 PP_Instance instance, 92 PP_Instance instance,
92 const std::vector<IPC::Message>& nested_msgs) { 93 const std::vector<IPC::Message>& nested_msgs) {
93 BrowserPpapiHostImpl* host = GetHostForChildProcess(child_process_id); 94 BrowserPpapiHostImpl* host = GetHostForChildProcess(child_process_id);
94 95
95 std::vector<int> pending_resource_host_ids(nested_msgs.size(), 0); 96 std::vector<int> pending_resource_host_ids(nested_msgs.size(), 0);
96 if (!host) { 97 if (!host) {
97 DLOG(ERROR) << "Invalid plugin process ID."; 98 DLOG(ERROR) << "Invalid plugin process ID.";
98 } else { 99 } else {
99 for (size_t i = 0; i < nested_msgs.size(); ++i) { 100 for (size_t i = 0; i < nested_msgs.size(); ++i) {
100 // FileRef_CreateExternal is only permitted from the renderer. Because of 101 const IPC::Message& nested_msg = nested_msgs[i];
101 // this, we handle this message here and not in
102 // content_browser_pepper_host_factory.cc.
103 scoped_ptr<ppapi::host::ResourceHost> resource_host; 102 scoped_ptr<ppapi::host::ResourceHost> resource_host;
104 if (host->IsValidInstance(instance)) { 103 if (host->IsValidInstance(instance)) {
105 if (nested_msgs[i].type() == PpapiHostMsg_FileRef_CreateExternal::ID) { 104 if (nested_msg.type() == PpapiHostMsg_FileRef_CreateExternal::ID) {
105 // FileRef_CreateExternal is only permitted from the renderer. Because
106 // of this, we handle this message here and not in
107 // content_browser_pepper_host_factory.cc.
106 base::FilePath external_path; 108 base::FilePath external_path;
107 if (ppapi::UnpackMessage<PpapiHostMsg_FileRef_CreateExternal>( 109 if (ppapi::UnpackMessage<PpapiHostMsg_FileRef_CreateExternal>(
108 nested_msgs[i], &external_path)) { 110 nested_msg, &external_path)) {
109 resource_host.reset(new PepperFileRefHost( 111 resource_host.reset(new PepperFileRefHost(
110 host, instance, params.pp_resource(), external_path)); 112 host, instance, params.pp_resource(), external_path));
111 } 113 }
114 } else if (nested_msg.type() ==
115 PpapiHostMsg_FileSystem_CreateFromRenderer::ID) {
116 // Similarly, FileSystem_CreateFromRenderer is only permitted from the
117 // renderer.
118 std::string root_url;
119 PP_FileSystemType file_system_type;
120 if (ppapi::UnpackMessage<PpapiHostMsg_FileSystem_CreateFromRenderer>(
121 nested_msg, &root_url, &file_system_type)) {
122 resource_host.reset(
123 new PepperFileSystemBrowserHost(host,
124 instance,
125 params.pp_resource(),
126 GURL(root_url),
127 file_system_type));
128 }
112 } 129 }
113 } 130 }
114 131
115 if (!resource_host.get()) { 132 if (!resource_host.get()) {
116 resource_host = host->GetPpapiHost()->CreateResourceHost( 133 resource_host = host->GetPpapiHost()->CreateResourceHost(
117 params, instance, nested_msgs[i]); 134 params, instance, nested_msg);
118 } 135 }
119 136
120 if (resource_host.get()) { 137 if (resource_host.get()) {
121 pending_resource_host_ids[i] = 138 pending_resource_host_ids[i] =
122 host->GetPpapiHost()->AddPendingResourceHost(resource_host.Pass()); 139 host->GetPpapiHost()->AddPendingResourceHost(resource_host.Pass());
123 } 140 }
124 } 141 }
125 } 142 }
126 143
127 Send(new PpapiHostMsg_CreateResourceHostsFromHostReply( 144 Send(new PpapiHostMsg_CreateResourceHostsFromHostReply(
128 routing_id, params.sequence(), pending_resource_host_ids)); 145 routing_id, params.sequence(), pending_resource_host_ids));
129 } 146 }
130 147
131 void PepperRendererConnection::OnMsgDidCreateInProcessInstance( 148 void PepperRendererConnection::OnMsgDidCreateInProcessInstance(
132 PP_Instance instance, 149 PP_Instance instance,
133 const PepperRendererInstanceData& instance_data) { 150 const PepperRendererInstanceData& instance_data) {
134 PepperRendererInstanceData data = instance_data; 151 PepperRendererInstanceData data = instance_data;
135 data.render_process_id = render_process_id_; 152 data.render_process_id = render_process_id_;
136 in_process_host_->AddInstance(instance, data); 153 in_process_host_->AddInstance(instance, data);
137 } 154 }
138 155
139 void PepperRendererConnection::OnMsgDidDeleteInProcessInstance( 156 void PepperRendererConnection::OnMsgDidDeleteInProcessInstance(
140 PP_Instance instance) { 157 PP_Instance instance) {
141 in_process_host_->DeleteInstance(instance); 158 in_process_host_->DeleteInstance(instance);
142 } 159 }
143 160
144 } // namespace content 161 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698