Revert "Remove OwnPtr from Blink."

third_party/WebKit/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 18 matching lines @@
 #include "core/dom/ExceptionCode.h"
 #include "core/fileapi/FilePropertyBag.h"
 #include "core/frame/UseCounter.h"
 #include "platform/FileMetadata.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/blob/BlobData.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebFileUtilities.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/DateMath.h"
-#include <memory>
 
 namespace blink {
 
 static String getContentTypeFromFileName(const String& name, File::ContentTypeLookupPolicy policy)
 {
     String type;
     int index = name.reverseFind('.');
     if (index != -1) {
         if (policy == File::WellKnownContentTypes) {
             type = MIMETypeRegistry::getWellKnownMIMETypeForExtension(name.substring(index + 1));
         } else {
             ASSERT(policy == File::AllContentTypes);
             type = MIMETypeRegistry::getMIMETypeForExtension(name.substring(index + 1));
         }
     }
     return type;
 }
 
-static std::unique_ptr<BlobData> createBlobDataForFileWithType(const String& path, const String& contentType)
+static PassOwnPtr<BlobData> createBlobDataForFileWithType(const String& path, const String& contentType)
 {
-    std::unique_ptr<BlobData> blobData = BlobData::create();
+    OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(contentType);
     blobData->appendFile(path);
     return blobData;
 }
 
-static std::unique_ptr<BlobData> createBlobDataForFile(const String& path, File::ContentTypeLookupPolicy policy)
+static PassOwnPtr<BlobData> createBlobDataForFile(const String& path, File::ContentTypeLookupPolicy policy)
 {
     return createBlobDataForFileWithType(path, getContentTypeFromFileName(path, policy));
 }
 
-static std::unique_ptr<BlobData> createBlobDataForFileWithName(const String& path, const String& fileSystemName, File::ContentTypeLookupPolicy policy)
+static PassOwnPtr<BlobData> createBlobDataForFileWithName(const String& path, const String& fileSystemName, File::ContentTypeLookupPolicy policy)
 {
     return createBlobDataForFileWithType(path, getContentTypeFromFileName(fileSystemName, policy));
 }
 
-static std::unique_ptr<BlobData> createBlobDataForFileWithMetadata(const String& fileSystemName, const FileMetadata& metadata)
+static PassOwnPtr<BlobData> createBlobDataForFileWithMetadata(const String& fileSystemName, const FileMetadata& metadata)
 {
-    std::unique_ptr<BlobData> blobData = BlobData::create();
+    OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(getContentTypeFromFileName(fileSystemName, File::WellKnownContentTypes));
     blobData->appendFile(metadata.platformPath, 0, metadata.length, metadata.modificationTime / msPerSecond);
     return blobData;
 }
 
-static std::unique_ptr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSystemURL, const FileMetadata& metadata)
+static PassOwnPtr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSystemURL, const FileMetadata& metadata)
 {
-    std::unique_ptr<BlobData> blobData = BlobData::create();
+    OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(getContentTypeFromFileName(fileSystemURL.path(), File::WellKnownContentTypes));
     blobData->appendFileSystemURL(fileSystemURL, 0, metadata.length, metadata.modificationTime / msPerSecond);
     return blobData;
 }
 
 // static
 File* File::create(ExecutionContext* context, const HeapVector<ArrayBufferOrArrayBufferViewOrBlobOrUSVString>& fileBits, const String& fileName, const FilePropertyBag& options, ExceptionState& exceptionState)
 {
     ASSERT(options.hasType());
     if (!options.type().containsOnlyASCII()) {
         exceptionState.throwDOMException(SyntaxError, "The 'type' property must consist of ASCII characters.");
         return nullptr;
     }
 
     double lastModified;
     if (options.hasLastModified())
         lastModified = static_cast<double>(options.lastModified());
     else
         lastModified = currentTimeMS();
     ASSERT(options.hasEndings());
     bool normalizeLineEndingsToNative = options.endings() == "native";
     if (normalizeLineEndingsToNative)
         UseCounter::count(context, UseCounter::FileAPINativeLineEndings);
 
-    std::unique_ptr<BlobData> blobData = BlobData::create();
+    OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(options.type().lower());
     populateBlobData(blobData.get(), fileBits, normalizeLineEndingsToNative);
 
     long long fileSize = blobData->length();
     return File::create(fileName, lastModified, BlobDataHandle::create(std::move(blobData), fileSize));
 }
 
 File* File::createWithRelativePath(const String& path, const String& relativePath)
 {
     File* file = new File(path, File::AllContentTypes, File::IsUserVisible);
@@ skipping 149 matching lines @@
     if (!m_hasBackingFile)
         return Blob::slice(start, end, contentType, exceptionState);
 
     // FIXME: This involves synchronous file operation. We need to figure out how to make it asynchronous.
     long long size;
     double modificationTimeMS;
     captureSnapshot(size, modificationTimeMS);
     clampSliceOffsets(size, start, end);
 
     long long length = end - start;
-    std::unique_ptr<BlobData> blobData = BlobData::create();
+    OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(contentType);
     if (!m_fileSystemURL.isEmpty()) {
         blobData->appendFileSystemURL(m_fileSystemURL, start, length, modificationTimeMS / msPerSecond);
     } else {
         ASSERT(!m_path.isEmpty());
         blobData->appendFile(m_path, start, length, modificationTimeMS / msPerSecond);
     }
     return Blob::create(BlobDataHandle::create(std::move(blobData), length));
 }
 
@@ skipping 66 matching lines @@
     if (m_fileSystemURL.isEmpty() != other.m_fileSystemURL.isEmpty())
         return false;
 
     if (!m_fileSystemURL.isEmpty())
         return m_fileSystemURL == other.m_fileSystemURL;
 
     return uuid() == other.uuid();
 }
 
 } // namespace blink