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