Chromium Code Reviews| 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/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 3888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3899 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here, | 3899 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here, |
| 3900 // as it is deprecated and can be out of sync with GetRenderViewHost(). | 3900 // as it is deprecated and can be out of sync with GetRenderViewHost(). |
| 3901 GURL url = controller_.GetActiveEntry() | 3901 GURL url = controller_.GetActiveEntry() |
| 3902 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); | 3902 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); |
| 3903 | 3903 |
| 3904 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url); | 3904 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url); |
| 3905 } | 3905 } |
| 3906 | 3906 |
| 3907 int WebContentsImpl::CreateSwappedOutRenderView( | 3907 int WebContentsImpl::CreateSwappedOutRenderView( |
| 3908 SiteInstance* instance) { | 3908 SiteInstance* instance) { |
| 3909 return GetRenderManager()->CreateRenderFrame( | 3909 return GetRenderManager()->CreateSwappedOutHiddenRenderFrame( |
|
nasko
2014/11/19 01:00:24
Please rebase on top of crrev.com/304494.
carlosk
2014/11/19 17:24:29
Already done locally.
carlosk
2014/11/21 14:36:34
Done.
| |
| 3910 instance, MSG_ROUTING_NONE, true, true, true); | 3910 instance, MSG_ROUTING_NONE, true); |
| 3911 } | 3911 } |
| 3912 | 3912 |
| 3913 void WebContentsImpl::OnUserGesture() { | 3913 void WebContentsImpl::OnUserGesture() { |
| 3914 // Notify observers. | 3914 // Notify observers. |
| 3915 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); | 3915 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); |
| 3916 | 3916 |
| 3917 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); | 3917 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); |
| 3918 if (rdh) // NULL in unittests. | 3918 if (rdh) // NULL in unittests. |
| 3919 rdh->OnUserGesture(this); | 3919 rdh->OnUserGesture(this); |
| 3920 } | 3920 } |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4072 instance) | 4072 instance) |
| 4073 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); | 4073 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); |
| 4074 | 4074 |
| 4075 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( | 4075 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( |
| 4076 instance); | 4076 instance); |
| 4077 if (rvh) | 4077 if (rvh) |
| 4078 return rvh->GetRoutingID(); | 4078 return rvh->GetRoutingID(); |
| 4079 | 4079 |
| 4080 // Create a swapped out RenderView in the given SiteInstance if none exists, | 4080 // Create a swapped out RenderView in the given SiteInstance if none exists, |
| 4081 // setting its opener to the given route_id. Return the new view's route_id. | 4081 // setting its opener to the given route_id. Return the new view's route_id. |
| 4082 return GetRenderManager()->CreateRenderFrame( | 4082 return GetRenderManager()->CreateSwappedOutHiddenRenderFrame( |
| 4083 instance, opener_route_id, true, true, true); | 4083 instance, opener_route_id, true); |
| 4084 } | 4084 } |
| 4085 | 4085 |
| 4086 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { | 4086 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { |
| 4087 return GetController(); | 4087 return GetController(); |
| 4088 } | 4088 } |
| 4089 | 4089 |
| 4090 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { | 4090 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { |
| 4091 return static_cast<WebUIImpl*>(CreateWebUI(url)); | 4091 return static_cast<WebUIImpl*>(CreateWebUI(url)); |
| 4092 } | 4092 } |
| 4093 | 4093 |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4348 node->render_manager()->ResumeResponseDeferredAtStart(); | 4348 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4349 } | 4349 } |
| 4350 | 4350 |
| 4351 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4351 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4352 force_disable_overscroll_content_ = force_disable; | 4352 force_disable_overscroll_content_ = force_disable; |
| 4353 if (view_) | 4353 if (view_) |
| 4354 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4354 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4355 } | 4355 } |
| 4356 | 4356 |
| 4357 } // namespace content | 4357 } // namespace content |
| OLD | NEW |