Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: webkit/glue/weburlrequest_impl.cc

Issue 63011: Monster FilePath patch! (Closed)
Patch Set: sync with trunk Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/resource_loader_bridge.h ('k') | webkit/glue/webview_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/weburlrequest_impl.cc
diff --git a/webkit/glue/weburlrequest_impl.cc b/webkit/glue/weburlrequest_impl.cc
index cf30f7e339380d648c98248bc55c43cb0d7e16f6..655eb0f557c6f4395a6e3f11cccb7b34e68c7a64 100644
--- a/webkit/glue/weburlrequest_impl.cc
+++ b/webkit/glue/weburlrequest_impl.cc
@@ -172,7 +172,8 @@ void WebRequestImpl::GetUploadData(net::UploadData* data) const {
if (element.m_type == WebCore::FormDataElement::data) {
data->AppendBytes(element.m_data.data(), element.m_data.size());
} else if (element.m_type == WebCore::FormDataElement::encodedFile) {
- data->AppendFile(webkit_glue::StringToStdWString(element.m_filename));
+ data->AppendFile(
+ FilePath(webkit_glue::StringToFilePathString(element.m_filename)));
} else {
NOTREACHED();
}
@@ -195,7 +196,7 @@ void WebRequestImpl::SetUploadData(const net::UploadData& data)
element.bytes().size());
} else if (element.type() == net::UploadData::TYPE_FILE) {
formdata->appendFile(
- webkit_glue::StdWStringToString(element.file_path()));
+ webkit_glue::FilePathStringToString(element.file_path().value()));
} else {
NOTREACHED();
}
« no previous file with comments | « webkit/glue/resource_loader_bridge.h ('k') | webkit/glue/webview_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698