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 149431.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@731 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-08-07 13:58:35 +00:00
parent b39ca211ae
commit 3b8ebef27b
27 changed files with 198 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cef1/libcef/browser_resource_loader_bridge.cc
View File

@ -580,7 +580,10 @@ class RequestProxy : public net::URLRequest::Delegate,
ResolveBlobReferencesInUploadData(params->upload.get());
}
request_.reset(new net::URLRequest(params->url, this));
net::URLRequestContext* context = browser_.get() ?
browser_->request_context_proxy() : _Context->request_context();
request_.reset(new net::URLRequest(params->url, this, context));
request_->set_priority(params->priority);
request_->set_method(params->method);
request_->set_first_party_for_cookies(params->first_party_for_cookies);
@ -592,8 +595,6 @@ class RequestProxy : public net::URLRequest::Delegate,
request_->SetExtraRequestHeaders(headers);
request_->set_load_flags(params->load_flags);
request_->set_upload(params->upload.get());
request_->set_context(browser_.get() ? browser_->request_context_proxy() :
_Context->request_context());
request_->SetUserData(kCefUserData,
new ExtraRequestInfo(browser_.get(), params->request_type));
BrowserAppCacheSystem::SetExtraRequestInfo(
@ -874,7 +875,7 @@ class RequestProxy : public net::URLRequest::Delegate,
// GetContentLengthSync() may perform file IO, but it's ok here, as file
// IO is not prohibited in IOThread defined in the file.
uint64 size = request_->get_upload()->GetContentLengthSync();
uint64 size = request_->get_upload_mutable()->GetContentLengthSync();
uint64 position = request_->GetUploadProgress();
if (position == last_upload_position_)
return; // no progress made since last time