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

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

Issue 616133002: Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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
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 3898 matching lines...) Expand 10 before | Expand all | Expand 10 after
3909 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here, 3909 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here,
3910 // as it is deprecated and can be out of sync with GetRenderViewHost(). 3910 // as it is deprecated and can be out of sync with GetRenderViewHost().
3911 GURL url = controller_.GetActiveEntry() 3911 GURL url = controller_.GetActiveEntry()
3912 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); 3912 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL();
3913 3913
3914 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url); 3914 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url);
3915 } 3915 }
3916 3916
3917 int WebContentsImpl::CreateSwappedOutRenderView( 3917 int WebContentsImpl::CreateSwappedOutRenderView(
3918 SiteInstance* instance) { 3918 SiteInstance* instance) {
3919 return GetRenderManager()->CreateRenderFrame( 3919 return GetRenderManager()->CreateRenderFrame(instance,
3920 instance, MSG_ROUTING_NONE, true, true, true); 3920 MSG_ROUTING_NONE, SWAPPED_OUT | FOR_MAIN_FRAME_NAVIGATION | HIDDEN);
3921 } 3921 }
3922 3922
3923 void WebContentsImpl::OnUserGesture() { 3923 void WebContentsImpl::OnUserGesture() {
3924 // Notify observers. 3924 // Notify observers.
3925 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); 3925 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture());
3926 3926
3927 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); 3927 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
3928 if (rdh) // NULL in unittests. 3928 if (rdh) // NULL in unittests.
3929 rdh->OnUserGesture(this); 3929 rdh->OnUserGesture(this);
3930 } 3930 }
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
4081 instance) 4081 instance)
4082 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); 4082 return GetRenderManager()->pending_render_view_host()->GetRoutingID();
4083 4083
4084 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( 4084 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost(
4085 instance); 4085 instance);
4086 if (rvh) 4086 if (rvh)
4087 return rvh->GetRoutingID(); 4087 return rvh->GetRoutingID();
4088 4088
4089 // Create a swapped out RenderView in the given SiteInstance if none exists, 4089 // Create a swapped out RenderView in the given SiteInstance if none exists,
4090 // setting its opener to the given route_id. Return the new view's route_id. 4090 // setting its opener to the given route_id. Return the new view's route_id.
4091 return GetRenderManager()->CreateRenderFrame( 4091 return GetRenderManager()->CreateRenderFrame(instance,
4092 instance, opener_route_id, true, true, true); 4092 opener_route_id, SWAPPED_OUT | FOR_MAIN_FRAME_NAVIGATION | HIDDEN);
4093 } 4093 }
4094 4094
4095 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { 4095 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
4096 return GetController(); 4096 return GetController();
4097 } 4097 }
4098 4098
4099 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { 4099 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) {
4100 return static_cast<WebUIImpl*>(CreateWebUI(url)); 4100 return static_cast<WebUIImpl*>(CreateWebUI(url));
4101 } 4101 }
4102 4102
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
4363 node->render_manager()->ResumeResponseDeferredAtStart(); 4363 node->render_manager()->ResumeResponseDeferredAtStart();
4364 } 4364 }
4365 4365
4366 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4366 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4367 force_disable_overscroll_content_ = force_disable; 4367 force_disable_overscroll_content_ = force_disable;
4368 if (view_) 4368 if (view_)
4369 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4369 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4370 } 4370 }
4371 4371
4372 } // namespace content 4372 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698