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

Unified Diff: content/renderer/render_frame_proxy.cc

Issue 2714943004: Move unique name generation and tracking into //content. (Closed)
Patch Set: . Created 3 years, 10 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: content/renderer/render_frame_proxy.cc
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 0315b29a3edd8ec0fa6dbb23ec0c2416b95103e2..bbd2170e544bbe40ee2dc39d5793f51822eb9e46 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -125,8 +125,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();
}
@@ -219,8 +219,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);
@@ -346,8 +345,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(

Powered by Google App Engine
This is Rietveld 408576698