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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1309043003: Handle frame openers in the same FrameTree when navigating subframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@opener-cycle-detection
Patch Set: Add comment for the DCHECK Created 5 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
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1776 // TODO(creis): Support beforeunload on subframes. 1776 // TODO(creis): Support beforeunload on subframes.
1777 return !GetParent() && IsRenderFrameLive(); 1777 return !GetParent() && IsRenderFrameLive();
1778 } 1778 }
1779 1779
1780 void RenderFrameHostImpl::UpdateOpener() { 1780 void RenderFrameHostImpl::UpdateOpener() {
1781 // This frame (the frame whose opener is being updated) might not have had 1781 // This frame (the frame whose opener is being updated) might not have had
1782 // proxies for the new opener chain in its SiteInstance. Make sure they 1782 // proxies for the new opener chain in its SiteInstance. Make sure they
1783 // exist. 1783 // exist.
1784 if (frame_tree_node_->opener()) { 1784 if (frame_tree_node_->opener()) {
1785 frame_tree_node_->opener()->render_manager()->CreateOpenerProxies( 1785 frame_tree_node_->opener()->render_manager()->CreateOpenerProxies(
1786 GetSiteInstance()); 1786 GetSiteInstance(), frame_tree_node_);
1787 } 1787 }
1788 1788
1789 int opener_routing_id = 1789 int opener_routing_id =
1790 frame_tree_node_->render_manager()->GetOpenerRoutingID(GetSiteInstance()); 1790 frame_tree_node_->render_manager()->GetOpenerRoutingID(GetSiteInstance());
1791 Send(new FrameMsg_UpdateOpener(GetRoutingID(), opener_routing_id)); 1791 Send(new FrameMsg_UpdateOpener(GetRoutingID(), opener_routing_id));
1792 } 1792 }
1793 1793
1794 void RenderFrameHostImpl::ExtendSelectionAndDelete(size_t before, 1794 void RenderFrameHostImpl::ExtendSelectionAndDelete(size_t before,
1795 size_t after) { 1795 size_t after) {
1796 Send(new InputMsg_ExtendSelectionAndDelete(routing_id_, before, after)); 1796 Send(new InputMsg_ExtendSelectionAndDelete(routing_id_, before, after));
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
2223 BrowserPluginInstanceIDToAXTreeID(value))); 2223 BrowserPluginInstanceIDToAXTreeID(value)));
2224 break; 2224 break;
2225 case AX_CONTENT_INT_ATTRIBUTE_LAST: 2225 case AX_CONTENT_INT_ATTRIBUTE_LAST:
2226 NOTREACHED(); 2226 NOTREACHED();
2227 break; 2227 break;
2228 } 2228 }
2229 } 2229 }
2230 } 2230 }
2231 2231
2232 } // namespace content 2232 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698