diff options
author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-02 21:36:33 +0000 |
---|---|---|
committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-02 21:36:33 +0000 |
commit | 706112e1399db5d9f83c4b0d8948fe61a50c7c0f (patch) | |
tree | f4bc66c8ef164d596ebc79f051dbf48fc0622d4a /webkit | |
parent | 762cc00892894be1b7e74015cd9bb22281a048eb (diff) | |
download | chromium_src-706112e1399db5d9f83c4b0d8948fe61a50c7c0f.zip chromium_src-706112e1399db5d9f83c4b0d8948fe61a50c7c0f.tar.gz chromium_src-706112e1399db5d9f83c4b0d8948fe61a50c7c0f.tar.bz2 |
Reapply "ChildProcessSecurityPolicy: Rationalize PlatformFileFlags used."
See https://codereview.chromium.org/24631002/
Patchset 1 is the above CL as-it-was. Unfortunately, it adds some new static initializers, which can't go into tree.
Solution is to just remove the definitions from file_permission_policy and inline them into child_process_security_policy_impl. They aren't referenced anywhere in webkit anyways.
TBR=kinuko
BUG=262142, 263150
Review URL: https://codereview.chromium.org/25628002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/browser/fileapi/file_permission_policy.cc | 37 | ||||
-rw-r--r-- | webkit/browser/fileapi/file_permission_policy.h | 5 | ||||
-rw-r--r-- | webkit/storage_browser.gyp | 1 |
3 files changed, 0 insertions, 43 deletions
diff --git a/webkit/browser/fileapi/file_permission_policy.cc b/webkit/browser/fileapi/file_permission_policy.cc deleted file mode 100644 index 6f1a36c..0000000 --- a/webkit/browser/fileapi/file_permission_policy.cc +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "webkit/browser/fileapi/file_permission_policy.h" - -#include "base/platform_file.h" - -namespace fileapi { - -const int kReadFilePermissions = base::PLATFORM_FILE_OPEN | - base::PLATFORM_FILE_READ | - base::PLATFORM_FILE_EXCLUSIVE_READ | - base::PLATFORM_FILE_ASYNC; - -const int kWriteFilePermissions = base::PLATFORM_FILE_OPEN | - base::PLATFORM_FILE_WRITE | - base::PLATFORM_FILE_EXCLUSIVE_WRITE | - base::PLATFORM_FILE_ASYNC | - base::PLATFORM_FILE_WRITE_ATTRIBUTES; - -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 5c9ced54..f1b6376 100644 --- a/webkit/browser/fileapi/file_permission_policy.h +++ b/webkit/browser/fileapi/file_permission_policy.h @@ -9,11 +9,6 @@ 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 kCreateFilePermissions; -WEBKIT_STORAGE_BROWSER_EXPORT extern const int kOpenPepperFilePermissions; - enum FilePermissionPolicy { // Any access should be always denied. FILE_PERMISSION_ALWAYS_DENY = 0x0, diff --git a/webkit/storage_browser.gyp b/webkit/storage_browser.gyp index ba2b656..79db94f 100644 --- a/webkit/storage_browser.gyp +++ b/webkit/storage_browser.gyp @@ -99,7 +99,6 @@ 'browser/fileapi/external_mount_points.cc', 'browser/fileapi/external_mount_points.h', 'browser/fileapi/file_observers.h', - 'browser/fileapi/file_permission_policy.cc', 'browser/fileapi/file_permission_policy.h', 'browser/fileapi/file_stream_writer.h', 'browser/fileapi/file_system_backend.h', |