bug #7774: added SetViewAutoZIndex to support CSS2 auto z-indexing. bug# 14601: assertion cleanup, using #ifdef instead of if (gsDebug). a=leaf, r=troy

view/src/nsViewManager.cpp

@@ -31,7 +31,7 @@ static NS_DEFINE_IID(kBlenderCID, NS_BLENDER_CID);
 static NS_DEFINE_IID(kRegionCID, NS_REGION_CID);
 static NS_DEFINE_IID(kRenderingContextCID, NS_RENDERING_CONTEXT_CID);
 
-static const PRBool gsDebug = PR_FALSE;
+//#define GS_DEBUG
 
 #define UPDATE_QUANTUM  1000 / 40
 
@@ -120,10 +120,9 @@ nsViewManager :: ~nsViewManager()
 
   mRootScrollable = nsnull;
 
+  NS_ASSERTION((mVMCount > 0), "underflow of viewmanagers");
   --mVMCount;
 
-  NS_ASSERTION(!(mVMCount < 0), "underflow of viewmanagers");
-
   if ((0 == mVMCount) &&
       ((nsnull != mDrawingSurface) || (nsnull != gOffScreen) ||
       (nsnull != gRed) || (nsnull != gBlue)))
@@ -1391,12 +1390,11 @@ NS_IMETHODIMP nsViewManager :: UpdateView(nsIView *aView, const nsRect &aRect, P
   if (visibility == nsViewVisibility_kHide)
   	return NS_OK; 
 
-  if (gsDebug)
-  {
-    printf("ViewManager::UpdateView: %p, rect ", aView);
-    stdout << aRect;
-    printf("\n");
-  }
+#ifdef GS_DEBUG
+  printf("ViewManager::UpdateView: %p, rect ", aView);
+  stdout << aRect;
+  printf("\n");
+#endif
 
   // Find the nearest view (including this view) that has a widget
   nsRect  trect = aRect;
@@ -1964,6 +1962,11 @@ NS_IMETHODIMP nsViewManager :: SetViewZIndex(nsIView *aView, PRInt32 aZIndex)
   return rv;
 }
 
+NS_IMETHODIMP nsViewManager::SetViewAutoZIndex(nsIView *aView, PRBool aAutoZIndex)
+{
+	return aView->SetAutoZIndex(aAutoZIndex);
+}
+
 NS_IMETHODIMP nsViewManager :: MoveViewAbove(nsIView *aView, nsIView *aOther)
 {
   nsresult  rv;