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

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

Issue 248963007: Perform navigation policy check on UI thread for --site-per-process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on ToT. Created 6 years, 8 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 #ifndef CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_ 5 #ifndef CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_
6 #define CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_ 6 #define CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/weak_ptr.h"
9 #include "content/browser/loader/layered_resource_handler.h" 10 #include "content/browser/loader/layered_resource_handler.h"
10 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
11 #include "net/url_request/url_request_status.h" 12 #include "net/url_request/url_request_status.h"
12 13
13 namespace net { 14 namespace net {
14 class URLRequest; 15 class URLRequest;
15 } 16 }
16 17
17 namespace content { 18 namespace content {
18 19
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 CONTENT_EXPORT static void SetLeakRequestsForTesting( 53 CONTENT_EXPORT static void SetLeakRequestsForTesting(
53 bool leak_requests_for_testing); 54 bool leak_requests_for_testing);
54 55
55 private: 56 private:
56 // Prepare to render the cross-site response in a new RenderViewHost, by 57 // Prepare to render the cross-site response in a new RenderViewHost, by
57 // telling the old RenderViewHost to run its onunload handler. 58 // telling the old RenderViewHost to run its onunload handler.
58 void StartCrossSiteTransition(int request_id, 59 void StartCrossSiteTransition(int request_id,
59 ResourceResponse* response, 60 ResourceResponse* response,
60 bool should_transfer); 61 bool should_transfer);
61 62
63 // Defer the navigation to the UI thread to check whether transfer is required
64 // or not. Currently only used in --site-per-process.
65 bool DeferForNavigationPolicyCheck(ResourceRequestInfoImpl* info,
66 ResourceResponse* response,
67 bool* defer);
68
69 void ResumeOrTransfer(bool is_transfer);
62 void ResumeIfDeferred(); 70 void ResumeIfDeferred();
63 71
64 // Called when about to defer a request. Sets |did_defer_| and logs the 72 // Called when about to defer a request. Sets |did_defer_| and logs the
65 // defferral 73 // defferral
66 void OnDidDefer(); 74 void OnDidDefer();
67 75
68 bool has_started_response_; 76 bool has_started_response_;
69 bool in_cross_site_transition_; 77 bool in_cross_site_transition_;
70 bool completed_during_transition_; 78 bool completed_during_transition_;
71 bool did_defer_; 79 bool did_defer_;
72 net::URLRequestStatus completed_status_; 80 net::URLRequestStatus completed_status_;
73 std::string completed_security_info_; 81 std::string completed_security_info_;
74 scoped_refptr<ResourceResponse> response_; 82 scoped_refptr<ResourceResponse> response_;
75 83
84 // TODO(nasko): WeakPtr is needed in --site-per-process, since all navigations
85 // are deferred to the UI thread and come back to IO thread via
86 // PostTaskAndReplyWithResult. If a transfer is needed, it goes back to the UI
87 // thread. This can be removed once the code is changed to only do one hop.
88 base::WeakPtrFactory<CrossSiteResourceHandler> weak_ptr_factory_;
89
76 DISALLOW_COPY_AND_ASSIGN(CrossSiteResourceHandler); 90 DISALLOW_COPY_AND_ASSIGN(CrossSiteResourceHandler);
77 }; 91 };
78 92
79 } // namespace content 93 } // namespace content
80 94
81 #endif // CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_ 95 #endif // CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/loader/cross_site_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698