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

Bug 53956. Unconditionally remove dummy layout request when no reflows pending. Also, add NSPR logging code. r=nisheeth, sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@91935 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
2001-04-11 03:07:50 +00:00
parent cb6f2a2121
commit 03eb3d47f8
2 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/layout/base/nsPresShell.cpp
View File

@@ -1030,6 +1030,10 @@ public:
#endif
#ifdef PR_LOGGING
static PRLogModuleInfo* gLog;
#endif
protected:
virtual ~PresShell();
@@ -1181,6 +1185,10 @@ private:
nsresult HandleEventInternal(nsEvent* aEvent, nsIView* aView, PRUint32 aFlags, nsEventStatus *aStatus);
};
#ifdef PR_LOGGING
PRLogModuleInfo* PresShell::gLog;
#endif
#ifdef NS_DEBUG
static void
VerifyStyleTree(nsIPresContext* aPresContext, nsIFrameManager* aFrameManager)
@@ -1312,6 +1320,10 @@ PresShell::PresShell():mAnonymousContentTable(nsnull),
#ifdef IBMBIDI
mBidiLevel = BIDI_LEVEL_UNDEFINED;
#endif
#ifdef PR_LOGGING
if (! gLog)
gLog = PR_NewLogModule("PresShell");
#endif
}
NS_IMPL_ADDREF(PresShell)
@@ -5663,7 +5675,7 @@ PresShell::ReflowCommandRemoved(nsIReflowCommand* aRC)
void
PresShell::DoneRemovingReflowCommands()
{
if (mRCCreatedDuringLoad == 0 && !mDocumentLoading && mDummyLayoutRequest) {
if (mRCCreatedDuringLoad == 0 && mDummyLayoutRequest) {
RemoveDummyLayoutRequest();
}
}
@@ -5689,11 +5701,10 @@ PresShell::AddDummyLayoutRequest(void)
if (NS_FAILED(rv)) return rv;
rv = loadGroup->AddRequest(mDummyLayoutRequest, nsnull);
if (NS_FAILED(rv)) return rv;
}
#ifdef DEBUG_nisheeth
printf("presshell=%p, Added dummy layout request.\n", this);
#endif
PR_LOG(gLog, PR_LOG_ALWAYS,
("presshell=%p, Added dummy layout request %p", this, mDummyLayoutRequest.get()));
}
}
return rv;
}
@@ -5714,12 +5725,11 @@ PresShell::RemoveDummyLayoutRequest(void)
rv = loadGroup->RemoveRequest(mDummyLayoutRequest, nsnull, NS_OK);
if (NS_FAILED(rv)) return rv;
PR_LOG(gLog, PR_LOG_ALWAYS,
("presshell=%p, Removed dummy layout request %p", this, mDummyLayoutRequest.get()));
mDummyLayoutRequest = nsnull;
}
#ifdef DEBUG_nisheeth
printf("presshell=%p, Removed dummy layout request.\n", this);
#endif
}
return rv;
}

28
mozilla/layout/html/base/src/nsPresShell.cpp
View File

@@ -1030,6 +1030,10 @@ public:
#endif
#ifdef PR_LOGGING
static PRLogModuleInfo* gLog;
#endif
protected:
virtual ~PresShell();
@@ -1181,6 +1185,10 @@ private:
nsresult HandleEventInternal(nsEvent* aEvent, nsIView* aView, PRUint32 aFlags, nsEventStatus *aStatus);
};
#ifdef PR_LOGGING
PRLogModuleInfo* PresShell::gLog;
#endif
#ifdef NS_DEBUG
static void
VerifyStyleTree(nsIPresContext* aPresContext, nsIFrameManager* aFrameManager)
@@ -1312,6 +1320,10 @@ PresShell::PresShell():mAnonymousContentTable(nsnull),
#ifdef IBMBIDI
mBidiLevel = BIDI_LEVEL_UNDEFINED;
#endif
#ifdef PR_LOGGING
if (! gLog)
gLog = PR_NewLogModule("PresShell");
#endif
}
NS_IMPL_ADDREF(PresShell)
@@ -5663,7 +5675,7 @@ PresShell::ReflowCommandRemoved(nsIReflowCommand* aRC)
void
PresShell::DoneRemovingReflowCommands()
{
if (mRCCreatedDuringLoad == 0 && !mDocumentLoading && mDummyLayoutRequest) {
if (mRCCreatedDuringLoad == 0 && mDummyLayoutRequest) {
RemoveDummyLayoutRequest();
}
}
@@ -5689,11 +5701,10 @@ PresShell::AddDummyLayoutRequest(void)
if (NS_FAILED(rv)) return rv;
rv = loadGroup->AddRequest(mDummyLayoutRequest, nsnull);
if (NS_FAILED(rv)) return rv;
}
#ifdef DEBUG_nisheeth
printf("presshell=%p, Added dummy layout request.\n", this);
#endif
PR_LOG(gLog, PR_LOG_ALWAYS,
("presshell=%p, Added dummy layout request %p", this, mDummyLayoutRequest.get()));
}
}
return rv;
}
@@ -5714,12 +5725,11 @@ PresShell::RemoveDummyLayoutRequest(void)
rv = loadGroup->RemoveRequest(mDummyLayoutRequest, nsnull, NS_OK);
if (NS_FAILED(rv)) return rv;
PR_LOG(gLog, PR_LOG_ALWAYS,
("presshell=%p, Removed dummy layout request %p", this, mDummyLayoutRequest.get()));
mDummyLayoutRequest = nsnull;
}
#ifdef DEBUG_nisheeth
printf("presshell=%p, Removed dummy layout request.\n", this);
#endif
}
return rv;
}