Merge 123495 - Files from drag and file <input> should use getMIMETypeForExtension to determine con…

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 16 matching lines @@
 #include "File.h"
 
 #include "FileMetadata.h"
 #include "FileSystem.h"
 #include "MIMETypeRegistry.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-static String getContentTypeFromFileName(const String& name)
+static String getContentTypeFromFileName(const String& name, File::ContentTypeLookupPolicy policy)
 {
     String type;
     int index = name.reverseFind('.');
-    if (index != -1)
-        type = MIMETypeRegistry::getWellKnownMIMETypeForExtension(name.substring(index + 1));
+    if (index != -1) {
+        if (policy == File::WellKnownContentTypes)
+            type = MIMETypeRegistry::getWellKnownMIMETypeForExtension(name.substring(index + 1));
+        else {
+            ASSERT(policy == File::AllContentTypes);
+            type = MIMETypeRegistry::getMIMETypeForExtension(name.substring(index + 1));
+        }
+    }
     return type;
 }
 
 static PassOwnPtr<BlobData> createBlobDataForFileWithType(const String& path, const String& contentType)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(contentType);
     blobData->appendFile(path);
     return blobData.release();
 }
 
-static PassOwnPtr<BlobData> createBlobDataForFile(const String& path)
+static PassOwnPtr<BlobData> createBlobDataForFile(const String& path, File::ContentTypeLookupPolicy policy)
 {
-    return createBlobDataForFileWithType(path, getContentTypeFromFileName(path));
+    return createBlobDataForFileWithType(path, getContentTypeFromFileName(path, policy));
 }
 
-static PassOwnPtr<BlobData> createBlobDataForFileWithName(const String& path, const String& fileSystemName)
+static PassOwnPtr<BlobData> createBlobDataForFileWithName(const String& path, const String& fileSystemName, File::ContentTypeLookupPolicy policy)
 {
-    return createBlobDataForFileWithType(path, getContentTypeFromFileName(fileSystemName));
+    return createBlobDataForFileWithType(path, getContentTypeFromFileName(fileSystemName, policy));
 }
 
 #if ENABLE(FILE_SYSTEM)
 static PassOwnPtr<BlobData> createBlobDataForFileWithMetadata(const String& fileSystemName, const FileMetadata& metadata)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
-    blobData->setContentType(getContentTypeFromFileName(fileSystemName));
+    blobData->setContentType(getContentTypeFromFileName(fileSystemName, File::WellKnownContentTypes));
     blobData->appendFile(metadata.platformPath, 0, metadata.length, metadata.modificationTime);
     return blobData.release();
 }
 #endif
 
 #if ENABLE(DIRECTORY_UPLOAD)
 PassRefPtr<File> File::createWithRelativePath(const String& path, const String& relativePath)
 {
-    RefPtr<File> file = adoptRef(new File(path));
+    RefPtr<File> file = adoptRef(new File(path, AllContentTypes));
     file->m_relativePath = relativePath;
     return file.release();
 }
 #endif
 
-File::File(const String& path)
-    : Blob(createBlobDataForFile(path), -1)
+File::File(const String& path, ContentTypeLookupPolicy policy)
+    : Blob(createBlobDataForFile(path, policy), -1)
     , m_path(path)
     , m_name(pathGetFileName(path))
 #if ENABLE(FILE_SYSTEM)
     , m_snapshotSize(-1)
     , m_snapshotModificationTime(invalidFileTime())
 #endif
 {
 }
 
 File::File(const String& path, const KURL& url, const String& type)
     : Blob(url, type, -1)
     , m_path(path)
 #if ENABLE(FILE_SYSTEM)
     , m_snapshotSize(-1)
     , m_snapshotModificationTime(invalidFileTime())
 #endif
 {
     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.
 }
 
-File::File(const String& path, const String& name)
-    : Blob(createBlobDataForFileWithName(path, name), -1)
+File::File(const String& path, const String& name, ContentTypeLookupPolicy policy)
+    : Blob(createBlobDataForFileWithName(path, name, policy), -1)
     , m_path(path)
     , m_name(name)
 #if ENABLE(FILE_SYSTEM)
     , m_snapshotSize(-1)
     , m_snapshotModificationTime(invalidFileTime())
 #endif
 {
 }
 
 #if ENABLE(FILE_SYSTEM)
@@ skipping 54 matching lines @@
         snapshotSize = 0;
         snapshotModificationTime = invalidFileTime();
         return;
     }
 
     snapshotSize = metadata.length;
     snapshotModificationTime = metadata.modificationTime;
 }
 
 } // namespace WebCore