From 05b0dbe26abd1106ba2aed775dec4cea27db5b42 Mon Sep 17 00:00:00 2001
From: "roc+%cs.cmu.edu" <roc+%cs.cmu.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 15 Nov 2004 05:01:11 +0000
Subject: [PATCH] Changing IsFrameEmpty to IsSelfEmpty as dbaron requested and
 I forgot to do before checking in.

git-svn-id: svn://10.0.0.236/trunk@165364 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/public/nsIFrame.h              | 2 +-
 mozilla/layout/generic/nsBlockFrame.cpp            | 4 ++--
 mozilla/layout/generic/nsBlockFrame.h              | 2 +-
 mozilla/layout/generic/nsFrame.cpp                 | 2 +-
 mozilla/layout/generic/nsFrame.h                   | 2 +-
 mozilla/layout/generic/nsHTMLReflowState.cpp       | 2 +-
 mozilla/layout/generic/nsIFrame.h                  | 2 +-
 mozilla/layout/generic/nsInlineFrame.cpp           | 5 +++--
 mozilla/layout/generic/nsInlineFrame.h             | 2 +-
 mozilla/layout/generic/nsPlaceholderFrame.h        | 2 +-
 mozilla/layout/generic/nsTextFrame.cpp             | 2 +-
 mozilla/layout/html/base/src/nsBlockFrame.cpp      | 4 ++--
 mozilla/layout/html/base/src/nsBlockFrame.h        | 2 +-
 mozilla/layout/html/base/src/nsFrame.cpp           | 2 +-
 mozilla/layout/html/base/src/nsFrame.h             | 2 +-
 mozilla/layout/html/base/src/nsHTMLReflowState.cpp | 2 +-
 mozilla/layout/html/base/src/nsInlineFrame.cpp     | 5 +++--
 mozilla/layout/html/base/src/nsInlineFrame.h       | 2 +-
 mozilla/layout/html/base/src/nsPlaceholderFrame.h  | 2 +-
 mozilla/layout/html/base/src/nsTextFrame.cpp       | 2 +-
 20 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h
index 426a2f650a1..5e97e631b93 100644
--- a/mozilla/layout/base/public/nsIFrame.h
+++ b/mozilla/layout/base/public/nsIFrame.h
@@ -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
diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 93d3a5bb5dd..8df392af736 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -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;
   }
 
diff --git a/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h
index 1e6e77fc9e7..fa83bf8cded 100644
--- a/mozilla/layout/generic/nsBlockFrame.h
+++ b/mozilla/layout/generic/nsBlockFrame.h
@@ -192,7 +192,7 @@ public:
                                   PRBool*              aIsVisible);
 
   virtual PRBool IsEmpty();
-  virtual PRBool IsFrameEmpty();
+  virtual PRBool IsSelfEmpty();
 
   // nsIHTMLReflow
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp
index d281400ee43..8cd948f30ce 100644
--- a/mozilla/layout/generic/nsFrame.cpp
+++ b/mozilla/layout/generic/nsFrame.cpp
@@ -2852,7 +2852,7 @@ nsFrame::IsEmpty()
 }
 
 /* virtual */ PRBool
-nsFrame::IsFrameEmpty()
+nsFrame::IsSelfEmpty()
 {
   return PR_FALSE;
 }
diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h
index 6c166abcd66..ff13890bf58 100644
--- a/mozilla/layout/generic/nsFrame.h
+++ b/mozilla/layout/generic/nsFrame.h
@@ -283,7 +283,7 @@ public:
                                   PRBool*              aIsVisible);
 
   virtual PRBool IsEmpty();
-  virtual PRBool IsFrameEmpty();
+  virtual PRBool IsSelfEmpty();
 
   // nsIHTMLReflow
   NS_IMETHOD  WillReflow(nsPresContext* aPresContext);
diff --git a/mozilla/layout/generic/nsHTMLReflowState.cpp b/mozilla/layout/generic/nsHTMLReflowState.cpp
index f0a90f5630f..c2b87df3de9 100644
--- a/mozilla/layout/generic/nsHTMLReflowState.cpp
+++ b/mozilla/layout/generic/nsHTMLReflowState.cpp
@@ -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;
   }
diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h
index 426a2f650a1..5e97e631b93 100644
--- a/mozilla/layout/generic/nsIFrame.h
+++ b/mozilla/layout/generic/nsIFrame.h
@@ -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
diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp
index b37b8dac403..0577e86486c 100644
--- a/mozilla/layout/generic/nsInlineFrame.cpp
+++ b/mozilla/layout/generic/nsInlineFrame.cpp
@@ -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;
   }
 
diff --git a/mozilla/layout/generic/nsInlineFrame.h b/mozilla/layout/generic/nsInlineFrame.h
index f83c5155237..63acc6ed285 100644
--- a/mozilla/layout/generic/nsInlineFrame.h
+++ b/mozilla/layout/generic/nsInlineFrame.h
@@ -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,
diff --git a/mozilla/layout/generic/nsPlaceholderFrame.h b/mozilla/layout/generic/nsPlaceholderFrame.h
index c23de746f0d..9a097a74faf 100644
--- a/mozilla/layout/generic/nsPlaceholderFrame.h
+++ b/mozilla/layout/generic/nsPlaceholderFrame.h
@@ -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;
diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp
index 8c70b11a4b7..6f4718b231d 100644
--- a/mozilla/layout/generic/nsTextFrame.cpp
+++ b/mozilla/layout/generic/nsTextFrame.cpp
@@ -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);
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 93d3a5bb5dd..8df392af736 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -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;
   }
 
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.h b/mozilla/layout/html/base/src/nsBlockFrame.h
index 1e6e77fc9e7..fa83bf8cded 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.h
+++ b/mozilla/layout/html/base/src/nsBlockFrame.h
@@ -192,7 +192,7 @@ public:
                                   PRBool*              aIsVisible);
 
   virtual PRBool IsEmpty();
-  virtual PRBool IsFrameEmpty();
+  virtual PRBool IsSelfEmpty();
 
   // nsIHTMLReflow
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp
index d281400ee43..8cd948f30ce 100644
--- a/mozilla/layout/html/base/src/nsFrame.cpp
+++ b/mozilla/layout/html/base/src/nsFrame.cpp
@@ -2852,7 +2852,7 @@ nsFrame::IsEmpty()
 }
 
 /* virtual */ PRBool
-nsFrame::IsFrameEmpty()
+nsFrame::IsSelfEmpty()
 {
   return PR_FALSE;
 }
diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h
index 6c166abcd66..ff13890bf58 100644
--- a/mozilla/layout/html/base/src/nsFrame.h
+++ b/mozilla/layout/html/base/src/nsFrame.h
@@ -283,7 +283,7 @@ public:
                                   PRBool*              aIsVisible);
 
   virtual PRBool IsEmpty();
-  virtual PRBool IsFrameEmpty();
+  virtual PRBool IsSelfEmpty();
 
   // nsIHTMLReflow
   NS_IMETHOD  WillReflow(nsPresContext* aPresContext);
diff --git a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp
index f0a90f5630f..c2b87df3de9 100644
--- a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp
@@ -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;
   }
diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp
index b37b8dac403..0577e86486c 100644
--- a/mozilla/layout/html/base/src/nsInlineFrame.cpp
+++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp
@@ -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;
   }
 
diff --git a/mozilla/layout/html/base/src/nsInlineFrame.h b/mozilla/layout/html/base/src/nsInlineFrame.h
index f83c5155237..63acc6ed285 100644
--- a/mozilla/layout/html/base/src/nsInlineFrame.h
+++ b/mozilla/layout/html/base/src/nsInlineFrame.h
@@ -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,
diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.h b/mozilla/layout/html/base/src/nsPlaceholderFrame.h
index c23de746f0d..9a097a74faf 100644
--- a/mozilla/layout/html/base/src/nsPlaceholderFrame.h
+++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.h
@@ -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;
diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp
index 8c70b11a4b7..6f4718b231d 100644
--- a/mozilla/layout/html/base/src/nsTextFrame.cpp
+++ b/mozilla/layout/html/base/src/nsTextFrame.cpp
@@ -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);