Launch packaged app with files on Drive on Chrome OS.

webkit/fileapi/file_system_context.cc

 // Copyright (c) 2012 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/fileapi/file_system_context.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/single_thread_task_runner.h"
 #include "googleurl/src/gurl.h"
@@ skipping 123 matching lines @@
 }
 
 FileSystemMountPointProvider* FileSystemContext::GetMountPointProvider(
     FileSystemType type) const {
   switch (type) {
     case kFileSystemTypeTemporary:
     case kFileSystemTypePersistent:
     case kFileSystemTypeSyncable:
       return sandbox_provider_.get();
     case kFileSystemTypeExternal:
+    case kFileSystemTypeExternalFullPath:
     case kFileSystemTypeDrive:
     case kFileSystemTypeRestrictedNativeLocal:
       return external_provider_.get();
     case kFileSystemTypeIsolated:
     case kFileSystemTypeDragged:
     case kFileSystemTypeNativeMedia:
     case kFileSystemTypeDeviceMedia:
       return isolated_provider_.get();
     case kFileSystemTypeNativeLocal:
 #if defined(OS_CHROMEOS)
@@ skipping 188 matching lines @@
   delete this;
 }
 
 FileSystemURL FileSystemContext::CrackFileSystemURL(
     const FileSystemURL& url) const {
   if (!url.is_valid())
     return FileSystemURL();
 
   // The returned value in case there is no crackers which can crack the url.
   // This is valid situation for non isolated/external file systems.
-  FileSystemURL result = url;
+  FileSystemURL current = url;
 
-  for (size_t i = 0; i < url_crackers_.size(); ++i) {
-    if (!url_crackers_[i]->HandlesFileSystemMountType(url.type()))
-      continue;
-
-    result = url_crackers_[i]->CreateCrackedFileSystemURL(url.origin(),
-                                                          url.type(),
-                                                          url.path());
-    if (result.is_valid())
-      return result;
+  // File system may be mounted multiple times (e.g., an isolated filesystem on
+  // top of an external filesystem). Hence cracking needs to be iterated.
+  for (;;) {
+    FileSystemURL cracked = current;
+    bool crack_happened = false;
+    for (size_t i = 0; i < url_crackers_.size(); ++i) {
+      if (!url_crackers_[i]->HandlesFileSystemMountType(current.type()))
+        continue;
+      crack_happened = true;
+      cracked = url_crackers_[i]->CrackFileSystemURL(current);
+      if (cracked.is_valid())
+        break;
+    }
+    if (!crack_happened)

[kinuko, 2013/03/19 20:34:50]

nit: if (cracked == current) may be enough

[kinaba, 2013/03/21 07:35:13]

Done.

+      break;
+    current = cracked;
   }
-
-  return result;
+  return current;
 }
 
 FileSystemFileUtil* FileSystemContext::GetFileUtil(
     FileSystemType type) const {
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(type);
   if (!mount_point_provider)
     return NULL;
   return mount_point_provider->GetFileUtil(type);
 }
 
 }  // namespace fileapi