Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: third_party/WebKit/Source/core/fileapi/File.cpp

Issue 2717583003: [BlobStorage] Enforcing renderer constraints to prevent broken blobs (Closed)
Patch Set: added test Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/fileapi/FileTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8576c47ef7c7e7d9c69b44e2214e76a9a40342f1..079a1b96b74ebbe5176c4cdecf996404b9f3d548 100644
--- a/third_party/WebKit/Source/core/fileapi/File.cpp
+++ b/third_party/WebKit/Source/core/fileapi/File.cpp
@@ -85,22 +85,34 @@ static std::unique_ptr<BlobData> createBlobDataForFileWithName(
static std::unique_ptr<BlobData> createBlobDataForFileWithMetadata(
const String& fileSystemName,
const FileMetadata& metadata) {
- std::unique_ptr<BlobData> blobData = BlobData::create();
+ std::unique_ptr<BlobData> blobData;
+ if (metadata.length == BlobDataItem::toEndOfFile) {
+ blobData = BlobData::createForFileWithUnknownSize(
+ metadata.platformPath, metadata.modificationTime / msPerSecond);
+ } else {
+ blobData = BlobData::create();
+ blobData->appendFile(metadata.platformPath, 0, metadata.length,
+ metadata.modificationTime / msPerSecond);
+ }
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) {
- std::unique_ptr<BlobData> blobData = BlobData::create();
+ std::unique_ptr<BlobData> blobData;
+ if (metadata.length == BlobDataItem::toEndOfFile) {
+ blobData = BlobData::createForFileSystemURLWithUnknownSize(
+ fileSystemURL, metadata.modificationTime / msPerSecond);
+ } else {
+ blobData = BlobData::create();
+ blobData->appendFileSystemURL(fileSystemURL, 0, metadata.length,
+ metadata.modificationTime / msPerSecond);
+ }
blobData->setContentType(getContentTypeFromFileName(
fileSystemURL.path(), File::WellKnownContentTypes));
- blobData->appendFileSystemURL(fileSystemURL, 0, metadata.length,
- metadata.modificationTime / msPerSecond);
return blobData;
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/fileapi/FileTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698