Merge 90308

Source/WebCore/fileapi/File.cpp

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 15 matching lines @@
 #include "config.h"
 #include "File.h"
 
 #include "FileSystem.h"
 #include "MIMETypeRegistry.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-static PassOwnPtr<BlobData> createBlobDataForFile(const String& path, const String& name = String())
+static PassOwnPtr<BlobData> createBlobDataForFileWithType(const String& path, const String& contentType)
 {
-    String type;
-    const String& nameForMIMEType = !name.isEmpty() ? name : path;
-    int index = nameForMIMEType.reverseFind('.');
-    if (index != -1)
-        type = MIMETypeRegistry::getMIMETypeForExtension(nameForMIMEType.substring(index + 1));
-
     OwnPtr<BlobData> blobData = BlobData::create();
-    blobData->setContentType(type);
+    blobData->setContentType(contentType);
     blobData->appendFile(path);
     return blobData.release();
 }
 
+static PassOwnPtr<BlobData> createBlobDataForFile(const String& path)
+{
+    String type;
+    int index = path.reverseFind('.');
+    if (index != -1)
+        type = MIMETypeRegistry::getMIMETypeForExtension(path.substring(index + 1));
+    return createBlobDataForFileWithType(path, type);
+}
+
+#if ENABLE(FILE_SYSTEM)
+static PassOwnPtr<BlobData> createBlobDataForFileSystemFile(const String& path, const String& fileSystemName)
+{
+    String type;
+    int index = fileSystemName.reverseFind('.');
+    if (index != -1)
+        type = MIMETypeRegistry::getWellKnownMIMETypeForExtension(fileSystemName.substring(index + 1));
+    return createBlobDataForFileWithType(path, type);
+}
+#endif
+
 #if ENABLE(DIRECTORY_UPLOAD)
 PassRefPtr<File> File::createWithRelativePath(const String& path, const String& relativePath)
 {
     RefPtr<File> file = adoptRef(new File(path));
     file->m_relativePath = relativePath;
     return file.release();
 }
 #endif
 
 File::File(const String& path)
     : Blob(createBlobDataForFile(path), -1)
     , m_path(path)
     , m_name(pathGetFileName(path))
 {
 }
 
 File::File(const String& path, const KURL& url, const String& type)
     : Blob(url, type, -1)
     , m_path(path)
 {
     m_name = pathGetFileName(path);
+    // FIXME: File object serialization/deserialization does not include
+    // newer file object data members: m_name and m_relativePath.
+    // See SerializedScriptValue.cpp for js and v8.
 }
 
 #if ENABLE(FILE_SYSTEM)
 File::File(const String& path, const String& name)
-    : Blob(createBlobDataForFile(path, name), -1)
+    : Blob(createBlobDataForFileSystemFile(path, name), -1)
     , m_path(path)
     , m_name(name)
 {
 }
 #endif
 
 double File::lastModifiedDate() const
 {
     time_t modificationTime;
     if (!getFileModificationTime(m_path, modificationTime))
@@ skipping 20 matching lines @@
     // FIXME: Combine getFileSize and getFileModificationTime into one file system call.
     time_t modificationTime;
     if (!getFileSize(m_path, snapshotSize) || !getFileModificationTime(m_path, modificationTime)) {
         snapshotSize = 0;
         snapshotModificationTime = 0;
     } else
         snapshotModificationTime = modificationTime;
 }
 
 } // namespace WebCore