Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: Source/WebCore/fileapi/File.h

Issue 11370004: Revert 123677 - Merge 123495 - Files from drag and file <input> should use getMIMETypeForExtension … (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/WebCore/fileapi/File.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/fileapi/File.h
===================================================================
--- Source/WebCore/fileapi/File.h (revision 133651)
+++ Source/WebCore/fileapi/File.h (working copy)
@@ -38,16 +38,9 @@
class File : public Blob {
public:
- // AllContentTypes should only be used when the full path/name are trusted; otherwise, it could
- // allow arbitrary pages to determine what applications an user has installed.
- enum ContentTypeLookupPolicy {
- WellKnownContentTypes,
- AllContentTypes,
- };
-
- static PassRefPtr<File> create(const String& path, ContentTypeLookupPolicy policy = WellKnownContentTypes)
+ static PassRefPtr<File> create(const String& path)
{
- return adoptRef(new File(path, policy));
+ return adoptRef(new File(path));
}
// For deserialization.
@@ -71,11 +64,11 @@
#endif
// Create a file with a name exposed to the author (via File.name and associated DOM properties) that differs from the one provided in the path.
- static PassRefPtr<File> createWithName(const String& path, const String& name, ContentTypeLookupPolicy policy = WellKnownContentTypes)
+ static PassRefPtr<File> createWithName(const String& path, const String& name)
{
if (name.isEmpty())
- return adoptRef(new File(path, policy));
- return adoptRef(new File(path, name, policy));
+ return adoptRef(new File(path));
+ return adoptRef(new File(path, name));
}
virtual unsigned long long size() const;
@@ -96,11 +89,11 @@
void captureSnapshot(long long& snapshotSize, double& snapshotModificationTime) const;
private:
- File(const String& path, ContentTypeLookupPolicy);
+ File(const String& path);
// For deserialization.
File(const String& path, const KURL& srcURL, const String& type);
- File(const String& path, const String& name, ContentTypeLookupPolicy);
+ File(const String& path, const String& name);
# if ENABLE(FILE_SYSTEM)
File(const String& name, const FileMetadata&);
« no previous file with comments | « no previous file | Source/WebCore/fileapi/File.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698