Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leak if a viewmanager has a child viewmanager. Bug 295656,

Browse Source 
r+sr=roc, a=shaver


git-svn-id: svn://10.0.0.236/trunk@173924 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2005-06-01 15:43:08 +00:00
parent 7178a28d71
commit a4e3731e4a
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/view/src/nsViewManager.cpp
View File

@@ -453,6 +453,7 @@ PRUint32 nsViewManager::gLastUserEventTime = 0;
nsViewManager::nsViewManager()
: mMouseLocation(NSCOORD_NONE, NSCOORD_NONE)
, mDelayedResize(NSCOORD_NONE, NSCOORD_NONE)
, mRootViewManager(this)
{
if (gViewManagers == nsnull) {
NS_ASSERTION(mVMCount == 0, "View Manager count is incorrect");
@@ -497,7 +498,7 @@ nsViewManager::~nsViewManager()
if (!IsRootVM()) {
// We have a strong ref to mRootViewManager
NS_IF_RELEASE(mRootViewManager);
NS_RELEASE(mRootViewManager);
}
mInvalidateEventQueue = nsnull;
@@ -640,22 +641,21 @@ NS_IMETHODIMP nsViewManager::SetRootView(nsIView *aView)
{
nsView* view = NS_STATIC_CAST(nsView*, aView);
NS_PRECONDITION(!view || view->GetViewManager() == this,
"Unexpected viewmanager on root view");
// Do NOT destroy the current root view. It's the caller's responsibility
// to destroy it
mRootView = view;
if (mRootView) {
if (mRootViewManager && mRootViewManager != this) {
NS_RELEASE(mRootViewManager);
}
nsView* parent = mRootView->GetParent();
if (parent) {
// Calling InsertChild on |parent| will InvalidateHierarchy() on us, so
// no need to set mRootViewManager ourselves here.
parent->InsertChild(mRootView, nsnull);
mRootViewManager = parent->GetViewManager()->RootViewManager();
NS_ASSERTION(mRootViewManager != this, "Something's wrong");
NS_ADDREF(mRootViewManager);
} else {
mRootViewManager = this;
InvalidateHierarchy();
}
mRootView->SetZIndex(PR_FALSE, 0, PR_FALSE);
@@ -4447,8 +4447,8 @@ void
nsViewManager::InvalidateHierarchy()
{
if (mRootView) {
if (mRootViewManager != this) {
NS_IF_RELEASE(mRootViewManager);
if (!IsRootVM()) {
NS_RELEASE(mRootViewManager);
}
nsView *parent = mRootView->GetParent();
if (parent) {

3
mozilla/view/src/nsViewManager.h
View File

@@ -508,7 +508,8 @@ private:
nsISupportsArray *mCompositeListeners;
nsCOMPtr<nsIFactory> mRegionFactory;
nsView *mRootView;
// mRootViewManager is a strong ref unless it equals |this|
// mRootViewManager is a strong ref unless it equals |this|. It's
// never null (if we have no ancestors, it will be |this|).
nsViewManager *mRootViewManager;
nsCOMPtr<nsIEventQueueService> mEventQueueService;
nsCOMPtr<nsIEventQueue> mSynthMouseMoveEventQueue;