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

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

Issue 23647008: Revert 221284 "Pepper: Move FileRef to the "new" resource proxy." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 | 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/resource_creation_impl.h" 5 #include "content/renderer/pepper/resource_creation_impl.h"
6 6
7 #include "content/renderer/pepper/common.h" 7 #include "content/renderer/pepper/common.h"
8 #include "content/renderer/pepper/ppb_audio_impl.h" 8 #include "content/renderer/pepper/ppb_audio_impl.h"
9 #include "content/renderer/pepper/ppb_broker_impl.h" 9 #include "content/renderer/pepper/ppb_broker_impl.h"
10 #include "content/renderer/pepper/ppb_buffer_impl.h" 10 #include "content/renderer/pepper/ppb_buffer_impl.h"
11 #include "content/renderer/pepper/ppb_file_ref_impl.h"
11 #include "content/renderer/pepper/ppb_flash_message_loop_impl.h" 12 #include "content/renderer/pepper/ppb_flash_message_loop_impl.h"
12 #include "content/renderer/pepper/ppb_graphics_3d_impl.h" 13 #include "content/renderer/pepper/ppb_graphics_3d_impl.h"
13 #include "content/renderer/pepper/ppb_image_data_impl.h" 14 #include "content/renderer/pepper/ppb_image_data_impl.h"
14 #include "content/renderer/pepper/ppb_scrollbar_impl.h" 15 #include "content/renderer/pepper/ppb_scrollbar_impl.h"
15 #include "content/renderer/pepper/ppb_video_decoder_impl.h" 16 #include "content/renderer/pepper/ppb_video_decoder_impl.h"
16 #include "content/renderer/pepper/ppb_x509_certificate_private_impl.h" 17 #include "content/renderer/pepper/ppb_x509_certificate_private_impl.h"
17 #include "ppapi/c/pp_size.h" 18 #include "ppapi/c/pp_size.h"
18 #include "ppapi/shared_impl/ppb_audio_config_shared.h" 19 #include "ppapi/shared_impl/ppb_audio_config_shared.h"
19 #include "ppapi/shared_impl/ppb_image_data_shared.h" 20 #include "ppapi/shared_impl/ppb_image_data_shared.h"
20 #include "ppapi/shared_impl/ppb_input_event_shared.h" 21 #include "ppapi/shared_impl/ppb_input_event_shared.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 63
63 PP_Resource ResourceCreationImpl::CreateBroker(PP_Instance instance) { 64 PP_Resource ResourceCreationImpl::CreateBroker(PP_Instance instance) {
64 return (new PPB_Broker_Impl(instance))->GetReference(); 65 return (new PPB_Broker_Impl(instance))->GetReference();
65 } 66 }
66 67
67 PP_Resource ResourceCreationImpl::CreateBuffer(PP_Instance instance, 68 PP_Resource ResourceCreationImpl::CreateBuffer(PP_Instance instance,
68 uint32_t size) { 69 uint32_t size) {
69 return PPB_Buffer_Impl::Create(instance, size); 70 return PPB_Buffer_Impl::Create(instance, size);
70 } 71 }
71 72
73 PP_Resource ResourceCreationImpl::CreateFileRef(
74 PP_Instance instance,
75 PP_Resource file_system,
76 const char* path) {
77 PPB_FileRef_Impl* res = PPB_FileRef_Impl::CreateInternal(
78 instance, file_system, path);
79 return res ? res->GetReference() : 0;
80 }
81
82 PP_Resource ResourceCreationImpl::CreateFileRef(
83 const ppapi::PPB_FileRef_CreateInfo& serialized) {
84 // When we're in-process, the host resource in the create info *is* the
85 // resource, so we don't need to do anything.
86 return serialized.resource.host_resource();
87 }
88
72 PP_Resource ResourceCreationImpl::CreateFlashDRM(PP_Instance instance) { 89 PP_Resource ResourceCreationImpl::CreateFlashDRM(PP_Instance instance) {
73 return 0; // Not supported in-process. 90 return 0; // Not supported in-process.
74 } 91 }
75 92
76 PP_Resource ResourceCreationImpl::CreateFlashFontFile( 93 PP_Resource ResourceCreationImpl::CreateFlashFontFile(
77 PP_Instance instance, 94 PP_Instance instance,
78 const PP_BrowserFont_Trusted_Description* description, 95 const PP_BrowserFont_Trusted_Description* description,
79 PP_PrivateFontCharset charset) { 96 PP_PrivateFontCharset charset) {
80 return 0; // Not supported in-process. 97 return 0; // Not supported in-process.
81 } 98 }
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 ppapi::OBJECT_IS_IMPL, instance, time_stamp, modifiers, 296 ppapi::OBJECT_IS_IMPL, instance, time_stamp, modifiers,
280 wheel_delta, wheel_ticks, scroll_by_page); 297 wheel_delta, wheel_ticks, scroll_by_page);
281 } 298 }
282 299
283 PP_Resource ResourceCreationImpl::CreateX509CertificatePrivate( 300 PP_Resource ResourceCreationImpl::CreateX509CertificatePrivate(
284 PP_Instance instance) { 301 PP_Instance instance) {
285 return PPB_X509Certificate_Private_Impl::CreateResource(instance); 302 return PPB_X509Certificate_Private_Impl::CreateResource(instance);
286 } 303 }
287 304
288 } // namespace content 305 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/pepper/resource_creation_impl.h ('k') | trunk/src/content/renderer/pepper/url_request_info_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698