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 "Response.h" | 6 #include "Response.h" |
7 | 7 |
8 #include "bindings/v8/Dictionary.h" | 8 #include "bindings/v8/Dictionary.h" |
| 9 #include "core/fileapi/Blob.h" |
9 #include "modules/serviceworkers/ResponseInit.h" | 10 #include "modules/serviceworkers/ResponseInit.h" |
10 #include "platform/NotImplemented.h" | 11 #include "platform/NotImplemented.h" |
11 #include "public/platform/WebServiceWorkerResponse.h" | 12 #include "public/platform/WebServiceWorkerResponse.h" |
12 | 13 |
13 namespace WebCore { | 14 namespace WebCore { |
14 | 15 |
15 PassRefPtr<Response> Response::create() | 16 // FIXME: Remove this legacy function when the required Chromium-side patch land
s. |
| 17 PassRefPtr<Response> Response::create(const Dictionary& responseInit) |
16 { | 18 { |
17 return create(Dictionary()); | 19 return create(nullptr, responseInit); |
18 } | 20 } |
19 | 21 |
20 PassRefPtr<Response> Response::create(const Dictionary& responseInit) | 22 PassRefPtr<Response> Response::create(Blob* body, const Dictionary& responseInit
) |
21 { | 23 { |
22 return adoptRef(new Response(ResponseInit(responseInit))); | 24 RefPtr<BlobDataHandle> blobDataHandle = body ? body->blobDataHandle() : null
ptr; |
| 25 |
| 26 // FIXME: Maybe append or override content-length and content-type headers u
sing the blob. The spec will clarify what to do: |
| 27 // https://github.com/slightlyoff/ServiceWorker/issues/192 |
| 28 return adoptRef(new Response(blobDataHandle.release(), ResponseInit(response
Init))); |
23 } | 29 } |
24 | 30 |
25 PassRefPtr<HeaderMap> Response::headers() const | 31 PassRefPtr<HeaderMap> Response::headers() const |
26 { | 32 { |
27 // FIXME: Implement. Spec will eventually whitelist allowable headers. | 33 // FIXME: Implement. Spec will eventually whitelist allowable headers. |
28 return m_headers; | 34 return m_headers; |
29 } | 35 } |
30 | 36 |
31 void Response::populateWebServiceWorkerResponse(blink::WebServiceWorkerResponse&
response) | 37 void Response::populateWebServiceWorkerResponse(blink::WebServiceWorkerResponse&
response) |
32 { | 38 { |
33 response.setStatus(status()); | 39 response.setStatus(status()); |
34 response.setStatusText(statusText()); | 40 response.setStatusText(statusText()); |
35 response.setHeaders(m_headers->headerMap()); | 41 response.setHeaders(m_headers->headerMap()); |
| 42 response.setBlobDataHandle(m_blobDataHandle); |
36 } | 43 } |
37 | 44 |
38 Response::Response(const ResponseInit& responseInit) | 45 Response::Response(PassRefPtr<BlobDataHandle> blobDataHandle, const ResponseInit
& responseInit) |
39 : m_status(responseInit.status) | 46 : m_status(responseInit.status) |
40 , m_statusText(responseInit.statusText) | 47 , m_statusText(responseInit.statusText) |
41 , m_headers(responseInit.headers) | 48 , m_headers(responseInit.headers) |
| 49 , m_blobDataHandle(blobDataHandle) |
42 { | 50 { |
43 ScriptWrappable::init(this); | 51 ScriptWrappable::init(this); |
44 | 52 |
45 if (!m_headers) | 53 if (!m_headers) |
46 m_headers = HeaderMap::create(); | 54 m_headers = HeaderMap::create(); |
47 } | 55 } |
48 | 56 |
49 } // namespace WebCore | 57 } // namespace WebCore |
OLD | NEW |