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

Unified Diff: webkit/fileapi/file_system_url.cc

Issue 11648027: Extract external file systems handling from isolated context. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/fileapi/file_system_mount_point_provider.h ('k') | webkit/fileapi/file_system_url_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_system_url.cc
diff --git a/webkit/fileapi/file_system_url.cc b/webkit/fileapi/file_system_url.cc
index 9e2fdf51b904e9cccc600a2d22a6fb70264c4ad9..b69eda1d44f34eebd25e8038660f4edb1e952bab 100644
--- a/webkit/fileapi/file_system_url.cc
+++ b/webkit/fileapi/file_system_url.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "net/base/escape.h"
+#include "webkit/fileapi/external_mount_points.h"
#include "webkit/fileapi/file_system_types.h"
#include "webkit/fileapi/file_system_util.h"
#include "webkit/fileapi/isolated_context.h"
@@ -158,7 +159,11 @@ void FileSystemURL::MayCrackIsolatedPath() {
if (is_valid_ && IsolatedContext::IsIsolatedType(type_)) {
// If the type is isolated, crack the path further to get the 'real'
// filesystem type and path.
- is_valid_ = IsolatedContext::GetInstance()->CrackIsolatedPath(
+ is_valid_ = ExternalMountPoints::GetSystemInstance()->CrackVirtualPath(
+ virtual_path_, &filesystem_id_, &type_, &path_);
+ if (is_valid_)
+ return;
+ is_valid_ = IsolatedContext::GetInstance()->CrackVirtualPath(
virtual_path_, &filesystem_id_, &type_, &path_);
}
}
« no previous file with comments | « webkit/fileapi/file_system_mount_point_provider.h ('k') | webkit/fileapi/file_system_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698