From b765debf3f3395bf7677643e0c315cb778e77567 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Wed, 18 Dec 2013 06:43:30 +0000 Subject: Chrome side of making SharedWorkerRepositoryClient be per RenderFrame instead of RenderView. This also fixes the TODOs from r241306 in tab_specific_content_settings.cc The RenderView ID is still being sent to the browser because it's used by ResourceRequestInfo::GetAssociatedRenderView. Fixing that will be a large change by itself, so I'll do that in a followup. One minor behavior change is that the per-RenderView limit on how many shared workers can be started is now per-RenderFrame. Given that shared workers will be moved to the renderer process, I'm not too concerned about that. BUG=304341 R=nasko@chromium.org Review URL: https://codereview.chromium.org/109213006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241514 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/loader/resource_dispatcher_host_impl.cc | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'content/browser/loader/resource_dispatcher_host_impl.cc') diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 831a368..e860a25 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -282,7 +282,7 @@ void NotifyRedirectOnUI(int render_process_id, return; RenderViewHostDelegate* delegate = host->GetDelegate(); - delegate->DidGetRedirectForResourceRequest(*details.get()); + delegate->DidGetRedirectForResourceRequest(host, *details.get()); } void NotifyResponseOnUI(int render_process_id, @@ -779,22 +779,6 @@ void ResourceDispatcherHostImpl::DidFinishLoading(ResourceLoader* loader) { RemovePendingRequest(info->GetChildID(), info->GetRequestID()); } -// static -bool ResourceDispatcherHostImpl::RenderViewForRequest( - const net::URLRequest* request, - int* render_process_id, - int* render_view_id) { - const ResourceRequestInfoImpl* info = - ResourceRequestInfoImpl::ForRequest(request); - if (!info) { - *render_process_id = -1; - *render_view_id = -1; - return false; - } - - return info->GetAssociatedRenderView(render_process_id, render_view_id); -} - void ResourceDispatcherHostImpl::OnInit() { scheduler_.reset(new ResourceScheduler); appcache::AppCacheInterceptor::EnsureRegistered(); -- cgit v1.1