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

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

Issue 1569673002: [NOT FOR LANDING] Detailed loading traces Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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/loader/cross_site_resource_handler.h" 5 #include "content/browser/loader/cross_site_resource_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/trace_event/trace_event.h"
10 #include "base/bind.h" 11 #include "base/bind.h"
11 #include "base/command_line.h" 12 #include "base/command_line.h"
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "content/browser/appcache/appcache_interceptor.h" 14 #include "content/browser/appcache/appcache_interceptor.h"
14 #include "content/browser/child_process_security_policy_impl.h" 15 #include "content/browser/child_process_security_policy_impl.h"
15 #include "content/browser/frame_host/cross_site_transferring_request.h" 16 #include "content/browser/frame_host/cross_site_transferring_request.h"
16 #include "content/browser/frame_host/render_frame_host_impl.h" 17 #include "content/browser/frame_host/render_frame_host_impl.h"
17 #include "content/browser/loader/resource_dispatcher_host_impl.h" 18 #include "content/browser/loader/resource_dispatcher_host_impl.h"
18 #include "content/browser/loader/resource_request_info_impl.h" 19 #include "content/browser/loader/resource_request_info_impl.h"
19 #include "content/browser/site_instance_impl.h" 20 #include "content/browser/site_instance_impl.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 scoped_ptr<ResourceHandler> next_handler, 114 scoped_ptr<ResourceHandler> next_handler,
114 net::URLRequest* request) 115 net::URLRequest* request)
115 : LayeredResourceHandler(request, std::move(next_handler)), 116 : LayeredResourceHandler(request, std::move(next_handler)),
116 has_started_response_(false), 117 has_started_response_(false),
117 in_cross_site_transition_(false), 118 in_cross_site_transition_(false),
118 completed_during_transition_(false), 119 completed_during_transition_(false),
119 did_defer_(false), 120 did_defer_(false),
120 weak_ptr_factory_(this) {} 121 weak_ptr_factory_(this) {}
121 122
122 CrossSiteResourceHandler::~CrossSiteResourceHandler() { 123 CrossSiteResourceHandler::~CrossSiteResourceHandler() {
124 TRACE_EVENT0("toplevel",
125 "CrossSiteResourceHandler::~CrossSiteResourceHandler");
126
123 // Cleanup back-pointer stored on the request info. 127 // Cleanup back-pointer stored on the request info.
124 GetRequestInfo()->set_cross_site_handler(NULL); 128 GetRequestInfo()->set_cross_site_handler(NULL);
125 } 129 }
126 130
127 bool CrossSiteResourceHandler::OnRequestRedirected( 131 bool CrossSiteResourceHandler::OnRequestRedirected(
128 const net::RedirectInfo& redirect_info, 132 const net::RedirectInfo& redirect_info,
129 ResourceResponse* response, 133 ResourceResponse* response,
130 bool* defer) { 134 bool* defer) {
131 // We should not have started the transition before being redirected. 135 // We should not have started the transition before being redirected.
132 DCHECK(!in_cross_site_transition_); 136 DCHECK(!in_cross_site_transition_);
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 controller()->Resume(); 385 controller()->Resume();
382 } 386 }
383 } 387 }
384 388
385 void CrossSiteResourceHandler::OnDidDefer() { 389 void CrossSiteResourceHandler::OnDidDefer() {
386 did_defer_ = true; 390 did_defer_ = true;
387 request()->LogBlockedBy("CrossSiteResourceHandler"); 391 request()->LogBlockedBy("CrossSiteResourceHandler");
388 } 392 }
389 393
390 } // namespace content 394 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/download/save_file_resource_handler.cc ('k') | content/browser/loader/detachable_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698