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

Changing IsFrameEmpty to IsSelfEmpty as dbaron requested and I forgot to do before checking in.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@165364 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu 2004-11-15 05:01:11 +00:00
parent 3d390bd26b
commit 05b0dbe26a
20 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/layout/base/public/nsIFrame.h
View File

@ -1223,7 +1223,7 @@ public:
* Determine whether the frame is logically empty, assuming that all
* its children are empty.
*/
virtual PRBool IsFrameEmpty() = 0;
virtual PRBool IsSelfEmpty() = 0;
/**
* IsGeneratedContentFrame returns whether a frame corresponds to

4
mozilla/layout/generic/nsBlockFrame.cpp
View File

@ -2939,7 +2939,7 @@ IsMarginZero(nsStyleUnit aUnit, nsStyleCoord &aCoord)
}
/* virtual */ PRBool
nsBlockFrame::IsFrameEmpty()
nsBlockFrame::IsSelfEmpty()
{
const nsStylePosition* position = GetStylePosition();
@ -2993,7 +2993,7 @@ nsBlockFrame::IsFrameEmpty()
PRBool
nsBlockFrame::IsEmpty()
{
if (!IsFrameEmpty()) {
if (!IsSelfEmpty()) {
return PR_FALSE;
}

2
mozilla/layout/generic/nsBlockFrame.h
View File

@ -192,7 +192,7 @@ public:
PRBool* aIsVisible);
virtual PRBool IsEmpty();
virtual PRBool IsFrameEmpty();
virtual PRBool IsSelfEmpty();
// nsIHTMLReflow
NS_IMETHOD Reflow(nsPresContext* aPresContext,

2
mozilla/layout/generic/nsFrame.cpp
View File

@ -2852,7 +2852,7 @@ nsFrame::IsEmpty()
}
/* virtual */ PRBool
nsFrame::IsFrameEmpty()
nsFrame::IsSelfEmpty()
{
return PR_FALSE;
}

2
mozilla/layout/generic/nsFrame.h
View File

@ -283,7 +283,7 @@ public:
PRBool* aIsVisible);
virtual PRBool IsEmpty();
virtual PRBool IsFrameEmpty();
virtual PRBool IsSelfEmpty();
// nsIHTMLReflow
NS_IMETHOD WillReflow(nsPresContext* aPresContext);

2
mozilla/layout/generic/nsHTMLReflowState.cpp
View File

@ -713,7 +713,7 @@ static PRBool AreAllEarlierInFlowFramesEmpty(nsIFrame* aFrame,
*aFound = PR_TRUE;
return PR_TRUE;
}
if (!aFrame->IsFrameEmpty()) {
if (!aFrame->IsSelfEmpty()) {
*aFound = PR_FALSE;
return PR_FALSE;
}

2
mozilla/layout/generic/nsIFrame.h
View File

@ -1223,7 +1223,7 @@ public:
* Determine whether the frame is logically empty, assuming that all
* its children are empty.
*/
virtual PRBool IsFrameEmpty() = 0;
virtual PRBool IsSelfEmpty() = 0;
/**
* IsGeneratedContentFrame returns whether a frame corresponds to

5
mozilla/layout/generic/nsInlineFrame.cpp
View File

@ -138,7 +138,7 @@ IsMarginZero(nsStyleUnit aUnit, nsStyleCoord &aCoord)
}
/* virtual */ PRBool
nsInlineFrame::IsFrameEmpty()
nsInlineFrame::IsSelfEmpty()
{
#if 0
// I used to think inline frames worked this way, but it seems they
@ -170,12 +170,13 @@ nsInlineFrame::IsFrameEmpty()
margin->mMargin.GetLeft(coord))) {
return PR_FALSE;
}
return PR_TRUE;
}
PRBool
nsInlineFrame::IsEmpty()
{
if (!IsFrameEmpty()) {
if (!IsSelfEmpty()) {
return PR_FALSE;
}

2
mozilla/layout/generic/nsInlineFrame.h
View File

@ -109,7 +109,7 @@ public:
virtual nsIAtom* GetType() const;
virtual PRBool IsEmpty();
virtual PRBool IsFrameEmpty();
virtual PRBool IsSelfEmpty();
// nsIHTMLReflow overrides
NS_IMETHOD Reflow(nsPresContext* aPresContext,

2
mozilla/layout/generic/nsPlaceholderFrame.h
View File

@ -86,7 +86,7 @@ public:
#endif
virtual PRBool IsEmpty() { return PR_TRUE; }
virtual PRBool IsFrameEmpty() { return PR_TRUE; }
virtual PRBool IsSelfEmpty() { return PR_TRUE; }
protected:
nsIFrame* mOutOfFlowFrame;

2
mozilla/layout/generic/nsTextFrame.cpp
View File

@ -483,7 +483,7 @@ public:
PRBool* aIsVisible);
virtual PRBool IsEmpty();
virtual PRBool IsFrameEmpty() { return IsEmpty(); }
virtual PRBool IsSelfEmpty() { return IsEmpty(); }
#ifdef ACCESSIBILITY
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);

4
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@ -2939,7 +2939,7 @@ IsMarginZero(nsStyleUnit aUnit, nsStyleCoord &aCoord)
}
/* virtual */ PRBool
nsBlockFrame::IsFrameEmpty()
nsBlockFrame::IsSelfEmpty()
{
const nsStylePosition* position = GetStylePosition();
@ -2993,7 +2993,7 @@ nsBlockFrame::IsFrameEmpty()
PRBool
nsBlockFrame::IsEmpty()
{
if (!IsFrameEmpty()) {
if (!IsSelfEmpty()) {
return PR_FALSE;
}

2
mozilla/layout/html/base/src/nsBlockFrame.h
View File

@ -192,7 +192,7 @@ public:
PRBool* aIsVisible);
virtual PRBool IsEmpty();
virtual PRBool IsFrameEmpty();
virtual PRBool IsSelfEmpty();
// nsIHTMLReflow
NS_IMETHOD Reflow(nsPresContext* aPresContext,

2
mozilla/layout/html/base/src/nsFrame.cpp
View File

@ -2852,7 +2852,7 @@ nsFrame::IsEmpty()
}
/* virtual */ PRBool
nsFrame::IsFrameEmpty()
nsFrame::IsSelfEmpty()
{
return PR_FALSE;
}

2
mozilla/layout/html/base/src/nsFrame.h
View File

@ -283,7 +283,7 @@ public:
PRBool* aIsVisible);
virtual PRBool IsEmpty();
virtual PRBool IsFrameEmpty();
virtual PRBool IsSelfEmpty();
// nsIHTMLReflow
NS_IMETHOD WillReflow(nsPresContext* aPresContext);

2
mozilla/layout/html/base/src/nsHTMLReflowState.cpp
View File

@ -713,7 +713,7 @@ static PRBool AreAllEarlierInFlowFramesEmpty(nsIFrame* aFrame,
*aFound = PR_TRUE;
return PR_TRUE;
}
if (!aFrame->IsFrameEmpty()) {
if (!aFrame->IsSelfEmpty()) {
*aFound = PR_FALSE;
return PR_FALSE;
}

5
mozilla/layout/html/base/src/nsInlineFrame.cpp
View File

@ -138,7 +138,7 @@ IsMarginZero(nsStyleUnit aUnit, nsStyleCoord &aCoord)
}
/* virtual */ PRBool
nsInlineFrame::IsFrameEmpty()
nsInlineFrame::IsSelfEmpty()
{
#if 0
// I used to think inline frames worked this way, but it seems they
@ -170,12 +170,13 @@ nsInlineFrame::IsFrameEmpty()
margin->mMargin.GetLeft(coord))) {
return PR_FALSE;
}
return PR_TRUE;
}
PRBool
nsInlineFrame::IsEmpty()
{
if (!IsFrameEmpty()) {
if (!IsSelfEmpty()) {
return PR_FALSE;
}

2
mozilla/layout/html/base/src/nsInlineFrame.h
View File

@ -109,7 +109,7 @@ public:
virtual nsIAtom* GetType() const;
virtual PRBool IsEmpty();
virtual PRBool IsFrameEmpty();
virtual PRBool IsSelfEmpty();
// nsIHTMLReflow overrides
NS_IMETHOD Reflow(nsPresContext* aPresContext,

2
mozilla/layout/html/base/src/nsPlaceholderFrame.h
View File

@ -86,7 +86,7 @@ public:
#endif
virtual PRBool IsEmpty() { return PR_TRUE; }
virtual PRBool IsFrameEmpty() { return PR_TRUE; }
virtual PRBool IsSelfEmpty() { return PR_TRUE; }
protected:
nsIFrame* mOutOfFlowFrame;

2
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@ -483,7 +483,7 @@ public:
PRBool* aIsVisible);
virtual PRBool IsEmpty();
virtual PRBool IsFrameEmpty() { return IsEmpty(); }
virtual PRBool IsSelfEmpty() { return IsEmpty(); }
#ifdef ACCESSIBILITY
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);