| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 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 "core/html/FormData.h" | 31 #include "core/html/FormData.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptState.h" | 33 #include "bindings/core/v8/ScriptState.h" |
| 34 #include "core/dom/ExecutionContext.h" |
| 34 #include "core/fileapi/Blob.h" | 35 #include "core/fileapi/Blob.h" |
| 35 #include "core/fileapi/File.h" | 36 #include "core/fileapi/File.h" |
| 36 #include "core/frame/UseCounter.h" | 37 #include "core/frame/UseCounter.h" |
| 37 #include "core/html/HTMLFormElement.h" | 38 #include "core/html/HTMLFormElement.h" |
| 38 #include "platform/network/FormDataEncoder.h" | 39 #include "platform/network/FormDataEncoder.h" |
| 39 #include "platform/text/LineEnding.h" | 40 #include "platform/text/LineEnding.h" |
| 40 #include "wtf/text/WTFString.h" | 41 #include "wtf/text/WTFString.h" |
| 41 | 42 |
| 42 namespace blink { | 43 namespace blink { |
| 43 | 44 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 void FormData::append(const String& name, const String& value) { | 100 void FormData::append(const String& name, const String& value) { |
| 100 entries_.push_back( | 101 entries_.push_back( |
| 101 new Entry(EncodeAndNormalize(name), EncodeAndNormalize(value))); | 102 new Entry(EncodeAndNormalize(name), EncodeAndNormalize(value))); |
| 102 } | 103 } |
| 103 | 104 |
| 104 void FormData::append(ScriptState* script_state, | 105 void FormData::append(ScriptState* script_state, |
| 105 const String& name, | 106 const String& name, |
| 106 Blob* blob, | 107 Blob* blob, |
| 107 const String& filename) { | 108 const String& filename) { |
| 108 if (!blob) { | 109 if (!blob) { |
| 109 UseCounter::Count(script_state->GetExecutionContext(), | 110 UseCounter::Count(ExecutionContext::From(script_state), |
| 110 UseCounter::kFormDataAppendNull); | 111 UseCounter::kFormDataAppendNull); |
| 111 } | 112 } |
| 112 append(name, blob, filename); | 113 append(name, blob, filename); |
| 113 } | 114 } |
| 114 | 115 |
| 115 void FormData::deleteEntry(const String& name) { | 116 void FormData::deleteEntry(const String& name) { |
| 116 const CString encoded_name = EncodeAndNormalize(name); | 117 const CString encoded_name = EncodeAndNormalize(name); |
| 117 size_t i = 0; | 118 size_t i = 0; |
| 118 while (i < entries_.size()) { | 119 while (i < entries_.size()) { |
| 119 if (entries_[i]->name() == encoded_name) { | 120 if (entries_[i]->name() == encoded_name) { |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 } | 330 } |
| 330 | 331 |
| 331 String filename = filename_; | 332 String filename = filename_; |
| 332 if (filename.IsNull()) | 333 if (filename.IsNull()) |
| 333 filename = "blob"; | 334 filename = "blob"; |
| 334 return File::Create(filename, CurrentTimeMS(), | 335 return File::Create(filename, CurrentTimeMS(), |
| 335 GetBlob()->GetBlobDataHandle()); | 336 GetBlob()->GetBlobDataHandle()); |
| 336 } | 337 } |
| 337 | 338 |
| 338 } // namespace blink | 339 } // namespace blink |
| OLD | NEW |