OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/prerender/prerender_resource_throttle.h" | 5 #include "chrome/browser/prerender/prerender_resource_throttle.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/numerics/safe_conversions.h" | 8 #include "base/numerics/safe_conversions.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "chrome/browser/prerender/prerender_final_status.h" | 10 #include "chrome/browser/prerender/prerender_final_status.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
114 ResourceType resource_type, | 114 ResourceType resource_type, |
115 int render_process_id, | 115 int render_process_id, |
116 int render_frame_id, | 116 int render_frame_id, |
117 const GURL& url) { | 117 const GURL& url) { |
118 bool cancel = false; | 118 bool cancel = false; |
119 PrerenderContents* prerender_contents = | 119 PrerenderContents* prerender_contents = |
120 PrerenderContentsFromRenderFrame(render_process_id, render_frame_id); | 120 PrerenderContentsFromRenderFrame(render_process_id, render_frame_id); |
121 if (prerender_contents) { | 121 if (prerender_contents) { |
122 // Abort any prerenders that spawn requests that use unsupported HTTP | 122 // Abort any prerenders that spawn requests that use unsupported HTTP |
123 // methods or schemes. | 123 // methods or schemes. |
124 if (!PrerenderManager::IsValidHttpMethod(method)) { | 124 if (!prerender_contents->IsValidHttpMethod(method)) { |
mmenke
2016/09/20 13:31:18
Would it make more sense just to cancel the indivi
droger
2016/09/20 15:07:27
I think you are right indeed, we could cancel the
droger
2016/09/21 09:57:48
Done, although the scenario where a prefetch subre
mmenke
2016/09/21 16:56:20
Good point, though I suppose extensions and Chrome
| |
125 prerender_contents->Destroy(FINAL_STATUS_INVALID_HTTP_METHOD); | 125 prerender_contents->Destroy(FINAL_STATUS_INVALID_HTTP_METHOD); |
126 cancel = true; | 126 cancel = true; |
127 } else if (!PrerenderManager::DoesSubresourceURLHaveValidScheme(url)) { | 127 } else if (!PrerenderManager::DoesSubresourceURLHaveValidScheme(url)) { |
128 prerender_contents->Destroy(FINAL_STATUS_UNSUPPORTED_SCHEME); | 128 prerender_contents->Destroy(FINAL_STATUS_UNSUPPORTED_SCHEME); |
129 ReportUnsupportedPrerenderScheme(url); | 129 ReportUnsupportedPrerenderScheme(url); |
130 cancel = true; | 130 cancel = true; |
131 #if defined(OS_ANDROID) | 131 #if defined(OS_ANDROID) |
132 } else if (resource_type == content::RESOURCE_TYPE_FAVICON) { | 132 } else if (resource_type == content::RESOURCE_TYPE_FAVICON) { |
133 // Delay icon fetching until the contents are getting swapped in | 133 // Delay icon fetching until the contents are getting swapped in |
134 // to conserve network usage in mobile devices. | 134 // to conserve network usage in mobile devices. |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
219 if (g_prerender_contents_for_testing) | 219 if (g_prerender_contents_for_testing) |
220 return g_prerender_contents_for_testing; | 220 return g_prerender_contents_for_testing; |
221 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( | 221 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( |
222 render_process_id, render_frame_id); | 222 render_process_id, render_frame_id); |
223 content::WebContents* web_contents = | 223 content::WebContents* web_contents = |
224 content::WebContents::FromRenderFrameHost(rfh); | 224 content::WebContents::FromRenderFrameHost(rfh); |
225 return PrerenderContents::FromWebContents(web_contents); | 225 return PrerenderContents::FromWebContents(web_contents); |
226 } | 226 } |
227 | 227 |
228 } // namespace prerender | 228 } // namespace prerender |
OLD | NEW |