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

Side by Side Diff: Source/core/loader/FormSubmission.cpp

Issue 329513002: Remove encoding parameter from createMultiPartFormData() and createFormData() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/BeaconLoader.cpp ('k') | Source/core/xml/XMLHttpRequest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 HTMLInputElement& input = toHTMLInputElement(element); 222 HTMLInputElement& input = toHTMLInputElement(element);
223 if (input.isPasswordField() && !input.value().isEmpty()) 223 if (input.isPasswordField() && !input.value().isEmpty())
224 containsPasswordData = true; 224 containsPasswordData = true;
225 } 225 }
226 } 226 }
227 227
228 RefPtr<FormData> formData; 228 RefPtr<FormData> formData;
229 String boundary; 229 String boundary;
230 230
231 if (isMultiPartForm) { 231 if (isMultiPartForm) {
232 formData = domFormData->createMultiPartFormData(domFormData->encoding()) ; 232 formData = domFormData->createMultiPartFormData();
233 boundary = formData->boundary().data(); 233 boundary = formData->boundary().data();
234 } else { 234 } else {
235 formData = domFormData->createFormData(domFormData->encoding(), attribut es.method() == GetMethod ? FormData::FormURLEncoded : FormData::parseEncodingTyp e(encodingType)); 235 formData = domFormData->createFormData(attributes.method() == GetMethod ? FormData::FormURLEncoded : FormData::parseEncodingType(encodingType));
236 if (copiedAttributes.method() == PostMethod && isMailtoForm) { 236 if (copiedAttributes.method() == PostMethod && isMailtoForm) {
237 // Convert the form data into a string that we put into the URL. 237 // Convert the form data into a string that we put into the URL.
238 appendMailtoPostFormDataToURL(actionURL, *formData, encodingType); 238 appendMailtoPostFormDataToURL(actionURL, *formData, encodingType);
239 formData = FormData::create(); 239 formData = FormData::create();
240 } 240 }
241 } 241 }
242 242
243 formData->setIdentifier(generateFormDataIdentifier()); 243 formData->setIdentifier(generateFormDataIdentifier());
244 formData->setContainsPasswordData(containsPasswordData); 244 formData->setContainsPasswordData(containsPasswordData);
245 AtomicString targetOrBaseTarget = copiedAttributes.target().isEmpty() ? docu ment.baseTarget() : copiedAttributes.target(); 245 AtomicString targetOrBaseTarget = copiedAttributes.target().isEmpty() ? docu ment.baseTarget() : copiedAttributes.target();
(...skipping 27 matching lines...) Expand all
273 frameRequest.resourceRequest().setHTTPContentType(m_contentType); 273 frameRequest.resourceRequest().setHTTPContentType(m_contentType);
274 else 274 else
275 frameRequest.resourceRequest().setHTTPContentType(m_contentType + "; boundary=" + m_boundary); 275 frameRequest.resourceRequest().setHTTPContentType(m_contentType + "; boundary=" + m_boundary);
276 } 276 }
277 277
278 frameRequest.resourceRequest().setURL(requestURL()); 278 frameRequest.resourceRequest().setURL(requestURL());
279 FrameLoader::addHTTPOriginIfNeeded(frameRequest.resourceRequest(), AtomicStr ing(m_origin)); 279 FrameLoader::addHTTPOriginIfNeeded(frameRequest.resourceRequest(), AtomicStr ing(m_origin));
280 } 280 }
281 281
282 } 282 }
OLDNEW
« no previous file with comments | « Source/core/loader/BeaconLoader.cpp ('k') | Source/core/xml/XMLHttpRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698