Index: third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp |
diff --git a/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp b/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp |
index 47a95f29a2286e508e112ffa053ebabe0ab204f6..c74e4c6dce93c07a12560421c3eaed0fa244c4d0 100644 |
--- a/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp |
+++ b/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp |
@@ -4,8 +4,12 @@ |
#include "modules/fetch/FetchDataLoader.h" |
+#include "core/fetch/MultipartImageResourceParser.h" |
horo
2016/08/30 05:12:55
I think we should rename MultipartImageResourcePar
yhirano
2016/08/30 05:51:14
MultipartImageResourceParser is not a generic mult
horo
2016/08/30 06:24:36
Then, are you saying that we shouldn't use it to p
|
+#include "core/fileapi/Blob.h" |
#include "core/html/parser/TextResourceDecoder.h" |
horo
2016/08/30 05:12:56
Include FormData.h here.
e_hakkinen
2016/08/30 07:59:08
Done.
|
#include "modules/fetch/BytesConsumer.h" |
+#include "platform/HTTPNames.h" |
+#include "platform/network/ParsedContentType.h" |
#include "wtf/PtrUtil.h" |
#include "wtf/text/StringBuilder.h" |
#include "wtf/text/WTFString.h" |
@@ -161,6 +165,147 @@ private: |
std::unique_ptr<ArrayBufferBuilder> m_rawData; |
}; |
+class FetchDataLoaderAsFormData final : public FetchDataLoader, public BytesConsumer::Client, private MultipartImageResourceParser::Client { |
+ USING_GARBAGE_COLLECTED_MIXIN(FetchDataLoaderAsFormData); |
+public: |
+ explicit FetchDataLoaderAsFormData(const String& multipartBoundary) |
+ : m_multipartBoundary(multipartBoundary) |
+ { |
+ } |
+ |
+ void start(BytesConsumer* consumer, FetchDataLoader::Client* client) override |
+ { |
+ DCHECK(!m_client); |
+ DCHECK(!m_multipartParser); |
+ DCHECK(!m_consumer); |
+ |
+ CString multipartBoundaryCString = m_multipartBoundary.utf8(); |
+ Vector<char> multipartBoundaryVector; |
+ multipartBoundaryVector.append(multipartBoundaryCString.data(), multipartBoundaryCString.length()); |
+ |
+ m_client = client; |
+ m_formData = FormData::create(); |
+ m_multipartParser = new MultipartImageResourceParser(ResourceResponse(), multipartBoundaryVector, this); |
+ m_consumer = consumer; |
+ m_consumer->setClient(this); |
+ onStateChange(); |
+ } |
+ |
+ void onStateChange() override |
+ { |
+ while (true) { |
+ const char* buffer; |
+ size_t available; |
+ switch (m_consumer->beginRead(&buffer, &available)) { |
+ case BytesConsumer::Result::Ok: |
+ if (available > 0) |
+ m_multipartParser->appendData(buffer, available); |
+ m_consumer->endRead(available); |
+ break; |
+ case BytesConsumer::Result::ShouldWait: |
+ return; |
+ case BytesConsumer::Result::Done: |
+ m_multipartParser->finish(); |
+ m_currentEntry.finishIfInitialized(m_formData); |
+ m_client->didFetchDataLoadedFormData(m_formData); |
+ return; |
+ case BytesConsumer::Result::Error: |
+ m_client->didFetchDataLoadFailed(); |
+ return; |
+ } |
+ } |
+ } |
+ |
+ void cancel() override |
+ { |
+ m_consumer->cancel(); |
+ m_multipartParser->cancel(); |
+ } |
+ |
+ DEFINE_INLINE_TRACE() |
+ { |
+ visitor->trace(m_consumer); |
+ visitor->trace(m_client); |
+ visitor->trace(m_formData); |
+ visitor->trace(m_multipartParser); |
+ FetchDataLoader::trace(visitor); |
+ BytesConsumer::Client::trace(visitor); |
+ MultipartImageResourceParser::Client::trace(visitor); |
+ } |
+ |
+private: |
+ void onePartInMultipartReceived(const ResourceResponse& response) override |
+ { |
+ m_currentEntry.finishIfInitialized(m_formData); |
+ if (!m_currentEntry.initialize(response)) |
+ m_client->didFetchDataLoadFailed(); |
+ } |
+ |
+ void multipartDataReceived(const char* bytes, size_t size) override |
+ { |
+ m_currentEntry.appendBytes(bytes, size); |
+ } |
+ |
+ class Entry { |
+ public: |
+ bool initialize(const ResourceResponse& response) |
+ { |
+ ParsedContentType disposition(response.httpHeaderField(HTTPNames::Content_Disposition)); |
+ String dispositionType = disposition.mimeType(); |
+ m_filename = disposition.parameterValueForName("filename"); |
+ m_name = disposition.parameterValueForName("name"); |
+ if (dispositionType != "form-data" || m_name.isNull()) |
+ return false; |
+ if (!m_filename.isNull()) { |
+ m_blobData = BlobData::create(); |
+ m_blobData->setContentType(response.httpHeaderField(HTTPNames::Content_Type)); |
+ m_stringBuilder.reset(); |
+ } else { |
+ m_blobData.reset(); |
+ if (!m_decoder) |
+ m_decoder = TextResourceDecoder::createAlwaysUseUTF8ForText(); |
+ m_stringBuilder.reset(new StringBuilder); |
+ } |
+ return true; |
+ } |
+ |
+ void appendBytes(const char* bytes, size_t size) |
+ { |
+ if (m_blobData) |
+ m_blobData->appendBytes(bytes, size); |
+ if (m_stringBuilder) |
+ m_stringBuilder->append(m_decoder->decode(bytes, size)); |
+ } |
+ |
+ void finishIfInitialized(FormData* formData) |
+ { |
+ if (m_blobData) { |
+ auto size = m_blobData->length(); |
horo
2016/08/30 05:12:56
ASSERT(!m_stringBuilder);
e_hakkinen
2016/08/30 07:59:08
ASSERT is deprecated and does not thus pass presub
|
+ formData->append(m_name, Blob::create(BlobDataHandle::create(std::move(m_blobData), size)), m_filename); |
+ } |
+ if (m_stringBuilder) { |
+ m_stringBuilder->append(m_decoder->flush()); |
horo
2016/08/30 05:12:56
ASSERT(!m_blobData));
e_hakkinen
2016/08/30 07:59:08
Done.
|
+ formData->append(m_name, m_stringBuilder->toString()); |
+ } |
+ } |
+ |
+ private: |
+ std::unique_ptr<BlobData> m_blobData; |
+ std::unique_ptr<TextResourceDecoder> m_decoder; |
+ String m_filename; |
+ String m_name; |
+ std::unique_ptr<StringBuilder> m_stringBuilder; |
+ }; |
+ |
+ Member<BytesConsumer> m_consumer; |
+ Member<FetchDataLoader::Client> m_client; |
+ Member<FormData> m_formData; |
+ Member<MultipartImageResourceParser> m_multipartParser; |
+ |
+ Entry m_currentEntry; |
+ String m_multipartBoundary; |
+}; |
+ |
class FetchDataLoaderAsString final : public FetchDataLoader, public BytesConsumer::Client { |
USING_GARBAGE_COLLECTED_MIXIN(FetchDataLoaderAsString); |
public: |
@@ -305,6 +450,11 @@ FetchDataLoader* FetchDataLoader::createLoaderAsArrayBuffer() |
return new FetchDataLoaderAsArrayBuffer(); |
} |
+FetchDataLoader* FetchDataLoader::createLoaderAsFormData(const String& multipartBoundary) |
+{ |
+ return new FetchDataLoaderAsFormData(multipartBoundary); |
+} |
+ |
FetchDataLoader* FetchDataLoader::createLoaderAsString() |
{ |
return new FetchDataLoaderAsString(); |