bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision c78c0ad7 (#363565)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-12-09 11:10:16 -05:00
parent 535c4fbc30
commit 5dec0c5f57
62 changed files with 534 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libcef/common/request_impl.cc
View File

@ -213,6 +213,9 @@ void SetHeaderMap(const CefRequest::HeaderMap& map,
}
}
// Type used in UploadDataStream.
typedef std::vector<scoped_ptr<net::UploadElementReader>> UploadElementReaders;
} // namespace
@ -983,11 +986,9 @@ void CefPostDataImpl::Set(const net::UploadDataStream& data_stream) {
CefRefPtr<CefPostDataElement> postelem;
const ScopedVector<net::UploadElementReader>* elements =
data_stream.GetElementReaders();
const UploadElementReaders* elements = data_stream.GetElementReaders();
if (elements) {
ScopedVector<net::UploadElementReader>::const_iterator it =
elements->begin();
UploadElementReaders::const_iterator it = elements->begin();
for (; it != elements->end(); ++it) {
postelem = CefPostDataElement::Create();
static_cast<CefPostDataElementImpl*>(postelem.get())->Set(**it);
@ -1015,14 +1016,14 @@ void CefPostDataImpl::Get(net::UploadData& data) const {
net::UploadDataStream* CefPostDataImpl::Get() const {
base::AutoLock lock_scope(lock_);
ScopedVector<net::UploadElementReader> element_readers;
UploadElementReaders element_readers;
ElementVector::const_iterator it = elements_.begin();
for (; it != elements_.end(); ++it) {
element_readers.push_back(
static_cast<CefPostDataElementImpl*>(it->get())->Get());
element_readers.push_back(make_scoped_ptr(
static_cast<CefPostDataElementImpl*>(it->get())->Get()));
}
return new net::ElementsUploadDataStream(element_readers.Pass(), 0);
return new net::ElementsUploadDataStream(std::move(element_readers), 0);
}
void CefPostDataImpl::Set(const blink::WebHTTPBody& data) {