diff options
author | nhiroki@chromium.org <nhiroki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:04:11 +0000 |
---|---|---|
committer | nhiroki@chromium.org <nhiroki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:04:11 +0000 |
commit | 3626042aa75cdd18e80ed14bbd68e77bfbd98b96 (patch) | |
tree | bb5328d54c1bfb69d6d4712a168f40f553510eb7 /webkit/common | |
parent | fbc10befb84a7245a3a746fb9489473896bd4159 (diff) | |
download | chromium_src-3626042aa75cdd18e80ed14bbd68e77bfbd98b96.zip chromium_src-3626042aa75cdd18e80ed14bbd68e77bfbd98b96.tar.gz chromium_src-3626042aa75cdd18e80ed14bbd68e77bfbd98b96.tar.bz2 |
Revert 223635 "SyncFS: Support resolveLocalFileSystemURL on Sync..."
> SyncFS: Support resolveLocalFileSystemURL on SyncFileSystem
>
> window.resolveLocalFileSystemURL is originally defined only for FileSystem API,
> but it'd be nice if it works on SyncFileSystem in a similar way. For that this
> change adds new IPC messages and interfaces.
>
> Blink side change depends on this:
> https://codereview.chromium.org/23537011/
>
>
> BUG=177137
> TEST=manual (Get FileSystemURL for a file on SyncFS, and then resolve it)
> TEST=unit_tests
> TEST=run_webkit_tests.sh http/tests/inspector/filesystem/\*
> TEST=run_webkit_tests.sh http/tests/inspector/filesystem/\*
>
> Review URL: https://chromiumcodereview.appspot.com/23856002
BUG=294502
TBR=nhiroki@chromium.org
Review URL: https://codereview.chromium.org/23558016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common')
-rw-r--r-- | webkit/common/fileapi/file_system_info.cc | 24 | ||||
-rw-r--r-- | webkit/common/fileapi/file_system_info.h | 31 | ||||
-rw-r--r-- | webkit/common/fileapi/file_system_util.cc | 2 |
3 files changed, 0 insertions, 57 deletions
diff --git a/webkit/common/fileapi/file_system_info.cc b/webkit/common/fileapi/file_system_info.cc deleted file mode 100644 index 269c021..0000000 --- a/webkit/common/fileapi/file_system_info.cc +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 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/common/fileapi/file_system_info.h" - -namespace fileapi { - -FileSystemInfo::FileSystemInfo() - : mount_type(fileapi::kFileSystemTypeTemporary) { -} - -FileSystemInfo::FileSystemInfo(const std::string& name, - const GURL& root_url, - fileapi::FileSystemType mount_type) - : name(name), - root_url(root_url), - mount_type(mount_type) { -} - -FileSystemInfo::~FileSystemInfo() { -} - -} // namespace fileapi diff --git a/webkit/common/fileapi/file_system_info.h b/webkit/common/fileapi/file_system_info.h deleted file mode 100644 index b71739a..0000000 --- a/webkit/common/fileapi/file_system_info.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 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. - -#ifndef WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_INFO_H_ -#define WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_INFO_H_ - -#include "url/gurl.h" -#include "webkit/common/fileapi/file_system_types.h" -#include "webkit/common/webkit_storage_common_export.h" - -namespace fileapi { - -// This struct is used to send the necessary information for Blink to create a -// DOMFileSystem. Since Blink side only uses mount_type (rather than -// detailed/cracked filesystem type) this only contains mount_type but not type. -struct WEBKIT_STORAGE_COMMON_EXPORT FileSystemInfo { - FileSystemInfo(); - FileSystemInfo(const std::string& filesystem_name, - const GURL& root_url, - fileapi::FileSystemType mount_type); - ~FileSystemInfo(); - - std::string name; - GURL root_url; - fileapi::FileSystemType mount_type; -}; - -} // namespace fileapi - -#endif // WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_INFO_H_ diff --git a/webkit/common/fileapi/file_system_util.cc b/webkit/common/fileapi/file_system_util.cc index 6229bc2..bc9aba7 100644 --- a/webkit/common/fileapi/file_system_util.cc +++ b/webkit/common/fileapi/file_system_util.cc @@ -296,8 +296,6 @@ WebKit::WebFileError PlatformFileErrorToWebFileError( return WebKit::WebFileErrorSecurity; case base::PLATFORM_FILE_ERROR_NO_SPACE: return WebKit::WebFileErrorQuotaExceeded; - case base::PLATFORM_FILE_ERROR_INVALID_URL: - return WebKit::WebFileErrorEncoding; default: return WebKit::WebFileErrorInvalidModification; } |