Fix a ChromeFrame Back Forward navigation issue which occurs when we modify t...

chrome_frame/chrome_active_document.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Implementation of ChromeActiveDocument
 #include "chrome_frame/chrome_active_document.h"
 
 #include <hlink.h>
 #include <htiface.h>
 #include <initguid.h>
@@ skipping 15 matching lines @@
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
 #include "base/win/win_util.h"
 #include "grit/generated_resources.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/bind_context_info.h"
 #include "chrome_frame/buggy_bho_handling.h"
 #include "chrome_frame/crash_reporting/crash_metrics.h"
 #include "chrome_frame/utils.h"
@@ skipping 574 matching lines @@
     int flags, const NavigationInfo& nav_info) {
   // TODO(joshia): handle INVALIDATE_TAB,INVALIDATE_LOAD etc.
   DVLOG(1) << __FUNCTION__
            << "\n Flags: " << flags
            << ", Url: " << nav_info.url
            << ", Title: " << nav_info.title
            << ", Type: " << nav_info.navigation_type
            << ", Relative Offset: " << nav_info.relative_offset
            << ", Index: " << nav_info.navigation_index;
 
-  UpdateNavigationState(nav_info);
+  UpdateNavigationState(nav_info, flags);
 }
 
 void ChromeActiveDocument::OnUpdateTargetUrl(
     const std::wstring& new_target_url) {
   if (in_place_frame_)
     in_place_frame_->SetStatusText(new_target_url.c_str());
 }
 
 bool IsFindAccelerator(const MSG& msg) {
   // TODO(robertshield): This may not stand up to localization. Fix if this
@@ skipping 44 matching lines @@
 
   CrashMetricsReporter::GetInstance()->IncrementMetric(
       CrashMetricsReporter::CHROME_FRAME_NAVIGATION_COUNT);
 
   // This could be NULL if the active document instance is being destroyed.
   if (!m_spInPlaceSite) {
     DVLOG(1) << __FUNCTION__ << "m_spInPlaceSite is NULL. Returning";
     return;
   }
 
-  UpdateNavigationState(nav_info);
+  UpdateNavigationState(nav_info, 0);
 }
 
 void ChromeActiveDocument::OnCloseTab() {
   // Base class will fire DIChromeFrameEvents::onclose.
   BaseActiveX::OnCloseTab();
 
   // Close the container window.
   ScopedComPtr<IWebBrowser2> web_browser2;
   DoQueryService(SID_SWebBrowserApp, m_spClientSite, web_browser2.Receive());
   if (web_browser2)
     web_browser2->Quit();
 }
 
 void ChromeActiveDocument::UpdateNavigationState(
-    const NavigationInfo& new_navigation_info) {
+    const NavigationInfo& new_navigation_info, int flags) {
   HRESULT hr = S_OK;
   bool is_title_changed = (navigation_info_.title != new_navigation_info.title);
   bool is_ssl_state_changed =
       (navigation_info_.security_style != new_navigation_info.security_style) ||
       (navigation_info_.displayed_insecure_content !=
           new_navigation_info.displayed_insecure_content) ||
       (navigation_info_.ran_insecure_content !=
           new_navigation_info.ran_insecure_content);
 
   if (is_ssl_state_changed) {
@@ skipping 26 matching lines @@
   // We get notified after the fact, when navigations are initiated within
   // Chrome via window.open calls. These navigations are handled by creating
   // an external tab container within chrome and then connecting to it from IE.
   // We still want to update the address bar/history, etc, to ensure that
   // the special URL used by Chrome to indicate this is updated correctly.
   ChromeFrameUrl cf_url;
   bool is_attach_external_tab_url = cf_url.Parse(std::wstring(url_)) &&
       cf_url.attach_to_external_tab();
 
   bool is_internal_navigation =
-      IsNewNavigation(new_navigation_info) || is_attach_external_tab_url;
+      IsNewNavigation(new_navigation_info, flags) || is_attach_external_tab_url;
 
   if (new_navigation_info.url.is_valid())
     url_.Allocate(UTF8ToWide(new_navigation_info.url.spec()).c_str());
 
   if (is_internal_navigation) {
     ScopedComPtr<IDocObjectService> doc_object_svc;
     ScopedComPtr<IWebBrowserEventsService> web_browser_events_svc;
 
     buggy_bho::BuggyBhoTls bad_bho_tls;
     if (GetConfigBool(true, kEnableBuggyBhoIntercept)) {
@@ skipping 589 matching lines @@
     web_browser2->put_Height(dimensions_.height());
     web_browser2->put_Left(dimensions_.x());
     web_browser2->put_Top(dimensions_.y());
 
     dimensions_.set_height(0);
     dimensions_.set_width(0);
   }
 }
 
 bool ChromeActiveDocument::IsNewNavigation(
-    const NavigationInfo& new_navigation_info) const {
+    const NavigationInfo& new_navigation_info, int flags) const {
   // A new navigation is typically an internal navigation which is initiated by
   // the renderer(WebKit). Condition 1 below has to be true along with the
   // any of the other conditions below.
-  // 1. The navigation index is greater than 0 which means that a top level
+  // 1. The navigation notification flags passed in as the flags parameter
+  //    is not INVALIDATE_LOAD which indicates that the loading state of the
+  //    tab changed.
+  // 2. The navigation index is greater than 0 which means that a top level
   //    navigation was initiated on the current external tab.
-  // 2. The navigation type has changed.
-  // 3. The url or the referrer are different.
+  // 3. The navigation type has changed.
+  // 4. The url or the referrer are different.
+  if (flags == TabContents::INVALIDATE_LOAD)
+    return false;
+
   if (new_navigation_info.navigation_index <= 0)
     return false;
 
   if (new_navigation_info.navigation_index ==
       navigation_info_.navigation_index)
     return false;
 
   if (new_navigation_info.navigation_type != navigation_info_.navigation_type)
     return true;
 
   if (new_navigation_info.url != navigation_info_.url)
     return true;
 
   if (new_navigation_info.referrer != navigation_info_.referrer)
     return true;
 
   return false;
 }