OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/pepper/url_request_info_util.h" | 5 #include "content/renderer/pepper/url_request_info_util.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "content/common/fileapi/file_system_messages.h" | 9 #include "content/common/fileapi/file_system_messages.h" |
10 #include "content/renderer/pepper/common.h" | 10 #include "content/renderer/pepper/common.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 25 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
26 #include "third_party/WebKit/public/web/WebDocument.h" | 26 #include "third_party/WebKit/public/web/WebDocument.h" |
27 #include "third_party/WebKit/public/web/WebFrame.h" | 27 #include "third_party/WebKit/public/web/WebFrame.h" |
28 #include "url/gurl.h" | 28 #include "url/gurl.h" |
29 #include "url/url_util.h" | 29 #include "url/url_util.h" |
30 #include "webkit/child/weburlrequest_extradata_impl.h" | 30 #include "webkit/child/weburlrequest_extradata_impl.h" |
31 | 31 |
32 using ppapi::Resource; | 32 using ppapi::Resource; |
33 using ppapi::URLRequestInfoData; | 33 using ppapi::URLRequestInfoData; |
34 using ppapi::thunk::EnterResourceNoLock; | 34 using ppapi::thunk::EnterResourceNoLock; |
35 using WebKit::WebData; | 35 using blink::WebData; |
36 using WebKit::WebHTTPBody; | 36 using blink::WebHTTPBody; |
37 using WebKit::WebString; | 37 using blink::WebString; |
38 using WebKit::WebFrame; | 38 using blink::WebFrame; |
39 using WebKit::WebURL; | 39 using blink::WebURL; |
40 using WebKit::WebURLRequest; | 40 using blink::WebURLRequest; |
41 | 41 |
42 namespace content { | 42 namespace content { |
43 | 43 |
44 namespace { | 44 namespace { |
45 | 45 |
46 // Appends the file ref given the Resource pointer associated with it to the | 46 // Appends the file ref given the Resource pointer associated with it to the |
47 // given HTTP body, returning true on success. | 47 // given HTTP body, returning true on success. |
48 bool AppendFileRefToBody( | 48 bool AppendFileRefToBody( |
49 PP_Instance instance, | 49 PP_Instance instance, |
50 PP_Resource resource, | 50 PP_Resource resource, |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 if (data->has_custom_content_transfer_encoding && | 170 if (data->has_custom_content_transfer_encoding && |
171 !data->custom_content_transfer_encoding.empty()) { | 171 !data->custom_content_transfer_encoding.empty()) { |
172 dest->addHTTPHeaderField( | 172 dest->addHTTPHeaderField( |
173 WebString::fromUTF8("Content-Transfer-Encoding"), | 173 WebString::fromUTF8("Content-Transfer-Encoding"), |
174 WebString::fromUTF8(data->custom_content_transfer_encoding)); | 174 WebString::fromUTF8(data->custom_content_transfer_encoding)); |
175 } | 175 } |
176 | 176 |
177 if (data->has_custom_user_agent) { | 177 if (data->has_custom_user_agent) { |
178 bool was_after_preconnect_request = false; | 178 bool was_after_preconnect_request = false; |
179 dest->setExtraData(new webkit_glue::WebURLRequestExtraDataImpl( | 179 dest->setExtraData(new webkit_glue::WebURLRequestExtraDataImpl( |
180 WebKit::WebReferrerPolicyDefault, // Ignored. | 180 blink::WebReferrerPolicyDefault, // Ignored. |
181 WebString::fromUTF8(data->custom_user_agent), | 181 WebString::fromUTF8(data->custom_user_agent), |
182 was_after_preconnect_request)); | 182 was_after_preconnect_request)); |
183 } | 183 } |
184 | 184 |
185 return true; | 185 return true; |
186 } | 186 } |
187 | 187 |
188 bool URLRequestRequiresUniversalAccess(const URLRequestInfoData& data) { | 188 bool URLRequestRequiresUniversalAccess(const URLRequestInfoData& data) { |
189 return | 189 return |
190 data.has_custom_referrer_url || | 190 data.has_custom_referrer_url || |
191 data.has_custom_content_transfer_encoding || | 191 data.has_custom_content_transfer_encoding || |
192 data.has_custom_user_agent || | 192 data.has_custom_user_agent || |
193 url_util::FindAndCompareScheme(data.url, "javascript", NULL); | 193 url_util::FindAndCompareScheme(data.url, "javascript", NULL); |
194 } | 194 } |
195 | 195 |
196 } // namespace content | 196 } // namespace content |
OLD | NEW |