OLD | NEW |
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 14 matching lines...) Expand all Loading... |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/loader/FormSubmission.h" | 32 #include "core/loader/FormSubmission.h" |
33 | 33 |
34 #include "core/HTMLNames.h" | 34 #include "core/HTMLNames.h" |
| 35 #include "core/InputTypeNames.h" |
35 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
36 #include "core/events/Event.h" | 37 #include "core/events/Event.h" |
37 #include "core/html/DOMFormData.h" | 38 #include "core/html/DOMFormData.h" |
38 #include "core/html/HTMLFormControlElement.h" | 39 #include "core/html/HTMLFormControlElement.h" |
39 #include "core/html/HTMLFormElement.h" | 40 #include "core/html/HTMLFormElement.h" |
40 #include "core/html/HTMLInputElement.h" | 41 #include "core/html/HTMLInputElement.h" |
41 #include "core/html/parser/HTMLParserIdioms.h" | 42 #include "core/html/parser/HTMLParserIdioms.h" |
42 #include "core/loader/FrameLoadRequest.h" | 43 #include "core/loader/FrameLoadRequest.h" |
43 #include "core/loader/FrameLoader.h" | 44 #include "core/loader/FrameLoader.h" |
44 #include "platform/RuntimeEnabledFeatures.h" | 45 #include "platform/RuntimeEnabledFeatures.h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 | 214 |
214 bool containsPasswordData = false; | 215 bool containsPasswordData = false; |
215 for (unsigned i = 0; i < form->associatedElements().size(); ++i) { | 216 for (unsigned i = 0; i < form->associatedElements().size(); ++i) { |
216 FormAssociatedElement* control = form->associatedElements()[i]; | 217 FormAssociatedElement* control = form->associatedElements()[i]; |
217 ASSERT(control); | 218 ASSERT(control); |
218 HTMLElement& element = toHTMLElement(*control); | 219 HTMLElement& element = toHTMLElement(*control); |
219 if (!element.isDisabledFormControl()) | 220 if (!element.isDisabledFormControl()) |
220 control->appendFormData(*domFormData, isMultiPartForm); | 221 control->appendFormData(*domFormData, isMultiPartForm); |
221 if (isHTMLInputElement(element)) { | 222 if (isHTMLInputElement(element)) { |
222 HTMLInputElement& input = toHTMLInputElement(element); | 223 HTMLInputElement& input = toHTMLInputElement(element); |
223 if (input.isPasswordField() && !input.value().isEmpty()) | 224 if (input.type() == InputTypeNames::password && !input.value().isEmp
ty()) |
224 containsPasswordData = true; | 225 containsPasswordData = true; |
225 } | 226 } |
226 } | 227 } |
227 | 228 |
228 RefPtr<FormData> formData; | 229 RefPtr<FormData> formData; |
229 String boundary; | 230 String boundary; |
230 | 231 |
231 if (isMultiPartForm) { | 232 if (isMultiPartForm) { |
232 formData = domFormData->createMultiPartFormData(); | 233 formData = domFormData->createMultiPartFormData(); |
233 boundary = formData->boundary().data(); | 234 boundary = formData->boundary().data(); |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 frameRequest.resourceRequest().setHTTPContentType(m_contentType); | 280 frameRequest.resourceRequest().setHTTPContentType(m_contentType); |
280 else | 281 else |
281 frameRequest.resourceRequest().setHTTPContentType(m_contentType + ";
boundary=" + m_boundary); | 282 frameRequest.resourceRequest().setHTTPContentType(m_contentType + ";
boundary=" + m_boundary); |
282 } | 283 } |
283 | 284 |
284 frameRequest.resourceRequest().setURL(requestURL()); | 285 frameRequest.resourceRequest().setURL(requestURL()); |
285 frameRequest.resourceRequest().addHTTPOriginIfNeeded(AtomicString(m_origin))
; | 286 frameRequest.resourceRequest().addHTTPOriginIfNeeded(AtomicString(m_origin))
; |
286 } | 287 } |
287 | 288 |
288 } | 289 } |
OLD | NEW |