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

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

Issue 297973002: Navigation transitions: Block first response until after transitions have run. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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 #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 "base/memory/weak_ptr.h"
10 #include "content/browser/loader/layered_resource_handler.h" 10 #include "content/browser/loader/layered_resource_handler.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 // We can now send the response to the new renderer, which will cause 47 // We can now send the response to the new renderer, which will cause
48 // WebContentsImpl to swap in the new renderer and destroy the old one. 48 // WebContentsImpl to swap in the new renderer and destroy the old one.
49 void ResumeResponse(); 49 void ResumeResponse();
50 50
51 // When set to true, requests are leaked when they can't be passed to a 51 // When set to true, requests are leaked when they can't be passed to a
52 // RenderViewHost, for unit tests. 52 // RenderViewHost, for unit tests.
53 CONTENT_EXPORT static void SetLeakRequestsForTesting( 53 CONTENT_EXPORT static void SetLeakRequestsForTesting(
54 bool leak_requests_for_testing); 54 bool leak_requests_for_testing);
55 55
56 // Navigations are deferred at response started to parse out any navigation
nasko 2014/05/28 22:59:00 nit: OnResponseStarted
shatch 2014/05/29 21:41:22 Done.
57 // transition link headers, and give the navigation transition (if it exists)
58 // a chance to run.
59 void ResumeResponseDeferredAtStart(int request_id);
60
56 private: 61 private:
57 // Prepare to render the cross-site response in a new RenderViewHost, by 62 // Prepare to render the cross-site response in a new RenderViewHost, by
58 // telling the old RenderViewHost to run its onunload handler. 63 // telling the old RenderViewHost to run its onunload handler.
59 void StartCrossSiteTransition(int request_id, 64 void StartCrossSiteTransition(int request_id,
60 ResourceResponse* response, 65 ResourceResponse* response,
61 bool should_transfer); 66 bool should_transfer);
62 67
63 // Defer the navigation to the UI thread to check whether transfer is required 68 // Defer the navigation to the UI thread to check whether transfer is required
64 // or not. Currently only used in --site-per-process. 69 // or not. Currently only used in --site-per-process.
65 bool DeferForNavigationPolicyCheck(ResourceRequestInfoImpl* info, 70 bool DeferForNavigationPolicyCheck(ResourceRequestInfoImpl* info,
66 ResourceResponse* response, 71 ResourceResponse* response,
67 bool* defer); 72 bool* defer);
68 73
74 bool OnNavigationTransitionResponseStarted(int request_id,
nasko 2014/05/28 22:59:00 style: parameters should be on separate lines.
shatch 2014/05/29 21:41:22 Done.
75 ResourceResponse* response, bool* defer);
76
77 bool OnNormalResponseStarted(int request_id, ResourceResponse* response,
nasko 2014/05/28 22:59:00 style: parameters should be on separate lines.
shatch 2014/05/29 21:41:22 Done.
78 bool* defer);
79
69 void ResumeOrTransfer(bool is_transfer); 80 void ResumeOrTransfer(bool is_transfer);
70 void ResumeIfDeferred(); 81 void ResumeIfDeferred();
71 82
72 // Called when about to defer a request. Sets |did_defer_| and logs the 83 // Called when about to defer a request. Sets |did_defer_| and logs the
73 // defferral 84 // defferral
74 void OnDidDefer(); 85 void OnDidDefer();
75 86
76 bool has_started_response_; 87 bool has_started_response_;
77 bool in_cross_site_transition_; 88 bool in_cross_site_transition_;
78 bool completed_during_transition_; 89 bool completed_during_transition_;
79 bool did_defer_; 90 bool did_defer_;
80 net::URLRequestStatus completed_status_; 91 net::URLRequestStatus completed_status_;
81 std::string completed_security_info_; 92 std::string completed_security_info_;
82 scoped_refptr<ResourceResponse> response_; 93 scoped_refptr<ResourceResponse> response_;
83 94
84 // TODO(nasko): WeakPtr is needed in --site-per-process, since all navigations 95 // 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 96 // 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 97 // 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. 98 // thread. This can be removed once the code is changed to only do one hop.
88 base::WeakPtrFactory<CrossSiteResourceHandler> weak_ptr_factory_; 99 base::WeakPtrFactory<CrossSiteResourceHandler> weak_ptr_factory_;
89 100
90 DISALLOW_COPY_AND_ASSIGN(CrossSiteResourceHandler); 101 DISALLOW_COPY_AND_ASSIGN(CrossSiteResourceHandler);
91 }; 102 };
92 103
93 } // namespace content 104 } // namespace content
94 105
95 #endif // CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_ 106 #endif // CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698