diff options
| -rw-r--r-- | chrome/browser/tab_contents/navigation_controller.cc | 6 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc index 819bf6e..b54c394 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -639,12 +639,6 @@ NavigationType::Type NavigationController::ClassifyNavigation( tab_contents_->GetSiteInstance(), params.page_id); if (existing_entry_index == -1) { - // TODO(twiz) Top-level, out-of-browser navigations from ActiveX instances - // of Chrome Frame can trigger this behaviour: The page_id is less than - // GetMaxPageID, yet no entry index is registered. See BUG 55138. - if (PageTransition::IsMainFrame(params.transition)) - return NavigationType::NEW_PAGE; - // The page was not found. It could have been pruned because of the limit on // back/forward entries (not likely since we'll usually tell it to navigate // to such entries). It could also mean that the renderer is smoking crack. diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 037a275..9666b67 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2587,7 +2587,6 @@ WebNavigationPolicy RenderView::decidePolicyForNavigation( // Reset these counters as the RenderView could be reused for the next // navigation. page_id_ = -1; - next_page_id_ = 1; last_page_id_sent_to_browser_ = -1; OpenURL(url, referrer, default_policy); return WebKit::WebNavigationPolicyIgnore; // Suppress the load here. |