summaryrefslogtreecommitdiffstats
path: root/webkit/browser
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/browser')
-rw-r--r--webkit/browser/fileapi/external_mount_points.cc3
-rw-r--r--webkit/browser/fileapi/file_system_context.cc1
2 files changed, 3 insertions, 1 deletions
diff --git a/webkit/browser/fileapi/external_mount_points.cc b/webkit/browser/fileapi/external_mount_points.cc
index 010fb08..1924c56 100644
--- a/webkit/browser/fileapi/external_mount_points.cc
+++ b/webkit/browser/fileapi/external_mount_points.cc
@@ -31,7 +31,8 @@ base::FilePath NormalizeFilePath(const base::FilePath& path) {
}
bool IsOverlappingMountPathForbidden(fileapi::FileSystemType type) {
- return type != fileapi::kFileSystemTypeNativeMedia;
+ return type != fileapi::kFileSystemTypeNativeMedia &&
+ type != fileapi::kFileSystemTypeDeviceMedia;
}
// Wrapper around ref-counted ExternalMountPoints that will be used to lazily
diff --git a/webkit/browser/fileapi/file_system_context.cc b/webkit/browser/fileapi/file_system_context.cc
index 847a68b..5492939 100644
--- a/webkit/browser/fileapi/file_system_context.cc
+++ b/webkit/browser/fileapi/file_system_context.cc
@@ -91,6 +91,7 @@ int FileSystemContext::GetPermissionPolicy(FileSystemType type) {
case kFileSystemTypeNativeLocal:
case kFileSystemTypeCloudDevice:
case kFileSystemTypeProvided:
+ case kFileSystemTypeDeviceMediaAsFileStorage:
return FILE_PERMISSION_USE_FILE_PERMISSION;
case kFileSystemTypeRestrictedNativeLocal: