Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/navigation_controller_impl.h" | 5 #include "content/browser/frame_host/navigation_controller_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1208 // have to query the entry index again. | 1208 // have to query the entry index again. |
| 1209 last_committed_entry_index_ = | 1209 last_committed_entry_index_ = |
| 1210 GetEntryIndexWithPageID(rfh->GetSiteInstance(), params.page_id); | 1210 GetEntryIndexWithPageID(rfh->GetSiteInstance(), params.page_id); |
| 1211 } | 1211 } |
| 1212 | 1212 |
| 1213 void NavigationControllerImpl::RendererDidNavigateNewSubframe( | 1213 void NavigationControllerImpl::RendererDidNavigateNewSubframe( |
| 1214 RenderFrameHost* rfh, | 1214 RenderFrameHost* rfh, |
| 1215 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { | 1215 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { |
| 1216 if (ui::PageTransitionCoreTypeIs(params.transition, | 1216 if (ui::PageTransitionCoreTypeIs(params.transition, |
| 1217 ui::PAGE_TRANSITION_AUTO_SUBFRAME)) { | 1217 ui::PAGE_TRANSITION_AUTO_SUBFRAME)) { |
| 1218 // This is not user-initiated. Ignore. | 1218 // The old comment here was "This is not user-initiated. Ignore." This is a |
| 1219 // weird scenario, where we've determined that this was a new subframe | |
| 1220 // navigation but say "never mind" based on a flag from the renderer. | |
|
Charlie Reis
2015/01/15 22:12:09
Maybe I misunderstood this case before, but I thou
Avi (use Gerrit)
2015/01/15 22:16:52
Will investigate.
Avi (use Gerrit)
2015/01/16 21:06:26
Isn't that what RendererDidNavigateAutoSubframe is
| |
| 1221 // | |
| 1222 // This dates back to http://crrev.com/115919 and the handling of immediate | |
|
Charlie Reis
2015/01/15 22:12:09
This revision is a DEPS roll. Did you mean http:/
Avi (use Gerrit)
2015/01/15 22:16:52
Yes. I used the auto-shortener and am bummed that
| |
| 1223 // redirects. TODO(avi): Is this still valid? | |
| 1219 DiscardNonCommittedEntriesInternal(); | 1224 DiscardNonCommittedEntriesInternal(); |
| 1220 return; | 1225 return; |
| 1221 } | 1226 } |
| 1222 | 1227 |
| 1223 // Manual subframe navigations just get the current entry cloned so the user | 1228 // Manual subframe navigations just get the current entry cloned so the user |
| 1224 // can go back or forward to it. The actual subframe information will be | 1229 // can go back or forward to it. The actual subframe information will be |
| 1225 // stored in the page state for each of those entries. This happens out of | 1230 // stored in the page state for each of those entries. This happens out of |
| 1226 // band with the actual navigations. | 1231 // band with the actual navigations. |
| 1227 DCHECK(GetLastCommittedEntry()) << "ClassifyNavigation should guarantee " | 1232 DCHECK(GetLastCommittedEntry()) << "ClassifyNavigation should guarantee " |
| 1228 << "that a last committed entry exists."; | 1233 << "that a last committed entry exists."; |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1777 } | 1782 } |
| 1778 } | 1783 } |
| 1779 } | 1784 } |
| 1780 | 1785 |
| 1781 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 1786 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
| 1782 const base::Callback<base::Time()>& get_timestamp_callback) { | 1787 const base::Callback<base::Time()>& get_timestamp_callback) { |
| 1783 get_timestamp_callback_ = get_timestamp_callback; | 1788 get_timestamp_callback_ = get_timestamp_callback; |
| 1784 } | 1789 } |
| 1785 | 1790 |
| 1786 } // namespace content | 1791 } // namespace content |
| OLD | NEW |