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

Side by Side Diff: trunk/src/content/renderer/pepper/content_renderer_pepper_host_factory.cc

Issue 60323002: Revert 232547 "Pepper: Move FileIO host from renderer to browser." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/pepper/content_renderer_pepper_host_factory.h" 5 #include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "content/public/common/content_client.h" 9 #include "content/public/common/content_client.h"
10 #include "content/public/renderer/content_renderer_client.h" 10 #include "content/public/renderer/content_renderer_client.h"
11 #include "content/renderer/pepper/pepper_audio_input_host.h" 11 #include "content/renderer/pepper/pepper_audio_input_host.h"
12 #include "content/renderer/pepper/pepper_file_chooser_host.h" 12 #include "content/renderer/pepper/pepper_file_chooser_host.h"
13 #include "content/renderer/pepper/pepper_file_io_host.h"
13 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h" 14 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
14 #include "content/renderer/pepper/pepper_file_system_host.h" 15 #include "content/renderer/pepper/pepper_file_system_host.h"
15 #include "content/renderer/pepper/pepper_graphics_2d_host.h" 16 #include "content/renderer/pepper/pepper_graphics_2d_host.h"
16 #include "content/renderer/pepper/pepper_truetype_font_host.h" 17 #include "content/renderer/pepper/pepper_truetype_font_host.h"
17 #include "content/renderer/pepper/pepper_url_loader_host.h" 18 #include "content/renderer/pepper/pepper_url_loader_host.h"
18 #include "content/renderer/pepper/pepper_video_capture_host.h" 19 #include "content/renderer/pepper/pepper_video_capture_host.h"
19 #include "content/renderer/pepper/pepper_video_destination_host.h" 20 #include "content/renderer/pepper/pepper_video_destination_host.h"
20 #include "content/renderer/pepper/pepper_video_source_host.h" 21 #include "content/renderer/pepper/pepper_video_source_host.h"
21 #include "content/renderer/pepper/pepper_websocket_host.h" 22 #include "content/renderer/pepper/pepper_websocket_host.h"
22 #include "content/renderer/pepper/renderer_ppapi_host_impl.h" 23 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 PP_Instance instance, 66 PP_Instance instance,
66 const IPC::Message& message) { 67 const IPC::Message& message) {
67 DCHECK(host == host_->GetPpapiHost()); 68 DCHECK(host == host_->GetPpapiHost());
68 69
69 // Make sure the plugin is giving us a valid instance for this resource. 70 // Make sure the plugin is giving us a valid instance for this resource.
70 if (!host_->IsValidInstance(instance)) 71 if (!host_->IsValidInstance(instance))
71 return scoped_ptr<ResourceHost>(); 72 return scoped_ptr<ResourceHost>();
72 73
73 // Public interfaces. 74 // Public interfaces.
74 switch (message.type()) { 75 switch (message.type()) {
76 case PpapiHostMsg_FileIO_Create::ID:
77 return scoped_ptr<ResourceHost>(new PepperFileIOHost(
78 host_, instance, params.pp_resource()));
75 case PpapiHostMsg_FileRef_CreateInternal::ID: { 79 case PpapiHostMsg_FileRef_CreateInternal::ID: {
76 PP_Resource file_system; 80 PP_Resource file_system;
77 std::string internal_path; 81 std::string internal_path;
78 if (!UnpackMessage<PpapiHostMsg_FileRef_CreateInternal>(message, 82 if (!UnpackMessage<PpapiHostMsg_FileRef_CreateInternal>(message,
79 &file_system, 83 &file_system,
80 &internal_path)) { 84 &internal_path)) {
81 NOTREACHED(); 85 NOTREACHED();
82 return scoped_ptr<ResourceHost>(); 86 return scoped_ptr<ResourceHost>();
83 } 87 }
84 return scoped_ptr<ResourceHost>(new PepperFileRefRendererHost( 88 return scoped_ptr<ResourceHost>(new PepperFileRefRendererHost(
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 169
166 return scoped_ptr<ResourceHost>(); 170 return scoped_ptr<ResourceHost>();
167 } 171 }
168 172
169 const ppapi::PpapiPermissions& 173 const ppapi::PpapiPermissions&
170 ContentRendererPepperHostFactory::GetPermissions() const { 174 ContentRendererPepperHostFactory::GetPermissions() const {
171 return host_->GetPpapiHost()->permissions(); 175 return host_->GetPpapiHost()->permissions();
172 } 176 }
173 177
174 } // namespace content 178 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/public/renderer/content_renderer_client.cc ('k') | trunk/src/content/renderer/pepper/pepper_file_io_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698