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

Side by Side Diff: content/browser/web_contents/web_contents_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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 4121 matching lines...) Expand 10 before | Expand all | Expand 10 after
4132 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) { 4132 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) {
4133 source_web_contents->GetRenderManager()->CreateRenderFrameProxy( 4133 source_web_contents->GetRenderManager()->CreateRenderFrameProxy(
4134 GetSiteInstance()); 4134 GetSiteInstance());
4135 } else { 4135 } else {
4136 source_web_contents->CreateSwappedOutRenderView(GetSiteInstance()); 4136 source_web_contents->CreateSwappedOutRenderView(GetSiteInstance());
4137 } 4137 }
4138 } else { 4138 } else {
4139 RenderFrameHostImpl* source_rfhi = 4139 RenderFrameHostImpl* source_rfhi =
4140 static_cast<RenderFrameHostImpl*>(source_rfh); 4140 static_cast<RenderFrameHostImpl*>(source_rfh);
4141 source_rfhi->frame_tree_node()->render_manager()->CreateOpenerProxies( 4141 source_rfhi->frame_tree_node()->render_manager()->CreateOpenerProxies(
4142 GetSiteInstance()); 4142 GetSiteInstance(), nullptr);
4143 } 4143 }
4144 } 4144 }
4145 } 4145 }
4146 4146
4147 bool WebContentsImpl::AddMessageToConsole(int32 level, 4147 bool WebContentsImpl::AddMessageToConsole(int32 level,
4148 const base::string16& message, 4148 const base::string16& message,
4149 int32 line_no, 4149 int32 line_no,
4150 const base::string16& source_id) { 4150 const base::string16& source_id) {
4151 if (!delegate_) 4151 if (!delegate_)
4152 return false; 4152 return false;
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
4621 return NULL; 4621 return NULL;
4622 } 4622 }
4623 4623
4624 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4624 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4625 force_disable_overscroll_content_ = force_disable; 4625 force_disable_overscroll_content_ = force_disable;
4626 if (view_) 4626 if (view_)
4627 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4627 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4628 } 4628 }
4629 4629
4630 } // namespace content 4630 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698