From de58d41cd96877a76a5e4debf9617704bfa4b678 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Tue, 11 Dec 2001 19:16:15 +0000 Subject: [PATCH] Fix blocker bug 114675 with null check around assertion code that I meant to check in yesterday (bug 114220). git-svn-id: svn://10.0.0.236/trunk@110272 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsFrameManager.cpp | 16 +++++++++------- mozilla/layout/html/base/src/nsFrameManager.cpp | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp index 0db655b0f84..3dfc296422a 100644 --- a/mozilla/layout/base/nsFrameManager.cpp +++ b/mozilla/layout/base/nsFrameManager.cpp @@ -974,13 +974,15 @@ FrameManager::NotifyDestroyingFrame(nsIFrame* aFrame) RemoveAllPropertiesFor(presContext, aFrame); #ifdef DEBUG - nsCOMPtr content; - aFrame->GetContent(getter_AddRefs(content)); - PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, - PL_DHashTableOperate(&mPrimaryFrameMap, content, PL_DHASH_LOOKUP)); - NS_ASSERTION(!PL_DHASH_ENTRY_IS_BUSY(entry) || entry->frame != aFrame, - "frame was not removed from primary frame map before" - "destruction or was readded to map after being removed"); + if (mPrimaryFrameMap.ops) { + nsCOMPtr content; + aFrame->GetContent(getter_AddRefs(content)); + PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, + PL_DHashTableOperate(&mPrimaryFrameMap, content, PL_DHASH_LOOKUP)); + NS_ASSERTION(!PL_DHASH_ENTRY_IS_BUSY(entry) || entry->frame != aFrame, + "frame was not removed from primary frame map before" + "destruction or was readded to map after being removed"); + } #endif return NS_OK; diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp index 0db655b0f84..3dfc296422a 100644 --- a/mozilla/layout/html/base/src/nsFrameManager.cpp +++ b/mozilla/layout/html/base/src/nsFrameManager.cpp @@ -974,13 +974,15 @@ FrameManager::NotifyDestroyingFrame(nsIFrame* aFrame) RemoveAllPropertiesFor(presContext, aFrame); #ifdef DEBUG - nsCOMPtr content; - aFrame->GetContent(getter_AddRefs(content)); - PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, - PL_DHashTableOperate(&mPrimaryFrameMap, content, PL_DHASH_LOOKUP)); - NS_ASSERTION(!PL_DHASH_ENTRY_IS_BUSY(entry) || entry->frame != aFrame, - "frame was not removed from primary frame map before" - "destruction or was readded to map after being removed"); + if (mPrimaryFrameMap.ops) { + nsCOMPtr content; + aFrame->GetContent(getter_AddRefs(content)); + PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, + PL_DHashTableOperate(&mPrimaryFrameMap, content, PL_DHASH_LOOKUP)); + NS_ASSERTION(!PL_DHASH_ENTRY_IS_BUSY(entry) || entry->frame != aFrame, + "frame was not removed from primary frame map before" + "destruction or was readded to map after being removed"); + } #endif return NS_OK;