| Index: content/common/navigation_params.cc
|
| diff --git a/content/common/navigation_params.cc b/content/common/navigation_params.cc
|
| index 8921fa80b0c1b7816c7cc8fd4d2e40ac31342c87..62ec8a0f1e7eba1f360f1fe37859f76b390b490a 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;
|
| @@ -30,7 +28,7 @@ bool ShouldMakeNetworkRequestForURL(const GURL& url) {
|
|
|
| CommonNavigationParams::CommonNavigationParams()
|
| : transition(ui::PAGE_TRANSITION_LINK),
|
| - navigation_type(FrameMsg_Navigate_Type::NORMAL),
|
| + navigation_type(FrameMsg_Navigate_Type::UNSPECIFIED),
|
| allow_download(true),
|
| should_replace_current_entry(false),
|
| report_type(FrameMsg_UILoadMetricsReportType::NO_REPORT),
|
| @@ -133,7 +131,6 @@ RequestNavigationParams::RequestNavigationParams()
|
| : is_overriding_user_agent(false),
|
| can_load_local_resources(false),
|
| nav_entry_id(0),
|
| - is_same_document_history_load(false),
|
| is_history_navigation_in_new_child(false),
|
| has_committed_real_load(false),
|
| intended_as_new_entry(false),
|
| @@ -154,7 +151,6 @@ RequestNavigationParams::RequestNavigationParams(
|
| bool can_load_local_resources,
|
| const PageState& page_state,
|
| int nav_entry_id,
|
| - bool is_same_document_history_load,
|
| bool is_history_navigation_in_new_child,
|
| std::map<std::string, bool> subframe_unique_names,
|
| bool has_committed_real_load,
|
| @@ -170,7 +166,6 @@ RequestNavigationParams::RequestNavigationParams(
|
| can_load_local_resources(can_load_local_resources),
|
| page_state(page_state),
|
| nav_entry_id(nav_entry_id),
|
| - 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),
|
| has_committed_real_load(has_committed_real_load),
|
|
|