Pass the selected non-native file information from the browser to FileInputType.

Previously the blink accepts only native files as a result value of the file
chooser. The information is conveyed to the FileInputType. Then FileInputType
generates the File class instances from the information, and the instances are
used to compose the form request.

Thic CL adds non-native file support to the above code path.

* Adds noo-native file information (file system URL and metadata) to structures
  representing selected file (FileChooserFileInfo, SelectedFileInfo).

* When FileInputType generates the File class instances, let the class refer the
  non-native file information.

* When FileInputType checks the change of selected files, let the class refer
  the non-native file information.

BUG=126902
TEST=None

Review URL: https://codereview.chromium.org/640723006

git-svn-id: svn://svn.chromium.org/blink/trunk@183960 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/core.gypi

@@ -3594,6 +3594,7 @@
             'html/HTMLTextFormControlElementTest.cpp',
             'html/LinkRelAttributeTest.cpp',
             'html/TimeRangesTest.cpp',
+            'html/forms/FileInputTypeTest.cpp',
             'html/parser/HTMLParserThreadTest.cpp',
             'html/parser/HTMLSrcsetParserTest.cpp',
             'html/track/vtt/BufferedLineReaderTest.cpp',

third_party/WebKit/Source/core/fileapi/File.cpp

@@ -296,4 +296,21 @@ void File::appendTo(BlobData& blobData) const
     blobData.appendFile(m_path, 0, size, modificationTime);
 }
 
+bool File::hasSameSource(const File& other) const
+{
+    if (m_hasBackingFile != other.m_hasBackingFile)
+        return false;
+
+    if (m_hasBackingFile)
+        return m_path == other.m_path;
+
+    if (m_fileSystemURL.isEmpty() != other.m_fileSystemURL.isEmpty())
+        return false;
+
+    if (!m_fileSystemURL.isEmpty())
+        return m_fileSystemURL == other.m_fileSystemURL;
+
+    return uuid() == other.uuid();
+}
+
 } // namespace blink

third_party/WebKit/Source/core/fileapi/File.h

@@ -135,6 +135,9 @@ public:
     // Returns true if this has a valid snapshot metadata (i.e. m_snapshotSize >= 0).
     bool hasValidSnapshotMetadata() const { return m_snapshotSize >= 0; }
 
+    // Returns true if the sources (file path, file system URL, or blob handler) of the file objects are same or not.
+    bool hasSameSource(const File& other) const;
+
 private:
     File(const String& path, ContentTypeLookupPolicy, UserVisibility);
     File(const String& path, const String& name, ContentTypeLookupPolicy, UserVisibility);

third_party/WebKit/Source/core/fileapi/FileTest.cpp

@@ -46,4 +46,40 @@ TEST(FileTest, fileSystemFileWithoutNativeSnapshot)
     EXPECT_EQ(url, file->fileSystemURL());
 }
 
+TEST(FileTest, hsaSameSource)
+{
+    File* const nativeFileA1 = File::create("/native/pathA");
+    File* const nativeFileA2 = File::create("/native/pathA");
+    File* const nativeFileB = File::create("/native/pathB");
+
+    const RefPtr<BlobDataHandle> blobDataA = BlobDataHandle::create();
+    const RefPtr<BlobDataHandle> blobDataB = BlobDataHandle::create();
+    File* const blobFileA1 = File::create("name", 0.0, blobDataA);
+    File* const blobFileA2 = File::create("name", 0.0, blobDataA);
+    File* const blobFileB = File::create("name", 0.0, blobDataB);
+
+    KURL urlA(ParsedURLStringTag(), "filesystem:http://example.com/isolated/hash/non-native-file-A");
+    KURL urlB(ParsedURLStringTag(), "filesystem:http://example.com/isolated/hash/non-native-file-B");
+    FileMetadata metadata;
+    File* const fileSystemFileA1 = File::createForFileSystemFile(urlA, metadata);
+    File* const fileSystemFileA2 = File::createForFileSystemFile(urlA, metadata);
+    File* const fileSystemFileB = File::createForFileSystemFile(urlB, metadata);
+
+    EXPECT_FALSE(nativeFileA1->hasSameSource(*blobFileA1));
+    EXPECT_FALSE(blobFileA1->hasSameSource(*fileSystemFileA1));
+    EXPECT_FALSE(fileSystemFileA1->hasSameSource(*nativeFileA1));
+
+    EXPECT_TRUE(nativeFileA1->hasSameSource(*nativeFileA1));
+    EXPECT_TRUE(nativeFileA1->hasSameSource(*nativeFileA2));
+    EXPECT_FALSE(nativeFileA1->hasSameSource(*nativeFileB));
+
+    EXPECT_TRUE(blobFileA1->hasSameSource(*blobFileA1));
+    EXPECT_TRUE(blobFileA1->hasSameSource(*blobFileA2));
+    EXPECT_FALSE(blobFileA1->hasSameSource(*blobFileB));
+
+    EXPECT_TRUE(fileSystemFileA1->hasSameSource(*fileSystemFileA1));
+    EXPECT_TRUE(fileSystemFileA1->hasSameSource(*fileSystemFileA2));
+    EXPECT_FALSE(fileSystemFileA1->hasSameSource(*fileSystemFileB));
+}
+
 } // namespace blink

