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 "Request.h" | 6 #include "Request.h" |
7 | 7 |
8 #include "bindings/core/v8/Dictionary.h" | 8 #include "bindings/core/v8/Dictionary.h" |
9 #include "core/dom/ExecutionContext.h" | 9 #include "core/dom/ExecutionContext.h" |
10 #include "core/fetch/FetchUtils.h" | 10 #include "core/fetch/FetchUtils.h" |
11 #include "core/fetch/ResourceLoaderOptions.h" | 11 #include "core/fetch/ResourceLoaderOptions.h" |
12 #include "core/loader/ThreadableLoader.h" | 12 #include "core/loader/ThreadableLoader.h" |
13 #include "core/xml/XMLHttpRequest.h" | 13 #include "core/xml/XMLHttpRequest.h" |
14 #include "modules/serviceworkers/FetchManager.h" | 14 #include "modules/serviceworkers/FetchManager.h" |
15 #include "modules/serviceworkers/HeadersForEachCallback.h" | |
15 #include "modules/serviceworkers/RequestInit.h" | 16 #include "modules/serviceworkers/RequestInit.h" |
16 #include "platform/NotImplemented.h" | 17 #include "platform/NotImplemented.h" |
17 #include "platform/network/HTTPParsers.h" | 18 #include "platform/network/HTTPParsers.h" |
18 #include "platform/network/ResourceRequest.h" | 19 #include "platform/network/ResourceRequest.h" |
19 #include "platform/weborigin/Referrer.h" | 20 #include "platform/weborigin/Referrer.h" |
20 #include "public/platform/WebServiceWorkerRequest.h" | 21 #include "public/platform/WebServiceWorkerRequest.h" |
21 | 22 |
22 namespace blink { | 23 namespace blink { |
23 | 24 |
24 namespace { | 25 namespace { |
25 | 26 |
27 class FillWebRequestHeaders : public HeadersForEachCallback { | |
28 public: | |
29 FillWebRequestHeaders(WebServiceWorkerRequest* webRequest) : m_webRequest(we bRequest) { } | |
30 | |
31 virtual bool handleItem(ScriptValue, const String&, const String&, Headers*) | |
32 { | |
33 ASSERT_NOT_REACHED(); | |
34 } | |
35 | |
36 virtual bool handleItem(const String& value, const String& key, Headers*) | |
37 { | |
38 m_webRequest->setHeader(key, value); | |
39 return true; | |
40 } | |
41 | |
42 private: | |
43 WebServiceWorkerRequest* m_webRequest; | |
44 }; | |
45 | |
26 PassRefPtrWillBeRawPtr<Request> createRequestWithRequestData(PassRefPtrWillBeRaw Ptr<FetchRequestData> request, const RequestInit& init, FetchRequestData::Mode m ode, FetchRequestData::Credentials credentials, ExceptionState& exceptionState) | 46 PassRefPtrWillBeRawPtr<Request> createRequestWithRequestData(PassRefPtrWillBeRaw Ptr<FetchRequestData> request, const RequestInit& init, FetchRequestData::Mode m ode, FetchRequestData::Credentials credentials, ExceptionState& exceptionState) |
27 { | 47 { |
28 // "6. Let |mode| be |init|'s mode member if it is present, and | 48 // "6. Let |mode| be |init|'s mode member if it is present, and |
29 // |fallbackMode| otherwise." | 49 // |fallbackMode| otherwise." |
30 // "7. If |mode| is non-null, set |request|'s mode to |mode|." | 50 // "7. If |mode| is non-null, set |request|'s mode to |mode|." |
31 if (init.mode == "same-origin") { | 51 if (init.mode == "same-origin") { |
32 request->setMode(FetchRequestData::SameOriginMode); | 52 request->setMode(FetchRequestData::SameOriginMode); |
33 } else if (init.mode == "no-cors") { | 53 } else if (init.mode == "no-cors") { |
34 request->setMode(mode = FetchRequestData::NoCORSMode); | 54 request->setMode(mode = FetchRequestData::NoCORSMode); |
35 } else if (init.mode == "cors") { | 55 } else if (init.mode == "cors") { |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
248 return "omit"; | 268 return "omit"; |
249 case FetchRequestData::SameOriginCredentials: | 269 case FetchRequestData::SameOriginCredentials: |
250 return "same-origin"; | 270 return "same-origin"; |
251 case FetchRequestData::IncludeCredentials: | 271 case FetchRequestData::IncludeCredentials: |
252 return "include"; | 272 return "include"; |
253 } | 273 } |
254 ASSERT_NOT_REACHED(); | 274 ASSERT_NOT_REACHED(); |
255 return ""; | 275 return ""; |
256 } | 276 } |
257 | 277 |
278 void Request::populateWebServiceWorkerRequest(WebServiceWorkerRequest& webReques t) | |
279 { | |
280 webRequest.setMethod(method()); | |
281 webRequest.setURL(m_request->url()); | |
282 m_headers->forEach(adoptPtr(new FillWebRequestHeaders(&webRequest))); | |
283 webRequest.setReferrer(m_request->referrer().referrer().referrer, static_cas t<WebReferrerPolicy>(m_request->referrer().referrer().referrerPolicy)); | |
284 // FIXME: Handle isReload correctly. | |
dominicc (has gone to gerrit)
2014/08/11 01:40:41
Can you hint more here? Is this doable right now b
gavinp
2014/08/13 23:25:22
Done.
| |
285 } | |
286 | |
258 void Request::trace(Visitor* visitor) | 287 void Request::trace(Visitor* visitor) |
259 { | 288 { |
260 visitor->trace(m_request); | 289 visitor->trace(m_request); |
261 visitor->trace(m_headers); | 290 visitor->trace(m_headers); |
262 } | 291 } |
263 | 292 |
264 } // namespace blink | 293 } // namespace blink |
OLD | NEW |