BlobBuilder/FormData refactor attempt

WebCore/html/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"
 
 namespace WebCore {
 
 File::File(const String& path)
     : Blob(path)
-    , m_name(pathGetFileName(path))
 {
     // We don't use MIMETypeRegistry::getMIMETypeForPath() because it returns "application/octet-stream" upon failure.
-    int index = m_name.reverseFind('.');
+    const String& fileName = name();
+    int index = fileName.reverseFind('.');
     if (index != -1)
-        m_type = MIMETypeRegistry::getMIMETypeForExtension(m_name.substring(index + 1));
+        m_type = MIMETypeRegistry::getMIMETypeForExtension(fileName.substring(index + 1));
+}
+
+const String& File::name() const
+{
+    return items().at(0)->toFileBlobItem()->name();
 }
 
 } // namespace WebCore