|
@@ -42,10 +42,10 @@ index 75a58c7f56ef990e340ef271aa2d057f3541c47d..ab2679680111cfdc260c8d8dafbfae00
|
|
|
// another SiteInstance for the same site.
|
|
|
void RegisterSiteInstance(SiteInstanceImpl* site_instance);
|
|
|
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
|
|
-index ab58967aba4143d5a39f51d7bbeed0568e2fa012..102c72335f0b3e7116c982784a3b0a26d780a618 100644
|
|
|
+index e4942faa3fbf90c2819620d3f091aea59299522d..60b2b213d6429fa7cff783370cbbeff26a97a859 100644
|
|
|
--- a/content/browser/renderer_host/navigation_request.cc
|
|
|
+++ b/content/browser/renderer_host/navigation_request.cc
|
|
|
-@@ -1396,6 +1396,21 @@ void NavigationRequest::BeginNavigation() {
|
|
|
+@@ -1397,6 +1397,21 @@ void NavigationRequest::BeginNavigation() {
|
|
|
// it immediately.
|
|
|
EnterChildTraceEvent("ResponseStarted", this);
|
|
|
|
|
@@ -67,7 +67,7 @@ index ab58967aba4143d5a39f51d7bbeed0568e2fa012..102c72335f0b3e7116c982784a3b0a26
|
|
|
// Select an appropriate RenderFrameHost.
|
|
|
render_frame_host_ =
|
|
|
frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
|
|
|
-@@ -5066,6 +5081,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
|
|
|
+@@ -5067,6 +5082,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
|
|
|
{WILL_START_REQUEST, {
|
|
|
WILL_REDIRECT_REQUEST,
|
|
|
WILL_PROCESS_RESPONSE,
|
|
@@ -75,7 +75,7 @@ index ab58967aba4143d5a39f51d7bbeed0568e2fa012..102c72335f0b3e7116c982784a3b0a26
|
|
|
READY_TO_COMMIT,
|
|
|
DID_COMMIT,
|
|
|
CANCELING,
|
|
|
-@@ -5079,10 +5095,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
|
|
|
+@@ -5080,10 +5096,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
|
|
|
WILL_FAIL_REQUEST,
|
|
|
}},
|
|
|
{WILL_PROCESS_RESPONSE, {
|
|
@@ -91,7 +91,7 @@ index ab58967aba4143d5a39f51d7bbeed0568e2fa012..102c72335f0b3e7116c982784a3b0a26
|
|
|
NOT_STARTED,
|
|
|
DID_COMMIT,
|
|
|
diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
|
|
|
-index 8ed463f9f7255bdd74471d3d06c17044c68bc953..c31a9e5a4a14e2c3f745b297ebe7355383c2b8bb 100644
|
|
|
+index cc726282fd93048177174d91e01b7c4a3ad9fdcd..2685a56b7b1582e66d90fbc07e04462b68c59a0f 100644
|
|
|
--- a/content/browser/renderer_host/navigation_request.h
|
|
|
+++ b/content/browser/renderer_host/navigation_request.h
|
|
|
@@ -129,6 +129,10 @@ class CONTENT_EXPORT NavigationRequest
|
|
@@ -255,7 +255,7 @@ index cafd45df059293bc1cf31e1d7b798e67578f3e9d..c196b783fe0a43bfee98253afe8461a0
|
|
|
const MainFunctionParams& parameters) {
|
|
|
return nullptr;
|
|
|
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
|
|
-index 9953cc472c04c2dc6ae0f70b64ea2b8d6ac86a05..5200555594d41f52bcf208b55c346323d7017b81 100644
|
|
|
+index 3b93afa004fb4d56ade2ab16147b42f26e90e3db..9156388fda045775145302f2c7fd810b0f61bd84 100644
|
|
|
--- a/content/public/browser/content_browser_client.h
|
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
|
@@ -253,8 +253,45 @@ class CONTENT_EXPORT ContentBrowserClient {
|