Update to Chromium revision 153668.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@748 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-08-28 22:26:35 +00:00
parent 6a8f3a9410
commit 2e83d58814
36 changed files with 317 additions and 117 deletions

View File

@ -319,19 +319,17 @@ void CefBrowserImpl::LoadRequest(const CefMsg_LoadRequest_Params& params) {
WebKit::WebHTTPBody body;
body.initialize();
const std::vector<net::UploadData::Element>* elements =
const std::vector<net::UploadElement>* elements =
params.upload_data->elements();
std::vector<net::UploadData::Element>::const_iterator it =
std::vector<net::UploadElement>::const_iterator it =
elements->begin();
for (; it != elements->end(); ++it) {
const net::UploadData::Element& element = *it;
if (element.type() == net::UploadData::TYPE_BYTES) {
const net::UploadElement& element = *it;
if (element.type() == net::UploadElement::TYPE_BYTES) {
WebKit::WebData data;
data.assign(std::string(element.bytes().begin(),
element.bytes().end()).c_str(),
element.bytes().size());
data.assign(element.bytes(), element.bytes_length());
body.appendData(data);
} else if (element.type() == net::UploadData::TYPE_FILE) {
} else if (element.type() == net::UploadElement::TYPE_FILE) {
body.appendFile(webkit_glue::FilePathToWebString(element.file_path()));
} else {
NOTREACHED();