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

Unified Diff: content/common/webblobregistry_impl.cc

Issue 7974011: Break large blobs into multiple ipcs during creation. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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
Index: content/common/webblobregistry_impl.cc
===================================================================
--- content/common/webblobregistry_impl.cc (revision 103169)
+++ content/common/webblobregistry_impl.cc (working copy)
@@ -10,6 +10,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
#include "webkit/blob/blob_data.h"
+#include "webkit/glue/webkit_glue.h"
using WebKit::WebBlobData;
using WebKit::WebString;
@@ -24,16 +25,58 @@
void WebBlobRegistryImpl::registerBlobURL(
const WebURL& url, WebBlobData& data) {
- scoped_refptr<webkit_blob::BlobData> blob_data(
- new webkit_blob::BlobData(data));
- sender_->Send(new BlobHostMsg_RegisterBlobUrl(url, blob_data));
+ sender_->Send(new BlobHostMsg_StartBuildingBlob(url));
+ size_t i = 0;
+ WebBlobData::Item data_item;
+ while (data.itemAt(i++, data_item)) {
+ webkit_blob::BlobData::Item item;
+ switch (data_item.type) {
+ case WebBlobData::Item::TypeData: {
+ // WebBlobData does not allow partial data items.
+ DCHECK(!data_item.offset && data_item.length == -1);
+ // We have to chunk large items to send them over ipc.
+ const size_t kMaxDataChunkSize = 5 * 1024 * 1024;
+ size_t data_size = data_item.data.size();
+ const char* data_ptr = data_item.data.data();
+ while (data_size) {
+ size_t chunk_size = std::min(data_size, kMaxDataChunkSize);
+ item.SetToData(data_ptr, chunk_size);
+ data_size -= chunk_size;
+ data_ptr += chunk_size;
+ sender_->Send(new BlobHostMsg_AppendBlobDataItem(url, item));
+ }
+ break;
+ }
+ case WebBlobData::Item::TypeFile:
+ item.SetToFile(
+ webkit_glue::WebStringToFilePath(data_item.filePath),
+ static_cast<uint64>(data_item.offset),
+ static_cast<uint64>(data_item.length),
+ base::Time::FromDoubleT(data_item.expectedModificationTime));
+ sender_->Send(new BlobHostMsg_AppendBlobDataItem(url, item));
+ break;
+ case WebBlobData::Item::TypeBlob:
+ if (data_item.length) {
+ item.SetToBlob(
+ data_item.blobURL,
+ static_cast<uint64>(data_item.offset),
+ static_cast<uint64>(data_item.length));
+ }
+ sender_->Send(new BlobHostMsg_AppendBlobDataItem(url, item));
+ break;
+ default:
+ NOTREACHED();
+ }
+ }
+ sender_->Send(new BlobHostMsg_FinishBuildingBlob(
+ url, data.contentType().utf8().data()));
}
void WebBlobRegistryImpl::registerBlobURL(
const WebURL& url, const WebURL& src_url) {
- sender_->Send(new BlobHostMsg_RegisterBlobUrlFrom(url, src_url));
+ sender_->Send(new BlobHostMsg_CloneBlob(url, src_url));
}
void WebBlobRegistryImpl::unregisterBlobURL(const WebURL& url) {
- sender_->Send(new BlobHostMsg_UnregisterBlobUrl(url));
+ sender_->Send(new BlobHostMsg_RemoveBlob(url));
}

Powered by Google App Engine
This is Rietveld 408576698