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

Unified Diff: content/renderer/render_frame_proxy.cc

Issue 2499053003: Simplify RenderFrameImpl::ResolveOpener() (Closed)
Patch Set: Rebase. Created 4 years, 1 month 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_thread_impl.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 8f429c68c4b94f2e76c960d3842550098535b48f..4c9c919df14378016c8fd07d7a731434cb69bcc2 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -82,7 +82,7 @@ RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
int routing_id,
int render_view_routing_id,
- int opener_routing_id,
+ blink::WebFrame* opener,
int parent_routing_id,
const FrameReplicationState& replicated_state) {
RenderFrameProxy* parent = nullptr;
@@ -95,9 +95,6 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
return nullptr;
}
- blink::WebFrame* opener =
- RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr);
-
std::unique_ptr<RenderFrameProxy> proxy(
new RenderFrameProxy(routing_id, MSG_ROUTING_NONE));
RenderViewImpl* render_view = nullptr;
@@ -327,8 +324,7 @@ void RenderFrameProxy::OnSetChildFrameSurface(
}
void RenderFrameProxy::OnUpdateOpener(int opener_routing_id) {
- blink::WebFrame* opener =
- RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr);
+ blink::WebFrame* opener = RenderFrameImpl::ResolveOpener(opener_routing_id);
web_frame_->setOpener(opener);
}
« no previous file with comments | « content/renderer/render_frame_proxy.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698