| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
| 7 | 7 |
| 8 MSVC_PUSH_WARNING_LEVEL(0); | 8 MSVC_PUSH_WARNING_LEVEL(0); |
| 9 #include "FormData.h" | 9 #include "FormData.h" |
| 10 #include "HTTPHeaderMap.h" | 10 #include "HTTPHeaderMap.h" |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 for (; it != elements.end(); ++it) { | 170 for (; it != elements.end(); ++it) { |
| 171 const WebCore::FormDataElement& element = (*it); | 171 const WebCore::FormDataElement& element = (*it); |
| 172 if (element.m_type == WebCore::FormDataElement::data) { | 172 if (element.m_type == WebCore::FormDataElement::data) { |
| 173 data->AppendBytes(element.m_data.data(), element.m_data.size()); | 173 data->AppendBytes(element.m_data.data(), element.m_data.size()); |
| 174 } else if (element.m_type == WebCore::FormDataElement::encodedFile) { | 174 } else if (element.m_type == WebCore::FormDataElement::encodedFile) { |
| 175 data->AppendFile(webkit_glue::StringToStdWString(element.m_filename)); | 175 data->AppendFile(webkit_glue::StringToStdWString(element.m_filename)); |
| 176 } else { | 176 } else { |
| 177 NOTREACHED(); | 177 NOTREACHED(); |
| 178 } | 178 } |
| 179 } | 179 } |
| 180 |
| 181 data->set_identifier(formdata->identifier()); |
| 180 } | 182 } |
| 181 | 183 |
| 182 void WebRequestImpl::SetUploadData(const net::UploadData& data) | 184 void WebRequestImpl::SetUploadData(const net::UploadData& data) |
| 183 { | 185 { |
| 184 RefPtr<WebCore::FormData> formdata = WebCore::FormData::create(); | 186 RefPtr<WebCore::FormData> formdata = WebCore::FormData::create(); |
| 185 | 187 |
| 186 const std::vector<net::UploadData::Element>& elements = data.elements(); | 188 const std::vector<net::UploadData::Element>& elements = data.elements(); |
| 187 std::vector<net::UploadData::Element>::const_iterator it = elements.begin(); | 189 std::vector<net::UploadData::Element>::const_iterator it = elements.begin(); |
| 188 for (; it != elements.end(); ++it) { | 190 for (; it != elements.end(); ++it) { |
| 189 const net::UploadData::Element& element = (*it); | 191 const net::UploadData::Element& element = (*it); |
| 190 if (element.type() == net::UploadData::TYPE_BYTES) { | 192 if (element.type() == net::UploadData::TYPE_BYTES) { |
| 191 formdata->appendData( | 193 formdata->appendData( |
| 192 std::string(element.bytes().begin(), element.bytes().end()).c_str(), | 194 std::string(element.bytes().begin(), element.bytes().end()).c_str(), |
| 193 element.bytes().size()); | 195 element.bytes().size()); |
| 194 } else if (element.type() == net::UploadData::TYPE_FILE) { | 196 } else if (element.type() == net::UploadData::TYPE_FILE) { |
| 195 formdata->appendFile( | 197 formdata->appendFile( |
| 196 webkit_glue::StdWStringToString(element.file_path())); | 198 webkit_glue::StdWStringToString(element.file_path())); |
| 197 } else { | 199 } else { |
| 198 NOTREACHED(); | 200 NOTREACHED(); |
| 199 } | 201 } |
| 200 } | 202 } |
| 201 | 203 |
| 204 formdata->setIdentifier(data.identifier()); |
| 205 |
| 202 request_.resourceRequest().setHTTPBody(formdata); | 206 request_.resourceRequest().setHTTPBody(formdata); |
| 203 } | 207 } |
| 204 | 208 |
| 205 void WebRequestImpl::SetRequestorID(int requestor_id) { | 209 void WebRequestImpl::SetRequestorID(int requestor_id) { |
| 206 request_.resourceRequest().setRequestorID(requestor_id); | 210 request_.resourceRequest().setRequestorID(requestor_id); |
| 207 } | 211 } |
| 208 | 212 |
| 209 // static | 213 // static |
| 210 WebRequest* WebRequest::Create(const GURL& url) { | 214 WebRequest* WebRequest::Create(const GURL& url) { |
| 211 return new WebRequestImpl(url); | 215 return new WebRequestImpl(url); |
| 212 } | 216 } |
| OLD | NEW |