mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #6941 from deepak1556/blob_data_patch

Browse source 
protocol: provide blob uuid with uploadData
This commit is contained in:
Cheng Zhao 2016-09-16 17:01:15 +09:00 • committed by GitHub
commit 9714348260
11 changed files with 321 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/common/native_mate_converters/net_converter.cc
View file

@ -19,6 +19,7 @@
#include "net/cert/x509_certificate.h"
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request.h"
#include "storage/browser/blob/upload_blob_element_reader.h"
#include "atom/common/node_includes.h"
@ -96,6 +97,10 @@ void GetUploadData(base::ListValue* upload_data_list,
reader->AsFileReader();
auto file_path = file_reader->path().AsUTF8Unsafe();
upload_data_dict->SetStringWithoutPathExpansion("file", file_path);
} else {
const storage::UploadBlobElementReader* blob_reader =
static_cast<storage::UploadBlobElementReader*>(reader.get());
upload_data_dict->SetString("blobUUID", blob_reader->uuid());
}
upload_data_list->Append(std::move(upload_data_dict));
}