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

Attempt to fix topcrash bugs, possibly due to stale cached lookup undisplayed entry (that part by dbaron). Also added some artificial branching to help narrow the problem should crash persist. b=118014 r=attinasi/dbaron, sr=kin a=asa (drivers)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@117952 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
attinasi%netscape.com
2002-04-02 21:14:43 +00:00
parent d18deb1faa
commit ccc52f504e
2 changed files with 126 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
mozilla/layout/base/nsFrameManager.cpp
View File

@@ -74,9 +74,11 @@
#include "nsPrintfCString.h"
#ifdef DEBUG
#undef NOISY_DEBUG
//#define NOISY_DEBUG
//#define DEBUG_UNDISPLAYED_MAP
#else
#undef NOISY_DEBUG
#undef DEBUG_UNDISPLAYED_MAP
#endif
#ifdef NOISY_DEBUG
@@ -841,6 +843,12 @@ FrameManager::SetUndisplayedContent(nsIContent* aContent,
nsIStyleContext* aStyleContext)
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("SetUndisplayedContent(%d): p=%p \n", i++, (void *)aContent);
#endif
if (! mUndisplayedMap) {
mUndisplayedMap = new UndisplayedMap;
}
@@ -848,6 +856,7 @@ FrameManager::SetUndisplayedContent(nsIContent* aContent,
nsresult result = NS_OK;
nsIContent* parent = nsnull;
aContent->GetParent(parent);
NS_ASSERTION(parent, "undisplayed content must have a parent");
if (parent) {
result = mUndisplayedMap->AddNodeFor(parent, aContent, aStyleContext);
NS_RELEASE(parent);
@@ -862,6 +871,12 @@ FrameManager::SetUndisplayedPseudoIn(nsIStyleContext* aPseudoContext,
nsIContent* aParentContent)
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("SetUndisplayedPseudo(%d): sp=%p cp=%p \n", i++, (void *)aPseudoContext, (void *)aParentContent);
#endif
if (! mUndisplayedMap) {
mUndisplayedMap = new UndisplayedMap;
}
@@ -875,11 +890,28 @@ NS_IMETHODIMP
FrameManager::ClearUndisplayedContentIn(nsIContent* aContent, nsIContent* aParentContent)
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("ClearUndisplayedContent(%d): content=%p parent=%p --> ", i++, (void *)aContent, (void*)aParentContent);
#endif
if (mUndisplayedMap) {
UndisplayedNode* node = mUndisplayedMap->GetFirstNode(aParentContent);
while (node) {
if (node->mContent == aContent) {
return mUndisplayedMap->RemoveNodeFor(aParentContent, node);
nsresult rv = mUndisplayedMap->RemoveNodeFor(aParentContent, node);
#ifdef DEBUG_UNDISPLAYED_MAP
printf( "REMOVED! (rv=%d)\n", (int)rv);
#endif
#ifdef DEBUG
// make sure that there are no more entries for the same content
nsIStyleContext *context = nsnull;
GetUndisplayedContent(aContent, &context);
NS_ASSERTION(context == nsnull, "Found more undisplayed content data after removal");
#endif
return rv;
}
node = node->mNext;
}
@@ -891,6 +923,12 @@ NS_IMETHODIMP
FrameManager::ClearAllUndisplayedContentIn(nsIContent* aParentContent)
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("ClearAllUndisplayedContentIn(%d): parent=%p \n", i++, (void*)aParentContent);
#endif
if (mUndisplayedMap) {
return mUndisplayedMap->RemoveNodesFor(aParentContent);
}
@@ -901,6 +939,12 @@ NS_IMETHODIMP
FrameManager::ClearUndisplayedContentMap()
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("ClearUndisplayedContentMap(%d)\n", i++);
#endif
if (mUndisplayedMap) {
mUndisplayedMap->Clear();
}
@@ -1754,8 +1798,21 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
nsIStyleContext* undisplayedContext = nsnull;
undisplayed->mStyle->GetPseudoType(pseudoTag);
if (undisplayed->mContent && pseudoTag == nsnull) { // child content
aPresContext->ResolveStyleContextFor(undisplayed->mContent, newContext,
&undisplayedContext);
// DIAGNOSTIC CHECK: bug 118014 tracks a topcrash coming out of this call. The following
// code to discriminate beween HTML and non HTML is an attempt to better understand
// what kind of element is causing the crash, since it cannot so far be reproduced in a
// debugging environment. (temporary: 04.02.2002 attinasi@netscape.com)
nsIContent *theContent = undisplayed->mContent;
if (theContent->IsContentOfType(nsIContent::eHTML)) {
// HTML element
aPresContext->ResolveStyleContextFor(theContent, newContext,
&undisplayedContext);
} else {
// non-HTML element (probably XUL)
aPresContext->ResolveStyleContextFor(theContent, newContext,
&undisplayedContext);
}
}
else if (pseudoTag == nsHTMLAtoms::mozNonElementPseudo) {
aPresContext->ResolveStyleContextForNonElement(newContext,
@@ -2521,11 +2578,10 @@ UndisplayedMap::RemoveNodesFor(nsIContent* aParentContent)
NS_ASSERTION(entry, "content not in map");
if (*entry) {
UndisplayedNode* node = (UndisplayedNode*)((*entry)->value);
NS_ASSERTION(node, "null node for non-null entry in UndisplayedMap");
delete node;
if (entry == mLastLookup) {
mLastLookup = nsnull;
}
PL_HashTableRawRemove(mTable, entry, *entry);
mLastLookup = nsnull; // hashtable may have shifted bucket out from under us
}
return NS_OK;
}

70
mozilla/layout/html/base/src/nsFrameManager.cpp
View File

@@ -74,9 +74,11 @@
#include "nsPrintfCString.h"
#ifdef DEBUG
#undef NOISY_DEBUG
//#define NOISY_DEBUG
//#define DEBUG_UNDISPLAYED_MAP
#else
#undef NOISY_DEBUG
#undef DEBUG_UNDISPLAYED_MAP
#endif
#ifdef NOISY_DEBUG
@@ -841,6 +843,12 @@ FrameManager::SetUndisplayedContent(nsIContent* aContent,
nsIStyleContext* aStyleContext)
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("SetUndisplayedContent(%d): p=%p \n", i++, (void *)aContent);
#endif
if (! mUndisplayedMap) {
mUndisplayedMap = new UndisplayedMap;
}
@@ -848,6 +856,7 @@ FrameManager::SetUndisplayedContent(nsIContent* aContent,
nsresult result = NS_OK;
nsIContent* parent = nsnull;
aContent->GetParent(parent);
NS_ASSERTION(parent, "undisplayed content must have a parent");
if (parent) {
result = mUndisplayedMap->AddNodeFor(parent, aContent, aStyleContext);
NS_RELEASE(parent);
@@ -862,6 +871,12 @@ FrameManager::SetUndisplayedPseudoIn(nsIStyleContext* aPseudoContext,
nsIContent* aParentContent)
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("SetUndisplayedPseudo(%d): sp=%p cp=%p \n", i++, (void *)aPseudoContext, (void *)aParentContent);
#endif
if (! mUndisplayedMap) {
mUndisplayedMap = new UndisplayedMap;
}
@@ -875,11 +890,28 @@ NS_IMETHODIMP
FrameManager::ClearUndisplayedContentIn(nsIContent* aContent, nsIContent* aParentContent)
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("ClearUndisplayedContent(%d): content=%p parent=%p --> ", i++, (void *)aContent, (void*)aParentContent);
#endif
if (mUndisplayedMap) {
UndisplayedNode* node = mUndisplayedMap->GetFirstNode(aParentContent);
while (node) {
if (node->mContent == aContent) {
return mUndisplayedMap->RemoveNodeFor(aParentContent, node);
nsresult rv = mUndisplayedMap->RemoveNodeFor(aParentContent, node);
#ifdef DEBUG_UNDISPLAYED_MAP
printf( "REMOVED! (rv=%d)\n", (int)rv);
#endif
#ifdef DEBUG
// make sure that there are no more entries for the same content
nsIStyleContext *context = nsnull;
GetUndisplayedContent(aContent, &context);
NS_ASSERTION(context == nsnull, "Found more undisplayed content data after removal");
#endif
return rv;
}
node = node->mNext;
}
@@ -891,6 +923,12 @@ NS_IMETHODIMP
FrameManager::ClearAllUndisplayedContentIn(nsIContent* aParentContent)
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("ClearAllUndisplayedContentIn(%d): parent=%p \n", i++, (void*)aParentContent);
#endif
if (mUndisplayedMap) {
return mUndisplayedMap->RemoveNodesFor(aParentContent);
}
@@ -901,6 +939,12 @@ NS_IMETHODIMP
FrameManager::ClearUndisplayedContentMap()
{
NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE);
#ifdef DEBUG_UNDISPLAYED_MAP
static int i = 0;
printf("ClearUndisplayedContentMap(%d)\n", i++);
#endif
if (mUndisplayedMap) {
mUndisplayedMap->Clear();
}
@@ -1754,8 +1798,21 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
nsIStyleContext* undisplayedContext = nsnull;
undisplayed->mStyle->GetPseudoType(pseudoTag);
if (undisplayed->mContent && pseudoTag == nsnull) { // child content
aPresContext->ResolveStyleContextFor(undisplayed->mContent, newContext,
&undisplayedContext);
// DIAGNOSTIC CHECK: bug 118014 tracks a topcrash coming out of this call. The following
// code to discriminate beween HTML and non HTML is an attempt to better understand
// what kind of element is causing the crash, since it cannot so far be reproduced in a
// debugging environment. (temporary: 04.02.2002 attinasi@netscape.com)
nsIContent *theContent = undisplayed->mContent;
if (theContent->IsContentOfType(nsIContent::eHTML)) {
// HTML element
aPresContext->ResolveStyleContextFor(theContent, newContext,
&undisplayedContext);
} else {
// non-HTML element (probably XUL)
aPresContext->ResolveStyleContextFor(theContent, newContext,
&undisplayedContext);
}
}
else if (pseudoTag == nsHTMLAtoms::mozNonElementPseudo) {
aPresContext->ResolveStyleContextForNonElement(newContext,
@@ -2521,11 +2578,10 @@ UndisplayedMap::RemoveNodesFor(nsIContent* aParentContent)
NS_ASSERTION(entry, "content not in map");
if (*entry) {
UndisplayedNode* node = (UndisplayedNode*)((*entry)->value);
NS_ASSERTION(node, "null node for non-null entry in UndisplayedMap");
delete node;
if (entry == mLastLookup) {
mLastLookup = nsnull;
}
PL_HashTableRawRemove(mTable, entry, *entry);
mLastLookup = nsnull; // hashtable may have shifted bucket out from under us
}
return NS_OK;
}