Fix a back forward bug in ChromeFrame reported on the field. The bug occurs when multiple

chrome_frame/chrome_active_document.cc

 // Copyright (c) 2011 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>
 #include <mshtmcid.h>
 #include <shdeprecated.h>
 #include <shlguid.h>
 #include <shlobj.h>
 #include <shobjidl.h>
 #include <tlogstg.h>
 #include <urlmon.h>
 #include <wininet.h>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_local.h"

[grt (UTC plus 2), 2011/08/17 09:51:41]

I think this header is no longer needed.

[ananta, 2011/08/17 18:13:14]

Done. Removed a bunch of other unneeded headers as well.

 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
 #include "base/win/win_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.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"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/navigation_types.h"
 #include "content/common/page_zoom.h"
 #include "grit/generated_resources.h"
 
 DEFINE_GUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0, 0xC0, 0, 0, 0, 0, 0, 0,
             0x46);
 
-base::ThreadLocalPointer<ChromeActiveDocument> g_active_doc_cache;
-
 bool g_first_launch_by_process_ = true;
 
 const DWORD kIEEncodingIdArray[] = {
 #define DEFINE_ENCODING_ID_ARRAY(encoding_name, id, chrome_name) encoding_name,
   INTERNAL_IE_ENCODINGMENU_IDS(DEFINE_ENCODING_ID_ARRAY)
 #undef DEFINE_ENCODING_ID_ARRAY
   0  // The Last data must be 0 to indicate the end of the encoding id array.
 };
 
 ChromeActiveDocument::ChromeActiveDocument()
     : navigation_info_(new NavigationInfo()),
       first_navigation_(true),
       is_automation_client_reused_(false),
       popup_allowed_(false),
       accelerator_table_(NULL) {
   TRACE_EVENT_BEGIN_ETW("chromeframe.createactivedocument", this, "");
 
   url_fetcher_->set_frame_busting(false);
   memset(navigation_info_.get(), 0, sizeof(NavigationInfo));
 }
 
 HRESULT ChromeActiveDocument::FinalConstruct() {
-  // If we have a cached ChromeActiveDocument instance in TLS, then grab
-  // ownership of the cached document's automation client. This is an
-  // optimization to get Chrome active documents to load faster.
-  ChromeActiveDocument* cached_document = g_active_doc_cache.Get();
-  if (cached_document && cached_document->IsValid()) {
-    SetResourceModule();
-    DCHECK(automation_client_.get() == NULL);
-    automation_client_.swap(cached_document->automation_client_);
-    DVLOG(1) << "Reusing automation client instance from " << cached_document;
-    DCHECK(automation_client_.get() != NULL);
-    automation_client_->Reinitialize(this, url_fetcher_.get());
-    is_automation_client_reused_ = true;
-    OnAutomationServerReady();
-  } else {
-    // The FinalConstruct implementation in the ChromeFrameActivexBase class
-    // i.e. Base creates an instance of the ChromeFrameAutomationClient class
-    // and initializes it, which would spawn a new Chrome process, etc.
-    // We don't want to be doing this if we have a cached document, whose
-    // automation client instance can be reused.
-    HRESULT hr = BaseActiveX::FinalConstruct();
-    if (FAILED(hr))
-      return hr;
-  }
+  // The FinalConstruct implementation in the ChromeFrameActivexBase class
+  // i.e. Base creates an instance of the ChromeFrameAutomationClient class
+  // and initializes it, which would spawn a new Chrome process, etc.
+  // We don't want to be doing this if we have a cached document, whose
+  // automation client instance can be reused.
+  HRESULT hr = BaseActiveX::FinalConstruct();
+  if (FAILED(hr))
+    return hr;
 
   InitializeAutomationSettings();
 
   find_dialog_.Init(automation_client_.get());
 
   OLECMDF flags = static_cast<OLECMDF>(OLECMDF_ENABLED | OLECMDF_SUPPORTED);
 
   null_group_commands_map_[OLECMDID_PRINT] = flags;
   null_group_commands_map_[OLECMDID_FIND] = flags;
   null_group_commands_map_[OLECMDID_CUT] = flags;
@@ skipping 427 matching lines @@
     (*in_place_frame)->AddRef();
     return S_OK;
   } else {
     return S_FALSE;
   }
 }
 
 HRESULT ChromeActiveDocument::IOleObject_SetClientSite(
     IOleClientSite* client_site) {
   if (client_site == NULL) {
-    ChromeActiveDocument* cached_document = g_active_doc_cache.Get();
-    if (cached_document) {
-      DCHECK(this == cached_document);
-      g_active_doc_cache.Set(NULL);
-      cached_document->Release();
-    }
-
     base::win::ScopedComPtr<IDocHostUIHandler> doc_host_handler;
     if (doc_site_)
       doc_host_handler.QueryFrom(doc_site_);
 
     if (doc_host_handler.get())
       doc_host_handler->HideUI();
 
     doc_site_.Release();
   }
 
@@ skipping 404 matching lines @@
         }
       }
     }
     bool should_unload = true;
     automation_client_->OnUnload(&should_unload);
     out_args->vt = VT_BOOL;
     out_args->boolVal = should_unload ? VARIANT_TRUE : VARIANT_FALSE;
   }
 }
 
-void ChromeActiveDocument::OnOpenURL(const GURL& url_to_open,
-                                     const GURL& referrer,
-                                     int open_disposition) {
-  // If the disposition indicates that we should be opening the URL in the
-  // current tab, then we can reuse the ChromeFrameAutomationClient instance
-  // maintained by the current ChromeActiveDocument instance. We cache this
-  // instance so that it can be used by the new ChromeActiveDocument instance
-  // which may be instantiated for handling the new URL.
-  if (open_disposition == CURRENT_TAB) {
-    // Grab a reference to ensure that the document remains valid.
-    AddRef();
-    g_active_doc_cache.Set(this);
-  }
-
-  BaseActiveX::OnOpenURL(url_to_open, referrer, open_disposition);
-}
-
 void ChromeActiveDocument::OnAttachExternalTab(
     const AttachExternalTabParams& params) {
   if (!automation_client_.get()) {
     DLOG(WARNING) << "Invalid automation client instance";
     return;
   }
   DWORD flags = 0;
   if (params.user_gesture)
     flags = NWMF_USERREQUESTED;
   else if (popup_allowed_)
@@ skipping 436 matching lines @@
     return true;
 
   if (new_navigation_info.url != navigation_info_->url)
     return true;
 
   if (new_navigation_info.referrer != navigation_info_->referrer)
     return true;
 
   return false;
 }