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

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 11410019: ********** Chromium Blob hacking (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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/browser/loader/resource_dispatcher_host_impl.cc
===================================================================
--- content/browser/loader/resource_dispatcher_host_impl.cc (revision 183651)
+++ content/browser/loader/resource_dispatcher_host_impl.cc (working copy)
@@ -80,7 +80,9 @@
#include "net/url_request/url_request_job_factory.h"
#include "webkit/appcache/appcache_interceptor.h"
#include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/blob/blob_storage_controller.h"
+#include "webkit/blob/blob_data.h"
+#include "webkit/blob/blob_storage_context.h"
+#include "webkit/blob/blob_url_request_job_factory.h"
#include "webkit/blob/shareable_file_reference.h"
#include "webkit/glue/resource_request_body.h"
#include "webkit/glue/webkit_glue.h"
@@ -928,7 +930,7 @@
if (request_data.request_body) {
request->set_upload(make_scoped_ptr(
request_data.request_body->ResolveElementsAndCreateUploadDataStream(
- filter_->blob_storage_context()->controller(),
+ filter_->blob_storage_context()->context(),
filter_->file_system_context(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE))));
}
@@ -961,9 +963,10 @@
if (request->url().SchemeIs(chrome::kBlobScheme)) {
// Hang on to a reference to ensure the blob is not released prior
// to the job being started.
- extra_info->set_requested_blob_data(
- filter_->blob_storage_context()->controller()->
- GetBlobDataFromUrl(request->url()));
+ webkit_blob::BlobProtocolHandler::SetRequestedBlobDataHandle(
+ request,
+ filter_->blob_storage_context()->context()->
+ GetBlobDataFromPublicUrl(request->url()));
}
// Have the appcache associate its extra info with the request.
« no previous file with comments | « content/browser/fileapi/fileapi_message_filter.cc ('k') | content/browser/loader/resource_request_info_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698