Index: third_party/WebKit/Source/core/fileapi/File.cpp |
diff --git a/third_party/WebKit/Source/core/fileapi/File.cpp b/third_party/WebKit/Source/core/fileapi/File.cpp |
index 0270ccae89517989bc9f770ef417b0317e2c679c..e8f41f963ae10484bda679b72f8ed1d8933657eb 100644 |
--- a/third_party/WebKit/Source/core/fileapi/File.cpp |
+++ b/third_party/WebKit/Source/core/fileapi/File.cpp |
@@ -36,6 +36,7 @@ |
#include "public/platform/WebFileUtilities.h" |
#include "wtf/CurrentTime.h" |
#include "wtf/DateMath.h" |
+#include <memory> |
namespace blink { |
@@ -54,35 +55,35 @@ static String getContentTypeFromFileName(const String& name, File::ContentTypeLo |
return type; |
} |
-static PassOwnPtr<BlobData> createBlobDataForFileWithType(const String& path, const String& contentType) |
+static std::unique_ptr<BlobData> createBlobDataForFileWithType(const String& path, const String& contentType) |
{ |
- OwnPtr<BlobData> blobData = BlobData::create(); |
+ std::unique_ptr<BlobData> blobData = BlobData::create(); |
blobData->setContentType(contentType); |
blobData->appendFile(path); |
return blobData; |
} |
-static PassOwnPtr<BlobData> createBlobDataForFile(const String& path, File::ContentTypeLookupPolicy policy) |
+static std::unique_ptr<BlobData> createBlobDataForFile(const String& path, File::ContentTypeLookupPolicy policy) |
{ |
return createBlobDataForFileWithType(path, getContentTypeFromFileName(path, policy)); |
} |
-static PassOwnPtr<BlobData> createBlobDataForFileWithName(const String& path, const String& fileSystemName, File::ContentTypeLookupPolicy policy) |
+static std::unique_ptr<BlobData> createBlobDataForFileWithName(const String& path, const String& fileSystemName, File::ContentTypeLookupPolicy policy) |
{ |
return createBlobDataForFileWithType(path, getContentTypeFromFileName(fileSystemName, policy)); |
} |
-static PassOwnPtr<BlobData> createBlobDataForFileWithMetadata(const String& fileSystemName, const FileMetadata& metadata) |
+static std::unique_ptr<BlobData> createBlobDataForFileWithMetadata(const String& fileSystemName, const FileMetadata& metadata) |
{ |
- OwnPtr<BlobData> blobData = BlobData::create(); |
+ std::unique_ptr<BlobData> blobData = BlobData::create(); |
blobData->setContentType(getContentTypeFromFileName(fileSystemName, File::WellKnownContentTypes)); |
blobData->appendFile(metadata.platformPath, 0, metadata.length, metadata.modificationTime / msPerSecond); |
return blobData; |
} |
-static PassOwnPtr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSystemURL, const FileMetadata& metadata) |
+static std::unique_ptr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSystemURL, const FileMetadata& metadata) |
{ |
- OwnPtr<BlobData> blobData = BlobData::create(); |
+ std::unique_ptr<BlobData> blobData = BlobData::create(); |
blobData->setContentType(getContentTypeFromFileName(fileSystemURL.path(), File::WellKnownContentTypes)); |
blobData->appendFileSystemURL(fileSystemURL, 0, metadata.length, metadata.modificationTime / msPerSecond); |
return blobData; |
@@ -107,7 +108,7 @@ File* File::create(ExecutionContext* context, const HeapVector<ArrayBufferOrArra |
if (normalizeLineEndingsToNative) |
UseCounter::count(context, UseCounter::FileAPINativeLineEndings); |
- OwnPtr<BlobData> blobData = BlobData::create(); |
+ std::unique_ptr<BlobData> blobData = BlobData::create(); |
blobData->setContentType(options.type().lower()); |
populateBlobData(blobData.get(), fileBits, normalizeLineEndingsToNative); |
@@ -277,7 +278,7 @@ Blob* File::slice(long long start, long long end, const String& contentType, Exc |
clampSliceOffsets(size, start, end); |
long long length = end - start; |
- OwnPtr<BlobData> blobData = BlobData::create(); |
+ std::unique_ptr<BlobData> blobData = BlobData::create(); |
blobData->setContentType(contentType); |
if (!m_fileSystemURL.isEmpty()) { |
blobData->appendFileSystemURL(m_fileSystemURL, start, length, modificationTimeMS / msPerSecond); |