Index: content/renderer/render_frame_proxy.cc |
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc |
index 2de7dafeb38f0e1ef2296139f97fa7fd1879e17b..fac591157d30abbf4fd6d31195482451d634c194 100644 |
--- a/content/renderer/render_frame_proxy.cc |
+++ b/content/renderer/render_frame_proxy.cc |
@@ -44,6 +44,9 @@ RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame( |
int routing_id, |
blink::WebTreeScopeType scope) { |
CHECK_NE(routing_id, MSG_ROUTING_NONE); |
+ LOG(ERROR) << "RFP::CreateProxyToReplaceFrame:" |
+ << " routing_id:" << routing_id |
+ << " frame_to_replace:" << frame_to_replace; |
scoped_ptr<RenderFrameProxy> proxy( |
new RenderFrameProxy(routing_id, frame_to_replace->GetRoutingID())); |
@@ -62,6 +65,10 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy( |
int parent_routing_id, |
int render_view_routing_id, |
const FrameReplicationState& replicated_state) { |
+ LOG(ERROR) << "RFP::CreateFrameProxy:" |
+ << " routing_id:" << routing_id |
+ << " parent routing id:" << parent_routing_id; |
+ |
scoped_ptr<RenderFrameProxy> proxy( |
new RenderFrameProxy(routing_id, MSG_ROUTING_NONE)); |
RenderViewImpl* render_view = NULL; |
@@ -69,6 +76,8 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy( |
if (parent_routing_id == MSG_ROUTING_NONE) { |
// Create a top level WebRemoteFrame. |
render_view = RenderViewImpl::FromRoutingID(render_view_routing_id); |
+ LOG(ERROR) << "RFP::CreateFrameProxy:" |
+ << " rv:" << render_view; |
web_frame = |
blink::WebRemoteFrame::create(replicated_state.scope, proxy.get()); |
render_view->webview()->setMainFrame(web_frame); |
@@ -119,8 +128,7 @@ RenderFrameProxy* RenderFrameProxy::FromWebFrame(blink::WebFrame* web_frame) { |
// static |
bool RenderFrameProxy::IsSwappedOutStateForbidden() { |
- return base::CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kSitePerProcess); |
+ return true; |
} |
RenderFrameProxy::RenderFrameProxy(int routing_id, int frame_routing_id) |
@@ -128,6 +136,10 @@ RenderFrameProxy::RenderFrameProxy(int routing_id, int frame_routing_id) |
frame_routing_id_(frame_routing_id), |
web_frame_(NULL), |
render_view_(NULL) { |
+ LOG(ERROR) << "RFP[" << this << "]::RFP:" |
+ << " routing_id:" << routing_id_ |
+ << " frame:" << frame_routing_id; |
+ |
std::pair<RoutingIDProxyMap::iterator, bool> result = |
g_routing_id_proxy_map.Get().insert(std::make_pair(routing_id_, this)); |
CHECK(result.second) << "Inserting a duplicate item."; |
@@ -149,6 +161,7 @@ RenderFrameProxy::~RenderFrameProxy() { |
CHECK(!web_frame_); |
RenderThread::Get()->RemoveRoute(routing_id_); |
g_routing_id_proxy_map.Get().erase(routing_id_); |
+ LOG(ERROR) << "RFP[" << this << "]::~RFP"; |
} |
void RenderFrameProxy::Init(blink::WebRemoteFrame* web_frame, |
@@ -292,6 +305,7 @@ void RenderFrameProxy::OnSetChildFrameSurface( |
} |
void RenderFrameProxy::OnDisownOpener() { |
+ LOG(ERROR) << "RFP[" << this << "]::OnDisownOpener"; |
// TODO(creis): We should only see this for main frames for now. To support |
// disowning the opener on subframes, we will need to move WebContentsImpl's |
// opener_ to FrameTreeNode. |
@@ -304,6 +318,7 @@ void RenderFrameProxy::OnDisownOpener() { |
RenderFrameImpl* render_frame = |
RenderFrameImpl::FromRoutingID(frame_routing_id_); |
if (render_frame) { |
+ CHECK(false); |
if (render_frame->GetWebFrame()->opener()) |
render_frame->GetWebFrame()->setOpener(NULL); |
return; |