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 3939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3950 const base::string16& source_id) { | 3950 const base::string16& source_id) { |
3951 if (!delegate_) | 3951 if (!delegate_) |
3952 return false; | 3952 return false; |
3953 return delegate_->AddMessageToConsole(this, level, message, line_no, | 3953 return delegate_->AddMessageToConsole(this, level, message, line_no, |
3954 source_id); | 3954 source_id); |
3955 } | 3955 } |
3956 | 3956 |
3957 int WebContentsImpl::CreateSwappedOutRenderView( | 3957 int WebContentsImpl::CreateSwappedOutRenderView( |
3958 SiteInstance* instance) { | 3958 SiteInstance* instance) { |
3959 int render_view_routing_id = MSG_ROUTING_NONE; | 3959 int render_view_routing_id = MSG_ROUTING_NONE; |
3960 GetRenderManager()->CreateRenderFrame( | 3960 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
3961 instance, nullptr, MSG_ROUTING_NONE, | 3961 switches::kSitePerProcess)) { |
3962 CREATE_RF_SWAPPED_OUT | CREATE_RF_FOR_MAIN_FRAME_NAVIGATION | | 3962 GetRenderManager()->CreateRenderFrameProxy(instance); |
3963 CREATE_RF_HIDDEN, | 3963 } else { |
3964 &render_view_routing_id); | 3964 GetRenderManager()->CreateRenderFrame( |
| 3965 instance, nullptr, MSG_ROUTING_NONE, |
| 3966 CREATE_RF_SWAPPED_OUT | CREATE_RF_FOR_MAIN_FRAME_NAVIGATION | |
| 3967 CREATE_RF_HIDDEN, |
| 3968 &render_view_routing_id); |
| 3969 } |
3965 return render_view_routing_id; | 3970 return render_view_routing_id; |
3966 } | 3971 } |
3967 | 3972 |
3968 void WebContentsImpl::OnUserGesture() { | 3973 void WebContentsImpl::OnUserGesture() { |
3969 // Notify observers. | 3974 // Notify observers. |
3970 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); | 3975 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); |
3971 | 3976 |
3972 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); | 3977 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); |
3973 if (rdh) // NULL in unittests. | 3978 if (rdh) // NULL in unittests. |
3974 rdh->OnUserGesture(this); | 3979 rdh->OnUserGesture(this); |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4145 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); | 4150 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); |
4146 | 4151 |
4147 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( | 4152 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( |
4148 instance); | 4153 instance); |
4149 if (rvh) | 4154 if (rvh) |
4150 return rvh->GetRoutingID(); | 4155 return rvh->GetRoutingID(); |
4151 | 4156 |
4152 // Create a swapped out RenderView in the given SiteInstance if none exists, | 4157 // Create a swapped out RenderView in the given SiteInstance if none exists, |
4153 // setting its opener to the given route_id. Return the new view's route_id. | 4158 // setting its opener to the given route_id. Return the new view's route_id. |
4154 int render_view_routing_id = MSG_ROUTING_NONE; | 4159 int render_view_routing_id = MSG_ROUTING_NONE; |
4155 GetRenderManager()->CreateRenderFrame(instance, nullptr, opener_route_id, | 4160 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
4156 CREATE_RF_FOR_MAIN_FRAME_NAVIGATION | | 4161 switches::kSitePerProcess)) { |
| 4162 GetRenderManager()->CreateRenderFrameProxy(instance); |
| 4163 render_view_routing_id = |
| 4164 frame_tree_.GetRenderViewHost(instance)->GetRoutingID(); |
| 4165 } else { |
| 4166 GetRenderManager()->CreateRenderFrame(instance, nullptr, opener_route_id, |
| 4167 CREATE_RF_FOR_MAIN_FRAME_NAVIGATION | |
4157 CREATE_RF_SWAPPED_OUT | | 4168 CREATE_RF_SWAPPED_OUT | |
4158 CREATE_RF_HIDDEN, | 4169 CREATE_RF_HIDDEN, |
4159 &render_view_routing_id); | 4170 &render_view_routing_id); |
| 4171 } |
4160 return render_view_routing_id; | 4172 return render_view_routing_id; |
4161 } | 4173 } |
4162 | 4174 |
4163 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { | 4175 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { |
4164 return GetController(); | 4176 return GetController(); |
4165 } | 4177 } |
4166 | 4178 |
4167 scoped_ptr<WebUIImpl> WebContentsImpl::CreateWebUIForRenderManager( | 4179 scoped_ptr<WebUIImpl> WebContentsImpl::CreateWebUIForRenderManager( |
4168 const GURL& url) { | 4180 const GURL& url) { |
4169 return scoped_ptr<WebUIImpl>(static_cast<WebUIImpl*>(CreateWebUI(url))); | 4181 return scoped_ptr<WebUIImpl>(static_cast<WebUIImpl*>(CreateWebUI(url))); |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4435 player_map->erase(it); | 4447 player_map->erase(it); |
4436 } | 4448 } |
4437 | 4449 |
4438 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4450 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4439 force_disable_overscroll_content_ = force_disable; | 4451 force_disable_overscroll_content_ = force_disable; |
4440 if (view_) | 4452 if (view_) |
4441 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4453 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4442 } | 4454 } |
4443 | 4455 |
4444 } // namespace content | 4456 } // namespace content |
OLD | NEW |