Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

Unified Diff: chrome/renderer/extensions/chrome_extensions_renderer_client.cc

Issue 2459143002: Avoid GURL allocations/copies/frees in RenderFrameImpl::willSendRequest (Closed)
Patch Set: compile fix Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/extensions/chrome_extensions_renderer_client.cc
diff --git a/chrome/renderer/extensions/chrome_extensions_renderer_client.cc b/chrome/renderer/extensions/chrome_extensions_renderer_client.cc
index 141bf76e929755914211405173ec293b5314dad3..54947da974591656d81dada83abd4165e0d21fdd 100644
--- a/chrome/renderer/extensions/chrome_extensions_renderer_client.cc
+++ b/chrome/renderer/extensions/chrome_extensions_renderer_client.cc
@@ -210,16 +210,16 @@ bool ChromeExtensionsRendererClient::AllowPopup() {
bool ChromeExtensionsRendererClient::WillSendRequest(
blink::WebFrame* frame,
ui::PageTransition transition_type,
- const GURL& url,
+ const blink::WebURL& url,
GURL* new_url) {
- if (url.SchemeIs(extensions::kExtensionScheme) &&
- !resource_request_policy_->CanRequestResource(url, frame,
+ if (url.protocolIs(extensions::kExtensionScheme) &&
Devlin 2016/10/31 15:17:39 My url spec knowledge is limited, so I might be co
Charlie Harrison 2016/10/31 15:46:13 Hm yeah I think "protocol" here is a misnomer, as
Devlin 2016/10/31 16:00:57 sgtm; I'm fine with this for now since it *is* saf
Charlie Harrison 2016/10/31 16:37:34 I filed crbug.com/660875 asking for owners advice
+ !resource_request_policy_->CanRequestResource(GURL(url), frame,
transition_type)) {
*new_url = GURL(chrome::kExtensionInvalidRequestURL);
return true;
}
- if (url.SchemeIs(extensions::kExtensionResourceScheme) &&
+ if (url.protocolIs(extensions::kExtensionResourceScheme) &&
!resource_request_policy_->CanRequestExtensionResourceScheme(url,
frame)) {
*new_url = GURL(chrome::kExtensionResourceInvalidRequestURL);

Powered by Google App Engine
This is Rietveld 408576698