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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1568073002: Reduce string copies in GURL creation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9b199d39f2d46c50a99b84b892d381dbb2e21d6b..853965059a8f6eee59164e657db56d327f57f04f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -145,6 +145,7 @@
#include "net/base/net_errors.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/http/http_util.h"
+#include "third_party/WebKit/public/platform/URLConversion.h"
#include "third_party/WebKit/public/platform/WebData.h"
#include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -2353,7 +2354,8 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
std::string mime_type;
bool found = false;
WebString top_origin = frame->top()->securityOrigin().toString();
- Send(new FrameHostMsg_GetPluginInfo(routing_id_, params.url, GURL(top_origin),
+ Send(new FrameHostMsg_GetPluginInfo(routing_id_, params.url,
+ blink::WebStringToGURL(top_origin),
params.mimeType.utf8(), &found, &info,
&mime_type));
if (!found)
@@ -2881,8 +2883,8 @@ void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame,
if (webview) {
if (WebFrame* old_frame = webview->mainFrame()) {
const WebURLRequest& original_request = datasource->originalRequest();
- const GURL referrer(
- original_request.httpHeaderField(WebString::fromUTF8("Referer")));
+ const GURL referrer(blink::WebStringToGURL(
+ original_request.httpHeaderField(WebString::fromUTF8("Referer"))));
if (!referrer.is_empty() && old_frame->isWebLocalFrame() &&
DocumentState::FromDataSource(old_frame->dataSource())
->was_prefetcher()) {
@@ -3755,7 +3757,7 @@ void RenderFrameImpl::willSendRequest(
extra_data->set_render_frame_id(routing_id_);
extra_data->set_is_main_frame(!parent);
extra_data->set_frame_origin(
- GURL(frame->document().securityOrigin().toString()));
+ blink::WebStringToGURL(frame->document().securityOrigin().toString()));
extra_data->set_parent_is_main_frame(parent && !parent->parent());
extra_data->set_parent_render_frame_id(parent_routing_id);
extra_data->set_allow_download(
@@ -3998,7 +4000,7 @@ void RenderFrameImpl::requestStorageQuota(
}
ChildThreadImpl::current()->quota_dispatcher()->RequestStorageQuota(
render_view_->GetRoutingID(),
- GURL(origin.toString()),
+ blink::WebStringToGURL(origin.toString()),
static_cast<storage::StorageType>(type),
requested_size,
QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
@@ -4152,7 +4154,7 @@ bool RenderFrameImpl::allowWebGL(blink::WebLocalFrame* frame,
bool blocked = true;
Send(new FrameHostMsg_Are3DAPIsBlocked(
routing_id_,
- GURL(frame->top()->securityOrigin().toString()),
+ blink::WebStringToGURL(frame->top()->securityOrigin().toString()),
THREE_D_API_TYPE_WEBGL,
&blocked));
return !blocked;
@@ -4162,7 +4164,7 @@ void RenderFrameImpl::didLoseWebGLContext(blink::WebLocalFrame* frame,
int arb_robustness_status_code) {
DCHECK(!frame_ || frame_ == frame);
Send(new FrameHostMsg_DidLose3DContext(
- GURL(frame->top()->securityOrigin().toString()),
+ blink::WebStringToGURL(frame->top()->securityOrigin().toString()),
THREE_D_API_TYPE_WEBGL,
arb_robustness_status_code));
}
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698