OLD | NEW |
---|---|
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 4131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4142 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) { | 4142 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) { |
4143 source_web_contents->GetRenderManager()->CreateRenderFrameProxy( | 4143 source_web_contents->GetRenderManager()->CreateRenderFrameProxy( |
4144 GetSiteInstance()); | 4144 GetSiteInstance()); |
4145 } else { | 4145 } else { |
4146 source_web_contents->CreateSwappedOutRenderView(GetSiteInstance()); | 4146 source_web_contents->CreateSwappedOutRenderView(GetSiteInstance()); |
4147 } | 4147 } |
4148 } else { | 4148 } else { |
4149 RenderFrameHostImpl* source_rfhi = | 4149 RenderFrameHostImpl* source_rfhi = |
4150 static_cast<RenderFrameHostImpl*>(source_rfh); | 4150 static_cast<RenderFrameHostImpl*>(source_rfh); |
4151 source_rfhi->frame_tree_node()->render_manager()->CreateOpenerProxies( | 4151 source_rfhi->frame_tree_node()->render_manager()->CreateOpenerProxies( |
4152 GetSiteInstance()); | 4152 GetSiteInstance(), nullptr); |
alexmos
2015/08/25 22:38:08
Using nullptr keeps today's behavior, but I'm thin
Charlie Reis
2015/08/31 20:49:43
Interesting. Is that something we could write a t
alexmos
2015/09/01 22:12:28
I wrote a test and then realized this is actually
| |
4153 } | 4153 } |
4154 } | 4154 } |
4155 } | 4155 } |
4156 | 4156 |
4157 bool WebContentsImpl::AddMessageToConsole(int32 level, | 4157 bool WebContentsImpl::AddMessageToConsole(int32 level, |
4158 const base::string16& message, | 4158 const base::string16& message, |
4159 int32 line_no, | 4159 int32 line_no, |
4160 const base::string16& source_id) { | 4160 const base::string16& source_id) { |
4161 if (!delegate_) | 4161 if (!delegate_) |
4162 return false; | 4162 return false; |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4615 player_map->erase(it); | 4615 player_map->erase(it); |
4616 } | 4616 } |
4617 | 4617 |
4618 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4618 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4619 force_disable_overscroll_content_ = force_disable; | 4619 force_disable_overscroll_content_ = force_disable; |
4620 if (view_) | 4620 if (view_) |
4621 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4621 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4622 } | 4622 } |
4623 | 4623 |
4624 } // namespace content | 4624 } // namespace content |
OLD | NEW |