| Index: content/common/navigation_params.cc
|
| diff --git a/content/common/navigation_params.cc b/content/common/navigation_params.cc
|
| index 95a9206b58208d10158d1ddf98e2a7b24a34c375..41c69fb96fad2d1fd5307e3ed44b45849903c7fc 100644
|
| --- a/content/common/navigation_params.cc
|
| +++ b/content/common/navigation_params.cc
|
| @@ -21,8 +21,6 @@ bool ShouldMakeNetworkRequestForURL(const GURL& url) {
|
|
|
| // Javascript URLs, about:blank, srcdoc should not send a request
|
| // to the network stack.
|
| - // TODO(clamy): same document navigations should not send requests to the
|
| - // network stack. Neither should pushState/popState.
|
| return url != url::kAboutBlankURL && !url.SchemeIs(url::kJavaScriptScheme) &&
|
| !url.is_empty() && !url.SchemeIs(url::kContentIDScheme) &&
|
| url != content::kAboutSrcDocURL;
|
| @@ -125,6 +123,7 @@ RequestNavigationParams::RequestNavigationParams()
|
| : is_overriding_user_agent(false),
|
| can_load_local_resources(false),
|
| nav_entry_id(0),
|
| + is_same_document_navigation(false),
|
| is_same_document_history_load(false),
|
| is_history_navigation_in_new_child(false),
|
| has_committed_real_load(false),
|
| @@ -146,6 +145,7 @@ RequestNavigationParams::RequestNavigationParams(
|
| bool can_load_local_resources,
|
| const PageState& page_state,
|
| int nav_entry_id,
|
| + bool is_same_document_navigation,
|
| bool is_same_document_history_load,
|
| bool is_history_navigation_in_new_child,
|
| std::map<std::string, bool> subframe_unique_names,
|
| @@ -162,6 +162,7 @@ RequestNavigationParams::RequestNavigationParams(
|
| can_load_local_resources(can_load_local_resources),
|
| page_state(page_state),
|
| nav_entry_id(nav_entry_id),
|
| + is_same_document_navigation(is_same_document_navigation),
|
| is_same_document_history_load(is_same_document_history_load),
|
| is_history_navigation_in_new_child(is_history_navigation_in_new_child),
|
| subframe_unique_names(subframe_unique_names),
|
|
|