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

Unified Diff: content/renderer/render_frame_proxy.cc

Issue 2714943004: Move unique name generation and tracking into //content. (Closed)
Patch Set: Rebase again. Created 3 years, 9 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/render_frame_proxy.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_proxy.cc
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 006858b6894ffcd4939aedfb0aa841274ffbac23..d6a89cef094a7691e07988a6f390865fcd5af42a 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -61,6 +61,7 @@ RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
CHECK_NE(routing_id, MSG_ROUTING_NONE);
std::unique_ptr<RenderFrameProxy> proxy(new RenderFrameProxy(routing_id));
+ proxy->unique_name_ = frame_to_replace->unique_name();
// When a RenderFrame is replaced by a RenderProxy, the WebRemoteFrame should
// always come from WebRemoteFrame::create and a call to WebFrame::swap must
@@ -126,8 +127,8 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
web_frame = parent->web_frame()->createRemoteChild(
replicated_state.scope,
blink::WebString::fromUTF8(replicated_state.name),
- blink::WebString::fromUTF8(replicated_state.unique_name),
replicated_state.sandbox_flags, proxy.get(), opener);
+ proxy->unique_name_ = replicated_state.unique_name;
render_view = parent->render_view();
render_widget = parent->render_widget();
}
@@ -220,8 +221,7 @@ void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
DCHECK(web_frame_);
web_frame_->setReplicatedOrigin(state.origin);
web_frame_->setReplicatedSandboxFlags(state.sandbox_flags);
- web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name),
- blink::WebString::fromUTF8(state.unique_name));
+ web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name));
web_frame_->setReplicatedInsecureRequestPolicy(state.insecure_request_policy);
web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin(
state.has_potentially_trustworthy_unique_origin);
@@ -347,8 +347,8 @@ void RenderFrameProxy::OnDispatchLoad() {
void RenderFrameProxy::OnDidUpdateName(const std::string& name,
const std::string& unique_name) {
- web_frame_->setReplicatedName(blink::WebString::fromUTF8(name),
- blink::WebString::fromUTF8(unique_name));
+ web_frame_->setReplicatedName(blink::WebString::fromUTF8(name));
+ unique_name_ = unique_name;
}
void RenderFrameProxy::OnAddContentSecurityPolicy(
« no previous file with comments | « content/renderer/render_frame_proxy.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698