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

Unified 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: Changes from review. Created 6 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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/cross_site_resource_handler.h
diff --git a/content/browser/loader/cross_site_resource_handler.h b/content/browser/loader/cross_site_resource_handler.h
index df6c7a39bbf4aacbd00a548c68811ade0ee10d07..9dfeec2de5546425b98e9f62c5b30c9caa4e3902 100644
--- a/content/browser/loader/cross_site_resource_handler.h
+++ b/content/browser/loader/cross_site_resource_handler.h
@@ -53,6 +53,15 @@ class CrossSiteResourceHandler : public LayeredResourceHandler {
CONTENT_EXPORT static void SetLeakRequestsForTesting(
bool leak_requests_for_testing);
+ // Navigations are deferred at OnResponseStarted to parse out any navigation
+ // transition link headers, and give the navigation transition (if it exists)
+ // a chance to run.
+ void ResumeResponseDeferredAtStart(int request_id);
+
+ // Returns whether the handler is deferred. This is designed for the
+ // browsertests.
+ bool is_deferred_for_testing() const { return did_defer_; }
jam 2014/06/11 02:00:21 nit: name should be did_defer_for_testing. also no
shatch 2014/06/14 00:41:37 That variable is used internally to check if the r
jam 2014/06/16 03:46:10 per http://google-styleguide.googlecode.com/svn/tr
shatch 2014/06/16 22:32:19 Done.
+
private:
// Prepare to render the cross-site response in a new RenderViewHost, by
// telling the old RenderViewHost to run its onunload handler.
@@ -66,6 +75,14 @@ class CrossSiteResourceHandler : public LayeredResourceHandler {
ResourceResponse* response,
bool* defer);
+ bool OnNavigationTransitionResponseStarted(int request_id,
+ ResourceResponse* response,
+ bool* defer);
+
+ bool OnNormalResponseStarted(int request_id,
+ ResourceResponse* response,
+ bool* defer);
+
void ResumeOrTransfer(bool is_transfer);
void ResumeIfDeferred();

Powered by Google App Engine
This is Rietveld 408576698