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 "public/platform/modules/serviceworker/WebServiceWorkerRequest.h" | 5 #include "public/platform/modules/serviceworker/WebServiceWorkerRequest.h" |
6 | 6 |
7 #include "platform/blob/BlobData.h" | 7 #include "platform/blob/BlobData.h" |
8 #include "platform/weborigin/KURL.h" | 8 #include "platform/weborigin/KURL.h" |
9 #include "public/platform/WebHTTPHeaderVisitor.h" | 9 #include "public/platform/WebHTTPHeaderVisitor.h" |
10 #include "public/platform/WebString.h" | |
10 #include "public/platform/WebURLRequest.h" | 11 #include "public/platform/WebURLRequest.h" |
11 | 12 |
12 namespace blink { | 13 namespace blink { |
13 | 14 |
14 class WebServiceWorkerRequestPrivate : public RefCounted<WebServiceWorkerRequest Private> { | 15 class WebServiceWorkerRequestPrivate : public RefCounted<WebServiceWorkerRequest Private> { |
15 public: | 16 public: |
16 WebServiceWorkerRequestPrivate() | 17 WebServiceWorkerRequestPrivate() |
17 : m_mode(WebURLRequest::FetchRequestModeNoCORS) | 18 : m_mode(WebURLRequest::FetchRequestModeNoCORS) |
18 , m_credentialsMode(WebURLRequest::FetchCredentialsModeOmit) | 19 , m_credentialsMode(WebURLRequest::FetchCredentialsModeOmit) |
19 , m_redirectMode(WebURLRequest::FetchRedirectModeFollow) | 20 , m_redirectMode(WebURLRequest::FetchRedirectModeFollow) |
20 , m_requestContext(WebURLRequest::RequestContextUnspecified) | 21 , m_requestContext(WebURLRequest::RequestContextUnspecified) |
21 , m_frameType(WebURLRequest::FrameTypeNone) | 22 , m_frameType(WebURLRequest::FrameTypeNone) |
23 , m_clientId(WebString()) | |
22 , m_isReload(false) | 24 , m_isReload(false) |
23 { | 25 { |
24 } | 26 } |
25 WebURL m_url; | 27 WebURL m_url; |
26 WebString m_method; | 28 WebString m_method; |
27 HTTPHeaderMap m_headers; | 29 HTTPHeaderMap m_headers; |
28 RefPtr<BlobDataHandle> blobDataHandle; | 30 RefPtr<BlobDataHandle> blobDataHandle; |
29 Referrer m_referrer; | 31 Referrer m_referrer; |
30 WebURLRequest::FetchRequestMode m_mode; | 32 WebURLRequest::FetchRequestMode m_mode; |
33 bool m_isMainResourceLoad; | |
falken
2016/01/13 09:06:53
uninitialised bool
jungkees
2016/01/13 10:55:18
Changed it set to false in the initializer list.
| |
31 WebURLRequest::FetchCredentialsMode m_credentialsMode; | 34 WebURLRequest::FetchCredentialsMode m_credentialsMode; |
32 WebURLRequest::FetchRedirectMode m_redirectMode; | 35 WebURLRequest::FetchRedirectMode m_redirectMode; |
33 WebURLRequest::RequestContext m_requestContext; | 36 WebURLRequest::RequestContext m_requestContext; |
34 WebURLRequest::FrameType m_frameType; | 37 WebURLRequest::FrameType m_frameType; |
38 WebString m_clientId; | |
35 bool m_isReload; | 39 bool m_isReload; |
36 }; | 40 }; |
37 | 41 |
38 WebServiceWorkerRequest::WebServiceWorkerRequest() | 42 WebServiceWorkerRequest::WebServiceWorkerRequest() |
39 : m_private(adoptRef(new WebServiceWorkerRequestPrivate)) | 43 : m_private(adoptRef(new WebServiceWorkerRequestPrivate)) |
40 { | 44 { |
41 } | 45 } |
42 | 46 |
43 void WebServiceWorkerRequest::reset() | 47 void WebServiceWorkerRequest::reset() |
44 { | 48 { |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
130 void WebServiceWorkerRequest::setMode(WebURLRequest::FetchRequestMode mode) | 134 void WebServiceWorkerRequest::setMode(WebURLRequest::FetchRequestMode mode) |
131 { | 135 { |
132 m_private->m_mode = mode; | 136 m_private->m_mode = mode; |
133 } | 137 } |
134 | 138 |
135 WebURLRequest::FetchRequestMode WebServiceWorkerRequest::mode() const | 139 WebURLRequest::FetchRequestMode WebServiceWorkerRequest::mode() const |
136 { | 140 { |
137 return m_private->m_mode; | 141 return m_private->m_mode; |
138 } | 142 } |
139 | 143 |
144 void WebServiceWorkerRequest::setIsMainResourceLoad(bool isMainResourceLoad) | |
145 { | |
146 m_private->m_isMainResourceLoad = isMainResourceLoad; | |
147 } | |
148 | |
149 bool WebServiceWorkerRequest::isMainResourceLoad() const | |
150 { | |
151 return m_private->m_isMainResourceLoad; | |
152 } | |
153 | |
140 void WebServiceWorkerRequest::setCredentialsMode(WebURLRequest::FetchCredentials Mode credentialsMode) | 154 void WebServiceWorkerRequest::setCredentialsMode(WebURLRequest::FetchCredentials Mode credentialsMode) |
141 { | 155 { |
142 m_private->m_credentialsMode = credentialsMode; | 156 m_private->m_credentialsMode = credentialsMode; |
143 } | 157 } |
144 | 158 |
145 WebURLRequest::FetchCredentialsMode WebServiceWorkerRequest::credentialsMode() c onst | 159 WebURLRequest::FetchCredentialsMode WebServiceWorkerRequest::credentialsMode() c onst |
146 { | 160 { |
147 return m_private->m_credentialsMode; | 161 return m_private->m_credentialsMode; |
148 } | 162 } |
149 | 163 |
(...skipping 20 matching lines...) Expand all Loading... | |
170 void WebServiceWorkerRequest::setFrameType(WebURLRequest::FrameType frameType) | 184 void WebServiceWorkerRequest::setFrameType(WebURLRequest::FrameType frameType) |
171 { | 185 { |
172 m_private->m_frameType = frameType; | 186 m_private->m_frameType = frameType; |
173 } | 187 } |
174 | 188 |
175 WebURLRequest::FrameType WebServiceWorkerRequest::frameType() const | 189 WebURLRequest::FrameType WebServiceWorkerRequest::frameType() const |
176 { | 190 { |
177 return m_private->m_frameType; | 191 return m_private->m_frameType; |
178 } | 192 } |
179 | 193 |
194 void WebServiceWorkerRequest::setClientId(WebString clientId) | |
195 { | |
196 m_private->m_clientId = clientId; | |
197 } | |
198 | |
199 WebString WebServiceWorkerRequest::clientId() const | |
200 { | |
201 return m_private->m_clientId; | |
202 } | |
203 | |
180 void WebServiceWorkerRequest::setIsReload(bool isReload) | 204 void WebServiceWorkerRequest::setIsReload(bool isReload) |
181 { | 205 { |
182 m_private->m_isReload = isReload; | 206 m_private->m_isReload = isReload; |
183 } | 207 } |
184 | 208 |
185 bool WebServiceWorkerRequest::isReload() const | 209 bool WebServiceWorkerRequest::isReload() const |
186 { | 210 { |
187 return m_private->m_isReload; | 211 return m_private->m_isReload; |
188 } | 212 } |
189 | 213 |
190 } // namespace blink | 214 } // namespace blink |
OLD | NEW |