Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(895)

Side by Side Diff: webkit/fileapi/file_system_url.cc

Issue 10810053: Enables internal filesystem types via Isolated filesystems (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: layout test crash fix Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/fileapi/file_system_url.h" 5 #include "webkit/fileapi/file_system_url.h"
6 6
7 #include "webkit/fileapi/file_system_types.h" 7 #include "webkit/fileapi/file_system_types.h"
8 #include "webkit/fileapi/file_system_util.h" 8 #include "webkit/fileapi/file_system_util.h"
9 #include "webkit/fileapi/isolated_context.h"
9 10
10 namespace fileapi { 11 namespace fileapi {
11 12
12 FileSystemURL::FileSystemURL() 13 FileSystemURL::FileSystemURL()
13 : type_(kFileSystemTypeUnknown), is_valid_(false) {} 14 : type_(kFileSystemTypeUnknown), is_valid_(false) {}
14 15
15 FileSystemURL::FileSystemURL(const GURL& url) 16 FileSystemURL::FileSystemURL(const GURL& url)
16 : type_(kFileSystemTypeUnknown) { 17 : type_(kFileSystemTypeUnknown) {
17 is_valid_ = CrackFileSystemURL(url, &origin_, &type_, &path_); 18 is_valid_ = CrackFileSystemURL(url, &origin_, &type_, &path_);
19 MayCrackIsolatedPath();
18 } 20 }
19 21
20 FileSystemURL::FileSystemURL( 22 FileSystemURL::FileSystemURL(
21 const GURL& origin, 23 const GURL& origin,
22 FileSystemType type, 24 FileSystemType type,
23 const FilePath& path) 25 const FilePath& path)
24 : origin_(origin), 26 : origin_(origin),
25 type_(type), 27 type_(type),
26 path_(path), 28 path_(path),
27 is_valid_(true) {} 29 is_valid_(true) {
30 MayCrackIsolatedPath();
31 }
28 32
29 FileSystemURL::~FileSystemURL() {} 33 FileSystemURL::~FileSystemURL() {}
30 34
31 std::string FileSystemURL::spec() const { 35 std::string FileSystemURL::spec() const {
32 if (!is_valid_) 36 if (!is_valid_)
33 return std::string(); 37 return std::string();
34 return GetFileSystemRootURI(origin_, type_).spec() + "/" + 38 return GetFileSystemRootURI(origin_, type_).spec() + "/" +
35 path_.AsUTF8Unsafe(); 39 path_.AsUTF8Unsafe();
36 } 40 }
37 41
38 FileSystemURL FileSystemURL::WithPath(const FilePath& path) const { 42 FileSystemURL FileSystemURL::WithPath(const FilePath& path) const {
39 return FileSystemURL(origin(), type(), path); 43 return FileSystemURL(origin(), type(), path);
40 } 44 }
41 45
42 bool FileSystemURL::operator==(const FileSystemURL& that) const { 46 bool FileSystemURL::operator==(const FileSystemURL& that) const {
43 return origin_ == that.origin_ && 47 return origin_ == that.origin_ &&
44 type_ == that.type_ && 48 type_ == that.type_ &&
45 path_ == that.path_ && 49 path_ == that.path_ &&
50 filesystem_id_ == that.filesystem_id_ &&
46 is_valid_ == that.is_valid_; 51 is_valid_ == that.is_valid_;
47 } 52 }
48 53
54 void FileSystemURL::MayCrackIsolatedPath() {
55 if (is_valid_ && type_ == kFileSystemTypeIsolated) {
56 // If the type is isolated, crack the path further to get the 'real'
57 // filesystem type and path.
58 is_valid_ = IsolatedContext::GetInstance()->CrackIsolatedPath(
59 path_, &filesystem_id_, &type_, &path_);
60 }
61 }
62
49 } // namespace fileapi 63 } // namespace fileapi
OLDNEW
« no previous file with comments | « webkit/fileapi/file_system_url.h ('k') | webkit/fileapi/file_system_url_request_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698