| 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 3830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3841 // as it is deprecated and can be out of sync with GetRenderViewHost(). | 3841 // as it is deprecated and can be out of sync with GetRenderViewHost(). |
| 3842 GURL url = controller_.GetActiveEntry() | 3842 GURL url = controller_.GetActiveEntry() |
| 3843 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); | 3843 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); |
| 3844 | 3844 |
| 3845 return GetRenderManager()->current_host()->GetWebkitPrefs(url); | 3845 return GetRenderManager()->current_host()->GetWebkitPrefs(url); |
| 3846 } | 3846 } |
| 3847 | 3847 |
| 3848 int WebContentsImpl::CreateSwappedOutRenderView( | 3848 int WebContentsImpl::CreateSwappedOutRenderView( |
| 3849 SiteInstance* instance) { | 3849 SiteInstance* instance) { |
| 3850 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, | 3850 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, |
| 3851 true, true); | 3851 true, true, false); |
| 3852 } | 3852 } |
| 3853 | 3853 |
| 3854 void WebContentsImpl::OnUserGesture() { | 3854 void WebContentsImpl::OnUserGesture() { |
| 3855 // Notify observers. | 3855 // Notify observers. |
| 3856 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); | 3856 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); |
| 3857 | 3857 |
| 3858 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); | 3858 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); |
| 3859 if (rdh) // NULL in unittests. | 3859 if (rdh) // NULL in unittests. |
| 3860 rdh->OnUserGesture(this); | 3860 rdh->OnUserGesture(this); |
| 3861 } | 3861 } |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4012 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); | 4012 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); |
| 4013 | 4013 |
| 4014 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( | 4014 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( |
| 4015 instance); | 4015 instance); |
| 4016 if (rvh) | 4016 if (rvh) |
| 4017 return rvh->GetRoutingID(); | 4017 return rvh->GetRoutingID(); |
| 4018 | 4018 |
| 4019 // Create a swapped out RenderView in the given SiteInstance if none exists, | 4019 // Create a swapped out RenderView in the given SiteInstance if none exists, |
| 4020 // setting its opener to the given route_id. Return the new view's route_id. | 4020 // setting its opener to the given route_id. Return the new view's route_id. |
| 4021 return GetRenderManager()->CreateRenderFrame(instance, opener_route_id, | 4021 return GetRenderManager()->CreateRenderFrame(instance, opener_route_id, |
| 4022 true, true); | 4022 true, true, false); |
| 4023 } | 4023 } |
| 4024 | 4024 |
| 4025 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { | 4025 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { |
| 4026 return GetController(); | 4026 return GetController(); |
| 4027 } | 4027 } |
| 4028 | 4028 |
| 4029 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { | 4029 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { |
| 4030 return static_cast<WebUIImpl*>(CreateWebUI(url)); | 4030 return static_cast<WebUIImpl*>(CreateWebUI(url)); |
| 4031 } | 4031 } |
| 4032 | 4032 |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4233 if (new_size != old_size) | 4233 if (new_size != old_size) |
| 4234 delegate_->UpdatePreferredSize(this, new_size); | 4234 delegate_->UpdatePreferredSize(this, new_size); |
| 4235 } | 4235 } |
| 4236 | 4236 |
| 4237 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4237 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
| 4238 FrameTreeNode* node = frame_tree_.root(); | 4238 FrameTreeNode* node = frame_tree_.root(); |
| 4239 node->render_manager()->ResumeResponseDeferredAtStart(); | 4239 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4240 } | 4240 } |
| 4241 | 4241 |
| 4242 } // namespace content | 4242 } // namespace content |
| OLD | NEW |