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

Unified Diff: webkit/browser/blob/blob_url_request_job.cc

Issue 46303005: Fix chrome upload with content uri (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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: webkit/browser/blob/blob_url_request_job.cc
diff --git a/webkit/browser/blob/blob_url_request_job.cc b/webkit/browser/blob/blob_url_request_job.cc
index 4b89636d6bfd34cafb3e4edf844038491d29b077..d8419b439852ed268548dedd084fe8921e5ba242 100644
--- a/webkit/browser/blob/blob_url_request_job.cc
+++ b/webkit/browser/blob/blob_url_request_job.cc
@@ -28,6 +28,10 @@
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_url.h"
+#if defined(OS_ANDROID)
+#include "webkit/browser/blob/content_url_stream_reader_android.h"
+#endif
+
namespace webkit_blob {
namespace {
@@ -36,6 +40,9 @@ bool IsFileType(BlobData::Item::Type type) {
switch (type) {
case BlobData::Item::TYPE_FILE:
case BlobData::Item::TYPE_FILE_FILESYSTEM:
+#if defined(OS_ANDROID)
+ case BlobData::Item::TYPE_CONTENT_URL:
+#endif
return true;
default:
return false;
@@ -564,6 +571,14 @@ void BlobURLRequestJob::CreateFileStreamReader(size_t index,
item.offset() + additional_offset,
item.expected_modification_time()).release();
break;
+#if defined(OS_ANDROID)
+ case BlobData::Item::TYPE_CONTENT_URL:
+ reader = FileStreamReader::CreateForContentUrl(
+ file_thread_proxy_.get(),
+ item.content_url(),
+ item.offset() + additional_offset);
+ break;
+#endif
default:
NOTREACHED();
}

Powered by Google App Engine
This is Rietveld 408576698