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

Unified Diff: content/renderer/render_view_impl.cc

Issue 8669014: Fix a bug where redirect chain gets lost on process swap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: conditional disabling Created 9 years 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
« no previous file with comments | « content/public/renderer/navigation_state.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 62e25897b0aeda0f19267ac4f0eca344b86348cf..12c7eade6d48289d57edba2b6781ef835e0beb35 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2052,13 +2052,8 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
// issue a special POST navigation in WebKit (via
// FrameLoader::loadFrameRequest). See ResourceDispatcher and WebURLLoaderImpl
// for examples of how to send the httpBody data.
- // Note2: We normally don't do this for browser-initiated navigations, since
- // it's pointless to tell the browser about navigations it gave us. But
- // we do potentially ask the browser to handle a redirect that was originally
- // initiated by the browser. See http://crbug.com/70943
- //
- // TODO(creis): Move this redirect check to the browser process to avoid
- // ping-ponging. See http://crbug.com/72380.
+ // TODO(mpcomplete): remove is_redirect clause when http://crbug.com/79520 is
+ // fixed.
if (!frame->parent() && (is_content_initiated || is_redirect) &&
default_policy == WebKit::WebNavigationPolicyCurrentTab &&
request.httpMethod() == "GET" && !url.SchemeIs(chrome::kAboutScheme)) {
@@ -2332,6 +2327,10 @@ void RenderViewImpl::PopulateStateFromPendingNavigationParams(
params.page_id,
params.pending_history_list_offset,
params.transition);
+ navigation_state->set_transferred_request_child_id(
+ params.transferred_request_child_id);
+ navigation_state->set_transferred_request_request_id(
+ params.transferred_request_request_id);
if (params.navigation_type == ViewMsg_Navigate_Type::RESTORE) {
// We're doing a load of a page that was restored from the last session.
// By default this prefers the cache over loading (LOAD_PREFERRING_CACHE)
@@ -2732,7 +2731,9 @@ void RenderViewImpl::willSendRequest(WebFrame* frame,
frame->identifier(),
frame->parent() == top_frame,
frame->parent() ? frame->parent()->identifier() : -1,
- transition_type));
+ transition_type,
+ navigation_state->transferred_request_child_id(),
+ navigation_state->transferred_request_request_id()));
DocumentState* top_document_state =
DocumentState::FromDataSource(top_data_source);
« no previous file with comments | « content/public/renderer/navigation_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698