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

Source/WebCore/platform/chromium/ChromiumDataObject.cpp

 /*
  * Copyright (c) 2008, 2009, 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 191 matching lines @@
 {
     Vector<String> results;
     for (size_t i = 0; i < m_itemList.size(); ++i)
         if (m_itemList[i]->isFilename())
             results.append(static_cast<File*>(m_itemList[i]->getAsFile().get())->path());
     return results;
 }
 
 void ChromiumDataObject::addFilename(const String& filename, const String& displayName)
 {
-    internalAddFileItem(ChromiumDataObjectItem::createFromFile(File::createWithName(filename, displayName)));
+    internalAddFileItem(ChromiumDataObjectItem::createFromFile(File::createWithName(filename, displayName, File::AllContentTypes)));
 }
 
 void ChromiumDataObject::addSharedBuffer(const String& name, PassRefPtr<SharedBuffer> buffer)
 {
     internalAddFileItem(ChromiumDataObjectItem::createFromSharedBuffer(name, buffer));
 }
 
 ChromiumDataObject::ChromiumDataObject()
     : m_modifierKeyState(0)
 {
@@ skipping 26 matching lines @@
     return true;
 }
 
 void ChromiumDataObject::internalAddFileItem(PassRefPtr<ChromiumDataObjectItem> item)
 {
     ASSERT(item->kind() == DataTransferItem::kindFile);
     m_itemList.append(item);
 }
 
 } // namespace WebCore