| Index: ppapi/thunk/ppb_file_ref_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_file_ref_thunk.cc b/ppapi/thunk/ppb_file_ref_thunk.cc
|
| index ef31e9227c306ae66e40fe891fea497007a75b45..83c774e88e935140643ae6169099ea960329e8ce 100644
|
| --- a/ppapi/thunk/ppb_file_ref_thunk.cc
|
| +++ b/ppapi/thunk/ppb_file_ref_thunk.cc
|
| @@ -89,8 +89,7 @@ int32_t MakeDirectory(PP_Resource directory_ref,
|
| return enter.retval();
|
| int32_t flag = make_ancestors ? PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS
|
| : PP_MAKEDIRECTORYFLAG_NONE;
|
| - return enter.SetResult(enter.object()->MakeDirectory(
|
| - flag, enter.callback()));
|
| + return enter.SetResult(enter.object()->MakeDirectory(flag, enter.callback()));
|
| }
|
|
|
| int32_t MakeDirectory_1_2(PP_Resource directory_ref,
|
| @@ -100,8 +99,8 @@ int32_t MakeDirectory_1_2(PP_Resource directory_ref,
|
| EnterFileRef enter(directory_ref, callback, true);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->MakeDirectory(
|
| - make_directory_flags, enter.callback()));
|
| + return enter.SetResult(
|
| + enter.object()->MakeDirectory(make_directory_flags, enter.callback()));
|
| }
|
|
|
| int32_t Touch(PP_Resource file_ref,
|
| @@ -116,8 +115,7 @@ int32_t Touch(PP_Resource file_ref,
|
| last_access_time, last_modified_time, enter.callback()));
|
| }
|
|
|
| -int32_t Delete(PP_Resource file_ref,
|
| - PP_CompletionCallback callback) {
|
| +int32_t Delete(PP_Resource file_ref, PP_CompletionCallback callback) {
|
| VLOG(4) << "PPB_FileRef::Delete()";
|
| EnterFileRef enter(file_ref, callback, true);
|
| if (enter.failed())
|
| @@ -132,8 +130,8 @@ int32_t Rename(PP_Resource file_ref,
|
| EnterFileRef enter(file_ref, callback, true);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->Rename(new_file_ref,
|
| - enter.callback()));
|
| + return enter.SetResult(
|
| + enter.object()->Rename(new_file_ref, enter.callback()));
|
| }
|
|
|
| int32_t Query(PP_Resource file_ref,
|
| @@ -143,8 +141,7 @@ int32_t Query(PP_Resource file_ref,
|
| EnterFileRef enter(file_ref, callback, true);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->Query(info,
|
| - enter.callback()));
|
| + return enter.SetResult(enter.object()->Query(info, enter.callback()));
|
| }
|
|
|
| int32_t ReadDirectoryEntries(PP_Resource file_ref,
|
| @@ -153,8 +150,8 @@ int32_t ReadDirectoryEntries(PP_Resource file_ref,
|
| EnterFileRef enter(file_ref, callback, true);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->ReadDirectoryEntries(
|
| - output, enter.callback()));
|
| + return enter.SetResult(
|
| + enter.object()->ReadDirectoryEntries(output, enter.callback()));
|
| }
|
|
|
| PP_Var GetAbsolutePath(PP_Resource file_ref) {
|
| @@ -166,51 +163,20 @@ PP_Var GetAbsolutePath(PP_Resource file_ref) {
|
| }
|
|
|
| const PPB_FileRef_1_0 g_ppb_file_ref_thunk_1_0 = {
|
| - &Create,
|
| - &IsFileRef,
|
| - &GetFileSystemType,
|
| - &GetName,
|
| - &GetPath,
|
| - &GetParent,
|
| - &MakeDirectory,
|
| - &Touch,
|
| - &Delete,
|
| - &Rename
|
| -};
|
| + &Create, &IsFileRef, &GetFileSystemType, &GetName, &GetPath,
|
| + &GetParent, &MakeDirectory, &Touch, &Delete, &Rename};
|
|
|
| const PPB_FileRef_1_1 g_ppb_file_ref_thunk_1_1 = {
|
| - &Create,
|
| - &IsFileRef,
|
| - &GetFileSystemType,
|
| - &GetName,
|
| - &GetPath,
|
| - &GetParent,
|
| - &MakeDirectory,
|
| - &Touch,
|
| - &Delete,
|
| - &Rename,
|
| - &Query,
|
| - &ReadDirectoryEntries
|
| -};
|
| + &Create, &IsFileRef, &GetFileSystemType, &GetName,
|
| + &GetPath, &GetParent, &MakeDirectory, &Touch,
|
| + &Delete, &Rename, &Query, &ReadDirectoryEntries};
|
|
|
| const PPB_FileRef_1_2 g_ppb_file_ref_thunk_1_2 = {
|
| - &Create,
|
| - &IsFileRef,
|
| - &GetFileSystemType,
|
| - &GetName,
|
| - &GetPath,
|
| - &GetParent,
|
| - &MakeDirectory_1_2,
|
| - &Touch,
|
| - &Delete,
|
| - &Rename,
|
| - &Query,
|
| - &ReadDirectoryEntries
|
| -};
|
| -
|
| -const PPB_FileRefPrivate g_ppb_file_ref_private_thunk = {
|
| - &GetAbsolutePath
|
| -};
|
| + &Create, &IsFileRef, &GetFileSystemType, &GetName,
|
| + &GetPath, &GetParent, &MakeDirectory_1_2, &Touch,
|
| + &Delete, &Rename, &Query, &ReadDirectoryEntries};
|
| +
|
| +const PPB_FileRefPrivate g_ppb_file_ref_private_thunk = {&GetAbsolutePath};
|
|
|
| } // namespace
|
|
|
|
|