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

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

Issue 1365923002: Make Document.charset an alias of characterSet, as per spec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 bool isMultiPartForm = false; 201 bool isMultiPartForm = false;
202 AtomicString encodingType = copiedAttributes.encodingType(); 202 AtomicString encodingType = copiedAttributes.encodingType();
203 203
204 if (copiedAttributes.method() == PostMethod) { 204 if (copiedAttributes.method() == PostMethod) {
205 isMultiPartForm = copiedAttributes.isMultiPartForm(); 205 isMultiPartForm = copiedAttributes.isMultiPartForm();
206 if (isMultiPartForm && isMailtoForm) { 206 if (isMultiPartForm && isMailtoForm) {
207 encodingType = AtomicString("application/x-www-form-urlencoded", Ato micString::ConstructFromLiteral); 207 encodingType = AtomicString("application/x-www-form-urlencoded", Ato micString::ConstructFromLiteral);
208 isMultiPartForm = false; 208 isMultiPartForm = false;
209 } 209 }
210 } 210 }
211 WTF::TextEncoding dataEncoding = isMailtoForm ? UTF8Encoding() : FormDataEnc oder::encodingFromAcceptCharset(copiedAttributes.acceptCharset(), document.chars et(), document.defaultCharset()); 211 WTF::TextEncoding dataEncoding = isMailtoForm ? UTF8Encoding() : FormDataEnc oder::encodingFromAcceptCharset(copiedAttributes.acceptCharset(), document.chara cterSet(), document.defaultCharset());
212 FormData* domFormData = FormData::create(dataEncoding.encodingForFormSubmiss ion()); 212 FormData* domFormData = FormData::create(dataEncoding.encodingForFormSubmiss ion());
213 213
214 bool containsPasswordData = false; 214 bool containsPasswordData = false;
215 for (unsigned i = 0; i < form->associatedElements().size(); ++i) { 215 for (unsigned i = 0; i < form->associatedElements().size(); ++i) {
216 FormAssociatedElement* control = form->associatedElements()[i]; 216 FormAssociatedElement* control = form->associatedElements()[i];
217 ASSERT(control); 217 ASSERT(control);
218 HTMLElement& element = toHTMLElement(*control); 218 HTMLElement& element = toHTMLElement(*control);
219 if (!element.isDisabledFormControl()) 219 if (!element.isDisabledFormControl())
220 control->appendToFormData(*domFormData); 220 control->appendToFormData(*domFormData);
221 if (isHTMLInputElement(element)) { 221 if (isHTMLInputElement(element)) {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 if (m_boundary.isEmpty()) 275 if (m_boundary.isEmpty())
276 frameRequest.resourceRequest().setHTTPContentType(m_contentType); 276 frameRequest.resourceRequest().setHTTPContentType(m_contentType);
277 else 277 else
278 frameRequest.resourceRequest().setHTTPContentType(m_contentType + "; boundary=" + m_boundary); 278 frameRequest.resourceRequest().setHTTPContentType(m_contentType + "; boundary=" + m_boundary);
279 } 279 }
280 280
281 frameRequest.resourceRequest().setURL(requestURL()); 281 frameRequest.resourceRequest().setURL(requestURL());
282 } 282 }
283 283
284 } 284 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698