Backed out changeset 55052ae7d067 (bug 1851868) for reftest failure on 1153695.html . CLOSED TREE

Author: nbeleuzu

layout/base/nsFrameManager.cpp

@@ -50,8 +50,7 @@ void nsFrameManager::Destroy() {
   mPresShell->SetIgnoreFrameDestruction(true);
 
   if (mRootFrame) {
-    FrameDestroyContext context(mRootFrame);
-    mRootFrame->Destroy(context);
+    mRootFrame->Destroy();
     mRootFrame = nullptr;
   }
 

layout/forms/nsColorControlFrame.cpp

@@ -38,9 +38,10 @@ NS_QUERYFRAME_HEAD(nsColorControlFrame)
   NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
 NS_QUERYFRAME_TAIL_INHERITING(nsHTMLButtonControlFrame)
 
-void nsColorControlFrame::Destroy(DestroyContext& aContext) {
-  aContext.AddAnonymousContent(mColorContent.forget());
-  nsHTMLButtonControlFrame::Destroy(aContext);
+void nsColorControlFrame::DestroyFrom(nsIFrame* aDestructRoot,
+                                      PostDestroyData& aPostDestroyData) {
+  aPostDestroyData.AddAnonymousContent(mColorContent.forget());
+  nsHTMLButtonControlFrame::DestroyFrom(aDestructRoot, aPostDestroyData);
 }
 
 #ifdef DEBUG_FRAME_DUMP

layout/forms/nsColorControlFrame.h

@@ -27,7 +27,8 @@ class nsColorControlFrame final : public nsHTMLButtonControlFrame,
   friend nsIFrame* NS_NewColorControlFrame(mozilla::PresShell* aPresShell,
                                            ComputedStyle* aStyle);
 
-  void Destroy(DestroyContext&) override;
+  virtual void DestroyFrom(nsIFrame* aDestructRoot,
+                           PostDestroyData& aPostDestroyData) override;
 
   NS_DECL_QUERYFRAME
   NS_DECL_FRAMEARENA_HELPERS(nsColorControlFrame)

layout/forms/nsComboboxControlFrame.cpp

@@ -845,16 +845,17 @@ nsIFrame* nsComboboxControlFrame::CreateFrameForDisplayNode() {
   return mDisplayFrame;
 }
 
-void nsComboboxControlFrame::Destroy(DestroyContext& aContext) {
+void nsComboboxControlFrame::DestroyFrom(nsIFrame* aDestructRoot,
+                                         PostDestroyData& aPostDestroyData) {
   // Revoke any pending RedisplayTextEvent
   mRedisplayTextEvent.Revoke();
 
   mEventListener->Detach();
 
   // Cleanup frames in popup child list
-  aContext.AddAnonymousContent(mDisplayContent.forget());
-  aContext.AddAnonymousContent(mButtonContent.forget());
-  nsBlockFrame::Destroy(aContext);
+  aPostDestroyData.AddAnonymousContent(mDisplayContent.forget());
+  aPostDestroyData.AddAnonymousContent(mButtonContent.forget());
+  nsBlockFrame::DestroyFrom(aDestructRoot, aPostDestroyData);
 }
 
 const nsFrameList& nsComboboxControlFrame::GetChildList(

layout/forms/nsComboboxControlFrame.h

@@ -105,8 +105,8 @@ class nsComboboxControlFrame final : public nsBlockFrame,
 #ifdef DEBUG_FRAME_DUMP
   nsresult GetFrameName(nsAString& aResult) const final;
 #endif
-  void Destroy(DestroyContext&) final;
-
+  void DestroyFrom(nsIFrame* aDestructRoot,
+                   PostDestroyData& aPostDestroyData) final;
   void SetInitialChildList(ChildListID aListID, nsFrameList&& aChildList) final;
   const nsFrameList& GetChildList(ChildListID aListID) const final;
   void GetChildLists(nsTArray<ChildList>* aLists) const final;

layout/forms/nsFileControlFrame.cpp

@@ -59,7 +59,8 @@ void nsFileControlFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
   mMouseListener = new DnDListener(this);
 }
 
-void nsFileControlFrame::Destroy(DestroyContext& aContext) {
+void nsFileControlFrame::DestroyFrom(nsIFrame* aDestructRoot,
+                                     PostDestroyData& aPostDestroyData) {
   NS_ENSURE_TRUE_VOID(mContent);
 
   // Remove the events.
@@ -68,11 +69,11 @@ void nsFileControlFrame::Destroy(DestroyContext& aContext) {
     mContent->RemoveSystemEventListener(u"dragover"_ns, mMouseListener, false);
   }
 
-  aContext.AddAnonymousContent(mTextContent.forget());
-  aContext.AddAnonymousContent(mBrowseFilesOrDirs.forget());
+  aPostDestroyData.AddAnonymousContent(mTextContent.forget());
+  aPostDestroyData.AddAnonymousContent(mBrowseFilesOrDirs.forget());
 
   mMouseListener->ForgetFrame();
-  nsBlockFrame::Destroy(aContext);
+  nsBlockFrame::DestroyFrom(aDestructRoot, aPostDestroyData);
 }
 
 static already_AddRefed<Element> MakeAnonButton(

layout/forms/nsFileControlFrame.h

@@ -39,7 +39,8 @@ class nsFileControlFrame final : public nsBlockFrame,
   nsresult SetFormProperty(nsAtom* aName, const nsAString& aValue) override;
   void SetFocus(bool aOn, bool aRepaint) override;
 
-  void Destroy(DestroyContext&) override;
+  void DestroyFrom(nsIFrame* aDestructRoot,
+                   PostDestroyData& aPostDestroyData) override;
 
 #ifdef DEBUG_FRAME_DUMP
   nsresult GetFrameName(nsAString& aResult) const override;

layout/forms/nsGfxButtonControlFrame.cpp

@@ -26,9 +26,10 @@ nsContainerFrame* NS_NewGfxButtonControlFrame(PresShell* aPresShell,
 
 NS_IMPL_FRAMEARENA_HELPERS(nsGfxButtonControlFrame)
 
-void nsGfxButtonControlFrame::Destroy(DestroyContext& aContext) {
-  aContext.AddAnonymousContent(mTextContent.forget());
-  nsHTMLButtonControlFrame::Destroy(aContext);
+void nsGfxButtonControlFrame::DestroyFrom(nsIFrame* aDestructRoot,
+                                          PostDestroyData& aPostDestroyData) {
+  aPostDestroyData.AddAnonymousContent(mTextContent.forget());
+  nsHTMLButtonControlFrame::DestroyFrom(aDestructRoot, aPostDestroyData);
 }
 
 #ifdef DEBUG_FRAME_DUMP

layout/forms/nsGfxButtonControlFrame.h

@@ -27,7 +27,8 @@ class nsGfxButtonControlFrame final : public nsHTMLButtonControlFrame,
   explicit nsGfxButtonControlFrame(ComputedStyle* aStyle,
                                    nsPresContext* aPresContext);
 
-  void Destroy(DestroyContext&) override;
+  virtual void DestroyFrom(nsIFrame* aDestructRoot,
+                           PostDestroyData& aPostDestroyData) override;
 
   virtual nsresult HandleEvent(nsPresContext* aPresContext,
                                mozilla::WidgetGUIEvent* aEvent,

layout/forms/nsListControlFrame.cpp

@@ -77,15 +77,16 @@ Maybe<nscoord> nsListControlFrame::GetNaturalBaselineBOffset(
   return Nothing{};
 }
 // for Bug 47302 (remove this comment later)
-void nsListControlFrame::Destroy(DestroyContext& aContext) {
+void nsListControlFrame::DestroyFrom(nsIFrame* aDestructRoot,
+                                     PostDestroyData& aPostDestroyData) {
   // get the receiver interface from the browser button's content node
   NS_ENSURE_TRUE_VOID(mContent);
 
   // Clear the frame pointer on our event listener, just in case the
   // event listener can outlive the frame.
 
   mEventListener->Detach();
-  nsHTMLScrollFrame::Destroy(aContext);
+  nsHTMLScrollFrame::DestroyFrom(aDestructRoot, aPostDestroyData);
 }
 
 void nsListControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,