| Index: webkit/plugins/ppapi/ppb_flash_file_impl.cc
|
| diff --git a/webkit/plugins/ppapi/ppb_flash_file_impl.cc b/webkit/plugins/ppapi/ppb_flash_file_impl.cc
|
| index 97eb64941984298700c04dde0fc64fb4c9939460..46d9786109e2871ca5cf88011ce15f8e6a3ab1c3 100644
|
| --- a/webkit/plugins/ppapi/ppb_flash_file_impl.cc
|
| +++ b/webkit/plugins/ppapi/ppb_flash_file_impl.cc
|
| @@ -11,11 +11,11 @@
|
| #include "ppapi/c/pp_file_info.h"
|
| #include "ppapi/c/ppb_file_io.h"
|
| #include "ppapi/c/private/ppb_flash_file.h"
|
| +#include "ppapi/shared_impl/file_type_conversion.h"
|
| #include "ppapi/shared_impl/time_conversion.h"
|
| #include "ppapi/thunk/enter.h"
|
| #include "webkit/plugins/ppapi/common.h"
|
| #include "webkit/plugins/ppapi/file_path.h"
|
| -#include "webkit/plugins/ppapi/file_type_conversions.h"
|
| #include "webkit/plugins/ppapi/host_globals.h"
|
| #include "webkit/plugins/ppapi/plugin_delegate.h"
|
| #include "webkit/plugins/ppapi/plugin_module.h"
|
| @@ -63,7 +63,9 @@ int32_t OpenModuleLocalFile(PP_Instance pp_instance,
|
| int32_t mode,
|
| PP_FileHandle* file) {
|
| int flags = 0;
|
| - if (!path || !PepperFileOpenFlagsToPlatformFileFlags(mode, &flags) || !file)
|
| + if (!path ||
|
| + !::ppapi::PepperFileOpenFlagsToPlatformFileFlags(mode, &flags) ||
|
| + !file)
|
| return PP_ERROR_BADARGUMENT;
|
|
|
| PluginInstance* instance = HostGlobals::Get()->GetInstance(pp_instance);
|
| @@ -76,7 +78,7 @@ int32_t OpenModuleLocalFile(PP_Instance pp_instance,
|
| flags,
|
| &base_file);
|
| *file = base_file;
|
| - return PlatformFileErrorToPepperError(result);
|
| + return ::ppapi::PlatformFileErrorToPepperError(result);
|
| }
|
|
|
| int32_t RenameModuleLocalFile(PP_Instance pp_instance,
|
| @@ -92,7 +94,7 @@ int32_t RenameModuleLocalFile(PP_Instance pp_instance,
|
| base::PlatformFileError result = instance->delegate()->RenameFile(
|
| PepperFilePath::MakeModuleLocal(instance->module(), from_path),
|
| PepperFilePath::MakeModuleLocal(instance->module(), to_path));
|
| - return PlatformFileErrorToPepperError(result);
|
| + return ::ppapi::PlatformFileErrorToPepperError(result);
|
| }
|
|
|
| int32_t DeleteModuleLocalFileOrDir(PP_Instance pp_instance,
|
| @@ -108,7 +110,7 @@ int32_t DeleteModuleLocalFileOrDir(PP_Instance pp_instance,
|
| base::PlatformFileError result = instance->delegate()->DeleteFileOrDir(
|
| PepperFilePath::MakeModuleLocal(instance->module(), path),
|
| PPBoolToBool(recursive));
|
| - return PlatformFileErrorToPepperError(result);
|
| + return ::ppapi::PlatformFileErrorToPepperError(result);
|
| }
|
|
|
| int32_t CreateModuleLocalDir(PP_Instance pp_instance, const char* path) {
|
| @@ -121,7 +123,7 @@ int32_t CreateModuleLocalDir(PP_Instance pp_instance, const char* path) {
|
|
|
| base::PlatformFileError result = instance->delegate()->CreateDir(
|
| PepperFilePath::MakeModuleLocal(instance->module(), path));
|
| - return PlatformFileErrorToPepperError(result);
|
| + return ::ppapi::PlatformFileErrorToPepperError(result);
|
| }
|
|
|
| int32_t QueryModuleLocalFile(PP_Instance pp_instance,
|
| @@ -149,7 +151,7 @@ int32_t QueryModuleLocalFile(PP_Instance pp_instance,
|
| else
|
| info->type = PP_FILETYPE_REGULAR;
|
| }
|
| - return PlatformFileErrorToPepperError(result);
|
| + return ::ppapi::PlatformFileErrorToPepperError(result);
|
| }
|
|
|
| int32_t GetModuleLocalDirContents(PP_Instance pp_instance,
|
| @@ -168,7 +170,7 @@ int32_t GetModuleLocalDirContents(PP_Instance pp_instance,
|
| &pepper_contents);
|
|
|
| if (result != base::PLATFORM_FILE_OK)
|
| - return PlatformFileErrorToPepperError(result);
|
| + return ::ppapi::PlatformFileErrorToPepperError(result);
|
|
|
| *contents = new PP_DirContents_Dev;
|
| size_t count = pepper_contents.size();
|
| @@ -218,7 +220,7 @@ int32_t OpenFileRefFile(PP_Resource file_ref_id,
|
| int32_t mode,
|
| PP_FileHandle* file) {
|
| int flags = 0;
|
| - if (!PepperFileOpenFlagsToPlatformFileFlags(mode, &flags) || !file)
|
| + if (!::ppapi::PepperFileOpenFlagsToPlatformFileFlags(mode, &flags) || !file)
|
| return PP_ERROR_BADARGUMENT;
|
|
|
| EnterResource<PPB_FileRef_API> enter(file_ref_id, true);
|
| @@ -236,7 +238,7 @@ int32_t OpenFileRefFile(PP_Resource file_ref_id,
|
| flags,
|
| &base_file);
|
| *file = base_file;
|
| - return PlatformFileErrorToPepperError(result);
|
| + return ::ppapi::PlatformFileErrorToPepperError(result);
|
| }
|
|
|
| int32_t QueryFileRefFile(PP_Resource file_ref_id,
|
| @@ -265,7 +267,7 @@ int32_t QueryFileRefFile(PP_Resource file_ref_id,
|
| else
|
| info->type = PP_FILETYPE_REGULAR;
|
| }
|
| - return PlatformFileErrorToPepperError(result);
|
| + return ::ppapi::PlatformFileErrorToPepperError(result);
|
| }
|
|
|
| const PPB_Flash_File_FileRef ppb_flash_file_fileref = {
|
|
|