Fix webkitGetEntry for non-native files.

third_party/WebKit/Source/modules/filesystem/DraggedIsolatedFileSystemImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 
 #include "core/dom/ExecutionContext.h"
 #include "modules/filesystem/DOMFileSystem.h"
 #include "platform/Supplementable.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 namespace blink {
 
 DOMFileSystem* DraggedIsolatedFileSystemImpl::getDOMFileSystem(
     DataObject* host,
-    ExecutionContext* executionContext) {
+    ExecutionContext* executionContext,
+    const DataObjectItem& item) {
+  if (!item.hasFileSystemId())
+    return nullptr;
+  const String fileSystemId = item.fileSystemId();
   DraggedIsolatedFileSystemImpl* draggedIsolatedFileSystem = from(host);
   if (!draggedIsolatedFileSystem)
-    return 0;
-  if (!draggedIsolatedFileSystem->m_filesystem)
-    draggedIsolatedFileSystem->m_filesystem =
-        DOMFileSystem::createIsolatedFileSystem(executionContext,
-                                                host->filesystemId());
-  return draggedIsolatedFileSystem->m_filesystem.get();
+    return nullptr;
+  auto it = draggedIsolatedFileSystem->m_filesystems.find(fileSystemId);
+  if (it != draggedIsolatedFileSystem->m_filesystems.end())
+    return it->value;
+  return draggedIsolatedFileSystem->m_filesystems
+      .add(fileSystemId, DOMFileSystem::createIsolatedFileSystem(
+                             executionContext, fileSystemId))
+      .storedValue->value;
 }
 
 // static
 const char* DraggedIsolatedFileSystemImpl::supplementName() {
   ASSERT(isMainThread());
   return "DraggedIsolatedFileSystemImpl";
 }
 
 DraggedIsolatedFileSystemImpl* DraggedIsolatedFileSystemImpl::from(
     DataObject* dataObject) {
   return static_cast<DraggedIsolatedFileSystemImpl*>(
       Supplement<DataObject>::from(dataObject, supplementName()));
 }
 
-DraggedIsolatedFileSystemImpl::DraggedIsolatedFileSystemImpl(
-    DataObject& host,
-    const String& filesystemId) {
-  host.setFilesystemId(filesystemId);
-}
-
 DEFINE_TRACE(DraggedIsolatedFileSystemImpl) {
-  visitor->trace(m_filesystem);
+  visitor->trace(m_filesystems);
   Supplement<DataObject>::trace(visitor);
 }
 
 void DraggedIsolatedFileSystemImpl::prepareForDataObject(
-    DataObject* dataObject,
-    const String& filesystemId) {
-  DraggedIsolatedFileSystemImpl* fileSystem = create(*dataObject, filesystemId);
+    DataObject* dataObject) {
+  DraggedIsolatedFileSystemImpl* fileSystem =
+      new DraggedIsolatedFileSystemImpl();
   DraggedIsolatedFileSystemImpl::provideTo(
       *dataObject, DraggedIsolatedFileSystemImpl::supplementName(), fileSystem);
 }
 
 }  // namespace blink