From 2599026f4976fef10dae2f7a7a0f21800f3b7130 Mon Sep 17 00:00:00 2001
From: "karnaze%netscape.com"
 <karnaze%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 2 Mar 2000 06:09:37 +0000
Subject: [PATCH] PDT+ bug 28341 - Destroy caption frame when outer table frame
 is destroyed. Add caption to outer frame rather than inner frame. r=troy,
 a=rickg

git-svn-id: svn://10.0.0.236/trunk@62032 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsCSSFrameConstructor.cpp |  20 +++++++++-----
 .../html/style/src/nsCSSFrameConstructor.cpp  |  20 +++++++++-----
 .../html/table/src/nsTableOuterFrame.cpp      |  26 ++++++++++++++++--
 .../layout/html/table/src/nsTableOuterFrame.h |  16 ++++++++---
 .../html/tests/table/bugs/bug28341.html       |   8 ++++++
 .../html/tests/table/bugs/file_list.txt       |   1 +
 .../html/tests/table/images/animated.gif      | Bin 0 -> 21710 bytes
 mozilla/layout/tables/nsTableOuterFrame.cpp   |  26 ++++++++++++++++--
 mozilla/layout/tables/nsTableOuterFrame.h     |  16 ++++++++---
 9 files changed, 107 insertions(+), 26 deletions(-)
 create mode 100644 mozilla/layout/html/tests/table/bugs/bug28341.html
 create mode 100644 mozilla/layout/html/tests/table/images/animated.gif

diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 8bcf05c8748..b858665c629 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -1402,12 +1402,6 @@ nsCSSFrameConstructor::ConstructTableCaptionFrame(nsIPresShell*            aPres
                                           nsLayoutAtoms::floaterList,
                                           aState.mFloatedItems.childList);
   }
-
-  if (outerFrame) {
-    outerFrame->SetInitialChildList(aPresContext, nsLayoutAtoms::captionList,
-                                    aNewCaptionFrame);
-  }
-
   return rv;
 }
 
@@ -5096,7 +5090,19 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsIPresShell* aPresShell,
     // the next 5 cases are only relevant if the parent is not a table, ConstructTableFrame handles children
     case NS_STYLE_DISPLAY_TABLE_CAPTION:
     {
-      rv = ConstructTableCaptionFrame(aPresShell, aPresContext, aState, aContent, aParentFrame,
+      // aParentFrame may be an inner table frame rather than an outer frame 
+      // In this case we need to get the outer frame.
+      nsIFrame* parentFrame = aParentFrame;
+      nsIFrame* outerFrame = nsnull;
+      aParentFrame->GetParent(&outerFrame);
+      nsCOMPtr<nsIAtom> frameType;
+      if (outerFrame) {
+        outerFrame->GetFrameType(getter_AddRefs(frameType));
+        if (nsLayoutAtoms::tableOuterFrame == frameType.get()) {
+          parentFrame = outerFrame;
+        }
+      }
+      rv = ConstructTableCaptionFrame(aPresShell, aPresContext, aState, aContent, parentFrame,
                                       aStyleContext, newFrame, ignore, tableCreator);
       aFrameItems.AddChild(newFrame);
       return rv;
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index 8bcf05c8748..b858665c629 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -1402,12 +1402,6 @@ nsCSSFrameConstructor::ConstructTableCaptionFrame(nsIPresShell*            aPres
                                           nsLayoutAtoms::floaterList,
                                           aState.mFloatedItems.childList);
   }
-
-  if (outerFrame) {
-    outerFrame->SetInitialChildList(aPresContext, nsLayoutAtoms::captionList,
-                                    aNewCaptionFrame);
-  }
-
   return rv;
 }
 
