| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "modules/serviceworkers/FetchBodyStream.h" | 6 #include "modules/serviceworkers/FetchBodyStream.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/ScriptPromiseResolver.h" | 8 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 9 #include "bindings/core/v8/ScriptState.h" | 9 #include "bindings/core/v8/ScriptState.h" |
| 10 #include "bindings/core/v8/V8ThrowException.h" | 10 #include "bindings/core/v8/V8ThrowException.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 m_resolver = ScriptPromiseResolver::create(scriptState); | 37 m_resolver = ScriptPromiseResolver::create(scriptState); |
| 38 ScriptPromise promise = m_resolver->promise(); | 38 ScriptPromise promise = m_resolver->promise(); |
| 39 | 39 |
| 40 FileReaderLoader::ReadType readType = FileReaderLoader::ReadAsText; | 40 FileReaderLoader::ReadType readType = FileReaderLoader::ReadAsText; |
| 41 | 41 |
| 42 switch (type) { | 42 switch (type) { |
| 43 case ResponseAsArrayBuffer: | 43 case ResponseAsArrayBuffer: |
| 44 readType = FileReaderLoader::ReadAsArrayBuffer; | 44 readType = FileReaderLoader::ReadAsArrayBuffer; |
| 45 break; | 45 break; |
| 46 case ResponseAsBlob: | 46 case ResponseAsBlob: |
| 47 m_resolver->resolve(Blob::create(m_blobDataHandle)); | 47 if (m_blobDataHandle->size() != kuint64max) { |
| 48 m_resolver.clear(); | 48 // If the size of |m_blobDataHandle| is set correctly, creates Blob
from it. |
| 49 return promise; | 49 m_resolver->resolve(Blob::create(m_blobDataHandle)); |
| 50 m_resolver.clear(); |
| 51 return promise; |
| 52 } |
| 53 // If the size is not set, read as ArrayBuffer and create a new blob to
get the size. |
| 54 // FIXME: This workaround is not good for performance. |
| 55 // When we will stop using Blob as a base system of FetchBodyStream to s
upport stream, this problem should be solved. |
| 56 readType = FileReaderLoader::ReadAsArrayBuffer; |
| 57 break; |
| 50 case ResponseAsFormData: | 58 case ResponseAsFormData: |
| 51 // FIXME: Implement this. | 59 // FIXME: Implement this. |
| 52 ASSERT_NOT_REACHED(); | 60 ASSERT_NOT_REACHED(); |
| 53 break; | 61 break; |
| 54 case ResponseAsJSON: | 62 case ResponseAsJSON: |
| 55 case ResponseAsText: | 63 case ResponseAsText: |
| 56 break; | 64 break; |
| 57 default: | 65 default: |
| 58 ASSERT_NOT_REACHED(); | 66 ASSERT_NOT_REACHED(); |
| 59 } | 67 } |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 | 140 |
| 133 // FileReaderLoaderClient functions. | 141 // FileReaderLoaderClient functions. |
| 134 void FetchBodyStream::didStartLoading() { } | 142 void FetchBodyStream::didStartLoading() { } |
| 135 void FetchBodyStream::didReceiveData() { } | 143 void FetchBodyStream::didReceiveData() { } |
| 136 void FetchBodyStream::didFinishLoading() | 144 void FetchBodyStream::didFinishLoading() |
| 137 { | 145 { |
| 138 switch (m_responseType) { | 146 switch (m_responseType) { |
| 139 case ResponseAsArrayBuffer: | 147 case ResponseAsArrayBuffer: |
| 140 m_resolver->resolve(m_loader->arrayBufferResult()); | 148 m_resolver->resolve(m_loader->arrayBufferResult()); |
| 141 break; | 149 break; |
| 142 case ResponseAsBlob: | 150 case ResponseAsBlob: { |
| 143 // Handled in ::readAsync(). | 151 ASSERT(m_blobDataHandle->size() == kuint64max); |
| 144 ASSERT_NOT_REACHED(); | 152 OwnPtr<BlobData> blobData = BlobData::create(); |
| 153 RefPtr<ArrayBuffer> buffer = m_loader->arrayBufferResult(); |
| 154 blobData->appendArrayBuffer(buffer.get()); |
| 155 const size_t length = blobData->length(); |
| 156 m_resolver->resolve(Blob::create(BlobDataHandle::create(blobData.release
(), length))); |
| 145 break; | 157 break; |
| 158 } |
| 146 case ResponseAsFormData: | 159 case ResponseAsFormData: |
| 147 ASSERT_NOT_REACHED(); | 160 ASSERT_NOT_REACHED(); |
| 148 break; | 161 break; |
| 149 case ResponseAsJSON: | 162 case ResponseAsJSON: |
| 150 resolveJSON(); | 163 resolveJSON(); |
| 151 break; | 164 break; |
| 152 case ResponseAsText: | 165 case ResponseAsText: |
| 153 m_resolver->resolve(m_loader->stringResult()); | 166 m_resolver->resolve(m_loader->stringResult()); |
| 154 break; | 167 break; |
| 155 default: | 168 default: |
| 156 ASSERT_NOT_REACHED(); | 169 ASSERT_NOT_REACHED(); |
| 157 } | 170 } |
| 158 m_resolver.clear(); | 171 m_resolver.clear(); |
| 159 } | 172 } |
| 160 | 173 |
| 161 void FetchBodyStream::didFail(FileError::ErrorCode code) | 174 void FetchBodyStream::didFail(FileError::ErrorCode code) |
| 162 { | 175 { |
| 163 ASSERT(m_resolver); | 176 ASSERT(m_resolver); |
| 164 m_resolver->resolve(""); | 177 m_resolver->resolve(""); |
| 165 m_resolver.clear(); | 178 m_resolver.clear(); |
| 166 } | 179 } |
| 167 | 180 |
| 168 } // namespace blink | 181 } // namespace blink |
| OLD | NEW |