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

Side by Side Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 132143003: [abort] Let webkit know we're past the phase where throttles run. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/browser/loader/resource_dispatcher_host_impl.h" 7 #include "content/browser/loader/resource_dispatcher_host_impl.h"
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 info->GetRouteID()); 672 info->GetRouteID());
673 } 673 }
674 674
675 void ResourceDispatcherHostImpl::DidStartRequest(ResourceLoader* loader) { 675 void ResourceDispatcherHostImpl::DidStartRequest(ResourceLoader* loader) {
676 // Make sure we have the load state monitor running 676 // Make sure we have the load state monitor running
677 if (!update_load_states_timer_->IsRunning()) { 677 if (!update_load_states_timer_->IsRunning()) {
678 update_load_states_timer_->Start(FROM_HERE, 678 update_load_states_timer_->Start(FROM_HERE,
679 TimeDelta::FromMilliseconds(kUpdateLoadStatesIntervalMsec), 679 TimeDelta::FromMilliseconds(kUpdateLoadStatesIntervalMsec),
680 this, &ResourceDispatcherHostImpl::UpdateLoadStates); 680 this, &ResourceDispatcherHostImpl::UpdateLoadStates);
681 } 681 }
682
683 ResourceRequestInfoImpl* info = loader->GetRequestInfo();
684 if (info->GetResourceType() == ResourceType::MAIN_FRAME && info->filter())
685 info->filter()->Send(new ResourceMsg_RequestDidStartForFrame(info->GetReques tID()));
682 } 686 }
683 687
684 void ResourceDispatcherHostImpl::DidReceiveRedirect(ResourceLoader* loader, 688 void ResourceDispatcherHostImpl::DidReceiveRedirect(ResourceLoader* loader,
685 const GURL& new_url) { 689 const GURL& new_url) {
686 ResourceRequestInfoImpl* info = loader->GetRequestInfo(); 690 ResourceRequestInfoImpl* info = loader->GetRequestInfo();
687 691
688 int render_process_id, render_frame_host; 692 int render_process_id, render_frame_host;
689 if (!info->GetAssociatedRenderFrame(&render_process_id, &render_frame_host)) 693 if (!info->GetAssociatedRenderFrame(&render_process_id, &render_frame_host))
690 return; 694 return;
691 695
(...skipping 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1961 if ((load_flags & net::LOAD_REPORT_RAW_HEADERS) 1965 if ((load_flags & net::LOAD_REPORT_RAW_HEADERS)
1962 && !policy->CanReadRawCookies(child_id)) { 1966 && !policy->CanReadRawCookies(child_id)) {
1963 VLOG(1) << "Denied unauthorized request for raw headers"; 1967 VLOG(1) << "Denied unauthorized request for raw headers";
1964 load_flags &= ~net::LOAD_REPORT_RAW_HEADERS; 1968 load_flags &= ~net::LOAD_REPORT_RAW_HEADERS;
1965 } 1969 }
1966 1970
1967 return load_flags; 1971 return load_flags;
1968 } 1972 }
1969 1973
1970 } // namespace content 1974 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698