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 24 matching lines...) Expand all Loading... |
35 #include "RuntimeEnabledFeatures.h" | 35 #include "RuntimeEnabledFeatures.h" |
36 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
37 #include "core/events/Event.h" | 37 #include "core/events/Event.h" |
38 #include "core/html/DOMFormData.h" | 38 #include "core/html/DOMFormData.h" |
39 #include "core/html/HTMLFormControlElement.h" | 39 #include "core/html/HTMLFormControlElement.h" |
40 #include "core/html/HTMLFormElement.h" | 40 #include "core/html/HTMLFormElement.h" |
41 #include "core/html/HTMLInputElement.h" | 41 #include "core/html/HTMLInputElement.h" |
42 #include "core/html/parser/HTMLParserIdioms.h" | 42 #include "core/html/parser/HTMLParserIdioms.h" |
43 #include "core/loader/FrameLoadRequest.h" | 43 #include "core/loader/FrameLoadRequest.h" |
44 #include "core/loader/FrameLoader.h" | 44 #include "core/loader/FrameLoader.h" |
| 45 #include "heap/Handle.h" |
45 #include "platform/network/FormData.h" | 46 #include "platform/network/FormData.h" |
46 #include "platform/network/FormDataBuilder.h" | 47 #include "platform/network/FormDataBuilder.h" |
47 #include "wtf/CurrentTime.h" | 48 #include "wtf/CurrentTime.h" |
48 #include "wtf/text/StringBuilder.h" | 49 #include "wtf/text/StringBuilder.h" |
49 #include "wtf/text/TextEncoding.h" | 50 #include "wtf/text/TextEncoding.h" |
50 | 51 |
51 namespace WebCore { | 52 namespace WebCore { |
52 | 53 |
53 using namespace HTMLNames; | 54 using namespace HTMLNames; |
54 | 55 |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 AtomicString encodingType = copiedAttributes.encodingType(); | 202 AtomicString encodingType = copiedAttributes.encodingType(); |
202 | 203 |
203 if (copiedAttributes.method() == PostMethod) { | 204 if (copiedAttributes.method() == PostMethod) { |
204 isMultiPartForm = copiedAttributes.isMultiPartForm(); | 205 isMultiPartForm = copiedAttributes.isMultiPartForm(); |
205 if (isMultiPartForm && isMailtoForm) { | 206 if (isMultiPartForm && isMailtoForm) { |
206 encodingType = AtomicString("application/x-www-form-urlencoded", Ato
micString::ConstructFromLiteral); | 207 encodingType = AtomicString("application/x-www-form-urlencoded", Ato
micString::ConstructFromLiteral); |
207 isMultiPartForm = false; | 208 isMultiPartForm = false; |
208 } | 209 } |
209 } | 210 } |
210 WTF::TextEncoding dataEncoding = isMailtoForm ? UTF8Encoding() : FormDataBui
lder::encodingFromAcceptCharset(copiedAttributes.acceptCharset(), document.input
Encoding(), document.defaultCharset()); | 211 WTF::TextEncoding dataEncoding = isMailtoForm ? UTF8Encoding() : FormDataBui
lder::encodingFromAcceptCharset(copiedAttributes.acceptCharset(), document.input
Encoding(), document.defaultCharset()); |
211 RefPtr<DOMFormData> domFormData = DOMFormData::create(dataEncoding.encodingF
orFormSubmission()); | 212 RefPtrWillBeRawPtr<DOMFormData> domFormData = DOMFormData::create(dataEncodi
ng.encodingForFormSubmission()); |
212 Vector<pair<String, String> > formValues; | 213 Vector<pair<String, String> > formValues; |
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 HTMLElement* element = toHTMLElement(control); | 218 HTMLElement* element = toHTMLElement(control); |
218 if (!element->isDisabledFormControl()) | 219 if (!element->isDisabledFormControl()) |
219 control->appendFormData(*domFormData, isMultiPartForm); | 220 control->appendFormData(*domFormData, isMultiPartForm); |
220 if (element->hasTagName(inputTag)) { | 221 if (element->hasTagName(inputTag)) { |
221 HTMLInputElement* input = toHTMLInputElement(element); | 222 HTMLInputElement* input = toHTMLInputElement(element); |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 frameRequest.resourceRequest().setHTTPContentType(m_contentType); | 276 frameRequest.resourceRequest().setHTTPContentType(m_contentType); |
276 else | 277 else |
277 frameRequest.resourceRequest().setHTTPContentType(m_contentType + ";
boundary=" + m_boundary); | 278 frameRequest.resourceRequest().setHTTPContentType(m_contentType + ";
boundary=" + m_boundary); |
278 } | 279 } |
279 | 280 |
280 frameRequest.resourceRequest().setURL(requestURL()); | 281 frameRequest.resourceRequest().setURL(requestURL()); |
281 FrameLoader::addHTTPOriginIfNeeded(frameRequest.resourceRequest(), AtomicStr
ing(m_origin)); | 282 FrameLoader::addHTTPOriginIfNeeded(frameRequest.resourceRequest(), AtomicStr
ing(m_origin)); |
282 } | 283 } |
283 | 284 |
284 } | 285 } |
OLD | NEW |