Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 753173002: Preparation steps for adding speculative renderer creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address a new round of CR comments: renames, comments and minor changes. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3890 matching lines...) Expand 10 before | Expand all | Expand 10 after
3901 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here, 3901 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here,
3902 // as it is deprecated and can be out of sync with GetRenderViewHost(). 3902 // as it is deprecated and can be out of sync with GetRenderViewHost().
3903 GURL url = controller_.GetActiveEntry() 3903 GURL url = controller_.GetActiveEntry()
3904 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); 3904 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL();
3905 3905
3906 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url); 3906 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url);
3907 } 3907 }
3908 3908
3909 int WebContentsImpl::CreateSwappedOutRenderView( 3909 int WebContentsImpl::CreateSwappedOutRenderView(
3910 SiteInstance* instance) { 3910 SiteInstance* instance) {
3911 return GetRenderManager()->CreateRenderFrame( 3911 int render_view_routing_id = MSG_ROUTING_NONE;
3912 instance, MSG_ROUTING_NONE, CREATE_RF_SWAPPED_OUT | 3912 GetRenderManager()->CreateRenderFrame(
3913 CREATE_RF_FOR_MAIN_FRAME_NAVIGATION | 3913 instance, nullptr, MSG_ROUTING_NONE,
3914 CREATE_RF_HIDDEN); 3914 CREATE_RF_SWAPPED_OUT | CREATE_RF_FOR_MAIN_FRAME_NAVIGATION |
3915 CREATE_RF_HIDDEN,
3916 &render_view_routing_id);
3917 return render_view_routing_id;
3915 } 3918 }
3916 3919
3917 void WebContentsImpl::OnUserGesture() { 3920 void WebContentsImpl::OnUserGesture() {
3918 // Notify observers. 3921 // Notify observers.
3919 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); 3922 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture());
3920 3923
3921 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); 3924 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
3922 if (rdh) // NULL in unittests. 3925 if (rdh) // NULL in unittests.
3923 rdh->OnUserGesture(this); 3926 rdh->OnUserGesture(this);
3924 } 3927 }
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
4076 instance) 4079 instance)
4077 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); 4080 return GetRenderManager()->pending_render_view_host()->GetRoutingID();
4078 4081
4079 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( 4082 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost(
4080 instance); 4083 instance);
4081 if (rvh) 4084 if (rvh)
4082 return rvh->GetRoutingID(); 4085 return rvh->GetRoutingID();
4083 4086
4084 // Create a swapped out RenderView in the given SiteInstance if none exists, 4087 // Create a swapped out RenderView in the given SiteInstance if none exists,
4085 // setting its opener to the given route_id. Return the new view's route_id. 4088 // setting its opener to the given route_id. Return the new view's route_id.
4086 return GetRenderManager()->CreateRenderFrame( 4089 int render_view_routing_id = MSG_ROUTING_NONE;
4087 instance, opener_route_id, CREATE_RF_FOR_MAIN_FRAME_NAVIGATION | 4090 GetRenderManager()->CreateRenderFrame(instance, nullptr, opener_route_id,
4088 CREATE_RF_SWAPPED_OUT | CREATE_RF_HIDDEN); 4091 CREATE_RF_FOR_MAIN_FRAME_NAVIGATION |
4092 CREATE_RF_SWAPPED_OUT |
4093 CREATE_RF_HIDDEN,
4094 &render_view_routing_id);
4095 return render_view_routing_id;
4089 } 4096 }
4090 4097
4091 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { 4098 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
4092 return GetController(); 4099 return GetController();
4093 } 4100 }
4094 4101
4095 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { 4102 scoped_ptr<WebUIImpl> WebContentsImpl::CreateWebUIForRenderManager(
4096 return static_cast<WebUIImpl*>(CreateWebUI(url)); 4103 const GURL& url) {
4104 return scoped_ptr<WebUIImpl>(static_cast<WebUIImpl*>(CreateWebUI(url)));
4097 } 4105 }
4098 4106
4099 NavigationEntry* 4107 NavigationEntry*
4100 WebContentsImpl::GetLastCommittedNavigationEntryForRenderManager() { 4108 WebContentsImpl::GetLastCommittedNavigationEntryForRenderManager() {
4101 return controller_.GetLastCommittedEntry(); 4109 return controller_.GetLastCommittedEntry();
4102 } 4110 }
4103 4111
4104 bool WebContentsImpl::CreateRenderViewForRenderManager( 4112 bool WebContentsImpl::CreateRenderViewForRenderManager(
4105 RenderViewHost* render_view_host, 4113 RenderViewHost* render_view_host,
4106 int opener_route_id, 4114 int opener_route_id,
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
4353 node->render_manager()->ResumeResponseDeferredAtStart(); 4361 node->render_manager()->ResumeResponseDeferredAtStart();
4354 } 4362 }
4355 4363
4356 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4364 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4357 force_disable_overscroll_content_ = force_disable; 4365 force_disable_overscroll_content_ = force_disable;
4358 if (view_) 4366 if (view_)
4359 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4367 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4360 } 4368 }
4361 4369
4362 } // namespace content 4370 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698