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/fetch/FetchRequestData.h" | 6 #include "modules/fetch/FetchRequestData.h" |
7 | 7 |
8 #include "core/dom/ExecutionContext.h" | 8 #include "core/dom/ExecutionContext.h" |
9 #include "core/fetch/ResourceLoaderOptions.h" | 9 #include "core/fetch/ResourceLoaderOptions.h" |
10 #include "core/loader/ThreadableLoader.h" | 10 #include "core/loader/ThreadableLoader.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 FetchRequestData* request = FetchRequestData::create(); | 25 FetchRequestData* request = FetchRequestData::create(); |
26 request->m_url = webRequest.url(); | 26 request->m_url = webRequest.url(); |
27 request->m_method = webRequest.method(); | 27 request->m_method = webRequest.method(); |
28 for (HTTPHeaderMap::const_iterator it = webRequest.headers().begin(); it !=
webRequest.headers().end(); ++it) | 28 for (HTTPHeaderMap::const_iterator it = webRequest.headers().begin(); it !=
webRequest.headers().end(); ++it) |
29 request->m_headerList->append(it->key, it->value); | 29 request->m_headerList->append(it->key, it->value); |
30 request->m_blobDataHandle = webRequest.blobDataHandle(); | 30 request->m_blobDataHandle = webRequest.blobDataHandle(); |
31 request->setContext(webRequest.requestContext()); | 31 request->setContext(webRequest.requestContext()); |
32 request->m_referrer.setURL(webRequest.referrer()); | 32 request->m_referrer.setURL(webRequest.referrer()); |
33 request->setMode(webRequest.mode()); | 33 request->setMode(webRequest.mode()); |
34 request->setCredentials(webRequest.credentialsMode()); | 34 request->setCredentials(webRequest.credentialsMode()); |
| 35 request->setRedirect(webRequest.redirectMode()); |
35 request->setMIMEType(request->m_headerList->extractMIMEType()); | 36 request->setMIMEType(request->m_headerList->extractMIMEType()); |
36 return request; | 37 return request; |
37 } | 38 } |
38 | 39 |
39 FetchRequestData* FetchRequestData::clone() const | 40 FetchRequestData* FetchRequestData::clone() const |
40 { | 41 { |
41 // TODO(yhirano): This method will be destructive. | 42 // TODO(yhirano): This method will be destructive. |
42 FetchRequestData* request = FetchRequestData::create(); | 43 FetchRequestData* request = FetchRequestData::create(); |
43 request->m_url = m_url; | 44 request->m_url = m_url; |
44 request->m_method = m_method; | 45 request->m_method = m_method; |
45 request->m_headerList = m_headerList->clone(); | 46 request->m_headerList = m_headerList->clone(); |
46 request->m_unsafeRequestFlag = m_unsafeRequestFlag; | 47 request->m_unsafeRequestFlag = m_unsafeRequestFlag; |
47 request->m_blobDataHandle = m_blobDataHandle; | 48 request->m_blobDataHandle = m_blobDataHandle; |
48 request->m_origin = m_origin; | 49 request->m_origin = m_origin; |
49 request->m_sameOriginDataURLFlag = m_sameOriginDataURLFlag; | 50 request->m_sameOriginDataURLFlag = m_sameOriginDataURLFlag; |
50 request->m_context = m_context; | 51 request->m_context = m_context; |
51 request->m_referrer = m_referrer; | 52 request->m_referrer = m_referrer; |
52 request->m_mode = m_mode; | 53 request->m_mode = m_mode; |
53 request->m_credentials = m_credentials; | 54 request->m_credentials = m_credentials; |
| 55 request->m_redirect = m_redirect; |
54 request->m_responseTainting = m_responseTainting; | 56 request->m_responseTainting = m_responseTainting; |
55 request->m_mimeType = m_mimeType; | 57 request->m_mimeType = m_mimeType; |
56 return request; | 58 return request; |
57 } | 59 } |
58 | 60 |
59 FetchRequestData* FetchRequestData::pass() const | 61 FetchRequestData* FetchRequestData::pass() const |
60 { | 62 { |
61 // TODO(yhirano): This method will be destructive. | 63 // TODO(yhirano): This method will be destructive. |
62 return clone(); | 64 return clone(); |
63 } | 65 } |
64 | 66 |
65 FetchRequestData::~FetchRequestData() | 67 FetchRequestData::~FetchRequestData() |
66 { | 68 { |
67 } | 69 } |
68 | 70 |
69 FetchRequestData::FetchRequestData() | 71 FetchRequestData::FetchRequestData() |
70 : m_method("GET") | 72 : m_method("GET") |
71 , m_headerList(FetchHeaderList::create()) | 73 , m_headerList(FetchHeaderList::create()) |
72 , m_unsafeRequestFlag(false) | 74 , m_unsafeRequestFlag(false) |
73 , m_context(WebURLRequest::RequestContextUnspecified) | 75 , m_context(WebURLRequest::RequestContextUnspecified) |
74 , m_sameOriginDataURLFlag(false) | 76 , m_sameOriginDataURLFlag(false) |
75 , m_mode(WebURLRequest::FetchRequestModeNoCORS) | 77 , m_mode(WebURLRequest::FetchRequestModeNoCORS) |
76 , m_credentials(WebURLRequest::FetchCredentialsModeOmit) | 78 , m_credentials(WebURLRequest::FetchCredentialsModeOmit) |
| 79 , m_redirect(WebURLRequest::FetchRedirectModeFollow) |
77 , m_responseTainting(BasicTainting) | 80 , m_responseTainting(BasicTainting) |
78 { | 81 { |
79 } | 82 } |
80 | 83 |
81 DEFINE_TRACE(FetchRequestData) | 84 DEFINE_TRACE(FetchRequestData) |
82 { | 85 { |
83 visitor->trace(m_headerList); | 86 visitor->trace(m_headerList); |
84 } | 87 } |
85 | 88 |
86 } // namespace blink | 89 } // namespace blink |
OLD | NEW |