summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host/navigation_request.cc
diff options
context:
space:
mode:
authorpdr <pdr@chromium.org>2015-05-04 22:21:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-05 05:22:14 +0000
commit1f5d6196b8d53e70e7a7a2276cdf3481365e7e04 (patch)
tree136a1a6cc62a704d544518b7a4b5759c55b19f4d /content/browser/frame_host/navigation_request.cc
parent47870b56de9d736e98f733883bd537aac735969b (diff)
downloadchromium_src-1f5d6196b8d53e70e7a7a2276cdf3481365e7e04.zip
chromium_src-1f5d6196b8d53e70e7a7a2276cdf3481365e7e04.tar.gz
chromium_src-1f5d6196b8d53e70e7a7a2276cdf3481365e7e04.tar.bz2
Revert of Classify navigations without page id in parallel to the existing classifier. (patchset #37 id:720001 of https://codereview.chromium.org/1002803002/)
Reason for revert: This patch broke missing-repaint-after-slow-style-sheet.pl, see crbug.com/484531 for more information. Original issue's description: > Classify navigations without page id in parallel to the existing classifier. > > For now, this only happens in debug builds. > > BUG=369661 > TEST=NavigationControllerBrowserTest.NavigationTypeClassification_* > TEST=Every other test on the planet. > > Committed: https://crrev.com/d8d93348bbd8c646c337bdaa40fc0c64204fc5ff > Cr-Commit-Position: refs/heads/master@{#327122} > > Reverted: https://crrev.com/5348e920f4119aff9a4eb76c0965725dc85a66cc > Cr-Revert-Position: refs/heads/master@{#327152} > > Committed: https://crrev.com/5671403d44971669e4d81aecf3f002188ce0e95f > Cr-Commit-Position: refs/heads/master@{#327214} > > Reverted: https://crrev.com/49180eb13549e440bbd4f66390e32e84699dcdfd > Cr-Revert-Position: refs/heads/master@{#327269} > > Committed: https://crrev.com/a038c6670f450313a8e224ccc5d05dd59e3488c4 > Cr-Commit-Position: refs/heads/master@{#328131} TBR=phajdan.jr@chromium.org,clamy@chromium.org,creis@chromium.org,hajimehoshi@chromium.org,isherman@chromium.org,jeremyim@chromium.org,mattm@chromium.org,mnaganov@chromium.org,mvanouwerkerk@chromium.org,nasko@chromium.org,stevenjb@chromium.org,bengr@chromium.org,cpu@chromium.org,nkostylev@chromium.org,avi@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=369661,484531 Review URL: https://codereview.chromium.org/1121083004 Cr-Commit-Position: refs/heads/master@{#328282}
Diffstat (limited to 'content/browser/frame_host/navigation_request.cc')
-rw-r--r--content/browser/frame_host/navigation_request.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index cd443de..f46eecb 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -90,9 +90,7 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
BeginNavigationParams(method, headers.ToString(),
LoadFlagFromNavigationType(navigation_type), false),
entry.ConstructRequestNavigationParams(
- navigation_start,
- controller->GetPendingEntryIndex() == -1,
- controller->GetIndexOfEntry(&entry),
+ navigation_start, controller->GetIndexOfEntry(&entry),
controller->GetLastCommittedEntryIndex(),
controller->GetEntryCount()),
request_body, true, &entry));