Release theme global in nsBox from layout module destructor instead of on a object count for objects whose destructors are not all called. (Adds nsBox to the leak stats, which will make leaks go up.) b=177807 r=bryner sr=roc

layout/build/nsLayoutModule.cpp

@@ -143,6 +143,7 @@ Shutdown(nsIModule* self)
   nsRepeatService::Shutdown();
   nsSprocketLayout::Shutdown();
   nsStackLayout::Shutdown();
+  nsBox::Shutdown();
 #endif
 
   // Release all of our atoms

layout/xul/base/src/nsBox.cpp

@@ -216,28 +216,37 @@ void Coelesced()
 
 #endif
 
-PRUint32 nsBox::gRefCnt = 0;
+PRBool nsBox::gGotTheme = PR_FALSE;
 nsITheme* nsBox::gTheme = nsnull;
 
+MOZ_DECL_CTOR_COUNTER(nsBox)
+
 nsBox::nsBox(nsIPresShell* aShell):mMouseThrough(unset),
                                    mNextChild(nsnull),
                                    mParentBox(nsnull)
                                    
 {
+  MOZ_COUNT_CTOR(nsBox);
   //mX = 0;
   //mY = 0;
-  gRefCnt++;
+  if (!gGotTheme) {
-  if (gRefCnt == 1)
+    gGotTheme = PR_TRUE;
-    nsServiceManager::GetService("@mozilla.org/chrome/chrome-native-theme;1",
+    CallGetService("@mozilla.org/chrome/chrome-native-theme;1", &gTheme);
-                                 NS_GET_IID(nsITheme),
+  }
-                                 (nsISupports**)&gTheme);
 }
 
 nsBox::~nsBox()
 {
-  gRefCnt--;
+  // NOTE:  This currently doesn't get called for |nsBoxToBlockAdaptor|
-  if (gRefCnt == 0 && gTheme)
+  // objects, so don't rely on putting anything here.
-    nsServiceManager::ReleaseService("@mozilla.org/chrome/chrome-native-theme;1", gTheme);
+  MOZ_COUNT_DTOR(nsBox);
+}
+
+/* static */ void
+nsBox::Shutdown()
+{
+  gGotTheme = PR_FALSE;
+  NS_IF_RELEASE(gTheme);
 }
 
 NS_IMETHODIMP 

layout/xul/base/src/nsBox.h

@@ -46,6 +46,8 @@ class nsBox : public nsIBox {
 
 public:
 
+  static void Shutdown();
+
   NS_DECL_ISUPPORTS_INHERITED
 
   NS_IMETHOD GetChildBox(nsIBox** aBox);
@@ -154,7 +156,7 @@ protected:
   virtual void GetBoxName(nsAutoString& aName);
 #endif
 
-  static PRUint32 gRefCnt;
+  static PRBool gGotTheme;
   static nsITheme* gTheme;
 
   enum eMouseThrough {