ChromeFrame tabs would hang at times while closing. This would randomly occur...

chrome/browser/external_tab_container_win.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.
 
 #include "chrome/browser/external_tab_container_win.h"
 
 #include <string>
 
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"
@@ skipping 22 matching lines @@
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
 
 static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject";
 
 base::LazyInstance<ExternalTabContainer::PendingTabs>
     ExternalTabContainer::pending_tabs_(base::LINKER_INITIALIZED);
 
-// ExternalTabContainer::PendingTabs ExternalTabContainer::pending_tabs_;
-ExternalTabContainer* ExternalTabContainer::innermost_tab_for_unload_event_
-    = NULL;
-
 ExternalTabContainer::ExternalTabContainer(
     AutomationProvider* automation, AutomationResourceMessageFilter* filter)
     : automation_(automation),
       tab_contents_(NULL),
       tab_contents_container_(NULL),
       tab_handle_(0),
       ignore_next_load_notification_(false),
       automation_resource_message_filter_(filter),
       load_requests_via_automation_(false),
       handle_top_level_requests_(false),
       external_method_factory_(this),
       enabled_extension_automation_(false),
       waiting_for_unload_event_(false),
       pending_(false),
       infobars_enabled_(true),
       focus_manager_(NULL),
-      external_tab_view_(NULL) {
+      external_tab_view_(NULL),
+      notification_window_(NULL),
+      notification_message_(NULL) {
 }
 
 ExternalTabContainer::~ExternalTabContainer() {
   Uninitialize();
 }
 
 bool ExternalTabContainer::Init(Profile* profile,
                                 HWND parent,
                                 const gfx::Rect& bounds,
                                 DWORD style,
@@ skipping 313 matching lines @@
 void ExternalTabContainer::ActivateContents(TabContents* contents) {
 }
 
 void ExternalTabContainer::LoadingStateChanged(TabContents* source) {
 }
 
 void ExternalTabContainer::CloseContents(TabContents* source) {
   static const int kExternalTabCloseContentsDelayMS = 100;
 
   if (waiting_for_unload_event_) {
-    // If we are not the innermost tab waiting for the unload event to return
-    // then don't handle this notification right away as we need the inner
-    // message loop to terminate.
-    if (this != innermost_tab_for_unload_event_) {
-      ChromeThread::PostDelayedTask(
-          ChromeThread::UI, FROM_HERE,
-          NewRunnableMethod(this, &ExternalTabContainer::CloseContents,
-                            source), kExternalTabCloseContentsDelayMS);
-      return;
-    }
-    MessageLoop::current()->Quit();
+    PostMessage(notification_window_, notification_message_, 0, 0);
+    waiting_for_unload_event_ = false;
   } else {
     if (automation_) {
       automation_->Send(new AutomationMsg_CloseExternalTab(0, tab_handle_));
     }
   }
 }
 
 void ExternalTabContainer::MoveContents(TabContents* source,
                                         const gfx::Rect& pos) {
 }
@@ skipping 265 matching lines @@
 LRESULT ExternalTabContainer::OnCreate(LPCREATESTRUCT create_struct) {
   LRESULT result = views::WidgetWin::OnCreate(create_struct);
   if (result == 0) {
     // Grab a reference here which will be released in OnFinalMessage
     AddRef();
   }
   return result;
 }
 
 void ExternalTabContainer::OnDestroy() {
-  if (tab_contents_) {
-    waiting_for_unload_event_ = true;
-    if (Browser::RunUnloadEventsHelper(tab_contents_)) {
-      // Maintain a local global stack of Externa;TabCotainers waiting for the
-      // unload event listeners to finish. We need this as we only want to
-      // handle the CloseContents call from the TabContents when the current
-      // ExternalTabContainers message loop is active. This ensures that nested
-      // ExternalTabContainer message loops terminate correctly.
-      ExternalTabContainer* current_tab = innermost_tab_for_unload_event_;
-      innermost_tab_for_unload_event_ = this;
-      MessageLoop::current()->Run();
-      innermost_tab_for_unload_event_ = current_tab;
-    }
-    waiting_for_unload_event_ = false;
-  }
-
   Uninitialize();
   WidgetWin::OnDestroy();
   if (browser_.get()) {
     ::DestroyWindow(browser_->window()->GetNativeHandle());
   }
 }
 
 void ExternalTabContainer::OnFinalMessage(HWND window) {
   // Release the reference which we grabbed in WM_CREATE.
   Release();
 }
 
+void ExternalTabContainer::RunUnloadHandlers(
+    gfx::NativeWindow notification_window,
+    int notification_message) {
+  DCHECK(::IsWindow(notification_window));
+  if (tab_contents_) {
+    notification_window_ = notification_window;
+    notification_message_ = notification_message;
+
+    if (Browser::RunUnloadEventsHelper(tab_contents_)) {
+      waiting_for_unload_event_ = true;
+    }
+  }
+  if (!waiting_for_unload_event_) {
+    PostMessage(notification_window, notification_message, 0, 0);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, private:
 bool ExternalTabContainer::ProcessUnhandledKeyStroke(HWND window,
                                                      UINT message,
                                                      WPARAM wparam,
                                                      LPARAM lparam) {
   if (!automation_) {
     return false;
   }
   if ((wparam == VK_TAB) && !win_util::IsCtrlPressed()) {
@@ skipping 243 matching lines @@
 
   layout->StartRow(0, 0);
   layout->AddView(info_bar_container);
   layout->StartRow(1, 0);
   layout->AddView(tab_contents_container_);
   SetContentsView(external_tab_view_);
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->ChangeTabContents(tab_contents_);
 }