diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 12:56:29 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 12:56:29 +0000 |
| commit | 05813c6aa817970a4067584f2a002245a45924d9 (patch) | |
| tree | fe0f6946c7adea2db3a408e00b6eca4b4ba726f2 /ppapi | |
| parent | 3d40fa2e270213faed434e720b897a0627006ded (diff) | |
| download | chromium_src-05813c6aa817970a4067584f2a002245a45924d9.zip chromium_src-05813c6aa817970a4067584f2a002245a45924d9.tar.gz chromium_src-05813c6aa817970a4067584f2a002245a45924d9.tar.bz2 | |
Extract PepperFileSystemTypeToFileSystemType() from ppapi.
This function is called only from within content to convert from a ppapi
enum type to webkit fileapi type (this one will be come a content enum
type in later change).
So anticipating that change from webkit/ to content/ we moved this
function from ppapi to content to make this future change a little bit
easier.
And it is also nice to do now because it removes the last include of
webkit/ from ppapi making it much more clearer in term of deps.
BUG=338338
TEST=blink_tests
R=dmichael@chromium.org,jam@chromium.org
Review URL: https://codereview.chromium.org/424213006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/shared_impl/DEPS | 1 | ||||
| -rw-r--r-- | ppapi/shared_impl/file_system_util.cc | 14 | ||||
| -rw-r--r-- | ppapi/shared_impl/file_system_util.h | 5 | ||||
| -rw-r--r-- | ppapi/shared_impl/host_resource.h | 2 |
4 files changed, 1 insertions, 21 deletions
diff --git a/ppapi/shared_impl/DEPS b/ppapi/shared_impl/DEPS index 3b00152..03701c8 100644 --- a/ppapi/shared_impl/DEPS +++ b/ppapi/shared_impl/DEPS @@ -5,7 +5,6 @@ include_rules = [ "+media/base", "+skia", "+ui/events", - "+webkit/common/fileapi/file_system_types.h", "-ppapi/cpp", "-ppapi/proxy", diff --git a/ppapi/shared_impl/file_system_util.cc b/ppapi/shared_impl/file_system_util.cc index 330995c..25650d1 100644 --- a/ppapi/shared_impl/file_system_util.cc +++ b/ppapi/shared_impl/file_system_util.cc @@ -8,20 +8,6 @@ namespace ppapi { -fileapi::FileSystemType PepperFileSystemTypeToFileSystemType( - PP_FileSystemType type) { - switch (type) { - case PP_FILESYSTEMTYPE_LOCALTEMPORARY: - return fileapi::kFileSystemTypeTemporary; - case PP_FILESYSTEMTYPE_LOCALPERSISTENT: - return fileapi::kFileSystemTypePersistent; - case PP_FILESYSTEMTYPE_EXTERNAL: - return fileapi::kFileSystemTypeExternal; - default: - return fileapi::kFileSystemTypeUnknown; - } -} - bool FileSystemTypeIsValid(PP_FileSystemType type) { return (type == PP_FILESYSTEMTYPE_LOCALPERSISTENT || type == PP_FILESYSTEMTYPE_LOCALTEMPORARY || diff --git a/ppapi/shared_impl/file_system_util.h b/ppapi/shared_impl/file_system_util.h index 5b39f69..bb7e8c7 100644 --- a/ppapi/shared_impl/file_system_util.h +++ b/ppapi/shared_impl/file_system_util.h @@ -10,14 +10,9 @@ #include "ppapi/c/pp_file_info.h" #include "ppapi/c/private/ppb_isolated_file_system_private.h" #include "ppapi/shared_impl/ppapi_shared_export.h" -#include "webkit/common/fileapi/file_system_types.h" namespace ppapi { -PPAPI_SHARED_EXPORT -fileapi::FileSystemType PepperFileSystemTypeToFileSystemType( - PP_FileSystemType type); - PPAPI_SHARED_EXPORT bool FileSystemTypeIsValid(PP_FileSystemType type); PPAPI_SHARED_EXPORT bool FileSystemTypeHasQuota(PP_FileSystemType type); diff --git a/ppapi/shared_impl/host_resource.h b/ppapi/shared_impl/host_resource.h index 6770a52..3c49090 100644 --- a/ppapi/shared_impl/host_resource.h +++ b/ppapi/shared_impl/host_resource.h @@ -18,7 +18,7 @@ namespace ppapi { // // Old style resources match these file specs: // Proxy: ppapi/proxy/ppb_*_proxy.* -// Host: webkit/plugins/ppapi/* +// Host: content/ppapi_plugin/* // New style resources match these file specs: // Proxy: ppapi/proxy/*_resource.* // Browser: (content|chrome)/browser/renderer_host/pepper/pepper_*_host.* |