summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 19:55:56 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 19:55:56 +0000
commit1333be7637f72983dd46cb5cc8305a96cc347dc6 (patch)
treecbda30156cc12ab3d5bf3b0a932f618df21ca438 /chrome_frame
parenta8f9f13dfb4a5dafbf55dee3279ecfccae799c54 (diff)
downloadchromium_src-1333be7637f72983dd46cb5cc8305a96cc347dc6.zip
chromium_src-1333be7637f72983dd46cb5cc8305a96cc347dc6.tar.gz
chromium_src-1333be7637f72983dd46cb5cc8305a96cc347dc6.tar.bz2
Revert 188443 "Have Chrome Frame ignore NavigationStateChanged e..."
> Have Chrome Frame ignore NavigationStateChanged events for provisional navigations. These would not be added to the IE travel log but previously would have caused ChromeActiveDocument's navigation_info_ member to be updated. This would cause incorrect entries to be added to the travel log when the notification for the committed navigation came in. > > Note, this fails only on one flaky test which I'll disable but notry-ing this in the meantime to unblock the change that needs it. > > BUG=9682 > TEST=chrome_frame_tests.exe > NOTRY=true > > > Review URL: https://chromiumcodereview.appspot.com/12710008 TBR=robertshield@chromium.org Review URL: https://codereview.chromium.org/12820011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_active_document.cc19
1 files changed, 5 insertions, 14 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 8c076e4..7ee0026 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -830,20 +830,11 @@ void ChromeActiveDocument::UpdateNavigationState(
title.AsInput(), NULL);
}
- // There are cases in which we receive NavigationStateChanged events for
- // provisional loads. These events will contain a new URL but will not be
- // considered new navigations since their navigation_index is 0. For these
- // events, do not update the navigation_info_ state, as this will muck up the
- // travel log when the subsequent committed navigation event takes place.
- if (IsNewNavigation(new_navigation_info, flags) ||
- new_navigation_info.url == navigation_info_->url) {
- // It is important that we only update the navigation_info_ after we have
- // finalized the travel log. This is because IE will ask for information
- // such as navigation index when the travel log is finalized and we need
- // supply the old index and not the new one.
- *navigation_info_ = new_navigation_info;
- }
-
+ // It is important that we only update the navigation_info_ after we have
+ // finalized the travel log. This is because IE will ask for information
+ // such as navigation index when the travel log is finalized and we need
+ // supply the old index and not the new one.
+ *navigation_info_ = new_navigation_info;
// Update the IE zone here. Ideally we would like to do it when the active
// document is activated. However that does not work at times as the frame we
// get there is not the actual frame which handles the command.