| Index: webkit/plugins/ppapi/ppb_file_io_impl.cc
|
| ===================================================================
|
| --- webkit/plugins/ppapi/ppb_file_io_impl.cc (revision 91558)
|
| +++ webkit/plugins/ppapi/ppb_file_io_impl.cc (working copy)
|
| @@ -11,8 +11,8 @@
|
| #include "base/platform_file.h"
|
| #include "base/logging.h"
|
| #include "base/time.h"
|
| -#include "ppapi/c/dev/ppb_file_io_dev.h"
|
| -#include "ppapi/c/dev/ppb_file_io_trusted_dev.h"
|
| +#include "ppapi/c/ppb_file_io.h"
|
| +#include "ppapi/c/trusted/ppb_file_io_trusted.h"
|
| #include "ppapi/c/pp_completion_callback.h"
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/thunk/enter.h"
|
| @@ -89,7 +89,7 @@
|
| return PP_OK_COMPLETIONPENDING;
|
| }
|
|
|
| -int32_t PPB_FileIO_Impl::Query(PP_FileInfo_Dev* info,
|
| +int32_t PPB_FileIO_Impl::Query(PP_FileInfo* info,
|
| PP_CompletionCallback callback) {
|
| int32_t rv = CommonCallValidation(true, callback);
|
| if (rv != PP_OK)
|
| @@ -308,8 +308,9 @@
|
| rv = bytes_read;
|
| if (file_ != base::kInvalidPlatformFileValue)
|
| memcpy(read_buffer_, data, bytes_read);
|
| - } else
|
| + } else {
|
| rv = PlatformFileErrorToPepperError(error_code);
|
| + }
|
|
|
| read_buffer_ = NULL;
|
| RunPendingCallback(rv);
|
|
|