| 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 3711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3722 // as it is deprecated and can be out of sync with GetRenderViewHost(). | 3722 // as it is deprecated and can be out of sync with GetRenderViewHost(). |
| 3723 GURL url = controller_.GetActiveEntry() | 3723 GURL url = controller_.GetActiveEntry() |
| 3724 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); | 3724 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); |
| 3725 | 3725 |
| 3726 return GetRenderManager()->current_host()->GetWebkitPrefs(url); | 3726 return GetRenderManager()->current_host()->GetWebkitPrefs(url); |
| 3727 } | 3727 } |
| 3728 | 3728 |
| 3729 int WebContentsImpl::CreateSwappedOutRenderView( | 3729 int WebContentsImpl::CreateSwappedOutRenderView( |
| 3730 SiteInstance* instance) { | 3730 SiteInstance* instance) { |
| 3731 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, | 3731 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, |
| 3732 true, true); | 3732 true, true, false); |
| 3733 } | 3733 } |
| 3734 | 3734 |
| 3735 void WebContentsImpl::OnUserGesture() { | 3735 void WebContentsImpl::OnUserGesture() { |
| 3736 // Notify observers. | 3736 // Notify observers. |
| 3737 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); | 3737 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); |
| 3738 | 3738 |
| 3739 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); | 3739 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); |
| 3740 if (rdh) // NULL in unittests. | 3740 if (rdh) // NULL in unittests. |
| 3741 rdh->OnUserGesture(this); | 3741 rdh->OnUserGesture(this); |
| 3742 } | 3742 } |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3893 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); | 3893 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); |
| 3894 | 3894 |
| 3895 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( | 3895 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( |
| 3896 instance); | 3896 instance); |
| 3897 if (rvh) | 3897 if (rvh) |
| 3898 return rvh->GetRoutingID(); | 3898 return rvh->GetRoutingID(); |
| 3899 | 3899 |
| 3900 // Create a swapped out RenderView in the given SiteInstance if none exists, | 3900 // Create a swapped out RenderView in the given SiteInstance if none exists, |
| 3901 // setting its opener to the given route_id. Return the new view's route_id. | 3901 // setting its opener to the given route_id. Return the new view's route_id. |
| 3902 return GetRenderManager()->CreateRenderFrame(instance, opener_route_id, | 3902 return GetRenderManager()->CreateRenderFrame(instance, opener_route_id, |
| 3903 true, true); | 3903 true, true, false); |
| 3904 } | 3904 } |
| 3905 | 3905 |
| 3906 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { | 3906 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { |
| 3907 return GetController(); | 3907 return GetController(); |
| 3908 } | 3908 } |
| 3909 | 3909 |
| 3910 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { | 3910 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { |
| 3911 return static_cast<WebUIImpl*>(CreateWebUI(url)); | 3911 return static_cast<WebUIImpl*>(CreateWebUI(url)); |
| 3912 } | 3912 } |
| 3913 | 3913 |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4116 if (new_size != old_size) | 4116 if (new_size != old_size) |
| 4117 delegate_->UpdatePreferredSize(this, new_size); | 4117 delegate_->UpdatePreferredSize(this, new_size); |
| 4118 } | 4118 } |
| 4119 | 4119 |
| 4120 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4120 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
| 4121 FrameTreeNode* node = frame_tree_.root(); | 4121 FrameTreeNode* node = frame_tree_.root(); |
| 4122 node->render_manager()->ResumeResponseDeferredAtStart(); | 4122 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4123 } | 4123 } |
| 4124 | 4124 |
| 4125 } // namespace content | 4125 } // namespace content |
| OLD | NEW |