diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/webkit/browser/fileapi/file_system_url.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/webkit/browser/fileapi/file_system_url.cc')
| -rw-r--r-- | chromium/webkit/browser/fileapi/file_system_url.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chromium/webkit/browser/fileapi/file_system_url.cc b/chromium/webkit/browser/fileapi/file_system_url.cc index 2f8875a701b..b045ed3f5d3 100644 --- a/chromium/webkit/browser/fileapi/file_system_url.cc +++ b/chromium/webkit/browser/fileapi/file_system_url.cc @@ -21,7 +21,8 @@ namespace { FileSystemURL::FileSystemURL() : is_valid_(false), mount_type_(kFileSystemTypeUnknown), - type_(kFileSystemTypeUnknown) { + type_(kFileSystemTypeUnknown), + mount_option_(COPY_SYNC_OPTION_NO_SYNC) { } // static @@ -98,7 +99,8 @@ bool FileSystemURL::ParseFileSystemSchemeURL( FileSystemURL::FileSystemURL(const GURL& url) : mount_type_(kFileSystemTypeUnknown), - type_(kFileSystemTypeUnknown) { + type_(kFileSystemTypeUnknown), + mount_option_(COPY_SYNC_OPTION_NO_SYNC) { is_valid_ = ParseFileSystemSchemeURL(url, &origin_, &mount_type_, &virtual_path_); path_ = virtual_path_; @@ -113,7 +115,8 @@ FileSystemURL::FileSystemURL(const GURL& origin, mount_type_(mount_type), virtual_path_(virtual_path.NormalizePathSeparators()), type_(mount_type), - path_(virtual_path.NormalizePathSeparators()) { + path_(virtual_path.NormalizePathSeparators()), + mount_option_(COPY_SYNC_OPTION_NO_SYNC) { } FileSystemURL::FileSystemURL(const GURL& origin, @@ -122,7 +125,8 @@ FileSystemURL::FileSystemURL(const GURL& origin, const std::string& mount_filesystem_id, FileSystemType cracked_type, const base::FilePath& cracked_path, - const std::string& filesystem_id) + const std::string& filesystem_id, + const FileSystemMountOption& mount_option) : is_valid_(true), origin_(origin), mount_type_(mount_type), @@ -130,7 +134,8 @@ FileSystemURL::FileSystemURL(const GURL& origin, mount_filesystem_id_(mount_filesystem_id), type_(cracked_type), path_(cracked_path.NormalizePathSeparators()), - filesystem_id_(filesystem_id) { + filesystem_id_(filesystem_id), + mount_option_(mount_option) { } FileSystemURL::~FileSystemURL() {} |