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

Side by Side Diff: content/renderer/render_frame_proxy.cc

Issue 547093002: Return WebLocalFrame from RenderFrame::GetWebFrame(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "content/common/frame_messages.h" 10 #include "content/common/frame_messages.h"
11 #include "content/common/swapped_out_messages.h" 11 #include "content/common/swapped_out_messages.h"
12 #include "content/renderer/child_frame_compositing_helper.h" 12 #include "content/renderer/child_frame_compositing_helper.h"
13 #include "content/renderer/render_frame_impl.h" 13 #include "content/renderer/render_frame_impl.h"
14 #include "content/renderer/render_thread_impl.h" 14 #include "content/renderer/render_thread_impl.h"
15 #include "content/renderer/render_view_impl.h" 15 #include "content/renderer/render_view_impl.h"
16 #include "third_party/WebKit/public/web/WebLocalFrame.h"
16 #include "third_party/WebKit/public/web/WebView.h" 17 #include "third_party/WebKit/public/web/WebView.h"
17 18
18 namespace content { 19 namespace content {
19 20
20 namespace { 21 namespace {
21 22
22 // Facilitates lookup of RenderFrameProxy by routing_id. 23 // Facilitates lookup of RenderFrameProxy by routing_id.
23 typedef std::map<int, RenderFrameProxy*> RoutingIDProxyMap; 24 typedef std::map<int, RenderFrameProxy*> RoutingIDProxyMap;
24 static base::LazyInstance<RoutingIDProxyMap> g_routing_id_proxy_map = 25 static base::LazyInstance<RoutingIDProxyMap> g_routing_id_proxy_map =
25 LAZY_INSTANCE_INITIALIZER; 26 LAZY_INSTANCE_INITIALIZER;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 if (render_frame->GetWebFrame()->opener()) 237 if (render_frame->GetWebFrame()->opener())
237 render_frame->GetWebFrame()->setOpener(NULL); 238 render_frame->GetWebFrame()->setOpener(NULL);
238 return; 239 return;
239 } 240 }
240 241
241 if (web_frame_->opener()) 242 if (web_frame_->opener())
242 web_frame_->setOpener(NULL); 243 web_frame_->setOpener(NULL);
243 } 244 }
244 245
245 } // namespace 246 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698