Index: ppapi/thunk/ppb_file_io_thunk.cc |
=================================================================== |
--- ppapi/thunk/ppb_file_io_thunk.cc (revision 91178) |
+++ ppapi/thunk/ppb_file_io_thunk.cc (working copy) |
@@ -5,8 +5,9 @@ |
#include "ppapi/c/dev/ppb_file_io_dev.h" |
#include "ppapi/c/pp_completion_callback.h" |
#include "ppapi/c/pp_errors.h" |
+#include "ppapi/thunk/common.h" |
+#include "ppapi/thunk/enter.h" |
#include "ppapi/thunk/thunk.h" |
-#include "ppapi/thunk/enter.h" |
#include "ppapi/thunk/ppb_file_io_api.h" |
#include "ppapi/thunk/resource_creation_api.h" |
@@ -33,8 +34,9 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileIO_API> enter(file_io, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->Open(file_ref, open_flags, callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->Open(file_ref, open_flags, callback); |
+ return MayForceCallback(callback, result); |
} |
int32_t Query(PP_Resource file_io, |
@@ -42,8 +44,9 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileIO_API> enter(file_io, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->Query(info, callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->Query(info, callback); |
+ return MayForceCallback(callback, result); |
} |
int32_t Touch(PP_Resource file_io, |
@@ -52,8 +55,10 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileIO_API> enter(file_io, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->Touch(last_access_time, last_modified_time, callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->Touch(last_access_time, last_modified_time, |
+ callback); |
+ return MayForceCallback(callback, result); |
} |
int32_t Read(PP_Resource file_io, |
@@ -63,8 +68,10 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileIO_API> enter(file_io, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->Read(offset, buffer, bytes_to_read, callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->Read(offset, buffer, bytes_to_read, |
+ callback); |
+ return MayForceCallback(callback, result); |
} |
int32_t Write(PP_Resource file_io, |
@@ -74,8 +81,10 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileIO_API> enter(file_io, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->Write(offset, buffer, bytes_to_write, callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->Write(offset, buffer, bytes_to_write, |
+ callback); |
+ return MayForceCallback(callback, result); |
} |
int32_t SetLength(PP_Resource file_io, |
@@ -83,16 +92,18 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileIO_API> enter(file_io, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->SetLength(length, callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->SetLength(length, callback); |
+ return MayForceCallback(callback, result); |
} |
int32_t Flush(PP_Resource file_io, |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileIO_API> enter(file_io, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->Flush(callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->Flush(callback); |
+ return MayForceCallback(callback, result); |
} |
void Close(PP_Resource file_io) { |