@@ -5096,7 +5090,19 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsIPresShell* aPresShell,
     // the next 5 cases are only relevant if the parent is not a table, ConstructTableFrame handles children
     case NS_STYLE_DISPLAY_TABLE_CAPTION:
     {
-      rv = ConstructTableCaptionFrame(aPresShell, aPresContext, aState, aContent, aParentFrame,
+      // aParentFrame may be an inner table frame rather than an outer frame 
+      // In this case we need to get the outer frame.
+      nsIFrame* parentFrame = aParentFrame;
+      nsIFrame* outerFrame = nsnull;
+      aParentFrame->GetParent(&outerFrame);
+      nsCOMPtr<nsIAtom> frameType;
+      if (outerFrame) {
+        outerFrame->GetFrameType(getter_AddRefs(frameType));
+        if (nsLayoutAtoms::tableOuterFrame == frameType.get()) {
+          parentFrame = outerFrame;
+        }
+      }
+      rv = ConstructTableCaptionFrame(aPresShell, aPresContext, aState, aContent, parentFrame,
                                       aStyleContext, newFrame, ignore, tableCreator);
       aFrameItems.AddChild(newFrame);
       return rv;
diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
index ccf876607b0..0ec4d1b9595 100644
--- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
@@ -37,6 +37,8 @@
 #include "nsHTMLParts.h"
 #include "nsIPresShell.h"
 
+/* ----------- nsTableCaptionFrame ---------- */
+
 #define NS_TABLE_FRAME_CAPTION_LIST_INDEX 0
 
 // caption frame
@@ -46,6 +48,20 @@ nsTableCaptionFrame::nsTableCaptionFrame()
   SetFlags(NS_BLOCK_SPACE_MGR|NS_BLOCK_WRAP_SIZE);
 }
 
+nsTableCaptionFrame::~nsTableCaptionFrame()
+{
+}
+
+NS_IMETHODIMP
+nsTableOuterFrame::Destroy(nsIPresContext* aPresContext)
+{
+  if (mCaptionFrame) {
+    mCaptionFrame->Destroy(aPresContext);
+  }
+
+  return nsHTMLContainerFrame::Destroy(aPresContext);
+}
+
 NS_IMETHODIMP
 nsTableCaptionFrame::GetFrameType(nsIAtom** aType) const
 {
@@ -117,13 +133,19 @@ struct OuterTableReflowState {
   }
 };
 
-
-
 /* ----------- nsTableOuterFrame ---------- */
 
 NS_IMPL_ADDREF_INHERITED(nsTableOuterFrame, nsHTMLContainerFrame)
 NS_IMPL_RELEASE_INHERITED(nsTableOuterFrame, nsHTMLContainerFrame)
 
+nsTableOuterFrame::nsTableOuterFrame()
+{
+}
+
+nsTableOuterFrame::~nsTableOuterFrame()
+{
+}
+
 nsresult nsTableOuterFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
 {
   if (NULL == aInstancePtr) {
diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.h b/mozilla/layout/html/table/src/nsTableOuterFrame.h
index 33a36ebd0b3..48a92930af7 100644
--- a/mozilla/layout/html/table/src/nsTableOuterFrame.h
+++ b/mozilla/layout/html/table/src/nsTableOuterFrame.h
@@ -32,10 +32,14 @@ struct nsStyleTable;
 
 class nsTableCaptionFrame : public nsBlockFrame
 {
-  public:
+public:
   // nsISupports
-  nsTableCaptionFrame();
   NS_IMETHOD  GetFrameType(nsIAtom** aType) const;
+  friend nsresult NS_NewTableCaptionFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame);
+
+protected:
+  nsTableCaptionFrame();
+  virtual ~nsTableCaptionFrame();
 };
 
 
@@ -60,8 +64,7 @@ public:
     *
     * @return  NS_OK if the frame was properly allocated, otherwise an error code
     */
-  friend nsresult 
-  NS_NewTableOuterFrame(nsIPresShell* aPresShell, nsIFrame** aResult);
+  friend nsresult NS_NewTableOuterFrame(nsIPresShell* aPresShell, nsIFrame** aResult);
 
   NS_IMETHOD Init(nsIPresContext*  aPresContext,
                   nsIContent*      aContent,
@@ -69,6 +72,8 @@ public:
                   nsIStyleContext* aContext,
                   nsIFrame*        aPrevInFlow);
 
+  NS_IMETHOD Destroy(nsIPresContext* aPresContext);
+
   NS_IMETHOD AdjustZeroWidth();
 
   /**  @see nsIFrame::SetInitialChildList */    
@@ -151,6 +156,9 @@ public:
 protected:
 
 
+  nsTableOuterFrame();
+  virtual ~nsTableOuterFrame();
+
   /** Always returns 0, since the outer table frame has no border of its own
     * The inner table frame can answer this question in a meaningful way.
     * @see nsHTMLContainerFrame::GetSkipSides */
diff --git a/mozilla/layout/html/tests/table/bugs/bug28341.html b/mozilla/layout/html/tests/table/bugs/bug28341.html
new file mode 100644
index 00000000000..c9709f51edc
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug28341.html
@@ -0,0 +1,8 @@
+The bug causes a crash when the page is destroyed
+<BR>
+<TABLE>
+<CAPTION>
+<IMG SRC="../images/animated.gif">
+</CAPTION>
+<TR><TD>foo</TD></TR>
+</TABLE>
diff --git a/mozilla/layout/html/tests/table/bugs/file_list.txt b/mozilla/layout/html/tests/table/bugs/file_list.txt
index 5aba3e94b83..bac0f72d478 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list.txt
@@ -127,6 +127,7 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug2684.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2757.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2763.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2773.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug28341.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2886.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2886-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug28928.html
diff --git a/mozilla/layout/html/tests/table/images/animated.gif b/mozilla/layout/html/tests/table/images/animated.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c77fbb6609c5326394e543d56ae90fa8f400a7d0
GIT binary patch
literal 21710
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
L5dIfK2=f08n{t-o

literal 0
HcmV?d00001

diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp
index ccf876607b0..0ec4d1b9595 100644
--- a/mozilla/layout/tables/nsTableOuterFrame.cpp
+++ b/mozilla/layout/tables/nsTableOuterFrame.cpp
@@ -37,6 +37,8 @@
 #include "nsHTMLParts.h"
 #include "nsIPresShell.h"
 
+/* ----------- nsTableCaptionFrame ---------- */
+
 #define NS_TABLE_FRAME_CAPTION_LIST_INDEX 0
 
 // caption frame
@@ -46,6 +48,20 @@ nsTableCaptionFrame::nsTableCaptionFrame()
   SetFlags(NS_BLOCK_SPACE_MGR|NS_BLOCK_WRAP_SIZE);
 }
 
+nsTableCaptionFrame::~nsTableCaptionFrame()
+{
+}
+
+NS_IMETHODIMP
+nsTableOuterFrame::Destroy(nsIPresContext* aPresContext)
+{
+  if (mCaptionFrame) {
+    mCaptionFrame->Destroy(aPresContext);
+  }
+
+  return nsHTMLContainerFrame::Destroy(aPresContext);
+}
+
 NS_IMETHODIMP
 nsTableCaptionFrame::GetFrameType(nsIAtom** aType) const
 {
@@ -117,13 +133,19 @@ struct OuterTableReflowState {
   }
 };
 
-
-
 /* ----------- nsTableOuterFrame ---------- */
 
 NS_IMPL_ADDREF_INHERITED(nsTableOuterFrame, nsHTMLContainerFrame)
 NS_IMPL_RELEASE_INHERITED(nsTableOuterFrame, nsHTMLContainerFrame)
 
+nsTableOuterFrame::nsTableOuterFrame()
+{
+}
+
+nsTableOuterFrame::~nsTableOuterFrame()
+{
+}
+
 nsresult nsTableOuterFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
 {
   if (NULL == aInstancePtr) {
diff --git a/mozilla/layout/tables/nsTableOuterFrame.h b/mozilla/layout/tables/nsTableOuterFrame.h
index 33a36ebd0b3..48a92930af7 100644
--- a/mozilla/layout/tables/nsTableOuterFrame.h
+++ b/mozilla/layout/tables/nsTableOuterFrame.h
@@ -32,10 +32,14 @@ struct nsStyleTable;
 
 class nsTableCaptionFrame : public nsBlockFrame
 {
-  public:
+public:
   // nsISupports
-  nsTableCaptionFrame();
   NS_IMETHOD  GetFrameType(nsIAtom** aType) const;
+  friend nsresult NS_NewTableCaptionFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame);
+
+protected:
+  nsTableCaptionFrame();
+  virtual ~nsTableCaptionFrame();
 };
 
 
@@ -60,8 +64,7 @@ public:
     *
     * @return  NS_OK if the frame was properly allocated, otherwise an error code
     */
-  friend nsresult 
-  NS_NewTableOuterFrame(nsIPresShell* aPresShell, nsIFrame** aResult);
+  friend nsresult NS_NewTableOuterFrame(nsIPresShell* aPresShell, nsIFrame** aResult);
 
   NS_IMETHOD Init(nsIPresContext*  aPresContext,
                   nsIContent*      aContent,
@@ -69,6 +72,8 @@ public:
                   nsIStyleContext* aContext,
                   nsIFrame*        aPrevInFlow);
 
+  NS_IMETHOD Destroy(nsIPresContext* aPresContext);
+
   NS_IMETHOD AdjustZeroWidth();
 
   /**  @see nsIFrame::SetInitialChildList */    
@@ -151,6 +156,9 @@ public:
 protected:
 
 
+  nsTableOuterFrame();
+  virtual ~nsTableOuterFrame();
+
   /** Always returns 0, since the outer table frame has no border of its own
     * The inner table frame can answer this question in a meaningful way.
     * @see nsHTMLContainerFrame::GetSkipSides */