Bug 112719 - make nsXULTreeSliceFrame inherit from nsGridRowLeafFrame, as it was intended to. r=jag, sr=hyatt.

layout/xul/base/src/nsXULTreeSliceFrame.cpp

@@ -79,11 +79,11 @@ nsXULTreeSliceFrame::Release(void)
 //
 NS_INTERFACE_MAP_BEGIN(nsXULTreeSliceFrame)
   NS_INTERFACE_MAP_ENTRY(nsIXULTreeSlice)
-NS_INTERFACE_MAP_END_INHERITING(nsBoxFrame)
+NS_INTERFACE_MAP_END_INHERITING(nsGridRowLeafFrame)
 
 // Constructor
 nsXULTreeSliceFrame::nsXULTreeSliceFrame(nsIPresShell* aPresShell, PRBool aIsRoot, nsIBoxLayout* aLayoutManager)
-:nsBoxFrame(aPresShell, aIsRoot, aLayoutManager) 
+:nsGridRowLeafFrame(aPresShell, aIsRoot, aLayoutManager) 
 {}
 
 // Destructor
@@ -94,7 +94,7 @@ nsXULTreeSliceFrame::~nsXULTreeSliceFrame()
 nsresult
 nsXULTreeSliceFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
 {
-  nsresult rv = nsBoxFrame::GetPrefSize(aState, aSize);
+  nsresult rv = nsGridRowLeafFrame::GetPrefSize(aState, aSize);
   if (NS_FAILED(rv)) return rv;
 
   aSize.height = PR_MAX(mRect.height, aSize.height);

layout/xul/base/src/nsXULTreeSliceFrame.h

@@ -36,15 +36,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsBoxFrame.h"
 #include "nsIXULTreeSlice.h"
-
-#ifdef MOZ_GRID2
 #include "nsGridRowLeafFrame.h"
+
 class nsXULTreeSliceFrame : public nsGridRowLeafFrame, public nsIXULTreeSlice
-#else
-class nsXULTreeSliceFrame : public nsBoxFrame, public nsIXULTreeSlice
-#endif
 {
 public:
   NS_DECL_ISUPPORTS