third_party/WebKit/Source/core/html/forms/FileInputType.cpp

@@ -217,7 +217,7 @@ void FileInputType::setValue(const String&, bool valueChanged, TextFieldEventBeh
     element().setNeedsValidityCheck();
 }
 
-FileList* FileInputType::createFileList(const Vector<FileChooserFileInfo>& files) const
+FileList* FileInputType::createFileList(const Vector<FileChooserFileInfo>& files, bool hasWebkitDirectoryAttr)
 {
     FileList* fileList(FileList::create());
     size_t size = files.size();
@@ -225,10 +225,10 @@ FileList* FileInputType::createFileList(const Vector<FileChooserFileInfo>& files
     // If a directory is being selected, the UI allows a directory to be chosen
     // and the paths provided here share a root directory somewhere up the tree;
     // we want to store only the relative paths from that point.
-    if (size && element().fastHasAttribute(webkitdirectoryAttr)) {
+    if (size && hasWebkitDirectoryAttr) {
         // Find the common root path.
         String rootPath = directoryName(files[0].path);
-        for (size_t i = 1; i < size; i++) {
+        for (size_t i = 1; i < size; ++i) {
             while (!files[i].path.startsWith(rootPath))
                 rootPath = directoryName(rootPath);
         }
@@ -237,7 +237,7 @@ FileList* FileInputType::createFileList(const Vector<FileChooserFileInfo>& files
         int rootLength = rootPath.length();
         if (rootPath[rootLength - 1] != '\\' && rootPath[rootLength - 1] != '/')
             rootLength += 1;
-        for (size_t i = 0; i < size; i++) {
+        for (size_t i = 0; i < size; ++i) {
             // Normalize backslashes to slashes before exposing the relative path to script.
             String relativePath = files[i].path.substring(rootLength).replace('\\', '/');
             fileList->append(File::createWithRelativePath(files[i].path, relativePath));
@@ -245,8 +245,13 @@ FileList* FileInputType::createFileList(const Vector<FileChooserFileInfo>& files
         return fileList;
     }
 
-    for (size_t i = 0; i < size; i++)
+    for (size_t i = 0; i < size; ++i) {
+        if (files[i].fileSystemURL.isEmpty()) {
             fileList->append(File::createForUserProvidedFile(files[i].path, files[i].displayName));
+        } else {
+            fileList->append(File::createForFileSystemFile(files[i].fileSystemURL, files[i].metadata));
+        }
+    }
     return fileList;
 }
 
@@ -281,13 +286,13 @@ void FileInputType::setFiles(FileList* files)
 
     RefPtrWillBeRawPtr<HTMLInputElement> input(element());
 
-    bool pathsChanged = false;
+    bool filesChanged = false;
     if (files->length() != m_fileList->length()) {
-        pathsChanged = true;
+        filesChanged = true;
     } else {
         for (unsigned i = 0; i < files->length(); ++i) {
-            if (files->item(i)->path() != m_fileList->item(i)->path()) {
-                pathsChanged = true;
+            if (!files->item(i)->hasSameSource(*m_fileList->item(i))) {
+                filesChanged = true;
                 break;
             }
         }
@@ -301,7 +306,7 @@ void FileInputType::setFiles(FileList* files)
     if (input->renderer())
         input->renderer()->setShouldDoFullPaintInvalidation();
 
-    if (pathsChanged) {
+    if (filesChanged) {
         // This call may cause destruction of this instance.
         // input instance is safe since it is ref-counted.
         input->dispatchChangeEvent();
@@ -311,7 +316,7 @@ void FileInputType::setFiles(FileList* files)
 
 void FileInputType::filesChosen(const Vector<FileChooserFileInfo>& files)
 {
-    setFiles(createFileList(files));
+    setFiles(createFileList(files, element().fastHasAttribute(webkitdirectoryAttr)));
 }
 
 void FileInputType::receiveDropForDirectoryUpload(const Vector<String>& paths)

third_party/WebKit/Source/core/html/forms/FileInputType.h

@@ -47,6 +47,7 @@ public:
     static PassRefPtrWillBeRawPtr<InputType> create(HTMLInputElement&);
     virtual void trace(Visitor*) override;
     static Vector<FileChooserFileInfo> filesFromFormControlState(const FormControlState&);
+    static FileList* createFileList(const Vector<FileChooserFileInfo>& files, bool hasWebkitDirectoryAttr);
 
 private:
     FileInputType(HTMLInputElement&);
@@ -74,7 +75,6 @@ private:
     // FileChooserClient implementation.
     virtual void filesChosen(const Vector<FileChooserFileInfo>&) override;
 
-    FileList* createFileList(const Vector<FileChooserFileInfo>& files) const;
     void receiveDropForDirectoryUpload(const Vector<String>&);
 
     PersistentWillBeMember<FileList> m_fileList;

third_party/WebKit/Source/core/html/forms/FileInputTypeTest.cpp

+// Copyright 2014 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 "config.h"
+#include "FileInputType.h"
+
+#include "core/fileapi/FileList.h"
+#include <gtest/gtest.h>
+
+namespace blink {
+
+TEST(FileInputTypeTest, createFileList)
+{
+    Vector<FileChooserFileInfo> files;
+
+    // Natvie file.
+    files.append(FileChooserFileInfo(
+        "/native/path/native-file",
+        "display-name"));
+
+    // Non-native file.
+    KURL url(ParsedURLStringTag(), "filesystem:http://example.com/isolated/hash/non-native-file");
+    FileMetadata metadata;
+    metadata.length = 64;
+    metadata.modificationTime = 24 * 60 * 60 /* sec */;
+    files.append(FileChooserFileInfo(url, metadata));
+
+
+    FileList* list = FileInputType::createFileList(files, false);
+    ASSERT_TRUE(list);
+    ASSERT_EQ(2u, list->length());
+
+    EXPECT_EQ("/native/path/native-file", list->item(0)->path());
+    EXPECT_EQ("display-name", list->item(0)->name());
+    EXPECT_TRUE(list->item(0)->fileSystemURL().isEmpty());
+
+    EXPECT_TRUE(list->item(1)->path().isEmpty());
+    EXPECT_EQ("non-native-file", list->item(1)->name());
+    EXPECT_EQ(url, list->item(1)->fileSystemURL());
+    EXPECT_EQ(64u, list->item(1)->size());
+    EXPECT_EQ(24 * 60 * 60 * 1000 /* ms */, list->item(1)->lastModified());
+}
+
+} // namespace blink

third_party/WebKit/Source/platform/FileChooser.h

@@ -30,7 +30,9 @@
 #ifndef FileChooser_h
 #define FileChooser_h
 
+#include "platform/FileMetadata.h"
 #include "platform/PlatformExport.h"
+#include "platform/weborigin/KURL.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
@@ -46,8 +48,17 @@ struct FileChooserFileInfo {
     {
     }
 
+    FileChooserFileInfo(const KURL& fileSystemURL, const FileMetadata metadata) : fileSystemURL(fileSystemURL), metadata(metadata)
+    {
+    }
+
+    // Members for native files.
     const String path;
     const String displayName;
+
+    // Members for file system API files.
+    const KURL fileSystemURL;
+    const FileMetadata metadata;
 };
 
 struct FileChooserSettings {

third_party/WebKit/Source/web/WebFileChooserCompletionImpl.cpp

@@ -30,6 +30,7 @@
 
 #include "config.h"
 #include "web/WebFileChooserCompletionImpl.h"
+#include "platform/FileMetadata.h"
 
 namespace blink {
 
@@ -55,8 +56,17 @@ void WebFileChooserCompletionImpl::didChooseFile(const WebVector<WebString>& fil
 void WebFileChooserCompletionImpl::didChooseFile(const WebVector<SelectedFileInfo>& files)
 {
     Vector<FileChooserFileInfo> fileInfo;
-    for (size_t i = 0; i < files.size(); ++i)
+    for (size_t i = 0; i < files.size(); ++i) {
+        if (files[i].fileSystemURL.isEmpty()) {
             fileInfo.append(FileChooserFileInfo(files[i].path, files[i].displayName));
+        } else {
+            FileMetadata metadata;
+            metadata.modificationTime = files[i].modificationTime;
+            metadata.length = files[i].length;
+            metadata.type = files[i].isDirectory ? FileMetadata::TypeDirectory : FileMetadata::TypeFile;
+            fileInfo.append(FileChooserFileInfo(files[i].fileSystemURL, metadata));
+        }
+    }
     m_fileChooser->chooseFiles(fileInfo);
     // This object is no longer needed.
     delete this;

third_party/WebKit/public/web/WebFileChooserCompletion.h

@@ -32,6 +32,7 @@
 #define WebFileChooserCompletion_h
 
 #include "../platform/WebString.h"
+#include "../platform/WebURL.h"
 
 namespace blink {
 
@@ -47,6 +48,22 @@ public:
         // The display name of the file that is to be exposed as File.name in
         // the DOM layer. If it is empty the base part of the |path| is used.
         WebString displayName;
+
+        // File system URL.
+        WebURL fileSystemURL;
+
+        // Metadata of non-native file.
+        // 0 is Unix epoch, unit is sec.
+        double modificationTime;
+        long long length;
+        bool isDirectory;
+
+        SelectedFileInfo()
+            : modificationTime(0)
+            , length(0)
+            , isDirectory(false)
+        {
+        }
     };
 
     // Called with zero or more file names. Zero-lengthed vector means that