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

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

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 9
9 #include "base/bind.h" 10 #include "base/bind.h"
10 #include "base/command_line.h" 11 #include "base/command_line.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
12 #include "content/browser/appcache/appcache_interceptor.h" 13 #include "content/browser/appcache/appcache_interceptor.h"
13 #include "content/browser/child_process_security_policy_impl.h" 14 #include "content/browser/child_process_security_policy_impl.h"
14 #include "content/browser/frame_host/cross_site_transferring_request.h" 15 #include "content/browser/frame_host/cross_site_transferring_request.h"
15 #include "content/browser/frame_host/render_frame_host_impl.h" 16 #include "content/browser/frame_host/render_frame_host_impl.h"
16 #include "content/browser/loader/resource_dispatcher_host_impl.h" 17 #include "content/browser/loader/resource_dispatcher_host_impl.h"
17 #include "content/browser/loader/resource_request_info_impl.h" 18 #include "content/browser/loader/resource_request_info_impl.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 RenderFrameHostImpl::FromID(params.global_request_id.child_id, 70 RenderFrameHostImpl::FromID(params.global_request_id.child_id,
70 params.render_frame_id); 71 params.render_frame_id);
71 if (rfh) { 72 if (rfh) {
72 if (rfh->GetParent()) { 73 if (rfh->GetParent()) {
73 // We should only swap processes for subframes in --site-per-process mode. 74 // We should only swap processes for subframes in --site-per-process mode.
74 // CrossSiteResourceHandler is not installed on subframe requests in 75 // CrossSiteResourceHandler is not installed on subframe requests in
75 // default Chrome. 76 // default Chrome.
76 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible()); 77 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible());
77 } 78 }
78 rfh->OnCrossSiteResponse( 79 rfh->OnCrossSiteResponse(
79 params.global_request_id, cross_site_transferring_request.Pass(), 80 params.global_request_id, std::move(cross_site_transferring_request),
80 params.transfer_url_chain, params.referrer, 81 params.transfer_url_chain, params.referrer, params.page_transition,
81 params.page_transition, params.should_replace_current_entry); 82 params.should_replace_current_entry);
82 } else if (leak_requests_for_testing_ && cross_site_transferring_request) { 83 } else if (leak_requests_for_testing_ && cross_site_transferring_request) {
83 // Some unit tests expect requests to be leaked in this case, so they can 84 // Some unit tests expect requests to be leaked in this case, so they can
84 // pass them along manually. 85 // pass them along manually.
85 cross_site_transferring_request->ReleaseRequest(); 86 cross_site_transferring_request->ReleaseRequest();
86 } 87 }
87 } 88 }
88 89
89 // Returns whether a transfer is needed by doing a check on the UI thread. 90 // Returns whether a transfer is needed by doing a check on the UI thread.
90 CrossSiteResourceHandler::NavigationDecision 91 CrossSiteResourceHandler::NavigationDecision
91 CheckNavigationPolicyOnUI(GURL real_url, int process_id, int render_frame_id) { 92 CheckNavigationPolicyOnUI(GURL real_url, int process_id, int render_frame_id) {
(...skipping 12 matching lines...) Expand all
104 return CrossSiteResourceHandler::NavigationDecision::TRANSFER_REQUIRED; 105 return CrossSiteResourceHandler::NavigationDecision::TRANSFER_REQUIRED;
105 else 106 else
106 return CrossSiteResourceHandler::NavigationDecision::USE_EXISTING_RENDERER; 107 return CrossSiteResourceHandler::NavigationDecision::USE_EXISTING_RENDERER;
107 } 108 }
108 109
109 } // namespace 110 } // namespace
110 111
111 CrossSiteResourceHandler::CrossSiteResourceHandler( 112 CrossSiteResourceHandler::CrossSiteResourceHandler(
112 scoped_ptr<ResourceHandler> next_handler, 113 scoped_ptr<ResourceHandler> next_handler,
113 net::URLRequest* request) 114 net::URLRequest* request)
114 : LayeredResourceHandler(request, next_handler.Pass()), 115 : LayeredResourceHandler(request, std::move(next_handler)),
115 has_started_response_(false), 116 has_started_response_(false),
116 in_cross_site_transition_(false), 117 in_cross_site_transition_(false),
117 completed_during_transition_(false), 118 completed_during_transition_(false),
118 did_defer_(false), 119 did_defer_(false),
119 weak_ptr_factory_(this) { 120 weak_ptr_factory_(this) {}
120 }
121 121
122 CrossSiteResourceHandler::~CrossSiteResourceHandler() { 122 CrossSiteResourceHandler::~CrossSiteResourceHandler() {
123 // Cleanup back-pointer stored on the request info. 123 // Cleanup back-pointer stored on the request info.
124 GetRequestInfo()->set_cross_site_handler(NULL); 124 GetRequestInfo()->set_cross_site_handler(NULL);
125 } 125 }
126 126
127 bool CrossSiteResourceHandler::OnRequestRedirected( 127 bool CrossSiteResourceHandler::OnRequestRedirected(
128 const net::RedirectInfo& redirect_info, 128 const net::RedirectInfo& redirect_info,
129 ResourceResponse* response, 129 ResourceResponse* response,
130 bool* defer) { 130 bool* defer) {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 controller()->Resume(); 381 controller()->Resume();
382 } 382 }
383 } 383 }
384 384
385 void CrossSiteResourceHandler::OnDidDefer() { 385 void CrossSiteResourceHandler::OnDidDefer() {
386 did_defer_ = true; 386 did_defer_ = true;
387 request()->LogBlockedBy("CrossSiteResourceHandler"); 387 request()->LogBlockedBy("CrossSiteResourceHandler");
388 } 388 }
389 389
390 } // namespace content 390 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/async_resource_handler_browsertest.cc ('k') | content/browser/loader/detachable_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698