content/browser/loader/cross_site_resource_handler.cc - Issue 15682009: Eliminate SwapOut message parameters, keeping state in RVHM instead.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/loader/cross_site_resource_handler.cc

Issue 15682009: Eliminate SwapOut message parameters, keeping state in RVHM instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to get Android build fix Created 7 years, 6 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:

Index: content/browser/loader/cross_site_resource_handler.cc

diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc

index a6d1273d722dbbfeb836fd30be28c58dbaf156a7..6b735f6d4fd08bf7cd78b81682a69235d2239d35 100644

--- a/content/browser/loader/cross_site_resource_handler.cc

+++ b/content/browser/loader/cross_site_resource_handler.cc

@@ -12,6 +12,7 @@

#include "content/browser/renderer_host/render_view_host_delegate.h"

#include "content/browser/renderer_host/render_view_host_impl.h"

#include "content/public/browser/browser_thread.h"

+#include "content/public/browser/global_request_id.h"

#include "content/public/browser/resource_controller.h"

#include "content/public/common/resource_response.h"

#include "net/http/http_response_headers.h"

@@ -27,7 +28,7 @@ void OnCrossSiteResponseHelper(int render_process_id,

render_view_id);

if (rvh && rvh->GetDelegate()->GetRendererManagementDelegate()) {

rvh->GetDelegate()->GetRendererManagementDelegate()->OnCrossSiteResponse(

- render_process_id, request_id);

+ rvh, GlobalRequestID(render_process_id, request_id));

}