Index: webkit/browser/fileapi/file_system_operation_runner.cc |
diff --git a/webkit/browser/fileapi/file_system_operation_runner.cc b/webkit/browser/fileapi/file_system_operation_runner.cc |
index 351536b6226dddd505c8e031c670ff8a2c37975a..91ca1bade10d5016da433d47a8e57714468aac11 100644 |
--- a/webkit/browser/fileapi/file_system_operation_runner.cc |
+++ b/webkit/browser/fileapi/file_system_operation_runner.cc |
@@ -6,6 +6,7 @@ |
#include "base/bind.h" |
#include "net/url_request/url_request_context.h" |
+#include "webkit/browser/blob/blob_url_request_job_factory.h" |
ericu
2013/08/21 23:26:09
Is this needed?
michaeln
2013/08/27 23:24:06
yes, see line 234
|
#include "webkit/browser/fileapi/file_observers.h" |
#include "webkit/browser/fileapi/file_stream_writer.h" |
#include "webkit/browser/fileapi/file_system_context.h" |
@@ -207,7 +208,7 @@ OperationID FileSystemOperationRunner::Remove( |
OperationID FileSystemOperationRunner::Write( |
const net::URLRequestContext* url_request_context, |
const FileSystemURL& url, |
- const GURL& blob_url, |
+ scoped_ptr<webkit_blob::BlobDataHandle> blob, |
int64 offset, |
const WriteCallback& callback) { |
base::PlatformFileError error = base::PLATFORM_FILE_OK; |
@@ -226,11 +227,13 @@ OperationID FileSystemOperationRunner::Write( |
return kErrorOperationID; |
} |
- DCHECK(blob_url.is_valid()); |
scoped_ptr<FileWriterDelegate> writer_delegate( |
new FileWriterDelegate(writer.Pass())); |
scoped_ptr<net::URLRequest> blob_request(url_request_context->CreateRequest( |
- blob_url, writer_delegate.get())); |
+ GURL("blob://see_user_data/"), writer_delegate.get())); |
kinuko
2013/08/21 10:22:20
nit: This URL string is a bit distracting... can t
michaeln
2013/08/21 17:57:00
Yes, thanx! That's a really good idea, also gives
michaeln
2013/08/27 23:24:06
added a helper method to construct the URLRequest
ericu
2013/08/28 22:01:28
Much nicer!
|
+ webkit_blob::BlobProtocolHandler::SetRequestedBlobDataHandle( |
+ blob_request.get(), |
+ blob.Pass()); |
OperationID id = operations_.Add(operation); |
PrepareForWrite(id, url); |