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

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: Rebase 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 3907 matching lines...) Expand 10 before | Expand all | Expand 10 after
3918 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here, 3918 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here,
3919 // as it is deprecated and can be out of sync with GetRenderViewHost(). 3919 // as it is deprecated and can be out of sync with GetRenderViewHost().
3920 GURL url = controller_.GetActiveEntry() 3920 GURL url = controller_.GetActiveEntry()
3921 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); 3921 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL();
3922 3922
3923 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url); 3923 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url);
3924 } 3924 }
3925 3925
3926 int WebContentsImpl::CreateSwappedOutRenderView( 3926 int WebContentsImpl::CreateSwappedOutRenderView(
3927 SiteInstance* instance) { 3927 SiteInstance* instance) {
3928 return GetRenderManager()->CreateRenderFrame( 3928 return GetRenderManager()->CreateRenderFrame(instance,
3929 instance, MSG_ROUTING_NONE, true, true, true); 3929 MSG_ROUTING_NONE, SWAPPED_OUT | FOR_MAIN_FRAME_NAVIGATION | HIDDEN);
3930 } 3930 }
3931 3931
3932 void WebContentsImpl::OnUserGesture() { 3932 void WebContentsImpl::OnUserGesture() {
3933 // Notify observers. 3933 // Notify observers.
3934 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); 3934 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture());
3935 3935
3936 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); 3936 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
3937 if (rdh) // NULL in unittests. 3937 if (rdh) // NULL in unittests.
3938 rdh->OnUserGesture(this); 3938 rdh->OnUserGesture(this);
3939 } 3939 }
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
4091 instance) 4091 instance)
4092 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); 4092 return GetRenderManager()->pending_render_view_host()->GetRoutingID();
4093 4093
4094 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( 4094 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost(
4095 instance); 4095 instance);
4096 if (rvh) 4096 if (rvh)
4097 return rvh->GetRoutingID(); 4097 return rvh->GetRoutingID();
4098 4098
4099 // Create a swapped out RenderView in the given SiteInstance if none exists, 4099 // Create a swapped out RenderView in the given SiteInstance if none exists,
4100 // setting its opener to the given route_id. Return the new view's route_id. 4100 // setting its opener to the given route_id. Return the new view's route_id.
4101 return GetRenderManager()->CreateRenderFrame( 4101 return GetRenderManager()->CreateRenderFrame(instance,
4102 instance, opener_route_id, true, true, true); 4102 opener_route_id, SWAPPED_OUT | FOR_MAIN_FRAME_NAVIGATION | HIDDEN);
4103 } 4103 }
4104 4104
4105 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { 4105 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
4106 return GetController(); 4106 return GetController();
4107 } 4107 }
4108 4108
4109 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { 4109 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) {
4110 return static_cast<WebUIImpl*>(CreateWebUI(url)); 4110 return static_cast<WebUIImpl*>(CreateWebUI(url));
4111 } 4111 }
4112 4112
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
4373 node->render_manager()->ResumeResponseDeferredAtStart(); 4373 node->render_manager()->ResumeResponseDeferredAtStart();
4374 } 4374 }
4375 4375
4376 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4376 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4377 force_disable_overscroll_content_ = force_disable; 4377 force_disable_overscroll_content_ = force_disable;
4378 if (view_) 4378 if (view_)
4379 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4379 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4380 } 4380 }
4381 4381
4382 } // namespace content 4382 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698