From d97ee82c1c8f57f8cdbcdc8d3c6e945e344fb1b9 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 14 Jan 2011 15:15:29 -0500
Subject: [PATCH] Bug 604215 - Part 2: when switching into tab view, start the
 heartbeat only after the zoom operation has been finished; r=ian
 a=blocking-final+

---
 browser/base/content/tabview/ui.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index bb3745a68ac2..cdfe3deaf2ff 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -499,6 +499,8 @@ let UI = {
 
         self._resize(true);
         dispatchEvent(event);
+
+        TabItems.resumePainting();
       });
     } else {
       if (currentTab && currentTab._tabViewTabItem)
@@ -506,9 +508,9 @@ let UI = {
 
       self.setActiveTab(null);
       dispatchEvent(event);
-    }
 
-    TabItems.resumePainting();
+      TabItems.resumePainting();
+    }
   },
 
   // ----------