blob hacking webcore style

Source/core/fileapi/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 63 matching lines @@
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(getContentTypeFromFileName(fileSystemName, File::WellKnownContentTypes));
     blobData->appendFile(metadata.platformPath, 0, metadata.length, metadata.modificationTime);
     return blobData.release();
 }
 
 static PassOwnPtr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSystemURL, const FileMetadata& metadata)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(getContentTypeFromFileName(fileSystemURL.path(), File::WellKnownContentTypes));
-    blobData->appendURL(fileSystemURL, 0, metadata.length, metadata.modificationTime);
+    blobData->appendFileSystemURL(fileSystemURL, 0, metadata.length, metadata.modificationTime);
     return blobData.release();
 }
 
 PassRefPtr<File> File::createWithRelativePath(const String& path, const String& relativePath)
 {
     RefPtr<File> file = adoptRef(new File(path, AllContentTypes));
     file->m_relativePath = relativePath;
     return file.release();
 }
 
 File::File(const String& path, ContentTypeLookupPolicy policy)
-    : Blob(createBlobDataForFile(path, policy), -1)
+    : Blob(BlobDataHandle::create(createBlobDataForFile(path, policy), -1))
     , m_path(path)
     , m_name(WebKit::Platform::current()->fileUtilities()->baseName(path))
     , m_snapshotSize(-1)
     , m_snapshotModificationTime(invalidFileTime())
 {
     ScriptWrappable::init(this);
 }
 
-File::File(const String& path, const KURL& url, const String& type)
-    : Blob(url, type, -1)
-    , m_path(path)
-    , m_snapshotSize(-1)
-    , m_snapshotModificationTime(invalidFileTime())
-{
-    ScriptWrappable::init(this);
-    m_name = WebKit::Platform::current()->fileUtilities()->baseName(path);
-    // FIXME: File object serialization/deserialization does not include
-    // newer file object data members: m_name and m_relativePath.
-    // See SerializedScriptValue.cpp for js and v8.
-}
-
 File::File(const String& path, const String& name, ContentTypeLookupPolicy policy)
-    : Blob(createBlobDataForFileWithName(path, name, policy), -1)
+    : Blob(BlobDataHandle::create(createBlobDataForFileWithName(path, name, policy), -1))
     , m_path(path)
     , m_name(name)
     , m_snapshotSize(-1)
     , m_snapshotModificationTime(invalidFileTime())
 {
     ScriptWrappable::init(this);
 }
 
+File::File(const String& path, PassRefPtr<BlobDataHandle> blobDataHandle)
+    : Blob(blobDataHandle)
+    , m_path(path)
+    , m_name(WebKit::Platform::current()->fileUtilities()->baseName(path))
+    , m_snapshotSize(-1)
+    , m_snapshotModificationTime(invalidFileTime())
+{
+    ScriptWrappable::init(this);
+    // FIXME: File object serialization/deserialization does not include
+    // newer file object data members: m_name and m_relativePath.
+    // See SerializedScriptValue.cpp.
+}
+
 File::File(const String& name, const FileMetadata& metadata)
-    : Blob(createBlobDataForFileWithMetadata(name, metadata), metadata.length)
+    : Blob(BlobDataHandle::create(createBlobDataForFileWithMetadata(name, metadata),  metadata.length))
     , m_path(metadata.platformPath)
     , m_name(name)
     , m_snapshotSize(metadata.length)
     , m_snapshotModificationTime(metadata.modificationTime)
 {
     ScriptWrappable::init(this);
 }
 
 File::File(const KURL& fileSystemURL, const FileMetadata& metadata)
-    : Blob(createBlobDataForFileSystemURL(fileSystemURL, metadata), metadata.length)
+    : Blob(BlobDataHandle::create(createBlobDataForFileSystemURL(fileSystemURL, metadata), metadata.length))
     , m_fileSystemURL(fileSystemURL)
     , m_snapshotSize(metadata.length)
     , m_snapshotModificationTime(metadata.modificationTime)
 {
     ScriptWrappable::init(this);
 }
 
 double File::lastModifiedDate() const
 {
     if (hasValidSnapshotMetadata() && isValidFileTime(m_snapshotModificationTime))
@@ skipping 34 matching lines @@
         snapshotSize = 0;
         snapshotModificationTime = invalidFileTime();
         return;
     }
 
     snapshotSize = metadata.length;
     snapshotModificationTime = metadata.modificationTime;
 }
 
 } // namespace WebCore