diff options
| author | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 00:32:34 +0000 |
|---|---|---|
| committer | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 00:32:34 +0000 |
| commit | 14c0a073c3beef1eb6c72c011e8456a18d95810b (patch) | |
| tree | d8e9f3590fb82b38e0dbc0a8c3f98be3138036fa /ppapi/proxy/resource_creation_proxy.cc | |
| parent | d7908418b3a981cf0712e95c67f7d022e080daa3 (diff) | |
| download | chromium_src-14c0a073c3beef1eb6c72c011e8456a18d95810b.zip chromium_src-14c0a073c3beef1eb6c72c011e8456a18d95810b.tar.gz chromium_src-14c0a073c3beef1eb6c72c011e8456a18d95810b.tar.bz2 | |
Revert 176792
Caused PP_ERROR_INPROGRESS when used from within Native Client.
> Refactor FileIO to the new resource host system.
> Taking over from Victor's CL: https://codereview.chromium.org/11419131/
>
> GetOSDescriptor is done by passing raw file descriptor via in-process messaging.
>
> Operations are kept exclusive, but the restriction can be easily removed if needed.
>
> Original author=Victor Hsieh
> BUG=
> TEST=browser_tests --gtest_filter=PPAPINaClNewlibTest.FileIO*
>
> Review URL: https://chromiumcodereview.appspot.com/11824039
TBR=bbudge@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/resource_creation_proxy.cc')
| -rw-r--r-- | ppapi/proxy/resource_creation_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc index e3f1b79..90a23bb8 100644 --- a/ppapi/proxy/resource_creation_proxy.cc +++ b/ppapi/proxy/resource_creation_proxy.cc @@ -11,7 +11,6 @@ #include "ppapi/proxy/browser_font_resource_trusted.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/file_chooser_resource.h" -#include "ppapi/proxy/file_io_resource.h" #include "ppapi/proxy/flash_device_id_resource.h" #include "ppapi/proxy/flash_font_file_resource.h" #include "ppapi/proxy/flash_menu_resource.h" @@ -23,6 +22,7 @@ #include "ppapi/proxy/ppb_audio_proxy.h" #include "ppapi/proxy/ppb_broker_proxy.h" #include "ppapi/proxy/ppb_buffer_proxy.h" +#include "ppapi/proxy/ppb_file_io_proxy.h" #include "ppapi/proxy/ppb_file_ref_proxy.h" #include "ppapi/proxy/ppb_file_system_proxy.h" #include "ppapi/proxy/ppb_flash_message_loop_proxy.h" @@ -69,7 +69,7 @@ InterfaceProxy* ResourceCreationProxy::Create(Dispatcher* dispatcher) { } PP_Resource ResourceCreationProxy::CreateFileIO(PP_Instance instance) { - return (new FileIOResource(GetConnection(), instance))->GetReference(); + return PPB_FileIO_Proxy::CreateProxyResource(instance); } PP_Resource ResourceCreationProxy::CreateFileRef(PP_Resource file_system, |