Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79

1 files changed, 10 insertions, 2 deletions

diff --git a/WebCore/html/File.cpp b/WebCore/html/File.cpp
index 109e0d3..253cb4d 100644
--- a/WebCore/html/File.cpp
+++ b/WebCore/html/File.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "File.h"
 
+#include "BlobData.h"
 #include "FileSystem.h"
 #include "MIMETypeRegistry.h"
 
@@ -37,6 +38,13 @@ File::File(ScriptExecutionContext* scriptExecutionContext, const String& path)
     Init();
 }
 
+File::File(ScriptExecutionContext* scriptExecutionContext, const String& path, const KURL& url, const String& type)
+    : Blob(scriptExecutionContext, url, type, BlobDataItem::toEndOfFile)
+{
+    // FIXME: To be removed when we switch to using BlobData.
+     m_items.append(FileBlobItem::create(path));
+}
+
 #if ENABLE(DIRECTORY_UPLOAD)
 File::File(ScriptExecutionContext* scriptExecutionContext, const String& relativePath, const String& filePath)
     : Blob(scriptExecutionContext, FileBlobItem::create(filePath, relativePath))
@@ -49,8 +57,8 @@ void File::Init()
 {
     // We don't use MIMETypeRegistry::getMIMETypeForPath() because it returns "application/octet-stream" upon failure.
     const String& fileName = name();
-    int index = fileName.reverseFind('.');
-    if (index != -1)
+    size_t index = fileName.reverseFind('.');
+    if (index != notFound)
         m_type = MIMETypeRegistry::getMIMETypeForExtension(fileName.substring(index + 1));
 }