diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 22:23:35 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 22:23:35 +0000 |
commit | 03b8869731dd6708719ae54dc9982f2f7e114447 (patch) | |
tree | b97a920032861c2d3b26085bdde318795ddc943d /webkit | |
parent | 01d5a1b54e50e8d075269b85196400a0ada3fa73 (diff) | |
download | chromium_src-03b8869731dd6708719ae54dc9982f2f7e114447.zip chromium_src-03b8869731dd6708719ae54dc9982f2f7e114447.tar.gz chromium_src-03b8869731dd6708719ae54dc9982f2f7e114447.tar.bz2 |
Revert 226311 "ChildProcessSecurityPolicy: Rationalize PlatformF..."
> ChildProcessSecurityPolicy: Rationalize PlatformFileFlags used.
>
> Eventually I want to move from PlatformFileFlags to a custom set of flags. Before that, here is an attempted rationalization and unification with the PlatformFileFlags defined in fileapi/file_permission_policy. This is so I have a firm basis to work off of.
>
> Depends on:
> https://codereview.chromium.org/24406003/
>
> This is part of Step 4 of this refactoring plan:
> https://docs.google.com/a/google.com/document/d/1QGkGWuwgSuaRqovz4wyb0upqPKDVsgYOFKt44E7gmOE/edit?usp=sharing
>
> BUG=262142, 263150
>
> Review URL: https://codereview.chromium.org/24631002
TBR=tommycli@chromium.org
Review URL: https://codereview.chromium.org/25616003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/browser/fileapi/file_permission_policy.cc | 17 | ||||
-rw-r--r-- | webkit/browser/fileapi/file_permission_policy.h | 3 |
2 files changed, 16 insertions, 4 deletions
diff --git a/webkit/browser/fileapi/file_permission_policy.cc b/webkit/browser/fileapi/file_permission_policy.cc index 081b536..6f1a36c 100644 --- a/webkit/browser/fileapi/file_permission_policy.cc +++ b/webkit/browser/fileapi/file_permission_policy.cc @@ -14,13 +14,24 @@ const int kReadFilePermissions = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_ASYNC; const int kWriteFilePermissions = base::PLATFORM_FILE_OPEN | - base::PLATFORM_FILE_OPEN_TRUNCATED | base::PLATFORM_FILE_WRITE | - base::PLATFORM_FILE_APPEND | base::PLATFORM_FILE_EXCLUSIVE_WRITE | base::PLATFORM_FILE_ASYNC | base::PLATFORM_FILE_WRITE_ATTRIBUTES; -const int kCreateNewFilePermissions = base::PLATFORM_FILE_CREATE; +const int kCreateFilePermissions = base::PLATFORM_FILE_CREATE; + +const int kOpenPepperFilePermissions = base::PLATFORM_FILE_OPEN | + base::PLATFORM_FILE_CREATE | + base::PLATFORM_FILE_OPEN_ALWAYS | + base::PLATFORM_FILE_CREATE_ALWAYS | + base::PLATFORM_FILE_OPEN_TRUNCATED | + base::PLATFORM_FILE_READ | + base::PLATFORM_FILE_WRITE | + base::PLATFORM_FILE_APPEND | + base::PLATFORM_FILE_EXCLUSIVE_WRITE | + base::PLATFORM_FILE_DELETE_ON_CLOSE | + base::PLATFORM_FILE_WRITE_ATTRIBUTES; + } // namespace fileapi diff --git a/webkit/browser/fileapi/file_permission_policy.h b/webkit/browser/fileapi/file_permission_policy.h index fdc19aad..5c9ced54 100644 --- a/webkit/browser/fileapi/file_permission_policy.h +++ b/webkit/browser/fileapi/file_permission_policy.h @@ -11,7 +11,8 @@ namespace fileapi { WEBKIT_STORAGE_BROWSER_EXPORT extern const int kReadFilePermissions; WEBKIT_STORAGE_BROWSER_EXPORT extern const int kWriteFilePermissions; -WEBKIT_STORAGE_BROWSER_EXPORT extern const int kCreateNewFilePermissions; +WEBKIT_STORAGE_BROWSER_EXPORT extern const int kCreateFilePermissions; +WEBKIT_STORAGE_BROWSER_EXPORT extern const int kOpenPepperFilePermissions; enum FilePermissionPolicy { // Any access should be always denied. |