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

Source/WebCore/platform/mac/ClipboardMac.mm

 /*
  * Copyright (C) 2004, 2005, 2006, 2008, 2010 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 303 matching lines @@
 {
     if (policy() != ClipboardReadable || m_clipboardContents == DragAndDropData)
         return FileList::create();
 
     Vector<String> absoluteURLs = absoluteURLsFromPasteboardFilenames(m_pasteboardName);
 
     RefPtr<FileList> fileList = FileList::create();
     for (size_t i = 0; i < absoluteURLs.size(); i++) {
         NSURL *absoluteURL = [NSURL URLWithString:absoluteURLs[i]];
         ASSERT([absoluteURL isFileURL]);
-        fileList->append(File::create([absoluteURL path]));
+        fileList->append(File::create([absoluteURL path], File::AllContentTypes));
     }
     return fileList.release(); // We will always return a FileList, sometimes empty
 }
 
 // The rest of these getters don't really have any impact on security, so for now make no checks
 
 void ClipboardMac::setDragImage(CachedImage* img, const IntPoint &loc)
 {
     setDragImage(img, 0, loc);
 }
@@ skipping 93 matching lines @@
     } else if (m_dragImage) {
         result = m_dragImage->image()->getNSImage();
         
         loc = m_dragLoc;
         loc.y = [result size].height - loc.y;
     }
     return result;
 }
 
 }