| 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 5da36bdea9cb5feafd6d78fb6e0b578c715b9e0c..0270ccae89517989bc9f770ef417b0317e2c679c 100644
|
| --- a/third_party/WebKit/Source/core/fileapi/File.cpp
|
| +++ b/third_party/WebKit/Source/core/fileapi/File.cpp
|
| @@ -59,7 +59,7 @@ static PassOwnPtr<BlobData> createBlobDataForFileWithType(const String& path, co
|
| OwnPtr<BlobData> blobData = BlobData::create();
|
| blobData->setContentType(contentType);
|
| blobData->appendFile(path);
|
| - return blobData.release();
|
| + return blobData;
|
| }
|
|
|
| static PassOwnPtr<BlobData> createBlobDataForFile(const String& path, File::ContentTypeLookupPolicy policy)
|
| @@ -77,7 +77,7 @@ static PassOwnPtr<BlobData> createBlobDataForFileWithMetadata(const String& file
|
| OwnPtr<BlobData> blobData = BlobData::create();
|
| blobData->setContentType(getContentTypeFromFileName(fileSystemName, File::WellKnownContentTypes));
|
| blobData->appendFile(metadata.platformPath, 0, metadata.length, metadata.modificationTime / msPerSecond);
|
| - return blobData.release();
|
| + return blobData;
|
| }
|
|
|
| static PassOwnPtr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSystemURL, const FileMetadata& metadata)
|
| @@ -85,7 +85,7 @@ static PassOwnPtr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSyste
|
| OwnPtr<BlobData> blobData = BlobData::create();
|
| blobData->setContentType(getContentTypeFromFileName(fileSystemURL.path(), File::WellKnownContentTypes));
|
| blobData->appendFileSystemURL(fileSystemURL, 0, metadata.length, metadata.modificationTime / msPerSecond);
|
| - return blobData.release();
|
| + return blobData;
|
| }
|
|
|
| // static
|
| @@ -112,7 +112,7 @@ File* File::create(ExecutionContext* context, const HeapVector<ArrayBufferOrArra
|
| populateBlobData(blobData.get(), fileBits, normalizeLineEndingsToNative);
|
|
|
| long long fileSize = blobData->length();
|
| - return File::create(fileName, lastModified, BlobDataHandle::create(blobData.release(), fileSize));
|
| + return File::create(fileName, lastModified, BlobDataHandle::create(std::move(blobData), fileSize));
|
| }
|
|
|
| File* File::createWithRelativePath(const String& path, const String& relativePath)
|
| @@ -285,7 +285,7 @@ Blob* File::slice(long long start, long long end, const String& contentType, Exc
|
| ASSERT(!m_path.isEmpty());
|
| blobData->appendFile(m_path, start, length, modificationTimeMS / msPerSecond);
|
| }
|
| - return Blob::create(BlobDataHandle::create(blobData.release(), length));
|
| + return Blob::create(BlobDataHandle::create(std::move(blobData), length));
|
| }
|
|
|
| void File::captureSnapshot(long long& snapshotSize, double& snapshotModificationTimeMS) const
|
|
|