Commit c85b133e authored by michaelp%netscape.com's avatar michaelp%netscape.com
Browse files

we no longer recurse into clip views. shoot me troy. so long folks.

parent ec513cc8

view/src/nsView.cpp

+12 −4
Original line number Diff line number Diff line
@@ -34,11 +34,13 @@ 
#include "nsGfxCIID.h"

#include "nsIBlender.h"

#include "nsIRegion.h"

#include "nsIClipView.h"



//mmptemp



static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID);

static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID);

static NS_DEFINE_IID(kIClipViewIID, NS_ICLIPVIEW_IID);



static nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent);
@@ -1377,6 +1379,7 @@ static void calc_extents(nsIView *view, nsRect *extents, nscoord ox, nscoord oy) 
  nsIView     *kid;

  PRInt32     numkids, cnt;

  nsRect      bounds;

  nsIClipView *cview;



  view->GetChildCount(numkids);
@@ -1390,6 +1393,11 @@ static void calc_extents(nsIView *view, nsRect *extents, nscoord ox, nscoord oy) 


    extents->UnionRect(*extents, bounds);



    cview = nsnull;



    kid->QueryInterface(kIClipViewIID, (void **)&cview);



    if (!cview)

      calc_extents(kid, extents, bounds.x, bounds.y);

  }

}