Index: ppapi/thunk/ppb_file_ref_thunk.cc |
=================================================================== |
--- ppapi/thunk/ppb_file_ref_thunk.cc (revision 91178) |
+++ ppapi/thunk/ppb_file_ref_thunk.cc (working copy) |
@@ -6,8 +6,9 @@ |
#include "ppapi/c/dev/ppb_file_ref_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_ref_api.h" |
#include "ppapi/thunk/resource_creation_api.h" |
@@ -61,8 +62,9 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileRef_API> enter(directory_ref, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->MakeDirectory(make_ancestors, callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->MakeDirectory(make_ancestors, callback); |
+ return MayForceCallback(callback, result); |
} |
int32_t Touch(PP_Resource file_ref, |
@@ -71,16 +73,19 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileRef_API> enter(file_ref, 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 Delete(PP_Resource file_ref, |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileRef_API> enter(file_ref, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->Delete(callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->Delete(callback); |
+ return MayForceCallback(callback, result); |
} |
int32_t Rename(PP_Resource file_ref, |
@@ -88,8 +93,9 @@ |
PP_CompletionCallback callback) { |
EnterResource<PPB_FileRef_API> enter(file_ref, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
- return enter.object()->Rename(new_file_ref, callback); |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ int32_t result = enter.object()->Rename(new_file_ref, callback); |
+ return MayForceCallback(callback, result); |
} |
const PPB_FileRef_Dev g_ppb_file_ref_thunk = { |